@jay-framework/dev-server 0.16.2 → 0.16.4

package/dist/index.js

@@ -13,15 +13,15 @@ import path__default from "node:path";
 import { JAY_IMPORT_RESOLVER, injectHeadfullFSTemplates, parseContract, slowRenderTransform, discoverHeadlessInstances, assignCoordinatesToJayHtml, resolveHeadlessInstances } from "@jay-framework/compiler-jay-html";
 import { getLogger, getDevLogger } from "@jay-framework/logger";
 import { createRequire as createRequire$1 } from "node:module";
-import * as fs from "node:fs";
-import fs__default$1 from "node:fs";
+import * as fsSync from "node:fs";
+import fsSync__default from "node:fs";
 import { scanRoutes, createRoute, routeToExpressRoute } from "@jay-framework/stack-route-scanner";
 import { discoverPluginsWithInit, sortPluginsByDependencies, executePluginServerInits, runInitCallbacks, actionRegistry, discoverAndRegisterActions, discoverAllPluginActions, runShutdownCallbacks, clearLifecycleCallbacks, clearServiceRegistry, clearClientInitData, loadPageParts, runLoadParams, DevSlowlyChangingPhase, SlowRenderCache, preparePluginClientInits, registerService, clearServerElementCache, scanPlugins, getServiceRegistry, materializeContracts, renderFastChangingData, mergeHeadTags, generateClientScript, getClientInitData, generateSSRPageHtml, generateFrozenPageHtml, validateForEachInstances, slowRenderInstances } from "@jay-framework/stack-server-runtime";
-import * as fs$1 from "node:fs/promises";
+import * as fs from "node:fs/promises";
 import fs__default from "node:fs/promises";
 import { pathToFileURL } from "node:url";
 import Busboy from "busboy";
-import fs$2 from "fs";
+import fs$1 from "fs";
 import path$1 from "path";
 import crypto from "crypto";
 import { randomUUID } from "node:crypto";
