circuitscript 0.0.24 → 0.0.26

package/dist/esm/parser.mjs

@@ -1,9 +1,9 @@
-import { CharStream, CommonTokenStream, ErrorListener, ParseTreeVisitor } from 'antlr4';
-import CircuitScriptParser, { Atom_exprContext, Create_component_exprContext, Create_graphic_exprContext, Function_def_exprContext, Property_key_exprContext, Sub_exprContext } from './antlr/CircuitScriptParser.mjs';
+import { CircuitScriptParser } from './antlr/CircuitScriptParser.mjs';
 import { MainLexer } from './lexer.mjs';
 import { SimpleStopwatch } from './utils.mjs';
+import { CharStream, CommonTokenStream, DefaultErrorStrategy } from 'antlr4ng';
 export function parseFileWithVisitor(visitor, data) {
-    const chars = new CharStream(data);
+    const chars = CharStream.fromString(data);
     const lexer = new MainLexer(chars);
     const lexerTimer = new SimpleStopwatch();
     const tokens = new CommonTokenStream(lexer);
@@ -11,259 +11,54 @@ export function parseFileWithVisitor(visitor, data) {
     const lexerTimeTaken = lexerTimer.lap();
     const parserTimer = new SimpleStopwatch();
     const parser = new CircuitScriptParser(tokens);
-    parser.removeErrorListeners();
-    const errorListener = new CircuitscriptParserErrorListener();
-    parser.addErrorListener(errorListener);
     const tree = parser.script();
     let hasError = false;
     try {
         visitor.visit(tree);
     }
     catch (err) {
-        err.print(data);
+        console.log(err);
         hasError = true;
     }
     const parserTimeTaken = parserTimer.lap();
-    const semanticTokenVisitor = new SemanticTokensVisitor(lexer, data);
-    semanticTokenVisitor.visit(tree);
-    const semanticTokens = semanticTokenVisitor.semanticTokens;
-    const parsedTokens = prepareTokens(tokens.tokens, lexer, data);
-    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 {
         tree, parser,
-        hasParseError: errorListener.hasParseErrors(),
+        hasParseError: false,
         hasError,
         parserTimeTaken,
         lexerTimeTaken,
-        tokens: finalParsedTokens,
     };
 }
-export class SemanticTokensVisitor extends ParseTreeVisitor {
-    parsedTokens = [];
-    lexer;
-    script;
-    semanticTokens = new Map();
-    constructor(lexer, script) {
-        super();
-        this.lexer = lexer;
-        this.script = script;
-    }
-    visit(ctx) {
-        const here = this;
-        if (Array.isArray(ctx)) {
-            return ctx.map(function (child) {
-                try {
-                    here.checkContext(child);
-                    return child.accept(this);
-                }
-                catch (err) {
-                    this.handleError(child, err);
-                }
-            }, this);
-        }
-        else {
-            try {
-                this.checkContext(ctx);
-                return ctx.accept(this);
-            }
-            catch (err) {
-                this.handleError(ctx, err);
-            }
-        }
+export class TempErrorStrategy extends DefaultErrorStrategy {
+    recover(recognizer, e) {
+        throw new Error('Method not implemented.');
     }
-    handleError(ctx, err) {
-        console.log('error!', err);
+    reportError(recognizer, e) {
+        throw new Error('Method not implemented.');
     }
-    checkContext(ctx) {
-        if (ctx instanceof Function_def_exprContext) {
-            this.addSemanticToken(this.parseToken(ctx.ID(), ['declaration'], 'function'));
-        }
-        else if (ctx instanceof Create_component_exprContext
-            || ctx instanceof Create_graphic_exprContext) {
-            this.addSemanticToken(this.parseToken(ctx.Create(), ['defaultLibrary'], 'function'));
-        }
-        else if (ctx instanceof Atom_exprContext) {
-            if (ctx.ID()) {
-                if (ctx.trailer_expr_list().length > 0) {
-                    this.addSemanticToken(this.parseToken(ctx.ID(), ['declaration'], 'function'));
-                }
-                else {
-                    this.addSemanticToken(this.parseToken(ctx.ID(), ['declaration'], 'variable'));
-                }
-            }
-        }
-        else if (ctx instanceof Property_key_exprContext) {
-            let useToken = null;
-            if (ctx.ID()) {
-                useToken = ctx.ID();
-            }
-            else if (ctx.INTEGER_VALUE()) {
-                useToken = ctx.INTEGER_VALUE();
-            }
-            else if (ctx.STRING_VALUE()) {
-                useToken = ctx.STRING_VALUE();
-            }
-            useToken && this.addSemanticToken(this.parseToken(useToken, ['declaration'], 'property'));
-        }
-        else if (ctx instanceof Sub_exprContext) {
-            let useToken = null;
-            if (ctx.ID()) {
-                useToken = ctx.ID();
-            }
-            else if (ctx.Pin()) {
-                useToken = ctx.Pin();
-            }
-            useToken && this.addSemanticToken(this.parseToken(useToken, ['defaultLibrary'], 'function'));
-        }
-    }
-    addSemanticToken(parsedToken) {
-        this.semanticTokens.set(parsedToken.line + "_" + parsedToken.column, parsedToken);
+}
+export class CircuitscriptParserErrorListener {
+    syntaxErrorCounter = 0;
+    onErrorHandler = null;
+    constructor(onErrorHandler = null) {
+        this.onErrorHandler = onErrorHandler;
     }
-    parseToken(node, modifiers, tokenType = null) {
-        const token = node.symbol;
-        let stringValue = "";
-        let textPart = "";
-        if (this.lexer.symbolicNames[token.type] !== null && this.lexer.symbolicNames[token.type] !== undefined) {
-            stringValue = this.lexer.symbolicNames[token.type];
-            if (stringValue !== "NEWLINE") {
-                textPart = this.script.substring(token.start, token.stop + 1);
-            }
-            else {
-                textPart = token.text.length - 1;
-            }
-        }
-        else if (this.lexer.literalNames[token.type] !== null && this.lexer.literalNames[token.type] !== undefined) {
-            stringValue = this.lexer.literalNames[token.type];
-            textPart = this.script.substring(token.start, token.stop + 1);
+    syntaxError(recognizer, offendingSymbol, line, charPositionInLine, msg, e) {
+        if (this.onErrorHandler) {
+            this.onErrorHandler(line, charPositionInLine, msg, e);
         }
         else {
-            stringValue = token._text;
+            console.log("Syntax error at line", line, ':', charPositionInLine, ' - ', msg);
         }
-        return {
-            line: token.line,
-            column: token.column,
-            length: token.stop - token.start + 1,
-            tokenType: tokenType !== null ? tokenType : stringValue,
-            tokenModifiers: modifiers,
-            textValue: textPart,
-        };
-    }
-}
-function prepareTokens(tokens, lexer, script) {
-    const parsedTokens = [];
-    tokens.forEach(item => {
-        if (item.type !== -1) {
-            let stringValue = "";
-            let textPart = "";
-            if (lexer.symbolicNames[item.type] !== null && lexer.symbolicNames[item.type] !== undefined) {
-                stringValue = lexer.symbolicNames[item.type];
-                if (stringValue !== "NEWLINE") {
-                    textPart = script.substring(item.start, item.stop + 1);
-                }
-                else {
-                    textPart = item.text.length - 1;
-                }
-            }
-            else if (lexer.literalNames[item.type] !== null && lexer.literalNames[item.type] !== undefined) {
-                stringValue = lexer.literalNames[item.type];
-                textPart = script.substring(item.start, item.stop + 1);
-            }
-            else {
-                stringValue = item._text;
-            }
-            if (textPart !== 0 && textPart !== '') {
-                parsedTokens.push({
-                    line: item.line,
-                    column: item.column,
-                    length: item.stop - item.start + 1,
-                    tokenType: resolveTokenType(stringValue),
-                    tokenModifiers: resolveTokenModifiers(stringValue),
-                    textValue: textPart,
-                });
-            }
-        }
-    });
-    return parsedTokens;
-}
-const languageKeywords = [
-    'break', 'branch', 'create', 'component',
-    'graphic', 'wire', 'pin', 'add', 'at', 'to',
-    'point', 'join', 'parallel', 'return', 'def', 'import',
-    'true', 'false', 'nc', 'frame',
-];
-const operatorKeywords = [
-    'at', 'to', 'wire', 'add', 'frame', 'join', 'parallel', 'point'
-];
-function resolveTokenType(tokenType) {
-    if (operatorKeywords.indexOf(tokenType.toLowerCase()) !== -1) {
-        return 'graphKeyword';
+        this.syntaxErrorCounter++;
     }
-    else if (languageKeywords.indexOf(tokenType.toLowerCase()) !== -1) {
-        return 'keyword';
+    reportAmbiguity(recognizer, dfa, startIndex, stopIndex, exact, ambigAlts, configs) {
     }
-    else {
-        switch (tokenType) {
-            case 'INTEGER_VALUE':
-            case 'NUMERIC_VALUE':
-            case 'DECIMAL_VALUE':
-            case 'PERCENTAGE_VALUE':
-                return 'number';
-            case 'STRING_VALUE':
-                return 'string';
-            case 'ID':
-                return 'variable';
-            case 'Define':
-                return 'keyword';
-            case 'COMMENT':
-                return 'comment';
-        }
-        return null;
+    reportAttemptingFullContext(recognizer, dfa, startIndex, stopIndex, conflictingAlts, configs) {
     }
-}
-function resolveTokenModifiers(tokenType) {
-    return [];
-}
-function dumpTokens(tokens, lexer, scriptData) {
-    tokens.forEach(item => {
-        if (item.type !== -1) {
-            let stringValue = "";
-            let textPart = "";
-            if (lexer.symbolicNames[item.type] !== null && lexer.symbolicNames[item.type] !== undefined) {
-                stringValue = lexer.symbolicNames[item.type];
-                if (stringValue !== "NEWLINE") {
-                    textPart = scriptData.substring(item.start, item.stop + 1);
-                }
-                else {
-                    textPart = item.text.length - 1;
-                }
-            }
-            else if (lexer.literalNames[item.type] !== null && lexer.literalNames[item.type] !== undefined) {
-                stringValue = lexer.literalNames[item.type];
-                textPart = scriptData.substring(item.start, item.stop + 1);
-            }
-            else {
-                stringValue = item._text;
-            }
-            console.log('line', item.line + ':' + item.column, `\t${stringValue} (${item.type})`.padEnd(30), textPart);
-        }
-    });
-}
-export class CircuitscriptParserErrorListener extends ErrorListener {
-    syntaxErrorCounter = 0;
-    syntaxError(recognizer, offendingSymbol, line, column, msg, e) {
-        console.log("Syntax error at line", line, ':', column, ' - ', msg);
-        this.syntaxErrorCounter++;
+    reportContextSensitivity(recognizer, dfa, startIndex, stopIndex, prediction, configs) {
     }
-    hasParseErrors() {
+    hasSyntaxErrors() {
         return (this.syntaxErrorCounter > 0);
     }
 }

package/dist/esm/render.mjs

@@ -1,7 +1,7 @@
 import { SVG, registerWindow } from '@svgdotjs/svg.js';
 import { RenderFrameType, getBounds } from "./layout.mjs";
 import { applyFontsToSVG, getCreateSVGWindow } from './sizing.mjs';
-import { ParamKeys, bodyColor, junctionColor, junctionSize, wireColor } from './globals.mjs';
+import { ComponentTypes, ParamKeys, bodyColor, junctionColor, junctionSize, wireColor } from './globals.mjs';
 import { NumericValue } from './objects/ParamDefinition.mjs';
 import { getBoundsSize } from './utils.mjs';
 export function generateSVG2(graph) {
@@ -36,7 +36,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         const { symbol = null } = item;
         if (symbol !== null && symbol) {
             const extra = {};
-            if (item.component.parameters.has('__is_net')) {
+            if (item.component.typeProp === ComponentTypes.net) {
                 extra.net_name = item.component.parameters.get(ParamKeys.net_name);
             }
             else if (item.component.parameters.has('value')) {

package/dist/esm/validate.mjs

@@ -0,0 +1,74 @@
+#! /usr/bin/env node
+import { program } from 'commander';
+import figlet from 'figlet';
+import path from 'path';
+import { readFileSync } from 'fs';
+import { prepareSVGEnvironment } from './sizing.mjs';
+import { getCurrentPath, getScriptText, getSemanticTokens, validateScript } from './helpers.mjs';
+export async function validate() {
+    const { filePath } = getCurrentPath();
+    const toolSrcPath = filePath;
+    const toolDirectory = path.dirname(toolSrcPath) + '/../../';
+    const fontsPath = toolDirectory + '/fonts';
+    const defaultLibsPath = toolDirectory + '/libs';
+    const packageJson = JSON.parse(readFileSync(toolDirectory + 'package.json').toString());
+    ;
+    const { version } = packageJson;
+    program
+        .description('generate graphical output from circuitscript files')
+        .version(version)
+        .option('-i, --input text <input text>', 'Input text directly')
+        .option('-f, --input-file <path>', 'Input file')
+        .option('-o, --output <path>', 'Output path')
+        .option('-c, --current-directory <path>', 'Set current directory')
+        .option('-k, --kicad-netlist <filename>', 'Create KiCad netlist')
+        .option('-w, --watch', 'Watch for file changes')
+        .option('-n, --dump-nets', 'Dump out net information')
+        .option('-d, --dump-data', 'Dump data during parsing')
+        .option('-s, --stats', 'Show stats during generation');
+    program.addHelpText('before', figlet.textSync('circuitscript', {
+        font: 'Small Slant'
+    }));
+    if (process.argv.length < 3) {
+        program.help();
+    }
+    program.parse();
+    const options = program.opts();
+    const watchFileChanges = options.watch;
+    const outputPath = options.output ?? null;
+    const dumpNets = options.dumpNets;
+    const dumpData = options.dumpData;
+    const kicadNetlist = options.kicadNetlist;
+    let currentDirectory = options.currentDirectory ?? null;
+    if (watchFileChanges) {
+        console.log('watching for file changes...');
+    }
+    await prepareSVGEnvironment(fontsPath);
+    let inputFilePath = null;
+    let scriptData;
+    if (options.input) {
+        scriptData = options.input;
+    }
+    else {
+        inputFilePath = options.inputFile;
+        const tmpScriptData = getScriptText(inputFilePath);
+        if (tmpScriptData === null) {
+            throw "File does not exists";
+        }
+        scriptData = tmpScriptData;
+        if (currentDirectory === null) {
+            currentDirectory = path.dirname(inputFilePath);
+        }
+    }
+    const scriptOptions = {
+        currentDirectory,
+        defaultLibsPath,
+        dumpNets,
+        dumpData,
+        kicadNetlistPath: kicadNetlist,
+        showStats: options.stats,
+    };
+    const visitor = validateScript(scriptData, scriptOptions);
+    const semanticTokensVisitor = getSemanticTokens(scriptData, scriptOptions);
+}
+validate();