@njdamstra/appwrite-utils-cli 1.8.9 → 1.10.1

package/src/cli/commands/schemaCommands.ts

@@ -1,8 +1,8 @@
 import inquirer from "inquirer";
 import path from "path";
 import chalk from "chalk";
-import { MessageFormatter } from "../../shared/messageFormatter.js";
-import { SchemaGenerator } from "../../shared/schemaGenerator.js";
+import { MessageFormatter } from '@njdamstra/appwrite-utils-helpers';
+import { SchemaGenerator } from '@njdamstra/appwrite-utils-helpers';
 import { setupDirsFiles } from "../../utils/setupFiles.js";
 import { fetchAllDatabases } from "../../databases/methods.js";
 import type { InteractiveCLI } from "../../interactiveCLI.js";
@@ -126,7 +126,7 @@ export const schemaCommands = {
     ]);
 
     try {
-      const { ConstantsGenerator } = await import("../../utils/constantsGenerator.js");
+      const { ConstantsGenerator } = await import("@njdamstra/appwrite-utils-helpers");
       const generator = new ConstantsGenerator((cli as any).controller.config);
 
       const include = {

package/src/cli/commands/storageCommands.ts

@@ -2,10 +2,9 @@ import inquirer from "inquirer";
 import chalk from "chalk";
 import { Storage, Permission, Role, Compression, type Models } from "node-appwrite";
 import type { InteractiveCLI } from "../../interactiveCLI.js";
-import { MessageFormatter } from "../../shared/messageFormatter.js";
+import { MessageFormatter } from '@njdamstra/appwrite-utils-helpers';
 import { listBuckets, createBucket as createBucketApi, deleteBucket as deleteBucketApi } from "../../storage/methods.js";
-import { writeYamlConfig } from "../../config/yamlConfig.js";
-import { ConfigManager } from "../../config/ConfigManager.js";
+import { writeYamlConfig, ConfigManager } from "@njdamstra/appwrite-utils-helpers";
 
 export const storageCommands = {
   async createBucket(cli: InteractiveCLI): Promise<void> {

package/src/cli/commands/transferCommands.ts

@@ -1,9 +1,9 @@
 import inquirer from "inquirer";
 import { Databases, Storage } from "node-appwrite";
-import { MessageFormatter } from "../../shared/messageFormatter.js";
+import { MessageFormatter } from '@njdamstra/appwrite-utils-helpers';
 import { fetchAllDatabases } from "../../databases/methods.js";
 import { listBuckets } from "../../storage/methods.js";
-import { getClient } from "../../utils/getClientFromConfig.js";
+import { getClient } from "@njdamstra/appwrite-utils-helpers";
 import { ComprehensiveTransfer, type ComprehensiveTransferOptions } from "../../migrations/comprehensiveTransfer.js";
 import type { TransferOptions } from "../../migrations/transfer.js";
 import type { InteractiveCLI } from "../../interactiveCLI.js";
@@ -145,10 +145,7 @@ export const transferCommands = {
       fromDb,
       targetDb,
       isRemote,
-      collections:
-        selectedCollections.length > 0
-          ? selectedCollections.map((c: any) => c.$id)
-          : undefined,
+      collections: selectedCollections.map((c: any) => c.$id),
       sourceBucket,
       targetBucket,
     };

package/src/collections/attributes.ts

@@ -14,13 +14,11 @@ import {
   delay,
   tryAwaitWithRetry,
   calculateExponentialBackoff,
-} from "../utils/helperFunctions.js";
+} from "@njdamstra/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 "@njdamstra/appwrite-utils-helpers";
+import { logger, MessageFormatter, isDatabaseAdapter } from "@njdamstra/appwrite-utils-helpers";
 
 // Extreme values that Appwrite may return, which should be treated as undefined
 const EXTREME_MIN_INTEGER = -9223372036854776000;
@@ -595,6 +593,74 @@ const createLegacyAttribute = async (
         attribute.array || false
       );
       break;
+    case "varchar":
+      await db.createVarcharAttribute(
+        dbId,
+        collectionId,
+        attribute.key,
+        (attribute as any).size || 255,
+        attribute.required || false,
+        (attribute as any).xdefault !== undefined && !attribute.required
+          ? (attribute as any).xdefault
+          : undefined,
+        attribute.array || false,
+        (attribute as any).encrypt
+      );
+      break;
+    case "text":
+    case "mediumtext":
+    case "longtext": {
+      const createFn = attribute.type === "text"
+        ? db.createTextAttribute.bind(db)
+        : attribute.type === "mediumtext"
+          ? db.createMediumtextAttribute.bind(db)
+          : db.createLongtextAttribute.bind(db);
+      await createFn(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        (attribute as any).xdefault !== undefined && !attribute.required
+          ? (attribute as any).xdefault
+          : undefined,
+        attribute.array || false,
+        (attribute as any).encrypt
+      );
+      break;
+    }
+    case "point":
+      await db.createPointAttribute(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        (attribute as any).xdefault !== undefined && !attribute.required
+          ? (attribute as any).xdefault
+          : undefined
+      );
+      break;
+    case "line":
+      await db.createLineAttribute(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        (attribute as any).xdefault !== undefined && !attribute.required
+          ? (attribute as any).xdefault
+          : undefined
+      );
+      break;
+    case "polygon":
+      await db.createPolygonAttribute(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        (attribute as any).xdefault !== undefined && !attribute.required
+          ? (attribute as any).xdefault
+          : undefined
+      );
+      break;
     case "relationship":
       await db.createRelationshipAttribute(
         dbId,
@@ -617,6 +683,10 @@ const createLegacyAttribute = async (
           type: (attribute as any).type,
           supportedTypes: [
             "string",
+            "varchar",
+            "text",
+            "mediumtext",
+            "longtext",
             "integer",
             "double",
             "float",
@@ -626,6 +696,9 @@ const createLegacyAttribute = async (
             "ip",
             "url",
             "enum",
+            "point",
+            "line",
+            "polygon",
             "relationship",
           ],
           operation: "createLegacyAttribute",
@@ -651,13 +724,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);
 
@@ -779,6 +845,70 @@ const updateLegacyAttribute = async (
           : null
       );
       break;
+    case "varchar":
+      await db.updateVarcharAttribute(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        !attribute.required && (attribute as any).xdefault !== undefined
+          ? (attribute as any).xdefault
+          : null,
+        (attribute as any).size
+      );
+      break;
+    case "text":
+    case "mediumtext":
+    case "longtext": {
+      const updateFn = attribute.type === "text"
+        ? db.updateTextAttribute.bind(db)
+        : attribute.type === "mediumtext"
+          ? db.updateMediumtextAttribute.bind(db)
+          : db.updateLongtextAttribute.bind(db);
+      await updateFn(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        !attribute.required && (attribute as any).xdefault !== undefined
+          ? (attribute as any).xdefault
+          : null
+      );
+      break;
+    }
+    case "point":
+      await db.updatePointAttribute(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        !attribute.required && (attribute as any).xdefault !== undefined
+          ? (attribute as any).xdefault
+          : null
+      );
+      break;
+    case "line":
+      await db.updateLineAttribute(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        !attribute.required && (attribute as any).xdefault !== undefined
+          ? (attribute as any).xdefault
+          : null
+      );
+      break;
+    case "polygon":
+      await db.updatePolygonAttribute(
+        dbId,
+        collectionId,
+        attribute.key,
+        attribute.required || false,
+        !attribute.required && (attribute as any).xdefault !== undefined
+          ? (attribute as any).xdefault
+          : null
+      );
+      break;
     case "relationship":
       await db.updateRelationshipAttribute(
         dbId,
@@ -1057,6 +1187,14 @@ const getComparableFields = (type: string): string[] => {
     case "string":
       return [...baseFields, "size", "encrypt"];
 
+    case "varchar":
+      return [...baseFields, "size", "encrypt"];
+
+    case "text":
+    case "mediumtext":
+    case "longtext":
+      return [...baseFields, "encrypt"];
+
     case "integer":
     case "double":
     case "float":
@@ -1065,6 +1203,11 @@ const getComparableFields = (type: string): string[] => {
     case "enum":
       return [...baseFields, "elements"];
 
+    case "point":
+    case "line":
+    case "polygon":
+      return baseFields;
+
     case "relationship":
       return [
         ...baseFields,
@@ -1515,37 +1658,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 &&

package/src/collections/indexes.ts

@@ -1,9 +1,7 @@
 import { indexSchema, type Index } from "@njdamstra/appwrite-utils";
-import { Databases, IndexType, Query, type Models } from "node-appwrite";
-import type { DatabaseAdapter } from "../adapters/DatabaseAdapter.js";
-import { delay, tryAwaitWithRetry, calculateExponentialBackoff } from "../utils/helperFunctions.js";
-import { isLegacyDatabases } from "../utils/typeGuards.js";
-import { MessageFormatter } from "../shared/messageFormatter.js";
+import { Databases, IndexType, OrderBy, Query, type Models } from "node-appwrite";
+import type { DatabaseAdapter } from "@njdamstra/appwrite-utils-helpers";
+import { delay, tryAwaitWithRetry, calculateExponentialBackoff, isLegacyDatabases, MessageFormatter } from "@njdamstra/appwrite-utils-helpers";
 
 // System attributes that are always available for indexing in Appwrite
 const SYSTEM_ATTRIBUTES = ['$id', '$createdAt', '$updatedAt', '$permissions'];
@@ -329,10 +327,10 @@ export const createOrUpdateIndex = async (
       index.key,
       index.type as IndexType,
       index.attributes,
-      orders
+      orders as OrderBy[]
     );
   }
-  
+
   return newIndex;
 };