@keymanapp/kmc-package 17.0.154-alpha → 17.0.156-alpha

package/build/src/compiler/redist-files.js

@@ -1,57 +1,59 @@
-/**
- * This is a set of known redistributable files for Keyman for Windows that
- * should not be included in packages. It is not critical that this list matches
- * the current deployment; it is just for warning against accidental inclusion
- * of these files by package authors. Some redistributable files have been
- * intentionally excluded because they could legitimately be a different file
- * with the same name.
- *
- * This matches behaviour from the legacy package compiler; we may want to
- * reconsider how this is done in the future.
- *
- * These lists have been constructed from 17.0.109 alpha build. Filenames
- * intentionally in lower case.
- */
-export const keymanForWindowsInstallerFiles = [
-    'keymandesktop.msi',
-    'keymanengine.msm'
-];
-export const keymanEngineForWindowsFiles = [
-    'base.xslt',
-    'crashpad_handler.exe',
-    'keyman-debug-etw.man',
-    'keyman.exe',
-    'keyman32.dll',
-    'keyman64.dll',
-    'keymanmc.dll',
-    'keymanx64.exe',
-    'kmcomapi.dll',
-    'kmcomapi.x64.dll',
-    'kmrefresh.x64.exe',
-    'kmrefresh.x86.exe',
-    'kmtip.dll',
-    'kmtip64.dll',
-    'mcompile.exe',
-    'sentry.dll',
-    'sentry.x64.dll',
-    'si_browsers.xslt',
-    'si_fonts.xslt',
-    'si_hookdlls.xslt',
-    'si_keyman.xslt',
-    'si_language.xslt',
-    'si_office.xslt',
-    'si_overview.xslt',
-    'si_processes.xslt',
-    'si_processes_x64.xslt',
-    'si_startup.xslt',
-    'tsysinfo.exe',
-];
-export const keymanForWindowsRedistFiles = [
-    'desktop_resources.dll',
-    'keymandesktop.chm',
-    'kmbrowserhost.exe',
-    'kmconfig.exe',
-    'kmshell.exe',
-    'unicodedata.mdb',
-];
-//# sourceMappingURL=redist-files.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]="1ee5d315-697f-5b0d-b69c-234149379e12")}catch(e){}}();
+/**
+ * This is a set of known redistributable files for Keyman for Windows that
+ * should not be included in packages. It is not critical that this list matches
+ * the current deployment; it is just for warning against accidental inclusion
+ * of these files by package authors. Some redistributable files have been
+ * intentionally excluded because they could legitimately be a different file
+ * with the same name.
+ *
+ * This matches behaviour from the legacy package compiler; we may want to
+ * reconsider how this is done in the future.
+ *
+ * These lists have been constructed from 17.0.109 alpha build. Filenames
+ * intentionally in lower case.
+ */
+export const keymanForWindowsInstallerFiles = [
+    'keymandesktop.msi',
+    'keymanengine.msm'
+];
+export const keymanEngineForWindowsFiles = [
+    'base.xslt',
+    'crashpad_handler.exe',
+    'keyman-debug-etw.man',
+    'keyman.exe',
+    'keyman32.dll',
+    'keyman64.dll',
+    'keymanmc.dll',
+    'keymanx64.exe',
+    'kmcomapi.dll',
+    'kmcomapi.x64.dll',
+    'kmrefresh.x64.exe',
+    'kmrefresh.x86.exe',
+    'kmtip.dll',
+    'kmtip64.dll',
+    'mcompile.exe',
+    'sentry.dll',
+    'sentry.x64.dll',
+    'si_browsers.xslt',
+    'si_fonts.xslt',
+    'si_hookdlls.xslt',
+    'si_keyman.xslt',
+    'si_language.xslt',
+    'si_office.xslt',
+    'si_overview.xslt',
+    'si_processes.xslt',
+    'si_processes_x64.xslt',
+    'si_startup.xslt',
+    'tsysinfo.exe',
+];
+export const keymanForWindowsRedistFiles = [
+    'desktop_resources.dll',
+    'keymandesktop.chm',
+    'kmbrowserhost.exe',
+    'kmconfig.exe',
+    'kmshell.exe',
+    'unicodedata.mdb',
+];
+//# debugId=1ee5d315-697f-5b0d-b69c-234149379e12
+//# sourceMappingURL=redist-files.js.map

package/build/src/compiler/redist-files.js.map

