@keymanapp/kmc-ldml 18.0.41-alpha → 18.0.45-alpha

package/build/src/compiler/metadata-compiler.js

@@ -1,50 +1,47 @@
-
-!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]="2ea0d6b3-d8b2-57fe-a0d7-11c4f312b694")}catch(e){}}();
-import { KMX } from '@keymanapp/common-types';
-import KEYMAN_VERSION from "@keymanapp/keyman-version";
-var KMXFile = KMX.KMXFile;
-export class KMXPlusMetadataCompiler {
-    /**
-     * Look for metadata fields in the KMXPlus data and copy them
-     * through to the relevant KMX stores
-     * @param kmxplus const KMXPlusData
-     */
-    static addKmxMetadata(kmxplus, keyboard, options) {
-        // Order of stores is not significant by kmx spec, but kmxplus compiler will
-        // always store according to dwSystemID binary order for non-zero
-        // dwSystemID, then by dpName binary order, and finally by dpString binary
-        // order
-        // TSS_NAME = 7
-        // TSS_COMPILEDVERSION = 20
-        // TSS_KEYBOARDVERSION = 36
-        // TSS_TARGETS = 38
-        // TSS_NAME: User friendly name of keyboard
-        keyboard.stores.push({
-            dpName: '&NAME',
-            dpString: kmxplus.meta?.name?.value ?? 'unknown',
-            dwSystemID: KMXFile.TSS_NAME
-        });
-        if (options.shouldAddCompilerVersion) {
-            // TSS_COMPILEDVERSION: version of the compiler
-            keyboard.stores.push({
-                dpName: '',
-                dpString: KEYMAN_VERSION.VERSION_WITH_TAG,
-                dwSystemID: KMXFile.TSS_COMPILEDVERSION
-            });
-        }
-        // TSS_KEYBOARDVERSION: Version of the keyboard, should be semver
-        keyboard.stores.push({
-            dpName: '&KEYBOARDVERSION',
-            dpString: kmxplus.meta?.version?.value ?? '1.0',
-            dwSystemID: KMXFile.TSS_KEYBOARDVERSION
-        });
-        // TSS_TARGETS: which platforms are supported
-        keyboard.stores.push({
-            dpName: '&TARGETS',
-            dpString: 'desktop',
-            dwSystemID: KMXFile.TSS_TARGETS
-        });
-    }
-}
-//# sourceMappingURL=metadata-compiler.js.map
-//# debugId=2ea0d6b3-d8b2-57fe-a0d7-11c4f312b694
+import { KMX } from '@keymanapp/common-types';
+import KEYMAN_VERSION from "@keymanapp/keyman-version";
+var KMXFile = KMX.KMXFile;
+export class KMXPlusMetadataCompiler {
+    /**
+     * Look for metadata fields in the KMXPlus data and copy them
+     * through to the relevant KMX stores
+     * @param kmxplus const KMXPlusData
+     */
+    static addKmxMetadata(kmxplus, keyboard, options) {
+        // Order of stores is not significant by kmx spec, but kmxplus compiler will
+        // always store according to dwSystemID binary order for non-zero
+        // dwSystemID, then by dpName binary order, and finally by dpString binary
+        // order
+        // TSS_NAME = 7
+        // TSS_COMPILEDVERSION = 20
+        // TSS_KEYBOARDVERSION = 36
+        // TSS_TARGETS = 38
+        // TSS_NAME: User friendly name of keyboard
+        keyboard.stores.push({
+            dpName: '&NAME',
+            dpString: kmxplus.meta?.name?.value ?? 'unknown', // Empty name should not happen, so ok to use 'unknown' here
+            dwSystemID: KMXFile.TSS_NAME
+        });
+        if (options.shouldAddCompilerVersion) {
+            // TSS_COMPILEDVERSION: version of the compiler
+            keyboard.stores.push({
+                dpName: '',
+                dpString: KEYMAN_VERSION.VERSION_WITH_TAG,
+                dwSystemID: KMXFile.TSS_COMPILEDVERSION
+            });
+        }
+        // TSS_KEYBOARDVERSION: Version of the keyboard, should be semver
+        keyboard.stores.push({
+            dpName: '&KEYBOARDVERSION',
+            dpString: kmxplus.meta?.version?.value ?? '1.0', // 1.0 is inferred version
+            dwSystemID: KMXFile.TSS_KEYBOARDVERSION
+        });
+        // TSS_TARGETS: which platforms are supported
+        keyboard.stores.push({
+            dpName: '&TARGETS',
+            dpString: 'desktop', // TODO-LDML: support touch layouts in #7238
+            dwSystemID: KMXFile.TSS_TARGETS
+        });
+    }
+}
+//# sourceMappingURL=metadata-compiler.js.map

