@keymanapp/kmc-analyze 18.0.41-alpha → 18.0.46-alpha

package/build/src/osk-rewrite-pua/index.d.ts

@@ -1,41 +1,41 @@
-import { CompilerCallbacks } from "@keymanapp/common-types";
-import { Osk } from '@keymanapp/kmc-kmn';
-/**
- * @public
- * Rewrite On Screen Keyboard files (.kvks, .keyman-touch-layout) with PUA
- * codepoints, based on analysis provided by {@link AnalyzeOskCharacterUse}
- * class.
- */
-export declare class AnalyzeOskRewritePua {
-    private callbacks;
-    private _data;
-    constructor(callbacks: CompilerCallbacks);
-    /**
-     * Clears data collected from previous calls to
-     * {@link AnalyzeOskRewritePua.analyze}
-     */
-    clear(): void;
-    /**
-     * Analyze a keyboard file or files, and provide a remapped output. Accepts a
-     * .kmn, .kvks, .keyman-touch-layout file formats. For .kmn, will rewrite
-     * associated On Screen Keyboard file formats. Can be called multiple times to
-     * rewrite multiple files. Use the {@link AnalyzeOskRewritePua.data} property
-     * to retrieve the output file content for writing. This does not modify the
-     * source file.
-     * @param file    - relative or absolute path to a Keyman source file
-     * @param mapping - OSK keycap map provided by {@link AnalyzeOskCharacterUse}
-     * @returns       true if the file is successfully loaded and rewritten
-     */
-    analyze(file: string, mapping: Osk.StringResult[]): Promise<boolean>;
-    /**
-     * Returns the file data for OSK files rewritten with PUA characters, for use
-     * with `&displayMap`.
-     */
-    get data(): {
-        [index: string]: Uint8Array;
-    };
-    private analyzeKmnKeyboard;
-    private analyzeVisualKeyboard;
-    private analyzeTouchLayout;
-}
+import { CompilerCallbacks } from "@keymanapp/common-types";
+import { Osk } from '@keymanapp/kmc-kmn';
+/**
+ * @public
+ * Rewrite On Screen Keyboard files (.kvks, .keyman-touch-layout) with PUA
+ * codepoints, based on analysis provided by {@link AnalyzeOskCharacterUse}
+ * class.
+ */
+export declare class AnalyzeOskRewritePua {
+    private callbacks;
+    private _data;
+    constructor(callbacks: CompilerCallbacks);
+    /**
+     * Clears data collected from previous calls to
+     * {@link AnalyzeOskRewritePua.analyze}
+     */
+    clear(): void;
+    /**
+     * Analyze a keyboard file or files, and provide a remapped output. Accepts a
+     * .kmn, .kvks, .keyman-touch-layout file formats. For .kmn, will rewrite
+     * associated On Screen Keyboard file formats. Can be called multiple times to
+     * rewrite multiple files. Use the {@link AnalyzeOskRewritePua.data} property
+     * to retrieve the output file content for writing. This does not modify the
+     * source file.
+     * @param file    - relative or absolute path to a Keyman source file
+     * @param mapping - OSK keycap map provided by {@link AnalyzeOskCharacterUse}
+     * @returns       true if the file is successfully loaded and rewritten
+     */
+    analyze(file: string, mapping: Osk.StringResult[]): Promise<boolean>;
+    /**
+     * Returns the file data for OSK files rewritten with PUA characters, for use
+     * with `&displayMap`.
+     */
+    get data(): {
+        [index: string]: Uint8Array;
+    };
+    private analyzeKmnKeyboard;
+    private analyzeVisualKeyboard;
+    private analyzeTouchLayout;
+}
 //# sourceMappingURL=index.d.ts.map

package/build/src/osk-rewrite-pua/index.js

