circuitscript 0.0.24 → 0.0.25

package/dist/cjs/helpers.js

@@ -1,6 +1,9 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentPath = exports.detectJSModuleType = exports.renderScript = exports.JSModuleType = void 0;
+exports.getPackageVersion = exports.getDefaultLibsPath = exports.getFontsPath = exports.getCurrentPath = exports.detectJSModuleType = exports.renderScript = exports.validateScript = exports.ParseErrorStrategy = exports.getSemanticTokens = exports.getScriptText = exports.prepareFile = exports.JSModuleType = void 0;
 const fs_1 = require("fs");
 const export_js_1 = require("./export.js");
 const layout_js_1 = require("./layout.js");
@@ -10,17 +13,164 @@ const render_js_1 = require("./render.js");
 const utils_js_1 = require("./utils.js");
 const visitor_js_1 = require("./visitor.js");
 const this_file_1 = require("this-file");
+const SymbolValidatorVisitor_js_1 = require("./SymbolValidatorVisitor.js");
+const antlr4ng_1 = require("antlr4ng");
+const lexer_js_1 = require("./lexer.js");
+const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
+const SemanticTokenVisitor_js_1 = require("./SemanticTokenVisitor.js");
+const path_1 = __importDefault(require("path"));
 var JSModuleType;
 (function (JSModuleType) {
     JSModuleType["CommonJs"] = "cjs";
     JSModuleType["ESM"] = "mjs";
 })(JSModuleType || (exports.JSModuleType = JSModuleType = {}));
+function prepareFile(textData) {
+    const chars = antlr4ng_1.CharStream.fromString(textData);
+    const lexer = new lexer_js_1.MainLexer(chars);
+    const lexerTimer = new utils_js_1.SimpleStopwatch();
+    const tokens = new antlr4ng_1.CommonTokenStream(lexer);
+    tokens.fill();
+    const lexerTimeTaken = lexerTimer.lap();
+    const parser = new CircuitScriptParser_js_1.CircuitScriptParser(tokens);
+    return {
+        parser,
+        lexer,
+        lexerTimeTaken,
+        tokens
+    };
+}
+exports.prepareFile = prepareFile;
+function getScriptText(filePath) {
+    try {
+        return (0, fs_1.readFileSync)(filePath, { encoding: 'utf-8' });
+    }
+    catch (err) {
+        return null;
+    }
+}
+exports.getScriptText = getScriptText;
+function getSemanticTokens(scriptData, options) {
+    const { parser, lexer, tokens } = prepareFile(scriptData);
+    const tree = parser.script();
+    const { currentDirectory = null, defaultLibsPath, } = options;
+    const visitor = new SemanticTokenVisitor_js_1.SemanticTokensVisitor(true, null, currentDirectory, defaultLibsPath, lexer, scriptData);
+    parser.removeErrorListeners();
+    visitor.onImportFile = (visitor, textData) => {
+        let hasError = false;
+        let hasParseError = false;
+        if (textData !== null) {
+            const { parser } = prepareFile(textData);
+            const tree = parser.script();
+            try {
+                visitor.visit(tree);
+            }
+            catch (err) {
+                console.log('Error while parsing: ', err);
+                hasParseError = true;
+                hasError = true;
+            }
+        }
+        else {
+            console.log('File does not exist');
+            hasError = true;
+        }
+        return {
+            hasError, hasParseError
+        };
+    };
+    visitor.visit(tree);
+    const semanticTokens = visitor.getTokens();
+    const parsedTokens = (0, SemanticTokenVisitor_js_1.prepareTokens)(tokens.getTokens(), lexer, scriptData);
+    const finalParsedTokens = [];
+    parsedTokens.forEach(token => {
+        const location = `${token.line}_${token.column}`;
+        if (semanticTokens.has(location)) {
+            finalParsedTokens.push(semanticTokens.get(location));
+        }
+        else {
+            finalParsedTokens.push(token);
+        }
+    });
+    return {
+        visitor,
+        parsedTokens: finalParsedTokens
+    };
+}
+exports.getSemanticTokens = getSemanticTokens;
+class TokenErrorListener extends antlr4ng_1.BaseErrorListener {
+    syntaxError(recognizer, offendingSymbol, line, column, msg, e) {
+        console.log(msg);
+    }
+}
+class ParseErrorStrategy extends antlr4ng_1.DefaultErrorStrategy {
+    reportUnwantedToken(recognizer) {
+        if (this.inErrorRecoveryMode(recognizer)) {
+            return;
+        }
+        this.beginErrorCondition(recognizer);
+        const t = recognizer.getCurrentToken();
+        const tokenName = this.getTokenErrorDisplay(t);
+        const msg = "extraneous input " + tokenName;
+        recognizer.notifyErrorListeners(msg, t, null);
+        this.endErrorCondition(recognizer);
+    }
+}
+exports.ParseErrorStrategy = ParseErrorStrategy;
+function validateScript(scriptData, options) {
+    const { parser } = prepareFile(scriptData);
+    parser.removeErrorListeners();
+    parser.errorHandler = new ParseErrorStrategy();
+    parser.addErrorListener(new TokenErrorListener());
+    const tree = parser.script();
+    const { currentDirectory = null, defaultLibsPath, } = options;
+    const visitor = new SymbolValidatorVisitor_js_1.SymbolValidatorVisitor(true, null, currentDirectory, defaultLibsPath);
+    visitor.onImportFile = (visitor, textData) => {
+        let hasError = false;
+        let hasParseError = false;
+        if (textData !== null) {
+            const { parser } = prepareFile(textData);
+            const tree = parser.script();
+            try {
+                visitor.visit(tree);
+            }
+            catch (err) {
+                console.log('got an error while parsing tree: ', err);
+                hasParseError = true;
+                hasError = true;
+            }
+        }
+        else {
+            console.log('file does not exist!');
+            hasError = true;
+        }
+        return {
+            hasError, hasParseError
+        };
+    };
+    visitor.visit(tree);
+    const symbolTable = visitor.getSymbols();
+    symbolTable.clearUndefined();
+    const visitorResolver = new SymbolValidatorVisitor_js_1.SymbolValidatorResolveVisitor(true, null, currentDirectory, defaultLibsPath);
+    visitorResolver.setSymbols(visitor.getSymbols());
+    visitorResolver.onImportFile = visitor.onImportFile;
+    visitorResolver.visit(tree);
+    return visitorResolver;
+}
+exports.validateScript = validateScript;
 function renderScript(scriptData, outputPath, options) {
     const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, kicadNetlistPath = null, showStats = false } = options;
