@markw65/monkeyc-optimizer 1.1.47 → 1.1.49

package/CHANGELOG.md

@@ -2,10 +2,21 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.49
+
+- Fix a bug in cleanupUnusedVars that could cause the wrong variable to be removed
+- Allow variables mixed with literals in jungle files
+- Allow Char as operands to relational operators
+- Include Null in dictionary return type
+
+### 1.1.48
+
+- Adds a `--char-info-as-array` option to `cft-font-info`. When this option is set, charInfo is an array of arrays, rather than an array of objects, and there is a (single) `charInfoNames` array, giving the names of the elements of the charInfo sub-arrays. This is to save space - the charInfo array only contains the data, rather than (potentially) thousands of copies of the field names.
+
 ### 1.1.47
 
 - Adds glyphAscent and glyphDescent to the font info produced by `cft-font-info`
-- Adds a --chars option to `cft-font-info` to select the chars you want included. This can save time, and greatly reduce the amount of output produced.
+- Adds a `--chars` option to `cft-font-info` to select the chars you want included. This can save time, and greatly reduce the amount of output produced.
 
 ### 1.1.46
 

package/bin/cft-font-info.js

@@ -2,12 +2,13 @@
 
 const cft = require("../build/cftinfo.cjs");
 const sdkUtil = require("../build/sdk-util.cjs");
-const { globa } = require("../build/util.cjs");
+const { globa, promiseAll } = require("../build/util.cjs");
 const path = require("node:path");
 
 const fonts = new Set();
 const otherArgs = [];
 let charsWanted;
+let charInfoAsArray;
 
 function error(e) {
   throw new Error(e);
@@ -34,6 +35,9 @@ const prev = process.argv.slice(2).reduce((key, value) => {
       if (value == null) return key;
       charsWanted = (charsWanted ?? "") + value;
       break;
+    case "char-info-as-array":
+      charInfoAsArray = !value || /^(true|1)$/i.test(value);
+      break;
     default:
       error(`Unknown argument: --${key}`);
   }
@@ -71,28 +75,41 @@ Promise.all(
       )
     );
   })
