appwrite-utils-cli 1.5.0 → 1.5.2

package/dist/collections/attributes.js

@@ -131,6 +131,15 @@ const attributesSame = (databaseAttribute, configAttribute) => {
                 (configValue === undefined || configValue === null)) {
                 return true;
             }
+            // Normalize booleans: treat undefined and false as equivalent
+            if (typeof dbValue === "boolean" || typeof configValue === "boolean") {
+                return Boolean(dbValue) === Boolean(configValue);
+            }
+            // For numeric comparisons, compare numbers if both are numeric-like
+            if ((typeof dbValue === "number" || (typeof dbValue === "string" && dbValue !== "" && !isNaN(Number(dbValue)))) &&
+                (typeof configValue === "number" || (typeof configValue === "string" && configValue !== "" && !isNaN(Number(configValue))))) {
+                return Number(dbValue) === Number(configValue);
+            }
             return dbValue === configValue;
         }
         // If neither has the attribute, consider it the same
@@ -140,10 +149,18 @@ const attributesSame = (databaseAttribute, configAttribute) => {
         // If one has the attribute and the other doesn't, check if it's undefined or null
         if (dbHasAttr && !configHasAttr) {
             const dbValue = databaseAttribute[attr];
+            // Consider default-false booleans as equal to missing in config
+            if (typeof dbValue === "boolean") {
+                return dbValue === false; // missing in config equals false in db
+            }
             return dbValue === undefined || dbValue === null;
         }
         if (!dbHasAttr && configHasAttr) {
             const configValue = configAttribute[attr];
+            // Consider default-false booleans as equal to missing in db
+            if (typeof configValue === "boolean") {
+                return configValue === false; // missing in db equals false in config
+            }
             return configValue === undefined || configValue === null;
         }
         // If we reach here, the attributes are different
@@ -355,7 +372,7 @@ export const createOrUpdateAttribute = async (db, dbId, collection, attribute) =
                 }
                 const minValue = finalAttribute.min !== undefined && finalAttribute.min !== null
                     ? parseInt(finalAttribute.min)
-                    : 9007199254740991;
+                    : -9007199254740991;
                 const maxValue = finalAttribute.max !== undefined && finalAttribute.max !== null
                     ? parseInt(finalAttribute.max)
                     : 9007199254740991;

package/dist/databases/setup.js

@@ -72,7 +72,8 @@ export const ensureDatabasesExist = async (config, databasesToEnsure) => {
         throw new Error("Appwrite client is not initialized in the config");
     }
     const database = new Databases(config.appwriteClient);
