@markw65/monkeyc-optimizer 1.1.86 → 1.1.88

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.88
+
+- Fix output of cft-font-info
+  - When I refactored the code to avoid holding everything in memory at once, I inadvertently changed the format. This restores the original format, and adds a flag to enable the incorrect format, just in case someone's relying on it.
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.61](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1061)
+
+  - Allow semi-colons after expression-statements, and uncontrolled block-statements to match Garmin's parser.
+
+- Fix a crash when no valid products are found in the manifest (Fixes [prettier-extension-monkeyc#19](https://github.com/markw65/prettier-extension-monkeyc/issues/19))
+- Fix various issues with tests so that they pass with 7.4.3, and on windows
+- Sdk 7.4.3 started signing `.iq` files with SHA256 in addition to SHA1. For now, the store still accepts files that are only signed with SHA1, but this adds the SHA256 for future proofing.
+
+### 1.1.87
+
+- Update post build optimizer to work with sdk-7.4.3. The manifest file was changed a little with this release, so I had to update the optimizer to match.
+
 ### 1.1.86
 
 - Leaving stashed type lists on ArrayExpression and ObjectExpression could confuse the prettier printer, and result in errors when outputing the optimized files. Remove all of them after optimization is done.

package/bin/cft-font-info.js

@@ -9,6 +9,7 @@ const fonts = new Set();
 const otherArgs = [];
 let charsWanted;
 let charInfoAsArray;
+let flatFonts;
 
 function error(e) {
   throw new Error(e);
@@ -38,6 +39,9 @@ const prev = process.argv.slice(2).reduce((key, value) => {
     case "char-info-as-array":
       charInfoAsArray = !value || /^(true|1)$/i.test(value);
       break;
+    case "flat-fonts":
+      flatFonts = !value || /^(true|1)$/i.test(value);
+      break;
     default:
       error(`Unknown argument: --${key}`);
   }
@@ -76,7 +80,8 @@ Promise.all(
     );
   })
 ).then((results) => {
-  console.log("{");
+  console.log(`{${flatFonts ? "" : `\n"fonts":{`}`);
+  let started = false;
   let last = -1;
   let active = [];
   const fontArray = Array.from(fonts).sort();
@@ -85,14 +90,15 @@ Promise.all(
       fontArray[i] &&
       cft
         .getCFTFontInfo(fontArray[i], { chars: charsWanted, charInfoAsArray })
-        .then(({ name, ...rest }) => `"${name}":${JSON.stringify(rest)},`)
+        .then(({ name, ...rest }) => `"${name}":${JSON.stringify(rest)}`)
         .catch(() => null)
         .then((line) => {
           active[i] = line;
           while (active[last + 1] !== undefined) {
             const a = active[++last];
             if (a != null) {
-              console.log(a);
+              console.log(started ? "," : "", a);
+              started = true;
             }
             delete active[last];
           }
@@ -101,6 +107,7 @@ Promise.all(
     .then(() => active.forEach((line) => line && console.log(line)))
     .then(() =>
       console.log(
+        flatFonts ? "," : "},\n",
         `"devices":${JSON.stringify(
           Object.fromEntries(
             results

package/build/api.cjs

@@ -18,52 +18,52 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_BPCBFFSW.checkCompilerVersion,
-  clearDiagnostics: () => import_chunk_BPCBFFSW.clearDiagnostics,
-  collectNamespaces: () => import_chunk_BPCBFFSW.collectNamespaces,
-  createDocumentationMap: () => import_chunk_BPCBFFSW.createDocumentationMap,
-  declKey: () => import_chunk_BPCBFFSW.declKey,
-  diagnostic: () => import_chunk_BPCBFFSW.diagnostic,
-  diagnosticHelper: () => import_chunk_BPCBFFSW.diagnosticHelper,
-  findNamesInScope: () => import_chunk_BPCBFFSW.findNamesInScope,
-  findUsingForNode: () => import_chunk_BPCBFFSW.findUsingForNode,
-  formatAst: () => import_chunk_BPCBFFSW.formatAst,
-  formatAstLongLines: () => import_chunk_BPCBFFSW.formatAstLongLines,
-  formatScopedName: () => import_chunk_BPCBFFSW.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_BPCBFFSW.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_BPCBFFSW.getApiMapping,
-  getSuperClasses: () => import_chunk_BPCBFFSW.getSuperClasses,
-  handleImportUsing: () => import_chunk_BPCBFFSW.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_ROZUBUPR.checkCompilerVersion,
+  clearDiagnostics: () => import_chunk_ROZUBUPR.clearDiagnostics,
+  collectNamespaces: () => import_chunk_ROZUBUPR.collectNamespaces,
+  createDocumentationMap: () => import_chunk_ROZUBUPR.createDocumentationMap,
+  declKey: () => import_chunk_ROZUBUPR.declKey,
+  diagnostic: () => import_chunk_ROZUBUPR.diagnostic,
+  diagnosticHelper: () => import_chunk_ROZUBUPR.diagnosticHelper,
+  findNamesInScope: () => import_chunk_ROZUBUPR.findNamesInScope,
+  findUsingForNode: () => import_chunk_ROZUBUPR.findUsingForNode,
+  formatAst: () => import_chunk_ROZUBUPR.formatAst,
+  formatAstLongLines: () => import_chunk_ROZUBUPR.formatAstLongLines,
+  formatScopedName: () => import_chunk_ROZUBUPR.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_ROZUBUPR.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_ROZUBUPR.getApiMapping,
+  getSuperClasses: () => import_chunk_ROZUBUPR.getSuperClasses,
+  handleImportUsing: () => import_chunk_ROZUBUPR.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_BPCBFFSW.isClassVariable,
-  isLocal: () => import_chunk_BPCBFFSW.isLocal,
-  isLookupCandidate: () => import_chunk_BPCBFFSW.isLookupCandidate,
-  isStateNode: () => import_chunk_BPCBFFSW.isStateNode,
-  lookupByFullName: () => import_chunk_BPCBFFSW.lookupByFullName,
-  lookupNext: () => import_chunk_BPCBFFSW.lookupNext,
-  lookupResultContains: () => import_chunk_BPCBFFSW.lookupResultContains,
-  lookupWithType: () => import_chunk_BPCBFFSW.lookupWithType,
-  makeToyboxLink: () => import_chunk_BPCBFFSW.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_BPCBFFSW.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_BPCBFFSW.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_BPCBFFSW.parseSdkVersion,
-  popRootNode: () => import_chunk_BPCBFFSW.popRootNode,
-  pushRootNode: () => import_chunk_BPCBFFSW.pushRootNode,
-  resolveDiagnostics: () => import_chunk_BPCBFFSW.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_BPCBFFSW.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_BPCBFFSW.sameLookupResult,
+  isClassVariable: () => import_chunk_ROZUBUPR.isClassVariable,
+  isLocal: () => import_chunk_ROZUBUPR.isLocal,
+  isLookupCandidate: () => import_chunk_ROZUBUPR.isLookupCandidate,
+  isStateNode: () => import_chunk_ROZUBUPR.isStateNode,
+  lookupByFullName: () => import_chunk_ROZUBUPR.lookupByFullName,
+  lookupNext: () => import_chunk_ROZUBUPR.lookupNext,
+  lookupResultContains: () => import_chunk_ROZUBUPR.lookupResultContains,
+  lookupWithType: () => import_chunk_ROZUBUPR.lookupWithType,
+  makeToyboxLink: () => import_chunk_ROZUBUPR.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_ROZUBUPR.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_ROZUBUPR.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_ROZUBUPR.parseSdkVersion,
+  popRootNode: () => import_chunk_ROZUBUPR.popRootNode,
+  pushRootNode: () => import_chunk_ROZUBUPR.pushRootNode,
+  resolveDiagnostics: () => import_chunk_ROZUBUPR.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_ROZUBUPR.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_ROZUBUPR.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_BPCBFFSW.variableDeclarationName,
-  visitReferences: () => import_chunk_BPCBFFSW.visitReferences,
-  visit_resources: () => import_chunk_BPCBFFSW.visit_resources,
-  visitorNode: () => import_chunk_BPCBFFSW.visitorNode
+  variableDeclarationName: () => import_chunk_ROZUBUPR.variableDeclarationName,
+  visitReferences: () => import_chunk_ROZUBUPR.visitReferences,
+  visit_resources: () => import_chunk_ROZUBUPR.visit_resources,
+  visitorNode: () => import_chunk_ROZUBUPR.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_BPCBFFSW = require("./chunk-BPCBFFSW.cjs");
+var import_chunk_ROZUBUPR = require("./chunk-ROZUBUPR.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_BPCBFFSW.init_api)();
+(0, import_chunk_ROZUBUPR.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-BPCBFFSW.cjs → chunk-ROZUBUPR.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_BPCBFFSW_exports = {};
-__export(chunk_BPCBFFSW_exports, {
+var chunk_ROZUBUPR_exports = {};
+__export(chunk_ROZUBUPR_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_BPCBFFSW_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_BPCBFFSW_exports);
+module.exports = __toCommonJS(chunk_ROZUBUPR_exports);
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -26075,6 +26075,10 @@ var init_bytecode = (0, import_chunk_ABYVSU2C.__esm)({
 function getPrgSignature(context) {
   if (!context.key)
     return;
+  const withSha256 = context.sections[
+    -507453934
+    /* SIGNATURE */
+  ]?.length === 1036 + 512;
   delete context.sections[
     -507453934
     /* SIGNATURE */
@@ -26086,6 +26090,9 @@ function getPrgSignature(context) {
   const signature = signatureFromContext(context);
   if (!signature)
     return;
+  const signature2 = withSha256 ? signatureFromContext(context, "SHA256") : null;
+  if (withSha256 && !signature2)
+    return;
   const keyInfo = context.key.export({ format: "jwk" });
   (0, import_node_assert16.default)(keyInfo.n && keyInfo.e);
   const modulusBuf = Buffer.from(keyInfo.n, "base64");
@@ -26100,23 +26107,31 @@ function getPrgSignature(context) {
     modulusBuf.byteLength - delta
   );
   (0, import_node_assert16.default)(modulus.byteLength === 512 && signature.length === 512);
-  const sectionLength = signature.length + modulus.byteLength + 4;
+  (0, import_node_assert16.default)(!signature2 || signature2.length === 512);
+  const sectionLength = signature.length + modulus.byteLength + 4 + (signature2?.length ?? 0);
   const buffer = new DataView(new ArrayBuffer(sectionLength + 8));
+  const asUint = new Uint8Array(
+    buffer.buffer,
+    buffer.byteOffset,
+    buffer.byteLength
+  );
   buffer.setInt32(
     0,
     -507453934
     /* SIGNATURE */
   );
   buffer.setInt32(4, sectionLength);
-  let offset = 8;
-  signature.forEach((b, i) => {
-    buffer.setUint8(offset + 512, modulus.getUint8(i));
-    buffer.setUint8(offset++, b);
-  });
-  buffer.setInt32(offset + 512, publicExponent);
-  const max = Object.values(context.sections).reduce(
-    (max2, cur) => cur.offset + cur.length > max2 ? cur.offset + cur.length : max2,
-    0
+  asUint.set(signature, 8);
+  asUint.set(
+    new Uint8Array(modulus.buffer, modulus.byteOffset, modulus.byteLength),
+    520
+  );
+  buffer.setInt32(1032, publicExponent);
+  if (signature2) {
+    asUint.set(signature2, 1036);
+  }
+  const max = Math.max(
+    ...Object.values(context.sections).map((cur) => cur.offset + cur.length)
   );
   context.sections[
     -507453934
@@ -26126,7 +26141,7 @@ function getPrgSignature(context) {
     length: sectionLength,
     view: new DataView(buffer.buffer, 8, sectionLength)
   };
-  return signature;
+  return signature2 ? Buffer.concat([signature, signature2]) : signature;
 }
 function getDevKey(file) {
   return fs3.readFile(file).then(
@@ -26137,10 +26152,10 @@ function getDevKey(file) {
     })
   );
 }
-function signatureFromContext(context) {
+function signatureFromContext(context, method = "SHA1") {
   if (!context.key)
     return null;
-  const signer = crypto.createSign("SHA1");
+  const signer = crypto.createSign(method);
   Object.entries(context.sections).filter(
     ([section]) => Number(section) !== -507453934 && Number(section) !== 20833
     /* STORE_SIG */
@@ -26156,8 +26171,8 @@ function signatureFromContext(context) {
   signer.end();
   return signer.sign(context.key);
 }
-function signView(key, view) {
-  const signer = crypto.createSign("SHA1");
+function signView(key, view, method = "SHA1") {
+  const signer = crypto.createSign(method);
   signer.update(view);
   signer.end();
   return signer.sign(key);
@@ -26568,50 +26583,64 @@ var require_common = (0, import_chunk_ABYVSU2C.__commonJS)({
         createDebug.namespaces = namespaces;
         createDebug.names = [];
         createDebug.skips = [];
-        let i;
-        const split = (typeof namespaces === "string" ? namespaces : "").split(/[\s,]+/);
-        const len = split.length;
-        for (i = 0; i < len; i++) {
-          if (!split[i]) {
-            continue;
+        const split = (typeof namespaces === "string" ? namespaces : "").trim().replace(" ", ",").split(",").filter(Boolean);
+        for (const ns of split) {
+          if (ns[0] === "-") {
+            createDebug.skips.push(ns.slice(1));
+          } else {
+            createDebug.names.push(ns);
           }
-          namespaces = split[i].replace(/\*/g, ".*?");
-          if (namespaces[0] === "-") {
-            createDebug.skips.push(new RegExp("^" + namespaces.slice(1) + "$"));
+        }
+      }
+      function matchesTemplate(search, template) {
+        let searchIndex = 0;
+        let templateIndex = 0;
+        let starIndex = -1;
+        let matchIndex = 0;
+        while (searchIndex < search.length) {
+          if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === "*")) {
+            if (template[templateIndex] === "*") {
+              starIndex = templateIndex;
+              matchIndex = searchIndex;
+              templateIndex++;
+            } else {
+              searchIndex++;
+              templateIndex++;
+            }
+          } else if (starIndex !== -1) {
+            templateIndex = starIndex + 1;
+            matchIndex++;
+            searchIndex = matchIndex;
           } else {
-            createDebug.names.push(new RegExp("^" + namespaces + "$"));
+            return false;
           }
         }
+        while (templateIndex < template.length && template[templateIndex] === "*") {
+          templateIndex++;
+        }
+        return templateIndex === template.length;
       }
       function disable() {
         const namespaces = [
-          ...createDebug.names.map(toNamespace),
-          ...createDebug.skips.map(toNamespace).map((namespace) => "-" + namespace)
+          ...createDebug.names,
+          ...createDebug.skips.map((namespace) => "-" + namespace)
         ].join(",");
         createDebug.enable("");
         return namespaces;
       }
       function enabled(name) {
-        if (name[name.length - 1] === "*") {
-          return true;
-        }
-        let i;
-        let len;
-        for (i = 0, len = createDebug.skips.length; i < len; i++) {
-          if (createDebug.skips[i].test(name)) {
+        for (const skip of createDebug.skips) {
+          if (matchesTemplate(name, skip)) {
             return false;
           }
         }
-        for (i = 0, len = createDebug.names.length; i < len; i++) {
-          if (createDebug.names[i].test(name)) {
+        for (const ns of createDebug.names) {
+          if (matchesTemplate(name, ns)) {
             return true;
           }
         }
         return false;
       }
-      function toNamespace(regexp) {
-        return regexp.toString().substring(2, regexp.toString().length - 2).replace(/\.\*\?$/, "*");
-      }
       function coerce(val) {
         if (val instanceof Error) {
           return val.stack || val.message;
@@ -26728,10 +26757,11 @@ var require_browser = (0, import_chunk_ABYVSU2C.__commonJS)({
       if (typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/(edge|trident)\/(\d+)/)) {
         return false;
       }
+      let m;
       return typeof document !== "undefined" && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance || // Is firebug? http://stackoverflow.com/a/398120/376773
       typeof window !== "undefined" && window.console && (window.console.firebug || window.console.exception && window.console.table) || // Is firefox >= v31?
       // https://developer.mozilla.org/en-US/docs/Tools/Web_Console#Styling_messages
-      typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/) && parseInt(RegExp.$1, 10) >= 31 || // Double check webkit in userAgent just in case we are in a worker
+      typeof navigator !== "undefined" && navigator.userAgent && (m = navigator.userAgent.toLowerCase().match(/firefox\/(\d+)/)) && parseInt(m[1], 10) >= 31 || // Double check webkit in userAgent just in case we are in a worker
       typeof navigator !== "undefined" && navigator.userAgent && navigator.userAgent.toLowerCase().match(/applewebkit\/(\d+)/);
     }
     function formatArgs(args) {
@@ -27046,7 +27076,7 @@ var require_node = (0, import_chunk_ABYVSU2C.__commonJS)({
       return (/* @__PURE__ */ new Date()).toISOString() + " ";
     }
     function log2(...args) {
-      return process.stderr.write(util.format(...args) + "\n");
+      return process.stderr.write(util.formatWithOptions(exports.inspectOpts, ...args) + "\n");
     }
     function save(namespaces) {
       if (namespaces) {
@@ -29955,6 +29985,11 @@ async function launchSimulator(force = true) {
         "Contents/MacOS/simulator"
       )
     ]);
+    if (process.platform === "win32") {
+      child.stdin?.end();
+      child.stdout?.destroy();
+      child.stderr?.destroy();
+    }
     child.unref();
     for (let i = 0; ; i++) {
       if (await checkIfSimulatorRunning())
@@ -30717,7 +30752,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_X7QCZR3F.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1734304300896 < opt_time) {
+      if (source_time < opt_time && 1738628242341 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30755,7 +30790,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.86",
+            optimizerVersion: "1.1.88",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -30830,6 +30865,12 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
       cur.paths.push(...result.paths);
       return cur;
     }, null)
+  ).then(
+    (result) => result ?? Promise.reject(
+      new Error(
+        `No valid devices found in manifest. Found ${manifestProducts(manifestXML).map((p) => `'${p}'`).join(", ") || "no products"}`
+      )
+    )
   );
   if (analysis) {
     Object.entries(fnMap).forEach(([k, v]) => {
@@ -31262,8 +31303,17 @@ function optimizePackage(filepath, devKey, output, config) {
   const outName = path5.basename(output, ".iq") + ".prg";
   const rename = (name) => path5.basename(name) === inName ? path5.join(path5.dirname(name), outName) : name;
   const poolStarted = startPool();
-  return getDevKey(devKey).then(
-    (key) => new Promise((resolve5, reject) => {
+  return Promise.all([
+    getDevKey(devKey),
+    getDeviceInfo().then(
+      (deviceInfo) => Object.fromEntries(
+        Object.entries(deviceInfo).flatMap(
+          ([id, info]) => info.partNumbers.map((part) => [part.number, id])
+        )
+      )
+    )
+  ]).then(
+    ([key, deviceInfo]) => new Promise((resolve5, reject) => {
       let manifest = null;
       const sigs = /* @__PURE__ */ new Map();
       const zipfile = new yazl.ZipFile();
@@ -31325,11 +31375,15 @@ function optimizePackage(filepath, devKey, output, config) {
           );
         };
         unzip.readEntry();
+        let hasSig2 = false;
         unzip.on("entry", function(entry) {
           if (/\/$/.test(entry.fileName)) {
             unzip.readEntry();
           } else {
-            if (entry.fileName === "manifest.sig") {
+            if (entry.fileName.startsWith("manifest.sig")) {
+              if (entry.fileName === "manifest.sig2") {
+                hasSig2 = true;
+              }
               unzip.readEntry();
               return;
             }
@@ -31382,7 +31436,7 @@ function optimizePackage(filepath, devKey, output, config) {
             });
           }
         });
-        unzip.on("end", () => {
+        unzip.on("end", async () => {
           try {
             if (!manifest) {
               throw new Error("No manifest file found");
@@ -31392,12 +31446,18 @@ function optimizePackage(filepath, devKey, output, config) {
             if (body instanceof Error) {
               throw body;
             }
-            Promise.all(promises).then(() => {
+            await Promise.all(promises).then(() => {
               body.children("iq:application").children("iq:products").children("iq:product").attrs().forEach((attr) => {
-                const id = attr.id?.value.value;
+                const part = attr.partNumber?.value.value;
+                if (!part) {
+                  throw new Error(
+                    `Missing partNumber for product in manifest`
+                  );
+                }
+                const id = deviceInfo[part];
                 if (!id) {
                   throw new Error(
-                    `Product with missing id found in manifest`
+                    `No id found for partNumber '${part}' in manifest`
                   );
                 }
                 const filename = attr.filename?.value.value;
@@ -31407,8 +31467,8 @@ function optimizePackage(filepath, devKey, output, config) {
                   );
                 }
                 const newName = rename(filename);
-                const sig2 = sigs.get(newName);
-                if (!sig2) {
+                const sig = sigs.get(newName);
+                if (!sig) {
                   throw new Error(
                     `${newName}, listed in the manifest for product ${id}, was not found`
                   );
@@ -31419,19 +31479,27 @@ function optimizePackage(filepath, devKey, output, config) {
                   );
                 }
                 attr.filename.value.value = newName;
-                attr.sig.value.value = sig2.toString("hex").toUpperCase();
+                attr.sig.value.value = sig.subarray(0, 512).toString("hex").toUpperCase();
+                if (attr.sig2 && sig.length === 1024) {
+                  attr.sig2.value.value = sig.subarray(512).toString("hex").toUpperCase();
+                } else {
+                  delete attr.sig2;
+                }
               });
               const contents = Buffer.from(xml_util_exports.writeXml(xml));
               zipfile.addBuffer(contents, "manifest.xml");
-              const sig = signView(
-                key,
-                new DataView(
-                  contents.buffer,
-                  contents.byteOffset,
-                  contents.byteLength
-                )
+              const contentView = new DataView(
+                contents.buffer,
+                contents.byteOffset,
+                contents.byteLength
               );
-              zipfile.addBuffer(sig, "manifest.sig");
+              zipfile.addBuffer(signView(key, contentView), "manifest.sig");
+              if (hasSig2) {
+                zipfile.addBuffer(
+                  signView(key, contentView, "SHA256"),
+                  "manifest.sig2"
+                );
+              }
               zipfile.end();
             });
           } catch (e) {
@@ -31512,7 +31580,14 @@ async function getDeviceInfo() {
         const ciqVersions = partNumbers.map((part) => part.connectIQVersion);
         return [
           deviceId,
-          { appTypes, deviceFamily, displayName, languages, ciqVersions }
+          {
+            appTypes,
+            deviceFamily,
+            displayName,
+            languages,
+            ciqVersions,
+            partNumbers
+          }
         ];
       });
     })

package/build/optimizer.cjs

@@ -18,30 +18,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_BPCBFFSW.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_BPCBFFSW.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_BPCBFFSW.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_ROZUBUPR.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_ROZUBUPR.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_ROZUBUPR.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_X7QCZR3F.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_BPCBFFSW.defaultConfig,
-  display: () => import_chunk_BPCBFFSW.display,
-  generateOneConfig: () => import_chunk_BPCBFFSW.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_BPCBFFSW.generateOptimizedProject,
-  getConfig: () => import_chunk_BPCBFFSW.getConfig,
-  getFnMapAnalysis: () => import_chunk_BPCBFFSW.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_BPCBFFSW.getProjectAnalysis,
-  get_jungle: () => import_chunk_BPCBFFSW.get_jungle,
-  isErrorWithLocation: () => import_chunk_BPCBFFSW.isErrorWithLocation,
-  launchSimulator: () => import_chunk_BPCBFFSW.launchSimulator,
-  manifestProducts: () => import_chunk_BPCBFFSW.manifestProducts,
-  mctree: () => import_chunk_BPCBFFSW.mctree,
-  simulateProgram: () => import_chunk_BPCBFFSW.simulateProgram
+  defaultConfig: () => import_chunk_ROZUBUPR.defaultConfig,
+  display: () => import_chunk_ROZUBUPR.display,
+  generateOneConfig: () => import_chunk_ROZUBUPR.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_ROZUBUPR.generateOptimizedProject,
+  getConfig: () => import_chunk_ROZUBUPR.getConfig,
+  getFnMapAnalysis: () => import_chunk_ROZUBUPR.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_ROZUBUPR.getProjectAnalysis,
+  get_jungle: () => import_chunk_ROZUBUPR.get_jungle,
+  isErrorWithLocation: () => import_chunk_ROZUBUPR.isErrorWithLocation,
+  launchSimulator: () => import_chunk_ROZUBUPR.launchSimulator,
+  manifestProducts: () => import_chunk_ROZUBUPR.manifestProducts,
+  mctree: () => import_chunk_ROZUBUPR.mctree,
+  simulateProgram: () => import_chunk_ROZUBUPR.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_BPCBFFSW = require("./chunk-BPCBFFSW.cjs");
+var import_chunk_ROZUBUPR = require("./chunk-ROZUBUPR.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_BPCBFFSW.init_optimizer)();
+(0, import_chunk_ROZUBUPR.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_BPCBFFSW.SectionKinds,
-  appSupport: () => import_chunk_BPCBFFSW.appSupport,
-  connectiq: () => import_chunk_BPCBFFSW.connectiq,
-  getDeviceInfo: () => import_chunk_BPCBFFSW.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_BPCBFFSW.getFunctionDocumentation,
-  getLanguages: () => import_chunk_BPCBFFSW.getLanguages,
-  getSdkPath: () => import_chunk_BPCBFFSW.getSdkPath,
-  isWin: () => import_chunk_BPCBFFSW.isWin,
-  optimizeProgram: () => import_chunk_BPCBFFSW.optimizeProgram,
-  readPrg: () => import_chunk_BPCBFFSW.readPrg,
-  readPrgWithOffsets: () => import_chunk_BPCBFFSW.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_BPCBFFSW.xml_util_exports
+  SectionKinds: () => import_chunk_ROZUBUPR.SectionKinds,
+  appSupport: () => import_chunk_ROZUBUPR.appSupport,
+  connectiq: () => import_chunk_ROZUBUPR.connectiq,
+  getDeviceInfo: () => import_chunk_ROZUBUPR.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_ROZUBUPR.getFunctionDocumentation,
+  getLanguages: () => import_chunk_ROZUBUPR.getLanguages,
+  getSdkPath: () => import_chunk_ROZUBUPR.getSdkPath,
+  isWin: () => import_chunk_ROZUBUPR.isWin,
+  optimizeProgram: () => import_chunk_ROZUBUPR.optimizeProgram,
+  readPrg: () => import_chunk_ROZUBUPR.readPrg,
+  readPrgWithOffsets: () => import_chunk_ROZUBUPR.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_ROZUBUPR.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_BPCBFFSW = require("./chunk-BPCBFFSW.cjs");
+var import_chunk_ROZUBUPR = require("./chunk-ROZUBUPR.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_BPCBFFSW.init_sdk_util)();
+(0, import_chunk_ROZUBUPR.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/readprg/signer.d.ts

@@ -4,5 +4,5 @@ import * as crypto from "node:crypto";
 import { Context } from "./bytecode";
 export declare function getPrgSignature(context: Context): Buffer | undefined;
 export declare function getDevKey(file: string): Promise<crypto.KeyObject>;
-export declare function signatureFromContext(context: Context): Buffer | null;
-export declare function signView(key: crypto.KeyObject, view: DataView): Buffer;
+export declare function signatureFromContext(context: Context, method?: string): Buffer | null;
+export declare function signView(key: crypto.KeyObject, view: DataView, method?: string): Buffer;

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

@@ -5,6 +5,15 @@ export declare const isWin: boolean;
 export declare const appSupport: string;
 export declare const connectiq: string;
 export declare function getSdkPath(): Promise<string>;
+export type PartNumber = {
+    connectIQVersion: string;
+    firmwareVersion: string;
+    languages: Array<{
+        code: string;
+        fontSet: string;
+    }>;
+    number: string;
+};
 export type DeviceInfo = {
     [key: string]: {
         appTypes: {
@@ -15,6 +24,7 @@ export type DeviceInfo = {
         displayName: string;
         languages: Record<string, true>;
         ciqVersions: Array<string>;
+        partNumbers: PartNumber[];
     };
 };
 export declare function getDeviceInfo(): Promise<DeviceInfo>;

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_BPCBFFSW = require("./chunk-BPCBFFSW.cjs");
+var import_chunk_ROZUBUPR = require("./chunk-ROZUBUPR.cjs");
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_BPCBFFSW.init_worker_task)();
+    (0, import_chunk_ROZUBUPR.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_BPCBFFSW.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_ROZUBUPR.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.86",
+  "version": "1.1.88",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -56,7 +56,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.60"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.61"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",