-)
-  .then((results) =>
-    Promise.all(
-      Array.from(fonts).map((font) =>
-        cft.getCFTFontInfo(font, charsWanted).catch(() => null)
+).then((results) => {
+  console.log("{");
+  let last = -1;
+  let active = [];
+  const fontArray = Array.from(fonts).sort();
+  return promiseAll(
+    (i) =>
+      fontArray[i] &&
+      cft
+        .getCFTFontInfo(fontArray[i], { chars: charsWanted, charInfoAsArray })
+        .then(({ name, ...rest }) => `"${name}":${JSON.stringify(rest)},`)
+        .catch(() => null)
+        .then((line) => {
+          active[i] = line;
+          while (active[last + 1] !== undefined) {
+            const a = active[++last];
+            if (a != null) {
+              console.log(a);
+            }
+            delete active[last];
+          }
+        })
+  )
+    .then(() => active.forEach((line) => line && console.log(line)))
+    .then(() =>
+      console.log(
+        `"devices":${JSON.stringify(
+          Object.fromEntries(
+            results
+              .flat()
+              .filter((result) => result != null)
+              .map(({ device, ...rest }) => [device, rest])
+          )
+        )}`
       )
     )
-      .then((fonts) =>
-        Object.fromEntries(
-          fonts
-            .filter((font) => font != null)
-            .map(({ name, ...rest }) => [name, rest])
-        )
-      )
-      .then((fonts) => ({
-        fonts,
-        devices: Object.fromEntries(
-          results
-            .flat()
-            .filter((result) => result != null)
-            .map(({ device, ...rest }) => [device, rest])
-        ),
-      }))
-  )
-  .then((results) => console.log(JSON.stringify(results)));
+    .then(() => console.log("}"));
+});

package/build/api.cjs

@@ -18,47 +18,47 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var api_exports = {};
 __export(api_exports, {
-  checkCompilerVersion: () => import_chunk_2ATRIWWT.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_2ATRIWWT.collectNamespaces,
-  createDocumentationMap: () => import_chunk_2ATRIWWT.createDocumentationMap,
-  diagnostic: () => import_chunk_2ATRIWWT.diagnostic,
-  diagnosticHelper: () => import_chunk_2ATRIWWT.diagnosticHelper,
-  findNamesInScope: () => import_chunk_2ATRIWWT.findNamesInScope,
-  findUsingForNode: () => import_chunk_2ATRIWWT.findUsingForNode,
-  formatAst: () => import_chunk_2ATRIWWT.formatAst,
-  formatAstLongLines: () => import_chunk_2ATRIWWT.formatAstLongLines,
-  formatScopedName: () => import_chunk_2ATRIWWT.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_2ATRIWWT.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_2ATRIWWT.getApiMapping,
-  getSuperClasses: () => import_chunk_2ATRIWWT.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_DZ7YMTUE.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_DZ7YMTUE.collectNamespaces,
+  createDocumentationMap: () => import_chunk_DZ7YMTUE.createDocumentationMap,
+  diagnostic: () => import_chunk_DZ7YMTUE.diagnostic,
+  diagnosticHelper: () => import_chunk_DZ7YMTUE.diagnosticHelper,
+  findNamesInScope: () => import_chunk_DZ7YMTUE.findNamesInScope,
+  findUsingForNode: () => import_chunk_DZ7YMTUE.findUsingForNode,
+  formatAst: () => import_chunk_DZ7YMTUE.formatAst,
+  formatAstLongLines: () => import_chunk_DZ7YMTUE.formatAstLongLines,
+  formatScopedName: () => import_chunk_DZ7YMTUE.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_DZ7YMTUE.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_DZ7YMTUE.getApiMapping,
+  getSuperClasses: () => import_chunk_DZ7YMTUE.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_2ATRIWWT.isClassVariable,
-  isLocal: () => import_chunk_2ATRIWWT.isLocal,
-  isLookupCandidate: () => import_chunk_2ATRIWWT.isLookupCandidate,
-  isStateNode: () => import_chunk_2ATRIWWT.isStateNode,
-  lookupByFullName: () => import_chunk_2ATRIWWT.lookupByFullName,
-  lookupNext: () => import_chunk_2ATRIWWT.lookupNext,
-  lookupResultContains: () => import_chunk_2ATRIWWT.lookupResultContains,
-  lookupWithType: () => import_chunk_2ATRIWWT.lookupWithType,
-  makeToyboxLink: () => import_chunk_2ATRIWWT.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_2ATRIWWT.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_2ATRIWWT.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_2ATRIWWT.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_2ATRIWWT.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_2ATRIWWT.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_2ATRIWWT.sameLookupResult,
+  isClassVariable: () => import_chunk_DZ7YMTUE.isClassVariable,
+  isLocal: () => import_chunk_DZ7YMTUE.isLocal,
+  isLookupCandidate: () => import_chunk_DZ7YMTUE.isLookupCandidate,
+  isStateNode: () => import_chunk_DZ7YMTUE.isStateNode,
+  lookupByFullName: () => import_chunk_DZ7YMTUE.lookupByFullName,
+  lookupNext: () => import_chunk_DZ7YMTUE.lookupNext,
+  lookupResultContains: () => import_chunk_DZ7YMTUE.lookupResultContains,
+  lookupWithType: () => import_chunk_DZ7YMTUE.lookupWithType,
+  makeToyboxLink: () => import_chunk_DZ7YMTUE.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_DZ7YMTUE.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_DZ7YMTUE.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_DZ7YMTUE.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_DZ7YMTUE.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_DZ7YMTUE.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_DZ7YMTUE.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_2ATRIWWT.variableDeclarationName,
-  visitReferences: () => import_chunk_2ATRIWWT.visitReferences,
-  visit_resources: () => import_chunk_2ATRIWWT.visit_resources,
-  visitorNode: () => import_chunk_2ATRIWWT.visitorNode
+  variableDeclarationName: () => import_chunk_DZ7YMTUE.variableDeclarationName,
+  visitReferences: () => import_chunk_DZ7YMTUE.visitReferences,
+  visit_resources: () => import_chunk_DZ7YMTUE.visit_resources,
+  visitorNode: () => import_chunk_DZ7YMTUE.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_2ATRIWWT = require("./chunk-2ATRIWWT.cjs");
+var import_chunk_DZ7YMTUE = require("./chunk-DZ7YMTUE.cjs");
 var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_2ATRIWWT.init_api)();
+(0, import_chunk_DZ7YMTUE.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/cftinfo.cjs

@@ -40,7 +40,7 @@ var fs = __toESM(require("node:fs/promises"));
 var path = __toESM(require("node:path"));
 var zlib = __toESM(require("node:zlib"));
 (0, import_chunk_MBTLUWXR.init_ast)();
-async function getCFTFontInfoFromBuffer(name, data, chars) {
+async function getCFTFontInfoFromBuffer(name, data, options) {
   const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
   const glyphFlags = view.getUint8(3);
   const cmapOffset = view.getUint32(8);
@@ -49,7 +49,8 @@ async function getCFTFontInfoFromBuffer(name, data, chars) {
   const height = view.getUint16(22);
   const ascent = view.getUint16(24);
   const internalLeading = view.getUint16(26);
-  const charFilter = chars ? new Set(chars.split("").map((ch) => ch.charCodeAt(0))) : null;
+  const { chars, charInfoAsArray } = typeof options === "string" ? { chars: options } : options ?? {};
+  const charFilter = chars != null ? new Set(chars.split("").map((ch) => ch.charCodeAt(0))) : null;
   const cmapNGroups = view.getUint32(cmapOffset + 12);
   const charInfo = [];
   const maybeCompressed = view.getUint16(0) === 40;
@@ -85,6 +86,16 @@ async function getCFTFontInfoFromBuffer(name, data, chars) {
       });
     }
   }
+  if (charInfoAsArray && charInfo.length) {
+    return {
+      name,
+      height,
+      ascent,
+      internalLeading,
+      charInfo: charInfo.map((info) => Object.values(info)),
+      charInfoNames: Object.keys(charInfo[0])
+    };
+  }
   return {
     name,
     height,
@@ -169,8 +180,10 @@ async function getGlyphData(view, offset, maybeCompressed) {
   );
 }
 function getGlyphAscentDescent(glyphData, glyphOffset, width, height, ascent, align, flags) {
-  const rle = (glyphOffset & 8388608) !== 0;
-  glyphOffset &= 8388607;
+  const rle = (flags & 2) !== 0;
+  if (rle) {
+    glyphOffset &= 8388607;
+  }
   const pixelsPerByte = flags & 4 ? 4 : 8;
   const bytesToCount = Math.ceil(width / pixelsPerByte);
   const byteWidth = Math.ceil(bytesToCount / align) * align;