circuitscript 0.0.7 → 0.0.12

package/.gitlab-ci.yml

@@ -10,7 +10,8 @@ variables:
 
 stages:
   - prepare
-  # - verify
+  - test_jest
+  - test_build
   - publish
 
 # Installs all dependencies.
@@ -26,27 +27,32 @@ install:
     when: on_success
     expire_in: 12h
   script:
-    - npm config set -- '//registry.npmjs.org/:_authToken' "${NPM_AUTH_TOKEN}"
     - npm install --no-progress --no-audit --no-fund --verbose
-    - npm run build:release || true
   # only:
   #   - merge_requests
   #   - develop
   #   - main
 
-# Lints the codebase.
-# lint:
-#   stage: verify
-#   interruptible: true
-#   retry: 1
-#   dependencies:
-#     - install
-#   script:
-#     - npm run lint
-#   # only:
-  #   - merge_requests
-  #   - develop
-  #   - main
+test_jest:
+  stage: test_jest
+  interruptible: true
+  retry: 1
+  dependencies:
+    - install
+  script:
+    - npm run test
+
+test_build:
+  stage: test_build
+  interruptible: true
+  retry: 1
+  dependencies:
+    - install
+  script:
+    - npm run build:release || true
+    - ls
+    - ls build
+    - node build/src/main.js
 
 # Publishes the package to npm.
 publish:
@@ -57,7 +63,6 @@ publish:
   script:
     - npm config set -- '//registry.npmjs.org/:_authToken' "${NPM_AUTH_TOKEN}"
     - npm run build:release || true
-    - ls build/src
     - npm publish --verbose
   resource_group: 'deployment-$CI_COMMIT_REF_SLUG'
   # rules:

package/README.md

@@ -1,3 +1,3 @@
 # circuitscript
 
