@markw65/monkeyc-optimizer 1.1.89 → 1.1.90

package/build/{chunk-JDC43A3I.cjs → chunk-UBAYZSM3.cjs}

@@ -16,8 +16,8 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_JDC43A3I_exports = {};
-__export(chunk_JDC43A3I_exports, {
+var chunk_UBAYZSM3_exports = {};
+__export(chunk_UBAYZSM3_exports, {
   adjustLoc: () => adjustLoc,
   cloneDeep: () => cloneDeep,
   getLiteralNode: () => getLiteralNode,
@@ -36,23 +36,21 @@ __export(chunk_JDC43A3I_exports, {
   withLocDeep: () => withLocDeep,
   wrap: () => wrap
 });
-module.exports = __toCommonJS(chunk_JDC43A3I_exports);
-var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
+module.exports = __toCommonJS(chunk_UBAYZSM3_exports);
+var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
 var import_prettier_plugin_monkeyc = require("@markw65/prettier-plugin-monkeyc");
 function isMCTreeNode(node) {
   return node ? typeof node === "object" && "type" in node : false;
 }
 function traverseAst(node, pre, post, parent) {
   const nodes = pre && pre(node);
-  if (nodes === false)
-    return;
+  if (nodes === false) return;
   if (!mctreeTypeInfo[node.type]) {
     throw new Error("what?");
   }
   for (const key of nodes || mctreeTypeInfo[node.type].keys) {
     const value = node[key];
-    if (!value)
-      continue;
+    if (!value) continue;
     if (Array.isArray(value)) {
       const values = value;
       const deletions = values.reduce(
@@ -60,12 +58,10 @@ function traverseAst(node, pre, post, parent) {
           if (isMCTreeNode(obj)) {
             const repl = traverseAst(obj, pre, post, node);
             if (repl === false) {
-              if (!state)
-                state = {};
+              if (!state) state = {};
               state[i] = true;
             } else if (repl != null) {
-              if (!state)
-                state = {};
+              if (!state) state = {};
               values[i] = repl;
             }
           }
@@ -130,8 +126,7 @@ function hasProperty(obj, prop) {
 function withLoc(node, start, end) {
   if (start && start.loc) {
     node.start = start.start;
-    if (!node.end)
-      node.end = start.end;
+    if (!node.end) node.end = start.end;
     node.loc = { ...node.loc || start.loc, start: start.loc.start };
     if (end === start && start.origins) {
       node.origins = start.origins;
@@ -155,8 +150,7 @@ function withLocDeep(node, start, end, inplace) {
   }
   for (const key of mctreeTypeInfo[node.type].keys) {
     const value = node[key];
-    if (!value)
-      continue;
+    if (!value) continue;
     const fix = (v) => isMCTreeNode(v) ? withLocDeep(v, start, end, inplace) : v;
     const repl = Array.isArray(value) ? value.map(fix) : fix(value);
     inplace || (node[key] = repl);
@@ -257,21 +251,17 @@ function makeScopedName(dotted, l, base) {
     },
     { cur: base, offset: 0 }
   ).cur;
-  if (!result)
-    throw new Error("Failed to make a ScopedName");
+  if (!result) throw new Error("Failed to make a ScopedName");
   return result;
 }
 function getLiteralNode(node) {
-  if (node == null)
-    return null;
-  if (node.type === "Literal")
-    return node;
+  if (node == null) return null;
+  if (node.type === "Literal") return node;
   if (node.type === "BinaryExpression" && node.operator === "as") {
     return getLiteralNode(node.left) && node;
   }
   if (node.type === "UnaryExpression") {
-    if (node.argument.type !== "Literal")
-      return null;
+    if (node.argument.type !== "Literal") return null;
     switch (node.operator) {
       case "-": {
         const [arg, type] = getNodeValue(node.argument);
@@ -284,7 +274,7 @@ function getLiteralNode(node) {
   return null;
 }
 var mctreeTypeInfo;
-var init_ast = (0, import_chunk_ABYVSU2C.__esm)({
+var init_ast = (0, import_chunk_VS2QQHAK.__esm)({
   "src/ast.ts"() {
     "use strict";
     mctreeTypeInfo = {

package/build/{chunk-ABYVSU2C.cjs → chunk-VS2QQHAK.cjs}

@@ -16,15 +16,15 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_ABYVSU2C_exports = {};
-__export(chunk_ABYVSU2C_exports, {
+var chunk_VS2QQHAK_exports = {};
+__export(chunk_VS2QQHAK_exports, {
   __commonJS: () => __commonJS,
   __esm: () => __esm,
   __export: () => __export2,
   __require: () => __require,
   __toESM: () => __toESM
 });
-module.exports = __toCommonJS(chunk_ABYVSU2C_exports);
+module.exports = __toCommonJS(chunk_VS2QQHAK_exports);
 var __create = Object.create;
 var __defProp2 = Object.defineProperty;
 var __getOwnPropDesc2 = Object.getOwnPropertyDescriptor;
@@ -34,9 +34,8 @@ var __hasOwnProp2 = Object.prototype.hasOwnProperty;
 var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
   get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
 }) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw new Error('Dynamic require of "' + x + '" is not supported');
+  if (typeof require !== "undefined") return require.apply(this, arguments);
+  throw Error('Dynamic require of "' + x + '" is not supported');
 });
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames2(fn)[0]])(fn = 0)), res;

package/build/optimizer.cjs

@@ -18,30 +18,30 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_7CG7CM26.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_7CG7CM26.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_7CG7CM26.buildOptimizedProject,
-  copyRecursiveAsNeeded: () => import_chunk_X7QCZR3F.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_7CG7CM26.defaultConfig,
-  display: () => import_chunk_7CG7CM26.display,
-  generateOneConfig: () => import_chunk_7CG7CM26.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_7CG7CM26.generateOptimizedProject,
-  getConfig: () => import_chunk_7CG7CM26.getConfig,
-  getFnMapAnalysis: () => import_chunk_7CG7CM26.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_7CG7CM26.getProjectAnalysis,
-  get_jungle: () => import_chunk_7CG7CM26.get_jungle,
-  isErrorWithLocation: () => import_chunk_7CG7CM26.isErrorWithLocation,
-  launchSimulator: () => import_chunk_7CG7CM26.launchSimulator,
-  manifestProducts: () => import_chunk_7CG7CM26.manifestProducts,
-  mctree: () => import_chunk_7CG7CM26.mctree,
-  simulateProgram: () => import_chunk_7CG7CM26.simulateProgram
+  StateNodeAttributes: () => import_chunk_BOVSYC7N.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_BOVSYC7N.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_BOVSYC7N.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_KHQPCXSJ.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_BOVSYC7N.defaultConfig,
+  display: () => import_chunk_BOVSYC7N.display,
+  generateOneConfig: () => import_chunk_BOVSYC7N.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_BOVSYC7N.generateOptimizedProject,
+  getConfig: () => import_chunk_BOVSYC7N.getConfig,
+  getFnMapAnalysis: () => import_chunk_BOVSYC7N.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_BOVSYC7N.getProjectAnalysis,
+  get_jungle: () => import_chunk_BOVSYC7N.get_jungle,
+  isErrorWithLocation: () => import_chunk_BOVSYC7N.isErrorWithLocation,
+  launchSimulator: () => import_chunk_BOVSYC7N.launchSimulator,
+  manifestProducts: () => import_chunk_BOVSYC7N.manifestProducts,
+  mctree: () => import_chunk_BOVSYC7N.mctree,
+  simulateProgram: () => import_chunk_BOVSYC7N.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_7CG7CM26 = require("./chunk-7CG7CM26.cjs");
-var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
-var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
-var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_7CG7CM26.init_optimizer)();
+var import_chunk_BOVSYC7N = require("./chunk-BOVSYC7N.cjs");
+var import_chunk_KHQPCXSJ = require("./chunk-KHQPCXSJ.cjs");
+var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
+var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
+(0, import_chunk_BOVSYC7N.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,25 +18,25 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var sdk_util_exports = {};
 __export(sdk_util_exports, {
-  SectionKinds: () => import_chunk_7CG7CM26.SectionKinds,
-  appSupport: () => import_chunk_7CG7CM26.appSupport,
-  connectiq: () => import_chunk_7CG7CM26.connectiq,
-  getDeviceInfo: () => import_chunk_7CG7CM26.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_7CG7CM26.getFunctionDocumentation,
-  getLanguages: () => import_chunk_7CG7CM26.getLanguages,
-  getSdkPath: () => import_chunk_7CG7CM26.getSdkPath,
-  isWin: () => import_chunk_7CG7CM26.isWin,
-  optimizeProgram: () => import_chunk_7CG7CM26.optimizeProgram,
-  readPrg: () => import_chunk_7CG7CM26.readPrg,
-  readPrgWithOffsets: () => import_chunk_7CG7CM26.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_7CG7CM26.xml_util_exports
+  SectionKinds: () => import_chunk_BOVSYC7N.SectionKinds,
+  appSupport: () => import_chunk_BOVSYC7N.appSupport,
+  connectiq: () => import_chunk_BOVSYC7N.connectiq,
+  getDeviceInfo: () => import_chunk_BOVSYC7N.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_BOVSYC7N.getFunctionDocumentation,
+  getLanguages: () => import_chunk_BOVSYC7N.getLanguages,
+  getSdkPath: () => import_chunk_BOVSYC7N.getSdkPath,
+  isWin: () => import_chunk_BOVSYC7N.isWin,
+  optimizeProgram: () => import_chunk_BOVSYC7N.optimizeProgram,
+  readPrg: () => import_chunk_BOVSYC7N.readPrg,
+  readPrgWithOffsets: () => import_chunk_BOVSYC7N.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_BOVSYC7N.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_7CG7CM26 = require("./chunk-7CG7CM26.cjs");
-var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
-var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
-var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_7CG7CM26.init_sdk_util)();
+var import_chunk_BOVSYC7N = require("./chunk-BOVSYC7N.cjs");
+var import_chunk_KHQPCXSJ = require("./chunk-KHQPCXSJ.cjs");
+var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
+var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
+(0, import_chunk_BOVSYC7N.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/type-flow/inference-type.d.ts

@@ -0,0 +1,2 @@
+import { ExactOrUnion } from "./types";
+export declare function inferenceType(a: ExactOrUnion, expandNull?: boolean): ExactOrUnion;

package/build/src/type-flow/interp.d.ts

@@ -38,7 +38,7 @@ export declare function evaluateUnaryTypes(op: mctree.UnaryOperator, argument: E
     type: ExactOrUnion;
 } & OpMatch;
 export declare function deEnumerate(t: ExactOrUnion): ExactOrUnion;
-export declare function getLhsConstraint(istate: InterpState, node: mctree.MemberExpression | mctree.Identifier): import("./types").UnionType | import("./types").NumberType | import("./types").LongType | import("./types").FloatType | import("./types").DoubleType | import("./types").CharType | import("./types").StringType | import("./types").ArrayType | import("./types").DictionaryType | import("./types").MethodType | import("./types").ModuleType | import("./types").FunctionType | import("./types").ClassType | ObjectType | import("./types").EnumType | import("./types").SymbolType | import("./types").TypedefType | null | undefined;
+export declare function getLhsConstraint(istate: InterpState, node: mctree.MemberExpression | mctree.Identifier): import("./types").UnionType | import("./types").NumberType | import("./types").LongType | import("./types").FloatType | import("./types").DoubleType | import("./types").CharType | import("./types").StringType | import("./types").ArrayType | import("./types").DictionaryType | import("./types").MethodType | import("./types").ModuleType | import("./types").FunctionType | import("./types").ClassType | ObjectType | import("./types").EnumType | import("./types").SymbolType | import("./types").TypedefType | null;
 export declare function evaluateNode(istate: InterpState, node: mctree.Node): void;
 export declare function roundToFloat(value: number): number;
 export declare function mustBeIdentical(a: ExactOrUnion, b: ExactOrUnion): boolean;

package/build/src/type-flow/types.d.ts

@@ -184,7 +184,9 @@ export declare function isSingleton(v: AbstractValue): v is SingletonType;
 export declare function hasValue(v: AbstractValue): v is WithValue<ExactTypes>;
 export declare function hasNoData(v: AbstractValue, t: TypeTag): boolean;
 export declare function cloneType<T extends ExactOrUnion>(t: T): T;
-export declare function relaxType(type: ExactOrUnion): ExactOrUnion;
+export declare function relaxType(type: ExactOrUnion): {
+    type: number;
+};
 export declare function typeFromTypeStateNode(state: ProgramStateAnalysis, sn: StateNodeDecl, classVsObj?: boolean): ExactOrUnion;
 export declare function typeFromTypeStateNodes(state: ProgramStateAnalysis, sns: StateNodeDecl[], classVsObj?: boolean): ExactOrUnion;
 export declare function arrayLiteralKeyFromType(k: ExactOrUnion | null | undefined): number | null;

package/build/util.cjs

@@ -18,35 +18,35 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var util_exports = {};
 __export(util_exports, {
-  AwaitedError: () => import_chunk_X7QCZR3F.AwaitedError,
-  GenericQueue: () => import_chunk_X7QCZR3F.GenericQueue,
-  bumpLogging: () => import_chunk_X7QCZR3F.bumpLogging,
-  copyRecursiveAsNeeded: () => import_chunk_X7QCZR3F.copyRecursiveAsNeeded,
-  every: () => import_chunk_X7QCZR3F.every,
-  first_modified: () => import_chunk_X7QCZR3F.first_modified,
-  forEach: () => import_chunk_X7QCZR3F.forEach,
-  globSome: () => import_chunk_X7QCZR3F.globSome,
-  globa: () => import_chunk_X7QCZR3F.globa,
-  last_modified: () => import_chunk_X7QCZR3F.last_modified,
-  log: () => import_chunk_X7QCZR3F.log,
-  logPromise: () => import_chunk_X7QCZR3F.logPromise,
-  logger: () => import_chunk_X7QCZR3F.logger,
-  map: () => import_chunk_X7QCZR3F.map,
-  popcount: () => import_chunk_X7QCZR3F.popcount,
-  promiseAll: () => import_chunk_X7QCZR3F.promiseAll,
-  pushUnique: () => import_chunk_X7QCZR3F.pushUnique,
-  readByLine: () => import_chunk_X7QCZR3F.readByLine,
-  reduce: () => import_chunk_X7QCZR3F.reduce,
-  sameArrays: () => import_chunk_X7QCZR3F.sameArrays,
-  setBanner: () => import_chunk_X7QCZR3F.setBanner,
-  some: () => import_chunk_X7QCZR3F.some,
-  spawnByLine: () => import_chunk_X7QCZR3F.spawnByLine,
-  wouldLog: () => import_chunk_X7QCZR3F.wouldLog
+  AwaitedError: () => import_chunk_KHQPCXSJ.AwaitedError,
+  GenericQueue: () => import_chunk_KHQPCXSJ.GenericQueue,
+  bumpLogging: () => import_chunk_KHQPCXSJ.bumpLogging,
+  copyRecursiveAsNeeded: () => import_chunk_KHQPCXSJ.copyRecursiveAsNeeded,
+  every: () => import_chunk_KHQPCXSJ.every,
+  first_modified: () => import_chunk_KHQPCXSJ.first_modified,
+  forEach: () => import_chunk_KHQPCXSJ.forEach,
+  globSome: () => import_chunk_KHQPCXSJ.globSome,
+  globa: () => import_chunk_KHQPCXSJ.globa,
+  last_modified: () => import_chunk_KHQPCXSJ.last_modified,
+  log: () => import_chunk_KHQPCXSJ.log,
+  logPromise: () => import_chunk_KHQPCXSJ.logPromise,
+  logger: () => import_chunk_KHQPCXSJ.logger,
+  map: () => import_chunk_KHQPCXSJ.map,
+  popcount: () => import_chunk_KHQPCXSJ.popcount,
+  promiseAll: () => import_chunk_KHQPCXSJ.promiseAll,
+  pushUnique: () => import_chunk_KHQPCXSJ.pushUnique,
+  readByLine: () => import_chunk_KHQPCXSJ.readByLine,
+  reduce: () => import_chunk_KHQPCXSJ.reduce,
+  sameArrays: () => import_chunk_KHQPCXSJ.sameArrays,
+  setBanner: () => import_chunk_KHQPCXSJ.setBanner,
+  some: () => import_chunk_KHQPCXSJ.some,
+  spawnByLine: () => import_chunk_KHQPCXSJ.spawnByLine,
+  wouldLog: () => import_chunk_KHQPCXSJ.wouldLog
 });
 module.exports = __toCommonJS(util_exports);
-var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
-var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_X7QCZR3F.init_util)();
+var import_chunk_KHQPCXSJ = require("./chunk-KHQPCXSJ.cjs");
+var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
+(0, import_chunk_KHQPCXSJ.init_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   AwaitedError,

package/build/worker-thread.cjs

@@ -21,17 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_7CG7CM26 = require("./chunk-7CG7CM26.cjs");
-var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
-var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
-var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
+var import_chunk_BOVSYC7N = require("./chunk-BOVSYC7N.cjs");
+var import_chunk_KHQPCXSJ = require("./chunk-KHQPCXSJ.cjs");
+var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
+var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
 var import_node_worker_threads = require("node:worker_threads");
-var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
+var require_worker_thread = (0, import_chunk_VS2QQHAK.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_7CG7CM26.init_worker_task)();
+    (0, import_chunk_BOVSYC7N.init_worker_task)();
     if (import_node_worker_threads.parentPort) {
       import_node_worker_threads.parentPort.on("message", async (task) => {
-        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_7CG7CM26.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_BOVSYC7N.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.89",
+  "version": "1.1.90",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -70,7 +70,7 @@
     "@typescript-eslint/eslint-plugin": "^5.28.0",
     "@typescript-eslint/parser": "^5.28.0",
     "chai": "^4.3.7",
-    "esbuild": "^0.17.16",
+    "esbuild": "^0.25.8",
     "eslint": "^8.12.0",
     "extract-zip": "^2.0.1",
     "fast-glob": "^3.2.12",