circuitscript 0.3.2 → 0.4.1

package/dist/cjs/antlr/CircuitScriptParserVisitor.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CircuitScriptParserVisitor = void 0;
+const antlr4ng_1 = require("antlr4ng");
+class CircuitScriptParserVisitor extends antlr4ng_1.AbstractParseTreeVisitor {
+}
+exports.CircuitScriptParserVisitor = CircuitScriptParserVisitor;

package/dist/cjs/cache/deserializer.js

@@ -0,0 +1,34 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deserializeLibraryScope = void 0;
+const types_js_1 = require("../objects/types.js");
+function deserializeLibraryScope(ir, name, libraryNamespace, filePathUsed, importHandling, specificImports, importContext, parseAndVisit, enterContext, exitContext, libraryFileHash) {
+    const importedLibrary = new types_js_1.ImportedLibrary(name, libraryNamespace, filePathUsed, null, null, importContext, importHandling, specificImports, libraryFileHash);
+    ir.functions.forEach(func => {
+        const { name, uniqueId } = func;
+        const functionEntry = importContext.createFunctionLazyLoaded(importContext.namespace, name, uniqueId);
+        functionEntry.lazyLoader = () => {
+            importContext.log(`loading lazy function ${name}`);
+            enterContext();
+            const [line, column, sourceText] = func.sourceText;
+            const { tokens, tree } = parseAndVisit(sourceText, line - 1);
+            importedLibrary.referencedTokens.push([tokens, tree]);
+            exitContext();
+            functionEntry.tokens = tokens;
+            functionEntry.tree = tree;
+        };
+    });
+    enterContext();
+    for (const importStatement of ir.imports) {
+        const [line, column, statement] = importStatement;
+        parseAndVisit(statement, line - 1);
+    }
+    for (const block of (ir.topLevel ?? [])) {
+        const [line, column, sourceText] = block;
+        const { tokens, tree } = parseAndVisit(sourceText, line - 1);
+        importedLibrary.referencedTokens.push([tokens, tree]);
+    }
+    exitContext();
+    return importedLibrary;
+}
+exports.deserializeLibraryScope = deserializeLibraryScope;

package/dist/cjs/cache/hash.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.computeContentHash = void 0;
+const crypto_1 = require("crypto");
+function computeContentHash(fileContent) {
+    return (0, crypto_1.createHash)('sha256').update(fileContent, 'utf8').digest('hex');
+}
+exports.computeContentHash = computeContentHash;

