appwrite-utils-cli 1.7.9 → 1.8.2

package/src/adapters/AdapterFactory.ts

@@ -7,14 +7,14 @@
  */
 
 import type { AppwriteConfig } from "appwrite-utils";
-import { detectAppwriteVersionCached, isVersionAtLeast, type ApiMode, type VersionDetectionResult } from "../utils/versionDetection.js";
-import type { DatabaseAdapter } from './DatabaseAdapter.js';
-import { TablesDBAdapter } from './TablesDBAdapter.js';
-import { LegacyAdapter } from './LegacyAdapter.js';
-import { logger } from '../shared/logging.js';
-import { getClientWithAuth } from '../utils/getClientFromConfig.js';
-import { isValidSessionCookie } from '../utils/sessionAuth.js';
-import { MessageFormatter } from '../shared/messageFormatter.js';
+import { detectAppwriteVersionCached, isVersionAtLeast, type ApiMode, type VersionDetectionResult } from "../utils/versionDetection.js";
+import type { DatabaseAdapter } from './DatabaseAdapter.js';
+import { TablesDBAdapter } from './TablesDBAdapter.js';
+import { LegacyAdapter } from './LegacyAdapter.js';
+import { logger } from '../shared/logging.js';
+import { isValidSessionCookie } from '../utils/sessionAuth.js';
+import { MessageFormatter } from '../shared/messageFormatter.js';
+import { Client } from 'node-appwrite';
 
 export interface AdapterFactoryConfig {
   appwriteEndpoint: string;
@@ -201,73 +201,61 @@ export class AdapterFactory {
   /**
    * Create TablesDB adapter with dynamic import
    */
-  private static async createTablesDBAdapter(
-    config: AdapterFactoryConfig
-  ): Promise<{ adapter: DatabaseAdapter; client: any }> {
-    const startTime = Date.now();
-
-    try {
-      logger.info('Loading TablesDB SDK', {
-        endpoint: config.appwriteEndpoint,
-        operation: 'createTablesDBAdapter'
-      });
-
-      // Dynamic import of TablesDB SDK
-      const importStartTime = Date.now();
-      const { Client, TablesDB } = await import('node-appwrite-tablesdb');
-      const importDuration = Date.now() - importStartTime;
-
-      logger.debug('TablesDB SDK import successful', {
-        importDuration,
-        operation: 'createTablesDBAdapter'
-      });
-
-      // Use pre-configured client or create session-aware client with TablesDB Client
-      let client: any;
-      if (config.preConfiguredClient) {
-        client = config.preConfiguredClient;
-      } else {
-        client = new Client()
-          .setEndpoint(config.appwriteEndpoint)
-          .setProject(config.appwriteProject);
-
-        // Set authentication method with mode headers
-        // Prefer session with admin mode, fallback to API key with default mode
-        if (config.sessionCookie && isValidSessionCookie(config.sessionCookie)) {
-          client.setSession(config.sessionCookie);
-          client.headers['X-Appwrite-Mode'] = 'admin';
-          logger.debug('Using session authentication for TablesDB adapter', {
-            project: config.appwriteProject,
-            operation: 'createTablesDBAdapter'
-          });
-        } else if (config.appwriteKey) {
-          client.setKey(config.appwriteKey);
-          client.headers['X-Appwrite-Mode'] = 'default';
-          logger.debug('Using API key authentication for TablesDB adapter', {
-            project: config.appwriteProject,
-            operation: 'createTablesDBAdapter'
-          });
-        } else {
-          throw new Error("No authentication available for adapter");
-        }
-      }
-
-      const tablesDB = new TablesDB(client);
-      const adapter = new TablesDBAdapter(tablesDB);
-
-      const totalDuration = Date.now() - startTime;
-      logger.info('TablesDB adapter created successfully', {
-        totalDuration,
-        importDuration,
-        endpoint: config.appwriteEndpoint,
-        operation: 'createTablesDBAdapter'
-      });
-
-      return { adapter, client };
-
-    } catch (error) {
-      const errorDuration = Date.now() - startTime;
-      const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+  private static async createTablesDBAdapter(
+    config: AdapterFactoryConfig
+  ): Promise<{ adapter: DatabaseAdapter; client: any }> {
+    const startTime = Date.now();
+
+    try {
+      logger.info('Creating TablesDB adapter (static SDK imports)', {
+        endpoint: config.appwriteEndpoint,
+        operation: 'createTablesDBAdapter'
+      });
+
+      // Use pre-configured client or create session-aware client with TablesDB Client
+      let client: any;
+      if (config.preConfiguredClient) {
+        client = config.preConfiguredClient;
+      } else {
+        client = new Client()
+          .setEndpoint(config.appwriteEndpoint)
+          .setProject(config.appwriteProject);
+
+        // Set authentication method with mode headers
+        // Prefer session with admin mode, fallback to API key with default mode
+        if (config.sessionCookie && isValidSessionCookie(config.sessionCookie)) {
+          client.setSession(config.sessionCookie);
+          client.headers['X-Appwrite-Mode'] = 'admin';
+          logger.debug('Using session authentication for TablesDB adapter', {
+            project: config.appwriteProject,
+            operation: 'createTablesDBAdapter'
+          });
+        } else if (config.appwriteKey) {
+          client.setKey(config.appwriteKey);
+          client.headers['X-Appwrite-Mode'] = 'default';
+          logger.debug('Using API key authentication for TablesDB adapter', {
+            project: config.appwriteProject,
+            operation: 'createTablesDBAdapter'
+          });
+        } else {
+          throw new Error("No authentication available for adapter");
+        }
+      }
+
+      const adapter = new TablesDBAdapter(client);
+
+      const totalDuration = Date.now() - startTime;
+      logger.info('TablesDB adapter created successfully', {
+        totalDuration,
+        endpoint: config.appwriteEndpoint,
+        operation: 'createTablesDBAdapter'
+      });
+
+      return { adapter, client };
+
+    } catch (error) {
+      const errorDuration = Date.now() - startTime;
+      const errorMessage = error instanceof Error ? error.message : 'Unknown error';
 
       MessageFormatter.warning('Failed to create TablesDB adapter - falling back to legacy', { prefix: "Adapter" });
 
@@ -286,73 +274,61 @@ export class AdapterFactory {
   /**
    * Create Legacy adapter with dynamic import
    */
-  private static async createLegacyAdapter(
-    config: AdapterFactoryConfig
-  ): Promise<{ adapter: DatabaseAdapter; client: any }> {
-    const startTime = Date.now();
-
-    try {
-      logger.info('Loading legacy Appwrite SDK', {
-        endpoint: config.appwriteEndpoint,
-        operation: 'createLegacyAdapter'
-      });
-
-      // Dynamic import of legacy SDK
-      const importStartTime = Date.now();
-      const { Client, Databases } = await import('node-appwrite');
-      const importDuration = Date.now() - importStartTime;
-
-      logger.debug('Legacy SDK import successful', {
-        importDuration,
-        operation: 'createLegacyAdapter'
-      });
-
-      // Use pre-configured client or create session-aware client with Legacy Client
-      let client: any;
-      if (config.preConfiguredClient) {
-        client = config.preConfiguredClient;
-      } else {
-        client = new Client()
-          .setEndpoint(config.appwriteEndpoint)
-          .setProject(config.appwriteProject);
-
-        // Set authentication method with mode headers
-        // Prefer session with admin mode, fallback to API key with default mode
-        if (config.sessionCookie && isValidSessionCookie(config.sessionCookie)) {
-          (client as any).setSession(config.sessionCookie);
-          client.headers['X-Appwrite-Mode'] = 'admin';
-          logger.debug('Using session authentication for Legacy adapter', {
-            project: config.appwriteProject,
-            operation: 'createLegacyAdapter'
-          });
-        } else if (config.appwriteKey) {
-          client.setKey(config.appwriteKey);
-          client.headers['X-Appwrite-Mode'] = 'default';
-          logger.debug('Using API key authentication for Legacy adapter', {
-            project: config.appwriteProject,
-            operation: 'createLegacyAdapter'
-          });
-        } else {
-          throw new Error("No authentication available for adapter");
-        }
-      }
-
-      const databases = new Databases(client);
-      const adapter = new LegacyAdapter(databases);
-
-      const totalDuration = Date.now() - startTime;
-      logger.info('Legacy adapter created successfully', {
-        totalDuration,
-        importDuration,
-        endpoint: config.appwriteEndpoint,
-        operation: 'createLegacyAdapter'
-      });
-
-      return { adapter, client };
-
-    } catch (error) {
-      const errorDuration = Date.now() - startTime;
-      const errorMessage = error instanceof Error ? error.message : 'Unknown error';
+  private static async createLegacyAdapter(
+    config: AdapterFactoryConfig
+  ): Promise<{ adapter: DatabaseAdapter; client: any }> {
+    const startTime = Date.now();
+
+    try {
+      logger.info('Creating legacy adapter (static SDK imports)', {
+        endpoint: config.appwriteEndpoint,
+        operation: 'createLegacyAdapter'
+      });
+
+      // Use pre-configured client or create session-aware client with Legacy Client
+      let client: any;
+      if (config.preConfiguredClient) {
+        client = config.preConfiguredClient;
+      } else {
+        client = new Client()
+          .setEndpoint(config.appwriteEndpoint)
+          .setProject(config.appwriteProject);
+
+        // Set authentication method with mode headers
+        // Prefer session with admin mode, fallback to API key with default mode
+        if (config.sessionCookie && isValidSessionCookie(config.sessionCookie)) {
+          (client as any).setSession(config.sessionCookie);
+          client.headers['X-Appwrite-Mode'] = 'admin';
+          logger.debug('Using session authentication for Legacy adapter', {
+            project: config.appwriteProject,
+            operation: 'createLegacyAdapter'
+          });
+        } else if (config.appwriteKey) {
+          client.setKey(config.appwriteKey);
+          client.headers['X-Appwrite-Mode'] = 'default';
+          logger.debug('Using API key authentication for Legacy adapter', {
+            project: config.appwriteProject,
+            operation: 'createLegacyAdapter'
+          });
+        } else {
+          throw new Error("No authentication available for adapter");
+        }
+      }
+
+      const adapter = new LegacyAdapter(client);
+
+      const totalDuration = Date.now() - startTime;
+      logger.info('Legacy adapter created successfully', {
+        totalDuration,
+        endpoint: config.appwriteEndpoint,
+        operation: 'createLegacyAdapter'
+      });
+
+      return { adapter, client };
+
+    } catch (error) {
+      const errorDuration = Date.now() - startTime;
+      const errorMessage = error instanceof Error ? error.message : 'Unknown error';
 
       logger.error('Failed to load legacy Appwrite SDK', {
         error: errorMessage,
@@ -531,4 +507,4 @@ export async function getApiCapabilities(
     terminology: metadata.terminology,
     capabilities
   };
-}
+}

package/src/adapters/DatabaseAdapter.ts

@@ -6,6 +6,7 @@
  * code uses TablesDB-style method signatures for consistency.
  */
 
+import type { Client } from "node-appwrite";
 import type { ApiMode } from "../utils/versionDetection.js";
 
 // Base parameter types using TablesDB terminology
@@ -43,6 +44,7 @@ export interface CreateTableParams {
   name: string;
   permissions?: string[];
   documentSecurity?: boolean;
+  rowSecurity?: boolean;
   enabled?: boolean;
 }
 
@@ -52,6 +54,7 @@ export interface UpdateTableParams {
   name: string;
   permissions?: string[];
   documentSecurity?: boolean;
+  rowSecurity?: boolean;
   enabled?: boolean;
 }
 
@@ -131,8 +134,20 @@ export interface UpdateAttributeParams {
   databaseId: string;
   tableId: string;
   key: string;
+  type?: string;
   required?: boolean;
   default?: any;
+  size?: number;
+  min?: number;
+  max?: number;
+  array?: boolean;
+  encrypt?: boolean;
+  elements?: string[];
+  relatedCollection?: string;
+  relationType?: string;
+  twoWay?: boolean;
+  twoWayKey?: string;
+  onDelete?: string;
 }
 
 export interface DeleteAttributeParams {
@@ -217,10 +232,10 @@ export interface DatabaseAdapter {
  * Base adapter class with common functionality
  */
 export abstract class BaseAdapter implements DatabaseAdapter {
-  protected client: any;
+  protected client: Client;
   protected apiMode: ApiMode;
   
-  constructor(client: any, apiMode: ApiMode) {
+  constructor(client: Client, apiMode: ApiMode) {
     this.client = client;
     this.apiMode = apiMode;
   }
@@ -288,4 +303,4 @@ export class UnsupportedOperationError extends AdapterError {
     );
     this.name = 'UnsupportedOperationError';
   }
-}
+}