circuitscript 0.0.36 → 0.0.37

package/dist/cjs/export.js

@@ -53,6 +53,7 @@ function generateKiCADNetList(netlist) {
             if (instance.typeProp !== globals_js_1.ComponentTypes.label &&
                 instance.typeProp !== globals_js_1.ComponentTypes.net &&
                 instance.typeProp !== globals_js_1.ComponentTypes.point &&
+                instance.typeProp !== globals_js_1.ComponentTypes.frame &&
                 instance.typeProp !== null) {
                 console.log('Skipping', instance.instanceName);
             }

package/dist/cjs/globals.js

@@ -78,6 +78,7 @@ var ComponentTypes;
     ComponentTypes["net"] = "net";
     ComponentTypes["label"] = "label";
     ComponentTypes["point"] = "point";
+    ComponentTypes["frame"] = "frame";
 })(ComponentTypes || (exports.ComponentTypes = ComponentTypes = {}));
 var ReferenceTypes;
 (function (ReferenceTypes) {

package/dist/cjs/helpers.js

@@ -161,7 +161,7 @@ function validateScript(scriptData, options) {
 }
 exports.validateScript = validateScript;
 function renderScript(scriptData, outputPath, options) {
-    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, kicadNetlistPath = null, showStats = false } = options;
+    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, showStats = false } = options;
     const onErrorHandler = (line, column, message, error) => {
         if (error instanceof visitor_js_1.VisitorExecutionException) {
             console.log('Error', line, column, message, error.errorMessage);
@@ -194,14 +194,6 @@ function renderScript(scriptData, outputPath, options) {
     catch (err) {
         console.log('Error during annotation: ', err);
     }
-    if (kicadNetlistPath) {
-        const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
-        missingFootprints.forEach(entry => {
-            console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
-        });
-        (0, fs_1.writeFileSync)(kicadNetlistPath, (0, export_js_1.printTree)(kicadNetList));
-        console.log('Generated KiCad netlist file');
-    }
     const { sequence, nets } = visitor.getGraph();
     const tmpSequence = sequence.map(item => {
         const tmp = [...item];
@@ -230,6 +222,15 @@ function renderScript(scriptData, outputPath, options) {
                 outputDefaultZoom = 1;
             }
         }
+        if (fileExtension === 'net') {
+            const { tree: kicadNetList, missingFootprints } = (0, export_js_1.generateKiCADNetList)(visitor.getNetList());
+            missingFootprints.forEach(entry => {
+                console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
+            });
+            (0, fs_1.writeFileSync)(outputPath, (0, export_js_1.printTree)(kicadNetList));
+            console.log('Generated file', outputPath);
+            return null;
+        }
         const layoutEngine = new layout_js_1.LayoutEngine();
         const layoutTimer = new utils_js_1.SimpleStopwatch();
         const sheetFrames = layoutEngine.runLayout(sequence, nets);

package/dist/cjs/main.js

@@ -21,7 +21,6 @@ async function main() {
         .argument('[output path]', 'Output path')
         .option('-i, --input text <input text>', 'Input text directly')
         .option('-c, --current-directory <path>', 'Set current directory')
-        .option('-k, --kicad-netlist <filename>', 'Create KiCad netlist')
         .option('-w, --watch', 'Watch for file changes')
         .option('-n, --dump-nets', 'Dump out net information')
         .option('-d, --dump-data', 'Dump data during parsing')
@@ -38,7 +37,6 @@ async function main() {
     const watchFileChanges = options.watch;
     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...');
@@ -75,7 +73,6 @@ async function main() {
         defaultLibsPath,
         dumpNets,
         dumpData,
-        kicadNetlistPath: kicadNetlist,
         showStats: options.stats,
     };
     let outputPath = null;

package/dist/cjs/visitor.js

@@ -1224,6 +1224,9 @@ class ComponentAnnotater {
                 this.counter[type] = 1;
             }
         }
+        if (ComponentRefDesPrefixes[type] === undefined) {
+            return null;
+        }
         let attempts = 100;
         let proposedName;
         while (attempts >= 0) {

package/dist/esm/export.mjs

@@ -50,6 +50,7 @@ export function generateKiCADNetList(netlist) {
             if (instance.typeProp !== ComponentTypes.label &&
                 instance.typeProp !== ComponentTypes.net &&
                 instance.typeProp !== ComponentTypes.point &&
+                instance.typeProp !== ComponentTypes.frame &&
                 instance.typeProp !== null) {
                 console.log('Skipping', instance.instanceName);
             }

package/dist/esm/globals.mjs

@@ -75,6 +75,7 @@ export var ComponentTypes;
     ComponentTypes["net"] = "net";
     ComponentTypes["label"] = "label";
     ComponentTypes["point"] = "point";
+    ComponentTypes["frame"] = "frame";
 })(ComponentTypes || (ComponentTypes = {}));
 export var ReferenceTypes;
 (function (ReferenceTypes) {

package/dist/esm/helpers.mjs

@@ -150,7 +150,7 @@ export function validateScript(scriptData, options) {
     return visitorResolver;
 }
 export function renderScript(scriptData, outputPath, options) {
-    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, kicadNetlistPath = null, showStats = false } = options;
+    const { currentDirectory = null, defaultLibsPath, dumpNets = false, dumpData = false, showStats = false } = options;
     const onErrorHandler = (line, column, message, error) => {
         if (error instanceof VisitorExecutionException) {
             console.log('Error', line, column, message, error.errorMessage);
@@ -183,14 +183,6 @@ export function renderScript(scriptData, outputPath, options) {
     catch (err) {
         console.log('Error during annotation: ', err);
     }
-    if (kicadNetlistPath) {
-        const { tree: kicadNetList, missingFootprints } = generateKiCADNetList(visitor.getNetList());
-        missingFootprints.forEach(entry => {
-            console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
-        });
-        writeFileSync(kicadNetlistPath, printTree(kicadNetList));
-        console.log('Generated KiCad netlist file');
-    }
     const { sequence, nets } = visitor.getGraph();
     const tmpSequence = sequence.map(item => {
         const tmp = [...item];
@@ -219,6 +211,15 @@ export function renderScript(scriptData, outputPath, options) {
                 outputDefaultZoom = 1;
             }
         }
+        if (fileExtension === 'net') {
+            const { tree: kicadNetList, missingFootprints } = generateKiCADNetList(visitor.getNetList());
+            missingFootprints.forEach(entry => {
+                console.log(`${entry.refdes} (${entry.instanceName}) does not have footprint`);
+            });
+            writeFileSync(outputPath, printTree(kicadNetList));
+            console.log('Generated file', outputPath);
+            return null;
+        }
         const layoutEngine = new LayoutEngine();
         const layoutTimer = new SimpleStopwatch();
         const sheetFrames = layoutEngine.runLayout(sequence, nets);

package/dist/esm/main.mjs

@@ -16,7 +16,6 @@ export default async function main() {
         .argument('[output path]', 'Output path')
         .option('-i, --input text <input text>', 'Input text directly')
         .option('-c, --current-directory <path>', 'Set current directory')
-        .option('-k, --kicad-netlist <filename>', 'Create KiCad netlist')
         .option('-w, --watch', 'Watch for file changes')
         .option('-n, --dump-nets', 'Dump out net information')
         .option('-d, --dump-data', 'Dump data during parsing')
@@ -33,7 +32,6 @@ export default async function main() {
     const watchFileChanges = options.watch;
     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...');
@@ -70,7 +68,6 @@ export default async function main() {
         defaultLibsPath,
         dumpNets,
         dumpData,
-        kicadNetlistPath: kicadNetlist,
         showStats: options.stats,
     };
     let outputPath = null;

package/dist/esm/visitor.mjs

@@ -1217,6 +1217,9 @@ class ComponentAnnotater {
                 this.counter[type] = 1;
             }
         }
+        if (ComponentRefDesPrefixes[type] === undefined) {
+            return null;
+        }
         let attempts = 100;
         let proposedName;
         while (attempts >= 0) {

package/dist/types/globals.d.ts

@@ -67,7 +67,8 @@ export declare enum ComponentTypes {
     gnd = "gnd",
     net = "net",
     label = "label",
-    point = "point"
+    point = "point",
+    frame = "frame"
 }
 export declare enum ReferenceTypes {
     function = "function",

package/dist/types/helpers.d.ts

@@ -13,7 +13,6 @@ export type ScriptOptions = {
     defaultLibsPath: string;
     dumpNets: boolean;
     dumpData: boolean;
-    kicadNetlistPath: string | null;
     showStats: boolean;
 };
 export declare function prepareFile(textData: string): {

package/package.json

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