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

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

@@ -78,4 +78,38 @@ export declare class VariableParser {
      */
     static setSplitter(str: string): string[];
 }
+/** for ElementParser.segment() */
+export declare enum ElementType {
+    codepoint = ".",
+    escaped = "\\",
+    uset = "[",
+    string = "*"
+}
+/** one portion of a segmented element string */
+export declare class ElementSegment {
+    segment: string;
+    readonly type: ElementType;
+    /**
+     * @param segment the string in the segment
+     * @param type type of segment. Will be calculated if not provided.
+     */
+    constructor(segment: string, type?: ElementType);
+}
+/** Class for helping with Element strings (i.e. reorder) */
+export declare class ElementParser {
+    /**
+     * Matches any complex UnicodeSet that would otherwise be misinterpreted
+     * by `MATCH_ELEMENT_SEGMENTS` due to nested `[]`'s.
+     * For example, `[[a-z]-[aeiou]]` could be
+     * mis-segmented into `[[a-z]`, `-`, `[aeiou]`, `]` */
+    static readonly MATCH_NESTED_SQUARE_BRACKETS: RegExp;
+    /** Match (segment) UnicodeSets OR hex escapes OR single Unicode codepoints */
+    static readonly MATCH_ELEMENT_SEGMENTS: RegExp;
+    /** Does it start with a UnicodeSet? Used to test the segments. */
+    static readonly MATCH_USET: RegExp;
+    /** Does it start with an escaped char? Used to test the segments. */
+    static readonly MATCH_ESCAPED: RegExp;
+    /** Split a string into ElementSegments */
+    static segment(str: string): ElementSegment[];
+}
 //# sourceMappingURL=pattern-parser.d.ts.map

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

@@ -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"}
+{"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"}

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

@@ -102,4 +102,62 @@ export class VariableParser {
         return str.trim().split(/\s+/);
     }
 }
+/** for ElementParser.segment() */
+export var ElementType;
+(function (ElementType) {
+    ElementType["codepoint"] = ".";
+    ElementType["escaped"] = "\\";
+    ElementType["uset"] = "[";
+    ElementType["string"] = "*";
+})(ElementType || (ElementType = {}));
+;
+/** one portion of a segmented element string */
+export class ElementSegment {
+    segment;
+    type;
+    /**
+     * @param segment the string in the segment
+     * @param type type of segment. Will be calculated if not provided.
+     */
+    constructor(segment, type) {
+        this.segment = segment;
+        if (type) {
+            this.type = type;
+        }
+        else if (ElementParser.MATCH_USET.test(segment)) {
+            this.type = ElementType.uset;
+        }
+        else if (ElementParser.MATCH_ESCAPED.test(segment)) {
+            this.type = ElementType.escaped;
+        }
+        else {
+            this.type = ElementType.codepoint;
+        }
+    }
+}
+;
+/** Class for helping with Element strings (i.e. reorder) */
+export class ElementParser {
+    /**
+     * Matches any complex UnicodeSet that would otherwise be misinterpreted
+     * by `MATCH_ELEMENT_SEGMENTS` due to nested `[]`'s.
+     * For example, `[[a-z]-[aeiou]]` could be
+     * 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;
+    /** 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. */
+    static MATCH_ESCAPED = /^\\u/;
+    /** Split a string into ElementSegments */
+    static segment(str) {
+        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));
+    }
+}
+;
 //# sourceMappingURL=pattern-parser.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"pattern-parser.js","sourceRoot":"","sources":["../../../src/ldml-keyboard/pattern-parser.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH;;;;;GAKG;AACH,SAAS,UAAU,CAAC,GAAW,EAAE,KAAa;IAC5C,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,SAAS,GAAG,sBAAsB,CAAC;AAEzC;;GAEG;AACH,MAAM,OAAO,YAAY;IACvB;;OAEG;IACI,MAAM,CAAU,EAAE,GAAG,SAAS,CAAC;IAEtC;;OAEG;IACI,MAAM,CAAU,UAAU,GAAG,QAAQ,CAAC;IAE7C;;OAEG;IACI,MAAM,CAAU,aAAa,GAAG,GAAG,CAAC;IAE3C;;OAEG;IACI,MAAM,CAAU,SAAS,GAAG,+BAA+B,CAAC;IAEnE;;;;OAIG;IACI,MAAM,CAAC,aAAa,CAAC,GAAW;QACrC,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;;AAGH;;GAEG;AACH,MAAM,OAAO,cAAc;IACzB;;OAEG;IACI,MAAM,CAAU,EAAE,GAAG,SAAS,CAAC;IAEtC;;OAEG;IACI,MAAM,CAAU,gBAAgB,GAAG,2BAA2B,CAAC;IAEtE;;OAEG;IACI,MAAM,CAAU,aAAa,GAAG,6BAA6B,CAAC;IAErE;;OAEG;IACI,MAAM,CAAU,qBAAqB,GAAG,iCAAiC,CAAC;IAEjF;;;OAGG;IACI,MAAM,CAAU,oBAAoB,GAAG,gCAAgC,CAAC;IAE/E;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,GAAW;QAC3C,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,gBAAgB,CAAC,GAAW;QACxC,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,uBAAuB,CAAC,GAAW;QAC/C,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,WAAW,CAAC,GAAW;QACnC,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC"}
