@njdamstra/appwrite-utils-cli 1.11.0 → 1.11.1

package/dist/cli/commands/migrateCommands.js

@@ -11,7 +11,7 @@ export const migrateCommands = {
                 message: "String attribute migration:",
                 choices: [
                     {
-                        name: "Analyze — scan local configs, generate migration plan (YAML)",
+                        name: "Analyze — scan Appwrite server, generate migration plan (YAML)",
                         value: "analyze",
                     },
                     {
@@ -33,17 +33,8 @@ export const migrateCommands = {
     },
     async analyzePhase(cli) {
         const controller = cli.controller;
-        if (!controller?.config) {
-            MessageFormatter.error("No configuration loaded. Make sure you have a valid .appwrite config.", undefined, { prefix: "Analyze" });
-            return;
-        }
-        const config = controller.config;
-        const collections = [
-            ...(config.collections || []),
-            ...(config.tables || []),
-        ];
-        if (collections.length === 0) {
-            MessageFormatter.warning("No collections/tables found in local config. Nothing to analyze.", { prefix: "Analyze" });
+        if (!controller?.adapter) {
+            MessageFormatter.error("No database adapter available. Ensure a server connection is established.", undefined, { prefix: "Analyze" });
             return;
         }
         // Prompt for output path
@@ -57,7 +48,7 @@ export const migrateCommands = {
         ]);
         const options = { outputPath };
         try {
-            analyzeStringAttributes(config, options);
+            await analyzeStringAttributes(controller.adapter, controller.config, options);
             MessageFormatter.success("Analysis complete. Review the YAML plan, edit targetType/action as needed, then run Execute.", { prefix: "Analyze" });
         }
         catch (err) {

package/dist/main.js

@@ -648,13 +648,11 @@ async function main() {
         if (argv.migrateStringsAnalyze || argv.migrateStringsExecute) {
             const { analyzeStringAttributes, executeMigrationPlan } = await import("./migrations/migrateStrings.js");
             if (argv.migrateStringsAnalyze) {
-                if (!controller.config) {
-                    MessageFormatter.error("No Appwrite configuration found", undefined, {
-                        prefix: "Migration",
-                    });
+                if (!controller.adapter) {
+                    MessageFormatter.error("No database adapter available. Ensure config has valid credentials.", undefined, { prefix: "Migration" });
                     return;
                 }
-                analyzeStringAttributes(controller.config, {
+                await analyzeStringAttributes(controller.adapter, controller.config, {
                     outputPath: argv.migrateStringsOutput,
                 });
             }

package/dist/migrations/migrateStrings.d.ts

@@ -1,7 +1,7 @@
 import { type DatabaseAdapter } from "@njdamstra/appwrite-utils-helpers";
 import type { AppwriteConfig } from "@njdamstra/appwrite-utils";
 import { type MigrationPlan, type AnalyzeOptions, type ExecuteOptions } from "./migrateStringsTypes.js";
-export declare function analyzeStringAttributes(config: AppwriteConfig, options?: AnalyzeOptions): MigrationPlan;
+export declare function analyzeStringAttributes(adapter: DatabaseAdapter, config: AppwriteConfig, options?: AnalyzeOptions): Promise<MigrationPlan>;
 export declare function executeMigrationPlan(adapter: DatabaseAdapter, options: ExecuteOptions): Promise<{
     succeeded: number;
     failed: number;

package/dist/migrations/migrateStrings.js

@@ -8,55 +8,52 @@ import { MessageFormatter, tryAwaitWithRetry, } from "@njdamstra/appwrite-utils-
 import { ProgressManager } from "../shared/progressManager.js";
 import { MigrationPlanSchema, MigrationCheckpointSchema, suggestTargetType, generateBackupKey, } from "./migrateStringsTypes.js";
 // ────────────────────────────────────────────────────────
-// Phase 1: Analyze — offline, reads local YAML configs
+// Phase 1: Analyze — queries Appwrite server for real state
 // ────────────────────────────────────────────────────────
-export function analyzeStringAttributes(config, options = {}) {
-    const collections = [
-        ...(config.collections || []),
-        ...(config.tables || []),
-    ];
+export async function analyzeStringAttributes(adapter, config, options = {}) {
     const databases = config.databases || [];
+    if (databases.length === 0) {
+        MessageFormatter.warning("No databases configured. Nothing to analyze.", {
+            prefix: "Analyze",
+        });
+        return emptyPlan(config);
+    }
     const entries = [];
-    const collectionsSeen = new Set();
     for (const db of databases) {
-        // Find collections assigned to this database (or unassigned = applied to all)
-        const dbCollections = collections.filter((c) => {
-            const coll = c;
-            if (coll.databaseId)
-                return coll.databaseId === db.$id;
-            if (coll.databaseIds?.length)
-                return coll.databaseIds.includes(db.$id);
-            return true; // unassigned → applied to all databases
+        MessageFormatter.info(`Scanning database: ${db.name} (${db.$id})`, {
+            prefix: "Analyze",
         });
-        for (const coll of dbCollections) {
-            const collId = coll.$id || coll.name;
-            const dedupKey = `${db.$id}:${collId}`;
-            if (collectionsSeen.has(dedupKey))
-                continue;
-            collectionsSeen.add(dedupKey);
-            const attributes = coll.attributes || [];
-            const indexes = coll.indexes || [];
+        // Fetch all collections/tables from server
+        const tablesRes = await tryAwaitWithRetry(() => adapter.listTables({ databaseId: db.$id }));
+        const tables = tablesRes?.tables || tablesRes?.collections || tablesRes?.data || [];
+        for (const table of tables) {
+            const tableId = table.$id || table.key || table.name;
+            const tableName = table.name || tableId;
+            // Fetch full schema from server
+            const schemaRes = await tryAwaitWithRetry(() => adapter.getTable({ databaseId: db.$id, tableId }));
+            const attributes = schemaRes?.data?.columns || schemaRes?.data?.attributes || [];
+            // Fetch indexes from server
+            const indexRes = await tryAwaitWithRetry(() => adapter.listIndexes({ databaseId: db.$id, tableId }));
+            const indexes = indexRes?.data || [];
             for (const attr of attributes) {
                 if (attr.type !== "string")
                     continue;
-                const stringAttr = attr;
-                const size = stringAttr.size || 50;
-                const isEncrypted = !!stringAttr.encrypt;
+                const size = attr.size || 50;
+                const isEncrypted = !!attr.encrypt;
                 const isRequired = !!attr.required;
                 const isArray = !!attr.array;
-                const hasDefault = stringAttr.xdefault !== undefined && stringAttr.xdefault !== null;
+                const hasDefault = attr.xdefault !== undefined && attr.xdefault !== null;
                 // Find indexes that reference this attribute
                 const affectedIndexes = indexes
-                    .filter((idx) => idx.attributes.includes(attr.key))
+                    .filter((idx) => idx.attributes?.includes(attr.key))
                     .map((idx) => idx.key);
                 const hasIndex = affectedIndexes.length > 0;
                 const suggested = suggestTargetType(size, hasIndex);
-                // Build entry
                 const entry = {
                     databaseId: db.$id,
                     databaseName: db.name,
-                    collectionId: collId,
-                    collectionName: coll.name,
+                    collectionId: tableId,
+                    collectionName: tableName,
                     attributeKey: attr.key,
                     currentType: "string",
                     currentSize: size,
@@ -64,7 +61,7 @@ export function analyzeStringAttributes(config, options = {}) {
                     isArray,
                     isEncrypted,
                     hasDefault,
-                    defaultValue: hasDefault ? stringAttr.xdefault : undefined,
+                    defaultValue: hasDefault ? attr.xdefault : undefined,
                     suggestedType: suggested,
                     targetType: suggested,
                     targetSize: suggested === "varchar" ? size : undefined,
@@ -72,10 +69,8 @@ export function analyzeStringAttributes(config, options = {}) {
                     skipReason: isEncrypted ? "encrypted" : undefined,
                     indexesAffected: affectedIndexes,
                 };
-                // Warn if indexed attr gets non-varchar suggestion
-                if (hasIndex &&
-                    suggested !== "varchar" &&
-                    !isEncrypted) {
+                // Indexed attrs must stay varchar
+                if (hasIndex && suggested !== "varchar" && !isEncrypted) {
                     entry.targetType = "varchar";
                     entry.targetSize = size;
                 }
@@ -116,6 +111,22 @@ export function analyzeStringAttributes(config, options = {}) {
     printPlanSummary(plan);
     return plan;
 }
+function emptyPlan(config) {
+    return {
+        version: 1,
+        generatedAt: new Date().toISOString(),
+        appwriteEndpoint: config.appwriteEndpoint,
+        appwriteProject: config.appwriteProject,
+        summary: {
+            totalStringAttributes: 0,
+            toMigrate: 0,
+            toSkip: 0,
+            databaseCount: 0,
+            collectionCount: 0,
+        },
+        entries: [],
+    };
+}
 function printPlanSummary(plan) {
     const { summary } = plan;
     console.log("");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@njdamstra/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.11.0",
+  "version": "1.11.1",
   "main": "dist/main.js",
   "type": "module",
   "repository": {

package/src/cli/commands/migrateCommands.ts

@@ -17,7 +17,7 @@ export const migrateCommands = {
         message: "String attribute migration:",
         choices: [
           {
-            name: "Analyze — scan local configs, generate migration plan (YAML)",
+            name: "Analyze — scan Appwrite server, generate migration plan (YAML)",
             value: "analyze",
           },
           {
@@ -39,29 +39,15 @@ export const migrateCommands = {
 
   async analyzePhase(cli: InteractiveCLI): Promise<void> {
     const controller = (cli as any).controller;
-    if (!controller?.config) {
+    if (!controller?.adapter) {
       MessageFormatter.error(
-        "No configuration loaded. Make sure you have a valid .appwrite config.",
+        "No database adapter available. Ensure a server connection is established.",
         undefined,
         { prefix: "Analyze" }
       );
       return;
     }
 
-    const config = controller.config;
-    const collections = [
-      ...(config.collections || []),
-      ...(config.tables || []),
-    ];
-
-    if (collections.length === 0) {
-      MessageFormatter.warning(
-        "No collections/tables found in local config. Nothing to analyze.",
-        { prefix: "Analyze" }
-      );
-      return;
-    }
-
     // Prompt for output path
     const { outputPath } = await inquirer.prompt([
       {
@@ -75,7 +61,7 @@ export const migrateCommands = {
     const options: AnalyzeOptions = { outputPath };
 
     try {
-      analyzeStringAttributes(config, options);
+      await analyzeStringAttributes(controller.adapter, controller.config, options);
       MessageFormatter.success(
         "Analysis complete. Review the YAML plan, edit targetType/action as needed, then run Execute.",
         { prefix: "Analyze" }

package/src/main.ts

@@ -881,13 +881,15 @@ async function main() {
       );
 
       if (argv.migrateStringsAnalyze) {
-        if (!controller.config) {
-          MessageFormatter.error("No Appwrite configuration found", undefined, {
-            prefix: "Migration",
-          });
+        if (!controller.adapter) {
+          MessageFormatter.error(
+            "No database adapter available. Ensure config has valid credentials.",
+            undefined,
+            { prefix: "Migration" }
+          );
           return;
         }
-        analyzeStringAttributes(controller.config, {
+        await analyzeStringAttributes(controller.adapter, controller.config, {
           outputPath: argv.migrateStringsOutput,
         });
       } else if (argv.migrateStringsExecute) {

package/src/migrations/migrateStrings.ts

@@ -9,11 +9,7 @@ import {
   MessageFormatter,
   tryAwaitWithRetry,
 } from "@njdamstra/appwrite-utils-helpers";
-import type {
-  AppwriteConfig,
-  Attribute,
-  Index,
-} from "@njdamstra/appwrite-utils";
+import type { AppwriteConfig } from "@njdamstra/appwrite-utils";
 import { ProgressManager } from "../shared/progressManager.js";
 import {
   type MigrationPlan,
@@ -30,65 +26,76 @@ import {
 } from "./migrateStringsTypes.js";
 
 // ────────────────────────────────────────────────────────
-// Phase 1: Analyze — offline, reads local YAML configs
+// Phase 1: Analyze — queries Appwrite server for real state
 // ────────────────────────────────────────────────────────
 
-export function analyzeStringAttributes(
+export async function analyzeStringAttributes(
+  adapter: DatabaseAdapter,
   config: AppwriteConfig,
   options: AnalyzeOptions = {}
-): MigrationPlan {
-  const collections = [
-    ...(config.collections || []),
-    ...(config.tables || []),
-  ];
+): Promise<MigrationPlan> {
   const databases = config.databases || [];
+  if (databases.length === 0) {
+    MessageFormatter.warning("No databases configured. Nothing to analyze.", {
+      prefix: "Analyze",
+    });
+    return emptyPlan(config);
+  }
 
   const entries: MigrationPlanEntry[] = [];
-  const collectionsSeen = new Set<string>();
 
   for (const db of databases) {
-    // Find collections assigned to this database (or unassigned = applied to all)
-    const dbCollections = collections.filter((c) => {
-      const coll = c as any;
-      if (coll.databaseId) return coll.databaseId === db.$id;
-      if (coll.databaseIds?.length) return coll.databaseIds.includes(db.$id);
-      return true; // unassigned → applied to all databases
+    MessageFormatter.info(`Scanning database: ${db.name} (${db.$id})`, {
+      prefix: "Analyze",
     });
 
-    for (const coll of dbCollections) {
-      const collId = (coll as any).$id || coll.name;
-      const dedupKey = `${db.$id}:${collId}`;
-      if (collectionsSeen.has(dedupKey)) continue;
-      collectionsSeen.add(dedupKey);
+    // Fetch all collections/tables from server
+    const tablesRes = await tryAwaitWithRetry(() =>
+      adapter.listTables({ databaseId: db.$id })
+    );
+    const tables: any[] =
+      tablesRes?.tables || tablesRes?.collections || tablesRes?.data || [];
+
+    for (const table of tables) {
+      const tableId: string = table.$id || table.key || table.name;
+      const tableName: string = table.name || tableId;
 
-      const attributes: Attribute[] = (coll as any).attributes || [];
-      const indexes: Index[] = (coll as any).indexes || [];
+      // Fetch full schema from server
+      const schemaRes = await tryAwaitWithRetry(() =>
+        adapter.getTable({ databaseId: db.$id, tableId })
+      );
+      const attributes: any[] =
+        schemaRes?.data?.columns || schemaRes?.data?.attributes || [];
+
+      // Fetch indexes from server
+      const indexRes = await tryAwaitWithRetry(() =>
+        adapter.listIndexes({ databaseId: db.$id, tableId })
+      );
+      const indexes: any[] = indexRes?.data || [];
 
       for (const attr of attributes) {
         if (attr.type !== "string") continue;
 
-        const stringAttr = attr as any;
-        const size: number = stringAttr.size || 50;
-        const isEncrypted = !!stringAttr.encrypt;
+        const size: number = attr.size || 50;
+        const isEncrypted = !!(attr as any).encrypt;
         const isRequired = !!attr.required;
         const isArray = !!attr.array;
         const hasDefault =
-          stringAttr.xdefault !== undefined && stringAttr.xdefault !== null;
+          attr.xdefault !== undefined && attr.xdefault !== null;
 
         // Find indexes that reference this attribute
         const affectedIndexes = indexes
-          .filter((idx) => idx.attributes.includes(attr.key))
-          .map((idx) => idx.key);
+          .filter((idx: any) => idx.attributes?.includes(attr.key))
+          .map((idx: any) => idx.key);
         const hasIndex = affectedIndexes.length > 0;
 
         const suggested = suggestTargetType(size, hasIndex);
 
-        // Build entry
         const entry: MigrationPlanEntry = {
           databaseId: db.$id,
           databaseName: db.name,
-          collectionId: collId,
-          collectionName: coll.name,
+          collectionId: tableId,
+          collectionName: tableName,
           attributeKey: attr.key,
           currentType: "string",
           currentSize: size,
@@ -96,7 +103,7 @@ export function analyzeStringAttributes(
           isArray,
           isEncrypted,
           hasDefault,
-          defaultValue: hasDefault ? stringAttr.xdefault : undefined,
+          defaultValue: hasDefault ? attr.xdefault : undefined,
           suggestedType: suggested,
           targetType: suggested,
           targetSize: suggested === "varchar" ? size : undefined,
@@ -105,12 +112,8 @@ export function analyzeStringAttributes(
           indexesAffected: affectedIndexes,
         };
 
-        // Warn if indexed attr gets non-varchar suggestion
-        if (
-          hasIndex &&
-          suggested !== "varchar" &&
-          !isEncrypted
-        ) {
+        // Indexed attrs must stay varchar
+        if (hasIndex && suggested !== "varchar" && !isEncrypted) {
           entry.targetType = "varchar";
           entry.targetSize = size;
         }
@@ -161,6 +164,23 @@ export function analyzeStringAttributes(
   return plan;
 }
 
+function emptyPlan(config: AppwriteConfig): MigrationPlan {
+  return {
+    version: 1,
+    generatedAt: new Date().toISOString(),
+    appwriteEndpoint: config.appwriteEndpoint,
+    appwriteProject: config.appwriteProject,
+    summary: {
+      totalStringAttributes: 0,
+      toMigrate: 0,
+      toSkip: 0,
+      databaseCount: 0,
+      collectionCount: 0,
+    },
+    entries: [],
+  };
+}
+
 function printPlanSummary(plan: MigrationPlan): void {
   const { summary } = plan;
   console.log("");