appwrite-utils-cli 0.0.262 → 0.0.264

package/src/migrations/schema.ts

@@ -1,4 +1,4 @@
-import { ID, IndexType } from "node-appwrite";
+import { ID, IndexType, Permission } from "node-appwrite";
 import { z } from "zod";
 
 const stringAttributeSchema = z.object({
@@ -376,6 +376,8 @@ export const indexSchema = z.object({
   orders: z.array(z.string()).optional(),
 });
 
+export const indexesSchema = z.array(indexSchema);
+
 export type Index = z.infer<typeof indexSchema>;
 
 export const AttributeMappingsSchema = z.array(
@@ -510,12 +512,45 @@ export const importDefSchemas = z
   .default([])
   .describe("The import definitions for the database");
 
+export const permissionSchema = z
+  .object({
+    permission: z.string(),
+    target: z.string(),
+  })
+  .or(
+    z.string().transform((val) => {
+      const trimmedVal = val.trim();
+      // Adjusted regex to match double quotes
+      const match = trimmedVal.match(/^(\w+)\("([^"]+)"\)$/);
+      if (!match) {
+        throw new Error(`Invalid permission format: ${trimmedVal}`);
+      }
+      return {
+        permission: match[1],
+        target: match[2],
+      };
+    })
+  );
+
+export const permissionsSchema = z.array(permissionSchema).optional();
+
+export const attributesSchema = z.array(attributeSchema).default([]);
+
 export const collectionSchema = z.object({
+  name: z.string().describe("The name of the collection"),
   $id: z
     .string()
     .optional()
     .default(ID.unique())
     .describe("The ID of the collection, auto generated if not provided"),
+  enabled: z
+    .boolean()
+    .default(true)
+    .describe("Whether the collection is enabled or not"),
+  documentSecurity: z
+    .boolean()
+    .default(false)
+    .describe("Whether document security is enabled or not"),
   $createdAt: z.string(),
   $updatedAt: z.string(),
   $permissions: z
@@ -527,19 +562,6 @@ export const collectionSchema = z.object({
     )
     .default([])
     .describe("The permissions of the collection"),
-  databaseId: z
-    .string()
-    .optional()
-    .describe("The ID of the database the collection belongs to"),
-  name: z.string().describe("The name of the collection"),
-  enabled: z
-    .boolean()
-    .default(true)
-    .describe("Whether the collection is enabled or not"),
-  documentSecurity: z
-    .boolean()
-    .default(false)
-    .describe("Whether document security is enabled or not"),
   attributes: z
     .array(attributeSchema)
     .default([])
@@ -549,6 +571,10 @@ export const collectionSchema = z.object({
     .default([])
     .describe("The indexes of the collection"),
   importDefs: importDefSchemas,
+  databaseId: z
+    .string()
+    .optional()
+    .describe("The ID of the database the collection belongs to"),
 });
 
 export const CollectionCreateSchema = collectionSchema.omit({

package/src/migrations/schemaStrings.ts

@@ -7,6 +7,8 @@ import type {
 import { z } from "zod";
 import fs from "fs";
 import path from "path";
+import { dump } from "js-yaml";
+import { getDatabaseFromConfig } from "./afterImportActions.js";
 
 interface RelationshipDetail {
   parentCollection: string;
@@ -28,6 +30,16 @@ export class SchemaGenerator {
     this.extractRelationships();
   }
 
+  public updateYamlSchemas(): void {
+    // Output this.config to a YAML file at appwriteFolderPath/appwriteConfig.yaml
+    let finalConfig = this.config;
+    finalConfig.appwriteClient = null;
+    const yamlConfig = finalConfig;
+    const yamlPath = path.join(this.appwriteFolderPath, "appwriteConfig.yaml");
+    fs.writeFileSync(yamlPath, dump(yamlConfig), { encoding: "utf-8" });
+    console.log(`YAML written to ${yamlPath}`);
+  }
+
   private extractRelationships(): void {
     this.config.collections.forEach((collection) => {
       collection.attributes.forEach((attr) => {
@@ -63,6 +75,9 @@ export class SchemaGenerator {
             isArrayParent,
             isArrayChild
           );
+          console.log(
+            `Extracted relationship: ${attr.key}\n\t${collection.name} -> ${relationshipAttr.relatedCollection}, databaseId: ${collection.databaseId}`
+          );
         }
       });
     });
@@ -122,22 +137,35 @@ export class SchemaGenerator {
 
     // Use the relationshipMap to find related collections
     const relationshipDetails = this.relationshipMap.get(name) || [];
-    const relatedCollections = relationshipDetails.map((detail) => {
-      const relatedCollectionName = detail.isChild
-        ? detail.parentCollection
-        : detail.childCollection;
-      const key = detail.isChild ? detail.childKey : detail.parentKey;
-      const isArray = detail.isArray ? "array" : "";
-      return [relatedCollectionName, key, isArray];
-    });
+    const relatedCollections = relationshipDetails
+      .filter((detail, index, self) => {
+        const uniqueKey = `${detail.parentCollection}-${detail.childCollection}-${detail.parentKey}-${detail.childKey}`;
+        return (
+          index ===
+          self.findIndex(
+            (obj) =>
+              `${obj.parentCollection}-${obj.childCollection}-${obj.parentKey}-${obj.childKey}` ===
+              uniqueKey
+          )
+        );
+      })
+      .map((detail) => {
+        const relatedCollectionName = detail.isChild
+          ? detail.parentCollection
+          : detail.childCollection;
+        const key = detail.isChild ? detail.childKey : detail.parentKey;
+        const isArray = detail.isArray ? "array" : "";
+        return [relatedCollectionName, key, isArray];
+      });
 
     let relatedTypes = "";
     let relatedTypesLazy = "";
     let curNum = 0;
     let maxNum = relatedCollections.length;
     relatedCollections.forEach((relatedCollection) => {
-      const relatedPascalName = toPascalCase(relatedCollection[0]);
-      const relatedCamelName = toCamelCase(relatedCollection[0]);
+      console.log(relatedCollection);
+      let relatedPascalName = toPascalCase(relatedCollection[0]);
+      let relatedCamelName = toCamelCase(relatedCollection[0]);
       curNum++;
       let endNameTypes = relatedPascalName;
       let endNameLazy = `${relatedPascalName}Schema`;
@@ -207,10 +235,18 @@ export class SchemaGenerator {
       case "integer":
         baseSchemaCode = "z.number().int()";
         if (attribute.min !== undefined) {
-          baseSchemaCode += `.min(${attribute.min}, "Minimum value of ${attribute.min} not met")`;
+          if (BigInt(attribute.min) === BigInt(-9223372036854776000)) {
+            delete attribute.min;
+          } else {
+            baseSchemaCode += `.min(${attribute.min}, "Minimum value of ${attribute.min} not met")`;
+          }
         }
         if (attribute.max !== undefined) {
-          baseSchemaCode += `.max(${attribute.max}, "Maximum value of ${attribute.max} exceeded")`;
+          if (BigInt(attribute.max) === BigInt(9223372036854776000)) {
+            delete attribute.max;
+          } else {
+            baseSchemaCode += `.max(${attribute.max}, "Maximum value of ${attribute.max} exceeded")`;
+          }
         }
         if (attribute.xdefault !== undefined) {
           baseSchemaCode += `.default(${attribute.xdefault})`;

package/src/utilsController.ts

@@ -23,6 +23,7 @@ import {
 } from "./migrations/validationRules.js";
 import { ImportController } from "./migrations/importController.js";
 import _ from "lodash";
+import { AppwriteToX } from "./migrations/appwriteToX.js";
 
 async function loadConfig(configPath: string) {
   if (!fs.existsSync(configPath)) {
@@ -35,6 +36,7 @@ async function loadConfig(configPath: string) {
 }
 
 export interface SetupOptions {
+  sync: boolean;
   runProd: boolean;
   runStaging: boolean;
   runDev: boolean;
@@ -127,6 +129,13 @@ export class UtilsController {
       throw new Error("Database or storage not initialized");
     }
 
+    if (options.sync) {
+      console.log("Starting synchronization with server...");
+      const appwriteToX = new AppwriteToX(this.config, this.appwriteFolderPath);
+      await appwriteToX.toSchemas();
+      console.log("Synchronization complete, YAML and Schemas updated");
+    }
+
     // Start the setup
     console.log(
       "Starting setup, this step sets up migrations, runs backup, wipes databases, and updates schemas (depending on your options)..."