@keymanapp/kmc-model 18.0.53-alpha → 18.0.55-alpha

package/build/src/model-definitions.js

@@ -1,189 +1,189 @@
-import { defaultApplyCasing, defaultCasedSearchTermToKey, defaultSearchTermToKey } from "./model-defaults.js";
-import KEYMAN_VERSION from "@keymanapp/keyman-version";
-/**
- * Processes certain defined model behaviors in such a way that the needed closures
- * may be safely compiled to a JS file and loaded within the LMLayer.
- *
- * This is accomplished by writing out a 'pseudoclosure' within the model's IIFE,
- * then used to build _actual_ closures at LMLayer load time.  This 'pseudoclosure'
- * will very closely match the organizational patterns of this class in order to
- * facilitate the maintenance of this approach.
- */
-export class ModelDefinitions {
-    static COMPILED_NAME = 'definitions';
-    /**
-     * A closure fully implementing the model's defined `applyCasing` behavior with
-     * the function parameter preset to the version-appropriate default.
-     * `defaults.applyCasing` is captured as part of the closure.
-     *
-     * During compilation of some models (such as Trie-based wordlist templated models),
-     * this closure will be directly used as part of searchTermToKey.
-     *
-     * In compiled code, this will instead be defined in-line as an autogenerated closure
-     * using the other properties of the pseudoclosure.
-     */
-    applyCasing;
-    /**
-     * A closure fully implementing the model's defined `searchTermToKey` behavior
-     * based upon the model's specified casing rules.  The `applyCasing` closure is
-     * itself captured within this closure.
-     *
-     * During compilation of some models (such as Trie-based wordlist templated models),
-     * this closure will be directly utilized when compiling the lexicon.
-     *
-     * In compiled code, this will instead be defined in-line as an autogenerated closure
-     * using the other properties of the pseudoclosure.
-     */
-    searchTermToKey;
-    /**
-     * Contains embedded 'default' implementations that may be needed for
-     * closures in the compiled version, annotated with the current version
-     * of Developer.
-     */
-    defaults = {
-        version: KEYMAN_VERSION.VERSION_WITH_TAG
-    };
-    /**
-     * Contains the model-specific definitions specified in the model's source.
-     *
-     * These definitions may expect `defaults.applyCasing` as a parameter in
-     * their final closures.
-     */
-    model = {};
-    constructor(modelSource) {
-        // Determine the model's `applyCasing` function / implementation.
-        if (modelSource.languageUsesCasing) {
-            this.defaults.applyCasing = defaultApplyCasing;
-            if (modelSource.applyCasing) {
-                this.model.applyCasing = modelSource.applyCasing;
-                let _this = this;
-                // Since the defined casing function may expect to take our default implementation
-                // as a parameter, we can define the full implementation via closure capture.
-                this.applyCasing = function (casing, text) {
-                    return _this.model.applyCasing(casing, text, _this.defaults.applyCasing);
-                };
-            }
-            else {
-                this.applyCasing = this.defaults.applyCasing;
-            }
-        }
-        // START: if(model type uses keying)...
-        // Use the default search term to key function, if left unspecified.
-        if (modelSource.searchTermToKey) {
-            this.model.searchTermToKey = modelSource.searchTermToKey;
-        }
-        else if (modelSource.languageUsesCasing) {
-            // applyCasing is defined here.
-            // Unfortunately, this only works conceptually.  .toString on a closure
-            // does not result in proper compilation.
-            this.model.searchTermToKey = defaultCasedSearchTermToKey;
-        }
-        else if (modelSource.languageUsesCasing == false) {
-            this.model.searchTermToKey = defaultSearchTermToKey;
-        }
-        else {
-            // If languageUsesCasing is not defined, then we use pre-14.0 behavior,
-            // which expects a lowercased default.
-            this.model.searchTermToKey = defaultCasedSearchTermToKey;
-            // Needed to provide pre-14.0 default lowercasing as part of the
-            // search-term keying operation.
-            this.defaults.applyCasing = defaultApplyCasing;
-            // For compile-time use.
-            this.applyCasing = this.defaults.applyCasing;
-        }
-        let _this = this;
-        this.searchTermToKey = function (text) {
-            return _this.model.searchTermToKey(text, _this.applyCasing);
-        };
-        // END: if(model type uses keying)...
-    }
-    // ------------ end:  common compile-time / run-time code ---------------
-    // START:  handwritten compilation code (to accomplish the 'common' pattern defined above)
-    /**
-     * Writes out a compiled JS version of the pseudoclosure, preserving all function
-     * implementations.
-     *
-     * This should be written to the file within the same IIFE as the model but BEFORE
-     * the model itself, as the model will need to refer to the definitions herein.
-     */
-    compileDefinitions() {
-        let defn = '';
-        defn += `var ${PSEUDOCLOSURE} = {\n`;
-        // ----------------------
-        // START - the 'defaults', which are common within the same Developer version.
-        defn += `  defaults: {\n    version: "${this.defaults.version}"`;
-        // Only write out `applyCasing` if and when it is needed.
-        if (this.defaults.applyCasing) {
-            defn += `,\n    applyCasing: ${this.defaults.applyCasing.toString()}`;
-        }
-        // Finalizes `defaults`
-        defn += `\n  },`;
-        // END - the 'defaults'
-        // ----------------------
-        // START - model-specific definitions (when defined)
-        defn += `  model: {\n`;
-        defn += `    searchTermToKey: ${this.model.searchTermToKey.toString()}`;
-        if (this.model.applyCasing) {
-            defn += `,\n    applyCasing: ${this.model.applyCasing.toString()}`;
-        }
-        defn += `\n  }`;
-        // END - model-specific definitions
-        // ----------------------
-        // START - compiled closures.  Given those definitions, write out the
-        // pseudoclosure-referencing closures for the needed methods.
-        // We should be able to define these closures in-line with the object's
-        // initialization.  Worst-case, we simply move the definitions outside
-        // of the pseudoclosure's init and THEN define/assign these closures to
-        // the object, as references will be available then for sure.
-        if (this.model.applyCasing) {
-            // A major potential issue:  if the user wants to call extra custom functions that they've written.
-            //
-            // `applyCasing` recursion SHOULD be fine if they write `this.applyCasing() and forward all arguments
-            // appropriately, as it will be known as `applyCasing` on the runtime `this` (`model`) object.
-            //
-            // Similarly, as long as any helper functions are similarly compiled and stored as part of `model`,
-            // they should be accessible too.  The issue would be to actually allow use of extra custom funcs
-            // and include them as part of this object as part of compilation.
+import { defaultApplyCasing, defaultCasedSearchTermToKey, defaultSearchTermToKey } from "./model-defaults.js";
+import KEYMAN_VERSION from "@keymanapp/keyman-version";
+/**
+ * Processes certain defined model behaviors in such a way that the needed closures
+ * may be safely compiled to a JS file and loaded within the LMLayer.
+ *
+ * This is accomplished by writing out a 'pseudoclosure' within the model's IIFE,
+ * then used to build _actual_ closures at LMLayer load time.  This 'pseudoclosure'
+ * will very closely match the organizational patterns of this class in order to
+ * facilitate the maintenance of this approach.
+ */
+export class ModelDefinitions {
+    static COMPILED_NAME = 'definitions';
+    /**
+     * A closure fully implementing the model's defined `applyCasing` behavior with
+     * the function parameter preset to the version-appropriate default.
+     * `defaults.applyCasing` is captured as part of the closure.
+     *
+     * During compilation of some models (such as Trie-based wordlist templated models),
+     * this closure will be directly used as part of searchTermToKey.
+     *
+     * In compiled code, this will instead be defined in-line as an autogenerated closure
+     * using the other properties of the pseudoclosure.
+     */
+    applyCasing;
+    /**
+     * A closure fully implementing the model's defined `searchTermToKey` behavior
+     * based upon the model's specified casing rules.  The `applyCasing` closure is
+     * itself captured within this closure.
+     *
+     * During compilation of some models (such as Trie-based wordlist templated models),
+     * this closure will be directly utilized when compiling the lexicon.
+     *
+     * In compiled code, this will instead be defined in-line as an autogenerated closure
+     * using the other properties of the pseudoclosure.
+     */
+    searchTermToKey;
+    /**
+     * Contains embedded 'default' implementations that may be needed for
+     * closures in the compiled version, annotated with the current version
+     * of Developer.
+     */
+    defaults = {
+        version: KEYMAN_VERSION.VERSION_WITH_TAG
+    };
+    /**
+     * Contains the model-specific definitions specified in the model's source.
+     *
+     * These definitions may expect `defaults.applyCasing` as a parameter in
+     * their final closures.
+     */
+    model = {};
+    constructor(modelSource) {
+        // Determine the model's `applyCasing` function / implementation.
+        if (modelSource.languageUsesCasing) {
+            this.defaults.applyCasing = defaultApplyCasing;
+            if (modelSource.applyCasing) {
+                this.model.applyCasing = modelSource.applyCasing;
+                let _this = this;
+                // Since the defined casing function may expect to take our default implementation
+                // as a parameter, we can define the full implementation via closure capture.
+                this.applyCasing = function (casing, text) {
+                    return _this.model.applyCasing(casing, text, _this.defaults.applyCasing);
+                };
+            }
+            else {
+                this.applyCasing = this.defaults.applyCasing;
+            }
+        }
+        // START: if(model type uses keying)...
+        // Use the default search term to key function, if left unspecified.
+        if (modelSource.searchTermToKey) {
+            this.model.searchTermToKey = modelSource.searchTermToKey;
+        }
+        else if (modelSource.languageUsesCasing) {
+            // applyCasing is defined here.
+            // Unfortunately, this only works conceptually.  .toString on a closure
+            // does not result in proper compilation.
+            this.model.searchTermToKey = defaultCasedSearchTermToKey;
+        }
+        else if (modelSource.languageUsesCasing == false) {
+            this.model.searchTermToKey = defaultSearchTermToKey;
+        }
+        else {
+            // If languageUsesCasing is not defined, then we use pre-14.0 behavior,
+            // which expects a lowercased default.
+            this.model.searchTermToKey = defaultCasedSearchTermToKey;
+            // Needed to provide pre-14.0 default lowercasing as part of the
+            // search-term keying operation.
+            this.defaults.applyCasing = defaultApplyCasing;
+            // For compile-time use.
+            this.applyCasing = this.defaults.applyCasing;
+        }
+        let _this = this;
+        this.searchTermToKey = function (text) {
+            return _this.model.searchTermToKey(text, _this.applyCasing);
+        };
+        // END: if(model type uses keying)...
+    }
+    // ------------ end:  common compile-time / run-time code ---------------
+    // START:  handwritten compilation code (to accomplish the 'common' pattern defined above)
+    /**
+     * Writes out a compiled JS version of the pseudoclosure, preserving all function
+     * implementations.
+     *
+     * This should be written to the file within the same IIFE as the model but BEFORE
+     * the model itself, as the model will need to refer to the definitions herein.
+     */
+    compileDefinitions() {
+        let defn = '';
+        defn += `var ${PSEUDOCLOSURE} = {\n`;
+        // ----------------------
+        // START - the 'defaults', which are common within the same Developer version.
+        defn += `  defaults: {\n    version: "${this.defaults.version}"`;
+        // Only write out `applyCasing` if and when it is needed.
+        if (this.defaults.applyCasing) {
+            defn += `,\n    applyCasing: ${this.defaults.applyCasing.toString()}`;
+        }
+        // Finalizes `defaults`
+        defn += `\n  },`;
+        // END - the 'defaults'
+        // ----------------------
+        // START - model-specific definitions (when defined)
+        defn += `  model: {\n`;
+        defn += `    searchTermToKey: ${this.model.searchTermToKey.toString()}`;
+        if (this.model.applyCasing) {
+            defn += `,\n    applyCasing: ${this.model.applyCasing.toString()}`;
+        }
+        defn += `\n  }`;
+        // END - model-specific definitions
+        // ----------------------
+        // START - compiled closures.  Given those definitions, write out the
+        // pseudoclosure-referencing closures for the needed methods.
+        // We should be able to define these closures in-line with the object's
+        // initialization.  Worst-case, we simply move the definitions outside
+        // of the pseudoclosure's init and THEN define/assign these closures to
+        // the object, as references will be available then for sure.
+        if (this.model.applyCasing) {
+            // A major potential issue:  if the user wants to call extra custom functions that they've written.
+            //
+            // `applyCasing` recursion SHOULD be fine if they write `this.applyCasing() and forward all arguments
+            // appropriately, as it will be known as `applyCasing` on the runtime `this` (`model`) object.
+            //
+            // Similarly, as long as any helper functions are similarly compiled and stored as part of `model`,
+            // they should be accessible too.  The issue would be to actually allow use of extra custom funcs
+            // and include them as part of this object as part of compilation.
             defn += `,\n  applyCasing: function(caseToApply, text) {
         return ${PSEUDOCLOSURE}.model.applyCasing(caseToApply, text, ${PSEUDOCLOSURE}.defaults.applyCasing);
-      }`;
-        }
-        else if (this.defaults.applyCasing) {
-            // We can't directly assign from `.defaults`, as initialization-time field reads
-            // are not permitted within JS.  Function references, however, are valid.
+      }`;
+        }
+        else if (this.defaults.applyCasing) {
+            // We can't directly assign from `.defaults`, as initialization-time field reads
+            // are not permitted within JS.  Function references, however, are valid.
             defn += `,\n  applyCasing: function(caseToApply, text) {
         return ${PSEUDOCLOSURE}.defaults.applyCasing(caseToApply, text);
-      }`;
-        }
-        // if(this.searchTermToKey) {
+      }`;
+        }
+        // if(this.searchTermToKey) {
         defn += `,\n  searchTermToKey: function(text) {
       return ${PSEUDOCLOSURE}.model.searchTermToKey(text, ${PSEUDOCLOSURE}.applyCasing);
-    }`;
-        // }
-        // END - compiled closures.
-        // ----------------------
-        // Finalize the definition of... `definitions`.
-        defn += `\n};\n`;
-        return defn;
-    }
-    /**
-     * Compiles the model-options entry for `searchTermToKey` in reference to the
-     * compiled pseudoclosure.
-     */
-    compileSearchTermToKey() {
-        // Simply point the model to the constructed closure defined by `compilePseudoclosure`.
-        // See "START - compiled closures" section.
-        return `${PSEUDOCLOSURE}.searchTermToKey`;
-    }
-    /**
-     * Compiles the model-options entry for `applyCasing` in reference to the
-     * compiled pseudoclosure.
-     */
-    compileApplyCasing() {
-        // See "START - compiled closures" section.
-        return `${PSEUDOCLOSURE}.applyCasing`;
-    }
-}
-// Because it references the class field, this line must come afterward.
-const PSEUDOCLOSURE = ModelDefinitions.COMPILED_NAME;
+    }`;
+        // }
+        // END - compiled closures.
+        // ----------------------
+        // Finalize the definition of... `definitions`.
+        defn += `\n};\n`;
+        return defn;
+    }
+    /**
+     * Compiles the model-options entry for `searchTermToKey` in reference to the
+     * compiled pseudoclosure.
+     */
+    compileSearchTermToKey() {
+        // Simply point the model to the constructed closure defined by `compilePseudoclosure`.
+        // See "START - compiled closures" section.
+        return `${PSEUDOCLOSURE}.searchTermToKey`;
+    }
+    /**
+     * Compiles the model-options entry for `applyCasing` in reference to the
+     * compiled pseudoclosure.
+     */
+    compileApplyCasing() {
+        // See "START - compiled closures" section.
+        return `${PSEUDOCLOSURE}.applyCasing`;
+    }
+}
+// Because it references the class field, this line must come afterward.
+const PSEUDOCLOSURE = ModelDefinitions.COMPILED_NAME;
 //# sourceMappingURL=model-definitions.js.map

package/build/src/model-definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"model-definitions.js","sourceRoot":"","sources":["../../src/model-definitions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model-definitions.js","sourceRoot":"","sources":["../../src/model-definitions.ts"],"names":[],"mappings":"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"}

package/build/src/script-overrides-decorator.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="@keymanapp/models-types" />
-import { OverrideScriptDefaults } from "./lexical-model.js";
-export declare function decorateWithScriptOverrides(breaker: WordBreakingFunction, option: OverrideScriptDefaults): (phrase: string) => Span[];
+/// <reference types="@keymanapp/models-types" />
+import { OverrideScriptDefaults } from "./lexical-model.js";
+export declare function decorateWithScriptOverrides(breaker: WordBreakingFunction, option: OverrideScriptDefaults): (phrase: string) => Span[];
 //# sourceMappingURL=script-overrides-decorator.d.ts.map

package/build/src/script-overrides-decorator.js

@@ -1,64 +1,64 @@
-import { ModelCompilerError, ModelCompilerMessages } from "./model-compiler-messages.js";
-export function decorateWithScriptOverrides(breaker, option) {
-    if (option !== 'break-words-at-spaces') {
-        throw new ModelCompilerError(ModelCompilerMessages.Error_UnsupportedScriptOverride({ option }));
-    }
-    /**
-     * Matches if when a span contains a Southeast-Asian letter or mark anywhere.
-     * This makes it a candidate for joining.
-     *
-     * See: tools/create-override-script-regexp.ts for how this RegExp was
-     * generated.
-     *
-     * Last updated for Unicode 13.0.0.
-     */
-    const HAS_SOUTHEAST_ASIAN_LETTER = /[\u0E01-\u0E3A\u0E40-\u0E4E\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0EDC-\u0EDF\u1000-\u103F\u1050-\u108F\u109A-\u109D\u1780-\u17D3\u17D7\u17DC\u17DD\u30A1-\u30FA\u30FC-\u30FF]/;
-    return function enhancedBreaker(phrase) {
-        let originalSpans = breaker(phrase);
-        if (originalSpans.length === 0) {
-            return [];
-        }
-        let outputSpans = [originalSpans.shift()];
-        for (let currentSpan of originalSpans) {
-            let previousSpan = lastFrom(outputSpans);
-            if (spansAreBackToBack(previousSpan, currentSpan) &&
-                hasSouthEastAsianLetter(previousSpan) &&
-                hasSouthEastAsianLetter(currentSpan)) {
-                // previous span SHOULD be joined with current!
-                outputSpans[outputSpans.length - 1] = concatenateSpans(previousSpan, currentSpan);
-            }
-            else {
-                outputSpans.push(currentSpan);
-            }
-        }
-        return outputSpans;
-    };
-    function hasSouthEastAsianLetter(span) {
-        return HAS_SOUTHEAST_ASIAN_LETTER.test(span.text);
-    }
-    /**
-     * Returns true when the spans are contiguous.
-     * Order matters when calling this function!
-     */
-    function spansAreBackToBack(former, latter) {
-        return former.end === latter.start;
-    }
-    function concatenateSpans(former, latter) {
-        if (latter.start !== former.end) {
-            throw new Error(`Cannot concatenate non-contiguous spans: ${JSON.stringify(former)}/${JSON.stringify(latter)}`);
-        }
-        return {
-            start: former.start,
-            end: latter.end,
-            length: former.length + latter.length,
-            text: former.text + latter.text
-        };
-    }
-    /**
-     * Get the last element from the array.
-     */
-    function lastFrom(array) {
-        return array[array.length - 1];
-    }
-}
+import { ModelCompilerError, ModelCompilerMessages } from "./model-compiler-messages.js";
+export function decorateWithScriptOverrides(breaker, option) {
+    if (option !== 'break-words-at-spaces') {
+        throw new ModelCompilerError(ModelCompilerMessages.Error_UnsupportedScriptOverride({ option }));
+    }
+    /**
+     * Matches if when a span contains a Southeast-Asian letter or mark anywhere.
+     * This makes it a candidate for joining.
+     *
+     * See: tools/create-override-script-regexp.ts for how this RegExp was
+     * generated.
+     *
+     * Last updated for Unicode 13.0.0.
+     */
+    const HAS_SOUTHEAST_ASIAN_LETTER = /[\u0E01-\u0E3A\u0E40-\u0E4E\u0E81\u0E82\u0E84\u0E86-\u0E8A\u0E8C-\u0EA3\u0EA5\u0EA7-\u0EBD\u0EC0-\u0EC4\u0EC6\u0EC8-\u0ECD\u0EDC-\u0EDF\u1000-\u103F\u1050-\u108F\u109A-\u109D\u1780-\u17D3\u17D7\u17DC\u17DD\u30A1-\u30FA\u30FC-\u30FF]/;
+    return function enhancedBreaker(phrase) {
+        let originalSpans = breaker(phrase);
+        if (originalSpans.length === 0) {
+            return [];
+        }
+        let outputSpans = [originalSpans.shift()];
+        for (let currentSpan of originalSpans) {
+            let previousSpan = lastFrom(outputSpans);
+            if (spansAreBackToBack(previousSpan, currentSpan) &&
+                hasSouthEastAsianLetter(previousSpan) &&
+                hasSouthEastAsianLetter(currentSpan)) {
+                // previous span SHOULD be joined with current!
+                outputSpans[outputSpans.length - 1] = concatenateSpans(previousSpan, currentSpan);
+            }
+            else {
+                outputSpans.push(currentSpan);
+            }
+        }
+        return outputSpans;
+    };
+    function hasSouthEastAsianLetter(span) {
+        return HAS_SOUTHEAST_ASIAN_LETTER.test(span.text);
+    }
+    /**
+     * Returns true when the spans are contiguous.
+     * Order matters when calling this function!
+     */
+    function spansAreBackToBack(former, latter) {
+        return former.end === latter.start;
+    }
+    function concatenateSpans(former, latter) {
+        if (latter.start !== former.end) {
+            throw new Error(`Cannot concatenate non-contiguous spans: ${JSON.stringify(former)}/${JSON.stringify(latter)}`);
+        }
+        return {
+            start: former.start,
+            end: latter.end,
+            length: former.length + latter.length,
+            text: former.text + latter.text
+        };
+    }
+    /**
+     * Get the last element from the array.
+     */
+    function lastFrom(array) {
+        return array[array.length - 1];
+    }
+}
 //# sourceMappingURL=script-overrides-decorator.js.map

package/build/src/script-overrides-decorator.js.map

@@ -1 +1 @@
-{"version":3,"file":"script-overrides-decorator.js","sourceRoot":"","sources":["../../src/script-overrides-decorator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAEzF,MAAM,UAAU,2BAA2B,CAAC,OAA6B,EAAE,MAA8B;IACvG,IAAI,MAAM,KAAK,uBAAuB,EAAE;QACtC,MAAM,IAAI,kBAAkB,CAAC,qBAAqB,CAAC,+BAA+B,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC,CAAC;KAC/F;IAED;;;;;;;;OAQG;IACH,MAAM,0BAA0B,GAAG,0OAA0O,CAAC;IAE9Q,OAAO,SAAS,eAAe,CAAC,MAAc;QAC5C,IAAI,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,OAAO,EAAE,CAAC;SACX;QAED,IAAI,WAAW,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1C,KAAK,IAAI,WAAW,IAAI,aAAa,EAAE;YACrC,IAAI,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;YAEzC,IAAI,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC;gBAC7C,uBAAuB,CAAC,YAAY,CAAC;gBACrC,uBAAuB,CAAC,WAAW,CAAC,EACtC;gBACA,+CAA+C;gBAC/C,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,gBAAgB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;aACnF;iBAAM;gBACL,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;aAC/B;SACF;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAA;IAED,SAAS,uBAAuB,CAAC,IAAU;QACzC,OAAO,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;IAED;;;OAGG;IACH,SAAS,kBAAkB,CAAC,MAAY,EAAE,MAAY;QACpD,OAAO,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,KAAK,CAAC;IACrC,CAAC;IAED,SAAS,gBAAgB,CAAC,MAAY,EAAE,MAAY;QAClD,IAAI,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,GAAG,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;SACjH;QAED,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM;YACrC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI;SAChC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,SAAS,QAAQ,CAAI,KAAU;QAC7B,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACjC,CAAC;AACH,CAAC"}
+{"version":3,"file":"script-overrides-decorator.js","sourceRoot":"","sources":["../../src/script-overrides-decorator.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAEzF,MAAM,UAAU,2BAA2B,CAAC,OAA6B,EAAE,MAA8B;IACvG,IAAI,MAAM,KAAK,uBAAuB,EAAE,CAAC;QACvC,MAAM,IAAI,kBAAkB,CAAC,qBAAqB,CAAC,+BAA+B,CAAC,EAAC,MAAM,EAAC,CAAC,CAAC,CAAC;IAChG,CAAC;IAED;;;;;;;;OAQG;IACH,MAAM,0BAA0B,GAAG,0OAA0O,CAAC;IAE9Q,OAAO,SAAS,eAAe,CAAC,MAAc;QAC5C,IAAI,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;QAEpC,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/B,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,IAAI,WAAW,GAAG,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1C,KAAK,IAAI,WAAW,IAAI,aAAa,EAAE,CAAC;YACtC,IAAI,YAAY,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;YAEzC,IAAI,kBAAkB,CAAC,YAAY,EAAE,WAAW,CAAC;gBAC7C,uBAAuB,CAAC,YAAY,CAAC;gBACrC,uBAAuB,CAAC,WAAW,CAAC,EACtC,CAAC;gBACD,+CAA+C;gBAC/C,WAAW,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,gBAAgB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;YACpF,CAAC;iBAAM,CAAC;gBACN,WAAW,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChC,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC,CAAA;IAED,SAAS,uBAAuB,CAAC,IAAU;QACzC,OAAO,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpD,CAAC;IAED;;;OAGG;IACH,SAAS,kBAAkB,CAAC,MAAY,EAAE,MAAY;QACpD,OAAO,MAAM,CAAC,GAAG,KAAK,MAAM,CAAC,KAAK,CAAC;IACrC,CAAC;IAED,SAAS,gBAAgB,CAAC,MAAY,EAAE,MAAY;QAClD,IAAI,MAAM,CAAC,KAAK,KAAK,MAAM,CAAC,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,KAAK,CAAC,4CAA4C,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAClH,CAAC;QAED,OAAO;YACL,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,GAAG,EAAE,MAAM,CAAC,GAAG;YACf,MAAM,EAAE,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM;YACrC,IAAI,EAAE,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC,IAAI;SAChC,CAAC;IACJ,CAAC;IAED;;OAEG;IACH,SAAS,QAAQ,CAAI,KAAU;QAC7B,OAAO,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IACjC,CAAC;AACH,CAAC"}

package/package.json

@@ -30,21 +30,20 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "dependencies": {
-    "@keymanapp/common-types": "18.0.53-alpha",
-    "@keymanapp/keyman-version": "18.0.53-alpha",
-    "@keymanapp/models-types": "18.0.53-alpha",
-    "typescript": "^4.9.5"
+    "@keymanapp/common-types": "18.0.55-alpha",
+    "@keymanapp/keyman-version": "18.0.55-alpha",
+    "@keymanapp/models-types": "18.0.55-alpha",
+    "typescript": "^5.4.5"
   },
   "devDependencies": {
-    "@keymanapp/developer-test-helpers": "18.0.53-alpha",
-    "@keymanapp/models-templates": "18.0.53-alpha",
+    "@keymanapp/developer-test-helpers": "18.0.55-alpha",
+    "@keymanapp/models-templates": "18.0.55-alpha",
     "@types/mocha": "^5.2.7",
     "@types/node": "^20.4.1",
     "c8": "^7.12.0",
     "chalk": "^2.4.2",
     "esbuild": "^0.15.7",
-    "mocha": "^10.0.0",
-    "ts-node": "^10.9.1"
+    "mocha": "^10.0.0"
   },
   "mocha": {
     "spec": "build/test/**/test-*.js",
@@ -68,5 +67,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "18.0.53-alpha"
+  "version": "18.0.55-alpha"
 }