@sdeverywhere/cli 0.7.36 → 0.7.38

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/cli",
-  "version": "0.7.36",
+  "version": "0.7.38",
   "description": "Contains the `sde` command line interface for the SDEverywhere tool suite.",
   "type": "module",
   "files": [
@@ -11,12 +11,12 @@
     "sde": "src/main.js"
   },
   "dependencies": {
-    "@sdeverywhere/build": "^0.3.7",
-    "@sdeverywhere/compile": "^0.7.25",
-    "bufx": "^1.0.5",
+    "@sdeverywhere/build": "^0.3.9",
+    "@sdeverywhere/compile": "^0.7.26",
     "byline": "^5.0.0",
     "ramda": "^0.27.0",
     "shelljs": "^0.10.0",
+    "strip-bom": "^5.0.0",
     "yargs": "^17.5.1"
   },
   "engines": {

package/src/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/sde-compare.js

@@ -1,6 +1,5 @@
 import { existsSync } from 'fs'
 
-import { pr } from 'bufx'
 import * as R from 'ramda'
 
 import { readDat } from '@sdeverywhere/compile'
@@ -70,7 +69,7 @@ export let compare = async (vensimfile, sdefile, opts) => {
           let diff = difference(sdeValue, vensimValue)
           if (diff > ε) {
             let diffPct = (diff * 100).toFixed(6)
-            pr(`${varName} time=${t.toFixed(2)} vensim=${vensimValue} sde=${sdeValue} diff=${diffPct}%`)
+            console.log(`${varName} time=${t.toFixed(2)} vensim=${vensimValue} sde=${sdeValue} diff=${diffPct}%`)
             noDATDifference = false
           }
         }
@@ -78,10 +77,10 @@ export let compare = async (vensimfile, sdefile, opts) => {
     }
   }
   if (noDATDifference) {
-    pr(`Data were the same for ${vensimfile} and ${sdefile}`)
+    console.log(`Data were the same for ${vensimfile} and ${sdefile}`)
     return true
   } else {
-    pr(`Data differences detected for ${vensimfile} and ${sdefile}`)
+    console.log(`Data differences detected for ${vensimfile} and ${sdefile}`)
     return false
   }
 }

package/src/sde-flatten.js

@@ -1,10 +1,9 @@
 import { readFileSync } from 'fs'
 import path from 'path'
 
-import B from 'bufx'
-
 import { preprocessVensimModel } from '@sdeverywhere/compile'
 
+import B from './bufx.js'
 import { buildDir, modelPathProps } from './utils.js'
 
 const command = 'flatten [options] <outmodel>'

package/src/sde-generate.js

@@ -1,9 +1,9 @@
 import path from 'path'
 import { readFileSync } from 'fs'
-import B from 'bufx'
 
 import { parseAndGenerate, preprocessVensimModel } from '@sdeverywhere/compile'
 
+import B from './bufx.js'
 import { buildDir, modelPathProps, parseSpec } from './utils.js'
 
 export let command = 'generate [options] <model>'

package/src/sde-log.js

@@ -1,12 +1,13 @@
 import fs from 'fs'
 import path from 'path'
 
-import B from 'bufx'
 import byline from 'byline'
 import * as R from 'ramda'
 
 import { canonicalName } from '@sdeverywhere/compile'
 
+import B from './bufx.js'
+
 export let command = 'log [options] <logfile>'
 export let describe = 'process an SDEverywhere log file'
 export let builder = {

package/src/utils.js

@@ -2,12 +2,13 @@ import fs from 'fs'
 import path from 'path'
 import { fileURLToPath } from 'url'
 
-import B from 'bufx'
 import * as R from 'ramda'
 import sh from 'shelljs'
 
 import { canonicalName } from '@sdeverywhere/compile'
 
+import B from './bufx.js'
+
 /**
  * Run a command line silently in the "sh" shell. Print error output on error.
  *