+{"version":3,"file":"pattern-parser.js","sourceRoot":"","sources":["../../../src/ldml-keyboard/pattern-parser.ts"],"names":[],"mappings":"AAAA;;GAEG;AAGH;;;;;GAKG;AACH,SAAS,UAAU,CAAC,GAAW,EAAE,KAAa;IAC5C,MAAM,IAAI,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzC,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACzC,CAAC;AAED;;GAEG;AACH,MAAM,SAAS,GAAG,sBAAsB,CAAC;AAEzC;;GAEG;AACH,MAAM,OAAO,YAAY;IACvB;;OAEG;IACI,MAAM,CAAU,EAAE,GAAG,SAAS,CAAC;IAEtC;;OAEG;IACI,MAAM,CAAU,UAAU,GAAG,QAAQ,CAAC;IAE7C;;OAEG;IACI,MAAM,CAAU,aAAa,GAAG,GAAG,CAAC;IAE3C;;OAEG;IACI,MAAM,CAAU,SAAS,GAAG,+BAA+B,CAAC;IAEnE;;;;OAIG;IACI,MAAM,CAAC,aAAa,CAAC,GAAW;QACrC,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;IACzC,CAAC;;AAGH;;GAEG;AACH,MAAM,OAAO,cAAc;IACzB;;OAEG;IACI,MAAM,CAAU,EAAE,GAAG,SAAS,CAAC;IAEtC;;OAEG;IACI,MAAM,CAAU,gBAAgB,GAAG,2BAA2B,CAAC;IAEtE;;OAEG;IACI,MAAM,CAAU,aAAa,GAAG,6BAA6B,CAAC;IAErE;;OAEG;IACI,MAAM,CAAU,qBAAqB,GAAG,iCAAiC,CAAC;IAEjF;;;OAGG;IACI,MAAM,CAAU,oBAAoB,GAAG,gCAAgC,CAAC;IAE/E;;;;OAIG;IACI,MAAM,CAAC,mBAAmB,CAAC,GAAW;QAC3C,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAChD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,gBAAgB,CAAC,GAAW;QACxC,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;IAC7C,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,uBAAuB,CAAC,GAAW;QAC/C,OAAO,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC;IACrD,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,WAAW,CAAC,GAAW;QACnC,OAAO,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;IACjC,CAAC;;AAGH,kCAAkC;AAClC,MAAM,CAAN,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,8BAAe,CAAA;IACf,6BAAa,CAAA;IACb,yBAAU,CAAA;IACV,2BAAY,CAAA;AACd,CAAC,EALW,WAAW,KAAX,WAAW,QAKtB;AAAA,CAAC;AAEF,gDAAgD;AAChD,MAAM,OAAO,cAAc;IAMN;IALH,IAAI,CAAc;IAClC;;;OAGG;IACH,YAAmB,OAAe,EAAE,IAAkB;QAAnC,YAAO,GAAP,OAAO,CAAQ;QAChC,IAAI,IAAI,EAAE;YACR,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;SAClB;aAAM,IAAI,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACjD,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,IAAI,CAAC;SAC9B;aAAM,IAAG,aAAa,CAAC,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;YACnD,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,OAAO,CAAC;SACjC;aAAM;YACL,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC,SAAS,CAAC;SACnC;IACH,CAAC;CACF;AAAA,CAAC;AAEF,4DAA4D;AAC5D,MAAM,OAAO,aAAa;IACxB;;;;0DAIsD;IAC/C,MAAM,CAAU,4BAA4B,GAAG,YAAY,CAAC;IAEnE,8EAA8E;IACvE,MAAM,CAAU,sBAAsB,GAC3C,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"}

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

