@tscircuit/cli 0.1.805 → 0.1.806

package/dist/main.js

@@ -74267,7 +74267,7 @@ var getGlobalDepsInstallCommand = (packageManager, deps) => {
 import { execSync as execSync2 } from "node:child_process";
 var import_semver2 = __toESM2(require_semver2(), 1);
 // package.json
-var version = "0.1.804";
+var version = "0.1.805";
 var package_default = {
   name: "@tscircuit/cli",
   version,
@@ -74294,7 +74294,7 @@ var package_default = {
     chokidar: "4.0.1",
     "circuit-json": "0.0.325",
     "circuit-json-to-gltf": "^0.0.58",
-    "circuit-json-to-kicad": "^0.0.38",
+    "circuit-json-to-kicad": "^0.0.40",
     "circuit-json-to-readable-netlist": "^0.0.13",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",
@@ -81825,6 +81825,7 @@ import {
   TextEffects as TextEffects7,
   TextEffectsFont as TextEffectsFont7
 } from "kicadts";
+import { parseKicadMod as parseKicadMod2 } from "kicadts";
 import { KicadSymbolLib as KicadSymbolLib2 } from "kicadts";
 var ConverterStage = class {
   MAX_ITERATIONS = 1000;
@@ -84295,8 +84296,15 @@ var CircuitJsonToKicadLibraryConverter = class {
     return this.getOutput().model3dSourcePaths;
   }
 };
+var KICAD_3RD_PARTY_PLACEHOLDER = "${KICAD_3RD_PARTY}";
 function renameKicadFootprint(params2) {
-  const { kicadFootprint, newKicadFootprintName, kicadLibraryName } = params2;
+  const {
+    kicadFootprint,
+    newKicadFootprintName,
+    kicadLibraryName,
+    isPcm,
+    kicadPcmPackageId
+  } = params2;
   const footprint = parseKicadMod(kicadFootprint.kicadModString);
   footprint.libraryLink = newKicadFootprintName;
   for (const model of footprint.models) {
@@ -84304,7 +84312,11 @@ function renameKicadFootprint(params2) {
     const usesProjectPath = currentPath.includes("${KIPRJMOD}/") || /3dmodels[\\/]/.test(currentPath);
     if (usesProjectPath) {
       const filename = currentPath.split(/[\\/]/).pop() ?? "";
-      model.path = `../../3dmodels/${kicadLibraryName}.3dshapes/${filename}`;
+      if (isPcm && kicadPcmPackageId) {
+        model.path = `${KICAD_3RD_PARTY_PLACEHOLDER}/3dmodels/${kicadPcmPackageId}/${kicadLibraryName}.3dshapes/${filename}`;
+      } else {
+        model.path = `../../3dmodels/${kicadLibraryName}.3dshapes/${filename}`;
+      }
     }
   }
   return {
@@ -84413,6 +84425,7 @@ function applyKicadFootprintMetadata(kicadModString, metadata, footprintName) {
     return kicadModString;
   }
 }
+var KICAD_3RD_PARTY_PLACEHOLDER2 = "${KICAD_3RD_PARTY}";
 function classifyKicadFootprints(ctx) {
   for (const extractedKicadComponent of ctx.extractedKicadComponents) {
     classifyFootprintsForComponent({
@@ -84437,7 +84450,9 @@ function classifyFootprintsForComponent({
         let renamedFootprint = renameKicadFootprint({
           kicadFootprint,
           newKicadFootprintName: tscircuitComponentName,
-          kicadLibraryName: ctx.kicadLibraryName
+          kicadLibraryName: ctx.kicadLibraryName,
+          isPcm: ctx.isPcm,
+          kicadPcmPackageId: ctx.kicadPcmPackageId
         });
         if (metadata) {
           renamedFootprint = {
@@ -84467,8 +84482,36 @@ function addBuiltinFootprint({
 }) {
   const alreadyExists = ctx.builtinKicadFootprints.some((fp) => fp.footprintName === kicadFootprint.footprintName);
   if (!alreadyExists) {
-    ctx.builtinKicadFootprints.push(kicadFootprint);
+    if (ctx.isPcm && ctx.kicadPcmPackageId) {
+      const updatedFootprint = updateBuiltinFootprintModelPaths({
+        kicadFootprint,
+        kicadPcmPackageId: ctx.kicadPcmPackageId
+      });
+      ctx.builtinKicadFootprints.push(updatedFootprint);
+    } else {
+      ctx.builtinKicadFootprints.push(kicadFootprint);
+    }
+  }
+}
+function updateBuiltinFootprintModelPaths({
+  kicadFootprint,
+  kicadPcmPackageId
+}) {
+  const footprint = parseKicadMod2(kicadFootprint.kicadModString);
+  for (const model of footprint.models) {
+    const currentPath = model.path;
+    const usesProjectPath = currentPath.includes("${KIPRJMOD}/") || /3dmodels[\\/]/.test(currentPath);
+    if (usesProjectPath) {
+      const filename = currentPath.split(/[\\/]/).pop() ?? "";
+      model.path = `${KICAD_3RD_PARTY_PLACEHOLDER2}/3dmodels/${kicadPcmPackageId}/tscircuit_builtin.3dshapes/${filename}`;
+    }
   }
+  return {
+    footprintName: kicadFootprint.footprintName,
+    kicadModString: footprint.getString(),
+    model3dSourcePaths: kicadFootprint.model3dSourcePaths,
+    isBuiltin: kicadFootprint.isBuiltin
+  };
 }
 function componentHasCustomFootprint(extractedKicadComponent) {
   return extractedKicadComponent.kicadFootprints.some((fp) => !fp.isBuiltin);
@@ -84489,22 +84532,24 @@ function renameKicadSymbol(params2) {
   return { symbolName: newKicadSymbolName, symbol };
 }
 function updateKicadSymbolFootprint(params2) {
-  const { kicadSymbol, kicadLibraryName, kicadFootprintName } = params2;
+  const { kicadSymbol, kicadLibraryName, kicadFootprintName, isPcm } = params2;
   const properties = kicadSymbol.symbol.properties ?? [];
+  const effectiveKicadLibraryName = isPcm ? `PCM_${kicadLibraryName}` : kicadLibraryName;
   for (const prop of properties) {
     if (prop.key === "Footprint") {
-      prop.value = `${kicadLibraryName}:${kicadFootprintName}`;
+      prop.value = `${effectiveKicadLibraryName}:${kicadFootprintName}`;
     }
   }
 }
-function updateBuiltinKicadSymbolFootprint(kicadSymbol) {
+function updateBuiltinKicadSymbolFootprint(kicadSymbol, options) {
   const symbol = kicadSymbol.symbol;
   const properties = symbol.properties ?? [];
+  const libraryName = options?.isPcm ? "PCM_tscircuit_builtin" : "tscircuit_builtin";
   for (const prop of properties) {
     if (prop.key === "Footprint" && prop.value) {
       const parts = prop.value.split(":");
       const footprintName = parts.length > 1 ? parts[1] : parts[0];
-      prop.value = `tscircuit_builtin:${footprintName}`;
+      prop.value = `${libraryName}:${footprintName}`;
     }
   }
   return { symbolName: kicadSymbol.symbolName, symbol };
@@ -84536,7 +84581,8 @@ function classifySymbolsForComponent({
           updateKicadSymbolFootprint({
             kicadSymbol: renamedSymbol,
             kicadLibraryName: ctx.kicadLibraryName,
-            kicadFootprintName: tscircuitComponentName
+            kicadFootprintName: tscircuitComponentName,
+            isPcm: ctx.isPcm
           });
         }
         addUserSymbol({ ctx, kicadSymbol: renamedSymbol });
@@ -84552,11 +84598,14 @@ function classifySymbolsForComponent({
       updateKicadSymbolFootprint({
         kicadSymbol: renamedSymbol,
         kicadLibraryName: ctx.kicadLibraryName,
-        kicadFootprintName: tscircuitComponentName
+        kicadFootprintName: tscircuitComponentName,
+        isPcm: ctx.isPcm
       });
       addUserSymbol({ ctx, kicadSymbol: renamedSymbol });
     } else {
-      const updatedSymbol = updateBuiltinKicadSymbolFootprint(kicadSymbol);
+      const updatedSymbol = updateBuiltinKicadSymbolFootprint(kicadSymbol, {
+        isPcm: ctx.isPcm
+      });
       addBuiltinSymbol({ ctx, kicadSymbol: updatedSymbol });
     }
   }
@@ -84671,7 +84720,9 @@ var KicadLibraryConverter = class {
     this.ctx = createKicadLibraryConverterContext({
       kicadLibraryName: options.kicadLibraryName ?? "tscircuit_library",
       includeBuiltins: options.includeBuiltins ?? true,
-      getComponentKicadMetadata: options.getComponentKicadMetadata
+      getComponentKicadMetadata: options.getComponentKicadMetadata,
+      isPcm: options.isPcm ?? false,
+      kicadPcmPackageId: options.kicadPcmPackageId
     });
   }
   async run() {
@@ -84771,6 +84822,8 @@ function createKicadLibraryConverterContext(params2) {
     kicadLibraryName: params2.kicadLibraryName,
     includeBuiltins: params2.includeBuiltins,
     getComponentKicadMetadata: params2.getComponentKicadMetadata,
+    isPcm: params2.isPcm,
+    kicadPcmPackageId: params2.kicadPcmPackageId,
     footprintMetadataMap: /* @__PURE__ */ new Map,
     builtTscircuitComponents: [],
     extractedKicadComponents: [],
@@ -84895,7 +84948,9 @@ import { jsxDEV } from "react/jsx-dev-runtime";
 async function convertToKicadLibrary({
   filePath,
   libraryName,
-  outputDir
+  outputDir,
+  isPcm,
+  kicadPcmPackageId
 }) {
   const absoluteFilePath = path30.isAbsolute(filePath) ? filePath : path30.resolve(process.cwd(), filePath);
   const React = await importFromUserLand("react");
@@ -84938,7 +84993,9 @@ async function convertToKicadLibrary({
         return null;
       }
     },
-    includeBuiltins: true
+    includeBuiltins: true,
+    isPcm,
+    kicadPcmPackageId
   });
   await converter.run();
   const kicadLibOutput = converter.getOutput();
@@ -173757,14 +173814,15 @@ async function buildKicadPcm({
   const description = packageJson.description || "";
   const libraryName = resolveKicadLibraryName({ projectDir });
   const kicadLibOutputDir = path45.join(distDir, "kicad-library");
-  if (!fs45.existsSync(kicadLibOutputDir)) {
-    console.log("Converting to KiCad library...");
-    await convertToKicadLibrary({
-      filePath: entryFile,
-      libraryName,
-      outputDir: kicadLibOutputDir
-    });
-  }
+  const kicadPcmPackageId = `com_tscircuit_${author}_${packageName}`.replace(/\./g, "_");
+  console.log("Converting to KiCad library for PCM...");
+  await convertToKicadLibrary({
+    filePath: entryFile,
+    libraryName,
+    outputDir: kicadLibOutputDir,
+    isPcm: true,
+    kicadPcmPackageId
+  });
   const pcmOutputDir = path45.join(distDir, "pcm");
   const envDeploymentUrl = process.env.TSCIRCUIT_DEPLOYMENT_URL?.replace(/\/+$/, "");
   const baseUrl = envDeploymentUrl ?? `https://${author}--${packageName}.tscircuit.app`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tscircuit/cli",
-  "version": "0.1.805",
+  "version": "0.1.806",
   "main": "dist/main.js",
   "devDependencies": {
     "@babel/standalone": "^7.26.9",
@@ -24,7 +24,7 @@
     "chokidar": "4.0.1",
     "circuit-json": "0.0.325",
     "circuit-json-to-gltf": "^0.0.58",
-    "circuit-json-to-kicad": "^0.0.38",
+    "circuit-json-to-kicad": "^0.0.40",
     "circuit-json-to-readable-netlist": "^0.0.13",
     "circuit-json-to-spice": "^0.0.10",
     "circuit-json-to-tscircuit": "^0.0.9",