package/build/src/compiler/metadata-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"metadata-compiler.js","sources":["../../../src/compiler/metadata-compiler.ts"],"sourceRoot":"","names":[],"mappings":";;AAAA,OAAO,EAAE,GAAG,EAAW,MAAM,yBAAyB,CAAC;AAEvD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAGvD,IAAO,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;AAG7B,MAAM,OAAO,uBAAuB;IAClC;;;;OAIG;IACI,MAAM,CAAC,cAAc,CAAC,OAAoB,EAAE,QAAkB,EAAE,OAA4B;QACjG,4EAA4E;QAC5E,iEAAiE;QACjE,0EAA0E;QAC1E,QAAQ;QAER,eAAe;QACf,2BAA2B;QAC3B,2BAA2B;QAC3B,mBAAmB;QAEnB,2CAA2C;QAC3C,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,OAAO;YACf,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,IAAI,SAAS;YAChD,UAAU,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC,CAAC;QAEH,IAAG,OAAO,CAAC,wBAAwB,EAAE;YACnC,+CAA+C;YAC/C,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,EAAE;gBACV,QAAQ,EAAE,cAAc,CAAC,gBAAgB;gBACzC,UAAU,EAAE,OAAO,CAAC,mBAAmB;aACxC,CAAC,CAAC;SACJ;QAED,iEAAiE;QACjE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,kBAAkB;YAC1B,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK;YAC/C,UAAU,EAAE,OAAO,CAAC,mBAAmB;SACxC,CAAC,CAAC;QAEH,6CAA6C;QAC7C,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,SAAS;YACnB,UAAU,EAAE,OAAO,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAEF","debug_id":"2ea0d6b3-d8b2-57fe-a0d7-11c4f312b694"}
+{"version":3,"file":"metadata-compiler.js","sourceRoot":"","sources":["../../../src/compiler/metadata-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAW,MAAM,yBAAyB,CAAC;AAEvD,OAAO,cAAc,MAAM,2BAA2B,CAAC;AAGvD,IAAO,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;AAG7B,MAAM,OAAO,uBAAuB;IAClC;;;;OAIG;IACI,MAAM,CAAC,cAAc,CAAC,OAAoB,EAAE,QAAkB,EAAE,OAA4B;QACjG,4EAA4E;QAC5E,iEAAiE;QACjE,0EAA0E;QAC1E,QAAQ;QAER,eAAe;QACf,2BAA2B;QAC3B,2BAA2B;QAC3B,mBAAmB;QAEnB,2CAA2C;QAC3C,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,OAAO;YACf,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,IAAI,SAAS,EAAG,4DAA4D;YAC/G,UAAU,EAAE,OAAO,CAAC,QAAQ;SAC7B,CAAC,CAAC;QAEH,IAAG,OAAO,CAAC,wBAAwB,EAAE,CAAC;YACpC,+CAA+C;YAC/C,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;gBACnB,MAAM,EAAE,EAAE;gBACV,QAAQ,EAAE,cAAc,CAAC,gBAAgB;gBACzC,UAAU,EAAE,OAAO,CAAC,mBAAmB;aACxC,CAAC,CAAC;QACL,CAAC;QAED,iEAAiE;QACjE,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,kBAAkB;YAC1B,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,IAAI,KAAK,EAAG,0BAA0B;YAC5E,UAAU,EAAE,OAAO,CAAC,mBAAmB;SACxC,CAAC,CAAC;QAEH,6CAA6C;QAC7C,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC;YACnB,MAAM,EAAE,UAAU;YAClB,QAAQ,EAAE,SAAS,EAAK,4CAA4C;YACpE,UAAU,EAAE,OAAO,CAAC,WAAW;SAChC,CAAC,CAAC;IACL,CAAC;CAEF"}

package/build/src/compiler/section-compiler.d.ts

@@ -1,36 +1,36 @@
-import { LDMLKeyboard, KMXPlus, CompilerCallbacks } from "@keymanapp/common-types";
-import { SectionIdent } from '@keymanapp/ldml-keyboard-constants';
-/** newable interface to SectionCompiler c'tor */
-export type SectionCompilerNew = new (source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks) => SectionCompiler;
-export declare abstract class SectionCompiler {
-    protected readonly keyboard3: LDMLKeyboard.LKKeyboard;
-    protected readonly callbacks: CompilerCallbacks;
-    constructor(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
-    abstract get id(): SectionIdent;
-    /**
-     * This is called before compile.
-     * @returns false if this compiler failed to validate.
-     */
-    validate(): boolean;
-    /**
-     * Perform the compilation for this section, returning the correct Section subclass
-     * object.
-     *
-     * @param sections any declared dependency sections per dependencies()
-     */
-    abstract compile(sections: KMXPlus.DependencySections): KMXPlus.Section;
-    /**
-     * This is called after all other compile phases have completed,
-     * when being called by validate(), and provides an
-     * opportunity for late error reporting, for example for invalid strings.
-     * @param section the compiled section, if any.
-     * @returns false if validate fails
-     */
-    postValidate(section?: KMXPlus.Section): boolean;
-    /**
-     * Get the dependencies for this compiler.
-     * @returns set of dependent sections
-     */
-    get dependencies(): Set<SectionIdent>;
-}
+import { LDMLKeyboard, KMXPlus, CompilerCallbacks } from "@keymanapp/common-types";
+import { SectionIdent } from '@keymanapp/ldml-keyboard-constants';
+/** newable interface to SectionCompiler c'tor */
+export type SectionCompilerNew = new (source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks) => SectionCompiler;
+export declare abstract class SectionCompiler {
+    protected readonly keyboard3: LDMLKeyboard.LKKeyboard;
+    protected readonly callbacks: CompilerCallbacks;
+    constructor(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
+    abstract get id(): SectionIdent;
+    /**
+     * This is called before compile.
+     * @returns false if this compiler failed to validate.
+     */
+    validate(): boolean;
+    /**
+     * Perform the compilation for this section, returning the correct Section subclass
+     * object.
+     *
+     * @param sections any declared dependency sections per dependencies()
+     */
+    abstract compile(sections: KMXPlus.DependencySections): KMXPlus.Section;
+    /**
+     * This is called after all other compile phases have completed,
+     * when being called by validate(), and provides an
+     * opportunity for late error reporting, for example for invalid strings.
+     * @param section the compiled section, if any.
+     * @returns false if validate fails
+     */
+    postValidate(section?: KMXPlus.Section): boolean;
+    /**
+     * Get the dependencies for this compiler.
+     * @returns set of dependent sections
+     */
+    get dependencies(): Set<SectionIdent>;
+}
 //# sourceMappingURL=section-compiler.d.ts.map

package/build/src/compiler/section-compiler.js

@@ -1,43 +1,40 @@
-
-!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]="be26e017-8a6f-5472-899a-65c563654944")}catch(e){}}();
-import { constants } from '@keymanapp/ldml-keyboard-constants';
-export class SectionCompiler {
-    keyboard3;
-    callbacks;
-    constructor(source, callbacks) {
-        this.keyboard3 = source.keyboard3;
-        this.callbacks = callbacks;
-    }
-    /**
-     * This is called before compile.
-     * @returns false if this compiler failed to validate.
-     */
-    validate() {
-        return true;
-    }
-    /**
-     * This is called after all other compile phases have completed,
-     * when being called by validate(), and provides an
-     * opportunity for late error reporting, for example for invalid strings.
-     * @param section the compiled section, if any.
-     * @returns false if validate fails
-     */
-    postValidate(section) {
-        return true;
-    }
-    /**
-     * Get the dependencies for this compiler.
-     * @returns set of dependent sections
-     */
-    get dependencies() {
-        const defaults = new Set([
-            constants.section.strs,
-            constants.section.list,
-            constants.section.elem,
-            constants.section.vars,
-        ]);
-        return defaults;
-    }
-}
-//# sourceMappingURL=section-compiler.js.map
-//# debugId=be26e017-8a6f-5472-899a-65c563654944
+import { constants } from '@keymanapp/ldml-keyboard-constants';
+export class SectionCompiler {
+    keyboard3;
+    callbacks;
+    constructor(source, callbacks) {
+        this.keyboard3 = source.keyboard3;
+        this.callbacks = callbacks;
+    }
+    /**
+     * This is called before compile.
+     * @returns false if this compiler failed to validate.
+     */
+    validate() {
+        return true;
+    }
+    /**
+     * This is called after all other compile phases have completed,
+     * when being called by validate(), and provides an
+     * opportunity for late error reporting, for example for invalid strings.
+     * @param section the compiled section, if any.
+     * @returns false if validate fails
+     */
+    postValidate(section) {
+        return true;
+    }
+    /**
+     * Get the dependencies for this compiler.
+     * @returns set of dependent sections
+     */
+    get dependencies() {
+        const defaults = new Set([
+            constants.section.strs,
+            constants.section.list,
+            constants.section.elem,
+            constants.section.vars,
+        ]);
+        return defaults;
+    }
+}
+//# sourceMappingURL=section-compiler.js.map