package/dist/cjs/cache/serializer.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.serializeLibraryScope = void 0;
+const types_js_1 = require("./types.js");
+const CircuitScriptLexer_js_1 = require("../antlr/CircuitScriptLexer.js");
+const utils_js_1 = require("../annotate/utils.js");
+function serializeLibraryScope(importedLib, contentHash) {
+    const functions = [];
+    const topLevelExpressions = [];
+    const scope = importedLib.context.scope;
+    const { tokens: libraryTokens, refdesAnnotations } = importedLib;
+    const libraryInputStream = libraryTokens.tokenSource.inputStream;
+    scope.functions.forEach((entry) => {
+        let useSource = '';
+        let useTokenLine = 0;
+        let useTokenColumn = 0;
+        if (libraryTokens !== null && entry.source !== null) {
+            const source = entry.source;
+            const startIndex = source.start?.tokenIndex ?? 0;
+            const stopIndex = source.stop?.tokenIndex ?? -1;
+            const contextTokens = libraryTokens.getTokens(startIndex, stopIndex);
+            const startToken = source.start;
+            const startChar = startToken.start ?? -1;
+            const stopChar = getFunctionDefinitionEnding(source, libraryTokens);
+            const sourceText = libraryInputStream != null && startChar >= 0 && stopChar >= 0
+                ? libraryInputStream.getTextFromRange(startChar, stopChar)
+                : libraryTokens.getTextFromContext(source);
+            useSource = (0, utils_js_1.generateModifiedSourceText)(refdesAnnotations, contextTokens, sourceText, startToken.start);
+            useTokenLine = startToken.line;
+            useTokenColumn = startToken.column;
+        }
+        functions.push({
+            name: entry.name,
+            namespace: entry.originalNamespace,
+            uniqueId: entry.uniqueId ?? '',
+            sourceText: [
+                useTokenLine, useTokenColumn, useSource
+            ]
+        });
+    });
+    const tree = importedLib.tree;
+    if (tree != null) {
+        let groupCtx = [];
+        let groupStart = null;
+        let prevStopLine = null;
+        const flushGroup = () => {
+            let useSource = '';
+            if (groupCtx.length > 0 && groupStart !== null) {
+                const startToken = groupCtx[0].start;
+                const stopToken = groupCtx[groupCtx.length - 1].stop;
+                const startIndex = startToken.tokenIndex ?? 0;
+                const stopIndex = stopToken.tokenIndex ?? -1;
+                const contextTokens = libraryTokens.getTokens(startIndex, stopIndex);
+                const startChar = startToken.start ?? -1;
+                const stopChar = stopToken.stop ?? -1;
+                const sourceText = libraryInputStream.getTextFromRange(startChar, stopChar);
+                useSource = (0, utils_js_1.generateModifiedSourceText)(refdesAnnotations, contextTokens, sourceText, startToken.start);
+                topLevelExpressions.push([
+                    ...groupStart,
+                    useSource
+                ]);
+            }
+            groupCtx = [];
+            groupStart = null;
+            prevStopLine = null;
+        };
+        for (const exprCtx of tree.expression()) {
+            if (exprCtx.function_def_expr() !== null) {
+                flushGroup();
+                continue;
+            }
+            if (exprCtx.NEWLINE() !== null) {
+                if (groupCtx.length > 0) {
+                    groupCtx.push(exprCtx);
+                }
+                continue;
+            }
+            const startToken = exprCtx.start;
+            if (startToken == null)
+                continue;
+            const currentStartLine = startToken.line;
+            if (prevStopLine !== null && currentStartLine > prevStopLine + 1) {
+                flushGroup();
+            }
+            if (groupStart == null) {
+                groupStart = [currentStartLine, startToken.column];
+            }
+            groupCtx.push(exprCtx);
+            prevStopLine = exprCtx.stop?.line ?? currentStartLine;
+        }
+        flushGroup();
+    }
+    const imports = [];
+    for (const [libName, lib] of importedLib.context.scope.libraries) {
+        imports.push(lib.importStatement);
+    }
+    return {
+        schemaVersion: types_js_1.CACHE_SCHEMA_VERSION,
+        contentHash,
+        libraryFilePath: importedLib.libraryFilePath,
+        imports,
+        functions,
+        topLevel: topLevelExpressions,
+    };
+}
+exports.serializeLibraryScope = serializeLibraryScope;
+function getFunctionDefinitionEnding(source, tokens) {
+    let stopChar = source.stop?.stop ?? -1;
+    const stopTokenIndex = source.stop?.tokenIndex ?? -1;
+    if (stopTokenIndex >= 0) {
+        for (let i = stopTokenIndex; i >= 0; i--) {
+            const tok = tokens.get(i);
+            if (tok.type !== CircuitScriptLexer_js_1.CircuitScriptLexer.NEWLINE &&
+                tok.type !== CircuitScriptLexer_js_1.CircuitScriptLexer.DEDENT &&
+                tok.type !== CircuitScriptLexer_js_1.CircuitScriptLexer.INDENT) {
+                stopChar = tok.stop ?? stopChar;
+                break;
+            }
+        }
+    }
+    return stopChar;
+}

package/dist/cjs/cache/storage.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeCache = exports.readCache = exports.getCachePath = void 0;
+const fs_1 = require("fs");
+const path_1 = require("path");
+const types_js_1 = require("./types.js");
+function getCachePath(libFilePath) {
+    const dir = (0, path_1.dirname)(libFilePath);
+    const base = (0, path_1.basename)(libFilePath);
+    return (0, path_1.join)(dir, '.cst.cache', `${base}.json`);
+}
+exports.getCachePath = getCachePath;
+function readCache(libFilePath, hash) {
+    try {
+        const cachePath = getCachePath(libFilePath);
+        if (!(0, fs_1.existsSync)(cachePath)) {
+            return null;
+        }
+        const raw = (0, fs_1.readFileSync)(cachePath, 'utf8');
+        const ir = JSON.parse(raw);
+        if (ir.schemaVersion !== types_js_1.CACHE_SCHEMA_VERSION || ir.contentHash !== hash) {
+            return null;
+        }
+        return ir;
+    }
+    catch {
+        return null;
+    }
+}
+exports.readCache = readCache;
+function writeCache(libFilePath, hash, ir) {
+    try {
+        const cachePath = getCachePath(libFilePath);
+        const cacheDir = (0, path_1.dirname)(cachePath);
+        if (!(0, fs_1.existsSync)(cacheDir)) {
+            (0, fs_1.mkdirSync)(cacheDir, { recursive: true });
+        }
+        const tmp = cachePath + '.tmp';
+        (0, fs_1.writeFileSync)(tmp, JSON.stringify(ir), 'utf8');
+        (0, fs_1.renameSync)(tmp, cachePath);
+    }
+    catch {
+    }
+}
+exports.writeCache = writeCache;