@@ -6,8 +6,17 @@
  * @param x Name of element to box
  */
 export declare function boxXmlArray(o: any, x: string): void;
+export declare const MATCH_HEX_ESCAPE: RegExp;
+/** regex for single quad escape such as \u0127 */
+export declare const MATCH_QUAD_ESCAPE: RegExp;
 export declare class UnescapeError extends Error {
 }
+/**
+ * Unescape one single quad string such as \u0127
+ * @param s input string
+ * @returns output
+ */
+export declare function unescapeOneQuadString(s: string): string;
 /**
  * Unescapes a string according to UTS#18§1.1, see <https://www.unicode.org/reports/tr18/#Hex_notation>
  * @param s escaped string

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;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CASnD;AAQD,qBAAa,aAAc,SAAQ,KAAK;CACvC;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAmChD;AAED,0DAA0D;AAC1D,wBACA,SAAS,CAAC,KAAK,EAAE,MAAM,GAAI,OAAO,CAEjC;AAED,wBACA,SAAS,CAAC,KAAK,EAAE,MAAM,GAAI,MAAM,CAKhC"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,GAAG,IAAI,CASnD;AAKD,eAAO,MAAM,gBAAgB,QAA6B,CAAC;AAG3D,kDAAkD;AAClD,eAAO,MAAM,iBAAiB,QAAyB,CAAC;AAExD,qBAAa,aAAc,SAAQ,KAAK;CACvC;AAYD;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAevD;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CA0BhD;AAED,0DAA0D;AAC1D,wBACA,SAAS,CAAC,KAAK,EAAE,MAAM,GAAI,OAAO,CAEjC;AAED,wBACA,SAAS,CAAC,KAAK,EAAE,MAAM,GAAI,MAAM,CAKhC"}

package/build/src/util/util.js

@@ -18,10 +18,42 @@ export function boxXmlArray(o, x) {
 // TODO-LDML: #7569 the below regex works, but captures more than it should
 // (it would include \u{fffffffffffffffff } which
 // is overlong and has a space at the end.) The second regex does not work yet.
-const MATCH_HEX_ESCAPE = /\\u{([0-9a-fA-F ]{1,})}/g;
+export const MATCH_HEX_ESCAPE = /\\u{([0-9a-fA-F ]{1,})}/g;
 // const MATCH_HEX_ESCAPE = /\\u{((?:(?:[0-9a-fA-F]{1,5})|(?:10[0-9a-fA-F]{4})(?: (?!}))?)+)}/g;
+/** regex for single quad escape such as \u0127 */
+export const MATCH_QUAD_ESCAPE = /\\u([0-9a-fA-F]{4})/g;
 export class UnescapeError extends Error {
 }
