@spotpatch/next 0.2.0 → 0.3.1

package/README.md

@@ -40,7 +40,7 @@ pnpm exec spotpatch-next check
 pnpm dev
 ```
 
-The supported initializer result has three parts:
+The supported initializer result has three parts. The TypeScript example below enables the in-page Review / Trusted fast selector by discovering the local TypeScript check; a JavaScript-only project remains on `withSpotPatch()` and review mode.
 
 ```ts
 // next.config.ts
@@ -49,7 +49,7 @@ import { withSpotPatch } from "@spotpatch/next";
 
 const nextConfig: NextConfig = {};
 
-export default withSpotPatch()(nextConfig);
+export default withSpotPatch({ trustedFastMode: true })(nextConfig);
 ```
 
 ```ts
@@ -141,7 +141,7 @@ pnpm exec spotpatch-next check
 pnpm dev
 ```
 
-受支持的初始化结果包含三部分：
+受支持的初始化结果包含三部分。下面的 TypeScript 示例会通过自动发现本地 TypeScript 校验来开放页面内“审阅 / 可信快速”选择；纯 JavaScript 项目保持 `withSpotPatch()` 和审阅模式。
 
 ```ts
 // next.config.ts
@@ -150,7 +150,7 @@ import { withSpotPatch } from "@spotpatch/next";
 
 const nextConfig: NextConfig = {};
 
-export default withSpotPatch()(nextConfig);
+export default withSpotPatch({ trustedFastMode: true })(nextConfig);
 ```
 
 ```ts

package/dist/cli.js

