@markw65/monkeyc-optimizer 1.1.27 → 1.1.28

package/README.md

@@ -876,3 +876,14 @@ No functional change, just fixes a typo that broke the typescript exports.
 
 - New features
   - Adds a [standalone script](https://github.com/markw65/monkeyc-optimizer/wiki/Garmin-Font-Analyzer) to analyze .cft (font) files.
+
+### 1.1.28
+
+- Bug fixes
+
+  - Fixes an issue in the post build optimizer which could cause a pre-definition to be inserted just prior to an `frpush`, which could result in the wrong value of `self` being passed to a call
+  - Don't add personality paths to the generated jungle file if the sdk is prior to 4.2.1
+  - Fixes a bug in the source-to-source optimizer that could incorrectly infer that an `if` block was never entered when the if's comparison was between a primitive type, and a plain `Object`
+
+- Improved optimizations
+  - Constant folding between `Char` and types other than `Number` is now handled (previously such comparisons were just left for Garmin's compiler to handle). This works around a [bug in Garmin's optimizer](https://forums.garmin.com/developer/connect-iq/i/bug-reports/the-optimizer-constant-folds-char-comparisons-incorrectly) by (correctly) resolving the comparisons before Garmin's optimizer can do the wrong thing.

package/build/api.cjs

@@ -18,44 +18,44 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_DD4VX53Y.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_DD4VX53Y.collectNamespaces,
-  createDocumentationMap: () => import_chunk_DD4VX53Y.createDocumentationMap,
-  diagnostic: () => import_chunk_DD4VX53Y.diagnostic,
-  diagnosticHelper: () => import_chunk_DD4VX53Y.diagnosticHelper,
-  findNamesInScope: () => import_chunk_DD4VX53Y.findNamesInScope,
-  findUsingForNode: () => import_chunk_DD4VX53Y.findUsingForNode,
-  formatAst: () => import_chunk_DD4VX53Y.formatAst,
-  formatAstLongLines: () => import_chunk_DD4VX53Y.formatAstLongLines,
-  getApiFunctionInfo: () => import_chunk_DD4VX53Y.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_DD4VX53Y.getApiMapping,
-  getSuperClasses: () => import_chunk_DD4VX53Y.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_ZI7CGRJC.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_ZI7CGRJC.collectNamespaces,
+  createDocumentationMap: () => import_chunk_ZI7CGRJC.createDocumentationMap,
+  diagnostic: () => import_chunk_ZI7CGRJC.diagnostic,
+  diagnosticHelper: () => import_chunk_ZI7CGRJC.diagnosticHelper,
+  findNamesInScope: () => import_chunk_ZI7CGRJC.findNamesInScope,
+  findUsingForNode: () => import_chunk_ZI7CGRJC.findUsingForNode,
+  formatAst: () => import_chunk_ZI7CGRJC.formatAst,
+  formatAstLongLines: () => import_chunk_ZI7CGRJC.formatAstLongLines,
+  getApiFunctionInfo: () => import_chunk_ZI7CGRJC.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_ZI7CGRJC.getApiMapping,
+  getSuperClasses: () => import_chunk_ZI7CGRJC.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_DD4VX53Y.isClassVariable,
-  isLocal: () => import_chunk_DD4VX53Y.isLocal,
-  isLookupCandidate: () => import_chunk_DD4VX53Y.isLookupCandidate,
-  isStateNode: () => import_chunk_DD4VX53Y.isStateNode,
-  lookupByFullName: () => import_chunk_DD4VX53Y.lookupByFullName,
-  lookupNext: () => import_chunk_DD4VX53Y.lookupNext,
-  lookupResultContains: () => import_chunk_DD4VX53Y.lookupResultContains,
-  lookupWithType: () => import_chunk_DD4VX53Y.lookupWithType,
-  makeToyboxLink: () => import_chunk_DD4VX53Y.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_DD4VX53Y.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_DD4VX53Y.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_DD4VX53Y.parseSdkVersion,
-  sameLookupResult: () => import_chunk_DD4VX53Y.sameLookupResult,
+  isClassVariable: () => import_chunk_ZI7CGRJC.isClassVariable,
+  isLocal: () => import_chunk_ZI7CGRJC.isLocal,
+  isLookupCandidate: () => import_chunk_ZI7CGRJC.isLookupCandidate,
+  isStateNode: () => import_chunk_ZI7CGRJC.isStateNode,
+  lookupByFullName: () => import_chunk_ZI7CGRJC.lookupByFullName,
+  lookupNext: () => import_chunk_ZI7CGRJC.lookupNext,
+  lookupResultContains: () => import_chunk_ZI7CGRJC.lookupResultContains,
+  lookupWithType: () => import_chunk_ZI7CGRJC.lookupWithType,
+  makeToyboxLink: () => import_chunk_ZI7CGRJC.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_ZI7CGRJC.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_ZI7CGRJC.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_ZI7CGRJC.parseSdkVersion,
+  sameLookupResult: () => import_chunk_ZI7CGRJC.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_DD4VX53Y.variableDeclarationName,
-  visitReferences: () => import_chunk_DD4VX53Y.visitReferences,
-  visit_resources: () => import_chunk_DD4VX53Y.visit_resources,
-  visitorNode: () => import_chunk_DD4VX53Y.visitorNode
+  variableDeclarationName: () => import_chunk_ZI7CGRJC.variableDeclarationName,
+  visitReferences: () => import_chunk_ZI7CGRJC.visitReferences,
+  visit_resources: () => import_chunk_ZI7CGRJC.visit_resources,
+  visitorNode: () => import_chunk_ZI7CGRJC.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_DD4VX53Y = require("./chunk-DD4VX53Y.cjs");
+var import_chunk_ZI7CGRJC = require("./chunk-ZI7CGRJC.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_DD4VX53Y.init_api)();
+(0, import_chunk_ZI7CGRJC.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-DD4VX53Y.cjs → chunk-ZI7CGRJC.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_DD4VX53Y_exports = {};
-__export(chunk_DD4VX53Y_exports, {
+var chunk_ZI7CGRJC_exports = {};
+__export(chunk_ZI7CGRJC_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -122,7 +122,7 @@ __export(chunk_DD4VX53Y_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_DD4VX53Y_exports);
+module.exports = __toCommonJS(chunk_ZI7CGRJC_exports);
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -10008,13 +10008,18 @@ function restrictExactTypesByEquality(a, b) {
     }
     case 8: {
       let extra_bits = 0;
-      if (b.type & 2 && (a.value == null || a.value === 0)) {
+      if (a.value == null || a.value === 0) {
         extra_bits |= 2;
       }
-      if (b.type & 4 && (a.value == null || a.value === 1)) {
+      if (a.value == null || a.value === 1) {
         extra_bits |= 4;
       }
       let value_bits = b.type & (120 | 128);
+      if (b.type & 32768 && !getObjectValue(b)) {
+        value_bits |= 120 | 128;
+      } else {
+        extra_bits &= b.type;
+      }
       if (a.value != null && value_bits & 32 && roundToFloat(Number(a.value)) !== a.value) {
         value_bits -= 32;
       }
@@ -10035,11 +10040,17 @@ function restrictExactTypesByEquality(a, b) {
       return fixupEnum(a, v, b);
     }
     case 16: {
-      let value_bits = b.type & 120;
+      let value_bits = b.type & (120 | 128);
+      if (b.type & 32768 && !getObjectValue(b)) {
+        value_bits |= 120 | 128;
+      }
       if (a.value != null) {
         if (value_bits & 8 && BigInt.asIntN(32, a.value) !== a.value) {
           value_bits -= 8;
         }
+        if (value_bits & 128 && BigInt.asIntN(32, a.value) !== a.value) {
+          value_bits -= 128;
+        }
         if (value_bits & 32 && BigInt(roundToFloat(Number(a.value))) !== a.value) {
           value_bits -= 32;
         }
@@ -10065,23 +10076,25 @@ function restrictExactTypesByEquality(a, b) {
     }
     case 64:
     case 32: {
-      let value_bits = 120;
+      let value_bits = b.type & (120 | 128);
+      if (b.type & 32768 && !getObjectValue(b)) {
+        value_bits |= 120 | 128;
+      }
       if (a.value != null) {
         if (!Number.isInteger(a.value)) {
-          value_bits -= 8 | 16;
+          value_bits &= ~(8 | 16 | 128);
         } else {
           if (Number(BigInt.asIntN(32, BigInt(a.value))) !== a.value) {
-            value_bits -= 8;
+            value_bits &= ~(8 | 128);
           }
         }
       }
-      value_bits &= b.type;
       let v = {
         type: value_bits
       };
       if (value_bits && !(value_bits & value_bits - 1)) {
         if (a.value != null) {
-          v.value = value_bits === 16 ? BigInt(a.value) : Number(a.value);
+          v.value = value_bits === 16 ? BigInt(a.value) : value_bits === 128 ? String.fromCharCode(Number(a.value)) : a.value;
           if (b.value && !couldBe(v, b)) {
             v.type = 0;
             delete v.value;
@@ -10093,13 +10106,25 @@ function restrictExactTypesByEquality(a, b) {
       return fixupEnum(a, v, b);
     }
     case 128: {
-      const value_bits = b.type & (8 | 128);
+      let extra_bits = 0;
+      if (a.value == null || a.value.charCodeAt(0) === 0) {
+        extra_bits |= 2;
+      }
+      if (a.value == null || a.value.charCodeAt(0) === 1) {
+        extra_bits |= 4;
+      }
+      let value_bits = b.type & (120 | 128);
+      if (b.type & 32768 && !getObjectValue(b)) {
+        value_bits |= 120 | 128;
+      } else {
+        extra_bits &= b.type;
+      }
       let v = {
-        type: value_bits
+        type: value_bits | extra_bits
       };
       if (value_bits && !(value_bits & value_bits - 1)) {
         if (a.value != null) {
-          v.value = value_bits === 8 ? a.value.charCodeAt(0) : a.value;
+          v.value = value_bits === 16 ? BigInt(a.value.charCodeAt(0)) : value_bits & 120 ? a.value.charCodeAt(0) : a.value;
           if (b.value && !couldBe(v, b)) {
             v.type = 0;
             delete v.value;
@@ -10403,10 +10428,10 @@ function equalsCheck(left, right) {
   return left.type & 120 && right.type & 120 ? (
     // eslint-disable-next-line eqeqeq
     left.value == right.value
-  ) : lrBits === (8 | 128) ? (
-    // Char vs Number is true iff the number is the char-code of the char
-    left.type === 128 ? left.value.charCodeAt(0) === right.value : left.value === right.value.charCodeAt(0)
-  ) : left.type === 8 && right.type & 6 ? left.value === (right.value ? 1 : 0) : right.type === 8 && left.type & 6 ? right.value === (left.value ? 1 : 0) : left.type !== right.type ? lrBits & 1 ? lrBits & (32768 | 512 | 1024) ? void 0 : false : lrBits & (4096 | 8192 | 16384) ? false : void 0 : left.type === 128 || left.type === 131072 ? left.value === right.value : isSingleton(left) ? true : void 0;
+  ) : (
+    // Char vs Numeric is true iff the number is the char-code of the char
+    left.type === 128 && right.type & 120 ? left.value.charCodeAt(0) === Number(right.value) : right.type === 128 && left.type & 120 ? Number(left.value) === right.value.charCodeAt(0) : left.type === 128 && right.type & 6 ? left.value.charCodeAt(0) === (right.value ? 1 : 0) : right.type === 128 && left.type & 6 ? right.value.charCodeAt(0) === (left.value ? 1 : 0) : left.type === 8 && right.type & 6 ? left.value === (right.value ? 1 : 0) : right.type === 8 && left.type & 6 ? right.value === (left.value ? 1 : 0) : left.type !== right.type ? lrBits & 1 ? lrBits & (32768 | 512 | 1024) ? void 0 : false : lrBits & (4096 | 8192 | 16384) ? false : void 0 : left.type === 128 || left.type === 131072 ? left.value === right.value : isSingleton(left) ? true : void 0
+  );
 }
 function evaluateBinaryTypes(op, left, right) {
   if (!operators) {
@@ -18180,7 +18205,7 @@ async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
       pragmaChecker(state, f.ast, state.diagnostics?.[name]);
     }
   });
-  return state.diagnostics;
+  return { diagnostics: state.diagnostics, sdkVersion: state.sdkVersion };
 }
 function maybeCalled(state, func) {
   if (!func.body) {
@@ -21567,7 +21592,7 @@ function sizeBasedPRE2(func, context) {
         })
       );
       (0, import_node_assert7.default)(spush);
-      if (index >= 0 && index < block.bytecodes.length) {
+      if (index >= 0 && index < block.bytecodes.length && bcs.has(block.bytecodes[index])) {
         index--;
       }
       block.bytecodes.splice(
@@ -29455,6 +29480,7 @@ async function generateOptimizedProject(options) {
     if (configsToBuild > 1) {
       poolStarted = startPool();
     }
+    let hasPersonality = false;
     const promises = Object.keys(buildConfigs).sort().map((key) => {
       const buildConfig = buildConfigs[key];
       const outputPath = path4.join(config.outputPath, key);
@@ -29483,6 +29509,9 @@ async function generateOptimizedProject(options) {
         if (t.diagnostics) {
           diagnostics = { ...diagnostics, ...t.diagnostics };
         }
+        if (t.sdkVersion != null && t.sdkVersion >= 4002001) {
+          hasPersonality = true;
+        }
       }) : fs6.rm(path4.resolve(workspace, outputPath), {
         recursive: true,
         force: true
@@ -29618,8 +29647,11 @@ async function generateOptimizedProject(options) {
         });
       }
     });
-    promises.push(fs6.writeFile(jungleFiles, parts.join("\n")));
     await Promise.all(promises);
+    await fs6.writeFile(
+      jungleFiles,
+      (hasPersonality ? parts : parts.filter((part) => !/\.personality = /.test(part))).join("\n")
+    );
   } finally {
     if (poolStarted) {
       stopPool();
@@ -29755,6 +29787,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
   const {
     hasTests,
     diagnostics: prevDiagnostics,
+    sdkVersion: prevSdkVersion,
     ...prevOptions
   } = JSON.parse(
     await fs6.readFile(path4.join(output, "build-info.json"), "utf-8").catch(() => "{}")
@@ -29769,8 +29802,12 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     const opt_time = await (0, import_chunk_PVBIKZYZ.first_modified)(
       Object.values(fnMap).map((v) => v.output)
     );
-    if (source_time < opt_time && 1682889148128 < opt_time) {
-      return { hasTests, diagnostics: prevDiagnostics };
+    if (source_time < opt_time && 1684251991147 < opt_time) {
+      return {
+        hasTests,
+        diagnostics: prevDiagnostics,
+        sdkVersion: prevSdkVersion
+      };
     }
   }
   const [, , prettierConfig] = await Promise.all([
@@ -29782,7 +29819,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     })
   ]);
   return optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config).then(
-    (diagnostics) => {
+    ({ diagnostics, sdkVersion }) => {
       const options = { ...prettierConfig, ...config.prettier || {} };
       return Promise.all(
         mcFiles.map(async (info) => {
@@ -29801,12 +29838,13 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
           JSON.stringify({
             hasTests: hasTests2,
             diagnostics,
-            optimizerVersion: "1.1.27",
+            sdkVersion,
+            optimizerVersion: "1.1.28",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
           })
-        ).then(() => ({ hasTests: hasTests2, diagnostics }));
+        ).then(() => ({ hasTests: hasTests2, diagnostics, sdkVersion }));
       });
     }
   );

package/build/optimizer.cjs

@@ -18,29 +18,29 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_DD4VX53Y.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_DD4VX53Y.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_ZI7CGRJC.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_ZI7CGRJC.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_PVBIKZYZ.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_DD4VX53Y.defaultConfig,
-  display: () => import_chunk_DD4VX53Y.display,
-  generateApiMirTests: () => import_chunk_DD4VX53Y.generateApiMirTests,
-  generateOneConfig: () => import_chunk_DD4VX53Y.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_DD4VX53Y.generateOptimizedProject,
-  getConfig: () => import_chunk_DD4VX53Y.getConfig,
-  getProjectAnalysis: () => import_chunk_DD4VX53Y.getProjectAnalysis,
-  get_jungle: () => import_chunk_DD4VX53Y.get_jungle,
-  isErrorWithLocation: () => import_chunk_DD4VX53Y.isErrorWithLocation,
-  launchSimulator: () => import_chunk_DD4VX53Y.launchSimulator,
-  manifestProducts: () => import_chunk_DD4VX53Y.manifestProducts,
-  mctree: () => import_chunk_DD4VX53Y.mctree,
-  simulateProgram: () => import_chunk_DD4VX53Y.simulateProgram
+  defaultConfig: () => import_chunk_ZI7CGRJC.defaultConfig,
+  display: () => import_chunk_ZI7CGRJC.display,
+  generateApiMirTests: () => import_chunk_ZI7CGRJC.generateApiMirTests,
+  generateOneConfig: () => import_chunk_ZI7CGRJC.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_ZI7CGRJC.generateOptimizedProject,
+  getConfig: () => import_chunk_ZI7CGRJC.getConfig,
+  getProjectAnalysis: () => import_chunk_ZI7CGRJC.getProjectAnalysis,
+  get_jungle: () => import_chunk_ZI7CGRJC.get_jungle,
+  isErrorWithLocation: () => import_chunk_ZI7CGRJC.isErrorWithLocation,
+  launchSimulator: () => import_chunk_ZI7CGRJC.launchSimulator,
+  manifestProducts: () => import_chunk_ZI7CGRJC.manifestProducts,
+  mctree: () => import_chunk_ZI7CGRJC.mctree,
+  simulateProgram: () => import_chunk_ZI7CGRJC.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_DD4VX53Y = require("./chunk-DD4VX53Y.cjs");
+var import_chunk_ZI7CGRJC = require("./chunk-ZI7CGRJC.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_DD4VX53Y.init_optimizer)();
+(0, import_chunk_ZI7CGRJC.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_DD4VX53Y.SectionKinds,
-  appSupport: () => import_chunk_DD4VX53Y.appSupport,
-  connectiq: () => import_chunk_DD4VX53Y.connectiq,
-  getDeviceInfo: () => import_chunk_DD4VX53Y.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_DD4VX53Y.getFunctionDocumentation,
-  getLanguages: () => import_chunk_DD4VX53Y.getLanguages,
-  getSdkPath: () => import_chunk_DD4VX53Y.getSdkPath,
-  isWin: () => import_chunk_DD4VX53Y.isWin,
-  optimizeProgram: () => import_chunk_DD4VX53Y.optimizeProgram,
-  readPrg: () => import_chunk_DD4VX53Y.readPrg,
-  readPrgWithOffsets: () => import_chunk_DD4VX53Y.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_DD4VX53Y.xml_util_exports
+  SectionKinds: () => import_chunk_ZI7CGRJC.SectionKinds,
+  appSupport: () => import_chunk_ZI7CGRJC.appSupport,
+  connectiq: () => import_chunk_ZI7CGRJC.connectiq,
+  getDeviceInfo: () => import_chunk_ZI7CGRJC.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_ZI7CGRJC.getFunctionDocumentation,
+  getLanguages: () => import_chunk_ZI7CGRJC.getLanguages,
+  getSdkPath: () => import_chunk_ZI7CGRJC.getSdkPath,
+  isWin: () => import_chunk_ZI7CGRJC.isWin,
+  optimizeProgram: () => import_chunk_ZI7CGRJC.optimizeProgram,
+  readPrg: () => import_chunk_ZI7CGRJC.readPrg,
+  readPrgWithOffsets: () => import_chunk_ZI7CGRJC.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_ZI7CGRJC.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_DD4VX53Y = require("./chunk-DD4VX53Y.cjs");
+var import_chunk_ZI7CGRJC = require("./chunk-ZI7CGRJC.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_DD4VX53Y.init_sdk_util)();
+(0, import_chunk_ZI7CGRJC.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/mc-rewrite.d.ts

@@ -7,4 +7,7 @@ export declare function getFileASTs(fnMap: FilesToOptimizeMap): Promise<boolean>
 export declare function analyze(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document | undefined, config: BuildConfig): Promise<ProgramStateAnalysis>;
 export declare function reportMissingSymbols(state: ProgramStateAnalysis, config?: BuildConfig): void;
 export declare function getLiteralFromDecls(lookupDefns: LookupDefinition[]): mctree.Literal | mctree.AsExpression | null;
-export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document, config: BuildConfig): Promise<Record<string, import("./optimizer-types").Diagnostic[]> | undefined>;
+export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document, config: BuildConfig): Promise<{
+    diagnostics: Record<string, import("./optimizer-types").Diagnostic[]> | undefined;
+    sdkVersion: number | undefined;
+}>;

package/build/src/optimizer.d.ts

@@ -89,6 +89,7 @@ export type Analysis = {
 export declare function generateOneConfig(buildConfig: JungleQualifier, manifestXML: xmlUtil.Document, dependencyFiles: string[], config: BuildConfig): Promise<{
     hasTests: boolean;
     diagnostics: ProgramState["diagnostics"];
+    sdkVersion: number | undefined;
 }>;
 export declare function getProjectAnalysis(targets: Target[], analysis: PreAnalysis | null, manifestXML: xmlUtil.Document, options: BuildConfig): Promise<Analysis | PreAnalysis>;
 /**

package/build/src/projects.d.ts

@@ -13,7 +13,7 @@ export type RemoteProject = string | {
     sourcePath?: string;
     jungleContent?: string[];
     garminOptLevel?: number;
-    test?: boolean;
+    test?: boolean | string[];
 };
 export declare const githubProjects: RemoteProject[];
 export declare function fetchGitProjects(projects: RemoteProject[], testOnly: boolean, skipRemote: boolean): Promise<(string | {
@@ -21,4 +21,5 @@ export declare function fetchGitProjects(projects: RemoteProject[], testOnly: bo
     build: boolean | null;
     options: BuildConfig | null;
     garminOptLevel: number | null;
+    products: string[] | null;
 })[]>;

package/build/src/worker-task.d.ts

@@ -70,6 +70,7 @@ export declare const workerTaskHandlers: {
     readonly generateOneConfig: (data: GenerateOneConfig["data"]) => Promise<{
         hasTests: boolean;
         diagnostics: Record<string, import("./optimizer-types").Diagnostic[]> | undefined;
+        sdkVersion: number | undefined;
     }>;
     readonly optimizePrgAndDebug: (data: OptimizePrgAndDebug["data"]) => Promise<{
         sigBuffer: ArrayBufferLike | undefined;

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_DD4VX53Y = require("./chunk-DD4VX53Y.cjs");
+var import_chunk_ZI7CGRJC = require("./chunk-ZI7CGRJC.cjs");
 var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.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_DD4VX53Y.init_worker_task)();
+    (0, import_chunk_ZI7CGRJC.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_DD4VX53Y.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_ZI7CGRJC.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.27",
+  "version": "1.1.28",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",