@@ -1,132 +1,129 @@
-
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="afce4aa9-23fc-5726-a96d-3716c9c177a6")}catch(e){}}();
-import { KeymanFileTypes, KvksFileReader, KvksFileWriter, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types";
-import { CompilerMessages, Osk } from '@keymanapp/kmc-kmn';
-import { getOskFromKmnFile } from "../util/get-osk-from-kmn-file.js";
-import { AnalyzerMessages } from "../messages.js";
-/**
- * @public
- * Rewrite On Screen Keyboard files (.kvks, .keyman-touch-layout) with PUA
- * codepoints, based on analysis provided by {@link AnalyzeOskCharacterUse}
- * class.
- */
-export class AnalyzeOskRewritePua {
-    callbacks;
-    _data = {};
-    constructor(callbacks) {
-        this.callbacks = callbacks;
-    }
-    /**
-     * Clears data collected from previous calls to
-     * {@link AnalyzeOskRewritePua.analyze}
-     */
-    clear() {
-        this._data = {};
-    }
-    //
-    // Analyze a single file
-    //
-    /**
-     * Analyze a keyboard file or files, and provide a remapped output. Accepts a
-     * .kmn, .kvks, .keyman-touch-layout file formats. For .kmn, will rewrite
-     * associated On Screen Keyboard file formats. Can be called multiple times to
-     * rewrite multiple files. Use the {@link AnalyzeOskRewritePua.data} property
-     * to retrieve the output file content for writing. This does not modify the
-     * source file.
-     * @param file    - relative or absolute path to a Keyman source file
-     * @param mapping - OSK keycap map provided by {@link AnalyzeOskCharacterUse}
-     * @returns       true if the file is successfully loaded and rewritten
-     */
-    async analyze(file, mapping) {
-        let map = Osk.parseMapping(mapping);
-        switch (KeymanFileTypes.sourceTypeFromFilename(file)) {
-            case ".kvks" /* KeymanFileTypes.Source.VisualKeyboard */:
-                this._data[file] = this.analyzeVisualKeyboard(file, map);
-                break;
-            case ".keyman-touch-layout" /* KeymanFileTypes.Source.TouchLayout */:
-                this._data[file] = this.analyzeTouchLayout(file, map);
-                break;
-            case ".kpj" /* KeymanFileTypes.Source.Project */:
-                throw new Error('Passing a project to analyze is not permitted');
-                break;
-            case ".kmn" /* KeymanFileTypes.Source.KeymanKeyboard */:
-                // The cleanest way to do this is to compile the .kmn to find the .kvks
-                // and .keyman-touch-layout from the &VISUALKEYBOARD and &LAYOUTFILE
-                // system stores
-                if (!await this.analyzeKmnKeyboard(file, map)) {
-                    return false;
-                }
-                break;
-            case ".xml" /* KeymanFileTypes.Source.LdmlKeyboard */:
-                // TODO: await this.analyzeLdmlKeyboard(file);
-                // note, will need to skip .xml files that are not ldml keyboards
-                break;
-            default:
-            // Ignore any other file types; this way we can analyze project files/folders
-            // easily also
-        }
-        return true;
-    }
-    /**
-     * Returns the file data for OSK files rewritten with PUA characters, for use
-     * with `&displayMap`.
-     */
-    get data() {
-        return this._data;
-    }
-    async analyzeKmnKeyboard(filename, map) {
-        this.callbacks.reportMessage(AnalyzerMessages.Info_ScanningFile({ type: 'keyboard source', name: filename }));
-        let osk = await getOskFromKmnFile(this.callbacks, filename);
-        if (osk.kvksFilename) {
-            this._data[osk.kvksFilename] = this.analyzeVisualKeyboard(osk.kvksFilename, map);
-        }
-        if (osk.touchLayoutFilename) {
-            this._data[osk.touchLayoutFilename] = this.analyzeTouchLayout(osk.touchLayoutFilename, map);
-        }
-        return true;
-    }
-    //
-    // On Screen Keyboard file scanning
-    //
-    analyzeVisualKeyboard(filename, map) {
-        this.callbacks.reportMessage(AnalyzerMessages.Info_ScanningFile({ type: 'visual keyboard', name: filename }));
-        const reader = new KvksFileReader();
-        let source;
-        try {
-            source = reader.read(this.callbacks.loadFile(filename));
-        }
-        catch (e) {
-            this.callbacks.reportMessage(CompilerMessages.Error_InvalidKvksFile({ filename, e }));
-            return null;
-        }
-        let invalidKeys = [];
-        const vk = reader.transform(source, invalidKeys);
-        if (!vk) {
-            this.callbacks.reportMessage(CompilerMessages.Error_InvalidKvksFile({ filename, e: null }));
-            return null;
-        }
-        const dirty = Osk.remapVisualKeyboard(vk, map);
-        if (!dirty) {
-            return null;
-        }
-        const writer = new KvksFileWriter();
-        const data = writer.write(vk);
-        // TODO: the encoder probably needs to go into KvksFileWRiter
-        const enc = new TextEncoder();
-        return enc.encode(data);
-    }
-    analyzeTouchLayout(filename, map) {
-        this.callbacks.reportMessage(AnalyzerMessages.Info_ScanningFile({ type: 'touch layout', name: filename }));
-        const reader = new TouchLayoutFileReader();
-        const source = reader.read(this.callbacks.loadFile(filename));
-        let dirty = Osk.remapTouchLayout(source, map);
-        if (!dirty) {
-            return null;
-        }
-        const writer = new TouchLayoutFileWriter({ formatted: true });
-        const data = writer.write(source);
-        return data;
-    }
-}
-//# sourceMappingURL=index.js.map
-//# debugId=afce4aa9-23fc-5726-a96d-3716c9c177a6
+import { KeymanFileTypes, KvksFileReader, KvksFileWriter, TouchLayoutFileReader, TouchLayoutFileWriter } from "@keymanapp/common-types";
+import { CompilerMessages, Osk } from '@keymanapp/kmc-kmn';
+import { getOskFromKmnFile } from "../util/get-osk-from-kmn-file.js";
+import { AnalyzerMessages } from "../messages.js";
+/**
+ * @public
+ * Rewrite On Screen Keyboard files (.kvks, .keyman-touch-layout) with PUA
+ * codepoints, based on analysis provided by {@link AnalyzeOskCharacterUse}
+ * class.
+ */
+export class AnalyzeOskRewritePua {
+    callbacks;
+    _data = {};
+    constructor(callbacks) {
+        this.callbacks = callbacks;
+    }
+    /**
+     * Clears data collected from previous calls to
+     * {@link AnalyzeOskRewritePua.analyze}
+     */
+    clear() {
+        this._data = {};
+    }
+    //
+    // Analyze a single file
+    //
+    /**
+     * Analyze a keyboard file or files, and provide a remapped output. Accepts a
+     * .kmn, .kvks, .keyman-touch-layout file formats. For .kmn, will rewrite
+     * associated On Screen Keyboard file formats. Can be called multiple times to
+     * rewrite multiple files. Use the {@link AnalyzeOskRewritePua.data} property
+     * to retrieve the output file content for writing. This does not modify the
+     * source file.
+     * @param file    - relative or absolute path to a Keyman source file
+     * @param mapping - OSK keycap map provided by {@link AnalyzeOskCharacterUse}
+     * @returns       true if the file is successfully loaded and rewritten
+     */
+    async analyze(file, mapping) {
+        let map = Osk.parseMapping(mapping);
+        switch (KeymanFileTypes.sourceTypeFromFilename(file)) {
+            case ".kvks" /* KeymanFileTypes.Source.VisualKeyboard */:
+                this._data[file] = this.analyzeVisualKeyboard(file, map);
+                break;
+            case ".keyman-touch-layout" /* KeymanFileTypes.Source.TouchLayout */:
+                this._data[file] = this.analyzeTouchLayout(file, map);
+                break;
+            case ".kpj" /* KeymanFileTypes.Source.Project */:
+                throw new Error('Passing a project to analyze is not permitted');
+                break;
+            case ".kmn" /* KeymanFileTypes.Source.KeymanKeyboard */:
+                // The cleanest way to do this is to compile the .kmn to find the .kvks
+                // and .keyman-touch-layout from the &VISUALKEYBOARD and &LAYOUTFILE
+                // system stores
+                if (!await this.analyzeKmnKeyboard(file, map)) {
+                    return false;
+                }
+                break;
+            case ".xml" /* KeymanFileTypes.Source.LdmlKeyboard */:
+                // TODO: await this.analyzeLdmlKeyboard(file);
+                // note, will need to skip .xml files that are not ldml keyboards
+                break;
+            default:
+            // Ignore any other file types; this way we can analyze project files/folders
+            // easily also
+        }
+        return true;
+    }
+    /**
+     * Returns the file data for OSK files rewritten with PUA characters, for use
+     * with `&displayMap`.
+     */
+    get data() {
+        return this._data;
+    }
+    async analyzeKmnKeyboard(filename, map) {
+        this.callbacks.reportMessage(AnalyzerMessages.Info_ScanningFile({ type: 'keyboard source', name: filename }));
+        let osk = await getOskFromKmnFile(this.callbacks, filename);
+        if (osk.kvksFilename) {
+            this._data[osk.kvksFilename] = this.analyzeVisualKeyboard(osk.kvksFilename, map);
+        }
+        if (osk.touchLayoutFilename) {
+            this._data[osk.touchLayoutFilename] = this.analyzeTouchLayout(osk.touchLayoutFilename, map);
+        }
+        return true;
+    }
+    //
+    // On Screen Keyboard file scanning
+    //
+    analyzeVisualKeyboard(filename, map) {
+        this.callbacks.reportMessage(AnalyzerMessages.Info_ScanningFile({ type: 'visual keyboard', name: filename }));
+        const reader = new KvksFileReader();
+        let source;
+        try {
+            source = reader.read(this.callbacks.loadFile(filename));
+        }
+        catch (e) {
+            this.callbacks.reportMessage(CompilerMessages.Error_InvalidKvksFile({ filename, e }));
+            return null;
+        }
+        let invalidKeys = [];
+        const vk = reader.transform(source, invalidKeys);
+        if (!vk) {
+            this.callbacks.reportMessage(CompilerMessages.Error_InvalidKvksFile({ filename, e: null }));
+            return null;
+        }
+        const dirty = Osk.remapVisualKeyboard(vk, map);
+        if (!dirty) {
+            return null;
+        }
+        const writer = new KvksFileWriter();
+        const data = writer.write(vk);
+        // TODO: the encoder probably needs to go into KvksFileWRiter
+        const enc = new TextEncoder();
+        return enc.encode(data);
+    }
+    analyzeTouchLayout(filename, map) {
+        this.callbacks.reportMessage(AnalyzerMessages.Info_ScanningFile({ type: 'touch layout', name: filename }));
+        const reader = new TouchLayoutFileReader();
+        const source = reader.read(this.callbacks.loadFile(filename));
+        let dirty = Osk.remapTouchLayout(source, map);
+        if (!dirty) {
+            return null;
+        }
+        const writer = new TouchLayoutFileWriter({ formatted: true });
+        const data = writer.write(source);
+        return data;
+    }
+}
+//# sourceMappingURL=index.js.map

package/build/src/osk-rewrite-pua/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":["../../../src/osk-rewrite-pua/index.ts"],"sourceRoot":"","names":[],"mappings":"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","debug_id":"afce4aa9-23fc-5726-a96d-3716c9c177a6"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/osk-rewrite-pua/index.ts"],"names":[],"mappings":"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"}

