@markw65/monkeyc-optimizer 1.1.88 → 1.1.89

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.89
+
+- Fix error determining whether or not to generate a SHA256 signature, so that things start working with sdk-8.2.2 again
+
 ### 1.1.88
 
 - Fix output of cft-font-info

package/build/api.cjs

@@ -18,52 +18,52 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_ROZUBUPR.checkCompilerVersion,
-  clearDiagnostics: () => import_chunk_ROZUBUPR.clearDiagnostics,
-  collectNamespaces: () => import_chunk_ROZUBUPR.collectNamespaces,
-  createDocumentationMap: () => import_chunk_ROZUBUPR.createDocumentationMap,
-  declKey: () => import_chunk_ROZUBUPR.declKey,
-  diagnostic: () => import_chunk_ROZUBUPR.diagnostic,
-  diagnosticHelper: () => import_chunk_ROZUBUPR.diagnosticHelper,
-  findNamesInScope: () => import_chunk_ROZUBUPR.findNamesInScope,
-  findUsingForNode: () => import_chunk_ROZUBUPR.findUsingForNode,
-  formatAst: () => import_chunk_ROZUBUPR.formatAst,
-  formatAstLongLines: () => import_chunk_ROZUBUPR.formatAstLongLines,
-  formatScopedName: () => import_chunk_ROZUBUPR.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_ROZUBUPR.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_ROZUBUPR.getApiMapping,
-  getSuperClasses: () => import_chunk_ROZUBUPR.getSuperClasses,
-  handleImportUsing: () => import_chunk_ROZUBUPR.handleImportUsing,
+  checkCompilerVersion: () => import_chunk_7CG7CM26.checkCompilerVersion,
+  clearDiagnostics: () => import_chunk_7CG7CM26.clearDiagnostics,
+  collectNamespaces: () => import_chunk_7CG7CM26.collectNamespaces,
+  createDocumentationMap: () => import_chunk_7CG7CM26.createDocumentationMap,
+  declKey: () => import_chunk_7CG7CM26.declKey,
+  diagnostic: () => import_chunk_7CG7CM26.diagnostic,
+  diagnosticHelper: () => import_chunk_7CG7CM26.diagnosticHelper,
+  findNamesInScope: () => import_chunk_7CG7CM26.findNamesInScope,
+  findUsingForNode: () => import_chunk_7CG7CM26.findUsingForNode,
+  formatAst: () => import_chunk_7CG7CM26.formatAst,
+  formatAstLongLines: () => import_chunk_7CG7CM26.formatAstLongLines,
+  formatScopedName: () => import_chunk_7CG7CM26.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_7CG7CM26.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_7CG7CM26.getApiMapping,
+  getSuperClasses: () => import_chunk_7CG7CM26.getSuperClasses,
+  handleImportUsing: () => import_chunk_7CG7CM26.handleImportUsing,
   hasProperty: () => import_chunk_JDC43A3I.hasProperty,
-  isClassVariable: () => import_chunk_ROZUBUPR.isClassVariable,
-  isLocal: () => import_chunk_ROZUBUPR.isLocal,
-  isLookupCandidate: () => import_chunk_ROZUBUPR.isLookupCandidate,
-  isStateNode: () => import_chunk_ROZUBUPR.isStateNode,
-  lookupByFullName: () => import_chunk_ROZUBUPR.lookupByFullName,
-  lookupNext: () => import_chunk_ROZUBUPR.lookupNext,
-  lookupResultContains: () => import_chunk_ROZUBUPR.lookupResultContains,
-  lookupWithType: () => import_chunk_ROZUBUPR.lookupWithType,
-  makeToyboxLink: () => import_chunk_ROZUBUPR.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_ROZUBUPR.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_ROZUBUPR.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_ROZUBUPR.parseSdkVersion,
-  popRootNode: () => import_chunk_ROZUBUPR.popRootNode,
-  pushRootNode: () => import_chunk_ROZUBUPR.pushRootNode,
-  resolveDiagnostics: () => import_chunk_ROZUBUPR.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_ROZUBUPR.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_ROZUBUPR.sameLookupResult,
+  isClassVariable: () => import_chunk_7CG7CM26.isClassVariable,
+  isLocal: () => import_chunk_7CG7CM26.isLocal,
+  isLookupCandidate: () => import_chunk_7CG7CM26.isLookupCandidate,
+  isStateNode: () => import_chunk_7CG7CM26.isStateNode,
+  lookupByFullName: () => import_chunk_7CG7CM26.lookupByFullName,
+  lookupNext: () => import_chunk_7CG7CM26.lookupNext,
+  lookupResultContains: () => import_chunk_7CG7CM26.lookupResultContains,
+  lookupWithType: () => import_chunk_7CG7CM26.lookupWithType,
+  makeToyboxLink: () => import_chunk_7CG7CM26.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_7CG7CM26.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_7CG7CM26.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_7CG7CM26.parseSdkVersion,
+  popRootNode: () => import_chunk_7CG7CM26.popRootNode,
+  pushRootNode: () => import_chunk_7CG7CM26.pushRootNode,
+  resolveDiagnostics: () => import_chunk_7CG7CM26.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_7CG7CM26.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_7CG7CM26.sameLookupResult,
   traverseAst: () => import_chunk_JDC43A3I.traverseAst,
