circuitscript 0.2.0 → 0.3.1

package/dist/types/BaseVisitor.d.ts

@@ -4,7 +4,7 @@ import { ExecutionContext } from "./execute.js";
 import { Logger } from "./logger.js";
 import { ClassComponent } from "./objects/ClassComponent.js";
 import { Net } from "./objects/Net.js";
-import { CallableParameter, ComplexType, Direction, FunctionDefinedParameter, AnyReference, ImportedModule, NewContextOptions, ImportFunctionHandling as ImportFunctionHandling } from "./objects/types.js";
+import { CallableParameter, ComplexType, Direction, FunctionDefinedParameter, AnyReference, ImportedLibrary, NewContextOptions, ImportFunctionHandling as ImportFunctionHandling } from "./objects/types.js";
 import { CommonTokenStream, ParserRuleContext } from 'antlr4ng';
 import { ExecutionWarning } from "./utils.js";
 import { BaseError } from './utils.js';
@@ -26,7 +26,7 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | AnyR
     pinTypesList: string[];
     onErrorHandler: OnErrorHandler | null;
     environment: NodeScriptEnvironment;
-    protected importedFiles: ImportFile[];
+    protected importedFiles: ImportLibraryFile[];
     protected warnings: ExecutionWarning[];
     onImportFile: (visitor: BaseVisitor, filePath: string, fileData: string, onErrorHandler: OnErrorHandler) => Promise<ImportFileResult>;
     refdesFileAnnotations: Map<string, string>;
@@ -73,8 +73,8 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | AnyR
     protected linkComponentToCtx(ctx: ParserRuleContext, instance: ClassComponent, creationFlag?: boolean): void;
     getComponentCtxLinks(): Map<ParserRuleContext, ClassComponent>;
     visitResult(ctx: ParserRuleContext): any;
-    protected handleImportFile(name: string, importHandling: ImportFunctionHandling, throwErrors?: boolean, ctx?: ParserRuleContext | null, specificImports?: string[]): Promise<ImportFile>;
-    checkModuleHasRefdesFile(filePath: string): Promise<void>;
+    protected handleImportFile(name: string, importHandling: ImportFunctionHandling, throwErrors?: boolean, ctx?: ParserRuleContext | null, specificImports?: string[]): Promise<ImportLibraryFile>;
+    checkLibraryHasRefdesFile(filePath: string): Promise<void>;
     getRefdesFileAnnotation(filePath: string, startLine: number, startColumn: number, stopLine: number, stopColumn: number): string;
     visitRoundedBracketsExpr: (ctx: RoundedBracketsExprContext) => void;
     protected setupDefinedParameters(funcDefinedParameters: FunctionDefinedParameter[], passedInParameters: CallableParameter[], executor: ExecutionContext): void;
@@ -94,12 +94,12 @@ export declare class BaseVisitor extends CircuitScriptVisitor<ComplexType | AnyR
     getCurrentFile(): string;
 }
 export type OnErrorHandler = (message: string, context: ParserRuleContext, e?: any) => void;
