circuitscript 0.1.33 → 0.2.0

package/dist/cjs/BomGeneration.js

@@ -25,7 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveBomOutputCsv = exports.generateBomCSV = exports.groupComponents = exports.generateBom = void 0;
 const csv = __importStar(require("@fast-csv/format"));
-const fs = __importStar(require("fs"));
 const ParamDefinition_js_1 = require("./objects/ParamDefinition.js");
 const TypeSortOrder = {
     "res": 1,
@@ -151,9 +150,9 @@ function generateBomCSV(bomData) {
     return rows;
 }
 exports.generateBomCSV = generateBomCSV;
-async function saveBomOutputCsv(bomCsvOutput, filePath) {
+async function saveBomOutputCsv(environment, bomCsvOutput, filePath) {
     return new Promise(resolve => {
-        const outputStream = fs.createWriteStream(filePath);
+        const outputStream = environment.createWriteStream(filePath);
         const csvStream = csv.format();
         csvStream.pipe(outputStream).on("finish", () => {
             resolve();

package/dist/cjs/SemanticTokenVisitor.js

@@ -211,7 +211,7 @@ exports.prepareTokens = prepareTokens;
 const languageKeywords = [
     'break', 'branch', 'create', 'component',
     'graphic', 'wire', 'pin', 'add', 'at', 'to',
-    'point', 'join', 'parallel', 'return', 'def', 'import',
+    'point', 'join', 'parallel', 'return', 'def', 'from', 'import',
     'true', 'false', 'nc', 'sheet', 'frame', 'if', 'else', 'for', 'in',
 ];
 const operatorKeywords = [

package/dist/cjs/environment.js

@@ -5,8 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NodeScriptEnvironment = void 0;
 const svg_js_1 = require("@svgdotjs/svg.js");
-const fs_1 = require("fs");
-const fs_2 = __importDefault(require("fs"));
+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");
@@ -22,6 +21,12 @@ class NodeScriptEnvironment {
             'Arial': 'Arial.ttf',
         };
     }
+    existsSync(pathLike) {
+        return fs_1.default.existsSync(pathLike);
+    }
+    mkdirSync(pathLike) {
+        return fs_1.default.mkdirSync(pathLike);
+    }
     static setInstance(instance) {
         NodeScriptEnvironment._instance = instance;
     }
@@ -40,7 +45,7 @@ class NodeScriptEnvironment {
         }
         try {
             const packageJsonPath = path_1.default.join(this.getToolsPath(), '../', 'package.json');
-            const packageJsonContent = fs_2.default.readFileSync(packageJsonPath, 'utf-8');
+            const packageJsonContent = fs_1.default.readFileSync(packageJsonPath, 'utf-8');
             const packageJson = JSON.parse(packageJsonContent);
             this.cachedVersion = packageJson.version || globals_js_1.TOOL_VERSION;
             return this.cachedVersion;
@@ -120,10 +125,10 @@ class NodeScriptEnvironment {
     }
     async readFile(path, options) {
         options = options ?? { encoding: 'utf8' };
-        return fs_2.default.promises.readFile(path, options);
+        return fs_1.default.promises.readFile(path, options);
     }
     writeFileSync(path, data) {
-        return (0, fs_1.writeFileSync)(path, data);
+        return fs_1.default.writeFileSync(path, data);
     }
     getAbsolutePath(filePath) {
         return path_1.default.resolve(filePath);
@@ -143,7 +148,7 @@ class NodeScriptEnvironment {
     }
     async exists(path) {
         try {
-            await fs_2.default.promises.access(path, fs_2.default.constants.F_OK);
+            await fs_1.default.promises.access(path, fs_1.default.constants.F_OK);
             return true;
         }
         catch (err) {
@@ -168,6 +173,9 @@ class NodeScriptEnvironment {
     relative(from, to) {
         return path_1.default.relative(from, to);
     }
+    createWriteStream(filePath) {
+        return fs_1.default.createWriteStream(filePath);
+    }
 }
 exports.NodeScriptEnvironment = NodeScriptEnvironment;
 NodeScriptEnvironment._instance = null;

package/dist/cjs/execute.js

@@ -1012,6 +1012,11 @@ class ExecutionContext {
                     globals_js_1.ParamKeys.flipY,
                 ];
                 if (unitModifiers.indexOf(paramName) !== -1) {
+                    if (paramName === globals_js_1.ParamKeys.flipX || paramName == globals_js_1.ParamKeys.flipY) {
+                        if (typeof value === "boolean") {
+                            value = value ? (0, ParamDefinition_js_1.numeric)(1) : (0, ParamDefinition_js_1.numeric)(0);
+                        }
+                    }
                     component.getUnit().setParam(paramName, value);
                 }
             }

package/dist/cjs/helpers.js

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPaperSize = exports.isSupportedPaperSize = exports.PaperGridReferences = exports.pxToMM = exports.milsToMM = exports.UnitDimension = exports.detectJSModuleType = exports.KiCadNetListOutputHandler = exports.ParseOutputHandler = exports.renderScriptCustom = exports.renderScript = exports.validateScript = exports.ParseErrorStrategy = exports.getSemanticTokens = exports.prepareFile = exports.JSModuleType = void 0;
-const fs_1 = require("fs");
 const path_1 = __importDefault(require("path"));
 const pdfkit_1 = __importDefault(require("pdfkit"));
 const export_js_1 = require("./export.js");
@@ -294,8 +293,8 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
     const dumpDirectory = environment.getRelativeToModule('/dump/');
     if (dumpData) {
         console.log('Dump data to:', dumpDirectory);
-        if (!(0, fs_1.existsSync)(dumpDirectory)) {
-            (0, fs_1.mkdirSync)(dumpDirectory);
+        if (!environment.existsSync(dumpDirectory)) {
+            environment.mkdirSync(dumpDirectory);
         }
     }
     if (inputPath !== '') {
@@ -320,8 +319,8 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
         const nets = visitor.dumpNets();
         nets.forEach(item => console.log(item.join(" | ")));
     }
-    dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'tree.lisp', tree.toStringTree(null, parser));
-    dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-parser.txt', visitor.logger.dump());
+    dumpData && environment.writeFileSync(dumpDirectory + 'tree.lisp', tree.toStringTree(null, parser));
+    dumpData && environment.writeFileSync(dumpDirectory + 'raw-parser.txt', visitor.logger.dump());
     if (throwError) {
         throw throwError;
     }
@@ -334,11 +333,11 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
             const bomConfig = documentVariable.bom;
             const bomData = (0, BomGeneration_js_1.generateBom)(bomConfig, visitor.getScope().getInstances());
             const bomCsvOutput = (0, BomGeneration_js_1.generateBomCSV)(bomData);
-            await (0, BomGeneration_js_1.saveBomOutputCsv)(bomCsvOutput, bomOutputPath);
+            await (0, BomGeneration_js_1.saveBomOutputCsv)(environment, bomCsvOutput, bomOutputPath);
             console.log('Generated BOM file', bomOutputPath);
         }
         const tmpSequence = (0, utils_js_1.generateDebugSequenceAction)(sequence).map(item => (0, utils_js_1.sequenceActionString)(item));
-        dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
+        dumpData && environment.writeFileSync(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
         try {
             let fileExtension = null;
             let outputDefaultZoom = globals_js_1.defaultZoomScale;
@@ -383,7 +382,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
             }
             layoutEngine.printWarnings();
             showStats && console.log('Layout took:', layoutTimer.lap());
-            dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
+            dumpData && environment.writeFileSync(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
             const generateSvgTimer = new utils_js_1.SimpleStopwatch();
             const renderLogger = new logger_js_1.Logger();
             let svgCanvas;
@@ -394,7 +393,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
                 throw new utils_js_1.RenderError(`Error during SVG generation: ${err}`, 'svg_generation');
             }
             showStats && console.log('Render took:', generateSvgTimer.lap());
-            dumpData && (0, fs_1.writeFileSync)(dumpDirectory + 'raw-render.txt', renderLogger.dump());
+            dumpData && environment.writeFileSync(dumpDirectory + 'raw-render.txt', renderLogger.dump());
             try {
                 if (fileExtension === "pdf") {
                     outputDefaultZoom = 1;
@@ -407,7 +406,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
             if (outputPath) {
                 if (fileExtension === 'svg') {
                     try {
-                        (0, fs_1.writeFileSync)(outputPath, svgOutput);
+                        environment.writeFileSync(outputPath, svgOutput);
                     }
                     catch (err) {
                         throw new utils_js_1.RenderError(`Error writing SVG file: ${err}`, 'file_output');
@@ -425,7 +424,7 @@ async function renderScriptCustom(scriptData, outputPath, options, parseHandlers
                             layout: 'landscape',
                             size: sheetSize
                         });
-                        const outputStream = (0, fs_1.createWriteStream)(outputPath);
+                        const outputStream = environment.createWriteStream(outputPath);
                         (0, render_js_1.generatePdfOutput)(doc, svgCanvas, sheetSize, sheetSizeDefined, outputDefaultZoom);
                         doc.pipe(outputStream);
                         doc.end();
@@ -468,7 +467,7 @@ class KiCadNetListOutputHandler extends ParseOutputHandler {
             missingFootprints.forEach(entry => {
                 console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
             });
-            (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kiCadNetList));
+            visitor.environment.writeFileSync(outputPath, (0, export_js_1.printTree)(kiCadNetList));
             console.log('Generated file', outputPath);
             return false;
         }

package/dist/esm/BomGeneration.js

@@ -1,5 +1,4 @@
 import * as csv from '@fast-csv/format';
-import * as fs from 'fs';
 import { NumericValue } from "./objects/ParamDefinition.js";
 const TypeSortOrder = {
     "res": 1,
@@ -122,9 +121,9 @@ export function generateBomCSV(bomData) {
     });
     return rows;
 }
-export async function saveBomOutputCsv(bomCsvOutput, filePath) {
+export async function saveBomOutputCsv(environment, bomCsvOutput, filePath) {
     return new Promise(resolve => {
-        const outputStream = fs.createWriteStream(filePath);
+        const outputStream = environment.createWriteStream(filePath);
         const csvStream = csv.format();
         csvStream.pipe(outputStream).on("finish", () => {
             resolve();

package/dist/esm/SemanticTokenVisitor.js

@@ -208,7 +208,7 @@ export function prepareTokens(tokens, lexer, script) {
 const languageKeywords = [
     'break', 'branch', 'create', 'component',
     'graphic', 'wire', 'pin', 'add', 'at', 'to',
-    'point', 'join', 'parallel', 'return', 'def', 'import',
+    'point', 'join', 'parallel', 'return', 'def', 'from', 'import',
     'true', 'false', 'nc', 'sheet', 'frame', 'if', 'else', 'for', 'in',
 ];
 const operatorKeywords = [

package/dist/esm/environment.js

@@ -1,11 +1,16 @@
 import { registerWindow, SVG } from "@svgdotjs/svg.js";
-import { writeFileSync } from "fs";
 import fs from 'fs';
 import path from "path";
 import CryptoJs from "crypto-js";
 import { TOOL_VERSION } from "./globals.js";
 import { RuntimeExecutionError } from "./utils.js";
 export class NodeScriptEnvironment {
+    existsSync(pathLike) {
+        return fs.existsSync(pathLike);
+    }
+    mkdirSync(pathLike) {
+        return fs.mkdirSync(pathLike);
+    }
     static _instance = null;
     static setInstance(instance) {
         NodeScriptEnvironment._instance = instance;
@@ -117,7 +122,7 @@ export class NodeScriptEnvironment {
         return fs.promises.readFile(path, options);
     }
     writeFileSync(path, data) {
-        return writeFileSync(path, data);
+        return fs.writeFileSync(path, data);
     }
     getAbsolutePath(filePath) {
         return path.resolve(filePath);
@@ -162,4 +167,7 @@ export class NodeScriptEnvironment {
     relative(from, to) {
         return path.relative(from, to);
     }
+    createWriteStream(filePath) {
+        return fs.createWriteStream(filePath);
+    }
 }

package/dist/esm/execute.js

@@ -1017,6 +1017,11 @@ export class ExecutionContext {
                     ParamKeys.flipY,
                 ];
                 if (unitModifiers.indexOf(paramName) !== -1) {
+                    if (paramName === ParamKeys.flipX || paramName == ParamKeys.flipY) {
+                        if (typeof value === "boolean") {
+                            value = value ? numeric(1) : numeric(0);
+                        }
+                    }
                     component.getUnit().setParam(paramName, value);
                 }
             }

package/dist/esm/helpers.js

@@ -1,4 +1,3 @@
-import { writeFileSync, createWriteStream, existsSync, mkdirSync } from "fs";
 import path from "path";
 import PDFDocument from "pdfkit";
 import { generateKiCadNetList, printTree } from "./export.js";
@@ -283,8 +282,8 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
     const dumpDirectory = environment.getRelativeToModule('/dump/');
     if (dumpData) {
         console.log('Dump data to:', dumpDirectory);
-        if (!existsSync(dumpDirectory)) {
-            mkdirSync(dumpDirectory);
+        if (!environment.existsSync(dumpDirectory)) {
+            environment.mkdirSync(dumpDirectory);
         }
     }
     if (inputPath !== '') {
@@ -309,8 +308,8 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
         const nets = visitor.dumpNets();
         nets.forEach(item => console.log(item.join(" | ")));
     }
-    dumpData && writeFileSync(dumpDirectory + 'tree.lisp', tree.toStringTree(null, parser));
-    dumpData && writeFileSync(dumpDirectory + 'raw-parser.txt', visitor.logger.dump());
+    dumpData && environment.writeFileSync(dumpDirectory + 'tree.lisp', tree.toStringTree(null, parser));
+    dumpData && environment.writeFileSync(dumpDirectory + 'raw-parser.txt', visitor.logger.dump());
     if (throwError) {
         throw throwError;
     }
@@ -323,11 +322,11 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
             const bomConfig = documentVariable.bom;
             const bomData = generateBom(bomConfig, visitor.getScope().getInstances());
             const bomCsvOutput = generateBomCSV(bomData);
-            await saveBomOutputCsv(bomCsvOutput, bomOutputPath);
+            await saveBomOutputCsv(environment, bomCsvOutput, bomOutputPath);
             console.log('Generated BOM file', bomOutputPath);
         }
         const tmpSequence = generateDebugSequenceAction(sequence).map(item => sequenceActionString(item));
-        dumpData && writeFileSync(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
+        dumpData && environment.writeFileSync(dumpDirectory + 'raw-sequence.txt', tmpSequence.join('\n'));
         try {
             let fileExtension = null;
             let outputDefaultZoom = defaultZoomScale;
@@ -372,7 +371,7 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
             }
             layoutEngine.printWarnings();
             showStats && console.log('Layout took:', layoutTimer.lap());
-            dumpData && writeFileSync(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
+            dumpData && environment.writeFileSync(dumpDirectory + 'raw-layout.txt', layoutEngine.logger.dump());
             const generateSvgTimer = new SimpleStopwatch();
             const renderLogger = new Logger();
             let svgCanvas;
@@ -383,7 +382,7 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
                 throw new RenderError(`Error during SVG generation: ${err}`, 'svg_generation');
             }
             showStats && console.log('Render took:', generateSvgTimer.lap());
-            dumpData && writeFileSync(dumpDirectory + 'raw-render.txt', renderLogger.dump());
+            dumpData && environment.writeFileSync(dumpDirectory + 'raw-render.txt', renderLogger.dump());
             try {
                 if (fileExtension === "pdf") {
                     outputDefaultZoom = 1;
@@ -396,7 +395,7 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
             if (outputPath) {
                 if (fileExtension === 'svg') {
                     try {
-                        writeFileSync(outputPath, svgOutput);
+                        environment.writeFileSync(outputPath, svgOutput);
                     }
                     catch (err) {
                         throw new RenderError(`Error writing SVG file: ${err}`, 'file_output');
@@ -414,7 +413,7 @@ export async function renderScriptCustom(scriptData, outputPath, options, parseH
                             layout: 'landscape',
                             size: sheetSize
                         });
-                        const outputStream = createWriteStream(outputPath);
+                        const outputStream = environment.createWriteStream(outputPath);
                         generatePdfOutput(doc, svgCanvas, sheetSize, sheetSizeDefined, outputDefaultZoom);
                         doc.pipe(outputStream);
                         doc.end();
@@ -450,7 +449,7 @@ export class KiCadNetListOutputHandler extends ParseOutputHandler {
             missingFootprints.forEach(entry => {
                 console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
             });
-            writeFileSync(outputPath, printTree(kiCadNetList));
+            visitor.environment.writeFileSync(outputPath, printTree(kiCadNetList));
             console.log('Generated file', outputPath);
             return false;
         }

package/dist/types/BomGeneration.d.ts

@@ -1,4 +1,5 @@
 import { ClassComponent } from "./objects/ClassComponent.js";
+import { NodeScriptEnvironment } from './environment.js';
 export type BomConfig = {
     columns: string[];
 };
@@ -9,5 +10,5 @@ type GroupEntry = {
 };
 export declare function groupComponents(bomConfig: BomConfig, bomComponents: Record<string, unknown>[]): Map<string, GroupEntry>;
 export declare function generateBomCSV(bomData: Record<string, GroupEntry>[]): string[][];
-export declare function saveBomOutputCsv(bomCsvOutput: string[][], filePath: string): Promise<void>;
+export declare function saveBomOutputCsv(environment: NodeScriptEnvironment, bomCsvOutput: string[][], filePath: string): Promise<void>;
 export {};

package/dist/types/environment.d.ts

@@ -1,8 +1,10 @@
 /// <reference types="node" resolution-mode="require"/>
 import { Dom } from "@svgdotjs/svg.js";
-import { PathOrFileDescriptor, PathLike } from "fs";
+import fs from 'fs';
 import { SVGWindow } from "./helpers.js";
 export declare class NodeScriptEnvironment {
+    existsSync(pathLike: string): boolean;
+    mkdirSync(pathLike: string): void;
     static _instance: NodeScriptEnvironment | null;
     static setInstance(instance: NodeScriptEnvironment): void;
     static getInstance(): NodeScriptEnvironment;
@@ -28,18 +30,19 @@ export declare class NodeScriptEnvironment {
     textMeasurementCanvas: Dom | undefined;
     getCanvasWindow(): Dom;
     prepareSVGEnvironment(): Promise<void>;
-    readFile(path: PathOrFileDescriptor, options?: any): Promise<string>;
-    writeFileSync(path: PathOrFileDescriptor, data: string): void;
+    readFile(path: fs.PathOrFileDescriptor, options?: any): Promise<string>;
+    writeFileSync(path: fs.PathOrFileDescriptor, data: string): void;
     getAbsolutePath(filePath: string): string;
     getDirPath(filePath: string): string;
     setCurrentFile(filePath: string): string;
     getCurrentFile(): string;
     getRelativeToCurrentFolder(filePath: string): string;
-    exists(path: PathLike): Promise<boolean>;
+    exists(path: fs.PathLike): Promise<boolean>;
     hashStringSHA256(value: string): string;
     dirname(filePath: string): string;
     extname(filePath: string): string;
     basename(filePath: string, ext: string): string;
     join(...paths: string[]): string;
     relative(from: string, to: string): string;
+    createWriteStream(filePath: string): fs.WriteStream;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "circuitscript",
-    "version": "0.1.33",
+    "version": "0.2.0",
     "description": "Interpreter for the circuitscript language",
     "homepage": "https://circuitscript.net",
     "engines": {