@jay-framework/wix-deploy 0.19.7 → 0.21.0

package/dist/artifact-store.js

@@ -8,15 +8,16 @@ function makeItemId(version, relativePath) {
 class WixDataArtifactStore {
   collectionId;
   version;
+  distDir;
   cacheDir;
   dataClient;
   moduleRegistry;
   manifestCache;
-  moduleCache = /* @__PURE__ */ new Map();
   fetchPromises = /* @__PURE__ */ new Map();
   constructor(options) {
     this.collectionId = options.collectionId;
     this.version = options.version;
+    this.distDir = options.distDir;
     this.cacheDir = options.cacheDir;
     this.dataClient = options.wixClient.use({ items });
     this.moduleRegistry = options.moduleRegistry || {};
@@ -54,16 +55,9 @@ class WixDataArtifactStore {
     if (this.moduleRegistry[modulePath]) {
       return this.moduleRegistry[modulePath];
     }
-    const cached = this.moduleCache.get(modulePath);
-    if (cached) return cached;
-    await this.ensureFile(modulePath);
-    const fullPath = path.join(this.cacheDir, modulePath);
-    const mod = await import(
-      /* @vite-ignore */
-      fullPath
+    throw new Error(
+      `Module not found in registry: ${modulePath}. All JS modules must be bundled in entry.mjs.`
     );
-    this.moduleCache.set(modulePath, mod);
-    return mod;
   }
   getAssetPath(relativePath) {
     return path.join(this.cacheDir, relativePath);
@@ -94,11 +88,21 @@ class WixDataArtifactStore {
     console.log(`[WixDataArtifactStore] Loaded ${totalLoaded} eager files`);
   }
   // ========================================================================
+  // Lazy page file loading
+  // ========================================================================
+  async ensurePageFiles(preRenderedPath) {
+    const dir = path.dirname(preRenderedPath);
+    const base = preRenderedPath.replace(/\.jay-html$/, "");
+    const filesToEnsure = [
+      path.join(dir, "page-parts.json"),
+      `${base}.cache.json`,
+      `${base}.server-element.js`
+    ];
+    await Promise.all(filesToEnsure.map((f) => this.ensureFile(f)));
+  }
+  // ========================================================================
   // Writes (for upload-backend and renderer)
   // ========================================================================
-  /**
-   * Write a single file to the data collection.
-   */
   async writeFile(relativePath, content, category) {
     const ext = path.extname(relativePath).slice(1);
     const item = {
@@ -112,10 +116,6 @@ class WixDataArtifactStore {
     };
     await this.dataClient.items.save(this.collectionId, item);
   }
-  /**
-   * Write a batch of files to the data collection.
-   * Returns the number of successfully written files.
-   */
   async writeFiles(files) {
     const dataItems = files.map((f) => ({
       _id: makeItemId(this.version, f.path),
@@ -142,12 +142,18 @@ class WixDataArtifactStore {
     }
   }
   // ========================================================================
-  // Internal: lazy file fetching
+  // Internal: file resolution
   // ========================================================================
   async ensureFile(relativePath) {
-    const fullPath = path.join(this.cacheDir, relativePath);
-    if (fs.existsSync(fullPath)) {
-      return fs.readFileSync(fullPath, "utf8");
+    if (this.distDir) {
+      const distPath = path.join(this.distDir, relativePath);
+      if (fs.existsSync(distPath)) {
+        return fs.readFileSync(distPath, "utf8");
+      }
+    }
+    const cachePath = path.join(this.cacheDir, relativePath);
+    if (fs.existsSync(cachePath)) {
+      return fs.readFileSync(cachePath, "utf8");
     }
     const existing = this.fetchPromises.get(relativePath);
     if (existing) return existing;
@@ -161,22 +167,26 @@ class WixDataArtifactStore {
   }
   async fetchFromCollection(relativePath) {
     const id = makeItemId(this.version, relativePath);
-    const t0 = Date.now();
-    const item = await this.dataClient.items.get(
-      this.collectionId,
-      id
-    );
-    const t1 = Date.now();
-    if (!item?.content) {
-      throw new Error(
-        `File not found in data collection: v${this.version}/${relativePath} (id: ${id})`
+    try {
+      const item = await this.dataClient.items.get(
+        this.collectionId,
+        id
       );
+      if (item?.content) {
+        this.writeToCache(relativePath, item.content);
+        return item.content;
+      }
+    } catch {
     }
-    this.writeToCache(relativePath, item.content);
-    console.log(
-      `[WixDataArtifactStore] Fetched v${this.version}/${relativePath} (${t1 - t0}ms)`
+    const result = await this.dataClient.items.query(this.collectionId).eq("path", relativePath).eq("version", this.version).limit(1).find();
+    if (result.items.length > 0) {
+      const item = result.items[0];
+      this.writeToCache(relativePath, item.content);
+      return item.content;
+    }
+    throw new Error(
+      `File not found in data collection: v${this.version}/${relativePath} (id: ${id})`
     );
-    return item.content;
   }
   writeToCache(relativePath, content) {
     const fullPath = path.join(this.cacheDir, relativePath);

package/dist/index.d.ts

@@ -7,13 +7,17 @@ import { WixClientService } from '@jay-framework/wix-server-client';
 /**
  * WixDataArtifactStore — implements ArtifactStore for Wix BaaS deployments.
  *
- * Manages both reads (for serving) and writes (for upload/renderer) of
- * backend build artifacts in a Wix data collection. All items are versioned
- * so that a new version can be uploaded while the current version serves.
+ * Reads eager files (route-manifest.json, build-metadata.json) from the dist
+ * directory alongside entry.mjs. Fetches lazy JSON files (page-parts, cache
+ * data) from a Wix data collection on demand and caches them to disk.
+ * All JS modules are resolved from the bundled MODULE_REGISTRY — no disk
+ * loading of JS files.
+ *
+ * Also supports writes (for upload-backend) to the data collection.
  *
  * Data collection schema:
- *   _id:       string  — "{version}__{path}" (unique key)
- *   version:   string  — build version (semver)
+ *   _id:       string  — sha256("{version}/{path}") truncated to 32 chars
+ *   version:   string  — deploy version (e.g. "0.0.1-d849685dc3de")
  *   path:      string  — relative file path within backend dir
  *   content:   string  — file content (text)
  *   fileType:  string  — extension (js, json)
@@ -24,18 +28,21 @@ import { WixClientService } from '@jay-framework/wix-server-client';
 interface WixDataArtifactStoreOptions {
     wixClient: WixClient;
     collectionId: string;
-    cacheDir: string;
     version: string;
+    /** Directory containing entry.mjs and eager files (route-manifest.json, build-metadata.json). Required for reads. */
+    distDir?: string;
+    /** Directory for caching lazy files fetched from the data collection */
+    cacheDir: string;
     moduleRegistry?: Record<string, any>;
 }
 declare class WixDataArtifactStore implements ArtifactStore {
     readonly collectionId: string;
     readonly version: string;
+    private readonly distDir;
     private readonly cacheDir;
     private readonly dataClient;
     private readonly moduleRegistry;
     private manifestCache?;
-    private moduleCache;
     private fetchPromises;
     constructor(options: WixDataArtifactStoreOptions);
     readManifest(): Promise<RouteManifest>;
@@ -46,14 +53,8 @@ declare class WixDataArtifactStore implements ArtifactStore {
     getAssetPath(relativePath: string): string;
     getBuildDir(): string;
     loadEagerFiles(): Promise<void>;
-    /**
-     * Write a single file to the data collection.
-     */
+    ensurePageFiles(preRenderedPath: string): Promise<void>;
     writeFile(relativePath: string, content: string, category: 'eager' | 'lazy'): Promise<void>;
-    /**
-     * Write a batch of files to the data collection.
-     * Returns the number of successfully written files.
-     */
     writeFiles(files: Array<{
         path: string;
         content: string;

package/dist/index.js

@@ -21,7 +21,25 @@ import { getService } from "@jay-framework/stack-server-runtime";
 import { items } from "@wix/data";
 const DEFAULT_COLLECTION_ID = "jay-backend-files";
 const DEFAULT_CACHE_DIR = "/tmp/jay-backend";
+function getDeployVersion(metadata) {
+  const version2 = metadata.version || "0.0.0";
+  const hash = metadata.sourceHash || "";
+  if (!hash) return version2;
+  return `${version2}-${hash}`;
+}
 const DEFAULT_EXCLUDE_PLUGINS = ["aiditor", "ui-kit", "wix-deploy"];
+function scanPagePartsFiles(dir, fs2, path2) {
+  const results = [];
+  for (const entry of fs2.readdirSync(dir, { withFileTypes: true })) {
+    const fullPath = path2.join(dir, entry.name);
+    if (entry.isDirectory()) {
+      results.push(...scanPagePartsFiles(fullPath, fs2, path2));
+    } else if (entry.name === "page-parts.json") {
+      results.push(fullPath);
+    }
+  }
+  return results;
+}
 function sortPluginsByDeps(plugins) {
   const priorityPackages = ["@jay-framework/wix-server-client"];
   const sorted = [];
@@ -170,11 +188,11 @@ ${actionsArray.join("\n")}
             wixClient: wixClientService,
             collectionId: COLLECTION_ID,
             version: VERSION,
+            distDir: entryDir,
             cacheDir: '${DEFAULT_CACHE_DIR}',
             moduleRegistry: MODULE_REGISTRY,
         });
-        console.log('[BaaS] Loading eager files...');
-        await artifacts.loadEagerFiles();
+        console.log('[BaaS] Artifact store ready (eager files from dist/, lazy from collection)');
     }
 
     initialized = true;
@@ -257,8 +275,8 @@ function generateServeSource(frontendDir, backendDir) {
     'import { Readable } from "node:stream";',
     "",
     'process.env.STATIC_BASE_URL = process.env.STATIC_BASE_URL || "/";',
-    `process.env.JAY_BACKEND_DIR = process.env.JAY_BACKEND_DIR || "${backendDir}";`,
-    'const entry = await import("./entry.mjs");',
+    `process.env.JAY_BACKEND_DIR = process.env.JAY_BACKEND_DIR || "";`,
+    'const entry = await import("./dist/entry.mjs");',
     "const handler = entry.default?.fetch || entry.fetch;",
     'const PORT = parseInt(process.env.PORT || "4000", 10);',
     `const FRONTEND_DIR = "${frontendDir}";`,
@@ -326,10 +344,10 @@ const buildEntry = makeCliCommand("build-entry").withServices(CONSOLE_CONTEXT).w
   }
   const manifest = JSON.parse(fs2.readFileSync(manifestPath, "utf8"));
   const metadataPath = path2.join(buildDir, "build-metadata.json");
-  let version2 = "1.0.0";
+  let version2 = "0.0.0";
   if (fs2.existsSync(metadataPath)) {
     const metadata = JSON.parse(fs2.readFileSync(metadataPath, "utf8"));
-    version2 = String(metadata.version || "1.0.0");
+    version2 = getDeployVersion(metadata);
   }
   const filteredPlugins = manifest.plugins.filter(
     (p) => !excludePlugins.includes(p.name) && !excludePlugins.includes(p.packageName)
@@ -337,18 +355,35 @@ const buildEntry = makeCliCommand("build-entry").withServices(CONSOLE_CONTEXT).w
   const plugins = sortPluginsByDeps(filteredPlugins);
   const pluginPackages = new Set(plugins.map((p) => p.packageName));
   const actionPackages = manifest.actions.filter((a) => a.isPlugin && a.packageName && pluginPackages.has(a.packageName)).map((a) => a.packageName).filter((v, i, arr) => arr.indexOf(v) === i);
-  const seSet = /* @__PURE__ */ new Set();
+  const localModuleSet = /* @__PURE__ */ new Set();
   for (const route of manifest.routes) {
-    if (route.serverElementPath) seSet.add(route.serverElementPath);
+    if (route.serverElementPath) localModuleSet.add(route.serverElementPath);
+    if (route.serverModule) localModuleSet.add(route.serverModule);
   }
-  const serverElements = [...seSet].map((rel) => ({
+  const pagePartsFiles = scanPagePartsFiles(buildDir, fs2, path2);
+  for (const ppFile of pagePartsFiles) {
+    try {
+      const config = JSON.parse(fs2.readFileSync(ppFile, "utf8"));
+      const collectLocal = (entries) => {
+        for (const entry of entries) {
+          if (entry.source === "local" && entry.modulePath) {
+            localModuleSet.add(entry.modulePath);
+          }
+        }
+      };
+      if (config.parts) collectLocal(config.parts);
+      if (config.instanceComponents) collectLocal(config.instanceComponents);
+    } catch {
+    }
+  }
+  const serverElements = [...localModuleSet].map((rel) => ({
     relativePath: rel,
     absolutePath: path2.join(buildDir, rel)
   }));
   ctx.log(`Version: ${version2}`);
   ctx.log(`Plugins: ${plugins.map((p) => p.name).join(", ")}`);
   ctx.log(`Action packages: ${actionPackages.join(", ")}`);
-  ctx.log(`Server elements: ${serverElements.length} routes`);
+  ctx.log(`Local modules: ${serverElements.length} (${[...localModuleSet].join(", ")})`);
   const entrySource = generateEntrySource(
     plugins,
     actionPackages,
@@ -373,7 +408,11 @@ const buildEntry = makeCliCommand("build-entry").withServices(CONSOLE_CONTEXT).w
     "prettier",
     "vite",
     "lightningcss",
-    "fsevents"
+    "fsevents",
+    "@types/js-yaml",
+    "@wix/sdk-runtime",
+    "yaml",
+    "js-beautify"
   ];
   const stubFilter = new RegExp(
     "^(" + stubs.map((s) => s.replace(/[/.]/g, "\\$&")).join("|") + ")$"
@@ -445,6 +484,13 @@ const buildEntry = makeCliCommand("build-entry").withServices(CONSOLE_CONTEXT).w
       JSON.stringify(result.metafile)
     );
   }
+  for (const name of ["route-manifest.json", "build-metadata.json"]) {
+    const src2 = path2.join(buildDir, name);
+    if (fs2.existsSync(src2)) {
+      fs2.copyFileSync(src2, path2.join(entryDir, name));
+    }
+  }
+  ctx.log("Copied route-manifest.json + build-metadata.json to dist/");
   const wixConfigSrc = path2.join(ctx.projectRoot, "config", ".wix.yaml");
   if (fs2.existsSync(wixConfigSrc)) {
     const configDir = path2.join(entryDir, "config");
@@ -458,16 +504,24 @@ const buildEntry = makeCliCommand("build-entry").withServices(CONSOLE_CONTEXT).w
     );
   }
   const serveFile = path2.join(ctx.projectRoot, "serve.mjs");
-  fs2.writeFileSync(serveFile, generateServeSource(ctx.build.frontend, buildDir));
+  fs2.writeFileSync(serveFile, generateServeSource(ctx.build.frontend));
   ctx.log(`Generated ${serveFile} — run with: node serve.mjs`);
   return { success: true, outFile, sizeMB };
 });
-const SKIP_EXTENSIONS = /* @__PURE__ */ new Set([".png", ".jpg", ".jpeg", ".gif", ".svg", ".webp", ".jay-html"]);
+const SKIP_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".js",
+  ".png",
+  ".jpg",
+  ".jpeg",
+  ".gif",
+  ".svg",
+  ".webp",
+  ".jay-html"
+]);
 const MAX_BATCH_BYTES = 4e5;
 function categorize(relativePath) {
   if (relativePath === "route-manifest.json") return "eager";
   if (relativePath === "build-metadata.json") return "eager";
-  if (relativePath.startsWith("server/")) return "eager";
   return "lazy";
 }
 function scanFileEntries(dir, base, fs2, path2) {
@@ -515,10 +569,10 @@ const uploadBackend = makeCliCommand("upload-backend").withServices(WIX_CLIENT_S
     const collectionId = input.collectionId || DEFAULT_COLLECTION_ID;
     const dryRun = input.dryRun || false;
     const metadataPath = path2.join(buildDir, "build-metadata.json");
-    let version2 = "1.0.0";
+    let version2 = "0.0.0";
     if (fs2.existsSync(metadataPath)) {
       const metadata = JSON.parse(fs2.readFileSync(metadataPath, "utf8"));
-      version2 = String(metadata.version || "1.0.0");
+      version2 = getDeployVersion(metadata);
     }
     if (dryRun) ctx.log("DRY RUN — no uploads");
     if (!fs2.existsSync(buildDir)) {
@@ -7151,6 +7205,7 @@ const deployBaas = makeCliCommand("deploy-baas").withServices(CONSOLE_CONTEXT).w
   const completedDeployment = completeData.appDeployment || {};
   const deploymentId = appDeployment?.id;
   const deploymentBaseUrl = completedDeployment.deploymentBaseUrl || appDeployment?.deploymentBaseUrl || "";
+  ctx.log(`Deployment uploaded. Base URL: ${deploymentBaseUrl}`);
   let appVersion = 0;
   try {
     const { data: versionData } = await httpClient2.request(
@@ -7203,14 +7258,6 @@ function prefixCtx(ctx, prefix) {
   return { ...ctx, log: (msg) => ctx.log(`[deploy]   ${prefix} ${msg}`), warn: () => {
   } };
 }
-function bumpPatch(version2) {
-  const parts = version2.split(".");
-  if (parts.length === 3) {
-    parts[2] = String(parseInt(parts[2], 10) + 1);
-    return parts.join(".");
-  }
-  return version2 + ".1";
-}
 const deploy = makeCliCommand("deploy").withServices(WIX_CLIENT_SERVICE, CONSOLE_CONTEXT).withHandler(async (input, wixClient, ctx) => {
   const fs2 = await import("node:fs");
   const path2 = await import("node:path");
@@ -7222,11 +7269,8 @@ const deploy = makeCliCommand("deploy").withServices(WIX_CLIENT_SERVICE, CONSOLE
     return { success: false };
   }
   const metadata = JSON.parse(fs2.readFileSync(metadataPath, "utf8"));
-  const buildVersion = String(metadata.version || "1.0.0");
-  const deployVersion = bumpPatch(buildVersion);
-  metadata.version = deployVersion;
-  fs2.writeFileSync(metadataPath, JSON.stringify(metadata, null, 2));
-  ctx.log(`[deploy] Version: ${buildVersion} → ${deployVersion}`);
+  const deployVersion = getDeployVersion(metadata);
+  ctx.log(`[deploy] Version: ${deployVersion}`);
   ctx.log("[deploy] Bundling entry.mjs...");
   const buildResult = await buildEntry.handler(
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/wix-deploy",
-  "version": "0.19.7",
+  "version": "0.21.0",
   "type": "module",
   "description": "Wix BaaS deployment adapter for Jay Framework — WixDataArtifactStore and entry builder",
   "license": "Apache-2.0",
@@ -16,7 +16,8 @@
     "./package.json": "./package.json"
   },
   "scripts": {
-    "build": "npm run clean && npm run build:server && npm run build:types",
+    "build": "npm run clean && npm run build:server && npm run build:types && npm run validate",
+    "validate": "jay-stack-cli validate-plugin",
     "build:server": "vite build --ssr",
     "build:types": "tsup lib/index.ts --dts-only --format esm",
     "build:check-types": "tsc",
@@ -25,10 +26,10 @@
     "test": ":"
   },
   "dependencies": {
-    "@jay-framework/fullstack-component": "^0.19.7",
-    "@jay-framework/production-server": "^0.19.7",
-    "@jay-framework/stack-server-runtime": "^0.19.7",
-    "@jay-framework/wix-server-client": "^0.19.7",
+    "@jay-framework/fullstack-component": "^0.21.0",
+    "@jay-framework/production-server": "^0.21.0",
+    "@jay-framework/stack-server-runtime": "^0.21.0",
+    "@jay-framework/wix-server-client": "^0.21.0",
     "@wix/data": "^1.0.433",
     "@wix/sdk": "^1.21.5",
     "esbuild": "^0.21.0",