@keymanapp/kmc-ldml 18.0.8-alpha → 18.0.10-alpha

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

@@ -0,0 +1 @@
+{"debug_id":"7aac6235-1791-5d7b-b3ba-a1eebffc6344","file":"substitution-tracker.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/substitution-tracker.ts"],"version":3}

package/build/src/compiler/tran.d.ts

@@ -5,10 +5,10 @@ import Bksp = KMXPlus.Bksp;
 import DependencySections = KMXPlus.DependencySections;
 import Tran = KMXPlus.Tran;
 import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
-import { MarkerTracker } from "./marker-tracker.js";
+import { Substitutions } from "./substitution-tracker.js";
 type TransformCompilerType = 'simple' | 'backspace';
 export declare abstract class TransformCompiler<T extends TransformCompilerType, TranBase extends Tran> extends SectionCompiler {
-    static validateMarkers(keyboard: LDMLKeyboard.LKKeyboard, mt: MarkerTracker): boolean;
+    static validateSubstitutions(keyboard: LDMLKeyboard.LKKeyboard, st: Substitutions): boolean;
     protected type: T;
     constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
     validate(): boolean;

package/build/src/compiler/tran.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tran.d.ts","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsC,MAAM,yBAAyB,CAAC;AACvH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAO1E,OAAO,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAE/D,KAAK,qBAAqB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpD,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,CAAE,SAAQ,eAAe;IAErH,MAAM,CAAC,eAAe,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAG,OAAO;IAUtF,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEN,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAyC1B,uCAAuC;IACvC,SAAS,CAAC,OAAO,IAAI,QAAQ;IAI7B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,gBAAgB;IAwDxB,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,cAAc;IAiBf,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ;IAStD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAW3C;IAED;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAgBpB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;CAuFpB;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAgB;gBACpE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;CACF;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAgB;gBACvE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;CACF"}
+{"version":3,"file":"tran.d.ts","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAsC,MAAM,yBAAyB,CAAC;AACvH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAO1E,OAAO,EAAE,aAAa,EAAmB,MAAM,2BAA2B,CAAC;AAE3E,KAAK,qBAAqB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpD,8BAAsB,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,CAAE,SAAQ,eAAe;IAErH,MAAM,CAAC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAE,aAAa,GAAG,OAAO;IAwB3F,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEN,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAyC1B,uCAAuC;IACvC,SAAS,CAAC,OAAO,IAAI,QAAQ;IAI7B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,qBAAqB;IAe7B,OAAO,CAAC,yBAAyB;IAUjC,OAAO,CAAC,gBAAgB;IAwDxB,OAAO,CAAC,uBAAuB;IAU/B,OAAO,CAAC,cAAc;IAiBf,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ;IAStD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAW3C;IAED;;;;;OAKG;IACH,OAAO,CAAC,YAAY;IAgBpB;;;;;OAKG;IACH,OAAO,CAAC,WAAW;CAuFpB;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,IAAI,CAAgB;gBACpE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;CACF;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,WAAW,EAAE,IAAI,CAAgB;gBACvE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,iBAEZ;CACF"}

package/build/src/compiler/tran.js

@@ -1,4 +1,4 @@
-!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]="58634c00-f582-5845-b99d-95606914d65b")}catch(e){}}();
+!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]="46f9c4ca-55de-57da-8da0-b5a03e066ae1")}catch(e){}}();
 import { constants } from "@keymanapp/ldml-keyboard-constants";
 import { KMXPlus, VariableParser, MarkerParser, util } from '@keymanapp/common-types';
 import { SectionCompiler } from "./section-compiler.js";
@@ -8,13 +8,26 @@ var TranReorder = KMXPlus.TranReorder;
 var TranTransform = KMXPlus.TranTransform;
 import { verifyValidAndUnique } from "../util/util.js";
 import { CompilerMessages } from "./messages.js";