@@ -1 +1 @@
-{"version":3,"file":"redist-files.js","sourceRoot":"","sources":["../../../src/compiler/redist-files.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;GAaG;AAEH,MAAM,CAAC,MACL,8BAA8B,GAAa;IACzC,mBAAmB;IACnB,kBAAkB;CACnB,CAAC;AAGJ,MAAM,CAAC,MACL,2BAA2B,GAAa;IACtC,WAAW;IACX,sBAAsB;IACtB,sBAAsB;IACtB,YAAY;IACZ,cAAc;IACd,cAAc;IACd,cAAc;IACd,eAAe;IACf,cAAc;IACd,kBAAkB;IAClB,mBAAmB;IACnB,mBAAmB;IACnB,WAAW;IACX,aAAa;IACb,cAAc;IACd,YAAY;IACZ,gBAAgB;IAChB,kBAAkB;IAClB,eAAe;IACf,kBAAkB;IAClB,gBAAgB;IAChB,kBAAkB;IAClB,gBAAgB;IAChB,kBAAkB;IAClB,mBAAmB;IACnB,uBAAuB;IACvB,iBAAiB;IACjB,cAAc;CACf,CAAC;AAEJ,MAAM,CAAC,MACL,2BAA2B,GAAa;IACtC,uBAAuB;IACvB,mBAAmB;IACnB,mBAAmB;IACnB,cAAc;IACd,aAAa;IACb,iBAAiB;CAClB,CAAC"}
+{"debug_id":"1ee5d315-697f-5b0d-b69c-234149379e12","file":"redist-files.js","mappings":";AACA;;;;;;;;;;;;;GAaG;AAEH,MAAM,CAAC,MACL,8BAA8B,GAAa;IACzC,mBAAmB;IACnB,kBAAkB;CACnB,CAAC;AAGJ,MAAM,CAAC,MACL,2BAA2B,GAAa;IACtC,WAAW;IACX,sBAAsB;IACtB,sBAAsB;IACtB,YAAY;IACZ,cAAc;IACd,cAAc;IACd,cAAc;IACd,eAAe;IACf,cAAc;IACd,kBAAkB;IAClB,mBAAmB;IACnB,mBAAmB;IACnB,WAAW;IACX,aAAa;IACb,cAAc;IACd,YAAY;IACZ,gBAAgB;IAChB,kBAAkB;IAClB,eAAe;IACf,kBAAkB;IAClB,gBAAgB;IAChB,kBAAkB;IAClB,gBAAgB;IAChB,kBAAkB;IAClB,mBAAmB;IACnB,uBAAuB;IACvB,iBAAiB;IACjB,cAAc;CACf,CAAC;AAEJ,MAAM,CAAC,MACL,2BAA2B,GAAa;IACtC,uBAAuB;IACvB,mBAAmB;IACnB,mBAAmB;IACnB,cAAc;IACd,aAAa;IACb,iBAAiB;CAClB,CAAC","names":[],"sourceRoot":"","sources":["../../../src/compiler/redist-files.ts"],"version":3}

package/build/src/compiler/web-keyboard-metadata.d.ts

@@ -0,0 +1,22 @@
+!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]="f6a504d6-1cad-5a8a-b9f8-c7ddd15d19f8")}catch(e){}}();
+export interface WebKeyboardMetadata {
+    keyboardName: string;
+    keyboardVersion: string;
+    minKeymanVersion: string;
+    isRtl: boolean;
+    isMnemonic: boolean;
+    targets?: string;
+}
+/**
+ * This function parses the JavaScript to do a best-effort retrieval of
+ * keyboard data. It assumes a format similar to what the compiler produces.
+ * It may be possible for it to miss something if the code is hand written and
+ * diverges enough from the compiler code (e.g. if there is a comment between
+ * a member variable and its value or something crazy like that).
+ *
+ * Long-term, we will require package to include .kmx so this kind of parsing
+ * won't be necessary.
+ */
+export declare function getCompiledWebKeyboardMetadata(js: string): WebKeyboardMetadata;
+//# debugId=f6a504d6-1cad-5a8a-b9f8-c7ddd15d19f8
+//# sourceMappingURL=web-keyboard-metadata.d.ts.map

package/build/src/compiler/web-keyboard-metadata.d.ts.map

@@ -0,0 +1 @@
+{"debug_id":"f6a504d6-1cad-5a8a-b9f8-c7ddd15d19f8","file":"web-keyboard-metadata.d.ts","mappings":";AACA,MAAM,WAAW,mBAAmB;IAClC,YAAY,EAAE,MAAM,CAAC;IACrB,eAAe,EAAE,MAAM,CAAC;IACxB,gBAAgB,EAAE,MAAM,CAAC;IACzB,KAAK,EAAE,OAAO,CAAC;IACf,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED;;;;;;;;;GASG;AACH,wBAAgB,8BAA8B,CAAC,EAAE,EAAE,MAAM,GAAG,mBAAmB,CAsB5E","names":[],"sourceRoot":"","sources":["../../../src/compiler/web-keyboard-metadata.ts"],"version":3}

package/build/src/compiler/web-keyboard-metadata.js

