circuitscript 0.1.29 → 0.1.32

package/dist/esm/antlr/CircuitScriptVisitor.js

@@ -72,7 +72,10 @@ export class CircuitScriptVisitor extends AbstractParseTreeVisitor {
     visitWire_expr;
     visitArray_expr;
     visitPoint_expr;
-    visitImport_expr;
+    visitImport_simple;
+    visitImport_all_simple;
+    visitImport_specific;
+    visitImport_annotation_expr;
     visitFrame_expr;
     visitIf_expr;
     visitIf_inner_expr;

package/dist/esm/builtinMethods.js

@@ -1,7 +1,8 @@
 import Big from "big.js";
 import { numeric, NumericValue } from "./objects/ParamDefinition.js";
-import { CFunctionEntry } from "./objects/types.js";
+import { CFunctionEntry, ImportedModule } from "./objects/types.js";
 import { unwrapValue, resolveToNumericValue, RuntimeExecutionError } from "./utils.js";
+import { BaseNamespace } from "./globals.js";
 const builtInMethods = [
     ['enumerate', enumerate],
     ['toMils', toMils],
@@ -14,7 +15,7 @@ const builtInMethods = [
 ];
 export const buildInMethodNamesList = builtInMethods.map(item => item[0]);
 export function linkBuiltInMethods(context, visitor) {
-    context.createFunction('print', (params) => {
+    context.createFunction(BaseNamespace, 'print', (params) => {
         const args = getPositionParams(params);
         const items = args.map(item => {
             return toString(unwrapValue(item));
@@ -28,7 +29,7 @@ export function linkBuiltInMethods(context, visitor) {
     });
     builtInMethods.forEach(([functionName, functionImpl]) => {
         if (functionImpl !== null) {
-            context.createFunction(functionName, params => {
+            context.createFunction(BaseNamespace, functionName, params => {
                 const args = getPositionParams(params);
                 const functionReturn = functionImpl(...args);
                 return [visitor, functionReturn];
@@ -148,6 +149,9 @@ function toString(obj) {
     else if (obj instanceof CFunctionEntry) {
         return obj.toString();
     }
+    else if (obj instanceof ImportedModule) {
+        return `[module: ${obj.moduleName}]`;
+    }
     else {
         if (obj === undefined) {
             return 'undefined';

package/dist/esm/draw_symbols.js

@@ -133,7 +133,7 @@ export class SymbolGraphic {
     }
     drawLabels(group) {
         const labels = this.drawing.getLabels();
-        labels.forEach(label => {
+        for (const label of labels) {
             const tmpLabel = label;
             const { fontSize = numeric(50), anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom, fontWeight = 'regular', angle: tmpLabelAngle = numeric(0), textColor = "#333", } = tmpLabel.style ?? {};
             const labelAngle = tmpLabelAngle.toNumber();
@@ -146,31 +146,35 @@ export class SymbolGraphic {
                 useAnchor = this.flipTextAnchor(anchor);
                 useDominantBaseline = this.flipDominantBaseline(vanchor);
             }
-            switch (useAnchor) {
-                case HorizontalAlign.Left:
-                    anchorStyle = (this.flipX === 0)
-                        ? HorizontalAlignProp.Start : HorizontalAlignProp.End;
-                    break;
-                case HorizontalAlign.Middle:
-                    anchorStyle = HorizontalAlignProp.Middle;
-                    break;
-                case HorizontalAlign.Right:
-                    anchorStyle = (this.flipX === 0)
-                        ? HorizontalAlignProp.End : HorizontalAlignProp.Start;
-                    break;
+            const isHorizontalLabel = labelAngle === 0 || labelAngle === 180;
+            const isVerticalLabel = labelAngle === 90 || labelAngle === -90;
+            if (useAnchor === HorizontalAlign.Middle) {
+                anchorStyle = HorizontalAlignProp.Middle;
             }
-            switch (useDominantBaseline) {
-                case VerticalAlign.Top:
-                    dominantBaseline = (this.flipY === 0)
-                        ? VerticalAlignProp.Hanging : VerticalAlignProp.TextTop;
-                    break;
-                case VerticalAlign.Middle:
-                    dominantBaseline = VerticalAlignProp.Central;
-                    break;
-                case VerticalAlign.Bottom:
-                    dominantBaseline = (this.flipY === 0)
-                        ? VerticalAlignProp.TextTop : VerticalAlignProp.Hanging;
-                    break;
+            else if (useAnchor === HorizontalAlign.Left) {
+                anchorStyle = HorizontalAlignProp.Start;
+            }
+            else if (useAnchor === HorizontalAlign.Right) {
+                anchorStyle = HorizontalAlignProp.End;
+            }
+            if (useDominantBaseline === VerticalAlign.Middle) {
+                dominantBaseline = VerticalAlignProp.Central;
+            }
+            else if (useDominantBaseline === VerticalAlign.Top) {
+                dominantBaseline = VerticalAlignProp.Hanging;
+            }
+            else if (useDominantBaseline === VerticalAlign.Bottom) {
+                dominantBaseline = VerticalAlignProp.TextTop;
+            }
+            if (anchorStyle !== HorizontalAlignProp.Middle &&
+                ((isHorizontalLabel && this.flipX === 1) || (isVerticalLabel && this.flipY === 1))) {
+                anchorStyle = (anchorStyle === HorizontalAlignProp.Start)
+                    ? HorizontalAlignProp.End : HorizontalAlignProp.Start;
+            }
+            if (dominantBaseline !== VerticalAlignProp.Central &&
+                ((isHorizontalLabel && this.flipY === 1) || (isVerticalLabel && this.flipX === 1))) {
+                dominantBaseline = (dominantBaseline === VerticalAlignProp.Hanging)
+                    ? VerticalAlignProp.TextTop : VerticalAlignProp.Hanging;
             }
             const position = tmpLabel.getLabelPosition();
             if (this.flipX !== 0) {
@@ -314,7 +318,7 @@ export class SymbolGraphic {
                     .translate(-originSize / 2, -originSize / 2)
                     .fill('green');
             }
-        });
+        }
     }
     flipTextAnchor(value) {
         if (value === HorizontalAlign.Left) {
@@ -709,7 +713,7 @@ export class SymbolCustom extends SymbolGraphic {
         const pinStartY = bodyHeightMM.neg().half();
         const pinStartX = bodyWidthMM.neg().half();
         const tmpPinSpacing = this.pinSpacing.toNumber();
-        leftPins.forEach(pin => {
+        for (const pin of leftPins) {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
             drawing.addPinMM(pin.pinId, leftPinStart.sub(this.pinLength), pinY, leftPinStart, pinY, defaultLineColor);
@@ -725,8 +729,8 @@ export class SymbolCustom extends SymbolGraphic {
                 vanchor: VerticalAlign.Bottom,
                 textColor: defaultLineColor
             });
-        });
-        rightPins.forEach(pin => {
+        }
+        for (const pin of rightPins) {
             const position = pin.position;
             const pinY = pinStartY.add((position + 1) * tmpPinSpacing);
             drawing.addPinMM(pin.pinId, rightPinStart.add(this.pinLength), pinY, rightPinStart, pinY, defaultLineColor);
@@ -742,8 +746,8 @@ export class SymbolCustom extends SymbolGraphic {
                 vanchor: VerticalAlign.Bottom,
                 textColor: defaultLineColor
             });
-        });
-        topPins.forEach(pin => {
+        }
+        for (const pin of topPins) {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
             drawing.addPinMM(pin.pinId, pinX, topPinStart.sub(this.pinLength), pinX, topPinStart, defaultLineColor);
@@ -761,8 +765,8 @@ export class SymbolCustom extends SymbolGraphic {
                 textColor: defaultLineColor,
                 angle: numeric(-90),
             });
-        });
-        bottomPins.forEach(pin => {
+        }
+        for (const pin of bottomPins) {
             const position = pin.position;
             const pinX = pinStartX.add((position + 1) * tmpPinSpacing);
             drawing.addPinMM(pin.pinId, pinX, bottomPinStart.add(this.pinLength), pinX, bottomPinStart, defaultLineColor);
@@ -780,7 +784,7 @@ export class SymbolCustom extends SymbolGraphic {
                 textColor: defaultLineColor,
                 angle: numeric(-90)
             });
-        });
+        }
         const instanceName = drawing.variables.get('refdes');
         instanceName && drawing.addLabel(bodyWidthMM.neg().half(), bodyHeightMM.neg().half().sub(milsToMM(20)), instanceName, {
             fontSize: numeric(CustomSymbolRefDesSize),

package/dist/esm/environment.js

@@ -1,6 +1,8 @@
 import { registerWindow, SVG } from "@svgdotjs/svg.js";
+import { writeFileSync } from "fs";
 import fs from 'fs';
 import path from "path";
+import CryptoJs from "crypto-js";
 import { TOOL_VERSION } from "./globals.js";
 import { RuntimeExecutionError } from "./utils.js";
 export class NodeScriptEnvironment {
@@ -111,8 +113,12 @@ export class NodeScriptEnvironment {
         return this.prepareSVGEnvironmentInternal(this.getFontsPath());
     }
     async readFile(path, options) {
+        options = options ?? { encoding: 'utf8' };
         return fs.promises.readFile(path, options);
     }
+    writeFileSync(path, data) {
+        return writeFileSync(path, data);
+    }
     getAbsolutePath(filePath) {
         return path.resolve(filePath);
     }
@@ -131,11 +137,29 @@ export class NodeScriptEnvironment {
     }
     async exists(path) {
         try {
-            fs.promises.access(path, fs.constants.F_OK);
+            await fs.promises.access(path, fs.constants.F_OK);
             return true;
         }
         catch (err) {
             return false;
         }
     }
+    hashStringSHA256(value) {
+        return CryptoJs.SHA256(value).toString();
+    }
+    dirname(filePath) {
+        return path.dirname(filePath);
+    }
+    extname(filePath) {
+        return path.extname(filePath);
+    }
+    basename(filePath, ext) {
+        return path.basename(filePath, ext);
+    }
+    join(...paths) {
+        return path.join(...paths);
+    }
+    relative(from, to) {
+        return path.relative(from, to);
+    }
 }