@markw65/monkeyc-optimizer 1.1.25 → 1.1.27

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

@@ -8,7 +8,7 @@ export declare function isTypeStateKey(decl: EventDecl): decl is TypeStateKey;
 export declare function declIsLocal(decl: EventDecl): decl is VariableStateNode | VariableStateNode[] | mctree.TypedIdentifier;
 export declare function declIsNonLocal(decl: EventDecl): decl is VariableStateNode | VariableStateNode[];
 export declare function localDeclName(decl: EventDecl): string;
-export declare type TypeStateKey = Exclude<EventDecl, {
+export type TypeStateKey = Exclude<EventDecl, {
     type: "MemberDecl" | "Unknown";
 }>;
 export declare function tsKey(key: TypeStateKey): string;

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

@@ -33,30 +33,30 @@ export declare const UnionDataTypeTagsConst: number;
 export declare const ValueTypeTagsConst: number;
 export declare const ObjectLikeTagsConst: number;
 export declare const EnumTagsConst: number;
-declare type ExactTypeTags = TypeTag.Null | TypeTag.False | TypeTag.True | TypeTag.Number | TypeTag.Long | TypeTag.Float | TypeTag.Double | TypeTag.Char | TypeTag.String | TypeTag.Array | TypeTag.Dictionary | TypeTag.Method | TypeTag.Module | TypeTag.Function | TypeTag.Class | TypeTag.Object | TypeTag.Enum | TypeTag.Symbol | TypeTag.Typedef;
-export declare type EnumeratedTypeTags = ExactTypeTags | TypeTag.Never | TypeTag.Any;
-export declare type UnionTypeTags = number;
+type ExactTypeTags = TypeTag.Null | TypeTag.False | TypeTag.True | TypeTag.Number | TypeTag.Long | TypeTag.Float | TypeTag.Double | TypeTag.Char | TypeTag.String | TypeTag.Array | TypeTag.Dictionary | TypeTag.Method | TypeTag.Module | TypeTag.Function | TypeTag.Class | TypeTag.Object | TypeTag.Enum | TypeTag.Symbol | TypeTag.Typedef;
+export type EnumeratedTypeTags = ExactTypeTags | TypeTag.Never | TypeTag.Any;
+export type UnionTypeTags = number;
 interface AbstractValue {
     type: UnionTypeTags;
     value?: unknown;
 }
-export declare type ExactTypes = NullType | FalseType | TrueType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | MethodType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType;
-declare type ExactPairHelper<T> = T extends ExactTypes ? {
+export type ExactTypes = NullType | FalseType | TrueType | NumberType | LongType | FloatType | DoubleType | CharType | StringType | ArrayType | DictionaryType | MethodType | ModuleType | FunctionType | ClassType | ObjectType | EnumType | SymbolType | TypedefType;
+type ExactPairHelper<T> = T extends ExactTypes ? {
     type: T["type"];
     avalue: T["value"];
     bvalue: T["value"];
 } : never;
-export declare type ExactPairs = ExactPairHelper<ExactTypes>;
-export declare type ValuePairs = ExactPairHelper<ValueTypes>;
-declare type WithValue<T> = T extends ExactTypes ? T extends SingletonType ? T : {
+export type ExactPairs = ExactPairHelper<ExactTypes>;
+export type ValuePairs = ExactPairHelper<ValueTypes>;
+type WithValue<T> = T extends ExactTypes ? T extends SingletonType ? T : {
     type: T["type"];
     value: NonNullable<T["value"]>;
 } : never;
-export declare type ExactData<T extends ExactTypeTags> = T extends SingletonType ? undefined : NonNullable<Extract<ExactTypes, {
+export type ExactData<T extends ExactTypeTags> = T extends SingletonType ? undefined : NonNullable<Extract<ExactTypes, {
     type: T;
 }>["value"]>;
-export declare type ValueTypes = WithValue<ExactTypes>;
-export declare type ExtendedTypes = ExactTypes | NeverType | AnyType;
+export type ValueTypes = WithValue<ExactTypes>;
+export type ExtendedTypes = ExactTypes | NeverType | AnyType;
 export interface NeverType extends AbstractValue {
     type: 0;
     value?: undefined;
@@ -156,8 +156,8 @@ export interface AnyType extends AbstractValue {
     type: TypeTag.Any;
     value?: undefined;
 }
-export declare type SingletonType = NullType | FalseType | TrueType;
-export declare type UnionData = {
+export type SingletonType = NullType | FalseType | TrueType;
+export type UnionData = {
     mask: TypeTag;
     [TypeTag.Array]?: NonNullable<ArrayType["value"]>;
     [TypeTag.Dictionary]?: NonNullable<DictionaryType["value"]>;
@@ -168,16 +168,16 @@ export declare type UnionData = {
     [TypeTag.Object]?: NonNullable<ObjectType["value"]>;
     [TypeTag.Enum]?: NonNullable<EnumType["value"]>;
 };
-export declare type UnionDataKey = Exclude<keyof UnionData, "mask">;
+export type UnionDataKey = Exclude<keyof UnionData, "mask">;
 export interface UnionType extends AbstractValue {
     value?: UnionData | undefined;
 }
-export declare type ExactOrUnion = UnionType | ExactTypes;
-export declare type SingleValue = NonNullable<ValueTypes["value"]>;
-declare type TagValue<TAG> = Extract<ValueTypes, {
+export type ExactOrUnion = UnionType | ExactTypes;
+export type SingleValue = NonNullable<ValueTypes["value"]>;
+type TagValue<TAG> = Extract<ValueTypes, {
     type: TAG;
 }>["value"];
-export declare type EnumValueType = TagValue<TypeTag.Enum>;
+export type EnumValueType = TagValue<TypeTag.Enum>;
 export declare function isExact(v: AbstractValue): v is ExactTypes;
 export declare function isUnion(v: AbstractValue): v is UnionType;
 export declare function isSingleton(v: AbstractValue): v is SingletonType;

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

@@ -4,7 +4,7 @@ import { FunctionStateNode, ProgramStateAnalysis } from "./optimizer-types";
 import { InterpState } from "./type-flow/interp";
 import { TypeStateKey } from "./type-flow/type-flow-util";
 export declare const missingNullWorkaround = true;
-export declare type NodeEquivMap = Map<mctree.Node, {
+export type NodeEquivMap = Map<mctree.Node, {
     decl: EventDecl;
     equiv: Array<EventDecl>;
 }>;

package/build/src/util.d.ts

@@ -15,7 +15,7 @@ export declare function last_modified(inputs: string[]): Promise<number>;
 export declare function first_modified(inputs: string[]): Promise<number>;
 export declare function pushUnique<T, U extends T>(arr: T[], value: U): boolean;
 export declare function sameArrays<T>(a1: T[], a2: T[], check: (a: T, b: T) => boolean): boolean;
-export declare type LineHandler = (line: string) => void;
+export type LineHandler = (line: string) => void;
 export declare function spawnByLine(command: string, args: string[], lineHandlers: LineHandler | LineHandler[], options?: {
     [key: string]: unknown;
 }): Promise<void>;

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

@@ -44,7 +44,7 @@ interface OptimizePrgAndDebug extends BaseNode {
         config: BuildConfig | undefined;
     };
 }
-export declare type WorkerTask = BuildOptimizedProject | GenerateOptimizedProject | GenerateOneConfig | OptimizePrgAndDebug;
+export type WorkerTask = BuildOptimizedProject | GenerateOptimizedProject | GenerateOneConfig | OptimizePrgAndDebug;
 export declare const workerTaskHandlers: {
     readonly buildOptimizedProject: (data: BuildOptimizedProject["data"]) => Promise<{
         exe: string;
@@ -81,7 +81,7 @@ export declare const workerTaskHandlers: {
         debugXml: string;
     }>;
 };
-declare type RemovePromise<T> = T extends Promise<infer U> ? U : T;
-export declare type WorkerTaskResult<T> = T extends WorkerTask ? RemovePromise<ReturnType<typeof workerTaskHandlers[T["type"]]>> : never;
+type RemovePromise<T> = T extends Promise<infer U> ? U : T;
+export type WorkerTaskResult<T> = T extends WorkerTask ? RemovePromise<ReturnType<typeof workerTaskHandlers[T["type"]]>> : never;
 export declare function performTask<T extends WorkerTask>(task: T): Promise<WorkerTaskResult<T>>;
 export {};

package/build/src/xml-util.d.ts

@@ -62,9 +62,9 @@ interface XValue extends BaseNode {
     extid?: System;
     ndecl?: NData;
 }
-declare type Reference = CharRef | EntityRef;
-declare type PEReference = PERef;
-declare type SystemLiteral = string;
+type Reference = CharRef | EntityRef;
+type PEReference = PERef;
+type SystemLiteral = string;
 interface EntityRef extends BaseNode {
     type: "entityref";
     name: string;
@@ -86,8 +86,8 @@ interface NData extends BaseNode {
     type: "ndata";
     value: string;
 }
-declare type ExternalID = System | Public;
-declare type MarkupDecl = EntityDecl | NotationDecl | PI | Comment;
+type ExternalID = System | Public;
+type MarkupDecl = EntityDecl | NotationDecl | PI | Comment;
 interface System extends BaseNode {
     type: "system";
     value: SystemLiteral;
@@ -97,8 +97,8 @@ interface Public extends BaseNode {
     value: SystemLiteral;
     pubid: string;
 }
-export declare type Misc = Comment | PI | CharData;
-export declare type Content = Element | Reference | CData | Misc;
+export type Misc = Comment | PI | CharData;
+export type Content = Element | Reference | CData | Misc;
 export interface CData extends BaseNode {
     type: "cdata";
     value: string;
@@ -144,7 +144,7 @@ export declare class Document {
     processRefs(text: string): string;
 }
 export declare function elementKids(e: Element): Element[];
-declare type ElementMatcher = string | ((c: Element) => boolean);
+type ElementMatcher = string | ((c: Element) => boolean);
 export declare class Nodes {
     elements: Array<Element>;
     constructor(elements: Element | Element[]);
@@ -164,7 +164,7 @@ export declare function attrString(value: string | AttrStr): AttrStr | {
 export declare function makeAttribute(name: string | AttrStr, value: string | AttrStr): Attribute;
 export declare function parseXml(content: string, fileName?: string | null): Document;
 export declare function writeXml(doc: Document): string;
-export declare type Visitor = {
+export type Visitor = {
     pre?: (node: Content) => boolean | null | undefined | void;
     post?: (node: Content) => void;
 };

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_QFQPBQSO.GenericQueue,
-  bumpLogging: () => import_chunk_QFQPBQSO.bumpLogging,
-  copyRecursiveAsNeeded: () => import_chunk_QFQPBQSO.copyRecursiveAsNeeded,
-  every: () => import_chunk_QFQPBQSO.every,
-  first_modified: () => import_chunk_QFQPBQSO.first_modified,
-  forEach: () => import_chunk_QFQPBQSO.forEach,
-  globSome: () => import_chunk_QFQPBQSO.globSome,
-  globa: () => import_chunk_QFQPBQSO.globa,
-  last_modified: () => import_chunk_QFQPBQSO.last_modified,
-  log: () => import_chunk_QFQPBQSO.log,
-  logger: () => import_chunk_QFQPBQSO.logger,
-  map: () => import_chunk_QFQPBQSO.map,
-  popcount: () => import_chunk_QFQPBQSO.popcount,
-  promiseAll: () => import_chunk_QFQPBQSO.promiseAll,
-  pushUnique: () => import_chunk_QFQPBQSO.pushUnique,
-  readByLine: () => import_chunk_QFQPBQSO.readByLine,
-  reduce: () => import_chunk_QFQPBQSO.reduce,
-  sameArrays: () => import_chunk_QFQPBQSO.sameArrays,
-  setBanner: () => import_chunk_QFQPBQSO.setBanner,
-  some: () => import_chunk_QFQPBQSO.some,
-  spawnByLine: () => import_chunk_QFQPBQSO.spawnByLine,
-  wouldLog: () => import_chunk_QFQPBQSO.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_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
-(0, import_chunk_QFQPBQSO.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,19 +21,19 @@ __export(worker_thread_exports, {
   default: () => worker_thread_default
 });
 module.exports = __toCommonJS(worker_thread_exports);
-var import_chunk_SNWJ2FZL = require("./chunk-SNWJ2FZL.cjs");
-var import_chunk_QFQPBQSO = require("./chunk-QFQPBQSO.cjs");
+var import_chunk_DD4VX53Y = require("./chunk-DD4VX53Y.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_QFQPBQSO.__commonJS)({
+var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_SNWJ2FZL.init_worker_task)();
+    (0, import_chunk_DD4VX53Y.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_SNWJ2FZL.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_DD4VX53Y.performTask)(task));
       });
     }
   }
 });
 var worker_thread_default = require_worker_thread();
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {});

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.25",
+  "version": "1.1.27",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",
@@ -20,30 +20,35 @@
     "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",
-    "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",
+    "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",
     "test-remote-tests": "node ./test/test.js --showInfo --postOptimize --product=pick-one --run-tests --github",
     "test-optimized": "node test/test.js --showInfo --postOptimize --typeCheckLevel Strict --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "test-unopt": "node test/test.js --typeCheckLevel Strict --skipOptimization --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
-    "test-post-only": "node test/test.js --typeCheckLevel Strict --skipOptimization --postOptimize --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
+    "test-post-only": "node test/test.js --showInfo --typeCheckLevel Strict --skipOptimization --postOptimize --run-tests --product=fenix5 --product=fr235 --jungle ./test/OptimizerTests/monkey.jungle",
     "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",
     "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"
   ],
   "author": "markw65",
   "license": "MIT",
   "dependencies": {
-    "@markw65/prettier-plugin-monkeyc": "^1.0.46"
+    "@markw65/prettier-plugin-monkeyc": "^1.0.49"
   },
   "devDependencies": {
     "@types/chai": "^4.3.4",
@@ -56,16 +61,16 @@
     "@typescript-eslint/eslint-plugin": "^5.28.0",
     "@typescript-eslint/parser": "^5.28.0",
     "chai": "^4.3.7",
-    "esbuild": "^0.17.10",
+    "esbuild": "^0.17.16",
     "eslint": "^8.12.0",
     "extract-zip": "^2.0.1",
     "fast-glob": "^3.2.12",
     "mocha": "^10.2.0",
-    "peggy": "^2.0.1",
+    "peggy": "^3.0.2",
     "prettier": "^2.6.2",
-    "prettier-plugin-pegjs": "https://github.com/markw65/prettier-plugin-pegjs/releases/download/v0.5.2/prettier-plugin-pegjs-0.5.2.tgz",
+    "prettier-plugin-pegjs": "^1.0.1",
     "priorityqueuejs": "^2.0.0",
-    "typescript": "^4.6.4",
+    "typescript": "^5.0.4",
     "yauzl": "^2.10.0",
     "yazl": "^2.5.1"
   },