npm - @markw65/monkeyc-optimizer - Versions diffs - 1.1.68 → 1.1.69 - Mend

@markw65/monkeyc-optimizer 1.1.68 → 1.1.69

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (10) hide show

package/CHANGELOG.md +4 -0
package/build/api.cjs +37 -37
package/build/cftinfo.cjs +4 -4
package/build/{chunk-MBTLUWXR.cjs → chunk-JDC43A3I.cjs} +5 -5
package/build/{chunk-NGCEDNHJ.cjs → chunk-YERUPFGW.cjs} +283 -267
package/build/optimizer.cjs +19 -19
package/build/sdk-util.cjs +15 -15
package/build/src/ast.d.ts +1 -1
package/build/worker-thread.cjs +4 -4
package/package.json +1 -1

package/build/{chunk-NGCEDNHJ.cjs → chunk-YERUPFGW.cjs} RENAMED Viewed

@@ -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_NGCEDNHJ_exports = {};
-__export(chunk_NGCEDNHJ_exports, {
+var chunk_YERUPFGW_exports = {};
+__export(chunk_YERUPFGW_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -135,9 +135,9 @@ __export(chunk_NGCEDNHJ_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_NGCEDNHJ_exports);
+module.exports = __toCommonJS(chunk_YERUPFGW_exports);
 var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
-var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
+var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_assert = __toESM(require("node:assert"));
 var import_prettier_plugin_monkeyc = require("@markw65/prettier-plugin-monkeyc");
@@ -3196,7 +3196,7 @@ var init_xml_util = (0, import_chunk_ABYVSU2C.__esm)({
   "src/xml-util.ts"() {
     "use strict";
     init_xml();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     PeggyError = class extends Error {
       constructor(message, location) {
         super(message);
@@ -3244,11 +3244,11 @@ var init_xml_util = (0, import_chunk_ABYVSU2C.__esm)({
               result.push(String.fromCharCode(child.value));
               return true;
             case "entityref":
-              if ((0, import_chunk_MBTLUWXR.hasProperty)(entities, child.name)) {
+              if ((0, import_chunk_JDC43A3I.hasProperty)(entities, child.name)) {
                 result.push(entities[child.name]);
                 return true;
               }
-              if ((0, import_chunk_MBTLUWXR.hasProperty)(this.entities, child.name)) {
+              if ((0, import_chunk_JDC43A3I.hasProperty)(this.entities, child.name)) {
                 result.push(
                   this.processRefs(referenceList(this.entities[child.name].value))
                 );
@@ -3273,13 +3273,13 @@ var init_xml_util = (0, import_chunk_ABYVSU2C.__esm)({
               } else if (hexref) {
                 return String.fromCharCode(parseInt(decref, 16));
               } else if (entref) {
-                if ((0, import_chunk_MBTLUWXR.hasProperty)(entities, entref)) {
+                if ((0, import_chunk_JDC43A3I.hasProperty)(entities, entref)) {
                   return entities[entref];
                 }
-                if ((0, import_chunk_MBTLUWXR.hasProperty)(this.entities, entref)) {
+                if ((0, import_chunk_JDC43A3I.hasProperty)(this.entities, entref)) {
                   return referenceList(this.entities[entref].value);
                 }
-              } else if ((0, import_chunk_MBTLUWXR.hasProperty)(this.pentities, peref)) {
+              } else if ((0, import_chunk_JDC43A3I.hasProperty)(this.pentities, peref)) {
                 return referenceList(this.pentities[peref].value);
               }
               return "";
@@ -5526,7 +5526,7 @@ function findCallees(lookupDefs) {
 }
 function findCalleesForNew(lookupDefs) {
   const initializer = (decl) => {
-    if ((0, import_chunk_MBTLUWXR.hasProperty)(decl.decls, "initialize")) {
+    if ((0, import_chunk_JDC43A3I.hasProperty)(decl.decls, "initialize")) {
       return decl.decls["initialize"];
     }
     if (decl.superClass && decl.superClass !== true) {
@@ -5554,12 +5554,12 @@ function findCalleesByNode(state, callee) {
   const name = callee.type === "Identifier" ? callee.name : callee.type === "MemberExpression" && !callee.computed ? callee.property.name : null;
   if (!name)
     return null;
-  return (0, import_chunk_MBTLUWXR.hasProperty)(state.allFunctions, name) && state.allFunctions[name] || null;
+  return (0, import_chunk_JDC43A3I.hasProperty)(state.allFunctions, name) && state.allFunctions[name] || null;
 }
 var init_function_info = (0, import_chunk_ABYVSU2C.__esm)({
   "src/function-info.ts"() {
     "use strict";
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
   }
 });
 var buildConfigDescription;
@@ -5883,7 +5883,7 @@ function renameIdentifier(ident, newName) {
 function renameVariable(state, locals, declName2) {
   const map2 = locals.map;
   if (declName2) {
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(map2, declName2))
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(map2, declName2))
       return null;
   } else {
     declName2 = "tmp";
@@ -5898,7 +5898,7 @@ function renameVariable(state, locals, declName2) {
   if (!locals.inners) {
     locals.inners = {};
     const inners = locals.inners;
-    (0, import_chunk_MBTLUWXR.traverseAst)(locals.node, (node) => {
+    (0, import_chunk_JDC43A3I.traverseAst)(locals.node, (node) => {
       if (node.type === "VariableDeclarator") {
         inners[variableDeclarationName(node.id)] = true;
       }
@@ -5907,13 +5907,13 @@ function renameVariable(state, locals, declName2) {
   let name;
   while (true) {
     name = `pmcr_${node_name}_${suffix}`;
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(map2, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(locals.inners, name)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(map2, name) && !(0, import_chunk_JDC43A3I.hasProperty)(locals.inners, name)) {
       let ok = false;
       let i;
       for (i = state.stack.length; i--; ) {
         const elm = state.stack[i].sn;
         if (ok) {
-          if ((0, import_chunk_MBTLUWXR.hasProperty)(elm.decls, name)) {
+          if ((0, import_chunk_JDC43A3I.hasProperty)(elm.decls, name)) {
             break;
           }
         } else if (elm.node && elm.node.type === "FunctionDeclaration") {
@@ -5934,7 +5934,7 @@ var init_variable_renamer = (0, import_chunk_ABYVSU2C.__esm)({
   "src/variable-renamer.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
   }
 });
 function inlinableSubExpression(expr) {
@@ -6070,7 +6070,7 @@ function getArgSafety(state, func, args, requireAll) {
         case "AssignmentExpression":
         case "UpdateExpression": {
           const v = node.type === "UpdateExpression" ? node.argument : node.left;
-          if (v.type === "Identifier" && (0, import_chunk_MBTLUWXR.hasProperty)(params, v.name)) {
+          if (v.type === "Identifier" && (0, import_chunk_JDC43A3I.hasProperty)(params, v.name)) {
             safeArgs[params[v.name]] = null;
             break;
           }
@@ -6116,7 +6116,7 @@ function getArgSafety(state, func, args, requireAll) {
           }
           break;
         case "Identifier":
-          if ((0, import_chunk_MBTLUWXR.hasProperty)(params, node.name) && !safeArgs[params[node.name]] && (modifiedUnknown || !argDecls[params[node.name]] || modifiedDecls.has(argDecls[params[node.name]]) || Array.from(callsSeen).some(
+          if ((0, import_chunk_JDC43A3I.hasProperty)(params, node.name) && !safeArgs[params[node.name]] && (modifiedUnknown || !argDecls[params[node.name]] || modifiedDecls.has(argDecls[params[node.name]]) || Array.from(callsSeen).some(
             (callee) => functionMayModify(state, callee, argDecls[params[node.name]])
           ))) {
             safeArgs[params[node.name]] = null;
@@ -6195,7 +6195,7 @@ function inliningLooksUseful(state, func, node) {
 function inlineRequestedNode(state, func) {
   const excludeAnnotations = func.loc?.source && state.fnMap[func.loc?.source]?.excludeAnnotations || {};
   if (func.attrs && func.attrs.attributes && func.attrs.attributes.elements.some(
-    (attr) => attr.type === "UnaryExpression" && (attr.argument.name === "inline" || attr.argument.name.startsWith("inline_") && !(0, import_chunk_MBTLUWXR.hasProperty)(excludeAnnotations, attr.argument.name.substring(7)))
+    (attr) => attr.type === "UnaryExpression" && (attr.argument.name === "inline" || attr.argument.name.startsWith("inline_") && !(0, import_chunk_JDC43A3I.hasProperty)(excludeAnnotations, attr.argument.name.substring(7)))
   )) {
     return true;
   }
@@ -6309,7 +6309,7 @@ function processInlineBody(state, func, call, root, params) {
     const fixId = (node) => {
       if (state.inType)
         return null;
-      if ((0, import_chunk_MBTLUWXR.hasProperty)(params, node.name)) {
+      if ((0, import_chunk_JDC43A3I.hasProperty)(params, node.name)) {
         const ix = params[node.name];
         if (ix >= 0) {
           const replacement2 = { ...call.arguments[ix] };
@@ -6379,7 +6379,7 @@ function processInlineBody(state, func, call, root, params) {
   }
 }
 function unused(state, expression, top) {
-  const estmt = (expression2) => (0, import_chunk_MBTLUWXR.withLoc)(
+  const estmt = (expression2) => (0, import_chunk_JDC43A3I.withLoc)(
     {
       type: "ExpressionStatement",
       expression: expression2
@@ -6404,7 +6404,7 @@ function unused(state, expression, top) {
       const right = unused(state, expression.right);
       if (!right.length)
         return unused(state, expression.left);
-      const consequent = (0, import_chunk_MBTLUWXR.withLoc)(
+      const consequent = (0, import_chunk_JDC43A3I.withLoc)(
         {
           type: "BlockStatement",
           body: [estmt(expression.right)]
@@ -6417,7 +6417,7 @@ function unused(state, expression, top) {
         consequent.body = [];
       }
       return [
-        (0, import_chunk_MBTLUWXR.withLoc)(
+        (0, import_chunk_JDC43A3I.withLoc)(
           {
             type: "IfStatement",
             test: expression.left,
@@ -6435,18 +6435,18 @@ function unused(state, expression, top) {
         return unused(state, expression.test);
       }
       return [
-        (0, import_chunk_MBTLUWXR.withLoc)(
+        (0, import_chunk_JDC43A3I.withLoc)(
           {
             type: "IfStatement",
             test: expression.test,
-            consequent: (0, import_chunk_MBTLUWXR.withLoc)(
+            consequent: (0, import_chunk_JDC43A3I.withLoc)(
               {
                 type: "BlockStatement",
                 body: consequentExprs
               },
               expression.consequent
             ),
-            alternate: (0, import_chunk_MBTLUWXR.withLoc)(
+            alternate: (0, import_chunk_JDC43A3I.withLoc)(
               {
                 type: "BlockStatement",
                 body: alternateExprs
@@ -6514,7 +6514,7 @@ function inlineWithArgs(state, func, call, context) {
       return null;
     }
   } else {
-    (0, import_chunk_MBTLUWXR.traverseAst)(func.node.body, (node) => {
+    (0, import_chunk_JDC43A3I.traverseAst)(func.node.body, (node) => {
       node.type === "ReturnStatement" && retStmtCount++;
     });
     if (retStmtCount > 1) {
@@ -6548,7 +6548,7 @@ function inlineWithArgs(state, func, call, context) {
       }
     }
   }
-  const body = (0, import_chunk_MBTLUWXR.cloneDeep)(func.node.body);
+  const body = (0, import_chunk_JDC43A3I.cloneDeep)(func.node.body);
   const safeArgs = getArgSafety(state, func, call.arguments, false);
   const params = Object.fromEntries(
     func.node.params.map((param, i) => {
@@ -6636,7 +6636,7 @@ function updateLocationForInline(node, original, context, func) {
   if (!loc) {
     throw new Error("Internal error: Inlined call had no location info");
   }
-  (0, import_chunk_MBTLUWXR.traverseAst)(node, (node2) => {
+  (0, import_chunk_JDC43A3I.traverseAst)(node, (node2) => {
     if (!node2.loc || node2.loc.source !== loc.source || node2.loc.start.offset > loc.end.offset || node2.loc.end.offset <= loc.start.offset) {
       if (node2.loc) {
         if (!node2.origins) {
@@ -6644,7 +6644,7 @@ function updateLocationForInline(node, original, context, func) {
         }
         node2.origins.unshift({ loc: node2.loc, func: func.fullName });
       }
-      (0, import_chunk_MBTLUWXR.withLoc)(node2, context, context === original ? context : false);
+      (0, import_chunk_JDC43A3I.withLoc)(node2, context, context === original ? context : false);
     }
   });
   return node;
@@ -6656,7 +6656,7 @@ function inlineFunctionHelper(state, func, call, context) {
   if (context) {
     return inlineWithArgs(state, func, call, context);
   }
-  const retArg = (0, import_chunk_MBTLUWXR.cloneDeep)(
+  const retArg = (0, import_chunk_JDC43A3I.cloneDeep)(
     func.node.body.body[0].argument
   );
   const params = Object.fromEntries(
@@ -6693,7 +6693,7 @@ function inlineFunction(state, func, call, context) {
     return ret;
   }
   if (!caller.attrs) {
-    caller.attrs = (0, import_chunk_MBTLUWXR.withLoc)(
+    caller.attrs = (0, import_chunk_JDC43A3I.withLoc)(
       {
         type: "AttributeList"
       },
@@ -6702,7 +6702,7 @@ function inlineFunction(state, func, call, context) {
     );
   }
   if (!caller.attrs.attributes) {
-    caller.attrs.attributes = (0, import_chunk_MBTLUWXR.withLoc)(
+    caller.attrs.attributes = (0, import_chunk_JDC43A3I.withLoc)(
       { type: "Attributes", elements: [] },
       caller.attrs,
       false
@@ -6710,7 +6710,7 @@ function inlineFunction(state, func, call, context) {
   }
   caller.attrs.attributes.elements.unshift(
     ...typecheckAttrs.map(
-      (typecheck) => (0, import_chunk_MBTLUWXR.withLocDeep)({ ...typecheck }, caller.attrs, false)
+      (typecheck) => (0, import_chunk_JDC43A3I.withLocDeep)({ ...typecheck }, caller.attrs, false)
     )
   );
   return ret;
@@ -6732,7 +6732,7 @@ function fixNodeScope(state, lookupNode, nodeStack) {
     const { map: map2 } = locals;
     if (!map2)
       throw new Error("No local variable map!");
-    if ((0, import_chunk_MBTLUWXR.hasProperty)(map2, lookupNode.name) && map2[lookupNode.name] !== false) {
+    if ((0, import_chunk_JDC43A3I.hasProperty)(map2, lookupNode.name) && map2[lookupNode.name] !== false) {
       return lookupNode;
     }
   }
@@ -6812,7 +6812,7 @@ function fixNodeScope(state, lookupNode, nodeStack) {
   return null;
 }
 function reportFailedInlining(state, ast) {
-  (0, import_chunk_MBTLUWXR.traverseAst)(ast, (node) => {
+  (0, import_chunk_JDC43A3I.traverseAst)(ast, (node) => {
     switch (node.type) {
       case "FunctionDeclaration":
         if (inlineRequestedNode(state, node)) {
@@ -6837,7 +6837,7 @@ var init_inliner = (0, import_chunk_ABYVSU2C.__esm)({
   "src/inliner.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_function_info();
     init_optimizer_types();
     init_variable_renamer();
@@ -6907,7 +6907,7 @@ function pragmaChecker(state, ast, diagnostics) {
   };
   next();
   let promise = Promise.resolve();
-  (0, import_chunk_MBTLUWXR.traverseAst)(ast, (node) => {
+  (0, import_chunk_JDC43A3I.traverseAst)(ast, (node) => {
     if (index >= comments.length || node.type === "Line" || node.type === "Block" || node.type === "MultiLine") {
       return false;
     }
@@ -6987,7 +6987,7 @@ var init_pragma_checker = (0, import_chunk_ABYVSU2C.__esm)({
   "src/pragma-checker.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
   }
 });
 function buildReducedGraph(state, func, refsForUpdate, notice) {
@@ -7006,14 +7006,14 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
       if (state.inType || localState.unreachable) {
         return [];
       }
-      if (!localState.curBlock.node && ((0, import_chunk_MBTLUWXR.isStatement)(node) || (0, import_chunk_MBTLUWXR.isExpression)(node))) {
+      if (!localState.curBlock.node && ((0, import_chunk_JDC43A3I.isStatement)(node) || (0, import_chunk_JDC43A3I.isExpression)(node))) {
         localState.curBlock.node = node;
       }
       let topTest = testStack[testStack.length - 1];
       if (topTest.node !== node && topTest.true) {
         testStack.push(topTest = { node });
       }
-      if ((0, import_chunk_MBTLUWXR.isStatement)(node)) {
+      if ((0, import_chunk_JDC43A3I.isStatement)(node)) {
         stmtStack.push(node);
       }
       switch (node.type) {
@@ -7330,7 +7330,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
       const curStmt = stmtStack[stmtStack.length - 1];
       const topTest = testStack[testStack.length - 1];
       if (!state.inType) {
-        const throws = tryActive > 0 && (0, import_chunk_MBTLUWXR.mayThrow)(node);
+        const throws = tryActive > 0 && (0, import_chunk_JDC43A3I.mayThrow)(node);
         const events = notice(node, curStmt, throws, getContainedEvents);
         if (throws) {
           if (!events) {
@@ -7391,7 +7391,7 @@ function buildReducedGraph(state, func, refsForUpdate, notice) {
       }
       if (curStmt === node) {
         stmtStack.pop();
-      } else if (localState.unreachable && curStmt.type === "BlockStatement" && (0, import_chunk_MBTLUWXR.isStatement)(node)) {
+      } else if (localState.unreachable && curStmt.type === "BlockStatement" && (0, import_chunk_JDC43A3I.isStatement)(node)) {
         return false;
       }
       return null;
@@ -7485,7 +7485,7 @@ var Terminals, LocalState;
 var init_control_flow = (0, import_chunk_ABYVSU2C.__esm)({
   "src/control-flow.ts"() {
     "use strict";
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     (0, import_chunk_OASVKTK5.init_util)();
     Terminals = {
       BreakStatement: "break",
@@ -7853,7 +7853,7 @@ function mergeObjectValues(to, from) {
   let empty = true;
   let result = to;
   Object.entries(to).forEach(([key, value2]) => {
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(from, key)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(from, key)) {
       if (result === to)
         result = { ...result };
       delete result[key];
@@ -8041,7 +8041,7 @@ function widenType(t) {
 var init_union_type = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/union-type.ts"() {
     "use strict";
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
     (0, import_chunk_OASVKTK5.init_util)();
     init_could_be();
@@ -8309,7 +8309,7 @@ function intersectObj(to, from) {
     return to;
   let result = to;
   Object.entries(from).forEach(([key, value2]) => {
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(to, key)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(to, key)) {
       if (result === to)
         result = { ...result };
       result[key] = value2;
@@ -8724,7 +8724,7 @@ function subtypeOfObj(a, b) {
   if (!a || !b)
     return true;
   return Object.entries(b).every(([key, value2]) => {
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(a, key))
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(a, key))
       return false;
     return subtypeOf(a[key], value2);
   });
@@ -9282,7 +9282,7 @@ function filterDecls(decls, possible, name) {
                   cur[1].add(poss);
                   break;
                 }
-                if ((0, import_chunk_MBTLUWXR.hasProperty)(sn.decls, name)) {
+                if ((0, import_chunk_JDC43A3I.hasProperty)(sn.decls, name)) {
                   break;
                 }
               }
@@ -9308,7 +9308,7 @@ function findObjectDeclsByProperty(state, object, next) {
   const decls = getStateNodeDeclsFromType(state, object);
   if (!decls)
     return [null, null];
-  const possibleDecls = (0, import_chunk_MBTLUWXR.hasProperty)(state.allDeclarations, next.name) && state.allDeclarations[next.name];
+  const possibleDecls = (0, import_chunk_JDC43A3I.hasProperty)(state.allDeclarations, next.name) && state.allDeclarations[next.name];
   return filterDecls(decls, possibleDecls, next.name);
 }
 function refineObjectTypeByDecls(istate, object, trueDecls) {
@@ -9581,7 +9581,7 @@ function isOverride(cur, funcs) {
 }
 function sysCallInfo(state, func) {
   const info = getSystemCallTable(state);
-  if ((0, import_chunk_MBTLUWXR.hasProperty)(info, func.fullName)) {
+  if ((0, import_chunk_JDC43A3I.hasProperty)(info, func.fullName)) {
     return info[func.fullName];
   }
   return null;
@@ -9922,7 +9922,7 @@ function getSystemCallTable(state) {
   };
   const mathHelper = (state2, callee, calleeObj, getArgs, helper) => {
     const results = {};
-    const fn = helper && typeof helper === "function" ? helper : (0, import_chunk_MBTLUWXR.hasProperty)(Math, helper || callee.name) && Math[helper || callee.name];
+    const fn = helper && typeof helper === "function" ? helper : (0, import_chunk_JDC43A3I.hasProperty)(Math, helper || callee.name) && Math[helper || callee.name];
     if (fn && typeof fn === "function") {
       results.effectFree = true;
       const args = getArgs();
@@ -10051,7 +10051,7 @@ function expandKeys(state, table) {
       );
       decls.forEach((decl) => {
         if (decl.type === "FunctionDeclaration") {
-          if (!(0, import_chunk_MBTLUWXR.hasProperty)(result, decl.fullName)) {
+          if (!(0, import_chunk_JDC43A3I.hasProperty)(result, decl.fullName)) {
             result[decl.fullName] = value2;
           }
         }
@@ -10256,9 +10256,9 @@ function evaluate(istate, node) {
     }
     return null;
   };
-  (0, import_chunk_MBTLUWXR.traverseAst)(node, pre, post);
+  (0, import_chunk_JDC43A3I.traverseAst)(node, pre, post);
   const ret = istate.stack.pop();
-  if ((0, import_chunk_MBTLUWXR.isExpression)(node)) {
+  if ((0, import_chunk_JDC43A3I.isExpression)(node)) {
     if (!ret || node !== ret.node) {
       throw new Error("evaluate failed to produce a value for an expression");
     }
@@ -11200,7 +11200,7 @@ var init_interp = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/interp.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
     init_optimizer_types();
     (0, import_chunk_OASVKTK5.init_util)();
@@ -11459,7 +11459,7 @@ function typeFromTypeStateNode(state, sn, classVsObj) {
         declared = typeFromTypespec(state, sn.node.id.right, sn.stack);
       }
       if (sn.node.kind === "const" && sn.node.init) {
-        if ((0, import_chunk_MBTLUWXR.hasProperty)(sn, "resolvedType")) {
+        if ((0, import_chunk_JDC43A3I.hasProperty)(sn, "resolvedType")) {
           return declared ?? {
             type: 524287
             /* Any */
@@ -11640,7 +11640,7 @@ function typeFromSingleTypeSpec(state, type, stack) {
           value: { result, args }
         };
       }
-      const id = typeof type.name === "string" ? (0, import_chunk_MBTLUWXR.makeScopedName)(type.name) : type.name;
+      const id = typeof type.name === "string" ? (0, import_chunk_JDC43A3I.makeScopedName)(type.name) : type.name;
       const [, results] = state.lookupType(id, null, stack);
       if (!results) {
         if (id.type === "Identifier") {
@@ -11719,7 +11719,7 @@ function typeFromTypespec(state, ts, stack) {
   );
 }
 function typeFromLiteral(literal) {
-  const [value2, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(literal);
+  const [value2, type] = (0, import_chunk_JDC43A3I.getNodeValue)(literal);
   switch (type) {
     case "Null":
       return {
@@ -12126,7 +12126,7 @@ var init_types = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     init_data_flow();
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     (0, import_chunk_OASVKTK5.init_util)();
     init_interp();
     init_union_type();
@@ -12290,7 +12290,7 @@ function couldBeObj(a, b) {
   if (!a || !b)
     return true;
   return Object.entries(a).every(([key, value2]) => {
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(b, key))
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(b, key))
       return true;
     return couldBe(value2, b[key]);
   });
@@ -12588,7 +12588,7 @@ function eliminateDeadStores(state, func, graph, logThisRun) {
     );
   }
   let changes = false;
-  (0, import_chunk_MBTLUWXR.traverseAst)(func.node.body, null, (node) => {
+  (0, import_chunk_JDC43A3I.traverseAst)(func.node.body, null, (node) => {
     const cleaned = variableCleanup(node);
     if (cleaned !== null)
       return cleaned;
@@ -12598,7 +12598,7 @@ function eliminateDeadStores(state, func, graph, logThisRun) {
       );
       changes = true;
       if (body.length) {
-        return (0, import_chunk_MBTLUWXR.withLoc)({ type: "BlockStatement", body }, node, node);
+        return (0, import_chunk_JDC43A3I.withLoc)({ type: "BlockStatement", body }, node, node);
       }
       return false;
     }
@@ -12631,7 +12631,7 @@ var init_dead_store = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/dead-store.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_control_flow();
     init_data_flow();
     init_inliner();
@@ -13087,7 +13087,7 @@ function updateAffected(blockState, objectType, baseDecl, assignedPath, affected
           type = newType;
         } else {
           const objValue = getObjectValue(type);
-          if (!objValue || !(0, import_chunk_MBTLUWXR.hasProperty)(objValue.obj, pathItem)) {
+          if (!objValue || !(0, import_chunk_JDC43A3I.hasProperty)(objValue.obj, pathItem)) {
             break;
           }
           type = objValue.obj[pathItem];
@@ -13150,7 +13150,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         const value2 = getObjectValue(cur);
         if (i === l && newValue) {
           next = newValue;
-        } else if (value2 && (0, import_chunk_MBTLUWXR.hasProperty)(value2.obj, me.property.name)) {
+        } else if (value2 && (0, import_chunk_JDC43A3I.hasProperty)(value2.obj, me.property.name)) {
           next = value2.obj[me.property.name];
         } else {
           const [objDecls, trueDecls] = findObjectDeclsByProperty(
@@ -14317,16 +14317,16 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
         }
       })
     );
-    (0, import_chunk_MBTLUWXR.traverseAst)(
+    (0, import_chunk_JDC43A3I.traverseAst)(
       func.node.body,
       (node) => {
         if (node.type === "AssignmentExpression" && node.operator !== "=" && nodeCopyProp.has(node.left)) {
-          const left = (0, import_chunk_MBTLUWXR.cloneDeep)(node.left);
-          const right = (0, import_chunk_MBTLUWXR.withLoc)(
+          const left = (0, import_chunk_JDC43A3I.cloneDeep)(node.left);
+          const right = (0, import_chunk_JDC43A3I.withLoc)(
             {
               type: "BinaryExpression",
               operator: node.operator.slice(0, -1),
-              left: (0, import_chunk_MBTLUWXR.withLocDeep)(node.left, node.right, false, true),
+              left: (0, import_chunk_JDC43A3I.withLocDeep)(node.left, node.right, false, true),
               right: node.right
             },
             node.left,
@@ -14348,7 +14348,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                 )
               );
             }
-            return (0, import_chunk_MBTLUWXR.withLoc)(
+            return (0, import_chunk_JDC43A3I.withLoc)(
               { type: "Literal", value: null, raw: "null" },
               node,
               node
@@ -14386,7 +14386,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                 )
               );
             }
-            return (0, import_chunk_MBTLUWXR.withLocDeep)(replacement2, node, node, false);
+            return (0, import_chunk_JDC43A3I.withLocDeep)(replacement2, node, node, false);
           } else if (copyNode.type === "VariableDeclarator") {
             const init = copyNode.init;
             (0, import_node_assert3.default)(init);
@@ -14399,7 +14399,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
                 )
               );
             }
-            return (0, import_chunk_MBTLUWXR.withLocDeep)(init, node, node, false);
+            return (0, import_chunk_JDC43A3I.withLocDeep)(init, node, node, false);
           }
           (0, import_node_assert3.default)(false);
         }
@@ -14413,7 +14413,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
               )
             );
           }
-          return (0, import_chunk_MBTLUWXR.withLoc)(
+          return (0, import_chunk_JDC43A3I.withLoc)(
             { type: "Literal", value: null, raw: "null" },
             node,
             node
@@ -14465,7 +14465,7 @@ function propagateTypes(state, func, graph, optimizeEquivalencies, copyPropStore
             )
           );
         }
-        const replacement = (0, import_chunk_MBTLUWXR.withLoc)({ type: "Identifier", name }, node, node);
+        const replacement = (0, import_chunk_JDC43A3I.withLoc)({ type: "Identifier", name }, node, node);
         const tm = typeMap.get(node);
         if (tm)
           typeMap.set(replacement, tm);
@@ -14573,7 +14573,7 @@ var init_type_flow = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_control_flow();
     init_data_flow();
     init_function_info();
@@ -14712,11 +14712,11 @@ function minimizeLocals(state, func) {
       };
       if (sn.node.body.length && sn.node.body[0].type === "VariableDeclaration") {
         sn.node.body[0].declarations.unshift(
-          (0, import_chunk_MBTLUWXR.withLocDeep)(varDecl, sn.node.body[0], false, true)
+          (0, import_chunk_JDC43A3I.withLocDeep)(varDecl, sn.node.body[0], false, true)
         );
       } else {
         sn.node.body.unshift(
-          (0, import_chunk_MBTLUWXR.withLocDeep)(
+          (0, import_chunk_JDC43A3I.withLocDeep)(
             {
               type: "VariableDeclaration",
               declarations: [varDecl],
@@ -14743,7 +14743,7 @@ function minimizeLocals(state, func) {
       nodeMap.set(event.node, rep);
     })
   );
-  (0, import_chunk_MBTLUWXR.traverseAst)(func.node.body, null, (node) => {
+  (0, import_chunk_JDC43A3I.traverseAst)(func.node.body, null, (node) => {
     const info = nodeMap.get(node);
     switch (node.type) {
       case "Identifier":
@@ -14755,7 +14755,7 @@ function minimizeLocals(state, func) {
         if (info) {
           (0, import_node_assert4.default)(node.left.type === "Identifier");
           if (node.right.type === "Identifier" && node.right.name === info.name && node.operator === "=") {
-            return (0, import_chunk_MBTLUWXR.withLoc)(
+            return (0, import_chunk_JDC43A3I.withLoc)(
               { type: "Literal", value: null, raw: "null" },
               node,
               node
@@ -14784,11 +14784,11 @@ function minimizeLocals(state, func) {
           if (node.init.type === "Identifier" && node.init.name === info.name) {
             return false;
           }
-          return (0, import_chunk_MBTLUWXR.withLoc)(
+          return (0, import_chunk_JDC43A3I.withLoc)(
             {
               type: "AssignmentExpression",
               operator: "=",
-              left: (0, import_chunk_MBTLUWXR.withLoc)(
+              left: (0, import_chunk_JDC43A3I.withLoc)(
                 {
                   type: "Identifier",
                   name: info.name,
@@ -14824,11 +14824,11 @@ function variableCleanup(node) {
         const results = [];
         node.declarations.forEach(
           (decl) => {
-            if ((0, import_chunk_MBTLUWXR.isStatement)(decl)) {
+            if ((0, import_chunk_JDC43A3I.isStatement)(decl)) {
               results.push(decl);
-            } else if ((0, import_chunk_MBTLUWXR.isExpression)(decl)) {
+            } else if ((0, import_chunk_JDC43A3I.isExpression)(decl)) {
               results.push(
-                (0, import_chunk_MBTLUWXR.withLoc)(
+                (0, import_chunk_JDC43A3I.withLoc)(
                   { type: "ExpressionStatement", expression: decl },
                   decl,
                   decl
@@ -14836,14 +14836,14 @@ function variableCleanup(node) {
               );
             } else if (decl.init) {
               results.push(
-                (0, import_chunk_MBTLUWXR.withLoc)(
+                (0, import_chunk_JDC43A3I.withLoc)(
                   {
                     type: "ExpressionStatement",
-                    expression: (0, import_chunk_MBTLUWXR.withLoc)(
+                    expression: (0, import_chunk_JDC43A3I.withLoc)(
                       {
                         type: "AssignmentExpression",
                         operator: "=",
-                        left: (0, import_chunk_MBTLUWXR.withLoc)(
+                        left: (0, import_chunk_JDC43A3I.withLoc)(
                           {
                             type: "Identifier",
                             name: variableDeclarationName(decl.id)
@@ -14872,7 +14872,7 @@ function variableCleanup(node) {
           return false;
         });
         if (node.declarations.length) {
-          (0, import_chunk_MBTLUWXR.withLocDeep)(node, node, false);
+          (0, import_chunk_JDC43A3I.withLocDeep)(node, node, false);
           results.unshift(node);
         }
         return results;
@@ -14909,7 +14909,7 @@ var init_minimize_locals = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/minimize-locals.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_control_flow();
     init_type_flow();
     (0, import_chunk_OASVKTK5.init_util)();
@@ -14950,7 +14950,7 @@ async function sizeBasedPRE(state, func) {
     }
     const nodeMap = /* @__PURE__ */ new Map();
     const declMap = /* @__PURE__ */ new Map();
-    const variableDecl = (0, import_chunk_MBTLUWXR.withLoc)(
+    const variableDecl = (0, import_chunk_JDC43A3I.withLoc)(
       {
         type: "VariableDeclaration",
         declarations: [],
@@ -14976,10 +14976,10 @@ async function sizeBasedPRE(state, func) {
       declMap.set(decl, name);
       const s = candidates.get(decl);
       variableDecl.declarations.push(
-        (0, import_chunk_MBTLUWXR.withLoc)(
+        (0, import_chunk_JDC43A3I.withLoc)(
           {
             type: "VariableDeclarator",
-            id: (0, import_chunk_MBTLUWXR.withLoc)({ type: "Identifier", name }, variableDecl),
+            id: (0, import_chunk_JDC43A3I.withLoc)({ type: "Identifier", name }, variableDecl),
             kind: "var"
           },
           variableDecl
@@ -15410,14 +15410,14 @@ function computeAttributes(state, head) {
 }
 function applyReplacements(func, nodeMap, declMap) {
   const ident = (name, node) => {
-    return (0, import_chunk_MBTLUWXR.withLoc)({ type: "Identifier", name }, node);
+    return (0, import_chunk_JDC43A3I.withLoc)({ type: "Identifier", name }, node);
   };
   const pendingMap = /* @__PURE__ */ new Map();
   const stmtStack = [func];
-  (0, import_chunk_MBTLUWXR.traverseAst)(
+  (0, import_chunk_JDC43A3I.traverseAst)(
     func,
     (node) => {
-      if ((0, import_chunk_MBTLUWXR.isStatement)(node)) {
+      if ((0, import_chunk_JDC43A3I.isStatement)(node)) {
         stmtStack.push(node);
       }
     },
@@ -15470,7 +15470,7 @@ function applyReplacements(func, nodeMap, declMap) {
               );
             }
             const id = ident(name, target);
-            const assign = (0, import_chunk_MBTLUWXR.withLoc)(
+            const assign = (0, import_chunk_JDC43A3I.withLoc)(
               {
                 type: "AssignmentExpression",
                 left: target,
@@ -15484,7 +15484,7 @@ function applyReplacements(func, nodeMap, declMap) {
             } else {
               node.argument = id;
             }
-            return (0, import_chunk_MBTLUWXR.withLoc)(
+            return (0, import_chunk_JDC43A3I.withLoc)(
               { type: "SequenceExpression", expressions: [node, assign] },
               node
             );
@@ -15539,15 +15539,15 @@ function applyReplacements(func, nodeMap, declMap) {
               )
             );
           }
-          const rhs = (0, import_chunk_MBTLUWXR.withLocDeep)(event.id, locNode, locNode);
+          const rhs = (0, import_chunk_JDC43A3I.withLocDeep)(event.id, locNode, locNode);
           rhs.end = rhs.start;
           if (rhs.loc) {
             rhs.loc.end = rhs.loc.start;
           }
-          const insertion = (0, import_chunk_MBTLUWXR.withLoc)(
+          const insertion = (0, import_chunk_JDC43A3I.withLoc)(
             {
               type: "ExpressionStatement",
-              expression: (0, import_chunk_MBTLUWXR.withLoc)(
+              expression: (0, import_chunk_JDC43A3I.withLoc)(
                 {
                   type: "AssignmentExpression",
                   left: ident(name, rhs),
@@ -15593,7 +15593,7 @@ var init_pre = (0, import_chunk_ABYVSU2C.__esm)({
   "src/pre.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_control_flow();
     init_data_flow();
     init_function_info();
@@ -15712,9 +15712,9 @@ function minimizeModules(ast, state) {
       delete repl.computed;
     });
     mappedNames.forEach((name, module2) => {
-      const id = (0, import_chunk_MBTLUWXR.makeScopedName)(module2.fullName.slice(2));
-      const as = name !== (id.type === "Identifier" ? id : id.property).name && (0, import_chunk_MBTLUWXR.makeIdentifier)(name);
-      const using = (0, import_chunk_MBTLUWXR.withLocDeep)(
+      const id = (0, import_chunk_JDC43A3I.makeScopedName)(module2.fullName.slice(2));
+      const as = name !== (id.type === "Identifier" ? id : id.property).name && (0, import_chunk_JDC43A3I.makeIdentifier)(name);
+      const using = (0, import_chunk_JDC43A3I.withLocDeep)(
         as ? { type: "Using", id, as } : { type: "Using", id },
         ast,
         false,
@@ -15782,7 +15782,7 @@ var init_minimize_modules = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/minimize-modules.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
   }
 });
 function beforeEvaluate(istate, node) {
@@ -15793,7 +15793,7 @@ function beforeEvaluate(istate, node) {
         if (expression.embeddedEffects) {
           istate.stack.push(expression);
         } else {
-          const rep = (0, import_chunk_MBTLUWXR.withLoc)(
+          const rep = (0, import_chunk_JDC43A3I.withLoc)(
             { type: "Literal", value: null, raw: "null" },
             node,
             node
@@ -15834,7 +15834,7 @@ function beforeEvaluate(istate, node) {
       }
       if (test.value.type === 6 && (consequent.value.type === 4 && alternate.value.type === 2 || consequent.value.type === 2 && alternate.value.type === 4) && !consequent.embeddedEffects && !alternate.embeddedEffects) {
         if (consequent.value.type === 2) {
-          test.node = (0, import_chunk_MBTLUWXR.wrap)(
+          test.node = (0, import_chunk_JDC43A3I.wrap)(
             {
               type: "UnaryExpression",
               operator: "!",
@@ -15856,7 +15856,7 @@ function beforeEvaluate(istate, node) {
       }
       const test = popIstate(istate, node.test);
       if (!node.alternate && node.consequent.type === "BlockStatement" && !node.consequent.body.length) {
-        const ret = (0, import_chunk_MBTLUWXR.withLoc)(node.consequent, node.test, node.test);
+        const ret = (0, import_chunk_JDC43A3I.withLoc)(node.consequent, node.test, node.test);
         const u = test.embeddedEffects && unused(istate.state, node.test);
         if (u) {
           node.consequent.body = u;
@@ -15869,7 +15869,7 @@ function beforeEvaluate(istate, node) {
         if (!test.embeddedEffects) {
           return rep;
         }
-        const estmt = (0, import_chunk_MBTLUWXR.wrap)(
+        const estmt = (0, import_chunk_JDC43A3I.wrap)(
           { type: "ExpressionStatement", expression: node.test },
           node.loc
         );
@@ -15899,7 +15899,7 @@ function beforeEvaluate(istate, node) {
         }
         let ok = true;
         let switchDepth = 0;
-        (0, import_chunk_MBTLUWXR.traverseAst)(
+        (0, import_chunk_JDC43A3I.traverseAst)(
           node.body,
           (n) => {
             if (!ok)
@@ -15943,11 +15943,11 @@ function beforeEvaluate(istate, node) {
         const [arg] = istate.stack.slice(-1);
         if ((arg.value.type & 120) === arg.value.type && arg.value.value == null) {
           const leftType = { type: 8, value: 0 };
-          const rep = (0, import_chunk_MBTLUWXR.withLoc)(
+          const rep = (0, import_chunk_JDC43A3I.withLoc)(
             {
               type: "BinaryExpression",
               operator: "-",
-              left: (0, import_chunk_MBTLUWXR.withLoc)(mcExprFromType(leftType), node.argument, false),
+              left: (0, import_chunk_JDC43A3I.withLoc)(mcExprFromType(leftType), node.argument, false),
               right: node.argument
             },
             node
@@ -15970,7 +15970,7 @@ function beforeEvaluate(istate, node) {
         }
         const id = node.right.argument;
         if ((0, import_chunk_OASVKTK5.every)(left.value.value, (m) => {
-          if ((0, import_chunk_MBTLUWXR.hasProperty)(m.decls, id.name))
+          if ((0, import_chunk_JDC43A3I.hasProperty)(m.decls, id.name))
             return false;
           return istate.state.lookup({
             type: "MemberExpression",
@@ -15981,7 +15981,7 @@ function beforeEvaluate(istate, node) {
         })) {
           popIstate(istate, node.right);
           popIstate(istate, node.left);
-          const rep = (0, import_chunk_MBTLUWXR.wrap)(
+          const rep = (0, import_chunk_JDC43A3I.wrap)(
             { type: "Literal", value: false, raw: "false" },
             node.loc
           );
@@ -16098,7 +16098,7 @@ function beforeEvaluate(istate, node) {
         if (selfAssign) {
           popIstate(istate, node.right);
           popIstate(istate, node.left);
-          const rep = (0, import_chunk_MBTLUWXR.withLoc)(
+          const rep = (0, import_chunk_JDC43A3I.withLoc)(
             { type: "Literal", value: null, raw: "null" },
             node,
             node
@@ -16120,13 +16120,13 @@ function beforeEvaluate(istate, node) {
   return null;
 }
 function afterEvaluate(istate, node) {
-  if ((0, import_chunk_MBTLUWXR.isExpression)(node) && node.type !== "Literal") {
+  if ((0, import_chunk_JDC43A3I.isExpression)(node) && node.type !== "Literal") {
     const top = istate.stack[istate.stack.length - 1];
     if (!top.embeddedEffects && hasValue(top.value)) {
       const rep = mcExprFromType(top.value);
       if (rep) {
         top.node = rep;
-        return (0, import_chunk_MBTLUWXR.withLoc)(rep, node, node);
+        return (0, import_chunk_JDC43A3I.withLoc)(rep, node, node);
       }
     }
   }
@@ -16238,7 +16238,7 @@ function tryCommuteAndAssociate(istate, node) {
   switch (node.operator) {
     case "-":
       if (left.value.type === 8 && left.value.value === -1 && (right.value.type & (8 | 16)) === right.value.type || left.value.type === 16 && left.value.value === -1n && right.value.type === 16) {
-        const rep = (0, import_chunk_MBTLUWXR.withLoc)(
+        const rep = (0, import_chunk_JDC43A3I.withLoc)(
           {
             type: "UnaryExpression",
             operator: "~",
@@ -16285,11 +16285,11 @@ function tryReAssociate(istate, node, left, right) {
   if (node.left.type !== "BinaryExpression" || node.left.operator !== node.operator && !(node.operator === "+" && node.left.operator === "-") && !(node.operator === "-" && node.left.operator === "+")) {
     return false;
   }
-  let leftLit = (0, import_chunk_MBTLUWXR.getLiteralNode)(node.left.right);
+  let leftLit = (0, import_chunk_JDC43A3I.getLiteralNode)(node.left.right);
   if (!leftLit) {
     if (node.left.operator !== "-")
       return false;
-    leftLit = (0, import_chunk_MBTLUWXR.getLiteralNode)(node.left.left);
+    leftLit = (0, import_chunk_JDC43A3I.getLiteralNode)(node.left.left);
     if (!leftLit)
       return false;
     const leftLeft = evaluate(istate, leftLit);
@@ -16357,7 +16357,7 @@ function tryReAssociate(istate, node, left, right) {
     return false;
   }
   if (node.right.type === "BinaryExpression" && (node.right.operator === node.operator || (node.operator === "+" || node.operator === "-") && (node.right.operator === "+" || node.right.operator === "-"))) {
-    const rr = (0, import_chunk_MBTLUWXR.getLiteralNode)(node.right.right);
+    const rr = (0, import_chunk_JDC43A3I.getLiteralNode)(node.right.right);
     if (!rr)
       return false;
     const rightRight = evaluate(istate, rr);
@@ -16412,7 +16412,7 @@ function tryDeEnumerate(istate, node, elem) {
 var init_optimize = (0, import_chunk_ABYVSU2C.__esm)({
   "src/type-flow/optimize.ts"() {
     "use strict";
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_inliner();
     init_type_flow();
     (0, import_chunk_OASVKTK5.init_util)();
@@ -16447,7 +16447,7 @@ function cleanupUnusedVars(state, node) {
   const stack = [];
   const activeRemove = {};
   let changes = false;
-  (0, import_chunk_MBTLUWXR.traverseAst)(
+  (0, import_chunk_JDC43A3I.traverseAst)(
     node,
     (node2) => {
       switch (node2.type) {
@@ -16468,7 +16468,7 @@ function cleanupUnusedVars(state, node) {
         case "VariableDeclaration": {
           node2.declarations.forEach((decl, i) => {
             const name = variableDeclarationName(decl.id);
-            if ((0, import_chunk_MBTLUWXR.hasProperty)(toRemove, name) && toRemove[name].node === decl) {
+            if ((0, import_chunk_JDC43A3I.hasProperty)(toRemove, name) && toRemove[name].node === decl) {
               activeRemove[name] = toRemove[name];
               const info = varDeclarations.get(node2);
               if (info) {
@@ -16485,11 +16485,11 @@ function cleanupUnusedVars(state, node) {
         }
         case "ExpressionStatement":
           if (node2.expression.type === "AssignmentExpression") {
-            if (node2.expression.left.type === "Identifier" && (0, import_chunk_MBTLUWXR.hasProperty)(activeRemove, node2.expression.left.name)) {
+            if (node2.expression.left.type === "Identifier" && (0, import_chunk_JDC43A3I.hasProperty)(activeRemove, node2.expression.left.name)) {
               changes = true;
               return unused(state, node2.expression.right);
             }
-          } else if (node2.expression.type === "UpdateExpression" && node2.expression.argument.type === "Identifier" && (0, import_chunk_MBTLUWXR.hasProperty)(activeRemove, node2.expression.argument.name)) {
+          } else if (node2.expression.type === "UpdateExpression" && node2.expression.argument.type === "Identifier" && (0, import_chunk_JDC43A3I.hasProperty)(activeRemove, node2.expression.argument.name)) {
             return false;
           }
           break;
@@ -16497,7 +16497,7 @@ function cleanupUnusedVars(state, node) {
           for (let i = node2.expressions.length; i--; ) {
             const expr = node2.expressions[i];
             if (expr.type === "AssignmentExpression") {
-              if (expr.left.type === "Identifier" && (0, import_chunk_MBTLUWXR.hasProperty)(activeRemove, expr.left.name)) {
+              if (expr.left.type === "Identifier" && (0, import_chunk_JDC43A3I.hasProperty)(activeRemove, expr.left.name)) {
                 const rep = unused(state, expr.right);
                 if (!rep.length) {
                   changes = true;
@@ -16507,7 +16507,7 @@ function cleanupUnusedVars(state, node) {
                   expr.operator = "=";
                 }
               }
-            } else if (expr.type === "UpdateExpression" && expr.argument.type === "Identifier" && (0, import_chunk_MBTLUWXR.hasProperty)(activeRemove, expr.argument.name)) {
+            } else if (expr.type === "UpdateExpression" && expr.argument.type === "Identifier" && (0, import_chunk_JDC43A3I.hasProperty)(activeRemove, expr.argument.name)) {
               changes = true;
               node2.expressions.splice(i, 1);
             }
@@ -16524,7 +16524,7 @@ function cleanupUnusedVars(state, node) {
       const i = info.indices[ii];
       const vdecl = decl.declarations[i];
       const name = variableDeclarationName(vdecl.id);
-      if ((0, import_chunk_MBTLUWXR.hasProperty)(activeRemove, name)) {
+      if ((0, import_chunk_JDC43A3I.hasProperty)(activeRemove, name)) {
         const rep = vdecl.init ? unused(state, vdecl.init) : [];
         if (rep.length) {
           if ((state.sdkVersion || 0) < 4001007 && rep.find(
@@ -16586,7 +16586,7 @@ var init_unused_exprs = (0, import_chunk_ABYVSU2C.__esm)({
   "src/unused-exprs.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_inliner();
   }
 });
@@ -16610,7 +16610,7 @@ function collectDeclarationsByName(state) {
             }
           });
           if (keyed.length) {
-            if (!(0, import_chunk_MBTLUWXR.hasProperty)(allDecls, key)) {
+            if (!(0, import_chunk_JDC43A3I.hasProperty)(allDecls, key)) {
               allDecls[key] = keyed;
             } else {
               allDecls[key].push(...keyed);
@@ -16682,7 +16682,7 @@ function collectClassInfo(state) {
       }
       Object.values(c.decls).forEach((funcs) => {
         funcs.forEach((f) => {
-          if (f.type === "FunctionDeclaration" && (0, import_chunk_MBTLUWXR.hasProperty)(cls.decls, f.name)) {
+          if (f.type === "FunctionDeclaration" && (0, import_chunk_JDC43A3I.hasProperty)(cls.decls, f.name)) {
             f.node.hasOverride = true;
           }
         });
@@ -16772,7 +16772,7 @@ async function analyze(fnMap, resourcesMap, manifestXML, config, allowParseError
                 return drop;
               if (attr.argument.type !== "Identifier")
                 return drop;
-              if ((0, import_chunk_MBTLUWXR.hasProperty)(excludeAnnotations, attr.argument.name)) {
+              if ((0, import_chunk_JDC43A3I.hasProperty)(excludeAnnotations, attr.argument.name)) {
                 return true;
               }
               if (attr.argument.name === "test") {
@@ -16799,7 +16799,7 @@ async function analyze(fnMap, resourcesMap, manifestXML, config, allowParseError
               scope.info = getApiFunctionInfo(state2, scope);
             }
             const allFuncs = state2.allFunctions;
-            if (!(0, import_chunk_MBTLUWXR.hasProperty)(allFuncs, scope.name)) {
+            if (!(0, import_chunk_JDC43A3I.hasProperty)(allFuncs, scope.name)) {
               allFuncs[scope.name] = [scope];
             } else {
               allFuncs[scope.name].push(scope);
@@ -16933,10 +16933,10 @@ function evaluateFunction(istate, func, args) {
     ])
   );
   let ret = null;
-  const body = args ? (0, import_chunk_MBTLUWXR.cloneDeep)(func.body) : func.body;
+  const body = args ? (0, import_chunk_JDC43A3I.cloneDeep)(func.body) : func.body;
   const depth2 = istate.stack.length;
   try {
-    (0, import_chunk_MBTLUWXR.traverseAst)(
+    (0, import_chunk_JDC43A3I.traverseAst)(
       body,
       (node) => {
         switch (node.type) {
@@ -16961,7 +16961,7 @@ function evaluateFunction(istate, func, args) {
           case "BlockStatement":
             return null;
           case "Identifier":
-            if ((0, import_chunk_MBTLUWXR.hasProperty)(paramValues, node.name)) {
+            if ((0, import_chunk_JDC43A3I.hasProperty)(paramValues, node.name)) {
               istate.stack.push(
                 evaluate(istate, node = paramValues[node.name])
               );
@@ -16986,7 +16986,7 @@ function evaluateFunction(istate, func, args) {
   }
 }
 function markFunctionCalled(state, func) {
-  if (!(0, import_chunk_MBTLUWXR.hasProperty)(state.calledFunctions, func.id.name)) {
+  if (!(0, import_chunk_JDC43A3I.hasProperty)(state.calledFunctions, func.id.name)) {
     state.calledFunctions[func.id.name] = [func];
     return;
   }
@@ -17013,7 +17013,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
   const optimizeCallHelper = (istate2, call, node) => {
     const result = optimizeCall(istate2, call, node);
     if (result) {
-      if ((0, import_chunk_MBTLUWXR.isExpression)(result)) {
+      if ((0, import_chunk_JDC43A3I.isExpression)(result)) {
         const elem = istate2.stack[istate2.stack.length - 1];
         elem.node = result;
         if (result.type === "Literal") {
@@ -17027,7 +17027,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
   };
   const topLocals = () => state.localsStack[state.localsStack.length - 1];
   const checkInherited = (elm, name) => elm.superClass === true || elm.superClass != null && elm.superClass.some(
-    (sc) => (0, import_chunk_MBTLUWXR.hasProperty)(sc.decls, name) && sc.decls[name].some(
+    (sc) => (0, import_chunk_JDC43A3I.hasProperty)(sc.decls, name) && sc.decls[name].some(
       (f) => isStateNode(f) && f.type === "FunctionDeclaration" && maybeCalled(state, f.node)
     ) || sc.superClass && checkInherited(sc, name)
   );
@@ -17055,10 +17055,10 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
           throw new Error(`No parent in lookup of local ${declName2}`);
         }
         const decls = parent.decls;
-        if (!decls || !(0, import_chunk_MBTLUWXR.hasProperty)(decls, declName2)) {
+        if (!decls || !(0, import_chunk_JDC43A3I.hasProperty)(decls, declName2)) {
           throw new Error(`Missing decls in lookup of local ${declName2}`);
         }
-        if ((0, import_chunk_MBTLUWXR.hasProperty)(decls, name)) {
+        if ((0, import_chunk_JDC43A3I.hasProperty)(decls, name)) {
           throw new Error(
             `While renaming ${declName2} to ${name}, there was already a variable ${name}`
           );
@@ -17127,7 +17127,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         break;
       case "Identifier": {
         const map2 = topLocals().map;
-        if ((0, import_chunk_MBTLUWXR.hasProperty)(map2, node.name)) {
+        if ((0, import_chunk_JDC43A3I.hasProperty)(map2, node.name)) {
           const name = map2[node.name];
           if (typeof name === "string") {
             renameIdentifier(node, name);
@@ -17161,7 +17161,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         if (lhs.type === "Identifier") {
           const map2 = topLocals().map;
           if (map2) {
-            if ((0, import_chunk_MBTLUWXR.hasProperty)(map2, lhs.name)) {
+            if ((0, import_chunk_JDC43A3I.hasProperty)(map2, lhs.name)) {
               const name = map2[lhs.name];
               if (typeof name === "string") {
                 renameIdentifier(lhs, name);
@@ -17285,14 +17285,14 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         }
         break;
       case "Identifier":
-        if ((0, import_chunk_MBTLUWXR.hasProperty)(state.index, node.name)) {
+        if ((0, import_chunk_JDC43A3I.hasProperty)(state.index, node.name)) {
           state.usedByName[node.name] = true;
         }
         break;
       case "MemberExpression": {
         const property = isLookupCandidate(node);
         if (property) {
-          if ((0, import_chunk_MBTLUWXR.hasProperty)(state.index, property.name)) {
+          if ((0, import_chunk_JDC43A3I.hasProperty)(state.index, property.name)) {
             state.usedByName[property.name] = true;
           }
         }
@@ -17345,7 +17345,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
               }
               delete decl.init;
               results.push(
-                (0, import_chunk_MBTLUWXR.withLoc)(
+                (0, import_chunk_JDC43A3I.withLoc)(
                   {
                     ...node,
                     declarations: declarations.slice(j, i)
@@ -17378,7 +17378,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
           if (call) {
             let ok = false;
             if (node.expression.left.type === "Identifier") {
-              if ((0, import_chunk_MBTLUWXR.hasProperty)(topLocals().map, node.expression.left.type)) {
+              if ((0, import_chunk_JDC43A3I.hasProperty)(topLocals().map, node.expression.left.type)) {
                 ok = true;
               }
             }
@@ -17398,7 +17398,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
         const n = node;
         n.type = "AssignmentExpression";
         n.left = node.argument;
-        n.right = (0, import_chunk_MBTLUWXR.withLoc)(
+        n.right = (0, import_chunk_JDC43A3I.withLoc)(
           mcExprFromType({ type: 8, value: 1 }),
           n.left
         );
@@ -17510,7 +17510,7 @@ async function optimizeMonkeyCHelper(fnMap, resourcesMap, manifestXML, config) {
       state.diagnostics = state.inlineDiagnostics;
     } else {
       Object.entries(state.inlineDiagnostics).forEach(([key, diags]) => {
-        if (!(0, import_chunk_MBTLUWXR.hasProperty)(state.diagnostics, key)) {
+        if (!(0, import_chunk_JDC43A3I.hasProperty)(state.diagnostics, key)) {
           state.diagnostics[key] = diags;
         } else {
           state.diagnostics[key].push(...diags);
@@ -17581,7 +17581,7 @@ function maybeCalled(state, func) {
   if (!func.body) {
     return true;
   }
-  if ((0, import_chunk_MBTLUWXR.hasProperty)(state.exposed, func.id.name))
+  if ((0, import_chunk_JDC43A3I.hasProperty)(state.exposed, func.id.name))
     return true;
   if (func.attrs && func.attrs.attributes && func.attrs.attributes.elements.some((attr) => {
     if (attr.type !== "UnaryExpression")
@@ -17592,7 +17592,7 @@ function maybeCalled(state, func) {
   })) {
     return true;
   }
-  if ((0, import_chunk_MBTLUWXR.hasProperty)(state.calledFunctions, func.id.name)) {
+  if ((0, import_chunk_JDC43A3I.hasProperty)(state.calledFunctions, func.id.name)) {
     return state.calledFunctions[func.id.name].find((f) => f === func) !== null;
   }
   return false;
@@ -17607,7 +17607,7 @@ function cleanup(state, node, ast, usedNodes) {
         if (usedNodes.has(m))
           return false;
         const name = "name" in m ? m.name : m.id.name;
-        return (0, import_chunk_MBTLUWXR.hasProperty)(state.index, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(state.exposed, name) && !(0, import_chunk_MBTLUWXR.hasProperty)(state.usedByName, name);
+        return (0, import_chunk_JDC43A3I.hasProperty)(state.index, name) && !(0, import_chunk_JDC43A3I.hasProperty)(state.exposed, name) && !(0, import_chunk_JDC43A3I.hasProperty)(state.usedByName, name);
       })) {
         break;
       }
@@ -17615,7 +17615,7 @@ function cleanup(state, node, ast, usedNodes) {
         node.body.members.map((m) => {
           if (!("init" in m))
             return "Number";
-          const [node2, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(m.init);
+          const [node2, type] = (0, import_chunk_JDC43A3I.getNodeValue)(m.init);
           return node2 ? type : null;
         })
       );
@@ -17624,7 +17624,7 @@ function cleanup(state, node, ast, usedNodes) {
       if (!node.id)
         return false;
       state.removeNodeComments(node, ast);
-      const typedefDecl = (0, import_chunk_MBTLUWXR.withLocDeep)(
+      const typedefDecl = (0, import_chunk_JDC43A3I.withLocDeep)(
         {
           type: "TypedefDeclaration",
           id: node.id,
@@ -17634,7 +17634,7 @@ function cleanup(state, node, ast, usedNodes) {
               type: "TypeSpecList",
               ts: Array.from(enumType).map((t) => ({
                 type: "TypeSpecPart",
-                name: t === "Null" ? t : (0, import_chunk_MBTLUWXR.makeScopedName)(`Toybox.Lang.${t}`)
+                name: t === "Null" ? t : (0, import_chunk_JDC43A3I.makeScopedName)(`Toybox.Lang.${t}`)
               }))
             },
             prefix: true,
@@ -17662,7 +17662,7 @@ function cleanup(state, node, ast, usedNodes) {
     }
     case "VariableDeclarator": {
       const name = variableDeclarationName(node.id);
-      return !(0, import_chunk_MBTLUWXR.hasProperty)(state.index, name) || (0, import_chunk_MBTLUWXR.hasProperty)(state.exposed, name) || (0, import_chunk_MBTLUWXR.hasProperty)(state.usedByName, name) ? null : false;
+      return !(0, import_chunk_JDC43A3I.hasProperty)(state.index, name) || (0, import_chunk_JDC43A3I.hasProperty)(state.exposed, name) || (0, import_chunk_JDC43A3I.hasProperty)(state.usedByName, name) ? null : false;
     }
     case "VariableDeclaration": {
       if (!node.declarations.length) {
@@ -17704,7 +17704,7 @@ function optimizeCall(istate, node, context) {
   if (!callees || !callees.length) {
     const n = name || "name" in node.callee && node.callee.name || "property" in node.callee && node.callee.property && "name" in node.callee.property && node.callee.property.name;
     if (n) {
-      if ((0, import_chunk_MBTLUWXR.hasProperty)(state.allFunctions, n)) {
+      if ((0, import_chunk_JDC43A3I.hasProperty)(state.allFunctions, n)) {
         if (state.currentFunction) {
           recordCalledFuncs(state.currentFunction, state.allFunctions[n]);
         }
@@ -17723,11 +17723,11 @@ function optimizeCall(istate, node, context) {
   if (callees.length === 1) {
     const callee = callees[0].node;
     if (callees[0].type === "FunctionDeclaration" && !callee.hasOverride) {
-      if (!context && callee.optimizable && node.arguments.every((n) => (0, import_chunk_MBTLUWXR.getNodeValue)(n)[0] !== null)) {
+      if (!context && callee.optimizable && node.arguments.every((n) => (0, import_chunk_JDC43A3I.getNodeValue)(n)[0] !== null)) {
         const ret = evaluateFunction(istate, callee, node.arguments);
         if (ret) {
           inlineDiagnostic(state, callees[0], node, null);
-          return (0, import_chunk_MBTLUWXR.withLoc)(ret, node, node);
+          return (0, import_chunk_JDC43A3I.withLoc)(ret, node, node);
         }
       }
       if (shouldInline(state, callees[0], node, context)) {
@@ -17745,7 +17745,7 @@ var init_mc_rewrite = (0, import_chunk_ABYVSU2C.__esm)({
   "src/mc-rewrite.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
     init_function_info();
     init_inliner();
@@ -17966,8 +17966,8 @@ function add_resources_to_ast(state, ast, resources, manifestXML) {
     loc: outerLoc
   });
   const makeImport = (type, module2, as) => {
-    const id = (0, import_chunk_MBTLUWXR.makeScopedName)(module2);
-    return type === "Using" && as ? { type, id, as: (0, import_chunk_MBTLUWXR.makeIdentifier)(as) } : { type, id };
+    const id = (0, import_chunk_JDC43A3I.makeScopedName)(module2);
+    return type === "Using" && as ? { type, id, as: (0, import_chunk_JDC43A3I.makeIdentifier)(as) } : { type, id };
   };
   ast.body.push(
     makeImport("ImportModule", "Toybox.Lang"),
@@ -17976,8 +17976,15 @@ function add_resources_to_ast(state, ast, resources, manifestXML) {
     makeImport("Using", "Toybox.Graphics"),
     makeImport("Using", "Toybox.Graphics", "Gfx")
   );
+  const barrelName = manifestXML && manifestXML.body instanceof xml_util_exports.Nodes && manifestXML?.body.children("iq:barrel").attrs()[0]?.module?.value.value;
+  const barrelNames = new Set(
+    Object.keys(resources).map((k) => k || barrelName).filter((e) => !!e)
+  );
   Object.entries(resources).forEach(([barrel, resourceMap]) => {
     let body = ast.body;
+    if (barrel === "" && barrelName) {
+      barrel = barrelName;
+    }
     if (barrel !== "") {
       const module2 = makeModule(barrel);
       body.push(module2);
@@ -17989,7 +17996,7 @@ function add_resources_to_ast(state, ast, resources, manifestXML) {
     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, "")
+        (e) => add_one_resource(state, manifestXML, rez, e, barrelNames)
       );
     }
     const rezModules = Object.fromEntries(
@@ -18005,10 +18012,10 @@ function add_resources_to_ast(state, ast, resources, manifestXML) {
       visit_resources(rez2.body.elements, null, (e, s) => {
         if (!s)
           return;
-        if (!(0, import_chunk_MBTLUWXR.hasProperty)(rezModules, s))
+        if (!(0, import_chunk_JDC43A3I.hasProperty)(rezModules, s))
           return;
         const module2 = rezModules[s];
-        add_one_resource(state, rez2, module2, e, barrel);
+        add_one_resource(state, rez2, module2, e, barrelNames);
       });
     });
   });
@@ -18024,30 +18031,39 @@ function addPositions(base, pos) {
   result.offset += pos.offset;
   return result;
 }
-function visit_resource_refs(state, doc, e, barrel) {
+function visit_resource_refs(state, doc, e, barrelNames) {
   const result = [];
   const parseArg = (name, loc, skip) => {
+    let base;
     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_JDC43A3I.adjustLoc)(loc, 1, 0);
+      if (barrelNames.size) {
+        const dot = name.indexOf(".");
+        if (dot > 0 && dot < name.length - 1) {
+          const start = name.substring(0, dot);
+          if (barrelNames.has(start)) {
+            base = (0, import_chunk_JDC43A3I.makeScopedName)(`${start}.Rez`, loc);
+            loc = (0, import_chunk_JDC43A3I.adjustLoc)(loc, dot + 1, 0);
+            name = name.substring(dot + 1);
+          }
+        }
       }
-      loc = (0, import_chunk_MBTLUWXR.adjustLoc)(loc, 1, 0);
     }
-    if ((0, import_chunk_MBTLUWXR.hasProperty)(skip, name) || /^\d+(\.\d+)?%?$/.test(name)) {
+    if ((0, import_chunk_JDC43A3I.hasProperty)(skip, name) || /^\d+(\.\d+)?%?$/.test(name)) {
       return;
     }
     if (/^([-\w_$]+\s*\.\s*)*[-\w_$]+$/.test(name)) {
-      result.push((0, import_chunk_MBTLUWXR.makeScopedName)(name, loc));
+      result.push((0, import_chunk_JDC43A3I.makeScopedName)(name, loc, base));
       return;
     }
-    const startPos = (0, import_chunk_MBTLUWXR.adjustLoc)(loc, -1, 0).start;
+    const startPos = (0, import_chunk_JDC43A3I.adjustLoc)(loc, -1, 0).start;
     try {
       const expr = import_prettier_plugin_monkeyc3.default.parsers.monkeyc.parse(`(${name})`, null, {
         filepath: loc.source || void 0,
         singleExpression: true
       });
-      (0, import_chunk_MBTLUWXR.traverseAst)(expr, (node) => {
+      (0, import_chunk_JDC43A3I.traverseAst)(expr, (node) => {
         if (node.loc) {
           node.loc = {
             source: node.loc.source,
@@ -18099,16 +18115,16 @@ function visit_resource_refs(state, doc, e, barrel) {
             loc.start.offset -= name.length;
           }
         } else {
-          const base = (0, import_chunk_MBTLUWXR.makeScopedName)(`Rez.Styles`);
-          const idLoc = (0, import_chunk_MBTLUWXR.adjustLoc)(loc, 0, 0);
+          const base = (0, import_chunk_JDC43A3I.makeScopedName)(`Rez.Styles`);
+          const idLoc = (0, import_chunk_JDC43A3I.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));
+          const id2 = (0, import_chunk_JDC43A3I.makeIdentifier)(name, idLoc);
+          result.push((0, import_chunk_JDC43A3I.makeMemberExpression)((0, import_chunk_JDC43A3I.withLoc)(base, id2, false), id2));
         }
-        return (0, import_chunk_MBTLUWXR.adjustLoc)(loc, name.length, 0);
-      }, (0, import_chunk_MBTLUWXR.adjustLoc)(l, 0, 0));
+        return (0, import_chunk_JDC43A3I.adjustLoc)(loc, name.length, 0);
+      }, (0, import_chunk_JDC43A3I.adjustLoc)(l, 0, 0));
       return;
     }
     if (/^\s*(true|false|null|NaN|(0x|#)[0-9a-f]+|[-+]?\d+%?)\s*$/i.test(dotted)) {
@@ -18121,7 +18137,7 @@ function visit_resource_refs(state, doc, e, barrel) {
           parseArg(
             dotted,
             l,
-            name && (0, import_chunk_MBTLUWXR.hasProperty)(drawableSkips, name) ? drawableSkips[name] : null
+            name && (0, import_chunk_JDC43A3I.hasProperty)(drawableSkips, name) ? drawableSkips[name] : null
           );
         }
         return;
@@ -18135,7 +18151,7 @@ function visit_resource_refs(state, doc, e, barrel) {
       case "drawable-list":
       case "text-area":
       case "label":
-        if (id && (0, import_chunk_MBTLUWXR.hasProperty)(drawableSkips, id)) {
+        if (id && (0, import_chunk_JDC43A3I.hasProperty)(drawableSkips, id)) {
           parseArg(dotted, l, drawableSkips[id]);
         }
         return;
@@ -18155,7 +18171,7 @@ function visit_resource_refs(state, doc, e, barrel) {
       Object.values(node.attr).forEach((attr) => {
         if (!attr || !attr.value.loc)
           return;
-        const loc = (0, import_chunk_MBTLUWXR.adjustLoc)(attr.value.loc);
+        const loc = (0, import_chunk_JDC43A3I.adjustLoc)(attr.value.loc);
         stringToScopedName(node, attr.name.value, attr.value.value, loc);
       });
       const content = doc.textContent(node);
@@ -18169,7 +18185,7 @@ function visit_resource_refs(state, doc, e, barrel) {
               node,
               null,
               content,
-              (0, import_chunk_MBTLUWXR.locRange)(
+              (0, import_chunk_JDC43A3I.locRange)(
                 node.children[0].loc,
                 node.children[node.children.length - 1].loc
               )
@@ -18182,29 +18198,29 @@ function visit_resource_refs(state, doc, e, barrel) {
   });
   return result;
 }
-function add_one_resource(state, doc, module2, e, barrel) {
+function add_one_resource(state, doc, module2, e, barrelNames) {
   let id;
   let func;
   const makeVarDecl = (id2, outer) => {
-    const loc = id2 && (0, import_chunk_MBTLUWXR.adjustLoc)(id2.value.loc);
-    return (0, import_chunk_MBTLUWXR.wrap)(
+    const loc = id2 && (0, import_chunk_JDC43A3I.adjustLoc)(id2.value.loc);
+    return (0, import_chunk_JDC43A3I.wrap)(
       {
         type: "VariableDeclaration",
         declarations: [
-          (0, import_chunk_MBTLUWXR.wrap)(
+          (0, import_chunk_JDC43A3I.wrap)(
             {
               type: "VariableDeclarator",
               kind: "var",
               id: {
                 type: "BinaryExpression",
                 operator: "as",
-                left: (0, import_chunk_MBTLUWXR.makeIdentifier)(id2 ? id2.value.value : "*invalid*", loc),
+                left: (0, import_chunk_JDC43A3I.makeIdentifier)(id2 ? id2.value.value : "*invalid*", loc),
                 right: {
                   type: "TypeSpecList",
                   ts: [
                     {
                       type: "TypeSpecPart",
-                      name: (0, import_chunk_MBTLUWXR.makeScopedName)(
+                      name: (0, import_chunk_JDC43A3I.makeScopedName)(
                         (state?.sdkVersion ?? 0) >= 7e6 ? "Toybox.Lang.ResourceId" : "Toybox.Lang.Symbol"
                       )
                     }
@@ -18237,7 +18253,7 @@ function add_one_resource(state, doc, module2, e, barrel) {
       type: "ClassElement",
       item: {
         type: "FunctionDeclaration",
-        id: (0, import_chunk_MBTLUWXR.makeIdentifier)("initialize", loc),
+        id: (0, import_chunk_JDC43A3I.makeIdentifier)("initialize", loc),
         body: null,
         params: [],
         loc: e.loc
@@ -18246,8 +18262,8 @@ function add_one_resource(state, doc, module2, e, barrel) {
     return {
       type: "ClassDeclaration",
       body: { type: "ClassBody", body: items, loc: e.loc },
-      id: (0, import_chunk_MBTLUWXR.makeIdentifier)(id.value.value, loc),
-      superClass: (0, import_chunk_MBTLUWXR.makeScopedName)(parent),
+      id: (0, import_chunk_JDC43A3I.makeIdentifier)(id.value.value, loc),
+      superClass: (0, import_chunk_JDC43A3I.makeScopedName)(parent),
       loc: e.loc
     };
   };
@@ -18259,18 +18275,18 @@ function add_one_resource(state, doc, module2, e, barrel) {
     return {
       type: "FunctionDeclaration",
       body: { type: "BlockStatement", body: items, loc: e.loc },
-      id: (0, import_chunk_MBTLUWXR.makeIdentifier)(id.value.value, loc),
+      id: (0, import_chunk_JDC43A3I.makeIdentifier)(id.value.value, loc),
       params: [
         {
           type: "BinaryExpression",
           operator: "as",
-          left: (0, import_chunk_MBTLUWXR.makeIdentifier)("dc"),
+          left: (0, import_chunk_JDC43A3I.makeIdentifier)("dc"),
           right: {
             type: "TypeSpecList",
             ts: [
               {
                 type: "TypeSpecPart",
-                name: (0, import_chunk_MBTLUWXR.makeScopedName)("Graphics.Dc")
+                name: (0, import_chunk_JDC43A3I.makeScopedName)("Graphics.Dc")
               }
             ]
           }
@@ -18285,14 +18301,14 @@ function add_one_resource(state, doc, module2, e, barrel) {
           ts: [
             {
               type: "TypeSpecPart",
-              name: (0, import_chunk_MBTLUWXR.makeScopedName)("$.Toybox.Lang.Array"),
+              name: (0, import_chunk_JDC43A3I.makeScopedName)("$.Toybox.Lang.Array"),
               generics: [
                 {
                   type: "TypeSpecList",
                   ts: [
                     {
                       type: "TypeSpecPart",
-                      name: (0, import_chunk_MBTLUWXR.makeScopedName)("$.Toybox.WatchUi.Drawable")
+                      name: (0, import_chunk_JDC43A3I.makeScopedName)("$.Toybox.WatchUi.Drawable")
                     }
                   ]
                 }
@@ -18346,12 +18362,12 @@ function add_one_resource(state, doc, module2, e, barrel) {
   }
   if (!func)
     return;
-  const elements = visit_resource_refs(state, doc, e, barrel);
+  const elements = visit_resource_refs(state, doc, e, barrelNames);
   const startLoc = elements[0]?.loc;
   const endLoc = elements[elements.length - 1]?.loc;
-  const init = elements.length ? (0, import_chunk_MBTLUWXR.wrap)(
+  const init = elements.length ? (0, import_chunk_JDC43A3I.wrap)(
     { type: "ArrayExpression", elements },
-    startLoc && endLoc && (0, import_chunk_MBTLUWXR.locRange)(startLoc, endLoc)
+    startLoc && endLoc && (0, import_chunk_JDC43A3I.locRange)(startLoc, endLoc)
   ) : void 0;
   if (!id) {
     if (!init)
@@ -18367,7 +18383,7 @@ var init_resources = (0, import_chunk_ABYVSU2C.__esm)({
   "src/resources.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_sdk_util();
     drawableSkips = {
       x: { center: true, left: true, right: true, start: true },
@@ -18649,7 +18665,7 @@ async function getApiMapping(state, resourcesMap, manifestXML) {
     if (!value2 || value2.type !== "EnumStringMember" && (value2.type !== "VariableDeclarator" || value2.kind !== "const")) {
       throw `Negative constant ${fixup} did not refer to a constant`;
     }
-    const init = (0, import_chunk_MBTLUWXR.getLiteralNode)(value2.init);
+    const init = (0, import_chunk_JDC43A3I.getLiteralNode)(value2.init);
     if (!init || init.type !== "Literal") {
       throw `Negative constant ${fixup} was not a Literal`;
     }
@@ -18664,7 +18680,7 @@ async function getApiMapping(state, resourcesMap, manifestXML) {
   return result;
 }
 function isStateNode(node) {
-  return (0, import_chunk_MBTLUWXR.hasProperty)(node, "node");
+  return (0, import_chunk_JDC43A3I.hasProperty)(node, "node");
 }
 function variableDeclarationName(node) {
   return ("left" in node ? node.left : node).name;
@@ -18700,7 +18716,7 @@ function checkOne(state, ns, decls, node) {
     }
     return cls.superClass.reduce((result, sup) => {
       const sdecls = sup[decls];
-      const next = (0, import_chunk_MBTLUWXR.hasProperty)(sdecls, node.name) ? sdecls[node.name] : superChain(sup);
+      const next = (0, import_chunk_JDC43A3I.hasProperty)(sdecls, node.name) ? sdecls[node.name] : superChain(sup);
       return next ? result ? result.concat(next) : next : result;
     }, null);
   };
@@ -18721,7 +18737,7 @@ function checkOne(state, ns, decls, node) {
     }, null);
   };
   const ndecls = ns[decls];
-  if ((0, import_chunk_MBTLUWXR.hasProperty)(ndecls, node.name)) {
+  if ((0, import_chunk_JDC43A3I.hasProperty)(ndecls, node.name)) {
     return ndecls[node.name];
   }
   switch (ns.type) {
@@ -18774,7 +18790,7 @@ function lookupNext(state, results, decls, property) {
           return;
         }
         if (module2.init.type === "Literal") {
-          const [, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(module2.init);
+          const [, type] = (0, import_chunk_JDC43A3I.getNodeValue)(module2.init);
           switch (type) {
             case "Null":
               break;
@@ -18895,7 +18911,7 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
           case "ClassDeclaration":
             if (inStatic && state.config?.enforceStatic !== "NO") {
               inStatic = false;
-              if ((0, import_chunk_MBTLUWXR.hasProperty)(si[decls], node.name)) {
+              if ((0, import_chunk_JDC43A3I.hasProperty)(si[decls], node.name)) {
                 const r = si[decls][node.name].filter((s) => {
                   switch (s.type) {
                     case "FunctionDeclaration":
@@ -18986,7 +19002,7 @@ function lookup(state, decls, node, name, maybeStack, nonlocal, ignoreImports) {
       return [null, null];
     }
     case "Literal": {
-      const [, type] = (0, import_chunk_MBTLUWXR.getNodeValue)(node);
+      const [, type] = (0, import_chunk_JDC43A3I.getNodeValue)(node);
       if (type === "Null")
         break;
       return [
@@ -19090,7 +19106,7 @@ function stateFuncs() {
       return this.stack[this.stack.length - 1];
     },
     traverse(root) {
-      return (0, import_chunk_MBTLUWXR.traverseAst)(
+      return (0, import_chunk_JDC43A3I.traverseAst)(
         root,
         (node) => {
           try {
@@ -19200,7 +19216,7 @@ function stateFuncs() {
                 if (name) {
                   if (!parent.decls)
                     parent.decls = {};
-                  if ((0, import_chunk_MBTLUWXR.hasProperty)(parent.decls, name)) {
+                  if ((0, import_chunk_JDC43A3I.hasProperty)(parent.decls, name)) {
                     const what = node.type === "ModuleDeclaration" ? "type" : "node";
                     const e = parent.decls[name].find(
                       (d) => isStateNode(d) && d[what] === elm[what]
@@ -19223,7 +19239,7 @@ function stateFuncs() {
                   if (node.type === "ModuleDeclaration" || node.type === "ClassDeclaration") {
                     if (!parent.type_decls)
                       parent.type_decls = {};
-                    if (!(0, import_chunk_MBTLUWXR.hasProperty)(parent.type_decls, name)) {
+                    if (!(0, import_chunk_JDC43A3I.hasProperty)(parent.type_decls, name)) {
                       parent.type_decls[name] = [];
                     }
                     parent.type_decls[name].push(elm);
@@ -19252,7 +19268,7 @@ function stateFuncs() {
                 const parent = this.top().sn;
                 if (!parent.type_decls)
                   parent.type_decls = {};
-                if (!(0, import_chunk_MBTLUWXR.hasProperty)(parent.type_decls, name)) {
+                if (!(0, import_chunk_JDC43A3I.hasProperty)(parent.type_decls, name)) {
                   parent.type_decls[name] = [];
                 } else if (parent.type_decls[name].find(
                   (n) => (isStateNode(n) ? n.node : n) === node
@@ -19281,7 +19297,7 @@ function stateFuncs() {
                 const stack = this.stackClone();
                 node.declarations.forEach((decl) => {
                   const name = variableDeclarationName(decl.id);
-                  if (!(0, import_chunk_MBTLUWXR.hasProperty)(decls, name)) {
+                  if (!(0, import_chunk_JDC43A3I.hasProperty)(decls, name)) {
                     decls[name] = [];
                   } else if (decls[name].find(
                     (n) => (isStateNode(n) ? n.node : n) === decl
@@ -19298,7 +19314,7 @@ function stateFuncs() {
                     attributes: stateNodeAttrs(node.attrs)
                   });
                   if (node.kind === "const") {
-                    if (!(0, import_chunk_MBTLUWXR.hasProperty)(this.index, name)) {
+                    if (!(0, import_chunk_JDC43A3I.hasProperty)(this.index, name)) {
                       this.index[name] = [];
                     }
                     (0, import_chunk_OASVKTK5.pushUnique)(this.index[name], parent);
@@ -19341,7 +19357,7 @@ function stateFuncs() {
                     };
                   }
                   const name = m.id.name;
-                  const init = (0, import_chunk_MBTLUWXR.getLiteralNode)(m.init);
+                  const init = (0, import_chunk_JDC43A3I.getLiteralNode)(m.init);
                   if (init) {
                     if (init !== m.init) {
                       if (m.init.enumType) {
@@ -19353,7 +19369,7 @@ function stateFuncs() {
                       prev = init.value;
                     }
                   }
-                  if (!(0, import_chunk_MBTLUWXR.hasProperty)(values, name)) {
+                  if (!(0, import_chunk_JDC43A3I.hasProperty)(values, name)) {
                     values[name] = [];
                   }
                   if ((0, import_chunk_OASVKTK5.pushUnique)(values[name], m) && currentEnum) {
@@ -19361,7 +19377,7 @@ function stateFuncs() {
                       this.enumMap = /* @__PURE__ */ new Map();
                     this.enumMap.set(m, currentEnum);
                   }
-                  if (!(0, import_chunk_MBTLUWXR.hasProperty)(this.index, name)) {
+                  if (!(0, import_chunk_JDC43A3I.hasProperty)(this.index, name)) {
                     this.index[name] = [];
                   }
                   (0, import_chunk_OASVKTK5.pushUnique)(this.index[name], parent);
@@ -19679,7 +19695,7 @@ function findUsing(state, stack, using) {
       find(node.object);
       name = node.property.name;
     }
-    if ((0, import_chunk_MBTLUWXR.hasProperty)(module2.decls, name)) {
+    if ((0, import_chunk_JDC43A3I.hasProperty)(module2.decls, name)) {
       const decls = module2.decls[name];
       if (decls && decls.length === 1 && decls[0].type === "ModuleDeclaration") {
         module2 = decls[0];
@@ -19708,7 +19724,7 @@ function findUsingForNode(state, stack, i, node) {
   let imports = null;
   while (i >= 0) {
     const si = stack[i--];
-    if ((0, import_chunk_MBTLUWXR.hasProperty)(si.usings, node.name)) {
+    if ((0, import_chunk_JDC43A3I.hasProperty)(si.usings, node.name)) {
       const using = si.usings[node.name];
       return findUsing(state, stack, using);
     }
@@ -19717,7 +19733,7 @@ function findUsingForNode(state, stack, i, node) {
         const using = si.imports[j];
         const module2 = findUsing(state, stack, using);
         if (module2) {
-          if ((0, import_chunk_MBTLUWXR.hasProperty)(module2.type_decls, node.name)) {
+          if ((0, import_chunk_JDC43A3I.hasProperty)(module2.type_decls, node.name)) {
             if (!imports)
               imports = [];
             imports.push({
@@ -19811,7 +19827,7 @@ function diagnosticHelper(diagnostics, node, message, type = "INFO", extra) {
   if (!loc || !loc.source)
     return;
   const source = loc.source;
-  if (!(0, import_chunk_MBTLUWXR.hasProperty)(diagnostics, source)) {
+  if (!(0, import_chunk_JDC43A3I.hasProperty)(diagnostics, source)) {
     if (!message)
       return;
     diagnostics[source] = [];
@@ -19856,7 +19872,7 @@ function getSuperClasses(klass) {
 }
 var init_api = (0, import_chunk_ABYVSU2C.__esm)({
   "src/api.ts"() {
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_data_flow();
     init_mc_rewrite();
     init_negative_fixups();
@@ -20072,7 +20088,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             break;
           case "Literal":
             if (wantsLiteral(node)) {
-              const result = (0, import_chunk_MBTLUWXR.getNodeValue)(node);
+              const result = (0, import_chunk_JDC43A3I.getNodeValue)(node);
               const key = result[1] + (result[0].value === null ? "" : "-" + result[0].value.toString());
               let decl = literals.get(key);
               if (!decl) {
@@ -20225,7 +20241,7 @@ function buildDataFlowGraph(state, func, wantsLiteral, trackInsertionPoints, wan
             return { type: "mod", node, mayThrow: mayThrow2, callees };
           }
           default:
-            if (!(0, import_chunk_MBTLUWXR.isExpression)(node))
+            if (!(0, import_chunk_JDC43A3I.isExpression)(node))
               break;
             unhandledType(node);
         }
@@ -20340,7 +20356,7 @@ var init_data_flow = (0, import_chunk_ABYVSU2C.__esm)({
   "src/data-flow.ts"() {
     "use strict";
     init_api();
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_control_flow();
     init_function_info();
     init_type_flow_util();
@@ -24097,7 +24113,7 @@ function groupBlocks(func) {
     }
   });
   const isCfgNode = (node) => {
-    return (0, import_chunk_MBTLUWXR.hasProperty)(node, "items");
+    return (0, import_chunk_JDC43A3I.hasProperty)(node, "items");
   };
   const sortHelper = (node) => {
     const itemsToSort = /* @__PURE__ */ new Set();
@@ -24232,7 +24248,7 @@ function getLocalsInfo(func) {
 var init_emit = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/emit.ts"() {
     "use strict";
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_cflow();
     init_opcodes();
     init_optimize2();
@@ -24793,7 +24809,7 @@ function bytecodeToString(bytecode, symbolTable) {
       arg = `${bytecode.arg.argc} ${bytecode.arg.incsp}`;
       break;
   }
-  if (arg == null && (0, import_chunk_MBTLUWXR.hasProperty)(bytecode, "arg")) {
+  if (arg == null && (0, import_chunk_JDC43A3I.hasProperty)(bytecode, "arg")) {
     arg = `${bytecode.arg}`;
   }
   if (arg != null) {
@@ -25124,7 +25140,7 @@ var SectionKinds;
 var init_bytecode = (0, import_chunk_ABYVSU2C.__esm)({
   "src/readprg/bytecode.ts"() {
     "use strict";
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_sdk_util();
     (0, import_chunk_OASVKTK5.init_util)();
     init_data();
@@ -28092,7 +28108,7 @@ var init_manifest = (0, import_chunk_ABYVSU2C.__esm)({
   }
 });
 function isJNode(obj) {
-  return (0, import_chunk_MBTLUWXR.hasProperty)(obj, "type");
+  return (0, import_chunk_JDC43A3I.hasProperty)(obj, "type");
 }
 async function default_jungle() {
   const assignments = [];
@@ -28134,11 +28150,11 @@ async function default_jungle() {
       );
     }
     const shape = match[1];
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(done, shape)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(done, shape)) {
       rezAndLang(shape, `resources-${shape}`, "base");
       done[shape] = true;
     }
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(done, deviceFamily)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(done, deviceFamily)) {
       rezAndLang(deviceFamily, `resources-${deviceFamily}`, shape);
       done[deviceFamily] = true;
     }
@@ -28151,7 +28167,7 @@ function process_assignments(assignments, current) {
   return assignments.reduce((state, a) => {
     const { node, dot, dotnames } = a.names.reduce(
       (r, name) => {
-        if (!(0, import_chunk_MBTLUWXR.hasProperty)(r.node, name))
+        if (!(0, import_chunk_JDC43A3I.hasProperty)(r.node, name))
           r.node[name] = {};
         r.dotnames.push(name);
         r.node = r.node[name];
@@ -28222,7 +28238,7 @@ function evaluate_locals(assignments) {
               value: v.values.map((s) => s.type === "Literal" ? s.value : "").join("")
             };
           }
-        } else if (v.type === "QualifiedName" && v.names.length === 1 && (0, import_chunk_MBTLUWXR.hasProperty)(locals, v.names[0])) {
+        } else if (v.type === "QualifiedName" && v.names.length === 1 && (0, import_chunk_JDC43A3I.hasProperty)(locals, v.names[0])) {
           values.splice(i, 1, ...locals[v.names[0]]);
         } else if (v.type === "SubList") {
           process_list(v.values);
@@ -28390,7 +28406,7 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
         /[\\/]\*\*([^\\/])/g,
         "/**/*$1"
       );
-      if (!(0, import_chunk_MBTLUWXR.hasProperty)(cache.resolvedPaths, resolved)) {
+      if (!(0, import_chunk_JDC43A3I.hasProperty)(cache.resolvedPaths, resolved)) {
         if (/[*?[\]{}]/.test(resolved)) {
           cache.resolvedPaths[resolved] = (0, import_chunk_OASVKTK5.globSome)(resolved, () => true);
         } else {
@@ -28447,7 +28463,7 @@ async function resolve_literals(qualifier, default_source, deviceInfo, cache) {
   resolve_literal_list(qualifier, "excludeAnnotations");
   const annotations = {};
   Object.entries(qualifier).forEach(([k, v]) => {
-    if ((0, import_chunk_MBTLUWXR.hasProperty)(v, "annotations")) {
+    if ((0, import_chunk_JDC43A3I.hasProperty)(v, "annotations")) {
       annotations[k] = v["annotations"];
       resolve_literal_list(annotations, k);
       delete qualifier[k];
@@ -28468,7 +28484,7 @@ async function read_resource_files(targets, cache) {
       if (!p.qualifier.resourcePath)
         return null;
       const key = p.qualifier.resourcePath.join(";");
-      if (!(0, import_chunk_MBTLUWXR.hasProperty)(resourceGroupPromises, key)) {
+      if (!(0, import_chunk_JDC43A3I.hasProperty)(resourceGroupPromises, key)) {
         resourceGroupPromises[key] = Promise.all(
           p.qualifier.resourcePath.map(
             (pattern) => (0, import_chunk_OASVKTK5.globa)(pattern, { mark: true })
@@ -28482,7 +28498,7 @@ async function read_resource_files(targets, cache) {
         ).then(
           (paths) => Promise.all(
             paths.flat().filter((file) => file.endsWith(".xml")).map((file) => {
-              if (!(0, import_chunk_MBTLUWXR.hasProperty)(cache.resources, file)) {
+              if (!(0, import_chunk_JDC43A3I.hasProperty)(cache.resources, file)) {
                 cache.resources[file] = fs5.readFile(file).then((data) => xml_util_exports.parseXml(data.toString(), file));
               }
               return Promise.resolve(cache.resources[file]).then((rez) => {
@@ -28548,9 +28564,9 @@ async function find_build_instructions(targets, resourceGroups, buildDependencie
       if (!p.qualifier.resourcePath)
         return;
       const key = p.qualifier.resourcePath.join(";");
-      if (!(0, import_chunk_MBTLUWXR.hasProperty)(resourceGroups, key))
+      if (!(0, import_chunk_JDC43A3I.hasProperty)(resourceGroups, key))
         return;
-      if (!(0, import_chunk_MBTLUWXR.hasProperty)(resourceGroups[key], "buildInstructions")) {
+      if (!(0, import_chunk_JDC43A3I.hasProperty)(resourceGroups[key], "buildInstructions")) {
         resourceGroups[key].buildInstructions = (await Promise.all(
           resourceGroups[key].resourceFiles.map(
             ({ path: path7, resources }) => find_build_instructions_in_resource(
@@ -28587,7 +28603,7 @@ function identify_optimizer_groups(targets, options) {
     if (option === "*") {
       return [];
     } else {
-      return strs.filter((a) => !(0, import_chunk_MBTLUWXR.hasProperty)(option, a));
+      return strs.filter((a) => !(0, import_chunk_JDC43A3I.hasProperty)(option, a));
     }
   };
   const ignoreRegExpOption = (str) => {
@@ -28630,7 +28646,7 @@ function identify_optimizer_groups(targets, options) {
         target.qualifier.sourcePath.forEach((path7) => {
           const m = path7.match(ignoredSourcePathsRe);
           const key2 = m ? "key-" + m.slice(1).join("") : path7;
-          if (!(0, import_chunk_MBTLUWXR.hasProperty)(state.keys, key2)) {
+          if (!(0, import_chunk_JDC43A3I.hasProperty)(state.keys, key2)) {
             state.keys[key2] = {};
           }
           state.keys[key2][path7] = true;
@@ -28696,7 +28712,7 @@ function identify_optimizer_groups(targets, options) {
       }
       return toSortedEntries(value2);
     });
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(groups, serialized)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(groups, serialized)) {
       groups[serialized] = {
         key: "group" + key.toString().padStart(3, "0"),
         optimizerConfig
@@ -28738,7 +28754,7 @@ function find_barrels(barrelPath, buildDependencies) {
   });
 }
 function resolve_barrel(barrel, barrelDir, products, options, cache, buildDependencies) {
-  if ((0, import_chunk_MBTLUWXR.hasProperty)(cache.barrels, barrel)) {
+  if ((0, import_chunk_JDC43A3I.hasProperty)(cache.barrels, barrel)) {
     return cache.barrels[barrel];
   }
   let promise = Promise.resolve(null);
@@ -28806,7 +28822,7 @@ function resolve_barrels(jungle, product, qualifier, barrels, products, options,
       return result;
     }, {});
   };
-  if ((0, import_chunk_MBTLUWXR.hasProperty)(cache.barrelMap, barrelMapKey)) {
+  if ((0, import_chunk_JDC43A3I.hasProperty)(cache.barrelMap, barrelMapKey)) {
     setBarrelMap(cache.barrelMap[barrelMapKey]);
     return null;
   }
@@ -28838,7 +28854,7 @@ function resolve_barrels(jungle, product, qualifier, barrels, products, options,
           resolvedBarrel.manifest,
           resolvedBarrel.xml
         );
-        if (!(0, import_chunk_MBTLUWXR.hasProperty)(barrelMap, name))
+        if (!(0, import_chunk_JDC43A3I.hasProperty)(barrelMap, name))
           return;
         const bmapName = barrelMap[name];
         if (bmapName) {
@@ -28896,7 +28912,7 @@ async function get_jungle_and_barrels(jungleFiles, defaultProducts, options, cac
     if (!options.workspace) {
       options.workspace = path2.dirname(manifest);
     }
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(cache.resources, manifest)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(cache.resources, manifest)) {
       cache.resources[manifest] = readManifest(manifest);
     }
     const xml = await Promise.resolve(cache.resources[manifest]);
@@ -28939,7 +28955,7 @@ async function get_jungle_and_barrels(jungleFiles, defaultProducts, options, cac
       });
     };
     products.forEach((product) => {
-      if ((0, import_chunk_MBTLUWXR.hasProperty)(state, product)) {
+      if ((0, import_chunk_JDC43A3I.hasProperty)(state, product)) {
         const sp = state[product];
         if (sp && !Array.isArray(sp) && sp.products) {
           sp.products.forEach((p) => add_one(p, product));
@@ -29125,7 +29141,7 @@ async function getCodeWorkspaceSettings(folder) {
   return {};
 }
 function isErrorWithLocation(e) {
-  return (0, import_chunk_MBTLUWXR.hasProperty)(e, "location");
+  return (0, import_chunk_JDC43A3I.hasProperty)(e, "location");
 }
 function getConfig(options) {
   const config = { ...defaultConfig, ...options || {} };
@@ -29163,7 +29179,7 @@ async function buildOptimizedProject(product, options) {
     config.products = [product];
   } else {
     delete config.testBuild;
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(config, "releaseBuild")) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(config, "releaseBuild")) {
       config.releaseBuild = true;
     }
   }
@@ -29219,7 +29235,7 @@ async function createLocalBarrels(targets, options) {
         );
         const sha1 = crypto3.createHash("sha1").update(rawBarrelDir, "binary").digest("base64").replace(/[/=+]/g, "");
         const optBarrelDir = path4.resolve(barrelDir, `${barrel}-${sha1}`);
-        if (!(0, import_chunk_MBTLUWXR.hasProperty)(optBarrels, barrel)) {
+        if (!(0, import_chunk_JDC43A3I.hasProperty)(optBarrels, barrel)) {
           optBarrels[barrel] = {
             rawBarrelDir,
             manifest,
@@ -29302,7 +29318,7 @@ async function generateOptimizedProject(options) {
       throw new Error(`Missing group in build target ${p.product}`);
     }
     const key = configKey(p);
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(buildConfigs, key)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(buildConfigs, key)) {
       p.group.dir = key;
       if (p.group.optimizerConfig.barrelMap && !p.group.optimizerConfig.optBarrels) {
         dropBarrels = true;
@@ -29476,7 +29492,7 @@ async function generateOptimizedProject(options) {
       if (qLang) {
         const devLang = devices[product].languages;
         const unsupportedLangs = Object.keys(qLang).sort().map((key) => {
-          if ((0, import_chunk_MBTLUWXR.hasProperty)(devLang, key) || !(0, import_chunk_MBTLUWXR.hasProperty)(languagesToInclude, key)) {
+          if ((0, import_chunk_JDC43A3I.hasProperty)(devLang, key) || !(0, import_chunk_JDC43A3I.hasProperty)(languagesToInclude, key)) {
             return null;
           }
           const mapped = map_field(qLang, key, quoted_relative_path);
@@ -29487,7 +29503,7 @@ async function generateOptimizedProject(options) {
         let keysToSkip = null;
         if (unsupportedLangs.length) {
           const key = JSON.stringify(unsupportedLangs);
-          if (!(0, import_chunk_MBTLUWXR.hasProperty)(unsupportedLangsCache, key)) {
+          if (!(0, import_chunk_JDC43A3I.hasProperty)(unsupportedLangsCache, key)) {
             const base = nextAvailableDefault();
             if (base) {
               unsupportedLangs.forEach(
@@ -29496,13 +29512,13 @@ async function generateOptimizedProject(options) {
               unsupportedLangsCache[key] = `${base}.lang`;
             }
           }
-          if ((0, import_chunk_MBTLUWXR.hasProperty)(unsupportedLangsCache, key)) {
+          if ((0, import_chunk_JDC43A3I.hasProperty)(unsupportedLangsCache, key)) {
             keysToSkip = Object.fromEntries(unsupportedLangs);
             parts.push(`${prefix}lang = $(${unsupportedLangsCache[key]})`);
           }
         }
         Object.keys(qLang).forEach((key) => {
-          (0, import_chunk_MBTLUWXR.hasProperty)(keysToSkip, key) || !(0, import_chunk_MBTLUWXR.hasProperty)(languagesToInclude, key) || process_field(`${prefix}lang.`, qLang, key, relative_path);
+          (0, import_chunk_JDC43A3I.hasProperty)(keysToSkip, key) || !(0, import_chunk_JDC43A3I.hasProperty)(languagesToInclude, key) || process_field(`${prefix}lang.`, qLang, key, relative_path);
         });
       }
     });
@@ -29655,7 +29671,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
     );
     barrelFnMaps.forEach(
       (barrelFnMap) => Object.entries(barrelFnMap).forEach(([key2, value2]) => {
-        if (!(0, import_chunk_MBTLUWXR.hasProperty)(fnMap, key2)) {
+        if (!(0, import_chunk_JDC43A3I.hasProperty)(fnMap, key2)) {
           fnMap[key2] = value2;
         }
       })
@@ -29683,7 +29699,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_OASVKTK5.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1720645332171 < opt_time) {
+      if (source_time < opt_time && 1721003959168 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -29721,7 +29737,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.68",
+            optimizerVersion: "1.1.69",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )
@@ -29795,7 +29811,7 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
   );
   if (analysis) {
     Object.entries(fnMap).forEach(([k, v]) => {
-      if ((0, import_chunk_MBTLUWXR.hasProperty)(analysis.fnMap, k)) {
+      if ((0, import_chunk_JDC43A3I.hasProperty)(analysis.fnMap, k)) {
         const old = analysis.fnMap[k];
         if (old.monkeyCSource)
           v.monkeyCSource = old.monkeyCSource;
@@ -29809,7 +29825,7 @@ async function getProjectAnalysisHelper(targets, analysis, manifestXML, options)
   const addResources = (name, resources) => {
     if (!resources)
       return;
-    if (!(0, import_chunk_MBTLUWXR.hasProperty)(resourcesMap, name)) {
+    if (!(0, import_chunk_JDC43A3I.hasProperty)(resourcesMap, name)) {
       resourcesMap[name] = { ...resources };
     } else {
       Object.assign(resourcesMap[name], resources);
@@ -30185,7 +30201,7 @@ function optimizeProgramBuffer(filepath, view, debugXml, apiDebugXml, key, confi
   const { sections } = readPrgWithOffsets(view);
   (0, import_chunk_OASVKTK5.logger)("readprg", 5, sections);
   const symbolTable = new SymbolTable();
-  if ((0, import_chunk_MBTLUWXR.hasProperty)(sections, 1461170197 .toString())) {
+  if ((0, import_chunk_JDC43A3I.hasProperty)(sections, 1461170197 .toString())) {
     symbolTable.parse(sections[
       1461170197
       /* SYMBOLS */
@@ -30473,7 +30489,7 @@ var init_readprg = (0, import_chunk_ABYVSU2C.__esm)({
     "use strict";
     yauzl = (0, import_chunk_ABYVSU2C.__toESM)(require_yauzl());
     yazl = (0, import_chunk_ABYVSU2C.__toESM)(require_yazl());
-    (0, import_chunk_MBTLUWXR.init_ast)();
+    (0, import_chunk_JDC43A3I.init_ast)();
     init_bytecode();
     init_data();
     init_exceptions();