@keymanapp/common-types 17.0.155-alpha → 17.0.157-alpha

package/build/src/util/file-types.js

@@ -0,0 +1,117 @@
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="9edc7a13-988f-5261-959f-f8ef6f004df2")}catch(e){}}();
+;
+/**
+ * List of all registered source file types for Keyman. Some of these file types
+ * (e.g. .xml) may have multiple uses outside Keyman.
+ */
+export const ALL_SOURCE = [
+    ".model.ts" /* Source.Model */,
+    ".kpj" /* Source.Project */,
+    ".kmn" /* Source.KeymanKeyboard */,
+    ".xml" /* Source.LdmlKeyboard */,
+    ".kps" /* Source.Package */,
+    ".kvks" /* Source.VisualKeyboard */,
+    ".keyman-touch-layout" /* Source.TouchLayout */,
+    ".keyboard_info" /* Source.KeyboardInfo */,
+    ".model_info" /* Source.ModelInfo */,
+];
+/**
+ * List of all registered binary file types for Keyman. Some of these file types
+ * (e.g. .js) may have multiple uses outside Keyman.
+ */
+export const ALL_BINARY = [
+    ".model.js" /* Binary.Model */,
+    ".js" /* Binary.WebKeyboard */,
+    ".kmx" /* Binary.Keyboard */,
+    ".kmp" /* Binary.Package */,
+    ".kvk" /* Binary.VisualKeyboard */,
+    ".keyboard_info" /* Binary.KeyboardInfo */,
+    ".model_info" /* Binary.ModelInfo */,
+];
+export const ALL = [...ALL_SOURCE, ...ALL_BINARY];
+/**
+ * Gets the file type based on extension, dealing with multi-part file
+ * extensions. Does not sniff contents of file or assume file existence. Does
+ * transform upper-cased file extensions to lower-case.
+ * @param filename
+ * @returns file extension, or `""` if no extension. Note that this return value
+ *          differs from the other, more-specific fromFilename functions below,
+ *          which return `null` if a supported extension is not found.
+ */
+export function fromFilename(filename) {
+    const result = sourceOrBinaryTypeFromFilename(filename) ??
+        filename.match(/\.[^\.]+$/)?.[0] ??
+        "";
+    return result;
+}
+/**
+ * Gets the file type based on extension, dealing with multi-part file
+ * extensions. Does not sniff contents of file or assume file existence.
+ * Does transform upper-cased file extensions to lower-case.
+ * @param filename
+ * @returns file type, or `null` if not found
+ */
+export function sourceOrBinaryTypeFromFilename(filename) {
+    filename = filename.toLowerCase();
+    const result = ALL_SOURCE.find(type => filename.endsWith(type)) ??
+        ALL_BINARY.find(type => filename.endsWith(type)) ??
+        null;
+    return result;
+}
+/**
+ * Gets the source file type based on extension, dealing with multi-part file
+ * extensions. Does not sniff contents of file or assume file existence. Does
+ * transform upper-cased file extensions to lower-case.
+ * @param filename
+ * @returns file type, or `null` if not found
+ */
+export function sourceTypeFromFilename(filename) {
+    filename = filename.toLowerCase();
+    const result = ALL_SOURCE.find(type => filename.endsWith(type)) ??
+        null;
+    return result;
+}
+/**
+ * Gets the binary file type based on extension, dealing with multi-part file
+ * extensions. Does not sniff contents of file or assume file existence. Does
+ * transform upper-cased file extensions to lower-case.
+ * @param filename
+ * @returns file type, or `null` if not found
+ */
+export function binaryTypeFromFilename(filename) {
+    filename = filename.toLowerCase();
+    const result = ALL_BINARY.find(type => filename.endsWith(type)) ??
+        null;
+    return result;
+}
+/**
+ * Returns true if filenmae has a specific file extension. Does transform
+ * upper-cased file extensions to lower-case.
+ * @param filename
+ * @param fileType
+ * @returns true if file is of type fileType
+ */
+export function filenameIs(filename, fileType) {
+    // Special case for .model.js
+    if (fileType == ".js" /* Binary.WebKeyboard */ && filenameIs(filename, ".model.js" /* Binary.Model */)) {
+        return false;
+    }
+    return filename.toLowerCase().endsWith(fileType);
+}
+/**
+ * Replaces a filename extension with the new extension. Returns `null` if the
+ * filename does not end with oldExtension.
+ * @param filename
+ * @param oldExtension
+ * @param newExtension
+ * @returns
+ */
+export function replaceExtension(filename, oldExtension, newExtension) {
+    const ext = filename.substring(filename.length - oldExtension.length);
+    if (ext !== oldExtension) {
+        return null;
+    }
+    return filename.substring(0, filename.length - oldExtension.length) + newExtension;
+}
+//# debugId=9edc7a13-988f-5261-959f-f8ef6f004df2
+//# sourceMappingURL=file-types.js.map

