@ethisyscore/vite-plugin 1.37.0 → 1.39.0

package/dist/index.d.cts

@@ -609,6 +609,12 @@ interface PlatformReactPageSource {
     file: string;
     /** The page's source content (scanned for `useView(<module>, …)` calls). */
     content: string;
+    /**
+     * Root-relative module specifier for this page (e.g. `src/pages/admin/Foo.tsx`).
+     * When pages come from multiple directories each source carries its own specifier,
+     * derived from the directory it was read from.
+     */
+    moduleSpecifier: string;
 }
 /** Input to {@link computePlatformReactPages} (already-read filesystem inputs). */
 interface ComputePlatformReactPagesInput {
@@ -617,12 +623,10 @@ interface ComputePlatformReactPagesInput {
     /** Extension slug for the `/extensions/<slug>/` route prefix. */
     slug: string;
     routeMeta: RouteMetaEntry[];
-    /** Each page file's basename (with `.tsx`) + its source content. */
+    /** Each page file's basename (with `.tsx`) + its source content + its root-relative module specifier. */
     pages: PlatformReactPageSource[];
     /** View name → src-relative module path (e.g. `src/adapter/<module>/XView.tsx`). */
     viewFiles: Record<string, string>;
-    /** Root-relative pages dir for the `moduleSpecifier` (e.g. `src/pages/<module>`). */
-    pagesDirRel: string;
     /** Per-file id/title/route overrides for non-filename-derived plugins. */
     pageOverrides?: Record<string, PlatformReactPageOverride>;
 }
@@ -648,8 +652,17 @@ declare function computePlatformReactPages(input: ComputePlatformReactPagesInput
 interface PlatformReactManifestPaths {
     /** Source root; default `"src"`. */
     src?: string;
-    /** Pages dir; default `src/pages/<module>`. */
-    pages?: string;
+    /**
+     * Pages dir(s); default `src/pages/<module>`. Accepts a single string (backward-compat)
+     * or an array of directories to scan together. Each `.tsx` file's `moduleSpecifier` is
+     * derived from the directory it was read from. A duplicate basename across dirs throws a
+     * clear error (fail-fast) — there is no per-dir escape hatch. `pageExclude` removes a
+     * filename from ALL scanned dirs, so it cannot preserve one dir's copy while dropping
+     * another's; to ship two pages with the same filename, rename one of them.
+     */
+    pages?: string | string[];
+    /** Page filenames (incl. `.tsx`) to skip — e.g. dialogs that live in a pages dir. */
+    pageExclude?: string[];
     /** Adapter (views) dir; default `src/adapter/<module>`. */
     adapter?: string;
     /** routeMeta file; default `src/config/routeMeta.json`. */

package/dist/index.d.ts

@@ -609,6 +609,12 @@ interface PlatformReactPageSource {
     file: string;
     /** The page's source content (scanned for `useView(<module>, …)` calls). */
     content: string;
+    /**
+     * Root-relative module specifier for this page (e.g. `src/pages/admin/Foo.tsx`).
+     * When pages come from multiple directories each source carries its own specifier,
+     * derived from the directory it was read from.
+     */
+    moduleSpecifier: string;
 }
 /** Input to {@link computePlatformReactPages} (already-read filesystem inputs). */
 interface ComputePlatformReactPagesInput {
@@ -617,12 +623,10 @@ interface ComputePlatformReactPagesInput {
     /** Extension slug for the `/extensions/<slug>/` route prefix. */
     slug: string;
     routeMeta: RouteMetaEntry[];
-    /** Each page file's basename (with `.tsx`) + its source content. */
+    /** Each page file's basename (with `.tsx`) + its source content + its root-relative module specifier. */
     pages: PlatformReactPageSource[];
     /** View name → src-relative module path (e.g. `src/adapter/<module>/XView.tsx`). */
     viewFiles: Record<string, string>;
-    /** Root-relative pages dir for the `moduleSpecifier` (e.g. `src/pages/<module>`). */
-    pagesDirRel: string;
     /** Per-file id/title/route overrides for non-filename-derived plugins. */
     pageOverrides?: Record<string, PlatformReactPageOverride>;
 }
@@ -648,8 +652,17 @@ declare function computePlatformReactPages(input: ComputePlatformReactPagesInput
 interface PlatformReactManifestPaths {
     /** Source root; default `"src"`. */
     src?: string;
-    /** Pages dir; default `src/pages/<module>`. */
-    pages?: string;
+    /**
+     * Pages dir(s); default `src/pages/<module>`. Accepts a single string (backward-compat)
+     * or an array of directories to scan together. Each `.tsx` file's `moduleSpecifier` is
+     * derived from the directory it was read from. A duplicate basename across dirs throws a
+     * clear error (fail-fast) — there is no per-dir escape hatch. `pageExclude` removes a
+     * filename from ALL scanned dirs, so it cannot preserve one dir's copy while dropping
+     * another's; to ship two pages with the same filename, rename one of them.
+     */
+    pages?: string | string[];
+    /** Page filenames (incl. `.tsx`) to skip — e.g. dialogs that live in a pages dir. */
+    pageExclude?: string[];
     /** Adapter (views) dir; default `src/adapter/<module>`. */
     adapter?: string;
     /** routeMeta file; default `src/config/routeMeta.json`. */

package/dist/index.js

@@ -1227,7 +1227,7 @@ function computePlatformReactPages(input) {
   );
   const entries = [];
   const missingViews = [];
-  for (const { file, content } of input.pages) {
+  for (const { file, content, moduleSpecifier } of input.pages) {
     const name = basename(file, ".tsx");
     const override = input.pageOverrides?.[file] ?? {};
     const views = {};
@@ -1245,7 +1245,7 @@ function computePlatformReactPages(input) {
     const route = override.route ?? pageRouteById[id];
     entries.push({
       id,
-      moduleSpecifier: `${input.pagesDirRel}/${file}`,
+      moduleSpecifier,
       exportName: "default",
       ...route !== void 0 ? { route } : {},
       title: override.title ?? titleCase(name),
@@ -1270,13 +1270,14 @@ function generatePlatformReactManifest(config) {
   const { root, module } = config;
   const slug = config.slug ?? module;
   const src = config.paths?.src ?? "src";
-  const pagesDir = resolve(root, config.paths?.pages ?? `${src}/pages/${module}`);
   const adapterDir = resolve(root, config.paths?.adapter ?? `${src}/adapter/${module}`);
   const routeMetaPath = resolve(root, config.paths?.routeMeta ?? `${src}/config/routeMeta.json`);
   const featureManifestRel = config.paths?.featureManifest ?? "feature.manifest.json";
   const overlayRel = config.paths?.overlay ?? "../extension.manifest.json";
   const routeMeta = existsSync(routeMetaPath) ? JSON.parse(readFileSync(routeMetaPath, "utf8")) : [];
-  const pagesDirRel = slash2(relative(root, pagesDir));
+  const pagesCfg = config.paths?.pages ?? `${src}/pages/${module}`;
+  const pageDirs = (Array.isArray(pagesCfg) ? pagesCfg : [pagesCfg]).map((p) => resolve(root, p));
+  const exclude = new Set(config.paths?.pageExclude ?? []);
   const viewFiles = {};
   if (existsSync(adapterDir)) {
     for (const f of walk(adapterDir)) {
@@ -1285,18 +1286,35 @@ function generatePlatformReactManifest(config) {
       }
     }
   }
-  const pageFiles = readdirSync(pagesDir).filter((f) => f.endsWith(".tsx")).sort();
-  const pages = pageFiles.map((file) => ({
-    file,
-    content: readFileSync(resolve(pagesDir, file), "utf8")
-  }));
+  const seen = /* @__PURE__ */ new Map();
+  const pages = [];
+  for (const dir of pageDirs) {
+    if (!existsSync(dir)) {
+      throw new Error(`generate-manifest: pages dir not found: ${dir}`);
+    }
+    for (const file of readdirSync(dir).filter((f) => f.endsWith(".tsx")).sort()) {
+      if (exclude.has(file)) continue;
+      if (seen.has(file)) {
+        throw new Error(
+          `generate-manifest: duplicate page filename "${file}" in both ${seen.get(file)} and ${dir}`
+        );
+      }
+      seen.set(file, dir);
+      const relDir = slash2(relative(root, dir));
+      const moduleSpecifier = relDir ? `${relDir}/${file}` : file;
+      pages.push({
+        file,
+        content: readFileSync(resolve(dir, file), "utf8"),
+        moduleSpecifier
+      });
+    }
+  }
   const { entries, missingViews } = computePlatformReactPages({
     module,
     slug,
     routeMeta,
     pages,
     viewFiles,
-    pagesDirRel,
     pageOverrides: config.pageOverrides
   });
   const schema = config.manifest.schema ?? DEFAULT_SCHEMA;