package/build/src/util/get-osk-from-kmn-file.d.ts

@@ -1,6 +1,6 @@
-import { CompilerCallbacks } from "@keymanapp/common-types";
-export declare function getOskFromKmnFile(callbacks: CompilerCallbacks, filename: string): Promise<{
-    kvksFilename?: string;
-    touchLayoutFilename?: string;
-}>;
+import { CompilerCallbacks } from "@keymanapp/common-types";
+export declare function getOskFromKmnFile(callbacks: CompilerCallbacks, filename: string): Promise<{
+    kvksFilename?: string;
+    touchLayoutFilename?: string;
+}>;
 //# sourceMappingURL=get-osk-from-kmn-file.d.ts.map

package/build/src/util/get-osk-from-kmn-file.js

@@ -1,33 +1,30 @@
-
-!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="a10b6c66-188f-52d4-9055-0f3fbda8317c")}catch(e){}}();
-import { KMX, KmxFileReader } from "@keymanapp/common-types";
-import { KmnCompiler } from "@keymanapp/kmc-kmn";
-export async function getOskFromKmnFile(callbacks, filename) {
-    let kvksFilename;
-    let touchLayoutFilename;
-    const kmnCompiler = new KmnCompiler();
-    if (!await kmnCompiler.init(callbacks, {
-        shouldAddCompilerVersion: false,
-        saveDebug: false,
-    })) {
-        // kmnCompiler will report errors
-        return null;
-    }
-    let result = await kmnCompiler.run(filename, null);
-    if (!result) {
-        // kmnCompiler will report any errors
-        return null;
-    }
-    if (result.extra.kvksFilename) {
-        kvksFilename = callbacks.resolveFilename(filename, result.extra.kvksFilename);
-    }
-    const reader = new KmxFileReader();
-    const keyboard = reader.read(result.artifacts.kmx.data);
-    const touchLayoutStore = keyboard.stores.find(store => store.dwSystemID == KMX.KMXFile.TSS_LAYOUTFILE);
-    if (touchLayoutStore) {
-        touchLayoutFilename = callbacks.resolveFilename(filename, touchLayoutStore.dpString);
-    }
-    return { kvksFilename, touchLayoutFilename };
-}
-//# sourceMappingURL=get-osk-from-kmn-file.js.map
-//# debugId=a10b6c66-188f-52d4-9055-0f3fbda8317c
+import { KMX, KmxFileReader } from "@keymanapp/common-types";
+import { KmnCompiler } from "@keymanapp/kmc-kmn";
+export async function getOskFromKmnFile(callbacks, filename) {
+    let kvksFilename;
+    let touchLayoutFilename;
+    const kmnCompiler = new KmnCompiler();
+    if (!await kmnCompiler.init(callbacks, {
+        shouldAddCompilerVersion: false,
+        saveDebug: false,
+    })) {
+        // kmnCompiler will report errors
+        return null;
+    }
+    let result = await kmnCompiler.run(filename, null);
+    if (!result) {
+        // kmnCompiler will report any errors
+        return null;
+    }
+    if (result.extra.kvksFilename) {
+        kvksFilename = callbacks.resolveFilename(filename, result.extra.kvksFilename);
+    }
+    const reader = new KmxFileReader();
+    const keyboard = reader.read(result.artifacts.kmx.data);
+    const touchLayoutStore = keyboard.stores.find(store => store.dwSystemID == KMX.KMXFile.TSS_LAYOUTFILE);
+    if (touchLayoutStore) {
+        touchLayoutFilename = callbacks.resolveFilename(filename, touchLayoutStore.dpString);
+    }
+    return { kvksFilename, touchLayoutFilename };
+}
+//# sourceMappingURL=get-osk-from-kmn-file.js.map