package/dist/cjs/cache/types.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CACHE_SCHEMA_VERSION = void 0;
+exports.CACHE_SCHEMA_VERSION = 3;

package/dist/cjs/{environment.js → environment/environment.js}

@@ -8,8 +8,8 @@ const svg_js_1 = require("@svgdotjs/svg.js");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const crypto_js_1 = __importDefault(require("crypto-js"));
-const globals_js_1 = require("./globals.js");
-const utils_js_1 = require("./utils.js");
+const globals_js_1 = require("../globals.js");
+const utils_js_1 = require("../utils.js");
 class NodeScriptEnvironment {
     constructor() {
         this.useModuleDirectoryPath = null;
@@ -60,14 +60,15 @@ class NodeScriptEnvironment {
             return this.useModuleDirectoryPath;
         }
         if (typeof __dirname !== 'undefined') {
-            return __dirname;
+            return path_1.default.resolve(__dirname + "/../");
         }
         const stackLine = new Error().stack?.split('\n')[1];
         if (stackLine) {
             const fileMatch = stackLine.match(/\((.+)\:[\d]+\:[\d]+\)/);
             if (fileMatch) {
                 const filePath = fileMatch[1].replace('file://', '');
-                return path_1.default.dirname(filePath);
+                const finalPath = path_1.default.resolve(path_1.default.dirname(filePath) + "/../");
+                return finalPath;
             }
         }
         throw new utils_js_1.RuntimeExecutionError("Failed to get current module directory");
@@ -134,7 +135,15 @@ class NodeScriptEnvironment {
         return path_1.default.resolve(filePath);
     }
     getDirPath(filePath) {
-        return path_1.default.dirname(path_1.default.resolve(filePath));
+        const resolved = path_1.default.resolve(filePath);
+        try {
+            if (fs_1.default.statSync(resolved).isDirectory()) {
+                return resolved;
+            }
+        }
+        catch {
+        }
+        return path_1.default.dirname(resolved);
     }
     setCurrentFile(filePath) {
         this.currentFile = this.getAbsolutePath(filePath);
@@ -143,7 +152,7 @@ class NodeScriptEnvironment {
     getCurrentFile() {
         return this.currentFile;
     }
-    getRelativeToCurrentFolder(filePath) {
+    getAbsPathRelativeToCurrentFolder(filePath) {
         return path_1.default.join(this.getDirPath(this.currentFile), filePath);
     }
     async exists(path) {
@@ -176,6 +185,9 @@ class NodeScriptEnvironment {
     createWriteStream(filePath) {
         return fs_1.default.createWriteStream(filePath);
     }
+    getCurrentDirectory() {
+        return process.cwd();
+    }
 }
 exports.NodeScriptEnvironment = NodeScriptEnvironment;
 NodeScriptEnvironment._instance = null;

package/dist/cjs/environment/esm-environment.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ESMNodeScriptEnvironment = void 0;
+const svgdom_1 = require("svgdom");
+const environment_1 = require("./environment");
+class ESMNodeScriptEnvironment extends environment_1.NodeScriptEnvironment {
+    async prepareSVGEnvironmentInternal(fontsPath) {
+        try {
+            this.globalCreateSVGWindow = svgdom_1.createSVGWindow;
+            if (fontsPath !== null) {
+                await svgdom_1.config.setFontDir(fontsPath)
+                    .setFontFamilyMappings(this.supportedFonts)
+                    .preloadFonts();
+            }
+        }
+        catch (error) {
+            throw new Error(`Failed to load svgdom ESM module: ${error}`);
+        }
+    }
+}
+exports.ESMNodeScriptEnvironment = ESMNodeScriptEnvironment;

package/dist/cjs/environment/helpers.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNewEnvironment = void 0;
+const esm_environment_1 = require("./esm-environment");
+function getNewEnvironment() {
+    return new esm_environment_1.ESMNodeScriptEnvironment();
+}
+exports.getNewEnvironment = getNewEnvironment;

package/dist/cjs/execute.js

@@ -10,9 +10,9 @@ const PinDefinition_js_1 = require("./objects/PinDefinition.js");
 const types_js_1 = require("./objects/types.js");
 const Wire_js_1 = require("./objects/Wire.js");
 const Frame_js_1 = require("./objects/Frame.js");
-const layout_js_1 = require("./layout.js");
+const layout_js_1 = require("./render/layout.js");
 const helpers_js_1 = require("./helpers.js");
-const draw_symbols_js_1 = require("./draw_symbols.js");
+const draw_symbols_js_1 = require("./render/draw_symbols.js");
 const utils_js_1 = require("./utils.js");
 class ExecutionContext {
     constructor(name, namespace, netNamespace, executionLevel = 0, scopeLevel = 0, silent = false, logger, warnings, parent) {
@@ -615,10 +615,36 @@ class ExecutionContext {
         return this.scope.breakStack[this.scope.breakStack.length - 1];
     }
     createFunction(namespace, functionName, __runFunc, source, uniqueId) {
-        const functionPath = `${namespace}${functionName}`;
-        this.scope.functions.set(functionPath, new types_js_1.CFunctionEntry(namespace, functionName, __runFunc, source, uniqueId));
+        const functionEntry = new types_js_1.CFunctionEntry(namespace, functionName, __runFunc, source, uniqueId);
+        const functionPath = functionEntry.getFunctionPath();
+        if (this.scope.functions.has(functionPath)) {
+            this.log(`function: ${functionPath} already exists`);
+            const existingEntry = this.scope.functions.get(functionPath);
+            if (existingEntry.lazyLoaded) {
+                this.log(`updating lazy function: ${functionPath}`);
+                existingEntry.execute = __runFunc;
+                existingEntry.source = source;
+            }
+            else {
+                this.log(`function is already defined: ${functionName}`);
+                console.log(`WARNING: function is already defined ${functionName}`);
+            }
+        }
+        else {
+            this.scope.functions.set(functionPath, functionEntry);
+            this.log(`defined new function: ${functionPath}`);
+        }
         this.__functionCache.set(functionPath, __runFunc);
-        this.log(`defined new function: ${functionPath}`);
+        return functionEntry;
+    }
+    createFunctionLazyLoaded(namespace, functionName, uniqueId) {
+        const functionEntry = new types_js_1.CFunctionEntry(namespace, functionName, null, null, uniqueId);
+        const functionPath = functionEntry.getFunctionPath();
+        functionEntry.lazyLoaded = true;
+        this.scope.functions.set(functionPath, functionEntry);
+        this.__functionCache.set(functionPath, null);
+        this.log(`defined new function with lazy flag: ${functionPath}`);
+        return functionEntry;
     }
     hasFunction(functionName) {
         return this.scope.functions.has(functionName);
@@ -648,11 +674,11 @@ class ExecutionContext {
                             && library.specifiedImports.indexOf(idName) !== -1)) {
                         const { context: libraryContext } = library;
                         const functionPath = `${libraryContext.namespace}${idName}`;
-                        if (library.context.hasFunction(functionPath)) {
+                        if (libraryContext.hasFunction(functionPath)) {
                             return new types_js_1.DeclaredReference({
                                 found: true,
                                 rootValue: library,
-                                value: library.context.getFunction(functionPath),
+                                value: libraryContext.getFunction(functionPath),
                                 type: globals_js_1.ReferenceTypes.function,
                                 name: idName,
                                 trailerIndex: 1,
@@ -759,7 +785,14 @@ class ExecutionContext {
     }
     callFunction(functionReference, functionParams, executionStack, netNamespace) {
         const functionEntry = functionReference.value;
-        const { name: functionName, execute: __runFunc } = functionEntry;
+        const { name: functionName } = functionEntry;
+        let { execute: __runFunc } = functionEntry;
+        if (__runFunc === null && functionEntry.lazyLoaded) {
+            this.log(`load lazy function: ${functionEntry.getFunctionPath()}`);
+            functionEntry.lazyLoader !== null && functionEntry.lazyLoader();
+            this.log(`done loading lazy function: ${functionEntry.getFunctionPath()}, replacing execute method`);
+            __runFunc = functionEntry.execute;
+        }
         if (__runFunc !== null) {
             let functionCallIndex = -1;
             if (!this.scope.functionCounter.has(__runFunc)) {
@@ -941,7 +974,7 @@ class ExecutionContext {
                 [(0, ParamDefinition_js_1.numeric)(1), (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0),
                     (0, ParamDefinition_js_1.numeric)(0), (0, ParamDefinition_js_1.numeric)(0)],
                 new Map([
-                    ["display_pin_id", false]
+                    ["display_id", false]
                 ]),
                 null
             ]
@@ -1077,8 +1110,9 @@ class ExecutionContext {
                 if (targetAngle === null) {
                     return;
                 }
-                this.log('set component unit angle from wire, target angle:', targetAngle, ', component unit angle:', targetUnit.angleProp, 'pin angle:', connectedPinPos.angle);
-                let useAngle = (targetAngle - connectedPinPos.angle.toNumber()) % 360;
+                const pinAngle = connectedPinPos.angle.toNumber();
+                this.log('set component unit angle from wire, target angle:', targetAngle, ', component unit angle:', targetUnit.angleProp, 'pin angle:', pinAngle);
+                let useAngle = (targetAngle - pinAngle) % 360;
                 if (useAngle < 0) {
                     useAngle += 360;
                 }
@@ -1086,12 +1120,12 @@ class ExecutionContext {
                     targetUnit.setParam(globals_js_1.ParamKeys.angle, (0, ParamDefinition_js_1.numeric)(90));
                 }
                 else if (useAngle === 180) {
-                    if (targetUnit.angleProp === 0 || targetUnit.angleProp === 180) {
-                        targetUnit.setParam(globals_js_1.ParamKeys.flipX, (0, ParamDefinition_js_1.numeric)(1));
-                    }
-                    else if (targetUnit.angleProp === 90 || targetUnit.angleProp === 270) {
+                    if (pinAngle == 90 || pinAngle == 270) {
                         targetUnit.setParam(globals_js_1.ParamKeys.flipY, (0, ParamDefinition_js_1.numeric)(1));
                     }
+                    else if (pinAngle == 0 || pinAngle == 180) {
+                        targetUnit.setParam(globals_js_1.ParamKeys.flipX, (0, ParamDefinition_js_1.numeric)(1));
+                    }
                 }
                 else if (useAngle === 270) {
                     targetUnit.setParam(globals_js_1.ParamKeys.angle, (0, ParamDefinition_js_1.numeric)(270));

package/dist/cjs/globals.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderFlags = exports.GlobalDocumentName = exports.ModuleContainsKeyword = exports.FrameType = exports.NetGraphicsParams = exports.BlockTypes = exports.ReferenceTypes = exports.ComponentTypes = exports.ColorScheme = exports.PortPaddingVertical = exports.PortPaddingHorizontal = exports.PortArrowSize = exports.junctionSize = exports.defaultFontSize = exports.defaultFontBold = exports.defaultFont = exports.displayUnits = exports.defaultFrameTitleTextSize = exports.CustomSymbolParamTextSize = exports.CustomSymbolRefDesSize = exports.CustomSymbolPinIdSize = exports.CustomSymbolPinTextSize = exports.defaultPageSpacingMM = exports.defaultPageMarginMM = exports.defaultPinIdTextSize = exports.defaultPinNameTextSize = exports.defaultWireLineWidth = exports.defaultSymbolLineWidth = exports.fontDisplayScale = exports.defaultZoomScale = exports.defaultGridSizeUnits = exports.portHeight = exports.portWidth = exports.PxToMM = exports.MMToPt = exports.MMToPx = exports.MilsToMM = exports.WireAutoDirection = exports.LengthUnit = exports.ValidPinSides = exports.SymbolPinSide = exports.LayoutDirection = exports.ParamKeys = exports.NoNetText = exports.GlobalNames = exports.RefdesFileSuffix = exports.BaseNamespace = exports.DoubleDelimiter1 = exports.Delimiter1 = exports.TOOL_VERSION = void 0;
-exports.DefaultComponentUnit = exports.TrailerArrayIndex = exports.SymbolValidatorContext = void 0;
+exports.PinTypesList = exports.DefaultComponentUnit = exports.TrailerArrayIndex = exports.SymbolValidatorContext = void 0;
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
+const PinTypes_js_1 = require("./objects/PinTypes.js");
 exports.TOOL_VERSION = '0.1.5';
 exports.Delimiter1 = '-';
 exports.DoubleDelimiter1 = `${exports.Delimiter1}${exports.Delimiter1}`;
@@ -135,3 +136,10 @@ exports.RenderFlags = {
 exports.SymbolValidatorContext = '_sym';
 exports.TrailerArrayIndex = 'index';
 exports.DefaultComponentUnit = '__default';
+exports.PinTypesList = [
+    PinTypes_js_1.PinTypes.Any,
+    PinTypes_js_1.PinTypes.Input,
+    PinTypes_js_1.PinTypes.Output,
+    PinTypes_js_1.PinTypes.IO,
+    PinTypes_js_1.PinTypes.Power,
+];