-    const visitor = new visitor_js_1.MainVisitor(true);
-    visitor.onImportFile = visitor.createImportFileHandler(currentDirectory, defaultLibsPath);
-    visitor.print('reading file');
-    visitor.print('done reading file');
+    const onErrorHandler = (line, column, message, error) => {
+        if (error instanceof visitor_js_1.VisitorExecutionException) {
+            console.log('Error', line, column, message, error.errorMessage);
+        }
+    };
+    const visitor = new visitor_js_1.ParserVisitor(true, onErrorHandler, currentDirectory, defaultLibsPath);
+    visitor.onImportFile = (visitor, fileData) => {
+        const { hasError, hasParseError } = (0, parser_js_1.parseFileWithVisitor)(visitor, fileData);
+        return { hasError, hasParseError };
+    };
+    visitor.log('reading file');
+    visitor.log('done reading file');
     const { tree, parser, hasParseError, hasError, parserTimeTaken, lexerTimeTaken } = (0, parser_js_1.parseFileWithVisitor)(visitor, scriptData);
     showStats && console.log('Lexing took:', lexerTimeTaken);
     showStats && console.log('Parsing took:', parserTimeTaken);
@@ -97,3 +247,23 @@ function getCurrentPath() {
     return { filePath: filename };
 }
 exports.getCurrentPath = getCurrentPath;
+function getToolsPath() {
+    const { filePath } = getCurrentPath();
+    return path_1.default.normalize(path_1.default.dirname(filePath) + '/../../');
+}
+function getFontsPath() {
+    const toolsPath = getToolsPath();
+    return path_1.default.normalize(toolsPath + "fonts");
+}
+exports.getFontsPath = getFontsPath;
+function getDefaultLibsPath() {
+    const toolsPath = getToolsPath();
+    return path_1.default.normalize(toolsPath + "libs");
+}
+exports.getDefaultLibsPath = getDefaultLibsPath;
+function getPackageVersion() {
+    const packageJson = JSON.parse((0, fs_1.readFileSync)(getToolsPath() + 'package.json').toString());
+    const { version } = packageJson;
+    return version;
+}
+exports.getPackageVersion = getPackageVersion;

package/dist/cjs/index.js

@@ -27,3 +27,5 @@ __exportStar(require("./parser.js"), exports);
 __exportStar(require("./render.js"), exports);
 __exportStar(require("./utils.js"), exports);
 __exportStar(require("./visitor.js"), exports);
+__exportStar(require("./sizing.js"), exports);
+__exportStar(require("./objects/types.js"), exports);