-import { MarkerUse } from "./marker-tracker.js";
+import { SubstitutionUse } from "./substitution-tracker.js";
 export class TransformCompiler extends SectionCompiler {
-    static validateMarkers(keyboard, mt) {
+    static validateSubstitutions(keyboard, st) {
         keyboard?.transforms?.forEach(transforms => transforms.transformGroup.forEach(transformGroup => {
             transformGroup.transform?.forEach(({ to, from }) => {
-                mt.add(MarkerUse.emit, MarkerParser.allReferences(to));
-                mt.add(MarkerUse.consume, MarkerParser.allReferences(from));
+                st.addSetAndStringSubtitution(SubstitutionUse.consume, from);
+                st.addSetAndStringSubtitution(SubstitutionUse.emit, to);
+                const mapFrom = VariableParser.CAPTURE_SET_REFERENCE.exec(from);
+                const mapTo = VariableParser.MAPPED_SET_REFERENCE.exec(to || '');
+                if (mapFrom) {
+                    // add the 'from' as a match
+                    st.set.add(SubstitutionUse.consume, [mapFrom[1]]);
+                }
+                if (mapTo) {
+                    // add the 'from' as a match
+                    st.set.add(SubstitutionUse.emit, [mapTo[1]]);
+                }
+            });
+            transformGroup.reorder?.forEach(({ before }) => {
+                st.addStringSubstitution(SubstitutionUse.consume, before);
             });
         }));
         return true;
@@ -117,12 +130,12 @@ export class TransformCompiler extends SectionCompiler {
         cookedFrom = sections.vars.substituteSetRegex(cookedFrom, sections);
         // add in markers. idempotent if no markers.
         cookedFrom = sections.vars.substituteMarkerString(cookedFrom, true);
-        // don't unescape literals here, because we are going to pass them through into the regex
-        cookedFrom = util.unescapeStringToRegex(cookedFrom);
         // check for incorrect \uXXXX escapes
         cookedFrom = this.checkEscapes(cookedFrom); // check for \uXXXX escapes before normalizing
         if (cookedFrom === null)
             return null; // error
+        // unescape from \u{} form to plain, or in some cases \uXXXX / \UXXXXXXXX for core
+        cookedFrom = util.unescapeStringToRegex(cookedFrom);
         // check for denormalized ranges
         cookedFrom = this.checkRanges(cookedFrom); // check before normalizing
         if (!sections?.meta?.normalizationDisabled) {
@@ -337,5 +350,5 @@ export class BkspCompiler extends TransformCompiler {
     }
 }
 ;
-//# debugId=58634c00-f582-5845-b99d-95606914d65b
+//# debugId=46f9c4ca-55de-57da-8da0-b5a03e066ae1
 //# sourceMappingURL=tran.js.map

package/build/src/compiler/tran.js.map

@@ -1 +1 @@
-{"debug_id":"58634c00-f582-5845-b99d-95606914d65b","file":"tran.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"version":3}
+{"debug_id":"46f9c4ca-55de-57da-8da0-b5a03e066ae1","file":"tran.js","mappings":";AAAA,OAAO,EAAE,SAAS,EAAgB,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAmC,cAAc,EAAE,YAAY,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AACvH,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,IAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAE3B,IAAO,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;AACzC,IAAO,aAAa,GAAG,OAAO,CAAC,aAAa,CAAC;AAM7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAiB,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAI3E,MAAM,OAAgB,iBAA0E,SAAQ,eAAe;IAErH,MAAM,CAAC,qBAAqB,CAAC,QAAiC,EAAE,EAAiB;QAC/E,QAAQ,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,EAAE,CACzC,UAAU,CAAC,cAAc,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE;YACjD,cAAc,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE;gBACjD,EAAE,CAAC,0BAA0B,CAAC,eAAe,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;gBAC7D,EAAE,CAAC,0BAA0B,CAAC,eAAe,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACxD,MAAM,OAAO,GAAG,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAChE,MAAM,KAAK,GAAG,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;gBACjE,IAAI,OAAO,EAAE;oBACX,4BAA4B;oBAC5B,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBACnD;gBACD,IAAI,KAAK,EAAE;oBACT,4BAA4B;oBAC5B,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC9C;YACH,CAAC,CAAC,CAAC;YACH,cAAc,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;gBAC7C,EAAE,CAAC,qBAAqB,CAAC,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;YAC5D,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC,CAAC;QACN,OAAO,IAAI,CAAC;IACd,CAAC;IAES,IAAI,CAAI;IAElB,YAAY,MAAiC,EAAE,SAA4B;QACzE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IAC3B,CAAC;IAEM,QAAQ;QACb,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAExE,IAAI,KAAK,GAAG,IAAI,CAAC;QACjB,MAAM,UAAU,GAAG,IAAI,EAAE,SAAS,EAAE,UAAU,CAAC;QAC/C,IAAI,UAAU,EAAE;YACd,MAAM,KAAK,GAAc,UAAU,CAAC,GAAG,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,oBAAoB,CAAC,KAAK,EAC7B,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,gBAAgB,CAAC,6BAA6B,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EACjF,IAAI,GAAG,CAAC,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC,EAChC,KAAK,CAAC,EAAE,CAAC,aAAa,CAAC,gBAAgB,CAAC,2BAA2B,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE;gBAClF,KAAK,GAAG,KAAK,CAAC;aACf;YAED,yBAAyB;YACzB,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,IAAI,KAAK,GAAG,KAAK,CAAC;YAClB,UAAU,CAAC,OAAO,CAAC,CAAC,EAAC,cAAc,EAAC,EAAE,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,cAAc,EAAE,EAAE;gBACjF,IAAI,cAAc,CAAC,OAAO,EAAE,MAAM,IAAI,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE;oBACtE,KAAK,GAAG,IAAI,CAAC;iBACd;gBACD,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE;oBACxE,KAAK,GAAG,IAAI,CAAC;iBACd;YACH,CAAC,CAAC,CAAC,CAAC;YACJ,IAAI,KAAK,EAAE;gBACT,KAAK,GAAG,KAAK,CAAC;gBACd,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC,mBAAmB;aACjF;YACD,IAAI,KAAK,EAAE;gBACT,KAAK,GAAG,KAAK,CAAC;gBACd,aAAa,CAAC,gBAAgB,CAAC,yBAAyB,EAAE,CAAC,CAAC,CAAC,mBAAmB;aACjF;YAED,0GAA0G;YAC1G,wHAAwH;SACzH;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,sBAAsB;IACtB,uCAAuC;IAC7B,OAAO;QACf,MAAM,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC3D,CAAC;IAEO,iBAAiB,CAAC,QAA4B,EAAE,UAAwB;QAC9E,IAAI,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;QAE5B,IAAI,UAAU,EAAE,cAAc,EAAE;YAC9B,KAAK,IAAI,cAAc,IAAI,UAAU,CAAC,cAAc,EAAE;gBACpD,MAAM,EAAE,GAAG,IAAI,CAAC,qBAAqB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;gBAChE,IAAI,CAAC,EAAE;oBAAE,OAAO,IAAI,CAAC,CAAC,OAAO;gBAC7B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;aACxB;SACF;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,qBAAqB,CAAC,QAA4B,EAAE,cAAgC;QAC1F,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,IAAI,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE;YACpE,sBAAsB;YACtB,sCAAsC;YACtC,MAAM,KAAK,CAAC,yEAAyE,CAAC,CAAC;SACxF;aAAM,IAAI,cAAc,CAAC,OAAO,CAAC,MAAM,EAAE;YACxC,OAAO,IAAI,CAAC,uBAAuB,CAAC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,CAAC;SACvE;aAAM,IAAI,cAAc,CAAC,SAAS,CAAC,MAAM,EAAE;YAC1C,OAAO,IAAI,CAAC,yBAAyB,CAAC,QAAQ,EAAE,cAAc,CAAC,SAAS,CAAC,CAAC;SAC3E;aAAM;YACL,oBAAoB;YACpB,MAAM,KAAK,CAAC,4EAA4E,CAAC,CAAC;SAC3F;IACH,CAAC;IAEO,yBAAyB,CAAC,QAA4B,EAAE,UAAyB;QACvF,MAAM,MAAM,GAAe;YACzB,IAAI,EAAE,SAAS,CAAC,yBAAyB;YACzC,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;YACnF,QAAQ,EAAE,EAAE;SACb,CAAA;QACD,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC;QAClD,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gBAAgB,CAAC,QAA4B,EAAE,SAAsB;QAC3E,IAAI,MAAM,GAAG,IAAI,aAAa,EAAE,CAAC;QACjC,IAAI,UAAU,GAAG,SAAS,CAAC,IAAI,CAAC;QAEhC,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACnE,MAAM,OAAO,GAAG,cAAc,CAAC,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACtE,MAAM,KAAK,GAAG,cAAc,CAAC,oBAAoB,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QAC3E,IAAI,OAAO,IAAI,KAAK,EAAE,EAAE,yBAAyB;YAC/C,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW;YACnE,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW;SAChE;aAAM;YACL,MAAM,CAAC,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY;YAC5D,MAAM,CAAC,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY;SAC3D;QACD,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QAEpE,4CAA4C;QAC5C,UAAU,GAAG,QAAQ,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;QAEpE,qCAAqC;QACrC,UAAU,GAAG,IAAI,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,8CAA8C;QAC1F,IAAI,UAAU,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC,CAAC,QAAQ;QAE9C,kFAAkF;QAClF,UAAU,GAAG,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;QAEpD,gCAAgC;QAChC,UAAU,GAAG,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC,CAAC,2BAA2B;QAEtE,IAAI,CAAC,QAAQ,EAAE,IAAI,EAAE,qBAAqB,EAAE;YAC1C,YAAY;YACZ,UAAU,GAAG,YAAY,CAAC,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;SACzD;QAED,+CAA+C;QAC/C,IAAI;YACF,IAAI,MAAM,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;SAC9B;QAAC,OAAO,CAAC,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,8BAA8B,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;YAC5H,OAAO,IAAI,CAAC,CAAC,QAAQ;SACtB;QAED,mEAAmE;QACnE,MAAM,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE;YAClD,QAAQ,EAAE,KAAK;SAChB,EAAE,QAAQ,CAAC,CAAC;QACb,kCAAkC;QAClC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE,EAAE;YAClD,eAAe,EAAE,IAAI;YACrB,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;YACd,GAAG,EAAE,IAAI;SACV,EAAE,QAAQ,CAAC,CAAC;QACb,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,uBAAuB,CAAC,QAA4B,EAAE,QAAqB;QACjF,MAAM,MAAM,GAAe;YACzB,IAAI,EAAE,SAAS,CAAC,uBAAuB;YACvC,UAAU,EAAE,EAAE;YACd,QAAQ,EAAE,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;SAC1E,CAAA;QACD,IAAI,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,OAAO,IAAI,CAAC,CAAC,+DAA+D;QAChH,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,cAAc,CAAC,QAA4B,EAAE,OAAkB;QACrE,IAAI,MAAM,GAAG,IAAI,WAAW,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,IAAI,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,IAAI,EAAE;YAC5D,OAAO,IAAI,CAAC,CAAC,WAAW;SACzB;QACD,IAAI,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE;YAChE,OAAO,IAAI,CAAC,CAAC,WAAW;SACzB;QACD,MAAM,CAAC,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;QACnJ,MAAM,CAAC,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;QAC3E,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YACtC,OAAO,IAAI,CAAC,CAAC,mBAAmB;SACjC;aAAM;YACL,OAAO,MAAM,CAAC;SACf;IACH,CAAC;IAEM,OAAO,CAAC,QAA4B;QACzC,KAAI,IAAI,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE;YACtC,IAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,EAAE;gBACtB,kDAAkD;gBAClD,OAAO,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;aAC5C;SACF;QACD,OAAO,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,qCAAqC;IAC9D,CAAC;IACD,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;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;YACtB,SAAS,CAAC,OAAO,CAAC,IAAI;SACvB,CAAC,CAAC;QACH,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzB,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACK,YAAY,CAAC,UAAkB;QACrC,IAAI,CAAC,UAAU;YAAE,OAAO,UAAU,CAAC;QAEnC,gEAAgE;QAChE,MAAM,OAAO,GAAG,gEAAgE,CAAC;QAEjF,KAAK,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAClD,MAAM,CAAC,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YAChC,IAAI,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,QAAQ,EAAE,EAAE,UAAU;gBAChD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,uBAAuB,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACjG,OAAO,IAAI,CAAC,CAAC,0BAA0B;aACxC;SACF;QACD,OAAO,UAAU,CAAC;IACpB,CAAC;IAED;;;;;OAKG;IACK,WAAW,CAAC,UAAkB;QACpC,IAAI,CAAC,UAAU;YAAE,OAAO,UAAU,CAAC;QAEnC,qEAAqE;QACrE,MAAM,QAAQ,GAAG,kCAAkC,CAAC;QACpD,MAAM,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QAE7C,IAAI,CAAC,MAAM;YAAE,OAAO,UAAU,CAAC;QAE/B,mDAAmD;QACnD,MAAM,UAAU,GAAG,4DAA4D,CAAC;QAEhF,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAC7C,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QAE7C,gCAAgC;QAChC,SAAS,eAAe,CAAC,CAAS;YAChC,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE;gBACxB,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;aAC5B;YACD,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,OAAO,CAAC,CAAC;QACX,CAAC;QAED,KAAK,MAAM,CAAC,EAAE,GAAG,CAAC,IAAI,MAAM,EAAE;YAC5B,MAAM,SAAS,GAAG,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;YAC3C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,IAAI,SAAS,EAAE;gBACzC,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE;oBAClB,uBAAuB;oBACvB,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAmB;iBAC1C;qBAAM;oBACL,qDAAqD;oBACrD,MAAM,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC;oBACjC,MAAM,GAAG,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC7B,MAAM,CAAC,GAAG,eAAe,CAAC,GAAG,CAAC,CAAC;oBAC/B,MAAM,GAAG,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;oBAC7B,uDAAuD;oBACvD,KAAK,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;wBAC9B,iBAAiB;wBACjB,aAAa,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;qBAC5C;iBACF;aACF;SACF;QAED,iBAAiB;QACjB,IAAI,WAAW,GAAG,KAAK,CAAC;QACxB,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;QAClF,IAAI,WAAW,EAAE;YACf,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,4BAA4B,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7H,WAAW,GAAG,IAAI,CAAC;SACpB;aAAM;YACL,mFAAmF;YACnF,MAAM,WAAW,GAAG,aAAa,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YAClF,IAAI,WAAW,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,4BAA4B,CAAC,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;gBAC7H,WAAW,GAAG,IAAI,CAAC;aACpB;SACF;QAED,kCAAkC;QAClC,+CAA+C;QAC/C,IAAI,WAAW,EAAE;YACf,gEAAgE;YAChE,4CAA4C;YAC5C,SAAS,OAAO,CAAC,CAAS;gBACxB,IAAI,CAAC,KAAK,GAAG,EAAE;oBACb,OAAO,CAAC,CAAC,CAAC,SAAS;iBACpB;qBAAM,IAAI,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,EAAE;oBACtD,OAAO,CAAC,CAAC,CAAC,kBAAkB;iBAC7B;qBAAM;oBACL,OAAO,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;iBAChC;YACH,CAAC;YACD,OAAO,UAAU,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC,QAAa,EAAE,GAAW,EAAE,EAAE;gBACpE,OAAO,GAAG,GAAG,GAAG,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,GAAQ,EAAE,KAAa,EAAE,GAAW,EAAE,EAAE;oBAC/E,IAAI,CAAC,KAAK,IAAI,CAAC,GAAG,EAAE;wBAClB,uBAAuB;wBACvB,OAAO,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,mBAAmB;qBACzC;yBAAM;wBACL,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;qBAC5C;gBACH,CAAC,CAAC,GAAG,GAAG,CAAC;YACX,CAAC,CAAC,CAAC;SACJ;QACD,OAAO,UAAU,CAAC,CAAC,YAAY;IACjC,CAAC;CACF;AAED,MAAM,OAAO,YAAa,SAAQ,iBAAgD;IAChF,YAAY,MAAiC,EAAE,SAA4B;QACzE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,QAAQ,CAAC;IACvB,CAAC;IACS,OAAO;QACf,OAAO,IAAI,IAAI,EAAE,CAAC;IACpB,CAAC;IACD,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;CACF;AAAA,CAAC;AAEF,MAAM,OAAO,YAAa,SAAQ,iBAAmD;IACnF,YAAY,MAAiC,EAAE,SAA4B;QACzE,KAAK,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACzB,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;IAC1B,CAAC;IACS,OAAO;QACf,OAAO,IAAI,IAAI,EAAE,CAAC;IACpB,CAAC;IACD,IAAW,EAAE;QACX,OAAO,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;IAChC,CAAC;CACF;AAAA,CAAC","names":[],"sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"version":3}

package/build/src/compiler/vars.d.ts

@@ -4,19 +4,19 @@ import { SectionCompiler } from "./section-compiler.js";
 import Vars = KMXPlus.Vars;
 import DependencySections = KMXPlus.DependencySections;
 import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
-import { MarkerTracker } from "./marker-tracker.js";
+import { Substitutions } from "./substitution-tracker.js";
 export declare class VarsCompiler extends SectionCompiler {
     get id(): SectionIdent;
     get dependencies(): Set<SectionIdent>;
     constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
     validate(): boolean;
     private validateVars;
-    private collectMarkers;
-    private validateMarkers;
-    validateVarsMarkers(keyboard: LDMLKeyboard.LKKeyboard, mt: MarkerTracker): boolean;
+    private collectSubstitutions;
+    private validateAllSubstitutions;
+    validateSubstitutions(keyboard: LDMLKeyboard.LKKeyboard, st: Substitutions): boolean;
     compile(sections: DependencySections): Vars;
     addString(result: Vars, e: LDMLKeyboard.LKString, sections: DependencySections): void;
     addSet(result: Vars, e: LDMLKeyboard.LKSet, sections: DependencySections): void;
-    addUnicodeSet(result: Vars, e: LDMLKeyboard.LKUnicodeSet, sections: DependencySections): void;
+    addUnicodeSet(result: Vars, e: LDMLKeyboard.LKUSet, sections: DependencySections): void;
 }
 //# sourceMappingURL=vars.d.ts.map

package/build/src/compiler/vars.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAgB,MAAM,yBAAyB,CAAC;AAEjG,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAK1E,OAAO,EAAE,aAAa,EAAa,MAAM,qBAAqB,CAAC;AAC/D,qBAAa,YAAa,SAAQ,eAAe;IAC/C,IAAW,EAAE,iBAEZ;IAED,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAQ3C;gBAEW,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAS1B,OAAO,CAAC,YAAY;IA2GpB,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,eAAe;IA0BvB,mBAAmB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAI,OAAO;IAM7E,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IA8BlD,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAOrF,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAU/E,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CAS9F"}
+{"version":3,"file":"vars.d.ts","sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAC7E,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAgB,MAAM,yBAAyB,CAAC;AAEjG,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAI3B,OAAO,kBAAkB,GAAG,OAAO,CAAC,kBAAkB,CAAC;AACvD,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAK1E,OAAO,EAAmB,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC3E,qBAAa,YAAa,SAAQ,eAAe;IAC/C,IAAW,EAAE,iBAEZ;IAED,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAQ3C;gBAEW,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAQ1B,OAAO,CAAC,YAAY;IA2GpB,OAAO,CAAC,oBAAoB;IAW5B,OAAO,CAAC,wBAAwB;IA+BhC,qBAAqB,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,EAAE,EAAE,EAAG,aAAa,GAAI,OAAO;IAM/E,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IA+BlD,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAOrF,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAU/E,aAAa,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,EAAE,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,IAAI;CASxF"}

package/build/src/compiler/vars.js

@@ -1,4 +1,4 @@
-!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]="f4e68358-0ce5-5c2e-9675-3f3b1b644b04")}catch(e){}}();
+!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]="8694b724-addc-5c24-b95e-7f11dd19203d")}catch(e){}}();
 import { constants } from "@keymanapp/ldml-keyboard-constants";
 import { KMXPlus, MarkerParser } from '@keymanapp/common-types';
 import { VariableParser } from '@keymanapp/common-types';
