circuitscript 0.1.26 → 0.1.28

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 => {
@@ -105,12 +115,16 @@ class SemanticTokensVisitor extends BaseVisitor_js_1.BaseVisitor {
                 this.addSemanticToken(item, [], 'variable');
             });
         };
+        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/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));
         }

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/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 => {
@@ -107,9 +117,13 @@ export class SemanticTokensVisitor extends BaseVisitor {
             this.addSemanticToken(item, [], 'variable');
         });
     };
+    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/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));
         }

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 } 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;
@@ -21,6 +22,7 @@ export declare class SemanticTokensVisitor extends BaseVisitor {
     visitAtom_expr: (ctx: Atom_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/helpers.d.ts

@@ -19,13 +19,13 @@ export type ScriptOptions = {
     dumpNets: boolean;
     dumpData: boolean;
     showStats: boolean;
-    enableErc: boolean;
-    enableBom: boolean;
-    bomOutputPath?: string;
     environment: NodeScriptEnvironment;
     inputPath?: string;
-    updateSource: boolean;
-    saveAnnotatedCopy: string | boolean;
+    enableErc?: boolean;
+    enableBom?: boolean;
+    bomOutputPath?: string;
+    updateSource?: boolean;
+    saveAnnotatedCopy?: string | boolean;
 };
 export declare function prepareFile(textData: string): {
     parser: CircuitScriptParser;

package/package.json

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