circuitscript 0.0.12 → 0.0.14

package/src/main.ts

@@ -4,20 +4,17 @@ import { program } from 'commander';
 import figlet from 'figlet';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { readFileSync, watch, writeFileSync } from 'fs';
+import { readFileSync, watch } from 'fs';
 
-import { MainVisitor } from './visitor.js';
 import { prepareSizing } from './sizing.js';
-import { LayoutEngine } from './layout.js';
-import { generateSVG2 } from './render.js';
-import { SequenceAction } from './objects/ExecutionScope.js';
-import { parseFileWithVisitor } from './parser.js';
-import { generateKiCADNetList } from './export.js';
-import { SimpleStopwatch } from './utils.js';
+import { renderScript } from './helpers.js';
 
 export default async function main(): Promise<void> {
     const toolSrcPath = fileURLToPath(import.meta.url);
+
     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;
@@ -56,10 +53,6 @@ export default async function main(): Promise<void> {
 
     let currentDirectory = options.currentDirectory ?? null;
 
-    
-    const fontsPath = toolDirectory + '/fonts';
-    const defaultLibsPath = toolDirectory + '/libs'; 
-
     if (watchFileChanges) {
         console.log('watching for file changes...');
     }
@@ -97,7 +90,7 @@ export default async function main(): Promise<void> {
     }
 
     if (watchFileChanges) {
-        watch(inputFilePath, (event, targetFile) => {
+        watch(inputFilePath, event => {
             if (event === 'change') {
                 const scriptData = readFileSync(inputFilePath, 
                     {encoding: 'utf-8'});
@@ -109,112 +102,4 @@ export default async function main(): Promise<void> {
     }
 }
 
-
-export function renderScript(scriptData: string, outputPath: string, options): string {
-
-    const {
-        currentDirectory = null, 
-        defaultLibsPath,
-        dumpNets = false,
-        dumpData = false,
-        kicadNetlistPath = null,
-        showStats = false} = options;
-
-    const visitor = new MainVisitor(true);
-
-    visitor.onImportFile = visitor.createImportFileHandler(currentDirectory, defaultLibsPath);
-
-    visitor.print('reading file');
-    visitor.print('done reading file');
-
-    const { tree, parser,
-        hasParseError, hasError, 
-        parserTimeTaken, 
-        lexerTimeTaken } = parseFileWithVisitor(visitor, scriptData);
-
-    showStats && console.log('Lexing took:', lexerTimeTaken);
-    showStats && console.log('Parsing took:', parserTimeTaken);
-    
-    if (dumpNets){
-        console.log(visitor.dumpNets());
-    }
-    // console.log(visitor.dumpUniqueNets());
-
-    dumpData && writeFileSync('dump/tree.lisp', tree.toStringTree(null, parser));
-    dumpData && writeFileSync('dump/raw-parser.txt', visitor.logger.dump());
-    
-    if (hasError || hasParseError) {
-        console.log('Error while parsing');
-        return;
-    }
-
-    visitor.annotateComponents();
-
-    if(kicadNetlistPath){
-        const kicadNetList = generateKiCADNetList(visitor.getNetList());
-        writeFileSync(kicadNetlistPath, kicadNetList);
-        console.log('Generated KiCad netlist file');
-    }
-    
-
-    // await writeFile('dump/raw-netlist.json', JSON.stringify(visitor.dump2(), null, 2));
-
-    const { sequence, nets } = visitor.getGraph();
-
-    // const tmpInstances = visitor.getExecutor().scope.instances;
-    // for (const [instanceName, instance] of tmpInstances){
-    //     console.log(instanceName);
-    //     console.log(instance.pinNets);
-    // }
-
-
-    const tmpSequence = sequence.map(item => {
-        const tmp = [...item];
-
-        const action = tmp[0];
-
-        if (action === SequenceAction.Wire) {
-            tmp[2] = tmp[2].map(item2 => {
-                return [item2.direction, item2.value].join(",");
-            }).join(" ");
-        } else if (action === SequenceAction.Frame) {
-            tmp[1] = item[1].frameId;
-            
-        } else if (action !== SequenceAction.WireJump) {
-            tmp[1] = item[1].instanceName;
-        }
-
-        return tmp.join(" | ");
-    });
-
-    dumpData && writeFileSync('dump/raw-sequence.txt', tmpSequence.join('\n'));
-    let svgOutput: string = null;
-
-    try {
-        const layoutEngine = new LayoutEngine();
-        const layoutTimer = new SimpleStopwatch();
-
-        const graph = layoutEngine.runLayout(sequence, nets);
-
-        layoutEngine.printWarnings();
-
-        showStats && console.log('Layout took:', layoutTimer.lap());
-
-        dumpData && writeFileSync('dump/raw-layout.txt', layoutEngine.logger.dump());
-
-        const generateSvgTimer = new SimpleStopwatch();
-        svgOutput = generateSVG2(graph);
-        showStats && console.log('Render took:', generateSvgTimer.lap());
-
-        if (outputPath){
-            writeFileSync(outputPath, svgOutput);
-        } 
-    } catch (err) {
-        console.log('Failed to render:');
-        console.log(err)
-    }
-
-    return svgOutput;
-}
-
 main();

package/src/parser.ts

@@ -91,14 +91,14 @@ export class CircuitscriptParserErrorListener extends ErrorListener {
         this.syntaxErrorCounter++;
     }
 
-    reportAmbiguity(recognizer, dfa, startIndex, stopIndex, exact, ambigAlts, configs) {
-    }
+    // reportAmbiguity(recognizer, dfa, startIndex, stopIndex, exact, ambigAlts, configs) {
+    // }
 
-    reportAttemptingFullContext(recognizer, dfa, startIndex, stopIndex, conflictingAlts, configs) {
-    }
+    // reportAttemptingFullContext(recognizer, dfa, startIndex, stopIndex, conflictingAlts, configs) {
+    // }
 
-    reportContextSensitivity(recognizer, dfa, startIndex, stopIndex, prediction, configs) {
-    }
+    // reportContextSensitivity(recognizer, dfa, startIndex, stopIndex, prediction, configs) {
+    // }
 
     hasParseErrors(): boolean {
         return (this.syntaxErrorCounter > 0);

package/src/regenerate-tests.ts

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { renderScript } from './main.js';
+import { renderScript } from './helpers.js';
 
 const mainDir = './__tests__/renderData/';
 

package/src/sizing.ts

@@ -1,13 +1,14 @@
 import { Box, SVG, SVGTypeMapping, registerWindow } from '@svgdotjs/svg.js';
 import { config, createSVGWindow } from 'svgdom';
 import { HorizontalAlign, VerticalAlign } from './geometry.js';
+import { defaultFont } from './globals.js';
 
 let MainCanvas = null;
 
 const supportedFonts = { 
     // 'Roboto': 'Roboto-Regular.ttf',
-    'Inter': 'Inter-Regular.ttf', 
-    'Inter-Bold': 'Inter-Bold.ttf',
+    // 'Inter': 'Inter-Regular.ttf', 
+    // 'Inter-Bold': 'Inter-Bold.ttf',
 }
 
 export async function prepareSizing(fontsPath): Promise<void> {
@@ -68,18 +69,14 @@ export function measureTextSize2(text: string, fontFamily: string,
                 break;
         }
 
-        if (fontWeight === 'bold'){
-            fontFamily = 'Inter-Bold';
-        } else {
-            fontFamily = 'Inter-Regular';
-        }
+        fontFamily = defaultFont;
         
         const tmpTextElement = MainCanvas.text(text).font({
             family: fontFamily,
             size: fontSize,
             anchor: anchor,
             'dominant-baseline': dominantBaseline,
-            // weight: fontWeight,
+            weight: fontWeight,
         }).fill('#333');
 
         const textbox = tmpTextElement.bbox();