-
+CLI tool for the [circuitscript language](https://circuitscript.net)

package/__tests__/helpers.ts

@@ -1,20 +1,21 @@
-import path from 'path';
-import fs from 'fs';
+import { dirname } from 'path';
 
-import CircuitScriptParser from '../src/antlr/CircuitScriptParser';
+import CircuitScriptParser from '../src/antlr/CircuitScriptParser.js';
 
 import { CharStream, CommonTokenStream } from 'antlr4';
-import { MainVisitor } from '../src/visitor';
-import { ComponentPinNet } from '../src/objects/types';
-import { CircuitscriptParserErrorListener, parseFileWithVisitor } from '../src/parser';
-import { ClassComponent } from '../src/objects/ClassComponent';
-import { MainLexer } from '../src/lexer';
+import { MainVisitor } from '../src/visitor.js';
+import { ComponentPinNet } from '../src/objects/types.js';
+import { CircuitscriptParserErrorListener } from '../src/parser.js';
+import { ClassComponent } from '../src/objects/ClassComponent.js';
+import { MainLexer } from '../src/lexer.js';
 
 
-export async function runScript(script: string): Promise<{visitor: MainVisitor, 
-    hasError: boolean, 
-    componentPinNets:ComponentPinNet[]}> {
-    
+export async function runScript(script: string): Promise<{
+    visitor: MainVisitor,
+    hasError: boolean,
+    componentPinNets: ComponentPinNet[]
+}> {
+
     const chars = new CharStream(script);
     const lexer = new MainLexer(chars);
     const tokens = new CommonTokenStream(lexer);
@@ -25,21 +26,22 @@ export async function runScript(script: string): Promise<{visitor: MainVisitor,
 
     const errorListener = new CircuitscriptParserErrorListener();
     parser.addErrorListener(errorListener);
-    
+
     const tree = parser.script();
 
     const scriptPath = "./examples/helpers.ts";
+    const defaultLibsPath = "./libs";
 
     const visitor = new MainVisitor(true);
     visitor.printToConsole = false; // do not clutter the console log
 
-    const currentDirectory = path.dirname(scriptPath);
-    visitor.onImportFile = visitor.createImportFileHandler(currentDirectory);
+    const currentDirectory = dirname(scriptPath);
+    visitor.onImportFile = visitor.createImportFileHandler(currentDirectory, defaultLibsPath);
 
     let hasError = false;
     try {
         visitor.visit(tree);
-    } catch (err){
+    } catch (err) {
         // Error should be internally handled in visitor
         err.print(script);
         hasError = true;

package/__tests__/testMathOps.ts

@@ -1,4 +1,4 @@
-import { runScript } from "./helpers";
+import { runScript } from "./helpers.js";
 
 const script1 = `
 b = 10

package/__tests__/testRender.ts

@@ -1,8 +1,8 @@
-import fs from 'fs';
+import { readFileSync } from 'fs';
 
-import { LayoutEngine } from "../src/layout";
-import { generateSVG2 } from "../src/render";
-import { runScript } from "./helpers";
+import { LayoutEngine } from "../src/layout.js";
+import { generateSVG2 } from "../src/render.js";
+import { runScript } from "./helpers.js";
 
 const mainPath = '__tests__/renderData/';
 
@@ -13,11 +13,11 @@ describe('Render tests', () => {
         ['simple function', 'script2.cst'],
         ['simple frame', 'script3.cst'],
         ['drawing functions for graphics', 'script4.cst']
-        
+
     ])('render - %s (%s)', async (title, scriptPath) => {
 
-        const script = fs.readFileSync(mainPath + scriptPath, { encoding: 'utf8' });
-        const {hasError, visitor} = await runScript(script);
+        const script = readFileSync(mainPath + scriptPath, { encoding: 'utf8' });
+        const { hasError, visitor } = await runScript(script);
         expect(hasError).toBe(false);
         visitor.annotateComponents();
 
@@ -28,7 +28,7 @@ describe('Render tests', () => {
 
         const svgOutput = generateSVG2(graph);
 
-        const expectedSvgOutput = fs.readFileSync(mainPath + scriptPath + ".svg", { encoding: 'utf8' });
+        const expectedSvgOutput = readFileSync(mainPath + scriptPath + ".svg", { encoding: 'utf8' });
         expect(svgOutput).toBe(expectedSvgOutput);
     });
 });

package/build/src/main.js

@@ -1,8 +1,9 @@
 #! /usr/bin/env node
 import { program } from 'commander';
 import figlet from 'figlet';
-import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
+import { readFileSync, watch, writeFileSync } from 'fs';
 import { MainVisitor } from './visitor.js';
 import { prepareSizing } from './sizing.js';
 import { LayoutEngine } from './layout.js';
@@ -12,9 +13,14 @@ import { parseFileWithVisitor } from './parser.js';
 import { generateKiCADNetList } from './export.js';
 import { SimpleStopwatch } from './utils.js';
 export default async function main() {
+    const toolSrcPath = fileURLToPath(import.meta.url);
+    const toolDirectory = path.dirname(toolSrcPath) + '/../../';
+    const packageJson = JSON.parse(readFileSync(toolDirectory + 'package.json').toString());
+    ;
+    const { version } = packageJson;
     program
         .description('generate graphical output from circuitscript files')
-        .version('0.0.6')
+        .version(version)
         .option('-i, --input text <input text>', 'Input text directly')
         .option('-f, --input-file <path>', 'Input file')
         .option('-o, --output <path>', 'Output path')
@@ -38,10 +44,12 @@ export default async function main() {
     const dumpData = options.dumpData;
     const kicadNetlist = options.kicadNetlist;
     let currentDirectory = options.currentDirectory ?? null;
+    const fontsPath = toolDirectory + '/fonts';
+    const defaultLibsPath = toolDirectory + '/libs';
     if (watchFileChanges) {
         console.log('watching for file changes...');
     }
-    await prepareSizing();
+    await prepareSizing(fontsPath);
     let inputFilePath = null;
     let scriptData;
     if (options.input) {
@@ -49,13 +57,14 @@ export default async function main() {
     }
     else {
         inputFilePath = options.inputFile;
-        scriptData = fs.readFileSync(inputFilePath, { encoding: 'utf-8' });
+        scriptData = readFileSync(inputFilePath, { encoding: 'utf-8' });
         if (currentDirectory === null) {
             currentDirectory = path.dirname(inputFilePath);
         }
     }
     const renderOptions = {
         currentDirectory,
+        defaultLibsPath,
         dumpNets,
         dumpData,
         kicadNetlistPath: kicadNetlist,
@@ -66,9 +75,9 @@ export default async function main() {
         console.log(output);
     }
     if (watchFileChanges) {
-        fs.watch(inputFilePath, (event, targetFile) => {
+        watch(inputFilePath, (event, targetFile) => {
             if (event === 'change') {
-                const scriptData = fs.readFileSync(inputFilePath, { encoding: 'utf-8' });
+                const scriptData = readFileSync(inputFilePath, { encoding: 'utf-8' });
                 renderScript(scriptData, outputPath, renderOptions);
                 console.log('done');
             }
@@ -76,9 +85,9 @@ export default async function main() {
     }
 }
 export function renderScript(scriptData, outputPath, options) {
-    const { currentDirectory = null, dumpNets = false, dumpData = false, kicadNetlistPath = null, showStats = false } = options;
+    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, kicadNetlistPath = null, showStats = false } = options;
     const visitor = new MainVisitor(true);
-    visitor.onImportFile = visitor.createImportFileHandler(currentDirectory);
+    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);
@@ -87,8 +96,8 @@ export function renderScript(scriptData, outputPath, options) {
     if (dumpNets) {
         console.log(visitor.dumpNets());
     }
-    dumpData && fs.writeFileSync('dump/tree.lisp', tree.toStringTree(null, parser));
-    dumpData && fs.writeFileSync('dump/raw-parser.txt', visitor.logger.dump());
+    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;
@@ -96,7 +105,7 @@ export function renderScript(scriptData, outputPath, options) {
     visitor.annotateComponents();
     if (kicadNetlistPath) {
         const kicadNetList = generateKiCADNetList(visitor.getNetList());
-        fs.writeFileSync(kicadNetlistPath, kicadNetList);
+        writeFileSync(kicadNetlistPath, kicadNetList);
         console.log('Generated KiCad netlist file');
     }
     const { sequence, nets } = visitor.getGraph();
@@ -116,7 +125,7 @@ export function renderScript(scriptData, outputPath, options) {
         }
         return tmp.join(" | ");
     });
-    dumpData && fs.writeFileSync('dump/raw-sequence.txt', tmpSequence.join('\n'));
+    dumpData && writeFileSync('dump/raw-sequence.txt', tmpSequence.join('\n'));
     let svgOutput = null;
     try {
         const layoutEngine = new LayoutEngine();
@@ -124,12 +133,12 @@ export function renderScript(scriptData, outputPath, options) {
         const graph = layoutEngine.runLayout(sequence, nets);
         layoutEngine.printWarnings();
         showStats && console.log('Layout took:', layoutTimer.lap());
-        dumpData && fs.writeFileSync('dump/raw-layout.txt', layoutEngine.logger.dump());
+        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) {
-            fs.writeFileSync(outputPath, svgOutput);
+            writeFileSync(outputPath, svgOutput);
         }
     }
     catch (err) {

package/build/src/sizing.js

@@ -6,8 +6,8 @@ const supportedFonts = {
     'Inter': 'Inter-Regular.ttf',
     'Inter-Bold': 'Inter-Bold.ttf',
 };
-export async function prepareSizing() {
-    await config.setFontDir('./fonts')
+export async function prepareSizing(fontsPath) {
+    await config.setFontDir(fontsPath)
         .setFontFamilyMappings(supportedFonts)
         .preloadFonts();
 }

package/build/src/visitor.js

@@ -1,6 +1,6 @@
 import { ParseTreeVisitor } from 'antlr4';
-import fs from 'fs';
-import path from 'path';
+import { readFileSync } from 'fs';
+import { join } from 'path';
 import { ExecutionContext } from './execute.js';
 import { ClassComponent } from './objects/ClassComponent.js';
 import { NumericValue, ParamDefinition, PercentageValue, PinBlankValue, } from './objects/ParamDefinition.js';
@@ -731,23 +731,42 @@ export class MainVisitor extends ParseTreeVisitor {
         PinTypes.Output,
         PinTypes.Power,
     ];
-    createImportFileHandler(directory) {
+    createImportFileHandler(directory, defaultLibsPath) {
         return (visitor, importPath) => {
-            const tmpFilePath = path.join(directory, importPath + ".cst");
-            visitor.print('importing path:', tmpFilePath);
-            try {
-                const fileData = fs.readFileSync(tmpFilePath, { encoding: 'utf8' });
+            let importResult;
+            importResult = this.importLib(visitor, directory, importPath);
+            if (!importResult.pathExists && importPath == 'lib') {
+                importResult = this.importLib(visitor, defaultLibsPath, importPath);
+            }
+            return importResult;
+        };
+    }
+    importLib(visitor, directory, filename) {
+        const tmpFilePath = join(directory, filename + ".cst");
+        visitor.print('importing path:', tmpFilePath);
+        let pathExists = false;
+        let fileData = null;
+        try {
+            fileData = readFileSync(tmpFilePath, { encoding: 'utf8' });
+            pathExists = true;
+        }
+        catch (err) {
+            pathExists = false;
+        }
+        try {
+            if (pathExists) {
                 visitor.print('done reading imported file data');
                 const { hasError, hasParseError } = parseFileWithVisitor(visitor, fileData);
-                return { hasError, hasParseError };
+                return { hasError, hasParseError, pathExists };
             }
-            catch (err) {
-                console.log('Failed to import file: ', err.message);
-            }
-            return {
-                hasError: true,
-                hasParseError: true
-            };
+        }
+        catch (err) {
+            visitor.print('Failed to import file: ', err.message);
+        }
+        return {
+            hasError: true,
+            hasParseError: true,
+            pathExists,
         };
     }
     parseCreateComponentPins(pinData) {

package/jest.config.js

@@ -0,0 +1,23 @@
+export default {
+    testEnvironment: 'node',
+    preset: 'ts-jest/presets/default-esm',
+    transform: {
+        '^.+\\.m?[tj]s?$': ['ts-jest', {
+            useESM: true,
+            diagnostics: false
+        }],
+    },
+    moduleNameMapper: {
+        '^(\\.{1,2}/.*)\\.(m)?js$': '$1',
+    },
+    testMatch: [
+        "<rootDir>/__tests__/test**.(ts|tsx)",
+    ],
+    coverageDirectory: 'coverage',
+    collectCoverageFrom: [
+        'src/**/*.ts',
+        'src/**/*.mts',
+        '!src/**/*.d.ts',
+        '!src/**/*.d.mts',
+    ],
+};

package/libs/lib.cst

@@ -0,0 +1,190 @@
+// Circuitscript default lib
+
+def net(net_name):
+    return create component:
+        pins: 1
+        display: create graphic:
+            hline: -15, 0, 30
+            pin: 1, 0, 10, 0, 0
+            label: "net_name", 0, -5, net_name, fontSize=10, anchor="middle"
+        type: "net"
+        params:
+            __is_net: 1
+            net_name: net_name
+            priority: 10
+
+def supply(net_name):
+    return create component:
+        pins: 1
+        display: create graphic:
+            hline: -15, 0, 30
+            pin: 1, 0, 10, 0, 0
+            label: "net_name", 0, -5, net_name, fontSize=10, anchor="middle"
+        type: "net"
+        params:
+            __is_net: 1
+            net_name: net_name
+            priority: 20
+
+def label(value):
+    return create component:
+        pins: 1
+        display: create graphic:
+            label: "value", 0, -2, fontSize=10, anchor="left"
+            pin: 1, 0, 0, 0, 0
+        type: "label"
+        params:
+            __is_net: 1
+            net_name: value
+            value: value
+            priority: 5
+
+def res(value):
+    width = 40
+    height = 20
+ 
+    return create component:
+        pins: 2
+        display: create graphic:
+            rect: 0, 0, width, height
+            pin: 1, -width/2 - 20, 0, -width / 2, 0
+            pin: 2, width/2 + 20, 0, width/2, 0
+            label: ("value", 0, 1, value, fontSize=10, anchor="middle", vanchor="middle")
+            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=10, anchor="left")
+
+        type: "res"
+        params:
+            value: value
+            size: "0402"
+            footprint: "Resistor_SMD:R_0402_1005Metric"
+
+def cap(value):
+    width = 20
+    height = 40
+
+    return create component:
+        pins: 2
+        display: create graphic:
+            hline: -width/2, -3, width
+            hline: -width/2, 3, width
+            pin: 1, 0, -height/2, 0, -3
+            pin: 2, 0, height/2, 0, 3
+            label: "refdes", width/2+2, 0, "?", fontSize = 10, anchor="left"
+            label: "value", width/2+2, 5, value, fontSize = 10, anchor = "left", vanchor="top"
+        type: "cap"
+        params:
+            value: value
+            size: "0402"
+            footprint: "Capacitor_SMD:C_0402_1005Metric"
+
+def ind(value):
+    width = 40
+    height = 20
+
+    return create component:
+        pins: 2
+        type: "ind"
+        display: create graphic:
+            arc: -15, 0, 5, 180, 360
+            arc: -5, 0, 5, 180, 360
+            arc: 5, 0, 5, 180, 360
+            arc: 15, 0, 5, 180, 360
+            pin: 1, -width/2 - 20, 0, -width / 2, 0
+            pin: 2, width/2 + 20, 0, width/2, 0
+            label: ("value", 0, 10, value, fontSize=10, anchor="middle", vanchor="middle")
+            label: ("refdes", -width/2, -height/2 -5 , "?", fontSize=10, anchor="left")
+        params:
+            value: value
+
+def diode():
+    width = 20
+    height = 20
+
+    # Diode is drawn horizontally
+    #  -|>|-
+    return create component:
+        pins: 2
+        type: "diode"
+        display: create graphic:
+            path: ("M", width/2, -height/2, "L", width/2, height/2,
+                   "M", -width/2, -height/2, "L", -width/2, height/2,
+                   "L", width/2, 0, "L", -width/2, -height/2)
+            pin: 1, -width/2-20, 0, -width/2, 0     # anode
+            pin: 2, width/2 + 20, 0, width/2, 0     # cathode
+            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
+
+def led(color):
+    width = 20
+    height = 20
+
+    return create component:
+        pins:   
+            1: "cathode"
+            2: "anode"
+        type: "diode"
+        display: create graphic:
+            path: ("M", width/2, -height/2, "L", width/2, height/2,
+                   "M", -width/2, -height/2, "L", -width/2, height/2,
+                   "L", width/2, 0, "L", -width/2, -height/2)
+            path: ("M", 0, 8, "L", 5, 18, 
+                   "M", 3, 8, "L", 8, 18)
+            pin: 1, -width/2-20, 0, -width/2, 0     # anode
+            pin: 2, width/2 + 20, 0, width/2, 0     # cathode
+            label: "refdes", width/2 + 5, 5, "?", fontSize=10, anchor="left", vanchor="top"
+        params:
+            size: "0603"
+            footprint: "LED_SMD:LED_0603_1608Metric_Pad1.05x0.95mm_HandSolder"
+
+
+def cgnd():
+    net_name = "gnd"
+    return create component:
+        pins: 1
+        display: create graphic:
+            hline: -15, 0, 30
+            hline: -10, 5, 20
+            hline: -5, 10, 10
+            pin: 1, 0, -10, 0, 0 
+            label: "net_name", 0, 22, net_name, fontSize=10, anchor="middle"
+        type: "net"
+        params:
+            __is_net: 1
+            net_name: net_name
+            priority: 100
+
+def dgnd():
+    height = 10
+    width = 20
+
+    net_name = "GND"
+    return create component:
+        pins: 1
+        display: create graphic:
+            path: ("M", -width/2, 0, 
+                    "L", width/2, 0, 
+                    "L", 0, height, 
+                    "Z")
+            pin: 1, 0, -10, 0, 0
+            label: "net_name", 0, height + 10, net_name, fontSize=10, anchor="middle"
+        type: "net"
+        params:
+            __is_net: 1
+            net_name: net_name
+            priority: 100
+
+def marker_point():
+    return create component:
+        pins: 1
+        display: create graphic:
+            hline: -5, 0, 10
+            vline: 0, -5, 10
+            pin: 1, 0, 0, 0, 0
+        type: "net"
+
+def arrow_point():
+    return create component:
+        pins: 1
+        display: create graphic:
+            path: ("M", 15, -5, "L", 20, 0, "L", 15, 5)
+            pin: 1, 0, 0, 20, 0
+        type: "net"

package/package.json

@@ -1,7 +1,8 @@
 {
     "name": "circuitscript",
-    "version": "0.0.7",
+    "version": "0.0.12",
     "description": "Interpreter for the circuitscript language",
+    "homepage": "https://circuitscript.net",
     "engines": {
         "node": ">=16.0"
     },
@@ -45,27 +46,6 @@
         "profile-flame": "node --prof-process --preprocess -j isolate*.log | flamebearer",
         "server": "node server.js"
     },
-    "jest": {
-        "preset": "ts-jest",
-        "verbose": true,
-        "testMatch": [
-            "**/__tests__/test**.ts"
-        ],
-        "transform": {
-            "^.+\\.tsx?$": [
-                "ts-jest",
-                {
-                    "diagnostics": false
-                }
-            ]
-        },
-        "collectCoverageFrom": [
-            "src/**/*.ts"
-        ],
-        "coveragePathIgnorePatterns": [
-            "src/antlr"
-        ]
-    },
     "boilerplate_author": "Jakub Synowiec <jsynowiec@users.noreply.github.com>",
     "license": "MIT",
     "dependencies": {

package/src/antlr/CircuitScriptLexer.ts

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 // Generated from ./src/antlr/CircuitScript.g4 by ANTLR 4.13.1
 // noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
 import {

package/src/antlr/CircuitScriptParser.ts

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 // Generated from ./src/antlr/CircuitScript.g4 by ANTLR 4.13.1
 // noinspection ES6UnusedImports,JSUnusedGlobalSymbols,JSUnusedLocalSymbols
 

package/src/antlr/CircuitScriptVisitor.ts

@@ -1,3 +1,5 @@
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-nocheck
 // Generated from ./src/antlr/CircuitScript.g4 by ANTLR 4.13.1
 
 import {ParseTreeVisitor} from 'antlr4';

package/src/main.ts

@@ -2,9 +2,9 @@
 
 import { program } from 'commander';
 import figlet from 'figlet';
-
-import fs from 'fs';
 import path from 'path';
+import { fileURLToPath } from 'url';
+import { readFileSync, watch, writeFileSync } from 'fs';
 
 import { MainVisitor } from './visitor.js';
 import { prepareSizing } from './sizing.js';
@@ -16,10 +16,15 @@ import { generateKiCADNetList } from './export.js';
 import { SimpleStopwatch } from './utils.js';
 
 export default async function main(): Promise<void> {
+    const toolSrcPath = fileURLToPath(import.meta.url);
+    const toolDirectory = path.dirname(toolSrcPath) + '/../../';
+    
+    const packageJson = JSON.parse(readFileSync(toolDirectory + 'package.json').toString());;
+    const {version} = packageJson;
 
     program
         .description('generate graphical output from circuitscript files')
-        .version('0.0.6')
+        .version(version)
         .option('-i, --input text <input text>', 'Input text directly')
         .option('-f, --input-file <path>', 'Input file')
         .option('-o, --output <path>', 'Output path')
@@ -51,11 +56,15 @@ 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...');
     }
 
-    await prepareSizing();
+    await prepareSizing(fontsPath);
 
     let inputFilePath: string = null;
 
@@ -64,7 +73,7 @@ export default async function main(): Promise<void> {
         scriptData = options.input;
     } else {
         inputFilePath = options.inputFile; // this should be provided
-        scriptData = fs.readFileSync(inputFilePath, { encoding: 'utf-8' });
+        scriptData = readFileSync(inputFilePath, { encoding: 'utf-8' });
 
         if (currentDirectory === null) {
             currentDirectory = path.dirname(inputFilePath);
@@ -73,6 +82,7 @@ export default async function main(): Promise<void> {
 
     const renderOptions = {
         currentDirectory,
+        defaultLibsPath,
         dumpNets, 
         dumpData,
         kicadNetlistPath: kicadNetlist,
@@ -87,9 +97,9 @@ export default async function main(): Promise<void> {
     }
 
     if (watchFileChanges) {
-        fs.watch(inputFilePath, (event, targetFile) => {
+        watch(inputFilePath, (event, targetFile) => {
             if (event === 'change') {
-                const scriptData = fs.readFileSync(inputFilePath, 
+                const scriptData = readFileSync(inputFilePath, 
                     {encoding: 'utf-8'});
 
                 renderScript(scriptData, outputPath, renderOptions);
@@ -104,6 +114,7 @@ export function renderScript(scriptData: string, outputPath: string, options): s
 
     const {
         currentDirectory = null, 
+        defaultLibsPath,
         dumpNets = false,
         dumpData = false,
         kicadNetlistPath = null,
@@ -111,7 +122,7 @@ export function renderScript(scriptData: string, outputPath: string, options): s
 
     const visitor = new MainVisitor(true);
 
-    visitor.onImportFile = visitor.createImportFileHandler(currentDirectory);
+    visitor.onImportFile = visitor.createImportFileHandler(currentDirectory, defaultLibsPath);
 
     visitor.print('reading file');
     visitor.print('done reading file');
@@ -129,8 +140,8 @@ export function renderScript(scriptData: string, outputPath: string, options): s
     }
     // console.log(visitor.dumpUniqueNets());
 
-    dumpData && fs.writeFileSync('dump/tree.lisp', tree.toStringTree(null, parser));
-    dumpData && fs.writeFileSync('dump/raw-parser.txt', visitor.logger.dump());
+    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');
@@ -141,7 +152,7 @@ export function renderScript(scriptData: string, outputPath: string, options): s
 
     if(kicadNetlistPath){
         const kicadNetList = generateKiCADNetList(visitor.getNetList());
-        fs.writeFileSync(kicadNetlistPath, kicadNetList);
+        writeFileSync(kicadNetlistPath, kicadNetList);
         console.log('Generated KiCad netlist file');
     }
     
@@ -176,7 +187,7 @@ export function renderScript(scriptData: string, outputPath: string, options): s
         return tmp.join(" | ");
     });
 
-    dumpData && fs.writeFileSync('dump/raw-sequence.txt', tmpSequence.join('\n'));
+    dumpData && writeFileSync('dump/raw-sequence.txt', tmpSequence.join('\n'));
     let svgOutput: string = null;
 
     try {
@@ -189,14 +200,14 @@ export function renderScript(scriptData: string, outputPath: string, options): s
 
         showStats && console.log('Layout took:', layoutTimer.lap());
 
-        dumpData && fs.writeFileSync('dump/raw-layout.txt', layoutEngine.logger.dump());
+        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){
-            fs.writeFileSync(outputPath, svgOutput);
+            writeFileSync(outputPath, svgOutput);
         } 
     } catch (err) {
         console.log('Failed to render:');

package/src/sizing.ts

@@ -10,8 +10,8 @@ const supportedFonts = {
     'Inter-Bold': 'Inter-Bold.ttf',
 }
 
-export async function prepareSizing(): Promise<void> {
-    await config.setFontDir('./fonts')
+export async function prepareSizing(fontsPath): Promise<void> {
+    await config.setFontDir(fontsPath)
         .setFontFamilyMappings(supportedFonts)
         .preloadFonts()
 }

package/src/visitor.ts

@@ -1,7 +1,7 @@
 import { ParseTreeVisitor, ParserRuleContext } from 'antlr4';
 
-import fs from 'fs';
-import path from 'path';
+import { readFileSync } from 'fs';
+import { join } from 'path';
 
 import {
     Add_component_exprContext,
@@ -1093,31 +1093,60 @@ export class MainVisitor extends ParseTreeVisitor<any> {
         PinTypes.Power,
     ];
 
-    createImportFileHandler(directory: string):
+    createImportFileHandler(directory: string, defaultLibsPath: string):
         ((visitor: MainVisitor, importPath: string) =>
-            { hasError: boolean, hasParseError: boolean }) {
+            { hasError: boolean, hasParseError: boolean, pathExists: boolean }) {
+
         return (visitor: MainVisitor, importPath: string) => {
             // Check if different files exist first
-            const tmpFilePath = path.join(directory, importPath + ".cst");
-            visitor.print('importing path:', tmpFilePath);
+            let importResult: {
+                hasError: boolean,
+                hasParseError: boolean,
+                pathExists: boolean,
+            };
 
-            try {
-                const fileData = fs.readFileSync(tmpFilePath, { encoding: 'utf8' });
+            importResult = this.importLib(visitor, directory, importPath);
+
+            if (!importResult.pathExists && importPath == 'lib') {
+                // Load default path
+                importResult = this.importLib(visitor, defaultLibsPath, importPath);
+            }
+
+            return importResult;
+        }
+    }
+
+    private importLib(visitor: MainVisitor, directory: string, filename: string): {hasError: boolean, hasParseError: boolean, pathExists: boolean} {
+        const tmpFilePath = join(directory, filename + ".cst");
+        visitor.print('importing path:', tmpFilePath);
+        let pathExists = false;
+
+        let fileData: string = null;
+
+        try {
+            fileData = readFileSync(tmpFilePath, { encoding: 'utf8' });
+            pathExists = true;
+        } catch (err) {
+            pathExists = false;
+        }
+
+        try {
+            if (pathExists){
                 visitor.print('done reading imported file data');
 
                 const { hasError, hasParseError } =
                     parseFileWithVisitor(visitor, fileData);
 
-                return { hasError, hasParseError }
-
-            } catch (err) {
-                console.log('Failed to import file: ', err.message);
+                return { hasError, hasParseError, pathExists }
             }
+        } catch (err) {
+            visitor.print('Failed to import file: ', err.message);
+        }
 
-            return {
-                hasError: true,
-                hasParseError: true
-            }
+        return {
+            hasError: true,
+            hasParseError: true,
+            pathExists,
         }
     }
 

package/tsconfig.json

@@ -17,7 +17,10 @@
       "noUnusedParameters": true,
       "noImplicitAny": false,
       "noImplicitThis": false,
-      "strictNullChecks": false
+      "strictNullChecks": false,
+      "resolveJsonModule": true,
+      "skipLibCheck": true,
+      "esModuleInterop":true,
     },
     "include": ["src/**/*", "__tests__/**/*"]
   }