@keymanapp/kmc-ldml 17.0.120-alpha → 17.0.122-alpha

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

@@ -1,12 +1,22 @@
 import { LDMLKeyboard, KMXPlus, CompilerCallbacks } from "@keymanapp/common-types";
 import { SectionIdent } from '@keymanapp/ldml-keyboard-constants';
 export declare class SectionCompiler {
+    /**
+     * Opportunity for async initialization.
+     * @returns true when OK. On false, causes a message to happen.
+     */
+    init(): Promise<boolean>;
     protected readonly keyboard: LDMLKeyboard.LKKeyboard;
     protected readonly callbacks: CompilerCallbacks;
     constructor(source: LDMLKeyboard.LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
     get id(): SectionIdent;
     get required(): boolean;
-    compile(sections: KMXPlus.GlobalSections): KMXPlus.Section;
+    compile(sections: KMXPlus.DependencySections): KMXPlus.Section;
     validate(): 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.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"section-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AAGlE,qBAAa,eAAe;IAC1B,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;gBAEpC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAKxF,IAAW,EAAE,IAAI,YAAY,CAE5B;IAED,IAAW,QAAQ,IAAI,OAAO,CAE7B;IAEM,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,GAAG,OAAO,CAAC,OAAO;IAI1D,QAAQ,IAAI,OAAO;CAG3B"}
+{"version":3,"file":"section-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,YAAY,EAAa,MAAM,oCAAoC,CAAC;AAG7E,qBAAa,eAAe;IAC1B;;;OAGG;IACU,IAAI,IAAK,OAAO,CAAC,OAAO,CAAC;IAKtC,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC,UAAU,CAAC;IACrD,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,iBAAiB,CAAC;gBAEpC,MAAM,EAAE,YAAY,CAAC,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAKxF,IAAW,EAAE,IAAI,YAAY,CAE5B;IAED,IAAW,QAAQ,IAAI,OAAO,CAE7B;IAEM,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,kBAAkB,GAAG,OAAO,CAAC,OAAO;IAI9D,QAAQ,IAAI,OAAO;IAI1B;;;OAGG;IACH,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAO3C;CACF"}

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

@@ -1,5 +1,14 @@
+import { constants } from '@keymanapp/ldml-keyboard-constants';
 /* istanbul ignore next */
 export class SectionCompiler {
+    /**
+     * Opportunity for async initialization.
+     * @returns true when OK. On false, causes a message to happen.
+     */
+    async init() {
+        // nothing to do here
+        return true;
+    }
     keyboard;
     callbacks;
     constructor(source, callbacks) {
@@ -18,5 +27,17 @@ export class SectionCompiler {
     validate() {
         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
+        ]);
+        return defaults;
+    }
 }
 //# sourceMappingURL=section-compiler.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"section-compiler.js","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AAGA,0BAA0B;AAC1B,MAAM,OAAO,eAAe;IACP,QAAQ,CAA0B;IAClC,SAAS,CAAoB;IAEhD,YAAY,MAA8C,EAAE,SAA4B;QACtF,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,IAAW,EAAE;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CAAC,QAAgC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,QAAQ;QACb,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
+{"version":3,"file":"section-compiler.js","sourceRoot":"","sources":["../../../src/compiler/section-compiler.ts"],"names":[],"mappings":"AACA,OAAO,EAAgB,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAE7E,0BAA0B;AAC1B,MAAM,OAAO,eAAe;IAC1B;;;OAGG;IACI,KAAK,CAAC,IAAI;QACf,qBAAqB;QACrB,OAAO,IAAI,CAAC;IACd,CAAC;IAEkB,QAAQ,CAA0B;IAClC,SAAS,CAAoB;IAEhD,YAAY,MAA8C,EAAE,SAA4B;QACtF,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;IAC7B,CAAC;IAED,IAAW,EAAE;QACX,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAW,QAAQ;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,OAAO,CAAC,QAAoC;QACjD,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,QAAQ;QACb,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;SACvB,CAAC,CAAC;QACH,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}

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

@@ -1,41 +1,34 @@
+import { SectionIdent } from "@keymanapp/ldml-keyboard-constants";
 import { KMXPlus, LDMLKeyboard, CompilerCallbacks } from '@keymanapp/common-types';
 import { SectionCompiler } from "./section-compiler.js";
-import Finl = KMXPlus.Finl;
-import FinlItem = KMXPlus.FinlItem;
 import Bksp = KMXPlus.Bksp;
-import BkspItem = KMXPlus.BkspItem;
-import GlobalSections = KMXPlus.GlobalSections;
+import DependencySections = KMXPlus.DependencySections;
 import Tran = KMXPlus.Tran;
-import TranItem = KMXPlus.TranItem;
 import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
-type TransformCompilerType = 'simple' | 'final' | 'backspace';
-declare class TransformCompiler<T extends TransformCompilerType, TranBase extends Tran, TranItemBase extends TranItem> extends SectionCompiler {
+type TransformCompilerType = 'simple' | 'backspace';
+declare class TransformCompiler<T extends TransformCompilerType, TranBase extends Tran> extends SectionCompiler {
     protected type: T;
     constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
     validate(): boolean;
-    protected newTranItem(): TranItemBase;
     protected newTran(): TranBase;
-    private compileTransform;
     private compileTransforms;
-    compile(sections: GlobalSections): TranBase;
+    private compileTransformGroup;
+    private compileTransformTranGroup;
+    private compileTransform;
+    private compileReorderTranGroup;
+    private compileReorder;
+    compile(sections: DependencySections): TranBase;
+    get dependencies(): Set<SectionIdent>;
 }
-export declare class TranCompiler extends TransformCompiler<'simple', Tran, TranItem> {
+export declare class TranCompiler extends TransformCompiler<'simple', Tran> {
     constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
-    protected newTranItem(): TranItem;
     protected newTran(): Tran;
-    get id(): import("@keymanapp/ldml-keyboard-constants").SectionIdent;
-}
-export declare class FinlCompiler extends TransformCompiler<'final', Finl, FinlItem> {
-    constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
-    protected newTranItem(): FinlItem;
-    protected newTran(): Finl;
-    get id(): import("@keymanapp/ldml-keyboard-constants").SectionIdent;
+    get id(): SectionIdent;
 }
-export declare class BkspCompiler extends TransformCompiler<'backspace', Bksp, BkspItem> {
+export declare class BkspCompiler extends TransformCompiler<'backspace', Bksp> {
     constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
-    protected newTranItem(): BkspItem;
     protected newTran(): Bksp;
-    get id(): import("@keymanapp/ldml-keyboard-constants").SectionIdent;
+    get id(): SectionIdent;
 }
 export {};
 //# sourceMappingURL=tran.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"tran.d.ts","sourceRoot":"","sources":["../../../src/compiler/tran.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AACnC,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AACnC,OAAO,cAAc,GAAG,OAAO,CAAC,cAAc,CAAC;AAC/C,OAAO,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;AAC3B,OAAO,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;AAEnC,OAAO,yBAAyB,GAAG,YAAY,CAAC,yBAAyB,CAAC;AAI1E,KAAK,qBAAqB,GAAG,QAAQ,GAAG,OAAO,GAAG,WAAW,CAAC;AAE9D,cAAM,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,EAAE,YAAY,SAAS,QAAQ,CAAE,SAAQ,eAAe;IAEpI,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEN,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAO1B,SAAS,CAAC,WAAW,IAAI,YAAY;IAIrC,SAAS,CAAC,OAAO,IAAI,QAAQ;IAI7B,OAAO,CAAC,gBAAgB;IASxB,OAAO,CAAC,iBAAiB;IAYlB,OAAO,CAAC,QAAQ,EAAE,cAAc,GAAG,QAAQ;CAQnD;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC;gBAC/D,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,WAAW,IAAI,QAAQ;IAGjC,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,8DAEZ;CACF;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC;gBAC9D,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,WAAW,IAAI,QAAQ;IAGjC,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,8DAEZ;CACF;AAED,qBAAa,YAAa,SAAQ,iBAAiB,CAAC,WAAW,EAAE,IAAI,EAAE,QAAQ,CAAC;gBAClE,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAI3E,SAAS,CAAC,WAAW,IAAI,QAAQ;IAGjC,SAAS,CAAC,OAAO,IAAI,IAAI;IAGzB,IAAW,EAAE,8DAEZ;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,EAAkB,MAAM,yBAAyB,CAAC;AACnG,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;AAQ1E,KAAK,qBAAqB,GAAG,QAAQ,GAAG,WAAW,CAAC;AAEpD,cAAM,iBAAiB,CAAC,CAAC,SAAS,qBAAqB,EAAE,QAAQ,SAAS,IAAI,CAAE,SAAQ,eAAe;IAErG,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;gBAEN,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IAwC1B,SAAS,CAAC,OAAO,IAAI,QAAQ;IAK7B,OAAO,CAAC,iBAAiB;IAWzB,OAAO,CAAC,qBAAqB;IAa7B,OAAO,CAAC,yBAAyB;IASjC,OAAO,CAAC,gBAAgB;IA4BxB,OAAO,CAAC,uBAAuB;IAS/B,OAAO,CAAC,cAAc;IAOf,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,QAAQ;IAStD,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAS3C;CACF;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,54 +1,142 @@
 import { constants } from "@keymanapp/ldml-keyboard-constants";
-import { KMXPlus } from '@keymanapp/common-types';
+import { KMXPlus, VariableParser } from '@keymanapp/common-types';
 import { SectionCompiler } from "./section-compiler.js";
-var Finl = KMXPlus.Finl;
-var FinlItem = KMXPlus.FinlItem;
 var Bksp = KMXPlus.Bksp;
-var BkspItem = KMXPlus.BkspItem;
 var Tran = KMXPlus.Tran;
-var TranItem = KMXPlus.TranItem;
-var TranItemFlags = KMXPlus.TranItemFlags;
+var TranReorder = KMXPlus.TranReorder;
+var TranTransform = KMXPlus.TranTransform;
+import { verifyValidAndUnique } from "../util/util.js";
+import { CompilerMessages } from "./messages.js";
 class TransformCompiler extends SectionCompiler {
     type;
     constructor(source, callbacks) {
         super(source, callbacks);
     }
     validate() {
+        const reportMessage = this.callbacks.reportMessage.bind(this.callbacks);
         let valid = true;
-        // TODO-LDML: linting here should check for identical before+from, but this involves a double-parse which is ugly
-        // TODO-LDML: unicodesets means that either we fully parse them and verify conflicting rules or the linting is imperfect
+        const transforms = this?.keyboard?.transforms;
+        if (transforms) {
+            const types = transforms.map(({ type }) => type);
+            if (!verifyValidAndUnique(types, types => reportMessage(CompilerMessages.Error_DuplicateTransformsType({ types })), new Set(['simple', 'backspace']), types => reportMessage(CompilerMessages.Error_InvalidTransformsType({ types })))) {
+                valid = false;
+            }
+            // check for mixed groups
+            let mixed = false;
+            let empty = false;
+            transforms.forEach(({ transformGroup }) => transformGroup.forEach((transformGroup) => {
+                if (transformGroup.reorder?.length && transformGroup.transform?.length) {
+                    mixed = true;
+                }
+                if (!transformGroup.reorder?.length && !transformGroup.transform?.length) {
+                    empty = true;
+                }
+            }));
+            if (mixed) {
+                valid = false;
+                reportMessage(CompilerMessages.Error_MixedTransformGroup()); // report this once
+            }
+            if (empty) {
+                valid = false;
+                reportMessage(CompilerMessages.Error_EmptyTransformGroup()); // report this once
+            }
+            // TODO-LDML: linting here should check for identical from, but this involves a double-parse which is ugly
+            // TODO-LDML: unicodesets means that either we fully parse them and verify conflicting rules or the linting is imperfect
+        }
         return valid;
     }
-    newTranItem() {
-        return null;
-    }
     newTran() {
+        // needs to be overridden in the subclass
         return null;
     }
-    compileTransform(sections, transform) {
-        let result = this.newTranItem();
-        result.from = sections.elem.allocElementString(sections.strs, transform.from);
-        result.to = sections.strs.allocAndUnescapeString(transform.to);
-        result.before = sections.elem.allocElementString(sections.strs, transform.before);
-        result.flags = transform.error == 'fail' ? TranItemFlags.error : TranItemFlags.none;
-        return result;
-    }
     compileTransforms(sections, transforms) {
         let result = this.newTran();
-        if (transforms?.transform) {
-            for (let transform of transforms.transform) {
-                result.items.push(this.compileTransform(sections, transform));
+        if (transforms?.transformGroup) {
+            for (let transformGroup of transforms.transformGroup) {
+                result.groups.push(this.compileTransformGroup(sections, transformGroup));
             }
         }
         return result;
     }
+    compileTransformGroup(sections, transformGroup) {
+        if (transformGroup.reorder.length && transformGroup.transform.length) {
+            // should have been caught by validate
+            throw Error(`Internal error: transformGroup has both reorder and transform elements.`);
+        }
+        else if (transformGroup.reorder.length) {
+            return this.compileReorderTranGroup(sections, transformGroup.reorder);
+        }
+        else if (transformGroup.transform.length) {
+            return this.compileTransformTranGroup(sections, transformGroup.transform);
+        }
+        else {
+            throw Error(`Internal error: transformGroup has neither reorder nor transform elements.`);
+        }
+    }
+    compileTransformTranGroup(sections, transforms) {
+        const result = {
+            type: constants.tran_group_type_transform,
+            transforms: transforms.map(transform => this.compileTransform(sections, transform)),
+            reorders: [],
+        };
+        return result;
+    }
+    compileTransform(sections, transform) {
+        let result = new TranTransform();
+        let cookedFrom = transform.from;
+        let cookedTo = transform.to;
+        cookedFrom = sections.vars.substituteStrings(cookedFrom, sections);
+        // TODO: handle 'map' case
+        const mapFrom = VariableParser.CAPTURE_SET_REFERENCE.exec(cookedFrom);
+        const mapTo = VariableParser.MAPPED_SET_REFERENCE.exec(cookedTo || '');
+        if (mapFrom && mapTo) { // TODO-LDML: error cases
+            result.mapFrom = sections.strs.allocString(mapFrom[1]); // var name
+            result.mapTo = sections.strs.allocString(mapTo[1]); // var name
+        }
+        else {
+            result.mapFrom = sections.strs.allocString(''); // TODO-LDML
+            result.mapTo = sections.strs.allocString(''); // TODO-LDML
+        }
+        cookedFrom = sections.vars.substituteSetRegex(cookedFrom, sections);
+        if (cookedTo) {
+            cookedTo = sections.vars.substituteStrings(cookedTo, sections);
+        }
+        result.from = sections.strs.allocAndUnescapeString(cookedFrom); // TODO-LDML: not unescaped here, done previously
+        result.to = sections.strs.allocAndUnescapeString(cookedTo); // TODO-LDML: not unescaped here, done previously
+        return result;
+    }
+    compileReorderTranGroup(sections, reorders) {
+        const result = {
+            type: constants.tran_group_type_reorder,
+            transforms: [],
+            reorders: reorders.map(reorder => this.compileReorder(sections, reorder)),
+        };
+        return result;
+    }
+    compileReorder(sections, reorder) {
+        let result = new TranReorder();
+        result.elements = sections.elem.allocElementString(sections.strs, reorder.from, reorder.order, reorder.tertiary, reorder.tertiaryBase, reorder.preBase);
+        result.before = sections.elem.allocElementString(sections.strs, reorder.before);
+        return result;
+    }
     compile(sections) {
         for (let t of this.keyboard.transforms) {
             if (t.type == this.type) {
+                // compile only the transforms of the correct type
                 return this.compileTransforms(sections, t);
             }
         }
-        return this.newTran();
+        return this.newTran(); // empty: nothing of this type found.
+    }
+    get dependencies() {
+        const defaults = new Set([
+            constants.section.strs,
+            constants.section.list,
+            constants.section.elem,
+            constants.section.vars,
+        ]);
+        defaults.delete(this.id);
+        return defaults;
     }
 }
 export class TranCompiler extends TransformCompiler {
@@ -56,9 +144,6 @@ export class TranCompiler extends TransformCompiler {
         super(source, callbacks);
         this.type = 'simple';
     }
-    newTranItem() {
-        return new TranItem();
-    }
     newTran() {
         return new Tran();
     }
@@ -67,30 +152,11 @@ export class TranCompiler extends TransformCompiler {
     }
 }
 ;
-export class FinlCompiler extends TransformCompiler {
-    constructor(source, callbacks) {
-        super(source, callbacks);
-        this.type = 'final';
-    }
-    newTranItem() {
-        return new FinlItem();
-    }
-    newTran() {
-        return new Finl();
-    }
-    get id() {
-        return constants.section.finl;
-    }
-}
-;
 export class BkspCompiler extends TransformCompiler {
     constructor(source, callbacks) {
         super(source, callbacks);
         this.type = 'backspace';
     }
-    newTranItem() {
-        return new BkspItem();
-    }
     newTran() {
         return new Bksp();
     }

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

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

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

@@ -0,0 +1,20 @@
+import { SectionIdent } from "@keymanapp/ldml-keyboard-constants";
+import { KMXPlus, LDMLKeyboard, CompilerCallbacks } from '@keymanapp/common-types';
+import { UnicodeSetParser } from '@keymanapp/common-types';
+import { SectionCompiler } from "./section-compiler.js";
+import Vars = KMXPlus.Vars;
+import DependencySections = KMXPlus.DependencySections;
+import LDMLKeyboardXMLSourceFile = LDMLKeyboard.LDMLKeyboardXMLSourceFile;
+export declare class VarsCompiler extends SectionCompiler {
+    get id(): SectionIdent;
+    get dependencies(): Set<SectionIdent>;
+    usetparser: UnicodeSetParser;
+    init(): Promise<boolean>;
+    constructor(source: LDMLKeyboardXMLSourceFile, callbacks: CompilerCallbacks);
+    validate(): 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;
+}
+//# sourceMappingURL=vars.d.ts.map

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

@@ -0,0 +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,EAAE,MAAM,yBAAyB,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAkB,MAAM,yBAAyB,CAAC;AAE3E,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;AAE1E,qBAAa,YAAa,SAAQ,eAAe;IAC/C,IAAW,EAAE,iBAEZ;IAED,IAAW,YAAY,IAAI,GAAG,CAAC,YAAY,CAAC,CAO3C;IAED,UAAU,EAAG,gBAAgB,CAAQ;IAExB,IAAI,IAAK,OAAO,CAAC,OAAO,CAAC;gBAS1B,MAAM,EAAE,yBAAyB,EAAE,SAAS,EAAE,iBAAiB;IAIpE,QAAQ,IAAI,OAAO;IA0GnB,OAAO,CAAC,QAAQ,EAAE,kBAAkB,GAAG,IAAI;IAwBlD,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"}

package/build/src/compiler/vars.js

@@ -0,0 +1,178 @@
+import { constants } from "@keymanapp/ldml-keyboard-constants";
+import { KMXPlus } from '@keymanapp/common-types';
+import { VariableParser } from '@keymanapp/common-types';
+import { KmnCompiler } from '@keymanapp/kmc-kmn';
+import { SectionCompiler } from "./section-compiler.js";
+var Vars = KMXPlus.Vars;
+var StringVarItem = KMXPlus.StringVarItem;
+var SetVarItem = KMXPlus.SetVarItem;
+var UnicodeSetItem = KMXPlus.UnicodeSetItem;
+import { CompilerMessages } from "./messages.js";
+export class VarsCompiler extends SectionCompiler {
+    get id() {
+        return constants.section.vars;
+    }
+    get dependencies() {
+        const defaults = new Set([
+            constants.section.strs,
+            constants.section.elem
+        ]);
+        defaults.delete(this.id);
+        return defaults;
+    }
+    usetparser = null;
+    async init() {
+        const compiler = new KmnCompiler();
+        const ok = await compiler.init(this.callbacks);
+        if (ok) {
+            this.usetparser = compiler;
+        }
+        return ok;
+    }
+    constructor(source, callbacks) {
+        super(source, callbacks);
+    }
+    validate() {
+        let valid = true;
+        // TODO-LDML scan for markers?
+        // Check for duplicate ids
+        const allIds = new Set();
+        const dups = new Set();
+        const variables = this.keyboard?.variables;
+        if (!variables)
+            return valid;
+        const allStrings = new Set();
+        const allSets = new Set();
+        const allUnicodeSets = new Set();
+        /**
+         * add an ID to check for duplicates
+         * @param id id
+         */
+        function addId(id) {
+            if (allIds.has(id)) {
+                dups.add(id);
+            }
+            else {
+                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 }));
+                }
+            }
+            // 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 }));
+                        }
+                    }
+                }
+                // 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 }));
+                }
+            }
+            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 }));
+                    }
+                }
+            }
+        }
+        // one report if any dups
+        if (dups.size > 0) {
+            this.callbacks.reportMessage(CompilerMessages.Error_DuplicateVariable({
+                ids: Array.from(dups.values()).sort().join(', ')
+            }));
+            valid = false;
+        }
+        return valid;
+    }
+    compile(sections) {
+        const result = new Vars();
+        const variables = this.keyboard?.variables;
+        if (!variables)
+            return result; // Empty vars, to simplify other sections
+        // we already know the variables do not conflict with each other
+        // need to add these one by one, because they depend on each other.
+        // we don't add these in completely 'natural' order because xml2js has already lost that.
+        // instead we go: strings, sets, then unicodeSets.
+        // 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));
+        return result.valid() ? result : null;
+    }
+    // routines for initializing Vars remain here, in the compiler.
+    addString(result, e, sections) {
+        const { id } = e;
+        let { value } = e;
+        // fix any variables
+        value = result.substituteStrings(value, sections);
+        result.strings.push(new StringVarItem(id, value, sections));
+    }
+    addSet(result, e, sections) {
+        const { id } = e;
+        let { value } = e;
+        // first substitute strings
+        value = result.substituteStrings(value, sections);
+        // OK to do this as a substitute, because we've already validated the set above.
+        value = result.substituteSets(value, sections);
+        const items = VariableParser.setSplitter(value);
+        result.sets.push(new SetVarItem(id, items, sections));
+    }
+    addUnicodeSet(result, e, sections) {
+        const { id } = e;
+        let { value } = e;
+        value = result.substituteStrings(value, sections);
+        value = result.substituteUnicodeSets(value, sections);
+        result.unicodeSets.push(new UnicodeSetItem(id, value, sections, this.usetparser));
+    }
+}
+//# sourceMappingURL=vars.js.map

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

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