@@ -297,7 +297,7 @@ import {
 // package.json
 var package_default = {
   name: "@spotpatch/next",
-  version: "0.2.0",
+  version: "0.3.1",
   description: "Development-only Next.js adapter and CLI for SpotPatch.",
   license: "MIT",
   repository: {
@@ -964,18 +964,15 @@ async function runNextDevelopment(arguments_) {
 }
 
 // src/initializer.ts
-import { randomBytes as randomBytes2 } from "crypto";
-import {
-  access as access2,
-  lstat,
-  mkdir,
-  readFile as readFile2,
-  rename,
-  stat,
-  unlink,
-  writeFile
-} from "fs/promises";
 import path3 from "path";
+import {
+  applyIntegrationPlan,
+  createIntegrationFileChange,
+  discoverProjectValidationCheck,
+  integrationPathExists,
+  readIntegrationFile
+} from "@spotpatch/dev-server";
+import { DEFAULT_AGENT_LIMITS } from "@spotpatch/shared";
 import { MagicString } from "magic-string";
 import {
   parseSync,
@@ -1008,23 +1005,6 @@ function isParserErrorSeverity(value) {
 function isRecord3(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-async function pathExists2(absolutePath) {
-  try {
-    await access2(absolutePath);
-    return true;
-  } catch {
-    return false;
-  }
-}
-async function readRegularFile(absolutePath) {
-  const metadata = await lstat(absolutePath);
-  if (!metadata.isFile() || metadata.isSymbolicLink()) {
-    throw new Error(
-      `SpotPatch refuses to modify the non-regular file ${path3.basename(absolutePath)}.`
-    );
-  }
-  return readFile2(absolutePath, "utf8");
-}
 function parseModule(absolutePath, source) {
   const result = parseSync(absolutePath, source, {
     sourceType: "module",
@@ -1129,18 +1109,18 @@ function unwrapParentheses(expression) {
   }
   return current;
 }
-function isWrappedDefaultExport(declaration, wrapperName) {
+function wrappedFactoryCall(declaration, wrapperName) {
   if (declaration.type !== "CallExpression" || declaration.arguments.length !== 1) {
-    return false;
+    return void 0;
   }
   const factoryCall = unwrapParentheses(declaration.callee);
   if (factoryCall.type !== "CallExpression") {
-    return false;
+    return void 0;
   }
   const callee = unwrapParentheses(factoryCall.callee);
-  return callee.type === "Identifier" && callee.name === wrapperName;
+  return callee.type === "Identifier" && callee.name === wrapperName ? factoryCall : void 0;
 }
-function transformNextConfig(absolutePath, source) {
+function transformNextConfig(absolutePath, source, trustedFastModeAvailable) {
   if (absolutePath.endsWith(".cjs") || absolutePath.endsWith(".cts")) {
     throw new Error(
       "SpotPatch init does not rewrite CommonJS next.config files; add withSpotPatch manually."
@@ -1149,9 +1129,6 @@ function transformNextConfig(absolutePath, source) {
   const { program } = parseModule(absolutePath, source);
   const defaultExport = findDefaultExport(program);
   const existingWrapperName = importedWrapperName(program);
-  if (existingWrapperName !== void 0 && isWrappedDefaultExport(defaultExport.declaration, existingWrapperName)) {
-    return source;
-  }
   if (defaultExport.declaration.type === "FunctionDeclaration" || defaultExport.declaration.type === "TSDeclareFunction" || defaultExport.declaration.type === "ClassDeclaration" || defaultExport.declaration.type === "TSInterfaceDeclaration") {
     throw new Error(
       "SpotPatch init cannot safely wrap this next.config default declaration; use an exported config expression."
@@ -1159,6 +1136,18 @@ function transformNextConfig(absolutePath, source) {
   }
   const magicString = new MagicString(source);
   const wrapperName = existingWrapperName ?? chooseWrapperName(program);
+  const existingFactory = existingWrapperName === void 0 ? void 0 : wrappedFactoryCall(defaultExport.declaration, existingWrapperName);
+  if (existingFactory !== void 0) {
+    if (trustedFastModeAvailable && existingFactory.arguments.length === 0) {
+      magicString.overwrite(
+        existingFactory.start,
+        existingFactory.end,
+        `${wrapperName}({ trustedFastMode: true })`
+      );
+      return magicString.toString();
+    }
+    return source;
+  }
   if (existingWrapperName === void 0) {
     const specifier = wrapperName === "withSpotPatch" ? "withSpotPatch" : `withSpotPatch as ${wrapperName}`;
     insertStaticImport(
@@ -1174,7 +1163,7 @@ function transformNextConfig(absolutePath, source) {
   magicString.overwrite(
     defaultExport.declaration.start,
     defaultExport.declaration.end,
-    `${wrapperName}()(${expression})`
+    `${wrapperName}(${trustedFastModeAvailable ? "{ trustedFastMode: true }" : ""})(${expression})`
   );
   return magicString.toString();
 }
@@ -1264,7 +1253,7 @@ async function findNextConfig(appRoot) {
   const candidates = (await Promise.all(
     CONFIG_FILE_NAMES.map(async (name) => {
       const absolutePath = path3.join(appRoot, name);
-      return await pathExists2(absolutePath) ? absolutePath : void 0;
+      return await integrationPathExists(absolutePath) ? absolutePath : void 0;
     })
   )).filter((value) => value !== void 0);
   if (candidates.length !== 1) {
@@ -1278,12 +1267,12 @@ async function findNextConfig(appRoot) {
 }
 async function resolveInstrumentationPath(appRoot, configPath) {
   const rootRouters = await Promise.all([
-    pathExists2(path3.join(appRoot, "app")),
-    pathExists2(path3.join(appRoot, "pages"))
+    integrationPathExists(path3.join(appRoot, "app")),
+    integrationPathExists(path3.join(appRoot, "pages"))
   ]);
   const sourceRouters = await Promise.all([
-    pathExists2(path3.join(appRoot, "src", "app")),
-    pathExists2(path3.join(appRoot, "src", "pages"))
+    integrationPathExists(path3.join(appRoot, "src", "app")),
+    integrationPathExists(path3.join(appRoot, "src", "pages"))
   ]);
   const hasRootRouter = rootRouters.some(Boolean);
   const hasSourceRouter = sourceRouters.some(Boolean);
@@ -1299,7 +1288,7 @@ async function resolveInstrumentationPath(appRoot, configPath) {
   const existing = (await Promise.all(
     INSTRUMENTATION_EXTENSIONS.map(async (extension) => {
       const absolutePath = path3.join(directory, `instrumentation-client${extension}`);
-      return await pathExists2(absolutePath) ? absolutePath : void 0;
+      return await integrationPathExists(absolutePath) ? absolutePath : void 0;
     })
   )).filter((value) => value !== void 0);
   if (existing.length > 1) {
@@ -1310,99 +1299,54 @@ async function resolveInstrumentationPath(appRoot, configPath) {
   if (existing[0] !== void 0) {
     return existing[0];
   }
-  const useTypeScript = configPath.endsWith(".ts") || configPath.endsWith(".mts") || configPath.endsWith(".cts") || await pathExists2(path3.join(appRoot, "tsconfig.json"));
+  const useTypeScript = configPath.endsWith(".ts") || configPath.endsWith(".mts") || configPath.endsWith(".cts") || await integrationPathExists(path3.join(appRoot, "tsconfig.json"));
   return path3.join(directory, `instrumentation-client.${useTypeScript ? "ts" : "js"}`);
 }
-function createChange(appRoot, absolutePath, nextContent, previousContent) {
-  if (previousContent === nextContent) {
-    return void 0;
-  }
-  return Object.freeze({
-    absolutePath,
-    nextContent,
-    ...previousContent === void 0 ? {} : { previousContent },
-    relativePath: path3.relative(appRoot, absolutePath).split(path3.sep).join("/")
-  });
-}
 async function planNextIntegration(directory = process.cwd()) {
   const appRoot = path3.resolve(directory);
   const packagePath = path3.join(appRoot, "package.json");
   const [packageSource, configPath] = await Promise.all([
-    readRegularFile(packagePath),
+    readIntegrationFile(packagePath),
     findNextConfig(appRoot)
   ]);
-  const configSource = await readRegularFile(configPath);
+  const [configSource, discoveredCheck] = await Promise.all([
+    readIntegrationFile(configPath),
+    discoverProjectValidationCheck({
+      appRoot,
+      timeoutMs: DEFAULT_AGENT_LIMITS.checkTimeoutMs
+    })
+  ]);
+  const trustedFastModeAvailable = discoveredCheck !== void 0;
   const instrumentationPath = await resolveInstrumentationPath(appRoot, configPath);
-  const instrumentationSource = await pathExists2(instrumentationPath) ? await readRegularFile(instrumentationPath) : void 0;
+  const instrumentationSource = await integrationPathExists(instrumentationPath) ? await readIntegrationFile(instrumentationPath) : void 0;
   const changes = [
-    createChange(
+    createIntegrationFileChange(
       appRoot,
       configPath,
-      transformNextConfig(configPath, configSource),
+      transformNextConfig(configPath, configSource, trustedFastModeAvailable),
       configSource
     ),
-    createChange(
+    createIntegrationFileChange(
       appRoot,
       instrumentationPath,
       transformInstrumentationClient(instrumentationPath, instrumentationSource ?? ""),
       instrumentationSource
     ),
-    createChange(
+    createIntegrationFileChange(
       appRoot,
       packagePath,
       transformPackageJson(packageSource),
       packageSource
     )
   ].filter((change) => change !== void 0);
-  return Object.freeze({ appRoot, changes: Object.freeze(changes) });
-}
-function temporaryPath(absolutePath, label) {
-  return path3.join(
-    path3.dirname(absolutePath),
-    `.${path3.basename(absolutePath)}.spotpatch-${label}-${String(process.pid)}-${randomBytes2(8).toString("hex")}`
-  );
-}
-async function writeAtomic(absolutePath, content, mode) {
-  await mkdir(path3.dirname(absolutePath), { recursive: true });
-  const stagedPath = temporaryPath(absolutePath, "stage");
-  try {
-    await writeFile(stagedPath, content, { encoding: "utf8", flag: "wx", mode });
-    await rename(stagedPath, absolutePath);
-  } catch (error) {
-    await unlink(stagedPath).catch(() => void 0);
-    throw error;
-  }
-}
-async function rollbackChange(change) {
-  if (change.previousContent === void 0) {
-    await unlink(change.absolutePath).catch(() => void 0);
-    return;
-  }
-  const mode = (await stat(change.absolutePath)).mode;
-  await writeAtomic(change.absolutePath, change.previousContent, mode);
+  return Object.freeze({
+    appRoot,
+    changes: Object.freeze(changes),
+    trustedFastModeAvailable
+  });
 }
 async function applyNextIntegrationPlan(plan) {
-  const applied = [];
-  try {
-    for (const change of plan.changes) {
-      const mode = change.previousContent === void 0 ? 384 : (await stat(change.absolutePath)).mode;
-      await writeAtomic(change.absolutePath, change.nextContent, mode);
-      applied.push(change);
-    }
-  } catch (error) {
-    const rollbackResults = await Promise.allSettled(
-      applied.reverse().map(rollbackChange)
-    );
-    if (rollbackResults.some((result) => result.status === "rejected")) {
-      throw new Error(
-        "SpotPatch init failed and could not completely restore the previous files.",
-        { cause: error }
-      );
-    }
-    throw new Error("SpotPatch init failed; all written files were restored.", {
-      cause: error
-    });
-  }
+  await applyIntegrationPlan(plan);
 }
 async function checkNextIntegration(directory = process.cwd()) {
   try {
@@ -1413,7 +1357,8 @@ async function checkNextIntegration(directory = process.cwd()) {
     return Object.freeze({
       appRoot: plan.appRoot,
       issues: Object.freeze(issues),
-      ok: issues.length === 0
+      ok: issues.length === 0,
+      trustedFastModeAvailable: plan.trustedFastModeAvailable
     });
   } catch (error) {
     return Object.freeze({
@@ -1421,7 +1366,8 @@ async function checkNextIntegration(directory = process.cwd()) {
       issues: Object.freeze([
         error instanceof Error ? error.message : "SpotPatch integration check failed."
       ]),
-      ok: false
+      ok: false,
+      trustedFastModeAvailable: false
     });
   }
 }
@@ -1449,6 +1395,11 @@ function verifyAdapterExports(appRoot) {
     }
   }
 }
+function writeTrustedModeStatus(available) {
+  process.stdout.write(
+    available ? "[spotpatch:next] trusted fast mode is available in the page selector.\n" : "[spotpatch:next] review mode is ready; trusted fast mode needs a local TypeScript project check.\n"
+  );
+}
 async function runInit(arguments_) {
   if (arguments_.length !== 0) {
     throw new Error("SpotPatch init does not accept positional arguments.");
@@ -1458,6 +1409,7 @@ async function runInit(arguments_) {
   const plan = await planNextIntegration(project.appRoot);
   if (plan.changes.length === 0) {
     process.stdout.write("[spotpatch:next] integration is already up to date.\n");
+    writeTrustedModeStatus(plan.trustedFastModeAvailable);
     return 0;
   }
   process.stdout.write("[spotpatch:next] integration preview (resulting files):\n");
@@ -1474,6 +1426,7 @@ ${change.nextContent}`);
     `[spotpatch:next] updated ${String(plan.changes.length)} integration file(s).
 `
   );
+  writeTrustedModeStatus(plan.trustedFastModeAvailable);
   return 0;
 }
 async function runCheck(arguments_) {
@@ -1490,8 +1443,9 @@ async function runCheck(arguments_) {
     }
     return 1;
   }
+  const mode = result.trustedFastModeAvailable ? "trusted fast mode available" : "review mode";
   process.stdout.write(
-    `[spotpatch:next] integration verified for Next.js ${project.nextVersion}.
+    `[spotpatch:next] integration verified for Next.js ${project.nextVersion} \xB7 ${mode}.
 `
   );
   return 0;