appwrite-utils-cli 1.9.6 → 1.11.0

package/src/collections/{attributes.ts → columns.ts}

@@ -14,13 +14,11 @@ import {
   delay,
   tryAwaitWithRetry,
   calculateExponentialBackoff,
-} from "../utils/helperFunctions.js";
+} from "appwrite-utils-helpers";
 import chalk from "chalk";
 import { Decimal } from "decimal.js";
-import type { DatabaseAdapter, CreateAttributeParams, UpdateAttributeParams, DeleteAttributeParams } from "../adapters/DatabaseAdapter.js";
-import { logger } from "../shared/logging.js";
-import { MessageFormatter } from "../shared/messageFormatter.js";
-import { isDatabaseAdapter } from "../utils/typeGuards.js";
+import type { DatabaseAdapter, CreateAttributeParams, UpdateAttributeParams, DeleteAttributeParams } from "appwrite-utils-helpers";
+import { logger, MessageFormatter, isDatabaseAdapter } from "appwrite-utils-helpers";
 
 // Extreme values that Appwrite may return, which should be treated as undefined
 const EXTREME_MIN_INTEGER = -9223372036854776000;
@@ -28,6 +26,11 @@ const EXTREME_MAX_INTEGER = 9223372036854776000;
 const EXTREME_MIN_FLOAT = -1.7976931348623157e308;
 const EXTREME_MAX_FLOAT = 1.7976931348623157e308;
 
+/** Get columns/attributes array, preferring modern 'columns' over legacy 'attributes' */
+function getColumns(obj: any): any[] {
+  return obj.columns || obj.attributes || [];
+}
+
 /**
  * Type guard to check if an attribute has min/max properties
  */
@@ -651,13 +654,6 @@ const updateLegacyAttribute = async (
   collectionId: string,
   attribute: Attribute
 ): Promise<void> => {
-  console.log(`DEBUG updateLegacyAttribute before normalizeMinMaxValues:`, {
-    key: attribute.key,
-    type: attribute.type,
-    min: (attribute as any).min,
-    max: (attribute as any).max
-  });
-
   const { min: normalizedMin, max: normalizedMax } =
     normalizeMinMaxValues(attribute);
 
@@ -842,7 +838,7 @@ const waitForAttributeAvailable = async (
       const collection = isDatabaseAdapter(db)
         ? (await db.getTable({ databaseId: dbId, tableId: collectionId })).data
         : await db.getCollection(dbId, collectionId);
-      const attribute = (collection.attributes as any[]).find(
+      const attribute = (getColumns(collection) as any[]).find(
         (attr: AttributeWithStatus) => attr.key === attributeKey
       ) as AttributeWithStatus | undefined;
 
@@ -1458,7 +1454,7 @@ export const createOrUpdateAttribute = async (
   const updateEnabled = true;
   let finalAttribute: any = attribute;
   try {
-    const collectionAttr = collection.attributes.find(
+    const collectionAttr = getColumns(collection).find(
       (attr: any) => attr.key === attribute.key
     ) as unknown as any;
     foundAttribute = parseAttribute(collectionAttr);
@@ -1487,9 +1483,11 @@ export const createOrUpdateAttribute = async (
         await db.deleteAttribute(dbId, collection.$id, attribute.key);
       }
       // Remove from local collection metadata so downstream logic treats it as new
-      collection.attributes = collection.attributes.filter(
+      const filtered = getColumns(collection).filter(
         (attr: any) => attr.key !== attribute.key
       );
+      if ('columns' in collection) (collection as any).columns = filtered;
+      if ('attributes' in collection) (collection as any).attributes = filtered;
       foundAttribute = undefined;
     } catch (deleteError) {
       MessageFormatter.error(
@@ -1515,37 +1513,10 @@ export const createOrUpdateAttribute = async (
     //   `Updating attribute with same key ${attribute.key} but different values`
     // );
 
-    // DEBUG: Log before object merge to detect corruption
-    if ((attribute.key === 'conversationType' || attribute.key === 'messageStreakCount')) {
-      console.log(`[DEBUG] MERGE - key="${attribute.key}"`, {
-        found: {
-          elements: (foundAttribute as any)?.elements,
-          min: (foundAttribute as any)?.min,
-          max: (foundAttribute as any)?.max
-        },
-        desired: {
-          elements: (attribute as any)?.elements,
-          min: (attribute as any)?.min,
-          max: (attribute as any)?.max
-        }
-      });
-    }
-
     finalAttribute = {
       ...foundAttribute,
       ...attribute,
     };
-
-    // DEBUG: Log after object merge to detect corruption
-    if ((finalAttribute.key === 'conversationType' || finalAttribute.key === 'messageStreakCount')) {
-      console.log(`[DEBUG] AFTER_MERGE - key="${finalAttribute.key}"`, {
-        merged: {
-          elements: finalAttribute?.elements,
-          min: (finalAttribute as any)?.min,
-          max: (finalAttribute as any)?.max
-        }
-      });
-    }
     action = "update";
   } else if (
     !updateEnabled &&
@@ -1751,7 +1722,7 @@ export const createUpdateCollectionAttributesWithStatusCheck = async (
   attributes: Attribute[]
 ): Promise<boolean> => {
   const existingAttributes: Attribute[] =
-    collection.attributes.map((attr) => parseAttribute(attr as any)) || [];
+    getColumns(collection).map((attr) => parseAttribute(attr as any)) || [];
 
   const attributesToRemove = existingAttributes.filter(
     (attr) => !attributes.some((a) => a.key === attr.key)
@@ -1971,7 +1942,7 @@ export const createUpdateCollectionAttributes = async (
   );
 
   const existingAttributes: Attribute[] =
-    collection.attributes.map((attr) => parseAttribute(attr as any)) || [];
+    getColumns(collection).map((attr) => parseAttribute(attr as any)) || [];
 
   const attributesToRemove = existingAttributes.filter(
     (attr) => !attributes.some((a) => a.key === attr.key)