@publish.os/nextjs 0.0.1-alpha.90 → 0.0.1-alpha.92

package/dist/{dev-operation-TZDVJCN7.js → dev-operation-WNECBHZ5.js}

@@ -1,37 +1,40 @@
 import {
   withCheckoutPreparation
-} from "./chunk-DWA3ZRGW.js";
-import {
-  approveLocalComposition
-} from "./chunk-SVYGXXYR.js";
-import {
-  withLocalOperation
-} from "./chunk-B2V22WRT.js";
+} from "./chunk-6C65KV7O.js";
 import {
   LocalProcessError,
+  approveLocalComposition,
   installLocalApp,
   localProcessEnvironment,
   startLocalProcess
-} from "./chunk-WKTEO6RS.js";
+} from "./chunk-4BC2L2KA.js";
+import {
+  withLocalOperation
+} from "./chunk-IL4RJOKI.js";
 import {
   assertGeneratedOutput,
   assertLocalDirectory,
   assertOperationOutput,
   prepareGeneratedOutputUpdate
-} from "./chunk-GGKFQ3MA.js";
+} from "./chunk-6D2E6UMD.js";
 import {
   assertFrameworkSelection
-} from "./chunk-DLDFHU7Y.js";
-import "./chunk-7OGTPSKI.js";
+} from "./chunk-NNBJZPFM.js";
+import "./chunk-7NY22B5U.js";
 import {
-  PUBLIC_PAGEFIND_DIRECTORY,
-  isExcludedSourcePath
-} from "./chunk-YLTOLYWM.js";
+  PUBLIC_SEARCH_DIRECTORY
+} from "./chunk-EFO6AWXN.js";
+import {
+  isExcludedSourcePath,
+  isOsMetadataPath
+} from "./chunk-WL75GQ5M.js";
 import "./chunk-AI2UULNX.js";
 import {
-  AppError,
   readInstalledFramework
-} from "./chunk-WDY4IK6Z.js";
+} from "./chunk-5J3YUNRY.js";
+import {
+  AppError
+} from "./chunk-22RSSUNV.js";
 
 // src/lib/compiler/lifecycle/dev-operation.ts
 import { createHash as createHash4 } from "crypto";
@@ -41,23 +44,47 @@ import { join as join5 } from "path";
 import { setTimeout as delay } from "timers/promises";
 import { stripVTControlCharacters } from "util";
 
+// src/lib/compiler/lifecycle/change-scheduler.ts
+function createChangeScheduler({
+  onChange,
+  onReady,
+  delayMs = 100
+}) {
+  let timer;
+  return {
+    notify() {
+      onChange(), timer && clearTimeout(timer), timer = setTimeout(() => {
+        timer = void 0, onReady();
+      }, delayMs);
+    },
+    stop() {
+      timer && clearTimeout(timer), timer = void 0;
+    }
+  };
+}
+
 // src/lib/compiler/lifecycle/checkout-development.ts
 import { createHash as createHash2 } from "crypto";
 import { mkdtemp, readFile as readFile2, rm, stat, writeFile } from "fs/promises";
 import { createRequire } from "module";
 import { dirname, isAbsolute, join as join2 } from "path";
+import { pathToFileURL } from "url";
 
 // src/lib/compiler/lifecycle/source-watch.ts
 import { createHash } from "crypto";
 import { watch } from "fs";
 import { lstat, readdir, readFile } from "fs/promises";
 import { join, relative } from "path";
