Add tsci import --model-format <obj|step> flag to select the cadModel which needs to be imported from easyeda

cli/import/register.ts

@@ -1,6 +1,6 @@
+import { getQueryFromParts } from "cli/utils/get-query-from-parts"
 import type { Command } from "commander"
 import kleur from "kleur"
-import { getQueryFromParts } from "cli/utils/get-query-from-parts"
 import { importComponentFromJlcpcb } from "lib/import/import-component-from-jlcpcb"
 import { getRegistryApiKy } from "lib/registry-api/get-ky"
 import { addPackage } from "lib/shared/add-package"
@@ -17,21 +17,30 @@ export const registerImport = (program: Command) => {
     .option("--jlcpcb", "Search JLCPCB components")
     .option("--lcsc", "Alias for --jlcpcb")
     .option("--tscircuit", "Search tscircuit registry packages")
+    .option(
+      "--model-format <format>",
+      "CAD model format to import from JLCPCB (obj, step)",
+      "obj",
+    )
     .action(
       async (
         queryParts: string[],
         opts: {
           jlcpcb?: boolean
           lcsc?: boolean
           tscircuit?: boolean
+          modelFormat?: "obj" | "step"
         },
       ) => {
         const query = getQueryFromParts(queryParts)
         const hasFilters = opts.jlcpcb || opts.lcsc || opts.tscircuit
         const searchJlc = opts.jlcpcb || opts.lcsc || !hasFilters
         const searchTscircuit = opts.tscircuit || !hasFilters
         const ky = getRegistryApiKy()
-        const spinner = ora("Searching...").start()
+        const spinner = ora({
+          text: "Searching...",
+          stream: process.stdout,
+        }).start()
 
         let registryResults: Array<{
           name: string
@@ -134,7 +143,10 @@ export const registerImport = (program: Command) => {
         }
 
         if (choice.type === "registry") {
-          const installSpinner = ora(`Installing ${choice.name}...`).start()
+          const installSpinner = ora({
+            text: `Installing ${choice.name}...`,
+            stream: process.stdout,
+          }).start()
           try {
             await addPackage(choice.name)
             installSpinner.succeed(kleur.green(`Installed ${choice.name}`))
@@ -144,13 +156,15 @@ export const registerImport = (program: Command) => {
             return process.exit(1)
           }
         } else {
-          const importSpinner = ora(
-            `Importing "C${choice.part}" from JLCPCB...`,
-          ).start()
+          const importSpinner = ora({
+            text: `Importing "C${choice.part}" from JLCPCB...`,
+            stream: process.stdout,
+          }).start()
           try {
-            const { filePath } = await importComponentFromJlcpcb(
-              `C${String(choice.part)}`,
-            )
+            const { filePath } = await importComponentFromJlcpcb({
+              jlcpcbPartNumber: `C${String(choice.part)}`,
+              modelFormat: opts.modelFormat,
+            })
             importSpinner.succeed(kleur.green(`Imported ${filePath}`))
           } catch (error) {
             importSpinner.fail(kleur.red("Failed to import part"))

lib/import/import-component-from-jlcpcb.ts

@@ -2,12 +2,20 @@ import { fetchEasyEDAComponent, convertRawEasyToTsx } from "easyeda/browser"
 import fs from "node:fs/promises"
 import path from "node:path"
 
-export const importComponentFromJlcpcb = async (
-  jlcpcbPartNumber: string,
-  projectDir: string = process.cwd(),
-) => {
+export const importComponentFromJlcpcb = async ({
+  jlcpcbPartNumber,
+  projectDir = process.cwd(),
+  modelFormat = "obj",
+}: {
+  jlcpcbPartNumber: string
+  projectDir?: string
+  modelFormat?: "obj" | "step"
+}) => {
   const component = await fetchEasyEDAComponent(jlcpcbPartNumber)
-  const tsx = await convertRawEasyToTsx(component)
+  const tsx = await convertRawEasyToTsx({
+    rawEasy: component,
+    format: modelFormat,
+  })
   const fileName = tsx.match(/export const (\w+) = .*/)?.[1]
   if (!fileName) {
     throw new Error("Could not determine file name of converted component")

package.json

@@ -40,7 +40,7 @@
     "debug": "^4.4.0",
     "delay": "^6.0.0",
     "dsn-converter": "^0.0.63",
-    "easyeda": "^0.0.248",
+    "easyeda": "^0.0.251",
     "fuse.js": "^7.1.0",
     "get-port": "^7.1.0",
     "globby": "^14.1.0",

tests/cli/import/import-with-step-cad-model.test.ts

@@ -0,0 +1,21 @@
+import { test, expect } from "bun:test"
+import { getCliTestFixture } from "../../fixtures/get-cli-test-fixture"
+import path from "node:path"
+import fs from "node:fs"
+
+test("import command generates package from JLCPCB part", async () => {
+  if (process.env.CI) {
+    return
+  }
+
+  const { tmpDir, runCommand } = await getCliTestFixture({ loggedIn: true })
+  const { stdout, stderr } = await runCommand(
+    "tsci import C2040 --model-format step",
+  )
+  const filePath = path.join(tmpDir, "imports", "RP2040.tsx")
+  expect(fs.existsSync(filePath)).toBe(true)
+  const fileContent = fs.readFileSync(filePath, "utf8")
+  expect(fileContent).toContain("stepUrl")
+  expect(stderr).toBe("")
+  expect(stdout.toLowerCase()).toContain("imported")
+}, 20_000)