+/**
+ * Unescape one codepoint
+ * @param hex one codepoint in hex, such as '0127'
+ * @returns the unescaped codepoint
+ */
+function unescapeOne(hex) {
+    const codepoint = Number.parseInt(hex, 16);
+    return String.fromCodePoint(codepoint);
+}
+/**
+ * Unescape one single quad string such as \u0127
+ * @param s input string
+ * @returns output
+ */
+export function unescapeOneQuadString(s) {
+    if (!s) {
+        return s;
+    }
+    /**
+   * process one regex match
+   * @param str ignored
+   * @param matched the entire match such as '0127' or '22 22'
+   * @returns the unescaped match
+   */
+    function processMatch(str, matched) {
+        return unescapeOne(matched);
+    }
+    s = s.replace(MATCH_QUAD_ESCAPE, processMatch);
+    return s;
+}
 /**
  * Unescapes a string according to UTS#18§1.1, see <https://www.unicode.org/reports/tr18/#Hex_notation>
  * @param s escaped string
@@ -32,15 +64,6 @@ export function unescapeString(s) {
         return s;
     }
     try {
-        /**
-         * Unescape one codepoint
-         * @param hex one codepoint in hex, such as '0127'
-         * @returns the unescaped codepoint
-         */
-        function unescapeOne(hex) {
-            const codepoint = Number.parseInt(hex, 16);
-            return String.fromCodePoint(codepoint);
-        }
         /**
          * process one regex match
          * @param str ignored

package/build/src/util/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,CAAM,EAAE,CAAS;IAC3C,IAAG,OAAO,CAAC,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;QAC/C,IAAG,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;YACtC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;SACX;aACI;YACH,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACf;KACF;AACH,CAAC;AAED,2EAA2E;AAC3E,iDAAiD;AACjD,+EAA+E;AAC/E,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AACpD,gGAAgG;AAEhG,MAAM,OAAO,aAAc,SAAQ,KAAK;CACvC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,CAAS;IACtC,IAAG,CAAC,CAAC,EAAE;QACL,OAAO,CAAC,CAAC;KACV;IACD,IAAI;QACF;;;;WAIG;QACH,SAAS,WAAW,CAAC,GAAW;YAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YAC3C,OAAO,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;QACzC,CAAC;QACD;;;;;WAKG;QACH,SAAS,YAAY,CAAC,GAAW,EAAE,OAAe;YAChD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC9C,OAAO,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC;QACD,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;KAClD;IAAC,OAAM,CAAC,EAAE;QACT,IAAI,CAAC,YAAY,UAAU,EAAE;YAC3B,MAAM,IAAI,aAAa,CAAC,kCAAkC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;SAC7F;aAAM;YACL,MAAM,CAAC,CAAC;SACT;KACF;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAED,0DAA0D;AAC1D,MAAM,UACN,SAAS,CAAC,KAAa;IACrB,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UACN,SAAS,CAAC,KAAa;IACrB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QACrB,MAAM,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;KAC5C;IACD,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../src/util/util.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AACH,MAAM,UAAU,WAAW,CAAC,CAAM,EAAE,CAAS;IAC3C,IAAG,OAAO,CAAC,IAAI,QAAQ,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;QAC/C,IAAG,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE;YACtC,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;SACX;aACI;YACH,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACf;KACF;AACH,CAAC;AAED,2EAA2E;AAC3E,iDAAiD;AACjD,+EAA+E;AAC/E,MAAM,CAAC,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;AAC3D,gGAAgG;AAEhG,kDAAkD;AAClD,MAAM,CAAC,MAAM,iBAAiB,GAAG,sBAAsB,CAAC;AAExD,MAAM,OAAO,aAAc,SAAQ,KAAK;CACvC;AAED;;;;GAIG;AACH,SAAS,WAAW,CAAC,GAAW;IAC9B,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC3C,OAAO,MAAM,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC;AACzC,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,qBAAqB,CAAC,CAAS;IAC7C,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,CAAC,CAAC;KACV;IACD;;;;;KAKC;IACD,SAAS,YAAY,CAAC,GAAW,EAAE,OAAe;QAChD,OAAO,WAAW,CAAC,OAAO,CAAC,CAAC;IAC9B,CAAC;IACD,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,YAAY,CAAC,CAAC;IAC/C,OAAO,CAAC,CAAC;AACX,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,cAAc,CAAC,CAAS;IACtC,IAAG,CAAC,CAAC,EAAE;QACL,OAAO,CAAC,CAAC;KACV;IACD,IAAI;QACF;;;;;WAKG;QACH,SAAS,YAAY,CAAC,GAAW,EAAE,OAAe;YAChD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YACtC,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;YAC9C,OAAO,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC5B,CAAC;QACD,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,gBAAgB,EAAE,YAAY,CAAC,CAAC;KAClD;IAAC,OAAM,CAAC,EAAE;QACT,IAAI,CAAC,YAAY,UAAU,EAAE;YAC3B,MAAM,IAAI,aAAa,CAAC,kCAAkC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;SAC7F;aAAM;YACL,MAAM,CAAC,CAAC;SACT;KACF;IAED,OAAO,CAAC,CAAC;AACX,CAAC;AAED,0DAA0D;AAC1D,MAAM,UACN,SAAS,CAAC,KAAa;IACrB,OAAO,CAAC,GAAG,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UACN,SAAS,CAAC,KAAa;IACrB,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE;QACrB,MAAM,KAAK,CAAC,sBAAsB,KAAK,EAAE,CAAC,CAAC;KAC5C;IACD,OAAO,KAAK,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;AAC9B,CAAC"}

package/package.json

@@ -26,7 +26,7 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "dependencies": {
-    "@keymanapp/keyman-version": "17.0.132-alpha",
+    "@keymanapp/keyman-version": "17.0.133-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.132-alpha"
+  "version": "17.0.133-alpha"
 }