@sdeverywhere/compile 0.7.27 → 0.7.29

package/src/model/read-variables.js

@@ -197,7 +197,13 @@ function subscriptPositionsToExpand(subIds, exceptSubIdSets, separationDims, rhs
 
     if (!expand) {
       // Direct data vars with subscripts are separated because we generate a lookup for each index
-      if (isDimension(subId) && (rhsText.includes('GET DIRECT DATA') || rhsText.includes('GET DIRECT LOOKUPS'))) {
+      if (
+        isDimension(subId) &&
+        (rhsText.includes('GET DIRECT DATA') ||
+          rhsText.includes('GET XLS DATA') ||
+          rhsText.includes('GET DIRECT LOOKUPS') ||
+          rhsText.includes('GET XLS LOOKUPS'))
+      ) {
         expand = true
       }
     }

package/src/parse-and-generate.js

@@ -2,7 +2,7 @@
 
 import path from 'path'
 
-import { parseVensimModel } from '@sdeverywhere/parse'
+import { parseVensimModel, parseXmileModel } from '@sdeverywhere/parse'
 
 import B from './_shared/bufx.js'
 import { readXlsx } from './_shared/helpers.js'
@@ -14,7 +14,7 @@ import { getDirectSubscripts } from './model/read-subscripts.js'
 import { generateCode } from './generate/gen-code.js'
 
 /**
- * Parse a Vensim model and generate C code.
+ * Parse a Vensim or XMILE model and generate C code.
  *
  * This is the primary entrypoint for the `sde generate` command.
  *
@@ -26,19 +26,20 @@ import { generateCode } from './generate/gen-code.js'
  * - If `operations` has 'convertNames', no output will be generated, but the results of model
  *   analysis will be available.
  *
- * @param {string} input The preprocessed Vensim model text.
+ * @param {string} input The preprocessed Vensim or XMILE model text.
+ * @param {string} modelKind The kind of model to parse, either 'vensim' or 'xmile'.
  * @param {*} spec The model spec (from the JSON file).
  * @param {string[]} operations The set of operations to perform; can include 'generateC', 'generateJS',
  * 'printVarList', 'printRefIdTest', 'convertNames'.  If the array is empty, the model will be
  * read but no operation will be performed.
- * @param {string} modelDirname The absolute path to the directory containing the mdl file.
- * The dat and xlsx files referenced by the spec will be relative to this directory.
+ * @param {string} modelDirname The absolute path to the directory containing data (dat, xlsx, csv)
+ * files that are referenced by the model.  These files will be resolved relative to this directory.
  * @param {string} modelName The model name (without the mdl extension).
  * @param {string} buildDir The output directory where the C or list files will be written.
  * @param {string} [varname] The variable name passed to the 'sde causes' command.
  * @return A string containing the generated C code.
  */
-export async function parseAndGenerate(input, spec, operations, modelDirname, modelName, buildDir, varname) {
+export async function parseAndGenerate(input, modelKind, spec, operations, modelDirname, modelName, buildDir, varname) {
   // Read time series from external DAT files into a single object.
   // externalDatfiles is an array of either filenames or objects
   // giving a variable name prefix as the key and a filename as the value.
@@ -69,7 +70,7 @@ export async function parseAndGenerate(input, spec, operations, modelDirname, mo
   }
 
   // Parse the model and generate code
-  let parsedModel = parseModel(input, modelDirname)
+  let parsedModel = parseModel(input, modelKind, modelDirname)
   let code = generateCode(parsedModel, { spec, operations, extData, directData, modelDirname, varname })
 
   function writeOutput(filename, text) {
@@ -132,33 +133,44 @@ export function printNames(namesPathname, operation) {
  * TODO: Fix return type
  *
  * @param {string} input The string containing the model text.
- * @param {string} modelDir The absolute path to the directory containing the mdl file.
- * The dat, xlsx, and csv files referenced by the model will be relative to this directory.
+ * @param {string} modelKind The kind of model to parse, either 'vensim' or 'xmile'.
+ * @param {string} modelDir The absolute path to the directory containing data (dat, xlsx, csv)
+ * files that are referenced by the model.  These files will be resolved relative to this directory.
  * @param {Object} [options] The options that control parsing.
  * @param {boolean} options.sort Whether to sort definitions alphabetically in the preprocess step.
  * @return {*} A parsed tree representation of the model.
  */
-export function parseModel(input, modelDir, options) {
-  // Prepare the parse context that provides access to external data files
-  let parseContext /*: VensimParseContext*/
-  if (modelDir) {
-    parseContext = {
-      getDirectSubscripts(fileName, tabOrDelimiter, firstCell, lastCell /*, prefix*/) {
-        // Resolve the CSV file relative the model directory
-        const csvPath = path.resolve(modelDir, fileName)
-
-        // Read the subscripts from the CSV file
-        return getDirectSubscripts(csvPath, tabOrDelimiter, firstCell, lastCell)
+export function parseModel(input, modelKind, modelDir, options) {
+  if (modelKind === 'vensim') {
+    // Prepare the parse context that provides access to external data files
+    let parseContext /*: VensimParseContext*/
+    if (modelDir) {
+      parseContext = {
+        getDirectSubscripts(fileName, tabOrDelimiter, firstCell, lastCell /*, prefix*/) {
+          // Resolve the CSV file relative to the model directory
+          const csvPath = path.resolve(modelDir, fileName)
+
+          // Read the subscripts from the CSV file
+          return getDirectSubscripts(csvPath, tabOrDelimiter, firstCell, lastCell)
+        }
       }
     }
-  }
 
-  // Parse the model
-  const sort = options?.sort === true
-  const root = parseVensimModel(input, parseContext, sort)
+    // Parse the Vensim model
+    const sort = options?.sort === true
+    const root = parseVensimModel(input, parseContext, sort)
+
+    return {
+      kind: 'vensim',
+      root
+    }
+  } else {
+    // Parse the XMILE model
+    const root = parseXmileModel(input)
 
-  return {
-    kind: 'vensim',
-    root
+    return {
+      kind: 'xmile',
+      root
+    }
   }
 }