@reckona/mreact-router 0.0.73 → 0.0.75

package/dist/build.js

@@ -2,7 +2,7 @@ import { createHash } from "node:crypto";
 import { copyFile, cp, mkdir, readdir, readFile, rm, stat, writeFile } from "node:fs/promises";
 import { builtinModules } from "node:module";
 import { dirname, join, relative, sep } from "node:path";
-import { collectFormActionReferenceNames, collectStaticImportReferences, collectTopLevelValueExportNames, formatDiagnostic, hasModuleDirective, transform, } from "@reckona/mreact-compiler";
+import { collectStaticImportReferences, collectTopLevelValueExportNames, formatDiagnostic, hasModuleDirective, transform, } from "@reckona/mreact-compiler";
 import { transformCompilerModuleContext } from "@reckona/mreact-compiler/internal";
 import { buildClientRouteBatchOutput, buildNavigationRuntimeBundle, clientScriptForPath, compilerModuleContextForSource, collectClientRouteReferences, createClientRouteInferenceCache, detectClientNavigationHint, detectNavigationRuntimeHint, formatClientRouteInferenceDiagnostic, inferClientRouteModule, routeIdForPath, } from "./client.js";
 import { bundleAppRouterSourceModule, importAppRouterSourceModule } from "./module-runner.js";
@@ -12,11 +12,12 @@ import { resolveAppRouterProjectOptions, resolveBuildTargets, } from "./config.j
 import { routeCachePolicyFromSource } from "./cache.js";
 import { bundleMiddlewareModuleCode, renderAppRequest } from "./render.js";
 import { createAppRouterImportPolicyPlugin } from "./import-policy.js";
-import { hasGenerateStaticParamsExport, hasLoaderExport, hasPrerenderExport, isStreamRouteSource, routeClosureMayUseAwaitBoundary, stripRouteBuildExports, stripRouteClientOnlyExports, stripRouteLoaderOnlyExports, stripRouteMetadataOnlyExports, stripRouteRequestOnlyExports, } from "./route-source.js";
+import { hasGenerateStaticParamsExport, hasLoaderExport, hasPrerenderExport, isStreamRouteSource, routeClosureMayUseAwaitBoundary, stripRouteBuildExports, stripRouteClientOnlyExports, stripRouteClientSource, stripRouteLoaderOnlyExports, stripRouteMetadataOnlyExports, stripRouteRequestOnlyExports, } from "./route-source.js";
 import { bundleRouterModule, } from "./bundle-pipeline.js";
 import { collectRouteCssFiles } from "./route-styles.js";
 import { existingRouteShellCandidates } from "./route-shells.js";
 import { sourceModuleCandidates } from "./source-modules.js";
