@markw65/monkeyc-optimizer 1.1.63 → 1.1.65

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 All notable changes to the "monkeyc-optimizer" package will be documented in this file.
 
+### 1.1.65
+
+- Fix lookup scopes for tuples and object literals (fixes #39)
+- Fix a race creating the output directory
+- Don't put system personality files in barrel namespace (partial fix for #40)
+- Fix 'illegal argument' error with multi-line personality attributes (partial fix for #40)
+- Fix filtering of source files in compiled barrels in analysis mode (fixes #41)
+- Fix lookup of Barrel qualified names in resource references (fixes #43)
+
+### 1.1.64
+
+- Pull all relevent config options from any found settings files
+- Look for a .code-workspace file, starting from the project folder and working upwards. Pull settings from it if found.
+- Update the example code in the README to fix some nits.
+
 ### 1.1.63
 
 - Fixes #31 again, after the fix for #35 broke it

package/README.md

@@ -16,11 +16,11 @@ See [Change Log](CHANGELOG.md)
 
 ## API
 
-First you will need to [install nodejs/npm](https://nodejs.org/en/download).
+First you will need to [install nodejs/npm](https://nodejs.org/en/download). Note that you need node 16.17.1 or later, preferably 18.20.3 or later
 
 Then you can install the package. From the directory where you want to use it:
 
-```
+```sh
 npm install -D @markw65/monkeyc-optimizer
 ```
 
@@ -31,7 +31,8 @@ import { buildOptimizedProject, getConfig } from "@markw65/monkeyc-optimizer";
 import { optimizeProgram } from "@markw65/monkeyc-optimizer/sdk-util.js";
 import * as path from "node:path";
 
-const jungleFiles = process.argv[2];
+const cwd = process.cwd();
+const jungleFiles = path.resolve(cwd, process.argv[2]);
 const workspace = path.dirname(jungleFiles);
 
 getConfig({
@@ -48,7 +49,7 @@ getConfig({
   // Defaults to bin. Relative paths are relative to workspace
   buildDir: "bin",
   // Where to put the files generated by the source-to-source optimizer
-  // Defaults to bin/optimized. Relative paths are relative to workspace
+  // Defaults to `${buildDir}/optimized`. Relative paths are relative to workspace
   outputPath: "bin/optimized",
   // Semi-colon separated list of jungle files
   jungleFiles,

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_Y2ZRISYL.checkCompilerVersion,
-  collectNamespaces: () => import_chunk_Y2ZRISYL.collectNamespaces,
-  createDocumentationMap: () => import_chunk_Y2ZRISYL.createDocumentationMap,
-  diagnostic: () => import_chunk_Y2ZRISYL.diagnostic,
-  diagnosticHelper: () => import_chunk_Y2ZRISYL.diagnosticHelper,
-  findNamesInScope: () => import_chunk_Y2ZRISYL.findNamesInScope,
-  findUsingForNode: () => import_chunk_Y2ZRISYL.findUsingForNode,
-  formatAst: () => import_chunk_Y2ZRISYL.formatAst,
-  formatAstLongLines: () => import_chunk_Y2ZRISYL.formatAstLongLines,
-  formatScopedName: () => import_chunk_Y2ZRISYL.formatScopedName,
-  getApiFunctionInfo: () => import_chunk_Y2ZRISYL.getApiFunctionInfo,
-  getApiMapping: () => import_chunk_Y2ZRISYL.getApiMapping,
-  getSuperClasses: () => import_chunk_Y2ZRISYL.getSuperClasses,
+  checkCompilerVersion: () => import_chunk_MDTDXRQB.checkCompilerVersion,
+  collectNamespaces: () => import_chunk_MDTDXRQB.collectNamespaces,
+  createDocumentationMap: () => import_chunk_MDTDXRQB.createDocumentationMap,
+  diagnostic: () => import_chunk_MDTDXRQB.diagnostic,
+  diagnosticHelper: () => import_chunk_MDTDXRQB.diagnosticHelper,
+  findNamesInScope: () => import_chunk_MDTDXRQB.findNamesInScope,
+  findUsingForNode: () => import_chunk_MDTDXRQB.findUsingForNode,
+  formatAst: () => import_chunk_MDTDXRQB.formatAst,
+  formatAstLongLines: () => import_chunk_MDTDXRQB.formatAstLongLines,
+  formatScopedName: () => import_chunk_MDTDXRQB.formatScopedName,
+  getApiFunctionInfo: () => import_chunk_MDTDXRQB.getApiFunctionInfo,
+  getApiMapping: () => import_chunk_MDTDXRQB.getApiMapping,
+  getSuperClasses: () => import_chunk_MDTDXRQB.getSuperClasses,
   hasProperty: () => import_chunk_MBTLUWXR.hasProperty,
-  isClassVariable: () => import_chunk_Y2ZRISYL.isClassVariable,
-  isLocal: () => import_chunk_Y2ZRISYL.isLocal,
-  isLookupCandidate: () => import_chunk_Y2ZRISYL.isLookupCandidate,
-  isStateNode: () => import_chunk_Y2ZRISYL.isStateNode,
-  lookupByFullName: () => import_chunk_Y2ZRISYL.lookupByFullName,
-  lookupNext: () => import_chunk_Y2ZRISYL.lookupNext,
-  lookupResultContains: () => import_chunk_Y2ZRISYL.lookupResultContains,
-  lookupWithType: () => import_chunk_Y2ZRISYL.lookupWithType,
-  makeToyboxLink: () => import_chunk_Y2ZRISYL.makeToyboxLink,
-  mapVarDeclsByType: () => import_chunk_Y2ZRISYL.mapVarDeclsByType,
-  markInvokeClassMethod: () => import_chunk_Y2ZRISYL.markInvokeClassMethod,
-  parseSdkVersion: () => import_chunk_Y2ZRISYL.parseSdkVersion,
-  resolveDiagnostics: () => import_chunk_Y2ZRISYL.resolveDiagnostics,
-  resolveDiagnosticsMap: () => import_chunk_Y2ZRISYL.resolveDiagnosticsMap,
-  sameLookupResult: () => import_chunk_Y2ZRISYL.sameLookupResult,
+  isClassVariable: () => import_chunk_MDTDXRQB.isClassVariable,
+  isLocal: () => import_chunk_MDTDXRQB.isLocal,
+  isLookupCandidate: () => import_chunk_MDTDXRQB.isLookupCandidate,
+  isStateNode: () => import_chunk_MDTDXRQB.isStateNode,
+  lookupByFullName: () => import_chunk_MDTDXRQB.lookupByFullName,
+  lookupNext: () => import_chunk_MDTDXRQB.lookupNext,
+  lookupResultContains: () => import_chunk_MDTDXRQB.lookupResultContains,
+  lookupWithType: () => import_chunk_MDTDXRQB.lookupWithType,
+  makeToyboxLink: () => import_chunk_MDTDXRQB.makeToyboxLink,
+  mapVarDeclsByType: () => import_chunk_MDTDXRQB.mapVarDeclsByType,
+  markInvokeClassMethod: () => import_chunk_MDTDXRQB.markInvokeClassMethod,
+  parseSdkVersion: () => import_chunk_MDTDXRQB.parseSdkVersion,
+  resolveDiagnostics: () => import_chunk_MDTDXRQB.resolveDiagnostics,
+  resolveDiagnosticsMap: () => import_chunk_MDTDXRQB.resolveDiagnosticsMap,
+  sameLookupResult: () => import_chunk_MDTDXRQB.sameLookupResult,
   traverseAst: () => import_chunk_MBTLUWXR.traverseAst,
-  variableDeclarationName: () => import_chunk_Y2ZRISYL.variableDeclarationName,
-  visitReferences: () => import_chunk_Y2ZRISYL.visitReferences,
-  visit_resources: () => import_chunk_Y2ZRISYL.visit_resources,
-  visitorNode: () => import_chunk_Y2ZRISYL.visitorNode
+  variableDeclarationName: () => import_chunk_MDTDXRQB.variableDeclarationName,
+  visitReferences: () => import_chunk_MDTDXRQB.visitReferences,
+  visit_resources: () => import_chunk_MDTDXRQB.visit_resources,
+  visitorNode: () => import_chunk_MDTDXRQB.visitorNode
 });
 module.exports = __toCommonJS(api_exports);
-var import_chunk_Y2ZRISYL = require("./chunk-Y2ZRISYL.cjs");
-var import_chunk_SG7ODKRM = require("./chunk-SG7ODKRM.cjs");
+var import_chunk_MDTDXRQB = require("./chunk-MDTDXRQB.cjs");
+var import_chunk_67LU4GPQ = require("./chunk-67LU4GPQ.cjs");
 var import_chunk_MBTLUWXR = require("./chunk-MBTLUWXR.cjs");
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
-(0, import_chunk_Y2ZRISYL.init_api)();
+(0, import_chunk_MDTDXRQB.init_api)();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   checkCompilerVersion,

package/build/{chunk-SG7ODKRM.cjs → chunk-67LU4GPQ.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_SG7ODKRM_exports = {};
-__export(chunk_SG7ODKRM_exports, {
+var chunk_67LU4GPQ_exports = {};
+__export(chunk_67LU4GPQ_exports, {
   AwaitedError: () => AwaitedError,
   GenericQueue: () => GenericQueue,
   bumpLogging: () => bumpLogging,
@@ -55,7 +55,7 @@ __export(chunk_SG7ODKRM_exports, {
   spawnByLine: () => spawnByLine,
   wouldLog: () => wouldLog
 });
-module.exports = __toCommonJS(chunk_SG7ODKRM_exports);
+module.exports = __toCommonJS(chunk_67LU4GPQ_exports);
 var import_chunk_ABYVSU2C = require("./chunk-ABYVSU2C.cjs");
 var child_process = __toESM(require("child_process"));
 var fsc = __toESM(require("fs"));
@@ -346,7 +346,7 @@ var require_utils = (0, import_chunk_ABYVSU2C.__commonJS)({
       return (Number(max) - Number(min)) / Number(step) >= limit;
     };
     exports.escapeNode = (block, n = 0, type) => {
-      let node = block.nodes[n];
+      const node = block.nodes[n];
       if (!node)
         return;
       if (type && node.type === type || node.type === "open" || node.type === "close") {
@@ -397,8 +397,14 @@ var require_utils = (0, import_chunk_ABYVSU2C.__commonJS)({
       const result = [];
       const flat = (arr) => {
         for (let i = 0; i < arr.length; i++) {
-          let ele = arr[i];
-          Array.isArray(ele) ? flat(ele, result) : ele !== void 0 && result.push(ele);
+          const ele = arr[i];
+          if (Array.isArray(ele)) {
+            flat(ele);
+            continue;
+          }
+          if (ele !== void 0) {
+            result.push(ele);
+          }
         }
         return result;
       };
@@ -412,9 +418,9 @@ var require_stringify = (0, import_chunk_ABYVSU2C.__commonJS)({
     "use strict";
     var utils = require_utils();
     module2.exports = (ast, options = {}) => {
-      let stringify = (node, parent = {}) => {
-        let invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent);
-        let invalidNode = node.invalid === true && options.escapeInvalid === true;
+      const stringify = (node, parent = {}) => {
+        const invalidBlock = options.escapeInvalid && utils.isInvalidBrace(parent);
+        const invalidNode = node.invalid === true && options.escapeInvalid === true;
         let output = "";
         if (node.value) {
           if ((invalidBlock || invalidNode) && utils.isOpenOrClose(node)) {
@@ -426,7 +432,7 @@ var require_stringify = (0, import_chunk_ABYVSU2C.__commonJS)({
           return node.value;
         }
         if (node.nodes) {
-          for (let child of node.nodes) {
+          for (const child of node.nodes) {
             output += stringify(child);
           }
         }
@@ -712,7 +718,7 @@ var require_fill_range = (0, import_chunk_ABYVSU2C.__commonJS)({
         input = "0" + input;
       return negative ? "-" + input : input;
     };
-    var toSequence = (parts, options) => {
+    var toSequence = (parts, options, maxLen) => {
       parts.negatives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
       parts.positives.sort((a, b) => a < b ? -1 : a > b ? 1 : 0);
       let prefix = options.capture ? "" : "?:";
@@ -720,10 +726,10 @@ var require_fill_range = (0, import_chunk_ABYVSU2C.__commonJS)({
       let negatives = "";
       let result;
       if (parts.positives.length) {
-        positives = parts.positives.join("|");
+        positives = parts.positives.map((v) => toMaxLen(String(v), maxLen)).join("|");
       }
       if (parts.negatives.length) {
-        negatives = `-(${prefix}${parts.negatives.join("|")})`;
+        negatives = `-(${prefix}${parts.negatives.map((v) => toMaxLen(String(v), maxLen)).join("|")})`;
       }
       if (positives && negatives) {
         result = `${positives}|${negatives}`;
@@ -805,7 +811,7 @@ var require_fill_range = (0, import_chunk_ABYVSU2C.__commonJS)({
         index++;
       }
       if (options.toRegex === true) {
-        return step > 1 ? toSequence(parts, options) : toRegex(range, null, { wrap: false, ...options });
+        return step > 1 ? toSequence(parts, options, maxLen) : toRegex(range, null, { wrap: false, ...options });
       }
       return range;
     };
@@ -870,16 +876,17 @@ var require_compile = (0, import_chunk_ABYVSU2C.__commonJS)({
     var fill = require_fill_range();
     var utils = require_utils();
     var compile = (ast, options = {}) => {
-      let walk = (node, parent = {}) => {
-        let invalidBlock = utils.isInvalidBrace(parent);
-        let invalidNode = node.invalid === true && options.escapeInvalid === true;
-        let invalid = invalidBlock === true || invalidNode === true;
-        let prefix = options.escapeInvalid === true ? "\\" : "";
+      const walk = (node, parent = {}) => {
+        const invalidBlock = utils.isInvalidBrace(parent);
+        const invalidNode = node.invalid === true && options.escapeInvalid === true;
+        const invalid = invalidBlock === true || invalidNode === true;
+        const prefix = options.escapeInvalid === true ? "\\" : "";
         let output = "";
         if (node.isOpen === true) {
           return prefix + node.value;
         }
         if (node.isClose === true) {
+          console.log("node.isClose", prefix, node.value);
           return prefix + node.value;
         }
         if (node.type === "open") {
@@ -895,14 +902,14 @@ var require_compile = (0, import_chunk_ABYVSU2C.__commonJS)({
           return node.value;
         }
         if (node.nodes && node.ranges > 0) {
-          let args = utils.reduce(node.nodes);
-          let range = fill(...args, { ...options, wrap: false, toRegex: true });
+          const args = utils.reduce(node.nodes);
+          const range = fill(...args, { ...options, wrap: false, toRegex: true, strictZeros: true });
           if (range.length !== 0) {
             return args.length > 1 && range.length > 1 ? `(${range})` : range;
           }
         }
         if (node.nodes) {
-          for (let child of node.nodes) {
+          for (const child of node.nodes) {
             output += walk(child, node);
           }
         }
@@ -920,7 +927,7 @@ var require_expand = (0, import_chunk_ABYVSU2C.__commonJS)({
     var stringify = require_stringify();
     var utils = require_utils();
     var append = (queue = "", stash = "", enclose = false) => {
-      let result = [];
+      const result = [];
       queue = [].concat(queue);
       stash = [].concat(stash);
       if (!stash.length)
@@ -928,9 +935,9 @@ var require_expand = (0, import_chunk_ABYVSU2C.__commonJS)({
       if (!queue.length) {
         return enclose ? utils.flatten(stash).map((ele) => `{${ele}}`) : stash;
       }
-      for (let item of queue) {
+      for (const item of queue) {
         if (Array.isArray(item)) {
-          for (let value of item) {
+          for (const value of item) {
             result.push(append(value, stash, enclose));
           }
         } else {
@@ -944,8 +951,8 @@ var require_expand = (0, import_chunk_ABYVSU2C.__commonJS)({
       return utils.flatten(result);
     };
     var expand = (ast, options = {}) => {
-      let rangeLimit = options.rangeLimit === void 0 ? 1e3 : options.rangeLimit;
-      let walk = (node, parent = {}) => {
+      const rangeLimit = options.rangeLimit === void 0 ? 1e3 : options.rangeLimit;
+      const walk = (node, parent = {}) => {
         node.queue = [];
         let p = parent;
         let q = parent.queue;
@@ -962,7 +969,7 @@ var require_expand = (0, import_chunk_ABYVSU2C.__commonJS)({
           return;
         }
         if (node.nodes && node.ranges > 0) {
-          let args = utils.reduce(node.nodes);
+          const args = utils.reduce(node.nodes);
           if (utils.exceedsLimit(...args, options.step, rangeLimit)) {
             throw new RangeError("expanded array length exceeds range limit. Use options.rangeLimit to increase or disable the limit.");
           }
@@ -974,7 +981,7 @@ var require_expand = (0, import_chunk_ABYVSU2C.__commonJS)({
           node.nodes = [];
           return;
         }
-        let enclose = utils.encloseBrace(node);
+        const enclose = utils.encloseBrace(node);
         let queue = node.queue;
         let block = node;
         while (block.type !== "brace" && block.type !== "root" && block.parent) {
@@ -982,7 +989,7 @@ var require_expand = (0, import_chunk_ABYVSU2C.__commonJS)({
           queue = block.queue;
         }
         for (let i = 0; i < node.nodes.length; i++) {
-          let child = node.nodes[i];
+          const child = node.nodes[i];
           if (child.type === "comma" && node.type === "brace") {
             if (i === 1)
               queue.push("");
@@ -1012,7 +1019,7 @@ var require_constants = (0, import_chunk_ABYVSU2C.__commonJS)({
   "node_modules/braces/lib/constants.js"(exports, module2) {
     "use strict";
     module2.exports = {
-      MAX_LENGTH: 1024 * 64,
+      MAX_LENGTH: 1e4,
       // Digits
       CHAR_0: "0",
       /* 0 */
@@ -1144,21 +1151,20 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
       if (typeof input !== "string") {
         throw new TypeError("Expected a string");
       }
-      let opts = options || {};
-      let max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
+      const opts = options || {};
+      const max = typeof opts.maxLength === "number" ? Math.min(MAX_LENGTH, opts.maxLength) : MAX_LENGTH;
       if (input.length > max) {
         throw new SyntaxError(`Input length (${input.length}), exceeds max characters (${max})`);
       }
-      let ast = { type: "root", input, nodes: [] };
-      let stack = [ast];
+      const ast = { type: "root", input, nodes: [] };
+      const stack = [ast];
       let block = ast;
       let prev = ast;
       let brackets = 0;
-      let length = input.length;
+      const length = input.length;
       let index = 0;
       let depth = 0;
       let value;
-      let memo = {};
       const advance = () => input[index++];
       const push = (node) => {
         if (node.type === "text" && prev.type === "dot") {
@@ -1191,7 +1197,6 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
         }
         if (value === CHAR_LEFT_SQUARE_BRACKET) {
           brackets++;
-          let closed = true;
           let next;
           while (index < length && (next = advance())) {
             value += next;
@@ -1230,7 +1235,7 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
           continue;
         }
         if (value === CHAR_DOUBLE_QUOTE || value === CHAR_SINGLE_QUOTE || value === CHAR_BACKTICK) {
-          let open2 = value;
+          const open2 = value;
           let next;
           if (options.keepQuotes !== true) {
             value = "";
@@ -1252,8 +1257,8 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
         }
         if (value === CHAR_LEFT_CURLY_BRACE) {
           depth++;
-          let dollar = prev.value && prev.value.slice(-1) === "$" || block.dollar === true;
-          let brace = {
+          const dollar = prev.value && prev.value.slice(-1) === "$" || block.dollar === true;
+          const brace = {
             type: "brace",
             open: true,
             close: false,
@@ -1273,7 +1278,7 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
             push({ type: "text", value });
             continue;
           }
-          let type = "close";
+          const type = "close";
           block = stack.pop();
           block.close = true;
           push({ type, value });
@@ -1284,7 +1289,7 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
         if (value === CHAR_COMMA && depth > 0) {
           if (block.ranges > 0) {
             block.ranges = 0;
-            let open2 = block.nodes.shift();
+            const open2 = block.nodes.shift();
             block.nodes = [open2, { type: "text", value: stringify(block) }];
           }
           push({ type: "comma", value });
@@ -1292,7 +1297,7 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
           continue;
         }
         if (value === CHAR_DOT && depth > 0 && block.commas === 0) {
-          let siblings = block.nodes;
+          const siblings = block.nodes;
           if (depth === 0 || siblings.length === 0) {
             push({ type: "text", value });
             continue;
@@ -1313,7 +1318,7 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
           }
           if (prev.type === "range") {
             siblings.pop();
-            let before = siblings[siblings.length - 1];
+            const before = siblings[siblings.length - 1];
             before.value += prev.value + value;
             prev = before;
             block.ranges--;
@@ -1338,8 +1343,8 @@ var require_parse = (0, import_chunk_ABYVSU2C.__commonJS)({
               node.invalid = true;
             }
           });
-          let parent = stack[stack.length - 1];
-          let index2 = parent.nodes.indexOf(block);
+          const parent = stack[stack.length - 1];
+          const index2 = parent.nodes.indexOf(block);
           parent.nodes.splice(index2, 1, ...block.nodes);
         }
       } while (stack.length > 0);
@@ -1359,8 +1364,8 @@ var require_braces = (0, import_chunk_ABYVSU2C.__commonJS)({
     var braces = (input, options = {}) => {
       let output = [];
       if (Array.isArray(input)) {
-        for (let pattern of input) {
-          let result = braces.create(pattern, options);
+        for (const pattern of input) {
+          const result = braces.create(pattern, options);
           if (Array.isArray(result)) {
             output.push(...result);
           } else {