appwrite-utils-cli 0.0.286 → 0.9.0

package/dist/migrations/appwriteToX.d.ts

@@ -1,88 +1,89 @@
-import { type Models } from "node-appwrite";
+import { Storage, type Models } from "node-appwrite";
 import { type AppwriteConfig } from "appwrite-utils";
 export declare class AppwriteToX {
     config: AppwriteConfig;
+    storage: Storage;
     updatedConfig: AppwriteConfig;
     collToAttributeMap: Map<string, ({
         type: "string";
         key: string;
         size: number;
+        format?: string | null | undefined;
+        description?: string | Record<string, string> | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: string | null | undefined;
         encrypted?: boolean | undefined;
-        format?: string | null | undefined;
-        description?: string | Record<string, string> | undefined;
     } | {
         type: "integer";
         key: string;
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: number | null | undefined;
-        description?: string | Record<string, string> | null | undefined;
         min?: number | undefined;
         max?: number | undefined;
     } | {
         type: "float";
         key: string;
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: number | null | undefined;
-        description?: string | Record<string, string> | null | undefined;
         min?: number | undefined;
         max?: number | undefined;
     } | {
         type: "boolean";
         key: string;
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: boolean | null | undefined;
-        description?: string | Record<string, string> | null | undefined;
     } | {
         type: "datetime";
         key: string;
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: string | null | undefined;
-        description?: string | Record<string, string> | null | undefined;
     } | {
         type: "email";
         key: string;
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: string | null | undefined;
-        description?: string | Record<string, string> | null | undefined;
     } | {
         type: "ip";
         key: string;
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: string | null | undefined;
-        description?: string | Record<string, string> | null | undefined;
     } | {
         type: "url";
         key: string;
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: string | null | undefined;
-        description?: string | Record<string, string> | null | undefined;
     } | {
         type: "enum";
         key: string;
         elements: string[];
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
         xdefault?: string | null | undefined;
-        description?: string | Record<string, string> | null | undefined;
     } | {
         type: "relationship";
         key: string;
@@ -92,17 +93,17 @@ export declare class AppwriteToX {
         twoWayKey: string;
         onDelete: "setNull" | "cascade" | "restrict";
         side: "parent" | "child";
+        description?: string | Record<string, string> | null | undefined;
+        required?: boolean | undefined;
         array?: boolean | undefined;
         error?: string | undefined;
-        required?: boolean | undefined;
-        description?: string | Record<string, string> | null | undefined;
         importMapping?: {
             originalIdField: string;
             targetField?: string | undefined;
         } | undefined;
     })[]>;
     appwriteFolderPath: string;
-    constructor(config: AppwriteConfig, appwriteFolderPath: string);
+    constructor(config: AppwriteConfig, appwriteFolderPath: string, storage: Storage);
     parsePermissionString: (permissionString: string) => {
         permission: string;
         target: string;
@@ -115,6 +116,6 @@ export declare class AppwriteToX {
         target: string;
     })[];
     updateCollectionConfigAttributes: (collection: Models.Collection) => void;
-    appwriteSync(config: AppwriteConfig): Promise<void>;
-    toSchemas(): Promise<void>;
+    appwriteSync(config: AppwriteConfig, databases?: Models.Database[]): Promise<void>;
+    toSchemas(databases?: Models.Database[]): Promise<void>;
 }

package/dist/migrations/appwriteToX.js

@@ -1,17 +1,20 @@
 import { SchemaGenerator } from "./schemaStrings.js";
-import { Databases, Query } from "node-appwrite";
+import { Client, Compression, Databases, Query, Storage, } from "node-appwrite";
 import { fetchAllCollections } from "./collections.js";
 import { fetchAllDatabases } from "./databases.js";
 import { CollectionSchema, attributeSchema, AppwriteConfigSchema, permissionsSchema, attributesSchema, indexesSchema, parseAttribute, } from "appwrite-utils";
 import { getDatabaseFromConfig } from "./afterImportActions.js";
+import { listBuckets } from "../storage/methods.js";
 export class AppwriteToX {
     config;
+    storage;
     updatedConfig;
     collToAttributeMap = new Map();
     appwriteFolderPath;
-    constructor(config, appwriteFolderPath) {
+    constructor(config, appwriteFolderPath, storage) {
         this.config = config;
         this.updatedConfig = config;
+        this.storage = storage;
         this.appwriteFolderPath = appwriteFolderPath;
     }
     // Function to parse a single permission string
@@ -43,15 +46,36 @@ export class AppwriteToX {
                 ?.push(attributeParsed);
         }
     };
-    async appwriteSync(config) {
+    async appwriteSync(config, databases) {
         const db = getDatabaseFromConfig(config);
-        const databases = await fetchAllDatabases(db);
+        if (!databases) {
+            databases = await fetchAllDatabases(db);
+        }
         let updatedConfig = { ...config };
+        // Fetch all buckets
+        const allBuckets = await listBuckets(this.storage);
         // Loop through each database
         for (const database of databases) {
             if (database.name.toLowerCase() === "migrations") {
                 continue;
             }
+            // Match bucket to database
+            const matchedBucket = allBuckets.buckets.find((bucket) => bucket.$id.toLowerCase().includes(database.$id.toLowerCase()));
+            if (matchedBucket) {
+                const dbConfig = updatedConfig.databases.find((db) => db.$id === database.$id);
+                if (dbConfig) {
+                    dbConfig.bucket = {
+                        $id: matchedBucket.$id,
+                        name: matchedBucket.name,
+                        enabled: matchedBucket.enabled,
+                        maximumFileSize: matchedBucket.maximumFileSize,
+                        allowedFileExtensions: matchedBucket.allowedFileExtensions,
+                        compression: matchedBucket.compression,
+                        encryption: matchedBucket.encryption,
+                        antivirus: matchedBucket.antivirus,
+                    };
+                }
+            }
             const collections = await fetchAllCollections(database.$id, db);
             // Loop through each collection in the current database
             if (!updatedConfig.collections) {
@@ -117,10 +141,22 @@ export class AppwriteToX {
             }
             console.log(`Processed ${collections.length} collections in ${database.name}`);
         }
+        // Add unmatched buckets as global buckets
+        const globalBuckets = allBuckets.buckets.filter((bucket) => !updatedConfig.databases.some((db) => db.bucket && db.bucket.$id === bucket.$id));
+        updatedConfig.buckets = globalBuckets.map((bucket) => ({
+            $id: bucket.$id,
+            name: bucket.name,
+            enabled: bucket.enabled,
+            maximumFileSize: bucket.maximumFileSize,
+            allowedFileExtensions: bucket.allowedFileExtensions,
+            compression: bucket.compression,
+            encryption: bucket.encryption,
+            antivirus: bucket.antivirus,
+        }));
         this.updatedConfig = updatedConfig;
     }
-    async toSchemas() {
-        await this.appwriteSync(this.config);
+    async toSchemas(databases) {
+        await this.appwriteSync(this.config, databases);
         const generator = new SchemaGenerator(this.updatedConfig, this.appwriteFolderPath);
         generator.updateTsSchemas();
         generator.generateSchemas();

package/dist/migrations/attributes.js

@@ -2,6 +2,7 @@ import { Query } from "node-appwrite";
 import { attributeSchema, parseAttribute, } from "appwrite-utils";
 import { nameToIdMapping, enqueueOperation } from "./queue.js";
 import _ from "lodash";
+import { tryAwaitWithRetry } from "../utils/helperFunctions.js";
 const attributesSame = (databaseAttribute, configAttribute) => {
     return (databaseAttribute.key == configAttribute.key &&
         databaseAttribute.type == configAttribute.type &&
@@ -105,10 +106,10 @@ export const createOrUpdateAttribute = async (db, dbId, collection, attribute) =
     switch (finalAttribute.type) {
         case "string":
             if (action === "create") {
-                await db.createStringAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.size, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array || false, finalAttribute.encrypted);
+                await tryAwaitWithRetry(async () => await db.createStringAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.size, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array || false, finalAttribute.encrypted));
             }
             else {
-                await db.updateStringAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined);
+                await tryAwaitWithRetry(async () => await db.updateStringAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined));
             }
             break;
         case "integer":
@@ -121,7 +122,7 @@ export const createOrUpdateAttribute = async (db, dbId, collection, attribute) =
                     BigInt(finalAttribute.max) === BigInt(9223372036854776000)) {
                     delete finalAttribute.max;
                 }
-                await db.createIntegerAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.min, finalAttribute.max, finalAttribute.xdefault || undefined, finalAttribute.array);
+                await tryAwaitWithRetry(async () => await db.createIntegerAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.min, finalAttribute.max, finalAttribute.xdefault || undefined, finalAttribute.array));
             }
             else {
                 if (finalAttribute.min &&
@@ -132,71 +133,71 @@ export const createOrUpdateAttribute = async (db, dbId, collection, attribute) =
                     BigInt(finalAttribute.max) === BigInt(9223372036854776000)) {
                     delete finalAttribute.max;
                 }
-                await db.updateIntegerAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.min || 0, finalAttribute.max || 2147483647, finalAttribute.xdefault || undefined);
+                await tryAwaitWithRetry(async () => await db.updateIntegerAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.min || 0, finalAttribute.max || 2147483647, finalAttribute.xdefault || undefined));
             }
             break;
         case "float":
             if (action === "create") {
-                await db.createFloatAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.min, finalAttribute.max, finalAttribute.xdefault || undefined, finalAttribute.array);
+                await tryAwaitWithRetry(async () => await db.createFloatAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.min, finalAttribute.max, finalAttribute.xdefault || undefined, finalAttribute.array));
             }
             else {
-                await db.updateFloatAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.min || 0, finalAttribute.max || 2147483647, finalAttribute.xdefault || undefined);
+                await tryAwaitWithRetry(async () => await db.updateFloatAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.min || 0, finalAttribute.max || 2147483647, finalAttribute.xdefault || undefined));
             }
             break;
         case "boolean":
             if (action === "create") {
-                await db.createBooleanAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array);
+                await tryAwaitWithRetry(async () => await db.createBooleanAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array));
             }
             else {
-                await db.updateBooleanAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || null);
+                await tryAwaitWithRetry(async () => await db.updateBooleanAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || null));
             }
             break;
         case "datetime":
             if (action === "create") {
-                await db.createDatetimeAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array);
+                await tryAwaitWithRetry(async () => await db.createDatetimeAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array));
             }
             else {
-                await db.updateDatetimeAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined);
+                await tryAwaitWithRetry(async () => await db.updateDatetimeAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined));
             }
             break;
         case "email":
             if (action === "create") {
-                await db.createEmailAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array);
+                await tryAwaitWithRetry(async () => await db.createEmailAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array));
             }
             else {
-                await db.updateEmailAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined);
+                await tryAwaitWithRetry(async () => await db.updateEmailAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined));
             }
             break;
         case "ip":
             if (action === "create") {
-                await db.createIpAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array);
+                await tryAwaitWithRetry(async () => await db.createIpAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array));
             }
             else {
-                await db.updateIpAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined);
+                await tryAwaitWithRetry(async () => await db.updateIpAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined));
             }
             break;
         case "url":
             if (action === "create") {
-                await db.createUrlAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array);
+                await tryAwaitWithRetry(async () => await db.createUrlAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array));
             }
             else {
-                await db.updateUrlAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined);
+                await tryAwaitWithRetry(async () => await db.updateUrlAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.required || false, finalAttribute.xdefault || undefined));
             }
             break;
         case "enum":
             if (action === "create") {
-                await db.createEnumAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.elements, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array);
+                await tryAwaitWithRetry(async () => await db.createEnumAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.elements, finalAttribute.required || false, finalAttribute.xdefault || undefined, finalAttribute.array));
             }
             else {
-                await db.updateEnumAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.elements, finalAttribute.required || false, finalAttribute.xdefault || undefined);
+                await tryAwaitWithRetry(async () => await db.updateEnumAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.elements, finalAttribute.required || false, finalAttribute.xdefault || undefined));
             }
             break;
         case "relationship":
             if (action === "create") {
-                await db.createRelationshipAttribute(dbId, collection.$id, relatedCollectionId, finalAttribute.relationType, finalAttribute.twoWay, finalAttribute.key, finalAttribute.twoWayKey, finalAttribute.onDelete);
+                await tryAwaitWithRetry(async () => await db.createRelationshipAttribute(dbId, collection.$id, relatedCollectionId, finalAttribute.relationType, finalAttribute.twoWay, finalAttribute.key, finalAttribute.twoWayKey, finalAttribute.onDelete));
             }
             else {
-                await db.updateRelationshipAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.onDelete);
+                await tryAwaitWithRetry(async () => await db.updateRelationshipAttribute(dbId, collection.$id, finalAttribute.key, finalAttribute.onDelete));
             }
             break;
         default: