circuitscript 0.1.27 → 0.1.29

package/dist/cjs/BaseVisitor.js

@@ -427,9 +427,15 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             const innerResult = this.getResult(ctxDataExpr);
             this.setResult(ctx, innerResult);
         };
+        this.silent = silent;
         this.logger = new logger_js_1.Logger();
         this.onErrorHandler = onErrorHandler;
         this.environment = environment;
+        this.log('-- Environment --');
+        this.log('Module directory: ' + environment.getModuleDirectory());
+        this.log('Default libs path: ' + environment.getDefaultLibsPath());
+        this.log('Current file: ' + environment.getCurrentFile());
+        this.log('-----------------');
         this.startingContext = new execute_js_1.ExecutionContext(globals_js_1.DoubleDelimiter1, `${globals_js_1.DoubleDelimiter1}.`, '/', 0, 0, silent, this.logger, this.warnings, null);
         const scope = this.startingContext.scope;
         scope.sequence.push([
@@ -618,7 +624,7 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
         let hasError = false;
         let hasParseError = false;
         let pathExists = false;
-        const tmpFilePath = this.environment.getRelativeToModule(name + ".cst");
+        const tmpFilePath = this.environment.getRelativeToCurrentFolder(name + ".cst");
         this.log('importing path:', tmpFilePath);
         let fileData = null;
         let filePathUsed = null;
@@ -628,16 +634,19 @@ class BaseVisitor extends CircuitScriptVisitor_js_1.CircuitScriptVisitor {
             pathExists = true;
         }
         catch (err) {
+            this.log('failed to read file');
             pathExists = false;
         }
         if (!pathExists) {
             try {
                 const tmpFilePath2 = this.environment.getRelativeToDefaultLibs(name + ".cst");
+                this.log('checking default libs: ' + tmpFilePath2);
                 filePathUsed = tmpFilePath2;
                 fileData = await this.environment.readFile(tmpFilePath2, { encoding: 'utf8' });
                 pathExists = true;
             }
             catch (err) {
+                this.log('failed to read file');
                 pathExists = false;
             }
         }

package/dist/cjs/SemanticTokenVisitor.js

@@ -10,6 +10,16 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
         super(silent, onErrorHandler, environment);
         this.parsedTokens = [];
         this.semanticTokens = new Map();
+        this.visitScript = async (ctx) => {
+            this.log('===', 'start', '===');
+            ctx.import_expr().forEach(ctxImport => {
+                this.visit(ctxImport);
+            });
+            const result = this.runExpressions(this.getExecutor(), ctx.expression());
+            this.setResult(ctx, result);
+            this.getExecutor().closeOpenPathBlocks();
+            this.log('===', 'end', '===');
+        };
         this.visitFunction_args_expr = (ctx) => {
             const IDs = ctx.ID();
             IDs.map(id => {
@@ -97,6 +107,10 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.addSemanticToken(ctx.ID(0), [], 'variable');
             }
         };
+        this.visitOperator_assignment_expr = (ctx) => {
+            this.visit(ctx.atom_expr());
+            this.visit(ctx.data_expr());
+        };
         this.visitImport_expr = (ctx) => {
             this.addSemanticToken(ctx.ID(), [], 'namespace');
         };
@@ -104,13 +118,19 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
             ctx.ID().forEach(item => {
                 this.addSemanticToken(item, [], 'variable');
             });
+            this.visit(ctx.data_expr());
+            this.visit(ctx.expressions_block());
+        };
+        this.visitAnnotation_comment_expr = (ctx) => {
+            this.addSemanticToken(ctx.ANNOTATION_START(), [], 'comment');
+            this.addSemanticToken(ctx.ID(), [], 'comment');
         };
         this.lexer = lexer;
         this.script = script;
     }
     addSemanticToken(node, modifiers, tokenType = null) {
         const parsedToken = this.parseToken(node, modifiers, tokenType);
-        this.semanticTokens.set(parsedToken.line + "_" + parsedToken.column, parsedToken);
+        this.semanticTokens.set(`${parsedToken.line}_${parsedToken.column}_${parsedToken.length}`, parsedToken);
     }
     parseToken(node, modifiers, tokenType = null) {
         const token = node.symbol;

package/dist/cjs/environment.js

@@ -13,6 +13,7 @@ class NodeScriptEnvironment {
     constructor() {
         this.useModuleDirectoryPath = null;
         this.useDefaultLibsPath = null;
+        this.currentFile = '';
         this.globalCreateSVGWindow = null;
         this.cachedVersion = null;
         this.supportedFonts = {
@@ -118,6 +119,22 @@ class NodeScriptEnvironment {
     async readFile(path, options) {
         return fs_1.default.promises.readFile(path, options);
     }
+    getAbsolutePath(filePath) {
+        return path_1.default.resolve(filePath);
+    }
+    getDirPath(filePath) {
+        return path_1.default.dirname(path_1.default.resolve(filePath));
+    }
+    setCurrentFile(filePath) {
+        this.currentFile = this.getAbsolutePath(filePath);
+        return this.currentFile;
+    }
+    getCurrentFile() {
+        return this.currentFile;
+    }
+    getRelativeToCurrentFolder(filePath) {
+        return path_1.default.join(this.getDirPath(this.currentFile), filePath);
+    }
     async exists(path) {
         try {
             fs_1.default.promises.access(path, fs_1.default.constants.F_OK);

package/dist/cjs/execute.js

@@ -175,8 +175,8 @@ class ExecutionContext {
             paramsMap.set(param.paramName, param.paramValue);
         });
         if (component.typeProp === globals_js_1.ComponentTypes.net) {
-            const netName = paramsMap.get(globals_js_1.ParamKeys.net_name);
-            const netType = paramsMap.get(globals_js_1.ParamKeys.net_type);
+            const netName = paramsMap.get(globals_js_1.ParamKeys.net_name) ?? this.getUniqueNetName();
+            const netType = paramsMap.get(globals_js_1.ParamKeys.net_type) ?? types_js_1.NetTypes.Any;
             let priority = 0;
             if (paramsMap.has(globals_js_1.ParamKeys.priority)) {
                 priority = paramsMap.get(globals_js_1.ParamKeys.priority).toNumber();

package/dist/cjs/helpers.js

@@ -82,7 +82,7 @@ async function getSemanticTokens(scriptData, options) {
     const parsedTokens = (0, SemanticTokenVisitor_js_1.prepareTokens)(tokens.getTokens(), lexer, scriptData);
     const finalParsedTokens = [];
     parsedTokens.forEach(token => {
-        const location = `${token.line}_${token.column}`;
+        const location = `${token.line}_${token.column}_${token.length}`;
         if (semanticTokens.has(location)) {
             finalParsedTokens.push(semanticTokens.get(location));
         }
@@ -187,7 +187,7 @@ async function renderScript(scriptData, outputPath, options) {
 }
 exports.renderScript = renderScript;
 async function renderScriptCustom(scriptData, outputPath, options, parseHandlers, postAnnotationCallbacks) {
-    const { dumpNets = false, dumpData = false, showStats = false, enableErc = false, enableBom = false, bomOutputPath = undefined, environment } = options;
+    const { dumpNets = false, dumpData = false, showStats = false, enableErc = false, enableBom = false, inputPath = '', bomOutputPath = undefined, environment } = options;
     const errors = [];
     const onErrorHandler = (message, context, error) => {
         if (error && error instanceof utils_js_1.RuntimeExecutionError) {
@@ -214,7 +214,8 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
             errors.push(new utils_js_1.ParseError(message, context.start, context.stop));
         }
     };
-    const visitor = new visitor_js_1.ParserVisitor(true, onErrorHandler, options.environment);
+    environment.setCurrentFile(inputPath);
+    const visitor = new visitor_js_1.ParserVisitor(true, onErrorHandler, environment);
     visitor.onImportFile = async (visitor, filePath, fileData) => {
         const { hasError, hasParseError } = await (0, parser_js_1.parseFileWithVisitor)(visitor, fileData);
         if (hasError || hasParseError) {

package/dist/cjs/validate.js

@@ -70,6 +70,7 @@ async function validate() {
     const visitor = await (0, helpers_js_1.validateScript)(inputFilePath, scriptData, scriptOptions);
     const symbols = visitor.getSymbols().getSymbols();
     const undefinedSymbols = [];
+    console.log('----- symbols -----');
     symbols.forEach((value, key) => {
         if (value.type !== types_js_1.ParseSymbolType.Undefined) {
             value = value;
@@ -83,7 +84,9 @@ async function validate() {
             undefinedSymbols.push(value);
         }
     });
+    console.log('----- tokens -----');
     const { parsedTokens } = await (0, helpers_js_1.getSemanticTokens)(scriptData, scriptOptions);
+    console.log('----- dump tokens -----');
     parsedTokens.forEach(item => {
         const { line, column, tokenType, tokenModifiers, textValue } = item;
         console.log(`${line}:${column} - ${textValue} - ${tokenType} | ${tokenModifiers.join(',')}`);

package/dist/esm/BaseVisitor.js

@@ -40,9 +40,15 @@ export class BaseVisitor extends CircuitScriptVisitor {
     };
     constructor(silent = false, onErrorHandler = null, environment) {
         super();
+        this.silent = silent;
         this.logger = new Logger();
         this.onErrorHandler = onErrorHandler;
         this.environment = environment;
+        this.log('-- Environment --');
+        this.log('Module directory: ' + environment.getModuleDirectory());
+        this.log('Default libs path: ' + environment.getDefaultLibsPath());
+        this.log('Current file: ' + environment.getCurrentFile());
+        this.log('-----------------');
         this.startingContext = new ExecutionContext(DoubleDelimiter1, `${DoubleDelimiter1}.`, '/', 0, 0, silent, this.logger, this.warnings, null);
         const scope = this.startingContext.scope;
         scope.sequence.push([
@@ -613,7 +619,7 @@ export class BaseVisitor extends CircuitScriptVisitor {
         let hasError = false;
         let hasParseError = false;
         let pathExists = false;
-        const tmpFilePath = this.environment.getRelativeToModule(name + ".cst");
+        const tmpFilePath = this.environment.getRelativeToCurrentFolder(name + ".cst");
         this.log('importing path:', tmpFilePath);
         let fileData = null;
         let filePathUsed = null;
@@ -623,16 +629,19 @@ export class BaseVisitor extends CircuitScriptVisitor {
             pathExists = true;
         }
         catch (err) {
+            this.log('failed to read file');
             pathExists = false;
         }
         if (!pathExists) {
             try {
                 const tmpFilePath2 = this.environment.getRelativeToDefaultLibs(name + ".cst");
+                this.log('checking default libs: ' + tmpFilePath2);
                 filePathUsed = tmpFilePath2;
                 fileData = await this.environment.readFile(tmpFilePath2, { encoding: 'utf8' });
                 pathExists = true;
             }
             catch (err) {
+                this.log('failed to read file');
                 pathExists = false;
             }
         }

package/dist/esm/SemanticTokenVisitor.js

@@ -12,6 +12,16 @@ export class SemanticTokensVisitor extends BaseVisitor {
         this.lexer = lexer;
         this.script = script;
     }
+    visitScript = async (ctx) => {
+        this.log('===', 'start', '===');
+        ctx.import_expr().forEach(ctxImport => {
+            this.visit(ctxImport);
+        });
+        const result = this.runExpressions(this.getExecutor(), ctx.expression());
+        this.setResult(ctx, result);
+        this.getExecutor().closeOpenPathBlocks();
+        this.log('===', 'end', '===');
+    };
     visitFunction_args_expr = (ctx) => {
         const IDs = ctx.ID();
         IDs.map(id => {
@@ -99,6 +109,10 @@ export class SemanticTokensVisitor extends BaseVisitor {
             this.addSemanticToken(ctx.ID(0), [], 'variable');
         }
     };
+    visitOperator_assignment_expr = (ctx) => {
+        this.visit(ctx.atom_expr());
+        this.visit(ctx.data_expr());
+    };
     visitImport_expr = (ctx) => {
         this.addSemanticToken(ctx.ID(), [], 'namespace');
     };
@@ -106,10 +120,16 @@ export class SemanticTokensVisitor extends BaseVisitor {
         ctx.ID().forEach(item => {
             this.addSemanticToken(item, [], 'variable');
         });
+        this.visit(ctx.data_expr());
+        this.visit(ctx.expressions_block());
+    };
+    visitAnnotation_comment_expr = (ctx) => {
+        this.addSemanticToken(ctx.ANNOTATION_START(), [], 'comment');
+        this.addSemanticToken(ctx.ID(), [], 'comment');
     };
     addSemanticToken(node, modifiers, tokenType = null) {
         const parsedToken = this.parseToken(node, modifiers, tokenType);
-        this.semanticTokens.set(parsedToken.line + "_" + parsedToken.column, parsedToken);
+        this.semanticTokens.set(`${parsedToken.line}_${parsedToken.column}_${parsedToken.length}`, parsedToken);
     }
     parseToken(node, modifiers, tokenType = null) {
         const token = node.symbol;

package/dist/esm/environment.js

@@ -13,6 +13,7 @@ export class NodeScriptEnvironment {
     }
     useModuleDirectoryPath = null;
     useDefaultLibsPath = null;
+    currentFile = '';
     globalCreateSVGWindow = null;
     cachedVersion = null;
     supportedFonts = {
@@ -112,6 +113,22 @@ export class NodeScriptEnvironment {
     async readFile(path, options) {
         return fs.promises.readFile(path, options);
     }
+    getAbsolutePath(filePath) {
+        return path.resolve(filePath);
+    }
+    getDirPath(filePath) {
+        return path.dirname(path.resolve(filePath));
+    }
+    setCurrentFile(filePath) {
+        this.currentFile = this.getAbsolutePath(filePath);
+        return this.currentFile;
+    }
+    getCurrentFile() {
+        return this.currentFile;
+    }
+    getRelativeToCurrentFolder(filePath) {
+        return path.join(this.getDirPath(this.currentFile), filePath);
+    }
     async exists(path) {
         try {
             fs.promises.access(path, fs.constants.F_OK);

package/dist/esm/execute.js

@@ -4,7 +4,7 @@ import { ActiveObject, ExecutionScope, FrameAction, SequenceAction } from './obj
 import { Net } from './objects/Net.js';
 import { numeric, NumericValue } from './objects/ParamDefinition.js';
 import { PinId, PortSide } from './objects/PinDefinition.js';
-import { AnyReference, CFunctionEntry, DeclaredReference, Direction } from './objects/types.js';
+import { AnyReference, CFunctionEntry, DeclaredReference, Direction, NetTypes } from './objects/types.js';
 import { Wire } from './objects/Wire.js';
 import { Frame } from './objects/Frame.js';
 import { CalculatePinPositions } from './layout.js';
@@ -180,8 +180,8 @@ export class ExecutionContext {
             paramsMap.set(param.paramName, param.paramValue);
         });
         if (component.typeProp === ComponentTypes.net) {
-            const netName = paramsMap.get(ParamKeys.net_name);
-            const netType = paramsMap.get(ParamKeys.net_type);
+            const netName = paramsMap.get(ParamKeys.net_name) ?? this.getUniqueNetName();
+            const netType = paramsMap.get(ParamKeys.net_type) ?? NetTypes.Any;
             let priority = 0;
             if (paramsMap.has(ParamKeys.priority)) {
                 priority = paramsMap.get(ParamKeys.priority).toNumber();

package/dist/esm/helpers.js

@@ -75,7 +75,7 @@ export async function getSemanticTokens(scriptData, options) {
     const parsedTokens = prepareTokens(tokens.getTokens(), lexer, scriptData);
     const finalParsedTokens = [];
     parsedTokens.forEach(token => {
-        const location = `${token.line}_${token.column}`;
+        const location = `${token.line}_${token.column}_${token.length}`;
         if (semanticTokens.has(location)) {
             finalParsedTokens.push(semanticTokens.get(location));
         }
@@ -176,7 +176,7 @@ export async function renderScript(scriptData, outputPath, options) {
     return renderScriptCustom(scriptData, outputPath, options, parseHandlers, [DefaultPostAnnotationCallback]);
 }
 export async function renderScriptCustom(scriptData, outputPath, options, parseHandlers, postAnnotationCallbacks) {
-    const { dumpNets = false, dumpData = false, showStats = false, enableErc = false, enableBom = false, bomOutputPath = undefined, environment } = options;
+    const { dumpNets = false, dumpData = false, showStats = false, enableErc = false, enableBom = false, inputPath = '', bomOutputPath = undefined, environment } = options;
     const errors = [];
     const onErrorHandler = (message, context, error) => {
         if (error && error instanceof RuntimeExecutionError) {
@@ -203,7 +203,8 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
             errors.push(new ParseError(message, context.start, context.stop));
         }
     };
-    const visitor = new ParserVisitor(true, onErrorHandler, options.environment);
+    environment.setCurrentFile(inputPath);
+    const visitor = new ParserVisitor(true, onErrorHandler, environment);
     visitor.onImportFile = async (visitor, filePath, fileData) => {
         const { hasError, hasParseError } = await parseFileWithVisitor(visitor, fileData);
         if (hasError || hasParseError) {

package/dist/esm/validate.js

@@ -68,6 +68,7 @@ export default async function validate() {
     const visitor = await validateScript(inputFilePath, scriptData, scriptOptions);
     const symbols = visitor.getSymbols().getSymbols();
     const undefinedSymbols = [];
+    console.log('----- symbols -----');
     symbols.forEach((value, key) => {
         if (value.type !== ParseSymbolType.Undefined) {
             value = value;
@@ -81,7 +82,9 @@ export default async function validate() {
             undefinedSymbols.push(value);
         }
     });
+    console.log('----- tokens -----');
     const { parsedTokens } = await getSemanticTokens(scriptData, scriptOptions);
+    console.log('----- dump tokens -----');
     parsedTokens.forEach(item => {
         const { line, column, tokenType, tokenModifiers, textValue } = item;
         console.log(`${line}:${column} - ${textValue} - ${tokenType} | ${tokenModifiers.join(',')}`);

package/dist/types/SemanticTokenVisitor.d.ts

@@ -1,6 +1,6 @@
 import { TerminalNode, Token } from "antlr4ng";
 import { CircuitScriptLexer } from "./antlr/CircuitScriptLexer.js";
-import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Atom_exprContext, Property_key_exprContext, ValueAtomExprContext, Assignment_exprContext, Import_exprContext, Function_args_exprContext, Function_call_exprContext, GraphicCommandExprContext, For_exprContext } from "./antlr/CircuitScriptParser.js";
+import { Function_def_exprContext, Create_component_exprContext, Create_graphic_exprContext, Atom_exprContext, Property_key_exprContext, ValueAtomExprContext, Assignment_exprContext, Import_exprContext, Function_args_exprContext, Function_call_exprContext, GraphicCommandExprContext, For_exprContext, Annotation_comment_exprContext, ScriptContext, Operator_assignment_exprContext } from "./antlr/CircuitScriptParser.js";
 import { BaseVisitor, OnErrorHandler } from "./BaseVisitor.js";
 import { NodeScriptEnvironment } from "./environment.js";
 export declare class SemanticTokensVisitor extends BaseVisitor {
@@ -9,6 +9,7 @@ export declare class SemanticTokensVisitor extends BaseVisitor {
     script: string;
     semanticTokens: Map<string, IParsedToken>;
     constructor(silent: boolean | undefined, onErrorHandler: OnErrorHandler | null | undefined, environment: NodeScriptEnvironment, lexer: CircuitScriptLexer, script: string);
+    visitScript: (ctx: ScriptContext) => Promise<void>;
     visitFunction_args_expr: (ctx: Function_args_exprContext) => void;
     visitFunction_call_expr: (ctx: Function_call_exprContext) => void;
     visitFunction_def_expr: (ctx: Function_def_exprContext) => void;
@@ -19,8 +20,10 @@ export declare class SemanticTokensVisitor extends BaseVisitor {
     visitValueAtomExpr: (ctx: ValueAtomExprContext) => void;
     visitAssignment_expr: (ctx: Assignment_exprContext) => void;
     visitAtom_expr: (ctx: Atom_exprContext) => void;
+    visitOperator_assignment_expr: (ctx: Operator_assignment_exprContext) => void;
     visitImport_expr: (ctx: Import_exprContext) => void;
     visitFor_expr: (ctx: For_exprContext) => void;
+    visitAnnotation_comment_expr: (ctx: Annotation_comment_exprContext) => void;
     addSemanticToken(node: TerminalNode, modifiers: string[], tokenType?: string | null): void;
     parseToken(node: TerminalNode, modifiers: string[], tokenType?: string | null): IParsedToken;
     dumpTokens(): void;

package/dist/types/environment.d.ts

@@ -8,6 +8,7 @@ export declare class NodeScriptEnvironment {
     static getInstance(): NodeScriptEnvironment;
     protected useModuleDirectoryPath: string | null;
     protected useDefaultLibsPath: string | null;
+    protected currentFile: string;
     protected globalCreateSVGWindow: (() => SVGWindow) | null;
     private cachedVersion;
     protected supportedFonts: {
@@ -28,5 +29,10 @@ export declare class NodeScriptEnvironment {
     getCanvasWindow(): Dom;
     prepareSVGEnvironment(): Promise<void>;
     readFile(path: PathOrFileDescriptor, options: any): Promise<string>;
+    getAbsolutePath(filePath: string): string;
+    getDirPath(filePath: string): string;
+    setCurrentFile(filePath: string): string;
+    getCurrentFile(): string;
+    getRelativeToCurrentFolder(filePath: string): string;
     exists(path: PathLike): Promise<boolean>;
 }

package/package.json

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