@jant/core 0.3.45 → 0.3.47

package/bin/commands/migrate.js

@@ -1,4 +1,4 @@
-import { existsSync, readFileSync, readdirSync } from "node:fs";
+import { existsSync, readdirSync } from "node:fs";
 import { resolve, dirname } from "node:path";
 import { fileURLToPath } from "node:url";
 import { parseArgs } from "node:util";
@@ -10,12 +10,15 @@ import {
   applyPgBackfills,
 } from "../lib/migration-runner.js";
 import { loadNodeRuntime } from "../lib/load-node-runtime.js";
+import { loadNodeEnvFile } from "../lib/node-env.js";
 import { openNodeSqlite, resolveDatabaseDialect } from "../lib/node-sqlite.js";
 import {
+  bootstrapCliRuntime,
   getCliRuntimeLabel,
-  resolveCliRuntime,
 } from "../lib/runtime-target.js";
 
+export { loadNodeEnvFile };
+
 export function isMigrationDebugEnabled(env = process.env) {
   return env.JANT_DEBUG_MIGRATE === "1";
 }
@@ -42,38 +45,6 @@ export function describeNodeDatabaseTarget(databaseUrl) {
   }
 }
 
-export function loadNodeEnvFile(envPath, env = process.env) {
-  const result = {
-    envPath,
-    found: false,
-    assignedKeys: [],
-    skippedKeys: [],
-  };
-
-  try {
-    const content = readFileSync(envPath, "utf8");
-    result.found = true;
-    for (const line of content.split("\n")) {
-      const trimmed = line.trim();
-      if (!trimmed || trimmed.startsWith("#")) continue;
-      const eqIdx = trimmed.indexOf("=");
-      if (eqIdx < 1) continue;
-      const key = trimmed.slice(0, eqIdx).trim();
-      const value = trimmed.slice(eqIdx + 1).trim();
-      if (key in env) {
-        result.skippedKeys.push(key);
-        continue;
-      }
-      env[key] = value;
-      result.assignedKeys.push(key);
-    }
-  } catch {
-    // .env.node not found
-  }
-
-  return result;
-}
-
 function logMigrationDebug(message) {
   console.log(`[jant:migrate] ${message}`);
 }
