yosys2digitaljs 0.2.3 → 0.6.0

package/package.json

@@ -1,16 +1,20 @@
 {
   "name": "yosys2digitaljs",
-  "version": "0.2.3",
+  "version": "0.6.0",
   "description": "Export Yosys netlists to a logic simulator",
-  "main": "index.js",
+  "main": "dist/index",
+  "types": "dist/index.d.ts",
   "scripts": {
+    "prepare": "npm run build",
+    "cjs": "tsc -m commonjs",
+    "build": "npm run cjs",
     "test": "./run_tests.sh"
   },
   "author": "Marek Materzok",
   "license": "BSD-2-Clause",
   "dependencies": {
-    "3vl": "^0.3.4",
-    "big-integer": "^1.6.48",
+    "3vl": "^0.3.5",
+    "big-integer": "^1.6.49",
     "hashmap": "^2.4.0",
     "minimist": "^1.2.5",
     "sanitize-filename": "^1.6.3",
@@ -24,5 +28,9 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/tilk/yosys2digitaljs.git"
+  },
+  "devDependencies": {
+    "@types/node": "^16.10.3",
+    "typescript": "^4.4.3"
   }
 }

package/process.js

@@ -4,7 +4,9 @@
 const fs = require('fs');
 const argv = require('minimist')(
     process.argv.slice(2), 
-    {boolean: ["optimize", "fsm", "yosys_out", "yosys_output", "html", "no_io_ui", "tmpdir", "noindent"]}
+    {boolean: ["optimize", "yosys_out", "yosys_output", "html", "no_io_ui", "tmpdir", "noindent", "fsmexpand"],
+     string: ["fsm"],
+     default: {fsm: true}}
 );
 const util = require('util');
 
@@ -29,10 +31,12 @@ if (argv._.length === 0) {
     console.error('No Verilog files passed!');
     process.exit(1);
 }
-const yosys2digitaljs = require('./index.js');
+const yosys2digitaljs = require('./dist/index.js');
 const opts = {};
 if (argv.optimize) opts.optimize = true;
 if (argv.fsm) opts.fsm = argv.fsm;
+if (argv.fsmexpand) opts.fsmexpand = true;
+if (argv.lint) opts.lint = true;
 if (argv.propagation !== undefined) opts.propagation = Number(argv.propagation);
 const result = argv.tmpdir ? yosys2digitaljs.process_files(read_files(argv._), opts) : yosys2digitaljs.process(argv._, null, opts);
 result.then(res => {
@@ -50,6 +54,13 @@ result.then(res => {
         console.log(util.inspect(res.yosys_output, {showHidden: false, depth: null, colors: process.stdout.isTTY && process.stdout.hasColors()}));
         console.log('*/');
     }
+    if (opts.lint && res.lint && res.lint.length) {
+        console.log('/*');
+        for (const lint of res.lint) {
+            console.log(`${lint.type} ${lint.file}:${lint.line}:${lint.column} ${lint.message}`);
+        }
+        console.log('*/');
+    }
     const output = res.output;
     if (!argv.no_io_ui) yosys2digitaljs.io_ui(output);
     console.log(JSON.stringify(output, null, argv.noindent ? 0 : 2));