circuitscript 0.1.29 → 0.1.32

package/dist/cjs/builtinMethods.js

@@ -8,6 +8,7 @@ const big_js_1 = __importDefault(require("big.js"));
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const types_js_1 = require("./objects/types.js");
 const utils_js_1 = require("./utils.js");
+const globals_js_1 = require("./globals.js");
 const builtInMethods = [
     ['enumerate', enumerate],
     ['toMils', toMils],
@@ -20,7 +21,7 @@ const builtInMethods = [
 ];
 exports.buildInMethodNamesList = builtInMethods.map(item => item[0]);
 function linkBuiltInMethods(context, visitor) {
-    context.createFunction('print', (params) => {
+    context.createFunction(globals_js_1.BaseNamespace, 'print', (params) => {
         const args = getPositionParams(params);
         const items = args.map(item => {
             return toString((0, utils_js_1.unwrapValue)(item));
@@ -34,7 +35,7 @@ function linkBuiltInMethods(context, visitor) {
     });
     builtInMethods.forEach(([functionName, functionImpl]) => {
         if (functionImpl !== null) {
-            context.createFunction(functionName, params => {
+            context.createFunction(globals_js_1.BaseNamespace, functionName, params => {
                 const args = getPositionParams(params);
                 const functionReturn = functionImpl(...args);
                 return [visitor, functionReturn];
@@ -155,6 +156,9 @@ function toString(obj) {
     else if (obj instanceof types_js_1.CFunctionEntry) {
         return obj.toString();
     }
+    else if (obj instanceof types_js_1.ImportedModule) {
+        return `[module: ${obj.moduleName}]`;
+    }
     else {
         if (obj === undefined) {
             return 'undefined';

package/dist/cjs/draw_symbols.js

@@ -135,7 +135,7 @@ class SymbolGraphic {
     }
     drawLabels(group) {
         const labels = this.drawing.getLabels();
-        labels.forEach(label => {
+        for (const label of labels) {
             const tmpLabel = label;
             const { fontSize = (0, ParamDefinition_js_1.numeric)(50), anchor = geometry_js_1.HorizontalAlign.Left, vanchor = geometry_js_1.VerticalAlign.Bottom, fontWeight = 'regular', angle: tmpLabelAngle = (0, ParamDefinition_js_1.numeric)(0), textColor = "#333", } = tmpLabel.style ?? {};
             const labelAngle = tmpLabelAngle.toNumber();
@@ -148,31 +148,35 @@ class SymbolGraphic {
                 useAnchor = this.flipTextAnchor(anchor);
                 useDominantBaseline = this.flipDominantBaseline(vanchor);
             }
-            switch (useAnchor) {
-                case geometry_js_1.HorizontalAlign.Left:
-                    anchorStyle = (this.flipX === 0)
-                        ? geometry_js_1.HorizontalAlignProp.Start : geometry_js_1.HorizontalAlignProp.End;
-                    break;
-                case geometry_js_1.HorizontalAlign.Middle:
-                    anchorStyle = geometry_js_1.HorizontalAlignProp.Middle;
-                    break;
-                case geometry_js_1.HorizontalAlign.Right:
-                    anchorStyle = (this.flipX === 0)
-                        ? geometry_js_1.HorizontalAlignProp.End : geometry_js_1.HorizontalAlignProp.Start;
-                    break;
+            const isHorizontalLabel = labelAngle === 0 || labelAngle === 180;
+            const isVerticalLabel = labelAngle === 90 || labelAngle === -90;
+            if (useAnchor === geometry_js_1.HorizontalAlign.Middle) {
+                anchorStyle = geometry_js_1.HorizontalAlignProp.Middle;
             }
-            switch (useDominantBaseline) {
-                case geometry_js_1.VerticalAlign.Top:
-                    dominantBaseline = (this.flipY === 0)
-                        ? geometry_js_1.VerticalAlignProp.Hanging : geometry_js_1.VerticalAlignProp.TextTop;
-                    break;
-                case geometry_js_1.VerticalAlign.Middle:
-                    dominantBaseline = geometry_js_1.VerticalAlignProp.Central;
-                    break;
-                case geometry_js_1.VerticalAlign.Bottom:
-                    dominantBaseline = (this.flipY === 0)
-                        ? geometry_js_1.VerticalAlignProp.TextTop : geometry_js_1.VerticalAlignProp.Hanging;
-                    break;
+            else if (useAnchor === geometry_js_1.HorizontalAlign.Left) {
+                anchorStyle = geometry_js_1.HorizontalAlignProp.Start;
+            }
+            else if (useAnchor === geometry_js_1.HorizontalAlign.Right) {
+                anchorStyle = geometry_js_1.HorizontalAlignProp.End;
+            }
+            if (useDominantBaseline === geometry_js_1.VerticalAlign.Middle) {
+                dominantBaseline = geometry_js_1.VerticalAlignProp.Central;
+            }
+            else if (useDominantBaseline === geometry_js_1.VerticalAlign.Top) {
+                dominantBaseline = geometry_js_1.VerticalAlignProp.Hanging;
+            }
+            else if (useDominantBaseline === geometry_js_1.VerticalAlign.Bottom) {
+                dominantBaseline = geometry_js_1.VerticalAlignProp.TextTop;
+            }
+            if (anchorStyle !== geometry_js_1.HorizontalAlignProp.Middle &&
+                ((isHorizontalLabel && this.flipX === 1) || (isVerticalLabel && this.flipY === 1))) {
+                anchorStyle = (anchorStyle === geometry_js_1.HorizontalAlignProp.Start)
+                    ? geometry_js_1.HorizontalAlignProp.End : geometry_js_1.HorizontalAlignProp.Start;
+            }
+            if (dominantBaseline !== geometry_js_1.VerticalAlignProp.Central &&
+                ((isHorizontalLabel && this.flipY === 1) || (isVerticalLabel && this.flipX === 1))) {
+                dominantBaseline = (dominantBaseline === geometry_js_1.VerticalAlignProp.Hanging)
+                    ? geometry_js_1.VerticalAlignProp.TextTop : geometry_js_1.VerticalAlignProp.Hanging;
             }
             const position = tmpLabel.getLabelPosition();
             if (this.flipX !== 0) {
@@ -316,7 +320,7 @@ class SymbolGraphic {
                     .translate(-originSize / 2, -originSize / 2)
                     .fill('green');
             }
-        });
+        }
     }
     flipTextAnchor(value) {
         if (value === geometry_js_1.HorizontalAlign.Left) {
@@ -712,7 +716,7 @@ 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);
@@ -728,8 +732,8 @@ class SymbolCustom extends SymbolGraphic {
                 vanchor: geometry_js_1.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);
@@ -745,8 +749,8 @@ class SymbolCustom extends SymbolGraphic {
                 vanchor: geometry_js_1.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);
@@ -764,8 +768,8 @@ class SymbolCustom extends SymbolGraphic {
                 textColor: defaultLineColor,
                 angle: (0, ParamDefinition_js_1.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);
@@ -783,7 +787,7 @@ class SymbolCustom extends SymbolGraphic {
                 textColor: defaultLineColor,
                 angle: (0, ParamDefinition_js_1.numeric)(-90)
             });
-        });
+        }
         const instanceName = drawing.variables.get('refdes');
         instanceName && drawing.addLabel(bodyWidthMM.neg().half(), bodyHeightMM.neg().half().sub((0, helpers_js_1.milsToMM)(20)), instanceName, {
             fontSize: (0, ParamDefinition_js_1.numeric)(globals_js_1.CustomSymbolRefDesSize),

package/dist/cjs/environment.js

@@ -5,8 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (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 fs_1 = require("fs");
+const fs_2 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const crypto_js_1 = __importDefault(require("crypto-js"));
 const globals_js_1 = require("./globals.js");
 const utils_js_1 = require("./utils.js");
 class NodeScriptEnvironment {
@@ -38,7 +40,7 @@ class NodeScriptEnvironment {
         }
         try {
             const packageJsonPath = path_1.default.join(this.getToolsPath(), '../', 'package.json');
-            const packageJsonContent = fs_1.default.readFileSync(packageJsonPath, 'utf-8');
+            const packageJsonContent = fs_2.default.readFileSync(packageJsonPath, 'utf-8');
             const packageJson = JSON.parse(packageJsonContent);
             this.cachedVersion = packageJson.version || globals_js_1.TOOL_VERSION;
             return this.cachedVersion;
@@ -117,7 +119,11 @@ class NodeScriptEnvironment {
         return this.prepareSVGEnvironmentInternal(this.getFontsPath());
     }
     async readFile(path, options) {
-        return fs_1.default.promises.readFile(path, options);
+        options = options ?? { encoding: 'utf8' };
+        return fs_2.default.promises.readFile(path, options);
+    }
+    writeFileSync(path, data) {
+        return (0, fs_1.writeFileSync)(path, data);
     }
     getAbsolutePath(filePath) {
         return path_1.default.resolve(filePath);
@@ -137,13 +143,31 @@ class NodeScriptEnvironment {
     }
     async exists(path) {
         try {
-            fs_1.default.promises.access(path, fs_1.default.constants.F_OK);
+            await fs_2.default.promises.access(path, fs_2.default.constants.F_OK);
             return true;
         }
         catch (err) {
             return false;
         }
     }
+    hashStringSHA256(value) {
+        return crypto_js_1.default.SHA256(value).toString();
+    }
+    dirname(filePath) {
+        return path_1.default.dirname(filePath);
+    }
+    extname(filePath) {
+        return path_1.default.extname(filePath);
+    }
+    basename(filePath, ext) {
+        return path_1.default.basename(filePath, ext);
+    }
+    join(...paths) {
+        return path_1.default.join(...paths);
+    }
+    relative(from, to) {
+        return path_1.default.relative(from, to);
+    }
 }
 exports.NodeScriptEnvironment = NodeScriptEnvironment;
 NodeScriptEnvironment._instance = null;