@@ -1318,16 +1318,16 @@ function jayStackCompiler(options = {}) {
           const importerDir = path.dirname(importer);
           let resolvedPath = path.resolve(importerDir, source);
           if (!resolvedPath.endsWith(".ts") && !resolvedPath.endsWith(".js")) {
-            if (fs.existsSync(resolvedPath + ".ts")) {
+            if (fsSync.existsSync(resolvedPath + ".ts")) {
               resolvedPath += ".ts";
-            } else if (fs.existsSync(resolvedPath + ".js")) {
+            } else if (fsSync.existsSync(resolvedPath + ".js")) {
               resolvedPath += ".js";
             } else {
               return null;
             }
-          } else if (resolvedPath.endsWith(".js") && !fs.existsSync(resolvedPath)) {
+          } else if (resolvedPath.endsWith(".js") && !fsSync.existsSync(resolvedPath)) {
             const tsPath = resolvedPath.slice(0, -3) + ".ts";
-            if (fs.existsSync(tsPath)) {
+            if (fsSync.existsSync(tsPath)) {
               resolvedPath = tsPath;
             } else {
               return null;
@@ -1342,7 +1342,7 @@ function jayStackCompiler(options = {}) {
           const actualPath = id.slice("\0jay-action:".length);
           let code;
           try {
-            code = await fs.promises.readFile(actualPath, "utf-8");
+            code = await fsSync.promises.readFile(actualPath, "utf-8");
           } catch (err) {
             getLogger().error(
               `[action-transform] Could not read ${actualPath}: ${err}`
@@ -1417,6 +1417,22 @@ async function createViteServer(options) {
     base,
     // Root directory for module resolution
     root: pagesRoot,
+    // Force singleton resolution for all runtime packages.
+    // Without this, pre-bundled deps (in .vite/deps/) inline their own copy
+    // of these packages, while plugin client bundles (served as raw ESM via /@fs/)
+    // resolve to a separate instance → duplicate createJayContext() → runtime crash.
+    resolve: {
+      dedupe: [
+        "@jay-framework/runtime",
+        "@jay-framework/reactive",
+        "@jay-framework/component",
+        "@jay-framework/fullstack-component",
+        "@jay-framework/stack-client-runtime",
+        "@jay-framework/runtime-automation",
+        "@jay-framework/view-state-merge",
+        "@jay-framework/json-patch"
+      ]
+    },
     // SSR configuration
     ssr: {
       // Mark jay-framework packages as external so Vite uses Node's require
@@ -1424,7 +1440,10 @@ async function createViteServer(options) {
       external: ["@jay-framework/stack-server-runtime", "@jay-framework/fullstack-component"]
     },
     // Disable automatic entry point discovery for pre-bundling —
-    // we run in middleware mode with no HTML files, so Vite can't auto-detect entries
+    // we run in middleware mode with no HTML files, so Vite can't auto-detect entries.
+    // Explicitly include singleton packages so Vite pre-bundles them as separate entries.
+    // Without this, stack-client-runtime inlines its own copy of component/reactive/runtime
+    // into the .vite/deps/ chunk, while plugin client bundles import the raw ESM copy → duplicates.
     optimizeDeps: {
       entries: []
     },
@@ -1482,7 +1501,7 @@ class ServiceLifecycleManager {
     const extensions = [".ts", ".js"];
     for (const ext of extensions) {
       const filePath = path.join(this.projectRoot, this.sourceBase, "init" + ext);
-      if (fs.existsSync(filePath)) {
+      if (fsSync.existsSync(filePath)) {
         return filePath;
       }
     }
@@ -1861,9 +1880,29 @@ function getStatusCodeForError(code, isActionError) {
 }
 const DEFAULT_MAX_FILE_SIZE = 10 * 1024 * 1024;
 const DEFAULT_MAX_FILES = 10;
+function mergeDottedMultipartKeys(body) {
+  const keys = Object.keys(body);
+  for (const key of keys) {
+    if (!key.includes("."))
+      continue;
+    const val = body[key];
+    delete body[key];
+    const parts = key.split(".");
+    let cur = body;
+    for (let i = 0; i < parts.length - 1; i++) {
+      const p = parts[i];
+      const next = cur[p];
+      if (typeof next !== "object" || next === null || Array.isArray(next)) {
+        cur[p] = {};
+      }
+      cur = cur[p];
+    }
+    cur[parts[parts.length - 1]] = val;
+  }
+}
 function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
   return new Promise((resolve, reject) => {
-    fs$2.mkdirSync(tempDir, { recursive: true });
+    fs$1.mkdirSync(tempDir, { recursive: true });
     const files = {};
     let jsonData = {};
     let fileCount = 0;
@@ -1884,7 +1923,7 @@ function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
       const tempPath = path$1.join(tempDir, `${fileCount}-${filename}`);
       let size = 0;
       let truncated = false;
-      const writeStream = fs$2.createWriteStream(tempPath);
+      const writeStream = fs$1.createWriteStream(tempPath);
       stream.pipe(writeStream);
       stream.on("data", (data) => {
         size += data.length;
@@ -1939,7 +1978,11 @@ function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
     bb.on("close", () => {
       if (errored)
         return;
-      Promise.all(pendingWrites).then(() => resolve({ body: { ...jsonData, ...files }, tempDir })).catch((err) => reject(err));
+      Promise.all(pendingWrites).then(() => {
+        const body = { ...jsonData, ...files };
+        mergeDottedMultipartKeys(body);
+        resolve({ body, tempDir });
+      }).catch((err) => reject(err));
     });
     bb.on("error", (err) => {
       if (!errored) {
@@ -1952,7 +1995,7 @@ function parseMultipart(req, tempDir, maxFileSize, maxFiles) {
 }
 function cleanupTempDir(dir) {
   try {
-    fs$2.rmSync(dir, { recursive: true, force: true });
+    fs$1.rmSync(dir, { recursive: true, force: true });
   } catch {
   }
 }
@@ -2032,7 +2075,7 @@ class FreezeStore {
     this.dir = path.join(buildFolder, "freezes");
   }
   async save(route, viewState, routePattern) {
-    await fs$1.mkdir(this.dir, { recursive: true });
+    await fs.mkdir(this.dir, { recursive: true });
     const entry = {
       id: randomUUID().slice(0, 8),
       route,
@@ -2040,7 +2083,7 @@ class FreezeStore {
       viewState,
       createdAt: (/* @__PURE__ */ new Date()).toISOString()
     };
-    await fs$1.writeFile(
+    await fs.writeFile(
       path.join(this.dir, `${entry.id}.json`),
       JSON.stringify(entry, null, 2),
       "utf-8"
@@ -2049,7 +2092,7 @@ class FreezeStore {
   }
   async get(id) {
     try {
-      const content = await fs$1.readFile(path.join(this.dir, `${id}.json`), "utf-8");
+      const content = await fs.readFile(path.join(this.dir, `${id}.json`), "utf-8");
       return JSON.parse(content);
     } catch {
       return void 0;
@@ -2057,13 +2100,13 @@ class FreezeStore {
   }
   async list(route) {
     try {
-      const files = await fs$1.readdir(this.dir);
+      const files = await fs.readdir(this.dir);
       const entries = [];
       for (const file of files) {
         if (!file.endsWith(".json"))
           continue;
         try {
-          const content = await fs$1.readFile(path.join(this.dir, file), "utf-8");
+          const content = await fs.readFile(path.join(this.dir, file), "utf-8");
           const entry = JSON.parse(content);
           if (!route || entry.routePattern === route || entry.route === route) {
             entries.push(entry);
@@ -2083,7 +2126,7 @@ class FreezeStore {
     if (!entry)
       return false;
     entry.name = name;
-    await fs$1.writeFile(
+    await fs.writeFile(
       path.join(this.dir, `${id}.json`),
       JSON.stringify(entry, null, 2),
       "utf-8"
@@ -2092,7 +2135,7 @@ class FreezeStore {
   }
   async delete(id) {
     try {
-      await fs$1.unlink(path.join(this.dir, `${id}.json`));
+      await fs.unlink(path.join(this.dir, `${id}.json`));
       return true;
     } catch {
       return false;
@@ -2186,7 +2229,7 @@ function resolvePluginExport(pluginPath, exportSubpath) {
   const normalized = exportSubpath.replace(/^\.\//, "");
   const packageJsonPath = path__default.join(pluginPath, "package.json");
   try {
-    const packageJson = JSON.parse(fs__default$1.readFileSync(packageJsonPath, "utf-8"));
+    const packageJson = JSON.parse(fsSync__default.readFileSync(packageJsonPath, "utf-8"));
     if (packageJson.exports) {
       const exportKey = "./" + normalized;
       const exportValue = packageJson.exports[exportKey];
@@ -2203,7 +2246,7 @@ function resolvePluginExport(pluginPath, exportSubpath) {
   for (const dir of ["dist", "lib", ""]) {
     const candidate = path__default.join(pluginPath, dir, normalized);
     try {
-      fs__default$1.accessSync(candidate);
+      fsSync__default.accessSync(candidate);
       return candidate;
     } catch {
     }
@@ -2211,11 +2254,25 @@ function resolvePluginExport(pluginPath, exportSubpath) {
   return void 0;
 }
 function resolvePluginModule(plugin) {
+  const pkgJsonPath = path__default.join(plugin.pluginPath, "package.json");
+  if (fsSync__default.existsSync(pkgJsonPath)) {
+    try {
+      const pkg = JSON.parse(fsSync__default.readFileSync(pkgJsonPath, "utf-8"));
+      const mainExport = pkg.exports?.["."];
+      const mainPath = typeof mainExport === "string" ? mainExport : mainExport?.default || mainExport?.import || pkg.main;
+      if (mainPath) {
+        const resolved = path__default.join(plugin.pluginPath, mainPath);
+        if (fsSync__default.existsSync(resolved))
+          return resolved;
+      }
+    } catch {
+    }
+  }
   const modulePath = plugin.manifest.module || "index";
   for (const ext of [".ts", ".js", "/index.ts", "/index.js"]) {
     const candidate = path__default.join(plugin.pluginPath, modulePath + ext);
     try {
-      fs__default$1.accessSync(candidate);
+      fsSync__default.accessSync(candidate);
       return candidate;
     } catch {
     }
@@ -2223,7 +2280,7 @@ function resolvePluginModule(plugin) {
   for (const ext of [".ts", ".js"]) {
     const candidate = path__default.join(plugin.pluginPath, "lib", path__default.basename(modulePath) + ext);
     try {
-      fs__default$1.accessSync(candidate);
+      fsSync__default.accessSync(candidate);
       return candidate;
     } catch {
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/dev-server",
-  "version": "0.16.2",
+  "version": "0.16.4",
   "type": "module",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -23,23 +23,23 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-stack": "^0.16.2",
-    "@jay-framework/compiler-shared": "^0.16.2",
-    "@jay-framework/component": "^0.16.2",
-    "@jay-framework/fullstack-component": "^0.16.2",
-    "@jay-framework/logger": "^0.16.2",
-    "@jay-framework/runtime": "^0.16.2",
-    "@jay-framework/stack-client-runtime": "^0.16.2",
-    "@jay-framework/stack-route-scanner": "^0.16.2",
-    "@jay-framework/stack-server-runtime": "^0.16.2",
-    "@jay-framework/view-state-merge": "^0.16.2",
+    "@jay-framework/compiler-jay-stack": "^0.16.4",
+    "@jay-framework/compiler-shared": "^0.16.4",
+    "@jay-framework/component": "^0.16.4",
+    "@jay-framework/fullstack-component": "^0.16.4",
+    "@jay-framework/logger": "^0.16.4",
+    "@jay-framework/runtime": "^0.16.4",
+    "@jay-framework/stack-client-runtime": "^0.16.4",
+    "@jay-framework/stack-route-scanner": "^0.16.4",
+    "@jay-framework/stack-server-runtime": "^0.16.4",
+    "@jay-framework/view-state-merge": "^0.16.4",
     "busboy": "^1.6.0",
     "vite": "^5.0.11"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.16.2",
-    "@jay-framework/jay-cli": "^0.16.2",
-    "@jay-framework/stack-client-runtime": "^0.16.2",
+    "@jay-framework/dev-environment": "^0.16.4",
+    "@jay-framework/jay-cli": "^0.16.4",
+    "@jay-framework/stack-client-runtime": "^0.16.4",
     "@playwright/test": "^1.58.2",
     "@types/busboy": "^1.5.4",
     "@types/express": "^5.0.2",