package/build/src/util/file-types.js.map

@@ -0,0 +1 @@
+{"debug_id":"9edc7a13-988f-5261-959f-f8ef6f004df2","file":"file-types.js","mappings":";AAeC,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAA0B;;;;;;;;;;CAUvC,CAAC;AAgBX;;;GAGG;AACH,MAAM,CAAC,MAAM,UAAU,GAA0B;;;;;;;;CAStC,CAAC;AAEZ,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,GAAG,UAAU,EAAE,GAAG,UAAU,CAAU,CAAC;AAQ3D;;;;;;;;GAQG;AACH,MAAM,UAAU,YAAY,CAAC,QAAgB;IAC3C,MAAM,MAAM,GACV,8BAA8B,CAAC,QAAQ,CAAC;QACxC,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;QAChC,EAAE,CAAC;IACL,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,8BAA8B,CAAC,QAAgB;IAC7D,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAClC,MAAM,MAAM,GACV,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChD,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC;IACP,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAgB;IACrD,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAClC,MAAM,MAAM,GACV,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC;IACP,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAgB;IACrD,QAAQ,GAAG,QAAQ,CAAC,WAAW,EAAE,CAAC;IAClC,MAAM,MAAM,GACV,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,CAAC;IACP,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CAAC,QAAgB,EAAE,QAAyB;IACpE,6BAA6B;IAC7B,IAAG,QAAQ,kCAAsB,IAAI,UAAU,CAAC,QAAQ,iCAAe,EAAE;QACvE,OAAO,KAAK,CAAC;KACd;IACD,OAAO,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AACnD,CAAC;AAED;;;;;;;GAOG;AACH,MAAM,UAAU,gBAAgB,CAAC,QAAgB,EAAE,YAAoB,EAAE,YAAoB;IAC3F,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC;IACtE,IAAG,GAAG,KAAK,YAAY,EAAE;QACvB,OAAO,IAAI,CAAC;KACb;IACD,OAAO,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,YAAY,CAAC,MAAM,CAAC,GAAG,YAAY,CAAC;AACrF,CAAC","names":[],"sourceRoot":"","sources":["../../../src/util/file-types.ts"],"version":3}

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

@@ -1,30 +1,32 @@
-/**
- * xml2js will not place single-entry objects into arrays. Easiest way to fix
- * this is to box them ourselves as needed. Ensures that o.x is an array.
- *
- * @param o Object with property to box
- * @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.
- * Throws exception if the string doesn't match MATCH_QUAD_ESCAPE
- * @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
- * @returns
- */
-export declare function unescapeString(s: string): string;
-/** True if this string *could* be a UTF-32 single char */
-export declare function isOneChar(value: string): boolean;
-export declare function toOneChar(value: string): number;
-//# sourceMappingURL=util.d.ts.map
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="2876f5a1-f75a-59b2-b92e-f6f599b6271c")}catch(e){}}();
+/**
+ * xml2js will not place single-entry objects into arrays. Easiest way to fix
+ * this is to box them ourselves as needed. Ensures that o.x is an array.
+ *
+ * @param o Object with property to box
+ * @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.
+ * Throws exception if the string doesn't match MATCH_QUAD_ESCAPE
+ * @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
+ * @returns
+ */
+export declare function unescapeString(s: string): string;
+/** True if this string *could* be a UTF-32 single char */
+export declare function isOneChar(value: string): boolean;
+export declare function toOneChar(value: string): number;
+//# debugId=2876f5a1-f75a-59b2-b92e-f6f599b6271c
+//# sourceMappingURL=util.d.ts.map

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;AAKD,eAAO,MAAM,gBAAgB,QAA6B,CAAC;AAG3D,kDAAkD;AAClD,eAAO,MAAM,iBAAiB,QAAyB,CAAC;AAExD,qBAAa,aAAc,SAAQ,KAAK;CACvC;AAYD;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CASvD;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"}
+{"debug_id":"2876f5a1-f75a-59b2-b92e-f6f599b6271c","file":"util.d.ts","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;;;;;GAKG;AACH,wBAAgB,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CASvD;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","names":[],"sourceRoot":"","sources":["../../../src/util/util.ts"],"version":3}

