circuitscript 0.0.22 → 0.0.24

package/src/render.ts

@@ -1,260 +0,0 @@
-import { createSVGWindow } from 'svgdom';
-import { SVG, SVGTypeMapping, registerWindow } from '@svgdotjs/svg.js';
-
-import { BoundBox, MergedWire, RenderComponent, RenderFrame, 
-    RenderFrameType, RenderJunction, RenderText, RenderWire, 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';
-
-export function generateSVG2(graph: {
-    components: RenderComponent[],
-    wires: RenderWire[], junctions: RenderJunction[],
-    mergedWires: MergedWire[], debugRects: BoundBox[],
-    frameObjects: RenderFrame[],
-    textObjects: RenderText[],
-    }): string {
-
-    const window = createSVGWindow();
-    const document = window.document;
-
-    registerWindow(window, document);
-
-    const canvas = SVG(document.documentElement);
-    applyFontsToSVG(canvas);
-
-    generateSVGChild(canvas, 
-        graph.components, graph.wires, graph.junctions, graph.mergedWires,
-        graph.frameObjects, graph.textObjects,
-        );
-    const {x, y, width, height} = canvas.bbox();
-
-    const margin = 5;
-    const widthAndMargin = width + margin * 2;
-    const heightAndMargin = height + margin * 2;
-
-    const scale = 1;
-
-    canvas.size(widthAndMargin * scale, heightAndMargin * scale);
-    canvas.viewbox(x - margin, y - margin, widthAndMargin, heightAndMargin);
-
-    return canvas.svg();
-}
-
-function generateSVGChild(canvas: SVGTypeMapping<SVGAElement>, 
-    components: RenderComponent[], wires: RenderWire[], 
-    junctions: RenderJunction[], mergedWires:MergedWire[],
-    frameObjects:RenderFrame[], textObjects: RenderText[] ): void {
-
-    const displayWireId = false;
-
-    // Draw the display grid
-    const bounds = getBounds(components, wires, junctions, frameObjects);
-
-    drawGrid(
-        canvas.group().translate(0, 0),
-        {
-            x: bounds.xmin,
-            y: bounds.ymin,
-            x2: bounds.xmax,
-            y2: bounds.ymax
-        });
-
-    components.forEach(item => {
-        const { x, y, width, height } = item;
-        const symbolGroup = canvas.group();
-        symbolGroup.translate(x, y);
-
-        const { symbol = null } = item;
-
-        if (symbol !== null && symbol) {
-            let extra = {};
-            if (item.component.parameters.has('__is_net')) {
-                extra.net_name = item.component.parameters.get(ParamKeys.net_name);
-
-            } else if (item.component.parameters.has('value')) {
-                let tmpValue = item.component.parameters.get('value');
-                if (tmpValue instanceof NumericValue){
-                    // Prepare value for display
-                    tmpValue = (tmpValue as NumericValue).value;
-                }
-                
-                extra.value = tmpValue;
-            }
-
-            extra.instance_name = item.component.instanceName;
-            
-            if (item.component.parameters.has('place')){
-                extra.place = item.component.parameters.get('place');
-            } else {
-                extra.place = true; // Default is to place the item
-            }
-
-            symbol.draw(symbolGroup, extra);
-
-        } else {
-            // draw default shape
-            symbolGroup.rect(width, height)
-                .fill(bodyColor)
-                .stroke({ width: 1, color: '#333' });
-        }
-    });
-
-    if (displayWireId){
-        // Debugging method to draw the wire id next to the wires.
-        const wiresGroup = canvas.group().translate(0, 0);
-        
-        wires.forEach(wire => {
-            // Draw the wire id at the start of the wire
-            wiresGroup.text(wire.id.toString())
-                .font({
-                    family: 'Inter',
-                    size: 10,
-                })
-                .translate(wire.x+5, wire.y+5)
-        });
-    }
-
-    const mergedWireGroup = canvas.group();
-
-    // draw the merged wires
-    mergedWires.forEach(tmpItem => {
-        const { segments, intersectPoints } = tmpItem;
-
-        segments.forEach(segment => {
-            const pt1 = segment[0];
-            const pt2 = segment[1];
-            mergedWireGroup.line([pt1, pt2])
-                .stroke({ width: 1, color: wireColor, linecap: 'square' })
-                .fill('none');
-        });
-
-        intersectPoints.forEach(point => {
-            const [x, y, count] = point;
-            mergedWireGroup.circle(junctionSize)
-                            .translate(x - junctionSize/2, y - junctionSize/2)
-                            .fill(junctionColor)
-                            .stroke('none');
-                            
-            // mergedWireGroup.text(count.toString())
-            //                 .translate(x + 2, y + 2)
-            //                 .font({
-            //                     family: 'Inter',
-            //                     size: 10,
-            //                 })
-        });
-    });
-
-    // const debugRectsGroup = canvas.group();
-    // debugRects.forEach(box => {
-    //     // Draw a rect
-    //     const width = box.xmax - box.xmin;
-    //     const height = box.ymax - box.ymin;
-    //     const tmpRect = debugRectsGroup.rect(width, height)
-    //                         .fill('none')
-    //                         .stroke({ width: 1, color: '#000'});
-    //     tmpRect.translate(box.xmin, box.ymin);
-    // });
-
-    const frameGroup = canvas.group();
-    const showElementFrames = false;
-
-    frameObjects.forEach(item => {
-        const { bounds, borderWidth } = item;
-        if (borderWidth > 0){
-            const { width, height } = getBoundsSize(bounds);
-
-            let strokeColor = '#111';
-            if (item.type === RenderFrameType.Container) {
-                strokeColor = '#111';
-            } else if (item.type === RenderFrameType.Elements){
-                strokeColor = '#aaa';
-                if (!showElementFrames){
-                    return;
-                }
-            }
-
-            const tmpRect = frameGroup.rect(width, height)
-                .fill('none')
-                .stroke({ width: borderWidth, color: strokeColor });
-
-            tmpRect.translate(item.x, item.y);
-        }
-    });
-
-    textObjects.forEach(item => {
-        const {x, y, symbol} = item;
-        const innerGroup = canvas.group();
-        innerGroup.translate(x, y);
-        symbol.draw(innerGroup);
-    });
-
-    const drawOrigin = false;
-
-    // Draw origin
-    drawOrigin && canvas.group().translate(0,0)
-        .circle(5)
-        .translate(-5/2, -5/2)
-        .stroke('none').fill('red');
-}
-
-function drawGrid(group: G, canvasSize: { x: number, y: number, x2: number, y2: number }): void {
-    const gridSize = 20;
-    const { x, y, x2, y2 } = canvasSize;
-
-    const gridStartX = (Math.floor(x / gridSize) - 1) * gridSize;
-    const gridStartY = (Math.floor(y / gridSize) - 1) * gridSize;
-
-    const gridEndX = (Math.ceil(x2 / gridSize) + 1) * gridSize;
-    const gridEndY = (Math.ceil(y2 / gridSize) + 1) * gridSize;
-
-    const numCols = Math.ceil((gridEndX - gridStartX) / gridSize);
-    // const numRows = Math.ceil((gridEndY - gridStartY) / gridSize);
-
-    // Draws (0, 0) point
-    // group.circle(5)
-    //     .translate(-5 / 2, -5 / 2)
-    //     .fill('red')
-    //     .stroke('none');
-
-    const lines = [];
-
-    for (let i = 0; i <= numCols; i++) {
-        const startX = gridStartX + i * gridSize;
-        const startY = gridStartY-0.5;
-        const endY = gridEndY;
-        lines.push(`M ${startX} ${startY} L ${startX} ${endY}`);
-    }
-
-    group.path(lines.join(" "))
-        .fill('none')
-        .attr({
-            'stroke-dasharray': '1,' + (gridSize-1),
-        })
-        .stroke({
-            width: 1,
-            color: '#aaa'
-        })
-}
-
-function calculateBoundingBox(components: RenderComponent[]): { width: number, height: number } {
-    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/src/sizing.ts

@@ -1,96 +0,0 @@
-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',
-}
-
-export async function prepareSizing(fontsPath): Promise<void> {
-    await config.setFontDir(fontsPath)
-        .setFontFamilyMappings(supportedFonts)
-        .preloadFonts()
-}
-
-export function applyFontsToSVG(canvas: SVGTypeMapping): void {
-    // for (const fontName in supportedFonts) {
-    //     canvas.fontface(fontName, "url('" + InterFontEncoded + "')");
-    // }
-}
-
-export async function measureTextSize(text: string, fontFamily: string, fontSize: number): Promise<{ width: number, height: number }> {
-    // Async version, in case measuring text sizes need more time
-    return measureTextSize2(text, fontFamily, fontSize);
-}
-
-// Cache measurements to avoid recalculations
-const measureTextSizeCache: {
-    [key: string]: {
-        width: number,
-        height: number, box: Box
-    }
-} = {};
-const measureTextSizeCacheHits: { [key: string]: number } = {};
-
-export function measureTextSize2(text: string, fontFamily: string,
-    fontSize: number, fontWeight = 'regular',
-    anchor = HorizontalAlign.Left,
-    vanchor = VerticalAlign.Bottom): { width: number, height: number, box: Box } {
-
-    // Reuse the canvas, so no need to keep creating
-    if (MainCanvas === null) {
-        const window = createSVGWindow();
-        const { document } = window;
-        registerWindow(window, document);
-        MainCanvas = SVG(document.documentElement);
-    }
-
-    // Check if entry already exists in the cache
-    const key = `${text}-${fontFamily}-${fontSize}-${fontWeight}-${anchor}-${vanchor}`;
-
-    if (measureTextSizeCache[key] === undefined) {
-        let dominantBaseline = 'hanging';
-        switch(vanchor){
-            case VerticalAlign.Top:
-                dominantBaseline = 'hanging';
-                break;
-
-            case VerticalAlign.Middle:
-                dominantBaseline = 'middle';
-                break;
-
-            case VerticalAlign.Bottom:
-                dominantBaseline = 'text-top';
-                break;
-        }
-
-        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;
-        tmpTextElement.remove();
-
-        measureTextSizeCache[key] = {
-            width: Math.round(width * 100) / 100,
-            height: Math.round(height * 100) / 100,
-            box: textbox,
-        }
-        measureTextSizeCacheHits[key] = 0;
-    }
-
-    measureTextSizeCacheHits[key]++;
-    return measureTextSizeCache[key];
-}

package/tsconfig.json

@@ -1,27 +0,0 @@
-{
-    "compilerOptions": {
-      "target": "ES2022",
-      "module": "Node16",
-      "lib": ["ES2022"],
-      "moduleResolution": "Node16",
-      "rootDir": ".",
-      "outDir": "build",
-      "allowSyntheticDefaultImports": true,
-      "importHelpers": true,
-      "alwaysStrict": true,
-      "sourceMap": true,
-      "forceConsistentCasingInFileNames": true,
-      "noFallthroughCasesInSwitch": true,
-      "noImplicitReturns": true,
-      "noUnusedLocals": true,
-      "noUnusedParameters": true,
-      "noImplicitAny": false,
-      "noImplicitThis": false,
-      "strictNullChecks": false,
-      "resolveJsonModule": true,
-      "skipLibCheck": true,
-      "esModuleInterop":true,
-      "declaration": true
-    },
-    "include": ["src/**/*", "__tests__/**/*"]
-  }

package/tsconfig.release.json

@@ -1,8 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "compilerOptions": {
-    "sourceMap": false,
-    "removeComments": true
-  },
-  "include": ["src/**/*"]
-}