+import { collectBuildInferredServerActions } from "./server-action-inference.js";
 import { workspacePackageFile } from "./workspace-packages.js";
 const nativeEscapeTransform = {
     batchImportName: "escapeHtmlBatch",
@@ -48,7 +49,7 @@ export async function buildApp(options) {
     const publicAssets = [
         ...new Set([...(await collectPublicAssetPaths(project.publicDir)), ...appConventionPublicAssets]),
     ].sort();
-    const serverActionManifest = collectBuildServerActionManifest({
+    const serverActionManifest = await collectBuildServerActionManifest({
         files,
         projectRoot: project.projectRoot,
         routes,
@@ -64,7 +65,7 @@ export async function buildApp(options) {
         routes,
         vitePlugins,
     });
-    const generatedImportPolicy = buildGeneratedImportPolicy({
+    const generatedImportPolicy = await buildGeneratedImportPolicy({
         files,
         projectRoot: project.projectRoot,
         routes,
@@ -116,6 +117,7 @@ export async function buildApp(options) {
             vitePlugins,
         });
     }
+    const routeServerActionReferences = Object.fromEntries([...serverActionManifest.routeReferences.entries()].sort(([left], [right]) => left.localeCompare(right)));
     const serverManifest = {
         allowedSourceDirs: project.allowedSourceDirs.map((directory) => relative(project.projectRoot, directory)),
         ...(project.assetBaseUrl === undefined ? {} : { assetBaseUrl: project.assetBaseUrl }),
@@ -127,7 +129,12 @@ export async function buildApp(options) {
         ...(project.publicAssetBaseUrl === undefined
             ? {}
             : { publicAssetBaseUrl: project.publicAssetBaseUrl }),
-        ...(serverActionManifest.length === 0 ? {} : { serverActionManifest }),
+        ...(Object.keys(routeServerActionReferences).length === 0
+            ? {}
+            : { routeServerActionReferences }),
+        ...(serverActionManifest.allowedActions.length === 0
+            ? {}
+            : { serverActionManifest: serverActionManifest.allowedActions }),
         ...(Object.keys(serverModuleArtifacts.files).length === 0
             ? {}
             : { serverModuleFiles: serverModuleArtifacts.files }),
@@ -250,15 +257,18 @@ const frameworkRuntimePackages = new Set([
     "@reckona/mreact-router",
     "@reckona/mreact-server",
 ]);
-function buildGeneratedImportPolicy(options) {
+const maxRuntimePackageManifestReads = 1000;
+async function buildGeneratedImportPolicy(options) {
     const routePackages = new Map();
     const allPackages = new Set();
     const relativeRoutesDir = relative(options.projectRoot, options.routesDir);
+    const packageJsonLookupCache = new Map();
     for (const route of options.routes) {
         const file = relative(options.projectRoot, route.file);
-        const packages = collectRuntimePackagesForFile({
+        const packages = await collectRuntimePackagesForFile({
             file,
             files: options.files,
+            packageJsonLookupCache,
             projectRoot: options.projectRoot,
             seen: new Set(),
         });
@@ -273,9 +283,10 @@ function buildGeneratedImportPolicy(options) {
         .map((file) => (relativeRoutesDir === "" ? file : `${relativeRoutesDir}/${file}`))
         .find((file) => options.files[file] !== undefined);
     if (middlewareFile !== undefined) {
-        const packages = collectRuntimePackagesForFile({
+        const packages = await collectRuntimePackagesForFile({
             file: middlewareFile,
             files: options.files,
+            packageJsonLookupCache,
             projectRoot: options.projectRoot,
             seen: new Set(),
         });
@@ -292,7 +303,7 @@ function buildGeneratedImportPolicy(options) {
         version: 1,
     };
 }
-function collectRuntimePackagesForFile(options) {
+async function collectRuntimePackagesForFile(options) {
     if (options.seen.has(options.file)) {
         return [];
     }
@@ -312,14 +323,22 @@ function collectRuntimePackagesForFile(options) {
         filename: join(options.projectRoot, options.file),
     })) {
         if (isRuntimePackageSpecifier(reference.source)) {
-            packages.add(runtimePackageNameForSpecifier(reference.source));
+            const packageName = runtimePackageNameForSpecifier(reference.source);
+            packages.add(packageName);
+            for (const optionalPackageName of await collectRuntimeOptionalPackages({
+                packageJsonLookupCache: options.packageJsonLookupCache,
+                packageName,
+                projectRoot: options.projectRoot,
+            })) {
+                packages.add(optionalPackageName);
+            }
             continue;
         }
         const localFile = resolveBuildLocalSourceImport(options.files, options.file, reference.source);
         if (localFile === undefined) {
             continue;
         }
-        for (const packageName of collectRuntimePackagesForFile({
+        for (const packageName of await collectRuntimePackagesForFile({
             ...options,
             file: localFile,
         })) {
@@ -329,12 +348,99 @@ function collectRuntimePackagesForFile(options) {
     options.seen.delete(options.file);
     return [...packages].sort();
 }
+async function collectRuntimeOptionalPackages(options) {
+    const optionalPackages = new Set();
+    const seenPackageJson = new Set();
+    const queue = [
+        { packageName: options.packageName, optional: false, startDir: options.projectRoot },
+    ];
+    for (let index = 0; index < queue.length && seenPackageJson.size < maxRuntimePackageManifestReads; index += 1) {
+        const item = queue[index];
+        if (item === undefined || !isValidRuntimePackageName(item.packageName)) {
+            continue;
+        }
+        const manifest = await readRuntimePackageManifest({
+            cache: options.packageJsonLookupCache,
+            packageName: item.packageName,
+            startDir: item.startDir,
+        });
+        if (manifest === undefined || seenPackageJson.has(manifest.packageJsonPath)) {
+            continue;
+        }
+        seenPackageJson.add(manifest.packageJsonPath);
+        if (item.optional && isRuntimePackageName(item.packageName)) {
+            optionalPackages.add(item.packageName);
+        }
+        const packageDir = dirname(manifest.packageJsonPath);
+        for (const dependencyName of Object.keys(manifest.dependencies ?? {})) {
+            if (isValidRuntimePackageName(dependencyName)) {
+                queue.push({ packageName: dependencyName, optional: false, startDir: packageDir });
+            }
+        }
+        for (const optionalDependencyName of Object.keys(manifest.optionalDependencies ?? {})) {
+            if (isValidRuntimePackageName(optionalDependencyName)) {
+                queue.push({ packageName: optionalDependencyName, optional: true, startDir: packageDir });
+            }
+        }
+    }
+    return [...optionalPackages].sort();
+}
+async function readRuntimePackageManifest(options) {
+    const key = `${options.startDir}\0${options.packageName}`;
+    const cached = options.cache.get(key);
+    const manifest = cached ??
+        findRuntimePackageJson(options.packageName, options.startDir).then(async (packageJsonPath) => {
+            if (packageJsonPath === undefined) {
+                return undefined;
+            }
+            try {
+                const json = JSON.parse(await readFile(packageJsonPath, "utf8"));
+                return { ...json, packageJsonPath };
+            }
+            catch {
+                return undefined;
+            }
+        });
+    if (cached === undefined) {
+        options.cache.set(key, manifest);
+    }
+    return (await manifest);
+}
+async function findRuntimePackageJson(packageName, startDir) {
+    if (!isValidRuntimePackageName(packageName)) {
+        return undefined;
+    }
+    let current = startDir;
+    while (true) {
+        const candidate = join(current, "node_modules", ...packageName.split("/"), "package.json");
+        try {
+            if ((await stat(candidate)).isFile()) {
+                return candidate;
+            }
+        }
+        catch {
+            // Keep walking toward the filesystem root.
+        }
+        const parent = dirname(current);
+        if (parent === current) {
+            return undefined;
+        }
+        current = parent;
+    }
+}
 function isRuntimePackageSpecifier(specifier) {
     if (specifier.startsWith(".") || specifier.startsWith("/") || /^[A-Za-z][A-Za-z0-9+.-]*:/.test(specifier)) {
         return false;
     }
     const packageName = runtimePackageNameForSpecifier(specifier);
-    return !nodeBuiltinPackages.has(specifier) && !frameworkRuntimePackages.has(packageName);
+    return !nodeBuiltinPackages.has(specifier) && isRuntimePackageName(packageName);
+}
+function isRuntimePackageName(packageName) {
+    return !frameworkRuntimePackages.has(packageName);
+}
+function isValidRuntimePackageName(packageName) {
+    return (/^(?:@[a-z0-9][a-z0-9._~-]*\/)?[a-z0-9][a-z0-9._~-]*$/u.test(packageName) &&
+        !packageName.includes(".."));
 }
 function runtimePackageNameForSpecifier(specifier) {
     if (!specifier.startsWith("@")) {
@@ -343,8 +449,9 @@ function runtimePackageNameForSpecifier(specifier) {
     const [scope, name] = specifier.split("/");
     return scope !== undefined && name !== undefined ? `${scope}/${name}` : specifier;
 }
-function collectBuildServerActionManifest(options) {
+async function collectBuildServerActionManifest(options) {
     const entries = new Map();
+    const routeReferences = new Map();
     const relativeRoutesDir = relative(options.projectRoot, options.routesDir);
     const routeSourceFiles = new Set(options.routes
         .filter((route) => route.kind === "page")
@@ -360,56 +467,46 @@ function collectBuildServerActionManifest(options) {
             }
         }
         if (routeSourceFiles.has(file)) {
-            for (const reference of collectBuildInferredServerActionReferences({
+            const inference = await collectBuildInferredServerActionReferences({
                 file,
                 files: options.files,
                 relativeRoutesDir,
                 source: code,
-            })) {
+            });
+            for (const diagnostic of inference.diagnostics) {
+                console.warn(formatServerActionInferenceDiagnostic(diagnostic));
+            }
+            routeReferences.set(file, inference.references);
+            for (const reference of inference.references) {
                 const key = `${reference.moduleId}#${reference.exportName}`;
                 if (!entries.has(key)) {
-                    entries.set(key, reference);
+                    entries.set(key, {
+                        exportName: reference.exportName,
+                        inferred: reference.inferred,
+                        moduleId: reference.moduleId,
+                    });
                 }
             }
         }
     }
-    return [...entries.values()].sort((left, right) => left.moduleId === right.moduleId
-        ? left.exportName.localeCompare(right.exportName)
-        : left.moduleId.localeCompare(right.moduleId));
+    return {
+        allowedActions: [...entries.values()].sort((left, right) => left.moduleId === right.moduleId
+            ? left.exportName.localeCompare(right.exportName)
+            : left.moduleId.localeCompare(right.moduleId)),
+        routeReferences,
+    };
 }
 function collectBuildInferredServerActionReferences(options) {
-    const actionNames = collectFormActionNames(options.source);
-    if (actionNames.size === 0) {
-        return [];
-    }
-    const references = [];
-    for (const match of options.source.matchAll(/^import\s+\{\s*(?<specifiers>[^}]+)\s*\}\s+from\s+["'](?<source>[^"']+)["'];?/gm)) {
-        const source = match.groups?.source;
-        const specifiers = match.groups?.specifiers;
-        if (source === undefined || specifiers === undefined || !source.startsWith(".")) {
-            continue;
-        }
-        const localFile = resolveBuildLocalSourceImport(options.files, options.file, source);
-        if (localFile === undefined) {
-            continue;
-        }
-        const moduleId = moduleIdForBuildFile(localFile, options.relativeRoutesDir);
-        for (const specifier of specifiers.split(",")) {
-            const [exportName, localName] = specifier.trim().split(/\s+as\s+/);
-            const imported = exportName?.trim();
-            const local = localName?.trim() ?? imported;
-            if (imported !== undefined &&
-                imported.length > 0 &&
-                local !== undefined &&
-                actionNames.has(local)) {
-                references.push({ moduleId, exportName: imported, inferred: true });
-            }
-        }
-    }
-    return references;
+    return collectBuildInferredServerActions({
+        file: options.file,
+        files: options.files,
+        relativeRoutesDir: options.relativeRoutesDir,
+        resolveSourceImport: (importer, source) => resolveBuildLocalSourceImport(options.files, importer, source),
+        source: options.source,
+    });
 }
-function collectFormActionNames(code) {
-    return new Set(collectFormActionReferenceNames({ code }));
+function formatServerActionInferenceDiagnostic(diagnostic) {
+    return `${diagnostic.code}: ${diagnostic.message}`;
 }
 function isSourceModuleFile(file) {
     return /\.(?:mreact\.tsx|tsx?|jsx?|mjs|mts|cjs|cts)$/.test(file);
@@ -667,7 +764,9 @@ async function buildServerModuleArtifacts(options) {
         const clientInference = await inferClientRouteModule({
             ...(route === undefined ? {} : { appDir: options.project.routesDir }),
             cache: options.clientRouteInferenceCache,
-            code: stripRouteClientOnlyExports(source),
+            code: route === undefined
+                ? stripRouteClientOnlyExports(source)
+                : stripRouteClientSource({ code: source, filename: route.file }),
             filename: join(options.projectRoot, file),
             ...(route === undefined ? {} : { routePath: route.path }),
             vitePlugins: options.vitePlugins,
@@ -1781,7 +1880,7 @@ async function writeClientRouteBundles(options) {
             vitePlugins: options.vitePlugins,
         });
         const source = await readFile(route.file, "utf8");
-        const clientSource = stripRouteClientOnlyExports(source);
+        const clientSource = stripRouteClientSource({ code: source, filename: route.file });
         const navigation = detectNavigationRuntimeHint(source);
         const references = await collectClientRouteReferences({
             appDir: options.appDir,