# HG changeset patch
# User cin
# Date 2020-09-08 14:11:35
# Node ID 93d9db76884ea1eda376575d74287537c7520a6a
# Parent  f7ed6a66cdbb482cb2385cf11801e19d16ffb6f7

fixed safe.mixin typings

diff --git a/buildSrc/src/main/groovy/org/implab/gradle/hg/MercurialPlugin.groovy b/buildSrc/src/main/groovy/org/implab/gradle/hg/MercurialPlugin.groovy
--- a/buildSrc/src/main/groovy/org/implab/gradle/hg/MercurialPlugin.groovy
+++ b/buildSrc/src/main/groovy/org/implab/gradle/hg/MercurialPlugin.groovy
@@ -12,7 +12,7 @@ public class MercurialPlugin implements 
             def tagVersion;
             def tagDistance;
 
-            def match = (rev =~ /^v(\d+\.\d+\.\d+).*-(\d+)$/);
+            def match = (rev =~ /^v(\d+\.\d+\.\d+(?:-\w+)?).*-(\d+)$/);
             
             if (match.size()) {
                 tagVersion = match[0][1];
diff --git a/src/main/ts/safe.ts b/src/main/ts/safe.ts
--- a/src/main/ts/safe.ts
+++ b/src/main/ts/safe.ts
@@ -166,7 +166,7 @@ export function each(obj: any, cb: any, 
  *  own properties of the source are entirely copied to the destination.
  *
  */
-export function mixin<T extends object, S extends object>(dest: T, source: S, template?: keyof S[]): T & S;
+export function mixin<T extends object, S extends object>(dest: T, source: S, template?: (keyof S)[]): T & S;
 export function mixin<T extends object, S extends object, R extends object = T>(dest: T, source: S, template: { [p in keyof S]?: keyof R; }): T & R;
 export function mixin<T extends object, S extends object>(dest: T, source: S, template?: any): any {
     argumentNotNull(dest, "dest");