package/build/src/util/get-osk-from-kmn-file.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-osk-from-kmn-file.js","sources":["../../../src/util/get-osk-from-kmn-file.ts"],"sourceRoot":"","names":[],"mappings":";;AAAA,OAAO,EAAqB,GAAG,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,SAA4B,EAAE,QAAgB;IAIpF,IAAI,YAAoB,CAAC;IACzB,IAAI,mBAA2B,CAAC;IAEhC,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IACtC,IAAG,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE;QACpC,wBAAwB,EAAE,KAAK;QAC/B,SAAS,EAAE,KAAK;KACjB,CAAC,EAAE;QACF,iCAAiC;QACjC,OAAO,IAAI,CAAC;KACb;IAED,IAAI,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAEnD,IAAG,CAAC,MAAM,EAAE;QACV,qCAAqC;QACrC,OAAO,IAAI,CAAC;KACb;IAED,IAAG,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE;QAC5B,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;KAC/E;IAED,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAiB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAEvG,IAAG,gBAAgB,EAAE;QACnB,mBAAmB,GAAG,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;KACtF;IAED,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAA;AAC9C,CAAC","debug_id":"a10b6c66-188f-52d4-9055-0f3fbda8317c"}
+{"version":3,"file":"get-osk-from-kmn-file.js","sourceRoot":"","sources":["../../../src/util/get-osk-from-kmn-file.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,GAAG,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,SAA4B,EAAE,QAAgB;IAIpF,IAAI,YAAoB,CAAC;IACzB,IAAI,mBAA2B,CAAC;IAEhC,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IACtC,IAAG,CAAC,MAAM,WAAW,CAAC,IAAI,CAAC,SAAS,EAAE;QACpC,wBAAwB,EAAE,KAAK;QAC/B,SAAS,EAAE,KAAK;KACjB,CAAC,EAAE,CAAC;QACH,iCAAiC;QACjC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;IAEnD,IAAG,CAAC,MAAM,EAAE,CAAC;QACX,qCAAqC;QACrC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAG,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,CAAC;QAC7B,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;IAChF,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAiB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACtE,MAAM,gBAAgB,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAEvG,IAAG,gBAAgB,EAAE,CAAC;QACpB,mBAAmB,GAAG,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IACvF,CAAC;IAED,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,CAAA;AAC9C,CAAC"}

package/package.json

@@ -23,12 +23,12 @@
     "build/src/"
   ],
   "dependencies": {
-    "@keymanapp/common-types": "18.0.41-alpha",
-    "@keymanapp/developer-utils": "18.0.41-alpha",
-    "@keymanapp/kmc-kmn": "18.0.41-alpha"
+    "@keymanapp/common-types": "18.0.46-alpha",
+    "@keymanapp/developer-utils": "18.0.46-alpha",
+    "@keymanapp/kmc-kmn": "18.0.46-alpha"
   },
   "devDependencies": {
-    "@keymanapp/resources-gosh": "18.0.41-alpha",
+    "@keymanapp/resources-gosh": "18.0.46-alpha",
     "@types/mocha": "^5.2.7",
     "@types/node": "^20.4.1",
     "c8": "^7.12.0",
@@ -41,5 +41,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "18.0.41-alpha"
+  "version": "18.0.46-alpha"
 }