package/build/src/util/util.d.ts

@@ -18,6 +18,16 @@ export declare function calculateUniqueKeys(keys?: LDMLKeyboard.LKKey[]): LDMLKe
  * @returns set of key IDs
  */
 export declare function allUsedKeyIdsInLayers(layersList: LDMLKeyboard.LKLayers[] | null): Set<string>;
+/**
+ * Helper function for validating child elements. Written for the convenience of message passing functions.
+ *
+ * @param values array of values to check
+ * @param onDuplicate callback with array of duplicate values, deduped
+ * @param allowed optional set of valid values
+ * @param onInvalid callback with array of invalid values, deduped
+ * @returns true if all OK
+ */
+export declare function verifyValidAndUnique(values: string[], onDuplicate: (duplicates: string[]) => void, allowed?: Set<string>, onInvalid?: (invalids: string[]) => void): boolean;
 /**
  * Determine modifier from layer info
  * @param layer layer obj

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

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,WAEjG;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,CAiBrF;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAG,YAAY,CAAC,QAAQ,EAAE,GAAG,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAgB9F;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,GAAI,MAAM,CAYjF;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAI,OAAO,CAQzD"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS;IAAC,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAAA;CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,WAEjG;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,KAAK,EAAE,GAAG,YAAY,CAAC,KAAK,EAAE,CAiBrF;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,UAAU,EAAG,YAAY,CAAC,QAAQ,EAAE,GAAG,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,CAgB9F;AAED;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,EAAE,EAChB,WAAW,EAAE,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,IAAI,EAC3C,OAAO,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,EACrB,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,IAAI,GACtC,OAAO,CA0BV;AAED;;;;GAIG;AACH,wBAAgB,4BAA4B,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,GAAI,MAAM,CAYjF;AAED;;;GAGG;AACH,wBAAgB,aAAa,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAI,OAAO,CAQzD"}