+import { setImmediate } from "timers/promises";
 function ignored(sourceRoot, path, include) {
   let name = relative(sourceRoot, path).replace(/\\/g, "/");
-  return (include ? !include(name) : isExcludedSourcePath(name)) || name.split("/").length === 1 && name.startsWith(".env") || name.split("/").some(
+  return isOsMetadataPath(name) || (include ? !include(name) : isExcludedSourcePath(name)) || name.split("/").length === 1 && name.startsWith(".env") || name.split("/").some(
     (segment) => ["node_modules", ".next", ".cache", ".turbo", ".git"].includes(segment)
   );
 }
+function usesRecursiveSourceWatch(platform) {
+  return platform === "darwin";
+}
 function changesBetween(before, after) {
   return [.../* @__PURE__ */ new Set([...before.keys(), ...after.keys()])].sort().flatMap((path) => {
     let previous = before.get(path), current = after.get(path);
@@ -70,17 +97,24 @@ function changesBetween(before, after) {
   });
 }
 async function watchSource(options) {
-  let watchers = /* @__PURE__ */ new Map(), closed = !1, scan = Promise.resolve(), baseline = /* @__PURE__ */ new Map(), scanNow = async () => {
+  let watchers = /* @__PURE__ */ new Map(), recursiveRootWatch = usesRecursiveSourceWatch(process.platform), closed = !1, scan = Promise.resolve(), rescanning = !1, baseline = /* @__PURE__ */ new Map(), closeWatchers = async () => {
+    let entries = [...watchers.values()];
+    watchers.clear();
+    for (let { watcher } of entries)
+      await setImmediate(), watcher.close();
+  }, scanNow = async () => {
     let visited = /* @__PURE__ */ new Set(), identity = /* @__PURE__ */ new Map();
     await visit(options.sourceRoot, visited, identity);
     for (let [path, entry] of watchers)
       visited.has(path) || (entry.watcher.close(), watchers.delete(path));
     return identity;
-  }, rescan = () => (scan = scan.then(async () => {
+  }, rescan = () => (closed || rescanning || (rescanning = !0, scan = scan.then(async () => {
     if (closed) return;
     let identity = await scanNow();
-    changesBetween(baseline, identity).length > 0 && options.onChange();
-  }).catch(options.onError), scan), visit = async (directory, visited, identity) => {
+    !closed && changesBetween(baseline, identity).length > 0 && options.onChange();
+  }).catch(options.onError).finally(() => {
+    rescanning = !1;
+  })), scan), visit = async (directory, visited, identity) => {
     if (closed || ignored(options.sourceRoot, directory, options.include))
       return;
     let entry = await lstat(directory, { bigint: !0 }).catch(
@@ -104,15 +138,16 @@ async function watchSource(options) {
       return;
     }
     visited.add(directory);
-    let previous = watchers.get(directory);
-    if (previous && (previous.dev !== entry.dev || previous.ino !== entry.ino) && (previous.watcher.close(), watchers.delete(directory)), !watchers.has(directory)) {
-      let watcher = watch(directory, (_event, filename) => {
-        closed || filename && ignored(
+    let watchDirectory = !recursiveRootWatch || directory === options.sourceRoot, previous = watchDirectory ? watchers.get(directory) : void 0;
+    if (previous && (previous.dev !== entry.dev || previous.ino !== entry.ino) && (previous.watcher.close(), watchers.delete(directory)), watchDirectory && !watchers.has(directory)) {
+      let onEvent = (_event, filename) => {
+        let relativeFilename = typeof filename == "string" ? filename : Buffer.isBuffer(filename) ? filename.toString("utf8") : void 0;
+        closed || relativeFilename && ignored(
           options.sourceRoot,
-          join(directory, filename),
+          join(directory, relativeFilename),
           options.include
         ) || rescan();
-      });
+      }, watcher = recursiveRootWatch ? watch(directory, { recursive: !0 }, onEvent) : watch(directory, onEvent);
       watcher.on("error", (error) => {
         closed || options.onError(error);
       }), watchers.set(directory, { watcher, dev: entry.dev, ino: entry.ino });
@@ -131,11 +166,12 @@ async function watchSource(options) {
       baseline = identity;
     }), await scan;
   } catch (error) {
-    closed = !0;
-    for (let { watcher } of watchers.values()) watcher.close();
-    throw error;
+    throw closed = !0, await closeWatchers(), error;
   }
-  return {
+  let reconciliation = setInterval(() => {
+    rescan();
+  }, 2e3);
+  return reconciliation.unref(), {
     reconcileStartup: rescan,
     revision: async () => {
       if (await scan, closed) return;
@@ -159,9 +195,7 @@ async function watchSource(options) {
       return baseline = current, changes;
     },
     stop: async () => {
-      closed = !0;
-      for (let { watcher } of watchers.values()) watcher.close();
-      watchers.clear(), await scan;
+      closed = !0, clearInterval(reconciliation), await closeWatchers(), await scan;
     }
   };
 }
@@ -295,8 +329,7 @@ async function prepareCheckoutDependencies(options) {
               "@publish.os/nextjs...",
               "install",
               "--frozen-lockfile",
-              "--prefer-offline",
-              "--fetch-timeout=10000"
+              "--prefer-offline"
             ],
             cwd: options.workspaceRoot ?? options.packageRoot,
             environment: {
@@ -305,7 +338,7 @@ async function prepareCheckoutDependencies(options) {
             },
             signal: AbortSignal.any([
               options.lifetime.signal,
-              AbortSignal.timeout(12e4)
+              AbortSignal.timeout(3e5)
             ]),
             onShutdown: options.lifetime.onShutdown,
             quiet: !0
@@ -328,7 +361,7 @@ async function runCheckoutCompiler(options) {
     });
   let temporary = await mkdtemp(
     join2(dirname(options.request.paths.output), "compiler-")
-  ), identity = await assertLocalDirectory(temporary), requestPath = join2(temporary, "request.json"), resultPath = join2(temporary, "result.json"), importIndex = process.execArgv.indexOf("--import"), retain = !1;
+  ), identity = await assertLocalDirectory(temporary), requestPath = join2(temporary, "request.json"), resultPath = join2(temporary, "result.json"), retain = !1;
   try {
     await writeFile(requestPath, JSON.stringify(options.request), {
       flag: "wx",
@@ -337,9 +370,11 @@ async function runCheckoutCompiler(options) {
       command: process.execPath,
       args: [
         "--import",
-        importIndex === -1 ? createRequire(join2(selection.packageRoot, "package.json")).resolve(
-          "tsx/esm"
-        ) : process.execArgv[importIndex + 1] ?? "",
+        pathToFileURL(
+          createRequire(join2(selection.packageRoot, "package.json")).resolve(
+            "tsx/esm"
+          )
+        ).href,
         join2(
           selection.packageRoot,
           "src/lib/compiler/lifecycle/checkout-compiler-worker.ts"
@@ -374,6 +409,15 @@ async function runCheckoutCompiler(options) {
   }
 }
 
+// src/lib/compiler/lifecycle/checkout-watch-shutdown.ts
+async function startCheckoutWatchForOperation({
+  lifetime,
+  watch: watch2
+}) {
+  let checkoutWatch = await watch2();
+  return lifetime.onShutdown(() => checkoutWatch.stop()), checkoutWatch;
+}
+
 // src/lib/compiler/lifecycle/preview-cache.ts
 import { createHash as createHash3 } from "crypto";
 import {
@@ -438,12 +482,12 @@ async function reusablePreview(options) {
       let cache = JSON.parse(
         await readFile3(join3(options.outputDir, CACHE_FILE), "utf8")
       );
-      if (cache.version !== 5 || cache.inputKind !== (options.inputKind ?? "customer") || cache.runtimeGraph !== (options.inputKind === "checkout" ? "checkout-source" : void 0) || cache.runtime !== options.runtime || cache.sourcePath !== options.sourcePath || typeof cache.integrity != "string")
+      if (cache.version !== 8 || cache.inputKind !== (options.inputKind ?? "customer") || cache.runtimeGraph !== (options.inputKind === "checkout" ? "checkout-source" : void 0) || cache.runtime !== options.runtime || cache.sourcePath !== options.sourcePath || typeof cache.integrity != "string")
         return;
       let current = cache.revision === options.revision && cache.frameworkIdentity === options.frameworkIdentity && cache.compilerRevision === options.compilerRevision && cache.checkoutDependencyRevision === options.checkoutDependencyRevision && cache.url === options.url;
       return !current && options.inputKind !== "checkout" || options.inputKind === "checkout" && (!options.checkoutRoot || await realpath(
         join3(options.outputDir, "node_modules/@publish.os/nextjs")
-      ) !== await realpath(options.checkoutRoot)) || (options.ide && await readFile3(join3(options.sourceRoot, ".publish.os/ide/metadata.json")), cache.integrity !== await outputIntegrity(options)) ? void 0 : {
+      ) !== await realpath(options.checkoutRoot)) || cache.integrity !== await outputIntegrity(options) ? void 0 : {
         current,
         dependenciesChanged: cache.checkoutDependencyRevision !== options.checkoutDependencyRevision
       };
@@ -454,7 +498,7 @@ async function reusablePreview(options) {
 async function recordPreviewCache(options) {
   if (!options.revision) return;
   let cache = {
-    version: 5,
+    version: 8,
     inputKind: options.inputKind ?? "customer",
     ...options.inputKind === "checkout" ? { runtimeGraph: "checkout-source" } : {},
     revision: options.revision,
@@ -490,7 +534,7 @@ var PRESERVED_PREVIEW_ENTRIES = /* @__PURE__ */ new Set([
   ".next",
   ".operation-owner.json",
   ".preview-cache.json",
-  PUBLIC_PAGEFIND_DIRECTORY
+  PUBLIC_SEARCH_DIRECTORY
 ]);
 async function refreshPreview(options) {
   let sync = async (source, target) => {
@@ -670,7 +714,7 @@ async function runDevelopment(options) {
     scope,
     signal: options.signal ? AbortSignal.any([options.signal, sessionCancellation.signal]) : sessionCancellation.signal,
     run: async (lifetime) => {
-      let localOptions = { ...options, signal: lifetime.signal }, stopped = !1, dirty = !1, refreshing, startupReconciliation, timer, ready = !1, checkoutWatch, checkoutDependenciesDirty = !1, rejectSession = () => {
+      let localOptions = { ...options, signal: lifetime.signal }, stopped = !1, dirty = !1, refreshing, startupReconciliation, ready = !1, checkoutWatch, checkoutDependenciesDirty = !1, rejectSession = () => {
       }, failed = new Promise((_resolve, reject) => {
         rejectSession = reject;
       });
@@ -678,12 +722,15 @@ async function runDevelopment(options) {
       });
       let abortSession = () => rejectSession(lifetime.signal.reason);
       lifetime.signal.addEventListener("abort", abortSession, { once: !0 });
-      let watchOptions = {
+      let changeScheduler = createChangeScheduler({
         onChange: () => {
-          dirty = !0, timer && clearTimeout(timer), timer = setTimeout(() => {
-            ready && drain();
-          }, 100);
+          dirty = !0;
         },
+        onReady: () => {
+          ready && drain();
+        }
+      }), watchOptions = {
+        onChange: changeScheduler.notify,
         onError: (cause) => {
           let error = new AppError({
             code: "FRAMEWORK_PREVIEW_WATCH_FAILED",
@@ -695,15 +742,20 @@ async function runDevelopment(options) {
         ...watchOptions,
         sourceRoot: lifetime.sourceRoot
       });
-      lifetime.onShutdown(async () => {
-        stopped = !0, timer && clearTimeout(timer), await sourceWatch.stop(), await checkoutWatch?.stop(), await startupReconciliation, await refreshing;
-      }), options.request.context?.framework?.kind === "checkout" && (checkoutWatch = await watchCheckout({
-        ...watchOptions,
-        packageRoot: options.request.context.framework.packageRoot
-      }));
+      if (lifetime.onShutdown(async () => {
+        stopped = !0, changeScheduler.stop(), await sourceWatch.stop(), await startupReconciliation, await refreshing;
+      }), options.request.context?.framework?.kind === "checkout") {
+        let packageRoot = options.request.context.framework.packageRoot;
+        checkoutWatch = await startCheckoutWatchForOperation({
+          lifetime,
+          watch: () => watchCheckout({
+            ...watchOptions,
+            packageRoot
+          })
+        });
+      }
       let initialRevision = await sourceWatch.revision(), initialCompilerRevision = await checkoutWatch?.revision(), initialDependencyRevision = await checkoutWatch?.dependencyRevision(), initialConfig = await readSourceSelection(lifetime.sourceRoot) ?? {}, reuse = await reusablePreview({
         outputDir: lifetime.outputDir,
-        sourceRoot: lifetime.sourceRoot,
         revision: initialRevision,
         runtime: options.request.context?.framework ? `${framework.packageName}@${framework.version}` : initialConfig.runtime ?? "",
         frameworkIdentity,
@@ -712,11 +764,10 @@ async function runDevelopment(options) {
         inputKind,
         url,
         sourcePath: options.request.context?.sourcePath ?? "publish.os",
-        ide: !!options.request.context?.ide,
         checkoutRoot: options.request.context?.framework?.kind === "checkout" ? options.request.context.framework.packageRoot : void 0
       });
       checkoutDependenciesDirty = reuse?.dependenciesChanged ?? !1;
-      let validateSource = async () => (await import("./validate-local-source-XRL2Y7XE.js")).validateLocalSource({
+      let validateSource = async () => (await import("./validate-local-source-EN2GW4FR.js")).validateLocalSource({
         options: localOptions,
         sourceDir: lifetime.sourceDir,
         sourceRoot: lifetime.sourceRoot
@@ -732,17 +783,16 @@ async function runDevelopment(options) {
           });
       };
       if (options.request.context?.ide) {
-        let { prepareIdeSupport } = await import("./ide-support-ZNW7ODFY.js");
+        let { prepareIdeSupport } = await import("./ide-support-TG74L4FF.js"), ideSource = prepared?.source ?? (await validateSource()).source;
         await prepareIdeSupport({
+          frameworkOptions: localOptions,
           publishOsDir: lifetime.sourceRoot,
-          // Only a verified unchanged source can defer validation until IDE repair.
-          source: prepared?.source ?? (reuse?.current ? async () => (await validateSource()).source : (await validateSource()).source),
-          framework: prepared?.framework ?? framework,
-          frameworkOptions: localOptions
+          source: ideSource,
+          framework: prepared?.framework ?? framework
         });
       }
       let compose = async (outputDir, preparedSource) => {
-        let { composeFrameworkSource } = await import("./compose-NN23UJGC.js");
+        let { composeFrameworkSource } = await import("./compose-44GJSMXD.js");
         await composeFrameworkSource({
           request: {
             ...options.request,
@@ -756,7 +806,13 @@ async function runDevelopment(options) {
           },
           source: preparedSource,
           signal: lifetime.signal,
-          onProgress: (message) => options.onEvent?.({ type: "progress", message })
+          onProgress: (message) => options.onEvent?.({ type: "progress", message }),
+          onWarning: (warning) => options.onEvent?.({
+            type: "diagnostics",
+            diagnostics: {
+              diagnostics: [{ ...warning, severity: "warning" }]
+            }
+          })
         });
       }, search = async (outputDir) => {
         options.onEvent?.({
@@ -874,7 +930,7 @@ async function runDevelopment(options) {
         );
         let revisionBefore = await sourceWatch.revision(), compilerRevisionBefore = await checkoutWatch?.revision(), dependencyRevisionBefore = await checkoutWatch?.dependencyRevision(), inputsCurrent = async () => revisionBefore !== void 0 && revisionBefore === await sourceWatch.revision() && (!checkoutWatch || compilerRevisionBefore !== void 0 && compilerRevisionBefore === await checkoutWatch.revision());
         await assertSelection();
-        let validation = checkoutWatch ? void 0 : await (await import("./validate-local-source-XRL2Y7XE.js")).validateLocalSource({
+        let validation = checkoutWatch ? void 0 : await (await import("./validate-local-source-EN2GW4FR.js")).validateLocalSource({
           options: localOptions,
           sourceDir: lifetime.sourceDir,
           sourceRoot: lifetime.sourceRoot
@@ -882,7 +938,17 @@ async function runDevelopment(options) {
         await assertSelection(), await assertOutput(), await assertGeneratedOutput({ outputDir: lifetime.outputDir, scope });
         let temporary = await mkdtemp2(join5(lifetime.outputDir, ".refresh-")), identity = await assertLocalDirectory(temporary), retain = !1, recordGeneratedOutput, primaryFailure, cleanup = async () => {
           try {
-            await assertOutput(), await assertLocalDirectory(temporary, identity), await recordGeneratedOutput?.(), await rm3(temporary, { recursive: !0, force: !0 });
+            await assertOutput(), await assertLocalDirectory(temporary, identity), await recordGeneratedOutput?.(), lifetime.signal.aborted && recordGeneratedOutput && inputKind === "checkout" && await recordPreviewCache({
+              outputDir: lifetime.outputDir,
+              revision: "interrupted",
+              runtime: selection.runtime ?? "",
+              frameworkIdentity,
+              compilerRevision: compilerRevisionBefore,
+              checkoutDependencyRevision: dependencyRevisionBefore,
+              inputKind,
+              url,
+              sourcePath: options.request.context?.sourcePath ?? "publish.os"
+            }), await rm3(temporary, { recursive: !0, force: !0 });
           } catch (error) {
             if (!primaryFailure) throw error;
             primaryFailure.error instanceof Error && (primaryFailure.error.cause = {
@@ -946,22 +1012,6 @@ async function runDevelopment(options) {
             framework,
             runtime: void 0
           }) : frameworkIdentity;
-          if (checkoutWatch && options.request.context?.ide && JSON.parse(
-            await readFile5(
-              join5(lifetime.sourceRoot, ".publish.os/ide/metadata.json"),
-              "utf8"
-            )
-          ).selection?.integrity !== nextFrameworkIdentity) {
-            let ide = await runCheckoutCompiler({
-              request: {
-                ...options.request,
-                operation: "validate",
-                paths: { source: lifetime.sourceRoot, output: incoming }
-              },
-              lifetime
-            });
-            acceptCompilation(ide);
-          }
           if (!await inputsCurrent())
             return dirty = !0, !1;
           if (recordGeneratedOutput = await prepareGeneratedOutputUpdate({

package/dist/{framework-selection-X4U6Y6QC.js → framework-selection-ZVO323PK.js}

@@ -1,9 +1,10 @@
 import {
   assertFrameworkSelection,
   readCheckoutTypeScriptConfig
-} from "./chunk-DLDFHU7Y.js";
+} from "./chunk-NNBJZPFM.js";
 import "./chunk-AI2UULNX.js";
-import "./chunk-WDY4IK6Z.js";
+import "./chunk-5J3YUNRY.js";
+import "./chunk-22RSSUNV.js";
 export {
   assertFrameworkSelection,
   readCheckoutTypeScriptConfig

package/dist/ide-support-TG74L4FF.js

@@ -0,0 +1,16 @@
+import {
+  prepareIdeSupport
+} from "./chunk-3T4HVDSC.js";
+import "./chunk-6D2E6UMD.js";
+import "./chunk-NHSLTARU.js";
+import "./chunk-NNBJZPFM.js";
+import "./chunk-DX7PXFCM.js";
+import "./chunk-EFO6AWXN.js";
+import "./chunk-5KAD7W53.js";
+import "./chunk-WL75GQ5M.js";
+import "./chunk-AI2UULNX.js";
+import "./chunk-5J3YUNRY.js";
+import "./chunk-22RSSUNV.js";
+export {
+  prepareIdeSupport
+};