circuitscript 0.0.22 → 0.0.25

package/{build/src/render.js → dist/esm/render.mjs}

@@ -1,12 +1,11 @@
-import { createSVGWindow } from 'svgdom';
 import { SVG, registerWindow } from '@svgdotjs/svg.js';
-import { RenderFrameType, getBounds } from "./layout.js";
-import { applyFontsToSVG } from './sizing.js';
-import { ParamKeys, bodyColor, junctionColor, junctionSize, wireColor } from './globals.js';
-import { NumericValue } from './objects/ParamDefinition.js';
-import { getBoundsSize } from './utils.js';
+import { RenderFrameType, getBounds } from "./layout.mjs";
+import { applyFontsToSVG, getCreateSVGWindow } from './sizing.mjs';
+import { ParamKeys, bodyColor, junctionColor, junctionSize, wireColor } from './globals.mjs';
+import { NumericValue } from './objects/ParamDefinition.mjs';
+import { getBoundsSize } from './utils.mjs';
 export function generateSVG2(graph) {
-    const window = createSVGWindow();
+    const window = getCreateSVGWindow()();
     const document = window.document;
     registerWindow(window, document);
     const canvas = SVG(document.documentElement);
@@ -36,7 +35,7 @@ function generateSVGChild(canvas, components, wires, junctions, mergedWires, fra
         symbolGroup.translate(x, y);
         const { symbol = null } = item;
         if (symbol !== null && symbol) {
-            let extra = {};
+            const extra = {};
             if (item.component.parameters.has('__is_net')) {
                 extra.net_name = item.component.parameters.get(ParamKeys.net_name);
             }
@@ -150,19 +149,3 @@ function drawGrid(group, canvasSize) {
         color: '#aaa'
     });
 }
-function calculateBoundingBox(components) {
-    let maxX = Number.NEGATIVE_INFINITY;
-    let minX = Number.POSITIVE_INFINITY;
-    let maxY = Number.NEGATIVE_INFINITY;
-    let minY = Number.POSITIVE_INFINITY;
-    components.forEach(item => {
-        minX = Math.min(item.x, minX);
-        maxX = Math.max(item.x + item.width, maxX);
-        minY = Math.min(item.y, minY);
-        maxY = Math.max(item.y + item.height, maxY);
-    });
-    return {
-        width: (maxX - minX),
-        height: (maxY - minY)
-    };
-}

package/{build/src/sizing.js → dist/esm/sizing.mjs}

@@ -1,13 +1,27 @@
 import { SVG, registerWindow } from '@svgdotjs/svg.js';
-import { config, createSVGWindow } from 'svgdom';
-import { HorizontalAlign, VerticalAlign } from './geometry.js';
-import { defaultFont } from './globals.js';
+import { HorizontalAlign, VerticalAlign } from './geometry.mjs';
+import { defaultFont } from './globals.mjs';
+import { JSModuleType, detectJSModuleType } from './helpers.mjs';
 let MainCanvas = null;
 const supportedFonts = {};
-export async function prepareSizing(fontsPath) {
-    await config.setFontDir(fontsPath)
-        .setFontFamilyMappings(supportedFonts)
-        .preloadFonts();
+let globalCreateSVGWindow;
+export async function prepareSVGEnvironment(fontsPath) {
+    const moduleType = detectJSModuleType();
+    if (moduleType === JSModuleType.CommonJs) {
+        const { config, createSVGWindow } = await import('svgdom');
+        globalCreateSVGWindow = createSVGWindow;
+        if (fontsPath !== null) {
+            await config.setFontDir(fontsPath)
+                .setFontFamilyMappings(supportedFonts)
+                .preloadFonts();
+        }
+    }
+}
+export function getCreateSVGWindow() {
+    if (globalCreateSVGWindow === undefined) {
+        throw "SVG environment is not set up yet";
+    }
+    return globalCreateSVGWindow;
 }
 export function applyFontsToSVG(canvas) {
 }
@@ -18,7 +32,7 @@ const measureTextSizeCache = {};
 const measureTextSizeCacheHits = {};
 export function measureTextSize2(text, fontFamily, fontSize, fontWeight = 'regular', anchor = HorizontalAlign.Left, vanchor = VerticalAlign.Bottom) {
     if (MainCanvas === null) {
-        const window = createSVGWindow();
+        const window = getCreateSVGWindow()();
         const { document } = window;
         registerWindow(window, document);
         MainCanvas = SVG(document.documentElement);

package/{src/main.ts → dist/esm/validate.mjs}

@@ -1,24 +1,19 @@
 #! /usr/bin/env node
-
 import { program } from 'commander';
 import figlet from 'figlet';
 import path from 'path';
-import { fileURLToPath } from 'url';
-import { readFileSync, watch } from 'fs';
-
-import { prepareSizing } from './sizing.js';
-import { renderScript } from './helpers.js';
-
-export default async function main(): Promise<void> {
-    const toolSrcPath = fileURLToPath(import.meta.url);
-
+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;
-
+    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)
@@ -30,76 +25,50 @@ export default async function main(): Promise<void> {
         .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')
-        ;
-
+        .option('-s, --stats', 'Show stats during generation');
     program.addHelpText('before', figlet.textSync('circuitscript', {
         font: 'Small Slant'
     }));
-
-    if (process.argv.length < 3){
+    if (process.argv.length < 3) {
         program.help();
     }
-    
-    program.parse();    
-
+    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 prepareSizing(fontsPath);
-
-    let inputFilePath: string = null;
-
-    let scriptData: string;
+    await prepareSVGEnvironment(fontsPath);
+    let inputFilePath = null;
+    let scriptData;
     if (options.input) {
         scriptData = options.input;
-    } else {
-        inputFilePath = options.inputFile; // this should be provided
-        scriptData = readFileSync(inputFilePath, { encoding: 'utf-8' });
-
+    }
+    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 renderOptions = {
+    }
+    const scriptOptions = {
         currentDirectory,
         defaultLibsPath,
-        dumpNets, 
+        dumpNets,
         dumpData,
         kicadNetlistPath: kicadNetlist,
         showStats: options.stats,
-    }
-
-    const output = renderScript(scriptData, outputPath,
-        renderOptions);
-
-    if (outputPath === null && output){
-        console.log(output);
-    }
-
-    if (watchFileChanges) {
-        watch(inputFilePath, event => {
-            if (event === 'change') {
-                const scriptData = readFileSync(inputFilePath, 
-                    {encoding: 'utf-8'});
-
-                renderScript(scriptData, outputPath, renderOptions);
-                console.log('done');
-            }
-        });
-    }
+    };
+    const visitor = validateScript(scriptData, scriptOptions);
+    const semanticTokensVisitor = getSemanticTokens(scriptData, scriptOptions);
 }
-
-main();
+validate();