@markw65/monkeyc-optimizer 1.1.87 → 1.1.89

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.89
+
+- Fix error determining whether or not to generate a SHA256 signature, so that things start working with sdk-8.2.2 again
+
+### 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.

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_N2N7HF67.checkCompilerVersion,
-  clearDiagnostics: () => import_chunk_N2N7HF67.clearDiagnostics,
-  collectNamespaces: () => import_chunk_N2N7HF67.collectNamespaces,
-  createDocumentationMap: () => import_chunk_N2N7HF67.createDocumentationMap,
-  declKey: () => import_chunk_N2N7HF67.declKey,
-  diagnostic: () => import_chunk_N2N7HF67.diagnostic,
-  diagnosticHelper: () => import_chunk_N2N7HF67.diagnosticHelper,
-  findNamesInScope: () => import_chunk_N2N7HF67.findNamesInScope,
-  findUsingForNode: () => import_chunk_N2N7HF67.findUsingForNode,
-  formatAst: () => import_chunk_N2N7HF67.formatAst,
-  formatAstLongLines: () => import_chunk_N2N7HF67.formatAstLongLines,
-  formatScopedName: () => import_chunk_N2N7HF67.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_N2N7HF67.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_N2N7HF67.getApiMapping,
-  getSuperClasses: () => import_chunk_N2N7HF67.getSuperClasses,
-  handleImportUsing: () => import_chunk_N2N7HF67.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_7CG7CM26.checkCompilerVersion,
+  clearDiagnostics: () => import_chunk_7CG7CM26.clearDiagnostics,
+  collectNamespaces: () => import_chunk_7CG7CM26.collectNamespaces,
+  createDocumentationMap: () => import_chunk_7CG7CM26.createDocumentationMap,
+  declKey: () => import_chunk_7CG7CM26.declKey,
+  diagnostic: () => import_chunk_7CG7CM26.diagnostic,
+  diagnosticHelper: () => import_chunk_7CG7CM26.diagnosticHelper,
+  findNamesInScope: () => import_chunk_7CG7CM26.findNamesInScope,
+  findUsingForNode: () => import_chunk_7CG7CM26.findUsingForNode,
+  formatAst: () => import_chunk_7CG7CM26.formatAst,
+  formatAstLongLines: () => import_chunk_7CG7CM26.formatAstLongLines,
+  formatScopedName: () => import_chunk_7CG7CM26.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_7CG7CM26.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_7CG7CM26.getApiMapping,
+  getSuperClasses: () => import_chunk_7CG7CM26.getSuperClasses,
+  handleImportUsing: () => import_chunk_7CG7CM26.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_N2N7HF67.isClassVariable,
-  isLocal: () => import_chunk_N2N7HF67.isLocal,
-  isLookupCandidate: () => import_chunk_N2N7HF67.isLookupCandidate,
-  isStateNode: () => import_chunk_N2N7HF67.isStateNode,
-  lookupByFullName: () => import_chunk_N2N7HF67.lookupByFullName,
-  lookupNext: () => import_chunk_N2N7HF67.lookupNext,
-  lookupResultContains: () => import_chunk_N2N7HF67.lookupResultContains,
-  lookupWithType: () => import_chunk_N2N7HF67.lookupWithType,
-  makeToyboxLink: () => import_chunk_N2N7HF67.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_N2N7HF67.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_N2N7HF67.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_N2N7HF67.parseSdkVersion,
-  popRootNode: () => import_chunk_N2N7HF67.popRootNode,
-  pushRootNode: () => import_chunk_N2N7HF67.pushRootNode,
-  resolveDiagnostics: () => import_chunk_N2N7HF67.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_N2N7HF67.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_N2N7HF67.sameLookupResult,
+  isClassVariable: () => import_chunk_7CG7CM26.isClassVariable,
+  isLocal: () => import_chunk_7CG7CM26.isLocal,
+  isLookupCandidate: () => import_chunk_7CG7CM26.isLookupCandidate,
+  isStateNode: () => import_chunk_7CG7CM26.isStateNode,
+  lookupByFullName: () => import_chunk_7CG7CM26.lookupByFullName,
+  lookupNext: () => import_chunk_7CG7CM26.lookupNext,
+  lookupResultContains: () => import_chunk_7CG7CM26.lookupResultContains,
+  lookupWithType: () => import_chunk_7CG7CM26.lookupWithType,
+  makeToyboxLink: () => import_chunk_7CG7CM26.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_7CG7CM26.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_7CG7CM26.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_7CG7CM26.parseSdkVersion,
+  popRootNode: () => import_chunk_7CG7CM26.popRootNode,
+  pushRootNode: () => import_chunk_7CG7CM26.pushRootNode,
+  resolveDiagnostics: () => import_chunk_7CG7CM26.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_7CG7CM26.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_7CG7CM26.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_N2N7HF67.variableDeclarationName,
-  visitReferences: () => import_chunk_N2N7HF67.visitReferences,
-  visit_resources: () => import_chunk_N2N7HF67.visit_resources,
-  visitorNode: () => import_chunk_N2N7HF67.visitorNode
+  variableDeclarationName: () => import_chunk_7CG7CM26.variableDeclarationName,
+  visitReferences: () => import_chunk_7CG7CM26.visitReferences,
+  visit_resources: () => import_chunk_7CG7CM26.visit_resources,
+  visitorNode: () => import_chunk_7CG7CM26.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_N2N7HF67 = require("./chunk-N2N7HF67.cjs");
+var import_chunk_7CG7CM26 = require("./chunk-7CG7CM26.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_N2N7HF67.init_api)();
+(0, import_chunk_7CG7CM26.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-N2N7HF67.cjs → chunk-7CG7CM26.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_N2N7HF67_exports = {};
-__export(chunk_N2N7HF67_exports, {
+var chunk_7CG7CM26_exports = {};
+__export(chunk_7CG7CM26_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_N2N7HF67_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_N2N7HF67_exports);
+module.exports = __toCommonJS(chunk_7CG7CM26_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 - 8;
   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 && 1734629819655 < opt_time) {
+      if (source_time < opt_time && 1754525704940 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30755,7 +30790,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.87",
+            optimizerVersion: "1.1.89",
             ...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]) => {
@@ -31334,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.startsWith("manifest.sig")) {
+              if (entry.fileName === "manifest.sig2") {
+                hasSig2 = true;
+              }
               unzip.readEntry();
               return;
             }
@@ -31422,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`
                   );
@@ -31434,20 +31479,27 @@ function optimizePackage(filepath, devKey, output, config) {
                   );
                 }
                 attr.filename.value.value = newName;
-                attr.sig.value.value = sig2.toString("hex").toUpperCase();
-                delete attr.sig2;
+                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) {

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_N2N7HF67.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_N2N7HF67.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_N2N7HF67.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_7CG7CM26.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_7CG7CM26.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_7CG7CM26.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_X7QCZR3F.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_N2N7HF67.defaultConfig,
-  display: () => import_chunk_N2N7HF67.display,
-  generateOneConfig: () => import_chunk_N2N7HF67.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_N2N7HF67.generateOptimizedProject,
-  getConfig: () => import_chunk_N2N7HF67.getConfig,
-  getFnMapAnalysis: () => import_chunk_N2N7HF67.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_N2N7HF67.getProjectAnalysis,
-  get_jungle: () => import_chunk_N2N7HF67.get_jungle,
-  isErrorWithLocation: () => import_chunk_N2N7HF67.isErrorWithLocation,
-  launchSimulator: () => import_chunk_N2N7HF67.launchSimulator,
-  manifestProducts: () => import_chunk_N2N7HF67.manifestProducts,
-  mctree: () => import_chunk_N2N7HF67.mctree,
-  simulateProgram: () => import_chunk_N2N7HF67.simulateProgram
+  defaultConfig: () => import_chunk_7CG7CM26.defaultConfig,
+  display: () => import_chunk_7CG7CM26.display,
+  generateOneConfig: () => import_chunk_7CG7CM26.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_7CG7CM26.generateOptimizedProject,
+  getConfig: () => import_chunk_7CG7CM26.getConfig,
+  getFnMapAnalysis: () => import_chunk_7CG7CM26.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_7CG7CM26.getProjectAnalysis,
+  get_jungle: () => import_chunk_7CG7CM26.get_jungle,
+  isErrorWithLocation: () => import_chunk_7CG7CM26.isErrorWithLocation,
+  launchSimulator: () => import_chunk_7CG7CM26.launchSimulator,
+  manifestProducts: () => import_chunk_7CG7CM26.manifestProducts,
+  mctree: () => import_chunk_7CG7CM26.mctree,
+  simulateProgram: () => import_chunk_7CG7CM26.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_N2N7HF67 = require("./chunk-N2N7HF67.cjs");
+var import_chunk_7CG7CM26 = require("./chunk-7CG7CM26.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_N2N7HF67.init_optimizer)();
+(0, import_chunk_7CG7CM26.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_N2N7HF67.SectionKinds,
-  appSupport: () => import_chunk_N2N7HF67.appSupport,
-  connectiq: () => import_chunk_N2N7HF67.connectiq,
-  getDeviceInfo: () => import_chunk_N2N7HF67.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_N2N7HF67.getFunctionDocumentation,
-  getLanguages: () => import_chunk_N2N7HF67.getLanguages,
-  getSdkPath: () => import_chunk_N2N7HF67.getSdkPath,
-  isWin: () => import_chunk_N2N7HF67.isWin,
-  optimizeProgram: () => import_chunk_N2N7HF67.optimizeProgram,
-  readPrg: () => import_chunk_N2N7HF67.readPrg,
-  readPrgWithOffsets: () => import_chunk_N2N7HF67.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_N2N7HF67.xml_util_exports
+  SectionKinds: () => import_chunk_7CG7CM26.SectionKinds,
+  appSupport: () => import_chunk_7CG7CM26.appSupport,
+  connectiq: () => import_chunk_7CG7CM26.connectiq,
+  getDeviceInfo: () => import_chunk_7CG7CM26.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_7CG7CM26.getFunctionDocumentation,
+  getLanguages: () => import_chunk_7CG7CM26.getLanguages,
+  getSdkPath: () => import_chunk_7CG7CM26.getSdkPath,
+  isWin: () => import_chunk_7CG7CM26.isWin,
+  optimizeProgram: () => import_chunk_7CG7CM26.optimizeProgram,
+  readPrg: () => import_chunk_7CG7CM26.readPrg,
+  readPrgWithOffsets: () => import_chunk_7CG7CM26.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_7CG7CM26.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_N2N7HF67 = require("./chunk-N2N7HF67.cjs");
+var import_chunk_7CG7CM26 = require("./chunk-7CG7CM26.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_N2N7HF67.init_sdk_util)();
+(0, import_chunk_7CG7CM26.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/analysis.d.ts

@@ -0,0 +1,34 @@
+import { JungleQualifier, JungleResourceMap, Target } from "./jungles";
+import { BuildConfig, ExcludeAnnotationsMap, FilesToOptimizeMap, ProgramStateAnalysis } from "./optimizer-types";
+import { xmlUtil } from "./sdk-util";
+import { TypeMap } from "./type-flow/interp";
+export type PreAnalysis = {
+    fnMap: FilesToOptimizeMap;
+    paths: string[];
+};
+export type Analysis = {
+    fnMap: FilesToOptimizeMap;
+    paths: string[];
+    state: ProgramStateAnalysis;
+    typeMap?: TypeMap | null | undefined;
+};
+export declare function relative_path_no_dotdot(relative: string): string;
+type GlobCache = Map<string, Promise<string[]>>;
+export declare function fileInfoFromConfig(workspace: string, buildDir: string, output: string, buildConfig: JungleQualifier, extraExcludes: ExcludeAnnotationsMap, barrel: string, cache?: GlobCache): Promise<PreAnalysis>;
+/**
+ * A barrel can specify a list of possible annotations, and the
+ * jungle that requests the barrel can specify the annotations it wants.
+ *
+ * We should exclude all the possible annotations that weren't explicitly
+ * requested.
+ */
+export declare function excludesFromAnnotations(baseAnnotations: string[] | undefined, barrelAnnotations: string[] | undefined): {
+    [k: string]: boolean;
+};
+export declare function getProjectAnalysisHelper(targets: Target[], analysis: PreAnalysis | null, manifestXML: xmlUtil.Document, options: BuildConfig): Promise<Analysis | PreAnalysis>;
+export declare function getFnMapAnalysis(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document, options: BuildConfig): Promise<{
+    fnMap: FilesToOptimizeMap;
+    state: ProgramStateAnalysis;
+    typeMap: TypeMap | null;
+}>;
+export {};

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/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_N2N7HF67 = require("./chunk-N2N7HF67.cjs");
+var import_chunk_7CG7CM26 = require("./chunk-7CG7CM26.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_N2N7HF67.init_worker_task)();
+    (0, import_chunk_7CG7CM26.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_N2N7HF67.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_7CG7CM26.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.87",
+  "version": "1.1.89",
   "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",