@flaredev/cli 0.7.1 → 0.7.3

package/dist/index.js

@@ -9,8 +9,8 @@ import { FLARE_VERSION as FLARE_VERSION3 } from "@flaredev/core";
 
 // src/commands/create.ts
 import { randomBytes } from "crypto";
-import { appendFileSync, copyFileSync, existsSync as existsSync3, readdirSync as readdirSync2, rmSync, writeFileSync as writeFileSync3 } from "fs";
-import { basename, dirname as dirname2, isAbsolute, join as join3, relative, resolve as resolve2 } from "path";
+import { appendFileSync, copyFileSync, existsSync as existsSync4, readdirSync as readdirSync2, rmSync, writeFileSync as writeFileSync3 } from "fs";
+import { basename, dirname as dirname2, isAbsolute, join as join4, relative, resolve as resolve2 } from "path";
 import * as prompts from "@clack/prompts";
 import pc from "picocolors";
 import { FLARE_VERSION } from "@flaredev/core";
@@ -282,6 +282,8 @@ var templatesDir = join2(findUp("templates", dirname(fileURLToPath(import.meta.u
 
 // src/utils/pm.ts
 import { spawnSync } from "child_process";
+import { existsSync as existsSync3 } from "fs";
+import { delimiter, join as join3 } from "path";
 var MANAGERS = ["pnpm", "npm", "yarn", "bun"];
 function isPackageManager(value) {
   return MANAGERS.includes(value);
@@ -291,9 +293,9 @@ function detectPackageManager(userAgent = process.env.npm_config_user_agent ?? "
   return isPackageManager(name) ? name : "pnpm";
 }
 function isInstalled(packageManager) {
-  const probe = [packageManager, "--version"].join(" ");
-  const result = process.platform === "win32" ? spawnSync(probe, { stdio: "ignore", shell: true, env: childEnv() }) : spawnSync(packageManager, ["--version"], { stdio: "ignore", env: childEnv() });
-  return result.status === 0;
+  const dirs = (process.env.PATH ?? "").split(delimiter).filter(Boolean);
+  const suffixes = process.platform === "win32" ? (process.env.PATHEXT ?? ".COM;.EXE;.BAT;.CMD").split(";") : [""];
+  return dirs.some((dir) => suffixes.some((suffix) => existsSync3(join3(dir, packageManager + suffix.toLowerCase()))));
 }
 function choosePackageManager(explicit) {
   if (explicit !== void 0) {
@@ -332,7 +334,7 @@ function toAppName(dir) {
 function flarePackageSpec(pkg, appDir, packageManager) {
   const repoPackage = resolve2(templatesDir, "../..", pkg);
   const repoRoot = resolve2(repoPackage, "../..");
-  const fromCheckout = existsSync3(join3(repoPackage, "package.json")) && existsSync3(join3(repoRoot, "pnpm-workspace.yaml")) && !repoPackage.split(/[\\/]/).includes("node_modules");
+  const fromCheckout = existsSync4(join4(repoPackage, "package.json")) && existsSync4(join4(repoRoot, "pnpm-workspace.yaml")) && !repoPackage.split(/[\\/]/).includes("node_modules");
   if (!fromCheckout) return `^${FLARE_VERSION}`;
   const rel = relative(repoRoot, appDir);
   if (rel && !rel.startsWith("..") && !isAbsolute(rel)) return "workspace:*";
@@ -342,7 +344,7 @@ function flarePackageSpec(pkg, appDir, packageManager) {
 function createApp(target, options2 = {}) {
   const dir = resolve2(target);
   const name = toAppName(dir);
-  if (existsSync3(dir) && readdirSync2(dir).length > 0) {
+  if (existsSync4(dir) && readdirSync2(dir).length > 0) {
     throw new Error(`Directory ${dir} already exists and is not empty.`);
   }
   const { packageManager, preferred: prefersPnpm } = choosePackageManager(options2.pm);
@@ -355,23 +357,23 @@ function createApp(target, options2 = {}) {
   const theme = parseTheme(options2.theme);
   const inWorkspace = findUp("pnpm-workspace.yaml", dirname2(dir)) !== void 0;
   const compatibilityDate = options2.compatibilityDate ?? COMPATIBILITY_DATE;
-  const files = copyTemplate(join3(templatesDir, "app"), dir, {
+  const files = copyTemplate(join4(templatesDir, "app"), dir, {
     APP_NAME: name,
     COMPAT_DATE: compatibilityDate,
     PM: packageManager,
     THEME: theme
   });
   if (stack === "next") {
-    copyTemplate(join3(templatesDir, "next"), dir, { APP_NAME: name, PM: packageManager, THEME: theme });
-    for (const path of CLOUDFLARE_ONLY) rmSync(join3(dir, path), { recursive: true, force: true });
+    copyTemplate(join4(templatesDir, "next"), dir, { APP_NAME: name, PM: packageManager, THEME: theme });
+    for (const path of CLOUDFLARE_ONLY) rmSync(join4(dir, path), { recursive: true, force: true });
   }
-  writeFileSync3(join3(dir, "lib", "auth-config.ts"), renderAuthConfig(authMethods, authProviders));
-  appendFileSync(join3(dir, stack === "next" ? ".env.example" : ".dev.vars.example"), devVarsExampleEntries(authProviders));
+  writeFileSync3(join4(dir, "lib", "auth-config.ts"), renderAuthConfig(authMethods, authProviders));
+  appendFileSync(join4(dir, stack === "next" ? ".env.example" : ".dev.vars.example"), devVarsExampleEntries(authProviders));
   const shared = { react: APP_DEPENDENCIES.react, "react-dom": APP_DEPENDENCIES["react-dom"] };
   const uiOnly = Object.fromEntries(
     Object.entries(APP_DEPENDENCIES).filter(([key]) => !["vinext", "@vinext/cloudflare", "drizzle-orm", "react-server-dom-webpack"].includes(key))
   );
-  writeJson(join3(dir, "package.json"), {
+  writeJson(join4(dir, "package.json"), {
     name,
     version: "0.1.0",
     private: true,
@@ -405,14 +407,14 @@ function createApp(target, options2 = {}) {
     }
   });
   writeFileSync3(
-    join3(dir, stack === "next" ? ".env" : ".dev.vars"),
+    join4(dir, stack === "next" ? ".env" : ".dev.vars"),
     `BETTER_AUTH_SECRET=${randomBytes(32).toString("base64")}
 RESEND_API_KEY=
 MAIL_FROM=
 ${devVarsEntries(authProviders)}`
   );
   if (packageManager === "pnpm" && !inWorkspace) {
-    writeFileSync3(join3(dir, "pnpm-workspace.yaml"), `allowBuilds:
+    writeFileSync3(join4(dir, "pnpm-workspace.yaml"), `allowBuilds:
 ${ALLOW_BUILDS}
 `);
   }
@@ -426,9 +428,9 @@ ${ALLOW_BUILDS}
 function copyLockfile(packageManager, dir) {
   const file = packageManager === "pnpm" ? "pnpm-lock.yaml" : packageManager === "yarn" ? "yarn.lock" : "package-lock.json";
   if (!file) return false;
-  const source = join3(templatesDir, "locks", file);
-  if (!existsSync3(source)) return false;
-  copyFileSync(source, join3(dir, file));
+  const source = join4(templatesDir, "locks", file);
+  if (!existsSync4(source)) return false;
+  copyFileSync(source, join4(dir, file));
   return true;
 }
 function printNextSteps(result, installed) {
@@ -448,8 +450,8 @@ function printNextSteps(result, installed) {
 }
 
 // src/commands/gen-billing.ts
-import { appendFileSync as appendFileSync2, existsSync as existsSync13, mkdirSync as mkdirSync5, readFileSync as readFileSync9, unlinkSync, writeFileSync as writeFileSync7 } from "fs";
-import { dirname as dirname6, join as join12 } from "path";
+import { appendFileSync as appendFileSync2, existsSync as existsSync14, mkdirSync as mkdirSync5, readFileSync as readFileSync9, unlinkSync, writeFileSync as writeFileSync7 } from "fs";
+import { dirname as dirname6, join as join13 } from "path";
 import pc6 from "picocolors";
 
 // src/generator/grammar.ts
@@ -613,7 +615,7 @@ import { defineResource, field as builders, kebabCase, pascalCase } from "@flare
 
 // src/generator/markers.ts
 import { createHash } from "crypto";
-import { existsSync as existsSync4, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, readFileSync as readFileSync3, writeFileSync as writeFileSync4 } from "fs";
 import { dirname as dirname3 } from "path";
 var START = "// generated:start";
 var END = "// generated:end";
@@ -663,7 +665,7 @@ ${indentBlock(body, indent)}${indent}${END}
 ${after}`;
 }
 function inspectGenerated(path, content) {
-  if (!existsSync4(path)) return "missing";
+  if (!existsSync5(path)) return "missing";
   const parts = splitMarkers(readFileSync3(path, "utf8"));
   if (!parts) return "unmarked";
   if (parts.hash && hashBlock(parts.block) !== parts.hash) return "drift";
@@ -680,7 +682,7 @@ var DriftError = class extends Error {
 };
 function writeGenerated(path, content, options2 = {}) {
   const hash = hashBlock(content);
-  if (!existsSync4(path)) {
+  if (!existsSync5(path)) {
     mkdirSync2(dirname3(path), { recursive: true });
     writeFileSync4(path, joinMarkers({ before: options2.header ?? "", block: content, after: "", indent: "", hash }));
     return "create";
@@ -1446,17 +1448,17 @@ var billingDevVarsExampleEntries = () => [
 ].join("\n");
 
 // src/generator/load.ts
-import { existsSync as existsSync5, readdirSync as readdirSync3 } from "fs";
-import { join as join4, resolve as resolve3 } from "path";
+import { existsSync as existsSync6, readdirSync as readdirSync3 } from "fs";
+import { join as join5, resolve as resolve3 } from "path";
 import { createJiti } from "jiti";
 async function loadResources(root) {
   const appRoot = resolve3(root);
-  const dir = join4(appRoot, "resources");
-  if (!existsSync5(dir)) return [];
-  const jiti = createJiti(join4(appRoot, "package.json"), { alias: { "@": appRoot }, moduleCache: false, fsCache: false });
+  const dir = join5(appRoot, "resources");
+  if (!existsSync6(dir)) return [];
+  const jiti = createJiti(join5(appRoot, "package.json"), { alias: { "@": appRoot }, moduleCache: false, fsCache: false });
   const loaded = [];
   for (const file of readdirSync3(dir).filter((name) => name.endsWith(".resource.ts")).sort()) {
-    const path = join4(dir, file);
+    const path = join5(dir, file);
     const mod = await jiti.import(path);
     const resource = mod.default;
     if (!resource || typeof resource !== "object" || !("fields" in resource) || !("table" in resource)) {
@@ -1474,20 +1476,20 @@ async function loadResources(root) {
 
 // src/generator/migrations.ts
 import { spawn as spawn4 } from "child_process";
-import { existsSync as existsSync10, readdirSync as readdirSync4, readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
-import { join as join9 } from "path";
+import { existsSync as existsSync11, readdirSync as readdirSync4, readFileSync as readFileSync7, writeFileSync as writeFileSync6 } from "fs";
+import { join as join10 } from "path";
 
 // src/commands/run.ts
 import { spawn as spawn3 } from "child_process";
-import { existsSync as existsSync9, readFileSync as readFileSync6 } from "fs";
-import { dirname as dirname4, join as join8, resolve as resolve4 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync6 } from "fs";
+import { dirname as dirname4, join as join9, resolve as resolve4 } from "path";
 import pc4 from "picocolors";
 
 // src/tunnel.ts
 import { spawn, spawnSync as spawnSync2 } from "child_process";
-import { chmodSync, existsSync as existsSync6, mkdirSync as mkdirSync3, renameSync, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "fs";
+import { chmodSync, existsSync as existsSync7, mkdirSync as mkdirSync3, renameSync, rmSync as rmSync2, writeFileSync as writeFileSync5 } from "fs";
 import { homedir } from "os";
-import { join as join5 } from "path";
+import { join as join6 } from "path";
 import pc2 from "picocolors";
 var TUNNEL_URL = /https:\/\/[a-z0-9-]+\.trycloudflare\.com/;
 var LOCAL_URL = /https?:\/\/(?:localhost|127\.0\.0\.1|\[::1\]|0\.0\.0\.0):\d+/;
@@ -1512,7 +1514,7 @@ function releaseAsset(platform = process.platform, arch = process.arch) {
   throw new Error(`No cloudflared build for ${platform}/${arch}. Install it yourself: https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/downloads/`);
 }
 var binName = process.platform === "win32" ? "cloudflared.exe" : "cloudflared";
-var cacheDir = () => join5(homedir(), ".flare", "bin");
+var cacheDir = () => join6(homedir(), ".flare", "bin");
 function onPath() {
   const probe = spawnSync2(process.platform === "win32" ? "where" : "which", ["cloudflared"], { encoding: "utf8" });
   return probe.status === 0 ? probe.stdout.split(/\r?\n/)[0]?.trim() ?? null : null;
@@ -1521,7 +1523,7 @@ async function download(log2) {
   const asset = releaseAsset();
   const dir = cacheDir();
   mkdirSync3(dir, { recursive: true });
-  const target = join5(dir, binName);
+  const target = join6(dir, binName);
   log2(pc2.dim(`Downloading cloudflared (one time) into ${dir}\u2026`));
   const response = await fetch(`https://github.com/cloudflare/cloudflared/releases/latest/download/${asset}`);
   if (!response.ok) throw new Error(`Downloading cloudflared failed: HTTP ${response.status}.`);
@@ -1542,8 +1544,8 @@ async function download(log2) {
 async function ensureCloudflared(log2 = console.log) {
   const found = onPath();
   if (found) return found;
-  const cached = join5(cacheDir(), binName);
-  if (existsSync6(cached)) return cached;
+  const cached = join6(cacheDir(), binName);
+  if (existsSync7(cached)) return cached;
   return download(log2);
 }
 async function openTunnel(localUrl, options2 = {}) {
@@ -1599,16 +1601,16 @@ function tunnelBanner(publicUrl, localUrl) {
 
 // src/commands/deploy.ts
 import { randomBytes as randomBytes2 } from "crypto";
-import { existsSync as existsSync8, readFileSync as readFileSync5 } from "fs";
-import { join as join7 } from "path";
+import { existsSync as existsSync9, readFileSync as readFileSync5 } from "fs";
+import { join as join8 } from "path";
 import { createZoneClient } from "@flaredev/core/security";
 import { createJiti as createJiti2 } from "jiti";
 import pc3 from "picocolors";
 
 // src/utils/wrangler.ts
 import { spawn as spawn2 } from "child_process";
-import { existsSync as existsSync7, readFileSync as readFileSync4 } from "fs";
-import { join as join6 } from "path";
+import { existsSync as existsSync8, readFileSync as readFileSync4 } from "fs";
+import { join as join7 } from "path";
 import { parse as parseJsonc } from "jsonc-parser";
 function runWrangler(wranglerBin, args, cwd, options2 = {}) {
   return new Promise((resolve6, reject) => {
@@ -1633,8 +1635,8 @@ ${output.trim()}`);
   return JSON.parse(output.slice(start, end + 1));
 }
 function readD1Databases(appRoot) {
-  const path = join6(appRoot, "wrangler.jsonc");
-  if (!existsSync7(path)) return [];
+  const path = join7(appRoot, "wrangler.jsonc");
+  if (!existsSync8(path)) return [];
   const config = parseJsonc(readFileSync4(path, "utf8"));
   return (config?.d1_databases ?? []).filter((db) => db.binding && db.database_name);
 }
@@ -1675,15 +1677,15 @@ function declaredSecretNames(devVarsExample) {
   return devVarsExample.split(/\r?\n/).map((line) => /^([A-Z][A-Z0-9_]*)=/.exec(line.trim())?.[1]).filter((name) => Boolean(name));
 }
 async function loadSecurityConfig(appRoot) {
-  const path = join7(appRoot, "security.config.ts");
-  if (!existsSync8(path)) return null;
-  const jiti = createJiti2(join7(appRoot, "package.json"), { moduleCache: false, fsCache: false });
+  const path = join8(appRoot, "security.config.ts");
+  if (!existsSync9(path)) return null;
+  const jiti = createJiti2(join8(appRoot, "package.json"), { moduleCache: false, fsCache: false });
   const mod = await jiti.import(path);
   if (!mod.default) throw new Error("security.config.ts must `export default defineSecurity({ ... })`.");
   return mod.default;
 }
 async function provisionZoneSecurity(appRoot, config, credentials, options2) {
-  const app = JSON.parse(readFileSync5(join7(appRoot, "package.json"), "utf8")).name ?? "app";
+  const app = JSON.parse(readFileSync5(join8(appRoot, "package.json"), "utf8")).name ?? "app";
   const zone = createZoneClient({ ...credentials, app, fetch: options2.fetch });
   if (config.zone?.rateLimits) {
     const result = await zone.syncRateLimits(config.zone.rateLimits);
@@ -1703,7 +1705,7 @@ async function runDeploy(args, context3) {
   const envArgs = plan.env ? ["--env", plan.env] : [];
   const step = (message) => log2(`
 ${pc3.bold(pc3.cyan("flare"))} ${message}`);
-  const databases = plan.skipMigrations ? [] : readD1Databases(appRoot).filter((db) => existsSync8(join7(appRoot, db.migrations_dir ?? "migrations")));
+  const databases = plan.skipMigrations ? [] : readD1Databases(appRoot).filter((db) => existsSync9(join8(appRoot, db.migrations_dir ?? "migrations")));
   const migrateAfterDeploy = [];
   const migrate2 = async (db) => {
     step(`Applying migrations to ${db.database_name} (remote)`);
@@ -1762,8 +1764,8 @@ ${put.output.trim()}`);
         existing.add(name);
       }
     }
-    const examplePath = join7(appRoot, ".dev.vars.example");
-    const optional = existsSync8(examplePath) ? declaredSecretNames(readFileSync5(examplePath, "utf8")).filter((name) => !existing.has(name)) : [];
+    const examplePath = join8(appRoot, ".dev.vars.example");
+    const optional = existsSync9(examplePath) ? declaredSecretNames(readFileSync5(examplePath, "utf8")).filter((name) => !existing.has(name)) : [];
     if (optional.length > 0) {
       step("Optional secrets not set in production (features using them stay off):");
       for (const name of optional) log2(`  wrangler secret put ${name}${plan.env ? ` --env ${plan.env}` : ""}`);
@@ -1798,7 +1800,7 @@ function findAppRoot(cwd) {
   while (dir) {
     const root = findUp("package.json", dir);
     if (!root) break;
-    const pkg = JSON.parse(readFileSync6(join8(root, "package.json"), "utf8"));
+    const pkg = JSON.parse(readFileSync6(join9(root, "package.json"), "utf8"));
     const deps = { ...pkg.dependencies, ...pkg.devDependencies };
     if (deps["@flaredev/core"] || deps.vinext) return root;
     const parent = dirname4(root);
@@ -1807,15 +1809,15 @@ function findAppRoot(cwd) {
   throw new Error("Not inside a Flare app (no package.json depending on @flaredev/core found). Run this from your app directory.");
 }
 function resolveBin(appRoot, pkgName, binName2) {
-  const pkgDir = findUp(join8("node_modules", pkgName, "package.json"), appRoot);
+  const pkgDir = findUp(join9("node_modules", pkgName, "package.json"), appRoot);
   if (!pkgDir) {
     throw new Error(`Cannot find ${pkgName} in ${appRoot}. Install dependencies first (e.g. pnpm install).`);
   }
-  const manifestPath = join8(pkgDir, "node_modules", pkgName, "package.json");
+  const manifestPath = join9(pkgDir, "node_modules", pkgName, "package.json");
   const { bin } = JSON.parse(readFileSync6(manifestPath, "utf8"));
   const relativeBin = typeof bin === "string" ? bin : bin?.[binName2];
   if (!relativeBin) throw new Error(`${pkgName} does not provide a "${binName2}" executable.`);
-  return join8(dirname4(manifestPath), relativeBin);
+  return join9(dirname4(manifestPath), relativeBin);
 }
 var NEXT_COMMANDS = {
   dev: { pkg: "next", bin: "next", args: ["dev"] },
@@ -1888,7 +1890,7 @@ async function runDelegated(command, forwarded, cwd = process.cwd()) {
     if (code !== 0) return code;
   }
   const built = next ? ".next" : "dist/server/wrangler.json";
-  if (command === "start" && !wantsHelp && !existsSync9(join8(appRoot, built))) {
+  if (command === "start" && !wantsHelp && !existsSync10(join9(appRoot, built))) {
     console.log("No production build found; running `flare build` first.\n");
     const code = await runDelegated("build", [], appRoot);
     if (code !== 0) return code;
@@ -1939,9 +1941,9 @@ function snapshotColumns(snapshot) {
 }
 
 // src/generator/migrations.ts
-var listSql = (dir) => existsSync10(dir) ? readdirSync4(dir).filter((file) => file.endsWith(".sql")) : [];
+var listSql = (dir) => existsSync11(dir) ? readdirSync4(dir).filter((file) => file.endsWith(".sql")) : [];
 async function generateSchemaMigration(appRoot, name, options2 = {}) {
-  const dir = join9(appRoot, "migrations");
+  const dir = join10(appRoot, "migrations");
   const before = new Set(listSql(dir));
   const bin = resolveBin(appRoot, "drizzle-kit", "drizzle-kit");
   const { code, output } = await new Promise((resolve6, reject) => {
@@ -1969,7 +1971,7 @@ If it asked whether a column was renamed, run \`pnpm exec drizzle-kit generate\`
   for (const file of created) {
     const previous = previousSnapshot(dir, file);
     if (!previous) continue;
-    const path = join9(dir, file);
+    const path = join10(dir, file);
     const { sql: sql2, changes } = repairRebuildMigration(readFileSync7(path, "utf8"), snapshotColumns(previous));
     if (changes.length) {
       writeFileSync6(path, sql2);
@@ -1980,32 +1982,32 @@ If it asked whether a column was renamed, run \`pnpm exec drizzle-kit generate\`
 }
 function previousSnapshot(dir, migrationFile) {
   const prefix = /^(\d+)_/.exec(migrationFile)?.[1];
-  const metaDir = join9(dir, "meta");
-  if (!prefix || !existsSync10(metaDir)) return void 0;
+  const metaDir = join10(dir, "meta");
+  if (!prefix || !existsSync11(metaDir)) return void 0;
   const earlier = readdirSync4(metaDir).filter((file) => /^\d+_snapshot\.json$/.test(file) && file < `${prefix}_snapshot.json`).sort().pop();
-  return earlier ? JSON.parse(readFileSync7(join9(metaDir, earlier), "utf8")) : void 0;
+  return earlier ? JSON.parse(readFileSync7(join10(metaDir, earlier), "utf8")) : void 0;
 }
 
 // src/generator/plan.ts
-import { copyFileSync as copyFileSync2, existsSync as existsSync12, mkdirSync as mkdirSync4, readdirSync as readdirSync6, readFileSync as readFileSync8 } from "fs";
-import { dirname as dirname5, join as join11, sep } from "path";
+import { copyFileSync as copyFileSync2, existsSync as existsSync13, mkdirSync as mkdirSync4, readdirSync as readdirSync6, readFileSync as readFileSync8 } from "fs";
+import { dirname as dirname5, join as join12, sep } from "path";
 import pc5 from "picocolors";
 
 // src/generator/policy.ts
-import { existsSync as existsSync11, readdirSync as readdirSync5 } from "fs";
-import { join as join10, resolve as resolve5 } from "path";
+import { existsSync as existsSync12, readdirSync as readdirSync5 } from "fs";
+import { join as join11, resolve as resolve5 } from "path";
 import { camelCase as camelCase2, kebabCase as kebabCase2 } from "@flaredev/core";
 import { createJiti as createJiti3 } from "jiti";
 var policyPath = (name) => `policies/${kebabCase2(name)}.policy.ts`;
 var policyLocal = (stem) => `${camelCase2(stem)}Policy`;
 async function loadPolicies(root) {
   const appRoot = resolve5(root);
-  const dir = join10(appRoot, "policies");
-  if (!existsSync11(dir)) return [];
-  const jiti = createJiti3(join10(appRoot, "package.json"), { moduleCache: false, fsCache: false });
+  const dir = join11(appRoot, "policies");
+  if (!existsSync12(dir)) return [];
+  const jiti = createJiti3(join11(appRoot, "package.json"), { moduleCache: false, fsCache: false });
   const loaded = [];
   for (const file of readdirSync5(dir).filter((name) => name.endsWith(".policy.ts")).sort()) {
-    const mod = await jiti.import(join10(dir, file));
+    const mod = await jiti.import(join11(dir, file));
     const policy = mod.default;
     if (!policy || typeof policy !== "object" || !("resource" in policy) || !Array.isArray(policy.read)) {
       throw new Error(`policies/${file} must \`export default definePolicy({ ... })\`.`);
@@ -2677,7 +2679,7 @@ function planFiles(all, policies, stack = "cloudflare") {
 }
 function applyPlan(appRoot, plan, options2 = {}) {
   return plan.map(({ path, content, header }) => {
-    const absolute = join11(appRoot, path);
+    const absolute = join12(appRoot, path);
     const status = inspectGenerated(absolute, content);
     if (status === "unmarked") return { path, status, outcome: "skipped-unmarked" };
     if (status === "drift" && !options2.force) return { path, status, outcome: "skipped-drift" };
@@ -2696,22 +2698,22 @@ function applyPlan(appRoot, plan, options2 = {}) {
 function findOrphans(appRoot, all) {
   const planned = new Set(planFiles(all).map((file) => file.path));
   const candidates = [];
-  const list2 = (dir, match) => existsSync12(join11(appRoot, dir)) ? readdirSync6(join11(appRoot, dir)).filter(match).map((name) => `${dir}/${name}`) : [];
+  const list2 = (dir, match) => existsSync13(join12(appRoot, dir)) ? readdirSync6(join12(appRoot, dir)).filter(match).map((name) => `${dir}/${name}`) : [];
   candidates.push(...list2("db/schema", (name) => name.endsWith(".ts")));
   candidates.push(...list2("resources", (name) => /\.(client|validators)\.ts$/.test(name)));
   for (const dir of list2("app/api", () => true)) {
-    for (const file of [`${dir}/route.ts`, `${dir}/[id]/route.ts`]) if (existsSync12(join11(appRoot, file))) candidates.push(file);
+    for (const file of [`${dir}/route.ts`, `${dir}/[id]/route.ts`]) if (existsSync13(join12(appRoot, file))) candidates.push(file);
   }
   for (const dir of list2("app/dashboard", () => true)) {
     const pages = [`${dir}/page.tsx`, `${dir}/new/page.tsx`, `${dir}/[id]/page.tsx`, `${dir}/[id]/edit/page.tsx`];
     const skeletons = [`${dir}/loading.tsx`, `${dir}/new/loading.tsx`, `${dir}/[id]/loading.tsx`, `${dir}/[id]/edit/loading.tsx`];
     for (const file of [...pages, ...skeletons]) {
-      if (existsSync12(join11(appRoot, file))) candidates.push(file);
+      if (existsSync13(join12(appRoot, file))) candidates.push(file);
     }
   }
   const orphans = [];
   for (const path of candidates) {
-    const match = HEADER_PATTERN.exec(readFileSync8(join11(appRoot, path), "utf8"));
+    const match = HEADER_PATTERN.exec(readFileSync8(join12(appRoot, path), "utf8"));
     if (match && !planned.has(path)) orphans.push({ path, resource: match[1] });
   }
   return orphans;
@@ -2722,10 +2724,10 @@ function ensureSupportFiles(appRoot, log2) {
     (name) => `lib/resource/${name}`
   );
   for (const path of ["lib/api.ts", "lib/cache.ts", ...engine]) {
-    const target = join11(appRoot, path);
-    if (existsSync12(target)) continue;
-    const source = [join11(templatesDir, "next", path), join11(templatesDir, "app", path)].find(
-      (candidate) => (stack === "next" || !candidate.includes(`${sep}next${sep}`)) && existsSync12(candidate)
+    const target = join12(appRoot, path);
+    if (existsSync13(target)) continue;
+    const source = [join12(templatesDir, "next", path), join12(templatesDir, "app", path)].find(
+      (candidate) => (stack === "next" || !candidate.includes(`${sep}next${sep}`)) && existsSync13(candidate)
     );
     if (!source) continue;
     mkdirSync4(dirname5(target), { recursive: true });
@@ -2757,14 +2759,14 @@ function billingFiles(appName) {
 }
 var RETIRED_FILES = ["app/api/billing/status/route.ts", "components/billing/subscribe-button.tsx"];
 function appendVars(appRoot, target) {
-  const path = join12(appRoot, target);
-  const text = existsSync13(path) ? readFileSync9(path, "utf8") : "";
+  const path = join13(appRoot, target);
+  const text = existsSync14(path) ? readFileSync9(path, "utf8") : "";
   if (/STRIPE_SECRET_KEY/.test(text)) return false;
   appendFileSync2(path, target === ".dev.vars" ? billingDevVarsEntries() : billingDevVarsExampleEntries());
   return true;
 }
 function addStripeDependency(appRoot) {
-  const path = join12(appRoot, "package.json");
+  const path = join13(appRoot, "package.json");
   const pkg = JSON.parse(readFileSync9(path, "utf8"));
   pkg.dependencies ??= {};
   if (pkg.dependencies.stripe) return false;
@@ -2774,8 +2776,8 @@ function addStripeDependency(appRoot) {
 }
 function writeBillingResource(appRoot, name, force, log2) {
   const relative3 = descriptorPath(name);
-  const path = join12(appRoot, relative3);
-  if (!existsSync13(path)) {
+  const path = join13(appRoot, relative3);
+  if (!existsSync14(path)) {
     mkdirSync5(dirname6(path), { recursive: true });
     writeFileSync7(path, renderBillingDescriptor(name));
     log2(`${pc6.green("create".padEnd(9))} ${relative3}`);
@@ -2805,25 +2807,25 @@ async function genBilling(options2 = {}) {
   for (const name of ["Plan", "Customer", "Purchase"]) writeBillingResource(appRoot, name, options2.force, log2);
   for (const [name, roles] of Object.entries(BILLING_POLICIES)) {
     const relative3 = policyPath(name);
-    if (existsSync13(join12(appRoot, relative3))) {
+    if (existsSync14(join13(appRoot, relative3))) {
       log2(`${pc6.dim("kept".padEnd(9))} ${relative3} (already exists)`);
       continue;
     }
-    mkdirSync5(join12(appRoot, "policies"), { recursive: true });
-    writeFileSync7(join12(appRoot, relative3), renderPolicy(name, roles));
+    mkdirSync5(join13(appRoot, "policies"), { recursive: true });
+    writeFileSync7(join13(appRoot, relative3), renderPolicy(name, roles));
     log2(`${pc6.green("create".padEnd(9))} ${relative3}`);
   }
   const files = [];
-  const appName = JSON.parse(readFileSync9(join12(appRoot, "package.json"), "utf8")).name ?? "app";
+  const appName = JSON.parse(readFileSync9(join13(appRoot, "package.json"), "utf8")).name ?? "app";
   for (const { path, content } of billingFiles(appName)) {
-    const outcome = writeGenerated(join12(appRoot, path), content, { header: billingHeader(), force: options2.force });
+    const outcome = writeGenerated(join13(appRoot, path), content, { header: billingHeader(), force: options2.force });
     files.push({ path, status: "missing", outcome });
     const label = outcome === "create" ? pc6.green("create") : outcome === "update" ? pc6.yellow("update") : pc6.dim("identical");
     log2(`${label.padEnd(18)} ${path}`);
   }
   for (const path of RETIRED_FILES) {
-    const absolute = join12(appRoot, path);
-    if (!existsSync13(absolute)) continue;
+    const absolute = join13(appRoot, path);
+    if (!existsSync14(absolute)) continue;
     const parts = splitMarkers(readFileSync9(absolute, "utf8"));
     const untouched = parts && parts.before.includes("flare gen billing") && !parts.after.trim() && parts.hash !== void 0 && hashBlock(parts.block) === parts.hash;
     if (untouched) {
@@ -2868,8 +2870,8 @@ async function genBilling(options2 = {}) {
 }
 
 // src/commands/gen-security.ts
-import { existsSync as existsSync14, mkdirSync as mkdirSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync8 } from "fs";
-import { dirname as dirname7, join as join13 } from "path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync6, readFileSync as readFileSync10, writeFileSync as writeFileSync8 } from "fs";
+import { dirname as dirname7, join as join14 } from "path";
 import pc7 from "picocolors";
 
 // src/generator/security.ts
@@ -3397,8 +3399,8 @@ function securityFiles(appName) {
 }
 var PASS_THROUGH_HEADER = /^\/\/ Request protection for worker\/index\.ts\.[\s\S]*?\n(?=\/\/ generated:start)/;
 function writeOnce(appRoot, relative3, content, log2) {
-  const path = join13(appRoot, relative3);
-  if (existsSync14(path)) {
+  const path = join14(appRoot, relative3);
+  if (existsSync15(path)) {
     log2(`${pc7.dim("kept".padEnd(9))} ${relative3} (already exists)`);
     return;
   }
@@ -3409,14 +3411,14 @@ function writeOnce(appRoot, relative3, content, log2) {
 async function genSecurity(options2 = {}) {
   const log2 = options2.log ?? ((message) => console.log(message));
   const appRoot = findAppRoot(options2.cwd ?? process.cwd());
-  const appName = JSON.parse(readFileSync10(join13(appRoot, "package.json"), "utf8")).name ?? "app";
+  const appName = JSON.parse(readFileSync10(join14(appRoot, "package.json"), "utf8")).name ?? "app";
   writeOnce(appRoot, "security.config.ts", renderSecurityConfig(), log2);
   writeOnce(appRoot, descriptorPath("SecurityEvent"), renderSecurityDescriptor(), log2);
   writeOnce(appRoot, policyPath("SecurityEvent"), renderPolicy("SecurityEvent", SECURITY_EVENT_POLICY), log2);
   const files = [];
   const write = (path, content, header) => {
-    const absolute = join13(appRoot, path);
-    if (path === "lib/security.ts" && existsSync14(absolute)) {
+    const absolute = join14(appRoot, path);
+    if (path === "lib/security.ts" && existsSync15(absolute)) {
       const source = readFileSync10(absolute, "utf8");
       if (PASS_THROUGH_HEADER.test(source)) writeFileSync8(absolute, source.replace(PASS_THROUGH_HEADER, securityHeader()));
     }
@@ -3426,12 +3428,12 @@ async function genSecurity(options2 = {}) {
     log2(`${label.padEnd(18)} ${path}`);
   };
   for (const { path, content } of securityFiles(appName)) write(path, content, securityHeader());
-  const navPath = join13(appRoot, "lib/dashboard-nav.ts");
-  if (existsSync14(navPath) && splitMarkers(readFileSync10(navPath, "utf8"))) write("lib/dashboard-nav.ts", renderAdminNavBlock());
+  const navPath = join14(appRoot, "lib/dashboard-nav.ts");
+  if (existsSync15(navPath) && splitMarkers(readFileSync10(navPath, "utf8"))) write("lib/dashboard-nav.ts", renderAdminNavBlock());
   else log2(pc7.yellow(`lib/dashboard-nav.ts not found: link to /dashboard/security from your dashboard sidebar yourself.`));
-  const wranglerPath = join13(appRoot, "wrangler.jsonc");
+  const wranglerPath = join14(appRoot, "wrangler.jsonc");
   let bindings = [];
-  if (existsSync14(wranglerPath)) {
+  if (existsSync15(wranglerPath)) {
     const { text, added } = addSecurityBindings(readFileSync10(wranglerPath, "utf8"));
     bindings = added;
     if (added.length) {
@@ -3466,14 +3468,14 @@ async function genSecurity(options2 = {}) {
 }
 
 // src/commands/theme.ts
-import { existsSync as existsSync15, readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from "fs";
-import { join as join14 } from "path";
+import { existsSync as existsSync16, readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from "fs";
+import { join as join15 } from "path";
 import pc8 from "picocolors";
 var THEME_LINE = /theme: "([a-z]+)" as ThemeName,/;
 function setTheme(name, cwd = process.cwd(), log2 = console.log) {
   const appRoot = findAppRoot(cwd);
-  const path = join14(appRoot, "lib/site.ts");
-  if (!existsSync15(path)) throw new Error("lib/site.ts not found: this app was created before themes. Add it from the Flare app template.");
+  const path = join15(appRoot, "lib/site.ts");
+  if (!existsSync16(path)) throw new Error("lib/site.ts not found: this app was created before themes. Add it from the Flare app template.");
   const source = readFileSync11(path, "utf8");
   const current = THEME_LINE.exec(source)?.[1];
   if (!name) {
@@ -3566,8 +3568,8 @@ async function askCreateQuestions(given, appName) {
 }
 
 // src/commands/gen.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync7, writeFileSync as writeFileSync10 } from "fs";
-import { dirname as dirname8, join as join15 } from "path";
+import { existsSync as existsSync17, mkdirSync as mkdirSync7, writeFileSync as writeFileSync10 } from "fs";
+import { dirname as dirname8, join as join16 } from "path";
 import { camelCase as camelCase5, defineResource as defineResource2, relationGraph as relationGraph2 } from "@flaredev/core";
 import pc10 from "picocolors";
 function validateFields(name, fields, others, log2) {
@@ -3588,8 +3590,8 @@ async function genResource(rawName, options2) {
   const appRoot = findAppRoot(options2.cwd ?? process.cwd());
   const name = resourceName(rawName);
   const relativePath = descriptorPath(name);
-  const path = join15(appRoot, relativePath);
-  const exists = existsSync16(path);
+  const path = join16(appRoot, relativePath);
+  const exists = existsSync17(path);
   if (!exists && !options2.fields) {
     throw new Error(`--fields is required, e.g. flare gen resource ${name} --fields "name:string, email:string"`);
   }
@@ -3654,8 +3656,8 @@ Next: ${pc10.bold("flare migrate")} to apply it locally.`);
 }
 
 // src/commands/gen-endpoint.ts
-import { existsSync as existsSync17, mkdirSync as mkdirSync8, writeFileSync as writeFileSync11 } from "fs";
-import { join as join16 } from "path";
+import { existsSync as existsSync18, mkdirSync as mkdirSync8, writeFileSync as writeFileSync11 } from "fs";
+import { join as join17 } from "path";
 import { kebabCase as kebabCase3, pascalCase as pascalCase3 } from "@flaredev/core";
 import pc11 from "picocolors";
 var METHODS = ["GET", "POST", "PATCH", "PUT", "DELETE"];
@@ -3677,9 +3679,9 @@ async function genEndpoint(resourceName2, rawName, options2 = {}) {
   if (!ACTIONS.includes(action)) throw new Error(`Unknown action "${action}". Use one of ${ACTIONS.join(", ")}.`);
   const { resource, stem } = entry;
   const relative3 = options2.record ? `app/api/${resource.slug}/[id]/${name}/route.ts` : `app/api/${resource.slug}/${name}/route.ts`;
-  const path = join16(appRoot, relative3);
-  if (existsSync17(path)) throw new Error(`${relative3} already exists.`);
-  mkdirSync8(join16(path, ".."), { recursive: true });
+  const path = join17(appRoot, relative3);
+  if (existsSync18(path)) throw new Error(`${relative3} already exists.`);
+  mkdirSync8(join17(path, ".."), { recursive: true });
   const route = options2.record ? `/api/${resource.slug}/[id]/${name}` : `/api/${resource.slug}/${name}`;
   writeFileSync11(path, renderEndpoint({ resource: resource.name, stem, method, action, record: Boolean(options2.record), name, route }));
   log2(`${pc11.green("create".padEnd(9))} ${relative3}`);
@@ -3717,8 +3719,8 @@ ${body}
 }
 
 // src/commands/gen-migration.ts
-import { existsSync as existsSync18, mkdirSync as mkdirSync9, writeFileSync as writeFileSync12 } from "fs";
-import { basename as basename2, join as join17 } from "path";
+import { existsSync as existsSync19, mkdirSync as mkdirSync9, writeFileSync as writeFileSync12 } from "fs";
+import { basename as basename2, join as join18 } from "path";
 import { snakeCase } from "@flaredev/core";
 import pc12 from "picocolors";
 var DOWN_TEMPLATE = (up) => `-- Rollback for ${up}, run by \`flare migrate:rollback\`.
@@ -3739,11 +3741,11 @@ async function genMigration(rawName, options2 = {}) {
   for (const file of files) log2(`${pc12.green("create".padEnd(9))} ${file}`);
   for (const repair of repairs) log2(pc12.dim(`repaired  ${repair}`));
   if (!options2.fromSchema) {
-    const downDir = join17(appRoot, "migrations", "down");
+    const downDir = join18(appRoot, "migrations", "down");
     mkdirSync9(downDir, { recursive: true });
     for (const file of files) {
-      const down = join17(downDir, basename2(file));
-      if (existsSync18(down)) continue;
+      const down = join18(downDir, basename2(file));
+      if (existsSync19(down)) continue;
       writeFileSync12(down, DOWN_TEMPLATE(basename2(file)));
       log2(`${pc12.green("create".padEnd(9))} migrations/down/${basename2(file)}`);
     }
@@ -3757,8 +3759,8 @@ Next: ${pc12.bold("flare migrate")}.`);
 }
 
 // src/commands/gen-policy.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync10, writeFileSync as writeFileSync13 } from "fs";
-import { dirname as dirname9, join as join18 } from "path";
+import { existsSync as existsSync20, mkdirSync as mkdirSync10, writeFileSync as writeFileSync13 } from "fs";
+import { dirname as dirname9, join as join19 } from "path";
 import { definePolicy } from "@flaredev/core";
 import pc13 from "picocolors";
 function parseRoles(input, what = "--roles") {
@@ -3776,8 +3778,8 @@ async function genPolicy(rawName, options2) {
     throw new Error(`No resource "${name}". Generate it first. Known resources: ${known}.`);
   }
   const relative3 = policyPath(name);
-  const path = join18(appRoot, relative3);
-  const exists = existsSync19(path);
+  const path = join19(appRoot, relative3);
+  const exists = existsSync20(path);
   let roles;
   let deleteRoles;
   if (options2.roles || !exists) {
@@ -3811,9 +3813,9 @@ ${pc13.dim("Roles come from `flare role:add`; the API and the admin both enforce
 }
 
 // src/commands/migrate.ts
-import { existsSync as existsSync20, mkdtempSync, readFileSync as readFileSync12, rmSync as rmSync3, writeFileSync as writeFileSync14 } from "fs";
+import { existsSync as existsSync21, mkdtempSync, readFileSync as readFileSync12, rmSync as rmSync3, writeFileSync as writeFileSync14 } from "fs";
 import { tmpdir } from "os";
-import { join as join19 } from "path";
+import { join as join20 } from "path";
 import pc14 from "picocolors";
 
 // src/generator/down.ts
@@ -3941,7 +3943,7 @@ async function rollback(options2 = {}) {
   const steps = options2.steps ?? 1;
   if (!Number.isInteger(steps) || steps < 1) throw new Error("--steps must be a positive integer.");
   const { appRoot, db, target, where, wrangler, log: log2 } = context(options2);
-  const migrationsDir = join19(appRoot, db.migrations_dir ?? "migrations");
+  const migrationsDir = join20(appRoot, db.migrations_dir ?? "migrations");
   const applied = await appliedMigrations(options2, steps);
   if (applied.length === 0) {
     log2("Nothing to roll back.");
@@ -3950,8 +3952,8 @@ async function rollback(options2 = {}) {
   const plan = [];
   for (const { name } of applied) {
     if (!/^[\w.-]+\.sql$/.test(name)) throw new Error(`Unexpected migration name "${name}" in d1_migrations.`);
-    const handWritten = join19(migrationsDir, "down", name);
-    if (existsSync20(handWritten)) {
+    const handWritten = join20(migrationsDir, "down", name);
+    if (existsSync21(handWritten)) {
       const sql2 = readFileSync12(handWritten, "utf8");
       if (splitStatements(sql2).length === 0) {
         throw new Error(`Can't roll back ${name}: migrations/down/${name} has no SQL statements yet. Write the rollback SQL, then run the rollback again. Nothing was changed.`);
@@ -3959,8 +3961,8 @@ async function rollback(options2 = {}) {
       plan.push({ name, sql: sql2, source: `migrations/down/${name}` });
       continue;
     }
-    const upPath = join19(migrationsDir, name);
-    if (!existsSync20(upPath)) throw new Error(`${name} was applied but migrations/${name} is missing, so it can't be reversed.`);
+    const upPath = join20(migrationsDir, name);
+    if (!existsSync21(upPath)) throw new Error(`${name} was applied but migrations/${name} is missing, so it can't be reversed.`);
     const down = deriveDown(readFileSync12(upPath, "utf8"));
     if (!down.reversible) {
       throw new Error(
@@ -3981,9 +3983,9 @@ Write the reverse SQL to migrations/down/${name} and run the rollback again. Not
   }
   const script = plan.map(({ name, sql: sql2 }) => `${sql2.trim()}
 DELETE FROM d1_migrations WHERE name = '${name.replace(/'/g, "''")}';`).join("\n") + "\n";
-  const dir = mkdtempSync(join19(tmpdir(), "flare-rollback-"));
+  const dir = mkdtempSync(join20(tmpdir(), "flare-rollback-"));
   try {
-    const file = join19(dir, "rollback.sql");
+    const file = join20(dir, "rollback.sql");
     writeFileSync14(file, script);
     const result = await runWrangler(wrangler, ["d1", "execute", db.binding, ...target, "--file", file], appRoot, { capture: true });
     if (result.code !== 0) throw new Error(`Rollback failed:
@@ -3997,8 +3999,8 @@ Rolled back ${plan.map((step) => step.name).join(", ")}.`));
 }
 
 // src/commands/rm.ts
-import { existsSync as existsSync21, readdirSync as readdirSync7, readFileSync as readFileSync13, rmdirSync, unlinkSync as unlinkSync2 } from "fs";
-import { dirname as dirname10, join as join20 } from "path";
+import { existsSync as existsSync22, readdirSync as readdirSync7, readFileSync as readFileSync13, rmdirSync, unlinkSync as unlinkSync2 } from "fs";
+import { dirname as dirname10, join as join21 } from "path";
 import { relationGraph as relationGraph3 } from "@flaredev/core";
 import pc15 from "picocolors";
 var squash = (text) => text.replace(/\r\n/g, "\n").replace(/\s+/g, " ").trim();
@@ -4017,10 +4019,10 @@ function handWrittenReason(source, header, options2 = {}) {
   return null;
 }
 function removeEmptyDirs(appRoot, start) {
-  let dir = dirname10(join20(appRoot, start));
-  const roots = [join20(appRoot, "app", "api"), join20(appRoot, "app", "dashboard")];
+  let dir = dirname10(join21(appRoot, start));
+  const roots = [join21(appRoot, "app", "api"), join21(appRoot, "app", "dashboard")];
   const inside = () => roots.some((root) => dir.startsWith(root) && dir !== root);
-  while (inside() && existsSync21(dir) && readdirSync7(dir).length === 0) {
+  while (inside() && existsSync22(dir) && readdirSync7(dir).length === 0) {
     rmdirSync(dir);
     dir = dirname10(dir);
   }
@@ -4049,7 +4051,7 @@ async function rmResource(rawName, options2 = {}) {
   if (entry) {
     owned.add(entry.file);
     for (const file of planFiles(all, void 0, readStack(appRoot))) {
-      if (existsSync21(join20(appRoot, file.path)) && file.header === resourceHeader(name)) owned.add(file.path);
+      if (existsSync22(join21(appRoot, file.path)) && file.header === resourceHeader(name)) owned.add(file.path);
     }
   }
   for (const orphan of findOrphans(appRoot, remaining)) if (orphan.resource === name) owned.add(orphan.path);
@@ -4058,7 +4060,7 @@ async function rmResource(rawName, options2 = {}) {
   if (!entry && owned.size === 0) throw new Error(`No resource "${name}" (no ${descriptorPath(name)} and no generated files).`);
   const findings = [];
   for (const path of owned) {
-    const source = readFileSync13(join20(appRoot, path), "utf8");
+    const source = readFileSync13(join21(appRoot, path), "utf8");
     let wrapper;
     if (entry && path === entry.file) {
       const standard = splitMarkers(renderDescriptor(name, [{ key: "placeholder", kind: "string", required: true, unique: false }]));
@@ -4079,15 +4081,15 @@ Move what you want to keep, or pass --force to delete anyway.`);
   }
   const removed = [...owned].sort();
   for (const path of removed) {
-    unlinkSync2(join20(appRoot, path));
+    unlinkSync2(join21(appRoot, path));
     removeEmptyDirs(appRoot, path);
     log2(`${pc15.red("remove".padEnd(9))} ${path}`);
   }
   logResults(applyPlan(appRoot, planFiles(remaining, policy ? await loadPolicies(appRoot) : void 0, readStack(appRoot))), log2);
   const table = entry ? tableExport(entry.resource) : void 0;
-  if (table && existsSync21(join20(appRoot, "seeds"))) {
-    const seeds = readdirSync7(join20(appRoot, "seeds")).filter(
-      (file) => new RegExp(`\\b${table}\\b`).test(readFileSync13(join20(appRoot, "seeds", file), "utf8"))
+  if (table && existsSync22(join21(appRoot, "seeds"))) {
+    const seeds = readdirSync7(join21(appRoot, "seeds")).filter(
+      (file) => new RegExp(`\\b${table}\\b`).test(readFileSync13(join21(appRoot, "seeds", file), "utf8"))
     );
     if (seeds.length) log2(pc15.yellow(`
 These seeds still use ${table}: ${seeds.map((s) => `seeds/${s}`).join(", ")}.`));
@@ -4157,21 +4159,28 @@ ${result.output.trim()}`);
 }
 
 // src/commands/eject.ts
-import { existsSync as existsSync22, mkdirSync as mkdirSync11, readFileSync as readFileSync14, readdirSync as readdirSync8, writeFileSync as writeFileSync15 } from "fs";
-import { dirname as dirname11, join as join21, relative as relative2 } from "path";
+import { existsSync as existsSync23, mkdirSync as mkdirSync11, readFileSync as readFileSync14, readdirSync as readdirSync8, writeFileSync as writeFileSync15 } from "fs";
+import { dirname as dirname11, join as join22, relative as relative2 } from "path";
 import pc17 from "picocolors";
-var TRACKED = ["lib/resource"];
+var TRACKED = ["lib", "components"];
+var PER_APP = /__APP_NAME__|__PM__|__THEME__|__COMPAT_DATE__/;
+var WRITTEN_PER_APP = /* @__PURE__ */ new Set(["lib/auth-config.ts"]);
 var prunedOn = (path, stack) => stack === "next" && CLOUDFLARE_ONLY.some((only) => path === only || path.startsWith(`${only}/`));
 function upstreamFile(path, stack) {
-  if (prunedOn(path, stack)) return void 0;
-  const candidates = stack === "next" ? [join21(templatesDir, "next", path), join21(templatesDir, "app", path)] : [join21(templatesDir, "app", path)];
-  return candidates.find((candidate) => existsSync22(candidate));
+  if (prunedOn(path, stack) || WRITTEN_PER_APP.has(path)) return void 0;
+  const found = locate(path, stack);
+  if (found && PER_APP.test(readFileSync14(found, "utf8"))) return void 0;
+  return found;
+}
+function locate(path, stack) {
+  const candidates = stack === "next" ? [join22(templatesDir, "next", path), join22(templatesDir, "app", path)] : [join22(templatesDir, "app", path)];
+  return candidates.find((candidate) => existsSync23(candidate));
 }
 function trackedPaths(appRoot, stack) {
   const paths = /* @__PURE__ */ new Set();
   const walk = (base, dir) => {
-    if (!existsSync22(join21(base, dir))) return;
-    for (const entry of readdirSync8(join21(base, dir), { withFileTypes: true })) {
+    if (!existsSync23(join22(base, dir))) return;
+    for (const entry of readdirSync8(join22(base, dir), { withFileTypes: true })) {
       const next = `${dir}/${entry.name}`;
       if (entry.isDirectory()) walk(base, next);
       else if (entry.name.endsWith(".ts") || entry.name.endsWith(".tsx")) paths.add(next);
@@ -4179,8 +4188,8 @@ function trackedPaths(appRoot, stack) {
   };
   for (const root of TRACKED) {
     walk(appRoot, root);
-    walk(join21(templatesDir, "app"), root);
-    if (stack === "next") walk(join21(templatesDir, "next"), root);
+    walk(join22(templatesDir, "app"), root);
+    if (stack === "next") walk(join22(templatesDir, "next"), root);
   }
   return [...paths].filter((path) => upstreamFile(path, stack) !== void 0).sort();
 }
@@ -4188,8 +4197,8 @@ function compareTracked(appRoot, stack, filter) {
   return trackedPaths(appRoot, stack).filter((path) => !filter || path.includes(filter)).map((path) => {
     const source = upstreamFile(path, stack);
     const theirs = readFileSync14(source, "utf8");
-    const target = join21(appRoot, path);
-    if (!existsSync22(target)) return { path, state: "missing", theirs };
+    const target = join22(appRoot, path);
+    if (!existsSync23(target)) return { path, state: "missing", theirs };
     const mine = readFileSync14(target, "utf8");
     return { path, state: mine === theirs ? "same" : "changed", mine, theirs };
   });
@@ -4252,7 +4261,7 @@ This discards your edits to those files. Re-run with ${pc17.bold("--yes")} to pr
     return 1;
   }
   for (const entry of changed) {
-    const target = join21(appRoot, entry.path);
+    const target = join22(appRoot, entry.path);
     mkdirSync11(dirname11(target), { recursive: true });
     writeFileSync15(target, entry.theirs);
     log2(`${pc17.green("update")}   ${relative2(process.cwd(), target) || entry.path}`);
@@ -4263,8 +4272,8 @@ Updated ${changed.length} file(s).`));
 }
 
 // src/commands/seed.ts
-import { existsSync as existsSync23, mkdirSync as mkdirSync12, readdirSync as readdirSync9, rmSync as rmSync5, writeFileSync as writeFileSync17 } from "fs";
-import { join as join23 } from "path";
+import { existsSync as existsSync24, mkdirSync as mkdirSync12, readdirSync as readdirSync9, rmSync as rmSync5, writeFileSync as writeFileSync17 } from "fs";
+import { join as join24 } from "path";
 import { camelCase as camelCase6, createFake, kebabCase as kebabCase4, storedFields as storedFields3 } from "@flaredev/core";
 import { createJiti as createJiti4 } from "jiti";
 import pc18 from "picocolors";
@@ -4363,18 +4372,18 @@ function createInsertMany(sink, drizzle, onProgress) {
 // src/seed/local-d1.ts
 import { readFileSync as readFileSync15, rmSync as rmSync4, writeFileSync as writeFileSync16 } from "fs";
 import { createRequire } from "module";
-import { join as join22 } from "path";
+import { join as join23 } from "path";
 import { pathToFileURL } from "url";
 import { parse as parseJsonc3 } from "jsonc-parser";
 var LOCAL_STATE = ".wrangler/state/v3";
 async function openLocalD1(appRoot, binding) {
   process.env.WRANGLER_LOG ??= "error";
-  const appRequire = createRequire(join22(appRoot, "package.json"));
+  const appRequire = createRequire(join23(appRoot, "package.json"));
   const wrangler = await import(pathToFileURL(appRequire.resolve("wrangler")).href);
   const configPath = seedConfig(appRoot);
   const { env, dispose } = await wrangler.getPlatformProxy({
     configPath,
-    persist: { path: join22(appRoot, LOCAL_STATE) }
+    persist: { path: join23(appRoot, LOCAL_STATE) }
   });
   const bindings = env;
   const name = binding ?? "DB";
@@ -4393,11 +4402,11 @@ async function openLocalD1(appRoot, binding) {
   };
 }
 function seedConfig(appRoot) {
-  const source = join22(appRoot, "wrangler.jsonc");
+  const source = join23(appRoot, "wrangler.jsonc");
   const config = parseJsonc3(readFileSync15(source, "utf8")) ?? {};
   delete config.durable_objects;
   delete config.migrations;
-  const path = join22(appRoot, ".flare-seed.wrangler.json");
+  const path = join23(appRoot, ".flare-seed.wrangler.json");
   writeFileSync16(path, JSON.stringify(config, null, 2));
   return path;
 }
@@ -4405,8 +4414,8 @@ function seedConfig(appRoot) {
 // src/commands/seed.ts
 var SEEDS_DIR = "seeds";
 function seedFiles(appRoot, names) {
-  const dir = join23(appRoot, SEEDS_DIR);
-  const all = existsSync23(dir) ? readdirSync9(dir).filter((file) => file.endsWith(".seed.ts")).sort() : [];
+  const dir = join24(appRoot, SEEDS_DIR);
+  const all = existsSync24(dir) ? readdirSync9(dir).filter((file) => file.endsWith(".seed.ts")).sort() : [];
   if (!names?.length) return all;
   return names.map((name) => {
     const file = `${name.replace(/\.seed\.ts$/, "")}.seed.ts`;
@@ -4428,16 +4437,16 @@ async function runSeeds(options2 = {}) {
     await runPrismaSeeds(appRoot, files, log2);
     return;
   }
-  const jiti = createJiti4(join23(appRoot, "package.json"), { alias: { "@": appRoot }, moduleCache: false, fsCache: false });
+  const jiti = createJiti4(join24(appRoot, "package.json"), { alias: { "@": appRoot }, moduleCache: false, fsCache: false });
   const { drizzle } = await jiti.import("drizzle-orm/d1");
   const drizzleHelpers = await jiti.import("drizzle-orm");
-  const schema = await jiti.import(join23(appRoot, "db/schema.ts"));
+  const schema = await jiti.import(join24(appRoot, "db/schema.ts"));
   const local = await openLocalD1(appRoot);
   try {
     const db = drizzle(local.db, { schema });
     const insertMany = createInsertMany(local.db, drizzleHelpers);
     for (const file of files) {
-      const mod = await jiti.import(join23(appRoot, SEEDS_DIR, file));
+      const mod = await jiti.import(join24(appRoot, SEEDS_DIR, file));
       if (typeof mod.default !== "function") throw new Error(`${SEEDS_DIR}/${file} must \`export default defineSeed(async ({ db }) => { ... })\`.`);
       log2(`${pc18.cyan("seed")} ${file}`);
       await mod.default({ db, env: local.env, insertMany, fake: createFake(), log: (message) => log2(`  ${message}`) });
@@ -4554,8 +4563,8 @@ async function makeSeed(rawName, options2 = {}) {
   const name = kebabCase4(rawName);
   if (!name) throw new Error(`Invalid seed name "${rawName}".`);
   const relative3 = `${SEEDS_DIR}/${name}.seed.ts`;
-  const path = join23(appRoot, relative3);
-  if (existsSync23(path)) throw new Error(`${relative3} already exists.`);
+  const path = join24(appRoot, relative3);
+  if (existsSync24(path)) throw new Error(`${relative3} already exists.`);
   const resources = (await loadResources(appRoot)).map(({ resource: resource2 }) => resource2);
   let resource;
   if (options2.resource) {
@@ -4564,7 +4573,7 @@ async function makeSeed(rawName, options2 = {}) {
   } else {
     resource = resources.find((r) => [kebabCase4(r.name), r.slug].includes(name));
   }
-  mkdirSync12(join23(appRoot, SEEDS_DIR), { recursive: true });
+  mkdirSync12(join24(appRoot, SEEDS_DIR), { recursive: true });
   writeFileSync17(path, renderSeed(resource, readStack(appRoot)));
   log2(`${pc18.green("create".padEnd(9))} ${relative3}`);
   log2(`
@@ -4572,7 +4581,7 @@ Run it with ${pc18.bold(`flare seed ${name}`)}.`);
   return relative3;
 }
 async function runPrismaSeeds(appRoot, files, log2) {
-  const runner = join23(appRoot, ".flare-seed-runner.mts");
+  const runner = join24(appRoot, ".flare-seed-runner.mts");
   const script = [
     `import "dotenv/config";`,
     `import { createFake } from "@flaredev/core";`,
@@ -4615,7 +4624,7 @@ Ran ${files.length} seed(s).`));
 // src/commands/db-push.ts
 import { mkdtempSync as mkdtempSync2, rmSync as rmSync6, writeFileSync as writeFileSync18 } from "fs";
 import { tmpdir as tmpdir2 } from "os";
-import { join as join24 } from "path";
+import { join as join25 } from "path";
 import pc19 from "picocolors";
 
 // src/terminal.ts
@@ -4680,7 +4689,7 @@ async function dbPush(tables, options2 = {}) {
   const wrangler = resolveBin(appRoot, "wrangler", "wrangler");
   const started = Date.now();
   const local = await openLocalD1(appRoot, options2.database);
-  const dir = mkdtempSync2(join24(tmpdir2(), "flare-push-"));
+  const dir = mkdtempSync2(join25(tmpdir2(), "flare-push-"));
   try {
     const statements = [];
     const counts = [];
@@ -4706,7 +4715,7 @@ async function dbPush(tables, options2 = {}) {
       log2("Nothing to push: those tables are empty locally.");
       return { tables: counts, ms: Date.now() - started };
     }
-    const file = join24(dir, "push.sql");
+    const file = join25(dir, "push.sql");
     writeFileSync18(file, statements.join("\n"));
     const target = ["--remote", ...options2.env ? ["--env", options2.env] : []];
     const result = await runWrangler(wrangler, ["d1", "execute", db.binding, ...target, "--yes", "--file", file], appRoot, { capture: true });
@@ -4724,7 +4733,7 @@ ${result.output.trim()}`);
 // src/commands/seed-resource.ts
 import { mkdtempSync as mkdtempSync3, rmSync as rmSync7, writeFileSync as writeFileSync19 } from "fs";
 import { tmpdir as tmpdir3 } from "os";
-import { join as join25 } from "path";
+import { join as join26 } from "path";
 import pc20 from "picocolors";
 
 // src/seed/rows.ts
@@ -4963,8 +4972,8 @@ ${result.output.trim()}`);
       const [counted] = await query(`SELECT count(*) AS total FROM "${resource.table}"`);
       startIndex = counted?.total ?? 0;
     }
-    const dir = mkdtempSync3(join25(tmpdir3(), "flare-seed-"));
-    const file = join25(dir, `${resource.table}.sql`);
+    const dir = mkdtempSync3(join26(tmpdir3(), "flare-seed-"));
+    const file = join26(dir, `${resource.table}.sql`);
     try {
       const statements = [];
       if (options2.truncate) statements.push(`DELETE FROM "${resource.table}";`);
@@ -5007,16 +5016,16 @@ ${result.output.trim()}`);
 
 // src/commands/billing-sync.ts
 import { createRequire as createRequire2 } from "module";
-import { existsSync as existsSync24, mkdtempSync as mkdtempSync4, readFileSync as readFileSync16, rmSync as rmSync8, writeFileSync as writeFileSync20 } from "fs";
+import { existsSync as existsSync25, mkdtempSync as mkdtempSync4, readFileSync as readFileSync16, rmSync as rmSync8, writeFileSync as writeFileSync20 } from "fs";
 import { tmpdir as tmpdir4 } from "os";
-import { join as join26 } from "path";
+import { join as join27 } from "path";
 import { pathToFileURL as pathToFileURL2 } from "url";
 import { kebabCase as kebabCase5 } from "@flaredev/core";
 import pc21 from "picocolors";
 function stripeKeys(appRoot) {
   const map = {};
-  const path = join26(appRoot, ".dev.vars");
-  if (existsSync24(path)) {
+  const path = join27(appRoot, ".dev.vars");
+  if (existsSync25(path)) {
     for (const line of readFileSync16(path, "utf8").split(/\r?\n/)) {
       const match = /^\s*([A-Z][A-Z0-9_]*)=(.*)$/.exec(line);
       if (match) map[match[1]] = match[2].trim();
@@ -5100,10 +5109,10 @@ async function syncPlans(options2 = {}) {
   if (!key) throw new Error("STRIPE_SECRET_KEY is not set in .dev.vars or the environment.");
   const db = readD1Databases(appRoot)[0];
   if (!db) throw new Error("No d1_databases in wrangler.jsonc.");
-  const appRequire = createRequire2(join26(appRoot, "package.json"));
+  const appRequire = createRequire2(join27(appRoot, "package.json"));
   const stripeModule = await import(pathToFileURL2(appRequire.resolve("stripe")).href);
   const stripe = new stripeModule.default(key, { apiVersion: "2026-08-26.dahlia" });
-  const appName = JSON.parse(readFileSync16(join26(appRoot, "package.json"), "utf8")).name ?? "app";
+  const appName = JSON.parse(readFileSync16(join27(appRoot, "package.json"), "utf8")).name ?? "app";
   const everything = await stripe.products.list({ active: true, limit: 100 }).autoPagingToArray({ limit: 1e4 });
   const products = options2.all ? everything : everything.filter((product) => product.metadata?.flare_app === appName);
   if (products.length === 0) {
@@ -5124,9 +5133,9 @@ async function syncPlans(options2 = {}) {
 ${existingResult.output.trim()}`);
   }
   const known = new Set(extractJson(existingResult.output)[0]?.results.map((row) => row.stripe_price_id));
-  const dir = mkdtempSync4(join26(tmpdir4(), "flare-sync-"));
+  const dir = mkdtempSync4(join27(tmpdir4(), "flare-sync-"));
   try {
-    const file = join26(dir, "sync-plans.sql");
+    const file = join27(dir, "sync-plans.sql");
     writeFileSync20(file, renderSyncSql(rows));
     const result = await runWrangler(wrangler, ["d1", "execute", db.binding, ...target, "--file", file], appRoot, { capture: true });
     if (result.code !== 0) throw new Error(`Could not write plans:
@@ -5150,15 +5159,15 @@ ${rows.length} plan(s) synced to the ${options2.remote ? "remote" : "local"} dat
 }
 
 // src/commands/sync.ts
-import { existsSync as existsSync25 } from "fs";
-import { join as join27 } from "path";
+import { existsSync as existsSync26 } from "fs";
+import { join as join28 } from "path";
 import pc22 from "picocolors";
 async function syncTypes(options2 = {}) {
   const log2 = options2.log ?? ((message) => console.log(message));
   const appRoot = findAppRoot(options2.cwd ?? process.cwd());
   const all = await loadResources(appRoot);
   const policies = await loadPolicies(appRoot);
-  const tracksPolicies = policies.length > 0 || existsSync25(join27(appRoot, "policies/index.ts"));
+  const tracksPolicies = policies.length > 0 || existsSync26(join28(appRoot, "policies/index.ts"));
   const plan = planFiles(all, tracksPolicies ? policies : void 0, readStack(appRoot));
   if (!options2.check) ensureSupportFiles(appRoot, log2);
   const results = applyPlan(appRoot, plan, { force: options2.force, dryRun: options2.check });
@@ -5206,7 +5215,7 @@ ${pc22.red("Out of sync:")} ${stale} file(s) would change. Run ${pc22.bold("flar
 
 // src/commands/user-role.ts
 import { rmSync as rmSync9, writeFileSync as writeFileSync21 } from "fs";
-import { join as join28 } from "path";
+import { join as join29 } from "path";
 import pc23 from "picocolors";
 var ROLE = /^[a-z][a-z0-9_-]{0,31}$/;
 var EMAIL = /^[^\s@'"\\]+@[^\s@'"\\]+\.[^\s@'"\\]+$/;
@@ -5244,7 +5253,7 @@ ${result.output.trim()}`);
   return 0;
 }
 async function setUserRoleOnPrisma(appRoot, email, role, log2) {
-  const runner = join28(appRoot, ".flare-role-runner.mts");
+  const runner = join29(appRoot, ".flare-role-runner.mts");
   const script = [
     `import "dotenv/config";`,
     `import { prisma } from "./lib/db";`,
@@ -5278,11 +5287,11 @@ async function setUserRoleOnPrisma(appRoot, email, role, log2) {
 
 // src/utils/install.ts
 import { spawn as spawn5 } from "child_process";
-import { existsSync as existsSync26, readFileSync as readFileSync17, readdirSync as readdirSync10 } from "fs";
-import { join as join29 } from "path";
+import { existsSync as existsSync27, readFileSync as readFileSync17, readdirSync as readdirSync10 } from "fs";
+import { join as join30 } from "path";
 function expectedPackages(dir) {
-  const npmLock = join29(dir, "package-lock.json");
-  if (existsSync26(npmLock)) {
+  const npmLock = join30(dir, "package-lock.json");
+  if (existsSync27(npmLock)) {
     try {
       const lock = JSON.parse(readFileSync17(npmLock, "utf8"));
       return Math.max(0, Object.keys(lock.packages ?? {}).length - 1);
@@ -5290,8 +5299,8 @@ function expectedPackages(dir) {
       return 0;
     }
   }
-  const pnpmLock = join29(dir, "pnpm-lock.yaml");
-  if (existsSync26(pnpmLock)) {
+  const pnpmLock = join30(dir, "pnpm-lock.yaml");
+  if (existsSync27(pnpmLock)) {
     try {
       const text = readFileSync17(pnpmLock, "utf8");
       const packages = text.slice(text.indexOf("\npackages:"));
@@ -5303,15 +5312,15 @@ function expectedPackages(dir) {
   return 0;
 }
 function installedPackages(dir) {
-  const root = join29(dir, "node_modules");
-  if (!existsSync26(root)) return 0;
+  const root = join30(dir, "node_modules");
+  if (!existsSync27(root)) return 0;
   let total = 0;
   try {
     for (const entry of readdirSync10(root, { withFileTypes: true })) {
       if (!entry.isDirectory() || entry.name === ".bin") continue;
       if (entry.name.startsWith("@")) {
         try {
-          total += readdirSync10(join29(root, entry.name)).length;
+          total += readdirSync10(join30(root, entry.name)).length;
         } catch {
         }
       } else if (entry.name !== ".pnpm" && entry.name !== ".vite") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flaredev/cli",
-  "version": "0.7.1",
+  "version": "0.7.3",
   "description": "The flare command-line tool: create, generate, migrate, and deploy Flare apps",
   "license": "MIT",
   "author": "Muke Johnbaptist",
@@ -41,7 +41,7 @@
     "jiti": "^2.7.0",
     "jsonc-parser": "^3.3.1",
     "picocolors": "^1.1.1",
-    "@flaredev/core": "0.7.1"
+    "@flaredev/core": "0.7.3"
   },
   "engines": {
     "node": ">=22"

package/templates/app/lib/resource/rows.ts

@@ -36,7 +36,20 @@ export interface RowsQuery {
    * `(sort field, id)` together so rows sharing a sort value are neither skipped nor
    * repeated.
    */
-  cursor?: { field: string; value: unknown; id: string; greaterThan: boolean };
+  cursor?: {
+    field: string;
+    value: unknown;
+    id: string;
+    greaterThan: boolean;
+    /**
+     * Whether the sort column holds a date.
+     *
+     * A cursor travels through a URL, so a Date arrives back as a number. SQLite stores
+     * dates as milliseconds and wants that number; Postgres wants a Date. Neither
+     * adapter can tell which a column is, and the store can — so it says.
+     */
+    isDate?: boolean;
+  };
   limit: number;
   /** Offset paging, for the page-number case. Never combined with a cursor. */
   offset?: number;

package/templates/app/lib/resource/store.ts

@@ -42,7 +42,7 @@ export type Result<T> = { ok: true; data: T } | Failure;
  */
 export const COUNT_LIMIT = 10_000;
 
-/** Dates are stored as milliseconds, and a cursor has to compare the way the column does. */
+/** A cursor is JSON in a URL, so a Date has to cross it as a number. */
 function toCursorValue(value: unknown): string | number | boolean | null {
   if (value instanceof Date) return value.getTime();
   if (value === null || value === undefined) return null;
@@ -211,6 +211,16 @@ export function createResourceStore(options: ResourceStoreOptions) {
       if ("issues" in parsed) return fail(400, "Invalid query.", { queryIssues: parsed.issues });
       const { page, perPage, sort, q, filters, cursor } = parsed.query;
 
+      /**
+       * Whether a sort column holds a date, so the adapter can shape the cursor for it.
+       * The timestamps every row has, plus any date or datetime field.
+       */
+      const isDateField = (key: string) => {
+        if (key === "createdAt" || key === "updatedAt") return true;
+        const def = fields.find(([name]) => name === key)?.[1];
+        return def?.kind === "date" || def?.kind === "datetime";
+      };
+
       const searchable = fields.filter(([, def]) => isSearchable(def)).map(([key]) => key);
       const matching = { search: q ? { term: q, fields: searchable } : undefined, filters };
 
@@ -224,7 +234,9 @@ export function createResourceStore(options: ResourceStoreOptions) {
         rows.find({
           ...matching,
           sort: { field: sort.field, direction: descending ? "desc" : "asc" },
-          cursor: cursor ? { field: sort.field, value: cursor.value, id: cursor.id, greaterThan: !descending } : undefined,
+          cursor: cursor
+            ? { field: sort.field, value: cursor.value, id: cursor.id, greaterThan: !descending, isDate: isDateField(sort.field) }
+            : undefined,
           limit: perPage + 1,
           offset: cursor ? undefined : (page - 1) * perPage,
         }),

package/templates/next/lib/resource/prisma-rows.ts

@@ -97,8 +97,12 @@ export function prismaRows(delegate: PrismaDelegate, client: unknown): ResourceR
     async find(query) {
       const where = matching(query);
       if (query.cursor) {
-        const { field, value, id, greaterThan } = query.cursor;
+        const { field, id, greaterThan, isDate } = query.cursor;
         const op = greaterThan ? "gt" : "lt";
+        // Postgres compares a timestamp against a Date, not the number the cursor
+        // carried. Without this, paging past the first page of a date-sorted list fails
+        // with "Expected DateTime, provided Int".
+        const value = isDate && (typeof query.cursor.value === "number" || typeof query.cursor.value === "string") ? new Date(query.cursor.value) : query.cursor.value;
         // (sort, id) as one comparison, so rows sharing a sort value are neither skipped
         // nor repeated. AND-ed with the filters rather than replacing them.
         const keyset = [{ [field]: { [op]: value } }, { AND: [{ [field]: value }, { id: { [op]: id } }] }];