@windypro-rourou/dsh-eda 0.1.10 → 0.1.11

package/lib/index.js

@@ -2004,14 +2004,17 @@ function edaExportTool(backend) {
 
 /**
  * eda_sch_to_pcb：把当前原理图的器件复制到 PCB（替代不可靠的 importChanges）。
- * 读原理图元件 → getState_Component() 取 device → 在 PCB 网格放置（layer 1）。
+ * 实测要点：原理图器件用 getState_Component() 取 {libraryUuid, uuid, name}，
+ * 但 pcb_PrimitiveComponent.create 需要完整 ILIB_DeviceItem —— 用 component.name
+ * 再 lib_Device.search(name) 得到可放置的 device（3/3 实测通过）。
  */
 function edaSchToPcbTool(backend) {
   return defineTool({
     name: 'eda_sch_to_pcb',
     description: 'Copy the components of the CURRENT schematic onto the project PCB (direct placement). ' +
-      'This is the reliable replacement for the unreliable PCB_Document.importChanges() (returns true but places nothing). ' +
-      'Reads each schematic component via getState_Component(), opens the project PCB and places it on layer 1 in a grid. ' +
+      'Reliable replacement for PCB_Document.importChanges() (which returns true but places nothing). ' +
+      'Reads each schematic component via getState_Component() (libraryUuid/uuid/name), resolves it with lib_Device.search(name), ' +
+      'opens the project PCB and places it on layer 1 in a grid. ' +
       'Triggers: 原理图转PCB, 复制器件到PCB, sch to pcb, 同步原理图到PCB.',
     parameters: {
       spacing: { type: 'integer', description: '可选：网格间距（mil，默认 900）' },
@@ -2032,6 +2035,7 @@ function edaSchToPcbTool(backend) {
               additionalProperties: false,
               properties: {
                 designator: { type: 'string' },
+                name: { type: 'string' },
                 ok: { type: 'boolean', required: true },
                 uuid: { type: 'string' },
                 err: { type: 'string' },
@@ -2045,7 +2049,9 @@ function edaSchToPcbTool(backend) {
       render: (_args, value) => {
         if (value?.ok !== true) return [{ type: 'text', text: '原理图转 PCB 失败: ' + (value?.error ?? '?') }]
         const lines = ['✅ 原理图 → PCB：' + (value.placedOk ?? 0) + '/' + (value.total ?? 0) + ' 个器件已放置到 ' + (value.pcbUuid ?? '')]
-        for (const p of value.placed ?? []) if (!p.ok && p.err) lines.push('  ⚠ ' + (p.designator ?? '?') + ': ' + p.err)
+        for (const p of value.placed ?? []) {
+          if (!p.ok) lines.push('  ⚠ ' + (p.designator || p.name || '?') + ': ' + (p.err ?? 'failed'))
+        }
         if (value.note) lines.push(value.note)
         return [{ type: 'text', text: lines.join('\n') }]
       },
@@ -2061,59 +2067,61 @@ function edaSchToPcbTool(backend) {
       const actId = pushPendingActivity({ sid, tool: 'eda_sch_to_pcb', action: '原理图转PCB', code: 'spacing=' + spacing })
       const t0 = Date.now()
       try {
-        const pre = await backend.execute('return await (async () => {' +
-          'const comps = await eda.sch_PrimitiveComponent.getAll();' +
-          'const list = [];' +
-          'for (const c of (comps || [])) {' +
-          '  let type = ""; try { type = c.getState_ComponentType(); } catch (e) {}' +
-          '  if (["sheet","netflag","netport","wire","bus","text"].includes(type)) continue;' +
-          '  let device = null; try { device = c.getState_Component ? c.getState_Component() : null; } catch (e) {}' +
-          '  if (!device) continue;' +
-          '  list.push({ id: (() => { try { return c.getState_PrimitiveId(); } catch (e) { return ""; } })(),' +
-          '    designator: (() => { try { return c.getState_Designator(); } catch (e) { return ""; } })() });' +
-          '}' +
-          'const proj = await eda.dmt_Project.getCurrentProjectInfo();' +
-          'const pcbUuid = proj?.data?.[0]?.pcb?.uuid;' +
-          'return { ok: true, count: list.length, pcbUuid }; })();', 30000)
-        let preData = null
-        try { preData = JSON.parse(pre.result ?? 'null') } catch (e) { preData = null }
-        if (!pre.ok || !preData || preData.ok !== true) {
-          updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: '读取原理图器件失败', durationMs: Date.now() - t0 })
-          return { ok: false, pcbUuid: '', total: 0, placedOk: 0, placed: [], note: '', error: '读取原理图器件失败：' + (pre.error ?? '') }
-        }
-        if (!preData.pcbUuid) {
-          updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: '当前工程没有 PCB', durationMs: Date.now() - t0 })
-          return { ok: false, pcbUuid: '', total: Number(preData.count ?? 0), placedOk: 0, placed: [], note: '', error: '当前工程没有 PCB（先 createPcb 建板）' }
-        }
+        // 一次性桥代码（与实测脚本一致）：打开原理图 → getAll(重试) → 取 component.name → 打开 PCB → search(name)→create → 保存
         const code = 'return await (async () => {' +
           'const sleep = (ms) => new Promise(r => setTimeout(r, ms));' +
-          'const comps = await eda.sch_PrimitiveComponent.getAll();' +
-          'const list = [];' +
-          'for (const c of (comps || [])) {' +
+          'const proj = await eda.dmt_Project.getCurrentProjectInfo();' +
+          'const first = (proj?.data || [])[0] || {};' +
+          'const schPage = first?.schematic?.page?.[0]?.uuid;' +
+          'const pcbUuid = first?.pcb?.uuid;' +
+          'if (!schPage) return { ok: false, err: "当前工程没有原理图页" };' +
+          'if (!pcbUuid) return { ok: false, err: "当前工程没有 PCB（先 createPcb 建板）" };' +
+          // 打开原理图
+          'await eda.dmt_EditorControl.openDocument(schPage);' +
+          'await sleep(2200);' +
+          'let comps = null;' +
+          'for (let i = 0; i < 5 && !comps; i++) {' +
+          '  try { const r = await eda.sch_PrimitiveComponent.getAll(); if (Array.isArray(r)) comps = r; } catch (e) {}' +
+          '  if (!comps) await sleep(800);' +
+          '}' +
+          'if (!comps) return { ok: false, err: "原理图矩形读取失败（getAll 重试 5 次）" };' +
+          'const parts = [];' +
+          'for (const c of comps) {' +
           '  let type = ""; try { type = c.getState_ComponentType(); } catch (e) {}' +
-          '  if (["sheet","netflag","netport","wire","bus","text"].includes(type)) continue;' +
-          '  let device = null; try { device = c.getState_Component ? c.getState_Component() : null; } catch (e) {}' +
-          '  if (!device) continue;' +
-          '  list.push({ designator: (() => { try { return c.getState_Designator(); } catch (e) { return ""; } })(), device });' +
+          '  if (!["part", "component"].includes(type)) continue;' +
+          '  let comp = null; try { comp = c.getState_Component ? c.getState_Component() : null; } catch (e) {}' +
+          '  if (!comp || !comp.name) continue;' +
+          '  parts.push({' +
+          '    designator: (() => { try { return c.getState_Designator(); } catch (e) { return ""; } })(),' +
+          '    name: String(comp.name),' +
+          '    libraryUuid: comp.libraryUuid ? String(comp.libraryUuid) : "",' +
+          '    uuid: comp.uuid ? String(comp.uuid) : "",' +
+          '  });' +
           '}' +
-          'const proj = await eda.dmt_Project.getCurrentProjectInfo();' +
-          'const pcbUuid = proj?.data?.[0]?.pcb?.uuid;' +
-          'if (!pcbUuid) return { ok: false, err: "no pcb" };' +
+          // 打开 PCB
           'await eda.dmt_EditorControl.openDocument(pcbUuid);' +
-          'await sleep(1800);' +
+          'await sleep(2000);' +
           'const spacing = SPACING;' +
           'const placed = [];' +
           'let x = 1500, y = 1200, col = 0;' +
-          'for (const it of list) {' +
+          'for (const p of parts) {' +
+          '  const rec = { designator: p.designator, name: p.name };' +
           '  try {' +
-          '    const comp = await eda.pcb_PrimitiveComponent.create(it.device, 1, x, y);' +
-          '    placed.push({ designator: String(it.designator || ""), ok: !!comp, uuid: comp && comp.getState_PrimitiveId ? comp.getState_PrimitiveId() : "" });' +
-          '  } catch (e) { placed.push({ designator: String(it.designator || ""), ok: false, err: String(e).slice(0, 80) }); }' +
+          '    const items = await eda.lib_Device.search(p.name, undefined, undefined, undefined, 5, 1);' +
+          '    const dev = items && items[0];' +
+          '    if (!dev) { rec.ok = false; rec.err = "search 无结果"; placed.push(rec); continue; }' +
+          '    const c = await eda.pcb_PrimitiveComponent.create(dev, 1, x, y);' +
+          '    rec.ok = !!c;' +
+          '    if (c && c.getState_PrimitiveId) rec.uuid = c.getState_PrimitiveId();' +
+          '  } catch (e) { rec.ok = false; rec.err = String(e && e.message || e).slice(0, 100); }' +
+          '  placed.push(rec);' +
           '  col++; if (col % 6 === 0) { x = 1500; y += spacing; } else x += spacing;' +
           '  await sleep(120);' +
           '}' +
           'try { await eda.pcb_Document.save(); } catch (e) {}' +
-          'return { ok: true, pcbUuid, total: list.length, placedOk: placed.filter(p => p.ok).length, placed }; })();'
+          'const pc = await eda.pcb_PrimitiveComponent.getAll().catch(() => null);' +
+          'return { ok: true, pcbUuid, total: parts.length, placedOk: placed.filter(p => p.ok).length, placed, pcbComponentCount: pc ? pc.length : null };' +
+          '})();'
         const r = await backend.execute(code.replace('SPACING', String(spacing)), 120000)
         if (!r.ok) {
           updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: r.error, durationMs: Date.now() - t0 })
@@ -2124,10 +2132,10 @@ function edaSchToPcbTool(backend) {
         if (!parsed) return { ok: false, pcbUuid: '', total: 0, placedOk: 0, placed: [], note: '', error: '结果解析失败' }
         if (parsed.ok !== true) {
           updateActivity(actId, { status: 'error', ok: false, action: '原理图转PCB', error: String(parsed.err ?? 'failed'), durationMs: Date.now() - t0 })
-          return { ok: false, pcbUuid: '', total: Number(parsed.total ?? 0), placedOk: 0, placed: [], note: '', error: String(parsed.err ?? '原理图转 PCB 失败') }
+          return { ok: false, pcbUuid: '', total: 0, placedOk: 0, placed: [], note: '', error: String(parsed.err ?? '原理图转 PCB 失败') }
         }
         const placed = (parsed.placed ?? []).map((p) => {
-          const row = { designator: String(p.designator ?? ''), ok: p.ok === true }
+          const row = { designator: String(p.designator ?? ''), name: String(p.name ?? ''), ok: p.ok === true }
           if (p.uuid) row.uuid = String(p.uuid)
           if (p.err) row.err = String(p.err)
           return row
@@ -2139,7 +2147,7 @@ function edaSchToPcbTool(backend) {
         return {
           ok: true, pcbUuid: String(parsed.pcbUuid ?? ''), total: Number(parsed.total ?? 0),
           placedOk: Number(parsed.placedOk ?? 0), placed,
-          note: '放置坐标是元件原点（封装可能偏移）；位号沿用原理图但 PCB 上可能为空，需人工确认。',
+          note: '已按 component.name 重新检索器件放置（比 translate device 引用更可靠）；位号沿用原理图，坐标=元件原点（封装可能偏移），布线与网络仍需后续处理。',
         }
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@windypro-rourou/dsh-eda",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "type": "module",
   "description": "dsh-lichuang-eda (JCL-EDA): 嘉立创 EDA 助手 DSH 插件 —— 官方 eda.* API 云端实时生成（原理图/PCB）+ 离线标准版 JSON 兜底 + 面板记录式时间线（撤回/清空/紧急保存）。开箱即用：npm i 后 cordis.patch.yml insert 一行即挂载。",
   "packageManager": "pnpm@11.22.0",