package/build/src/compiler/section-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"section-compiler.js","sources":["../../../src/compiler/section-compiler.ts"],"sourceRoot":"","names":[],"mappings":";;AACA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAI7E,MAAM,OAAgB,eAAe;IAChB,SAAS,CAA0B;IACnC,SAAS,CAAoB;IAEhD,YAAY,MAA8C,EAAE,SAA4B;QACtF,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAID;;;OAGG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAUD;;;;;;OAMG;IACI,YAAY,CAAC,OAAyB;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB;YACvC,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF","debug_id":"be26e017-8a6f-5472-899a-65c563654944"}
+{"version":3,"file":"section-compiler.js","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAI7E,MAAM,OAAgB,eAAe;IAChB,SAAS,CAA0B;IACnC,SAAS,CAAoB;IAEhD,YAAY,MAA8C,EAAE,SAA4B;QACtF,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;QAClC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAID;;;OAGG;IACI,QAAQ;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAUD;;;;;;OAMG;IACI,YAAY,CAAC,OAAyB;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;OAGG;IACH,IAAW,YAAY;QACrB,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAiB;YACvC,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}

package/build/src/compiler/substitution-tracker.d.ts

@@ -1,48 +1,48 @@
-/**
- * Verb for SubstitutionTracker.add()
- */
-export declare enum SubstitutionUse {
-    /** outputs this marker into context (e.g. transform to= or key to=) */
-    emit = 0,
-    /** consumes this marker out of the context (e.g. transform from=) */
-    consume = 1,
-    /** matches the marker, but doesn't consume (e.g. display to=) */
-    match = 2,
-    /** variable definition: might consume, emit, or match. */
-    variable = 3
-}
-type SubstitutionSet = Set<string>;
-/** Tracks usage of markers */
-export declare class SubstitutionTracker {
-    /** markers that were emitted */
-    emitted: SubstitutionSet;
-    /** markers that were consumed and removed from the context */
-    consumed: SubstitutionSet;
-    /** markers that were matched, but not necessarily consumed */
-    matched: SubstitutionSet;
-    /** all markers */
-    all: SubstitutionSet;
-    constructor();
-    /**
-     *
-     * @param verb what kind of use we are adding
-     * @param markers list of substitutions to add
-     */
-    add(verb: SubstitutionUse, markers: string[]): void;
-}
-/** rollup of several substitution types */
-export declare class Substitutions {
-    addSetAndStringSubtitution(verb: SubstitutionUse, str?: string): void;
-    /** add a string that can have string var substitutions or markers */
-    addStringAndMarkerSubstitution(verb: SubstitutionUse, str?: string): void;
-    addStringSubstitution(verb: SubstitutionUse, str?: string): void;
-    /** add a string that's just markers */
-    addMarkers(verb: SubstitutionUse, str?: string): void;
-    markers: SubstitutionTracker;
-    set: SubstitutionTracker;
-    string: SubstitutionTracker;
-    uset: SubstitutionTracker;
-    constructor();
-}
-export {};
+/**
+ * Verb for SubstitutionTracker.add()
+ */
+export declare enum SubstitutionUse {
+    /** outputs this marker into context (e.g. transform to= or key to=) */
+    emit = 0,
+    /** consumes this marker out of the context (e.g. transform from=) */
+    consume = 1,
+    /** matches the marker, but doesn't consume (e.g. display to=) */
+    match = 2,
+    /** variable definition: might consume, emit, or match. */
+    variable = 3
+}
+type SubstitutionSet = Set<string>;
+/** Tracks usage of markers */
+export declare class SubstitutionTracker {
+    /** markers that were emitted */
+    emitted: SubstitutionSet;
+    /** markers that were consumed and removed from the context */
+    consumed: SubstitutionSet;
+    /** markers that were matched, but not necessarily consumed */
+    matched: SubstitutionSet;
+    /** all markers */
+    all: SubstitutionSet;
+    constructor();
+    /**
+     *
+     * @param verb what kind of use we are adding
+     * @param markers list of substitutions to add
+     */
+    add(verb: SubstitutionUse, markers: string[]): void;
+}
+/** rollup of several substitution types */
+export declare class Substitutions {
+    addSetAndStringSubtitution(verb: SubstitutionUse, str?: string): void;
+    /** add a string that can have string var substitutions or markers */
+    addStringAndMarkerSubstitution(verb: SubstitutionUse, str?: string): void;
+    addStringSubstitution(verb: SubstitutionUse, str?: string): void;
+    /** add a string that's just markers */
+    addMarkers(verb: SubstitutionUse, str?: string): void;
+    markers: SubstitutionTracker;
+    set: SubstitutionTracker;
+    string: SubstitutionTracker;
+    uset: SubstitutionTracker;
+    constructor();
+}
+export {};
 //# sourceMappingURL=substitution-tracker.d.ts.map

package/build/src/compiler/substitution-tracker.js

@@ -1,106 +1,103 @@
-
-!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]="1fdfe3f8-d593-5e7f-9858-74311b2316dd")}catch(e){}}();
-import { MarkerParser, VariableParser } from "@keymanapp/common-types";
-/**
- * Verb for SubstitutionTracker.add()
- */
-export var SubstitutionUse;
-(function (SubstitutionUse) {
-    /** outputs this marker into context (e.g. transform to= or key to=) */
-    SubstitutionUse[SubstitutionUse["emit"] = 0] = "emit";
-    /** consumes this marker out of the context (e.g. transform from=) */
-    SubstitutionUse[SubstitutionUse["consume"] = 1] = "consume";
-    /** matches the marker, but doesn't consume (e.g. display to=) */
-    SubstitutionUse[SubstitutionUse["match"] = 2] = "match";
-    /** variable definition: might consume, emit, or match. */
-    SubstitutionUse[SubstitutionUse["variable"] = 3] = "variable";
-})(SubstitutionUse || (SubstitutionUse = {}));
-/** Tracks usage of markers */
-export class SubstitutionTracker {
-    /** markers that were emitted */
-    emitted;
-    /** markers that were consumed and removed from the context */
-    consumed;
-    /** markers that were matched, but not necessarily consumed */
-    matched;
-    /** all markers */
-    all;
-    constructor() {
-        this.emitted = new Set();
-        this.consumed = new Set();
-        this.matched = new Set();
-        this.all = new Set();
-    }
-    /**
-     *
-     * @param verb what kind of use we are adding
-     * @param markers list of substitutions to add
-     */
-    add(verb, markers) {
-        if (!markers.length) {
-            return; // skip if empty
-        }
-        if (verb == SubstitutionUse.emit) {
-            markers.forEach((m) => {
-                this.emitted.add(m);
-                this.all.add(m);
-            });
-        }
-        else if (verb == SubstitutionUse.consume) {
-            markers.forEach((m) => {
-                this.consumed.add(m);
-                this.all.add(m);
-            });
-        }
-        else if (verb == SubstitutionUse.match) {
-            markers.forEach((m) => {
-                this.matched.add(m);
-                this.all.add(m);
-            });
-        }
-        else if (verb == SubstitutionUse.variable) {
-            markers.forEach((m) => {
-                // we don't know, so add it to all three
-                this.matched.add(m);
-                this.emitted.add(m);
-                this.consumed.add(m);
-                this.all.add(m);
-            });
-            /* c8 skip next 3 */
-        }
-        else {
-            throw Error(`Internal error: unsupported verb ${verb} for match`);
-        }
-    }
-}
-/** rollup of several substitution types */
-export class Substitutions {
-    addSetAndStringSubtitution(verb, str) {
-        this.set.add(verb, VariableParser.allSetReferences(str));
-        this.addStringAndMarkerSubstitution(verb, str);
-    }
-    /** add a string that can have string var substitutions or markers */
-    addStringAndMarkerSubstitution(verb, str) {
-        this.addMarkers(verb, str);
-        this.addStringSubstitution(verb, str);
-    }
-    addStringSubstitution(verb, str) {
-        this.string.add(verb, VariableParser.allStringReferences(str));
-    }
-    /** add a string that's just markers */
-    addMarkers(verb, str) {
-        this.markers.add(verb, MarkerParser.allReferences(str));
-    }
-    markers;
-    set;
-    string;
-    uset;
-    constructor() {
-        this.markers = new SubstitutionTracker();
-        this.set = new SubstitutionTracker();
-        this.string = new SubstitutionTracker();
-        this.uset = new SubstitutionTracker();
-    }
-}
-//# sourceMappingURL=substitution-tracker.js.map
-//# debugId=1fdfe3f8-d593-5e7f-9858-74311b2316dd
+import { MarkerParser, VariableParser } from "@keymanapp/common-types";
+/**
+ * Verb for SubstitutionTracker.add()
+ */
+export var SubstitutionUse;
+(function (SubstitutionUse) {
+    /** outputs this marker into context (e.g. transform to= or key to=) */
+    SubstitutionUse[SubstitutionUse["emit"] = 0] = "emit";
+    /** consumes this marker out of the context (e.g. transform from=) */
+    SubstitutionUse[SubstitutionUse["consume"] = 1] = "consume";
+    /** matches the marker, but doesn't consume (e.g. display to=) */
+    SubstitutionUse[SubstitutionUse["match"] = 2] = "match";
+    /** variable definition: might consume, emit, or match. */
+    SubstitutionUse[SubstitutionUse["variable"] = 3] = "variable";
+})(SubstitutionUse || (SubstitutionUse = {}));
+/** Tracks usage of markers */
+export class SubstitutionTracker {
+    /** markers that were emitted */
+    emitted;
+    /** markers that were consumed and removed from the context */
+    consumed;
+    /** markers that were matched, but not necessarily consumed */
+    matched;
+    /** all markers */
+    all;
+    constructor() {
+        this.emitted = new Set();
+        this.consumed = new Set();
+        this.matched = new Set();
+        this.all = new Set();
+    }
+    /**
+     *
+     * @param verb what kind of use we are adding
+     * @param markers list of substitutions to add
+     */
+    add(verb, markers) {
+        if (!markers.length) {
+            return; // skip if empty
+        }
+        if (verb == SubstitutionUse.emit) {
+            markers.forEach((m) => {
+                this.emitted.add(m);
+                this.all.add(m);
+            });
+        }
+        else if (verb == SubstitutionUse.consume) {
+            markers.forEach((m) => {
+                this.consumed.add(m);
+                this.all.add(m);
+            });
+        }
+        else if (verb == SubstitutionUse.match) {
+            markers.forEach((m) => {
+                this.matched.add(m);
+                this.all.add(m);
+            });
+        }
+        else if (verb == SubstitutionUse.variable) {
+            markers.forEach((m) => {
+                // we don't know, so add it to all three
+                this.matched.add(m);
+                this.emitted.add(m);
+                this.consumed.add(m);
+                this.all.add(m);
+            });
+            /* c8 skip next 3 */
+        }
+        else {
+            throw Error(`Internal error: unsupported verb ${verb} for match`);
+        }
+    }
+}
+/** rollup of several substitution types */
+export class Substitutions {
+    addSetAndStringSubtitution(verb, str) {
+        this.set.add(verb, VariableParser.allSetReferences(str));
+        this.addStringAndMarkerSubstitution(verb, str);
+    }
+    /** add a string that can have string var substitutions or markers */
+    addStringAndMarkerSubstitution(verb, str) {
+        this.addMarkers(verb, str);
+        this.addStringSubstitution(verb, str);
+    }
+    addStringSubstitution(verb, str) {
+        this.string.add(verb, VariableParser.allStringReferences(str));
+    }
+    /** add a string that's just markers */
+    addMarkers(verb, str) {
+        this.markers.add(verb, MarkerParser.allReferences(str));
+    }
+    markers;
+    set;
+    string;
+    uset;
+    constructor() {
+        this.markers = new SubstitutionTracker();
+        this.set = new SubstitutionTracker();
+        this.string = new SubstitutionTracker();
+        this.uset = new SubstitutionTracker();
+    }
+}
+//# sourceMappingURL=substitution-tracker.js.map

