circuitscript 0.1.16 → 0.1.17

package/dist/types/execute.d.ts

@@ -4,7 +4,7 @@ import { ClassComponent } from './objects/ClassComponent.js';
 import { ExecutionScope } from './objects/ExecutionScope.js';
 import { Net } from './objects/Net.js';
 import { NumericValue, ParamDefinition } from './objects/ParamDefinition.js';
-import { PinDefinition } from './objects/PinDefinition.js';
+import { PinDefinition, PinId } from './objects/PinDefinition.js';
 import { AnyReference, CFunction, CFunctionEntry, CFunctionResult, CallableParameter, ComponentPin } from './objects/types.js';
 import { Logger } from './logger.js';
 import { UnitDimension } from './helpers.js';
@@ -21,7 +21,7 @@ export declare class ExecutionContext {
         found: boolean;
         net?: Net;
     });
-    resolveComponentPinNet: (component: ClassComponent, pin: number) => Net | null;
+    resolveComponentPinNet: (component: ClassComponent, pin: PinId) => Net | null;
     stopFurtherExpressions: boolean;
     returnValue: null;
     silent: boolean;
@@ -40,7 +40,7 @@ export declare class ExecutionContext {
     private linkComponentPinNet;
     private mergeNets;
     createComponent(instanceName: string, pins: PinDefinition[], params: ParamDefinition[], props: {
-        arrange?: Map<string, number[]>;
+        arrange?: Map<string, PinId[]>;
         display?: SymbolDrawingCommands;
         type?: string;
         width?: number;
@@ -52,11 +52,11 @@ export declare class ExecutionContext {
     private removeArrangePropDuplicates;
     private getArrangePropPins;
     printPoint(extra?: string): void;
-    addComponentExisting(component: ClassComponent, pin: number): ComponentPin;
+    addComponentExisting(component: ClassComponent, pin: PinId): ComponentPin;
     toComponent(component: ClassComponent, pinId: number | null, options?: {
         addSequence?: boolean;
     }): ComponentPin;
-    atComponent(component: ClassComponent, pinId: number | null, options?: {
+    atComponent(component: ClassComponent, pinId: PinId | null, options?: {
         addSequence?: boolean;
     }): ComponentPin;
     copyComponent(component: ClassComponent): ClassComponent;
@@ -86,12 +86,12 @@ export declare class ExecutionContext {
     enterFrame(frameType: FrameType): number;
     exitFrame(frameId: number): void;
 }
-export declare function getPortSide(pins: Map<number, PinDefinition>, arrangeProps: null | Map<string, number[]>): {
+export declare function getPortSide(pins: Map<PinId, PinDefinition>, arrangeProps: null | Map<string, number[]>): {
     pins: PortSideItem[];
     maxPositions: Map<string, number>;
 };
 type PortSideItem = {
-    pinId: number;
+    pinId: PinId;
     side: string;
     order: number;
     position: number;

package/dist/types/globals.d.ts

@@ -9,6 +9,7 @@ export declare const NoNetText = "NO_NET";
 export declare enum ParamKeys {
     priority = "priority",
     net_name = "net_name",
+    net_type = "net_type",
     flip = "flip",
     flipX = "flipX",
     flipY = "flipY",

package/dist/types/graph.d.ts

@@ -6,10 +6,11 @@ import { SequenceItem } from "./objects/ExecutionScope.js";
 import { Net } from "./objects/Net.js";
 import { Logger } from "./logger.js";
 import { ComponentPinNetPair } from "./objects/types.js";
+import { PinId } from "./objects/PinDefinition.js";
 export declare class NetGraph {
     logger: Logger;
     constructor(logger: Logger);
-    generateLayoutGraph(sequence: SequenceItem[], nets: [ClassComponent, pin: number, net: Net][]): {
+    generateLayoutGraph(sequence: SequenceItem[], nets: [ClassComponent, pin: PinId, net: Net][]): {
         graph: Graph;
         containerFrames: RenderFrame[];
     };

package/dist/types/layout.d.ts

@@ -8,6 +8,7 @@ import { Logger } from './logger.js';
 import { Frame, FramePlotDirection } from './objects/Frame.js';
 import { BoundBox } from './utils.js';
 import { ComponentPinNetPair } from './objects/types.js';
+import { PinId } from './objects/PinDefinition.js';
 import { NumericValue } from './objects/ParamDefinition.js';
 export declare class LayoutEngine {
     logger: Logger;
@@ -35,7 +36,7 @@ export declare class LayoutEngine {
     private placeSubgraphV2;
     mergeOriginNodes(node1: RenderItem, pin1: number, node2: RenderItem, pin2: number, originNode1: string, originNode2: string, originNodes: RenderItem[], originNodeGroups: Map<string, RenderItem[]>): void;
     translateNodeBy(offsetX: number, offsetY: number, item: RenderItem): void;
-    placeNodeAtPosition(fromX: NumericValue, fromY: NumericValue, item: RenderItem, pin: number, depth?: number): void;
+    placeNodeAtPosition(fromX: NumericValue, fromY: NumericValue, item: RenderItem, pin: PinId, depth?: number): void;
     placeFloatingItems(graph: Graph, item: RenderItem, depth?: number): void;
     printWarnings(): void;
 }

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

@@ -9,8 +9,8 @@ export declare class ClassComponent {
     instanceName: string;
     numPins: number;
     parameters: Map<string, number | string | NumericValue>;
-    pins: Map<number, PinDefinition>;
-    pinNets: Map<number, Net>;
+    pins: Map<PinId, PinDefinition>;
+    pinNets: Map<PinId, Net>;
     pinWires: Map<number, WireSegment[]>;
     pinsMaxPositions: Map<string, number>;
     _cachedPins: string;
@@ -18,8 +18,8 @@ export declare class ClassComponent {
     _copyID?: number;
     _copyFrom?: ClassComponent;
     _pointLinkComponent?: ClassComponent;
-    _unplacedPins: number[];
-    arrangeProps: Map<string, NumericValue[]> | null;
+    _unplacedPins: PinId[];
+    arrangeProps: Map<string, PinId[]> | null;
     displayProp: SymbolDrawingCommands | null;
     widthProp: number | null;
     heightProp: number | null;
@@ -33,10 +33,10 @@ export declare class ClassComponent {
     assignedRefDes: string | null;
     constructor(instanceName: string, numPins: number);
     setupPins(): void;
-    getDefaultPin(): number;
-    hasPin(pinId: number | string): boolean;
-    getPin(pinId: number | string): PinId;
-    getNextPinAfter(pinIndex: number): number;
+    getDefaultPin(): PinId;
+    hasPin(pinId: PinId): boolean;
+    getPin(pinId: PinId): PinId;
+    getNextPinAfter(pinIndex: PinId): PinId;
     setParam(key: string, value: number | string | NumericValue): void;
     hasParam(key: string): boolean;
     private refreshParamCache;

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

@@ -6,6 +6,7 @@ import { Wire, WireSegment } from './Wire.js';
 import { Frame } from './Frame.js';
 import { ParserRuleContext } from 'antlr4ng';
 import { BaseVisitor } from 'src/BaseVisitor.js';
+import { PinId } from './PinDefinition.js';
 type OnPropertyHandler = (path: PropertyTreeKey[], value: any, valueContext: ParserRuleContext) => void;
 export type PropertyTreeKey = [ctx: ParserRuleContext, value: any] | ['index', number];
 export declare class ExecutionScope {
@@ -39,10 +40,10 @@ export declare class 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;
-    removeNet(component: ClassComponent, pin: number): void;
+    hasNet(component: ClassComponent, pin: PinId): boolean;
+    getNet(component: ClassComponent, pin: PinId): Net | null;
+    setNet(component: ClassComponent, pin: PinId, net: Net): void;
+    removeNet(component: ClassComponent, pin: PinId): void;
     getNets(): ComponentPinNetPair[];
     dumpNets(): ComponentPinNet[];
     printNets(): void;

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

@@ -3,9 +3,9 @@ export declare class Net {
     baseName: string;
     namespace: string;
     priority: number;
-    type: any;
+    type: string;
     params: Map<string, any>;
-    constructor(namespace: string, name: string, priority?: number, type?: any);
+    constructor(namespace: string, name: string, priority?: number, type?: string);
     toString(): string;
     static isSame(netA: Net, netB: Net): boolean;
 }

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

@@ -1,5 +1,18 @@
+import { NumericValue } from './ParamDefinition.js';
 import { PinTypes } from './PinTypes.js';
-export type PinId = number | string;
+export declare class PinId {
+    private value;
+    private type;
+    constructor(value: number | string);
+    getValue(): number | string;
+    getType(): PinIdType;
+    isNumeric(): boolean;
+    isString(): boolean;
+    toString(): string;
+    equals(other: PinId | number | string): boolean;
+    static from(value: number | string | NumericValue): PinId;
+    static isPinIdType(value: number | string): boolean;
+}
 export declare class PinDefinition {
     id: PinId;
     idType: PinIdType;
@@ -8,7 +21,7 @@ export declare class PinDefinition {
     altNames: string[];
     side: string;
     position: number;
-    constructor(id: PinId, idType: PinIdType, name: string, pinType?: PinTypes, altNames?: never[]);
+    constructor(id: PinId | number | string, idType: PinIdType, name: string, pinType?: PinTypes, altNames?: never[]);
 }
 export declare enum PinIdType {
     Int = "int",
@@ -20,3 +33,5 @@ export declare enum PortSide {
     SOUTH = "SOUTH",
     NORTH = "NORTH"
 }
+export declare function isPinId(item: any): boolean;
+export declare function getPinDefinition(map: Map<PinId, PinDefinition>, id: PinId): PinDefinition;

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

@@ -4,6 +4,7 @@ import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
 import { NumericValue, PercentageValue } from './ParamDefinition.js';
 import { ReferenceTypes } from '../globals.js';
+import { PinId } from './PinDefinition.js';
 export type CFunction = (args: CallableParameter[], options?: CFunctionOptions) => CFunctionResult;
 export declare class CFunctionEntry {
     name: string;
@@ -27,7 +28,7 @@ export type ComponentPinNet = [
 ];
 export type ComponentPinNetPair = [
     component: ClassComponent,
-    pin: number,
+    pin: PinId,
     net: Net
 ];
 export type ComponentPinWireId = [
@@ -95,3 +96,16 @@ export declare enum Direction {
     Down = "down",
     Up = "up"
 }
+export declare enum TypeProps {
+    Net = "net",
+    Port = "port",
+    Graphic = "graphic",
+    Resistor = "res",
+    Capacitor = "cap",
+    Inductor = "ind",
+    Diode = "diode"
+}
+export declare enum NetTypes {
+    Any = "any",
+    Source = "source"
+}

package/libs/std.cst

@@ -1,6 +1,6 @@
 # Circuitscript default lib
 
-def net(net_name):
+def net(net_name, net_type = "any"):
     return create component:
         pins: 1
         copy: true
@@ -13,9 +13,10 @@ def net(net_name):
         params:
             net_name: net_name
             priority: 10
+            net_type: net_type
 
 def supply(net_name):
-    net_obj = net(net_name)
+    net_obj = net(net_name, "source")
     return net_obj
 
 def label(value, anchor="left"):

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.1.16",
+    "version": "0.1.17",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {
@@ -88,6 +88,7 @@
         "express": "^4.18.2",
         "figlet": "^1.7.0",
         "lodash": "^4.17.21",
+        "ml-matrix": "^6.12.1",
         "pdfkit": "^0.15.1",
         "svg-to-pdfkit": "^0.1.8",
         "svgdom": "^0.1.22",