circuitscript 0.1.0 → 0.1.3

package/dist/esm/globals.mjs

@@ -1,10 +1,7 @@
+import { numeric } from "./objects/ParamDefinition";
 export var GlobalNames;
 (function (GlobalNames) {
     GlobalNames["__root"] = "__root";
-    GlobalNames["gnd"] = "gnd";
-    GlobalNames["DefaultResistor"] = "res";
-    GlobalNames["DefaultCapacitor"] = "cap";
-    GlobalNames["DefaultInductor"] = "ind";
     GlobalNames["symbol"] = "symbol";
 })(GlobalNames || (GlobalNames = {}));
 export const NoNetText = 'NO_NET';
@@ -12,6 +9,10 @@ export 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 || (ParamKeys = {}));
 export var LayoutDirection;
 (function (LayoutDirection) {
@@ -22,6 +23,8 @@ export var SymbolPinSide;
 (function (SymbolPinSide) {
     SymbolPinSide["Left"] = "left";
     SymbolPinSide["Right"] = "right";
+    SymbolPinSide["Top"] = "top";
+    SymbolPinSide["Bottom"] = "bottom";
 })(SymbolPinSide || (SymbolPinSide = {}));
 export var LengthUnit;
 (function (LengthUnit) {
@@ -40,11 +43,11 @@ export const MMToPt = 2.8346456693;
 export const PxToMM = 0.2645833;
 export const portWidth = 20;
 export const portHeight = 2;
-export const defaultGridSizeUnits = MilsToMM * 100;
+export const defaultGridSizeUnits = numeric(MilsToMM).mul(100).toNumber();
 export const defaultZoomScale = 2.5;
 export const fontDisplayScale = 0.032;
-export const defaultSymbolLineWidth = MilsToMM * 6;
-export const defaultWireLineWidth = MilsToMM * 6;
+export const defaultSymbolLineWidth = numeric(MilsToMM).mul(6).toNumber();
+export const defaultWireLineWidth = numeric(MilsToMM).mul(6).toNumber();
 export const defaultPinNameTextSize = 40;
 export const defaultPinIdTextSize = 30;
 export const defaultPageMarginMM = 10;
@@ -58,7 +61,7 @@ export const displayUnits = LengthUnit.mils;
 export const defaultFont = 'Arial';
 export const defaultFontBold = 'Arial';
 export const defaultFontSize = 10;
-export const junctionSize = MilsToMM * 20;
+export const junctionSize = numeric(MilsToMM).mul(20);
 export const PortArrowSize = MilsToMM * 50;
 export const PortPaddingHorizontal = MilsToMM * 10;
 export const PortPaddingVertical = MilsToMM * 10;
@@ -71,11 +74,10 @@ export const ColorScheme = {
 };
 export 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 || (ComponentTypes = {}));
 export var ReferenceTypes;
 (function (ReferenceTypes) {
@@ -102,4 +104,7 @@ export const GlobalDocumentName = 'document';
 export const RenderFlags = {
     ShowElementFrames: false,
     ShowOrigin: false,
+    ShowGridOrigin: false,
+    ShowLabelBoxBounds: false,
+    ShowLabelOrigin: false,
 };

package/dist/esm/helpers.mjs

@@ -6,7 +6,7 @@ import { LayoutEngine } from "./layout.mjs";
 import { SequenceAction } from "./objects/ExecutionScope.mjs";
 import { parseFileWithVisitor } from "./parser.mjs";
 import { generatePdfOutput, generateSvgOutput, renderSheetsToSVG } from "./render.mjs";
-import { SimpleStopwatch } from "./utils.mjs";
+import { resolveToNumericValue, SimpleStopwatch } from "./utils.mjs";
 import { ParserVisitor, VisitorExecutionException } from "./visitor.mjs";
 import { createContext } from "this-file";
 import { SymbolValidatorResolveVisitor, SymbolValidatorVisitor } from "./SymbolValidatorVisitor.mjs";
@@ -16,6 +16,8 @@ import { CircuitScriptParser } from "./antlr/CircuitScriptParser.mjs";
 import { prepareTokens, SemanticTokensVisitor } from "./SemanticTokenVisitor.mjs";
 import { defaultPageMarginMM, defaultZoomScale, LengthUnit, MilsToMM, PxToMM } from "./globals.mjs";
 import { FrameParamKeys } from "./objects/Frame.mjs";
+import Big from "big.js";
+import { Logger } from "./logger.mjs";
 export var JSModuleType;
 (function (JSModuleType) {
     JSModuleType["CommonJs"] = "cjs";
@@ -189,7 +191,13 @@ export function renderScript(scriptData, outputPath, options) {
         const action = tmp[0];
         if (action === 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 === SequenceAction.Frame) {
@@ -227,8 +235,10 @@ export function renderScript(scriptData, outputPath, options) {
         showStats && console.log('Layout took:', layoutTimer.lap());
         dumpData && writeFileSync('dump/raw-layout.txt', layoutEngine.logger.dump());
         const generateSvgTimer = new SimpleStopwatch();
-        const svgCanvas = renderSheetsToSVG(sheetFrames);
+        const renderLogger = new Logger();
+        const svgCanvas = renderSheetsToSVG(sheetFrames, renderLogger);
         showStats && console.log('Render took:', generateSvgTimer.lap());
+        dumpData && writeFileSync('dump/raw-render.txt', renderLogger.dump());
         svgOutput = generateSvgOutput(svgCanvas, outputDefaultZoom);
         if (outputPath) {
             if (fileExtension === 'svg') {
@@ -320,7 +330,10 @@ export class UnitDimension {
     }
 }
 export function milsToMM(value) {
-    return value * MilsToMM;
+    if (typeof value === 'number') {
+        value = resolveToNumericValue(new Big(value));
+    }
+    return resolveToNumericValue(value.toBigNumber().mul(new Big(MilsToMM)).round(6));
 }
 export function pxToMM(value) {
     return value * PxToMM;