@@ -11,7 +11,7 @@ import { CompilerMessages } from "./messages.js";
 import { KeysCompiler } from "./keys.js";
 import { TransformCompiler } from "./tran.js";
 import { DispCompiler } from "./disp.js";
-import { MarkerTracker, MarkerUse } from "./marker-tracker.js";
+import { SubstitutionUse, Substitutions } from "./substitution-tracker.js";
 export class VarsCompiler extends SectionCompiler {
     get id() {
         return constants.section.vars;
@@ -30,16 +30,12 @@ export class VarsCompiler extends SectionCompiler {
     }
     validate() {
         let valid = true;
-        valid = this.validateVars() && valid; // accumulate validity
-        valid = this.validateMarkers() && valid; // accumulate validity
+        valid = this.validateAllSubstitutions() && valid; // accumulate validity
         return valid;
     }
-    validateVars() {
+    validateVars(st) {
         let valid = true;
         const variables = this.keyboard3?.variables;
-        if (!variables) {
-            return true; // nothing to check
-        }
         // Check for duplicate ids
         const allIds = new Set();
         const dups = new Set();
@@ -58,71 +54,53 @@ export class VarsCompiler extends SectionCompiler {
                 allIds.add(id);
             }
         }
-        // Strings
-        for (const { id, value } of variables?.string) {
-            addId(id);
-            allStrings.add(id);
-            const stringrefs = VariableParser.allStringReferences(value);
-            for (const id2 of stringrefs) {
-                if (!allStrings.has(id2)) {
-                    valid = false;
-                    this.callbacks.reportMessage(CompilerMessages.Error_MissingStringVariable({ id: id2 }));
-                }
-            }
-        }
-        // Sets
-        for (const { id, value } of variables.set) {
-            addId(id);
-            allSets.add(id);
-            // check for illegal references, here.
-            const stringrefs = VariableParser.allStringReferences(value);
-            for (const id2 of stringrefs) {
-                if (!allStrings.has(id2)) {
-                    valid = false;
-                    this.callbacks.reportMessage(CompilerMessages.Error_MissingStringVariable({ id: id2 }));
-                }
+        if (variables) {
+            // Strings
+            for (const { id, value } of variables.string) {
+                addId(id);
+                allStrings.add(id);
+                const stringrefs = VariableParser.allStringReferences(value);
+                st.string.add(SubstitutionUse.variable, stringrefs);
             }
-            // Now split into spaces.
-            const items = VariableParser.setSplitter(value);
-            for (const item of items) {
-                const setrefs = VariableParser.allSetReferences(item);
-                if (setrefs.length > 1) {
-                    // this is the form $[seta]$[setb]
-                    valid = false;
-                    this.callbacks.reportMessage(CompilerMessages.Error_NeedSpacesBetweenSetVariables({ item }));
-                }
-                else {
-                    for (const id2 of setrefs) {
-                        if (!allSets.has(id2)) {
-                            valid = false;
-                            this.callbacks.reportMessage(CompilerMessages.Error_MissingSetVariable({ id: id2 }));
-                        }
+            // Sets
+            for (const { id, value } of variables.set) {
+                addId(id);
+                allSets.add(id);
+                // check for illegal references, here.
+                const stringrefs = VariableParser.allStringReferences(value);
+                st.string.add(SubstitutionUse.variable, stringrefs);
+                // Now split into spaces.
+                const items = VariableParser.setSplitter(value);
+                for (const item of items) {
+                    const setrefs = VariableParser.allSetReferences(item);
+                    if (setrefs.length > 1) {
+                        // this is the form $[seta]$[setb]
+                        valid = false;
+                        this.callbacks.reportMessage(CompilerMessages.Error_NeedSpacesBetweenSetVariables({ item }));
                     }
-                }
-                // TODO-LDML: Are there other illegal cases here? what about "x$[set]"?
-            }
-        }
-        // UnicodeSets
-        for (const { id, value } of variables.unicodeSet) {
-            addId(id);
-            allUnicodeSets.add(id);
-            const stringrefs = VariableParser.allStringReferences(value);
-            for (const id2 of stringrefs) {
-                if (!allStrings.has(id2)) {
-                    valid = false;
-                    this.callbacks.reportMessage(CompilerMessages.Error_MissingStringVariable({ id: id2 }));
+                    else {
+                        st.set.add(SubstitutionUse.variable, setrefs); // the reference to a 'map'
+                    }
+                    // TODO-LDML: Are there other illegal cases here? what about "x$[set]"?
                 }
             }
-            const setrefs = VariableParser.allSetReferences(value);
-            for (const id2 of setrefs) {
-                if (!allUnicodeSets.has(id2)) {
-                    valid = false;
-                    if (allSets.has(id2)) {
-                        // $[set] in a UnicodeSet must be another UnicodeSet.
-                        this.callbacks.reportMessage(CompilerMessages.Error_CantReferenceSetFromUnicodeSet({ id: id2 }));
-                    }
-                    else {
-                        this.callbacks.reportMessage(CompilerMessages.Error_MissingUnicodeSetVariable({ id: id2 }));
+            // UnicodeSets
+            for (const { id, value } of variables.uset) {
+                addId(id);
+                allUnicodeSets.add(id);
+                const stringrefs = VariableParser.allStringReferences(value);
+                st.string.add(SubstitutionUse.variable, stringrefs);
+                const setrefs = VariableParser.allSetReferences(value);
+                for (const id2 of setrefs) {
+                    if (!allUnicodeSets.has(id2)) {
+                        valid = false;
+                        if (allSets.has(id2)) {
+                            // $[set] in a UnicodeSet must be another UnicodeSet.
+                            this.callbacks.reportMessage(CompilerMessages.Error_CantReferenceSetFromUnicodeSet({ id: id2 }));
+                        }
+                        else {
+                            st.uset.add(SubstitutionUse.variable, [id2]);
+                        }
                     }
                 }
             }
@@ -134,22 +112,44 @@ export class VarsCompiler extends SectionCompiler {
             }));
             valid = false;
         }
+        // check for any missing vars
+        for (const id of st.set.all) {
+            // note: we check the uset list also. we don't know until later which was
+            // intended. collisions are handled separately.
+            if (!allSets.has(id) && !allUnicodeSets.has(id)) {
+                valid = false;
+                this.callbacks.reportMessage(CompilerMessages.Error_MissingSetVariable({ id }));
+            }
+        }
+        for (const id of st.string.all) {
+            if (!allStrings.has(id)) {
+                valid = false;
+                this.callbacks.reportMessage(CompilerMessages.Error_MissingStringVariable({ id }));
+            }
+        }
+        for (const id of st.uset.all) {
+            if (!allUnicodeSets.has(id)) {
+                valid = false;
+                this.callbacks.reportMessage(CompilerMessages.Error_MissingUnicodeSetVariable({ id }));
+            }
+        }
         return valid;
     }
-    collectMarkers(mt) {
+    collectSubstitutions(st) {
         let valid = true;
         // call our friends to validate
-        valid = this.validateVarsMarkers(this.keyboard3, mt) && valid; // accumulate validity
-        valid = KeysCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
-        valid = TransformCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
-        valid = DispCompiler.validateMarkers(this.keyboard3, mt) && valid; // accumulate validity
+        valid = this.validateSubstitutions(this.keyboard3, st) && valid; // accumulate validity
+        valid = KeysCompiler.validateSubstitutions(this.keyboard3, st) && valid; // accumulate validity
+        valid = TransformCompiler.validateSubstitutions(this.keyboard3, st) && valid; // accumulate validity
+        valid = DispCompiler.validateSubstitutions(this.keyboard3, st) && valid; // accumulate validity
         return valid;
     }
-    validateMarkers() {
-        const mt = new MarkerTracker();
-        let valid = this.collectMarkers(mt);
-        // see if there are any matched-but-not-emitted
+    validateAllSubstitutions() {
+        const st = new Substitutions();
+        let valid = this.collectSubstitutions(st);
+        // see if there are any matched-but-not-emitted markers
         const matchedNotEmitted = new Set();
+        const mt = st.markers;
         for (const m of mt.matched.values()) {
             if (m === MarkerParser.ANY_MARKER_ID)
                 continue; // match-all marker
@@ -169,10 +169,12 @@ export class VarsCompiler extends SectionCompiler {
             this.callbacks.reportMessage(CompilerMessages.Error_MissingMarkers({ ids: Array.from(matchedNotEmitted.values()).sort() }));
             valid = false;
         }
+        // now, validate the variables.
+        valid = this.validateVars(st) && valid;
         return valid;
     }
-    validateVarsMarkers(keyboard, mt) {
-        keyboard?.variables?.string?.forEach(({ value }) => mt.add(MarkerUse.variable, MarkerParser.allReferences(value)));
+    validateSubstitutions(keyboard, st) {
+        keyboard?.variables?.string?.forEach(({ value }) => st.markers.add(SubstitutionUse.variable, MarkerParser.allReferences(value)));
         return true;
     }
     compile(sections) {
@@ -186,10 +188,11 @@ export class VarsCompiler extends SectionCompiler {
         // first, strings.
         variables?.string?.forEach((e) => this.addString(result, e, sections));
         variables?.set?.forEach((e) => this.addSet(result, e, sections));
-        variables?.unicodeSet?.forEach((e) => this.addUnicodeSet(result, e, sections));
+        variables?.uset?.forEach((e) => this.addUnicodeSet(result, e, sections));
         // reload markers - TODO-LDML: double work!
-        const mt = new MarkerTracker();
-        this.collectMarkers(mt);
+        const st = new Substitutions();
+        this.collectSubstitutions(st);
+        const mt = st.markers;
         // collect all markers, excluding the match-all
         const allMarkers = Array.from(mt.all).filter(m => m !== MarkerParser.ANY_MARKER_ID).sort();
         result.markers = sections.list.allocList(allMarkers, {}, sections);
@@ -218,8 +221,8 @@ export class VarsCompiler extends SectionCompiler {
         let { value } = e;
         value = result.substituteStrings(value, sections);
         value = result.substituteUnicodeSets(value, sections);
-        result.unicodeSets.push(new UnicodeSetItem(id, value, sections, sections.usetparser));
+        result.usets.push(new UnicodeSetItem(id, value, sections, sections.usetparser));
     }
 }
-//# debugId=f4e68358-0ce5-5c2e-9675-3f3b1b644b04
+//# debugId=8694b724-addc-5c24-b95e-7f11dd19203d
 //# sourceMappingURL=vars.js.map

package/build/src/compiler/vars.js.map

@@ -1 +1 @@
-{"debug_id":"f4e68358-0ce5-5c2e-9675-3f3b1b644b04","file":"vars.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"version":3}
+{"debug_id":"8694b724-addc-5c24-b95e-7f11dd19203d","file":"vars.js","mappings":"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","names":[],"sourceRoot":"","sources":["../../../src/compiler/vars.ts"],"version":3}

package/build/src/main.d.ts

@@ -1,9 +1,4 @@
 export { LdmlKeyboardCompiler } from './compiler/compiler.js';
-export { LdmlKeyboardKeymanWebCompiler } from './compiler/keymanweb-compiler.js';
-export { LdmlKeyboardVisualKeyboardCompiler } from './compiler/visual-keyboard-compiler.js';
-export { TouchLayoutCompiler } from './compiler/touch-layout-compiler.js';
 export { LdmlCompilerOptions } from './compiler/ldml-compiler-options.js';
 export { CompilerMessages as LdmlKeyboardCompilerMessages } from './compiler/messages.js';
-export { KMXPlusMetadataCompiler } from './compiler/metadata-compiler.js';
-export { KMXBuilder } from "@keymanapp/common-types";
 //# sourceMappingURL=main.d.ts.map

package/build/src/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,IAAI,4BAA4B,EAAE,MAAM,wBAAwB,CAAC;AAC1F,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,IAAI,4BAA4B,EAAE,MAAM,wBAAwB,CAAC"}

package/build/src/main.js

@@ -1,10 +1,5 @@
-!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]="2deb9071-8421-52f4-bb4b-902980eee52a")}catch(e){}}();
+!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]="19304dd8-b397-5c91-a393-c86c3c398b6c")}catch(e){}}();
 export { LdmlKeyboardCompiler } from './compiler/compiler.js';
-export { LdmlKeyboardKeymanWebCompiler } from './compiler/keymanweb-compiler.js';
-export { LdmlKeyboardVisualKeyboardCompiler } from './compiler/visual-keyboard-compiler.js';
-export { TouchLayoutCompiler } from './compiler/touch-layout-compiler.js';
 export { CompilerMessages as LdmlKeyboardCompilerMessages } from './compiler/messages.js'; // TODO: rename messages.js and CompilerMessages
-export { KMXPlusMetadataCompiler } from './compiler/metadata-compiler.js';
-export { KMXBuilder } from "@keymanapp/common-types";
-//# debugId=2deb9071-8421-52f4-bb4b-902980eee52a
+//# debugId=19304dd8-b397-5c91-a393-c86c3c398b6c
 //# sourceMappingURL=main.js.map

package/build/src/main.js.map

@@ -1 +1 @@
-{"debug_id":"2deb9071-8421-52f4-bb4b-902980eee52a","file":"main.js","mappings":";AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,6BAA6B,EAAE,MAAM,kCAAkC,CAAC;AACjF,OAAO,EAAE,kCAAkC,EAAE,MAAM,wCAAwC,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,qCAAqC,CAAC;AAE1E,OAAO,EAAE,gBAAgB,IAAI,4BAA4B,EAAE,MAAM,wBAAwB,CAAC,CAAC,gDAAgD;AAC3I,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAE1E,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC","names":[],"sourceRoot":"","sources":["../../src/main.ts"],"version":3}
+{"debug_id":"19304dd8-b397-5c91-a393-c86c3c398b6c","file":"main.js","mappings":";AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAE9D,OAAO,EAAE,gBAAgB,IAAI,4BAA4B,EAAE,MAAM,wBAAwB,CAAC,CAAC,gDAAgD","names":[],"sourceRoot":"","sources":["../../src/main.ts"],"version":3}

package/package.json

@@ -25,15 +25,15 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "dependencies": {
-    "@keymanapp/keyman-version": "18.0.8-alpha",
-    "@keymanapp/kmc-kmn": "18.0.8-alpha",
-    "@keymanapp/ldml-keyboard-constants": "18.0.8-alpha",
+    "@keymanapp/keyman-version": "18.0.10-alpha",
+    "@keymanapp/kmc-kmn": "18.0.10-alpha",
+    "@keymanapp/ldml-keyboard-constants": "18.0.10-alpha",
     "restructure": "git+https://github.com/keymanapp/dependency-restructure.git#7a188a1e26f8f36a175d95b67ffece8702363dfc",
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@keymanapp/developer-test-helpers": "18.0.8-alpha",
-    "@keymanapp/resources-gosh": "18.0.8-alpha",
+    "@keymanapp/developer-test-helpers": "18.0.10-alpha",
+    "@keymanapp/resources-gosh": "18.0.10-alpha",
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.7",
     "@types/node": "^20.4.1",
@@ -65,5 +65,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "18.0.8-alpha"
+  "version": "18.0.10-alpha"
 }

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

@@ -1,34 +0,0 @@
-/**
- * Verb for MarkerTracker.add()
- */
-export declare enum MarkerUse {
-    /** 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 MarkerSet = Set<string>;
-/** Tracks usage of markers */
-export declare class MarkerTracker {
-    /** markers that were emitted */
-    emitted: MarkerSet;
-    /** markers that were consumed and removed from the context */
-    consumed: MarkerSet;
-    /** markers that were matched, but not necessarily consumed */
-    matched: MarkerSet;
-    /** all markers */
-    all: MarkerSet;
-    constructor();
-    /**
-     *
-     * @param verb what kind of use we are adding
-     * @param markers list of markers to add
-     */
-    add(verb: MarkerUse, markers: string[]): void;
-}
-export {};
-//# sourceMappingURL=marker-tracker.d.ts.map

package/build/src/compiler/marker-tracker.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"marker-tracker.d.ts","sourceRoot":"","sources":["../../../src/compiler/marker-tracker.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,oBAAY,SAAS;IACnB,uEAAuE;IACvE,IAAI,IAAA;IACJ,qEAAqE;IACrE,OAAO,IAAA;IACP,iEAAiE;IACjE,KAAK,IAAA;IACL,0DAA0D;IAC1D,QAAQ,IAAA;CACT;AAED,KAAK,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;AAE7B,8BAA8B;AAC9B,qBAAa,aAAa;IACxB,gCAAgC;IAChC,OAAO,EAAE,SAAS,CAAC;IACnB,8DAA8D;IAC9D,QAAQ,EAAE,SAAS,CAAC;IACpB,8DAA8D;IAC9D,OAAO,EAAE,SAAS,CAAC;IACnB,kBAAkB;IAClB,GAAG,EAAE,SAAS,CAAC;;IASf;;;;OAIG;IACH,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE;CAgCvC"}

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

@@ -1 +0,0 @@
-{"debug_id":"aae20e50-3663-5361-b1fa-24e504c123f1","file":"marker-tracker.js","mappings":";AAAA;;GAEG;AACH,MAAM,CAAN,IAAY,SASX;AATD,WAAY,SAAS;IACnB,uEAAuE;IACvE,yCAAI,CAAA;IACJ,qEAAqE;IACrE,+CAAO,CAAA;IACP,iEAAiE;IACjE,2CAAK,CAAA;IACL,0DAA0D;IAC1D,iDAAQ,CAAA;AACV,CAAC,EATW,SAAS,KAAT,SAAS,QASpB;AAID,8BAA8B;AAC9B,MAAM,OAAO,aAAa;IACxB,gCAAgC;IAChC,OAAO,CAAY;IACnB,8DAA8D;IAC9D,QAAQ,CAAY;IACpB,8DAA8D;IAC9D,OAAO,CAAY;IACnB,kBAAkB;IAClB,GAAG,CAAY;IAEf;QACE,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,EAAU,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,IAAI,GAAG,EAAU,CAAC;QACjC,IAAI,CAAC,GAAG,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,CAAC;IAED;;;;OAIG;IACH,GAAG,CAAC,IAAe,EAAE,OAAiB;QACpC,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO,CAAC,gBAAgB;SACzB;QACD,IAAI,IAAI,IAAI,SAAS,CAAC,IAAI,EAAE;YAC1B,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,IAAI,SAAS,CAAC,OAAO,EAAE;YACpC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,IAAI,SAAS,CAAC,KAAK,EAAE;YAClC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,IAAI,IAAI,SAAS,CAAC,QAAQ,EAAE;YACrC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,wCAAwC;gBACxC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,oBAAoB;SACrB;aAAM;YACL,MAAM,KAAK,CAAC,oCAAoC,IAAI,YAAY,CAAC,CAAC;SACnE;IACH,CAAC;CACF","names":[],"sourceRoot":"","sources":["../../../src/compiler/marker-tracker.ts"],"version":3}