appwrite-utils-cli 1.6.7 → 1.6.9

package/dist/collections/attributes.js

@@ -607,6 +607,13 @@ const attributesSame = (databaseAttribute, configAttribute) => {
             operation: 'attributesSame'
         });
     }
+    // Log differences if comparison failed (for debugging)
+    if (!result && differences.length > 0) {
+        MessageFormatter.debug(`Attribute '${configAttribute.key}' differences detected:`, { prefix: "Attributes" });
+        differences.forEach(diff => {
+            MessageFormatter.debug(`  ${diff}`, { prefix: "Attributes" });
+        });
+    }
     return result;
 };
 /**

package/dist/migrations/services/ValidationService.js

@@ -1,4 +1,6 @@
 import { logger } from "../../shared/logging.js";
+import fs from "fs";
+import path from "path";
 /**
  * Service responsible for validation during import operations.
  * Provides centralized validation logic extracted from ImportDataActions and DataLoader.
@@ -203,8 +205,6 @@ export class ValidationService {
                     errors.push(...importDefErrors.map(err => `${collection.name}.importDefs[${i}]: ${err}`));
                     // Check if import file exists
                     try {
-                        const fs = require("fs");
-                        const path = require("path");
                         const filePath = path.resolve(appwriteFolderPath, importDef.filePath);
                         if (!fs.existsSync(filePath)) {
                             errors.push(`${collection.name}.importDefs[${i}]: Import file not found: ${filePath}`);

package/dist/migrations/yaml/YamlImportIntegration.js

@@ -4,6 +4,7 @@ import { logger } from "../../shared/logging.js";
 import { normalizeYamlData, usesTableTerminology, convertTerminology } from "../../utils/yamlConverter.js";
 import path from "path";
 import fs from "fs";
+import yaml from "js-yaml";
 /**
  * Integration service that bridges YAML import configurations with the existing import system.
  * Provides seamless integration between new YAML configs and legacy TypeScript collection definitions.
@@ -225,7 +226,6 @@ export class YamlImportIntegration {
                 updateMapping: importDef.updateMapping,
             },
         };
-        const yaml = require("js-yaml");
         const yamlContent = yaml.dump(yamlConfig, {
             indent: 2,
             lineWidth: 120,

package/dist/migrations/yaml/generateImportSchemas.js

@@ -462,6 +462,14 @@ export function generateCollectionSchema() {
                     "side": {
                         "type": "string",
                         "enum": ["parent", "child"]
+                    },
+                    "encrypt": {
+                        "type": "boolean",
+                        "description": "Whether the attribute should be encrypted"
+                    },
+                    "format": {
+                        "type": "string",
+                        "description": "Format for string attributes (e.g., email, url, ip)"
                     }
                 },
                 "required": ["key", "type"],

package/dist/utils/configDiscovery.js

@@ -123,7 +123,9 @@ const YamlCollectionSchema = z.object({
         twoWay: z.boolean().optional(),
         twoWayKey: z.string().optional(),
         onDelete: z.string().optional(),
-        side: z.string().optional()
+        side: z.string().optional(),
+        encrypt: z.boolean().optional(),
+        format: z.string().optional()
     })).optional().default([]),
     indexes: z.array(z.object({
         key: z.string(),
@@ -168,7 +170,9 @@ export const loadYamlCollection = (filePath) => {
                 twoWay: attr.twoWay,
                 twoWayKey: attr.twoWayKey,
                 onDelete: attr.onDelete,
-                side: attr.side
+                side: attr.side,
+                encrypted: attr.encrypt,
+                format: attr.format
             })),
             indexes: parsedCollection.indexes.map(idx => ({
                 key: idx.key,
@@ -221,7 +225,9 @@ export const loadYamlTable = (filePath) => {
                 twoWay: attr.twoWay,
                 twoWayKey: attr.twoWayKey,
                 onDelete: attr.onDelete,
-                side: attr.side
+                side: attr.side,
+                encrypted: attr.encrypt,
+                format: attr.format
             })),
             indexes: parsedTable.indexes.map(idx => ({
                 key: idx.key,

package/dist/utils/setupFiles.js

@@ -479,6 +479,14 @@ importDefs: []
                                 "type": "string",
                                 "description": "Column description"
                             },
+                            "encrypt": {
+                                "type": "boolean",
+                                "description": "Whether the column should be encrypted"
+                            },
+                            "format": {
+                                "type": "string",
+                                "description": "Format for string columns"
+                            },
                             "min": {
                                 "type": "number",
                                 "description": "Minimum value for numeric columns"
@@ -673,6 +681,14 @@ importDefs: []
                                 "type": "string",
                                 "description": "Attribute description"
                             },
+                            "encrypt": {
+                                "type": "boolean",
+                                "description": "Whether the attribute should be encrypted"
+                            },
+                            "format": {
+                                "type": "string",
+                                "description": "Format for string attributes"
+                            },
                             "min": {
                                 "type": "number",
                                 "description": "Minimum value for numeric attributes"

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.6.7",
+  "version": "1.6.9",
   "main": "src/main.ts",
   "type": "module",
   "repository": {

package/src/collections/attributes.ts

@@ -935,6 +935,17 @@ const attributesSame = (
     });
   }
 
+  // Log differences if comparison failed (for debugging)
+  if (!result && differences.length > 0) {
+    MessageFormatter.debug(
+      `Attribute '${configAttribute.key}' differences detected:`,
+      { prefix: "Attributes" }
+    );
+    differences.forEach(diff => {
+      MessageFormatter.debug(`  ${diff}`, { prefix: "Attributes" });
+    });
+  }
+
   return result;
 };
 

package/src/migrations/services/ValidationService.ts

@@ -1,10 +1,12 @@
-import type {
-  AttributeMappings,
-  ImportDef,
-  CollectionCreate,
-} from "appwrite-utils";
-import type { ImportDataActions } from "../importDataActions.js";
-import { logger } from "../../shared/logging.js";
+import type {
+  AttributeMappings,
+  ImportDef,
+  CollectionCreate,
+} from "appwrite-utils";
+import type { ImportDataActions } from "../importDataActions.js";
+import { logger } from "../../shared/logging.js";
+import fs from "fs";
+import path from "path";
 
 /**
  * Service responsible for validation during import operations.
@@ -274,15 +276,13 @@ export class ValidationService {
           );
 
           // Check if import file exists
-          try {
-            const fs = require("fs");
-            const path = require("path");
-            const filePath = path.resolve(appwriteFolderPath, importDef.filePath);
-            if (!fs.existsSync(filePath)) {
-              errors.push(
-                `${collection.name}.importDefs[${i}]: Import file not found: ${filePath}`
-              );
-            }
+          try {
+            const filePath = path.resolve(appwriteFolderPath, importDef.filePath);
+            if (!fs.existsSync(filePath)) {
+              errors.push(
+                `${collection.name}.importDefs[${i}]: Import file not found: ${filePath}`
+              );
+            }
           } catch (error) {
             warnings.push(
               `${collection.name}.importDefs[${i}]: Could not validate file existence: ${error}`
@@ -346,4 +346,4 @@ export class ValidationService {
       shouldContinue: true,
     };
   }
-}
+}

package/src/migrations/yaml/YamlImportIntegration.ts

@@ -1,10 +1,11 @@
-import type { CollectionCreate, ImportDef } from "appwrite-utils";
-import { YamlImportConfigLoader, type YamlImportConfig } from "./YamlImportConfigLoader.js";
-import { createImportSchemas, createImportExamples } from "./generateImportSchemas.js";
-import { logger } from "../../shared/logging.js";
-import { normalizeYamlData, usesTableTerminology, convertTerminology, type YamlCollectionData } from "../../utils/yamlConverter.js";
-import path from "path";
-import fs from "fs";
+import type { CollectionCreate, ImportDef } from "appwrite-utils";
+import { YamlImportConfigLoader, type YamlImportConfig } from "./YamlImportConfigLoader.js";
+import { createImportSchemas, createImportExamples } from "./generateImportSchemas.js";
+import { logger } from "../../shared/logging.js";
+import { normalizeYamlData, usesTableTerminology, convertTerminology, type YamlCollectionData } from "../../utils/yamlConverter.js";
+import path from "path";
+import fs from "fs";
+import yaml from "js-yaml";
 
 /**
  * Integration service that bridges YAML import configurations with the existing import system.
@@ -284,8 +285,7 @@ export class YamlImportIntegration {
       },
     };
 
-    const yaml = require("js-yaml");
-    const yamlContent = yaml.dump(yamlConfig, {
+    const yamlContent = yaml.dump(yamlConfig, {
       indent: 2,
       lineWidth: 120,
       sortKeys: false,
@@ -443,4 +443,4 @@ export class YamlImportIntegration {
       missingComponents,
     };
   }
-}
+}

package/src/migrations/yaml/generateImportSchemas.ts

@@ -464,6 +464,14 @@ export function generateCollectionSchema(): any {
           "side": {
             "type": "string",
             "enum": ["parent", "child"]
+          },
+          "encrypt": {
+            "type": "boolean",
+            "description": "Whether the attribute should be encrypted"
+          },
+          "format": {
+            "type": "string",
+            "description": "Format for string attributes (e.g., email, url, ip)"
           }
         },
         "required": ["key", "type"],

package/src/utils/configDiscovery.ts

@@ -139,7 +139,9 @@ const YamlCollectionSchema = z.object({
       twoWay: z.boolean().optional(),
       twoWayKey: z.string().optional(),
       onDelete: z.string().optional(),
-      side: z.string().optional()
+      side: z.string().optional(),
+      encrypt: z.boolean().optional(),
+      format: z.string().optional()
     })
   ).optional().default([]),
   indexes: z.array(
@@ -191,7 +193,9 @@ export const loadYamlCollection = (filePath: string): CollectionCreate | null =>
         twoWay: attr.twoWay,
         twoWayKey: attr.twoWayKey,
         onDelete: attr.onDelete as any,
-        side: attr.side as any
+        side: attr.side as any,
+        encrypted: (attr as any).encrypt,
+        format: (attr as any).format
       })),
       indexes: parsedCollection.indexes.map(idx => ({
         key: idx.key,
@@ -247,7 +251,9 @@ export const loadYamlTable = (filePath: string): any | null => {
         twoWay: attr.twoWay,
         twoWayKey: attr.twoWayKey,
         onDelete: attr.onDelete as any,
-        side: attr.side as any
+        side: attr.side as any,
+        encrypted: (attr as any).encrypt,
+        format: (attr as any).format
       })),
       indexes: parsedTable.indexes.map(idx => ({
         key: idx.key,

package/src/utils/setupFiles.ts

@@ -516,6 +516,14 @@ importDefs: []
                 "type": "string",
                 "description": "Column description"
               },
+              "encrypt": {
+                "type": "boolean",
+                "description": "Whether the column should be encrypted"
+              },
+              "format": {
+                "type": "string",
+                "description": "Format for string columns"
+              },
               "min": {
                 "type": "number",
                 "description": "Minimum value for numeric columns"
@@ -710,6 +718,14 @@ importDefs: []
                 "type": "string",
                 "description": "Attribute description"
               },
+              "encrypt": {
+                "type": "boolean",
+                "description": "Whether the attribute should be encrypted"
+              },
+              "format": {
+                "type": "string",
+                "description": "Format for string attributes"
+              },
               "min": {
                 "type": "number",
                 "description": "Minimum value for numeric attributes"