@jant/core 0.3.45 → 0.3.47

package/bin/commands/db/execute-file.js

@@ -3,13 +3,13 @@ import { parseArgs } from "node:util";
 import { executeD1 } from "../../lib/d1-query.js";
 import { openNodeDatabase } from "../../lib/node-database.js";
 import {
+  bootstrapCliRuntime,
   getCliRuntimeLabel,
-  resolveCliRuntime,
 } from "../../lib/runtime-target.js";
 
 function formatUsage() {
   console.log(
-    "Usage: jant db execute-file --file <path> [--local | --remote] [--config <file>] [--env <name>] [--database <binding>]",
+    "Usage: jant db execute-file --file <path> [--local | --remote | --node] [--config <file>] [--env <name>] [--database <binding>]",
   );
   console.log("");
   console.log(
@@ -20,6 +20,9 @@ function formatUsage() {
   console.log("  --file             SQL file to execute");
   console.log("  --local            Force local D1 instead of DATABASE_URL");
   console.log("  --remote           Run against remote D1");
+  console.log(
+    "  --node             Force Node runtime even if DATABASE_URL is unset",
+  );
   console.log(
     "  --config           Wrangler config file (default: wrangler.toml)",
   );
@@ -28,8 +31,12 @@ function formatUsage() {
   console.log("  --persist-to       Local D1 state directory override");
   console.log("");
   console.log(
-    "If DATABASE_URL or DATA_DIR is set and no runtime flag is passed, this command uses the Node database runtime.",
+    "`.env.node` next to your project (or in packages/core/) is auto-loaded.",
+  );
+  console.log(
+    "If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
   );
+  console.log("this command uses the Node database runtime.");
 }
 
 async function loadSqlFile(filePath) {
@@ -59,6 +66,7 @@ export async function run(argv) {
       file: { type: "string" },
       help: { type: "boolean", short: "h" },
       local: { type: "boolean", default: false },
+      node: { type: "boolean", default: false },
       "persist-to": { type: "string" },
       remote: { type: "boolean", default: false },
     },
@@ -73,7 +81,7 @@ export async function run(argv) {
     throw new Error("Missing required --file <path> argument.");
   }
 
-  const runtime = resolveCliRuntime(values);
+  const { runtime } = bootstrapCliRuntime(values);
   const sql = await loadSqlFile(values.file);
 
   if (runtime === "node") {

package/bin/commands/db/rehearse.js

@@ -1,8 +1,8 @@
 import { parseArgs } from "node:util";
 import { rehearseD1Migrations } from "../../lib/migration-rehearsal.js";
 import {
+  bootstrapCliRuntime,
   getCliRuntimeLabel,
-  resolveCliRuntime,
 } from "../../lib/runtime-target.js";
 
 export async function run(argv) {
@@ -46,7 +46,7 @@ export async function run(argv) {
     throw new Error("Missing required --fixture option.");
   }
 
-  const runtime = resolveCliRuntime(values);
+  const { runtime } = bootstrapCliRuntime(values);
   if (runtime === "node") {
     throw new Error(
       "Migration rehearsal only supports D1. Pass --local or --remote.",

package/bin/commands/export.js

@@ -5,8 +5,8 @@ import { queryD1 } from "../lib/d1-query.js";
 import { openNodeDatabase } from "../lib/node-database.js";
 import { dumpDatabaseToSql } from "../lib/sql-export.js";
 import {
+  bootstrapCliRuntime,
   getCliRuntimeLabel,
-  resolveCliRuntime,
 } from "../lib/runtime-target.js";
 
 function createD1QueryRunner(runtime) {
@@ -25,6 +25,7 @@ export async function run(argv) {
       database: { type: "string", default: "DB" },
       env: { type: "string" },
       local: { type: "boolean", default: false },
+      node: { type: "boolean", default: false },
       remote: { type: "boolean", default: false },
       output: { type: "string", short: "o", default: "jant-export.sql" },
       help: { type: "boolean", short: "h" },
@@ -34,7 +35,7 @@ export async function run(argv) {
 
   if (values.help) {
     console.log(
-      "Usage: jant db export [--local | --remote] [--output <file>] [--config <file>] [--env <name>] [--database <binding>]",
+      "Usage: jant db export [--local | --remote | --node] [--output <file>] [--config <file>] [--env <name>] [--database <binding>]",
     );
     console.log("");
     console.log("Export the current database to a SQL file.");
@@ -44,6 +45,9 @@ export async function run(argv) {
     console.log(
       "  --remote          Export from remote D1 database (default: local)",
     );
+    console.log(
+      "  --node            Force Node runtime even if DATABASE_URL is unset",
+    );
     console.log(
       "  --output, -o      Output file path (default: jant-export.sql)",
     );
@@ -55,14 +59,18 @@ export async function run(argv) {
     console.log("  --persist-to      Local D1 state directory override");
     console.log("");
     console.log(
-      "If DATABASE_URL or DATA_DIR is set and no runtime flag is passed, this command uses the Node database runtime.",
+      "`.env.node` next to your project (or in packages/core/) is auto-loaded.",
+    );
+    console.log(
+      "If DATABASE_URL or DATA_DIR is then set and no runtime flag is passed,",
     );
+    console.log("this command uses the Node database runtime.");
     console.log("");
     console.log("Compatibility alias: jant export");
     process.exit(0);
   }
 
-  const runtime = resolveCliRuntime(values);
+  const { runtime } = bootstrapCliRuntime(values);
   const output = values.output;
   let sql;
 

package/bin/commands/import-site.js

@@ -18,8 +18,6 @@ import {
   normalizeImportedBody,
   rewriteMediaReferences,
 } from "../lib/site-media-parser.js";
-import { openNodeDatabase } from "../lib/node-database.js";
-import { loadNodeRuntime } from "../lib/load-node-runtime.js";
 import { parseFrontMatter as parseFrontMatterShared } from "../lib/hugo-markdown.js";
 
 /**
@@ -437,6 +435,18 @@ function isAbsoluteUrl(value) {
   return typeof value === "string" && /^https?:\/\//i.test(value);
 }
 
+/**
+ * True when `url` points to a different location than the import target —
+ * i.e. has a scheme (`https://`, `data:`) or is protocol-relative (`//cdn…`).
+ * False for relative paths (`/media/x`, `./x`, `x`), which always belong to
+ * the source site and must be rehosted. Used to filter the body-fallback
+ * upload when `--skip-remote-media` is set.
+ */
+function isAbsoluteImportUrl(value) {
+  if (typeof value !== "string") return false;
+  return /^([a-z][a-z0-9+.\-]*:|\/\/)/i.test(value);
+}
+
 /**
  * Resolve a `media:` entry's `src` or `poster` reference to a local disk
  * path when the export bundled the bytes under `static/`. Absolute URLs
@@ -641,19 +651,7 @@ async function buildImportedAttachments(
   target,
   siteConfig,
   sourceRootDir,
-  options = {},
 ) {
-  if (
-    sourceRootDir &&
-    typeof sourceRootDir === "object" &&
-    !Array.isArray(sourceRootDir) &&
-    options &&
-    Object.keys(options).length === 0
-  ) {
-    options = sourceRootDir;
-    sourceRootDir = null;
-  }
-
   const attachments = [];
   let uploaded = 0;
 
@@ -668,10 +666,6 @@ async function buildImportedAttachments(
       continue;
     }
 
-    if (options.skipUploads) {
-      continue;
-    }
-
     const normalized = await normalizeMediaSpec(
       spec,
       siteConfig,
@@ -1487,223 +1481,6 @@ function createRemoteTarget(apiUrl, token) {
   };
 }
 
-async function createLocalTarget(env = process.env) {
-  const nodeDatabase = await openNodeDatabase(env);
-  const { createNodeCliRuntime, resolveConfig } = await loadNodeRuntime();
-  const bindings = nodeDatabase.bindings;
-  const runtime = await createNodeCliRuntime(bindings);
-  const allSettings = await runtime.services.settings.getAll();
-  const appConfig = resolveConfig(bindings, allSettings);
-  const summaryConfig = {
-    maxParagraphs: appConfig.summaryMaxParagraphs,
-    maxChars: appConfig.summaryMaxChars,
-  };
-
-  return {
-    async close() {
-      await nodeDatabase.close();
-    },
-    async getSetupStatus() {
-      return runtime.services.settings.isOnboardingComplete();
-    },
-    async updateSettings(updates) {
-      await runtime.services.settings.setMany(updates);
-      return { settings: updates };
-    },
-    async updateImportSettings(updates) {
-      await runtime.services.settings.setMany(updates);
-      return { success: true };
-    },
-    async listNavItems() {
-      return runtime.services.navItems.list();
-    },
-    async createNavItem(data) {
-      return runtime.services.navItems.create(data);
-    },
-    async deleteNavItem(id) {
-      return runtime.services.navItems.delete(id);
-    },
-    async removeSiteAvatar() {
-      return runtime.services.settings.removeAvatar(runtime.storage);
-    },
-    async uploadSiteAvatar(data) {
-      if (!runtime.storage) {
-        throw new Error("Local import requires configured storage.");
-      }
-
-      const avatarAsset = await readImportAsset({
-        sourceUrl: data.avatarUrl,
-        sourceFilePath: data.avatarFilePath,
-      });
-      if (!avatarAsset) {
-        throw new Error(`Failed to read site avatar: ${data.avatarUrl}`);
-      }
-
-      let faviconIco;
-      if (data.faviconUrl || data.faviconFilePath) {
-        const faviconAsset = await readImportAsset({
-          sourceUrl: data.faviconUrl,
-          sourceFilePath: data.faviconFilePath,
-          mimeType: "image/x-icon",
-          originalName: "favicon.ico",
-        });
-        if (faviconAsset) {
-          faviconIco = toArrayBuffer(faviconAsset.bytes);
-        }
-      }
-
-      let appleTouchIcon;
-      if (data.appleTouchUrl) {
-        const appleTouchAsset = await readImportAsset({
-          sourceUrl: data.appleTouchUrl,
-          sourceFilePath: data.appleTouchFilePath,
-        });
-        if (appleTouchAsset) {
-          appleTouchIcon = toArrayBuffer(appleTouchAsset.bytes);
-        }
-      }
-
-      await runtime.services.settings.uploadAvatar(
-        {
-          file: createUploadFile(
-            avatarAsset.filename,
-            avatarAsset.contentType,
-            avatarAsset.bytes,
-          ),
-          faviconIco,
-          appleTouchIcon,
-        },
-        {
-          media: runtime.services.media,
-          storage: runtime.storage,
-          storageProvider: appConfig.storageDriver,
-          maxFileSizeMB: appConfig.uploadMaxFileSize,
-        },
-      );
-
-      return { success: true };
-    },
-    async syncSiteAvatar(data) {
-      await this.removeSiteAvatar();
-      if (!data) {
-        return { success: true };
-      }
-      return this.uploadSiteAvatar(data);
-    },
-    async listCollections() {
-      return runtime.services.collections.list();
-    },
-    async listCollectionDirectoryItems() {
-      return runtime.services.collections.listDirectoryItems();
-    },
-    async createCollection(data) {
-      return runtime.services.collections.create(data);
-    },
-    async createCollectionDirectoryItem(data) {
-      return runtime.services.collections.createDirectoryItem(data);
-    },
-    async moveCollectionDirectoryItem(id, after, before) {
-      return runtime.services.collections.moveDirectoryItem(id, after, before);
-    },
-    async deleteCollectionDirectoryItem(id) {
-      return runtime.services.collections.deleteDirectoryItem(id);
-    },
-    async createPost(data) {
-      const { attachments, ...postData } = data;
-      return runtime.services.posts.createWithAttachments(
-        postData,
-        attachments,
-        {
-          media: runtime.services.media,
-          storage: runtime.storage,
-          storageDriver: appConfig.storageDriver,
-          maxFileSizeMB: appConfig.uploadMaxFileSize,
-        },
-        summaryConfig,
-      );
-    },
-    async createAlias(path, targetSlug) {
-      const post = await runtime.services.posts.getBySlug(targetSlug);
-      if (!post) {
-        throw new Error(`Post with slug "${targetSlug}" not found`);
-      }
-      return runtime.services.customUrls.create({
-        path,
-        targetType: "post",
-        targetId: post.id,
-      });
-    },
-    async uploadMedia(mediaSpec) {
-      if (!runtime.storage) {
-        throw new Error("Local import requires configured storage.");
-      }
-
-      const asset = await readMediaSpecAsset(mediaSpec);
-      if (!asset) return null;
-
-      const originalName =
-        mediaSpec.originalName ||
-        asset.filename ||
-        getFilenameFromUrl(mediaSpec.src) ||
-        "file";
-      const bytes = asset.bytes;
-      const { id, filename, storageKey } =
-        generateImportedStorageKey(originalName);
-      const mimeType =
-        mediaSpec.mimeType || asset.contentType || guessMimeType(originalName);
-      let posterKey;
-
-      if (mediaSpec.poster) {
-        const posterAsset = await readMediaSpecAsset(mediaSpec, "poster");
-        if (posterAsset) {
-          const posterName = posterAsset.filename || "poster.webp";
-          const posterExt = extname(posterName) || ".webp";
-          posterKey = storageKey.replace(/(\.[^.]+)?$/, `-poster${posterExt}`);
-          await runtime.storage.put(posterKey, posterAsset.bytes, {
-            contentType: posterAsset.contentType || guessMimeType(posterName),
-          });
-        }
-      }
-
-      await runtime.storage.put(storageKey, bytes, {
-        contentType: mimeType,
-      });
-
-      const createdMedia = await runtime.services.media.create({
-        id,
-        filename,
-        originalName,
-        mimeType,
-        size: mediaSpec.size ?? bytes.byteLength,
-        storageKey,
-        provider: appConfig.storageDriver,
-        width: mediaSpec.width ?? undefined,
-        height: mediaSpec.height ?? undefined,
-        alt: mediaSpec.alt ?? undefined,
-        position: mediaSpec.position ?? undefined,
-        blurhash: mediaSpec.blurhash ?? undefined,
-        waveform: mediaSpec.waveform ?? undefined,
-        posterKey,
-        summary: mediaSpec.summary ?? undefined,
-        chars: mediaSpec.chars ?? undefined,
-        mediaKind: mediaSpec.kind ?? undefined,
-      });
-
-      return {
-        id: createdMedia.id,
-        url: getMediaPublicUrl(
-          createdMedia.storageKey,
-          createdMedia.provider,
-          appConfig,
-        ),
-      };
-    },
-    async checkPostSlugAvailability(slug) {
-      return runtime.services.posts.checkSlugAvailability(slug);
-    },
-  };
-}
-
 /**
  * Walk `content/` and classify each `_index.md` / `index.md` bundle by its
  * front-matter `type`. Returns ordered root-post bundles (with child reply
@@ -1976,6 +1753,7 @@ function buildPostPayloadFromBundle(bundle, options) {
 }
 
 export const __test__ = {
+  isAbsoluteImportUrl,
   resolveImportUrl,
   readMediaSpecAsset,
   normalizeMediaSpec,
@@ -2001,77 +1779,89 @@ export const __test__ = {
   buildPostPayloadFromBundle,
 };
 
+function printImportUsage() {
+  console.log("Usage: jant site import <url> [options]");
+  console.log("");
+  console.log("Import a Hugo export directory or ZIP into a Jant site.");
+  console.log("");
+  console.log("Arguments:");
+  console.log("  <url>         Jant site URL (required)");
+  console.log("");
+  console.log("Options:");
+  console.log(
+    "  --path        Path to export directory or ZIP file (default: .)",
+  );
+  console.log("  --dry-run     Parse and validate without making API calls");
+  console.log(
+    "  --skip-remote-media  Skip uploading absolute-URL images found in body (relative paths and declared media still import)",
+  );
+  console.log("  --token       API token (overrides JANT_API_TOKEN)");
+  console.log("");
+  console.log(
+    "Import expects an empty target site and fails on slug or alias conflicts.",
+  );
+  console.log("");
+  console.log("Authentication:");
+  console.log(`  export ${CLI_API_TOKEN_ENV_VAR}=jnt_your_token`);
+  console.log("  jant site import https://your-site.example --path ./export");
+  console.log("");
+  console.log("Examples:");
+  console.log(
+    "  jant site import https://your-site.example --path ./jant-site",
+  );
+  console.log(
+    "  jant site import https://your-site.example --path ./jant-site-export.zip",
+  );
+  console.log("");
+  console.log("Compatibility alias: jant import-site");
+}
+
 export async function run(argv) {
-  const { values } = parseArgs({
+  const { values, positionals } = parseArgs({
     args: argv,
+    allowPositionals: true,
     options: {
-      url: { type: "string" },
       token: { type: "string" },
       path: { type: "string", default: "." },
       "dry-run": { type: "boolean", default: false },
-      "skip-media": { type: "boolean", default: false },
+      "skip-remote-media": { type: "boolean", default: false },
       help: { type: "boolean", short: "h" },
     },
   });
 
   if (values.help) {
-    console.log("Usage: jant site import [--url <url>] [options]");
-    console.log("");
-    console.log("Import a Hugo export directory or ZIP into a Jant instance.");
-    console.log("");
-    console.log("Modes:");
-    console.log(
-      "  Local           No --url; imports into the local Node database runtime",
-    );
-    console.log(
-      `  Remote          --url requires ${CLI_API_TOKEN_ENV_VAR} or --token`,
-    );
-    console.log("");
-    console.log("Options:");
-    console.log("  --url         Target remote Jant instance URL");
-    console.log(
-      "  --path        Path to export directory or ZIP file (default: .)",
-    );
-    console.log("  --dry-run     Parse and validate without making API calls");
-    console.log(
-      "  --skip-media  Skip remote media download/upload (embedded text attachments still import)",
-    );
-    console.log("");
-    console.log(
-      "Import expects an empty target site and fails on slug or alias conflicts.",
-    );
-    console.log("");
-    console.log("Authentication:");
-    console.log(`  Set ${CLI_API_TOKEN_ENV_VAR} env var (recommended):`);
-    console.log(`    export ${CLI_API_TOKEN_ENV_VAR}=jnt_your_token`);
-    console.log("    jant site import --url https://your-site.com");
-    console.log("");
-    console.log("Examples:");
-    console.log("  jant site import --path ./jant-site");
-    console.log("  jant site import --path ./jant-site-export.zip");
-    console.log("");
-    console.log("Compatibility alias: jant import-site");
+    printImportUsage();
     process.exit(0);
   }
 
+  const url = positionals[0];
+  if (!url) {
+    console.error("Error: site URL is required");
+    console.error("");
+    printImportUsage();
+    process.exit(1);
+  }
+  if (positionals.length > 1) {
+    console.error(
+      `Error: unexpected extra arguments: ${positionals.slice(1).join(" ")}`,
+    );
+    process.exit(1);
+  }
+
+  const dryRun = values["dry-run"];
   const token = getCliApiToken(process.env, values.token);
-  if (values.url && !token && !values["dry-run"]) {
+  if (!token && !dryRun) {
     console.error(
-      `Error: remote import requires ${CLI_API_TOKEN_ENV_VAR} or --token (unless using --dry-run)`,
+      `Error: site import requires ${CLI_API_TOKEN_ENV_VAR} or --token (unless using --dry-run)`,
     );
     console.error("");
     console.error(`  export ${CLI_API_TOKEN_ENV_VAR}=jnt_your_token`);
     process.exit(1);
   }
 
-  const apiUrl = values.url?.replace(/\/$/, "");
-  const dryRun = values["dry-run"];
-  const skipMedia = values["skip-media"];
-  const target = dryRun
-    ? null
-    : values.url
-      ? createRemoteTarget(apiUrl, token)
-      : await createLocalTarget(process.env);
+  const apiUrl = url.replace(/\/$/, "");
+  const skipRemoteMedia = values["skip-remote-media"];
+  const target = dryRun ? null : createRemoteTarget(apiUrl, token);
 
   // 1. Read source — directory or ZIP
   const inputPath = resolve(process.cwd(), values.path);
@@ -2121,7 +1911,7 @@ export async function run(argv) {
     if (target) {
       const setupError = await getIncompleteSetupError(
         target,
-        values.url ? `Target site at ${apiUrl}` : "Local target site",
+        `Target site at ${apiUrl}`,
       );
       if (setupError) {
         console.error("");
@@ -2149,7 +1939,7 @@ export async function run(argv) {
             `[dry-run] Would replace navigation with ${importedNav.items.length} items`,
           );
         }
-        if (avatarImport && !skipMedia) {
+        if (avatarImport) {
           if (avatarImport.mode === "remove") {
             console.log("[dry-run] Would remove existing site avatar");
           } else {
@@ -2204,7 +1994,7 @@ export async function run(argv) {
           }
         }
 
-        if (avatarImport && !skipMedia) {
+        if (avatarImport) {
           try {
             await target.syncSiteAvatar(
               avatarImport.mode === "set" ? avatarImport : null,
@@ -2349,7 +2139,7 @@ export async function run(argv) {
       }
 
       const rootResourceIds = [];
-      if (!skipMedia && !dryRun && rootResourceSpecs.length > 0) {
+      if (!dryRun && rootResourceSpecs.length > 0) {
         const result = await uploadBundleResources(rootResourceSpecs, target);
         mediaUploaded += result.uploaded;
         if (result.urlMap.size > 0) {
@@ -2360,8 +2150,13 @@ export async function run(argv) {
 
       // Fallback: rewrite any leftover in-body image URLs (covers hand-
       // authored Hugo content where the exporter didn't declare resources).
-      if (!skipMedia && !dryRun) {
-        const imageMedia = findImageUrls(rootBody).map((src) => ({ src }));
+      // `--skip-remote-media` filters out absolute URLs here so we only
+      // rehost relative paths (the source site's own files).
+      if (!dryRun) {
+        const fallbackUrls = findImageUrls(rootBody).filter(
+          (url) => !skipRemoteMedia || !isAbsoluteImportUrl(url),
+        );
+        const imageMedia = fallbackUrls.map((src) => ({ src }));
         const uploadResult = await uploadMediaList(
           imageMedia,
           target,
@@ -2380,7 +2175,6 @@ export async function run(argv) {
           target,
           siteConfig,
           sourceRootDir,
-          { skipUploads: skipMedia },
         );
         importedAttachments = attachmentResult.attachments;
         mediaUploaded += attachmentResult.uploaded;
@@ -2396,7 +2190,7 @@ export async function run(argv) {
       // These reference a `.md` artifact that holds the full body; the
       // normalizer fetches the bytes (local disk first, then remote URL)
       // and decodes them.
-      if (!skipMedia && !dryRun) {
+      if (!dryRun) {
         for (const textEntry of rootTextAttachmentEntries) {
           const textAttachment = await normalizeTextAttachmentSpec(
             textEntry,
@@ -2496,7 +2290,7 @@ export async function run(argv) {
         }
 
         const replyResourceIds = [];
-        if (!skipMedia && replyResourceSpecs.length > 0) {
+        if (replyResourceSpecs.length > 0) {
           const result = await uploadBundleResources(
             replyResourceSpecs,
             target,
@@ -2508,8 +2302,11 @@ export async function run(argv) {
           replyResourceIds.push(...result.mediaIds);
         }
 
-        if (!skipMedia) {
-          const imageMedia = findImageUrls(replyBody).map((src) => ({ src }));
+        {
+          const fallbackUrls = findImageUrls(replyBody).filter(
+            (url) => !skipRemoteMedia || !isAbsoluteImportUrl(url),
+          );
+          const imageMedia = fallbackUrls.map((src) => ({ src }));
           const uploadResult = await uploadMediaList(
             imageMedia,
             target,
@@ -2527,7 +2324,6 @@ export async function run(argv) {
           target,
           siteConfig,
           sourceRootDir,
-          { skipUploads: skipMedia },
         );
         replyAttachments = attachmentResult.attachments;
         mediaUploaded += attachmentResult.uploaded;
@@ -2535,15 +2331,13 @@ export async function run(argv) {
           replyAttachments.push({ type: "media", mediaId });
         }
 
-        if (!skipMedia) {
-          for (const textEntry of replyTextAttachmentEntries) {
-            const textAttachment = await normalizeTextAttachmentSpec(
-              textEntry,
-              siteConfig,
-              sourceRootDir,
-            );
-            if (textAttachment) replyAttachments.push(textAttachment);
-          }
+        for (const textEntry of replyTextAttachmentEntries) {
+          const textAttachment = await normalizeTextAttachmentSpec(
+            textEntry,
+            siteConfig,
+            sourceRootDir,
+          );
+          if (textAttachment) replyAttachments.push(textAttachment);
         }
 
         const replyMemberships = resolveCollectionMemberships(