clientnode 3.0.1000 → 3.0.1001

package/index.d.ts

@@ -1234,7 +1234,7 @@ export declare class Tools<TElement = HTMLElement> {
      * @returns Object of prepared scope name mappings and compiled function or
      * error string message if given expression couldn't be compiled.
      */
-    static stringCompile<T = string>(this: void, expression: string, scope?: Array<string> | Mapping<unknown> | string, execute?: boolean): CompilationResult<T>;
+    static stringCompile<T = string, N extends Array<string> = Array<string>>(this: void, expression: string, scope?: N | Mapping<unknown, N[number]> | N[number], execute?: boolean): CompilationResult<T, N>;
     /**
      * Evaluates a given string as expression against given scope.
      * @param expression - The string to interpret.
@@ -1244,7 +1244,7 @@ export declare class Tools<TElement = HTMLElement> {
      *
      * @returns Object with error message during parsing / running or result.
      */
-    static stringEvaluate<T = string>(this: void, expression: string, scope?: Mapping<unknown>, execute?: boolean, binding?: unknown): EvaluationResult<T>;
+    static stringEvaluate<T = string, S extends Mapping<unknown> = Mapping<unknown>>(this: void, expression: string, scope?: S, execute?: boolean, binding?: unknown): EvaluationResult<T>;
     /**
      * Finds the string match of given query in given target text by applying
      * given normalisation function to target and query.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clientnode",
-  "version": "3.0.1000",
+  "version": "3.0.1001",
   "description": "upgrade to object orientated rock solid plugins",
   "keywords": [
     "client",

package/type.d.ts

@@ -104,8 +104,8 @@ export interface TimeoutPromise extends Promise<boolean> {
     clear: () => void;
     timeoutID: NodeJS.Timeout;
 }
-export type Mapping<T = string> = {
-    [key: string]: T;
+export type Mapping<V = string, K extends string = string> = {
+    [key in K]: V;
 };
 export type ObjectMask = boolean | {
     [key: string]: boolean | ObjectMask;
@@ -158,12 +158,14 @@ export type ProcessCloseCallback = (reason: ProcessCloseReason) => void;
 export type ProcessErrorCallback = (reason: ProcessError) => void;
 export type RelativePosition = 'above' | 'below' | 'in' | 'left' | 'right';
 export type TemplateFunction<Type = string> = (...parameters: Array<unknown>) => Type;
-export interface CompilationResult<Type = string> {
+export interface CompilationResult<T = string, N extends Array<string> = Array<string>> {
     error: null | string;
-    originalScopeNames: Array<string>;
-    scopeNameMapping: Mapping<string>;
+    originalScopeNames: N;
+    scopeNameMapping: {
+        [key in N[number]]: string;
+    };
     scopeNames: Array<string>;
-    templateFunction: TemplateFunction<Type>;
+    templateFunction: TemplateFunction<T>;
 }
 export interface EvaluationResult<Type = string> {
     compileError: null | string;