circuitscript 0.1.5 → 0.1.7

package/dist/cjs/builtinMethods.js

@@ -3,10 +3,20 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.linkBuiltInMethods = void 0;
+exports.linkBuiltInMethods = exports.buildInMethodNamesList = void 0;
 const big_js_1 = __importDefault(require("big.js"));
-const ParamDefinition_1 = require("./objects/ParamDefinition");
-const utils_1 = require("./utils");
+const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const utils_js_1 = require("./utils.js");
+const builtInMethods = [
+    ['enumerate', enumerate],
+    ['toMils', toMils],
+    ['range', range],
+    ['len', objectLength],
+    ['arrayPush', arrayPush],
+    ['arrayGet', arrayGet],
+    ['print', null],
+];
+exports.buildInMethodNamesList = builtInMethods.map(item => item[0]);
 function linkBuiltInMethods(context, visitor) {
     context.createFunction('print', (params) => {
         const args = getPositionParams(params);
@@ -18,26 +28,20 @@ function linkBuiltInMethods(context, visitor) {
         visitor.printStream.push(printedValue);
         return [visitor, printedValue];
     });
-    const builtIns = [
-        ['enumerate', enumerate],
-        ['toMils', toMils],
-        ['range', range],
-        ['len', objectLength],
-        ['arrayPush', arrayPush],
-        ['arrayGet', arrayGet],
-    ];
-    builtIns.forEach(([functionName, functionImpl]) => {
-        context.createFunction(functionName, params => {
-            const args = getPositionParams(params);
-            const functionReturn = functionImpl(...args);
-            return [visitor, functionReturn];
-        });
+    builtInMethods.forEach(([functionName, functionImpl]) => {
+        if (functionImpl !== null) {
+            context.createFunction(functionName, params => {
+                const args = getPositionParams(params);
+                const functionReturn = functionImpl(...args);
+                return [visitor, functionReturn];
+            });
+        }
     });
 }
 exports.linkBuiltInMethods = linkBuiltInMethods;
 function range(...args) {
-    let startValue = (0, ParamDefinition_1.numeric)(0);
-    let endValue = (0, ParamDefinition_1.numeric)(0);
+    let startValue = (0, ParamDefinition_js_1.numeric)(0);
+    let endValue = (0, ParamDefinition_js_1.numeric)(0);
     if (args.length === 1) {
         endValue = args[0];
     }
@@ -64,7 +68,7 @@ function enumerate(array) {
 }
 function toMils(value) {
     let bigValue;
-    if (value instanceof ParamDefinition_1.NumericValue) {
+    if (value instanceof ParamDefinition_js_1.NumericValue) {
         bigValue = value.toBigNumber();
     }
     else {
@@ -74,15 +78,15 @@ function toMils(value) {
         bigValue = new big_js_1.default(value);
     }
     bigValue = bigValue.div(new big_js_1.default(25.4 / 1000));
-    return (0, utils_1.resolveToNumericValue)(bigValue);
+    return (0, utils_js_1.resolveToNumericValue)(bigValue);
 }
 function objectLength(obj) {
     if (Array.isArray(obj)) {
-        return (0, ParamDefinition_1.numeric)(obj.length);
+        return (0, ParamDefinition_js_1.numeric)(obj.length);
     }
     else {
         if (obj.length) {
-            return (0, ParamDefinition_1.numeric)(obj.length);
+            return (0, ParamDefinition_js_1.numeric)(obj.length);
         }
         else {
             throw "Could not get length of object: " + obj;
@@ -101,7 +105,7 @@ function arrayGet(arrayObject, index) {
         throw "Invalid array object to get";
     }
     let useValue;
-    if (index instanceof ParamDefinition_1.NumericValue) {
+    if (index instanceof ParamDefinition_js_1.NumericValue) {
         useValue = index.toNumber();
     }
     else {
@@ -123,7 +127,7 @@ function toString(obj) {
         const inner = obj.map(item => toString(item)).join(", ");
         return "[" + inner + "]";
     }
-    else if (obj instanceof ParamDefinition_1.NumericValue) {
+    else if (obj instanceof ParamDefinition_js_1.NumericValue) {
         return obj.toBigNumber().toString();
     }
     else {

package/dist/cjs/environment.js

@@ -0,0 +1,118 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NodeScriptEnvironment = void 0;
+const svg_js_1 = require("@svgdotjs/svg.js");
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const globals_js_1 = require("./globals.js");
+const utils_js_1 = require("./utils.js");
+class NodeScriptEnvironment {
+    constructor() {
+        this.useModuleDirectoryPath = null;
+        this.useDefaultLibsPath = null;
+        this.globalCreateSVGWindow = null;
+        this.supportedFonts = {
+            'Arial': 'Arial.ttf',
+        };
+    }
+    static setInstance(instance) {
+        NodeScriptEnvironment._instance = instance;
+    }
+    static getInstance() {
+        return NodeScriptEnvironment._instance;
+    }
+    setModuleDirectory(path) {
+        this.useModuleDirectoryPath = path;
+    }
+    setDefaultLibsPath(path) {
+        this.useDefaultLibsPath = path;
+    }
+    getPackageVersion() {
+        return globals_js_1.TOOL_VERSION;
+    }
+    getModuleDirectory() {
+        if (this.useModuleDirectoryPath !== null) {
+            return this.useModuleDirectoryPath;
+        }
+        if (typeof __dirname !== 'undefined') {
+            return __dirname;
+        }
+        const stackLine = new Error().stack?.split('\n')[1];
+        if (stackLine) {
+            const fileMatch = stackLine.match(/\((.+)\:[\d]+\:[\d]+\)/);
+            if (fileMatch) {
+                const filePath = fileMatch[1].replace('file://', '');
+                return path_1.default.dirname(filePath);
+            }
+        }
+        throw new utils_js_1.RuntimeExecutionError("Failed to get current module directory");
+    }
+    getRelativeToModule(filePath) {
+        return path_1.default.join(this.getModuleDirectory(), filePath);
+    }
+    getRelativeToDefaultLibs(filePath) {
+        return path_1.default.join(this.getDefaultLibsPath(), filePath);
+    }
+    getToolsPath() {
+        return path_1.default.normalize(this.getModuleDirectory() + '/../');
+    }
+    getFontsPath() {
+        return path_1.default.normalize(this.getToolsPath() + "fonts");
+    }
+    getDefaultLibsPath() {
+        if (this.useDefaultLibsPath !== null) {
+            return this.useDefaultLibsPath;
+        }
+        return path_1.default.normalize(this.getToolsPath() + "libs");
+    }
+    async prepareSVGEnvironmentInternal(fontsPath) {
+        try {
+            const dynamicImport = new Function('specifier', 'return import(specifier)');
+            const { config, createSVGWindow } = await dynamicImport('svgdom');
+            this.globalCreateSVGWindow = createSVGWindow;
+            if (fontsPath !== null) {
+                await config.setFontDir(fontsPath)
+                    .setFontFamilyMappings(this.supportedFonts)
+                    .preloadFonts();
+            }
+        }
+        catch (error) {
+            throw new Error(`Failed to load svgdom ESM module: ${error}`);
+        }
+    }
+    createSVGWindow() {
+        if (this.globalCreateSVGWindow === null) {
+            throw new Error("SVG environment is not set up yet. Call prepareSVGEnvironment() first.");
+        }
+        return this.globalCreateSVGWindow();
+    }
+    getCanvasWindow() {
+        if (this.textMeasurementCanvas === undefined) {
+            const window = this.createSVGWindow();
+            const { document } = window;
+            (0, svg_js_1.registerWindow)(window, document);
+            this.textMeasurementCanvas = (0, svg_js_1.SVG)(document.documentElement);
+        }
+        return this.textMeasurementCanvas;
+    }
+    prepareSVGEnvironment() {
+        return this.prepareSVGEnvironmentInternal(this.getFontsPath());
+    }
+    async readFile(path, options) {
+        return fs_1.default.promises.readFile(path, options);
+    }
+    async exists(path) {
+        try {
+            fs_1.default.promises.access(path, fs_1.default.constants.F_OK);
+            return true;
+        }
+        catch (err) {
+            return false;
+        }
+    }
+}
+exports.NodeScriptEnvironment = NodeScriptEnvironment;
+NodeScriptEnvironment._instance = null;

package/dist/cjs/execute.js

@@ -206,7 +206,7 @@ class ExecutionContext {
         this.log('to component');
         const { addSequence = false } = options ?? {};
         if (!(component instanceof ClassComponent_js_1.ClassComponent)) {
-            throw "Not a valid component!";
+            throw new utils_js_1.RuntimeExecutionError("Not a valid component!");
         }
         if (pinId === null) {
             pinId = component.getDefaultPin();
@@ -217,7 +217,7 @@ class ExecutionContext {
             }
             else {
                 console.trace();
-                throw ('Invalid pin number ' +
+                throw new utils_js_1.RuntimeExecutionError('Invalid pin number ' +
                     pinId +
                     ' in ' +
                     component.instanceName);
@@ -342,6 +342,7 @@ class ExecutionContext {
         const stackRef = this.scope.blockStack.get(this.scope.indentLevel);
         stackRef['block_index'] = blockIndex;
         const { type: blockType } = stackRef;
+        const blockTypeName = (0, utils_js_1.getBlockTypeString)(blockType);
         stackRef['inner_blocks'].set(blockIndex, {
             last_net: null,
             ignore_last_net: false,
@@ -354,7 +355,7 @@ class ExecutionContext {
             const { entered_at: [component, pin,] } = stackRef;
             this.atComponent(component, pin, { addSequence: true });
         }
-        this.log(`enter inner block of type (${blockType}) >>>`);
+        this.log(`enter inner block of type (${blockTypeName}) >>>`);
         this.scope.indentLevel += 1;
     }
     exitBlock(blockIndex) {
@@ -655,24 +656,64 @@ class ExecutionContext {
         }
         const useName = userDefined ? 'point.' + pointId : pointId;
         const componentPoint = ClassComponent_js_1.ClassComponent.simple(useName, 1);
-        componentPoint.displayProp = this.getPointSymbol();
+        componentPoint.displayProp = this.getPointSymbol(useName);
         componentPoint.typeProp = globals_js_1.ComponentTypes.net;
+        let usePointLinkComponent = null;
+        if (this.scope.currentComponent._pointLinkComponent) {
+            usePointLinkComponent = this.scope.currentComponent._pointLinkComponent;
+        }
+        else {
+            usePointLinkComponent = this.scope.currentComponent;
+        }
+        componentPoint._pointLinkComponent = usePointLinkComponent;
         this.scope.instances.set(pointId, componentPoint);
         this.toComponent(componentPoint, 1, { addSequence: true });
         return this.getCurrentPoint();
     }
-    getPointSymbol() {
-        return new draw_symbols_js_1.SymbolDrawingCommands(() => {
-            return [
-                [draw_symbols_js_1.PlaceHolderCommands.pin,
-                    [(0, ParamDefinition_js_1.numeric)(1), (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0),
-                        (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)],
+    getPointSymbol(name = "") {
+        const commands = [
+            [draw_symbols_js_1.PlaceHolderCommands.pin,
+                [(0, ParamDefinition_js_1.numeric)(1), (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0),
+                    (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)],
+                new Map([
+                    ["display_pin_id", false]
+                ]),
+                null
+            ]
+        ];
+        if (false) {
+            commands.push(...[
+                [draw_symbols_js_1.PlaceHolderCommands.lineColor,
+                    ["red"],
+                    new Map(), null
+                ],
+                [draw_symbols_js_1.PlaceHolderCommands.hline,
+                    [(0, ParamDefinition_js_1.numeric)(-25), (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(50)],
+                    new Map(),
+                    null
+                ],
+                [draw_symbols_js_1.PlaceHolderCommands.vline,
+                    [(0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(-25), (0, ParamDefinition_js_1.numeric)(50)],
+                    new Map(),
+                    null
+                ],
+                [draw_symbols_js_1.PlaceHolderCommands.hline,
+                    [(0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0),
+                        (0, ParamDefinition_js_1.numeric)(10)],
+                    new Map([]), null
+                ],
+                [draw_symbols_js_1.PlaceHolderCommands.text,
+                    [],
                     new Map([
-                        ["display_pin_id", false]
+                        ["content", name],
+                        ["fontSize", (0, ParamDefinition_js_1.numeric)(10)],
                     ]),
                     null
                 ]
-            ];
+            ]);
+        }
+        return new draw_symbols_js_1.SymbolDrawingCommands(() => {
+            return commands;
         });
     }
     setProperty(nameWithProp, value) {

package/dist/cjs/geometry.js

@@ -383,6 +383,7 @@ class Geometry {
                             replaceSegments(existingSegments, j, splitCurrentSegments);
                             replaceSegments(newSegments, k, splitNewSegments);
                             j = Math.max(0, j - 1);
+                            break;
                         }
                     }
                 }

package/dist/cjs/globals.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = exports.BlockTypes = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.PortPaddingVertical = exports.PortPaddingHorizontal = exports.PortArrowSize = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.displayUnits = exports.defaultFrameTitleTextSize = exports.CustomSymbolParamTextSize = exports.CustomSymbolRefDesSize = exports.CustomSymbolPinIdSize = exports.CustomSymbolPinTextSize = exports.defaultPageSpacingMM = exports.defaultPageMarginMM = exports.defaultPinIdTextSize = exports.defaultPinNameTextSize = exports.defaultWireLineWidth = exports.defaultSymbolLineWidth = exports.fontDisplayScale = exports.defaultZoomScale = exports.defaultGridSizeUnits = exports.portHeight = exports.portWidth = exports.PxToMM = exports.MMToPt = exports.MMToPx = exports.MilsToMM = exports.WireAutoDirection = exports.LengthUnit = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = exports.DoubleDelimiter1 = exports.Delimiter1 = void 0;
-const ParamDefinition_1 = require("./objects/ParamDefinition");
+exports.SymbolValidatorContext = exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = exports.BlockTypes = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.PortPaddingVertical = exports.PortPaddingHorizontal = exports.PortArrowSize = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.displayUnits = exports.defaultFrameTitleTextSize = exports.CustomSymbolParamTextSize = exports.CustomSymbolRefDesSize = exports.CustomSymbolPinIdSize = exports.CustomSymbolPinTextSize = exports.defaultPageSpacingMM = exports.defaultPageMarginMM = exports.defaultPinIdTextSize = exports.defaultPinNameTextSize = exports.defaultWireLineWidth = exports.defaultSymbolLineWidth = exports.fontDisplayScale = exports.defaultZoomScale = exports.defaultGridSizeUnits = exports.portHeight = exports.portWidth = exports.PxToMM = exports.MMToPt = exports.MMToPx = exports.MilsToMM = exports.WireAutoDirection = exports.LengthUnit = exports.ValidPinSides = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = exports.DoubleDelimiter1 = exports.Delimiter1 = exports.TOOL_VERSION = void 0;
+const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+exports.TOOL_VERSION = '0.1.5';
 exports.Delimiter1 = '-';
 exports.DoubleDelimiter1 = `${exports.Delimiter1}${exports.Delimiter1}`;
 var GlobalNames;
@@ -31,6 +32,9 @@ var SymbolPinSide;
     SymbolPinSide["Top"] = "top";
     SymbolPinSide["Bottom"] = "bottom";
 })(SymbolPinSide || (exports.SymbolPinSide = SymbolPinSide = {}));
+exports.ValidPinSides = [
+    SymbolPinSide.Left, SymbolPinSide.Right, SymbolPinSide.Top, SymbolPinSide.Bottom
+];
 var LengthUnit;
 (function (LengthUnit) {
     LengthUnit["mm"] = "mm";
@@ -48,11 +52,11 @@ exports.MMToPt = 2.8346456693;
 exports.PxToMM = 0.2645833;
 exports.portWidth = 20;
 exports.portHeight = 2;
-exports.defaultGridSizeUnits = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(100).toNumber();
+exports.defaultGridSizeUnits = (0, ParamDefinition_js_1.numeric)(exports.MilsToMM).mul(100).toNumber();
 exports.defaultZoomScale = 2.5;
 exports.fontDisplayScale = 0.032;
-exports.defaultSymbolLineWidth = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(6).toNumber();
-exports.defaultWireLineWidth = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(6).toNumber();
+exports.defaultSymbolLineWidth = (0, ParamDefinition_js_1.numeric)(exports.MilsToMM).mul(6).toNumber();
+exports.defaultWireLineWidth = (0, ParamDefinition_js_1.numeric)(exports.MilsToMM).mul(6).toNumber();
 exports.defaultPinNameTextSize = 40;
 exports.defaultPinIdTextSize = 30;
 exports.defaultPageMarginMM = 10;
@@ -66,7 +70,7 @@ exports.displayUnits = LengthUnit.mils;
 exports.defaultFont = 'Arial';
 exports.defaultFontBold = 'Arial';
 exports.defaultFontSize = 10;
-exports.junctionSize = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(20);
+exports.junctionSize = (0, ParamDefinition_js_1.numeric)(exports.MilsToMM).mul(20);
 exports.PortArrowSize = exports.MilsToMM * 50;
 exports.PortPaddingHorizontal = exports.MilsToMM * 10;
 exports.PortPaddingVertical = exports.MilsToMM * 10;
@@ -113,3 +117,4 @@ exports.RenderFlags = {
     ShowLabelBoxBounds: false,
     ShowLabelOrigin: false,
 };
+exports.SymbolValidatorContext = '_sym';