@markw65/monkeyc-optimizer 1.1.65 → 1.1.67

package/build/{chunk-67LU4GPQ.cjs → chunk-OASVKTK5.cjs}

@@ -26,8 +26,8 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var chunk_67LU4GPQ_exports = {};
-__export(chunk_67LU4GPQ_exports, {
+var chunk_OASVKTK5_exports = {};
+__export(chunk_OASVKTK5_exports, {
   AwaitedError: () => AwaitedError,
   GenericQueue: () => GenericQueue,
   bumpLogging: () => bumpLogging,
@@ -55,7 +55,7 @@ __export(chunk_67LU4GPQ_exports, {
   spawnByLine: () => spawnByLine,
   wouldLog: () => wouldLog
 });
-module.exports = __toCommonJS(chunk_67LU4GPQ_exports);
+module.exports = __toCommonJS(chunk_OASVKTK5_exports);
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var child_process = __toESM(require("child_process"));
 var fsc = __toESM(require("fs"));
@@ -5729,7 +5729,10 @@ var init_util = (0, import_chunk_ABYVSU2C.__esm)({
         this.messagePromise = messagePromise;
       }
       resolve() {
-        return this.messagePromise.then((message) => this.message = message);
+        return this.messagePromise.then((message) => {
+          this.message = message;
+          return this;
+        });
       }
     };
   }

package/build/optimizer.cjs

@@ -18,29 +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_MDTDXRQB.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_MDTDXRQB.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_MDTDXRQB.buildOptimizedProject,
-  copyRecursiveAsNeeded: () => import_chunk_67LU4GPQ.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_MDTDXRQB.defaultConfig,
-  display: () => import_chunk_MDTDXRQB.display,
-  generateOneConfig: () => import_chunk_MDTDXRQB.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_MDTDXRQB.generateOptimizedProject,
-  getConfig: () => import_chunk_MDTDXRQB.getConfig,
-  getProjectAnalysis: () => import_chunk_MDTDXRQB.getProjectAnalysis,
-  get_jungle: () => import_chunk_MDTDXRQB.get_jungle,
-  isErrorWithLocation: () => import_chunk_MDTDXRQB.isErrorWithLocation,
-  launchSimulator: () => import_chunk_MDTDXRQB.launchSimulator,
-  manifestProducts: () => import_chunk_MDTDXRQB.manifestProducts,
-  mctree: () => import_chunk_MDTDXRQB.mctree,
-  simulateProgram: () => import_chunk_MDTDXRQB.simulateProgram
+  StateNodeAttributes: () => import_chunk_2OEXWI65.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_2OEXWI65.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_2OEXWI65.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_OASVKTK5.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_2OEXWI65.defaultConfig,
+  display: () => import_chunk_2OEXWI65.display,
+  generateOneConfig: () => import_chunk_2OEXWI65.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_2OEXWI65.generateOptimizedProject,
+  getConfig: () => import_chunk_2OEXWI65.getConfig,
+  getFnMapAnalysis: () => import_chunk_2OEXWI65.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_2OEXWI65.getProjectAnalysis,
+  get_jungle: () => import_chunk_2OEXWI65.get_jungle,
+  isErrorWithLocation: () => import_chunk_2OEXWI65.isErrorWithLocation,
+  launchSimulator: () => import_chunk_2OEXWI65.launchSimulator,
+  manifestProducts: () => import_chunk_2OEXWI65.manifestProducts,
+  mctree: () => import_chunk_2OEXWI65.mctree,
+  simulateProgram: () => import_chunk_2OEXWI65.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_MDTDXRQB = require("./chunk-MDTDXRQB.cjs");
-var import_chunk_67LU4GPQ = require("./chunk-67LU4GPQ.cjs");
+var import_chunk_2OEXWI65 = require("./chunk-2OEXWI65.cjs");
+var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_MDTDXRQB.init_optimizer)();
+(0, import_chunk_2OEXWI65.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,
@@ -52,6 +53,7 @@ var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
   generateOneConfig,
   generateOptimizedProject,
   getConfig,
+  getFnMapAnalysis,
   getProjectAnalysis,
   get_jungle,
   isErrorWithLocation,

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_MDTDXRQB.SectionKinds,
-  appSupport: () => import_chunk_MDTDXRQB.appSupport,
-  connectiq: () => import_chunk_MDTDXRQB.connectiq,
-  getDeviceInfo: () => import_chunk_MDTDXRQB.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_MDTDXRQB.getFunctionDocumentation,
-  getLanguages: () => import_chunk_MDTDXRQB.getLanguages,
-  getSdkPath: () => import_chunk_MDTDXRQB.getSdkPath,
-  isWin: () => import_chunk_MDTDXRQB.isWin,
-  optimizeProgram: () => import_chunk_MDTDXRQB.optimizeProgram,
-  readPrg: () => import_chunk_MDTDXRQB.readPrg,
-  readPrgWithOffsets: () => import_chunk_MDTDXRQB.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_MDTDXRQB.xml_util_exports
+  SectionKinds: () => import_chunk_2OEXWI65.SectionKinds,
+  appSupport: () => import_chunk_2OEXWI65.appSupport,
+  connectiq: () => import_chunk_2OEXWI65.connectiq,
+  getDeviceInfo: () => import_chunk_2OEXWI65.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_2OEXWI65.getFunctionDocumentation,
+  getLanguages: () => import_chunk_2OEXWI65.getLanguages,
+  getSdkPath: () => import_chunk_2OEXWI65.getSdkPath,
+  isWin: () => import_chunk_2OEXWI65.isWin,
+  optimizeProgram: () => import_chunk_2OEXWI65.optimizeProgram,
+  readPrg: () => import_chunk_2OEXWI65.readPrg,
+  readPrgWithOffsets: () => import_chunk_2OEXWI65.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_2OEXWI65.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_MDTDXRQB = require("./chunk-MDTDXRQB.cjs");
-var import_chunk_67LU4GPQ = require("./chunk-67LU4GPQ.cjs");
+var import_chunk_2OEXWI65 = require("./chunk-2OEXWI65.cjs");
+var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_MDTDXRQB.init_sdk_util)();
+(0, import_chunk_2OEXWI65.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/build-config.d.ts

@@ -2,6 +2,7 @@ export type DiagnosticType = "ERROR" | "WARNING" | "INFO";
 export type LookupRules = "COMPILER1" | "COMPILER2" | "DEFAULT";
 export type EnforceStatic = "YES" | "NO";
 export type BuildConfig = {
+    ignore_settings_files?: boolean;
     workspace?: string;
     jungleFiles?: string;
     developerKeyPath?: string;
@@ -30,6 +31,7 @@ export type BuildConfig = {
     compilerLookupRules?: LookupRules;
     enforceStatic?: EnforceStatic;
     sizeBasedPRE?: boolean | string;
+    preSkipLiterals?: boolean;
     prettier?: Record<string, unknown>;
     extensionVersion?: string;
     useLocalOptimizer?: boolean;
@@ -42,6 +44,7 @@ export type BuildConfig = {
     iterateOptimizer?: boolean;
     covarianceWarnings?: boolean;
     checkTypes?: DiagnosticType | "OFF";
+    strictTypeCheck?: "On" | "Off" | "Default";
     removeArgc?: boolean;
     postBuildPRE?: boolean;
     allowForbiddenOpts?: boolean;

package/build/src/mc-rewrite.d.ts

@@ -4,7 +4,7 @@ import { BuildConfig, Diagnostic, FilesToOptimizeMap, LookupDefinition, ProgramS
 import { xmlUtil } from "./sdk-util";
 export declare function getFileSources(fnMap: FilesToOptimizeMap): Promise<void>;
 export declare function getFileASTs(fnMap: FilesToOptimizeMap): Promise<boolean>;
-export declare function analyze(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document | undefined, config: BuildConfig): Promise<ProgramStateAnalysis>;
+export declare function analyze(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document | undefined, config: BuildConfig, allowParseErrors?: boolean): Promise<ProgramStateAnalysis>;
 export declare function reportMissingSymbols(state: ProgramStateAnalysis, config?: BuildConfig): void;
 export declare function getLiteralFromDecls(lookupDefns: LookupDefinition[]): mctree.Literal | mctree.AsExpression | null;
 export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document, config: BuildConfig): Promise<{

package/build/src/optimizer.d.ts

@@ -70,13 +70,8 @@ export type PreAnalysis = {
     fnMap: FilesToOptimizeMap;
     paths: string[];
 };
-declare type RequiredNonNull<T> = {
-    [K1 in keyof T]-?: {
-        [K2 in keyof T[K1]]-?: NonNullable<T[K1][K2]>;
-    };
-};
 export type Analysis = {
-    fnMap: RequiredNonNull<FilesToOptimizeMap>;
+    fnMap: FilesToOptimizeMap;
     paths: string[];
     state: ProgramStateAnalysis;
     typeMap?: TypeMap | null | undefined;
@@ -93,3 +88,8 @@ export declare function generateOneConfig(buildConfig: JungleQualifier, manifest
     sdkVersion: number | undefined;
 }>;
 export declare function getProjectAnalysis(targets: Target[], analysis: PreAnalysis | null, manifestXML: xmlUtil.Document, options: BuildConfig): Promise<Analysis | PreAnalysis>;
+export declare function getFnMapAnalysis(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document, options: BuildConfig): Promise<{
+    fnMap: FilesToOptimizeMap;
+    state: ProgramStateAnalysis;
+    typeMap: TypeMap | null;
+}>;

package/build/src/pragma-checker.d.ts

@@ -1,3 +1,3 @@
 import { mctree } from "@markw65/prettier-plugin-monkeyc";
-import { Diagnostic, ProgramStateOptimizer } from "./optimizer-types";
-export declare function pragmaChecker(state: ProgramStateOptimizer, ast: mctree.Program, diagnostics: Diagnostic[] | null | undefined): Promise<void>;
+import { Diagnostic, ProgramStateAnalysis } from "./optimizer-types";
+export declare function pragmaChecker(state: ProgramStateAnalysis, ast: mctree.Program, diagnostics: Diagnostic[] | null | undefined): Promise<void>;

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

@@ -17,7 +17,7 @@ export declare function printBlockHeader(block: TypeFlowBlock): void;
 export declare function describeEvent(event: Event): Promise<string>;
 export declare function printBlockEvents(block: TypeFlowBlock, extra?: (event: Event) => string): void;
 export declare function printBlockTrailer(block: TypeFlowBlock): void;
-export declare function findObjectDeclsByProperty(state: ProgramStateAnalysis, object: ExactOrUnion, next: mctree.DottedMemberExpression): readonly [null, null] | [StateNode[], StateNode[]];
+export declare function findObjectDeclsByProperty(state: ProgramStateAnalysis, object: ExactOrUnion, next: mctree.Identifier): readonly [null, null] | [StateNode[], StateNode[]];
 export declare function refineObjectTypeByDecls(istate: InterpState, object: ExactOrUnion, trueDecls: StateNode[]): ExactOrUnion;
 export declare function findNextObjectType(istate: InterpState, trueDecls: StateNode[], next: mctree.DottedMemberExpression): 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 | import("./types").ObjectType | import("./types").EnumType | import("./types").SymbolType | import("./types").TypedefType | null;
 export declare function resolveDottedMember(istate: InterpState, object: ExactOrUnion, next: mctree.DottedMemberExpression): {

package/build/src/util.d.ts

@@ -34,5 +34,5 @@ export declare class GenericQueue<Block> {
 export declare class AwaitedError extends Error {
     private messagePromise;
     constructor(messagePromise: Promise<string>);
-    resolve(): Promise<string>;
+    resolve(): Promise<this>;
 }

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_67LU4GPQ.AwaitedError,
-  GenericQueue: () => import_chunk_67LU4GPQ.GenericQueue,
-  bumpLogging: () => import_chunk_67LU4GPQ.bumpLogging,
-  copyRecursiveAsNeeded: () => import_chunk_67LU4GPQ.copyRecursiveAsNeeded,
-  every: () => import_chunk_67LU4GPQ.every,
-  first_modified: () => import_chunk_67LU4GPQ.first_modified,
-  forEach: () => import_chunk_67LU4GPQ.forEach,
-  globSome: () => import_chunk_67LU4GPQ.globSome,
-  globa: () => import_chunk_67LU4GPQ.globa,
-  last_modified: () => import_chunk_67LU4GPQ.last_modified,
-  log: () => import_chunk_67LU4GPQ.log,
-  logPromise: () => import_chunk_67LU4GPQ.logPromise,
-  logger: () => import_chunk_67LU4GPQ.logger,
-  map: () => import_chunk_67LU4GPQ.map,
-  popcount: () => import_chunk_67LU4GPQ.popcount,
-  promiseAll: () => import_chunk_67LU4GPQ.promiseAll,
-  pushUnique: () => import_chunk_67LU4GPQ.pushUnique,
-  readByLine: () => import_chunk_67LU4GPQ.readByLine,
-  reduce: () => import_chunk_67LU4GPQ.reduce,
-  sameArrays: () => import_chunk_67LU4GPQ.sameArrays,
-  setBanner: () => import_chunk_67LU4GPQ.setBanner,
-  some: () => import_chunk_67LU4GPQ.some,
-  spawnByLine: () => import_chunk_67LU4GPQ.spawnByLine,
-  wouldLog: () => import_chunk_67LU4GPQ.wouldLog
+  AwaitedError: () => import_chunk_OASVKTK5.AwaitedError,
+  GenericQueue: () => import_chunk_OASVKTK5.GenericQueue,
+  bumpLogging: () => import_chunk_OASVKTK5.bumpLogging,
+  copyRecursiveAsNeeded: () => import_chunk_OASVKTK5.copyRecursiveAsNeeded,
+  every: () => import_chunk_OASVKTK5.every,
+  first_modified: () => import_chunk_OASVKTK5.first_modified,
+  forEach: () => import_chunk_OASVKTK5.forEach,
+  globSome: () => import_chunk_OASVKTK5.globSome,
+  globa: () => import_chunk_OASVKTK5.globa,
+  last_modified: () => import_chunk_OASVKTK5.last_modified,
+  log: () => import_chunk_OASVKTK5.log,
+  logPromise: () => import_chunk_OASVKTK5.logPromise,
+  logger: () => import_chunk_OASVKTK5.logger,
+  map: () => import_chunk_OASVKTK5.map,
+  popcount: () => import_chunk_OASVKTK5.popcount,
+  promiseAll: () => import_chunk_OASVKTK5.promiseAll,
+  pushUnique: () => import_chunk_OASVKTK5.pushUnique,
+  readByLine: () => import_chunk_OASVKTK5.readByLine,
+  reduce: () => import_chunk_OASVKTK5.reduce,
+  sameArrays: () => import_chunk_OASVKTK5.sameArrays,
+  setBanner: () => import_chunk_OASVKTK5.setBanner,
+  some: () => import_chunk_OASVKTK5.some,
+  spawnByLine: () => import_chunk_OASVKTK5.spawnByLine,
+  wouldLog: () => import_chunk_OASVKTK5.wouldLog
 });
 module.exports = __toCommonJS(util_exports);
-var import_chunk_67LU4GPQ = require("./chunk-67LU4GPQ.cjs");
+var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_67LU4GPQ.init_util)();
+(0, import_chunk_OASVKTK5.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_MDTDXRQB = require("./chunk-MDTDXRQB.cjs");
-var import_chunk_67LU4GPQ = require("./chunk-67LU4GPQ.cjs");
+var import_chunk_2OEXWI65 = require("./chunk-2OEXWI65.cjs");
+var import_chunk_OASVKTK5 = require("./chunk-OASVKTK5.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var import_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_MDTDXRQB.init_worker_task)();
+    (0, import_chunk_2OEXWI65.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_MDTDXRQB.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_2OEXWI65.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.65",
+  "version": "1.1.67",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -24,8 +24,8 @@
     "prepack": "node esbuild.mjs --release && mkdir -p bin && cp test/cft-font-info.js bin",
     "test": "npm run test-mocha && npm run test-analysis && npm run test-optimized && npm run test-unopt && npm run test-post-only && npm run test-tiny && npm run test-remote && npm run test-remote-tests && npm run test-personality",
     "test-mocha": "npx mocha --timeout 999999 build/mocha.cjs",
-    "test-remote": "node ./test/test.js --showInfo --postOptimize --product=pick-one --github",
-    "test-remote-tests-default": "node ./test/test.js --showInfo --postOptimize --product=pick-one --run-tests --github",
+    "test-remote": "node ./test/test.js --showInfo --postOptimize --product=pick-one --ignore-settings-files --github",
+    "test-remote-tests-default": "npm run test-remote -- --run-tests",
     "test-remote-tests-with-forbidden": "npm run test-remote-tests-default -- --allowForbiddenOpts",
     "test-remote-tests": "npm run test-remote-tests-default && npm run test-remote-tests-with-forbidden",
     "test-optimized-default": "node test/test.js --showInfo --postOptimize --typeCheckLevel Strict --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
@@ -36,7 +36,7 @@
     "test-garmin-opt": "node test/test.js --typeCheckLevel Strict --skipOptimization --garminOptLevel=2 --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-personality": "node test/test-personality.js",
     "test-analysis": "node test/test.js --showInfo --typeCheckLevel Strict --product=fr955 --sourceFile 'test/analysis/*.mc'",
-    "test-tiny": "node test/test.js --postOptimize --showInfo --typeCheckLevel Strict --run-tests --product=pick-one --jungle test/tiny/array-overflow/monkey.jungle",
+    "test-tiny": "node test/test-tiny.js",
     "eslint": "npx eslint ."
   },
   "bin": {