@sdeverywhere/cli 0.7.0 → 0.7.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sdeverywhere/cli",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "Contains the `sde` command line interface for the SDEverywhere tool suite.",
   "type": "module",
   "files": [
@@ -11,11 +11,10 @@
     "sde": "src/main.js"
   },
   "dependencies": {
-    "@sdeverywhere/build": "^0.1.0",
+    "@sdeverywhere/build": "^0.2.0",
     "@sdeverywhere/compile": "^0.7.0",
     "bufx": "^1.0.5",
     "byline": "^5.0.0",
-    "fs-extra": "^10.1.0",
     "ramda": "^0.27.0",
     "shelljs": "^0.8.3",
     "yargs": "^17.5.1"

package/src/main.js

@@ -26,6 +26,7 @@ import fs from 'fs'
 import path from 'path'
 
 import yargs from 'yargs'
+
 import sdeBundle from './sde-bundle.js'
 import sdeDev from './sde-dev.js'
 import sdeGenerate from './sde-generate.js'
@@ -41,12 +42,14 @@ import sdeTest from './sde-test.js'
 import sdeNames from './sde-names.js'
 import sdeCauses from './sde-causes.js'
 import sdeWhich from './sde-which.js'
+import { parentDirForFileUrl } from './utils.js'
 
 // Workaround yargs issue where it doesn't find version from package.json
 // automatically in all cases in ESM context
-const srcDir = new URL('.', import.meta.url).pathname
+const srcDir = parentDirForFileUrl(import.meta.url)
 const pkgFile = path.resolve(srcDir, '..', 'package.json')
 const pkg = JSON.parse(fs.readFileSync(pkgFile))
+const pkgVersion = pkg.version
 
 const yarg = yargs(process.argv.slice(2))
 yarg
@@ -70,7 +73,7 @@ yarg
   .command(sdeWhich)
   .demandCommand(1)
   .help()
-  .version(pkg.version)
+  .version(pkgVersion)
   .alias('h', 'help')
   .alias('v', 'version')
   .wrap(yarg.terminalWidth())

package/src/sde-bundle.js

@@ -4,6 +4,8 @@ import path from 'path'
 
 import { build as runBuild } from '@sdeverywhere/build'
 
+import { parentDirForFileUrl } from './utils.js'
+
 export let command = 'bundle [options]'
 export let describe = 'build and bundle a model as specified by a config file'
 export let builder = {
@@ -25,7 +27,7 @@ export let bundle = async (configPath, verbose) => {
   if (verbose) {
     logLevels.push('verbose')
   }
-  const srcDir = new URL('.', import.meta.url).pathname
+  const srcDir = parentDirForFileUrl(import.meta.url)
   const sdeDir = path.resolve(srcDir, '..')
   const sdeCmdPath = path.resolve(srcDir, 'main.js')
   const result = await runBuild('production', {

package/src/sde-compile.js

@@ -1,8 +1,8 @@
-import fs from 'fs-extra'
+import fs from 'fs'
 import path from 'path'
 import sh from 'shelljs'
 
-import { buildDir, execCmd, modelPathProps } from './utils.js'
+import { buildDir, execCmd, modelPathProps, parentDirForFileUrl } from './utils.js'
 
 export let command = 'compile [options] <model>'
 export let describe = 'compile the generated model to an executable file'
@@ -43,15 +43,16 @@ export default {
 }
 
 let linkCSourceFiles = (modelDirname, buildDirname) => {
-  let cDirname = path.join(new URL('.', import.meta.url).pathname, 'c')
+  let srcDir = parentDirForFileUrl(import.meta.url)
+  let cDirname = path.join(srcDir, 'c')
   sh.ls(cDirname).forEach(filename => {
-    // If a C source file is present in the model directory, link to it instead
-    // as an override.
+    // If a C source file is present in the model directory, copy that one into
+    // the build directory to override the one from `src/c`.
     let srcPathname = path.join(modelDirname, filename)
     if (!fs.existsSync(srcPathname)) {
       srcPathname = path.join(cDirname, filename)
     }
     let dstPathname = path.join(buildDirname, filename)
-    fs.ensureSymlinkSync(srcPathname, dstPathname)
+    fs.copyFileSync(srcPathname, dstPathname)
   })
 }

package/src/sde-dev.js

@@ -4,6 +4,8 @@ import path from 'path'
 
 import { build as runBuild } from '@sdeverywhere/build'
 
+import { parentDirForFileUrl } from './utils.js'
+
 export let command = 'dev [options]'
 export let describe = 'run a model in a live development environment'
 export let builder = {
@@ -25,7 +27,7 @@ export let dev = async (configPath, verbose) => {
   if (verbose) {
     logLevels.push('verbose')
   }
-  const srcDir = new URL('.', import.meta.url).pathname
+  const srcDir = parentDirForFileUrl(import.meta.url)
   const sdeDir = path.resolve(srcDir, '..')
   const sdeCmdPath = path.resolve(srcDir, 'main.js')
   const result = await runBuild('development', {

package/src/sde-which.js

@@ -1,5 +1,7 @@
 import path from 'path'
 
+import { parentDirForFileUrl } from './utils.js'
+
 let command = 'which'
 let describe = 'print the SDEverywhere home directory'
 let builder = {}
@@ -8,7 +10,8 @@ let handler = argv => {
 }
 let which = () => {
   // The SDEverywhere home directory is one level above the src directory where this code runs.
-  let homeDir = path.resolve(new URL('..', import.meta.url).pathname)
+  let srcDir = parentDirForFileUrl(import.meta.url)
+  let homeDir = path.resolve(srcDir, '..')
   console.log(homeDir)
 }
 export default {

package/src/utils.js

@@ -1,5 +1,6 @@
 import fs from 'fs'
 import path from 'path'
+import { fileURLToPath } from 'url'
 
 import B from 'bufx'
 import R from 'ramda'
@@ -77,6 +78,20 @@ export function parseSpec(specFilename) {
   return spec
 }
 
+/**
+ * Return the absolute path to the directory in which the given (source)
+ * file is located.  (This is a replacement for `__dirname`, which is not
+ * available in an ESM context.)
+ *
+ * @param srcFileUrl The URL for the source file (i.e., `import.meta.url`).
+ */
+export function parentDirForFileUrl(srcFileUrl) {
+  return path.dirname(fileURLToPath(srcFileUrl))
+}
+
+/**
+ * Ensure the output directory exists for a given output file path.
+ */
 export function outputDir(outfile, modelDirname) {
   if (outfile) {
     outfile = path.dirname(outfile)