package/build/src/util/util.js

@@ -1,96 +1,98 @@
-/**
- * xml2js will not place single-entry objects into arrays. Easiest way to fix
- * this is to box them ourselves as needed. Ensures that o.x is an array.
- *
- * @param o Object with property to box
- * @param x Name of element to box
- */
-export function boxXmlArray(o, x) {
-    if (typeof o == 'object' && !Array.isArray(o[x])) {
-        if (o[x] === null || o[x] === undefined) {
-            o[x] = [];
-        }
-        else {
-            o[x] = [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.
-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.
- * Throws exception if the string doesn't match MATCH_QUAD_ESCAPE
- * @param s input string
- * @returns output
- */
-export function unescapeOneQuadString(s) {
-    if (!s || !s.match(MATCH_QUAD_ESCAPE)) {
-        throw new UnescapeError(`Not a quad escape: ${s}`);
-    }
-    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
- * @returns
- */
-export function unescapeString(s) {
-    if (!s) {
-        return s;
-    }
-    try {
-        /**
-         * 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) {
-            const codepoints = matched.split(' ');
-            const unescaped = codepoints.map(unescapeOne);
-            return unescaped.join('');
-        }
-        s = s.replaceAll(MATCH_HEX_ESCAPE, processMatch);
-    }
-    catch (e) {
-        if (e instanceof RangeError) {
-            throw new UnescapeError(`Out of range while unescaping '${s}': ${e.message}`, { cause: e });
-            /* c8 ignore next 3 */
-        }
-        else {
-            throw e; // pass through some other error
-        }
-    }
-    return s;
-}
-/** True if this string *could* be a UTF-32 single char */
-export function isOneChar(value) {
-    return [...value].length === 1;
-}
-export function toOneChar(value) {
-    if (!isOneChar(value)) {
-        throw Error(`Not a single char: ${value}`);
-    }
-    return value.codePointAt(0);
-}
-//# sourceMappingURL=util.js.map
+!function(){try{var e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{},n=(new Error).stack;n&&(e._sentryDebugIds=e._sentryDebugIds||{},e._sentryDebugIds[n]="b3cedfe7-9879-5934-90b0-7cb43071df24")}catch(e){}}();
+/**
+ * xml2js will not place single-entry objects into arrays. Easiest way to fix
+ * this is to box them ourselves as needed. Ensures that o.x is an array.
+ *
+ * @param o Object with property to box
+ * @param x Name of element to box
+ */
+export function boxXmlArray(o, x) {
+    if (typeof o == 'object' && !Array.isArray(o[x])) {
+        if (o[x] === null || o[x] === undefined) {
+            o[x] = [];
+        }
+        else {
+            o[x] = [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.
+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.
+ * Throws exception if the string doesn't match MATCH_QUAD_ESCAPE
+ * @param s input string
+ * @returns output
+ */
+export function unescapeOneQuadString(s) {
+    if (!s || !s.match(MATCH_QUAD_ESCAPE)) {
+        throw new UnescapeError(`Not a quad escape: ${s}`);
+    }
+    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
+ * @returns
+ */
+export function unescapeString(s) {
+    if (!s) {
+        return s;
+    }
+    try {
+        /**
+         * 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) {
+            const codepoints = matched.split(' ');
+            const unescaped = codepoints.map(unescapeOne);
+            return unescaped.join('');
+        }
+        s = s.replaceAll(MATCH_HEX_ESCAPE, processMatch);
+    }
+    catch (e) {
+        if (e instanceof RangeError) {
+            throw new UnescapeError(`Out of range while unescaping '${s}': ${e.message}`, { cause: e });
+            /* c8 ignore next 3 */
+        }
+        else {
+            throw e; // pass through some other error
+        }
+    }
+    return s;
+}
+/** True if this string *could* be a UTF-32 single char */
+export function isOneChar(value) {
+    return [...value].length === 1;
+}
+export function toOneChar(value) {
+    if (!isOneChar(value)) {
+        throw Error(`Not a single char: ${value}`);
+    }
+    return value.codePointAt(0);
+}
+//# debugId=b3cedfe7-9879-5934-90b0-7cb43071df24
+//# sourceMappingURL=util.js.map

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,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;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,CAAS;IAC7C,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE;QACrC,MAAM,IAAI,aAAa,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;KACpD;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;YAC5F,sBAAsB;SACvB;aAAM;YACL,MAAM,CAAC,CAAC,CAAC,gCAAgC;SAC1C;KACF;IACD,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"}
+{"debug_id":"b3cedfe7-9879-5934-90b0-7cb43071df24","file":"util.js","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;;;;;GAKG;AACH,MAAM,UAAU,qBAAqB,CAAC,CAAS;IAC7C,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE;QACrC,MAAM,IAAI,aAAa,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;KACpD;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;YAC5F,sBAAsB;SACvB;aAAM;YACL,MAAM,CAAC,CAAC,CAAC,gCAAgC;SAC1C;KACF;IACD,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","names":[],"sourceRoot":"","sources":["../../../src/util/util.ts"],"version":3}

package/package.json

@@ -26,9 +26,9 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "dependencies": {
-    "@keymanapp/keyman-version": "17.0.155-alpha",
+    "@keymanapp/keyman-version": "17.0.157-alpha",
     "ajv": "^8.11.0",
-    "restructure": "git+https://github.com/keymanapp/dependency-restructure.git#49d129cf0916d082a7278bb09296fb89cecfcc50",
+    "restructure": "git+https://github.com/keymanapp/dependency-restructure.git#7a188a1e26f8f36a175d95b67ffece8702363dfc",
     "semver": "^7.5.2",
     "xml2js": "git+https://github.com/keymanapp/dependency-node-xml2js#535fe732dc408d697e0f847c944cc45f0baf0829"
   },
@@ -36,7 +36,7 @@
     "@types/chai": "^4.1.7",
     "@types/git-diff": "^2.0.3",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^10.14.6",
+    "@types/node": "^20.4.1",
     "@types/semver": "^7.3.12",
     "@types/xml2js": "^0.4.5",
     "c8": "^7.12.0",
@@ -58,5 +58,24 @@
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "17.0.155-alpha"
+  "c8": {
+    "all": true,
+    "src": [
+      "src/"
+    ],
+    "exclude-after-remap": true,
+    "exclude": [
+      "src/kmx/kmx-plus-builder/",
+      "src/kmx/kmx-plus.ts",
+      "src/kmx/kmx-builder.ts",
+      "src/kmx/element-string.ts",
+      "src/kmx/string-list.ts",
+      "src/ldml-keyboard/ldml-keyboard-testdata-xml.ts",
+      "src/ldml-keyboard/unicodeset-parser-api.ts",
+      "src/keyman-touch-layout/keyman-touch-layout-file-writer.ts",
+      "src/osk/osk.ts",
+      "test/"
+    ]
+  },
+  "version": "17.0.157-alpha"
 }

package/build/src/keyman-touch-layout.clean.spec.json

@@ -1,170 +0,0 @@
-{
-  "$schema": "http://json-schema.org/schema#",
-  "$ref": "#/definitions/touch-layout",
-  "$comment": "Version: 16.0",
-  "description": "A Keyman Touch Layout file, per version 16.0, clean spec, no legacy data or types",
-
-  "definitions": {
-    "touch-layout": {
-      "type": "object",
-      "properties": {
-        "tablet": { "$ref": "#/definitions/platform" },
-        "phone": { "$ref": "#/definitions/platform" },
-        "desktop": { "$ref": "#/definitions/platform" }
-      },
-      "minProperties": 1,
-      "additionalProperties": false
-    },
-
-    "platform": {
-      "type": "object",
-      "properties": {
-        "font": { "$ref": "#/definitions/font-spec" },
-        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
-        "layer": { "$ref": "#/definitions/layers" },
-        "displayUnderlying": { "type": "boolean" },
-        "defaultHint": { "type": "string", "enum": ["none","dot","longpress","multitap","flick","flick-n","flick-ne","flick-e","flick-se","flick-s","flick-sw","flick-w","flick-nw"] }
-      },
-      "required": ["layer"],
-      "additionalProperties": false
-    },
-
-    "layers": {
-      "type": "array",
-      "items": { "$ref": "#/definitions/layer" },
-      "minItems": 1
-    },
-
-    "layer": {
-      "type": "object",
-      "properties": {
-        "id": { "$ref": "#/definitions/layer-id" },
-        "row": { "$ref": "#/definitions/rows" }
-      },
-      "required": ["id", "row"],
-      "additionalProperties": false
-    },
-
-    "layer-id": {
-      "type": "string",
-      "pattern": "^[a-zA-Z0-9_-]+$"
-    },
-
-    "rows": {
-      "type": "array",
-      "items": { "$ref": "#/definitions/row" },
-      "minItems": 1
-    },
-
-    "row": {
-      "type": "object",
-      "properties": {
-        "id": { "$ref": "#/definitions/row-id" },
-        "key": { "$ref": "#/definitions/keys" }
-      },
-      "required": ["id", "key"],
-      "additionalProperties": false
-    },
-
-    "row-id": {
-      "type": "integer",
-      "minimum": 0,
-      "maximum": 100
-    },
-
-    "keys": {
-      "type": "array",
-      "items": { "$ref": "#/definitions/key" },
-      "minItems": 1
-    },
-
-    "key": {
-      "type": "object",
-      "properties": {
-        "id": { "$ref": "#/definitions/key-id" },
-        "text": { "type": "string" },
-        "layer": { "$ref": "#/definitions/layer-id" },
-        "nextlayer": { "$ref": "#/definitions/layer-id" },
-        "font": { "$ref": "#/definitions/font-spec" },
-        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
-        "sp": { "$ref": "#/definitions/key-sp" },
-        "pad": { "$ref" : "#/definitions/key-pad" },
-        "width": { "$ref" : "#/definitions/key-width" },
-        "sk": { "$ref": "#/definitions/subkeys" },
-        "flick": { "$ref": "#/definitions/flick" },
-        "multitap": { "$ref": "#/definitions/subkeys" },
-        "hint": { "type": "string" }
-      },
-      "anyOf": [
-        {"required": ["id"]},
-        {"required": ["sp"]},
-        {"required": ["sk"]},
-        {"required": ["flick"]},
-        {"required": ["multitap"]}
-      ],
-      "additionalProperties": false
-    },
-
-    "key-id": {
-      "type": "string",
-      "pattern": "^[TKUtku]_[a-zA-Z0-9_]+$"
-    },
-
-    "key-sp": {
-      "type": "integer",
-      "enum": [0, 1, 2, 8, 9, 10]
-    },
-
-    "key-pad": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 100000
-    },
-
-    "key-width": {
-      "type": "number",
-      "minimum": 0,
-      "maximum": 100000
-    },
-
-    "subkeys": {
-      "type": "array",
-      "items": { "$ref": "#/definitions/subkey" },
-      "minItems": 1
-    },
-
-    "subkey": {
-      "type": "object",
-      "properties": {
-        "id": { "$ref": "#/definitions/key-id" },
-        "text": { "type": "string" },
-        "layer": { "$ref": "#/definitions/layer-id" },
-        "nextlayer": { "$ref": "#/definitions/layer-id" },
-        "font": { "$ref": "#/definitions/font-spec" },
-        "fontsize": { "$ref": "#/definitions/fontsize-spec" },
-        "sp": { "$ref": "#/definitions/key-sp" },
-        "pad": { "$ref" : "#/definitions/key-pad" },
-        "width": { "$ref" : "#/definitions/key-width" }
-      },
-      "required": ["id"],
-      "additionalProperties": false
-    },
-
-    "flick": {
-      "type": "object",
-      "patternProperties": {
-        "^(n|s|e|w|ne|nw|se|sw)$": { "$ref": "#/definitions/subkey" }
-      },
-      "minProperties": 1,
-      "additionalProperties": false
-    },
-
-    "font-spec": {
-      "type": "string"
-    },
-
-    "fontsize-spec": {
-      "type": "string"
-    }
-  }
-}