lineadraw 0.5.0 → 0.6.0

package/lib/init.mjs

@@ -146,9 +146,9 @@ export const init = async (dir) => {
       .join("\n");
     throw new Error(`existing modules failed validation:\n${detail}`);
   }
-  // Bake thumbnails when the sdk is installed, so the very first commit's
-  // manifest matches what CI's `check` (sdk installed) regenerates.
-  const sdkResult = await verifyWithSdk(dir, base, sources);
+  // Bake thumbnails now, so the very first commit's manifest matches what
+  // CI's `check` regenerates.
+  const sdkResult = await verifyWithSdk(base, sources);
   const manifest = withThumbnails(base, sdkResult.thumbnails);
   mkdirSync(join(dir, dirname(MANIFEST_PATH)), { recursive: true });
   writeFileSync(join(dir, MANIFEST_PATH), manifestJson(manifest));

package/lib/manifest.mjs

@@ -5,8 +5,7 @@
 // bytes, so `check` is a plain diff.
 import { createRequire } from "node:module";
 import { existsSync, readFileSync, readdirSync } from "node:fs";
-import { dirname, join, resolve } from "node:path";
-import { pathToFileURL } from "node:url";
+import { join } from "node:path";
 
 // sucrase is this package's own dependency — the light path needs nothing
 // else installed.
