@jay-framework/stack-server-runtime 0.8.0 → 0.9.0

package/dist/index.d.ts

@@ -21,8 +21,8 @@ declare class DevSlowlyChangingPhase implements SlowlyChangingPhase {
     constructor(dontCacheSlowly: boolean);
     runSlowlyForPage(pageParams: UrlParams, pageProps: PageProps, parts: Array<DevServerPagePart>): Promise<AnySlowlyRenderResult>;
 }
-declare function runLoadParams<StaticViewState extends object, ViewState extends object, Refs extends object, Services extends Array<any>, Contexts extends Array<any>, PropsT extends object, Params extends UrlParams, CompCore extends JayComponentCore<PropsT, ViewState>>(compDefinition: JayStackComponentDefinition<StaticViewState, ViewState, Refs, Services, Contexts, PropsT, Params, CompCore>, services: Services): Promise<void>;
-declare function runSlowlyChangingRender<StaticViewState extends object, ViewState extends object, Refs extends object, Services extends Array<any>, Contexts extends Array<any>, PropsT extends object, Params extends UrlParams, CompCore extends JayComponentCore<PropsT, ViewState>>(compDefinition: JayStackComponentDefinition<StaticViewState, ViewState, Refs, Services, Contexts, PropsT, Params, CompCore>): void;
+declare function runLoadParams<Refs extends object, SlowVS extends object, FastVS extends object, InteractiveVS extends object, Services extends Array<any>, Contexts extends Array<any>, PropsT extends object, Params extends UrlParams, CompCore extends JayComponentCore<PropsT, InteractiveVS>>(compDefinition: JayStackComponentDefinition<Refs, SlowVS, FastVS, InteractiveVS, Services, Contexts, PropsT, Params, CompCore>, services: Services): Promise<void>;
+declare function runSlowlyChangingRender<Refs extends object, SlowVS extends object, FastVS extends object, InteractiveVS extends object, Services extends Array<any>, Contexts extends Array<any>, PropsT extends object, Params extends UrlParams, CompCore extends JayComponentCore<PropsT, InteractiveVS>>(compDefinition: JayStackComponentDefinition<Refs, SlowVS, FastVS, InteractiveVS, Services, Contexts, PropsT, Params, CompCore>): void;
 
 declare function renderFastChangingData(pageParams: object, pageProps: PageProps, carryForward: object, parts: Array<DevServerPagePart>): Promise<AnyFastRenderResult>;
 

package/dist/index.js

@@ -166,10 +166,11 @@ async function loadPageParts(vite, route, pagesBase, jayRollupConfig) {
   const exists = await fs.access(route.compPath, fs.constants.F_OK).then(() => true).catch(() => false);
   const parts = [];
   if (exists) {
-    const pageComponent = (await vite.ssrLoadModule(route.compPath)).page;
+    const pageComponent = (await vite.ssrLoadModule(route.compPath + "?jay-server")).page;
     parts.push({
       compDefinition: pageComponent,
-      clientImport: `import {page} from '${route.compPath}'`,
+      // Client import uses client-only code (server code stripped)
+      clientImport: `import {page} from '${route.compPath}?jay-client'`,
       clientPart: `{comp: page.comp, contextMarkers: []}`
     });
   }
@@ -191,14 +192,18 @@ async function loadPageParts(vite, route, pagesBase, jayRollupConfig) {
     for await (const headlessImport of jayHtml.headlessImports) {
       const module2 = headlessImport.codeLink.module;
       const name = headlessImport.codeLink.names[0].name;
-      const modulePath = module2[0] === "." ? path.resolve(dirName, module2) : require2.resolve(module2, { paths: require2.resolve.paths(dirName) });
-      const compDefinition = (await vite.ssrLoadModule(modulePath))[name];
+      const isLocalModule = module2[0] === "." || module2[0] === "/";
+      const modulePath = isLocalModule ? path.resolve(dirName, module2) : require2.resolve(module2, { paths: require2.resolve.paths(dirName) });
+      const serverModulePath = isLocalModule ? modulePath + "?jay-server" : modulePath;
+      const compDefinition = (await vite.ssrLoadModule(serverModulePath))[name];
       const moduleImport = module2.startsWith("./") ? path.resolve(pagesBase, module2) : module2;
+      const isNpmPackage = !module2.startsWith("./") && !module2.startsWith("../");
+      const clientModuleImport = isNpmPackage ? `${moduleImport}/client` : `${moduleImport}?jay-client`;
       const key = headlessImport.key;
       const part = {
         key,
         compDefinition,
-        clientImport: `import {${name}} from '${moduleImport}'`,
+        clientImport: `import {${name}} from '${clientModuleImport}'`,
         clientPart: `{comp: ${name}.comp, contextMarkers: [], key: '${headlessImport.key}'}`
       };
       parts.push(part);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/stack-server-runtime",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.mts",
@@ -26,16 +26,16 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@jay-framework/compiler-jay-html": "^0.8.0",
-    "@jay-framework/component": "^0.8.0",
-    "@jay-framework/fullstack-component": "^0.8.0",
-    "@jay-framework/runtime": "^0.8.0",
-    "@jay-framework/stack-route-scanner": "^0.8.0"
+    "@jay-framework/compiler-jay-html": "^0.9.0",
+    "@jay-framework/component": "^0.9.0",
+    "@jay-framework/fullstack-component": "^0.9.0",
+    "@jay-framework/runtime": "^0.9.0",
+    "@jay-framework/stack-route-scanner": "^0.9.0"
   },
   "devDependencies": {
-    "@jay-framework/dev-environment": "^0.8.0",
-    "@jay-framework/jay-cli": "^0.8.0",
-    "@jay-framework/stack-client-runtime": "^0.8.0",
+    "@jay-framework/dev-environment": "^0.9.0",
+    "@jay-framework/jay-cli": "^0.9.0",
+    "@jay-framework/stack-client-runtime": "^0.9.0",
     "@types/express": "^5.0.2",
     "@types/node": "^22.15.21",
     "nodemon": "^3.0.3",