@tscircuit/cli 0.1.2371 → 0.1.2373

package/dist/cli/main.js

@@ -1,4 +1,4 @@
 [diffend] Oversized file quarantined before diffing.
 name: package/dist/cli/main.js
-size: 46949501 bytes
-sha256: 1c4a78cfcc460f7db8131969afc3e3c563f23f355eb0c489349a70591fa49651
+size: 46951130 bytes
+sha256: 7f0d1c6ae9572d5bfb510f1606d5e4f75c4dccfaf186e1258acf21b60b62cce3

package/dist/lib/index.js

@@ -69121,7 +69121,7 @@ var getNodeHandler = (winterSpec, { port, middleware = [] }) => {
   }));
 };
 // package.json
-var version = "0.1.2368";
+var version = "0.1.2371";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -69144,7 +69144,7 @@ var package_default = {
     "@tscircuit/circuit-json-schematic-placement-analysis": "https://jscdn.tscircuit.com/@tscircuit/circuit-json-schematic-placement-analysis/0.0.68.tgz",
     "@tscircuit/circuit-json-util": "^0.0.121",
     "@tscircuit/eval": "0.0.1619",
-    "@tscircuit/fake-snippets": "^0.0.182",
+    "@tscircuit/fake-snippets": "^0.0.226",
     "@tscircuit/file-server": "^0.0.32",
     "@tscircuit/footprinter": "^0.0.438",
     "@tscircuit/image-utils": "^0.0.8",
@@ -69175,7 +69175,7 @@ var package_default = {
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.59",
     "circuit-json-to-gerber": "^0.0.112",
-    "circuit-json-to-kicad": "0.0.236",
+    "circuit-json-to-kicad": "0.0.241",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
@@ -69205,6 +69205,7 @@ var package_default = {
     ky: "^1.7.4",
     "make-vfs": "^1.0.15",
     md5: "^2.3.0",
+    "mime-types": "^3.0.2",
     "pdf-lib": "^1.17.1",
     "perfect-cli": "^1.0.21",
     playwright: "^1.57.0",
@@ -71923,7 +71924,8 @@ import {
   LibSymbols,
   SchematicSymbol as SchematicSymbol4,
   SymbolPinNames,
-  SymbolPinNumbers
+  SymbolPinNumbers,
+  SymbolPower
 } from "kicadts";
 import { symbols as symbols3 } from "schematic-symbols";
 import { symbols } from "schematic-symbols";
@@ -73997,21 +73999,19 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       }
     }
     const netLabels = db.schematic_net_label?.list?.() || [];
+    const railLibraryIds = /* @__PURE__ */ new Set;
     for (const netLabel of netLabels) {
-      if (netLabel.symbol_name) {
-        const isPower = netLabel.source_net_id ? db.source_net.get(netLabel.source_net_id)?.is_power : false;
-        const isGround = netLabel.source_net_id ? db.source_net.get(netLabel.source_net_id)?.is_ground : false;
-        const isPowerOrGround = isPower || isGround;
-        if (isPowerOrGround) {
-          const libSymbol = this.createLibrarySymbolForNetLabel({
-            netLabel,
-            isPower: isPower ?? false,
-            isGround: isGround ?? false
-          });
-          if (libSymbol) {
-            librarySymbols.push(libSymbol);
-          }
-        }
+      if (!netLabel.symbol_name || railLibraryIds.has(netLabel.symbol_name))
+        continue;
+      const sourceNet = netLabel.source_net_id ? db.source_net.get(netLabel.source_net_id) : undefined;
+      const libSymbol = this.createLibrarySymbolForNetLabel({
+        netLabel,
+        isPower: sourceNet?.is_power ?? false,
+        isGround: sourceNet?.is_ground ?? false
+      });
+      if (libSymbol) {
+        librarySymbols.push(libSymbol);
+        railLibraryIds.add(netLabel.symbol_name);
       }
     }
     libSymbols.symbols = librarySymbols;
@@ -74168,7 +74168,7 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
     if (!symbolData)
       return null;
     const libId = `Custom:${symbolName}`;
-    return this.createLibrarySymbol({
+    const symbol = this.createLibrarySymbol({
       libId,
       symbolData,
       isChip: false,
@@ -74176,9 +74176,17 @@ var AddLibrarySymbolsStage = class extends ConverterStage {
       description: isPower ? "Power net label" : isGround ? "Ground net label" : "Net symbol",
       keywords: isPower ? "power net" : isGround ? "ground net" : "net",
       fpFilters: "",
-      referencePrefix: libId.split(":")[1]?.[0] || "U",
+      referencePrefix: "#PWR",
       symbolScale: this.ctx.kicadSchematicScaleFactor
     });
+    symbol._sxPower = new SymbolPower("global");
+    symbol.inBom = false;
+    symbol.onBoard = false;
+    for (const unit of symbol.subSymbols) {
+      for (const pin of unit.pins)
+        pin.pinElectricalType = "power_in";
+    }
+    return symbol;
   }
   getSymbolData(symbolName, schematicComponent) {
     if (symbolName.startsWith("generic_chip_")) {
@@ -74560,13 +74568,14 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
       x -= pinPosition.x;
       y += pinPosition.y;
     }
+    const reference = `#PWR${netLabel.schematic_net_label_id}`;
     const uuid = crypto.randomUUID();
     const symbol = new SchematicSymbol5({
       at: [x, y, 0],
       unit: 1,
       excludeFromSim: false,
-      inBom: true,
-      onBoard: true,
+      inBom: false,
+      onBoard: false,
       dnp: false,
       uuid,
       fieldsAutoplaced: false
@@ -74576,20 +74585,19 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
     symbol._sxLibId = symLibId;
     const isUpSymbol = symbolName.includes("_up") || symbolName.toLowerCase().includes("vcc");
     const referenceOffset = isUpSymbol ? -4 : 4;
-    const valueOffset = isUpSymbol ? -6 : 6;
     const referenceProperty = new SymbolProperty2({
       key: "Reference",
-      value: labelText,
+      value: reference,
       id: 0,
       at: [x, y + referenceOffset, 0],
-      effects: this.createTextEffects(1.27, false)
+      effects: this.createTextEffects(1.27, true)
     });
     const valueProperty = new SymbolProperty2({
       key: "Value",
       value: labelText,
       id: 1,
-      at: [x, y + valueOffset, 0],
-      effects: this.createTextEffects(1.27, true)
+      at: [x, y + referenceOffset, 0],
+      effects: this.createTextEffects(1.27, false)
     });
     const footprintProperty = new SymbolProperty2({
       key: "Footprint",
@@ -74622,7 +74630,7 @@ var AddSchematicNetLabelsStage = class extends ConverterStage {
     const project = new SymbolInstancesProject("");
     const instancePathPrefix = this.ctx.symbolInstancePathPrefix ?? `/${kicadSch?.uuid?.value || ""}`;
     const path = new SymbolInstancePath(instancePathPrefix);
-    path.reference = labelText;
+    path.reference = reference;
     path.unit = 1;
     project.paths.push(path);
     instances.projects.push(project);
@@ -77549,6 +77557,7 @@ var AddTracesStage = class extends ConverterStage {
   constructor(input, ctx) {
     super(input, ctx);
     this.pcbTraces = this.ctx.db.pcb_trace.list();
+    this.MAX_ITERATIONS = Math.max(this.MAX_ITERATIONS, this.pcbTraces.length + 1);
   }
   getRoutePointPosition(point, pointRoleInSegment) {
     if ("x" in point && "y" in point) {
@@ -84765,19 +84774,19 @@ var findPushProject = async ({
   }) ?? undefined;
   return { snippetFilePath, packageJsonPath, projectDir };
 };
-var getArchivePayload = (filePaths, projectDir, packageNameWithVersion) => {
-  const files = filePaths.map((fullFilePath) => {
-    const relativeFilePath = path28.relative(projectDir, fullFilePath);
-    const fileBuffer = fs24.readFileSync(fullFilePath);
-    const isBinary = isBinaryFile(relativeFilePath) || hasBinaryContent(fileBuffer);
-    return isBinary ? {
-      file_path: relativeFilePath,
-      content_base64: fileBuffer.toString("base64")
-    } : {
-      file_path: relativeFilePath,
-      content_text: fileBuffer.toString("utf8")
-    };
-  });
+var getUploadFiles = (filePaths, projectDir) => filePaths.map((fullFilePath) => {
+  const relativeFilePath = path28.relative(projectDir, fullFilePath).split(path28.sep).join("/");
+  const fileBuffer = fs24.readFileSync(fullFilePath);
+  const isBinary = isBinaryFile(relativeFilePath) || hasBinaryContent(fileBuffer);
+  return isBinary ? {
+    file_path: relativeFilePath,
+    content_base64: fileBuffer.toString("base64")
+  } : {
+    file_path: relativeFilePath,
+    content_text: fileBuffer.toString("utf8")
+  };
+});
+var createArchivePayload = (files, packageNameWithVersion) => {
   const archive = gzipSync(JSON.stringify({ files }), { level: 9 });
   return {
     package_name_with_version: packageNameWithVersion,
@@ -84984,53 +84993,79 @@ var pushSnippet = async ({
   const filePaths = getPackageFilePaths(projectDir, includeDist ? [] : ["**/dist/**"]);
   const uploadResults = { succeeded: [], failed: [] };
   const packageNameWithVersion = `${scopedPackageName}@${releaseVersion}`;
+  const files = getUploadFiles(filePaths, projectDir);
+  let filesToUpload = files;
   if (compress) {
     log(kleur_default.gray("Uploading package archive..."));
     try {
-      const archivePayload = getArchivePayload(filePaths, projectDir, packageNameWithVersion);
+      const archivePayload = createArchivePayload(files, packageNameWithVersion);
       await ky.post("package_files/upload_archive", {
         json: archivePayload
       });
-      for (const fullFilePath of filePaths) {
-        const relativeFilePath = path28.relative(projectDir, fullFilePath);
-        uploadResults.succeeded.push(relativeFilePath);
+      for (const file of files) {
+        uploadResults.succeeded.push(file.file_path);
       }
+      filesToUpload = [];
       log(kleur_default.gray(`\uD83D\uDCE6 Uploaded archive with ${filePaths.length} files`));
     } catch (error) {
-      log(kleur_default.yellow(`Archive upload failed, falling back to file-by-file upload: ${error}`));
-    }
-  }
-  if (uploadResults.succeeded.length === 0) {
-    for (const fullFilePath of filePaths) {
-      const relativeFilePath = path28.relative(projectDir, fullFilePath);
-      const fileBuffer = fs24.readFileSync(fullFilePath);
-      const isBinary = isBinaryFile(relativeFilePath) || hasBinaryContent(fileBuffer);
-      const payload = {
-        file_path: relativeFilePath,
-        package_name_with_version: packageNameWithVersion
-      };
-      if (isBinary) {
-        payload.content_base64 = fileBuffer.toString("base64");
+      const status = error?.response?.status;
+      if (status === undefined || status === 408 || status >= 500) {
+        log(kleur_default.yellow(`Archive upload outcome unknown, checking release files: ${error}`));
+        try {
+          const { package_files: remoteFiles } = await ky.get("package_files/list", {
+            searchParams: {
+              package_name_with_version: packageNameWithVersion
+            }
+          }).json();
+          const remoteIds = new Map(remoteFiles.map((file) => [file.file_path, file.package_file_id]));
+          filesToUpload = [];
+          for (const file of files) {
+            const remoteId = remoteIds.get(file.file_path);
+            if (remoteId) {
+              const remoteContent = await ky.get("package_files/download", {
+                searchParams: { package_file_id: remoteId }
+              }).arrayBuffer();
+              const localContent = file.content_base64 !== undefined ? Buffer.from(file.content_base64, "base64") : Buffer.from(file.content_text, "utf8");
+              if (localContent.equals(Buffer.from(remoteContent))) {
+                uploadResults.succeeded.push(file.file_path);
+                continue;
+              }
+            }
+            filesToUpload.push(file);
+          }
+          log(kleur_default.gray(`Verified ${uploadResults.succeeded.length} archive files; ${filesToUpload.length} files still need uploading`));
+        } catch (verificationError) {
+          onError(`Could not verify archive upload outcome: ${verificationError}. No files were retransmitted; check ${packageNameWithVersion} before retrying.`);
+          return onExit(1);
+        }
       } else {
-        payload.content_text = fileBuffer.toString("utf-8");
+        log(kleur_default.yellow(`Archive upload failed, falling back to file-by-file upload: ${error}`));
       }
-      await ky.post("package_files/create", {
-        json: payload
-      }).then(() => {
-        const icon = isBinary ? "\uD83D\uDCE6" : "⬆︎";
-        console.log(kleur_default.gray(`${icon} ${relativeFilePath}`));
-        uploadResults.succeeded.push(relativeFilePath);
-      }).catch(async (error) => {
-        const errorDetails = String(error)?.split(`
+    }
+  }
+  for (const file of filesToUpload) {
+    const relativeFilePath = file.file_path;
+    const isBinary = file.content_base64 !== undefined;
+    const payload = {
+      ...file,
+      package_name_with_version: packageNameWithVersion
+    };
+    await ky.post("package_files/create", {
+      json: payload
+    }).then(() => {
+      const icon = isBinary ? "\uD83D\uDCE6" : "⬆︎";
+      console.log(kleur_default.gray(`${icon} ${relativeFilePath}`));
+      uploadResults.succeeded.push(relativeFilePath);
+    }).catch(async (error) => {
+      const errorDetails = String(error)?.split(`
 
 Request Body:`)?.[0];
-        console.log(kleur_default.red(`  ${relativeFilePath} - failed`));
-        uploadResults.failed.push({
-          file: relativeFilePath,
-          error: errorDetails
-        });
+      console.log(kleur_default.red(`  ${relativeFilePath} - failed`));
+      uploadResults.failed.push({
+        file: relativeFilePath,
+        error: errorDetails
       });
-    }
+    });
   }
   log(`
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.2371",
+  "version": "0.1.2373",
   "repository": {
     "type": "git",
     "url": "https://github.com/tscircuit/cli"
@@ -20,7 +20,7 @@
     "@tscircuit/circuit-json-schematic-placement-analysis": "https://jscdn.tscircuit.com/@tscircuit/circuit-json-schematic-placement-analysis/0.0.68.tgz",
     "@tscircuit/circuit-json-util": "^0.0.121",
     "@tscircuit/eval": "0.0.1619",
-    "@tscircuit/fake-snippets": "^0.0.182",
+    "@tscircuit/fake-snippets": "^0.0.226",
     "@tscircuit/file-server": "^0.0.32",
     "@tscircuit/footprinter": "^0.0.438",
     "@tscircuit/image-utils": "^0.0.8",
@@ -51,7 +51,7 @@
     "circuit-json-to-fdm-component-box": "^0.0.2",
     "circuit-json-to-footprinter": "^0.0.59",
     "circuit-json-to-gerber": "^0.0.112",
-    "circuit-json-to-kicad": "0.0.236",
+    "circuit-json-to-kicad": "0.0.241",
     "circuit-json-to-pnp-csv": "^0.0.18",
     "circuit-json-to-readable-netlist": "^0.0.15",
     "circuit-json-to-spice": "^0.0.45",
@@ -81,6 +81,7 @@
     "ky": "^1.7.4",
     "make-vfs": "^1.0.15",
     "md5": "^2.3.0",
+    "mime-types": "^3.0.2",
     "pdf-lib": "^1.17.1",
     "perfect-cli": "^1.0.21",
     "playwright": "^1.57.0",