-  variableDeclarationName: () => import_chunk_ROZUBUPR.variableDeclarationName,
-  visitReferences: () => import_chunk_ROZUBUPR.visitReferences,
-  visit_resources: () => import_chunk_ROZUBUPR.visit_resources,
-  visitorNode: () => import_chunk_ROZUBUPR.visitorNode
+  variableDeclarationName: () => import_chunk_7CG7CM26.variableDeclarationName,
+  visitReferences: () => import_chunk_7CG7CM26.visitReferences,
+  visit_resources: () => import_chunk_7CG7CM26.visit_resources,
+  visitorNode: () => import_chunk_7CG7CM26.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_ROZUBUPR = require("./chunk-ROZUBUPR.cjs");
+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_ROZUBUPR.init_api)();
+(0, import_chunk_7CG7CM26.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-ROZUBUPR.cjs → chunk-7CG7CM26.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_ROZUBUPR_exports = {};
-__export(chunk_ROZUBUPR_exports, {
+var chunk_7CG7CM26_exports = {};
+__export(chunk_7CG7CM26_exports, {
   EnumTagsConst: () => EnumTagsConst,
   LastTypeTag: () => LastTypeTag,
   ObjectLikeTagsConst: () => ObjectLikeTagsConst,
@@ -140,7 +140,7 @@ __export(chunk_ROZUBUPR_exports, {
   visitorNode: () => visitorNode,
   xml_util_exports: () => xml_util_exports
 });
-module.exports = __toCommonJS(chunk_ROZUBUPR_exports);
+module.exports = __toCommonJS(chunk_7CG7CM26_exports);
 var import_chunk_X7QCZR3F = require("./chunk-X7QCZR3F.cjs");
 var import_chunk_JDC43A3I = require("./chunk-JDC43A3I.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
@@ -26078,7 +26078,7 @@ function getPrgSignature(context) {
   const withSha256 = context.sections[
     -507453934
     /* SIGNATURE */
-  ]?.length === 1036 + 512;
+  ]?.length === 1036 + 512 - 8;
   delete context.sections[
     -507453934
     /* SIGNATURE */
@@ -30752,7 +30752,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
       const opt_time = await (0, import_chunk_X7QCZR3F.first_modified)(
         Object.values(fnMap).map((v) => v.output)
       );
-      if (source_time < opt_time && 1738628242341 < opt_time) {
+      if (source_time < opt_time && 1754525704940 < opt_time) {
         return {
           hasTests,
           diagnostics: prevDiagnostics,
@@ -30790,7 +30790,7 @@ async function generateOneConfig(buildConfig, manifestXML, dependencyFiles, conf
             hasTests: hasTests2,
             diagnostics,
             sdkVersion,
-            optimizerVersion: "1.1.88",
+            optimizerVersion: "1.1.89",
             ...Object.fromEntries(
               configOptionsToCheck.map((option) => [option, config[option]])
             )

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_ROZUBUPR.StateNodeAttributes,
-  buildConfigDescription: () => import_chunk_ROZUBUPR.buildConfigDescription,
-  buildOptimizedProject: () => import_chunk_ROZUBUPR.buildOptimizedProject,
+  StateNodeAttributes: () => import_chunk_7CG7CM26.StateNodeAttributes,
+  buildConfigDescription: () => import_chunk_7CG7CM26.buildConfigDescription,
+  buildOptimizedProject: () => import_chunk_7CG7CM26.buildOptimizedProject,
   copyRecursiveAsNeeded: () => import_chunk_X7QCZR3F.copyRecursiveAsNeeded,
-  defaultConfig: () => import_chunk_ROZUBUPR.defaultConfig,
-  display: () => import_chunk_ROZUBUPR.display,
-  generateOneConfig: () => import_chunk_ROZUBUPR.generateOneConfig,
-  generateOptimizedProject: () => import_chunk_ROZUBUPR.generateOptimizedProject,
-  getConfig: () => import_chunk_ROZUBUPR.getConfig,
-  getFnMapAnalysis: () => import_chunk_ROZUBUPR.getFnMapAnalysis,
-  getProjectAnalysis: () => import_chunk_ROZUBUPR.getProjectAnalysis,
-  get_jungle: () => import_chunk_ROZUBUPR.get_jungle,
-  isErrorWithLocation: () => import_chunk_ROZUBUPR.isErrorWithLocation,
-  launchSimulator: () => import_chunk_ROZUBUPR.launchSimulator,
-  manifestProducts: () => import_chunk_ROZUBUPR.manifestProducts,
-  mctree: () => import_chunk_ROZUBUPR.mctree,
-  simulateProgram: () => import_chunk_ROZUBUPR.simulateProgram
+  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
 });
 module.exports = __toCommonJS(optimizer_exports);
-var import_chunk_ROZUBUPR = require("./chunk-ROZUBUPR.cjs");
+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_ROZUBUPR.init_optimizer)();
+(0, import_chunk_7CG7CM26.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_ROZUBUPR.SectionKinds,
-  appSupport: () => import_chunk_ROZUBUPR.appSupport,
-  connectiq: () => import_chunk_ROZUBUPR.connectiq,
-  getDeviceInfo: () => import_chunk_ROZUBUPR.getDeviceInfo,
-  getFunctionDocumentation: () => import_chunk_ROZUBUPR.getFunctionDocumentation,
-  getLanguages: () => import_chunk_ROZUBUPR.getLanguages,
-  getSdkPath: () => import_chunk_ROZUBUPR.getSdkPath,
-  isWin: () => import_chunk_ROZUBUPR.isWin,
-  optimizeProgram: () => import_chunk_ROZUBUPR.optimizeProgram,
-  readPrg: () => import_chunk_ROZUBUPR.readPrg,
-  readPrgWithOffsets: () => import_chunk_ROZUBUPR.readPrgWithOffsets,
-  xmlUtil: () => import_chunk_ROZUBUPR.xml_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
 });
 module.exports = __toCommonJS(sdk_util_exports);
-var import_chunk_ROZUBUPR = require("./chunk-ROZUBUPR.cjs");
+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_ROZUBUPR.init_sdk_util)();
+(0, import_chunk_7CG7CM26.init_sdk_util)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   SectionKinds,

package/build/src/analysis.d.ts

@@ -0,0 +1,34 @@
+import { JungleQualifier, JungleResourceMap, Target } from "./jungles";
+import { BuildConfig, ExcludeAnnotationsMap, FilesToOptimizeMap, ProgramStateAnalysis } from "./optimizer-types";
+import { xmlUtil } from "./sdk-util";
+import { TypeMap } from "./type-flow/interp";
+export type PreAnalysis = {
+    fnMap: FilesToOptimizeMap;
+    paths: string[];
+};
+export type Analysis = {
+    fnMap: FilesToOptimizeMap;
+    paths: string[];
+    state: ProgramStateAnalysis;
+    typeMap?: TypeMap | null | undefined;
+};
+export declare function relative_path_no_dotdot(relative: string): string;
+type GlobCache = Map<string, Promise<string[]>>;
+export declare function fileInfoFromConfig(workspace: string, buildDir: string, output: string, buildConfig: JungleQualifier, extraExcludes: ExcludeAnnotationsMap, barrel: string, cache?: GlobCache): Promise<PreAnalysis>;
+/**
+ * A barrel can specify a list of possible annotations, and the
+ * jungle that requests the barrel can specify the annotations it wants.
+ *
+ * We should exclude all the possible annotations that weren't explicitly
+ * requested.
+ */
+export declare function excludesFromAnnotations(baseAnnotations: string[] | undefined, barrelAnnotations: string[] | undefined): {
+    [k: string]: boolean;
+};
+export declare function getProjectAnalysisHelper(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;
+}>;
+export {};

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_ROZUBUPR = require("./chunk-ROZUBUPR.cjs");
+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_node_worker_threads = require("node:worker_threads");
 var require_worker_thread = (0, import_chunk_ABYVSU2C.__commonJS)({
   "src/worker-thread.ts"() {
-    (0, import_chunk_ROZUBUPR.init_worker_task)();
+    (0, import_chunk_7CG7CM26.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_ROZUBUPR.performTask)(task));
+        return import_node_worker_threads.parentPort.postMessage(await (0, import_chunk_7CG7CM26.performTask)(task));
       });
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@markw65/monkeyc-optimizer",
   "type": "commonjs",
-  "version": "1.1.88",
+  "version": "1.1.89",
   "description": "Source to source optimizer for Garmin Monkey C code",
   "main": "build/optimizer.cjs",
   "types": "build/src/optimizer.d.ts",