appwrite-utils-cli 1.7.9 → 1.8.2

package/dist/migrations/appwriteToX.d.ts

@@ -8,94 +8,159 @@ export declare class AppwriteToX {
     updatedConfig: AppwriteConfig;
     collToAttributeMap: Map<string, ({
         key: string;
+        required: boolean;
         type: "string";
         size: number;
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         xdefault?: string | null | undefined;
         encrypted?: boolean | undefined;
-        format?: string | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "integer";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         min?: number | undefined;
         max?: number | undefined;
         xdefault?: number | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "double";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         min?: number | undefined;
         max?: number | undefined;
         xdefault?: number | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "float";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         min?: number | undefined;
         max?: number | undefined;
         xdefault?: number | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "boolean";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         xdefault?: boolean | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "datetime";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         xdefault?: string | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "email";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         xdefault?: string | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "ip";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         xdefault?: string | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "url";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         xdefault?: string | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "enum";
         elements: string[];
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         xdefault?: string | null | undefined;
     } | {
         key: string;
+        required: boolean;
         type: "relationship";
         relatedCollection: string;
         relationType: "oneToMany" | "manyToOne" | "oneToOne" | "manyToMany";
         twoWay: boolean;
         onDelete: "setNull" | "cascade" | "restrict";
-        error?: string | undefined;
-        required?: boolean | undefined;
         array?: boolean | undefined;
+        format?: string | undefined;
+        status?: string | undefined;
+        attributes?: string[] | undefined;
+        orders?: string[] | undefined;
+        $createdAt?: string | undefined;
+        $updatedAt?: string | undefined;
+        error?: string | undefined;
         twoWayKey?: string | undefined;
         side?: "parent" | "child" | undefined;
         importMapping?: {

package/dist/migrations/comprehensiveTransfer.d.ts

@@ -62,6 +62,8 @@ export declare class ComprehensiveTransfer {
     private startTime;
     private tempDir;
     private cachedMaxFileSize?;
+    private sourceAdapter?;
+    private targetAdapter?;
     constructor(options: ComprehensiveTransferOptions);
     execute(): Promise<TransferResults>;
     private transferAllUsers;

package/dist/migrations/comprehensiveTransfer.js

@@ -12,6 +12,8 @@ import pLimit from "p-limit";
 import chalk from "chalk";
 import { join } from "node:path";
 import fs from "node:fs";
+import { getAdapter } from "../utils/getClientFromConfig.js";
+import { mapToCreateAttributeParams } from "../shared/attributeMapper.js";
 export class ComprehensiveTransfer {
     options;
     sourceClient;
@@ -33,6 +35,8 @@ export class ComprehensiveTransfer {
     startTime;
     tempDir;
     cachedMaxFileSize; // Cache successful maximumFileSize for subsequent buckets
+    sourceAdapter;
+    targetAdapter;
     constructor(options) {
         this.options = options;
         this.sourceClient = getClient(options.sourceEndpoint, options.sourceProject, options.sourceKey);
@@ -70,6 +74,11 @@ export class ComprehensiveTransfer {
             MessageFormatter.info("Starting comprehensive transfer", {
                 prefix: "Transfer",
             });
+            // Initialize adapters for unified API (TablesDB or legacy via adapter)
+            const source = await getAdapter(this.options.sourceEndpoint, this.options.sourceProject, this.options.sourceKey, 'auto');
+            const target = await getAdapter(this.options.targetEndpoint, this.options.targetProject, this.options.targetKey, 'auto');
+            this.sourceAdapter = source.adapter;
+            this.targetAdapter = target.adapter;
             if (this.options.dryRun) {
                 MessageFormatter.info("DRY RUN MODE - No actual changes will be made", {
                     prefix: "Transfer",
@@ -807,17 +816,85 @@ export class ComprehensiveTransfer {
      * Helper method to create collection attributes with status checking
      */
     async createCollectionAttributesWithStatusCheck(databases, dbId, collection, attributes) {
-        // Import the enhanced attribute creation function
-        const { createUpdateCollectionAttributesWithStatusCheck } = await import("../collections/attributes.js");
-        return await createUpdateCollectionAttributesWithStatusCheck(databases, dbId, collection, attributes);
+        if (!this.targetAdapter) {
+            throw new Error('Target adapter not initialized');
+        }
+        try {
+            // Create non-relationship attributes first
+            const nonRel = (attributes || []).filter((a) => a.type !== 'relationship');
+            for (const attr of nonRel) {
+                const params = mapToCreateAttributeParams(attr, { databaseId: dbId, tableId: collection.$id });
+                await this.targetAdapter.createAttribute(params);
+                // Small delay between creations
+                await new Promise((r) => setTimeout(r, 150));
+            }
+            // Wait for attributes to become available
+            for (const attr of nonRel) {
+                const maxWait = 60000; // 60s
+                const start = Date.now();
+                let lastStatus = '';
+                while (Date.now() - start < maxWait) {
+                    try {
+                        const tableRes = await this.targetAdapter.getTable({ databaseId: dbId, tableId: collection.$id });
+                        const cols = tableRes.attributes || tableRes.columns || [];
+                        const col = cols.find((c) => c.key === attr.key);
+                        if (col) {
+                            if (col.status === 'available')
+                                break;
+                            if (col.status === 'failed' || col.status === 'stuck') {
+                                throw new Error(col.error || `Attribute ${attr.key} failed`);
+                            }
+                            lastStatus = col.status;
+                        }
+                        await new Promise((r) => setTimeout(r, 2000));
+                    }
+                    catch {
+                        await new Promise((r) => setTimeout(r, 2000));
+                    }
+                }
+                if (Date.now() - start >= maxWait) {
+                    MessageFormatter.warning(`Attribute ${attr.key} did not become available within 60s (last status: ${lastStatus})`, { prefix: 'Attributes' });
+                }
+            }
+            // Create relationship attributes
+            const rels = (attributes || []).filter((a) => a.type === 'relationship');
+            for (const attr of rels) {
+                const params = mapToCreateAttributeParams(attr, { databaseId: dbId, tableId: collection.$id });
+                await this.targetAdapter.createAttribute(params);
+                await new Promise((r) => setTimeout(r, 150));
+            }
+            return true;
+        }
+        catch (e) {
+            MessageFormatter.error('Failed creating attributes via adapter', e instanceof Error ? e : new Error(String(e)), { prefix: 'Attributes' });
+            return false;
+        }
     }
     /**
      * Helper method to create collection indexes with status checking
      */
     async createCollectionIndexesWithStatusCheck(dbId, databases, collectionId, collection, indexes) {
-        // Import the enhanced index creation function
-        const { createOrUpdateIndexesWithStatusCheck } = await import("../collections/indexes.js");
-        return await createOrUpdateIndexesWithStatusCheck(dbId, databases, collectionId, collection, indexes);
+        if (!this.targetAdapter) {
+            throw new Error('Target adapter not initialized');
+        }
+        try {
+            for (const idx of indexes || []) {
+                await this.targetAdapter.createIndex({
+                    databaseId: dbId,
+                    tableId: collectionId,
+                    key: idx.key,
+                    type: idx.type,
+                    attributes: idx.attributes,
+                    orders: idx.orders || []
+                });
+                await new Promise((r) => setTimeout(r, 150));
+            }
+            return true;
+        }
+        catch (e) {
+            MessageFormatter.error('Failed creating indexes via adapter', e instanceof Error ? e : new Error(String(e)), { prefix: 'Indexes' });
+            return false;
+        }
     }
     /**
      * Helper method to transfer documents between databases using bulk operations with content and permission-based filtering