@markw65/monkeyc-optimizer 1.1.63 → 1.1.65

package/build/{chunk-Y2ZRISYL.cjs → chunk-MDTDXRQB.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_Y2ZRISYL_exports = {};
-__export(chunk_Y2ZRISYL_exports, {
+var chunk_MDTDXRQB_exports = {};
+__export(chunk_MDTDXRQB_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -37,6 +37,7 @@ __export(chunk_Y2ZRISYL_exports, {
   TruthyTypes: () => TruthyTypes,
   analyze: () => analyze,
   appSupport: () => appSupport,
+  buildConfigDescription: () => buildConfigDescription,
   buildOptimizedProject: () => buildOptimizedProject,
   checkCompilerVersion: () => checkCompilerVersion,
   collectNamespaces: () => collectNamespaces,
@@ -133,8 +134,8 @@ __export(chunk_Y2ZRISYL_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_Y2ZRISYL_exports);
-var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
+module.exports = __toCommonJS(chunk_MDTDXRQB_exports);
+var import_chunk_67LU4GPQ = require("./chunk-67LU4GPQ.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"));
@@ -5560,10 +5561,289 @@ var init_function_info = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_MBTLUWXR.init_ast)();
   }
 });
+var buildConfigDescription;
+var init_build_config = (0, import_chunk_ABYVSU2C.__esm)({
+  "src/build-config.ts"() {
+    "use strict";
+    buildConfigDescription = [
+      {
+        title: "Optimizer",
+        type: "object",
+        properties: {
+          outputPath: {
+            type: "string",
+            description: "Path to where the optimized project should be generated.",
+            default: "bin/optimized",
+            scope: "resource"
+          },
+          extraExcludes: {
+            type: "string",
+            markdownDescription: "[Semicolon separated list of excludeAnnotations to add or remove](https://github.com/markw65/monkeyc-optimizer/wiki/The-extraExcludes-Option)",
+            default: "",
+            scope: "resource"
+          },
+          ignoredExcludeAnnotations: {
+            type: "string",
+            description: "Semicolon separated list of excludeAnnotations to ignore, or `*' to ignore all",
+            default: "",
+            scope: "resource"
+          },
+          ignoredAnnotations: {
+            type: "string",
+            description: "Semicolon separated list of annotations to ignore, or `*' to ignore all",
+            default: "",
+            scope: "resource"
+          },
+          ignoredSourcePaths: {
+            type: "string",
+            description: "Regex of source paths to ignore.",
+            default: "",
+            scope: "resource"
+          },
+          typeCheckLevel: {
+            type: "string",
+            description: "Unless set to 'Default', overrides the corresponding `monkeyC' setting.",
+            taskDescription: "If present, overrides the corresponding `monkeyC' setting.",
+            launchDescription: "If present, overrides the corresponding `monkeyC' setting.",
+            default: "Off",
+            enum: ["Off", "Default", "Gradual", "Informative", "Strict"],
+            enumDescriptions: [
+              "Disable type checking",
+              "Inherit the Garmin Extension's typeCheckLevel",
+              "Type match failures are marked as errors, but ambiguity is ignored",
+              "Type match failures are marked as errors, and ambiguity is marked as a warning",
+              "Type match failures and ambiguity are marked as errors"
+            ],
+            scope: "resource"
+          },
+          checkInvalidSymbols: {
+            type: "string",
+            description: "Whether to check for invalid symbols, and how to report them",
+            enum: ["OFF", "INFO", "WARNING", "ERROR"],
+            enumDescriptions: [
+              "Disable checking",
+              "Generate INFO level diagnostics",
+              "Generate WARNING level diagnostics",
+              "Generate ERROR level diagnostics"
+            ],
+            default: "WARNING",
+            scope: "resource"
+          },
+          checkTypes: {
+            type: "string",
+            description: "Whether to check for type related issues, and how to report them",
+            enum: ["OFF", "INFO", "WARNING", "ERROR"],
+            enumDescriptions: [
+              "Disable checking",
+              "Generate INFO level diagnostics",
+              "Generate WARNING level diagnostics",
+              "Generate ERROR level diagnostics"
+            ],
+            default: "WARNING",
+            scope: "resource"
+          },
+          trustDeclaredTypes: {
+            order: 10,
+            type: "boolean",
+            markdownDescription: "[Whether to rely on type declarations when optimizing](https://github.com/markw65/monkeyc-optimizer/wiki/Type-and-Dataflow-analysis#trust-declared-types)",
+            default: true,
+            scope: "resource"
+          },
+          propagateTypes: {
+            order: 11,
+            type: "boolean",
+            markdownDescription: "[Whether to propagate type information, or process it locally](https://github.com/markw65/monkeyc-optimizer/wiki/Type-and-Dataflow-analysis#propagate-types)",
+            default: true,
+            scope: "resource"
+          },
+          sizeBasedPRE: {
+            order: 11,
+            type: "boolean",
+            markdownDescription: "[Whether to enable the size based partial redundancy pass](https://github.com/markw65/monkeyc-optimizer/wiki/Type-and-Dataflow-analysis#size-based-pre)",
+            default: true,
+            scope: "resource"
+          },
+          minimizeLocals: {
+            order: 12,
+            type: "boolean",
+            markdownDescription: "[Whether to enable the minimize locals pass](https://github.com/markw65/monkeyc-optimizer/wiki/Local-variable-elimination#minimize-locals)",
+            default: true,
+            scope: "resource"
+          },
+          singleUseCopyProp: {
+            order: 12,
+            type: "boolean",
+            markdownDescription: "[Whether to enable the single use copy propagation pass](https://github.com/markw65/monkeyc-optimizer/wiki/Local-variable-elimination#single-use-copy-propagation)",
+            default: true,
+            scope: "resource"
+          },
+          minimizeModules: {
+            order: 12,
+            type: "boolean",
+            markdownDescription: "[Whether to enable the minimize modules pass](https://github.com/markw65/monkeyc-optimizer/wiki/Optimizing-module-imports#minimize-modules)",
+            default: true,
+            scope: "resource"
+          },
+          iterateOptimizer: {
+            order: 12,
+            type: "boolean",
+            description: "Whether to keep running the optimizer pass until it makes no further changes (may be slow)",
+            default: false,
+            scope: "resource"
+          },
+          enforceStatic: {
+            type: "string",
+            description: "Whether to perform lookups in static methods as if they were invoked statically",
+            enum: ["NO", "YES"],
+            enumDescriptions: [
+              "Assume static functions may be invoked non-statically",
+              "Assume static functions will always be invoked statically"
+            ],
+            default: "YES",
+            scope: "resource"
+          },
+          compilerLookupRules: {
+            type: "string",
+            description: "Whether to perform lookups as compiler1, compiler2, or based on the currently selected sdk",
+            enum: ["COMPILER1", "COMPILER2", "DEFAULT"],
+            enumDescriptions: [
+              "Match compiler1's behavior when performing lookups",
+              "Match compiler2's behavior when performing lookups",
+              "Match the currently selected compiler's behavior"
+            ],
+            default: "DEFAULT",
+            scope: "resource"
+          },
+          checkCompilerLookupRules: {
+            type: "string",
+            description: "Whether to report differences in your code's behavior between compiler1 and compiler2",
+            enum: ["OFF", "INFO", "WARNING", "ERROR"],
+            enumDescriptions: [
+              "Disable checking",
+              "Generate INFO level diagnostics",
+              "Generate WARNING level diagnostics",
+              "Generate ERROR level diagnostics"
+            ],
+            default: "WARNING",
+            scope: "resource"
+          },
+          useLocalOptimizer: {
+            type: "boolean",
+            description: "Whether to use a locally installed @markw65/monkeyc-optimizer for builds",
+            default: true,
+            scope: "resource"
+          }
+        }
+      },
+      {
+        title: "Post Build Optimizer",
+        type: "object",
+        properties: {
+          postBuildOptimizer: {
+            title: "Enable",
+            order: 0,
+            type: "boolean",
+            description: "Whether to enable the post build optimizer",
+            default: false,
+            scope: "resource"
+          },
+          removeArgc: {
+            order: 1,
+            type: "boolean",
+            markdownDescription: "[Whether to remove argc bytecodes](https://github.com/markw65/monkeyc-optimizer/wiki/Post-Build-Optimizer#remove-argc). Does not apply to exports",
+            default: false,
+            scope: "resource"
+          },
+          allowForbiddenOpts: {
+            order: 2,
+            type: "boolean",
+            markdownDescription: "[Whether to perform optimizations no longer allowed on the app store](https://github.com/markw65/monkeyc-optimizer/wiki/Post-Build-Optimizer#allow-forbidden-optimizations). Always false for exports",
+            default: false,
+            scope: "resource"
+          },
+          postBuildPRE: {
+            order: 3,
+            type: "boolean",
+            markdownDescription: "Post Build Size based PRE [similar to the source-to-source pass](https://github.com/markw65/monkeyc-optimizer/wiki/Type-and-Dataflow-analysis#size-based-pre)",
+            default: true,
+            scope: "resource"
+          }
+        }
+      },
+      {
+        title: "OnlyTasks",
+        type: "object",
+        properties: {
+          device: {
+            type: "string",
+            taskDescription: "The device to build for. The special value `export' will do an iq build into bin/export, and the value `choose' will let you pick the device from a list",
+            launchDescription: "Device to run or 'choose' or '${command:GetTargetDevice}' to choose a new device each run.",
+            scope: "tasks_launch"
+          },
+          releaseBuild: {
+            type: "boolean",
+            taskDescription: "Is this a release build.",
+            launchDescription: "Run a release build.",
+            scope: "tasks_launch"
+          },
+          runTests: {
+            type: "boolean",
+            description: "run test cases.",
+            default: false,
+            scope: "launch"
+          },
+          jungleFiles: {
+            type: "string",
+            description: "If present, overrides the corresponding `monkeyC' setting.",
+            scope: "tasks_launch"
+          },
+          developerKeyPath: {
+            type: "string",
+            description: "If present, overrides the corresponding `monkeyC' setting.",
+            scope: "tasks_launch"
+          },
+          optimizationLevel: {
+            type: "string",
+            description: "If present, overrides the corresponding `monkeyC' setting.",
+            enum: ["None", "Basic", "Fast", "Slow"],
+            enumDescriptions: [
+              "No optimization",
+              "Basic optimizations for building in debug",
+              "Fast optimizations for building in release",
+              "Slow optimizations that need more time"
+            ],
+            scope: "tasks_launch"
+          },
+          compilerOptions: {
+            type: "string",
+            description: "If present, overrides the corresponding `monkeyC' setting.",
+            scope: "tasks_launch"
+          },
+          compilerWarnings: {
+            type: "boolean",
+            description: "If present, overrides the corresponding `monkeyC' setting.",
+            scope: "tasks_launch"
+          },
+          simulatorBuild: {
+            type: "boolean",
+            description: "Is this build for the simulator.",
+            scope: "tasks"
+          },
+          testBuild: {
+            type: "boolean",
+            description: "Is this a test build.",
+            scope: "tasks"
+          }
+        }
+      }
+    ];
+  }
+});
 var StateNodeAttributes;
 var init_optimizer_types = (0, import_chunk_ABYVSU2C.__esm)({
   "src/optimizer-types.ts"() {
     "use strict";
+    init_build_config();
     StateNodeAttributes = /* @__PURE__ */ ((StateNodeAttributes2) => {
       StateNodeAttributes2[StateNodeAttributes2["NONE"] = 0] = "NONE";
       StateNodeAttributes2[StateNodeAttributes2["PUBLIC"] = 1] = "PUBLIC";
@@ -7039,9 +7319,9 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
             );
           }
         } else {
-          (0, import_chunk_SG7ODKRM.forEach)(events, (e) => e.mayThrow = false);
+          (0, import_chunk_67LU4GPQ.forEach)(events, (e) => e.mayThrow = false);
         }
-        (0, import_chunk_SG7ODKRM.forEach)(events, (event) => {
+        (0, import_chunk_67LU4GPQ.forEach)(events, (event) => {
           if (event.mayThrow) {
             for (let i = localState.stack.length; i--; ) {
               const target = localState.stack[i].throw;
@@ -7186,7 +7466,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_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     Terminals = {
       BreakStatement: "break",
       ContinueStatement: "continue",
@@ -7216,12 +7496,12 @@ var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
         if (!from.succs) {
           from.succs = [to];
         } else {
-          (0, import_chunk_SG7ODKRM.pushUnique)(from.succs, to);
+          (0, import_chunk_67LU4GPQ.pushUnique)(from.succs, to);
         }
         if (!to.preds) {
           to.preds = [from];
         } else {
-          (0, import_chunk_SG7ODKRM.pushUnique)(to.preds, from);
+          (0, import_chunk_67LU4GPQ.pushUnique)(to.preds, from);
         }
       }
       newBlock(block) {
@@ -7575,8 +7855,8 @@ function mergeObjectValues(to, from) {
 function mergeStateDecls(to, from) {
   let changed = false;
   let result = to;
-  (0, import_chunk_SG7ODKRM.forEach)(from, (v) => {
-    if ((0, import_chunk_SG7ODKRM.some)(to, (t) => t === v)) {
+  (0, import_chunk_67LU4GPQ.forEach)(from, (v) => {
+    if ((0, import_chunk_67LU4GPQ.some)(to, (t) => t === v)) {
       return;
     }
     if (Array.isArray(result)) {
@@ -7743,7 +8023,7 @@ var init_union_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_data_flow();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_could_be();
     init_intersection_type();
     init_sub_type();
@@ -7758,7 +8038,7 @@ function expandTypedef(t) {
   );
   const tExpanded = cloneType(t);
   clearValuesUnder(tExpanded, 262144, true);
-  (0, import_chunk_SG7ODKRM.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
+  (0, import_chunk_67LU4GPQ.forEach)(decls, (decl) => unionInto(tExpanded, decl.resolvedType));
   return tExpanded;
 }
 function intersectEnum(t, e) {
@@ -7952,9 +8232,9 @@ function intersectionValue(pair) {
     case 4096:
     case 8192: {
       const common = [];
-      (0, import_chunk_SG7ODKRM.forEach)(
+      (0, import_chunk_67LU4GPQ.forEach)(
         pair.avalue,
-        (sna) => (0, import_chunk_SG7ODKRM.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
+        (sna) => (0, import_chunk_67LU4GPQ.some)(pair.bvalue, (snb) => sna === snb) && common.push(sna)
       );
       if (!common.length)
         return null;
@@ -7962,9 +8242,9 @@ function intersectionValue(pair) {
     }
     case 16384: {
       const common = [];
-      (0, import_chunk_SG7ODKRM.forEach)(pair.avalue, (sna) => {
+      (0, import_chunk_67LU4GPQ.forEach)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        (0, import_chunk_SG7ODKRM.forEach)(pair.bvalue, (snb) => {
+        (0, import_chunk_67LU4GPQ.forEach)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             common.push(sna);
           }
@@ -8210,7 +8490,7 @@ function restrictExactTypesByEquality(a, b) {
     }
     case 262144:
       return restrictByEquality(
-        (0, import_chunk_SG7ODKRM.reduce)(
+        (0, import_chunk_67LU4GPQ.reduce)(
           a.value,
           (cur, decl) => {
             unionInto(cur, decl.resolvedType);
@@ -8277,7 +8557,7 @@ var init_intersection_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_could_be();
     init_interp();
     init_types();
@@ -8391,14 +8671,14 @@ function subtypeOfValue(pair) {
     case 8192: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_SG7ODKRM.some)(asd, (sna) => (0, import_chunk_SG7ODKRM.some)(bsd, (snb) => sna === snb));
+      return (0, import_chunk_67LU4GPQ.some)(asd, (sna) => (0, import_chunk_67LU4GPQ.some)(bsd, (snb) => sna === snb));
     }
     case 16384: {
       const asd = pair.avalue;
       const bsd = pair.bvalue;
-      return (0, import_chunk_SG7ODKRM.every)(asd, (sna) => {
+      return (0, import_chunk_67LU4GPQ.every)(asd, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_SG7ODKRM.some)(bsd, (snb) => {
+        return (0, import_chunk_67LU4GPQ.some)(bsd, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -8434,7 +8714,7 @@ var init_sub_type = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_could_be();
     init_intersection_type();
     init_types();
@@ -8855,13 +9135,13 @@ function isTypeStateKey(decl) {
   return Array.isArray(decl) || decl.type !== "MemberDecl" && decl.type !== "Unknown";
 }
 function declIsLocal(decl) {
-  return (0, import_chunk_SG7ODKRM.some)(
+  return (0, import_chunk_67LU4GPQ.some)(
     decl,
     (d) => d.type === "BinaryExpression" || d.type === "Identifier" || d.type === "VariableDeclarator" && isLocal(d)
   );
 }
 function declIsNonLocal(decl) {
-  return (0, import_chunk_SG7ODKRM.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
+  return (0, import_chunk_67LU4GPQ.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d));
 }
 function localDeclName(decl) {
   if (Array.isArray(decl))
@@ -8874,12 +9154,12 @@ function localDeclName(decl) {
     case "VariableDeclarator":
       return variableDeclarationName(decl.node.id);
   }
-  throw new import_chunk_SG7ODKRM.AwaitedError(
+  throw new import_chunk_67LU4GPQ.AwaitedError(
     declFullName(decl).then((declStr) => `Invalid local decl: ${declStr}`)
   );
 }
 function tsKey(key) {
-  return `${(0, import_chunk_SG7ODKRM.map)(key, (k) => {
+  return `${(0, import_chunk_67LU4GPQ.map)(key, (k) => {
     if (k.type === "Literal") {
       return k.raw;
     } else if (isStateNode(k)) {
@@ -8898,7 +9178,7 @@ function sourceLocation(loc) {
   return loc ? `${loc.source || "??"}:${loc.start.line}:${loc.start.column}` : "??";
 }
 function printBlockHeader(block) {
-  (0, import_chunk_SG7ODKRM.log)(
+  (0, import_chunk_67LU4GPQ.log)(
     block.order,
     `(${block.node?.loc?.source || "??"}:${block.node?.loc?.start.line || "??"})`,
     `Preds: ${(block.preds || []).map((block2) => block2.order).join(", ")}`
@@ -8912,10 +9192,10 @@ function describeEvent(event) {
   ).then((desc) => `${event.type}: ${desc}`);
 }
 function printBlockEvents(block, extra) {
-  (0, import_chunk_SG7ODKRM.log)("Events:");
-  (0, import_chunk_SG7ODKRM.forEach)(
+  (0, import_chunk_67LU4GPQ.log)("Events:");
+  (0, import_chunk_67LU4GPQ.forEach)(
     block.events,
-    (event) => (0, import_chunk_SG7ODKRM.log)(
+    (event) => (0, import_chunk_67LU4GPQ.log)(
       describeEvent(event).then(
         (eventStr) => `    ${eventStr} ${extra ? extra(event) : ""}`
       )
@@ -8923,7 +9203,7 @@ function printBlockEvents(block, extra) {
   );
 }
 function printBlockTrailer(block) {
-  (0, import_chunk_SG7ODKRM.log)(
+  (0, import_chunk_67LU4GPQ.log)(
     `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
   );
 }
@@ -9055,7 +9335,7 @@ var init_type_flow_util = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_intersection_type();
     init_sub_type();
     init_types();
@@ -9109,7 +9389,7 @@ function calleeObjectType(istate, callee) {
 }
 function checkCallArgs(istate, node, callees, args) {
   const allDiags = [];
-  const resultType = (0, import_chunk_SG7ODKRM.reduce)(
+  const resultType = (0, import_chunk_67LU4GPQ.reduce)(
     callees,
     (result, cur) => {
       const curDiags = [];
@@ -9268,7 +9548,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_SG7ODKRM.some)(funcs, (func) => {
+    if (supers && (0, import_chunk_67LU4GPQ.some)(funcs, (func) => {
       if (func === cur)
         return false;
       const fcls = func.stack?.[func.stack.length - 1].sn;
@@ -9754,7 +10034,7 @@ var init_interp_call = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_optimizer_types();
     init_api();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_interp();
     init_sub_type();
     init_types();
@@ -10879,7 +11159,7 @@ function mustBeIdentical(a, b) {
   return false;
 }
 function isByteArrayData(objectData) {
-  return objectData.klass.value && (0, import_chunk_SG7ODKRM.every)(
+  return objectData.klass.value && (0, import_chunk_67LU4GPQ.every)(
     objectData.klass.value,
     (klass) => klass.fullName === "$.Toybox.Lang.ByteArray"
   );
@@ -10891,7 +11171,7 @@ var init_interp = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_data_flow();
     init_optimizer_types();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_could_be();
     init_interp_binary();
     init_interp_call();
@@ -11122,7 +11402,7 @@ function typeFromTypeStateNode(state, sn, classVsObj) {
           );
           if (value2) {
             const a = [];
-            (0, import_chunk_SG7ODKRM.forEach)(value2, (v) => {
+            (0, import_chunk_67LU4GPQ.forEach)(value2, (v) => {
               if (v !== sn)
                 a.push(v);
             });
@@ -11289,7 +11569,7 @@ function typeFromSingleTypeSpec(state, type, stack) {
       return {
         type: 512,
         value: type.elements.map(
-          (cur) => typeFromTypespec(state, cur)
+          (cur) => typeFromTypespec(state, cur, stack)
         )
       };
     }
@@ -11299,7 +11579,7 @@ function typeFromSingleTypeSpec(state, type, stack) {
         const prop = property;
         fields.set(
           objectLiteralKeyFromKeyExpr(prop.left),
-          typeFromTypespec(state, prop.right)
+          typeFromTypespec(state, prop.right, stack)
         );
       });
       return { type: 1024, value: fields };
@@ -11614,7 +11894,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_SG7ODKRM.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
+  const names = (v, fn) => (0, import_chunk_67LU4GPQ.map)(v, fn).sort().filter((s, i, arr) => !i || s !== arr[i - 1]).join(" or ");
   const parts = [];
   const displayOne = (tv) => {
     switch (tv.type) {
@@ -11815,7 +12095,7 @@ var init_types = (0, import_chunk_ABYVSU2C.__esm)({
     init_data_flow();
     init_api();
     (0, import_chunk_MBTLUWXR.init_ast)();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_interp();
     init_union_type();
     init_intersection_type();
@@ -11875,7 +12155,7 @@ function couldBeHelper(a, b, shallow) {
       262144
       /* Typedef */
     );
-    return typedef && (0, import_chunk_SG7ODKRM.some)(typedef, (td) => {
+    return typedef && (0, import_chunk_67LU4GPQ.some)(typedef, (td) => {
       if (!td.resolvedType) {
         throw new Error(`No resolved type for ${td.fullName} in 'couldBe'`);
       }
@@ -11947,15 +12227,15 @@ function couldBeValue(pair, shallow) {
     }
     case 4096:
     case 8192: {
-      return (0, import_chunk_SG7ODKRM.some)(
+      return (0, import_chunk_67LU4GPQ.some)(
         pair.avalue,
-        (sna) => (0, import_chunk_SG7ODKRM.some)(pair.bvalue, (snb) => sna === snb)
+        (sna) => (0, import_chunk_67LU4GPQ.some)(pair.bvalue, (snb) => sna === snb)
       );
     }
     case 16384: {
-      return (0, import_chunk_SG7ODKRM.some)(pair.avalue, (sna) => {
+      return (0, import_chunk_67LU4GPQ.some)(pair.avalue, (sna) => {
         const superA = getSuperClasses(sna);
-        return (0, import_chunk_SG7ODKRM.some)(pair.bvalue, (snb) => {
+        return (0, import_chunk_67LU4GPQ.some)(pair.bvalue, (snb) => {
           if (sna === snb || superA && superA.has(snb)) {
             return true;
           }
@@ -11988,7 +12268,7 @@ var init_could_be = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_api();
     init_data_flow();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_types();
   }
 });
@@ -12095,7 +12375,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
       }
       addAnt(curState.partiallyAnticipated, key, node);
       if (logThisRun) {
-        (0, import_chunk_SG7ODKRM.log)(
+        (0, import_chunk_67LU4GPQ.log)(
           `  antrefs: ${curState.partiallyAnticipated.get(key) !== false} ${curState.anticipated.get(key) !== false}`
         );
       }
@@ -12118,7 +12398,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_SG7ODKRM.log)(` - anticipated: ${tsKey(decl)}`));
+      curState.dead.forEach((decl) => (0, import_chunk_67LU4GPQ.log)(` - anticipated: ${tsKey(decl)}`));
     }
     if (top.events) {
       for (let i = top.events.length; i--; ) {
@@ -12130,12 +12410,12 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
           case "ref":
             if (isTypeStateKey(event.decl)) {
               if (logThisRun) {
-                (0, import_chunk_SG7ODKRM.log)(
+                (0, import_chunk_67LU4GPQ.log)(
                   describeEvent(event).then(
                     (eventStr) => `${eventStr} (${sourceLocation(event.node.loc)})`
                   )
                 );
-                (0, import_chunk_SG7ODKRM.log)(`  kill => ${tsKey(event.decl)}`);
+                (0, import_chunk_67LU4GPQ.log)(`  kill => ${tsKey(event.decl)}`);
               }
               copyPropRef(curState, event.decl, event.node);
               curState.dead.delete(event.decl);
@@ -12144,7 +12424,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_SG7ODKRM.log)(
+                (0, import_chunk_67LU4GPQ.log)(
                   describeEvent(event).then(
                     (eventStr) => `${eventStr} (${sourceLocation(event.node.loc)})`
                   )
@@ -12160,7 +12440,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
                   const pant = curState.partiallyAnticipated.get(event.decl);
                   if (pant) {
                     if (logThisRun) {
-                      (0, import_chunk_SG7ODKRM.log)(
+                      (0, import_chunk_67LU4GPQ.log)(
                         `  is copy-prop-candidate ${curState.anticipated?.get(event.decl) === pant}`
                       );
                     }
@@ -12192,7 +12472,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
               if (assignNode) {
                 curState.dead.add(event.decl);
                 if (logThisRun) {
-                  (0, import_chunk_SG7ODKRM.log)(`  anticipated => ${tsKey(event.decl)}`);
+                  (0, import_chunk_67LU4GPQ.log)(`  anticipated => ${tsKey(event.decl)}`);
                 }
               } else if (event.node.type === "UpdateExpression") {
                 copyPropRef(curState, event.decl, event.node.argument);
@@ -12203,7 +12483,7 @@ function findDeadStores(func, graph, nodeEquivs, findCopyPropCandidates, logThis
             if (isTypeStateKey(event.decl)) {
               curState.dead.add(event.decl);
               if (logThisRun) {
-                (0, import_chunk_SG7ODKRM.log)(`  anticipated => ${tsKey(event.decl)}`);
+                (0, import_chunk_67LU4GPQ.log)(`  anticipated => ${tsKey(event.decl)}`);
               }
             }
             break;
@@ -12266,9 +12546,9 @@ function eliminateDeadStores(state, func, graph, logThisRun) {
   if (!deadStores.size)
     return { changes: false, copyPropStores };
   if (logThisRun) {
-    (0, import_chunk_SG7ODKRM.log)("====== Dead Stores =====");
+    (0, import_chunk_67LU4GPQ.log)("====== Dead Stores =====");
     deadStores.forEach(
-      (dead) => (dead.type === "AssignmentExpression" || dead.type === "UpdateExpression" || dead.type === "VariableDeclarator") && (0, import_chunk_SG7ODKRM.log)(
+      (dead) => (dead.type === "AssignmentExpression" || dead.type === "UpdateExpression" || dead.type === "VariableDeclarator") && (0, import_chunk_67LU4GPQ.log)(
         formatAst(dead).then(
           (deadStr) => `${deadStr} (${sourceLocation(dead.loc)})`
         )
@@ -12323,7 +12603,7 @@ var init_dead_store = (0, import_chunk_ABYVSU2C.__esm)({
     init_control_flow();
     init_data_flow();
     init_inliner();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_minimize_locals();
     init_type_flow_util();
   }
@@ -12688,13 +12968,13 @@ function typeStateEntry(value2, key) {
   return `${tsKey(key)} = ${display(value2.curType)}`;
 }
 function printBlockState(block, state, indent = "") {
-  (0, import_chunk_SG7ODKRM.log)(indent + "State:");
+  (0, import_chunk_67LU4GPQ.log)(indent + "State:");
   if (!state) {
-    (0, import_chunk_SG7ODKRM.log)(indent + "Not visited!");
+    (0, import_chunk_67LU4GPQ.log)(indent + "Not visited!");
     return;
   }
   state.map.forEach((value2, key) => {
-    (0, import_chunk_SG7ODKRM.log)(
+    (0, import_chunk_67LU4GPQ.log)(
       `${indent} - ${typeStateEntry(value2, key)}${value2.equivSet ? ` [(${Array.from(value2.equivSet).map(tsKey).join(", ")})]` : ""}`
     );
   });
@@ -12901,7 +13181,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                   type: 0
                   /* Never */
                 };
-                (0, import_chunk_SG7ODKRM.forEach)(avalue, (v) => unionInto(n, v));
+                (0, import_chunk_67LU4GPQ.forEach)(avalue, (v) => unionInto(n, v));
                 next = n;
               }
             } else {
@@ -13006,7 +13286,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_SG7ODKRM.some)(
+        if (baseObj && baseObj.klass.type === 16384 && (0, import_chunk_67LU4GPQ.some)(
           baseObj.klass.value,
           (cls) => cls === selfClassDecl || getSuperClasses(cls)?.has(selfClassDecl) || getSuperClasses(selfClassDecl)?.has(cls) || false
         )) {
@@ -13051,7 +13331,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     return [cur, updateAny];
   }
   function typeConstraint(decls, blockState) {
-    return (0, import_chunk_SG7ODKRM.reduce)(
+    return (0, import_chunk_67LU4GPQ.reduce)(
       decls,
       (cur, decl) => {
         if (decl.type === "Identifier" || decl.type === "BinaryExpression") {
@@ -13147,9 +13427,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     stack: [],
     func
   };
-  const modifiableDecl = (decls, callees) => (0, import_chunk_SG7ODKRM.some)(
+  const modifiableDecl = (decls, callees) => (0, import_chunk_67LU4GPQ.some)(
     decls,
-    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_SG7ODKRM.some)(callees, (callee) => functionMayModify(state, callee, decl)))
+    (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl) && (!callees || (0, import_chunk_67LU4GPQ.some)(callees, (callee) => functionMayModify(state, callee, decl)))
   );
   const mergeSuccState = (top, curState) => {
     top.succs?.forEach((succ) => {
@@ -13158,7 +13438,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       if (mergeTypeState(blockStates, succ.order, curState, nodeCopyProp)) {
         if (logThisRun) {
-          (0, import_chunk_SG7ODKRM.log)(`re-merge: ${top.order} -> ${succ.order}`);
+          (0, import_chunk_67LU4GPQ.log)(`re-merge: ${top.order} -> ${succ.order}`);
         }
         queue.enqueue(succ);
       }
@@ -13168,7 +13448,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     const calleeObj = getStateType(curState, calleeObjDecl);
     let calleeResult = null;
     let effectFree = true;
-    (0, import_chunk_SG7ODKRM.forEach)(callees, (callee) => {
+    (0, import_chunk_67LU4GPQ.forEach)(callees, (callee) => {
       const info = sysCallInfo(istate.state, callee);
       if (!info) {
         effectFree = false;
@@ -13445,7 +13725,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       });
     } else {
       if (logThisRun) {
-        (0, import_chunk_SG7ODKRM.log)(`  Flow (true): merge to ${trueSucc.order || -1}`);
+        (0, import_chunk_67LU4GPQ.log)(`  Flow (true): merge to ${trueSucc.order || -1}`);
         printBlockState(top, sTrue || curState, "    >true ");
       }
       if (mergeTypeState(
@@ -13455,7 +13735,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         nodeCopyProp
       )) {
         if (logThisRun) {
-          (0, import_chunk_SG7ODKRM.log)(`re-merge: ${top.order} -> ${trueSucc.order}`);
+          (0, import_chunk_67LU4GPQ.log)(`re-merge: ${top.order} -> ${trueSucc.order}`);
         }
         queue.enqueue(trueSucc);
       }
@@ -13467,7 +13747,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       });
     } else {
       if (logThisRun) {
-        (0, import_chunk_SG7ODKRM.log)(`  Flow (false): merge to: ${falseSucc.order || -1}`);
+        (0, import_chunk_67LU4GPQ.log)(`  Flow (false): merge to: ${falseSucc.order || -1}`);
         printBlockState(top, sFalse || curState, "    >false ");
       }
       if (mergeTypeState(
@@ -13477,7 +13757,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         nodeCopyProp
       )) {
         if (logThisRun) {
-          (0, import_chunk_SG7ODKRM.log)(`re-merge: ${top.order} -> ${falseSucc.order}`);
+          (0, import_chunk_67LU4GPQ.log)(`re-merge: ${top.order} -> ${falseSucc.order}`);
         }
         queue.enqueue(falseSucc);
       }
@@ -13552,7 +13832,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           }
         }
         if (logThisRun) {
-          (0, import_chunk_SG7ODKRM.log)(
+          (0, import_chunk_67LU4GPQ.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} == ${display(curEntry.curType)}`
             )
@@ -13562,7 +13842,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       }
       case "mod": {
         if (logThisRun) {
-          (0, import_chunk_SG7ODKRM.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
+          (0, import_chunk_67LU4GPQ.log)(describeEvent(event).then((eventStr) => `  ${eventStr}`));
         }
         modInterference(curState, event, true, (callees, calleeObj) => {
           clearRelatedCopyPropEvents(curState, null, nodeCopyProp);
@@ -13578,7 +13858,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               );
             }
           }
-          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_SG7ODKRM.some)(callees, (callee) => inlineRequested(state, callee))) {
+          if (nodeCopyProp.size && event.node.type === "CallExpression" && (0, import_chunk_67LU4GPQ.some)(callees, (callee) => inlineRequested(state, callee))) {
             event.node.arguments.forEach((arg) => {
               const def = nodeCopyProp.get(arg);
               if (def && nodeCopyProp.get(def) !== false) {
@@ -13590,7 +13870,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_SG7ODKRM.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
+            if ((type.value == null || !(type.type & (32768 | 512 | 1024))) && !(0, import_chunk_67LU4GPQ.some)(decl, (d) => d.type === "VariableDeclarator" && !isLocal(d))) {
               return;
             }
             if (modifiableDecl(decl, callees)) {
@@ -13605,7 +13885,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_SG7ODKRM.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
+            } else if (type.type & (32768 | 512 | 1024) && (calleeEffects == null ? calleeEffects = !callees || !(0, import_chunk_67LU4GPQ.every)(callees, (callee) => callee.info === false) : calleeEffects)) {
               if (type.value != null && type.type & 32768) {
                 const odata = getObjectValue(tsv.curType);
                 if (odata?.obj) {
@@ -13673,7 +13953,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           2
           /* Reassign */
         );
-        (0, import_chunk_SG7ODKRM.some)(event.decl, (decl) => {
+        (0, import_chunk_67LU4GPQ.some)(event.decl, (decl) => {
           if (decl.type !== "VariableDeclarator" || decl.node.kind !== "var" || !isClassVariable(decl)) {
             return false;
           }
@@ -13681,7 +13961,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           if (affected) {
             const objType = typeFromTypeStateNodes(
               istate.state,
-              (0, import_chunk_SG7ODKRM.map)(
+              (0, import_chunk_67LU4GPQ.map)(
                 event.decl,
                 (decl2) => decl2.type === "VariableDeclarator" && decl2.stack[decl2.stack.length - 1].sn
               ).filter(
@@ -13702,7 +13982,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         });
         if (wasComputedDecl) {
           curState.map.forEach((value2, decls) => {
-            if ((0, import_chunk_SG7ODKRM.some)(
+            if ((0, import_chunk_67LU4GPQ.some)(
               decls,
               (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && !isLocal(decl)
             )) {
@@ -13748,14 +14028,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_SG7ODKRM.some)(
+                  (0, import_chunk_67LU4GPQ.some)(
                     event2.calleeDecl,
                     (callee) => callee.type === "FunctionDeclaration" && inlineRequested(state, callee)
                   )) {
                     return false;
                   }
                 }
-                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_SG7ODKRM.some)(
+                if (!event2.decl || isTypeStateKey(event2.decl) && (0, import_chunk_67LU4GPQ.some)(
                   event2.decl,
                   (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" || decl.type === "BinaryExpression" || decl.type === "Identifier"
                 )) {
@@ -13794,13 +14074,13 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           }
         }
         if (uninitClassDecls?.size) {
-          (0, import_chunk_SG7ODKRM.forEach)(
+          (0, import_chunk_67LU4GPQ.forEach)(
             event.decl,
             (decl) => uninitClassDecls.has(decl) && curState.inited?.add(decl)
           );
         }
         if (logThisRun) {
-          (0, import_chunk_SG7ODKRM.log)(
+          (0, import_chunk_67LU4GPQ.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} := ${display(type)}`
             )
@@ -13818,7 +14098,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           );
         }
         if (logThisRun) {
-          (0, import_chunk_SG7ODKRM.log)(
+          (0, import_chunk_67LU4GPQ.log)(
             describeEvent(event).then(
               (eventStr) => `  ${eventStr} : ${!Array.isArray(event.left) && event.left.type === "MemberDecl" ? `${display(
                 curState.map.get(event.left.base)?.curType || {
@@ -13876,8 +14156,8 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     }
     if (!successorsHandled) {
       if (logThisRun) {
-        (0, import_chunk_SG7ODKRM.log)(
-          `  merge to: ${(0, import_chunk_SG7ODKRM.map)(
+        (0, import_chunk_67LU4GPQ.log)(
+          `  merge to: ${(0, import_chunk_67LU4GPQ.map)(
             top.succs,
             (succ) => succ.order || -1
           ).join(", ")}`
@@ -13908,17 +14188,17 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
       );
       printBlockTrailer(block);
     });
-    (0, import_chunk_SG7ODKRM.log)("====== TypeMap =====");
+    (0, import_chunk_67LU4GPQ.log)("====== TypeMap =====");
     typeMap.forEach((value2, key) => {
-      (0, import_chunk_SG7ODKRM.log)(
+      (0, import_chunk_67LU4GPQ.log)(
         formatAst(key).then(
           (keyStr) => `${keyStr} = ${display(value2)} ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
         )
       );
     });
-    (0, import_chunk_SG7ODKRM.log)("====== EquivMap =====");
+    (0, import_chunk_67LU4GPQ.log)("====== EquivMap =====");
     nodeEquivs.forEach((value2, key) => {
-      (0, import_chunk_SG7ODKRM.log)(
+      (0, import_chunk_67LU4GPQ.log)(
         formatAst(key).then(
           (keyStr) => `${keyStr} = [${value2.equiv.map(
             (equiv) => tsKey(equiv)
@@ -13926,7 +14206,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         )
       );
     });
-    (0, import_chunk_SG7ODKRM.log)("====== Copy Prop =====");
+    (0, import_chunk_67LU4GPQ.log)("====== Copy Prop =====");
     nodeCopyProp.forEach((value2, key) => {
       (0, import_node_assert3.default)(value2 !== false);
       if (key.type === "VariableDeclarator" || key.type === "AssignmentExpression") {
@@ -13936,7 +14216,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_SG7ODKRM.log)(
+      (0, import_chunk_67LU4GPQ.log)(
         formatAst(key).then(
           (keyStr) => formatAstLongLines(node).then(
             (nodeStr) => `${keyStr} = [${nodeStr}] ${key.loc && key.loc.source ? ` (${sourceLocation(key.loc)})` : ""}`
@@ -13946,10 +14226,10 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     });
   }
   if (logThisRun) {
-    (0, import_chunk_SG7ODKRM.log)(formatAstLongLines(func.node));
+    (0, import_chunk_67LU4GPQ.log)(formatAstLongLines(func.node));
     if (copyPropStores) {
       copyPropStores.forEach(({ ref, ant }, node) => {
-        (0, import_chunk_SG7ODKRM.log)(
+        (0, import_chunk_67LU4GPQ.log)(
           formatAstLongLines(node).then(
             (nodeStr) => `copy-prop-store: ${nodeStr}${ant ? "!" : ""} => ${nodeCopyProp.get(node) !== ref ? "Failed" : "Success"}`
           )
@@ -13963,9 +14243,9 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
     }
     if (logThisRun) {
       if (selfAssignments.size) {
-        (0, import_chunk_SG7ODKRM.log)("====== Self Assignments =====");
+        (0, import_chunk_67LU4GPQ.log)("====== Self Assignments =====");
         selfAssignments.forEach(
-          (self) => (0, import_chunk_SG7ODKRM.log)(
+          (self) => (0, import_chunk_67LU4GPQ.log)(
             formatAst(self).then(
               (selfStr) => `${selfStr} (${sourceLocation(self.loc)})`
             )
@@ -14030,7 +14310,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         if (copyNode) {
           if (node.type === "AssignmentExpression") {
             if (logThisRun) {
-              (0, import_chunk_SG7ODKRM.log)(
+              (0, import_chunk_67LU4GPQ.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => `Killing copy-prop assignment ${nodeStr}`
                 )
@@ -14045,7 +14325,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
           if (node.type === "VariableDeclarator") {
             (0, import_node_assert3.default)(node.init);
             if (logThisRun) {
-              (0, import_chunk_SG7ODKRM.log)(
+              (0, import_chunk_67LU4GPQ.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => `Killing copy-prop variable initialization ${nodeStr}`
                 )
@@ -14066,7 +14346,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               right: copyNode.right
             };
             if (logThisRun) {
-              (0, import_chunk_SG7ODKRM.log)(
+              (0, import_chunk_67LU4GPQ.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => formatAstLongLines(replacement2).then(
                     (repStr) => `copy-prop ${nodeStr} => ${repStr}`
@@ -14079,7 +14359,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
             const init = copyNode.init;
             (0, import_node_assert3.default)(init);
             if (logThisRun) {
-              (0, import_chunk_SG7ODKRM.log)(
+              (0, import_chunk_67LU4GPQ.log)(
                 formatAstLongLines(node).then(
                   (nodeStr) => formatAstLongLines(init).then(
                     (initStr) => `copy-prop ${nodeStr} => ${initStr}`
@@ -14093,7 +14373,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         }
         if (selfAssignments.has(node)) {
           if (logThisRun) {
-            (0, import_chunk_SG7ODKRM.log)(
+            (0, import_chunk_67LU4GPQ.log)(
               formatAst(node).then(
                 (nodeStr) => `Deleting self assignment: ${nodeStr} (${sourceLocation(
                   node.loc
@@ -14137,7 +14417,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         }, curInfo);
         if (rep === curInfo)
           return null;
-        const name = (0, import_chunk_SG7ODKRM.reduce)(
+        const name = (0, import_chunk_67LU4GPQ.reduce)(
           rep.decl,
           (cur, decl) => decl.type === "VariableDeclarator" ? decl.name : cur,
           null
@@ -14145,7 +14425,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         if (!name)
           return null;
         if (logThisRun) {
-          (0, import_chunk_SG7ODKRM.log)(
+          (0, import_chunk_67LU4GPQ.log)(
             formatAst(node).then(
               (nodeStr) => `Replacing ${nodeStr} with ${name} at ${sourceLocation(
                 node.loc
@@ -14276,7 +14556,7 @@ var init_type_flow = (0, import_chunk_ABYVSU2C.__esm)({
     init_type_flow_util();
     init_types();
     init_union_type();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     logging = true;
     missingNullWorkaround = true;
   }
@@ -14328,9 +14608,9 @@ function minimizeLocals(state, func) {
   if (!didMerge)
     return;
   if (logThisRun) {
-    (0, import_chunk_SG7ODKRM.log)(`>>> Merging locals in ${func.fullName}`);
+    (0, import_chunk_67LU4GPQ.log)(`>>> Merging locals in ${func.fullName}`);
     merge.forEach(
-      (merged) => merged.length > 1 && (0, import_chunk_SG7ODKRM.log)(` - merging ${merged.map((k) => tsKey(k)).join(" | ")}`)
+      (merged) => merged.length > 1 && (0, import_chunk_67LU4GPQ.log)(` - merging ${merged.map((k) => tsKey(k)).join(" | ")}`)
     );
   }
   const remap = /* @__PURE__ */ new Map();
@@ -14600,7 +14880,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_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_variable_renamer();
     init_type_flow_util();
   }
@@ -14611,12 +14891,12 @@ function logAntState(s, decl) {
       defs2++;
     return defs2;
   }, 0);
-  (0, import_chunk_SG7ODKRM.log)(
+  (0, import_chunk_67LU4GPQ.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_SG7ODKRM.log)(
+  (0, import_chunk_67LU4GPQ.log)(
     `    - members: ${Array.from(s.members).map(([block, live]) => block.order + (live ? "t" : "f")).join(", ")}`
   );
 }
@@ -14633,7 +14913,7 @@ async function sizeBasedPRE(state, func) {
   const candidates = computeAttributes(state, head);
   if (candidates) {
     if (logging2) {
-      (0, import_chunk_SG7ODKRM.log)(`Found ${candidates.size} candidates in ${func.fullName}`);
+      (0, import_chunk_67LU4GPQ.log)(`Found ${candidates.size} candidates in ${func.fullName}`);
       logAntDecls(candidates);
     }
     const nodeMap = /* @__PURE__ */ new Map();
@@ -14726,7 +15006,7 @@ function buildPREGraph(state, func) {
       const event = block.events[i];
       switch (event.type) {
         case "ref":
-          if ((0, import_chunk_SG7ODKRM.some)(
+          if ((0, import_chunk_67LU4GPQ.some)(
             event.decl,
             (decl) => decl.type === "Literal" || decl.type === "VariableDeclarator" && decl.node.kind === "const"
           )) {
@@ -14744,7 +15024,7 @@ function buildPREGraph(state, func) {
           defs.add(event.decl);
           break;
         case "mod":
-          if (event.callees && (0, import_chunk_SG7ODKRM.every)(event.callees, (callee) => callee.info === false)) {
+          if (event.callees && (0, import_chunk_67LU4GPQ.every)(event.callees, (callee) => callee.info === false)) {
             block.events.splice(i, 1);
             break;
           }
@@ -14903,21 +15183,21 @@ function computeAttributes(state, head) {
   });
   if (logging2) {
     order.forEach((block) => {
-      (0, import_chunk_SG7ODKRM.log)(
+      (0, import_chunk_67LU4GPQ.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_SG7ODKRM.log)(
+          (event) => event.type !== "exn" && (0, import_chunk_67LU4GPQ.log)(
             Promise.resolve(
               event.decl ? declFullName(event.decl) : event.node ? formatAst(event.node) : "??"
             ).then((eventDetails) => `    ${event.type}: ${eventDetails}`)
           )
         );
       }
-      (0, import_chunk_SG7ODKRM.log)(
+      (0, import_chunk_67LU4GPQ.log)(
         `Succs: ${(block.succs || []).map((block2) => block2.order).join(", ")} ExSucc: ${block.exsucc ? block.exsucc.order : ""}`
       );
     });
@@ -14985,7 +15265,7 @@ function computeAttributes(state, head) {
           }
           case "mod": {
             curState.forEach((candidates, decls) => {
-              if ((0, import_chunk_SG7ODKRM.some)(
+              if ((0, import_chunk_67LU4GPQ.some)(
                 decls,
                 (decl) => decl.type === "VariableDeclarator" && decl.node.kind === "var" && candidates.live && (!event.callees || event.callees.some(
                   (callee) => functionMayModify(state, callee, decl)
@@ -15027,7 +15307,7 @@ function computeAttributes(state, head) {
     }
     blockStates[top.order] = curState;
     if (logging2) {
-      (0, import_chunk_SG7ODKRM.log)(`Updated block ${top.order}`);
+      (0, import_chunk_67LU4GPQ.log)(`Updated block ${top.order}`);
       logAntDecls(curState);
     }
     if (top.preds) {
@@ -15129,7 +15409,7 @@ function applyReplacements(func, nodeMap, declMap) {
             }
             const name = declMap.get(event.decl);
             if (!name) {
-              throw new import_chunk_SG7ODKRM.AwaitedError(
+              throw new import_chunk_67LU4GPQ.AwaitedError(
                 formatAst(node).then(
                   (targetStr) => `No replacement found for "${targetStr}"`
                 )
@@ -15151,7 +15431,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_SG7ODKRM.AwaitedError(
+              throw new import_chunk_67LU4GPQ.AwaitedError(
                 formatAst(target).then(
                   (targetStr) => `No replacement found for "${targetStr}"`
                 )
@@ -15214,14 +15494,14 @@ function applyReplacements(func, nodeMap, declMap) {
           const decl = event.decl;
           const name = declMap.get(decl);
           if (!name) {
-            throw new import_chunk_SG7ODKRM.AwaitedError(
+            throw new import_chunk_67LU4GPQ.AwaitedError(
               declFullName(decl).then(
                 (declStr) => `No replacement found for "${declStr}"`
               )
             );
           }
           if (!event.id) {
-            throw new import_chunk_SG7ODKRM.AwaitedError(
+            throw new import_chunk_67LU4GPQ.AwaitedError(
               declFullName(decl).then(
                 (declStr) => `Missing id for mod event for "${declStr}"`
               )
@@ -15286,7 +15566,7 @@ var init_pre = (0, import_chunk_ABYVSU2C.__esm)({
     init_data_flow();
     init_function_info();
     init_minimize_locals();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     logging2 = false;
     LocalRefCost = 2;
   }
@@ -15657,7 +15937,7 @@ function beforeEvaluate(istate, node) {
           break;
         }
         const id = node.right.argument;
-        if ((0, import_chunk_SG7ODKRM.every)(left.value.value, (m) => {
+        if ((0, import_chunk_67LU4GPQ.every)(left.value.value, (m) => {
           if ((0, import_chunk_MBTLUWXR.hasProperty)(m.decls, id.name))
             return false;
           return istate.state.lookup({
@@ -16103,7 +16383,7 @@ var init_optimize = (0, import_chunk_ABYVSU2C.__esm)({
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_inliner();
     init_type_flow();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_interp();
     init_interp_binary();
     init_types();
@@ -16640,13 +16920,13 @@ function markFunctionCalled(state, func) {
     state.calledFunctions[func.id.name] = [func];
     return;
   }
-  (0, import_chunk_SG7ODKRM.pushUnique)(state.calledFunctions[func.id.name], func);
+  (0, import_chunk_67LU4GPQ.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_SG7ODKRM.AwaitedError) {
+    if (ex instanceof import_chunk_67LU4GPQ.AwaitedError) {
       await ex.resolve();
     }
     throw ex;
@@ -17383,7 +17663,7 @@ var init_mc_rewrite = (0, import_chunk_ABYVSU2C.__esm)({
     init_sub_type();
     init_types();
     init_unused_exprs();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_variable_renamer();
     init_data_flow();
   }
@@ -17612,7 +17892,9 @@ function add_resources_to_ast(state, ast, resources, manifestXML) {
     const hiddenRez = makeModule("*Rez*");
     rez.body.body.push(hiddenRez);
     if (barrel === "" && manifestXML && manifestXML.body instanceof xml_util_exports.Nodes) {
-      manifestXML.body.children("iq:application").elements.forEach((e) => add_one_resource(state, manifestXML, rez, e));
+      manifestXML.body.children("iq:application").elements.forEach(
+        (e) => add_one_resource(state, manifestXML, rez, e, "")
+      );
     }
     const rezModules = Object.fromEntries(
       Object.entries(modules).map(([moduleName, isPublic]) => {
@@ -17630,7 +17912,7 @@ function add_resources_to_ast(state, ast, resources, manifestXML) {
         if (!(0, import_chunk_MBTLUWXR.hasProperty)(rezModules, s))
           return;
         const module2 = rezModules[s];
-        add_one_resource(state, rez2, module2, e);
+        add_one_resource(state, rez2, module2, e, barrel);
       });
     });
   });
@@ -17646,11 +17928,14 @@ function addPositions(base, pos) {
   result.offset += pos.offset;
   return result;
 }
-function visit_resource_refs(state, doc, e) {
+function visit_resource_refs(state, doc, e, barrel) {
   const result = [];
   const parseArg = (name, loc, skip) => {
     if (name.startsWith("@")) {
       name = name.substring(1);
+      if (barrel && name.startsWith(barrel) && name[barrel.length] === ".") {
+        name = name.slice(barrel.length + 1);
+      }
       loc = (0, import_chunk_MBTLUWXR.adjustLoc)(loc, 1, 0);
     }
     if ((0, import_chunk_MBTLUWXR.hasProperty)(skip, name) || /^\d+(\.\d+)?%?$/.test(name)) {
@@ -17707,18 +17992,27 @@ function visit_resource_refs(state, doc, e) {
     }
     if (id === "personality") {
       const elems = dotted.match(/\s+|\S+/g);
-      elems?.reduce((offset, name) => {
-        const end = offset + name.length;
-        if (!/\s/.test(name)) {
+      elems?.reduce((loc, name) => {
+        if (/\s/.test(name)) {
+          const newLines = name.match(/\r\n|[\r\n]/g);
+          if (newLines?.length) {
+            loc.start.line += newLines.length;
+            loc.start.column = 1;
+            loc.start.offset += name.length;
+            name = name.replace(/^.*(\r\n|[\r\n])(.*)$/, "$2");
+            loc.start.offset -= name.length;
+          }
+        } else {
           const base = (0, import_chunk_MBTLUWXR.makeScopedName)(`Rez.Styles`);
-          const id2 = (0, import_chunk_MBTLUWXR.makeIdentifier)(
-            name,
-            (0, import_chunk_MBTLUWXR.adjustLoc)(l, offset, end - dotted.length)
-          );
+          const idLoc = (0, import_chunk_MBTLUWXR.adjustLoc)(loc, 0, 0);
+          idLoc.end = { ...idLoc.start };
+          idLoc.end.column += name.length;
+          idLoc.end.offset += name.length;
+          const id2 = (0, import_chunk_MBTLUWXR.makeIdentifier)(name, idLoc);
           result.push((0, import_chunk_MBTLUWXR.makeMemberExpression)((0, import_chunk_MBTLUWXR.withLoc)(base, id2, false), id2));
         }
-        return end;
-      }, 0);
+        return (0, import_chunk_MBTLUWXR.adjustLoc)(loc, name.length, 0);
+      }, (0, import_chunk_MBTLUWXR.adjustLoc)(l, 0, 0));
       return;
     }
     if (/^\s*(true|false|null|NaN|(0x|#)[0-9a-f]+|[-+]?\d+%?)\s*$/i.test(dotted)) {
@@ -17792,7 +18086,7 @@ function visit_resource_refs(state, doc, e) {
   });
   return result;
 }
-function add_one_resource(state, doc, module2, e) {
+function add_one_resource(state, doc, module2, e, barrel) {
   let id;
   let func;
   const makeVarDecl = (id2, outer) => {
@@ -17956,7 +18250,7 @@ function add_one_resource(state, doc, module2, e) {
   }
   if (!func)
     return;
-  const elements = visit_resource_refs(state, doc, e);
+  const elements = visit_resource_refs(state, doc, e, barrel);
   const startLoc = elements[0]?.loc;
   const endLoc = elements[elements.length - 1]?.loc;
   const init = elements.length ? (0, import_chunk_MBTLUWXR.wrap)(
@@ -18264,7 +18558,7 @@ async function getApiMapping(state, resourcesMap, manifestXML) {
       throw `Negative constant ${fixup} was not a Literal`;
     }
     if (typeof init.value !== "number") {
-      (0, import_chunk_SG7ODKRM.log)(`Negative fixup ${fixup} was not a number!`);
+      (0, import_chunk_67LU4GPQ.log)(`Negative fixup ${fixup} was not a number!`);
     } else if (init.value > 0) {
       init.value = -init.value;
       init.raw = "-" + init.raw;
@@ -18354,11 +18648,11 @@ function sameStateNodeDecl(a, b) {
 function sameLookupDefinition(a, b) {
   return (
     // sameStateNodeDecl(a.parent, b.parent) &&
-    (0, import_chunk_SG7ODKRM.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
+    (0, import_chunk_67LU4GPQ.sameArrays)(a.results, b.results, (ar, br) => sameStateNodeDecl(ar, br))
   );
 }
 function sameLookupResult(a, b) {
-  return (0, import_chunk_SG7ODKRM.sameArrays)(a, b, sameLookupDefinition);
+  return (0, import_chunk_67LU4GPQ.sameArrays)(a, b, sameLookupDefinition);
 }
 function declKey(decl) {
   return isStateNode(decl) ? decl.type === "ModuleDeclaration" ? decl.fullName : decl.node : decl;
@@ -18896,7 +19190,7 @@ function stateFuncs() {
                     if (!(0, import_chunk_MBTLUWXR.hasProperty)(this.index, name)) {
                       this.index[name] = [];
                     }
-                    (0, import_chunk_SG7ODKRM.pushUnique)(this.index[name], parent);
+                    (0, import_chunk_67LU4GPQ.pushUnique)(this.index[name], parent);
                   }
                 });
                 break;
@@ -18951,7 +19245,7 @@ function stateFuncs() {
                   if (!(0, import_chunk_MBTLUWXR.hasProperty)(values, name)) {
                     values[name] = [];
                   }
-                  if ((0, import_chunk_SG7ODKRM.pushUnique)(values[name], m) && currentEnum) {
+                  if ((0, import_chunk_67LU4GPQ.pushUnique)(values[name], m) && currentEnum) {
                     if (!this.enumMap)
                       this.enumMap = /* @__PURE__ */ new Map();
                     this.enumMap.set(m, currentEnum);
@@ -18959,7 +19253,7 @@ function stateFuncs() {
                   if (!(0, import_chunk_MBTLUWXR.hasProperty)(this.index, name)) {
                     this.index[name] = [];
                   }
-                  (0, import_chunk_SG7ODKRM.pushUnique)(this.index[name], parent);
+                  (0, import_chunk_67LU4GPQ.pushUnique)(this.index[name], parent);
                 });
                 break;
               }
@@ -19460,7 +19754,7 @@ var init_api = (0, import_chunk_ABYVSU2C.__esm)({
     init_sdk_util();
     init_type_flow_util();
     init_types();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_visitor();
   }
 });
@@ -19544,7 +19838,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_SG7ODKRM.AwaitedError(
+      throw new import_chunk_67LU4GPQ.AwaitedError(
         declFullName(canon).then(
           (canonStr) => `Canonical representation of ${canonStr} did not match`
         )
@@ -19578,7 +19872,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
     }
     const decl = lookupDefToDecl(results);
     if (decl && path7.length) {
-      if (wantsAllRefs && (0, import_chunk_SG7ODKRM.every)(
+      if (wantsAllRefs && (0, import_chunk_67LU4GPQ.every)(
         decl,
         (d) => d.type === "VariableDeclarator" || d.type === "BinaryExpression" || d.type === "Identifier"
       )) {
@@ -19630,7 +19924,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             }
             const v = liveDefs.get(def);
             if (!v || !v.has(node)) {
-              throw new import_chunk_SG7ODKRM.AwaitedError(
+              throw new import_chunk_67LU4GPQ.AwaitedError(
                 Promise.resolve(def ? declFullName(def) : "null").then(
                   (defStr) => `No stmt in liveDef for ${defStr}`
                 )
@@ -19688,7 +19982,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             const decls = findDecl(node);
             if (!decls)
               break;
-            if (trackInsertionPoints && (0, import_chunk_SG7ODKRM.some)(decls, (decl) => {
+            if (trackInsertionPoints && (0, import_chunk_67LU4GPQ.some)(decls, (decl) => {
               if (decl.type === "VariableDeclarator") {
                 const defStmts = decl.node.kind === "var" && liveDefs.get(null) || liveDefs.get(decl);
                 if (defStmts) {
@@ -19939,8 +20233,8 @@ var init_data_flow = (0, import_chunk_ABYVSU2C.__esm)({
     init_control_flow();
     init_function_info();
     init_type_flow_util();
-    (0, import_chunk_SG7ODKRM.init_util)();
-    DataflowQueue = class extends import_chunk_SG7ODKRM.GenericQueue {
+    (0, import_chunk_67LU4GPQ.init_util)();
+    DataflowQueue = class extends import_chunk_67LU4GPQ.GenericQueue {
       constructor() {
         super((b, a) => (a.order || 0) - (b.order || 0));
       }
@@ -20735,7 +21029,7 @@ function computeJsrMap(func) {
 }
 function postOrderPropagate(func, preBlock, processBc, postBlock, merge) {
   const order = /* @__PURE__ */ new Map();
-  const queue = new import_chunk_SG7ODKRM.GenericQueue(
+  const queue = new import_chunk_67LU4GPQ.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   postOrderTraverse2(func, (block) => {
@@ -20794,7 +21088,7 @@ function rpoPropagate(func, preBlock, processBc, postBlock, merge) {
     });
     blocks.reverse().forEach((block, i) => order.set(block, i));
   }
-  const queue = new import_chunk_SG7ODKRM.GenericQueue(
+  const queue = new import_chunk_67LU4GPQ.GenericQueue(
     (b, a) => order.get(a) - order.get(b)
   );
   queue.enqueue(func.blocks.get(func.offset));
@@ -20848,7 +21142,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_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_opcodes();
   }
 });
@@ -21311,12 +21605,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_SG7ODKRM.wouldLog)("interp", 1);
+  const interpLogging = (0, import_chunk_67LU4GPQ.wouldLog)("interp", 1);
   if (interpLogging) {
-    if ((0, import_chunk_SG7ODKRM.wouldLog)("interp", 7)) {
-      (0, import_chunk_SG7ODKRM.setBanner)(functionBanner(func, context, "interp"));
-    } else if ((0, import_chunk_SG7ODKRM.wouldLog)("interp", 3)) {
-      (0, import_chunk_SG7ODKRM.setBanner)(
+    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)(
         () => `+++++++++++++ interp-prepare ${func.name} ++++++++++++++`
       );
     }
@@ -21350,20 +21644,20 @@ function interpFunc(func, context) {
     func,
     (block) => {
       if (interpLogging) {
-        (0, import_chunk_SG7ODKRM.logger)(
+        (0, import_chunk_67LU4GPQ.logger)(
           "interp",
           3,
           `${offsetToString(block.offset)}: ${block.bytecodes[0]?.lineNum ? lineInfoToString(block.bytecodes[0]?.lineNum, context) : ""}
  ${interpStateToString(liveInState.get(block.offset))}`
         );
-        (0, import_chunk_SG7ODKRM.logger)("interp", 9, () => blockToString(block, context));
+        (0, import_chunk_67LU4GPQ.logger)("interp", 9, () => blockToString(block, context));
       }
       return cloneState2(liveInState.get(block.offset));
     },
     (block, bc, localState) => {
       if (interpLogging) {
-        if ((0, import_chunk_SG7ODKRM.wouldLog)("interp", 8)) {
-          (0, import_chunk_SG7ODKRM.log)(
+        if ((0, import_chunk_67LU4GPQ.wouldLog)("interp", 8)) {
+          (0, import_chunk_67LU4GPQ.log)(
             `${interpStateToString(localState)}
     ${bytecodeToString(
               bc,
@@ -21528,14 +21822,14 @@ function interpFunc(func, context) {
       if (!mergeInto(localState, succState))
         return false;
       if (interpLogging) {
-        (0, import_chunk_SG7ODKRM.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
+        (0, import_chunk_67LU4GPQ.logger)("interp", 3, `Re-Merge to ${offsetToString(succBlock.offset)}`);
       }
       return true;
     }
   );
   if (interpLogging) {
-    if ((0, import_chunk_SG7ODKRM.wouldLog)("interp", 5)) {
-      (0, import_chunk_SG7ODKRM.setBanner)(
+    if ((0, import_chunk_67LU4GPQ.wouldLog)("interp", 5)) {
+      (0, import_chunk_67LU4GPQ.setBanner)(
         functionBanner(func, context, "interp", (block, footer) => {
           if (footer)
             return "";
@@ -21543,44 +21837,44 @@ function interpFunc(func, context) {
         })
       );
     } else {
-      (0, import_chunk_SG7ODKRM.setBanner)(() => `=============== interp ${func.name} ==============`);
+      (0, import_chunk_67LU4GPQ.setBanner)(() => `=============== interp ${func.name} ==============`);
     }
     if (equivSets.size) {
-      (0, import_chunk_SG7ODKRM.log)(`====== equivSets =====`);
+      (0, import_chunk_67LU4GPQ.log)(`====== equivSets =====`);
       equivSets.forEach(
-        (value2, key) => (0, import_chunk_SG7ODKRM.log)(
+        (value2, key) => (0, import_chunk_67LU4GPQ.log)(
           `L${key.arg} === ${Array.from(value2).sort().join(" ")} ${key.lineNum ? lineInfoToString(key.lineNum, context) : ""}`
         )
       );
     }
     if (selfStores.size) {
-      (0, import_chunk_SG7ODKRM.log)(`====== selfStores =====`);
+      (0, import_chunk_67LU4GPQ.log)(`====== selfStores =====`);
       selfStores.forEach(
-        (value2) => (0, import_chunk_SG7ODKRM.log)(`${bytecodeToString(value2, symbolTable)}`)
+        (value2) => (0, import_chunk_67LU4GPQ.log)(`${bytecodeToString(value2, symbolTable)}`)
       );
     }
     if (replacements.size) {
-      (0, import_chunk_SG7ODKRM.log)(`====== replacements =====`);
+      (0, import_chunk_67LU4GPQ.log)(`====== replacements =====`);
       replacements.forEach(
         (blockRep) => blockRep.forEach(
-          (rep, bc) => (0, import_chunk_SG7ODKRM.log)(
+          (rep, bc) => (0, import_chunk_67LU4GPQ.log)(
             `${bytecodeToString(bc, symbolTable)} => ${rep.invert ? "~" : ""}${bytecodeToString(rep, symbolTable)} ${bc.lineNum ? lineInfoToString(bc.lineNum, context) : ""}`
           )
         )
       );
     }
     if (resolvedBranches.size) {
-      (0, import_chunk_SG7ODKRM.log)(`====== resolved branches =====`);
+      (0, import_chunk_67LU4GPQ.log)(`====== resolved branches =====`);
       resolvedBranches.forEach(
-        (isTaken, block) => (0, import_chunk_SG7ODKRM.log)(
+        (isTaken, block) => (0, import_chunk_67LU4GPQ.log)(
           `block ${offsetToString(block.offset)} is ${isTaken ? "always" : "never"} taken`
         )
       );
     }
     if (branchRedirects.size) {
-      (0, import_chunk_SG7ODKRM.log)(`====== redirected branches =====`);
+      (0, import_chunk_67LU4GPQ.log)(`====== redirected branches =====`);
       branchRedirects.forEach(
-        ({ to, from }, block) => (0, import_chunk_SG7ODKRM.log)(
+        ({ to, from }, block) => (0, import_chunk_67LU4GPQ.log)(
           `block ${offsetToString(
             block.offset
           )} redirects from ${offsetToString(from)} to ${offsetToString(to)}${safeBranchBlocks.get(from) ? ` popping ${safeBranchBlocks.get(from)}` : ""}`
@@ -21643,7 +21937,7 @@ function interpFunc(func, context) {
     }
   });
   if (interpLogging)
-    (0, import_chunk_SG7ODKRM.setBanner)(null);
+    (0, import_chunk_67LU4GPQ.setBanner)(null);
   return {
     liveInState,
     equivSets,
@@ -21693,7 +21987,7 @@ var init_interp2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/interp.ts"() {
     "use strict";
     init_interp_binary();
-    (0, import_chunk_SG7ODKRM.init_logger)();
+    (0, import_chunk_67LU4GPQ.init_logger)();
     init_interp();
     init_types();
     init_union_type();
@@ -21805,7 +22099,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_SG7ODKRM.logger)(
+    (0, import_chunk_67LU4GPQ.logger)(
       "array-init",
       1,
       () => `${func.name}: Removing initialization of default initialized ${putvStarts.length} element array init at block ${offsetToString(
@@ -21842,7 +22136,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         convertAputv(offset - 1);
       }
     }
-    (0, import_chunk_SG7ODKRM.logger)(
+    (0, import_chunk_67LU4GPQ.logger)(
       "array-init",
       1,
       () => `${func.name}: Optimizing unused ${putvStarts.length} element array init at block ${offsetToString(
@@ -21851,8 +22145,8 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index].offset
       )}`
     );
-    if ((0, import_chunk_SG7ODKRM.wouldLog)("array-init", 5)) {
-      (0, import_chunk_SG7ODKRM.log)(blockToString(block, context));
+    if ((0, import_chunk_67LU4GPQ.wouldLog)("array-init", 5)) {
+      (0, import_chunk_67LU4GPQ.log)(blockToString(block, context));
     }
     return true;
   }
@@ -21892,7 +22186,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
     if (putvStarts.length < 3)
       return false;
     tryLocal(3);
-    (0, import_chunk_SG7ODKRM.logger)(
+    (0, import_chunk_67LU4GPQ.logger)(
       "array-init",
       1,
       () => `${func.name}: Optimizing ${putvStarts.length} element array init with constant initializer ${bytecodeToString(
@@ -21918,7 +22212,7 @@ function optimizeArrayInit(func, block, index, context, interpState) {
         block.bytecodes[index + 1].arg = putvStarts.length;
       }
     }
-    (0, import_chunk_SG7ODKRM.logger)(
+    (0, import_chunk_67LU4GPQ.logger)(
       "array-init",
       5,
       () => `index: ${index}, i: ${i}
@@ -21971,7 +22265,7 @@ ${blockToString(block, context)}`
   for (let i2 = putvStarts.length; i2-- > 1; ) {
     block.bytecodes.splice(putvStarts[i2], 2);
   }
-  (0, import_chunk_SG7ODKRM.logger)(
+  (0, import_chunk_67LU4GPQ.logger)(
     "array-init",
     1,
     () => `${func.name}: Optimizing ${putvStarts.length} element array init at block ${offsetToString(
@@ -22030,15 +22324,15 @@ var init_array_init = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/array-init.ts"() {
     "use strict";
     init_types();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_bytecode();
     init_interp2();
     init_opcodes();
   }
 });
 function localDCE(func, context) {
-  if ((0, import_chunk_SG7ODKRM.wouldLog)("dce", 5)) {
-    (0, import_chunk_SG7ODKRM.setBanner)(
+  if ((0, import_chunk_67LU4GPQ.wouldLog)("dce", 5)) {
+    (0, import_chunk_67LU4GPQ.setBanner)(
       functionBanner(
         func,
         context,
@@ -22071,7 +22365,7 @@ function localDCE(func, context) {
   };
   func.blocks.forEach((block) => {
     const reportPopv = (i, item, kill) => {
-      (0, import_chunk_SG7ODKRM.logger)(
+      (0, import_chunk_67LU4GPQ.logger)(
         "dce",
         2,
         () => `${func.name}: Convert ${i}:${bytecodeToString(
@@ -22086,7 +22380,7 @@ function localDCE(func, context) {
       );
     };
     const reportNop = (item) => {
-      (0, import_chunk_SG7ODKRM.logger)(
+      (0, import_chunk_67LU4GPQ.logger)(
         "dce",
         2,
         () => `${func.name}: Kill ${item.deps.map(
@@ -22105,7 +22399,7 @@ function localDCE(func, context) {
         case 19: {
           const liveLocal = dceInfo.locals.has(bytecode.arg);
           if (!liveLocal && (bytecode.arg || context.config.allowForbiddenOpts)) {
-            (0, import_chunk_SG7ODKRM.logger)(
+            (0, import_chunk_67LU4GPQ.logger)(
               "dce",
               2,
               () => `${func.name}: Killing store to unused local ${bytecode.arg} at ${offsetToString(block.offset)}:${i}`
@@ -22265,10 +22559,10 @@ function localDCE(func, context) {
         (bc) => bc.op !== 0
         /* nop */
       );
-      (0, import_chunk_SG7ODKRM.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
+      (0, import_chunk_67LU4GPQ.logger)("dce", 3, functionBanner(func, context, "local-dce-end"));
     }
   });
-  (0, import_chunk_SG7ODKRM.setBanner)(null);
+  (0, import_chunk_67LU4GPQ.setBanner)(null);
   return anyChanges;
 }
 function computeLiveLocals(func) {
@@ -22319,7 +22613,7 @@ var init_dce = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/dce.ts"() {
     "use strict";
     init_data_flow();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -22359,7 +22653,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_SG7ODKRM.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
+  (0, import_chunk_67LU4GPQ.logger)("locals", 10, functionBanner(func, context, "Minimize Locals"));
   let argc = func.argc ?? null;
   const colors = /* @__PURE__ */ new Map();
   const merge = [];
@@ -22426,15 +22720,15 @@ function minimizeLocals2(func, equivSets, context) {
       }
     }
   }
-  if ((0, import_chunk_SG7ODKRM.wouldLog)("locals", 1)) {
-    if (!(0, import_chunk_SG7ODKRM.wouldLog)("locals", 10)) {
-      (0, import_chunk_SG7ODKRM.logger)("locals", 5, functionBanner(func, context, "Minimize Locals"));
+  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"));
     }
-    (0, import_chunk_SG7ODKRM.log)(
+    (0, import_chunk_67LU4GPQ.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_SG7ODKRM.log)(
+      (merged) => (0, import_chunk_67LU4GPQ.log)(
         ` ${colors.get(merged[0])} - ${merged.map((k) => bytecodeToString(k, context.symbolTable)).join(" | ")}`
       )
     );
@@ -22733,7 +23027,7 @@ function mergeSplitRanges(splitRanges) {
 var init_locals = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/locals.ts"() {
     "use strict";
-    (0, import_chunk_SG7ODKRM.init_logger)();
+    (0, import_chunk_67LU4GPQ.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -22846,16 +23140,16 @@ function sizeBasedPRE2(func, context) {
       delete bc.arg;
     return bc;
   };
-  if ((0, import_chunk_SG7ODKRM.wouldLog)("pre", 1)) {
-    if ((0, import_chunk_SG7ODKRM.wouldLog)("pre", 5)) {
-      (0, import_chunk_SG7ODKRM.log)(functionBanner(func, context, "PRE")());
+  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")());
     } else {
-      (0, import_chunk_SG7ODKRM.log)(`================ PRE : ${func.name} ================
+      (0, import_chunk_67LU4GPQ.log)(`================ PRE : ${func.name} ================
 `);
     }
     insertionBlocks.forEach((o, key) => {
       const bcs = canonicalMap.get(key);
-      (0, import_chunk_SG7ODKRM.log)(
+      (0, import_chunk_67LU4GPQ.log)(
         `Replacing ${bcs.size} instances of ${bytecodeToString(
           bcs.values().next().value,
           context.symbolTable
@@ -22938,13 +23232,13 @@ function sizeBasedPRE2(func, context) {
       bytecode(1, insertionBlocks.size)
     );
   }
-  (0, import_chunk_SG7ODKRM.logger)("pre", 5, functionBanner(func, context, "post-PRE"));
+  (0, import_chunk_67LU4GPQ.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_SG7ODKRM.init_logger)();
+    (0, import_chunk_67LU4GPQ.init_logger)();
     init_bytecode();
     init_cflow();
     init_opcodes();
@@ -22977,9 +23271,9 @@ function blockSharing(func, context) {
   if (!any)
     return false;
   any = false;
-  const logging3 = (0, import_chunk_SG7ODKRM.wouldLog)("sharing", 1);
-  if (logging3 && (0, import_chunk_SG7ODKRM.wouldLog)("sharing", 10)) {
-    (0, import_chunk_SG7ODKRM.setBanner)(functionBanner(func, context, "sharing"));
+  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"));
   }
   candidates.forEach((blocks) => {
     while (blocks.size > 1) {
@@ -23115,9 +23409,9 @@ function blockSharing(func, context) {
                 block2.offset
               )})` : `block(${offsetToString(block2.offset)})`;
             };
-            (0, import_chunk_SG7ODKRM.log)(`Sharing ${showBlock(block)} with ${showBlock(target)}`);
-            if ((0, import_chunk_SG7ODKRM.wouldLog)("sharing", 5)) {
-              (0, import_chunk_SG7ODKRM.log)(blockToString(target, context));
+            (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));
             }
           }
           if (target.bytecodes.length > length2) {
@@ -23144,13 +23438,13 @@ function blockSharing(func, context) {
       });
     }
   });
-  (0, import_chunk_SG7ODKRM.setBanner)(null);
+  (0, import_chunk_67LU4GPQ.setBanner)(null);
   return any;
 }
 var init_sharing = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/sharing.ts"() {
     "use strict";
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_bytecode();
     init_opcodes();
   }
@@ -23214,7 +23508,7 @@ function doArrayInits(func, liveInState, context) {
 }
 function simpleOpts(func, context) {
   const equalsSym = 8388787;
-  const logging3 = (0, import_chunk_SG7ODKRM.wouldLog)("optimize", 5);
+  const logging3 = (0, import_chunk_67LU4GPQ.wouldLog)("optimize", 5);
   return Array.from(func.blocks.values()).reduce((changes, block) => {
     for (let i = block.bytecodes.length; i--; ) {
       const cur = block.bytecodes[i];
@@ -23222,7 +23516,7 @@ function simpleOpts(func, context) {
         block.bytecodes.splice(i, 1);
         changes = true;
         if (logging3) {
-          (0, import_chunk_SG7ODKRM.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
+          (0, import_chunk_67LU4GPQ.log)(`${func.name}: deleting ${bytecodeToString(cur, null)}`);
         }
       } else if (cur.op === 74 && context.config.removeArgc && context.config.allowForbiddenOpts) {
         const arg = cur.arg.incsp;
@@ -23231,7 +23525,7 @@ function simpleOpts(func, context) {
         incsp.arg = arg;
         changes = true;
         if (logging3) {
-          (0, import_chunk_SG7ODKRM.log)(`${func.name}: argcincsp => incsp`);
+          (0, import_chunk_67LU4GPQ.log)(`${func.name}: argcincsp => incsp`);
         }
       } else if (i && cur.op === 39 && cur.arg === equalsSym) {
         changes = equalSymbolToEq(block, i) || changes;
@@ -23242,7 +23536,7 @@ function simpleOpts(func, context) {
           if (!shift && prev.op === 37) {
             block.bytecodes.splice(i - 1, 2);
             changes = true;
-            logging3 && (0, import_chunk_SG7ODKRM.log)(`${func.name}: deleting no-op shift (${shift})`);
+            logging3 && (0, import_chunk_67LU4GPQ.log)(`${func.name}: deleting no-op shift (${shift})`);
             continue;
           }
           if (shift === 1n && prev.op === 37) {
@@ -23252,7 +23546,7 @@ function simpleOpts(func, context) {
             const add = cur;
             add.op = 3;
             delete add.arg;
-            logging3 && (0, import_chunk_SG7ODKRM.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
+            logging3 && (0, import_chunk_67LU4GPQ.log)(`${func.name}: converting "ipush 1; shlv" to "dup 0; addv"`);
             continue;
           }
           if (shift < (prev.op === 49 ? 64n : 31n)) {
@@ -23262,7 +23556,7 @@ function simpleOpts(func, context) {
             } else {
               prev.arg = BigInt.asIntN(64, mul);
             }
-            logging3 && (0, import_chunk_SG7ODKRM.log)(
+            logging3 && (0, import_chunk_67LU4GPQ.log)(
               `${func.name}: converting shlv(${shift}) to mulv(${prev.arg})`
             );
             changes = true;
@@ -23276,14 +23570,14 @@ function simpleOpts(func, context) {
         func.blocks.get(block.taken).preds.delete(block.offset);
         delete block.taken;
         changes = true;
-        logging3 && (0, import_chunk_SG7ODKRM.log)(`${func.name}: deleting empty finally handler`);
+        logging3 && (0, import_chunk_67LU4GPQ.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_SG7ODKRM.log)(
+            (0, import_chunk_67LU4GPQ.log)(
               `${func.name}: converting ${Opcodes[cur.op]} to ${Opcodes[newOp]}`
             );
           }
@@ -23296,7 +23590,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_SG7ODKRM.log)(
+              (0, import_chunk_67LU4GPQ.log)(
                 `${func.name}: simplifying ${next.bytecodes[next.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   next.offset
                 )}:${offsetToString(taken.offset)}:`
@@ -23313,7 +23607,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_SG7ODKRM.log)(
+              (0, import_chunk_67LU4GPQ.log)(
                 `${func.name}: simplifying ${taken.bytecodes[taken.bytecodes.length - 1].op === 7 ? "'&&'" : "'||'"} at ${offsetToString(block.offset)}:${offsetToString(
                   taken.offset
                 )}:${offsetToString(next.offset)}:`
@@ -23361,7 +23655,7 @@ function equalSymbolToEq(block, equalsIndex) {
     op: 26,
     offset: invokem.offset
   });
-  (0, import_chunk_SG7ODKRM.logger)(
+  (0, import_chunk_67LU4GPQ.logger)(
     "optimize",
     1,
     `Replacing <thing>.equals(:symbol) with <thing> eq :symbol at ${offsetToString(
@@ -23421,7 +23715,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_SG7ODKRM.logger)(
+          (0, import_chunk_67LU4GPQ.logger)(
             "cfg",
             1,
             () => `${func.name}: ${offsetToString(
@@ -23444,7 +23738,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_SG7ODKRM.logger)(
+          (0, import_chunk_67LU4GPQ.logger)(
             "cfg",
             1,
             () => `${func.name}: ${offsetToString(
@@ -23469,7 +23763,7 @@ function removeUnreachableCatches(func, context) {
       switch (last.op) {
         case 41:
         case 40:
-          (0, import_chunk_SG7ODKRM.logger)(
+          (0, import_chunk_67LU4GPQ.logger)(
             "cfg",
             1,
             () => `${func.name}: killing no-op ${bytecodeToString(
@@ -23492,7 +23786,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_SG7ODKRM.logger)(
+          (0, import_chunk_67LU4GPQ.logger)(
             "cfg",
             1,
             `${func.name}: killing unused try-catch at ${offsetToString(
@@ -23509,8 +23803,8 @@ function removeUnreachableCatches(func, context) {
   });
 }
 function cleanCfg2(func, context) {
-  if ((0, import_chunk_SG7ODKRM.wouldLog)("cfg", 10)) {
-    (0, import_chunk_SG7ODKRM.setBanner)(functionBanner(func, context, "sharing"));
+  if ((0, import_chunk_67LU4GPQ.wouldLog)("cfg", 10)) {
+    (0, import_chunk_67LU4GPQ.setBanner)(functionBanner(func, context, "sharing"));
   }
   removeNoOpBlocks(func);
   removeUnreachableCatches(func, context);
@@ -23525,12 +23819,12 @@ function cleanCfg2(func, context) {
     (0, import_node_assert12.default)(!block.preds?.size);
     func.blocks.delete(block.offset);
   });
-  (0, import_chunk_SG7ODKRM.setBanner)(null);
+  (0, import_chunk_67LU4GPQ.setBanner)(null);
 }
 var init_optimize2 = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/optimize.ts"() {
     "use strict";
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_array_init();
     init_bytecode();
     init_cflow();
@@ -24145,21 +24439,21 @@ function optimizeBytecode(context) {
       functions.forEach(callback);
       return;
     }
-    (0, import_chunk_SG7ODKRM.bumpLogging)(null, 10);
+    (0, import_chunk_67LU4GPQ.bumpLogging)(null, 10);
     functions.forEach((func) => {
       if (loggerFunc.test(func.name ?? "<null>")) {
-        (0, import_chunk_SG7ODKRM.bumpLogging)(null, -10);
+        (0, import_chunk_67LU4GPQ.bumpLogging)(null, -10);
         callback(func);
-        (0, import_chunk_SG7ODKRM.bumpLogging)(null, 10);
+        (0, import_chunk_67LU4GPQ.bumpLogging)(null, 10);
         return;
       }
       callback(func);
     });
-    (0, import_chunk_SG7ODKRM.bumpLogging)(null, -10);
+    (0, import_chunk_67LU4GPQ.bumpLogging)(null, -10);
   };
-  if ((0, import_chunk_SG7ODKRM.wouldLog)("list-input", 1)) {
+  if ((0, import_chunk_67LU4GPQ.wouldLog)("list-input", 1)) {
     forEachFunction(
-      (func) => (0, import_chunk_SG7ODKRM.wouldLog)("list-input", 1) && printFunction(func, context)
+      (func) => (0, import_chunk_67LU4GPQ.wouldLog)("list-input", 1) && printFunction(func, context)
     );
   }
   forEachFunction((func) => optimizeFunc(func, context));
@@ -24177,7 +24471,7 @@ function optimizeBytecode(context) {
   forEachFunction((func) => {
     if (!func.name)
       return;
-    (0, import_chunk_SG7ODKRM.logger)(
+    (0, import_chunk_67LU4GPQ.logger)(
       "bytecode",
       5,
       `${func.name}: ${offset.toString(16)} ${offset - func.offset}`
@@ -24186,7 +24480,7 @@ function optimizeBytecode(context) {
   });
   const { offsetMap } = updateInfo;
   offsetMap.set(code.byteLength, offset);
-  (0, import_chunk_SG7ODKRM.logger)(
+  (0, import_chunk_67LU4GPQ.logger)(
     "bytecode",
     1,
     `${context.filepath}: code size: ${context.sections[
@@ -24198,9 +24492,9 @@ function optimizeBytecode(context) {
     ].length - offset}`
   );
   fixSectionSize(-1059145026, context.sections, offset);
-  if ((0, import_chunk_SG7ODKRM.wouldLog)("list-output", 1)) {
+  if ((0, import_chunk_67LU4GPQ.wouldLog)("list-output", 1)) {
     forEachFunction(
-      (func) => (0, import_chunk_SG7ODKRM.wouldLog)("list-output", 1) && printFunction(func, context)
+      (func) => (0, import_chunk_67LU4GPQ.wouldLog)("list-output", 1) && printFunction(func, context)
     );
   }
   fixupHeader(context, updateInfo);
@@ -24290,7 +24584,7 @@ ${functionToString(
 ---------------- ${func.name} ----------------`;
 }
 function printFunction(func, context) {
-  (0, import_chunk_SG7ODKRM.log)(functionToString(func, context));
+  (0, import_chunk_67LU4GPQ.log)(functionToString(func, context));
 }
 function functionToString(func, context, extra) {
   const parts = [];
@@ -24721,7 +25015,7 @@ var init_bytecode = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     (0, import_chunk_MBTLUWXR.init_ast)();
     init_sdk_util();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_data();
     init_emit();
     init_exceptions();
@@ -25007,10 +25301,10 @@ async function build_project(product, options, lineCallback) {
   ].flat();
   if (!returnCommand) {
     const handlers = [
-      lineCallback || ((line) => (0, import_chunk_SG7ODKRM.log)(line)),
+      lineCallback || ((line) => (0, import_chunk_67LU4GPQ.log)(line)),
       (line) => console.error(line)
     ];
-    await (0, import_chunk_SG7ODKRM.spawnByLine)(exe, args, handlers, {
+    await (0, import_chunk_67LU4GPQ.spawnByLine)(exe, args, handlers, {
       cwd: workspace
     });
   }
@@ -25020,7 +25314,7 @@ var init_build = (0, import_chunk_ABYVSU2C.__esm)({
   "src/build.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
   }
 });
 var require_ms = (0, import_chunk_ABYVSU2C.__commonJS)({
@@ -27987,7 +28281,7 @@ 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_SG7ODKRM.globSome)(resolved, () => true);
+          cache.resolvedPaths[resolved] = (0, import_chunk_67LU4GPQ.globSome)(resolved, () => true);
         } else {
           cache.resolvedPaths[resolved] = fs5.stat(resolved).then(
             () => true,
@@ -28065,12 +28359,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_SG7ODKRM.globa)(pattern, { mark: true })
+            (pattern) => (0, import_chunk_67LU4GPQ.globa)(pattern, { mark: true })
           )
         ).then(
           (patterns) => Promise.all(
             patterns.flat().map(
-              (path7) => path7.endsWith("/") ? (0, import_chunk_SG7ODKRM.globa)(`${path7}**/*.xml`, { mark: true }) : path7
+              (path7) => path7.endsWith("/") ? (0, import_chunk_67LU4GPQ.globa)(`${path7}**/*.xml`, { mark: true }) : path7
             )
           )
         ).then(
@@ -28130,7 +28424,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_SG7ODKRM.globa)(p)))).flat();
+    const files = (await Promise.all(filePatterns.map((p) => (0, import_chunk_67LU4GPQ.globa)(p)))).flat();
     sourceExcludes.push(...files);
   }
   const excludeAnnotations = excludes.map((e) => e.annotation?.value.value).filter((f) => f != null);
@@ -28307,15 +28601,15 @@ function identify_optimizer_groups(targets, options) {
 function find_barrels(barrelPath) {
   if (Array.isArray(barrelPath)) {
     return Promise.all(
-      barrelPath.map((path7) => (0, import_chunk_SG7ODKRM.globa)(path7, { mark: true }))
+      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_SG7ODKRM.globa)(barrelPath, { mark: true }).then(
+  return (0, import_chunk_67LU4GPQ.globa)(barrelPath, { mark: true }).then(
     (paths) => Promise.all(
       paths.map(
-        (path7) => path7.endsWith("/") ? (0, import_chunk_SG7ODKRM.globa)(`${path7}**/*.barrel`) : path7
+        (path7) => path7.endsWith("/") ? (0, import_chunk_67LU4GPQ.globa)(`${path7}**/*.barrel`) : path7
       )
     )
   ).then(
@@ -28326,7 +28620,7 @@ function resolve_barrel(barrel, barrelDir, products, options, cache, buildDepend
   if ((0, import_chunk_MBTLUWXR.hasProperty)(cache.barrels, barrel)) {
     return cache.barrels[barrel];
   }
-  let promise = Promise.resolve();
+  let promise = Promise.resolve(null);
   let rawBarrel = barrel;
   if (barrel.endsWith(".barrel")) {
     const sha1 = crypto2.createHash("sha1").update(barrel, "binary").digest("base64").replace(/[/=+]/g, "");
@@ -28339,9 +28633,9 @@ function resolve_barrel(barrel, barrelDir, products, options, cache, buildDepend
       () => fs5.stat(localPath).then(
         (localStat) => !localStat.isDirectory() || fs5.stat(barrel).then((barrelStat) => localStat.mtimeMs < barrelStat.mtimeMs),
         () => true
-      ).then((needsUpdate) => {
-        needsUpdate && fs5.rm(localPath, { recursive: true, force: true }).then(() => (0, import_extract_zip.default)(barrel, { dir: localPath }));
-      })
+      ).then(
+        (needsUpdate) => needsUpdate ? fs5.rm(localPath, { recursive: true, force: true }).catch(() => null).then(() => (0, import_extract_zip.default)(barrel, { dir: localPath })) : null
+      )
     );
   }
   return promise.then(() => get_jungle_and_barrels(rawBarrel, products, options, cache)).then((result) => {
@@ -28588,7 +28882,7 @@ var init_jungles = (0, import_chunk_ABYVSU2C.__esm)({
     init_api();
     init_manifest();
     init_sdk_util();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     depth = 0;
   }
 });
@@ -28616,7 +28910,7 @@ async function launchSimulator(force = true) {
       await new Promise((r) => setTimeout(r, 200));
     }
   } catch (e) {
-    (0, import_chunk_SG7ODKRM.log)(e);
+    (0, import_chunk_67LU4GPQ.log)(e);
   }
 }
 function checkIfSimulatorRunning() {
@@ -28647,10 +28941,10 @@ function simulateProgram(prg, device, test = false, logger2) {
     }
   }
   return getSdkPath().then(
-    (sdk) => (0, import_chunk_SG7ODKRM.spawnByLine)(
+    (sdk) => (0, import_chunk_67LU4GPQ.spawnByLine)(
       path3.resolve(sdk, "bin", isWin ? "monkeydo.bat" : "monkeydo"),
       args,
-      logger2 || ((line) => (0, import_chunk_SG7ODKRM.log)(line))
+      logger2 || ((line) => (0, import_chunk_67LU4GPQ.log)(line))
     ).then(() => {
       return;
     })
@@ -28660,7 +28954,7 @@ var init_launch = (0, import_chunk_ABYVSU2C.__esm)({
   "src/launch.ts"() {
     "use strict";
     init_sdk_util();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
   }
 });
 function relative_path_no_dotdot(relative2) {
@@ -28677,32 +28971,56 @@ async function getVSCodeSettings(path7) {
     return {};
   }
 }
+async function getCodeWorkspaceSettings(folder) {
+  let curDir = folder;
+  try {
+    while (curDir) {
+      const code_workspaces = await (0, import_chunk_67LU4GPQ.globa)(
+        path4.resolve(curDir, "*.code-workspace"),
+        { onlyFiles: true }
+      );
+      if (code_workspaces.length === 1) {
+        const contents = await fs6.readFile(code_workspaces[0], "utf-8");
+        const code_workspace = JSON.parse(contents);
+        if (Array.isArray(code_workspace.folders) && code_workspace.settings && code_workspace.folders.some(
+          (workspace) => path4.resolve(curDir, workspace.path) === folder
+        )) {
+          return code_workspace.settings;
+        }
+        break;
+      }
+      if (code_workspaces.length > 1)
+        break;
+      const next = path4.dirname(curDir);
+      if (next === curDir)
+        break;
+      curDir = next;
+    }
+  } catch (ex) {
+  }
+  return {};
+}
 function isErrorWithLocation(e) {
   return (0, import_chunk_MBTLUWXR.hasProperty)(e, "location");
 }
 function getConfig(options) {
   const config = { ...defaultConfig, ...options || {} };
-  return [
-    "jungleFiles",
-    "developerKeyPath",
-    "typeCheckLevel",
-    "optimizationLevel",
-    "compilerOptions",
-    "compilerWarnings",
-    "ignoredExcludeAnnotations",
-    "ignoredAnnotations",
-    "ignoredSourcePaths"
-  ].reduce((promise, key) => {
+  const defaults = buildConfigDescription.flatMap(
+    (desc) => Object.entries(desc.properties)
+  );
+  return defaults.reduce((promise, [key, info]) => {
     if (key in config)
       return promise;
     return promise.then(
       (v) => v || getVSCodeSettings(`${appSupport}/Code/User/settings.json`).then(
-        (globals) => getVSCodeSettings(
-          `${config.workspace}/.vscode/settings.json`
-        ).then((locals) => ({ ...globals, ...locals }))
+        (globals) => getCodeWorkspaceSettings(config.workspace).then(
+          (workspace) => getVSCodeSettings(
+            `${config.workspace ?? "."}/.vscode/settings.json`
+          ).then((locals) => ({ ...globals, ...workspace, ...locals }))
+        )
       )
     ).then((settings) => {
-      const value2 = settings[`monkeyC.${key}`] || settings[`prettierMonkeyC.${key}`];
+      const value2 = settings[`prettierMonkeyC.${key}`] ?? settings[`monkeyC.${key}`] ?? info.default;
       if (value2 !== void 0) {
         config[key] = value2;
       }
@@ -28780,7 +29098,7 @@ async function createLocalBarrels(targets, options) {
             optBarrelDir
           };
           return promise2.then(
-            () => (0, import_chunk_SG7ODKRM.copyRecursiveAsNeeded)(
+            () => (0, import_chunk_67LU4GPQ.copyRecursiveAsNeeded)(
               rawBarrelDir,
               optBarrelDir,
               (src) => !src.endsWith(".mc")
@@ -29082,11 +29400,11 @@ async function generateOptimizedProject(options) {
 }
 async function filesFromPaths(workspace, paths, extension) {
   paths = (await Promise.all(
-    paths?.map((pattern) => (0, import_chunk_SG7ODKRM.globa)(pattern, { cwd: workspace, mark: true })) || []
+    paths?.map((pattern) => (0, import_chunk_67LU4GPQ.globa)(pattern, { cwd: workspace, mark: true })) || []
   )).flat();
   const files = await Promise.all(
     paths.map(
-      (path7) => path7.endsWith("/") ? (0, import_chunk_SG7ODKRM.globa)(`${path7}**/*${extension}`, { cwd: workspace, mark: true }) : path7
+      (path7) => path7.endsWith("/") ? (0, import_chunk_67LU4GPQ.globa)(`${path7}**/*${extension}`, { cwd: workspace, mark: true }) : path7
     )
   );
   return {
@@ -29196,7 +29514,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       })
     );
   }
-  const actualOptimizedFiles = (await (0, import_chunk_SG7ODKRM.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
+  const actualOptimizedFiles = (await (0, import_chunk_67LU4GPQ.globa)(path4.join(output, "**", "*.mc"), { mark: true })).filter((file) => !file.endsWith("/")).sort();
   const {
     hasTests,
     diagnostics: prevDiagnostics,
@@ -29212,13 +29530,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_SG7ODKRM.last_modified)(
+      const source_time = await (0, import_chunk_67LU4GPQ.last_modified)(
         Object.keys(fnMap).concat(dependencyFiles)
       );
-      const opt_time = await (0, import_chunk_SG7ODKRM.first_modified)(
+      const opt_time = await (0, import_chunk_67LU4GPQ.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1716827034287 < opt_time) {
+      if (source_time < opt_time && 1719447701318 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29257,7 +29575,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.63",
+            optimizerVersion: "1.1.65",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29271,7 +29589,7 @@ async function getProjectAnalysis(targets, analysis, manifestXML, options) {
   try {
     return getProjectAnalysisHelper(targets, analysis, manifestXML, options);
   } catch (ex) {
-    if (ex instanceof import_chunk_SG7ODKRM.AwaitedError) {
+    if (ex instanceof import_chunk_67LU4GPQ.AwaitedError) {
       await ex.resolve();
     }
     throw ex;
@@ -29279,13 +29597,17 @@ async function getProjectAnalysis(targets, analysis, manifestXML, options) {
 }
 async function getProjectAnalysisHelper(targets, analysis, manifestXML, options) {
   const qualifiers = /* @__PURE__ */ new Map();
-  const addQualifier = (name, qualifier) => {
+  const addQualifier = (name, qualifier, root) => {
     const sp = qualifier.sourcePath;
     const pp = qualifier.personality;
     if (sp || pp) {
       let q = qualifiers.get(name);
       if (!q) {
-        q = { sourcePath: /* @__PURE__ */ new Set(), personality: /* @__PURE__ */ new Set() };
+        q = {
+          sourcePath: /* @__PURE__ */ new Set(),
+          personality: /* @__PURE__ */ new Set(),
+          root
+        };
         qualifiers.set(name, q);
       }
       sp?.forEach((s) => q.sourcePath.add(s));
@@ -29293,10 +29615,10 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
     }
   };
   const products = targets.map(({ qualifier, product }) => {
-    addQualifier("", qualifier);
+    addQualifier("", qualifier, options.workspace);
     if (qualifier.barrelMap) {
       Object.entries(qualifier.barrelMap).forEach(([name, bm]) => {
-        addQualifier(name, bm.qualifier);
+        addQualifier(name, bm.qualifier, path4.dirname(bm.jungles[0]));
       });
     }
     return product;
@@ -29304,7 +29626,7 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
   const { fnMap, paths } = await Promise.all(
     Array.from(qualifiers).map(
       ([name, qualifier]) => fileInfoFromConfig(
-        options.workspace,
+        qualifier.root,
         options.workspace,
         {
           sourcePath: Array.from(qualifier.sourcePath),
@@ -29320,7 +29642,7 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
       if (!cur)
         return result;
       Object.entries(result.fnMap).forEach(
-        ([key, value2]) => cur.fnMap[key] = value2
+        ([key, value2]) => cur.fnMap[key] || (cur.fnMap[key] = value2)
       );
       cur.paths.push(...result.paths);
       return cur;
@@ -29408,6 +29730,7 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
   "src/optimizer.ts"() {
     init_api();
     init_build();
+    init_build_config();
     init_jungles();
     init_launch();
     init_manifest();
@@ -29417,7 +29740,7 @@ var init_optimizer = (0, import_chunk_ABYVSU2C.__esm)({
     init_could_be();
     init_interp();
     init_sub_type();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_worker_pool();
     init_optimizer_types();
     init_types();
@@ -29477,7 +29800,7 @@ async function performTask(task) {
     throw new Error(`Invalid task type ${type}`);
   }
   return Promise.resolve(handler(task.data)).then(
-    (result) => import_chunk_SG7ODKRM.logPromise.then(() => result)
+    (result) => import_chunk_67LU4GPQ.logPromise.then(() => result)
   );
 }
 var workerTaskHandlers;
@@ -29487,7 +29810,7 @@ var init_worker_task = (0, import_chunk_ABYVSU2C.__esm)({
     init_optimizer();
     init_readprg();
     init_sdk_util();
-    (0, import_chunk_SG7ODKRM.init_logger)();
+    (0, import_chunk_67LU4GPQ.init_logger)();
     workerTaskHandlers = {
       buildOptimizedProject(data) {
         return buildOptimizedProject(data.product, data.options);
@@ -29704,7 +30027,7 @@ async function optimizeProgram(filepath, devKey, output, config) {
 }
 function optimizeProgramBuffer(filepath, view, debugXml, apiDebugXml, key, config) {
   const { sections } = readPrgWithOffsets(view);
-  (0, import_chunk_SG7ODKRM.logger)("readprg", 5, sections);
+  (0, import_chunk_67LU4GPQ.logger)("readprg", 5, sections);
   const symbolTable = new SymbolTable();
   if ((0, import_chunk_MBTLUWXR.hasProperty)(sections, 1461170197 .toString())) {
     symbolTable.parse(sections[
@@ -30004,7 +30327,7 @@ var init_readprg = (0, import_chunk_ABYVSU2C.__esm)({
     init_signer();
     init_symbols();
     init_sdk_util();
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_worker_pool();
   }
 });
@@ -30016,7 +30339,7 @@ function getSdkPath() {
   });
 }
 async function getDeviceInfo() {
-  const files = await (0, import_chunk_SG7ODKRM.globa)(`${connectiq}/Devices/*/compiler.json`);
+  const files = await (0, import_chunk_67LU4GPQ.globa)(`${connectiq}/Devices/*/compiler.json`);
   if (!files.length) {
     throw new Error(
       `No devices found at '${connectiq}/Devices'. Check your sdk is correctly installed`
@@ -30084,7 +30407,7 @@ async function getFunctionDocumentation() {
 var isWin, appSupport, connectiq;
 var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   "src/sdk-util.ts"() {
-    (0, import_chunk_SG7ODKRM.init_util)();
+    (0, import_chunk_67LU4GPQ.init_util)();
     init_xml_util();
     init_readprg();
     init_bytecode();
@@ -30105,6 +30428,7 @@ var init_sdk_util = (0, import_chunk_ABYVSU2C.__esm)({
   TruthyTypes,
   analyze,
   appSupport,
+  buildConfigDescription,
   buildOptimizedProject,
   checkCompilerVersion,
   collectNamespaces,