circuitscript 0.0.13 → 0.0.15

package/build/src/main.js

@@ -3,15 +3,9 @@ import { program } from 'commander';
 import figlet from 'figlet';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { readFileSync, watch, writeFileSync } from 'fs';
-import { MainVisitor } from './visitor.js';
+import { readFileSync, watch } from 'fs';
 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() {
     const toolSrcPath = fileURLToPath(import.meta.url);
     const toolDirectory = path.dirname(toolSrcPath) + '/../../';
@@ -84,65 +78,4 @@ export default async function main() {
         });
     }
 }
-export function renderScript(scriptData, outputPath, options) {
-    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);
-    dumpNets && console.log(visitor.dumpNets());
-    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 null;
-    }
-    visitor.annotateComponents();
-    if (kicadNetlistPath) {
-        const kicadNetList = generateKiCADNetList(visitor.getNetList());
-        writeFileSync(kicadNetlistPath, kicadNetList);
-        console.log('Generated KiCad netlist file');
-    }
-    const { sequence, nets } = visitor.getGraph();
-    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 = 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/build/src/regenerate-tests.js

@@ -1,5 +1,5 @@
 import fs from 'fs';
-import { renderScript } from './main.js';
+import { renderScript } from './helpers.js';
 const mainDir = './__tests__/renderData/';
 const cstFiles = [];
 const files = fs.readdirSync(mainDir);
@@ -14,5 +14,5 @@ cstFiles.forEach(file => {
     const scriptData = fs.readFileSync(inputPath, { encoding: 'utf-8' });
     const outputPath = inputPath + '.svg';
     renderScript(scriptData, outputPath, { currentDirectory: useCurrentDir });
-    console.log('generated ', inputPath);
+    console.log('generated ', outputPath);
 });

package/build/src/sizing.js

@@ -1,11 +1,9 @@
 import { SVG, 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 = {
-    'Inter': 'Inter-Regular.ttf',
-    'Inter-Bold': 'Inter-Bold.ttf',
-};
+const supportedFonts = {};
 export async function prepareSizing(fontsPath) {
     await config.setFontDir(fontsPath)
         .setFontFamilyMappings(supportedFonts)
@@ -39,17 +37,13 @@ export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regul
                 dominantBaseline = 'text-top';
                 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,
         }).fill('#333');
         const textbox = tmpTextElement.bbox();
         const { width, height } = textbox;

package/build/src/visitor.js

@@ -914,8 +914,8 @@ export class MainVisitor extends ParseTreeVisitor {
                     continue;
                 }
                 if (instance.typeProp === null) {
-                    this.print('Instance has no type:', instance.instanceName);
-                    continue;
+                    this.print('Instance has no type:', instance.instanceName, ' assuming connector');
+                    instance.typeProp = 'conn';
                 }
                 if (instance.parameters.has('refdes')) {
                     const refdes = instance.parameters.get('refdes');
@@ -1065,8 +1065,16 @@ class ComponentAnnotater {
         this.counter['?'] = 1;
     }
     getAnnotation(type) {
-        if (this.counter[type] === undefined) {
-            return null;
+        if (this.counter[type] === undefined && type.length <= 2) {
+            for (const [, value] of Object.entries(ComponentRefDesPrefixes)) {
+                if (value === type) {
+                    throw "Refdes prefix is already in use!";
+                }
+            }
+            if (ComponentRefDesPrefixes[type] === undefined) {
+                ComponentRefDesPrefixes[type] = type;
+                this.counter[type] = 1;
+            }
         }
         let attempts = 100;
         let proposedName;