@@ -222,7 +193,7 @@ export async function run(argv) {
     console.log("  --local            Force local D1 instead of DATABASE_URL");
     console.log("  --remote           Run against remote D1");
     console.log(
-      "  --node             Force Node runtime (loads .env.node for DATABASE_URL)",
+      "  --node             Force Node runtime even if DATABASE_URL is unset",
     );
     console.log(
       "  --config           Wrangler config file (default: wrangler.toml)",
@@ -232,20 +203,20 @@ 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.");
     process.exit(0);
   }
 
-  // --node: load .env.node and force node runtime
-  let nodeEnvLoadResult;
-  if (values.node) {
-    const __dir = dirname(fileURLToPath(import.meta.url));
-    const envPath = resolve(__dir, "../../.env.node");
-    nodeEnvLoadResult = loadNodeEnvFile(envPath);
-  }
-
-  const runtime = resolveCliRuntime(values);
+  // bootstrapCliRuntime auto-loads `.env.node` (so DATABASE_URL/DATA_DIR
+  // resolve without sourcing the file) and prints a one-line banner with
+  // the chosen target.
+  const { runtime, envLoad } = bootstrapCliRuntime(values);
+  const nodeEnvLoadResult = envLoad;
   const debugMigrate = isMigrationDebugEnabled();
   const databaseUrl = process.env.DATABASE_URL ?? "";
   const databaseDialect =
@@ -255,30 +226,26 @@ export async function run(argv) {
 
   if (debugMigrate) {
     logMigrationDebug(`cli.runtime=${runtime}`);
-    if (values.node) {
-      const databaseUrlSource = nodeEnvLoadResult?.assignedKeys.includes(
-        "DATABASE_URL",
-      )
-        ? ".env.node"
-        : process.env.DATABASE_URL
-          ? "process.env"
-          : "<unset>";
-      const dataDirSource = nodeEnvLoadResult?.assignedKeys.includes("DATA_DIR")
-        ? ".env.node"
-        : process.env.DATA_DIR
-          ? "process.env"
-          : "<unset>";
-      const envPath = nodeEnvLoadResult?.envPath ?? "<unknown>";
-      const envState = nodeEnvLoadResult?.found ? "loaded" : "missing";
-      const skippedKeys = nodeEnvLoadResult?.skippedKeys.join(", ") || "<none>";
-      logMigrationDebug(`cli.node_env.path=${envPath}`);
-      logMigrationDebug(`cli.node_env.state=${envState}`);
-      logMigrationDebug(`cli.node_env.skipped_keys=${skippedKeys}`);
-      logMigrationDebug(
-        `cli.node_env.database_url_source=${databaseUrlSource}`,
-      );
-      logMigrationDebug(`cli.node_env.data_dir_source=${dataDirSource}`);
-    }
+    const databaseUrlSource = nodeEnvLoadResult?.assignedKeys.includes(
+      "DATABASE_URL",
+    )
+      ? ".env.node"
+      : process.env.DATABASE_URL
+        ? "process.env"
+        : "<unset>";
+    const dataDirSource = nodeEnvLoadResult?.assignedKeys.includes("DATA_DIR")
+      ? ".env.node"
+      : process.env.DATA_DIR
+        ? "process.env"
+        : "<unset>";
+    const envPath = nodeEnvLoadResult?.envPath ?? "<unknown>";
+    const envState = nodeEnvLoadResult?.found ? "loaded" : "missing";
+    const skippedKeys = nodeEnvLoadResult?.skippedKeys.join(", ") || "<none>";
+    logMigrationDebug(`cli.node_env.path=${envPath}`);
+    logMigrationDebug(`cli.node_env.state=${envState}`);
+    logMigrationDebug(`cli.node_env.skipped_keys=${skippedKeys}`);
+    logMigrationDebug(`cli.node_env.database_url_source=${databaseUrlSource}`);
+    logMigrationDebug(`cli.node_env.data_dir_source=${dataDirSource}`);
 
     if (runtime === "node") {
       logMigrationDebug(`cli.node.dialect=${databaseDialect ?? "<unset>"}`);

package/bin/commands/reset-password.js

@@ -4,8 +4,8 @@ import { executeD1, queryD1 } from "../lib/d1-query.js";
 import { openNodeDatabase } from "../lib/node-database.js";
 import { loadNodeRuntime } from "../lib/load-node-runtime.js";
 import {
+  bootstrapCliRuntime,
   getCliRuntimeLabel,
-  resolveCliRuntime,
 } from "../lib/runtime-target.js";
 import { resolveCliSite } from "../lib/site-selection.js";
 
@@ -18,6 +18,7 @@ export async function run(argv) {
       env: { type: "string" },
       host: { type: "string" },
       local: { type: "boolean", default: false },
+      node: { type: "boolean", default: false },
       "path-prefix": { type: "string" },
       "persist-to": { type: "string" },
       remote: { type: "boolean", default: false },
@@ -28,13 +29,14 @@ export async function run(argv) {
   });
 
   if (values.help) {
-    console.log("Usage: jant reset-password [--local | --remote]");
+    console.log("Usage: jant reset-password [--local | --remote | --node]");
     console.log("");
     console.log("Generate a password reset token (expires in 15 minutes).");
     console.log("");
     console.log("Options:");
     console.log("  --local   Force local D1 instead of DATABASE_URL");
     console.log("  --remote  Run against remote D1 database (default: local)");
+    console.log("  --node    Force Node runtime even if DATABASE_URL is unset");
     console.log("  --site    Target site id");
     console.log("  --host    Target site host");
     console.log("  --url     Target site URL");
@@ -45,12 +47,16 @@ 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.");
     process.exit(0);
   }
 
-  const runtime = resolveCliRuntime(values);
+  const { runtime } = bootstrapCliRuntime(values);
 
   const token = randomBytes(32).toString("hex");
   const hash = createHash("sha256").update(token).digest("hex");

package/bin/commands/site/export.js

@@ -6,22 +6,8 @@ import {
   CLI_API_TOKEN_ENV_VAR,
   getCliApiToken,
 } from "../../lib/cli-api-token.js";
-import { openNodeDatabase } from "../../lib/node-database.js";
-import { loadNodeRuntime } from "../../lib/load-node-runtime.js";
 import { pullSiteExportZipBytes } from "../../lib/site-pull-media.js";
 
-function describeLocalExportSource(input) {
-  if (input.siteUrl) {
-    return input.siteUrl;
-  }
-
-  if (input.siteDomain?.host) {
-    return `https://${input.siteDomain.host}${input.siteDomain.pathPrefix || ""}`;
-  }
-
-  return `site "${input.site.key}"`;
-}
-
 async function exportRemoteSite(url, token) {
   const response = await fetch(`${url.replace(/\/$/, "")}/api/export/hugo`, {
     method: "POST",
@@ -83,189 +69,46 @@ function logPullProgress(event) {
   }
 }
 
-function getStorageKeyFromUrl(url, appConfig) {
-  try {
-    const resolvedUrl = new URL(url, appConfig.siteUrl);
-    let pathname = resolvedUrl.pathname;
-    const publicPathPrefixes = [
-      appConfig.r2PublicUrl,
-      appConfig.s3PublicUrl,
-      appConfig.localPublicUrl,
-    ]
-      .filter(Boolean)
-      .map((value) => {
-        try {
-          const parsed = new URL(value);
-          return parsed.pathname.replace(/\/+$/, "");
-        } catch {
-          return "";
-        }
-      })
-      .filter(Boolean);
-
-    for (const prefix of publicPathPrefixes) {
-      if (pathname.startsWith(`${prefix}/`)) {
-        pathname = pathname.slice(prefix.length + 1);
-        break;
-      }
-      if (pathname === prefix) {
-        pathname = "";
-        break;
-      }
-    }
-
-    const sitePathPrefix = appConfig.sitePathPrefix || "";
-    if (sitePathPrefix && pathname.startsWith(`${sitePathPrefix}/`)) {
-      pathname = pathname.slice(sitePathPrefix.length + 1);
-    } else {
-      pathname = pathname.replace(/^\/+/, "");
-    }
-
-    if (!pathname.startsWith("media/") && !pathname.startsWith("favicon/")) {
-      return null;
-    }
-
-    return pathname;
-  } catch {
-    return null;
-  }
-}
-
-async function readStorageBody(body) {
-  const reader = body.getReader();
-  const chunks = [];
-  let totalLength = 0;
-
-  for (;;) {
-    const { done, value } = await reader.read();
-    if (done) break;
-    chunks.push(value);
-    totalLength += value.length;
-  }
-
-  const bytes = new Uint8Array(totalLength);
-  let offset = 0;
-  for (const chunk of chunks) {
-    bytes.set(chunk, offset);
-    offset += chunk.length;
-  }
-
-  return bytes;
-}
-
-function createLocalAssetLoader(storage, appConfig) {
-  if (!storage) {
-    return null;
-  }
-
-  return async ({ resolvedUrl }) => {
-    const storageKey = getStorageKeyFromUrl(resolvedUrl, appConfig);
-    if (!storageKey) {
-      return null;
-    }
-
-    const object = await storage.get(storageKey);
-    if (!object?.body) {
-      return null;
-    }
-
-    return {
-      bytes: await readStorageBody(object.body),
-      contentType: object.contentType || "",
-    };
-  };
-}
-
-async function exportLocalSite(env = process.env) {
-  const nodeDatabase = await openNodeDatabase(env);
-
-  try {
-    const {
-      createExportService,
-      createNodeCliRuntime,
-      resolveConfig,
-      buildThemeStyle,
-      BUILTIN_COLOR_THEMES,
-      BUILTIN_FONT_THEMES,
-      getCjkSerifCssVariables,
-      getFontThemeCssVariables,
-    } = await loadNodeRuntime();
-    const runtime = await createNodeCliRuntime(nodeDatabase.bindings);
-    const allSettings = await runtime.services.settings.getAll();
-    const navItems = await runtime.services.navItems.list();
-    const appConfig = resolveConfig(nodeDatabase.bindings, allSettings);
-    const activeTheme = BUILTIN_COLOR_THEMES.find(
-      (theme) => theme.id === (appConfig.themeId || appConfig.defaultThemeId),
-    );
-    const fontTheme = appConfig.fontThemeId
-      ? BUILTIN_FONT_THEMES.find((theme) => theme.id === appConfig.fontThemeId)
-      : undefined;
-    const fontOverrides = {
-      ...getCjkSerifCssVariables(appConfig.siteLanguage),
-      ...(fontTheme ? getFontThemeCssVariables(fontTheme) : {}),
-    };
-    const themeCss = buildThemeStyle(
-      activeTheme,
-      appConfig.themeMode,
-      fontOverrides,
-    );
-    const appleTouchKey = allSettings.SITE_FAVICON_APPLE_TOUCH || "";
-    const exportService = createExportService(
-      runtime.services,
-      {
-        siteName: appConfig.siteName,
-        siteUrl: appConfig.siteUrl,
-        siteDescription: appConfig.siteDescription,
-        siteLanguage: appConfig.siteLanguage,
-        showJantBrandingOnHome: appConfig.showJantBrandingOnHome,
-        homeDefaultView: appConfig.homeDefaultView,
-        mainRssFeed: appConfig.mainRssFeed,
-        siteFooter: appConfig.siteFooter,
-        showHeaderAvatar: appConfig.showHeaderAvatar,
-        siteAvatarUrl: appConfig.siteAvatarUrl,
-        faviconIcoBase64: allSettings.SITE_FAVICON_ICO || undefined,
-        appleTouchIconStorageKey: appleTouchKey || undefined,
-        faviconVersion: appConfig.faviconVersion,
-        themeId: appConfig.themeId,
-        defaultThemeId: appConfig.defaultThemeId,
-        fontThemeId: appConfig.fontThemeId,
-        themeMode: appConfig.themeMode,
-        noindex: appConfig.noindex,
-        themeCss,
-        customCss: appConfig.customCSS,
-        r2PublicUrl: appConfig.r2PublicUrl,
-        s3PublicUrl: appConfig.s3PublicUrl,
-        localPublicUrl: appConfig.localPublicUrl,
-        imageTransformUrl: appConfig.imageTransformUrl,
-        sitePathPrefix: appConfig.sitePathPrefix,
-        navItems,
-        pageSize: appConfig.pageSize,
-        archivePageSize: appConfig.archivePageSize,
-        rssFeedLimit: appConfig.rssFeedLimit,
-      },
-      {
-        storage: runtime.storage,
-      },
-    );
-
-    return {
-      zip: await exportService.generateHugoSite(),
-      assetLoader: createLocalAssetLoader(runtime.storage, appConfig),
-      source: describeLocalExportSource({
-        site: runtime.currentSite,
-        siteDomain: runtime.currentSiteDomain,
-        siteUrl: appConfig.siteUrl,
-      }),
-    };
-  } finally {
-    await nodeDatabase.close();
-  }
+function printUsage() {
+  console.log("Usage: jant site export <url> [options]");
+  console.log("");
+  console.log("Export a Jant site as a Hugo ZIP archive or directory.");
+  console.log("");
+  console.log("Arguments:");
+  console.log("  <url>           Jant site URL (required)");
+  console.log("");
+  console.log("Options:");
+  console.log(
+    "  --output, -o    Output ZIP path (default: jant-site-export.zip)",
+  );
+  console.log(
+    "  --directory, -d Export directly to a directory for hugo serve/debugging",
+  );
+  console.log(
+    "  --pull-media    Download referenced media into static/media/ (default: on)",
+  );
+  console.log("  --no-pull-media Skip the media pull and keep original URLs");
+  console.log("  --token         API token (overrides JANT_API_TOKEN)");
+  console.log("");
+  console.log("Authentication:");
+  console.log(`  export ${CLI_API_TOKEN_ENV_VAR}=jnt_your_token`);
+  console.log("  jant site export https://your-site.example");
+  console.log("");
+  console.log("Examples:");
+  console.log(
+    "  jant site export https://your-site.example -o ./export.zip",
+  );
+  console.log(
+    "  jant site export https://your-site.example -d ./jant-site && cd ./jant-site && hugo serve",
+  );
 }
 
 export async function run(argv) {
   const noPullMedia = argv.includes("--no-pull-media");
-  const { values } = parseArgs({
-    args: argv.filter((arg) => arg !== "--no-pull-media"),
+  const filteredArgv = argv.filter((arg) => arg !== "--no-pull-media");
+  const { values, positionals } = parseArgs({
+    args: filteredArgv,
+    allowPositionals: true,
     options: {
       directory: {
         type: "string",
@@ -279,49 +122,28 @@ export async function run(argv) {
         default: "jant-site-export.zip",
       },
       token: { type: "string" },
-      url: { type: "string" },
     },
   });
 
   if (values.help) {
-    console.log("Usage: jant site export [--url <url>] [options]");
-    console.log("");
-    console.log("Export a Jant site as a Hugo ZIP archive or directory.");
-    console.log("");
-    console.log("Modes:");
-    console.log(
-      "  Local           No --url; exports from 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           Remote Jant site URL");
-    console.log(
-      "  --output, -o    Output ZIP path (default: jant-site-export.zip)",
-    );
-    console.log(
-      "  --directory, -d Export directly to a directory for hugo serve/debugging",
-    );
-    console.log(
-      "  --pull-media    Download referenced media into static/media/ (default: on)",
-    );
-    console.log(
-      "  --no-pull-media Skip the media pull and keep original URLs",
-    );
-    console.log("  --token         API token for remote export");
-    console.log("");
-    console.log("Authentication:");
-    console.log(`  export ${CLI_API_TOKEN_ENV_VAR}=jnt_your_token`);
-    console.log("  jant site export --url https://your-site.com");
-    console.log("");
-    console.log("Examples:");
-    console.log("  jant site export --directory ./jant-site");
-    console.log("  cd ./jant-site && hugo serve");
+    printUsage();
     process.exit(0);
   }
 
+  const url = positionals[0];
+  if (!url) {
+    console.error("Error: site URL is required");
+    console.error("");
+    printUsage();
+    process.exit(1);
+  }
+  if (positionals.length > 1) {
+    console.error(
+      `Error: unexpected extra arguments: ${positionals.slice(1).join(" ")}`,
+    );
+    process.exit(1);
+  }
+
   if (values.directory && values.output !== "jant-site-export.zip") {
     console.error("Error: use either --output or --directory, not both");
     process.exit(1);
@@ -334,40 +156,29 @@ export async function run(argv) {
   const token = getCliApiToken(process.env, values.token);
   const pullMedia = values["pull-media"] ?? !noPullMedia;
 
-  if (values.url && !token) {
+  if (!token) {
     console.error(
-      `Error: remote export requires ${CLI_API_TOKEN_ENV_VAR} or --token`,
+      `Error: site export requires ${CLI_API_TOKEN_ENV_VAR} or --token`,
     );
     process.exit(1);
   }
 
-  console.log(
-    values.url
-      ? `Exporting site from ${values.url}...`
-      : "Exporting site from the local runtime...",
-  );
+  console.log(`Exporting site from ${url}...`);
 
-  const exported = values.url
-    ? {
-        zip: await exportRemoteSite(values.url, token),
-        assetLoader: null,
-        source: values.url,
-      }
-    : await exportLocalSite(process.env);
-  let zip = exported.zip;
+  const zipBytes = await exportRemoteSite(url, token);
+  let zip = zipBytes;
   let pullStats = null;
 
   if (pullMedia) {
     console.log("Preparing pull-media export ZIP...");
     const pulled = await pullSiteExportZipBytes(zip, {
-      assetLoader: exported.assetLoader,
+      assetLoader: null,
       logger: logPullProgress,
     });
     zip = pulled.zipBytes;
     pullStats = pulled.stats;
   }
 
-  const source = exported.source;
   if (outputDirectory) {
     let existingEntries = [];
     try {
@@ -393,12 +204,12 @@ export async function run(argv) {
       mkdirSync(dirname(fullPath), { recursive: true });
       writeFileSync(fullPath, Buffer.from(bytes));
     }
-    console.log(`Exported site from ${source} to ${values.directory}`);
+    console.log(`Exported site from ${url} to ${values.directory}`);
     console.log(`Preview with: cd ${values.directory} && hugo serve`);
   } else {
     console.log(`Writing ${values.output}...`);
     writeFileSync(output, Buffer.from(zip));
-    console.log(`Exported site from ${source} to ${values.output}`);
+    console.log(`Exported site from ${url} to ${values.output}`);
   }
 
   if (pullStats) {