@markw65/monkeyc-optimizer 1.1.26 → 1.1.28

package/build/optimizer.cjs

@@ -18,27 +18,29 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var optimizer_exports = {};
 __export(optimizer_exports, {
-  StateNodeAttributes: () => import_chunk_XO53WBWQ.StateNodeAttributes,
-  buildOptimizedProject: () => import_chunk_XO53WBWQ.buildOptimizedProject,
-  copyRecursiveAsNeeded: () => import_chunk_YZ44IUV6.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_XO53WBWQ.defaultConfig,
-  display: () => import_chunk_XO53WBWQ.display,
-  generateApiMirTests: () => import_chunk_XO53WBWQ.generateApiMirTests,
-  generateOneConfig: () => import_chunk_XO53WBWQ.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_XO53WBWQ.generateOptimizedProject,
-  getConfig: () => import_chunk_XO53WBWQ.getConfig,
-  getProjectAnalysis: () => import_chunk_XO53WBWQ.getProjectAnalysis,
-  get_jungle: () => import_chunk_XO53WBWQ.get_jungle,
-  isErrorWithLocation: () => import_chunk_XO53WBWQ.isErrorWithLocation,
-  launchSimulator: () => import_chunk_XO53WBWQ.launchSimulator,
-  manifestProducts: () => import_chunk_XO53WBWQ.manifestProducts,
-  mctree: () => import_chunk_XO53WBWQ.mctree,
-  simulateProgram: () => import_chunk_XO53WBWQ.simulateProgram
+  StateNodeAttributes: () => import_chunk_ZI7CGRJC.StateNodeAttributes,
+  buildOptimizedProject: () => import_chunk_ZI7CGRJC.buildOptimizedProject,
+  copyRecursiveAsNeeded: () => import_chunk_PVBIKZYZ.copyRecursiveAsNeeded,
+  defaultConfig: () => import_chunk_ZI7CGRJC.defaultConfig,
+  display: () => import_chunk_ZI7CGRJC.display,
+  generateApiMirTests: () => import_chunk_ZI7CGRJC.generateApiMirTests,
+  generateOneConfig: () => import_chunk_ZI7CGRJC.generateOneConfig,
+  generateOptimizedProject: () => import_chunk_ZI7CGRJC.generateOptimizedProject,
+  getConfig: () => import_chunk_ZI7CGRJC.getConfig,
+  getProjectAnalysis: () => import_chunk_ZI7CGRJC.getProjectAnalysis,
+  get_jungle: () => import_chunk_ZI7CGRJC.get_jungle,
+  isErrorWithLocation: () => import_chunk_ZI7CGRJC.isErrorWithLocation,
+  launchSimulator: () => import_chunk_ZI7CGRJC.launchSimulator,
+  manifestProducts: () => import_chunk_ZI7CGRJC.manifestProducts,
+  mctree: () => import_chunk_ZI7CGRJC.mctree,
+  simulateProgram: () => import_chunk_ZI7CGRJC.simulateProgram
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_XO53WBWQ = require("./chunk-XO53WBWQ.cjs");
-var import_chunk_YZ44IUV6 = require("./chunk-YZ44IUV6.cjs");
-(0, import_chunk_XO53WBWQ.init_optimizer)();
+var import_chunk_ZI7CGRJC = require("./chunk-ZI7CGRJC.cjs");
+var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
+var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
+var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
+(0, import_chunk_ZI7CGRJC.init_optimizer)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   StateNodeAttributes,

package/build/sdk-util.cjs

@@ -18,23 +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_XO53WBWQ.SectionKinds,
-  appSupport: () => import_chunk_XO53WBWQ.appSupport,
-  connectiq: () => import_chunk_XO53WBWQ.connectiq,
-  getDeviceInfo: () => import_chunk_XO53WBWQ.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_XO53WBWQ.getFunctionDocumentation,
-  getLanguages: () => import_chunk_XO53WBWQ.getLanguages,
-  getSdkPath: () => import_chunk_XO53WBWQ.getSdkPath,
-  isWin: () => import_chunk_XO53WBWQ.isWin,
-  optimizeProgram: () => import_chunk_XO53WBWQ.optimizeProgram,
-  readPrg: () => import_chunk_XO53WBWQ.readPrg,
-  readPrgWithOffsets: () => import_chunk_XO53WBWQ.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_XO53WBWQ.xml_util_exports
+  SectionKinds: () => import_chunk_ZI7CGRJC.SectionKinds,
+  appSupport: () => import_chunk_ZI7CGRJC.appSupport,
+  connectiq: () => import_chunk_ZI7CGRJC.connectiq,
+  getDeviceInfo: () => import_chunk_ZI7CGRJC.getDeviceInfo,
+  getFunctionDocumentation: () => import_chunk_ZI7CGRJC.getFunctionDocumentation,
+  getLanguages: () => import_chunk_ZI7CGRJC.getLanguages,
+  getSdkPath: () => import_chunk_ZI7CGRJC.getSdkPath,
+  isWin: () => import_chunk_ZI7CGRJC.isWin,
+  optimizeProgram: () => import_chunk_ZI7CGRJC.optimizeProgram,
+  readPrg: () => import_chunk_ZI7CGRJC.readPrg,
+  readPrgWithOffsets: () => import_chunk_ZI7CGRJC.readPrgWithOffsets,
+  xmlUtil: () => import_chunk_ZI7CGRJC.xml_util_exports
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_XO53WBWQ = require("./chunk-XO53WBWQ.cjs");
-var import_chunk_YZ44IUV6 = require("./chunk-YZ44IUV6.cjs");
-(0, import_chunk_XO53WBWQ.init_sdk_util)();
+var import_chunk_ZI7CGRJC = require("./chunk-ZI7CGRJC.cjs");
+var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.cjs");
+var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
+var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
+(0, import_chunk_ZI7CGRJC.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/cftinfo.d.ts

@@ -0,0 +1,32 @@
+/// <reference types="node" />
+export declare function getCFTFontInfoFromBuffer(name: string, data: Buffer): {
+    name: string;
+    height: number;
+    ascent: number;
+    internalLeading: number;
+    charInfo: {
+        code: number;
+        char: string;
+        width: number;
+    }[];
+};
+export declare function getCFTFontInfo(filename: string): Promise<{
+    name: string;
+    height: number;
+    ascent: number;
+    internalLeading: number;
+    charInfo: {
+        code: number;
+        char: string;
+        width: number;
+    }[];
+}>;
+export declare function getDeviceFontInfo(dirname: string): Promise<{
+    device: string;
+    fontSets: {
+        [k: string]: {
+            [k: string]: string;
+        };
+    };
+    langMap: Record<string, string>;
+}>;

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

@@ -7,4 +7,7 @@ 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 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<Record<string, import("./optimizer-types").Diagnostic[]> | undefined>;
+export declare function optimizeMonkeyC(fnMap: FilesToOptimizeMap, resourcesMap: Record<string, JungleResourceMap>, manifestXML: xmlUtil.Document, config: BuildConfig): Promise<{
+    diagnostics: Record<string, import("./optimizer-types").Diagnostic[]> | undefined;
+    sdkVersion: number | undefined;
+}>;

package/build/src/optimizer.d.ts

@@ -89,6 +89,7 @@ export type Analysis = {
 export declare function generateOneConfig(buildConfig: JungleQualifier, manifestXML: xmlUtil.Document, dependencyFiles: string[], config: BuildConfig): Promise<{
     hasTests: boolean;
     diagnostics: ProgramState["diagnostics"];
+    sdkVersion: number | undefined;
 }>;
 export declare function getProjectAnalysis(targets: Target[], analysis: PreAnalysis | null, manifestXML: xmlUtil.Document, options: BuildConfig): Promise<Analysis | PreAnalysis>;
 /**

package/build/src/projects.d.ts

@@ -13,7 +13,7 @@ export type RemoteProject = string | {
     sourcePath?: string;
     jungleContent?: string[];
     garminOptLevel?: number;
-    test?: boolean;
+    test?: boolean | string[];
 };
 export declare const githubProjects: RemoteProject[];
 export declare function fetchGitProjects(projects: RemoteProject[], testOnly: boolean, skipRemote: boolean): Promise<(string | {
@@ -21,4 +21,5 @@ export declare function fetchGitProjects(projects: RemoteProject[], testOnly: bo
     build: boolean | null;
     options: BuildConfig | null;
     garminOptLevel: number | null;
+    products: string[] | null;
 })[]>;

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

@@ -11,6 +11,7 @@ export type InterpState = {
     state: ProgramStateAnalysis;
     stack: InterpStackElem[];
     typeMap?: TypeMap;
+    localLvals?: Set<mctree.Node>;
     func?: FunctionStateNode;
     pre?: (node: mctree.Node) => mctree.Node | false | null | void;
     post?: (node: mctree.Node) => mctree.Node | false | null | void;

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

@@ -70,6 +70,7 @@ export declare const workerTaskHandlers: {
     readonly generateOneConfig: (data: GenerateOneConfig["data"]) => Promise<{
         hasTests: boolean;
         diagnostics: Record<string, import("./optimizer-types").Diagnostic[]> | undefined;
+        sdkVersion: number | undefined;
     }>;
     readonly optimizePrgAndDebug: (data: OptimizePrgAndDebug["data"]) => Promise<{
         sigBuffer: ArrayBufferLike | undefined;

package/build/util.cjs

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

package/build/worker-thread.cjs

@@ -21,15 +21,17 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_XO53WBWQ = require("./chunk-XO53WBWQ.cjs");
-var import_chunk_YZ44IUV6 = require("./chunk-YZ44IUV6.cjs");
+var import_chunk_ZI7CGRJC = require("./chunk-ZI7CGRJC.cjs");
+var import_chunk_PVBIKZYZ = require("./chunk-PVBIKZYZ.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_YZ44IUV6.__commonJS)({
+var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_XO53WBWQ.init_worker_task)();
+    (0, import_chunk_ZI7CGRJC.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_XO53WBWQ.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_ZI7CGRJC.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.26",
+  "version": "1.1.28",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -20,7 +20,7 @@
     "prettier-live": "test -z \"$(git status --untracked-files=no --porcelain || echo dirty)\" && npm install ../prettier-plugin-monkeyc && git commit -am 'prettier-plugin-monkeyc-live'",
     "build-debug": "node esbuild.mjs",
     "build-release": "node esbuild.mjs --release",
-    "prepack": "node esbuild.mjs --release",
+    "prepack": "node esbuild.mjs --release && mkdir -p bin && cp test/cft-font-info.js bin",
     "test": "npm run test-mocha && npm run test-optimized && npm run test-unopt && npm run test-post-only && 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",
@@ -32,12 +32,16 @@
     "test-personality": "node test/test-personality.js",
     "eslint": "npx eslint ."
   },
+  "bin": {
+    "cft-font-info": "bin/cft-font-info.js"
+  },
   "files": [
     "build/optimizer.cjs",
     "build/util.cjs",
     "build/sdk-util.cjs",
     "build/api.cjs",
     "build/worker-thread.cjs",
+    "build/cftinfo.cjs",
     "build/chunk-*.cjs",
     "build/src/**/*.d.ts"
   ],