@@ -0,0 +1,34 @@
+!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]="589f031e-f15e-5395-9dec-c413db88d9a1")}catch(e){}}();
+;
+/**
+ * This function parses the JavaScript to do a best-effort retrieval of
+ * keyboard data. It assumes a format similar to what the compiler produces.
+ * It may be possible for it to miss something if the code is hand written and
+ * diverges enough from the compiler code (e.g. if there is a comment between
+ * a member variable and its value or something crazy like that).
+ *
+ * Long-term, we will require package to include .kmx so this kind of parsing
+ * won't be necessary.
+ */
+export function getCompiledWebKeyboardMetadata(js) {
+    const nameRegex = /this.KN\s*=\s*(['"])(.*?)\1/;
+    const kbverRegex = /this.KBVER\s*=\s*(['"])(.*?)\1/;
+    const minverRegex = /this.KMINVER\s*=\s*([''"])(.*?)\1/;
+    const rtlRegex = /this.KRTL\s*=\s*(.*?)\s*;/;
+    const mnemonicRegex = /this.KM\s*=\s*(.*?)\s*;/;
+    const name = nameRegex.exec(js);
+    const kbver = kbverRegex.exec(js);
+    const minver = minverRegex.exec(js);
+    const rtl = rtlRegex.exec(js);
+    const mnemonic = mnemonicRegex.exec(js);
+    const SKeymanVersion70 = '7.0';
+    return {
+        keyboardName: name ? name[2] : null,
+        keyboardVersion: kbver ? kbver[2] : null,
+        minKeymanVersion: minver ? minver[2] : SKeymanVersion70,
+        isRtl: !!(rtl && rtl[1].match(/^(1|true)$/)),
+        isMnemonic: !!(mnemonic && mnemonic[1].match(/^(1|true)$/))
+    };
+}
+//# debugId=589f031e-f15e-5395-9dec-c413db88d9a1
+//# sourceMappingURL=web-keyboard-metadata.js.map

package/build/src/compiler/web-keyboard-metadata.js.map

@@ -0,0 +1 @@
+{"debug_id":"589f031e-f15e-5395-9dec-c413db88d9a1","file":"web-keyboard-metadata.js","mappings":";AAQC,CAAC;AAEF;;;;;;;;;GASG;AACH,MAAM,UAAU,8BAA8B,CAAC,EAAU;IACrD,MAAM,SAAS,GAAK,6BAA6B,CAAC;IAClD,MAAM,UAAU,GAAI,gCAAgC,CAAC;IACrD,MAAM,WAAW,GAAG,mCAAmC,CAAC;IACxD,MAAM,QAAQ,GAAM,2BAA2B,CAAC;IAChD,MAAM,aAAa,GAAG,yBAAyB,CAAC;IAEhD,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAClC,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACpC,MAAM,GAAG,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC9B,MAAM,QAAQ,GAAG,aAAa,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAExC,MAAM,gBAAgB,GAAG,KAAK,CAAC;IAE/B,OAAO;QACL,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;QACnC,eAAe,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI;QACxC,gBAAgB,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB;QACvD,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;QAC5C,UAAU,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;KAC5D,CAAC;AACJ,CAAC","names":[],"sourceRoot":"","sources":["../../../src/compiler/web-keyboard-metadata.ts"],"version":3}

package/build/src/main.d.ts

@@ -1,3 +1,5 @@
-export { KmpCompiler } from "./compiler/kmp-compiler.js";
-export { PackageValidation } from "./compiler/package-validation.js";
-//# sourceMappingURL=main.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]="fbf3cc87-0b8e-5315-9cf5-8f87f7cbccda")}catch(e){}}();
+export { KmpCompiler } from "./compiler/kmp-compiler.js";
+export { PackageValidation } from "./compiler/package-validation.js";
+//# debugId=fbf3cc87-0b8e-5315-9cf5-8f87f7cbccda
+//# sourceMappingURL=main.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC"}
+{"debug_id":"fbf3cc87-0b8e-5315-9cf5-8f87f7cbccda","file":"main.d.ts","mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC","names":[],"sourceRoot":"","sources":["../../src/main.ts"],"version":3}

package/build/src/main.js

@@ -1,3 +1,5 @@
-export { KmpCompiler } from "./compiler/kmp-compiler.js";
-export { PackageValidation } from "./compiler/package-validation.js";
-//# sourceMappingURL=main.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]="e4a5fce7-4d69-50f5-a11d-ac6e7252230c")}catch(e){}}();
+export { KmpCompiler } from "./compiler/kmp-compiler.js";
+export { PackageValidation } from "./compiler/package-validation.js";
+//# debugId=e4a5fce7-4d69-50f5-a11d-ac6e7252230c
+//# sourceMappingURL=main.js.map

package/build/src/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC"}
+{"debug_id":"e4a5fce7-4d69-50f5-a11d-ac6e7252230c","file":"main.js","mappings":";AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kCAAkC,CAAC","names":[],"sourceRoot":"","sources":["../../src/main.ts"],"version":3}

package/package.json

@@ -30,20 +30,20 @@
     "url": "https://github.com/keymanapp/keyman/issues"
   },
   "dependencies": {
-    "jszip": "^3.7.0",
-    "@keymanapp/common-types": "17.0.154-alpha"
+    "@keymanapp/common-types": "17.0.156-alpha",
+    "jszip": "^3.7.0"
   },
   "devDependencies": {
+    "@keymanapp/developer-test-helpers": "17.0.156-alpha",
     "@types/chai": "^4.1.7",
     "@types/mocha": "^5.2.7",
-    "@types/node": "^10.14.6",
+    "@types/node": "^20.4.1",
     "c8": "^7.12.0",
     "chai": "^4.3.4",
     "chalk": "^2.4.2",
     "mocha": "^8.4.0",
     "ts-node": "^9.1.1",
-    "typescript": "^4.9.5",
-    "@keymanapp/developer-test-helpers": "17.0.154-alpha"
+    "typescript": "^4.9.5"
   },
   "mocha": {
     "spec": "build/test/**/test-*.js",
@@ -59,13 +59,12 @@
     "exclude-after-remap": true,
     "exclude": [
       "test/",
-      "src/kmp-json-file.ts",
-      "src/kps-file.ts"
+      "src/main.ts"
     ]
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/keymanapp/keyman.git"
   },
-  "version": "17.0.154-alpha"
+  "version": "17.0.156-alpha"
 }

package/build/src/compiler/keyman-targets.d.ts

@@ -1,18 +0,0 @@
-export declare enum KeymanTarget {
-    any = "any",
-    windows = "windows",
-    macosx = "macosx",
-    linux = "linux",
-    web = "web",
-    iphone = "iphone",
-    ipad = "ipad",
-    androidphone = "androidphone",
-    androidtablet = "androidtablet",
-    mobile = "mobile",
-    desktop = "desktop",
-    tablet = "tablet"
-}
-export declare const AllKeymanTargets: KeymanTarget[], TouchKeymanTargets: KeymanTarget[], KMXKeymanTargets: KeymanTarget[], KMWKeymanTargets: KeymanTarget[], KeymanTargetsUsingKVK: KeymanTarget[], SKeymanTargetNames: {
-    [index: string]: string;
-};
-//# sourceMappingURL=keyman-targets.d.ts.map

package/build/src/compiler/keyman-targets.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"keyman-targets.d.ts","sourceRoot":"","sources":["../../../src/compiler/keyman-targets.ts"],"names":[],"mappings":"AAKA,oBACE,YAAY;IACV,GAAG,QAAQ;IACX,OAAO,YAAY;IAAE,MAAM,WAAW;IAAE,KAAK,UAAU;IACvD,GAAG,QAAQ;IAAE,MAAM,WAAW;IAAE,IAAI,SAAS;IAAE,YAAY,iBAAiB;IAAE,aAAa,kBAAkB;IAC7G,MAAM,WAAW;IAAE,OAAO,YAAY;IAAE,MAAM,WAAW;CAC1D;AAEH,eAAO,MAEL,gBAAgB,EAAE,YAAY,EAK7B,EAED,kBAAkB,EAAE,YAAY,EAG/B,EAGD,gBAAgB,EAAE,YAAY,EAE7B,EAGD,gBAAgB,EAAE,YAAY,EAG7B,EAGD,qBAAqB,EAAE,YAAY,EAElC,EAID,kBAAkB,EAAE;IAAE,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAA;CAO5C,CAAC"}

package/build/src/compiler/keyman-targets.js

@@ -1,53 +0,0 @@
-//
-// This mirrors UKeymanTargets.pas
-//
-export var KeymanTarget;
-(function (KeymanTarget) {
-    KeymanTarget["any"] = "any";
-    KeymanTarget["windows"] = "windows";
-    KeymanTarget["macosx"] = "macosx";
-    KeymanTarget["linux"] = "linux";
-    KeymanTarget["web"] = "web";
-    KeymanTarget["iphone"] = "iphone";
-    KeymanTarget["ipad"] = "ipad";
-    KeymanTarget["androidphone"] = "androidphone";
-    KeymanTarget["androidtablet"] = "androidtablet";
-    KeymanTarget["mobile"] = "mobile";
-    KeymanTarget["desktop"] = "desktop";
-    KeymanTarget["tablet"] = "tablet";
-})(KeymanTarget || (KeymanTarget = {}));
-;
-export const 
-// Note: if these change, update the copied values in KeyboardParser.pas accordingly
-AllKeymanTargets = [
-    KeymanTarget.any,
-    KeymanTarget.windows, KeymanTarget.macosx, KeymanTarget.linux,
-    KeymanTarget.web, KeymanTarget.iphone, KeymanTarget.ipad, KeymanTarget.androidphone, KeymanTarget.androidtablet,
-    KeymanTarget.mobile, KeymanTarget.desktop, KeymanTarget.tablet
-], TouchKeymanTargets = [
-    KeymanTarget.iphone, KeymanTarget.ipad, KeymanTarget.androidphone, KeymanTarget.androidtablet,
-    KeymanTarget.mobile, KeymanTarget.tablet
-], 
-// Compile to .kmx
-KMXKeymanTargets = [
-    KeymanTarget.windows, KeymanTarget.macosx, KeymanTarget.linux, KeymanTarget.desktop
-], 
-// Compile to .js
-KMWKeymanTargets = [
-    KeymanTarget.web, KeymanTarget.iphone, KeymanTarget.ipad, KeymanTarget.androidphone, KeymanTarget.androidtablet,
-    KeymanTarget.mobile, KeymanTarget.tablet
-], 
-// Supports .kvks
-KeymanTargetsUsingKVK = [
-    KeymanTarget.windows, KeymanTarget.macosx, KeymanTarget.linux, KeymanTarget.desktop, KeymanTarget.web
-], 
-// Friendly names for targets, e.g. for documentation
-SKeymanTargetNames = {
-    [KeymanTarget.any]: 'All',
-    [KeymanTarget.windows]: 'Windows', [KeymanTarget.macosx]: 'macOS', [KeymanTarget.linux]: 'Linux',
-    [KeymanTarget.web]: 'Web', [KeymanTarget.iphone]: 'iPhone', [KeymanTarget.ipad]: 'iPad',
-    [KeymanTarget.androidphone]: 'Android phone', [KeymanTarget.androidtablet]: 'Android tablet',
-    [KeymanTarget.mobile]: 'Mobile devices', [KeymanTarget.desktop]: 'Desktop devices',
-    [KeymanTarget.tablet]: 'Tablet devices'
-};
-//# sourceMappingURL=keyman-targets.js.map

package/build/src/compiler/keyman-targets.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"keyman-targets.js","sourceRoot":"","sources":["../../../src/compiler/keyman-targets.ts"],"names":[],"mappings":"AACA,EAAE;AACF,kCAAkC;AAClC,EAAE;AAEF,MAAM,CAAN,IACE,YAKC;AANH,WACE,YAAY;IACV,2BAAW,CAAA;IACX,mCAAmB,CAAA;IAAE,iCAAiB,CAAA;IAAE,+BAAe,CAAA;IACvD,2BAAW,CAAA;IAAE,iCAAiB,CAAA;IAAE,6BAAa,CAAA;IAAE,6CAA6B,CAAA;IAAE,+CAA+B,CAAA;IAC7G,iCAAiB,CAAA;IAAE,mCAAmB,CAAA;IAAE,iCAAiB,CAAA;AAC3D,CAAC,EALD,YAAY,KAAZ,YAAY,QAKX;AAAA,CAAC;AAEJ,MAAM,CAAC;AACL,oFAAoF;AACpF,gBAAgB,GAAmB;IACjC,YAAY,CAAC,GAAG;IAChB,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK;IAC7D,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,aAAa;IAC/G,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM;CAC/D,EAED,kBAAkB,GAAmB;IACnC,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,aAAa;IAC7F,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM;CACzC;AAED,kBAAkB;AAClB,gBAAgB,GAAmB;IACjC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO;CACpF;AAED,iBAAiB;AACjB,gBAAgB,GAAmB;IACjC,YAAY,CAAC,GAAG,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,aAAa;IAC/G,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,MAAM;CACzC;AAED,iBAAiB;AACjB,qBAAqB,GAAmB;IACtC,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM,EAAE,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,EAAE,YAAY,CAAC,GAAG;CACtG;AAED,qDAAqD;AAErD,kBAAkB,GAAgC;IAChD,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,KAAK;IACzB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,OAAO;IAChG,CAAC,YAAY,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM;IACrF,CAAC,YAAY,CAAC,YAAY,CAAC,EAAE,eAAe,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,EAAE,gBAAgB;IAC9F,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,gBAAgB,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,iBAAiB;IAChF,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,gBAAgB;CAC1C,CAAC"}

package/build/src/compiler/package-version-validation.d.ts

@@ -1,24 +0,0 @@
-import { KmpJsonFile, CompilerCallbacks, KpsFile } from '@keymanapp/common-types';
-export declare class PackageVersionValidation {
-    private callbacks;
-    constructor(callbacks: CompilerCallbacks);
-    /**
-     * Verifies version information in corresponding keyboards and updates kmpJson
-     * metadata as the version information can be out of sync in the .kps file
-     * after updating a contained keyboard.
-     * @param kpsFilename
-     * @param kps
-     * @param kmp
-     * @returns
-     */
-    validateAndUpdateVersions(kpsFilename: string, kps: KpsFile.KpsFile, kmp: KmpJsonFile.KmpJsonFile): boolean;
-    private checkFollowKeyboardVersion;
-    private getKmxData;
-    private getKeyboardVersionFromKmx;
-    /**
-     * Verify that the package contains a .js if the keyboard targets touch
-     * devices
-     */
-    private verifyTargets;
-}
-//# sourceMappingURL=package-version-validation.d.ts.map

package/build/src/compiler/package-version-validation.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"package-version-validation.d.ts","sourceRoot":"","sources":["../../../src/compiler/package-version-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,OAAO,EAAsB,MAAM,yBAAyB,CAAC;AAUtG,qBAAa,wBAAwB;IAEvB,OAAO,CAAC,SAAS;gBAAT,SAAS,EAAE,iBAAiB;IAEhD;;;;;;;;OAQG;IACI,yBAAyB,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,EAAE,WAAW,CAAC,WAAW;IAmExG,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,UAAU;IAuClB,OAAO,CAAC,yBAAyB;IAOjC;;;OAGG;IACH,OAAO,CAAC,aAAa;CA6BtB"}

package/build/src/compiler/package-version-validation.js

@@ -1,153 +0,0 @@
-import { KmxFileReader, KMX } from '@keymanapp/common-types';
-import { TouchKeymanTargets } from './keyman-targets.js';
-import { CompilerMessages } from './messages.js';
-// The DEFAULT_VERSION used to be '1.0', but we now use '0.0' to allow
-// pre-release 0.x keyboards to be considered later than a keyboard without
-// any version metadata at all.
-// TODO: move to a better location
-const DEFAULT_VERSION = '0.0';
-export class PackageVersionValidation {
-    callbacks;
-    constructor(callbacks) {
-        this.callbacks = callbacks;
-    }
-    /**
-     * Verifies version information in corresponding keyboards and updates kmpJson
-     * metadata as the version information can be out of sync in the .kps file
-     * after updating a contained keyboard.
-     * @param kpsFilename
-     * @param kps
-     * @param kmp
-     * @returns
-     */
-    validateAndUpdateVersions(kpsFilename, kps, kmp) {
-        const followKeyboardVersion = kps.options?.followKeyboardVersion !== undefined;
-        if (followKeyboardVersion) {
-            if (!this.checkFollowKeyboardVersion(kps, kmp)) {
-                return false;
-            }
-        }
-        if (!kmp.keyboards) {
-            // Lexical models don't have version metadata; only their packages.
-            return true;
-        }
-        let result = true;
-        // We now know we have at least one keyboard in the package
-        for (let keyboard of kmp.keyboards) {
-            const kmx = this.getKmxData(kpsFilename, kmp, keyboard);
-            if (!kmx) {
-                // Warnings or errors will have been raised by getKmxData
-                result = false;
-                continue;
-            }
-            // get the targets from the .kmx
-            this.verifyTargets(keyboard, kmx, kmp);
-            // Note: there is often version metadata in the .kps <Keyboard> element, but
-            // we don't read from the metadata because we want to ensure we have the
-            // most up-to-date keyboard version data here, from the compiled keyboard.
-            let keyboardVersion = this.getKeyboardVersionFromKmx(kmx);
-            if (followKeyboardVersion && keyboardVersion === null) {
-                this.callbacks.reportMessage(CompilerMessages.Info_KeyboardFileHasNoKeyboardVersion({ filename: keyboard.id }));
-            }
-            keyboard.version = keyboardVersion ?? DEFAULT_VERSION;
-            if (result) {
-                if (kmp.keyboards[0].version !== keyboard.version) {
-                    this.callbacks.reportMessage(CompilerMessages.Warn_KeyboardVersionsDoNotMatch({
-                        keyboard: keyboard.id,
-                        version: keyboard.version,
-                        firstKeyboard: kmp.keyboards[0].id,
-                        firstVersion: kmp.keyboards[0].version
-                    }));
-                }
-            }
-        }
-        if (result) {
-            if (followKeyboardVersion) {
-                kmp.info.version.description = kmp.keyboards[0].version;
-            }
-            else if (kmp.info.version?.description != kmp.keyboards[0].version) {
-                // Only need to compare against first keyboard as we compare keyboards above
-                this.callbacks.reportMessage(CompilerMessages.Warn_KeyboardVersionsDoNotMatchPackageVersion({
-                    keyboard: kmp.keyboards[0].id,
-                    keyboardVersion: kmp.keyboards[0].version,
-                    packageVersion: kmp.info.version?.description
-                }));
-            }
-        }
-        return result;
-    }
-    checkFollowKeyboardVersion(kps, kmp) {
-        // Lexical model packages do not allow FollowKeyboardVersion
-        if (kmp.lexicalModels && kmp.lexicalModels.length) {
-            this.callbacks.reportMessage(CompilerMessages.Error_FollowKeyboardVersionNotAllowedForModelPackages());
-            return false;
-        }
-        if (!kmp.keyboards || !kmp.keyboards.length) {
-            this.callbacks.reportMessage(CompilerMessages.Error_FollowKeyboardVersionButNoKeyboards());
-            return false;
-        }
-        return true;
-    }
-    getKmxData(kpsFilename, kmp, keyboard) {
-        const file = kmp.files.find(file => this.callbacks.path.basename(file.name, '.kmx') == keyboard.id);
-        if (!file) {
-            this.callbacks.reportMessage(CompilerMessages.Error_KeyboardContentFileNotFound({ id: keyboard.id }));
-            return null;
-        }
-        const filename = this.callbacks.resolveFilename(kpsFilename, file.name);
-        if (!this.callbacks.fs.existsSync(filename)) {
-            this.callbacks.reportMessage(CompilerMessages.Error_KeyboardFileNotFound({ filename }));
-            return null;
-        }
-        //
-        // load the .kmx and extract the version number
-        //
-        let kmxFileData;
-        try {
-            kmxFileData = this.callbacks.loadFile(filename);
-        }
-        catch (e) {
-            this.callbacks.reportMessage(CompilerMessages.Error_FileCouldNotBeRead({ filename, e }));
-            return null;
-        }
-        const kmxReader = new KmxFileReader();
-        const kmx = kmxReader.read(kmxFileData);
-        if (!kmx) {
-            // The file couldn't be read, it might not be a .kmx file
-            this.callbacks.reportMessage(CompilerMessages.Error_KeyboardFileNotValid({ filename }));
-            return null;
-        }
-        return kmx;
-    }
-    getKeyboardVersionFromKmx(kmx) {
-        const store = kmx.stores.find(store => store.dwSystemID == KMX.KMXFile.TSS_KEYBOARDVERSION);
-        return store ? store.dpString : null;
-    }
-    /**
-     * Verify that the package contains a .js if the keyboard targets touch
-     * devices
-     */
-    verifyTargets(keyboard, kmx, kmp) {
-        // TODO: this function doesn't really belong in version validation, but we
-        // don't want to read .kmx twice so we'll leave it here for now; a future
-        // refactor could move .kmx loading into another class
-        const store = kmx.stores.find(store => store.dwSystemID == KMX.KMXFile.TSS_TARGETS);
-        if (!store) {
-            // If there is no &TARGETS store, then there is nothing to check,
-            // because default is windows-only
-            return;
-        }
-        // Note, if we have gotten this far, we've already located and loaded a
-        // .kmx, so no need to verify that the package includes a .kmx
-        // If at least one target is a touch target, we need to check that the
-        // package also includes the .js
-        const targets = store.dpString.split(' ');
-        if (targets.some(target => ['any', ...TouchKeymanTargets].includes(target))) {
-            if (!kmp.files.find(file => this.callbacks.path.basename(file.name, '.js') == keyboard.id)) {
-                // .js version of the keyboard is not found, warn
-                this.callbacks.reportMessage(CompilerMessages.Warn_JsKeyboardFileIsMissing({ id: keyboard.id }));
-            }
-        }
-    }
-}
-//# sourceMappingURL=package-version-validation.js.map

package/build/src/compiler/package-version-validation.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"package-version-validation.js","sourceRoot":"","sources":["../../../src/compiler/package-version-validation.ts"],"names":[],"mappings":"AAAA,OAAO,EAA2C,aAAa,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AACtG,OAAO,EAAgB,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAEjD,sEAAsE;AACtE,2EAA2E;AAC3E,+BAA+B;AAC/B,kCAAkC;AAClC,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B,MAAM,OAAO,wBAAwB;IAEf;IAApB,YAAoB,SAA4B;QAA5B,cAAS,GAAT,SAAS,CAAmB;IAAG,CAAC;IAEpD;;;;;;;;OAQG;IACI,yBAAyB,CAAC,WAAmB,EAAE,GAAoB,EAAE,GAA4B;QACtG,MAAM,qBAAqB,GAAG,GAAG,CAAC,OAAO,EAAE,qBAAqB,KAAK,SAAS,CAAC;QAE/E,IAAG,qBAAqB,EAAE;YACxB,IAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;gBAC7C,OAAO,KAAK,CAAC;aACd;SACF;QAED,IAAG,CAAC,GAAG,CAAC,SAAS,EAAE;YACjB,mEAAmE;YACnE,OAAO,IAAI,CAAC;SACb;QAED,IAAI,MAAM,GAAG,IAAI,CAAC;QAElB,2DAA2D;QAE3D,KAAI,IAAI,QAAQ,IAAI,GAAG,CAAC,SAAS,EAAE;YACjC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;YACxD,IAAG,CAAC,GAAG,EAAE;gBACP,yDAAyD;gBACzD,MAAM,GAAG,KAAK,CAAC;gBACf,SAAS;aACV;YAED,gCAAgC;YAChC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;YAEvC,4EAA4E;YAC5E,wEAAwE;YACxE,0EAA0E;YAC1E,IAAI,eAAe,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC;YAC1D,IAAG,qBAAqB,IAAI,eAAe,KAAK,IAAI,EAAE;gBACpD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,qCAAqC,CAAC,EAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;aAC/G;YACD,QAAQ,CAAC,OAAO,GAAG,eAAe,IAAI,eAAe,CAAC;YAEtD,IAAG,MAAM,EAAE;gBACT,IAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,KAAK,QAAQ,CAAC,OAAO,EAAE;oBAChD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,+BAA+B,CAAC;wBAC5E,QAAQ,EAAE,QAAQ,CAAC,EAAE;wBACrB,OAAO,EAAE,QAAQ,CAAC,OAAO;wBACzB,aAAa,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;wBAClC,YAAY,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO;qBACvC,CAAC,CAAC,CAAC;iBACL;aACF;SACF;QAED,IAAG,MAAM,EAAE;YACT,IAAG,qBAAqB,EAAE;gBACxB,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC;aACzD;iBACI,IAAG,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,IAAI,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,EAAE;gBACjE,4EAA4E;gBAC5E,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,6CAA6C,CAAC;oBAC1F,QAAQ,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;oBAC7B,eAAe,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO;oBACzC,cAAc,EAAE,GAAG,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW;iBAC9C,CAAC,CAAC,CAAC;aACL;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,0BAA0B,CAAC,GAAoB,EAAE,GAA4B;QACnF,4DAA4D;QAC5D,IAAG,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,aAAa,CAAC,MAAM,EAAE;YAChD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,qDAAqD,EAAE,CAAC,CAAC;YACvG,OAAO,KAAK,CAAC;SACd;QAED,IAAG,CAAC,GAAG,CAAC,SAAS,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,EAAE;YAC1C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,yCAAyC,EAAE,CAAC,CAAC;YAC3F,OAAO,KAAK,CAAC;SACd;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,UAAU,CAChB,WAAmB,EACnB,GAA4B,EAC5B,QAAyC;QAGzC,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC;QACpG,IAAG,CAAC,IAAI,EAAE;YACR,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,iCAAiC,CAAC,EAAC,EAAE,EAAC,QAAQ,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;YACnG,OAAO,IAAI,CAAC;SACb;QAED,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;QACxE,IAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;YAC1C,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;YACtF,OAAO,IAAI,CAAC;SACb;QAED,EAAE;QACF,+CAA+C;QAC/C,EAAE;QACF,IAAI,WAAW,CAAC;QAChB,IAAI;YACF,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;SACjD;QAAC,OAAM,CAAC,EAAE;YACT,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,wBAAwB,CAAC,EAAC,QAAQ,EAAE,CAAC,EAAC,CAAC,CAAC,CAAC;YACvF,OAAO,IAAI,CAAC;SACb;QACD,MAAM,SAAS,GAAkB,IAAI,aAAa,EAAE,CAAC;QACrD,MAAM,GAAG,GAAiB,SAAS,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QACtD,IAAG,CAAC,GAAG,EAAE;YACP,yDAAyD;YACzD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;YACtF,OAAO,IAAI,CAAC;SACb;QAED,OAAO,GAAG,CAAC;IACb,CAAC;IAEO,yBAAyB,CAC/B,GAAiB;QAEjB,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAC;QAC5F,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;IACvC,CAAC;IAED;;;OAGG;IACK,aAAa,CACnB,QAAyC,EACzC,GAAiB,EACjB,GAA4B;QAE5B,0EAA0E;QAC1E,yEAAyE;QACzE,sDAAsD;QAEtD,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,UAAU,IAAI,GAAG,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QACpF,IAAG,CAAC,KAAK,EAAE;YACT,iEAAiE;YACjE,kCAAkC;YAClC,OAAO;SACR;QAED,uEAAuE;QACvE,8DAA8D;QAE9D,sEAAsE;QACtE,gCAAgC;QAChC,MAAM,OAAO,GAAmB,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1D,IAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,kBAAkB,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE;YAC1E,IAAG,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,EAAE,CAAC,EAAE;gBACzF,iDAAiD;gBACjD,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,gBAAgB,CAAC,4BAA4B,CAAC,EAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,EAAC,CAAC,CAAC,CAAC;aAChG;SACF;IACH,CAAC;CACF"}