@@ -19,7 +18,9 @@ const SEMVER_RE = /^\d+\.\d+\.\d+$/;
 export const readConfig = (repoDir) => {
   const pkgPath = join(repoDir, "package.json");
   if (!existsSync(pkgPath))
-    throw new Error(`no package.json in ${repoDir} — run \`lineadraw init\` in an npm project`);
+    throw new Error(
+      `no package.json in ${repoDir} — run \`lineadraw init\` in an npm project`,
+    );
   const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
   const cfg = pkg.lineadraw ?? {};
   return {
@@ -142,17 +143,17 @@ export const buildManifest = (repoDir) => {
       entryOf("command", repoDir, cfg.commandsDir, f),
     ),
   ];
-  const problems = results.filter((r) => r.problems).map((r) => ({
-    file: r.file,
-    problems: r.problems,
-  }));
+  const problems = results
+    .filter((r) => r.problems)
+    .map((r) => ({
+      file: r.file,
+      problems: r.problems,
+    }));
   const entries = results.filter((r) => r.entry).map((r) => r.entry);
 
   const dupes = [
     ...new Set(
-      entries
-        .map((e) => e.id)
-        .filter((id, i, all) => all.indexOf(id) !== i),
+      entries.map((e) => e.id).filter((id, i, all) => all.indexOf(id) !== i),
     ),
   ];
   if (dupes.length > 0)
@@ -167,9 +168,7 @@ export const buildManifest = (repoDir) => {
     entries.filter((e) => e.kind === "block").map((e) => e.id),
   );
   const dangling = entries.flatMap((e) =>
-    e.dependencies
-      .filter((d) => !blockIds.has(d))
-      .map((d) => `${e.id} → ${d}`),
+    e.dependencies.filter((d) => !blockIds.has(d)).map((d) => `${e.id} → ${d}`),
   );
   if (dangling.length > 0)
     problems.push({
@@ -197,51 +196,22 @@ export const manifestJson = (manifest) =>
 export const MANIFEST_PATH = ".lineadraw/marketplace.json";
 
 /**
- * Optional execution-level verification: dry-run every block through
- * @lineadraw/sdk when the repo has it installed. Returns
- * `{ ran, problems }` — `ran: false` when the sdk (or a new enough one) is
- * absent; validation-only, so manifest CONTENT never depends on it.
+ * Execution-level verification: dry-run every block through this package's
+ * own SDK (dist/sdk.js) and bake preview thumbnails. Returns
+ * `{ ran, problems, thumbnails }` — `ran: false` (reason "load-failed") when
+ * the SDK can't load (an unbuilt checkout, a broken native install);
+ * validation-only, so the manifest's base CONTENT never depends on it.
+ * `loadSdk` is injectable for tests.
  */
-/**
- * Locate the repo's installed @lineadraw/sdk entry module. require.resolve
- * alone is NOT enough: sdk ≤ 0.11 exports only the `import` condition,
- * which a CJS resolver refuses (ERR_PACKAGE_PATH_NOT_EXPORTED) even though
- * the package is installed — that mislabeled installed sdks as missing.
- * On any resolve failure, fall back to walking node_modules by hand (the
- * same directory climb Node performs) and reading the entry from the sdk's
- * own package.json. Returns an absolute path, or null when truly absent.
- */
-const resolveSdkEntry = (repoDir) => {
-  try {
-    const repoRequire = createRequire(join(repoDir, "package.json"));
-    return repoRequire.resolve("@lineadraw/sdk");
-  } catch {
-    for (let d = resolve(repoDir); ; d = dirname(d)) {
-      const pkgPath = join(d, "node_modules", "@lineadraw", "sdk", "package.json");
-      if (existsSync(pkgPath)) {
-        const pkg = JSON.parse(readFileSync(pkgPath, "utf8"));
-        const dot = pkg.exports?.["."];
-        const entry =
-          (typeof dot === "string" ? dot : (dot?.import ?? dot?.default)) ??
-          pkg.main ??
-          "./dist/index.js";
-        return join(dirname(pkgPath), entry);
-      }
-      if (dirname(d) === d) return null;
-    }
-  }
-};
-
-export const verifyWithSdk = async (repoDir, manifest, sources) => {
-  const entryPath = resolveSdkEntry(repoDir);
-  if (entryPath === null)
-    return { ran: false, problems: [], reason: "not-installed" };
+export const verifyWithSdk = async (
+  manifest,
+  sources,
+  loadSdk = () => import("../dist/sdk.js"),
+) => {
   let sdk;
   try {
-    sdk = await import(pathToFileURL(entryPath).href);
+    sdk = await loadSdk();
   } catch (e) {
-    // Installed but not loadable (broken install, incompatible Node, …) —
-    // must never be reported as "not installed".
     return {
       ran: false,
       problems: [],
@@ -249,8 +219,6 @@ export const verifyWithSdk = async (repoDir, manifest, sources) => {
       detail: e instanceof Error ? e.message : String(e),
     };
   }
-  if (typeof sdk.testBlockDefinition !== "function")
-    return { ran: false, problems: [], reason: "too-old" };
   const problems = [];
   // All block sources double as the resolution set for thumbnails, so a
   // block emitting instances of its catalog siblings previews complete.
@@ -265,17 +233,15 @@ export const verifyWithSdk = async (repoDir, manifest, sources) => {
       problems.push({ file: entry.source, problems: [result.error] });
       continue;
     }
-    // Bake the preview thumbnail (sdk ≥ 0.12; older sdks still validate).
-    // The render is deterministic, so the manifest stays byte-stable.
-    if (typeof sdk.renderBlockThumbnailSvg === "function") {
-      try {
-        const svg = await sdk.renderBlockThumbnailSvg(sources.get(entry.id), {
-          definitions: blockSources,
-        });
-        if (typeof svg === "string") thumbnails.set(entry.id, svg);
-      } catch {
-        // A block that validates but can't render just ships no thumbnail.
-      }
+    // Bake the preview thumbnail. The render is deterministic, so the
+    // manifest stays byte-stable.
+    try {
+      const svg = await sdk.renderBlockThumbnailSvg(sources.get(entry.id), {
+        definitions: blockSources,
+      });
+      if (typeof svg === "string") thumbnails.set(entry.id, svg);
+    } catch {
+      // A block that validates but can't render just ships no thumbnail.
     }
   }
   return { ran: true, problems, thumbnails };