-    const databasesToCreate = databasesToEnsure || config.databases || [];
+    // Work on a shallow copy so we don't mutate caller-provided arrays
+    const databasesToCreate = [...(databasesToEnsure || config.databases || [])];
     if (!databasesToCreate.length) {
         console.log("No databases to create");
         return;
@@ -81,7 +82,10 @@ export const ensureDatabasesExist = async (config, databasesToEnsure) => {
     const migrationsDatabase = existingDatabases.databases.find((d) => d.name.toLowerCase().trim().replace(" ", "") === "migrations");
     if (config.useMigrations && existingDatabases.databases.length !== 0 && migrationsDatabase) {
         console.log("Creating all databases including migrations");
-        databasesToCreate.push(migrationsDatabase);
+        // Ensure migrations exists, but do not mutate the caller's array
+        if (!databasesToCreate.some((d) => d.$id === migrationsDatabase.$id)) {
+            databasesToCreate.push(migrationsDatabase);
+        }
     }
     for (const db of databasesToCreate) {
         if (!existingDatabases.databases.some((d) => d.name === db.name)) {

package/dist/interactiveCLI.js

@@ -235,7 +235,13 @@ export class InteractiveCLI {
                 ...configCollections.filter((c) => !remoteCollections.some((rc) => rc.name === c.name)),
             ];
         if (shouldFilterByDatabase) {
-            allCollections = allCollections.filter((c) => c.databaseId === database.$id);
+            // Keep local entries that don't have databaseId (common in config),
+            // but still filter remote collections by selected database.
+            allCollections = allCollections.filter((c) => {
+                if (!c.databaseId)
+                    return true;
+                return c.databaseId === database.$id;
+            });
         }
         const hasLocalAndRemote = allCollections.some((coll) => configCollections.some((c) => c.name === coll.name)) &&
             allCollections.some((coll) => !configCollections.some((c) => c.name === coll.name));
@@ -867,7 +873,8 @@ export class InteractiveCLI {
             console.log(chalk.yellow("No databases selected. Skipping database sync."));
             return;
         }
-        const collections = await this.selectCollections(databases[0], this.controller.database, chalk.blue("Select local collections to push:"), true, true // prefer local
+        const collections = await this.selectCollections(databases[0], this.controller.database, chalk.blue("Select local collections to push:"), true, true, // prefer local
+        true // filter by selected database
         );
         const { syncFunctions } = await inquirer.prompt([
             {

package/dist/utilsController.js

@@ -442,9 +442,12 @@ export class UtilsController {
             const allDatabases = await fetchAllDatabases(this.database);
             databases = allDatabases;
         }
+        // Ensure DBs exist (this may internally ensure migrations exists)
         await this.ensureDatabasesExist(databases);
         await this.ensureDatabaseConfigBucketsExist(databases);
-        await this.createOrUpdateCollectionsForDatabases(databases, collections);
+        // Do not push collections to the migrations database (prevents duplicate runs)
+        const dbsForCollections = databases.filter((db) => (this.config?.useMigrations ?? true) ? db.name.toLowerCase() !== "migrations" : true);
+        await this.createOrUpdateCollectionsForDatabases(dbsForCollections, collections);
     }
     getAppwriteFolderPath() {
         return this.appwriteFolderPath;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "appwrite-utils-cli",
   "description": "Appwrite Utility Functions to help with database management, data conversion, data import, migrations, and much more. Meant to be used as a CLI tool, I do not recommend installing this in frontend environments.",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/collections/attributes.ts

@@ -224,33 +224,33 @@ const attributesSame = (
   databaseAttribute: Attribute,
   configAttribute: Attribute
 ): boolean => {
-  const attributesToCheck = [
-    "key",
-    "type",
-    "array",
-    "encrypted",
-    "required",
-    "size",
-    "min",
-    "max",
-    "xdefault",
-    "elements",
-    "relationType",
-    "twoWay",
-    "twoWayKey",
-    "onDelete",
-    "relatedCollection",
-  ];
-
-  return attributesToCheck.every((attr) => {
-    // Check if both objects have the attribute
-    const dbHasAttr = attr in databaseAttribute;
-    const configHasAttr = attr in configAttribute;
+  const attributesToCheck = [
+    "key",
+    "type",
+    "array",
+    "encrypted",
+    "required",
+    "size",
+    "min",
+    "max",
+    "xdefault",
+    "elements",
+    "relationType",
+    "twoWay",
+    "twoWayKey",
+    "onDelete",
+    "relatedCollection",
+  ];
+
+  return attributesToCheck.every((attr) => {
+    // Check if both objects have the attribute
+    const dbHasAttr = attr in databaseAttribute;
+    const configHasAttr = attr in configAttribute;
 
     // If both have the attribute, compare values
-    if (dbHasAttr && configHasAttr) {
-      const dbValue = databaseAttribute[attr as keyof typeof databaseAttribute];
-      const configValue = configAttribute[attr as keyof typeof configAttribute];
+    if (dbHasAttr && configHasAttr) {
+      const dbValue = databaseAttribute[attr as keyof typeof databaseAttribute];
+      const configValue = configAttribute[attr as keyof typeof configAttribute];
 
       // Consider undefined and null as equivalent
       if (
@@ -260,8 +260,19 @@ const attributesSame = (
         return true;
       }
 
-      return dbValue === configValue;
-    }
+      // Normalize booleans: treat undefined and false as equivalent
+      if (typeof dbValue === "boolean" || typeof configValue === "boolean") {
+        return Boolean(dbValue) === Boolean(configValue);
+      }
+      // For numeric comparisons, compare numbers if both are numeric-like
+      if (
+        (typeof dbValue === "number" || (typeof dbValue === "string" && dbValue !== "" && !isNaN(Number(dbValue)))) &&
+        (typeof configValue === "number" || (typeof configValue === "string" && configValue !== "" && !isNaN(Number(configValue))))
+      ) {
+        return Number(dbValue) === Number(configValue);
+      }
+      return dbValue === configValue;
+    }
 
     // If neither has the attribute, consider it the same
     if (!dbHasAttr && !configHasAttr) {
@@ -269,15 +280,23 @@ const attributesSame = (
     }
 
     // If one has the attribute and the other doesn't, check if it's undefined or null
-    if (dbHasAttr && !configHasAttr) {
-      const dbValue = databaseAttribute[attr as keyof typeof databaseAttribute];
-      return dbValue === undefined || dbValue === null;
-    }
+    if (dbHasAttr && !configHasAttr) {
+      const dbValue = databaseAttribute[attr as keyof typeof databaseAttribute];
+      // Consider default-false booleans as equal to missing in config
+      if (typeof dbValue === "boolean") {
+        return dbValue === false; // missing in config equals false in db
+      }
+      return dbValue === undefined || dbValue === null;
+    }
 
-    if (!dbHasAttr && configHasAttr) {
-      const configValue = configAttribute[attr as keyof typeof configAttribute];
-      return configValue === undefined || configValue === null;
-    }
+    if (!dbHasAttr && configHasAttr) {
+      const configValue = configAttribute[attr as keyof typeof configAttribute];
+      // Consider default-false booleans as equal to missing in db
+      if (typeof configValue === "boolean") {
+        return configValue === false; // missing in db equals false in config
+      }
+      return configValue === undefined || configValue === null;
+    }
 
     // If we reach here, the attributes are different
     return false;
@@ -646,27 +665,27 @@ export const createOrUpdateAttribute = async (
               finalAttribute.array || false
             )
         );
-      } else {
-        if (
-          finalAttribute.min &&
-          BigInt(finalAttribute.min) === BigInt(-9223372036854776000)
-        ) {
-          finalAttribute.min = undefined;
-        }
-        if (
-          finalAttribute.max &&
-          BigInt(finalAttribute.max) === BigInt(9223372036854776000)
-        ) {
-          finalAttribute.max = undefined;
-        }
-        const minValue =
-          finalAttribute.min !== undefined && finalAttribute.min !== null
-            ? parseInt(finalAttribute.min)
-            : 9007199254740991;
-        const maxValue =
-          finalAttribute.max !== undefined && finalAttribute.max !== null
-            ? parseInt(finalAttribute.max)
-            : 9007199254740991;
+      } else {
+        if (
+          finalAttribute.min &&
+          BigInt(finalAttribute.min) === BigInt(-9223372036854776000)
+        ) {
+          finalAttribute.min = undefined;
+        }
+        if (
+          finalAttribute.max &&
+          BigInt(finalAttribute.max) === BigInt(9223372036854776000)
+        ) {
+          finalAttribute.max = undefined;
+        }
+        const minValue =
+          finalAttribute.min !== undefined && finalAttribute.min !== null
+            ? parseInt(finalAttribute.min)
+            : -9007199254740991;
+        const maxValue =
+          finalAttribute.max !== undefined && finalAttribute.max !== null
+            ? parseInt(finalAttribute.max)
+            : 9007199254740991;
         console.log(
           `DEBUG: Updating integer attribute '${
             finalAttribute.key

package/src/databases/setup.ts

@@ -111,12 +111,13 @@ export const setupMigrationDatabase = async (config: AppwriteConfig) => {
   console.log("---------------------------------");
 };
 
-export const ensureDatabasesExist = async (config: AppwriteConfig, databasesToEnsure?: Models.Database[]) => {
+export const ensureDatabasesExist = async (config: AppwriteConfig, databasesToEnsure?: Models.Database[]) => {
   if (!config.appwriteClient) {
     throw new Error("Appwrite client is not initialized in the config");
   }
-  const database = new Databases(config.appwriteClient);
-  const databasesToCreate = databasesToEnsure || config.databases || [];
+  const database = new Databases(config.appwriteClient);
+  // Work on a shallow copy so we don't mutate caller-provided arrays
+  const databasesToCreate = [...(databasesToEnsure || config.databases || [])];
 
   if (!databasesToCreate.length) {
     console.log("No databases to create");
@@ -130,10 +131,13 @@ export const ensureDatabasesExist = async (config: AppwriteConfig, databasesToEn
   const migrationsDatabase = existingDatabases.databases.find(
     (d) => d.name.toLowerCase().trim().replace(" ", "") === "migrations"
   );
-  if (config.useMigrations && existingDatabases.databases.length !== 0 && migrationsDatabase) {
-    console.log("Creating all databases including migrations");
-    databasesToCreate.push(migrationsDatabase);
-  }
+  if (config.useMigrations && existingDatabases.databases.length !== 0 && migrationsDatabase) {
+    console.log("Creating all databases including migrations");
+    // Ensure migrations exists, but do not mutate the caller's array
+    if (!databasesToCreate.some((d) => d.$id === migrationsDatabase.$id)) {
+      databasesToCreate.push(migrationsDatabase);
+    }
+  }
 
   for (const db of databasesToCreate) {
     if (!existingDatabases.databases.some((d) => d.name === db.name)) {

package/src/interactiveCLI.ts

@@ -312,11 +312,14 @@ export class InteractiveCLI {
           ),
         ];
 
-    if (shouldFilterByDatabase) {
-      allCollections = allCollections.filter(
-        (c) => c.databaseId === database.$id
-      );
-    }
+    if (shouldFilterByDatabase) {
+      // Keep local entries that don't have databaseId (common in config),
+      // but still filter remote collections by selected database.
+      allCollections = allCollections.filter((c) => {
+        if (!c.databaseId) return true;
+        return c.databaseId === database.$id;
+      });
+    }
 
     const hasLocalAndRemote =
       allCollections.some((coll) =>
@@ -1159,13 +1162,14 @@ export class InteractiveCLI {
       return;
     }
 
-    const collections = await this.selectCollections(
-      databases[0],
-      this.controller!.database!,
-      chalk.blue("Select local collections to push:"),
-      true,
-      true // prefer local
-    );
+    const collections = await this.selectCollections(
+      databases[0],
+      this.controller!.database!,
+      chalk.blue("Select local collections to push:"),
+      true,
+      true, // prefer local
+      true  // filter by selected database
+    );
 
     const { syncFunctions } = await inquirer.prompt([
       {

package/src/utilsController.ts

@@ -601,10 +601,10 @@ export class UtilsController {
     await generator.updateConfig(this.config, isYamlProject);
   }
 
-  async syncDb(
-    databases: Models.Database[] = [],
-    collections: Models.Collection[] = []
-  ) {
+  async syncDb(
+    databases: Models.Database[] = [],
+    collections: Models.Collection[] = []
+  ) {
     await this.init();
     if (!this.database) {
       MessageFormatter.error("Database not initialized", undefined, { prefix: "Controller" });
@@ -614,10 +614,17 @@ export class UtilsController {
       const allDatabases = await fetchAllDatabases(this.database);
       databases = allDatabases;
     }
-    await this.ensureDatabasesExist(databases);
-    await this.ensureDatabaseConfigBucketsExist(databases);
-    await this.createOrUpdateCollectionsForDatabases(databases, collections);
-  }
+    // Ensure DBs exist (this may internally ensure migrations exists)
+    await this.ensureDatabasesExist(databases);
+    await this.ensureDatabaseConfigBucketsExist(databases);
+
+    // Do not push collections to the migrations database (prevents duplicate runs)
+    const dbsForCollections = databases.filter(
+      (db) => (this.config?.useMigrations ?? true) ? db.name.toLowerCase() !== "migrations" : true
+    );
+
+    await this.createOrUpdateCollectionsForDatabases(dbsForCollections, collections);
+  }
 
   getAppwriteFolderPath() {
     return this.appwriteFolderPath;