@markw65/monkeyc-optimizer 1.1.90 → 1.1.92

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_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
+  StateNodeAttributes: () => import_chunk_VAV4N2CL.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_VAV4N2CL.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_VAV4N2CL.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_IJS7AYMN.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_VAV4N2CL.defaultConfig,
+  display: () => import_chunk_VAV4N2CL.display,
+  generateOneConfig: () => import_chunk_VAV4N2CL.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_VAV4N2CL.generateOptimizedProject,
+  getConfig: () => import_chunk_VAV4N2CL.getConfig,
+  getFnMapAnalysis: () => import_chunk_VAV4N2CL.getFnMapAnalysis,
+  getProjectAnalysis: () => import_chunk_VAV4N2CL.getProjectAnalysis,
+  get_jungle: () => import_chunk_VAV4N2CL.get_jungle,
+  isErrorWithLocation: () => import_chunk_VAV4N2CL.isErrorWithLocation,
+  launchSimulator: () => import_chunk_VAV4N2CL.launchSimulator,
+  manifestProducts: () => import_chunk_VAV4N2CL.manifestProducts,
+  mctree: () => import_chunk_VAV4N2CL.mctree,
+  simulateProgram: () => import_chunk_VAV4N2CL.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_BOVSYC7N = require("./chunk-BOVSYC7N.cjs");
-var import_chunk_KHQPCXSJ = require("./chunk-KHQPCXSJ.cjs");
+var import_chunk_VAV4N2CL = require("./chunk-VAV4N2CL.cjs");
+var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_BOVSYC7N.init_optimizer)();
+(0, import_chunk_VAV4N2CL.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_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
+  SectionKinds: () => import_chunk_VAV4N2CL.SectionKinds,
+  appSupport: () => import_chunk_VAV4N2CL.appSupport,
+  connectiq: () => import_chunk_VAV4N2CL.connectiq,
+  getDeviceInfo: () => import_chunk_VAV4N2CL.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_VAV4N2CL.getFunctionDocumentation,
+  getLanguages: () => import_chunk_VAV4N2CL.getLanguages,
+  getSdkPath: () => import_chunk_VAV4N2CL.getSdkPath,
+  isWin: () => import_chunk_VAV4N2CL.isWin,
+  optimizeProgram: () => import_chunk_VAV4N2CL.optimizeProgram,
+  readPrg: () => import_chunk_VAV4N2CL.readPrg,
+  readPrgWithOffsets: () => import_chunk_VAV4N2CL.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_VAV4N2CL.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_BOVSYC7N = require("./chunk-BOVSYC7N.cjs");
-var import_chunk_KHQPCXSJ = require("./chunk-KHQPCXSJ.cjs");
+var import_chunk_VAV4N2CL = require("./chunk-VAV4N2CL.cjs");
+var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_UBAYZSM3 = require("./chunk-UBAYZSM3.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_BOVSYC7N.init_sdk_util)();
+(0, import_chunk_VAV4N2CL.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/cftinfo.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 export type FontInfoOptions = {
     chars?: string;
     charInfoAsArray?: boolean;

package/build/src/optimizer.d.ts

@@ -89,7 +89,7 @@ export declare function generateOneConfig(buildConfig: JungleQualifier, manifest
 }>;
 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;
+    fnMap: Analysis["fnMap"];
     state: ProgramStateAnalysis;
     typeMap: TypeMap | null;
 }>;

package/build/src/readprg/bytecode.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as crypto from "node:crypto";
 import { BuildConfig } from "../optimizer-types";
 import { xmlUtil } from "../sdk-util";

package/build/src/readprg/opcodes.d.ts

@@ -56,25 +56,25 @@ export declare enum Opcodes {
     argc = 53,
     newba = 54,
     ipushz = 55,
-    ipush1 = 56,
-    ipush2 = 57,
-    ipush3 = 58,
+    ipush1 = 56,// ArgumentType.ARGUMENT_NUMBER),
+    ipush2 = 57,// ArgumentType.ARGUMENT_NUMBER),
+    ipush3 = 58,// ArgumentType.ARGUMENT_NUMBER),
     fpushz = 59,
     lpushz = 60,
     dpushz = 61,
     btpush = 62,
     bfpush = 63,
-    apush = 64,
-    bapush = 65,
-    hpush = 66,
-    getselfv = 67,
+    apush = 64,// ArgumentType.ARGUMENT_LABEL),
+    bapush = 65,// ArgumentType.ARGUMENT_LABEL),
+    hpush = 66,// ArgumentType.ARGUMENT_LABEL),
+    getselfv = 67,// ArgumentType.ARGUMENT_SYMBOL),
     getself = 68,
-    getmv = 69,
-    getlocalv = 70,
-    getsv = 71,
+    getmv = 69,// ArgumentType.ARGUMENT_SYMBOL, ArgumentType.ARGUMENT_SYMBOL),
+    getlocalv = 70,// ArgumentType.ARGUMENT_NUMBER, ArgumentType.ARGUMENT_SYMBOL),
+    getsv = 71,// ArgumentType.ARGUMENT_SYMBOL),
     invokemz = 72,
     aputvdup = 73,
-    argcincsp = 74,
+    argcincsp = 74,// ArgumentType.ARGUMENT_NUMBER, ArgumentType.ARGUMENT_NUMBER),
     isnotnull = 75
 }
 interface BaseOpcode {

package/build/src/readprg/signer.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import * as crypto from "node:crypto";
 import { Context } from "./bytecode";
-export declare function getPrgSignature(context: Context): Buffer | undefined;
+export declare function getPrgSignature(context: Context): Buffer<ArrayBuffer> | undefined;
 export declare function getDevKey(file: string): Promise<crypto.KeyObject>;
-export declare function signatureFromContext(context: Context, method?: string): Buffer | null;
-export declare function signView(key: crypto.KeyObject, view: DataView, method?: string): Buffer;
+export declare function signatureFromContext(context: Context, method?: string): NonSharedBuffer | null;
+export declare function signView(key: crypto.KeyObject, view: DataView, method?: string): NonSharedBuffer;

package/build/src/readprg/symbols.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { xmlUtil } from "../sdk-util";
 export declare class SymbolTable {
     symbolToLabelMap: Map<number, number>;
@@ -11,7 +10,7 @@ export declare class SymbolTable {
         id: number | null;
         argc: number | null;
     }>;
-    decoder: import("util").TextDecoder;
+    decoder: import("node:util").TextDecoder;
     parseSymbolTable(view: DataView): number;
     parse(view: DataView): void;
     parseXml(debugXml: xmlUtil.Document): void;

package/build/src/readprg.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as crypto from "node:crypto";
 import { BuildConfig } from "./optimizer-types";
 import { SectionInfo } from "./readprg/bytecode";
@@ -6,19 +5,22 @@ export declare function readPrg(path: string): Promise<{
     [k: string]: number;
 }>;
 export declare function readPrgFromFile(prg: string): Promise<{
-    view: DataView;
+    view: DataView<ArrayBufferLike>;
     sections: Record<number, SectionInfo>;
 }>;
 export declare function readPrgWithOffsets(view: DataView): {
-    view: DataView;
+    view: DataView<ArrayBufferLike>;
     sections: Record<number, SectionInfo>;
 };
-export declare function optimizeProgram(filepath: string, devKey?: string | undefined, output?: string, config?: BuildConfig): Promise<unknown>;
+export declare function optimizeProgram(filepath: string, devKey?: string | undefined, output?: string, config?: BuildConfig): Promise<void | {
+    signature: Buffer<ArrayBuffer> | undefined;
+    output: string;
+}>;
 export declare function optimizePrgAndDebug(prgName: string, prgBuffer: ArrayBuffer, prgOffset: number, prgLength: number, xmlName: string, xmlBuffer: ArrayBuffer, xmlOffset: number, xmlLength: number, key: crypto.KeyObject, config: BuildConfig | undefined): Promise<{
-    sigBuffer: ArrayBufferLike | undefined;
+    sigBuffer: ArrayBuffer | undefined;
     sigOffset: number | undefined;
     sigLength: number | undefined;
-    prgBuffer: ArrayBufferLike;
+    prgBuffer: ArrayBuffer;
     prgOffset: number;
     prgLength: number;
     debugXml: string;

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

@@ -215,4 +215,6 @@ export declare function getStateNodeDeclsWithExactFromType(state: ProgramStateAn
     exact: boolean;
 }[];
 export declare function typeFromEnumValue(arg: EnumType["value"] | null): UnionType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | MethodType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType;
+export type ActiveTypeMap = Map<ExactOrUnion, Set<ExactOrUnion>>;
+export declare function guardRecursiveTypedef<T>(activeTypeMap: ActiveTypeMap, a: ExactOrUnion, b: ExactOrUnion, callback: (a: ExactOrUnion, b: ExactOrUnion) => T): true | T;
 export {};

package/build/src/unzip7.d.ts

@@ -0,0 +1,6 @@
+export type SevenZipHandler = {
+    refresh: (filename: string, data?: Buffer) => void;
+    writeArchive: (filepath: string, t?: string) => void;
+};
+export declare function unzip7(filepath: string, destination: string): Promise<null>;
+export declare function unzip7(filepath: string, process: (fileName: string, data: Buffer<ArrayBuffer>, refresh: (filename: string, data?: Buffer) => void) => void): Promise<SevenZipHandler>;

package/build/src/worker-task.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as crypto from "node:crypto";
 import { JungleQualifier } from "./jungles";
 import { BuildConfig } from "./optimizer";
@@ -70,14 +69,14 @@ export declare const workerTaskHandlers: {
     }>;
     readonly generateOneConfig: (data: GenerateOneConfig["data"]) => Promise<{
         hasTests: boolean;
-        diagnostics: Record<string, import("./optimizer-types").PreDiagnostic[]> | undefined;
+        diagnostics: import("./optimizer-types").ProgramState["diagnostics"];
         sdkVersion: number | undefined;
     }>;
     readonly optimizePrgAndDebug: (data: OptimizePrgAndDebug["data"]) => Promise<{
-        sigBuffer: ArrayBufferLike | undefined;
+        sigBuffer: ArrayBuffer | undefined;
         sigOffset: number | undefined;
         sigLength: number | undefined;
-        prgBuffer: ArrayBufferLike;
+        prgBuffer: ArrayBuffer;
         prgOffset: number;
         prgLength: number;
         debugXml: string;

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_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
+  AwaitedError: () => import_chunk_IJS7AYMN.AwaitedError,
+  GenericQueue: () => import_chunk_IJS7AYMN.GenericQueue,
+  bumpLogging: () => import_chunk_IJS7AYMN.bumpLogging,
+  copyRecursiveAsNeeded: () => import_chunk_IJS7AYMN.copyRecursiveAsNeeded,
+  every: () => import_chunk_IJS7AYMN.every,
+  first_modified: () => import_chunk_IJS7AYMN.first_modified,
+  forEach: () => import_chunk_IJS7AYMN.forEach,
+  globSome: () => import_chunk_IJS7AYMN.globSome,
+  globa: () => import_chunk_IJS7AYMN.globa,
+  last_modified: () => import_chunk_IJS7AYMN.last_modified,
+  log: () => import_chunk_IJS7AYMN.log,
+  logPromise: () => import_chunk_IJS7AYMN.logPromise,
+  logger: () => import_chunk_IJS7AYMN.logger,
+  map: () => import_chunk_IJS7AYMN.map,
+  popcount: () => import_chunk_IJS7AYMN.popcount,
+  promiseAll: () => import_chunk_IJS7AYMN.promiseAll,
+  pushUnique: () => import_chunk_IJS7AYMN.pushUnique,
+  readByLine: () => import_chunk_IJS7AYMN.readByLine,
+  reduce: () => import_chunk_IJS7AYMN.reduce,
+  sameArrays: () => import_chunk_IJS7AYMN.sameArrays,
+  setBanner: () => import_chunk_IJS7AYMN.setBanner,
+  some: () => import_chunk_IJS7AYMN.some,
+  spawnByLine: () => import_chunk_IJS7AYMN.spawnByLine,
+  wouldLog: () => import_chunk_IJS7AYMN.wouldLog
 });
 module.exports = __toCommonJS(util_exports);
-var import_chunk_KHQPCXSJ = require("./chunk-KHQPCXSJ.cjs");
+var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.cjs");
 var import_chunk_VS2QQHAK = require("./chunk-VS2QQHAK.cjs");
-(0, import_chunk_KHQPCXSJ.init_util)();
+(0, import_chunk_IJS7AYMN.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_BOVSYC7N = require("./chunk-BOVSYC7N.cjs");
-var import_chunk_KHQPCXSJ = require("./chunk-KHQPCXSJ.cjs");
+var import_chunk_VAV4N2CL = require("./chunk-VAV4N2CL.cjs");
+var import_chunk_IJS7AYMN = require("./chunk-IJS7AYMN.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_VS2QQHAK.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_BOVSYC7N.init_worker_task)();
+    (0, import_chunk_VAV4N2CL.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_BOVSYC7N.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_VAV4N2CL.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.90",
+  "version": "1.1.92",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -56,7 +56,8 @@
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.61"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.61",
+    "7z-wasm": "^1.2.0"
   },
   "devDependencies": {
     "@markw65/peggy-optimizer": "^1.0.1",
@@ -65,23 +66,18 @@
     "@types/mocha": "^10.0.1",
     "@types/prettier": "^2.6.1",
     "@types/priorityqueuejs": "^1.0.1",
-    "@types/yauzl": "^2.10.0",
-    "@types/yazl": "^2.4.2",
     "@typescript-eslint/eslint-plugin": "^5.28.0",
     "@typescript-eslint/parser": "^5.28.0",
     "chai": "^4.3.7",
     "esbuild": "^0.25.8",
     "eslint": "^8.12.0",
-    "extract-zip": "^2.0.1",
     "fast-glob": "^3.2.12",
     "mocha": "^10.2.0",
     "peggy": "^3.0.2",
     "prettier": "^2.6.2",
     "prettier-plugin-pegjs": "^1.0.1",
     "priorityqueuejs": "^2.0.0",
-    "typescript": "^5.0.4",
-    "yauzl": "^2.10.0",
-    "yazl": "^2.5.1"
+    "typescript": "^5.0.4"
   },
   "repository": {
     "type": "git",