npm - @keymanapp/common-types - Versions diffs - 17.0.133-alpha → 17.0.134-alpha - Mend

@keymanapp/common-types 17.0.133-alpha → 17.0.134-alpha

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (31) hide show

package/build/src/kmx/element-string.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Strs, StrsItem, UsetItem } from './kmx-plus.js';
+import { DependencySections, StrsItem, UsetItem } from './kmx-plus.js';
 export declare enum ElemElementFlags {
     none = 0,
     type,
@@ -14,7 +14,11 @@ export declare class ElemElement {
     isEqual(a: ElemElement): boolean;
 }
 export declare class ElementString extends Array<ElemElement> {
-    constructor(strs: Strs, source: string | string[], order?: string, tertiary?: string, tertiary_base?: string, prebase?: string);
+    /**
+     * @param source if a string array, does not get reinterpreted as UnicodeSet. This is used with vars, etc. Or pass `["str"]` for an explicit 1-element elem.
+     * If it is a string, will be interpreted per reorder element rules.
+     */
+    constructor(sections: DependencySections, source: string | string[], order?: string, tertiary?: string, tertiary_base?: string, prebase?: string);
     isEqual(a: ElementString): boolean;
 }
 //# sourceMappingURL=element-string.d.ts.map

package/build/src/kmx/element-string.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"element-string.d.ts","sourceRoot":"","sources":["../../../src/kmx/element-string.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,~~IAAI~~,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;~~AAEzD~~,oBAAY,gBAAgB;IAC1B,IAAI,IAAI;IACR,IAAgC;IAChC,aAAkD;IAClD,OAAsC;CACvC;AAGD,qBAAa,WAAW;IACtB,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,gBAAgB,CAAC;IACxB,OAAO,CAAC,CAAC,EAAE,WAAW;CAMvB;AAGD,qBAAa,aAAc,SAAQ,KAAK,CAAC,WAAW,CAAC;~~gBACvC~~,~~IAAI~~,EAAE,~~IAAI~~,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;~~IA+C9H~~,OAAO,CAAC,CAAC,EAAE,aAAa,GAAG,OAAO;CAWnC"}
1	+ {"version":3,"file":"element-string.d.ts","sourceRoot":"","sources":["../../../src/kmx/element-string.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAIvE,oBAAY,gBAAgB;IAC1B,IAAI,IAAI;IACR,IAAgC;IAChC,aAAkD;IAClD,OAAsC;CACvC;AAGD,qBAAa,WAAW;IACtB,KAAK,CAAC,EAAE,QAAQ,CAAC;IACjB,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,gBAAgB,CAAC;IACxB,OAAO,CAAC,CAAC,EAAE,WAAW;CAMvB;AAGD,qBAAa,aAAc,SAAQ,KAAK,CAAC,WAAW,CAAC;IACnD;;;OAGG;gBACS,QAAQ,EAAE,kBAAkB,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM;IA4EhJ,OAAO,CAAC,CAAC,EAAE,aAAa,GAAG,OAAO;CAWnC"}

package/build/src/kmx/element-string.js CHANGED Viewed

@@ -1,4 +1,6 @@
 import { constants } from '@keymanapp/ldml-keyboard-constants';
+import { ElementParser, ElementSegment, ElementType } from '../ldml-keyboard/pattern-parser.js';
+import { MATCH_HEX_ESCAPE, unescapeOneQuadString } from '../util/util.js';
 export var ElemElementFlags;
 (function (ElemElementFlags) {
     ElemElementFlags[ElemElementFlags["none"] = 0] = "none";
@@ -22,13 +24,24 @@ export class ElemElement {
 }
 ;
 export class ElementString extends Array {
-    constructor(strs, source, order, tertiary, tertiary_base, prebase) {
+    /**
+     * @param source if a string array, does not get reinterpreted as UnicodeSet. This is used with vars, etc. Or pass `["str"]` for an explicit 1-element elem.
+     * If it is a string, will be interpreted per reorder element rules.
+     */
+    constructor(sections, source, order, tertiary, tertiary_base, prebase) {
         super();
         //TODO-LDML: full UnicodeSet and parsing
         if (!source) {
             return;
         }
-        let items = Array.isArray(source) ? source : source.split("");
+        let items;
+        if (Array.isArray(source)) {
+            items = source.map(segment => new ElementSegment(segment, ElementType.string));
+        }
+        else {
+            // use segmenter to analyze each part
+            items = ElementParser.segment(source);
+        }
         let orders = order ? order.split(" ") : [];
         if (orders.length == 1) {
             orders = Array(items.length).fill(orders[0]);
@@ -47,14 +60,39 @@ export class ElementString extends Array {
         }
         for (let i = 0; i < items.length; i++) {
             let elem = new ElemElement();
-            elem.value = strs.allocString(items[i], true);
+            const item = items[i];
             let typeFlag = 0;
-            if (elem.value.isOneChar) {
-                typeFlag |= constants.elem_flags_type_char;
+            if (item.type === ElementType.uset) {
+                typeFlag |= constants.elem_flags_type_uset;
+                // TODO-LDML: err on max buffer size
+                const needRanges = sections.usetparser.sizeUnicodeSet(item.segment);
+                const uset = sections.usetparser.parseUnicodeSet(item.segment, needRanges);
+                if (!uset) {
+                    // TODO-LDML - error callback
+                    throw Error(`Could not parse uset ${item.segment}`);
+                }
+                elem.uset = sections.uset.allocUset(uset, sections);
+                elem.value = sections.strs.allocString('', true); // no string
+            }
+            else if (item.type === ElementType.codepoint || item.type === ElementType.escaped || item.type === ElementType.string) {
+                // some kind of a string
+                let str = item.segment;
+                if (item.type === ElementType.escaped && !MATCH_HEX_ESCAPE.test(str)) {
+                    str = unescapeOneQuadString(str);
+                    // TODO-LDML: any other escape forms here?
+                    elem.value = sections.strs.allocString(str, true);
+                }
+                else {
+                    elem.value = sections.strs.allocAndUnescapeString(str, true);
+                }
+                // Now did we end up with one char or no?
+                if (elem.value.isOneChar) {
+                    typeFlag |= constants.elem_flags_type_char;
+                }
+                else {
+                    typeFlag |= constants.elem_flags_type_str;
+                }
             }
-            else {
-                typeFlag |= constants.elem_flags_type_str;
-            } // TODO-LDML: UnicodeSet
             elem.order = orders.length ? parseInt(orders[i], 10) : 0;
             elem.tertiary = tertiaries.length ? parseInt(tertiaries[i], 10) : 0;
             elem.flags = ElemElementFlags.none |

package/build/src/kmx/element-string.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"element-string.js","sourceRoot":"","sources":["../../../src/kmx/element-string.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;~~AAG~~/D,MAAM,CAAN,IAAY,gBAKX;AALD,WAAY,gBAAgB;IAC1B,uDAAQ,CAAA;IACR,4CAAO,SAAS,CAAC,eAAe,UAAA,CAAA;IAChC,qDAAgB,SAAS,CAAC,wBAAwB,mBAAA,CAAA;IAClD,+CAAU,SAAS,CAAC,kBAAkB,aAAA,CAAA;AACxC,CAAC,EALW,gBAAgB,KAAhB,gBAAgB,QAK3B;AACD,CAAC;AAED,MAAM,OAAO,WAAW;IACtB,KAAK,CAAY,CAAC,kCAAkC;IACpD,IAAI,CAAY;IAChB,KAAK,CAAS,CAAC,oDAAoD;IACnE,QAAQ,CAAS,CAAC,oDAAoD;IACtE,KAAK,CAAmB;IACxB,OAAO,CAAC,CAAc;QACpB,OAAO,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK;YAC3B,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK;YACtB,CAAC,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ;YAC5B,CAAC,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,CAAC;IAC3B,CAAC;CACF;AACD,CAAC;AAED,MAAM,OAAO,aAAc,SAAQ,KAAkB;IACnD,YAAY,~~IAAU~~,EAAE,MAAyB,EAAE,KAAc,EAAE,QAAiB,EAAE,aAAsB,EAAE,OAAgB;~~QAC5H~~,KAAK,EAAE,CAAC;QACR,wCAAwC;QACxC,IAAG,CAAC,MAAM,EAAE;YACV,OAAO;SACR;QAED,IAAI,~~KAAK~~,~~GAAG~~,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,~~MAAM~~,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,~~EAAE~~,CAAC,CAAC;~~QAE9D~~,IAAI,MAAM,GAAkB,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1D,IAAG,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;YACrB,MAAM,GAAG,KAAK,CAAS,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;SACtD;QAED,IAAI,UAAU,GAAkB,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QACpE,IAAG,UAAU,CAAC,MAAM,IAAI,CAAC,EAAE;YACzB,UAAU,GAAG,KAAK,CAAS,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9D;QAED,IAAI,cAAc,GAAkB,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAClF,IAAG,cAAc,CAAC,MAAM,IAAI,CAAC,EAAE;YAC7B,cAAc,GAAG,KAAK,CAAS,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;SACtE;QAED,IAAI,QAAQ,GAAkB,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,IAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,EAAE;YACvB,QAAQ,GAAG,KAAK,CAAS,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;SAC1D;QAED,KAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,IAAI,IAAI,GAAG,IAAI,WAAW,EAAE,CAAC;YAC7B,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;~~YAC9C~~,IAAI,QAAQ,GAAG,CAAC,CAAC;~~YACjB~~,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;~~gBACxB~~,QAAQ,IAAI,SAAS,CAAC,oBAAoB,CAAC;~~aAC5C~~;~~iBAAM~~;~~gBACL~~,QAAQ,IAAI,SAAS,CAAC,mBAAmB,CAAC;~~aAC3C,CAAC,wBAAwB~~;~~YAC1B~~,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACzD,IAAI,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpE,IAAI,CAAC,KAAK,GAAG,gBAAgB,CAAC,IAAI;gBAChC,CAAC,gBAAgB,CAAC,IAAI,GAAG,QAAQ,CAAC;gBAClC,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC7F,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,2BAA2B,CAAC,CAAC,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACpF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SACjB;QAAA,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,CAAgB;QACtB,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,EAAE;YAC3B,OAAO,KAAK,CAAC;SACd;QACD,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACjC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;gBAC1B,OAAO,KAAK,CAAC;aACd;SACF;QACD,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AACD,CAAC"}
1	+ {"version":3,"file":"element-string.js","sourceRoot":"","sources":["../../../src/kmx/element-string.ts"],"names":[],"mappings":"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"}

package/build/src/kmx/kmx-plus-builder/build-elem.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ import { ElementString } from "../element-string.js";
 import { Elem } from "../kmx-plus.js";
 import { BUILDER_STRS } from "./build-strs.js";
 import { BUILDER_SECTION } from "./builder-section.js";
+import { BUILDER_USET } from "./build-uset.js";
 interface BUILDER_ELEM_ELEMENT {
     element: number;
     flags: number;
@@ -20,7 +21,7 @@ export interface BUILDER_ELEM extends BUILDER_SECTION {
     count: number;
     strings: BUILDER_ELEM_STRING[];
 }
-export declare function build_elem(source_elem: Elem, sect_strs: BUILDER_STRS): BUILDER_ELEM;
+export declare function build_elem(source_elem: Elem, sect_strs: BUILDER_STRS, sect_uset: BUILDER_USET): BUILDER_ELEM;
 export declare function build_elem_index(sect_elem: BUILDER_ELEM, value: ElementString): number;
 export {};
 //# sourceMappingURL=build-elem.d.ts.map

package/build/src/kmx/kmx-plus-builder/build-elem.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-elem.d.ts","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-elem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAoB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;~~AAMvD~~,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAC9B,MAAM,EAAE,aAAa,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC;AAcD,wBAAgB,UAAU,CAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,~~CA8CnF~~;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,UAU7E"}
1	+ {"version":3,"file":"build-elem.d.ts","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-elem.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAoB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAoB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAMjE,UAAU,oBAAoB;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,UAAU,mBAAmB;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,oBAAoB,EAAE,CAAC;IAC9B,MAAM,EAAE,aAAa,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,mBAAmB,EAAE,CAAC;CAChC;AAcD,wBAAgB,UAAU,CAAC,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,YAAY,GAAG,YAAY,CAsD5G;AAED,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,UAU7E"}

package/build/src/kmx/kmx-plus-builder/build-elem.js CHANGED Viewed

@@ -1,6 +1,7 @@
 import { constants } from "@keymanapp/ldml-keyboard-constants";
 import { ElementString } from "../element-string.js";
 import { build_strs_index } from "./build-strs.js";
+import { build_uset_index } from "./build-uset.js";
 ;
 ;
 ;
@@ -21,7 +22,7 @@ function binaryElemCompare(a, b) {
         return 1;
     return 0;
 }
-export function build_elem(source_elem, sect_strs) {
+export function build_elem(source_elem, sect_strs, sect_uset) {
     let result = {
         ident: constants.hex_section_id(constants.section.elem),
         size: 0,
@@ -37,7 +38,17 @@ export function build_elem(source_elem, sect_strs) {
             _value: item
         };
         res.items = item.map(v => {
-            let element = build_strs_index(sect_strs, v.value); // TODO-LDML: UnicodeSet
+            let element;
+            const type = (v.flags & constants.elem_flags_type);
+            if (type === constants.elem_flags_type_char || type == constants.elem_flags_type_str) {
+                element = build_strs_index(sect_strs, v.value);
+            }
+            else if (type == constants.elem_flags_type_uset) {
+                element = build_uset_index(sect_uset, v.uset);
+            }
+            else {
+                throw Error(`Internal Error: Unknown element type 0x${type.toString(16)}`);
+            }
             return {
                 element,
                 flags: v.flags | //

package/build/src/kmx/kmx-plus-builder/build-elem.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-elem.js","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-elem.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAErD,OAAO,EAAE,gBAAgB,EAAgB,MAAM,iBAAiB,CAAC;~~AAWhE~~,CAAC;AAOD,CAAC;AAQD,CAAC;AAEF,SAAS,iBAAiB,CAAC,CAAsB,EAAE,CAAsB;IACvE,KAAI,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QAC5D,IAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC,CAAC;QACpD,IAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC;QACnD,IAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;YAAE,OAAO,CAAC,CAAC,CAAC;QAClD,IAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK;YAAE,OAAO,CAAC,CAAC;KAClD;IACD,IAAG,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC,CAAC;IAC9C,IAAG,CAAC,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM;QAAE,OAAO,CAAC,CAAC;IAC7C,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,WAAiB,EAAE,SAAuB;~~IACnE~~,IAAI,MAAM,GAAiB;QACzB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;QACvD,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM;QACjC,OAAO,EAAE,EAAE,EAAE,kBAAkB;KAChC,CAAC;IAEF,MAAM,CAAC,OAAO,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;QAC9C,IAAI,GAAG,GAAwB;YAC7B,MAAM,EAAE,CAAC;YACT,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,IAAI;SACb,CAAC;QAEF,GAAG,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACvB,IAAI,OAAO,GAAG,gBAAgB,CAAC,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,~~wBAAwB~~;~~YAC5E~~,OAAO;gBACL,OAAO;gBACP,KAAK,EAAE,CAAC,CAAC,KAAK,GAA+D,EAAE;oBACzE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,yBAAyB,CAAC,GAAe,oDAAoD;oBAC1H,CAAC,CAAC,CAAC,CAAC,QAAQ,IAAI,CAAC,CAAC,IAAI,SAAS,CAAC,4BAA4B,CAAC;gBACnE,MAAM,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK;aACtB,CAAC;QACJ,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAEtD,sCAAsC;IAEtC,IAAI,MAAM,GAAG,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC;IAC/E,KAAI,IAAI,IAAI,IAAI,MAAM,CAAC,OAAO,EAAE;QAC9B,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,+BAA+B;YAC/B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SACjB;aAAM;YACL,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;YACrB,MAAM,IAAI,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,wBAAwB,CAAC;SAC5D;KACF;IAED,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC;IACrB,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,SAAuB,EAAE,KAAoB;IAC5E,IAAG,CAAC,CAAC,KAAK,YAAY,aAAa,CAAC,EAAE;QACpC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAC,KAAK,CAAC,CAAC;KAC5C;IAED,MAAM,MAAM,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACzE,IAAG,MAAM,GAAG,CAAC,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAC,KAAK,CAAC,CAAC;KACzD;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1	+ {"version":3,"file":"build-elem.js","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-elem.ts"],"names":[],"mappings":"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"}

package/build/src/kmx/kmx-plus-builder/build-strs.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-strs.d.ts","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-strs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAMvD,UAAU,iBAAiB;IAGzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,IAAI,GAAG,YAAY,CAqB1D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,~~UAcxE~~"}
1	+ {"version":3,"file":"build-strs.d.ts","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-strs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAMvD,UAAU,iBAAiB;IAGzB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAA;CACf;AAED;;GAEG;AACH,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,iBAAiB,EAAE,CAAC;CAC5B;AAED,wBAAgB,UAAU,CAAC,WAAW,EAAE,IAAI,GAAG,YAAY,CAqB1D;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,UAkBxE"}

package/build/src/kmx/kmx-plus-builder/build-strs.js CHANGED Viewed

@@ -26,7 +26,12 @@ export function build_strs(source_strs) {
  */
 export function build_strs_index(sect_strs, value) {
     if (!(value instanceof StrsItem)) {
-        throw new Error('unexpected value ' + value);
+        if (value === null) {
+            throw new Error('unexpected null StrsItem, use an empty string instead');
+        }
+        else {
+            throw new Error('unexpected StrsItem value ' + value);
+        }
     }
     if (value.isOneChar) {
         return value.char;

package/build/src/kmx/kmx-plus-builder/build-strs.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-strs.js","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-strs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAQ,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAa/C,CAAC;AAQD,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,WAAiB;IAC1C,IAAI,MAAM,GAAiB;QACzB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;QACvD,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM;QACjC,KAAK,EAAE,EAAE,EAAE,eAAe;KAC3B,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE7E,IAAI,MAAM,GAAG,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC;IAC/E,yBAAyB;IACzB,KAAI,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,gDAAgD;KAChF;IACD,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC;IAErB,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAuB,EAAE,KAAe;IACvE,IAAG,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC,EAAE;QAC/B,MAAM,IAAI,KAAK,CAAC,~~mBAAmB~~,GAAE,KAAK,CAAC,CAAC;~~KAC7C~~;IAED,IAAG,KAAK,CAAC,SAAS,EAAE;QAClB,OAAO,KAAK,CAAC,IAAI,CAAC;KACnB;IAED,IAAI,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC;IACtE,IAAG,MAAM,GAAG,CAAC,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAC/D;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}
1	+ {"version":3,"file":"build-strs.js","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-strs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAQ,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAa/C,CAAC;AAQD,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,WAAiB;IAC1C,IAAI,MAAM,GAAiB;QACzB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;QACvD,IAAI,EAAE,CAAC;QACP,OAAO,EAAE,CAAC;QACV,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM;QACjC,KAAK,EAAE,EAAE,EAAE,eAAe;KAC3B,CAAC;IAEF,MAAM,CAAC,KAAK,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAC,MAAM,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACvH,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAE7E,IAAI,MAAM,GAAG,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,gBAAgB,GAAG,MAAM,CAAC,KAAK,CAAC;IAC/E,yBAAyB;IACzB,KAAI,IAAI,IAAI,IAAI,MAAM,CAAC,KAAK,EAAE;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,MAAM,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,gDAAgD;KAChF;IACD,MAAM,CAAC,IAAI,GAAG,MAAM,CAAC;IAErB,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAuB,EAAE,KAAe;IACvE,IAAG,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC,EAAE;QAC/B,IAAI,KAAK,KAAK,IAAI,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;SAC1E;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAE,KAAK,CAAC,CAAC;SACtD;KACF;IAED,IAAG,KAAK,CAAC,SAAS,EAAE;QAClB,OAAO,KAAK,CAAC,IAAI,CAAC;KACnB;IAED,IAAI,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC;IACtE,IAAG,MAAM,GAAG,CAAC,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAC/D;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/build/src/kmx/kmx-plus-builder/build-uset.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { KMXPlusData, StrsItem } from "../kmx-plus.js";
+import { KMXPlusData, StrsItem, UsetItem } from "../kmx-plus.js";
 import { BUILDER_STRS } from "./build-strs.js";
 import { BUILDER_SECTION } from "./builder-section.js";
 interface BUILDER_USET_USET {
@@ -21,5 +21,9 @@ export interface BUILDER_USET extends BUILDER_SECTION {
 * Builder for the 'uset' section
 */
 export declare function build_uset(kmxplus: KMXPlusData, sect_strs: BUILDER_STRS): BUILDER_USET;
+/**
+ * @returns uset index
+ */
+export declare function build_uset_index(sect_uset: BUILDER_USET, value: UsetItem): number;
 export {};
 //# sourceMappingURL=build-uset.d.ts.map

package/build/src/kmx/kmx-plus-builder/build-uset.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-uset.d.ts","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-uset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;~~AACvD~~,OAAO,EAAoB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,UAAU,iBAAiB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,UAAU,kBAAkB;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED;;EAEE;AACF,wBAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,GAAK,YAAY,CAqCxF"}
1	+ {"version":3,"file":"build-uset.d.ts","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-uset.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAoB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAGvD,UAAU,iBAAiB;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,UAAU,kBAAkB;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,WAAW,YAAa,SAAQ,eAAe;IACnD,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,iBAAiB,EAAE,CAAC;IAC3B,MAAM,EAAE,kBAAkB,EAAE,CAAC;CAC9B;AAED;;EAEE;AACF,wBAAgB,UAAU,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,YAAY,GAAK,YAAY,CAqCxF;AAGD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,QAAQ,UAcxE"}

package/build/src/kmx/kmx-plus-builder/build-uset.js CHANGED Viewed

@@ -1,4 +1,5 @@
 import { constants } from "@keymanapp/ldml-keyboard-constants";
+import { UsetItem } from "../kmx-plus.js";
 import { build_strs_index } from "./build-strs.js";
 ;
 ;
@@ -37,4 +38,22 @@ export function build_uset(kmxplus, sect_strs) {
     };
     return uset;
 }
+/**
+ * @returns uset index
+ */
+export function build_uset_index(sect_uset, value) {
+    if (!(value instanceof UsetItem)) {
+        if (value === null) {
+            throw new Error('unexpected null UsetItem');
+        }
+        else {
+            throw new Error('Expected UsetItem but got ' + value);
+        }
+    }
+    let result = sect_uset.usets.findIndex(v => v._pattern.value === value.str.value);
+    if (result < 0) {
+        throw new Error('unexpectedly missing UsetItem ' + value.uset.toString());
+    }
+    return result;
+}
 //# sourceMappingURL=build-uset.js.map

package/build/src/kmx/kmx-plus-builder/build-uset.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build-uset.js","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-uset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;~~AAE~~/D,OAAO,EAAE,gBAAgB,EAAgB,MAAM,iBAAiB,CAAC;AAShE,CAAC;AAYD,CAAC;AAEF;;EAEE;AACF,MAAM,UAAU,UAAU,CAAC,OAAoB,EAAE,SAAuB;IACtE,IAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IAED,8BAA8B;IAC9B,MAAM,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;SAClC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjC,MAAM,MAAM,GAA0B,EAAE,CAAC;IAEzC,MAAM,KAAK,GAAyB,EAAE,CAAC;IAEvC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAClB,KAAK,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,MAAM,CAAC,MAAM;YACpB,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;YACtB,OAAO,EAAE,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC;YAC7C,QAAQ,EAAE,GAAG,CAAC,GAAG;SAClB,CAAC,CAAC;QACH,oBAAoB;QACpB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAiB;QACzB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;QACvD,IAAI,EAAE,SAAS,CAAC,WAAW;YACzB,CAAC,SAAS,CAAC,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC;YAC3C,CAAC,SAAS,CAAC,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;QAC/C,SAAS,EAAE,KAAK,CAAC,MAAM;QACvB,UAAU,EAAE,MAAM,CAAC,MAAM;QACzB,KAAK;QACL,MAAM;QACN,OAAO,EAAE,CAAC;KACX,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC"}
1	+ {"version":3,"file":"build-uset.js","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/build-uset.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAyB,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAgB,MAAM,iBAAiB,CAAC;AAShE,CAAC;AAYD,CAAC;AAEF;;EAEE;AACF,MAAM,UAAU,UAAU,CAAC,OAAoB,EAAE,SAAuB;IACtE,IAAG,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE;QACxB,OAAO,IAAI,CAAC;KACb;IAED,8BAA8B;IAC9B,MAAM,KAAK,GAAG,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC;SAClC,IAAI,CAAC,CAAC,CAAC,EAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjC,MAAM,MAAM,GAA0B,EAAE,CAAC;IAEzC,MAAM,KAAK,GAAyB,EAAE,CAAC;IAEvC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QAClB,KAAK,CAAC,IAAI,CAAC;YACT,KAAK,EAAE,MAAM,CAAC,MAAM;YACpB,KAAK,EAAE,GAAG,CAAC,IAAI,CAAC,MAAM;YACtB,OAAO,EAAE,gBAAgB,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC;YAC7C,QAAQ,EAAE,GAAG,CAAC,GAAG;SAClB,CAAC,CAAC;QACH,oBAAoB;QACpB,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IACzE,CAAC,CAAC,CAAC;IAEH,MAAM,IAAI,GAAiB;QACzB,KAAK,EAAE,SAAS,CAAC,cAAc,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC;QACvD,IAAI,EAAE,SAAS,CAAC,WAAW;YACzB,CAAC,SAAS,CAAC,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC;YAC3C,CAAC,SAAS,CAAC,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC;QAC/C,SAAS,EAAE,KAAK,CAAC,MAAM;QACvB,UAAU,EAAE,MAAM,CAAC,MAAM;QACzB,KAAK;QACL,MAAM;QACN,OAAO,EAAE,CAAC;KACX,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC;AAGD;;GAEG;AACH,MAAM,UAAU,gBAAgB,CAAC,SAAuB,EAAE,KAAe;IACvE,IAAG,CAAC,CAAC,KAAK,YAAY,QAAQ,CAAC,EAAE;QAC/B,IAAI,KAAK,KAAK,IAAI,EAAE;YAClB,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;SAC7C;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,4BAA4B,GAAE,KAAK,CAAC,CAAC;SACtD;KACF;IAED,IAAI,MAAM,GAAG,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,KAAK,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IAClF,IAAG,MAAM,GAAG,CAAC,EAAE;QACb,MAAM,IAAI,KAAK,CAAC,gCAAgC,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;KAC3E;IACD,OAAO,MAAM,CAAC;AAChB,CAAC"}

package/build/src/kmx/kmx-plus-builder/kmx-plus-builder.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"kmx-plus-builder.d.ts","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/kmx-plus-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAE3D,KAAK,YAAY,GAAG,YAAY,CAAC;AAGjC,KAAK,eAAe,GAAG;IAErB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,OAAO,CAAC,IAAI,CAAc;IAG1B,IAAI,EAAG,eAAe,CAEpB;gBAEU,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO;IAK5C,OAAO,IAAI,UAAU;~~IAyB5B~~,OAAO,CAAC,KAAK;~~IA8Bb~~,OAAO,CAAC,aAAa;IAkCrB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,YAAY;CAWrB"}
1	+ {"version":3,"file":"kmx-plus-builder.d.ts","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/kmx-plus-builder.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAG7C,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAE,YAAY,EAAc,MAAM,iBAAiB,CAAC;AAE3D,KAAK,YAAY,GAAG,YAAY,CAAC;AAGjC,KAAK,eAAe,GAAG;IAErB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;IACpB,IAAI,CAAC,EAAE,YAAY,CAAC;CACrB,CAAC;AAEF,MAAM,CAAC,OAAO,OAAO,cAAc;IACjC,OAAO,CAAC,IAAI,CAAc;IAG1B,IAAI,EAAG,eAAe,CAEpB;gBAEU,IAAI,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO;IAK5C,OAAO,IAAI,UAAU;IA0B5B,OAAO,CAAC,KAAK;IA+Bb,OAAO,CAAC,aAAa;IAkCrB,OAAO,CAAC,kBAAkB;IAU1B,OAAO,CAAC,WAAW;IAWnB,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,YAAY;CAWrB"}

package/build/src/kmx/kmx-plus-builder/kmx-plus-builder.js CHANGED Viewed

@@ -40,6 +40,7 @@ export default class KMXPlusBuilder {
         this.emitSection(file, this.file.COMP_PLUS_STRS, this.sect.strs);
         this.emitStrings(file);
         this.emitSection(file, this.file.COMP_PLUS_TRAN, this.sect.tran);
+        this.emitSection(file, this.file.COMP_PLUS_USET, this.sect.uset);
         this.emitSection(file, this.file.COMP_PLUS_VARS, this.sect.vars);
         this.emitSection(file, this.file.COMP_PLUS_VKEY, this.sect.vkey);
         return file;
@@ -50,8 +51,8 @@ export default class KMXPlusBuilder {
         // reference them. However, they will be emitted in alpha order.
         this.sect.strs = build_strs(this.file.kmxplus.strs);
         this.sect.list = build_list(this.file.kmxplus.list, this.sect.strs);
-        this.sect.elem = build_elem(this.file.kmxplus.elem, this.sect.strs);
         this.sect.uset = build_uset(this.file.kmxplus, this.sect.strs);
+        this.sect.elem = build_elem(this.file.kmxplus.elem, this.sect.strs, this.sect.uset);
         const build_bksp = build_tran;
         this.sect.bksp = build_bksp(this.file.kmxplus.bksp, this.sect.strs, this.sect.elem);
         this.sect.disp = build_disp(this.file.kmxplus, this.sect.strs);
@@ -61,6 +62,7 @@ export default class KMXPlusBuilder {
         this.sect.meta = build_meta(this.file.kmxplus, this.sect.strs);
         this.sect.name = build_name(this.file.kmxplus, this.sect.strs);
         this.sect.tran = build_tran(this.file.kmxplus.tran, this.sect.strs, this.sect.elem);
+        this.sect.uset = build_uset(this.file.kmxplus, this.sect.strs);
         this.sect.vars = build_vars(this.file.kmxplus, this.sect.strs);
         this.sect.vkey = build_vkey(this.file.kmxplus);
         // Finalize the sect (index) section

package/build/src/kmx/kmx-plus-builder/kmx-plus-builder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"kmx-plus-builder.js","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/kmx-plus-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAgB,MAAM,oCAAoC,CAAC;AAE7E,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAwB3D,MAAM,CAAC,OAAO,OAAO,cAAc;IACzB,IAAI,CAAc;IAC1B,8BAA8B;IAE9B,IAAI,GAAqB,EAExB,CAAC;IAEF,YAAY,IAAiB,EAAE,WAAoB;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,gCAAgC;IAClC,CAAC;IAEM,OAAO;QACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,IAAI,GAAe,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEhD,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,mCAAmC;QACnC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAEjE,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,KAAK;QACX,4CAA4C;QAE5C,qFAAqF;QACrF,gEAAgE;QAChE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACpD,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpE,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,~~CAAC,IAAI,~~EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;~~QACpE~~,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;~~QAE/D~~,MAAM,UAAU,GAAG,UAAU,CAAC;QAE9B,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/E,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/E,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACpF,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAE/C,oCAAoC;QAEpC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,UAAU,EAAE,CAAC;QAC9B,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,oBAAoB;QAC1C,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;IAC9B,CAAC;IAEO,aAAa;QACnB,iBAAiB;QAEjB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QAEzB,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,OAAgB,EAAE,EAAE;YAC1D,MAAM,IAAI,GAAkB,SAAS,CAAC,OAAO,CAAe,OAAO,CAAC,CAAC;YACrE,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,KAAK,MAAM,EAAE;gBACrC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;aACxB;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,WAAW,GAAG,SAAS,CAAC,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;QAEhG,IAAI,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;QACjC,qEAAqE;QACrE,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEzD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;IAChC,CAAC;IAEO,kBAAkB,CAAC,IAAqB,EAAE,MAAc;QAC9D,IAAG,CAAC,IAAI,EAAE;YACR,8BAA8B;YAC9B,OAAO,MAAM,CAAC;SACf;QACD,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;QACtB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,EAAC,IAAI,EAAE,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,CAAC,CAAC;QAC9D,OAAO,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC;IAC5B,CAAC;IAEO,WAAW,CAAC,IAAgB,EAAE,IAAS,EAAE,IAAqB;QACpE,IAAG,IAAI,EAAE;YACP,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,EAAE;gBAC1B,wEAAwE;gBACxE,MAAM,IAAI,UAAU,CAAC,2BAA2B,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,IAAI,gCAAgC,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC;aAC9J;YACD,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SAC7B;IACH,CAAC;IAEO,WAAW,CAAC,IAAgB;QAClC,KAAI,IAAI,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACpC,IAAG,IAAI,CAAC,MAAM,KAAK,EAAE,EAAE;gBACrB,oDAAoD;gBACpD,IAAI,IAAI,GAAG,CAAC,CAAC,QAAQ,CAAC;gBACtB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAClE;iBAAM;gBACL,IAAI,IAAI,GAAG,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;gBACzC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;aAC5E;SACF;IACH,CAAC;IAEO,YAAY,CAAC,IAAgB;QACnC,IAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE;YACjB,KAAI,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBACrC,IAAG,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE;oBACvB,IAAI,uBAAuB,GAAG,IAAI,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;oBAC9F,IAAI,CAAC,GAAG,CAAC,uBAAuB,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;iBAC5F;aACF;SACF;IACH,CAAC;CAEF"}
1	+ {"version":3,"file":"kmx-plus-builder.js","sourceRoot":"","sources":["../../../../src/kmx/kmx-plus-builder/kmx-plus-builder.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,aAAa,CAAC;AAEjC,OAAO,EAAE,SAAS,EAAgB,MAAM,oCAAoC,CAAC;AAE7E,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC3D,OAAO,EAAgB,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAwB3D,MAAM,CAAC,OAAO,OAAO,cAAc;IACzB,IAAI,CAAc;IAC1B,8BAA8B;IAE9B,IAAI,GAAqB,EAExB,CAAC;IAEF,YAAY,IAAiB,EAAE,WAAoB;QACjD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,gCAAgC;IAClC,CAAC;IAEM,OAAO;QACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC9B,IAAI,IAAI,GAAe,IAAI,UAAU,CAAC,QAAQ,CAAC,CAAC;QAEhD,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,mCAAmC;QACnC,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;QACxB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACvB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjE,IAAI,CAAC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"}

package/build/src/kmx/kmx-plus.d.ts CHANGED Viewed

@@ -8,13 +8,19 @@ export declare class Section {
  * Sections which are needed as dependencies.
  */
 export interface DependencySections extends KMXPlusData {
+    /** needed for UnicodeSet parsing */
+    usetparser?: UnicodeSetParser;
 }
 export declare class Sect extends Section {
 }
 export declare class Elem extends Section {
     strings: ElementString[];
-    constructor(strs: Strs);
-    allocElementString(strs: Strs, source: string | string[], order?: string, tertiary?: string, tertiary_base?: string, prebase?: string): ElementString;
+    constructor(sections: DependencySections);
+    /**
+     * @param source if a string array, does not get reinterpreted as UnicodeSet. This is used with vars, etc. Or pass `["str"]` for an explicit 1-element elem.
+     * If it is a string, will be interpreted per reorder element ruls.
+     */
+    allocElementString(sections: DependencySections, source: string | string[], order?: string, tertiary?: string, tertiary_base?: string, prebase?: string): ElementString;
 }
 export declare class Loca extends Section {
     locales: StrsItem[];

package/build/src/kmx/kmx-plus.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"kmx-plus.d.ts","sourceRoot":"","sources":["../../../src/kmx/kmx-plus.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACnC,OAAO,EAAE,gBAAgB,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAOvE,qBAAa,OAAO;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,kBAAmB,SAAQ,WAAW;~~CACtD~~;AAID,qBAAa,IAAK,SAAQ,OAAO;CAAG;AAMpC,qBAAa,IAAK,SAAQ,OAAO;IAC/B,OAAO,EAAE,aAAa,EAAE,CAAM;gBAClB,~~IAAI~~,EAAE,~~IAAI~~;~~IAItB~~,kBAAkB,CAAC,~~IAAI~~,EAAE,~~IAAI~~,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,aAAa;~~CAStJ~~;AAMD,qBAAa,IAAK,SAAQ,OAAO;IAC/B,OAAO,EAAE,QAAQ,EAAE,CAAM;CAC1B;AAID,oBAAY,gBAAgB;IAC1B,IAAI,IAAI;IACR,QAAgD;IAChD,gBAAgE;IAChE,gBAAgE;CACjE;AAED,oBAAY,sBAAsB;IAAG,GAAG,QAAM;IAAE,GAAG,QAAM;IAAE,KAAK,UAAQ;CAAE;AAE1E,qBAAa,IAAK,SAAQ,OAAO;IAC/B,MAAM,EAAE,QAAQ,CAAC;IACjB,OAAO,EAAE,QAAQ,CAAC;IAClB,MAAM,EAAE,QAAQ,CAAC;IACjB,aAAa,EAAE,QAAQ,CAAC;IACxB,SAAS,EAAE,QAAQ,CAAC;IACpB,OAAO,EAAE,QAAQ,CAAC;IAClB,QAAQ,EAAE,gBAAgB,CAAC;CAC5B;AAID,qBAAa,IAAK,SAAQ,OAAO;IAC/B,KAAK,EAAE,QAAQ,EAAE,CAAM;CACxB;AAID;;;GAGG;AACH,qBAAa,QAAQ;IACnB,mBAAmB;IACnB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,0EAA0E;IAC1E,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;gBAEX,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM;IAaxC,SAAS,CAAC,CAAC,EAAE,QAAQ,GAAG,MAAM;IAI9B,MAAM,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,GAAG,MAAM;IAUxD,IAAI,SAAS,YAEZ;CACF;AAED;;GAEG;AACH,qBAAa,YAAa,SAAQ,QAAQ;gBAC5B,KAAK,EAAE,MAAM;CAM1B;AAED,qBAAa,IAAK,SAAQ,OAAO;IAC/B,OAAO,EAAE,QAAQ,EAAE,CAAwB;IAC3C;;;;;OAKG;IACH,sBAAsB,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ;IAGhE;;;;;OAKG;IACH,WAAW,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,GAAG,QAAQ;CAsBtD;AAED;;GAEG;AACH,qBAAa,IAAK,SAAQ,OAAO;IAC/B,UAAU,IAAK,MAAM;IAGrB,OAAO,EAAE,QAAQ,CAAC;IAClB,OAAO,EAAE,aAAa,EAAE,CAAM;IAC9B,IAAI,EAAE,UAAU,EAAE,CAAM;IACxB,WAAW,EAAE,cAAc,EAAE,CAAM;IAEnC;;;OAGG;IACH,KAAK,IAAK,OAAO;IAajB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,MAAM;IAUjE,qBAAqB,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,MAAM;IAU1E,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,MAAM;IAUpE,uBAAuB,CAAC,EAAE,EAAE,MAAM,GAAG,MAAM;IAG3C,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,GAAG,MAAM;IA8BrE;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,YAAY;CAW5B;AAED;;;GAGG;AACH,qBAAa,QAAS,SAAQ,OAAO;IACnC,EAAE,EAAE,QAAQ,CAAC;IACb,KAAK,EAAE,QAAQ,CAAC;gBAEJ,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB;IAMnE,KAAK,IAAK,OAAO;CAGlB;AAED,qBAAa,cAAe,SAAQ,QAAQ;gBAC9B,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,EAAE,UAAU,EAAE,gBAAgB;~~IAOjG~~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"}
1	+ {"version":3,"file":"kmx-plus.d.ts","sourceRoot":"","sources":["../../../src/kmx/kmx-plus.ts"],"names":[],"mappings":"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"}

package/build/src/kmx/kmx-plus.js CHANGED Viewed

@@ -18,12 +18,16 @@ export class Sect extends Section {
 // 'elem'
 export class Elem extends Section {
     strings = [];
-    constructor(strs) {
+    constructor(sections) {
         super();
-        this.strings.push(new ElementString(strs, '')); // C7043: null element string
+        this.strings.push(new ElementString(sections, '')); // C7043: null element string
     }
-    allocElementString(strs, source, order, tertiary, tertiary_base, prebase) {
-        let s = new ElementString(strs, source, order, tertiary, tertiary_base, prebase);
+    /**
+     * @param source if a string array, does not get reinterpreted as UnicodeSet. This is used with vars, etc. Or pass `["str"]` for an explicit 1-element elem.
+     * If it is a string, will be interpreted per reorder element ruls.
+     */
+    allocElementString(sections, source, order, tertiary, tertiary_base, prebase) {
+        let s = new ElementString(sections, source, order, tertiary, tertiary_base, prebase);
         let result = this.strings.find(item => item.isEqual(s));
         if (result === undefined) {
             result = s;
@@ -290,8 +294,9 @@ export class VarsItem extends Section {
 export class UnicodeSetItem extends VarsItem {
     constructor(id, value, sections, usetparser) {
         super(id, value, sections);
-        // TODO-LDML: buffer size
-        this.unicodeSet = usetparser.parseUnicodeSet(value, 100);
+        // TODO-LDML: err on max buffer size
+        const needRanges = sections.usetparser.sizeUnicodeSet(value);
+        this.unicodeSet = sections.usetparser.parseUnicodeSet(value, needRanges);
         // _unicodeSet may be null, indicating this is invalid.
         // A message will have been set in that case.
     }
@@ -304,7 +309,7 @@ export class UnicodeSetItem extends VarsItem {
 export class SetVarItem extends VarsItem {
     constructor(id, value, sections) {
         super(id, value.join(' '), sections);
-        this.items = sections.elem.allocElementString(sections.strs, value);
+        this.items = sections.elem.allocElementString(sections, value);
     }
     items;
     valid() {

package/build/src/kmx/kmx-plus.js.map CHANGED Viewed

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

package/build/src/ldml-keyboard/pattern-parser.d.ts CHANGED Viewed

@@ -94,6 +94,8 @@ export declare class ElementSegment {
      * @param type type of segment. Will be calculated if not provided.
      */
     constructor(segment: string, type?: ElementType);
+    /** unescaped format */
+    get unescaped(): string;
 }
 /** Class for helping with Element strings (i.e. reorder) */
 export declare class ElementParser {

package/build/src/ldml-keyboard/pattern-parser.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pattern-parser.d.ts","sourceRoot":"","sources":["../../../src/ldml-keyboard/pattern-parser.ts"],"names":[],"mappings":"AAAA;;GAEG;~~AAmBH~~;;GAEG;AACH,qBAAa,YAAY;IACvB;;OAEG;IACH,gBAAuB,EAAE,SAAa;IAEtC;;OAEG;IACH,gBAAuB,UAAU,YAAY;IAE7C;;OAEG;IACH,gBAAuB,aAAa,OAAO;IAE3C;;OAEG;IACH,gBAAuB,SAAS,SAAmC;IAEnE;;;;OAIG;WACW,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;CAGnD;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB;;OAEG;IACH,gBAAuB,EAAE,SAAa;IAEtC;;OAEG;IACH,gBAAuB,gBAAgB,SAA+B;IAEtE;;OAEG;IACH,gBAAuB,aAAa,SAAiC;IAErE;;OAEG;IACH,gBAAuB,qBAAqB,SAAqC;IAEjF;;;OAGG;IACH,gBAAuB,oBAAoB,SAAoC;IAE/E;;;;OAIG;WACW,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;IAIxD;;;;OAIG;WACW,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;IAIrD;;;;OAIG;WACW,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;IAI5D;;;;OAIG;WACW,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;CAGjD;AAED,kCAAkC;AAClC,oBAAY,WAAW;IACrB,SAAS,MAAM;IACf,OAAO,OAAM;IACb,IAAI,MAAM;IACV,MAAM,MAAM;CACb;AAED,gDAAgD;AAChD,qBAAa,cAAc;IAMN,OAAO,EAAE,MAAM;IALlC,SAAgB,IAAI,EAAE,WAAW,CAAC;IAClC;;;OAGG;gBACgB,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW;~~CAWvD~~;AAED,4DAA4D;AAC5D,qBAAa,aAAa;IACxB;;;;0DAIsD;IACtD,gBAAuB,4BAA4B,SAAgB;IAEnE,8EAA8E;IAC9E,gBAAuB,sBAAsB,~~SACoB~~;~~IAEjE~~,kEAAkE;IAClE,gBAAuB,UAAU,SAAS;IAE1C,qEAAqE;IACrE,gBAAuB,aAAa,SAAU;IAE9C,0CAA0C;WAC5B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE;~~CAOrD~~"}
1	+ {"version":3,"file":"pattern-parser.d.ts","sourceRoot":"","sources":["../../../src/ldml-keyboard/pattern-parser.ts"],"names":[],"mappings":"AAAA;;GAEG;AAqBH;;GAEG;AACH,qBAAa,YAAY;IACvB;;OAEG;IACH,gBAAuB,EAAE,SAAa;IAEtC;;OAEG;IACH,gBAAuB,UAAU,YAAY;IAE7C;;OAEG;IACH,gBAAuB,aAAa,OAAO;IAE3C;;OAEG;IACH,gBAAuB,SAAS,SAAmC;IAEnE;;;;OAIG;WACW,aAAa,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;CAGnD;AAED;;GAEG;AACH,qBAAa,cAAc;IACzB;;OAEG;IACH,gBAAuB,EAAE,SAAa;IAEtC;;OAEG;IACH,gBAAuB,gBAAgB,SAA+B;IAEtE;;OAEG;IACH,gBAAuB,aAAa,SAAiC;IAErE;;OAEG;IACH,gBAAuB,qBAAqB,SAAqC;IAEjF;;;OAGG;IACH,gBAAuB,oBAAoB,SAAoC;IAE/E;;;;OAIG;WACW,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;IAIxD;;;;OAIG;WACW,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;IAIrD;;;;OAIG;WACW,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;IAI5D;;;;OAIG;WACW,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE;CAGjD;AAED,kCAAkC;AAClC,oBAAY,WAAW;IACrB,SAAS,MAAM;IACf,OAAO,OAAM;IACb,IAAI,MAAM;IACV,MAAM,MAAM;CACb;AAED,gDAAgD;AAChD,qBAAa,cAAc;IAMN,OAAO,EAAE,MAAM;IALlC,SAAgB,IAAI,EAAE,WAAW,CAAC;IAClC;;;OAGG;gBACgB,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,WAAW;IAYtD,uBAAuB;IACvB,IAAI,SAAS,IAAK,MAAM,CAUvB;CACF;AAED,4DAA4D;AAC5D,qBAAa,aAAa;IACxB;;;;0DAIsD;IACtD,gBAAuB,4BAA4B,SAAgB;IAEnE,8EAA8E;IAC9E,gBAAuB,sBAAsB,SACyE;IAEtH,kEAAkE;IAClE,gBAAuB,UAAU,SAAS;IAE1C,qEAAqE;IACrE,gBAAuB,aAAa,SAAU;IAE9C,0CAA0C;WAC5B,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE;CAyBrD"}

package/build/src/ldml-keyboard/pattern-parser.js CHANGED Viewed

@@ -1,6 +1,7 @@
 /**
  * Utilities for transform and marker processing
  */
+import { MATCH_QUAD_ESCAPE, isOneChar, unescapeOneQuadString, unescapeString } from "../util/util.js";
 /**
  * Helper function for extracting matched items
  * @param str input string
@@ -134,6 +135,20 @@ export class ElementSegment {
             this.type = ElementType.codepoint;
         }
     }
+    /** unescaped format */
+    get unescaped() {
+        if (this.type !== ElementType.escaped) {
+            return this.segment;
+        }
+        else {
+            if (MATCH_QUAD_ESCAPE.test(this.segment)) {
+                return unescapeOneQuadString(this.segment);
+            }
+            else {
+                return unescapeString(this.segment);
+            }
+        }
+    }
 }
 ;
 /** Class for helping with Element strings (i.e. reorder) */
@@ -145,7 +160,7 @@ export class ElementParser {
      * mis-segmented into `[[a-z]`, `-`, `[aeiou]`, `]` */
     static MATCH_NESTED_SQUARE_BRACKETS = /\[[^\]]*\[/;
     /** Match (segment) UnicodeSets OR hex escapes OR single Unicode codepoints */
-    static MATCH_ELEMENT_SEGMENTS = /(?:\[[^\]]*\]|\\u[0-9a-fA-F]{4}|\\u\{[0-9a-fA-F]{1,6}\}|.)/gu;
+    static MATCH_ELEMENT_SEGMENTS = /(?:\[[^\]]*\]|\\u[0-9a-fA-F]{4}|\\u\{[0-9a-fA-F]{1,6}\}|\\u\{(?:[0-9a-fA-F]{1,6})(?: [0-9a-fA-F]{1,6}){1,}\}|.)/gu;
     /** Does it start with a UnicodeSet? Used to test the segments. */
     static MATCH_USET = /^\[/;
     /** Does it start with an escaped char? Used to test the segments. */
@@ -155,8 +170,28 @@ export class ElementParser {
         if (this.MATCH_NESTED_SQUARE_BRACKETS.test(str)) {
             throw Error(`Unsupported: nested square brackets in element segment: ${str}`);
         }
-        return str.match(ElementParser.MATCH_ELEMENT_SEGMENTS)
-            .map(str => new ElementSegment(str));
+        const list = [];
+        for (let m of str.match(ElementParser.MATCH_ELEMENT_SEGMENTS)) {
+            const e = new ElementSegment(m);
+            if (e.type === ElementType.escaped) {
+                // unescape
+                const { unescaped } = e;
+                if (isOneChar(unescaped)) {
+                    list.push(e);
+                }
+                else {
+                    // need to split the escaped segment, \u{41 42} -> \u{41}, \u{42}
+                    for (let s of unescaped) {
+                        list.push(new ElementSegment(`\\u{${s.codePointAt(0).toString(16)}}`));
+                    }
+                }
+            }
+            else {
+                // all others
+                list.push(e);
+            }
+        }
+        return list;
     }
 }
 ;

package/build/src/ldml-keyboard/pattern-parser.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"pattern-parser.js","sourceRoot":"","sources":["../../../src/ldml-keyboard/pattern-parser.ts"],"names":[],"mappings":"AAAA;;GAEG;~~AAGH~~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~~8DAA8D~~,CAAC;~~IAEjE~~,kEAAkE;IAC3D,MAAM,CAAU,UAAU,GAAG,KAAK,CAAC;IAE1C,qEAAqE;IAC9D,MAAM,CAAU,aAAa,GAAG,MAAM,CAAC;IAE9C,0CAA0C;IACnC,MAAM,CAAC,OAAO,CAAC,GAAW;QAC/B,IAAI,IAAI,CAAC,4BAA4B,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YAC/C,MAAM,KAAK,CAAC,2DAA2D,GAAG,EAAE,CAAC,CAAC;SAC/E;QACD,~~OAAO~~,GAAG,CAAC,KAAK,CAAC,aAAa,CAAC,sBAAsB,CAAC;~~aACnD~~,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC;~~IACzC~~,CAAC;;AACF,CAAC"}
1	+ {"version":3,"file":"pattern-parser.js","sourceRoot":"","sources":["../../../src/ldml-keyboard/pattern-parser.ts"],"names":[],"mappings":"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"}

package/build/src/ldml-keyboard/unicodeset-parser-api.d.ts CHANGED Viewed

@@ -2,14 +2,32 @@
  * Abstraction for an interface capable of parsing a UnicodeSet
  */
 export interface UnicodeSetParser {
-    parseUnicodeSet(pattern: string, bufferSize: number): UnicodeSet | null;
+    /**
+     * Parse a UnicodeSet into ranges
+     * @param pattern string to parse such as `[a-z]`
+     * @param rangeCount number of ranges to allow for
+     */
+    parseUnicodeSet(pattern: string, rangeCount: number): UnicodeSet | null;
+    /**
+     * Calculate the number of ranges in a UnicodeSet
+     * @param pattern string to parse such as `[a-z]`
+     * @returns number of ranges, or -1 (with callback-reported err) on err
+     */
+    sizeUnicodeSet(pattern: string): number;
 }
 /**
- * Represents a parsed UnicodeSet
+ * Parsed UnicodeSet, return value of of parseUnicodeSet()
  */
 export declare class UnicodeSet {
     pattern: string;
     ranges: number[][];
+    /**
+     * A UnicodeSet in range form.
+     * For example, `[ħa-z]` will parse to
+     * ranges = `[[0x41, 0x7A], [0x0127, 0x0127]]` meaning `[a,z], [ħ,ħ]`
+     * @param pattern the pattern per UnicodeSet syntax such as `[a-z]`
+     * @param ranges array of 2-element arrays, 'start' and 'end'.
+     */
     constructor(pattern: string, ranges: number[][]);
     /**
      * Number of ranges

package/build/src/ldml-keyboard/unicodeset-parser-api.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"unicodeset-parser-api.d.ts","sourceRoot":"","sources":["../../../src/ldml-keyboard/unicodeset-parser-api.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAI,UAAU,GAAG,IAAI,CAAC;~~CAC1E~~;AAED;;GAEG;AACH,qBAAa,UAAU;~~IACF~~,OAAO,EAAE,MAAM;IAAS,MAAM,EAAE,MAAM,EAAE,EAAE;~~gBAA1C~~,OAAO,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,EAAE,EAAE;IAE7D;;OAEG;IACH,IAAI,MAAM,IAAK,MAAM,CAEpB;IAED,QAAQ,IAAK,MAAM;CAGpB"}
1	+ {"version":3,"file":"unicodeset-parser-api.d.ts","sourceRoot":"","sources":["../../../src/ldml-keyboard/unicodeset-parser-api.ts"],"names":[],"mappings":"AACA;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,eAAe,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAI,UAAU,GAAG,IAAI,CAAC;IACzE;;;;OAIG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAI,MAAM,CAAC;CAC1C;AAED;;GAEG;AACH,qBAAa,UAAU;IAQF,OAAO,EAAE,MAAM;IAAS,MAAM,EAAE,MAAM,EAAE,EAAE;IAP7D;;;;;;OAMG;gBACgB,OAAO,EAAE,MAAM,EAAS,MAAM,EAAE,MAAM,EAAE,EAAE;IAE7D;;OAEG;IACH,IAAI,MAAM,IAAK,MAAM,CAEpB;IAED,QAAQ,IAAK,MAAM;CAGpB"}

package/build/src/ldml-keyboard/unicodeset-parser-api.js CHANGED Viewed

@@ -1,9 +1,16 @@
 /**
- * Represents a parsed UnicodeSet
+ * Parsed UnicodeSet, return value of of parseUnicodeSet()
  */
 export class UnicodeSet {
     pattern;
     ranges;
+    /**
+     * A UnicodeSet in range form.
+     * For example, `[ħa-z]` will parse to
+     * ranges = `[[0x41, 0x7A], [0x0127, 0x0127]]` meaning `[a,z], [ħ,ħ]`
+     * @param pattern the pattern per UnicodeSet syntax such as `[a-z]`
+     * @param ranges array of 2-element arrays, 'start' and 'end'.
+     */
     constructor(pattern, ranges) {
         this.pattern = pattern;
         this.ranges = ranges;

package/build/src/ldml-keyboard/unicodeset-parser-api.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"unicodeset-parser-api.js","sourceRoot":"","sources":["../../../src/ldml-keyboard/unicodeset-parser-api.ts"],"names":[],"mappings":"~~AAQA~~;;GAEG;AACH,MAAM,OAAO,UAAU;~~IACF~~;IAAwB;~~IAA3C~~,YAAmB,OAAe,EAAS,MAAkB;QAA1C,YAAO,GAAP,OAAO,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAY;IAC7D,CAAC;IACD;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC5B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF"}
1	+ {"version":3,"file":"unicodeset-parser-api.js","sourceRoot":"","sources":["../../../src/ldml-keyboard/unicodeset-parser-api.ts"],"names":[],"mappings":"AAmBA;;GAEG;AACH,MAAM,OAAO,UAAU;IAQF;IAAwB;IAP3C;;;;;;OAMG;IACH,YAAmB,OAAe,EAAS,MAAkB;QAA1C,YAAO,GAAP,OAAO,CAAQ;QAAS,WAAM,GAAN,MAAM,CAAY;IAC7D,CAAC;IACD;;OAEG;IACH,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;IAC5B,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF"}

package/package.json CHANGED Viewed

@@ -26,7 +26,7 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "dependencies": {
-    "@keymanapp/keyman-version": "17.0.133-alpha",
+    "@keymanapp/keyman-version": "17.0.134-alpha",
     "ajv": "^8.11.0",
     "restructure": "git+https://github.com/keymanapp/dependency-restructure.git#49d129cf0916d082a7278bb09296fb89cecfcc50",
     "semver": "^7.5.2",
@@ -58,5 +58,5 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "17.0.133-alpha"
+  "version": "17.0.134-alpha"
 }