@markw65/monkeyc-optimizer 1.1.60 → 1.1.62

package/CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.62
+
+- Update to [@markw65/prettier-plugin-monkeyc@1.0.58](https://github.com/markw65/prettier-plugin-monkeyc/blob/main/CHANGELOG.md#1058)
+  - Fix an indentation issue with interfaces
+- Track uninitialized fields in class initializers (Part of fix for #35)
+- Fix lookups for MemberExpressions with literal objects (Rest of fix for #35)
+- Don't report parameters as missing symbols in interface functions (Fixes #36)
+
+### 1.1.61
+
+- Disable more post-build optimizations to allow apps to verify.
+- Add an `allowForbiddenOpts` option to re-enable the optimizations in simulator or device build mode.
+
 ### 1.1.60
 
 - Disable the "remove argc" optimization, as it's going to start breaking verification in the app store.

package/build/api.cjs

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

package/build/{chunk-X2C4HXXZ.cjs → chunk-WVEFLPTH.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_X2C4HXXZ_exports = {};
-__export(chunk_X2C4HXXZ_exports, {
+var chunk_WVEFLPTH_exports = {};
+__export(chunk_WVEFLPTH_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -133,7 +133,7 @@ __export(chunk_X2C4HXXZ_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_X2C4HXXZ_exports);
+module.exports = __toCommonJS(chunk_WVEFLPTH_exports);
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -12477,8 +12477,14 @@ function clearAssocPaths(blockState, decl, v) {
   }
 }
 function cloneTypeState(blockState) {
-  const { map: map2, trackedMemberDecls, liveCopyPropEvents, ...rest } = blockState;
-  const clone = { map: new Map(map2), ...rest };
+  const { map: map2, inited, trackedMemberDecls, liveCopyPropEvents, ...rest } = blockState;
+  const clone = {
+    map: new Map(map2),
+    ...rest
+  };
+  if (inited) {
+    clone.inited = new Set(inited);
+  }
   clone.map.forEach((value2, key) => {
     if (value2.equivSet) {
       if (key === Array.from(value2.equivSet)[0]) {
@@ -12675,6 +12681,7 @@ function mergeTypeState(blockStates, index, from, nodeCopyProp) {
     tov.curType = result;
     changes = true;
   });
+  to.inited?.forEach((k) => from.inited.has(k) || to.inited?.delete(k));
   return changes;
 }
 function typeStateEntry(value2, key) {
@@ -12788,13 +12795,16 @@ function updateAffected(blockState, objectType, baseDecl, assignedPath, affected
 function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStores, logThisRun) {
   const order = getPostOrder(graph).reverse();
   const queue = new DataflowQueue();
-  let selfClassDecl = null;
   const isStatic = !!(func.attributes & 8);
   const klass = func.stack?.[func.stack?.length - 1].sn;
-  if (klass && klass.type === "ClassDeclaration") {
-    selfClassDecl = klass;
-  }
-  const isInitialize = selfClassDecl && func.name === "initialize";
+  const selfClassDecl = klass && klass.type === "ClassDeclaration" ? klass : null;
+  const uninitClassDecls = selfClassDecl && func.name === "initialize" && selfClassDecl.decls ? new Set(
+    Object.values(selfClassDecl.decls).filter(
+      (decls) => decls.some(
+        (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !decl.node.init
+      )
+    ).flat()
+  ) : null;
   order.forEach((block, i) => {
     block.order = i;
   });
@@ -13040,7 +13050,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     }
     return [cur, updateAny];
   }
-  function typeConstraint(decls) {
+  function typeConstraint(decls, blockState) {
     return (0, import_chunk_SG7ODKRM.reduce)(
       decls,
       (cur, decl) => {
@@ -13055,7 +13065,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           cur,
           decl.type === "Literal" ? typeFromLiteral(decl) : typeFromTypeStateNode(state, decl, true)
         );
-        if (isInitialize && decl.type === "VariableDeclarator" && !decl.node.init && decl.node.kind === "var" && decl.stack[decl.stack.length - 1].sn === selfClassDecl) {
+        if (blockState.inited && !blockState.inited.has(decl) && decl.type === "VariableDeclarator" && !decl.node.init && decl.node.kind === "var" && decl.stack[decl.stack.length - 1].sn === selfClassDecl) {
           cur.type |= 1;
         }
         return cur;
@@ -13112,7 +13122,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     if (Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown") {
       let tsVal = blockState.map.get(decl);
       if (!tsVal) {
-        tsVal = { curType: typeConstraint(decl) };
+        tsVal = { curType: typeConstraint(decl, blockState) };
         blockState.map.set(decl, tsVal);
       }
       return tsVal;
@@ -13592,7 +13602,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               }
               (0, import_node_assert3.default)(!tsv.copyPropItem);
               clearRelatedCopyPropEvents(curState, decl, nodeCopyProp);
-              curState.map.set(decl, { curType: typeConstraint(decl) });
+              curState.map.set(decl, {
+                curType: typeConstraint(decl, curState)
+              });
             } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_SG7ODKRM.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
               if (type.value != null && type.type & 32768) {
                 const odata = getObjectValue(tsv.curType);
@@ -13615,6 +13627,12 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         break;
       }
       case "def": {
+        if (uninitClassDecls?.size) {
+          (0, import_chunk_SG7ODKRM.forEach)(
+            event.decl,
+            (decl) => uninitClassDecls.has(decl) && curState.inited?.add(decl)
+          );
+        }
         const lval = event.node.type === "UpdateExpression" ? event.node.argument : event.node.type === "AssignmentExpression" ? event.node.left : null;
         if (lval) {
           if (nodeCopyProp.size && lval.type === "MemberExpression") {
@@ -13701,7 +13719,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                 clearAssocPaths(curState, decls, value2);
               }
               (0, import_node_assert3.default)(!value2.copyPropItem);
-              curState.map.set(decls, { curType: typeConstraint(decls) });
+              curState.map.set(decls, {
+                curType: typeConstraint(decls, curState)
+              });
               clearRelatedCopyPropEvents(curState, decls, nodeCopyProp);
             }
           });
@@ -13818,6 +13838,8 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
   };
   blockStates[0] = { map: /* @__PURE__ */ new Map(), visits: 0 };
   const head = blockStates[0];
+  if (uninitClassDecls?.size)
+    head.inited = /* @__PURE__ */ new Set();
   func.node.params.forEach((param) => {
     setStateEvent(
       head,
@@ -18063,6 +18085,8 @@ function visitReferences(state, ast, name, defn, callback, includeDefs = false,
                 );
               }
             }
+          } else if (state.inType && node.operator === "as") {
+            return ["right"];
           }
           break;
         case "CallExpression":
@@ -18560,6 +18584,20 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
       }
       return [null, null];
     }
+    case "Literal": {
+      const [, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(node);
+      if (type === "Null")
+        break;
+      return [
+        name ?? `${node.value}`,
+        [
+          {
+            parent: null,
+            results: lookupByFullName(state, `Toybox.Lang.${type}`)
+          }
+        ]
+      ];
+    }
   }
   return [false, false];
 }
@@ -19414,6 +19452,7 @@ function getSuperClasses(klass) {
 var init_api = (0, import_chunk_ABYVSU2C.__esm)({
   "src/api.ts"() {
     (0, import_chunk_MBTLUWXR.init_ast)();
+    init_data_flow();
     init_mc_rewrite();
     init_negative_fixups();
     init_optimizer_types();
@@ -19422,8 +19461,6 @@ var init_api = (0, import_chunk_ABYVSU2C.__esm)({
     init_type_flow_util();
     init_types();
     (0, import_chunk_SG7ODKRM.init_util)();
-    (0, import_chunk_MBTLUWXR.init_ast)();
-    init_data_flow();
     init_visitor();
   }
 });
@@ -22067,7 +22104,7 @@ function localDCE(func, context) {
       switch (bytecode.op) {
         case 19: {
           const liveLocal = dceInfo.locals.has(bytecode.arg);
-          if (!liveLocal) {
+          if (!liveLocal && (bytecode.arg || context.config.allowForbiddenOpts)) {
             (0, import_chunk_SG7ODKRM.logger)(
               "dce",
               2,
@@ -22344,17 +22381,22 @@ function minimizeLocals2(func, equivSets, context) {
   locals.forEach((local, key) => {
     if (key.op !== 19)
       return;
-    let inUse = 0n;
-    local.conflicts.forEach((conflict) => {
-      const color = colors.get(conflict);
-      if (color != null) {
-        inUse |= 1n << BigInt(color);
+    let lowest = context.config.allowForbiddenOpts ? 0 : 1;
+    if (key.arg === 0 && !context.config.allowForbiddenOpts) {
+      lowest = 0;
+    } else {
+      let inUse = 0n;
+      local.conflicts.forEach((conflict) => {
+        const color = colors.get(conflict);
+        if (color != null) {
+          inUse |= 1n << BigInt(color);
+        }
+      });
+      inUse >>= BigInt(lowest);
+      while (inUse & 1n) {
+        lowest++;
+        inUse >>= 1n;
       }
-    });
-    let lowest = 0;
-    while (inUse & 1n) {
-      lowest++;
-      inUse >>= 1n;
     }
     colors.set(key, lowest);
     if (!merge[lowest]) {
@@ -22403,7 +22445,7 @@ function minimizeLocals2(func, equivSets, context) {
     (0, import_node_assert9.default)(color != null);
     let name = null;
     Array.from(value2.live).some((bc) => {
-      if ((bc.op === 18 || bc.op === 19) && bc.range) {
+      if ("range" in bc && bc.range) {
         if (!name) {
           name = bc.range.name;
         } else if (name !== bc.range.name) {
@@ -22420,11 +22462,18 @@ function minimizeLocals2(func, equivSets, context) {
         name = Array.from(name).join("_");
       }
       range = { name, id: context.nextLocalId++ };
-      if (key.op === 18) {
+      if (key.op !== 19) {
         range.isParam = true;
       }
     }
-    value2.live.forEach((bc) => fixupMap.set(bc, { color, range }));
+    value2.live.forEach((bc) => {
+      if (bc.op === 19 ? bc.arg === 0 : opReadsLocal(bc) === 0) {
+        if (color !== 0) {
+          console.log("oops");
+        }
+      }
+      fixupMap.set(bc, { color, range });
+    });
   });
   func.blocks.forEach((block) => {
     let filter = false;
@@ -22622,7 +22671,12 @@ function mergeSplitRanges(splitRanges) {
         (count, set) => count + (set.has(key) ? 1 : 0),
         0
       );
-      (0, import_node_assert9.default)(num === 1);
+      if (num === 0) {
+        (0, import_node_assert9.default)(x.live.size === 0);
+        putvSets.add(/* @__PURE__ */ new Set([key]));
+      } else {
+        (0, import_node_assert9.default)(num === 1);
+      }
     });
     const newRange = /* @__PURE__ */ new Map();
     putvSets.forEach((pvSet) => {
@@ -23123,7 +23177,8 @@ function optimizeFunc(func, context) {
       if (sizeBasedPRE2(func, context))
         continue;
     }
-    if (!minimizeLocals2(func, equivSets, context) && !changes) {
+    changes = minimizeLocals2(func, equivSets, context) || changes;
+    if (!changes) {
       return;
     }
   }
@@ -23157,18 +23212,27 @@ function doArrayInits(func, liveInState, context) {
   );
   return changes;
 }
-function simpleOpts(func, _context) {
+function simpleOpts(func, context) {
   const equalsSym = 8388787;
   const logging3 = (0, import_chunk_SG7ODKRM.wouldLog)("optimize", 5);
   return Array.from(func.blocks.values()).reduce((changes, block) => {
     for (let i = block.bytecodes.length; i--; ) {
       const cur = block.bytecodes[i];
-      if (cur.op === 0 || cur.op === 1 && cur.arg === 0) {
+      if (cur.op === 0 || cur.op === 1 && cur.arg === 0 || cur.op === 53 && context.config.removeArgc && context.config.allowForbiddenOpts) {
         block.bytecodes.splice(i, 1);
         changes = true;
         if (logging3) {
           (0, import_chunk_SG7ODKRM.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
         }
+      } else if (cur.op === 74 && context.config.removeArgc && context.config.allowForbiddenOpts) {
+        const arg = cur.arg.incsp;
+        const incsp = cur;
+        incsp.op = 1;
+        incsp.arg = arg;
+        changes = true;
+        if (logging3) {
+          (0, import_chunk_SG7ODKRM.log)(`${func.name}: argcincsp => incsp`);
+        }
       } else if (i && cur.op === 39 && cur.arg === equalsSym) {
         changes = equalSymbolToEq(block, i) || changes;
       } else if (i && cur.op === 10) {
@@ -23714,14 +23778,17 @@ function getLocalsInfo(func) {
     (block) => new Map(liveOutLocals.get(block.offset)),
     (block, bc, locals) => {
       switch (bc.op) {
+        case 70:
         case 18: {
           const range = bc.range;
           if (range) {
-            locals.set(bc.arg, {
+            const localNum = opReadsLocal(bc);
+            (0, import_node_assert13.default)(localNum != null);
+            locals.set(localNum, {
               name: range.name,
               id: range.id,
               isParam: range.isParam === true,
-              slot: bc.arg
+              slot: localNum
             });
           }
           break;
@@ -24056,8 +24123,9 @@ function markLocals(context) {
         e.push(localInfo.sid);
       }
     });
-    if (bc.op === 18 || bc.op === 19) {
-      const local = live.get(bc.arg);
+    if (bc.op === 19 || bc.op === 18 || bc.op === 70) {
+      const localNum = bc.op === 70 ? bc.arg.local : bc.arg;
+      const local = live.get(localNum);
       if (local) {
         const range2 = { name: local.name, id: local.range };
         if (local.arg) {
@@ -24311,7 +24379,7 @@ function bytecodeToString(bytecode, symbolTable) {
       arg = offsetToString(bytecode.arg);
       break;
     case 70:
-      arg = `${bytecode.range ? `${bytecode.range.name} ${bytecode.arg}${bytecode.range.isParam ? " (param)" : ""}` : bytecode.arg.local} ${symbol(bytecode.arg.var)}`;
+      arg = `${bytecode.range ? `${bytecode.range.name} ${bytecode.arg.local}${bytecode.range.isParam ? " (param)" : ""}` : bytecode.arg.local} ${symbol(bytecode.arg.var)}`;
       break;
     case 69:
       arg = `${symbol(bytecode.arg.module)} ${symbol(bytecode.arg.var)}`;
@@ -24439,8 +24507,12 @@ function findFunctions({
         continue;
       }
       func.set(next2, block);
-      if (func.size === 1 && block.bytecodes.length && block.bytecodes[0].op === 53) {
-        argc = block.bytecodes[0].arg;
+      if (func.size === 1 && block.bytecodes.length) {
+        if (block.bytecodes[0].op === 53) {
+          argc = block.bytecodes[0].arg;
+        } else if (block.bytecodes[0].op === 74) {
+          argc = block.bytecodes[0].arg.argc;
+        }
       }
       blocks.delete(next2);
       if (block.exsucc != null) {
@@ -29146,7 +29218,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_SG7ODKRM.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1715292882674 < opt_time) {
+      if (source_time < opt_time && 1716742569780 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29185,7 +29257,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.60",
+            optimizerVersion: "1.1.62",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29701,6 +29773,9 @@ function optimizePackage(filepath, devKey, output, config) {
   if (!devKey) {
     throw new Error(`Can't sign ${filepath} without a developer key`);
   }
+  if (config?.allowForbiddenOpts) {
+    config = { ...config, allowForbiddenOpts: false };
+  }
   const inBase = path5.basename(filepath, ".iq");
   if (!output) {
     output = path5.join(path5.dirname(filepath), inBase) + ".opt.iq";

package/build/optimizer.cjs

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

package/build/src/optimizer-types.d.ts

@@ -47,6 +47,7 @@ export type BuildConfig = {
     checkTypes?: DiagnosticType | "OFF";
     removeArgc?: boolean;
     postBuildPRE?: boolean;
+    allowForbiddenOpts?: boolean;
 };
 export type StateNodeDecl = StateNode | mctree.EnumStringMember | mctree.TypedIdentifier;
 export type StateNodeDecls = {

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_X2C4HXXZ = require("./chunk-X2C4HXXZ.cjs");
+var import_chunk_WVEFLPTH = require("./chunk-WVEFLPTH.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.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_X2C4HXXZ.init_worker_task)();
+    (0, import_chunk_WVEFLPTH.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_X2C4HXXZ.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_WVEFLPTH.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.60",
+  "version": "1.1.62",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -25,8 +25,12 @@
     "test": "npm run test-mocha && npm run test-analysis && npm run test-optimized && npm run test-unopt && npm run test-post-only && npm run test-tiny && npm run test-remote && npm run test-remote-tests && npm run test-personality",
     "test-mocha": "npx mocha --timeout 999999 build/mocha.cjs",
     "test-remote": "node ./test/test.js --showInfo --postOptimize --product=pick-one --github",
-    "test-remote-tests": "node ./test/test.js --showInfo --postOptimize --product=pick-one --run-tests --github",
-    "test-optimized": "node test/test.js --showInfo --postOptimize --typeCheckLevel Strict --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
+    "test-remote-tests-default": "node ./test/test.js --showInfo --postOptimize --product=pick-one --run-tests --github",
+    "test-remote-tests-with-forbidden": "npm run test-remote-tests-default -- --allowForbiddenOpts",
+    "test-remote-tests": "npm run test-remote-tests-default && npm run test-remote-tests-with-forbidden",
+    "test-optimized-default": "node test/test.js --showInfo --postOptimize --typeCheckLevel Strict --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
+    "test-optimized-with-forbidden": "npm run test-optimized-default -- --allowForbiddenOpts",
+    "test-optimized": "npm run test-optimized-default && npm run test-optimized-with-forbidden",
     "test-unopt": "node test/test.js --typeCheckLevel Strict --skipOptimization --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-post-only": "node test/test.js --showInfo --typeCheckLevel Strict --skipOptimization --postOptimize --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-garmin-opt": "node test/test.js --typeCheckLevel Strict --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
@@ -52,7 +56,7 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.57"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.58"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",