@markw65/monkeyc-optimizer 1.1.66 → 1.1.68

package/build/{chunk-UDJNFXSX.cjs → chunk-NGCEDNHJ.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_UDJNFXSX_exports = {};
-__export(chunk_UDJNFXSX_exports, {
+var chunk_NGCEDNHJ_exports = {};
+__export(chunk_NGCEDNHJ_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -64,6 +64,7 @@ __export(chunk_UDJNFXSX_exports, {
   getConfig: () => getConfig,
   getDeviceInfo: () => getDeviceInfo,
   getFileASTs: () => getFileASTs,
+  getFnMapAnalysis: () => getFnMapAnalysis,
   getFunctionDocumentation: () => getFunctionDocumentation,
   getLanguages: () => getLanguages,
   getProjectAnalysis: () => getProjectAnalysis,
@@ -134,8 +135,8 @@ __export(chunk_UDJNFXSX_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_UDJNFXSX_exports);
-var import_chunk_67LU4GPQ = require("./chunk-67LU4GPQ.cjs");
+module.exports = __toCommonJS(chunk_NGCEDNHJ_exports);
+var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_assert = __toESM(require("node:assert"));
@@ -5642,6 +5643,18 @@ var init_build_config = (0, import_chunk_ABYVSU2C.__esm)({
             default: "WARNING",
             scope: "resource"
           },
+          strictTypeCheck: {
+            type: "string",
+            description: "Whether to do strict or relaxed type checking - Default deduces it from typeCheckLevel",
+            enum: ["On", "Off", "Default"],
+            enumDescriptions: [
+              "Do Strict type checking",
+              "Do Relaxed type checking",
+              "Do Strict type checking iff typeCheckLevel is Strict"
+            ],
+            default: "Default",
+            scope: "resource"
+          },
           trustDeclaredTypes: {
             order: 100,
             type: "boolean",
@@ -7326,9 +7339,9 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             );
           }
         } else {
-          (0, import_chunk_67LU4GPQ.forEach)(events, (e) => e.mayThrow = false);
+          (0, import_chunk_OASVKTK5.forEach)(events, (e) => e.mayThrow = false);
         }
-        (0, import_chunk_67LU4GPQ.forEach)(events, (event) => {
+        (0, import_chunk_OASVKTK5.forEach)(events, (event) => {
           if (event.mayThrow) {
             for (let i = localState.stack.length; i--; ) {
               const target = localState.stack[i].throw;
@@ -7473,7 +7486,7 @@ var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
   "src/control-flow.ts"() {
     "use strict";
     (0, import_chunk_MBTLUWXR.init_ast)();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     Terminals = {
       BreakStatement: "break",
       ContinueStatement: "continue",
@@ -7503,12 +7516,12 @@ var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
         if (!from.succs) {
           from.succs = [to];
         } else {
-          (0, import_chunk_67LU4GPQ.pushUnique)(from.succs, to);
+          (0, import_chunk_OASVKTK5.pushUnique)(from.succs, to);
         }
         if (!to.preds) {
           to.preds = [from];
         } else {
-          (0, import_chunk_67LU4GPQ.pushUnique)(to.preds, from);
+          (0, import_chunk_OASVKTK5.pushUnique)(to.preds, from);
         }
       }
       newBlock(block) {
@@ -7862,8 +7875,8 @@ function mergeObjectValues(to, from) {
 function mergeStateDecls(to, from) {
   let changed = false;
   let result = to;
-  (0, import_chunk_67LU4GPQ.forEach)(from, (v) => {
-    if ((0, import_chunk_67LU4GPQ.some)(to, (t) => t === v)) {
+  (0, import_chunk_OASVKTK5.forEach)(from, (v) => {
+    if ((0, import_chunk_OASVKTK5.some)(to, (t) => t === v)) {
       return;
     }
     if (Array.isArray(result)) {
@@ -8030,7 +8043,7 @@ var init_union_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_data_flow();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_could_be();
     init_intersection_type();
     init_sub_type();
@@ -8045,7 +8058,7 @@ function expandTypedef(t) {
   );
   const tExpanded = cloneType(t);
   clearValuesUnder(tExpanded, 262144, true);
-  (0, import_chunk_67LU4GPQ.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
+  (0, import_chunk_OASVKTK5.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
   return tExpanded;
 }
 function intersectEnum(t, e) {
@@ -8239,9 +8252,9 @@ function intersectionValue(pair) {
     case 4096:
     case 8192: {
       const common = [];
-      (0, import_chunk_67LU4GPQ.forEach)(
+      (0, import_chunk_OASVKTK5.forEach)(
         pair.avalue,
-        (sna) => (0, import_chunk_67LU4GPQ.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
+        (sna) => (0, import_chunk_OASVKTK5.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
       );
       if (!common.length)
         return null;
@@ -8249,9 +8262,9 @@ function intersectionValue(pair) {
     }
     case 16384: {
       const common = [];
-      (0, import_chunk_67LU4GPQ.forEach)(pair.avalue, (sna) => {
+      (0, import_chunk_OASVKTK5.forEach)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        (0, import_chunk_67LU4GPQ.forEach)(pair.bvalue, (snb) => {
+        (0, import_chunk_OASVKTK5.forEach)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             common.push(sna);
           }
@@ -8497,7 +8510,7 @@ function restrictExactTypesByEquality(a, b) {
     }
     case 262144:
       return restrictByEquality(
-        (0, import_chunk_67LU4GPQ.reduce)(
+        (0, import_chunk_OASVKTK5.reduce)(
           a.value,
           (cur, decl) => {
             unionInto(cur, decl.resolvedType);
@@ -8564,7 +8577,7 @@ var init_intersection_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_could_be();
     init_interp();
     init_types();
@@ -8678,14 +8691,14 @@ function subtypeOfValue(pair) {
     case 8192: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_67LU4GPQ.some)(asd, (sna) => (0, import_chunk_67LU4GPQ.some)(bsd, (snb) => sna === snb));
+      return (0, import_chunk_OASVKTK5.some)(asd, (sna) => (0, import_chunk_OASVKTK5.some)(bsd, (snb) => sna === snb));
     }
     case 16384: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_67LU4GPQ.every)(asd, (sna) => {
+      return (0, import_chunk_OASVKTK5.every)(asd, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_67LU4GPQ.some)(bsd, (snb) => {
+        return (0, import_chunk_OASVKTK5.some)(bsd, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -8721,7 +8734,7 @@ var init_sub_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_could_be();
     init_intersection_type();
     init_types();
@@ -9142,13 +9155,13 @@ function isTypeStateKey(decl) {
   return Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown";
 }
 function declIsLocal(decl) {
-  return (0, import_chunk_67LU4GPQ.some)(
+  return (0, import_chunk_OASVKTK5.some)(
     decl,
     (d) => d.type === "BinaryExpression" || d.type === "Identifier" || d.type === "VariableDeclarator" && isLocal(d)
   );
 }
 function declIsNonLocal(decl) {
-  return (0, import_chunk_67LU4GPQ.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
+  return (0, import_chunk_OASVKTK5.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
 }
 function localDeclName(decl) {
   if (Array.isArray(decl))
@@ -9161,12 +9174,12 @@ function localDeclName(decl) {
     case "VariableDeclarator":
       return variableDeclarationName(decl.node.id);
   }
-  throw new import_chunk_67LU4GPQ.AwaitedError(
+  throw new import_chunk_OASVKTK5.AwaitedError(
     declFullName(decl).then((declStr) => `Invalid local decl: ${declStr}`)
   );
 }
 function tsKey(key) {
-  return `${(0, import_chunk_67LU4GPQ.map)(key, (k) => {
+  return `${(0, import_chunk_OASVKTK5.map)(key, (k) => {
     if (k.type === "Literal") {
       return k.raw;
     } else if (isStateNode(k)) {
@@ -9185,7 +9198,7 @@ function sourceLocation(loc) {
   return loc ? `${loc.source || "??"}:${loc.start.line}:${loc.start.column}` : "??";
 }
 function printBlockHeader(block) {
-  (0, import_chunk_67LU4GPQ.log)(
+  (0, import_chunk_OASVKTK5.log)(
     block.order,
     `(${block.node?.loc?.source || "??"}:${block.node?.loc?.start.line || "??"})`,
     `Preds: ${(block.preds || []).map((block2) => block2.order).join(", ")}`
@@ -9199,10 +9212,10 @@ function describeEvent(event) {
   ).then((desc) => `${event.type}: ${desc}`);
 }
 function printBlockEvents(block, extra) {
-  (0, import_chunk_67LU4GPQ.log)("Events:");
-  (0, import_chunk_67LU4GPQ.forEach)(
+  (0, import_chunk_OASVKTK5.log)("Events:");
+  (0, import_chunk_OASVKTK5.forEach)(
     block.events,
-    (event) => (0, import_chunk_67LU4GPQ.log)(
+    (event) => (0, import_chunk_OASVKTK5.log)(
       describeEvent(event).then(
         (eventStr) => `    ${eventStr} ${extra ? extra(event) : ""}`
       )
@@ -9210,7 +9223,7 @@ function printBlockEvents(block, extra) {
   );
 }
 function printBlockTrailer(block) {
-  (0, import_chunk_67LU4GPQ.log)(
+  (0, import_chunk_OASVKTK5.log)(
     `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
   );
 }
@@ -9295,8 +9308,8 @@ function findObjectDeclsByProperty(state, object, next) {
   const decls = getStateNodeDeclsFromType(state, object);
   if (!decls)
     return [null, null];
-  const possibleDecls = (0, import_chunk_MBTLUWXR.hasProperty)(state.allDeclarations, next.property.name) && state.allDeclarations[next.property.name];
-  return filterDecls(decls, possibleDecls, next.property.name);
+  const possibleDecls = (0, import_chunk_MBTLUWXR.hasProperty)(state.allDeclarations, next.name) && state.allDeclarations[next.name];
+  return filterDecls(decls, possibleDecls, next.name);
 }
 function refineObjectTypeByDecls(istate, object, trueDecls) {
   const refinedType = typeFromTypeStateNodes(istate.state, trueDecls);
@@ -9326,7 +9339,7 @@ function resolveDottedMember(istate, object, next) {
   const [objDecls, trueDecls] = findObjectDeclsByProperty(
     istate.state,
     object,
-    next
+    next.property
   );
   if (!objDecls)
     return null;
@@ -9342,7 +9355,7 @@ var init_type_flow_util = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_intersection_type();
     init_sub_type();
     init_types();
@@ -9396,7 +9409,7 @@ function calleeObjectType(istate, callee) {
 }
 function checkCallArgs(istate, node, callees, args) {
   const allDiags = [];
-  const resultType = (0, import_chunk_67LU4GPQ.reduce)(
+  const resultType = (0, import_chunk_OASVKTK5.reduce)(
     callees,
     (result, cur) => {
       const curDiags = [];
@@ -9555,7 +9568,7 @@ function isOverride(cur, funcs) {
   const cls = cur.stack?.[cur.stack.length - 1]?.sn;
   if (cls?.type === "ClassDeclaration" && cls.superClasses) {
     const supers = getSuperClasses(cls);
-    if (supers && (0, import_chunk_67LU4GPQ.some)(funcs, (func) => {
+    if (supers && (0, import_chunk_OASVKTK5.some)(funcs, (func) => {
       if (func === cur)
         return false;
       const fcls = func.stack?.[func.stack.length - 1].sn;
@@ -9841,7 +9854,11 @@ function getSystemCallTable(state) {
         property: symbol,
         computed: false
       };
-      const [, trueDecls] = findObjectDeclsByProperty(state2, calleeObj, next);
+      const [, trueDecls] = findObjectDeclsByProperty(
+        state2,
+        calleeObj,
+        next.property
+      );
       if (!trueDecls)
         return ret;
       const callees = trueDecls.flatMap((decl) => decl.decls?.[symbol.name]).filter(
@@ -10049,7 +10066,7 @@ var init_interp_call = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_optimizer_types();
     init_api();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_interp();
     init_sub_type();
     init_types();
@@ -10410,7 +10427,7 @@ function getLhsConstraint(istate, node) {
         const [, trueDecls2] = findObjectDeclsByProperty(
           istate.state,
           object,
-          node
+          node.property
         );
         if (trueDecls2) {
           lookupDefs = lookupNext(
@@ -11174,7 +11191,7 @@ function mustBeIdentical(a, b) {
   return false;
 }
 function isByteArrayData(objectData) {
-  return objectData.klass.value && (0, import_chunk_67LU4GPQ.every)(
+  return objectData.klass.value && (0, import_chunk_OASVKTK5.every)(
     objectData.klass.value,
     (klass) => klass.fullName === "$.Toybox.Lang.ByteArray"
   );
@@ -11186,7 +11203,7 @@ var init_interp = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_data_flow();
     init_optimizer_types();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_could_be();
     init_interp_binary();
     init_interp_call();
@@ -11417,7 +11434,7 @@ function typeFromTypeStateNode(state, sn, classVsObj) {
           );
           if (value2) {
             const a = [];
-            (0, import_chunk_67LU4GPQ.forEach)(value2, (v) => {
+            (0, import_chunk_OASVKTK5.forEach)(value2, (v) => {
               if (v !== sn)
                 a.push(v);
             });
@@ -11909,7 +11926,7 @@ function mustBeFalse(arg) {
   return arg.type === 1 || arg.type === 2 || (arg.type === 8 || arg.type === 16) && arg.value != null && Number(arg.value) === 0;
 }
 function display(type) {
-  const names = (v, fn) => (0, import_chunk_67LU4GPQ.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
+  const names = (v, fn) => (0, import_chunk_OASVKTK5.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
   const parts = [];
   const displayOne = (tv) => {
     switch (tv.type) {
@@ -12110,7 +12127,7 @@ var init_types = (0, import_chunk_ABYVSU2C.__esm)({
     init_data_flow();
     init_api();
     (0, import_chunk_MBTLUWXR.init_ast)();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_interp();
     init_union_type();
     init_intersection_type();
@@ -12170,7 +12187,7 @@ function couldBeHelper(a, b, shallow) {
       262144
       /* Typedef */
     );
-    return typedef && (0, import_chunk_67LU4GPQ.some)(typedef, (td) => {
+    return typedef && (0, import_chunk_OASVKTK5.some)(typedef, (td) => {
       if (!td.resolvedType) {
         throw new Error(`No resolved type for ${td.fullName} in 'couldBe'`);
       }
@@ -12242,15 +12259,15 @@ function couldBeValue(pair, shallow) {
     }
     case 4096:
     case 8192: {
-      return (0, import_chunk_67LU4GPQ.some)(
+      return (0, import_chunk_OASVKTK5.some)(
         pair.avalue,
-        (sna) => (0, import_chunk_67LU4GPQ.some)(pair.bvalue, (snb) => sna === snb)
+        (sna) => (0, import_chunk_OASVKTK5.some)(pair.bvalue, (snb) => sna === snb)
       );
     }
     case 16384: {
-      return (0, import_chunk_67LU4GPQ.some)(pair.avalue, (sna) => {
+      return (0, import_chunk_OASVKTK5.some)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_67LU4GPQ.some)(pair.bvalue, (snb) => {
+        return (0, import_chunk_OASVKTK5.some)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -12283,7 +12300,7 @@ var init_could_be = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_types();
   }
 });
@@ -12390,7 +12407,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
       }
       addAnt(curState.partiallyAnticipated, key, node);
       if (logThisRun) {
-        (0, import_chunk_67LU4GPQ.log)(
+        (0, import_chunk_OASVKTK5.log)(
           `  antrefs: ${curState.partiallyAnticipated.get(key) !== false} ${curState.anticipated.get(key) !== false}`
         );
       }
@@ -12413,7 +12430,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
     const curState = cloneState(blockStates[top.order]);
     if (logThisRun) {
       printBlockHeader(top);
-      curState.dead.forEach((decl) => (0, import_chunk_67LU4GPQ.log)(` - anticipated: ${tsKey(decl)}`));
+      curState.dead.forEach((decl) => (0, import_chunk_OASVKTK5.log)(` - anticipated: ${tsKey(decl)}`));
     }
     if (top.events) {
       for (let i = top.events.length; i--; ) {
@@ -12425,12 +12442,12 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
           case "ref":
             if (isTypeStateKey(event.decl)) {
               if (logThisRun) {
-                (0, import_chunk_67LU4GPQ.log)(
+                (0, import_chunk_OASVKTK5.log)(
                   describeEvent(event).then(
                     (eventStr) => `${eventStr} (${sourceLocation(event.node.loc)})`
                   )
                 );
-                (0, import_chunk_67LU4GPQ.log)(`  kill => ${tsKey(event.decl)}`);
+                (0, import_chunk_OASVKTK5.log)(`  kill => ${tsKey(event.decl)}`);
               }
               copyPropRef(curState, event.decl, event.node);
               curState.dead.delete(event.decl);
@@ -12439,7 +12456,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
           case "def":
             if (isTypeStateKey(event.decl) && (event.node.type !== "VariableDeclarator" || event.node.init)) {
               if (logThisRun) {
-                (0, import_chunk_67LU4GPQ.log)(
+                (0, import_chunk_OASVKTK5.log)(
                   describeEvent(event).then(
                     (eventStr) => `${eventStr} (${sourceLocation(event.node.loc)})`
                   )
@@ -12455,7 +12472,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
                   const pant = curState.partiallyAnticipated.get(event.decl);
                   if (pant) {
                     if (logThisRun) {
-                      (0, import_chunk_67LU4GPQ.log)(
+                      (0, import_chunk_OASVKTK5.log)(
                         `  is copy-prop-candidate ${curState.anticipated?.get(event.decl) === pant}`
                       );
                     }
@@ -12487,7 +12504,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
               if (assignNode) {
                 curState.dead.add(event.decl);
                 if (logThisRun) {
-                  (0, import_chunk_67LU4GPQ.log)(`  anticipated => ${tsKey(event.decl)}`);
+                  (0, import_chunk_OASVKTK5.log)(`  anticipated => ${tsKey(event.decl)}`);
                 }
               } else if (event.node.type === "UpdateExpression") {
                 copyPropRef(curState, event.decl, event.node.argument);
@@ -12498,7 +12515,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
             if (isTypeStateKey(event.decl)) {
               curState.dead.add(event.decl);
               if (logThisRun) {
-                (0, import_chunk_67LU4GPQ.log)(`  anticipated => ${tsKey(event.decl)}`);
+                (0, import_chunk_OASVKTK5.log)(`  anticipated => ${tsKey(event.decl)}`);
               }
             }
             break;
@@ -12561,9 +12578,9 @@ function eliminateDeadStores(state, func, graph, logThisRun) {
   if (!deadStores.size)
     return { changes: false, copyPropStores };
   if (logThisRun) {
-    (0, import_chunk_67LU4GPQ.log)("====== Dead Stores =====");
+    (0, import_chunk_OASVKTK5.log)("====== Dead Stores =====");
     deadStores.forEach(
-      (dead) => (dead.type === "AssignmentExpression" || dead.type === "UpdateExpression" || dead.type === "VariableDeclarator") && (0, import_chunk_67LU4GPQ.log)(
+      (dead) => (dead.type === "AssignmentExpression" || dead.type === "UpdateExpression" || dead.type === "VariableDeclarator") && (0, import_chunk_OASVKTK5.log)(
         formatAst(dead).then(
           (deadStr) => `${deadStr} (${sourceLocation(dead.loc)})`
         )
@@ -12618,7 +12635,7 @@ var init_dead_store = (0, import_chunk_ABYVSU2C.__esm)({
     init_control_flow();
     init_data_flow();
     init_inliner();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_minimize_locals();
     init_type_flow_util();
   }
@@ -12983,13 +13000,13 @@ function typeStateEntry(value2, key) {
   return `${tsKey(key)} = ${display(value2.curType)}`;
 }
 function printBlockState(block, state, indent = "") {
-  (0, import_chunk_67LU4GPQ.log)(indent + "State:");
+  (0, import_chunk_OASVKTK5.log)(indent + "State:");
   if (!state) {
-    (0, import_chunk_67LU4GPQ.log)(indent + "Not visited!");
+    (0, import_chunk_OASVKTK5.log)(indent + "Not visited!");
     return;
   }
   state.map.forEach((value2, key) => {
-    (0, import_chunk_67LU4GPQ.log)(
+    (0, import_chunk_OASVKTK5.log)(
       `${indent} - ${typeStateEntry(value2, key)}${value2.equivSet ? ` [(${Array.from(value2.equivSet).map(tsKey).join(", ")})]` : ""}`
     );
   });
@@ -13139,7 +13156,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           const [objDecls, trueDecls] = findObjectDeclsByProperty(
             istate.state,
             cur,
-            me
+            me.property
           );
           if (!objDecls) {
             return null;
@@ -13196,7 +13213,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                   type: 0
                   /* Never */
                 };
-                (0, import_chunk_67LU4GPQ.forEach)(avalue, (v) => unionInto(n, v));
+                (0, import_chunk_OASVKTK5.forEach)(avalue, (v) => unionInto(n, v));
                 next = n;
               }
             } else {
@@ -13301,7 +13318,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       if (!isStatic && selfClassDecl) {
         const baseObj = getObjectValue(baseElem.type);
-        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_67LU4GPQ.some)(
+        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_OASVKTK5.some)(
           baseObj.klass.value,
           (cls) => cls === selfClassDecl || getSuperClasses(cls)?.has(selfClassDecl) || getSuperClasses(selfClassDecl)?.has(cls) || false
         )) {
@@ -13346,7 +13363,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     return [cur, updateAny];
   }
   function typeConstraint(decls, blockState) {
-    return (0, import_chunk_67LU4GPQ.reduce)(
+    return (0, import_chunk_OASVKTK5.reduce)(
       decls,
       (cur, decl) => {
         if (decl.type === "Identifier" || decl.type === "BinaryExpression") {
@@ -13442,9 +13459,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     stack: [],
     func
   };
-  const modifiableDecl = (decls, callees) => (0, import_chunk_67LU4GPQ.some)(
+  const modifiableDecl = (decls, callees) => (0, import_chunk_OASVKTK5.some)(
     decls,
-    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_67LU4GPQ.some)(callees, (callee) => functionMayModify(state, callee, decl)))
+    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_OASVKTK5.some)(callees, (callee) => functionMayModify(state, callee, decl)))
   );
   const mergeSuccState = (top, curState) => {
     top.succs?.forEach((succ) => {
@@ -13453,7 +13470,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       if (mergeTypeState(blockStates, succ.order, curState, nodeCopyProp)) {
         if (logThisRun) {
-          (0, import_chunk_67LU4GPQ.log)(`re-merge: ${top.order} -> ${succ.order}`);
+          (0, import_chunk_OASVKTK5.log)(`re-merge: ${top.order} -> ${succ.order}`);
         }
         queue.enqueue(succ);
       }
@@ -13463,7 +13480,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     const calleeObj = getStateType(curState, calleeObjDecl);
     let calleeResult = null;
     let effectFree = true;
-    (0, import_chunk_67LU4GPQ.forEach)(callees, (callee) => {
+    (0, import_chunk_OASVKTK5.forEach)(callees, (callee) => {
       const info = sysCallInfo(istate.state, callee);
       if (!info) {
         effectFree = false;
@@ -13740,7 +13757,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       });
     } else {
       if (logThisRun) {
-        (0, import_chunk_67LU4GPQ.log)(`  Flow (true): merge to ${trueSucc.order || -1}`);
+        (0, import_chunk_OASVKTK5.log)(`  Flow (true): merge to ${trueSucc.order || -1}`);
         printBlockState(top, sTrue || curState, "    >true ");
       }
       if (mergeTypeState(
@@ -13750,7 +13767,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         nodeCopyProp
       )) {
         if (logThisRun) {
-          (0, import_chunk_67LU4GPQ.log)(`re-merge: ${top.order} -> ${trueSucc.order}`);
+          (0, import_chunk_OASVKTK5.log)(`re-merge: ${top.order} -> ${trueSucc.order}`);
         }
         queue.enqueue(trueSucc);
       }
@@ -13762,7 +13779,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       });
     } else {
       if (logThisRun) {
-        (0, import_chunk_67LU4GPQ.log)(`  Flow (false): merge to: ${falseSucc.order || -1}`);
+        (0, import_chunk_OASVKTK5.log)(`  Flow (false): merge to: ${falseSucc.order || -1}`);
         printBlockState(top, sFalse || curState, "    >false ");
       }
       if (mergeTypeState(
@@ -13772,7 +13789,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         nodeCopyProp
       )) {
         if (logThisRun) {
-          (0, import_chunk_67LU4GPQ.log)(`re-merge: ${top.order} -> ${falseSucc.order}`);
+          (0, import_chunk_OASVKTK5.log)(`re-merge: ${top.order} -> ${falseSucc.order}`);
         }
         queue.enqueue(falseSucc);
       }
@@ -13847,7 +13864,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           }
         }
         if (logThisRun) {
-          (0, import_chunk_67LU4GPQ.log)(
+          (0, import_chunk_OASVKTK5.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} == ${display(curEntry.curType)}`
             )
@@ -13857,7 +13874,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       case "mod": {
         if (logThisRun) {
-          (0, import_chunk_67LU4GPQ.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
+          (0, import_chunk_OASVKTK5.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
         }
         modInterference(curState, event, true, (callees, calleeObj) => {
           clearRelatedCopyPropEvents(curState, null, nodeCopyProp);
@@ -13873,7 +13890,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               );
             }
           }
-          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_67LU4GPQ.some)(callees, (callee) => inlineRequested(state, callee))) {
+          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_OASVKTK5.some)(callees, (callee) => inlineRequested(state, callee))) {
             event.node.arguments.forEach((arg) => {
               const def = nodeCopyProp.get(arg);
               if (def && nodeCopyProp.get(def) !== false) {
@@ -13885,7 +13902,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           let calleeEffects;
           curState.map.forEach((tsv, decl) => {
             let type = tsv.curType;
-            if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_67LU4GPQ.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
+            if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_OASVKTK5.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
               return;
             }
             if (modifiableDecl(decl, callees)) {
@@ -13900,7 +13917,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               curState.map.set(decl, {
                 curType: typeConstraint(decl, curState)
               });
-            } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_67LU4GPQ.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
+            } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_OASVKTK5.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
               if (type.value != null && type.type & 32768) {
                 const odata = getObjectValue(tsv.curType);
                 if (odata?.obj) {
@@ -13968,7 +13985,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           2
           /* Reassign */
         );
-        (0, import_chunk_67LU4GPQ.some)(event.decl, (decl) => {
+        (0, import_chunk_OASVKTK5.some)(event.decl, (decl) => {
           if (decl.type !== "VariableDeclarator" || decl.node.kind !== "var" || !isClassVariable(decl)) {
             return false;
           }
@@ -13976,7 +13993,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           if (affected) {
             const objType = typeFromTypeStateNodes(
               istate.state,
-              (0, import_chunk_67LU4GPQ.map)(
+              (0, import_chunk_OASVKTK5.map)(
                 event.decl,
                 (decl2) => decl2.type === "VariableDeclarator" && decl2.stack[decl2.stack.length - 1].sn
               ).filter(
@@ -13997,7 +14014,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         });
         if (wasComputedDecl) {
           curState.map.forEach((value2, decls) => {
-            if ((0, import_chunk_67LU4GPQ.some)(
+            if ((0, import_chunk_OASVKTK5.some)(
               decls,
               (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl)
             )) {
@@ -14043,14 +14060,14 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                   }
                   if (!copyPropCandidate.ant || // If the ref isn't anticipated, we can't propagate it
                   // in case it has side effects.
-                  (0, import_chunk_67LU4GPQ.some)(
+                  (0, import_chunk_OASVKTK5.some)(
                     event2.calleeDecl,
                     (callee) => callee.type === "FunctionDeclaration" && inlineRequested(state, callee)
                   )) {
                     return false;
                   }
                 }
-                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_67LU4GPQ.some)(
+                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_OASVKTK5.some)(
                   event2.decl,
                   (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" || decl.type === "BinaryExpression" || decl.type === "Identifier"
                 )) {
@@ -14089,13 +14106,13 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           }
         }
         if (uninitClassDecls?.size) {
-          (0, import_chunk_67LU4GPQ.forEach)(
+          (0, import_chunk_OASVKTK5.forEach)(
             event.decl,
             (decl) => uninitClassDecls.has(decl) && curState.inited?.add(decl)
           );
         }
         if (logThisRun) {
-          (0, import_chunk_67LU4GPQ.log)(
+          (0, import_chunk_OASVKTK5.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} := ${display(type)}`
             )
@@ -14113,7 +14130,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           );
         }
         if (logThisRun) {
-          (0, import_chunk_67LU4GPQ.log)(
+          (0, import_chunk_OASVKTK5.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} : ${!Array.isArray(event.left) && event.left.type === "MemberDecl" ? `${display(
                 curState.map.get(event.left.base)?.curType || {
@@ -14171,8 +14188,8 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     }
     if (!successorsHandled) {
       if (logThisRun) {
-        (0, import_chunk_67LU4GPQ.log)(
-          `  merge to: ${(0, import_chunk_67LU4GPQ.map)(
+        (0, import_chunk_OASVKTK5.log)(
+          `  merge to: ${(0, import_chunk_OASVKTK5.map)(
             top.succs,
             (succ) => succ.order || -1
           ).join(", ")}`
@@ -14203,17 +14220,17 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       );
       printBlockTrailer(block);
     });
-    (0, import_chunk_67LU4GPQ.log)("====== TypeMap =====");
+    (0, import_chunk_OASVKTK5.log)("====== TypeMap =====");
     typeMap.forEach((value2, key) => {
-      (0, import_chunk_67LU4GPQ.log)(
+      (0, import_chunk_OASVKTK5.log)(
         formatAst(key).then(
           (keyStr) => `${keyStr} = ${display(value2)} ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
         )
       );
     });
-    (0, import_chunk_67LU4GPQ.log)("====== EquivMap =====");
+    (0, import_chunk_OASVKTK5.log)("====== EquivMap =====");
     nodeEquivs.forEach((value2, key) => {
-      (0, import_chunk_67LU4GPQ.log)(
+      (0, import_chunk_OASVKTK5.log)(
         formatAst(key).then(
           (keyStr) => `${keyStr} = [${value2.equiv.map(
             (equiv) => tsKey(equiv)
@@ -14221,7 +14238,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         )
       );
     });
-    (0, import_chunk_67LU4GPQ.log)("====== Copy Prop =====");
+    (0, import_chunk_OASVKTK5.log)("====== Copy Prop =====");
     nodeCopyProp.forEach((value2, key) => {
       (0, import_node_assert3.default)(value2 !== false);
       if (key.type === "VariableDeclarator" || key.type === "AssignmentExpression") {
@@ -14231,7 +14248,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         value2.type === "VariableDeclarator" && value2.init || value2.type === "AssignmentExpression"
       );
       const node = value2.type === "VariableDeclarator" ? value2.init : value2.right;
-      (0, import_chunk_67LU4GPQ.log)(
+      (0, import_chunk_OASVKTK5.log)(
         formatAst(key).then(
           (keyStr) => formatAstLongLines(node).then(
             (nodeStr) => `${keyStr} = [${nodeStr}] ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
@@ -14241,10 +14258,10 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     });
   }
   if (logThisRun) {
-    (0, import_chunk_67LU4GPQ.log)(formatAstLongLines(func.node));
+    (0, import_chunk_OASVKTK5.log)(formatAstLongLines(func.node));
     if (copyPropStores) {
       copyPropStores.forEach(({ ref, ant }, node) => {
-        (0, import_chunk_67LU4GPQ.log)(
+        (0, import_chunk_OASVKTK5.log)(
           formatAstLongLines(node).then(
             (nodeStr) => `copy-prop-store: ${nodeStr}${ant ? "!" : ""} => ${nodeCopyProp.get(node) !== ref ? "Failed" : "Success"}`
           )
@@ -14258,9 +14275,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     }
     if (logThisRun) {
       if (selfAssignments.size) {
-        (0, import_chunk_67LU4GPQ.log)("====== Self Assignments =====");
+        (0, import_chunk_OASVKTK5.log)("====== Self Assignments =====");
         selfAssignments.forEach(
-          (self) => (0, import_chunk_67LU4GPQ.log)(
+          (self) => (0, import_chunk_OASVKTK5.log)(
             formatAst(self).then(
               (selfStr) => `${selfStr} (${sourceLocation(self.loc)})`
             )
@@ -14325,7 +14342,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         if (copyNode) {
           if (node.type === "AssignmentExpression") {
             if (logThisRun) {
-              (0, import_chunk_67LU4GPQ.log)(
+              (0, import_chunk_OASVKTK5.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => `Killing copy-prop assignment ${nodeStr}`
                 )
@@ -14340,7 +14357,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           if (node.type === "VariableDeclarator") {
             (0, import_node_assert3.default)(node.init);
             if (logThisRun) {
-              (0, import_chunk_67LU4GPQ.log)(
+              (0, import_chunk_OASVKTK5.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => `Killing copy-prop variable initialization ${nodeStr}`
                 )
@@ -14361,7 +14378,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               right: copyNode.right
             };
             if (logThisRun) {
-              (0, import_chunk_67LU4GPQ.log)(
+              (0, import_chunk_OASVKTK5.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => formatAstLongLines(replacement2).then(
                     (repStr) => `copy-prop ${nodeStr} => ${repStr}`
@@ -14374,7 +14391,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
             const init = copyNode.init;
             (0, import_node_assert3.default)(init);
             if (logThisRun) {
-              (0, import_chunk_67LU4GPQ.log)(
+              (0, import_chunk_OASVKTK5.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => formatAstLongLines(init).then(
                     (initStr) => `copy-prop ${nodeStr} => ${initStr}`
@@ -14388,7 +14405,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         }
         if (selfAssignments.has(node)) {
           if (logThisRun) {
-            (0, import_chunk_67LU4GPQ.log)(
+            (0, import_chunk_OASVKTK5.log)(
               formatAst(node).then(
                 (nodeStr) => `Deleting self assignment: ${nodeStr} (${sourceLocation(
                   node.loc
@@ -14432,7 +14449,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         }, curInfo);
         if (rep === curInfo)
           return null;
-        const name = (0, import_chunk_67LU4GPQ.reduce)(
+        const name = (0, import_chunk_OASVKTK5.reduce)(
           rep.decl,
           (cur, decl) => decl.type === "VariableDeclarator" ? decl.name : cur,
           null
@@ -14440,7 +14457,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         if (!name)
           return null;
         if (logThisRun) {
-          (0, import_chunk_67LU4GPQ.log)(
+          (0, import_chunk_OASVKTK5.log)(
             formatAst(node).then(
               (nodeStr) => `Replacing ${nodeStr} with ${name} at ${sourceLocation(
                 node.loc
@@ -14571,7 +14588,7 @@ var init_type_flow = (0, import_chunk_ABYVSU2C.__esm)({
     init_type_flow_util();
     init_types();
     init_union_type();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     logging = true;
     missingNullWorkaround = true;
   }
@@ -14623,9 +14640,9 @@ function minimizeLocals(state, func) {
   if (!didMerge)
     return;
   if (logThisRun) {
-    (0, import_chunk_67LU4GPQ.log)(`>>> Merging locals in ${func.fullName}`);
+    (0, import_chunk_OASVKTK5.log)(`>>> Merging locals in ${func.fullName}`);
     merge.forEach(
-      (merged) => merged.length > 1 && (0, import_chunk_67LU4GPQ.log)(` - merging ${merged.map((k) => tsKey(k)).join(" | ")}`)
+      (merged) => merged.length > 1 && (0, import_chunk_OASVKTK5.log)(` - merging ${merged.map((k) => tsKey(k)).join(" | ")}`)
     );
   }
   const remap = /* @__PURE__ */ new Map();
@@ -14895,7 +14912,7 @@ var init_minimize_locals = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_control_flow();
     init_type_flow();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_variable_renamer();
     init_type_flow_util();
   }
@@ -14906,12 +14923,12 @@ function logAntState(s, decl) {
       defs2++;
     return defs2;
   }, 0);
-  (0, import_chunk_67LU4GPQ.log)(
+  (0, import_chunk_OASVKTK5.log)(
     declFullName(decl).then(
       (declStr) => `  - ${declStr}: ${candidateCost(s)} bytes, ${s.ant.size - defs} refs, ${defs} defs, ${s.live ? "" : "!"}live, ${s.isIsolated ? "" : "!"}isolated`
     )
   );
-  (0, import_chunk_67LU4GPQ.log)(
+  (0, import_chunk_OASVKTK5.log)(
     `    - members: ${Array.from(s.members).map(([block, live]) => block.order + (live ? "t" : "f")).join(", ")}`
   );
 }
@@ -14928,7 +14945,7 @@ async function sizeBasedPRE(state, func) {
   const candidates = computeAttributes(state, head);
   if (candidates) {
     if (logging2) {
-      (0, import_chunk_67LU4GPQ.log)(`Found ${candidates.size} candidates in ${func.fullName}`);
+      (0, import_chunk_OASVKTK5.log)(`Found ${candidates.size} candidates in ${func.fullName}`);
       logAntDecls(candidates);
     }
     const nodeMap = /* @__PURE__ */ new Map();
@@ -15021,7 +15038,7 @@ function buildPREGraph(state, func) {
       const event = block.events[i];
       switch (event.type) {
         case "ref":
-          if ((0, import_chunk_67LU4GPQ.some)(
+          if ((0, import_chunk_OASVKTK5.some)(
             event.decl,
             (decl) => decl.type === "Literal" || decl.type === "VariableDeclarator" && decl.node.kind === "const"
           )) {
@@ -15039,7 +15056,7 @@ function buildPREGraph(state, func) {
           defs.add(event.decl);
           break;
         case "mod":
-          if (event.callees && (0, import_chunk_67LU4GPQ.every)(event.callees, (callee) => callee.info === false)) {
+          if (event.callees && (0, import_chunk_OASVKTK5.every)(event.callees, (callee) => callee.info === false)) {
             block.events.splice(i, 1);
             break;
           }
@@ -15198,21 +15215,21 @@ function computeAttributes(state, head) {
   });
   if (logging2) {
     order.forEach((block) => {
-      (0, import_chunk_67LU4GPQ.log)(
+      (0, import_chunk_OASVKTK5.log)(
         block.order,
         `(${block.node ? block.node.loc?.start.line : "??"})`,
         `Preds: ${(block.preds || []).map((block2) => block2.order).join(", ")}`
       );
       if (block.events) {
         block.events.forEach(
-          (event) => event.type !== "exn" && (0, import_chunk_67LU4GPQ.log)(
+          (event) => event.type !== "exn" && (0, import_chunk_OASVKTK5.log)(
             Promise.resolve(
               event.decl ? declFullName(event.decl) : event.node ? formatAst(event.node) : "??"
             ).then((eventDetails) => `    ${event.type}: ${eventDetails}`)
           )
         );
       }
-      (0, import_chunk_67LU4GPQ.log)(
+      (0, import_chunk_OASVKTK5.log)(
         `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
       );
     });
@@ -15280,7 +15297,7 @@ function computeAttributes(state, head) {
           }
           case "mod": {
             curState.forEach((candidates, decls) => {
-              if ((0, import_chunk_67LU4GPQ.some)(
+              if ((0, import_chunk_OASVKTK5.some)(
                 decls,
                 (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && candidates.live && (!event.callees || event.callees.some(
                   (callee) => functionMayModify(state, callee, decl)
@@ -15322,7 +15339,7 @@ function computeAttributes(state, head) {
     }
     blockStates[top.order] = curState;
     if (logging2) {
-      (0, import_chunk_67LU4GPQ.log)(`Updated block ${top.order}`);
+      (0, import_chunk_OASVKTK5.log)(`Updated block ${top.order}`);
       logAntDecls(curState);
     }
     if (top.preds) {
@@ -15424,7 +15441,7 @@ function applyReplacements(func, nodeMap, declMap) {
             }
             const name = declMap.get(event.decl);
             if (!name) {
-              throw new import_chunk_67LU4GPQ.AwaitedError(
+              throw new import_chunk_OASVKTK5.AwaitedError(
                 formatAst(node).then(
                   (targetStr) => `No replacement found for "${targetStr}"`
                 )
@@ -15446,7 +15463,7 @@ function applyReplacements(func, nodeMap, declMap) {
             const target = node.type === "AssignmentExpression" ? node.left : node.argument;
             const name = declMap.get(event.decl);
             if (!name) {
-              throw new import_chunk_67LU4GPQ.AwaitedError(
+              throw new import_chunk_OASVKTK5.AwaitedError(
                 formatAst(target).then(
                   (targetStr) => `No replacement found for "${targetStr}"`
                 )
@@ -15509,14 +15526,14 @@ function applyReplacements(func, nodeMap, declMap) {
           const decl = event.decl;
           const name = declMap.get(decl);
           if (!name) {
-            throw new import_chunk_67LU4GPQ.AwaitedError(
+            throw new import_chunk_OASVKTK5.AwaitedError(
               declFullName(decl).then(
                 (declStr) => `No replacement found for "${declStr}"`
               )
             );
           }
           if (!event.id) {
-            throw new import_chunk_67LU4GPQ.AwaitedError(
+            throw new import_chunk_OASVKTK5.AwaitedError(
               declFullName(decl).then(
                 (declStr) => `Missing id for mod event for "${declStr}"`
               )
@@ -15581,7 +15598,7 @@ var init_pre = (0, import_chunk_ABYVSU2C.__esm)({
     init_data_flow();
     init_function_info();
     init_minimize_locals();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     logging2 = false;
     LocalRefCost = 2;
   }
@@ -15952,7 +15969,7 @@ function beforeEvaluate(istate, node) {
           break;
         }
         const id = node.right.argument;
-        if ((0, import_chunk_67LU4GPQ.every)(left.value.value, (m) => {
+        if ((0, import_chunk_OASVKTK5.every)(left.value.value, (m) => {
           if ((0, import_chunk_MBTLUWXR.hasProperty)(m.decls, id.name))
             return false;
           return istate.state.lookup({
@@ -16398,7 +16415,7 @@ var init_optimize = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_inliner();
     init_type_flow();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_interp();
     init_interp_binary();
     init_types();
@@ -16609,6 +16626,7 @@ function collectClassInfo(state) {
   const toybox = state.stack[0].sn.decls["Toybox"][0];
   const lang = toybox.decls["Lang"][0];
   const object = lang.decls["Object"];
+  const invalidSymbols = state.config?.checkInvalidSymbols ?? "WARNING";
   state.allClasses.forEach((elm) => {
     if (elm.stack[elm.stack.length - 1].sn.type === "ClassDeclaration") {
       elm.stack = elm.stack.slice(0, 1);
@@ -16623,7 +16641,18 @@ function collectClassInfo(state) {
         (c) => isStateNode(c) && c.type === "ClassDeclaration"
       );
       elm.superClass = superClass && superClass.length ? superClass : true;
-      if (name && elm.superClass !== true) {
+      if (elm.superClass === true) {
+        if (invalidSymbols !== "OFF") {
+          diagnostic(
+            state,
+            elm.node,
+            formatAstLongLines(elm.node.superClass).then(
+              (superClass2) => `Unable to find super class ${superClass2} for ${elm.fullName}`
+            ),
+            invalidSymbols
+          );
+        }
+      } else if (name) {
         if (!elm.decls)
           elm.decls = {};
         elm.decls[name] = elm.superClass;
@@ -16632,24 +16661,44 @@ function collectClassInfo(state) {
       elm.superClass = object;
     }
   });
-  const markOverrides = (cls, scls) => {
+  const markOverrides = (cls, scls, seen) => {
     if (scls === true)
       return;
-    scls.forEach((c) => {
-      c.decls && Object.values(c.decls).forEach((funcs) => {
+    for (let i = scls.length; i--; ) {
+      const c = scls[i];
+      if (!c.decls)
+        continue;
+      if (seen.has(c)) {
+        if (invalidSymbols !== "OFF") {
+          diagnostic(
+            state,
+            cls.node,
+            `Class ${cls.fullName}'s inheritance graph contains a cycle including ${c.fullName}`,
+            invalidSymbols
+          );
+        }
+        scls.splice(i, 1);
+        continue;
+      }
+      Object.values(c.decls).forEach((funcs) => {
         funcs.forEach((f) => {
           if (f.type === "FunctionDeclaration" && (0, import_chunk_MBTLUWXR.hasProperty)(cls.decls, f.name)) {
             f.node.hasOverride = true;
           }
         });
       });
-      if (c.superClass)
-        markOverrides(cls, c.superClass);
-    });
+      if (c.superClass) {
+        seen.add(c);
+        markOverrides(cls, c.superClass, seen);
+        seen.delete(c);
+      }
+    }
   };
   state.allClasses.forEach((elm) => {
-    if (elm.superClass)
-      markOverrides(elm, elm.superClass);
+    if (elm.superClass) {
+      const seen = /* @__PURE__ */ new Set();
+      markOverrides(elm, elm.superClass, seen);
+    }
     if (elm.hasInvoke && elm.decls) {
       Object.values(elm.decls).forEach((funcs) => {
         funcs.forEach((f) => {
@@ -16660,6 +16709,11 @@ function collectClassInfo(state) {
       });
     }
   });
+  state.allClasses.forEach((elm) => {
+    if (elm.superClass && elm.superClass !== true && elm.superClass.length === 0) {
+      elm.superClass = true;
+    }
+  });
 }
 function getFileSources(fnMap) {
   return Promise.all(
@@ -16675,7 +16729,7 @@ function getFileSources(fnMap) {
 function getFileASTs(fnMap) {
   return getFileSources(fnMap).then(
     () => Object.entries(fnMap).reduce((ok, [name, value2]) => {
-      if (!value2.ast) {
+      if (!value2.ast && !value2.parserError) {
         const options = {
           filepath: name
         };
@@ -16689,7 +16743,6 @@ function getFileASTs(fnMap) {
             options
           );
         } catch (e) {
-          ok = false;
           if (e instanceof Error) {
             value2.parserError = e;
           } else {
@@ -16697,11 +16750,11 @@ function getFileASTs(fnMap) {
           }
         }
       }
-      return ok;
+      return value2.parserError ? false : ok;
     }, true)
   );
 }
-async function analyze(fnMap, resourcesMap, manifestXML, config) {
+async function analyze(fnMap, resourcesMap, manifestXML, config, allowParseErrors) {
   let hasTests = false;
   let markApi = true;
   const preState = {
@@ -16767,6 +16820,8 @@ async function analyze(fnMap, resourcesMap, manifestXML, config) {
   Object.entries(fnMap).forEach(([name, value2]) => {
     const { ast, parserError } = value2;
     if (!ast) {
+      if (allowParseErrors)
+        return;
       throw parserError || new Error(`Failed to parse ${name}`);
     }
     hasTests = false;
@@ -16785,7 +16840,7 @@ function reportMissingSymbols(state, config) {
   const diagnosticType = config?.checkInvalidSymbols !== "OFF" ? config?.checkInvalidSymbols || "WARNING" : null;
   const compiler2DiagnosticType = config?.checkCompilerLookupRules !== "OFF" ? config?.checkCompilerLookupRules || "WARNING" : null;
   if (diagnosticType && !config?.compilerOptions?.includes("--Eno-invalid-symbol")) {
-    const checkTypes = config?.typeCheckLevel && config.typeCheckLevel !== "Off";
+    const checkTypes = config?.checkTypes?.toLowerCase() !== "off";
     const report = (ast) => {
       visitReferences(state, ast, null, false, (node, results, error) => {
         if (node.type === "BinaryExpression" && node.operator === "has") {
@@ -16935,17 +16990,12 @@ function markFunctionCalled(state, func) {
     state.calledFunctions[func.id.name] = [func];
     return;
   }
-  (0, import_chunk_67LU4GPQ.pushUnique)(state.calledFunctions[func.id.name], func);
+  (0, import_chunk_OASVKTK5.pushUnique)(state.calledFunctions[func.id.name], func);
 }
-async function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
-  try {
-    return optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config);
-  } catch (ex) {
-    if (ex instanceof import_chunk_67LU4GPQ.AwaitedError) {
-      await ex.resolve();
-    }
-    throw ex;
-  }
+function optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config) {
+  return optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config).catch(
+    (ex) => Promise.reject(ex instanceof import_chunk_OASVKTK5.AwaitedError ? ex.resolve() : ex)
+  );
 }
 async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
   const state = await analyze(
@@ -17040,7 +17090,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
   };
   const gistate = { state, stack: [] };
   if (state.config?.checkTypes !== "OFF" && state.config?.trustDeclaredTypes && state.config.propagateTypes) {
-    gistate.typeChecker = state.config.typeCheckLevel?.toLowerCase() === "strict" ? subtypeOf : couldBeWeak;
+    gistate.typeChecker = state.config.strictTypeCheck?.toLowerCase() === "on" ? subtypeOf : couldBeWeak;
     gistate.checkTypes = state.config?.checkTypes || "WARNING";
   }
   let istate = gistate;
@@ -17469,15 +17519,12 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
     }
     delete state.inlineDiagnostics;
   }
+  const diagnostics = state.diagnostics && await resolveDiagnosticsMap(state.diagnostics);
   if (state.config?.checkBuildPragmas) {
-    await Object.entries(fnMap).reduce((promise, [name, f]) => {
-      return Promise.all([
-        resolveDiagnostics(state.diagnostics?.[name]),
-        promise
-      ]).then(([diagnostics2]) => pragmaChecker(state, f.ast, diagnostics2));
-    }, Promise.resolve());
-  }
-  const diagnostics = state.diagnostics ? await resolveDiagnosticsMap(state.diagnostics) : state.diagnostics;
+    Object.entries(fnMap).forEach(([name, f]) => {
+      pragmaChecker(state, f.ast, diagnostics?.[name]);
+    });
+  }
   return {
     diagnostics,
     sdkVersion: state.sdkVersion
@@ -17699,6 +17746,7 @@ var init_mc_rewrite = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     (0, import_chunk_MBTLUWXR.init_ast)();
+    init_data_flow();
     init_function_info();
     init_inliner();
     init_optimizer_types();
@@ -17712,9 +17760,8 @@ var init_mc_rewrite = (0, import_chunk_ABYVSU2C.__esm)({
     init_sub_type();
     init_types();
     init_unused_exprs();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_variable_renamer();
-    init_data_flow();
   }
 });
 var negativeFixups;
@@ -18607,7 +18654,7 @@ async function getApiMapping(state, resourcesMap, manifestXML) {
       throw `Negative constant ${fixup} was not a Literal`;
     }
     if (typeof init.value !== "number") {
-      (0, import_chunk_67LU4GPQ.log)(`Negative fixup ${fixup} was not a number!`);
+      (0, import_chunk_OASVKTK5.log)(`Negative fixup ${fixup} was not a number!`);
     } else if (init.value > 0) {
       init.value = -init.value;
       init.raw = "-" + init.raw;
@@ -18697,11 +18744,11 @@ function sameStateNodeDecl(a, b) {
 function sameLookupDefinition(a, b) {
   return (
     // sameStateNodeDecl(a.parent, b.parent) &&
-    (0, import_chunk_67LU4GPQ.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
+    (0, import_chunk_OASVKTK5.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
   );
 }
 function sameLookupResult(a, b) {
-  return (0, import_chunk_67LU4GPQ.sameArrays)(a, b, sameLookupDefinition);
+  return (0, import_chunk_OASVKTK5.sameArrays)(a, b, sameLookupDefinition);
 }
 function declKey(decl) {
   return isStateNode(decl) ? decl.type === "ModuleDeclaration" ? decl.fullName : decl.node : decl;
@@ -18758,6 +18805,17 @@ function lookupNext(state, results, decls, property) {
         );
         return;
       }
+      if (module2.type === "VariableDeclarator" && module2.resolvedType) {
+        const [, decls2] = findObjectDeclsByProperty(
+          state,
+          module2.resolvedType,
+          property
+        );
+        if (decls2) {
+          addToItems(decls2);
+          return;
+        }
+      }
       const res = checkOne(state, module2, decls, property);
       if (res) {
         items.push({ parent: module2, results: res });
@@ -18952,7 +19010,11 @@ function lookupWithType(state, node, typeMap, nonLocal = false, stack = null) {
     const objectType = typeMap.get(node.object);
     if (!objectType)
       return results;
-    const [, decls] = findObjectDeclsByProperty(state, objectType, node);
+    const [, decls] = findObjectDeclsByProperty(
+      state,
+      objectType,
+      node.property
+    );
     if (decls) {
       const next = lookupNext(
         state,
@@ -19239,7 +19301,7 @@ function stateFuncs() {
                     if (!(0, import_chunk_MBTLUWXR.hasProperty)(this.index, name)) {
                       this.index[name] = [];
                     }
-                    (0, import_chunk_67LU4GPQ.pushUnique)(this.index[name], parent);
+                    (0, import_chunk_OASVKTK5.pushUnique)(this.index[name], parent);
                   }
                 });
                 break;
@@ -19294,7 +19356,7 @@ function stateFuncs() {
                   if (!(0, import_chunk_MBTLUWXR.hasProperty)(values, name)) {
                     values[name] = [];
                   }
-                  if ((0, import_chunk_67LU4GPQ.pushUnique)(values[name], m) && currentEnum) {
+                  if ((0, import_chunk_OASVKTK5.pushUnique)(values[name], m) && currentEnum) {
                     if (!this.enumMap)
                       this.enumMap = /* @__PURE__ */ new Map();
                     this.enumMap.set(m, currentEnum);
@@ -19302,7 +19364,7 @@ function stateFuncs() {
                   if (!(0, import_chunk_MBTLUWXR.hasProperty)(this.index, name)) {
                     this.index[name] = [];
                   }
-                  (0, import_chunk_67LU4GPQ.pushUnique)(this.index[name], parent);
+                  (0, import_chunk_OASVKTK5.pushUnique)(this.index[name], parent);
                 });
                 break;
               }
@@ -19803,7 +19865,7 @@ var init_api = (0, import_chunk_ABYVSU2C.__esm)({
     init_sdk_util();
     init_type_flow_util();
     init_types();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_visitor();
   }
 });
@@ -19887,7 +19949,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
       return decls;
     }
     if (canon.length !== decls.length || !canon.every((v, i) => v === decls[i])) {
-      throw new import_chunk_67LU4GPQ.AwaitedError(
+      throw new import_chunk_OASVKTK5.AwaitedError(
         declFullName(canon).then(
           (canonStr) => `Canonical representation of ${canonStr} did not match`
         )
@@ -19921,7 +19983,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
     }
     const decl = lookupDefToDecl(results);
     if (decl && path7.length) {
-      if (wantsAllRefs && (0, import_chunk_67LU4GPQ.every)(
+      if (wantsAllRefs && (0, import_chunk_OASVKTK5.every)(
         decl,
         (d) => d.type === "VariableDeclarator" || d.type === "BinaryExpression" || d.type === "Identifier"
       )) {
@@ -19973,7 +20035,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             }
             const v = liveDefs.get(def);
             if (!v || !v.has(node)) {
-              throw new import_chunk_67LU4GPQ.AwaitedError(
+              throw new import_chunk_OASVKTK5.AwaitedError(
                 Promise.resolve(def ? declFullName(def) : "null").then(
                   (defStr) => `No stmt in liveDef for ${defStr}`
                 )
@@ -20031,7 +20093,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             const decls = findDecl(node);
             if (!decls)
               break;
-            if (trackInsertionPoints && (0, import_chunk_67LU4GPQ.some)(decls, (decl) => {
+            if (trackInsertionPoints && (0, import_chunk_OASVKTK5.some)(decls, (decl) => {
               if (decl.type === "VariableDeclarator") {
                 const defStmts = decl.node.kind === "var" && liveDefs.get(null) || liveDefs.get(decl);
                 if (defStmts) {
@@ -20282,8 +20344,8 @@ var init_data_flow = (0, import_chunk_ABYVSU2C.__esm)({
     init_control_flow();
     init_function_info();
     init_type_flow_util();
-    (0, import_chunk_67LU4GPQ.init_util)();
-    DataflowQueue = class extends import_chunk_67LU4GPQ.GenericQueue {
+    (0, import_chunk_OASVKTK5.init_util)();
+    DataflowQueue = class extends import_chunk_OASVKTK5.GenericQueue {
       constructor() {
         super((b, a) => (a.order || 0) - (b.order || 0));
       }
@@ -21078,7 +21140,7 @@ function computeJsrMap(func) {
 }
 function postOrderPropagate(func, preBlock, processBc, postBlock, merge) {
   const order = /* @__PURE__ */ new Map();
-  const queue = new import_chunk_67LU4GPQ.GenericQueue(
+  const queue = new import_chunk_OASVKTK5.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   postOrderTraverse2(func, (block) => {
@@ -21137,7 +21199,7 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
     });
     blocks.reverse().forEach((block, i) => order.set(block, i));
   }
-  const queue = new import_chunk_67LU4GPQ.GenericQueue(
+  const queue = new import_chunk_OASVKTK5.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   queue.enqueue(func.blocks.get(func.offset));
@@ -21191,7 +21253,7 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
 var init_cflow = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/cflow.ts"() {
     "use strict";
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_opcodes();
   }
 });
@@ -21654,12 +21716,12 @@ function interpFunc(func, context) {
   const selfStores = /* @__PURE__ */ new Set();
   const liveInState = /* @__PURE__ */ new Map();
   const replacements = /* @__PURE__ */ new Map();
-  const interpLogging = (0, import_chunk_67LU4GPQ.wouldLog)("interp", 1);
+  const interpLogging = (0, import_chunk_OASVKTK5.wouldLog)("interp", 1);
   if (interpLogging) {
-    if ((0, import_chunk_67LU4GPQ.wouldLog)("interp", 7)) {
-      (0, import_chunk_67LU4GPQ.setBanner)(functionBanner(func, context, "interp"));
-    } else if ((0, import_chunk_67LU4GPQ.wouldLog)("interp", 3)) {
-      (0, import_chunk_67LU4GPQ.setBanner)(
+    if ((0, import_chunk_OASVKTK5.wouldLog)("interp", 7)) {
+      (0, import_chunk_OASVKTK5.setBanner)(functionBanner(func, context, "interp"));
+    } else if ((0, import_chunk_OASVKTK5.wouldLog)("interp", 3)) {
+      (0, import_chunk_OASVKTK5.setBanner)(
         () => `+++++++++++++ interp-prepare ${func.name} ++++++++++++++`
       );
     }
@@ -21693,20 +21755,20 @@ function interpFunc(func, context) {
     func,
     (block) => {
       if (interpLogging) {
-        (0, import_chunk_67LU4GPQ.logger)(
+        (0, import_chunk_OASVKTK5.logger)(
           "interp",
           3,
           `${offsetToString(block.offset)}: ${block.bytecodes[0]?.lineNum ? lineInfoToString(block.bytecodes[0]?.lineNum, context) : ""}
  ${interpStateToString(liveInState.get(block.offset))}`
         );
-        (0, import_chunk_67LU4GPQ.logger)("interp", 9, () => blockToString(block, context));
+        (0, import_chunk_OASVKTK5.logger)("interp", 9, () => blockToString(block, context));
       }
       return cloneState2(liveInState.get(block.offset));
     },
     (block, bc, localState) => {
       if (interpLogging) {
-        if ((0, import_chunk_67LU4GPQ.wouldLog)("interp", 8)) {
-          (0, import_chunk_67LU4GPQ.log)(
+        if ((0, import_chunk_OASVKTK5.wouldLog)("interp", 8)) {
+          (0, import_chunk_OASVKTK5.log)(
             `${interpStateToString(localState)}
     ${bytecodeToString(
               bc,
@@ -21871,14 +21933,14 @@ function interpFunc(func, context) {
       if (!mergeInto(localState, succState))
         return false;
       if (interpLogging) {
-        (0, import_chunk_67LU4GPQ.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
+        (0, import_chunk_OASVKTK5.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
       }
       return true;
     }
   );
   if (interpLogging) {
-    if ((0, import_chunk_67LU4GPQ.wouldLog)("interp", 5)) {
-      (0, import_chunk_67LU4GPQ.setBanner)(
+    if ((0, import_chunk_OASVKTK5.wouldLog)("interp", 5)) {
+      (0, import_chunk_OASVKTK5.setBanner)(
         functionBanner(func, context, "interp", (block, footer) => {
           if (footer)
             return "";
@@ -21886,44 +21948,44 @@ function interpFunc(func, context) {
         })
       );
     } else {
-      (0, import_chunk_67LU4GPQ.setBanner)(() => `=============== interp ${func.name} ==============`);
+      (0, import_chunk_OASVKTK5.setBanner)(() => `=============== interp ${func.name} ==============`);
     }
     if (equivSets.size) {
-      (0, import_chunk_67LU4GPQ.log)(`====== equivSets =====`);
+      (0, import_chunk_OASVKTK5.log)(`====== equivSets =====`);
       equivSets.forEach(
-        (value2, key) => (0, import_chunk_67LU4GPQ.log)(
+        (value2, key) => (0, import_chunk_OASVKTK5.log)(
           `L${key.arg} === ${Array.from(value2).sort().join(" ")} ${key.lineNum ? lineInfoToString(key.lineNum, context) : ""}`
         )
       );
     }
     if (selfStores.size) {
-      (0, import_chunk_67LU4GPQ.log)(`====== selfStores =====`);
+      (0, import_chunk_OASVKTK5.log)(`====== selfStores =====`);
       selfStores.forEach(
-        (value2) => (0, import_chunk_67LU4GPQ.log)(`${bytecodeToString(value2, symbolTable)}`)
+        (value2) => (0, import_chunk_OASVKTK5.log)(`${bytecodeToString(value2, symbolTable)}`)
       );
     }
     if (replacements.size) {
-      (0, import_chunk_67LU4GPQ.log)(`====== replacements =====`);
+      (0, import_chunk_OASVKTK5.log)(`====== replacements =====`);
       replacements.forEach(
         (blockRep) => blockRep.forEach(
-          (rep, bc) => (0, import_chunk_67LU4GPQ.log)(
+          (rep, bc) => (0, import_chunk_OASVKTK5.log)(
             `${bytecodeToString(bc, symbolTable)} => ${rep.invert ? "~" : ""}${bytecodeToString(rep, symbolTable)} ${bc.lineNum ? lineInfoToString(bc.lineNum, context) : ""}`
           )
         )
       );
     }
     if (resolvedBranches.size) {
-      (0, import_chunk_67LU4GPQ.log)(`====== resolved branches =====`);
+      (0, import_chunk_OASVKTK5.log)(`====== resolved branches =====`);
       resolvedBranches.forEach(
-        (isTaken, block) => (0, import_chunk_67LU4GPQ.log)(
+        (isTaken, block) => (0, import_chunk_OASVKTK5.log)(
           `block ${offsetToString(block.offset)} is ${isTaken ? "always" : "never"} taken`
         )
       );
     }
     if (branchRedirects.size) {
-      (0, import_chunk_67LU4GPQ.log)(`====== redirected branches =====`);
+      (0, import_chunk_OASVKTK5.log)(`====== redirected branches =====`);
       branchRedirects.forEach(
-        ({ to, from }, block) => (0, import_chunk_67LU4GPQ.log)(
+        ({ to, from }, block) => (0, import_chunk_OASVKTK5.log)(
           `block ${offsetToString(
             block.offset
           )} redirects from ${offsetToString(from)} to ${offsetToString(to)}${safeBranchBlocks.get(from) ? ` popping ${safeBranchBlocks.get(from)}` : ""}`
@@ -21986,7 +22048,7 @@ function interpFunc(func, context) {
     }
   });
   if (interpLogging)
-    (0, import_chunk_67LU4GPQ.setBanner)(null);
+    (0, import_chunk_OASVKTK5.setBanner)(null);
   return {
     liveInState,
     equivSets,
@@ -22036,7 +22098,7 @@ var init_interp2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/interp.ts"() {
     "use strict";
     init_interp_binary();
-    (0, import_chunk_67LU4GPQ.init_logger)();
+    (0, import_chunk_OASVKTK5.init_logger)();
     init_interp();
     init_types();
     init_union_type();
@@ -22148,7 +22210,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     i = found;
   }
   if (initType && (block.bytecodes[index].op === 20 ? initType.type === 1 : initType.type === 8 && initType.value === 0)) {
-    (0, import_chunk_67LU4GPQ.logger)(
+    (0, import_chunk_OASVKTK5.logger)(
       "array-init",
       1,
       () => `${func.name}: Removing initialization of default initialized ${putvStarts.length} element array init at block ${offsetToString(
@@ -22185,7 +22247,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         convertAputv(offset - 1);
       }
     }
-    (0, import_chunk_67LU4GPQ.logger)(
+    (0, import_chunk_OASVKTK5.logger)(
       "array-init",
       1,
       () => `${func.name}: Optimizing unused ${putvStarts.length} element array init at block ${offsetToString(
@@ -22194,8 +22256,8 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index].offset
       )}`
     );
-    if ((0, import_chunk_67LU4GPQ.wouldLog)("array-init", 5)) {
-      (0, import_chunk_67LU4GPQ.log)(blockToString(block, context));
+    if ((0, import_chunk_OASVKTK5.wouldLog)("array-init", 5)) {
+      (0, import_chunk_OASVKTK5.log)(blockToString(block, context));
     }
     return true;
   }
@@ -22235,7 +22297,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     if (putvStarts.length < 3)
       return false;
     tryLocal(3);
-    (0, import_chunk_67LU4GPQ.logger)(
+    (0, import_chunk_OASVKTK5.logger)(
       "array-init",
       1,
       () => `${func.name}: Optimizing ${putvStarts.length} element array init with constant initializer ${bytecodeToString(
@@ -22261,7 +22323,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index + 1].arg = putvStarts.length;
       }
     }
-    (0, import_chunk_67LU4GPQ.logger)(
+    (0, import_chunk_OASVKTK5.logger)(
       "array-init",
       5,
       () => `index: ${index}, i: ${i}
@@ -22314,7 +22376,7 @@ ${blockToString(block, context)}`
   for (let i2 = putvStarts.length; i2-- > 1; ) {
     block.bytecodes.splice(putvStarts[i2], 2);
   }
-  (0, import_chunk_67LU4GPQ.logger)(
+  (0, import_chunk_OASVKTK5.logger)(
     "array-init",
     1,
     () => `${func.name}: Optimizing ${putvStarts.length} element array init at block ${offsetToString(
@@ -22373,15 +22435,15 @@ var init_array_init = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/array-init.ts"() {
     "use strict";
     init_types();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_bytecode();
     init_interp2();
     init_opcodes();
   }
 });
 function localDCE(func, context) {
-  if ((0, import_chunk_67LU4GPQ.wouldLog)("dce", 5)) {
-    (0, import_chunk_67LU4GPQ.setBanner)(
+  if ((0, import_chunk_OASVKTK5.wouldLog)("dce", 5)) {
+    (0, import_chunk_OASVKTK5.setBanner)(
       functionBanner(
         func,
         context,
@@ -22414,7 +22476,7 @@ function localDCE(func, context) {
   };
   func.blocks.forEach((block) => {
     const reportPopv = (i, item, kill) => {
-      (0, import_chunk_67LU4GPQ.logger)(
+      (0, import_chunk_OASVKTK5.logger)(
         "dce",
         2,
         () => `${func.name}: Convert ${i}:${bytecodeToString(
@@ -22429,7 +22491,7 @@ function localDCE(func, context) {
       );
     };
     const reportNop = (item) => {
-      (0, import_chunk_67LU4GPQ.logger)(
+      (0, import_chunk_OASVKTK5.logger)(
         "dce",
         2,
         () => `${func.name}: Kill ${item.deps.map(
@@ -22448,7 +22510,7 @@ function localDCE(func, context) {
         case 19: {
           const liveLocal = dceInfo.locals.has(bytecode.arg);
           if (!liveLocal && (bytecode.arg || context.config.allowForbiddenOpts)) {
-            (0, import_chunk_67LU4GPQ.logger)(
+            (0, import_chunk_OASVKTK5.logger)(
               "dce",
               2,
               () => `${func.name}: Killing store to unused local ${bytecode.arg} at ${offsetToString(block.offset)}:${i}`
@@ -22608,10 +22670,10 @@ function localDCE(func, context) {
         (bc) => bc.op !== 0
         /* nop */
       );
-      (0, import_chunk_67LU4GPQ.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
+      (0, import_chunk_OASVKTK5.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
     }
   });
-  (0, import_chunk_67LU4GPQ.setBanner)(null);
+  (0, import_chunk_OASVKTK5.setBanner)(null);
   return anyChanges;
 }
 function computeLiveLocals(func) {
@@ -22662,7 +22724,7 @@ var init_dce = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/dce.ts"() {
     "use strict";
     init_data_flow();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -22702,7 +22764,7 @@ function minimizeLocals2(func, equivSets, context) {
   const splitRanges = computeSplitRanges(func, equivSets);
   const locals = mergeSplitRanges(splitRanges);
   const numLocals = Math.max(...Array.from(splitRanges.keys())) + 1;
-  (0, import_chunk_67LU4GPQ.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
+  (0, import_chunk_OASVKTK5.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
   let argc = func.argc ?? null;
   const colors = /* @__PURE__ */ new Map();
   const merge = [];
@@ -22769,15 +22831,15 @@ function minimizeLocals2(func, equivSets, context) {
       }
     }
   }
-  if ((0, import_chunk_67LU4GPQ.wouldLog)("locals", 1)) {
-    if (!(0, import_chunk_67LU4GPQ.wouldLog)("locals", 10)) {
-      (0, import_chunk_67LU4GPQ.logger)("locals", 5, functionBanner(func, context, "Minimize Locals"));
+  if ((0, import_chunk_OASVKTK5.wouldLog)("locals", 1)) {
+    if (!(0, import_chunk_OASVKTK5.wouldLog)("locals", 10)) {
+      (0, import_chunk_OASVKTK5.logger)("locals", 5, functionBanner(func, context, "Minimize Locals"));
     }
-    (0, import_chunk_67LU4GPQ.log)(
+    (0, import_chunk_OASVKTK5.log)(
       `>>> Merging locals in ${func.name} (in: ${numLocals} => out: ${merge.length})`
     );
     merge.slice().sort((a, b) => (colors.get(a[0]) ?? 0) - (colors.get(b[0]) ?? 0)).forEach(
-      (merged) => (0, import_chunk_67LU4GPQ.log)(
+      (merged) => (0, import_chunk_OASVKTK5.log)(
         ` ${colors.get(merged[0])} - ${merged.map((k) => bytecodeToString(k, context.symbolTable)).join(" | ")}`
       )
     );
@@ -23076,7 +23138,7 @@ function mergeSplitRanges(splitRanges) {
 var init_locals = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/locals.ts"() {
     "use strict";
-    (0, import_chunk_67LU4GPQ.init_logger)();
+    (0, import_chunk_OASVKTK5.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -23189,16 +23251,16 @@ function sizeBasedPRE2(func, context) {
       delete bc.arg;
     return bc;
   };
-  if ((0, import_chunk_67LU4GPQ.wouldLog)("pre", 1)) {
-    if ((0, import_chunk_67LU4GPQ.wouldLog)("pre", 5)) {
-      (0, import_chunk_67LU4GPQ.log)(functionBanner(func, context, "PRE")());
+  if ((0, import_chunk_OASVKTK5.wouldLog)("pre", 1)) {
+    if ((0, import_chunk_OASVKTK5.wouldLog)("pre", 5)) {
+      (0, import_chunk_OASVKTK5.log)(functionBanner(func, context, "PRE")());
     } else {
-      (0, import_chunk_67LU4GPQ.log)(`================ PRE : ${func.name} ================
+      (0, import_chunk_OASVKTK5.log)(`================ PRE : ${func.name} ================
 `);
     }
     insertionBlocks.forEach((o, key) => {
       const bcs = canonicalMap.get(key);
-      (0, import_chunk_67LU4GPQ.log)(
+      (0, import_chunk_OASVKTK5.log)(
         `Replacing ${bcs.size} instances of ${bytecodeToString(
           bcs.values().next().value,
           context.symbolTable
@@ -23281,13 +23343,13 @@ function sizeBasedPRE2(func, context) {
       bytecode(1, insertionBlocks.size)
     );
   }
-  (0, import_chunk_67LU4GPQ.logger)("pre", 5, functionBanner(func, context, "post-PRE"));
+  (0, import_chunk_OASVKTK5.logger)("pre", 5, functionBanner(func, context, "post-PRE"));
   return true;
 }
 var init_pre2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/pre.ts"() {
     "use strict";
-    (0, import_chunk_67LU4GPQ.init_logger)();
+    (0, import_chunk_OASVKTK5.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -23320,9 +23382,9 @@ function blockSharing(func, context) {
   if (!any)
     return false;
   any = false;
-  const logging3 = (0, import_chunk_67LU4GPQ.wouldLog)("sharing", 1);
-  if (logging3 && (0, import_chunk_67LU4GPQ.wouldLog)("sharing", 10)) {
-    (0, import_chunk_67LU4GPQ.setBanner)(functionBanner(func, context, "sharing"));
+  const logging3 = (0, import_chunk_OASVKTK5.wouldLog)("sharing", 1);
+  if (logging3 && (0, import_chunk_OASVKTK5.wouldLog)("sharing", 10)) {
+    (0, import_chunk_OASVKTK5.setBanner)(functionBanner(func, context, "sharing"));
   }
   candidates.forEach((blocks) => {
     while (blocks.size > 1) {
@@ -23458,9 +23520,9 @@ function blockSharing(func, context) {
                 block2.offset
               )})` : `block(${offsetToString(block2.offset)})`;
             };
-            (0, import_chunk_67LU4GPQ.log)(`Sharing ${showBlock(block)} with ${showBlock(target)}`);
-            if ((0, import_chunk_67LU4GPQ.wouldLog)("sharing", 5)) {
-              (0, import_chunk_67LU4GPQ.log)(blockToString(target, context));
+            (0, import_chunk_OASVKTK5.log)(`Sharing ${showBlock(block)} with ${showBlock(target)}`);
+            if ((0, import_chunk_OASVKTK5.wouldLog)("sharing", 5)) {
+              (0, import_chunk_OASVKTK5.log)(blockToString(target, context));
             }
           }
           if (target.bytecodes.length > length2) {
@@ -23487,13 +23549,13 @@ function blockSharing(func, context) {
       });
     }
   });
-  (0, import_chunk_67LU4GPQ.setBanner)(null);
+  (0, import_chunk_OASVKTK5.setBanner)(null);
   return any;
 }
 var init_sharing = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/sharing.ts"() {
     "use strict";
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_bytecode();
     init_opcodes();
   }
@@ -23557,7 +23619,7 @@ function doArrayInits(func, liveInState, context) {
 }
 function simpleOpts(func, context) {
   const equalsSym = 8388787;
-  const logging3 = (0, import_chunk_67LU4GPQ.wouldLog)("optimize", 5);
+  const logging3 = (0, import_chunk_OASVKTK5.wouldLog)("optimize", 5);
   return Array.from(func.blocks.values()).reduce((changes, block) => {
     for (let i = block.bytecodes.length; i--; ) {
       const cur = block.bytecodes[i];
@@ -23565,7 +23627,7 @@ function simpleOpts(func, context) {
         block.bytecodes.splice(i, 1);
         changes = true;
         if (logging3) {
-          (0, import_chunk_67LU4GPQ.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
+          (0, import_chunk_OASVKTK5.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
         }
       } else if (cur.op === 74 && context.config.removeArgc && context.config.allowForbiddenOpts) {
         const arg = cur.arg.incsp;
@@ -23574,7 +23636,7 @@ function simpleOpts(func, context) {
         incsp.arg = arg;
         changes = true;
         if (logging3) {
-          (0, import_chunk_67LU4GPQ.log)(`${func.name}: argcincsp => incsp`);
+          (0, import_chunk_OASVKTK5.log)(`${func.name}: argcincsp => incsp`);
         }
       } else if (i && cur.op === 39 && cur.arg === equalsSym) {
         changes = equalSymbolToEq(block, i) || changes;
@@ -23585,7 +23647,7 @@ function simpleOpts(func, context) {
           if (!shift && prev.op === 37) {
             block.bytecodes.splice(i - 1, 2);
             changes = true;
-            logging3 && (0, import_chunk_67LU4GPQ.log)(`${func.name}: deleting no-op shift (${shift})`);
+            logging3 && (0, import_chunk_OASVKTK5.log)(`${func.name}: deleting no-op shift (${shift})`);
             continue;
           }
           if (shift === 1n && prev.op === 37) {
@@ -23595,7 +23657,7 @@ function simpleOpts(func, context) {
             const add = cur;
             add.op = 3;
             delete add.arg;
-            logging3 && (0, import_chunk_67LU4GPQ.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
+            logging3 && (0, import_chunk_OASVKTK5.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
             continue;
           }
           if (shift < (prev.op === 49 ? 64n : 31n)) {
@@ -23605,7 +23667,7 @@ function simpleOpts(func, context) {
             } else {
               prev.arg = BigInt.asIntN(64, mul);
             }
-            logging3 && (0, import_chunk_67LU4GPQ.log)(
+            logging3 && (0, import_chunk_OASVKTK5.log)(
               `${func.name}: converting shlv(${shift}) to mulv(${prev.arg})`
             );
             changes = true;
@@ -23619,14 +23681,14 @@ function simpleOpts(func, context) {
         func.blocks.get(block.taken).preds.delete(block.offset);
         delete block.taken;
         changes = true;
-        logging3 && (0, import_chunk_67LU4GPQ.log)(`${func.name}: deleting empty finally handler`);
+        logging3 && (0, import_chunk_OASVKTK5.log)(`${func.name}: deleting empty finally handler`);
       } else if (isCondBranch(cur.op)) {
         const next = func.blocks.get(block.next);
         const taken = func.blocks.get(block.taken);
         if (next.preds.size > 1 && taken.preds.size === 1) {
           const newOp = cur.op === 40 ? 41 : 40;
           if (logging3) {
-            (0, import_chunk_67LU4GPQ.log)(
+            (0, import_chunk_OASVKTK5.log)(
               `${func.name}: converting ${Opcodes[cur.op]} to ${Opcodes[newOp]}`
             );
           }
@@ -23639,7 +23701,7 @@ function simpleOpts(func, context) {
           const isBool = i >= 2 && isBoolOp(block.bytecodes[i - 2].op);
           if (next.next === block.taken && next.taken == null && taken.bytecodes.length === 1 && isCondBranch(taken.bytecodes[0].op) && next.bytecodes.length > 1 && next.bytecodes[next.bytecodes.length - 1].op === (cur.op === 41 ? 7 : 8) && (isBool || next.bytecodes.length > 2 && isBoolOp(next.bytecodes[next.bytecodes.length - 2].op)) && next.preds?.size === 1 && taken.preds?.size === 2) {
             if (logging3) {
-              (0, import_chunk_67LU4GPQ.log)(
+              (0, import_chunk_OASVKTK5.log)(
                 `${func.name}: simplifying ${next.bytecodes[next.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   next.offset
                 )}:${offsetToString(taken.offset)}:`
@@ -23656,7 +23718,7 @@ function simpleOpts(func, context) {
             changes = true;
           } else if (taken.next === block.next && taken.taken == null && next.bytecodes.length === 1 && isCondBranch(next.bytecodes[0].op) && taken.bytecodes.length > 1 && taken.bytecodes[taken.bytecodes.length - 1].op === (cur.op === 40 ? 7 : 8) && (isBool || taken.bytecodes.length > 2 && isBoolOp(taken.bytecodes[taken.bytecodes.length - 2].op)) && next.preds?.size === 2 && taken.preds?.size === 1) {
             if (logging3) {
-              (0, import_chunk_67LU4GPQ.log)(
+              (0, import_chunk_OASVKTK5.log)(
                 `${func.name}: simplifying ${taken.bytecodes[taken.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   taken.offset
                 )}:${offsetToString(next.offset)}:`
@@ -23704,7 +23766,7 @@ function equalSymbolToEq(block, equalsIndex) {
     op: 26,
     offset: invokem.offset
   });
-  (0, import_chunk_67LU4GPQ.logger)(
+  (0, import_chunk_OASVKTK5.logger)(
     "optimize",
     1,
     `Replacing <thing>.equals(:symbol) with <thing> eq :symbol at ${offsetToString(
@@ -23764,7 +23826,7 @@ function removeUnreachableCatches(func, context) {
       const next = func.blocks.get(block.next);
       if (block.try === next.try) {
         if (next.preds.size === 1) {
-          (0, import_chunk_67LU4GPQ.logger)(
+          (0, import_chunk_OASVKTK5.logger)(
             "cfg",
             1,
             () => `${func.name}: ${offsetToString(
@@ -23787,7 +23849,7 @@ function removeUnreachableCatches(func, context) {
           delete next.preds;
           removeBlock(func, next.offset);
         } else if (next.next == null && next.bytecodes.length < 3 && next.bytecodes.reduce((size, bc) => size + opcodeSize(bc.op), 0) < 3 && countFallthroughPreds(func, next) > 1) {
-          (0, import_chunk_67LU4GPQ.logger)(
+          (0, import_chunk_OASVKTK5.logger)(
             "cfg",
             1,
             () => `${func.name}: ${offsetToString(
@@ -23812,7 +23874,7 @@ function removeUnreachableCatches(func, context) {
       switch (last.op) {
         case 41:
         case 40:
-          (0, import_chunk_67LU4GPQ.logger)(
+          (0, import_chunk_OASVKTK5.logger)(
             "cfg",
             1,
             () => `${func.name}: killing no-op ${bytecodeToString(
@@ -23835,7 +23897,7 @@ function removeUnreachableCatches(func, context) {
       for (let i = block.try.length; i--; ) {
         const handler = block.try[i].handler;
         if (!func.blocks.get(handler)?.preds?.size) {
-          (0, import_chunk_67LU4GPQ.logger)(
+          (0, import_chunk_OASVKTK5.logger)(
             "cfg",
             1,
             `${func.name}: killing unused try-catch at ${offsetToString(
@@ -23852,8 +23914,8 @@ function removeUnreachableCatches(func, context) {
   });
 }
 function cleanCfg2(func, context) {
-  if ((0, import_chunk_67LU4GPQ.wouldLog)("cfg", 10)) {
-    (0, import_chunk_67LU4GPQ.setBanner)(functionBanner(func, context, "sharing"));
+  if ((0, import_chunk_OASVKTK5.wouldLog)("cfg", 10)) {
+    (0, import_chunk_OASVKTK5.setBanner)(functionBanner(func, context, "sharing"));
   }
   removeNoOpBlocks(func);
   removeUnreachableCatches(func, context);
@@ -23868,12 +23930,12 @@ function cleanCfg2(func, context) {
     (0, import_node_assert12.default)(!block.preds?.size);
     func.blocks.delete(block.offset);
   });
-  (0, import_chunk_67LU4GPQ.setBanner)(null);
+  (0, import_chunk_OASVKTK5.setBanner)(null);
 }
 var init_optimize2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/optimize.ts"() {
     "use strict";
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_array_init();
     init_bytecode();
     init_cflow();
@@ -24488,21 +24550,21 @@ function optimizeBytecode(context) {
       functions.forEach(callback);
       return;
     }
-    (0, import_chunk_67LU4GPQ.bumpLogging)(null, 10);
+    (0, import_chunk_OASVKTK5.bumpLogging)(null, 10);
     functions.forEach((func) => {
       if (loggerFunc.test(func.name ?? "<null>")) {
-        (0, import_chunk_67LU4GPQ.bumpLogging)(null, -10);
+        (0, import_chunk_OASVKTK5.bumpLogging)(null, -10);
         callback(func);
-        (0, import_chunk_67LU4GPQ.bumpLogging)(null, 10);
+        (0, import_chunk_OASVKTK5.bumpLogging)(null, 10);
         return;
       }
       callback(func);
     });
-    (0, import_chunk_67LU4GPQ.bumpLogging)(null, -10);
+    (0, import_chunk_OASVKTK5.bumpLogging)(null, -10);
   };
-  if ((0, import_chunk_67LU4GPQ.wouldLog)("list-input", 1)) {
+  if ((0, import_chunk_OASVKTK5.wouldLog)("list-input", 1)) {
     forEachFunction(
-      (func) => (0, import_chunk_67LU4GPQ.wouldLog)("list-input", 1) && printFunction(func, context)
+      (func) => (0, import_chunk_OASVKTK5.wouldLog)("list-input", 1) && printFunction(func, context)
     );
   }
   forEachFunction((func) => optimizeFunc(func, context));
@@ -24520,7 +24582,7 @@ function optimizeBytecode(context) {
   forEachFunction((func) => {
     if (!func.name)
       return;
-    (0, import_chunk_67LU4GPQ.logger)(
+    (0, import_chunk_OASVKTK5.logger)(
       "bytecode",
       5,
       `${func.name}: ${offset.toString(16)} ${offset - func.offset}`
@@ -24529,7 +24591,7 @@ function optimizeBytecode(context) {
   });
   const { offsetMap } = updateInfo;
   offsetMap.set(code.byteLength, offset);
-  (0, import_chunk_67LU4GPQ.logger)(
+  (0, import_chunk_OASVKTK5.logger)(
     "bytecode",
     1,
     `${context.filepath}: code size: ${context.sections[
@@ -24541,9 +24603,9 @@ function optimizeBytecode(context) {
     ].length - offset}`
   );
   fixSectionSize(-1059145026, context.sections, offset);
-  if ((0, import_chunk_67LU4GPQ.wouldLog)("list-output", 1)) {
+  if ((0, import_chunk_OASVKTK5.wouldLog)("list-output", 1)) {
     forEachFunction(
-      (func) => (0, import_chunk_67LU4GPQ.wouldLog)("list-output", 1) && printFunction(func, context)
+      (func) => (0, import_chunk_OASVKTK5.wouldLog)("list-output", 1) && printFunction(func, context)
     );
   }
   fixupHeader(context, updateInfo);
@@ -24633,7 +24695,7 @@ ${functionToString(
 ---------------- ${func.name} ----------------`;
 }
 function printFunction(func, context) {
-  (0, import_chunk_67LU4GPQ.log)(functionToString(func, context));
+  (0, import_chunk_OASVKTK5.log)(functionToString(func, context));
 }
 function functionToString(func, context, extra) {
   const parts = [];
@@ -25064,7 +25126,7 @@ var init_bytecode = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_sdk_util();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_data();
     init_emit();
     init_exceptions();
@@ -25350,10 +25412,10 @@ async function build_project(product, options, lineCallback) {
   ].flat();
   if (!returnCommand) {
     const handlers = [
-      lineCallback || ((line) => (0, import_chunk_67LU4GPQ.log)(line)),
+      lineCallback || ((line) => (0, import_chunk_OASVKTK5.log)(line)),
       (line) => console.error(line)
     ];
-    await (0, import_chunk_67LU4GPQ.spawnByLine)(exe, args, handlers, {
+    await (0, import_chunk_OASVKTK5.spawnByLine)(exe, args, handlers, {
       cwd: workspace
     });
   }
@@ -25363,7 +25425,7 @@ var init_build = (0, import_chunk_ABYVSU2C.__esm)({
   "src/build.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
   }
 });
 var require_ms = (0, import_chunk_ABYVSU2C.__commonJS)({
@@ -28310,7 +28372,7 @@ function resolve_filename(literal, default_source = null) {
   return path2.resolve(root, literal.value);
 }
 async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
-  const resolve_file_list = (literals) => Promise.all(
+  const resolve_file_list = (literals, checkExists = true) => Promise.all(
     literals.map((v) => {
       if (!isJNode(v)) {
         return v;
@@ -28330,11 +28392,11 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
       );
       if (!(0, import_chunk_MBTLUWXR.hasProperty)(cache.resolvedPaths, resolved)) {
         if (/[*?[\]{}]/.test(resolved)) {
-          cache.resolvedPaths[resolved] = (0, import_chunk_67LU4GPQ.globSome)(resolved, () => true);
+          cache.resolvedPaths[resolved] = (0, import_chunk_OASVKTK5.globSome)(resolved, () => true);
         } else {
           cache.resolvedPaths[resolved] = fs5.stat(resolved).then(
             () => true,
-            () => false
+            () => !checkExists
           );
         }
       }
@@ -28345,12 +28407,13 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
   ).then(
     (results) => results.filter((name) => name != null)
   );
-  const resolve_one_file_list = async (base, name) => {
+  const resolve_one_file_list = async (base, name, checkExists = true) => {
     const bname = base[name];
     if (!bname)
       return;
     const result = await resolve_file_list(
-      bname
+      bname,
+      checkExists
     );
     if (!result || !result.length) {
       delete base[name];
@@ -28362,7 +28425,7 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
     resolve_one_file_list(qualifier, "sourcePath"),
     resolve_one_file_list(qualifier, "resourcePath"),
     resolve_one_file_list(qualifier, "personality"),
-    resolve_one_file_list(qualifier, "barrelPath")
+    resolve_one_file_list(qualifier, "barrelPath", false)
   ];
   const lang = qualifier["lang"];
   if (lang) {
@@ -28408,12 +28471,12 @@ async function read_resource_files(targets, cache) {
       if (!(0, import_chunk_MBTLUWXR.hasProperty)(resourceGroupPromises, key)) {
         resourceGroupPromises[key] = Promise.all(
           p.qualifier.resourcePath.map(
-            (pattern) => (0, import_chunk_67LU4GPQ.globa)(pattern, { mark: true })
+            (pattern) => (0, import_chunk_OASVKTK5.globa)(pattern, { mark: true })
           )
         ).then(
           (patterns) => Promise.all(
             patterns.flat().map(
-              (path7) => path7.endsWith("/") ? (0, import_chunk_67LU4GPQ.globa)(`${path7}**/*.xml`, { mark: true }) : path7
+              (path7) => path7.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${path7}**/*.xml`, { mark: true }) : path7
             )
           )
         ).then(
@@ -28473,7 +28536,7 @@ async function find_build_instructions_in_resource(file, rez, buildDependencies)
   const sourceExcludes = excludes.map((e) => e.file?.value.value).filter((f) => f != null).map((f) => path2.resolve(dir, f).replace(/\\/g, "/"));
   const filePatterns = excludes.map((e) => e.dir?.value.value).filter((f) => f != null).map((f) => path2.join(dir, f, "**", "*.mc").replace(/\\/g, "/"));
   if (filePatterns.length) {
-    const files = (await Promise.all(filePatterns.map((p) => (0, import_chunk_67LU4GPQ.globa)(p)))).flat();
+    const files = (await Promise.all(filePatterns.map((p) => (0, import_chunk_OASVKTK5.globa)(p)))).flat();
     sourceExcludes.push(...files);
   }
   const excludeAnnotations = excludes.map((e) => e.annotation?.value.value).filter((f) => f != null);
@@ -28647,23 +28710,32 @@ function identify_optimizer_groups(targets, options) {
     target.group.optimizerConfig.products.push(target.product);
   });
 }
-function find_barrels(barrelPath) {
-  if (Array.isArray(barrelPath)) {
-    return Promise.all(
-      barrelPath.map((path7) => (0, import_chunk_67LU4GPQ.globa)(path7, { mark: true }))
-    ).then((paths) => [
-      paths.flat().filter((path7) => path7.endsWith(".jungle")).join(";")
-    ]);
-  }
-  return (0, import_chunk_67LU4GPQ.globa)(barrelPath, { mark: true }).then(
+function find_barrels(barrelPath, buildDependencies) {
+  return (Array.isArray(barrelPath) ? (
+    // This is a sublist. The barrel has more than one jungle file.
+    Promise.all(barrelPath.map((path7) => (0, import_chunk_OASVKTK5.globa)(path7, { mark: true }))).then(
+      (paths) => [
+        paths.flat().filter((path7) => path7.endsWith(".jungle")).join(";")
+      ]
+    )
+  ) : (0, import_chunk_OASVKTK5.globa)(barrelPath, { mark: true }).then(
     (paths) => Promise.all(
       paths.map(
-        (path7) => path7.endsWith("/") ? (0, import_chunk_67LU4GPQ.globa)(`${path7}**/*.barrel`) : path7
+        (path7) => path7.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${path7}**/*.barrel`) : path7
       )
     )
   ).then(
-    (barrelPaths) => barrelPaths.flat().filter((path7) => path7.endsWith(".jungle") || path7.endsWith(".barrel"))
-  );
+    (barrelPaths) => barrelPaths.flat().filter(
+      (path7) => path7.endsWith(".jungle") || path7.endsWith(".barrel")
+    )
+  )).then((paths) => {
+    (0, import_chunk_OASVKTK5.forEach)(
+      barrelPath,
+      (path7) => /[*?[\]{}]/.test(path7) || (buildDependencies[path7] = true)
+    );
+    paths.forEach((path7) => buildDependencies[path7] = true);
+    return paths;
+  });
 }
 function resolve_barrel(barrel, barrelDir, products, options, cache, buildDependencies) {
   if ((0, import_chunk_MBTLUWXR.hasProperty)(cache.barrels, barrel)) {
@@ -28709,7 +28781,7 @@ function resolve_barrel(barrel, barrelDir, products, options, cache, buildDepend
     throw e;
   });
 }
-function resolve_barrels(product, qualifier, barrels, products, options, cache, buildDependencies) {
+function resolve_barrels(jungle, product, qualifier, barrels, products, options, cache, buildDependencies) {
   if (qualifier.annotations) {
     Object.keys(qualifier.annotations).forEach((key) => {
       if (!barrels.includes(key)) {
@@ -28747,7 +28819,7 @@ function resolve_barrels(product, qualifier, barrels, products, options, cache,
     barrels.map((b) => [b, null])
   );
   return (qualifier.barrelPath || []).reduce(
-    (promise, barrelPath) => promise.then(() => find_barrels(barrelPath)).then((barrelPaths) => {
+    (promise, barrelPath) => promise.then(() => find_barrels(barrelPath, buildDependencies)).then((barrelPaths) => {
       return Promise.all(
         barrelPaths.map(
           (barrel) => resolve_barrel(
@@ -28784,9 +28856,11 @@ function resolve_barrels(product, qualifier, barrels, products, options, cache,
   ).then(() => {
     const unresolved = Object.entries(barrelMap).filter((v) => v[1] === null);
     if (unresolved.length) {
-      throw new Error(
+      const e = new Error(
         `Failed to resolve some barrels: ${unresolved.map(([name]) => name).join(",")}`
       );
+      e.source = jungle;
+      throw e;
     }
     const finalMap = barrelMap;
     if (!cache.barrelMap)
@@ -28851,6 +28925,7 @@ async function get_jungle_and_barrels(jungleFiles, defaultProducts, options, cac
       ).then((qualifier) => {
         targets.push({ product, qualifier, shape });
         return resolve_barrels(
+          jungles[0],
           product,
           qualifier,
           barrels,
@@ -28931,7 +29006,7 @@ var init_jungles = (0, import_chunk_ABYVSU2C.__esm)({
     init_api();
     init_manifest();
     init_sdk_util();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     depth = 0;
   }
 });
@@ -28959,7 +29034,7 @@ async function launchSimulator(force = true) {
       await new Promise((r) => setTimeout(r, 200));
     }
   } catch (e) {
-    (0, import_chunk_67LU4GPQ.log)(e);
+    (0, import_chunk_OASVKTK5.log)(e);
   }
 }
 function checkIfSimulatorRunning() {
@@ -28990,10 +29065,10 @@ function simulateProgram(prg, device, test = false, logger2) {
     }
   }
   return getSdkPath().then(
-    (sdk) => (0, import_chunk_67LU4GPQ.spawnByLine)(
+    (sdk) => (0, import_chunk_OASVKTK5.spawnByLine)(
       path3.resolve(sdk, "bin", isWin ? "monkeydo.bat" : "monkeydo"),
       args,
-      logger2 || ((line) => (0, import_chunk_67LU4GPQ.log)(line))
+      logger2 || ((line) => (0, import_chunk_OASVKTK5.log)(line))
     ).then(() => {
       return;
     })
@@ -29003,7 +29078,7 @@ var init_launch = (0, import_chunk_ABYVSU2C.__esm)({
   "src/launch.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
   }
 });
 function relative_path_no_dotdot(relative2) {
@@ -29024,7 +29099,7 @@ async function getCodeWorkspaceSettings(folder) {
   let curDir = folder;
   try {
     while (curDir) {
-      const code_workspaces = await (0, import_chunk_67LU4GPQ.globa)(
+      const code_workspaces = await (0, import_chunk_OASVKTK5.globa)(
         path4.resolve(curDir, "*.code-workspace"),
         { onlyFiles: true }
       );
@@ -29075,7 +29150,12 @@ function getConfig(options) {
       }
       return settings;
     });
-  }, Promise.resolve(null)).then(() => config);
+  }, Promise.resolve(options.ignore_settings_files ? {} : null)).then((settings) => {
+    if (settings && (!config.strictTypeCheck || config.strictTypeCheck === "Default") && (settings["monkeyC.typeCheckLevel"]?.toString().toLowerCase() === "strict" || settings["prettierMonkeyC.typeCheckLevel"]?.toString().toLowerCase() === "strict")) {
+      config.strictTypeCheck = "On";
+    }
+    return config;
+  });
 }
 async function buildOptimizedProject(product, options) {
   const config = await getConfig(options);
@@ -29147,7 +29227,7 @@ async function createLocalBarrels(targets, options) {
             optBarrelDir
           };
           return promise2.then(
-            () => (0, import_chunk_67LU4GPQ.copyRecursiveAsNeeded)(
+            () => (0, import_chunk_OASVKTK5.copyRecursiveAsNeeded)(
               rawBarrelDir,
               optBarrelDir,
               (src) => !src.endsWith(".mc")
@@ -29265,17 +29345,14 @@ async function generateOptimizedProject(options) {
     let hasPersonality = false;
     const promises = Object.keys(buildConfigs).sort().map((key) => {
       const buildConfig = buildConfigs[key];
-      const outputPath = path4.join(config.outputPath, key);
       return buildConfig ? runTaskInPool({
         type: "generateOneConfig",
         data: {
           buildConfig,
           manifestXML: xml,
           dependencyFiles,
-          config: {
-            ...config,
-            outputPath
-          }
+          config,
+          key
         }
       }).catch((e) => {
         if (!e.stack) {
@@ -29294,7 +29371,7 @@ async function generateOptimizedProject(options) {
         if (t.sdkVersion != null && t.sdkVersion >= 4002001) {
           hasPersonality = true;
         }
-      }) : fs6.rm(path4.resolve(workspace, outputPath), {
+      }) : fs6.rm(path4.resolve(workspace, config.outputPath, key), {
         recursive: true,
         force: true
       });
@@ -29447,30 +29524,48 @@ async function generateOptimizedProject(options) {
     diagnostics
   };
 }
-async function filesFromPaths(workspace, paths, extension) {
-  paths = (await Promise.all(
-    paths?.map((pattern) => (0, import_chunk_67LU4GPQ.globa)(pattern, { cwd: workspace, mark: true })) || []
+async function filesFromPaths(workspace, buildDir, inPaths, extension) {
+  const filter = buildDir.startsWith(workspace);
+  const paths = (await Promise.all(
+    inPaths?.map(
+      (pattern) => (0, import_chunk_OASVKTK5.globa)(pattern, { cwd: workspace, mark: true }).then(
+        (paths2) => paths2.map((p) => ({
+          path: p,
+          filter: filter && /^\*\*[\\/]\*.mc$/i.test(path4.relative(workspace, pattern))
+        }))
+      )
+    ) || []
   )).flat();
   const files = await Promise.all(
     paths.map(
-      (path7) => path7.endsWith("/") ? (0, import_chunk_67LU4GPQ.globa)(`${path7}**/*${extension}`, { cwd: workspace, mark: true }) : path7
+      (result) => result.path.endsWith("/") ? (0, import_chunk_OASVKTK5.globa)(`${result.path}**/*${extension}`, {
+        cwd: workspace,
+        mark: true
+      }).then(
+        (paths2) => paths2.map((path7) => ({
+          path: path7,
+          filter: result.filter
+        }))
+      ) : result
     )
   );
   return {
     files: files.flat().filter(
-      (file) => file.endsWith(extension) && !path4.relative(workspace, file).startsWith("bin")
-    ),
-    paths
+      (file) => file.path.endsWith(extension) && (!file.filter || !file.path.startsWith(buildDir))
+    ).map(({ path: path7 }) => path7),
+    paths: paths.map(({ path: path7 }) => path7)
   };
 }
-async function fileInfoFromConfig(workspace, output, buildConfig, extraExcludes, barrel) {
+async function fileInfoFromConfig(workspace, buildDir, output, buildConfig, extraExcludes, barrel) {
   const { files, paths } = await filesFromPaths(
     workspace,
+    buildDir,
     buildConfig.sourcePath,
     ".mc"
   );
   const { files: personalityFiles } = await filesFromPaths(
     workspace,
+    buildDir,
     buildConfig.personality,
     ".mss"
   );
@@ -29508,9 +29603,10 @@ function excludesFromAnnotations(barrel, annotations, resolvedBarrel) {
   }
   return excludes;
 }
-async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, config) {
+async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, config, key) {
   const { workspace } = config;
-  const output = path4.join(workspace, config.outputPath);
+  const outputRoot = path4.resolve(workspace, config.outputPath);
+  const output = path4.join(outputRoot, key);
   const buildModeExcludes = {
     // note: exclude debug in release builds, and release in debug builds
     [config.releaseBuild ? "debug" : "release"]: true
@@ -29524,6 +29620,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
   }
   const { fnMap } = await fileInfoFromConfig(
     workspace,
+    outputRoot,
     path4.join(output, "source"),
     buildConfig,
     buildModeExcludes,
@@ -29541,6 +29638,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
         );
         return fileInfoFromConfig(
           path4.dirname(resolvedBarrel.jungles[0]),
+          outputRoot,
           path4.join(output, "barrels", barrel),
           resolvedBarrel.qualifier,
           {
@@ -29556,14 +29654,14 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       }).flat()
     );
     barrelFnMaps.forEach(
-      (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key, value2]) => {
-        if (!(0, import_chunk_MBTLUWXR.hasProperty)(fnMap, key)) {
-          fnMap[key] = value2;
+      (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key2, value2]) => {
+        if (!(0, import_chunk_MBTLUWXR.hasProperty)(fnMap, key2)) {
+          fnMap[key2] = value2;
         }
       })
     );
   }
-  const actualOptimizedFiles = (await (0, import_chunk_67LU4GPQ.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
+  const actualOptimizedFiles = (await (0, import_chunk_OASVKTK5.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
   const {
     hasTests,
     diagnostics: prevDiagnostics,
@@ -29579,13 +29677,13 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     const sdk = await getSdkPath();
     const match = sdk.match(/-(\d+\.\d+\.\d+)/);
     if ((match && parseSdkVersion(match[1])) === prevSdkVersion) {
-      const source_time = await (0, import_chunk_67LU4GPQ.last_modified)(
+      const source_time = await (0, import_chunk_OASVKTK5.last_modified)(
         Object.keys(fnMap).concat(dependencyFiles)
       );
-      const opt_time = await (0, import_chunk_67LU4GPQ.first_modified)(
+      const opt_time = await (0, import_chunk_OASVKTK5.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1719699536477 < opt_time) {
+      if (source_time < opt_time && 1720645332171 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29594,13 +29692,12 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       }
     }
   }
-  const [, , prettierConfig] = await Promise.all([
-    fs6.rm(output, { recursive: true, force: true }),
-    fs6.mkdir(output, { recursive: true }),
+  const [prettierConfig] = await Promise.all([
     Prettier2.resolveConfig(config.workspace, {
       useCache: false,
       editorconfig: true
-    })
+    }),
+    fs6.rm(output, { recursive: true, force: true }).then(() => fs6.mkdir(output, { recursive: true }))
   ]);
   return optimizeMonkeyC(fnMap, resourcesMap, manifestXML, config).then(
     ({ diagnostics, sdkVersion }) => {
@@ -29624,7 +29721,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.66",
+            optimizerVersion: "1.1.68",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29634,15 +29731,12 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     }
   );
 }
-async function getProjectAnalysis(targets, analysis, manifestXML, options) {
-  try {
-    return getProjectAnalysisHelper(targets, analysis, manifestXML, options);
-  } catch (ex) {
-    if (ex instanceof import_chunk_67LU4GPQ.AwaitedError) {
-      await ex.resolve();
-    }
-    throw ex;
-  }
+function getProjectAnalysis(targets, analysis, manifestXML, options) {
+  return getConfig(options).then(
+    (options2) => getProjectAnalysisHelper(targets, analysis, manifestXML, options2)
+  ).catch(
+    (ex) => Promise.reject(ex instanceof import_chunk_OASVKTK5.AwaitedError ? ex.resolve() : ex)
+  );
 }
 async function getProjectAnalysisHelper(targets, analysis, manifestXML, options) {
   const qualifiers = /* @__PURE__ */ new Map();
@@ -29672,11 +29766,13 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
     }
     return product;
   });
+  const { workspace, outputPath } = options;
   const { fnMap, paths } = await Promise.all(
     Array.from(qualifiers).map(
       ([name, qualifier]) => fileInfoFromConfig(
         qualifier.root,
-        options.workspace,
+        path4.resolve(workspace, outputPath ?? "bin/optimized"),
+        workspace,
         {
           sourcePath: Array.from(qualifier.sourcePath),
           personality: Array.from(qualifier.personality),
@@ -29708,9 +29804,7 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
       }
     });
   }
-  if (!await getFileASTs(fnMap)) {
-    return { fnMap, paths };
-  }
+  await getFileASTs(fnMap);
   const resourcesMap = {};
   const addResources = (name, resources) => {
     if (!resources)
@@ -29729,14 +29823,22 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
       );
     }
   });
-  const state = await analyze(fnMap, resourcesMap, manifestXML, options);
-  reportMissingSymbols(state, options);
+  return {
+    ...await getFnMapAnalysis(fnMap, resourcesMap, manifestXML, options),
+    paths
+  };
+}
+async function getFnMapAnalysis(fnMap, resourcesMap, manifestXML, options) {
+  const state = await analyze(fnMap, resourcesMap, manifestXML, options, true);
+  if (Object.values(fnMap).every(({ ast }) => ast != null)) {
+    reportMissingSymbols(state, options);
+  }
   let typeMap = null;
-  if (state.config?.propagateTypes && state.config.trustDeclaredTypes && state.config.checkTypes !== "OFF" && Object.values(state.fnMap).every((ast) => ast != null)) {
+  if (state.config?.propagateTypes && state.config.trustDeclaredTypes && state.config.checkTypes !== "OFF") {
     const gistate = {
       state,
       stack: [],
-      typeChecker: state.config.typeCheckLevel?.toLowerCase() === "strict" ? subtypeOf : couldBeWeak,
+      typeChecker: state.config.strictTypeCheck?.toLowerCase() === "on" ? subtypeOf : couldBeWeak,
       checkTypes: state.config?.checkTypes || "WARNING"
     };
     state.pre = (node) => {
@@ -29765,14 +29867,17 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
       return null;
     };
     Object.values(state.fnMap).forEach((f) => {
-      collectNamespaces(f.ast, state);
+      f.ast && collectNamespaces(f.ast, state);
     });
     delete state.pre;
   }
-  if (state.diagnostics) {
-    await resolveDiagnosticsMap(state.diagnostics);
+  const diagnostics = state.diagnostics && await resolveDiagnosticsMap(state.diagnostics);
+  if (state.config?.checkBuildPragmas) {
+    Object.entries(fnMap).forEach(([name, f]) => {
+      pragmaChecker(state, f.ast, diagnostics?.[name]);
+    });
   }
-  return { fnMap, paths, state, typeMap };
+  return { fnMap, state, typeMap };
 }
 var defaultConfig, configOptionsToCheck;
 var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
@@ -29784,12 +29889,13 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
     init_launch();
     init_manifest();
     init_mc_rewrite();
+    init_pragma_checker();
     init_sdk_util();
     init_type_flow();
     init_could_be();
     init_interp();
     init_sub_type();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_worker_pool();
     init_optimizer_types();
     init_types();
@@ -29849,7 +29955,7 @@ async function performTask(task) {
     throw new Error(`Invalid task type ${type}`);
   }
   return Promise.resolve(handler(task.data)).then(
-    (result) => import_chunk_67LU4GPQ.logPromise.then(() => result)
+    (result) => import_chunk_OASVKTK5.logPromise.then(() => result)
   );
 }
 var workerTaskHandlers;
@@ -29859,7 +29965,7 @@ var init_worker_task = (0, import_chunk_ABYVSU2C.__esm)({
     init_optimizer();
     init_readprg();
     init_sdk_util();
-    (0, import_chunk_67LU4GPQ.init_logger)();
+    (0, import_chunk_OASVKTK5.init_logger)();
     workerTaskHandlers = {
       buildOptimizedProject(data) {
         return buildOptimizedProject(data.product, data.options);
@@ -29876,7 +29982,8 @@ var init_worker_task = (0, import_chunk_ABYVSU2C.__esm)({
           data.buildConfig,
           data.manifestXML,
           data.dependencyFiles,
-          data.config
+          data.config,
+          data.key
         );
       },
       optimizePrgAndDebug(data) {
@@ -30076,7 +30183,7 @@ async function optimizeProgram(filepath, devKey, output, config) {
 }
 function optimizeProgramBuffer(filepath, view, debugXml, apiDebugXml, key, config) {
   const { sections } = readPrgWithOffsets(view);
-  (0, import_chunk_67LU4GPQ.logger)("readprg", 5, sections);
+  (0, import_chunk_OASVKTK5.logger)("readprg", 5, sections);
   const symbolTable = new SymbolTable();
   if ((0, import_chunk_MBTLUWXR.hasProperty)(sections, 1461170197 .toString())) {
     symbolTable.parse(sections[
@@ -30376,7 +30483,7 @@ var init_readprg = (0, import_chunk_ABYVSU2C.__esm)({
     init_signer();
     init_symbols();
     init_sdk_util();
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_worker_pool();
   }
 });
@@ -30388,7 +30495,7 @@ function getSdkPath() {
   });
 }
 async function getDeviceInfo() {
-  const files = await (0, import_chunk_67LU4GPQ.globa)(`${connectiq}/Devices/*/compiler.json`);
+  const files = await (0, import_chunk_OASVKTK5.globa)(`${connectiq}/Devices/*/compiler.json`);
   if (!files.length) {
     throw new Error(
       `No devices found at '${connectiq}/Devices'. Check your sdk is correctly installed`
@@ -30456,7 +30563,7 @@ async function getFunctionDocumentation() {
 var isWin, appSupport, connectiq;
 var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   "src/sdk-util.ts"() {
-    (0, import_chunk_67LU4GPQ.init_util)();
+    (0, import_chunk_OASVKTK5.init_util)();
     init_xml_util();
     init_readprg();
     init_bytecode();
@@ -30504,6 +30611,7 @@ var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   getConfig,
   getDeviceInfo,
   getFileASTs,
+  getFnMapAnalysis,
   getFunctionDocumentation,
   getLanguages,
   getProjectAnalysis,