circuitscript 0.1.3 → 0.1.5

package/dist/esm/utils.mjs

@@ -1,5 +1,8 @@
 import { Big } from 'big.js';
+import { ClassComponent } from "./objects/ClassComponent";
 import { NumericValue } from "./objects/ParamDefinition";
+import { SequenceAction } from './objects/ExecutionScope';
+import { BlockTypes } from './globals';
 export class SimpleStopwatch {
     startTime;
     constructor() {
@@ -167,3 +170,73 @@ export function areasOverlap(area1, area2) {
         || isPointWithinArea(pt3, area2)
         || isPointWithinArea(pt4, area2);
 }
+export function sequenceActionString(sequenceAction) {
+    const tmp = [...sequenceAction];
+    const action = tmp[0];
+    if (action === SequenceAction.Wire) {
+        tmp[2] = tmp[2].map(item2 => {
+            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) {
+        tmp[1] = sequenceAction[1].frameId;
+    }
+    else if (action !== SequenceAction.WireJump) {
+        const [, component] = sequenceAction;
+        if (component instanceof ClassComponent) {
+            tmp[1] = sequenceAction[1].instanceName;
+        }
+    }
+    return tmp.join(" | ");
+}
+export function generateDebugSequenceAction(sequence) {
+    const variableMapping = new Map();
+    return sequence.map(item => {
+        const returnResult = [...item];
+        const [action,] = item;
+        if (action === SequenceAction.Assign) {
+            const [, name, component] = item;
+            variableMapping.set(name, component);
+        }
+        else {
+            if (action === SequenceAction.At || action === SequenceAction.To) {
+                const [, component,] = item;
+                const foundIndex = Array.from(variableMapping.values()).findIndex(item2 => {
+                    if (component._copyFrom !== null) {
+                        return component._copyFrom === item2;
+                    }
+                    return component === item2;
+                });
+                if (foundIndex !== -1) {
+                    const name = Array.from(variableMapping.keys())[foundIndex];
+                    returnResult[1] = name + ':' + component._copyID;
+                }
+            }
+        }
+        return returnResult;
+    });
+}
+export function getBlockTypeString(type) {
+    let returnValue = 'branch';
+    switch (type) {
+        case BlockTypes.Branch:
+            returnValue = 'branch';
+            break;
+        case BlockTypes.Join:
+            returnValue = 'join';
+            break;
+        case BlockTypes.Parallel:
+            returnValue = 'parallel';
+            break;
+        case BlockTypes.Point:
+            returnValue = 'point';
+            break;
+    }
+    return returnValue;
+}

package/dist/esm/visitor.mjs

@@ -3,7 +3,7 @@ import { NumberOperator, numeric, NumericValue, ParamDefinition } from './object
 import { PinDefinition, PinIdType } from './objects/PinDefinition.mjs';
 import { PinTypes } from './objects/PinTypes.mjs';
 import { DeclaredReference, UndeclaredReference } from './objects/types.mjs';
-import { BlockTypes, ComponentTypes, FrameType, GlobalDocumentName, ModuleContainsKeyword, NoNetText, ParamKeys, ReferenceTypes, SymbolPinSide, WireAutoDirection } from './globals.mjs';
+import { BlockTypes, ComponentTypes, Delimiter1, FrameType, GlobalDocumentName, ModuleContainsKeyword, NoNetText, ParamKeys, ReferenceTypes, SymbolPinSide, WireAutoDirection } from './globals.mjs';
 import { PlaceHolderCommands, SymbolDrawingCommands } from './draw_symbols.mjs';
 import { BaseVisitor } from './BaseVisitor.mjs';
 import { getPortType } from './utils.mjs';
@@ -118,7 +118,7 @@ export class ParserVisitor extends BaseVisitor {
             if (paramValue instanceof NumericValue) {
                 appendValue = paramValue.value;
             }
-            instanceName += '_' + appendValue;
+            instanceName += `${Delimiter1}${appendValue}`;
         }
         const arrange = properties.has('arrange') ?
             properties.get('arrange') : null;
@@ -446,15 +446,15 @@ export class ParserVisitor extends BaseVisitor {
     expandModuleContains(component, netNamespace) {
         this.getExecutor().log('expanding module `contains`');
         const executionStack = this.executionStack;
-        const resolveNet = this.createNetResolver(executionStack);
         const executor = this.getExecutor();
-        const executionContextName = executor.namespace + "_"
+        const executionContextName = executor.namespace + Delimiter1
             + component.instanceName
-            + '_' + component.moduleCounter;
-        const tmpNamespace = this.getNetNamespace(netNamespace, "+/" + component.instanceName + "_" + component.moduleCounter);
+            + Delimiter1 + component.moduleCounter;
+        const tmpNamespace = this.getNetNamespace(netNamespace, "+/" + component.instanceName + Delimiter1 + component.moduleCounter);
         const newExecutor = this.enterNewChildContext(executionStack, executor, executionContextName, { netNamespace: tmpNamespace }, [], []);
         component.moduleCounter += 1;
-        newExecutor.resolveNet = resolveNet;
+        newExecutor.resolveNet = this.createNetResolver(executionStack);
+        newExecutor.resolveComponentPinNet = this.createComponentPinNetResolver(executionStack);
         this.visit(component.moduleContainsExpressions);
         const executionContext = executionStack.pop();
         component.moduleExecutionContext = executionContext;
@@ -659,11 +659,13 @@ export class ParserVisitor extends BaseVisitor {
         const executionStack = this.executionStack;
         const functionCounter = { counter: 0 };
         const resolveNet = this.createNetResolver(this.executionStack);
+        const resolveComponentPinNet = this.createComponentPinNetResolver(this.executionStack);
         const __runFunc = (passedInParameters, options) => {
-            const executionContextName = functionName + '_' + functionCounter['counter'];
+            const executionContextName = `${functionName}-${functionCounter['counter']}`;
             const newExecutor = this.enterNewChildContext(executionStack, this.getExecutor(), executionContextName, options, funcDefinedParameters, passedInParameters);
             functionCounter['counter'] += 1;
             newExecutor.resolveNet = resolveNet;
+            newExecutor.resolveComponentPinNet = resolveComponentPinNet;
             const returnValue = this.runExpressions(newExecutor, ctx.function_expr());
             const lastExecution = executionStack.pop();
             const nextLastExecution = executionStack[executionStack.length - 1];

package/dist/types/BaseVisitor.d.ts

@@ -27,11 +27,12 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | Refe
     };
     constructor(silent: boolean | undefined, onErrorHandler: OnErrorCallback | null | undefined, currentDirectory: string | null, defaultLibsPath: string);
     getExecutor(): ExecutionContext;
-    protected setupPrintFunction(context: ExecutionContext): void;
+    protected setupBuiltInFunctions(context: ExecutionContext): void;
     createNetResolver(executionStack: ExecutionContext[]): (netName: string, netNamespace: string) => {
         found: boolean;
         net?: Net;
     };
+    createComponentPinNetResolver(executionStack: ExecutionContext[]): (component: ClassComponent, pin: number) => Net | null;
     log(...params: any[]): void;
     log2(message: string): void;
     visitScript: (ctx: ScriptContext) => void;

package/dist/types/draw_symbols.d.ts

@@ -101,12 +101,8 @@ export declare class SymbolCustom extends SymbolGraphic {
     _cacheRightPins: SymbolPinDefintion[];
     _cacheTopPins: SymbolPinDefintion[];
     _cacheBottomPins: SymbolPinDefintion[];
-    pinMaxPositions: {
-        [key: string]: number;
-    };
-    constructor(pinDefinition: SymbolPinDefintion[], pinMaxPositions: {
-        [key: string]: number;
-    });
+    pinMaxPositions: Map<string, number>;
+    constructor(pinDefinition: SymbolPinDefintion[], pinMaxPositions: Map<string, number>);
     generateDrawing(): void;
     private getPins;
     generateDrawingPins(drawing: SymbolDrawing, bodyWidthMM: NumericValue, bodyHeightMM: NumericValue, pins: {

package/dist/types/execute.d.ts

@@ -20,6 +20,7 @@ export declare class ExecutionContext {
         found: boolean;
         net?: Net;
     });
+    resolveComponentPinNet: (component: ClassComponent, pin: number) => Net | null;
     stopFurtherExpressions: boolean;
     returnValue: null;
     silent: boolean;
@@ -80,9 +81,7 @@ export declare class ExecutionContext {
 }
 export declare function getPortSide(pins: Map<number, PinDefinition>, arrangeProps: null | Map<string, number[]>): {
     pins: PortSideItem[];
-    maxPositions: {
-        [key: string]: number;
-    };
+    maxPositions: Map<string, number>;
 };
 type PortSideItem = {
     pinId: number;

package/dist/types/globals.d.ts

@@ -1,5 +1,7 @@
+export declare const Delimiter1 = "-";
+export declare const DoubleDelimiter1 = "--";
 export declare enum GlobalNames {
-    __root = "__root",
+    __root = "--root",
     symbol = "symbol"
 }
 export declare const NoNetText = "NO_NET";

package/dist/types/objects/ClassComponent.d.ts

@@ -12,9 +12,7 @@ export declare class ClassComponent {
     pins: Map<number, PinDefinition>;
     pinNets: Map<number, Net>;
     pinWires: Map<number, WireSegment[]>;
-    pinsMaxPositions: {
-        [key: string]: number;
-    };
+    pinsMaxPositions: Map<string, number>;
     _cachedPins: string;
     _cachedParams: string;
     _copyID?: number;

package/dist/types/objects/ExecutionScope.d.ts

@@ -25,8 +25,6 @@ export declare class ExecutionScope {
     currentPin: number | null;
     currentWireId: number;
     currentFrameId: number;
-    netGnd: Net | null;
-    componentGnd: ClassComponent | null;
     componentRoot: ClassComponent | null;
     copyIDs: Map<string, number>;
     sequence: SequenceItem[];
@@ -35,6 +33,7 @@ export declare class ExecutionScope {
     static create(): ExecutionScope;
     private findNet;
     getNetWithName(name: string): Net;
+    getNetWithNamespacePath(namespace: string, name: string): Net | null;
     hasNet(component: ClassComponent, pin: number): boolean;
     getNet(component: ClassComponent, pin: number): Net | null;
     setNet(component: ClassComponent, pin: number, net: Net): void;
@@ -51,7 +50,8 @@ export declare enum SequenceAction {
     At = "at",
     Wire = "wire",
     WireJump = "wire-jump",
-    Frame = "frame"
+    Frame = "frame",
+    Assign = "assign"
 }
 export declare enum FrameAction {
     Enter = "enter",
@@ -61,10 +61,13 @@ export declare enum ActiveObject {
     Frame = "frame",
     Wire = "wire"
 }
-export type SequenceItem = [
+export type SequenceActionAtTo = [
     SequenceAction.To | SequenceAction.At,
     ClassComponent,
-    number,
+    pinId: number,
     LayoutDirection?,
     string?
-] | [SequenceAction.Wire, wireId: number, WireSegment[]] | [SequenceAction.WireJump, wireId: number, pinId: number] | [SequenceAction.Frame, Frame, "enter" | "exit"];
+];
+export type SequenceActionWire = [SequenceAction.Wire, wireId: number, WireSegment[]];
+export type SequenceActionAssign = [SequenceAction.Assign, variable: string, ClassComponent];
+export type SequenceItem = SequenceActionAtTo | SequenceActionWire | [SequenceAction.WireJump, wireId: number, pinId: number] | [SequenceAction.Frame, Frame, "enter" | "exit"] | SequenceActionAssign;

package/dist/types/utils.d.ts

@@ -2,6 +2,8 @@ import { Big } from 'big.js';
 import { ParserRuleContext } from "antlr4ng";
 import { ClassComponent } from "./objects/ClassComponent";
 import { NumericValue } from "./objects/ParamDefinition";
+import { SequenceAction, SequenceItem } from './objects/ExecutionScope';
+import { BlockTypes } from './globals';
 export declare class SimpleStopwatch {
     startTime: Date;
     constructor();
@@ -36,3 +38,6 @@ export declare function getNumberExponentialText(value: number): string;
 export declare function resolveToNumericValue(value: Big): NumericValue;
 export declare function isPointWithinArea(point: [x: number, y: number], bounds: BoundBox2): boolean;
 export declare function areasOverlap(area1: BoundBox2, area2: BoundBox2): boolean;
+export declare function sequenceActionString(sequenceAction: SequenceAction): string;
+export declare function generateDebugSequenceAction(sequence: SequenceItem[]): string[];
+export declare function getBlockTypeString(type: BlockTypes): string;

package/libs/lib.cst

@@ -15,18 +15,8 @@ def net(net_name):
             priority: 10
 
 def supply(net_name):
-    return create component:
-        pins: 1
-        copy: true
-        angle: -90
-        display: create graphic (params):
-            hline: -50, 0, 100
-            vpin: 1, 0, 50, -50, display_pin_id=false
-            label: params.net_name, 0, -15, fontSize=50, anchor="middle"
-        type: "net"
-        params:
-            net_name: net_name
-            priority: 20
+    net_obj = net(net_name)
+    return net_obj
 
 def label(value, anchor="left"):
     return create component:
@@ -97,21 +87,21 @@ def cap(value):
             footprint: "Capacitor_SMD:C_0402_1005Metric"
 
 def ind(value):
-    width = 40
-    height = 20
+    width = 200
+    height = 100
 
     return create component:
         pins: 2
         type: "ind"
         display: create graphic (params):
-            arc: -15, 0, 5, 180, 360
-            arc: -5, 0, 5, 180, 360
-            arc: 5, 0, 5, 180, 360
-            arc: 15, 0, 5, 180, 360
-            hpin: 1, -width/2 - 20, 0, 20
-            hpin: 2, width/2 + 20, 0, -20
-            label: (params.refdes, -width/2, -height/2 -5 , fontSize=50, anchor="left")
-            label: (params.value, 0, 10, fontSize=50, anchor="middle", vanchor="middle")
+            arc: -75, 0, 25, 180, 360
+            arc: -25, 0, 25, 180, 360
+            arc: 25, 0, 25, 180, 360
+            arc: 75, 0, 25, 180, 360
+            hpin: 1, -width/2 - 100, 0, 100
+            hpin: 2, width/2 + 100, 0, -100
+            label: (params.refdes, -width/2, -height/2 - 25 , fontSize=50, anchor="left")
+            label: (params.value, 0, 50, fontSize=50, anchor="middle", vanchor="middle")
         params:
             value: value
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.1.3",
+    "version": "0.1.5",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -88,7 +88,7 @@
         "lodash": "^4.17.21",
         "pdfkit": "^0.15.1",
         "svg-to-pdfkit": "^0.1.8",
-        "svgdom": "^0.1.14",
+        "svgdom": "0.1.14",
         "this-file": "^2.0.3",
         "tslib": "~2.5",
         "ws": "^8.14.2"