@sdeverywhere/compile 0.7.15 → 0.7.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/compile",
-  "version": "0.7.15",
+  "version": "0.7.17",
   "description": "The core Vensim to C compiler for the SDEverywhere tool suite.",
   "type": "module",
   "main": "./src/index.js",
@@ -14,7 +14,7 @@
     "js-yaml": "^3.13.1",
     "ramda": "^0.27.0",
     "split-string": "^6.0.0",
-    "xlsx": "^0.17.0"
+    "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
   },
   "author": "Climate Interactive",
   "license": "MIT",

package/src/_shared/helpers.js

@@ -1,3 +1,4 @@
+import * as fs from 'node:fs'
 import util from 'util'
 import B from 'bufx'
 import { parse as parseCsv } from 'csv-parse/sync'
@@ -23,6 +24,10 @@ let nextAuxVarSeq = 1
 // parsed csv data cache
 let csvData = new Map()
 
+// Newer versions of the xlsx package require manually setting the `fs` instance
+// before using the `XLSX.readFile` function
+XLSX.set_fs(fs)
+
 // XXX: This is needed for tests due to sequence numbers being in module-level storage
 export function resetHelperState() {
   nextTmpVarSeq = 1

package/src/generate/code-gen.js

@@ -17,14 +17,7 @@ let codeGenerator = (parsedModel, opts) => {
   // Set to 'decl', 'init-lookups', 'eval', etc depending on the section being generated.
   let mode = ''
   // Set to true to output all variables when there is no model run spec.
-  let outputAllVars
-  if (spec.outputVars && spec.outputVars.length > 0) {
-    outputAllVars = false
-  } else if (spec.outputVarNames && spec.outputVarNames.length > 0) {
-    outputAllVars = false
-  } else {
-    outputAllVars = true
-  }
+  let outputAllVars = spec.outputVarNames === undefined || spec.outputVarNames.length === 0
   // Function to generate a section of the code
   let generateSection = R.map(v => {
     if (parsedModel.kind === 'vensim-legacy') {
@@ -157,19 +150,19 @@ ${chunkedFunctions('evalLevels', Model.levelVars(), '  // Evaluate levels.')}
   // Input/output section
   //
   function emitIOCode() {
-    let headerVars = outputAllVars ? expandedVarNames(true) : spec.outputVars
-    let outputVars = outputAllVars ? expandedVarNames() : spec.outputVars
+    let headerVarNames = outputAllVars ? expandedVarNames(true) : spec.outputVarNames
+    let outputVarIds = outputAllVars ? expandedVarNames() : spec.outputVars
     mode = 'io'
     return `void setInputs(const char* inputData) {${inputsFromStringImpl()}}
 
 void setInputsFromBuffer(double* inputData) {${inputsFromBufferImpl()}}
 
 const char* getHeader() {
-  return "${R.map(varName => headerTitle(varName), headerVars).join('\\t')}";
+  return "${R.map(varName => varName.replace(/"/g, '\\"'), headerVarNames).join('\\t')}";
 }
 
 void storeOutputData() {
-${specOutputSection(outputVars)}
+${specOutputSection(outputVarIds)}
 }
 
 void storeOutput(size_t varIndex, size_t subIndex0, size_t subIndex1, size_t subIndex2) {
@@ -382,9 +375,6 @@ ${postStep}
     }
     return inputVars
   }
-  function headerTitle(varName) {
-    return Model.vensimName(varName).replace(/"/g, '\\"')
-  }
 
   return {
     generate: generate

package/src/model/model.js

@@ -102,9 +102,8 @@ function read(parsedModel, spec, extData, directData, modelDirname, opts) {
   if (opts?.stopAfterReadVariables) return
 
   if (spec) {
-    // If the spec file contains `input/outputVarNames` (with full Vensim variable names)
-    // convert those to C names first.  Otherwise, use `input/outputNames` which are already
-    // assumed to be valid C names.
+    // If the spec file contains `input/outputVarNames`, convert the full Vensim variable
+    // names to C names first so that later phases only need to work with canonical names
     if (spec.inputVarNames) {
       spec.inputVars = R.map(cName, spec.inputVarNames)
     }