circuitscript 0.5.6 → 0.5.7

package/dist/cjs/execute.js

@@ -374,6 +374,7 @@ class ExecutionContext {
         this.applyComponentAngleFromWire(component, pinId);
         this.scope.setCurrent(component, pinId);
         this.scope.clearActive();
+        this.log('clear active wire/frame (to component)');
         if (addSequence) {
             if (this.scope.sequence.length > 0) {
                 const [entryType, , segments] = this.scope.sequence[this.scope.sequence.length - 1];
@@ -410,6 +411,7 @@ class ExecutionContext {
             this.scope.setNet(component, usePinId, tmpNet);
         }
         this.scope.clearActive();
+        this.log('clear active wire/frame (at component)');
         if (addSequence) {
             this.scope.sequence.push([ExecutionScope_js_1.SequenceAction.At,
                 component, usePinId]);
@@ -448,8 +450,12 @@ class ExecutionContext {
             || blockType === BlockTypes_js_1.BlockTypes.Parallel
             || blockType === BlockTypes_js_1.BlockTypes.Branch) {
             const key = (0, utils_js_1.getBlockTypeString)(blockType);
+            const wireIdBefore = this.scope.currentWireId;
             this.addPoint(`${globals_js_1.Delimiter1}${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
+            if (wireIdBefore !== -1) {
+                this.scope.currentWireId = wireIdBefore;
+            }
         }
         this.scope.blockStack.set(this.scope.scopeLevel, {
             start_point: [

package/dist/cjs/regenerate-tests.js

@@ -9,13 +9,15 @@ const environment_js_1 = require("./environment/environment.js");
 const mainDir = './__tests__/testData/renderData/';
 const env = new environment_js_1.NodeScriptEnvironment();
 environment_js_1.NodeScriptEnvironment.setInstance(env);
-async function regenerateTests(extra = "") {
+async function regenerateTests(extra = "", fileList = []) {
     await env.prepareSVGEnvironment();
     const cstFiles = [];
     const files = fs_1.default.readdirSync(mainDir);
     files.forEach(file => {
         if (file.endsWith('.cst') && file.startsWith('script')) {
-            cstFiles.push(file);
+            if (fileList.length === 0 || fileList.includes(file)) {
+                cstFiles.push(file);
+            }
         }
     });
     for (let i = 0; i < cstFiles.length; i++) {
@@ -38,8 +40,15 @@ async function regenerateTests(extra = "") {
 (async () => {
     const generateDiff = (process.argv.indexOf('-diff') !== -1);
     console.log('diff flag: ', generateDiff);
+    const listIndex = process.argv.indexOf('--list');
+    const fileList = listIndex !== -1 && process.argv[listIndex + 1]
+        ? process.argv[listIndex + 1].split(',').map(f => f.trim())
+        : [];
+    if (fileList.length > 0) {
+        console.log('filtering to files: ', fileList);
+    }
     const nextExtra = generateDiff ? '.next' : '';
-    const cstFiles = await regenerateTests(nextExtra);
+    const cstFiles = await regenerateTests(nextExtra, fileList);
     const allFiles = [];
     if (generateDiff) {
         cstFiles.forEach(file => {

package/dist/esm/execute.js

@@ -379,6 +379,7 @@ export class ExecutionContext {
         this.applyComponentAngleFromWire(component, pinId);
         this.scope.setCurrent(component, pinId);
         this.scope.clearActive();
+        this.log('clear active wire/frame (to component)');
         if (addSequence) {
             if (this.scope.sequence.length > 0) {
                 const [entryType, , segments] = this.scope.sequence[this.scope.sequence.length - 1];
@@ -415,6 +416,7 @@ export class ExecutionContext {
             this.scope.setNet(component, usePinId, tmpNet);
         }
         this.scope.clearActive();
+        this.log('clear active wire/frame (at component)');
         if (addSequence) {
             this.scope.sequence.push([SequenceAction.At,
                 component, usePinId]);
@@ -453,8 +455,12 @@ export class ExecutionContext {
             || blockType === BlockTypes.Parallel
             || blockType === BlockTypes.Branch) {
             const key = getBlockTypeString(blockType);
+            const wireIdBefore = this.scope.currentWireId;
             this.addPoint(`${Delimiter1}${key}.${this.name}.${this.tmpPointId}`, false);
             this.tmpPointId += 1;
+            if (wireIdBefore !== -1) {
+                this.scope.currentWireId = wireIdBefore;
+            }
         }
         this.scope.blockStack.set(this.scope.scopeLevel, {
             start_point: [

package/dist/esm/regenerate-tests.js

@@ -4,13 +4,15 @@ import { NodeScriptEnvironment } from "./environment/environment.js";
 const mainDir = './__tests__/testData/renderData/';
 const env = new NodeScriptEnvironment();
 NodeScriptEnvironment.setInstance(env);
-async function regenerateTests(extra = "") {
+async function regenerateTests(extra = "", fileList = []) {
     await env.prepareSVGEnvironment();
     const cstFiles = [];
     const files = fs.readdirSync(mainDir);
     files.forEach(file => {
         if (file.endsWith('.cst') && file.startsWith('script')) {
-            cstFiles.push(file);
+            if (fileList.length === 0 || fileList.includes(file)) {
+                cstFiles.push(file);
+            }
         }
     });
     for (let i = 0; i < cstFiles.length; i++) {
@@ -33,8 +35,15 @@ async function regenerateTests(extra = "") {
 (async () => {
     const generateDiff = (process.argv.indexOf('-diff') !== -1);
     console.log('diff flag: ', generateDiff);
+    const listIndex = process.argv.indexOf('--list');
+    const fileList = listIndex !== -1 && process.argv[listIndex + 1]
+        ? process.argv[listIndex + 1].split(',').map(f => f.trim())
+        : [];
+    if (fileList.length > 0) {
+        console.log('filtering to files: ', fileList);
+    }
     const nextExtra = generateDiff ? '.next' : '';
-    const cstFiles = await regenerateTests(nextExtra);
+    const cstFiles = await regenerateTests(nextExtra, fileList);
     const allFiles = [];
     if (generateDiff) {
         cstFiles.forEach(file => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.5.6",
+    "version": "0.5.7",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -24,12 +24,14 @@
         "libs"
     ],
     "devDependencies": {
+        "@resvg/resvg-js": "^2.6.2",
         "@types/big.js": "^6.2.2",
         "@types/crypto-js": "^4.2.2",
         "@types/figlet": "^1.5.8",
         "@types/jest": "~29.5",
         "@types/node": "~18",
         "@types/pdfkit": "^0.13.6",
+        "@types/pngjs": "^6.0.5",
         "@types/svg-to-pdfkit": "^0.1.3",
         "@types/svgdom": "^0.1.2",
         "@typescript-eslint/eslint-plugin": "~5.59",
@@ -40,6 +42,8 @@
         "eslint-plugin-jest": "~27.2",
         "jest": "~29.5",
         "license-check-and-add": "^4.0.5",
+        "pixelmatch": "^7.1.0",
+        "pngjs": "^7.0.0",
         "prettier": "~2.8",
         "rimraf": "~5.0",
         "source-map-support": "^0.5.21",