package/build/src/compiler/substitution-tracker.js.map

@@ -1 +1 @@
-{"version":3,"file":"substitution-tracker.js","sources":["../../../src/compiler/substitution-tracker.ts"],"sourceRoot":"","names":[],"mappings":"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","debug_id":"1fdfe3f8-d593-5e7f-9858-74311b2316dd"}
+{"version":3,"file":"substitution-tracker.js","sourceRoot":"","sources":["../../../src/compiler/substitution-tracker.ts"],"names":[],"mappings":"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"}

package/build/src/compiler/touch-layout-compiler.d.ts

@@ -1,8 +1,8 @@
-import { TouchLayout, LDMLKeyboard } from "@keymanapp/common-types";
-export declare class TouchLayoutCompiler {
-    compileToJavascript(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile): TouchLayout.TouchLayoutFile;
-    private compileHardwareLayer;
-    private translateLayerIdToTouchLayoutLayerId;
-    private translateKeyIdentifierToTouch;
-}
+import { TouchLayout, LDMLKeyboard } from "@keymanapp/common-types";
+export declare class TouchLayoutCompiler {
+    compileToJavascript(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile): TouchLayout.TouchLayoutFile;
+    private compileHardwareLayer;
+    private translateLayerIdToTouchLayoutLayerId;
+    private translateKeyIdentifierToTouch;
+}
 //# sourceMappingURL=touch-layout-compiler.d.ts.map