@sdeverywhere/compile 0.7.25 → 0.7.26

package/package.json

@@ -1,16 +1,15 @@
 {
   "name": "@sdeverywhere/compile",
-  "version": "0.7.25",
+  "version": "0.7.26",
   "description": "The core Vensim to C compiler for the SDEverywhere tool suite.",
   "type": "module",
   "main": "./src/index.js",
   "dependencies": {
     "@sdeverywhere/parse": "^0.1.2",
-    "bufx": "^1.0.5",
     "byline": "^5.0.0",
     "csv-parse": "^5.3.3",
-    "js-yaml": "^3.13.1",
     "ramda": "^0.27.0",
+    "strip-bom": "^5.0.0",
     "xlsx": "https://cdn.sheetjs.com/xlsx-0.20.2/xlsx-0.20.2.tgz"
   },
   "author": "Climate Interactive",

package/src/_shared/bufx.js

@@ -0,0 +1,66 @@
+import * as fs from 'node:fs'
+import stripBom from 'strip-bom'
+
+// Numeric value of a string or number
+let num = x => (typeof x === 'number' ? x : Number.parseFloat(x))
+// Split a string into lines that may have Windows, Unix, or old Mac line endings.
+let lines = s => s.split(/\r\n|\n|\r/)
+// Print a string to the console
+let print = s => {
+  console.log(s)
+}
+// Read a UTF-8 file into a string. Strip the BOM if present.
+let read = pathname => stripBom(fs.readFileSync(pathname, 'utf8'))
+// Write a string to a UTF-8 file
+let write = (s, pathname) => {
+  fs.writeFileSync(pathname, s, { encoding: 'utf8' })
+}
+
+// Output buffer
+let bufs = { _: '' }
+// Open a buffer for writing
+let open = channel => (bufs[channel] = '')
+// Emit a string to a buffer
+let emit = (a, channel = null) => {
+  channel = channel || '_'
+  bufs[channel] += a
+}
+// Emit a string to a buffer terminated by a newline
+let emitLine = (a, channel = null) => {
+  channel = channel || '_'
+  bufs[channel] += a + '\n'
+}
+// Print a buffer to the console
+let printBuf = (channel = null) => {
+  channel = channel || '_'
+  print(bufs[channel])
+}
+// Write a buffer to a file
+let writeBuf = (pathname, channel = null) => {
+  channel = channel || '_'
+  write(bufs[channel], pathname)
+}
+// Get buffer contents as a string
+let getBuf = (channel = null) => {
+  channel = channel || '_'
+  return bufs[channel]
+}
+// Clear a buffer
+let clearBuf = (channel = null) => {
+  channel = channel || '_'
+  bufs[channel] = ''
+}
+
+export default {
+  clearBuf,
+  emit,
+  emitLine,
+  getBuf,
+  lines,
+  num,
+  open,
+  printBuf,
+  read,
+  write,
+  writeBuf
+}

package/src/_shared/helpers.js

@@ -1,9 +1,9 @@
 import * as fs from 'node:fs'
 import util from 'util'
-import B from 'bufx'
 import { parse as parseCsv } from 'csv-parse/sync'
 import * as R from 'ramda'
 import XLSX from 'xlsx'
+import B from './bufx.js'
 
 import { canonicalId, canonicalVarId } from '@sdeverywhere/parse'
 

package/src/_shared/read-dat.js

@@ -1,8 +1,8 @@
 import fs from 'fs'
-import B from 'bufx'
 import byline from 'byline'
 import * as R from 'ramda'
 
+import B from './bufx.js'
 import { canonicalVensimName } from './helpers.js'
 
 /**

package/src/_shared/subscript.js

@@ -1,7 +1,6 @@
 import util from 'util'
-import B from 'bufx'
-import yaml from 'js-yaml'
 import * as R from 'ramda'
+import B from './bufx.js'
 import { canonicalName, vlog } from './helpers.js'
 
 // A subscript is a dimension or an index.
@@ -218,21 +217,6 @@ export function printSubscripts() {
   }
   return B.getBuf()
 }
-export function yamlSubsList() {
-  let subs = {}
-  for (let [k, v] of subscripts) {
-    subs[k] = v
-  }
-  return yaml.safeDump(subs)
-}
-export function loadSubscriptsFromYaml(yamlSubs) {
-  // Load the subscripts map from subscripts serialized to a YAML file by yamlSubsList.
-  // This function should be called instead of adding subscripts through the constructor.
-  let subs = yaml.safeLoad(yamlSubs)
-  for (const k in subs) {
-    subscripts.set(k, subs[k])
-  }
-}
 export function extractMarkedDims(subscripts) {
   // Extract all marked dimensions and update subscripts.
   let dims = []

package/src/model/model.js

@@ -1,7 +1,6 @@
-import B from 'bufx'
-import yaml from 'js-yaml'
 import * as R from 'ramda'
 
+import B from '../_shared/bufx.js'
 import { canonicalVensimName, decanonicalize, isIterable, strlist, vlog, vsort } from '../_shared/helpers.js'
 import {
   addIndex,
@@ -946,14 +945,6 @@ function printVarList() {
   }
   return B.getBuf()
 }
-function yamlVarList() {
-  // Print selected properties of all variable objects to a YAML string.
-  let vars = R.sortBy(
-    R.prop('refId'),
-    R.map(v => filterVar(v), variables)
-  )
-  return yaml.safeDump(vars)
-}
 function printVar(v) {
   let nonAtoA = isNonAtoAName(v.varName) ? ' (non-apply-to-all)' : ''
   B.emitLine(`${v.modelLHS}: ${v.varType}${nonAtoA}`)
@@ -1348,6 +1339,5 @@ export default {
   varsWithName,
   varWithName,
   varWithRefId,
-  vensimName,
-  yamlVarList
+  vensimName
 }

package/src/parse-and-generate.js

@@ -1,13 +1,13 @@
 // Copyright (c) 2022 Climate Interactive / New Venture Fund
 
 import path from 'path'
-import B from 'bufx'
 
 import { parseVensimModel } from '@sdeverywhere/parse'
 
+import B from './_shared/bufx.js'
 import { readXlsx } from './_shared/helpers.js'
 import { readDat } from './_shared/read-dat.js'
-import { printSubscripts, yamlSubsList } from './_shared/subscript.js'
+import { printSubscripts } from './_shared/subscript.js'
 import { cName } from './_shared/var-names.js'
 import Model from './model/model.js'
 import { getDirectSubscripts } from './model/read-subscripts.js'
@@ -21,7 +21,7 @@ import { generateCode } from './generate/gen-code.js'
  * - If `operations` has 'generateC', the generated C code will be written to `buildDir`.
  * - If `operations` has 'generateJS', the generated JS code will be written to `buildDir`.
  * - If `operations` has 'printVarList', variables and subscripts will be written to
- *   txt, yaml, and json files under `buildDir`.
+ *   txt and json files under `buildDir`.
  * - If `operations` has 'printRefIdTest', reference identifiers will be printed to the console.
  * - If `operations` has 'convertNames', no output will be generated, but the results of model
  *   analysis will be available.
@@ -92,10 +92,6 @@ export async function parseAndGenerate(input, spec, operations, modelDirname, mo
     writeOutput(`${modelName}_vars.txt`, Model.printVarList())
     // Write subscripts to a text file.
     writeOutput(`${modelName}_subs.txt`, printSubscripts())
-    // Write variables to a YAML file.
-    writeOutput(`${modelName}_vars.yaml`, Model.yamlVarList())
-    // Write subscripts to a YAML file.
-    writeOutput(`${modelName}_subs.yaml`, yamlSubsList())
     // Write variables and subscripts to a JSON file.
     const jsonList = Model.jsonList()
     writeOutput(`${modelName}.json`, JSON.stringify(jsonList.full, null, 2))