-type ImportFile = {
+type ImportLibraryFile = {
     id: string;
     hasError: boolean;
     hasParseError: boolean;
     pathExists: boolean;
-    importedModule: ImportedModule;
+    importedLibrary: ImportedLibrary;
 };
 export type ImportFileResult = {
     hasError: boolean;

package/dist/types/antlr/CircuitScriptParser.d.ts

@@ -895,7 +895,7 @@ export declare class Import_exprContext extends antlr.ParserRuleContext {
     copyFrom(ctx: Import_exprContext): void;
 }
 export declare class Import_specificContext extends Import_exprContext {
-    _moduleName?: Token | null;
+    _libraryName?: Token | null;
     _ID?: Token | null;
     _funcNames: antlr.Token[];
     constructor(ctx: Import_exprContext);
@@ -907,7 +907,7 @@ export declare class Import_specificContext extends Import_exprContext {
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
 export declare class Import_all_simpleContext extends Import_exprContext {
-    _moduleName?: Token | null;
+    _libraryName?: Token | null;
     constructor(ctx: Import_exprContext);
     From(): antlr.TerminalNode;
     Import(): antlr.TerminalNode;
@@ -917,7 +917,7 @@ export declare class Import_all_simpleContext extends Import_exprContext {
     accept<Result>(visitor: CircuitScriptVisitor<Result>): Result | null;
 }
 export declare class Import_simpleContext extends Import_exprContext {
-    _moduleName?: Token | null;
+    _libraryName?: Token | null;
     constructor(ctx: Import_exprContext);
     Import(): antlr.TerminalNode;
     ID(): antlr.TerminalNode;

package/dist/types/globals.d.ts

@@ -76,7 +76,8 @@ export declare enum ComponentTypes {
     net = "net",
     graphic = "graphic",
     port = "port",
-    module = "module"
+    module = "module",
+    resistor = "res"
 }
 export declare enum ReferenceTypes {
     function = "function",
@@ -84,7 +85,7 @@ export declare enum ReferenceTypes {
     variable = "variable",
     instance = "instance",
     pinType = "pinType",
-    module = "module",
+    library = "library",
     unknown = "unknown"
 }
 export declare enum BlockTypes {

package/dist/types/helpers.d.ts

@@ -11,7 +11,7 @@ export type SVGWindow = any;
 import { NumericValue } from "./objects/ParamDefinition.js";
 import { NodeScriptEnvironment } from "./environment.js";
 import { ClassComponent } from "./objects/ClassComponent.js";
-import { ImportedModule } from "./objects/types.js";
+import { ImportedLibrary } from "./objects/types.js";
 export declare enum JSModuleType {
     CommonJs = "cjs",
     ESM = "mjs"
@@ -47,7 +47,7 @@ type RenderScriptReturn = {
     errors: BaseError[];
 };
 export declare function renderScript(scriptData: string, outputPath: string | null, options: ScriptOptions): Promise<RenderScriptReturn>;
-export declare function renderScriptCustom(scriptData: string, outputPath: string | null, options: ScriptOptions, parseHandlers: ParseOutputHandler[], postAnnotationCallbacks: ((options: ScriptOptions, scriptData: string, tree: ScriptContext, tokens: CommonTokenStream, componentLinks: Map<ParserRuleContext, ClassComponent>, importedModule: ImportedModule[], environment: NodeScriptEnvironment) => void)[]): Promise<RenderScriptReturn>;
+export declare function renderScriptCustom(scriptData: string, outputPath: string | null, options: ScriptOptions, parseHandlers: ParseOutputHandler[], postAnnotationCallbacks: ((options: ScriptOptions, scriptData: string, tree: ScriptContext, tokens: CommonTokenStream, componentLinks: Map<ParserRuleContext, ClassComponent>, importedLibraries: ImportedLibrary[], environment: NodeScriptEnvironment) => void)[]): Promise<RenderScriptReturn>;
 export declare abstract class ParseOutputHandler {
     beforeRender: boolean;
     afterRender: boolean;

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

@@ -1,6 +1,6 @@
 import { ClassComponent } from './ClassComponent.js';
 import { Net } from './Net.js';
-import { CFunction, CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ImportedModule, ParseSymbolType, ValueType } from './types.js';
+import { CFunction, CFunctionEntry, ComponentPinNet, ComponentPinNetPair, ComponentPinWireId, ImportedLibrary, ParseSymbolType, ValueType } from './types.js';
 import { BlockTypes, LayoutDirection } from '../globals.js';
 import { Wire, WireSegment } from './Wire.js';
 import { Frame } from './Frame.js';
@@ -19,7 +19,7 @@ export declare class ExecutionScope {
     symbols: Map<string, {
         type: ParseSymbolType;
     }>;
-    modules: Map<string, ImportedModule>;
+    libraries: Map<string, ImportedLibrary>;
     blockStack: Map<number, BlockStackEntry>;
     contextStack: ParserRuleContext[];
     onPropertyHandler: OnPropertyHandler[];

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

@@ -108,32 +108,22 @@ export declare enum Direction {
     Down = "down",
     Up = "up"
 }
-export declare enum TypeProps {
-    Net = "net",
-    Port = "port",
-    Graphic = "graphic",
-    Module = "module",
-    Resistor = "res",
-    Capacitor = "cap",
-    Inductor = "ind",
-    Diode = "diode"
-}
 export declare enum NetTypes {
     Any = "any",
     Source = "source"
 }
-export declare class ImportedModule {
-    moduleName: string;
+export declare class ImportedLibrary {
+    libraryName: string;
     context: ExecutionContext;
     importHandlingFlag: ImportFunctionHandling;
     specifiedImports: string[];
-    moduleNamespace: string;
-    moduleFilePath: string;
+    libraryNamespace: string;
+    libraryFilePath: string;
     enableRefdesAnnotation: boolean;
     enableRefdesAnnotationFile: boolean;
     tree: ScriptContext;
     tokens: CommonTokenStream;
-    constructor(moduleName: string, moduleNamespace: string, moduleFilePath: string, tree: ScriptContext, tokens: CommonTokenStream, context: ExecutionContext, flag: ImportFunctionHandling, specifiedImports: string[]);
+    constructor(libraryName: string, libraryNamespace: string, libraryFilePath: string, tree: ScriptContext, tokens: CommonTokenStream, context: ExecutionContext, flag: ImportFunctionHandling, specifiedImports: string[]);
 }
 export declare enum ImportFunctionHandling {
     AllWithNamespace = "all-with-namespace",

package/dist/types/validate/SymbolValidatorVisitor.d.ts

@@ -16,7 +16,7 @@ export declare class SymbolValidatorVisitor extends BaseVisitor {
     visitImport_simple: (ctx: Import_simpleContext) => Promise<void>;
     visitImport_all_simple: (ctx: Import_all_simpleContext) => Promise<void>;
     visitImport_specific: (ctx: Import_specificContext) => Promise<void>;
-    private applyModuleImports;
+    private applyLibraryImports;
     visitAssignment_expr: (ctx: Assignment_exprContext) => ComplexType;
     visitAtom_expr: (ctx: Atom_exprContext) => void;
     visitFunction_call_expr: (ctx: Function_call_exprContext) => void;

package/dist/types/visitor.d.ts

@@ -75,7 +75,7 @@ export declare class ParserVisitor extends BaseVisitor {
     visitPart_value_expr: (ctx: Part_value_exprContext) => void;
     visitPart_condition_expr: (ctx: Part_condition_exprContext) => void;
     visitPart_condition_key_only_expr: (ctx: Part_condition_key_only_exprContext) => void;
-    checkModuleHasRefdesFile(filePath: string): Promise<void>;
+    checkLibraryHasRefdesFile(filePath: string): Promise<void>;
     private resolveDataExpr;
     private resolveDataValue;
     pinTypes: PinTypes[];

package/libs/std.cst

@@ -428,4 +428,5 @@ def sheet_A6(revision="V1"):
     return tmp_sheet
 
 document.sheet_type = sheet_A4()
-document.bom.columns = ["refdes", "mpn", "manufacturer", "footprint"]
+document.bom.columns = ["refdes", "mpn", "manufacturer", "footprint"]
+document.bom.group_by = ["mpn", "manufacturer"]

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.2.0",
+    "version": "0.3.1",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {