@jay-framework/wix-deploy 0.18.3 → 0.18.4

package/dist/artifact-store.js

@@ -1,246 +1,214 @@
-/**
- * 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.
- *
- * Data collection schema:
- *   _id:       string  — "{version}__{path}" (unique key)
- *   version:   string  — build version (semver)
- *   path:      string  — relative file path within backend dir
- *   content:   string  — file content (text)
- *   fileType:  string  — extension (js, json)
- *   sizeBytes: number  — content byte length
- *   category:  string  — 'eager' | 'lazy'
- */
-import { items } from '@wix/data';
-import crypto from 'node:crypto';
-import fs from 'node:fs';
-import path from 'node:path';
-export function makeItemId(version, relativePath) {
-    return crypto
-        .createHash('sha256')
-        .update(`v${version}/${relativePath}`)
-        .digest('hex')
-        .slice(0, 32);
+import { items } from "@wix/data";
+import crypto from "node:crypto";
+import fs from "node:fs";
+import path from "node:path";
+function makeItemId(version, relativePath) {
+  return crypto.createHash("sha256").update(`v${version}/${relativePath}`).digest("hex").slice(0, 32);
 }
-// ============================================================================
-// Read + Write artifact store
-// ============================================================================
-export class WixDataArtifactStore {
-    collectionId;
-    version;
-    cacheDir;
-    dataClient;
-    moduleRegistry;
-    manifestCache;
-    moduleCache = new Map();
-    fetchPromises = new Map();
-    constructor(options) {
-        this.collectionId = options.collectionId;
-        this.version = options.version;
-        this.cacheDir = options.cacheDir;
-        this.dataClient = options.wixClient.use({ items });
-        this.moduleRegistry = options.moduleRegistry || {};
-        fs.mkdirSync(this.cacheDir, { recursive: true });
+class WixDataArtifactStore {
+  collectionId;
+  version;
+  cacheDir;
+  dataClient;
+  moduleRegistry;
+  manifestCache;
+  moduleCache = /* @__PURE__ */ new Map();
+  fetchPromises = /* @__PURE__ */ new Map();
+  constructor(options) {
+    this.collectionId = options.collectionId;
+    this.version = options.version;
+    this.cacheDir = options.cacheDir;
+    this.dataClient = options.wixClient.use({ items });
+    this.moduleRegistry = options.moduleRegistry || {};
+    fs.mkdirSync(this.cacheDir, { recursive: true });
+  }
+  // ========================================================================
+  // ArtifactStore interface (reads)
+  // ========================================================================
+  async readManifest() {
+    if (this.manifestCache) return this.manifestCache;
+    const content = await this.ensureFile("route-manifest.json");
+    this.manifestCache = JSON.parse(content);
+    return this.manifestCache;
+  }
+  async readCacheData(relativePath) {
+    const cacheContent = await this.ensureFile(relativePath);
+    try {
+      const cacheData = JSON.parse(cacheContent);
+      return {
+        slowViewState: cacheData.slowViewState || {},
+        carryForward: cacheData.carryForward || {}
+      };
+    } catch {
+      return { slowViewState: {}, carryForward: {} };
     }
-    // ========================================================================
-    // ArtifactStore interface (reads)
-    // ========================================================================
-    async readManifest() {
-        if (this.manifestCache)
-            return this.manifestCache;
-        const content = await this.ensureFile('route-manifest.json');
-        this.manifestCache = JSON.parse(content);
-        return this.manifestCache;
+  }
+  async readPagePartsConfig(relativePath) {
+    const content = await this.ensureFile(relativePath);
+    return JSON.parse(content);
+  }
+  async loadServerElement(relativePath) {
+    return this.loadModule(relativePath, true);
+  }
+  async loadModule(modulePath, _local) {
+    if (this.moduleRegistry[modulePath]) {
+      return this.moduleRegistry[modulePath];
     }
-    async readCacheData(relativePath) {
-        const cacheContent = await this.ensureFile(relativePath);
+    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
+    );
+    this.moduleCache.set(modulePath, mod);
+    return mod;
+  }
+  getAssetPath(relativePath) {
+    return path.join(this.cacheDir, relativePath);
+  }
+  getBuildDir() {
+    return this.cacheDir;
+  }
+  // ========================================================================
+  // Eager loading (cold start)
+  // ========================================================================
+  async loadEagerFiles() {
+    console.log(
+      `[WixDataArtifactStore] Loading eager files v${this.version} from "${this.collectionId}"...`
+    );
+    let totalLoaded = 0;
+    let hasMore = true;
+    let offset = 0;
+    const limit = 50;
+    while (hasMore) {
+      const result = await this.dataClient.items.query(this.collectionId).eq("category", "eager").eq("version", this.version).skip(offset).limit(limit).find();
+      for (const item of result.items) {
+        this.writeToCache(item.path, item.content);
+        totalLoaded++;
+      }
+      hasMore = result.items.length === limit;
+      offset += limit;
+    }
+    console.log(`[WixDataArtifactStore] Loaded ${totalLoaded} eager files`);
+  }
+  // ========================================================================
+  // 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 = {
+      _id: makeItemId(this.version, relativePath),
+      version: this.version,
+      path: relativePath,
+      content,
+      fileType: ext || "unknown",
+      sizeBytes: Buffer.byteLength(content),
+      category
+    };
+    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),
+      version: this.version,
+      path: f.path,
+      content: f.content,
+      fileType: path.extname(f.path).slice(1) || "unknown",
+      sizeBytes: Buffer.byteLength(f.content),
+      category: f.category
+    }));
+    try {
+      await this.dataClient.items.bulkSave(this.collectionId, dataItems);
+      return dataItems.length;
+    } catch {
+      let count = 0;
+      for (const item of dataItems) {
         try {
-            const cacheData = JSON.parse(cacheContent);
-            return {
-                slowViewState: cacheData.slowViewState || {},
-                carryForward: cacheData.carryForward || {},
-            };
-        }
-        catch {
-            return { slowViewState: {}, carryForward: {} };
+          await this.dataClient.items.save(this.collectionId, item);
+          count++;
+        } catch {
         }
+      }
+      return count;
     }
-    async readPagePartsConfig(relativePath) {
-        const content = await this.ensureFile(relativePath);
-        return JSON.parse(content);
+  }
+  // ========================================================================
+  // Internal: lazy file fetching
+  // ========================================================================
+  async ensureFile(relativePath) {
+    const fullPath = path.join(this.cacheDir, relativePath);
+    if (fs.existsSync(fullPath)) {
+      return fs.readFileSync(fullPath, "utf8");
     }
-    async loadServerElement(relativePath) {
-        return this.loadModule(relativePath, true);
-    }
-    async loadModule(modulePath, _local) {
-        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);
-        this.moduleCache.set(modulePath, mod);
-        return mod;
+    const existing = this.fetchPromises.get(relativePath);
+    if (existing) return existing;
+    const promise = this.fetchFromCollection(relativePath);
+    this.fetchPromises.set(relativePath, promise);
+    try {
+      return await promise;
+    } finally {
+      this.fetchPromises.delete(relativePath);
     }
-    getAssetPath(relativePath) {
-        return path.join(this.cacheDir, relativePath);
+  }
+  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})`
+      );
     }
-    getBuildDir() {
-        return this.cacheDir;
-    }
-    // ========================================================================
-    // Eager loading (cold start)
-    // ========================================================================
-    async loadEagerFiles() {
-        console.log(`[WixDataArtifactStore] Loading eager files v${this.version} from "${this.collectionId}"...`);
-        let totalLoaded = 0;
-        let hasMore = true;
-        let offset = 0;
-        const limit = 50;
-        while (hasMore) {
-            const result = await this.dataClient.items
-                .query(this.collectionId)
-                .eq('category', 'eager')
-                .eq('version', this.version)
-                .skip(offset)
-                .limit(limit)
-                .find();
-            for (const item of result.items) {
-                this.writeToCache(item.path, item.content);
-                totalLoaded++;
-            }
-            hasMore = result.items.length === limit;
-            offset += limit;
-        }
-        console.log(`[WixDataArtifactStore] Loaded ${totalLoaded} eager files`);
-    }
-    // ========================================================================
-    // 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 = {
-            _id: makeItemId(this.version, relativePath),
-            version: this.version,
-            path: relativePath,
-            content,
-            fileType: ext || 'unknown',
-            sizeBytes: Buffer.byteLength(content),
-            category,
-        };
-        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),
-            version: this.version,
-            path: f.path,
-            content: f.content,
-            fileType: path.extname(f.path).slice(1) || 'unknown',
-            sizeBytes: Buffer.byteLength(f.content),
-            category: f.category,
-        }));
-        try {
-            await this.dataClient.items.bulkSave(this.collectionId, dataItems);
-            return dataItems.length;
-        }
-        catch {
-            // Fallback to individual saves
-            let count = 0;
-            for (const item of dataItems) {
-                try {
-                    await this.dataClient.items.save(this.collectionId, item);
-                    count++;
-                }
-                catch {
-                    /* skip failed items */
+    this.writeToCache(relativePath, item.content);
+    console.log(
+      `[WixDataArtifactStore] Fetched v${this.version}/${relativePath} (${t1 - t0}ms)`
+    );
+    return item.content;
+  }
+  writeToCache(relativePath, content) {
+    const fullPath = path.join(this.cacheDir, relativePath);
+    fs.mkdirSync(path.dirname(fullPath), { recursive: true });
+    if (relativePath.endsWith("page-parts.json")) {
+      try {
+        const config = JSON.parse(content);
+        const rewriteParts = (parts) => {
+          for (const part of parts) {
+            if (part.modulePath && part.source === "npm") {
+              const npmMatch = part.modulePath.match(/\/@jay-framework\/([^/]+)\//);
+              if (npmMatch) {
+                part.modulePath = `@jay-framework/${npmMatch[1]}`;
+              } else {
+                const pkgMatch = part.modulePath.match(/\/packages\/(wix-[^/]+)\//);
+                if (pkgMatch) {
+                  part.modulePath = `@jay-framework/${pkgMatch[1]}`;
                 }
+              }
             }
-            return count;
-        }
-    }
-    // ========================================================================
-    // Internal: lazy file fetching
-    // ========================================================================
-    async ensureFile(relativePath) {
-        const fullPath = path.join(this.cacheDir, relativePath);
-        if (fs.existsSync(fullPath)) {
-            return fs.readFileSync(fullPath, 'utf8');
-        }
-        const existing = this.fetchPromises.get(relativePath);
-        if (existing)
-            return existing;
-        const promise = this.fetchFromCollection(relativePath);
-        this.fetchPromises.set(relativePath, promise);
-        try {
-            return await promise;
-        }
-        finally {
-            this.fetchPromises.delete(relativePath);
-        }
-    }
-    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})`);
-        }
-        this.writeToCache(relativePath, item.content);
-        console.log(`[WixDataArtifactStore] Fetched v${this.version}/${relativePath} (${t1 - t0}ms)`);
-        return item.content;
-    }
-    writeToCache(relativePath, content) {
-        const fullPath = path.join(this.cacheDir, relativePath);
-        fs.mkdirSync(path.dirname(fullPath), { recursive: true });
-        // Rewrite page-parts.json modulePath entries from absolute build paths
-        // to package names that Node can resolve from the bundled entry.mjs
-        if (relativePath.endsWith('page-parts.json')) {
-            try {
-                const config = JSON.parse(content);
-                const rewriteParts = (parts) => {
-                    for (const part of parts) {
-                        if (part.modulePath && part.source === 'npm') {
-                            // Extract package dir name from absolute path and map to npm name
-                            // e.g. /Users/.../packages/wix-stores/dist/index.js → @jay-framework/wix-stores
-                            // e.g. /Users/.../node_modules/@jay-framework/wix-stores/dist/index.js → @jay-framework/wix-stores
-                            const npmMatch = part.modulePath.match(/\/@jay-framework\/([^/]+)\//);
-                            if (npmMatch) {
-                                part.modulePath = `@jay-framework/${npmMatch[1]}`;
-                            }
-                            else {
-                                const pkgMatch = part.modulePath.match(/\/packages\/(wix-[^/]+)\//);
-                                if (pkgMatch) {
-                                    part.modulePath = `@jay-framework/${pkgMatch[1]}`;
-                                }
-                            }
-                        }
-                    }
-                };
-                if (config.parts)
-                    rewriteParts(config.parts);
-                if (config.instanceComponents)
-                    rewriteParts(config.instanceComponents);
-                content = JSON.stringify(config);
-            }
-            catch {
-                /* keep original content if parsing fails */
-            }
-        }
-        fs.writeFileSync(fullPath, content, 'utf8');
+          }
+        };
+        if (config.parts) rewriteParts(config.parts);
+        if (config.instanceComponents) rewriteParts(config.instanceComponents);
+        content = JSON.stringify(config);
+      } catch {
+      }
     }
+    fs.writeFileSync(fullPath, content, "utf8");
+  }
 }
+export {
+  WixDataArtifactStore,
+  makeItemId
+};

package/dist/index.d.ts

@@ -1,7 +1,112 @@
-export { WixDataArtifactStore } from './artifact-store.js';
-export type { WixDataArtifactStoreOptions } from './artifact-store.js';
-export { buildEntry } from './commands/build-entry.js';
-export { uploadBackend } from './commands/upload-backend.js';
-export { deployBaas } from './commands/deploy-baas.js';
-export { deploy } from './commands/deploy.js';
-export { setupWixDeploy } from './setup.js';
+import { WixClient } from '@wix/sdk';
+import { ArtifactStore, RouteManifest, CacheEntry, ServerElementModule } from '@jay-framework/production-server/serve';
+import * as _jay_framework_fullstack_component from '@jay-framework/fullstack-component';
+import { ConsoleContext } from '@jay-framework/fullstack-component';
+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.
+ *
+ * Data collection schema:
+ *   _id:       string  — "{version}__{path}" (unique key)
+ *   version:   string  — build version (semver)
+ *   path:      string  — relative file path within backend dir
+ *   content:   string  — file content (text)
+ *   fileType:  string  — extension (js, json)
+ *   sizeBytes: number  — content byte length
+ *   category:  string  — 'eager' | 'lazy'
+ */
+
+interface WixDataArtifactStoreOptions {
+    wixClient: WixClient;
+    collectionId: string;
+    cacheDir: string;
+    version: string;
+    moduleRegistry?: Record<string, any>;
+}
+declare class WixDataArtifactStore implements ArtifactStore {
+    readonly collectionId: string;
+    readonly version: string;
+    private readonly cacheDir;
+    private readonly dataClient;
+    private readonly moduleRegistry;
+    private manifestCache?;
+    private moduleCache;
+    private fetchPromises;
+    constructor(options: WixDataArtifactStoreOptions);
+    readManifest(): Promise<RouteManifest>;
+    readCacheData(relativePath: string): Promise<CacheEntry>;
+    readPagePartsConfig(relativePath: string): Promise<any>;
+    loadServerElement(relativePath: string): Promise<ServerElementModule>;
+    loadModule(modulePath: string, _local?: boolean): Promise<any>;
+    getAssetPath(relativePath: string): string;
+    getBuildDir(): string;
+    loadEagerFiles(): Promise<void>;
+    /**
+     * Write a single file to the data collection.
+     */
+    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;
+        category: 'eager' | 'lazy';
+    }>): Promise<number>;
+    private ensureFile;
+    private fetchFromCollection;
+    private writeToCache;
+}
+
+interface BuildEntryInput {
+    collectionId?: string;
+    staticBaseUrl?: string;
+    excludePlugins?: string;
+}
+declare const buildEntry: _jay_framework_fullstack_component.JayCliCommand<BuildEntryInput> & _jay_framework_fullstack_component.JayCliCommandDefinition<BuildEntryInput, [ConsoleContext]>;
+
+interface UploadBackendInput {
+    collectionId?: string;
+    dryRun?: boolean;
+}
+declare const uploadBackend: _jay_framework_fullstack_component.JayCliCommand<UploadBackendInput> & _jay_framework_fullstack_component.JayCliCommandDefinition<UploadBackendInput, [WixClientService, ConsoleContext]>;
+
+interface DeployBaasInput {
+    dryRun?: boolean;
+}
+declare const deployBaas: _jay_framework_fullstack_component.JayCliCommand<DeployBaasInput> & _jay_framework_fullstack_component.JayCliCommandDefinition<DeployBaasInput, [ConsoleContext]>;
+
+interface DeployInput {
+    collectionId?: string;
+    staticBaseUrl?: string;
+    excludePlugins?: string;
+    dryRun?: boolean;
+}
+declare const deploy: _jay_framework_fullstack_component.JayCliCommand<DeployInput> & _jay_framework_fullstack_component.JayCliCommandDefinition<DeployInput, [WixClientService, ConsoleContext]>;
+
+/**
+ * wix-deploy setup hook
+ *
+ * Runs after wix-server-client setup. Reads wix.config.json to populate
+ * clientId and siteId in config/.wix.yaml (if they're still placeholders),
+ * then validates the data collection exists.
+ */
+interface SetupContext {
+    configDir: string;
+    projectRoot: string;
+    initError?: Error;
+}
+interface SetupResult {
+    status: 'configured' | 'needs-config' | 'error';
+    message?: string;
+    configCreated?: string[];
+}
+declare function setupWixDeploy(ctx: SetupContext): Promise<SetupResult>;
+
+export { WixDataArtifactStore, type WixDataArtifactStoreOptions, buildEntry, deploy, deployBaas, setupWixDeploy, uploadBackend };