package/dist/cjs/layout.js

@@ -395,6 +395,14 @@ class LayoutEngine {
                         didSetAngle = true;
                         tmpSymbol.angle = component.parameters.get('angle');
                     }
+                    if (component.parameters.has('flipX')) {
+                        tmpSymbol.flipX =
+                            component.parameters.get('flipX');
+                    }
+                    if (component.parameters.has('flipY')) {
+                        tmpSymbol.flipY =
+                            component.parameters.get('flipY');
+                    }
                     if (tmpSymbol instanceof draw_symbols_js_1.SymbolCustom && widthProp) {
                         tmpSymbol.bodyWidth = widthProp;
                     }

package/dist/cjs/lexer.js

@@ -1,13 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MainLexer = void 0;
-const antlr4_1 = require("antlr4");
-const CircuitScriptParser_js_1 = __importDefault(require("./antlr/CircuitScriptParser.js"));
-const CircuitScriptLexer_js_1 = __importDefault(require("./antlr/CircuitScriptLexer.js"));
-class MainLexer extends CircuitScriptLexer_js_1.default {
+const antlr4ng_1 = require("antlr4ng");
+const CircuitScriptParser_js_1 = require("./antlr/CircuitScriptParser.js");
+const CircuitScriptLexer_js_1 = require("./antlr/CircuitScriptLexer.js");
+class MainLexer extends CircuitScriptLexer_js_1.CircuitScriptLexer {
     constructor(input) {
         super(input);
         this.tokens = [];
@@ -25,38 +22,38 @@ class MainLexer extends CircuitScriptLexer_js_1.default {
         this.tokens.push(token);
     }
     nextToken() {
-        if (this._input.LA(1) === CircuitScriptParser_js_1.default.EOF && this.indents.length) {
+        if (this.inputStream.LA(1) === CircuitScriptParser_js_1.CircuitScriptParser.EOF && this.indents.length) {
             this.tokens = this.tokens.filter(function (val) {
-                return val.type !== CircuitScriptParser_js_1.default.EOF;
+                return val.type !== CircuitScriptParser_js_1.CircuitScriptParser.EOF;
             });
-            this.emitToken(this.commonToken(CircuitScriptParser_js_1.default.NEWLINE, "\n"));
+            this.emitToken(this.commonToken(CircuitScriptParser_js_1.CircuitScriptParser.NEWLINE, "\n"));
             while (this.indents.length) {
                 this.emitToken(this.createDedent());
                 this.indents.pop();
             }
-            this.emitToken(this.commonToken(CircuitScriptParser_js_1.default.EOF, "<EOF>"));
+            this.emitToken(this.commonToken(CircuitScriptParser_js_1.CircuitScriptParser.EOF, "<EOF>"));
         }
         const next = super.nextToken();
         return this.tokens.length ? this.tokens.shift() : next;
     }
     createDedent() {
-        return this.commonToken(CircuitScriptParser_js_1.default.DEDENT, "");
+        return this.commonToken(CircuitScriptParser_js_1.CircuitScriptParser.DEDENT, "");
     }
     getCharIndex() {
-        return this._input.index;
+        return this.inputStream.index;
     }
     commonToken(type, text) {
         const stop = this.getCharIndex() - 1;
         const start = text.length ? stop - text.length + 1 : stop;
-        const token = new antlr4_1.CommonToken([this, this._input], type, 0, start, stop);
-        let tokenTypeString;
-        if (type === CircuitScriptParser_js_1.default.INDENT) {
+        const token = antlr4ng_1.CommonToken.fromSource([this, this.inputStream], type, 0, start, stop);
+        let tokenTypeString = null;
+        if (type === CircuitScriptParser_js_1.CircuitScriptParser.INDENT) {
             tokenTypeString = "indent";
         }
-        else if (type === CircuitScriptParser_js_1.default.DEDENT) {
+        else if (type === CircuitScriptParser_js_1.CircuitScriptParser.DEDENT) {
             tokenTypeString = "dedent";
         }
-        if (tokenTypeString) {
+        if (tokenTypeString !== null) {
             token.text = tokenTypeString;
         }
         return token;
@@ -85,14 +82,14 @@ class MainLexer extends CircuitScriptLexer_js_1.default {
     onNewLine() {
         const newLine = this.text.replace(/[^\r\n]+/g, '');
         const spaces = this.text.replace(/[\r\n]+/g, '');
-        const next = this._input.LA(1);
-        const nextnext = this._input.LA(2);
+        const next = this.inputStream.LA(1);
+        const nextnext = this.inputStream.LA(2);
         if (this.opened > 0 || (nextnext != -1 &&
             (next === 13 || next === 10 || next === 35))) {
             this.skip();
         }
         else {
-            this.emitToken(this.commonToken(CircuitScriptParser_js_1.default.NEWLINE, newLine));
+            this.emitToken(this.commonToken(CircuitScriptParser_js_1.CircuitScriptParser.NEWLINE, newLine));
             const indent = this.getIndentationCount(spaces);
             const previous = this.indents.length ? this.indents[this.indents.length - 1] : 0;
             if (indent === previous) {
@@ -100,7 +97,7 @@ class MainLexer extends CircuitScriptLexer_js_1.default {
             }
             else if (indent > previous) {
                 this.indents.push(indent);
-                this.emitToken(this.commonToken(CircuitScriptParser_js_1.default.INDENT, spaces));
+                this.emitToken(this.commonToken(CircuitScriptParser_js_1.CircuitScriptParser.INDENT, spaces));
             }
             else {
                 while (this.indents.length && this.indents[this.indents.length - 1] > indent) {

package/dist/cjs/main.js

@@ -11,14 +11,9 @@ const fs_1 = require("fs");
 const sizing_js_1 = require("./sizing.js");
 const helpers_js_1 = require("./helpers.js");
 async function main() {
-    const { filePath } = (0, helpers_js_1.getCurrentPath)();
-    const toolSrcPath = filePath;
-    const toolDirectory = path_1.default.dirname(toolSrcPath) + '/../../';
-    const fontsPath = toolDirectory + '/fonts';
-    const defaultLibsPath = toolDirectory + '/libs';
-    const packageJson = JSON.parse((0, fs_1.readFileSync)(toolDirectory + 'package.json').toString());
-    ;
-    const { version } = packageJson;
+    const fontsPath = (0, helpers_js_1.getFontsPath)();
+    const defaultLibsPath = (0, helpers_js_1.getDefaultLibsPath)();
+    const version = (0, helpers_js_1.getPackageVersion)();
     commander_1.program
         .description('generate graphical output from circuitscript files')
         .version(version)
@@ -61,7 +56,7 @@ async function main() {
             currentDirectory = path_1.default.dirname(inputFilePath);
         }
     }
-    const renderOptions = {
+    const scriptOptions = {
         currentDirectory,
         defaultLibsPath,
         dumpNets,
@@ -69,7 +64,7 @@ async function main() {
         kicadNetlistPath: kicadNetlist,
         showStats: options.stats,
     };
-    const output = (0, helpers_js_1.renderScript)(scriptData, outputPath, renderOptions);
+    const output = (0, helpers_js_1.renderScript)(scriptData, outputPath, scriptOptions);
     if (outputPath === null && output) {
         console.log(output);
     }
@@ -77,7 +72,7 @@ async function main() {
         (0, fs_1.watch)(inputFilePath, event => {
             if (event === 'change') {
                 const scriptData = (0, fs_1.readFileSync)(inputFilePath, { encoding: 'utf-8' });
-                (0, helpers_js_1.renderScript)(scriptData, outputPath, renderOptions);
+                (0, helpers_js_1.renderScript)(scriptData, outputPath, scriptOptions);
                 console.log('done');
             }
         });

package/dist/cjs/objects/ClassComponent.js

@@ -127,6 +127,9 @@ class ClassComponent {
             }
         }
         for (const [key, value] of this.parameters) {
+            if (key === 'flipX' || key === 'flipY' || key === 'angle') {
+                continue;
+            }
             component.parameters.set(key, value);
         }
         for (const [key, value] of this.pins) {

package/dist/cjs/objects/ExecutionScope.js

@@ -7,6 +7,7 @@ class ExecutionScope {
         this.instances = new Map();
         this.functions = new Map();
         this.variables = new Map();
+        this.symbols = new Map();
         this.blockStack = new Map();
         this.wires = [];
         this.frames = [];

package/dist/cjs/objects/types.js

@@ -1,9 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UndeclaredReference = void 0;
+exports.ParseSymbolType = exports.UndeclaredReference = void 0;
 class UndeclaredReference {
     constructor(reference) {
         this.reference = reference;
     }
 }
 exports.UndeclaredReference = UndeclaredReference;
+var ParseSymbolType;
+(function (ParseSymbolType) {
+    ParseSymbolType["Variable"] = "variable";
+    ParseSymbolType["Function"] = "function";
+    ParseSymbolType["Undefined"] = "undefined";
+})(ParseSymbolType || (exports.ParseSymbolType = ParseSymbolType = {}));