@sdeverywhere/parse 0.1.0 → 0.1.2

package/dist/index.cjs

@@ -29,11 +29,15 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
+  canonicalFunctionId: () => canonicalFunctionId,
+  canonicalId: () => canonicalId,
+  canonicalVarId: () => canonicalVarId,
   debugPrintExpr: () => debugPrintExpr,
   parseVensimEquation: () => parseVensimEquation,
   parseVensimExpr: () => parseVensimExpr,
   parseVensimModel: () => parseVensimModel,
   parseVensimSubscriptRange: () => parseVensimSubscriptRange,
+  preprocessVensimModel: () => preprocessVensimModel,
   prettyPrintExpr: () => prettyPrintExpr,
   printExprStats: () => printExprStats,
   reduceConditionals: () => reduceConditionals,
@@ -42,6 +46,29 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/_shared/canonical-id.js
+var reTrailingMark = new RegExp("\\s+!$", "g");
+var reWhitespace = new RegExp("(\\s|_)+", "g");
+var reSpecialChars = new RegExp(`['"\\.,\\-\\$&%\\/\\|()]`, "g");
+function canonicalId(name) {
+  return "_" + name.trim().replace(reTrailingMark, "!").replace(reWhitespace, "_").replace(reSpecialChars, "_").toLowerCase();
+}
+function canonicalVarId(name) {
+  const m = name.match(/([^[]+)(?:\[([^\]]+)\])?/);
+  if (!m) {
+    throw new Error(`Invalid variable name: ${name}`);
+  }
+  let id = canonicalId(m[1]);
+  if (m[2]) {
+    const subscripts = m[2].split(",").map((x) => canonicalId(x));
+    id += `[${subscripts.join(",")}]`;
+  }
+  return id;
+}
+function canonicalFunctionId(name) {
+  return canonicalId(name).toUpperCase();
+}
+
 // src/ast/print-expr.ts
 var import_assert_never = require("assert-never");
 function debugPrintExpr(expr, indent = 0) {
@@ -290,14 +317,6 @@ function fullIdForVarRef(varRef) {
 // src/ast/reduce-expr.ts
 var import_assert_never2 = require("assert-never");
 
-// src/_shared/names.js
-function canonicalName(name) {
-  return "_" + name.trim().replace(/"/g, "_").replace(/\s+!$/g, "!").replace(/\s/g, "_").replace(/,/g, "_").replace(/-/g, "_").replace(/\./g, "_").replace(/\$/g, "_").replace(/'/g, "_").replace(/&/g, "_").replace(/%/g, "_").replace(/\//g, "_").replace(/\|/g, "_").toLowerCase();
-}
-function cFunctionName(name) {
-  return canonicalName(name).toUpperCase();
-}
-
 // src/ast/ast-builders.ts
 function num(value, text) {
   return {
@@ -673,7 +692,7 @@ var SubscriptRangeReader = class extends import_antlr4_vensim2.ModelVisitor {
     const ids = ctx.Id();
     if (ids.length === 1) {
       const dimName = ids[0].getText();
-      const dimId = canonicalName(dimName);
+      const dimId = canonicalId(dimName);
       super.visitSubscriptRange(ctx);
       return {
         dimName,
@@ -683,7 +702,7 @@ var SubscriptRangeReader = class extends import_antlr4_vensim2.ModelVisitor {
         subscriptRefs: this.subscriptNames.map((subName) => {
           return {
             subName,
-            subId: canonicalName(subName)
+            subId: canonicalId(subName)
           };
         }),
         subscriptMappings: this.subscriptMappings,
@@ -691,9 +710,9 @@ var SubscriptRangeReader = class extends import_antlr4_vensim2.ModelVisitor {
       };
     } else if (ids.length === 2) {
       const dimName = ids[0].getText();
-      const dimId = canonicalName(dimName);
+      const dimId = canonicalId(dimName);
       const familyName = ids[1].getText();
-      const familyId = canonicalName(familyName);
+      const familyId = canonicalId(familyName);
       return {
         dimName,
         dimId,
@@ -733,11 +752,11 @@ var SubscriptRangeReader = class extends import_antlr4_vensim2.ModelVisitor {
     super.visitSubscriptMapping(ctx);
     this.subscriptMappings.push({
       toDimName,
-      toDimId: canonicalName(toDimName),
+      toDimId: canonicalId(toDimName),
       subscriptRefs: this.mappedSubscriptNames.map((subName) => {
         return {
           subName,
-          subId: canonicalName(subName)
+          subId: canonicalId(subName)
         };
       })
     });
@@ -747,7 +766,7 @@ var SubscriptRangeReader = class extends import_antlr4_vensim2.ModelVisitor {
   }
   visitCall(ctx) {
     const fnName = ctx.Id().getText();
-    const fnId = cFunctionName(fnName);
+    const fnId = canonicalFunctionId(fnName);
     if (fnId === "_GET_DIRECT_SUBSCRIPT") {
       super.visitCall(ctx);
     } else {
@@ -843,7 +862,7 @@ var ExprReader = class extends import_antlr4_vensim3.ModelVisitor {
   //
   visitCall(ctx) {
     const vensimFnName = ctx.Id().getText();
-    const fnId = cFunctionName(vensimFnName);
+    const fnId = canonicalFunctionId(vensimFnName);
     this.callStack.push({ fn: fnId, args: [] });
     super.visitCall(ctx);
     const callInfo = this.callStack.pop();
@@ -866,14 +885,14 @@ var ExprReader = class extends import_antlr4_vensim3.ModelVisitor {
   }
   visitVar(ctx) {
     const vensimVarName = ctx.Id().getText().trim();
-    const varId = canonicalName(vensimVarName);
+    const varId = canonicalId(vensimVarName);
     this.subscripts = void 0;
     super.visitVar(ctx);
     const subscriptNames = this.subscripts;
     const subscriptRefs = subscriptNames?.map((name) => {
       return {
         subName: name,
-        subId: canonicalName(name)
+        subId: canonicalId(name)
       };
     });
     this.subscripts = void 0;
@@ -923,7 +942,7 @@ var ExprReader = class extends import_antlr4_vensim3.ModelVisitor {
   }
   visitLookupCall(ctx) {
     const lookupVarName = ctx.Id().getText();
-    const lookupVarId = canonicalName(lookupVarName);
+    const lookupVarId = canonicalId(lookupVarName);
     if (ctx.subscriptList()) {
       ctx.subscriptList().accept(this);
     }
@@ -931,7 +950,7 @@ var ExprReader = class extends import_antlr4_vensim3.ModelVisitor {
     const subscriptRefs = subscriptNames?.map((name) => {
       return {
         subName: name,
-        subId: canonicalName(name)
+        subId: canonicalId(name)
       };
     });
     this.subscripts = void 0;
@@ -1128,13 +1147,13 @@ var EquationReader = class extends import_antlr4_vensim4.ModelVisitor {
   }
   visitLhs(ctx) {
     const lhsVarName = ctx.Id().getText();
-    const lhsVarId = canonicalName(lhsVarName);
+    const lhsVarId = canonicalId(lhsVarName);
     super.visitLhs(ctx);
     const subscriptNames = this.subscripts;
     const subscriptRefs = subscriptNames?.map((name) => {
       return {
         subName: name,
-        subId: canonicalName(name)
+        subId: canonicalId(name)
       };
     });
     const exceptSubscriptSets = this.exceptSubscriptSets;
@@ -1142,7 +1161,7 @@ var EquationReader = class extends import_antlr4_vensim4.ModelVisitor {
       return subscriptSet.map((name) => {
         return {
           subName: name,
-          subId: canonicalName(name)
+          subId: canonicalId(name)
         };
       });
     });
@@ -1222,16 +1241,41 @@ function parseVensimEquation(input) {
 
 // src/vensim/preprocess-vensim.ts
 var import_split_string = __toESM(require("split-string"), 1);
-function preprocessVensimModel(input) {
+function preprocessVensimModel(input, options) {
+  const removalKeys = options?.removalKeys;
+  function shouldRemove(text) {
+    if (text.includes("TABBED ARRAY")) {
+      return true;
+    }
+    if (removalKeys) {
+      for (const key of removalKeys) {
+        if (text.includes(key)) {
+          return true;
+        }
+      }
+    }
+    return false;
+  }
+  const macrosResult = removeMacros(input);
+  input = macrosResult.processed;
   const rawDefs = splitDefs(input);
   const vensimDefs = [];
+  const removedBlocks = [];
   for (const rawDef of rawDefs) {
+    if (shouldRemove(rawDef.text)) {
+      removedBlocks.push(rawDef.text.trim() + "|");
+      continue;
+    }
     const vensimDef = processDef(rawDef);
     if (vensimDef) {
       vensimDefs.push(vensimDef);
     }
   }
-  return vensimDefs;
+  return {
+    defs: vensimDefs,
+    removedMacros: macrosResult.removed,
+    removedBlocks
+  };
 }
 function splitDefs(input) {
   const defTexts = (0, import_split_string.default)(input, { separator: "|", quotes: ['"'], keep: () => true });
@@ -1273,6 +1317,9 @@ function splitDefs(input) {
 function splitLines(input) {
   return input.split(/\r\n|\n|\r/);
 }
+function splitExceptInQuoted(input, sep) {
+  return (0, import_split_string.default)(input, { separator: sep, quotes: ['"'] });
+}
 function processBackslashes(input) {
   const inputLines = splitLines(input);
   let output = "";
@@ -1318,22 +1365,27 @@ function replaceDelimitedStrings(str, open, close, newStr) {
 function reduceWhitespace(input) {
   return input.replace(/\s\s+/g, " ").trim();
 }
+var reWhitespace2 = new RegExp("(\\s|_)+", "g");
 function keyForDef(def) {
   let key = def;
   key = key.replace(/:INTERPOLATE:/g, "");
+  let kind;
   if (key.includes("=")) {
+    kind = "eqn";
     key = key.split("=")[0].trim();
   } else if (key.includes(":")) {
+    kind = "dim";
     key = key.split(":")[0].trim();
   } else {
+    kind = "decl";
   }
+  key = splitExceptInQuoted(key, "(")[0];
   key = key.replace(/"/g, "");
-  key = key.split("(")[0];
   key = key.trim();
-  key = key.replace(/\[\s*/g, "[");
-  key = key.replace(/\s*\]/g, "]");
+  key = key.replace(/(?<=\[).*?(?=\])/g, (match) => match.replace(/\s/g, ""));
+  key = key.replace(reWhitespace2, "_");
   key = key.toLowerCase();
-  return key;
+  return { key, kind };
 }
 function processDef(rawDef) {
   let input = rawDef.text;
@@ -1351,7 +1403,7 @@ function processDef(rawDef) {
 ${input}`);
   }
   const rawDefText = reduceWhitespace(parts[0]);
-  const key = keyForDef(rawDefText);
+  const { key, kind } = keyForDef(rawDefText);
   const def = `${rawDefText} ~~|`;
   const units = reduceWhitespace(parts[1]);
   const comment = reduceWhitespace(parts[2]);
@@ -1359,12 +1411,25 @@ ${input}`);
   return {
     key,
     def,
+    kind,
     line: rawDef.line,
     units,
     comment,
     ...group ? { group } : {}
   };
 }
+function removeMacros(input) {
+  const removed = [];
+  const processed = input.replace(/:MACRO:.*:END OF MACRO:/gms, (match) => {
+    removed.push(match);
+    const numBreaks = match.split(/\r\n|\n|\r/gms).length - 1;
+    return numBreaks > 0 ? "\n".repeat(numBreaks) : "";
+  });
+  return {
+    processed,
+    removed
+  };
+}
 
 // src/vensim/impl/model-reader.js
 var import_antlr4_vensim5 = require("antlr4-vensim");
@@ -1423,7 +1488,7 @@ var ModelReader = class extends import_antlr4_vensim5.ModelVisitor {
 function parseVensimModel(input, context, sort = false) {
   const dimensions = [];
   const equations = [];
-  const defs = preprocessVensimModel(input);
+  const { defs } = preprocessVensimModel(input);
   if (sort) {
     defs.sort((a, b) => {
       return a.key < b.key ? -1 : a.key > b.key ? 1 : 0;
@@ -1476,11 +1541,15 @@ Detail:
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  canonicalFunctionId,
+  canonicalId,
+  canonicalVarId,
   debugPrintExpr,
   parseVensimEquation,
   parseVensimExpr,
   parseVensimModel,
   parseVensimSubscriptRange,
+  preprocessVensimModel,
   prettyPrintExpr,
   printExprStats,
   reduceConditionals,