circuitscript 0.1.0 → 0.1.3

package/dist/cjs/globals.js

@@ -1,13 +1,10 @@
 "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 = void 0;
+const ParamDefinition_1 = require("./objects/ParamDefinition");
 var GlobalNames;
 (function (GlobalNames) {
     GlobalNames["__root"] = "__root";
-    GlobalNames["gnd"] = "gnd";
-    GlobalNames["DefaultResistor"] = "res";
-    GlobalNames["DefaultCapacitor"] = "cap";
-    GlobalNames["DefaultInductor"] = "ind";
     GlobalNames["symbol"] = "symbol";
 })(GlobalNames || (exports.GlobalNames = GlobalNames = {}));
 exports.NoNetText = 'NO_NET';
@@ -15,6 +12,10 @@ var ParamKeys;
 (function (ParamKeys) {
     ParamKeys["priority"] = "priority";
     ParamKeys["net_name"] = "net_name";
+    ParamKeys["flip"] = "flip";
+    ParamKeys["flipX"] = "flipX";
+    ParamKeys["flipY"] = "flipY";
+    ParamKeys["angle"] = "angle";
 })(ParamKeys || (exports.ParamKeys = ParamKeys = {}));
 var LayoutDirection;
 (function (LayoutDirection) {
@@ -25,6 +26,8 @@ var SymbolPinSide;
 (function (SymbolPinSide) {
     SymbolPinSide["Left"] = "left";
     SymbolPinSide["Right"] = "right";
+    SymbolPinSide["Top"] = "top";
+    SymbolPinSide["Bottom"] = "bottom";
 })(SymbolPinSide || (exports.SymbolPinSide = SymbolPinSide = {}));
 var LengthUnit;
 (function (LengthUnit) {
@@ -43,11 +46,11 @@ exports.MMToPt = 2.8346456693;
 exports.PxToMM = 0.2645833;
 exports.portWidth = 20;
 exports.portHeight = 2;
-exports.defaultGridSizeUnits = exports.MilsToMM * 100;
+exports.defaultGridSizeUnits = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(100).toNumber();
 exports.defaultZoomScale = 2.5;
 exports.fontDisplayScale = 0.032;
-exports.defaultSymbolLineWidth = exports.MilsToMM * 6;
-exports.defaultWireLineWidth = exports.MilsToMM * 6;
+exports.defaultSymbolLineWidth = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(6).toNumber();
+exports.defaultWireLineWidth = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(6).toNumber();
 exports.defaultPinNameTextSize = 40;
 exports.defaultPinIdTextSize = 30;
 exports.defaultPageMarginMM = 10;
@@ -61,7 +64,7 @@ exports.displayUnits = LengthUnit.mils;
 exports.defaultFont = 'Arial';
 exports.defaultFontBold = 'Arial';
 exports.defaultFontSize = 10;
-exports.junctionSize = exports.MilsToMM * 20;
+exports.junctionSize = (0, ParamDefinition_1.numeric)(exports.MilsToMM).mul(20);
 exports.PortArrowSize = exports.MilsToMM * 50;
 exports.PortPaddingHorizontal = exports.MilsToMM * 10;
 exports.PortPaddingVertical = exports.MilsToMM * 10;
@@ -74,11 +77,10 @@ exports.ColorScheme = {
 };
 var ComponentTypes;
 (function (ComponentTypes) {
-    ComponentTypes["gnd"] = "gnd";
     ComponentTypes["net"] = "net";
-    ComponentTypes["label"] = "label";
-    ComponentTypes["point"] = "point";
-    ComponentTypes["frame"] = "frame";
+    ComponentTypes["graphic"] = "graphic";
+    ComponentTypes["port"] = "port";
+    ComponentTypes["module"] = "module";
 })(ComponentTypes || (exports.ComponentTypes = ComponentTypes = {}));
 var ReferenceTypes;
 (function (ReferenceTypes) {
@@ -105,4 +107,7 @@ exports.GlobalDocumentName = 'document';
 exports.RenderFlags = {
     ShowElementFrames: false,
     ShowOrigin: false,
+    ShowGridOrigin: false,
+    ShowLabelBoxBounds: false,
+    ShowLabelOrigin: false,
 };

package/dist/cjs/helpers.js

@@ -22,6 +22,8 @@ const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
 const SemanticTokenVisitor_js_1 = require("./SemanticTokenVisitor.js");
 const globals_js_1 = require("./globals.js");
 const Frame_js_1 = require("./objects/Frame.js");
+const big_js_1 = __importDefault(require("big.js"));
+const logger_js_1 = require("./logger.js");
 var JSModuleType;
 (function (JSModuleType) {
     JSModuleType["CommonJs"] = "cjs";
@@ -200,7 +202,13 @@ function renderScript(scriptData, outputPath, options) {
         const action = tmp[0];
         if (action === ExecutionScope_js_1.SequenceAction.Wire) {
             tmp[2] = tmp[2].map(item2 => {
-                return [item2.direction, item2.value].join(",");
+                const lengthValue = item2.value;
+                const useValue = [item2.direction];
+                if (lengthValue !== null) {
+                    useValue.push(lengthValue.value);
+                    useValue.push(lengthValue.type);
+                }
+                return useValue.join(",");
             }).join(" ");
         }
         else if (action === ExecutionScope_js_1.SequenceAction.Frame) {
@@ -238,8 +246,10 @@ function renderScript(scriptData, outputPath, options) {
         showStats && console.log('Layout took:', layoutTimer.lap());
         dumpData && (0, fs_1.writeFileSync)('dump/raw-layout.txt', layoutEngine.logger.dump());
         const generateSvgTimer = new utils_js_1.SimpleStopwatch();
-        const svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames);
+        const renderLogger = new logger_js_1.Logger();
+        const svgCanvas = (0, render_js_1.renderSheetsToSVG)(sheetFrames, renderLogger);
         showStats && console.log('Render took:', generateSvgTimer.lap());
+        dumpData && (0, fs_1.writeFileSync)('dump/raw-render.txt', renderLogger.dump());
         svgOutput = (0, render_js_1.generateSvgOutput)(svgCanvas, outputDefaultZoom);
         if (outputPath) {
             if (fileExtension === 'svg') {
@@ -336,7 +346,10 @@ class UnitDimension {
 }
 exports.UnitDimension = UnitDimension;
 function milsToMM(value) {
-    return value * globals_js_1.MilsToMM;
+    if (typeof value === 'number') {
+        value = (0, utils_js_1.resolveToNumericValue)(new big_js_1.default(value));
+    }
+    return (0, utils_js_1.resolveToNumericValue)(value.toBigNumber().mul(new big_js_1.default(globals_js_1.MilsToMM)).round(6));
 }
 exports.milsToMM = milsToMM;
 function pxToMM(value) {