@rulecad/cad 0.1.2 → 0.1.4

package/bin/cad.mjs

@@ -215,10 +215,10 @@ async function board(cmd, d, b, { title, version, tag }) {
   }
   // export: exports/<project>/<name>-fab.zip (Gerbers, drills, BOM, placement: upload it to JLCPCB as it is), KiCad's
   // board and schematic beside it, and the matrix for firmware
-  const dir = paths.exports(d.project), { zipSync, strToU8 } = await import('fflate');
+  const dir = paths.exports(d.project), { zip: zipOf } = await import('@rulecad/model-link');
   fs.mkdirSync(dir, { recursive: true });
   const fab = await pcb.fabFiles(b.circuit, d.name), zip = path.join(dir, `${name}-fab.zip`);
-  fs.writeFileSync(zip, zipSync(Object.fromEntries(Object.entries(fab).map(([f, t]) => [f, strToU8(t)])), { level: 6 }));
+  fs.writeFileSync(zip, await zipOf(Object.entries(fab)));
   const written = [zip];
   for (const [f, t] of Object.entries(await pcb.kicadFiles(b.circuit, name))) { fs.writeFileSync(path.join(dir, f), t); written.push(path.join(dir, f)); }
   if (b.matrix) { const f = path.join(dir, `${name}-matrix.json`); fs.writeFileSync(f, JSON.stringify(b.matrix, null, 2) + '\n'); written.push(f); }

package/lib/versions.mjs

@@ -7,6 +7,7 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { execFileSync } from 'node:child_process';
 import { createRequire } from 'node:module';
+import { fileURLToPath } from 'node:url';
 import crypto from 'node:crypto';
 import { resolve, loadRuleSet } from './rules.mjs';
 import { WS, paths } from './workspace.mjs';
@@ -64,18 +65,24 @@ export function materialise(d, version) {
 
 // ---------- what changed: compare() is @rulecad/versions' (exported above) ----------
 
-// The board engine's identity: its code and the tscircuit it runs on. A board's release tag records it ("engine: …").
-// A package's version, from the package.json above its entry point (some packages don't export their package.json)
-export function packageVersion(name) {
-  for (let dir = path.dirname(createRequire(import.meta.url).resolve(name)); dir !== path.dirname(dir); dir = path.dirname(dir)) {
+// The board engine's identity: all its code, and the versions of the libraries that route, place and check a board. A
+// board's release tag records it ("engine: …"), and the build cache keys boards on it.
+// A package's version, from the package.json above its entry point (some packages don't export their package.json).
+// from: where to look from (a file URL), when it's another package's dependency, as tscircuit is the board engine's
+export function packageVersion(name, from = import.meta.url) {
+  for (let dir = path.dirname(createRequire(from).resolve(name)); dir !== path.dirname(dir); dir = path.dirname(dir)) {
     const f = path.join(dir, 'package.json');
     if (fs.existsSync(f)) { const pj = JSON.parse(fs.readFileSync(f, 'utf8')); if (pj.name === name) return pj.version; }
   }
   return '';
 }
-const tscircuitVersion = () => packageVersion('tscircuit');
-const engineHash = (code) => crypto.createHash('sha256').update(`${code.trimEnd()}\n${tscircuitVersion()}`).digest('hex').slice(0, 16);
-export const engineId = () => engineHash(fs.readFileSync(new URL(import.meta.resolve('@rulecad/pcb')), 'utf8'));
+const ENGINE_LIBS = ['@tscircuit/capacity-autorouter', '@tscircuit/footprinter', '@tscircuit/checks', 'schematic-symbols'];
+const engineLibs = () => ENGINE_LIBS.map((n) => `${n}@${packageVersion(n, import.meta.resolve('@rulecad/pcb'))}`).join(' ');
+const engineHash = (code) => crypto.createHash('sha256').update(`${code.trimEnd()}\n${engineLibs()}`).digest('hex').slice(0, 16);
+export const engineId = () => {
+  const dir = path.dirname(fileURLToPath(import.meta.resolve('@rulecad/pcb')));
+  return engineHash(fs.readdirSync(dir).filter((f) => f.endsWith('.mjs') && f !== 'test.mjs').sort().map((f) => fs.readFileSync(path.join(dir, f), 'utf8')).join('\n'));
+};
 // From a tag's message, or for releases before tags recorded it, from the engine's code in the repo at the tag
 function taggedEngine(tag) {
   const m = git('tag', '-l', '--format=%(contents)', tag).match(/^engine: (\w+)$/m);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rulecad/cad",
-  "version": "0.1.2",
+  "version": "0.1.4",
   "description": "The cad command: JSCAD designs from traceable rules, checked for printing and fit, versioned by what fits, shared as links and exported as Bambu 3MF.",
   "type": "module",
   "bin": {
@@ -47,12 +47,11 @@
     "@rulecad/keyboard-layout": "^0.1.2",
     "@rulecad/printcheck": "^0.1.0",
     "@rulecad/fit": "^0.1.0",
-    "@rulecad/model-link": "^0.1.0",
+    "@rulecad/model-link": "^0.1.2",
     "@rulecad/versions": "^0.1.0",
     "@rulecad/shapes": "^0.1.0",
     "@rulecad/rules": "^0.1.0",
     "@jscad/modeling": "^2.12.0",
-    "fflate": "^0.8.2",
     "three": "^0.186.1"
   },
   "peerDependencies": {