appwrite-utils-cli 1.7.9 → 1.8.2

package/dist/config/yamlConfig.d.ts

@@ -239,100 +239,165 @@ export declare const createSessionPreservingYamlConfig: (configPath: string, ses
             name: string;
             attributes: ({
                 key: string;
-                type: "string";
-                size: number;
-                error?: string | undefined;
-                required?: boolean | undefined;
-                array?: boolean | undefined;
-                xdefault?: string | null | undefined;
-                encrypted?: boolean | undefined;
-                format?: string | null | undefined;
-            } | {
-                key: string;
+                required: boolean;
                 type: "integer";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 min?: number | undefined;
                 max?: number | undefined;
                 xdefault?: number | null | undefined;
             } | {
                 key: string;
-                type: "double";
+                required: boolean;
+                type: "relationship";
+                relatedCollection: string;
+                relationType: "oneToMany" | "manyToOne" | "oneToOne" | "manyToMany";
+                twoWay: boolean;
+                onDelete: "setNull" | "cascade" | "restrict";
+                array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
                 error?: string | undefined;
-                required?: boolean | undefined;
+                twoWayKey?: string | undefined;
+                side?: "parent" | "child" | undefined;
+                importMapping?: {
+                    originalIdField: string;
+                    targetField?: string | undefined;
+                } | undefined;
+            } | {
+                key: string;
+                required: boolean;
+                type: "string";
+                size: number;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
+                xdefault?: string | null | undefined;
+                encrypted?: boolean | undefined;
+            } | {
+                key: string;
+                required: boolean;
+                type: "double";
+                array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 min?: number | undefined;
                 max?: number | undefined;
                 xdefault?: number | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "float";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 min?: number | undefined;
                 max?: number | undefined;
                 xdefault?: number | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "boolean";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: boolean | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "datetime";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: string | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "email";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: string | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "ip";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: string | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "url";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: string | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "enum";
                 elements: string[];
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
-                xdefault?: string | null | undefined;
-            } | {
-                key: string;
-                type: "relationship";
-                relatedCollection: string;
-                relationType: "oneToMany" | "manyToOne" | "oneToOne" | "manyToMany";
-                twoWay: boolean;
-                onDelete: "setNull" | "cascade" | "restrict";
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
                 error?: string | undefined;
-                required?: boolean | undefined;
-                array?: boolean | undefined;
-                twoWayKey?: string | undefined;
-                side?: "parent" | "child" | undefined;
-                importMapping?: {
-                    originalIdField: string;
-                    targetField?: string | undefined;
-                } | undefined;
+                xdefault?: string | null | undefined;
             })[];
             $permissions: {
                 permission: string;
@@ -387,104 +452,170 @@ export declare const createSessionPreservingYamlConfig: (configPath: string, ses
             enabled?: boolean | undefined;
             documentSecurity?: boolean | undefined;
             databaseId?: string | undefined;
+            databaseIds?: string[] | undefined;
         }[] | undefined;
         tables?: {
             attributes: ({
                 key: string;
-                type: "string";
-                size: number;
-                error?: string | undefined;
-                required?: boolean | undefined;
-                array?: boolean | undefined;
-                xdefault?: string | null | undefined;
-                encrypted?: boolean | undefined;
-                format?: string | null | undefined;
-            } | {
-                key: string;
+                required: boolean;
                 type: "integer";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 min?: number | undefined;
                 max?: number | undefined;
                 xdefault?: number | null | undefined;
             } | {
                 key: string;
-                type: "double";
+                required: boolean;
+                type: "relationship";
+                relatedCollection: string;
+                relationType: "oneToMany" | "manyToOne" | "oneToOne" | "manyToMany";
+                twoWay: boolean;
+                onDelete: "setNull" | "cascade" | "restrict";
+                array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
                 error?: string | undefined;
-                required?: boolean | undefined;
+                twoWayKey?: string | undefined;
+                side?: "parent" | "child" | undefined;
+                importMapping?: {
+                    originalIdField: string;
+                    targetField?: string | undefined;
+                } | undefined;
+            } | {
+                key: string;
+                required: boolean;
+                type: "string";
+                size: number;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
+                xdefault?: string | null | undefined;
+                encrypted?: boolean | undefined;
+            } | {
+                key: string;
+                required: boolean;
+                type: "double";
+                array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 min?: number | undefined;
                 max?: number | undefined;
                 xdefault?: number | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "float";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 min?: number | undefined;
                 max?: number | undefined;
                 xdefault?: number | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "boolean";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: boolean | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "datetime";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: string | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "email";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: string | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "ip";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: string | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "url";
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
+                error?: string | undefined;
                 xdefault?: string | null | undefined;
             } | {
                 key: string;
+                required: boolean;
                 type: "enum";
                 elements: string[];
-                error?: string | undefined;
-                required?: boolean | undefined;
                 array?: boolean | undefined;
-                xdefault?: string | null | undefined;
-            } | {
-                key: string;
-                type: "relationship";
-                relatedCollection: string;
-                relationType: "oneToMany" | "manyToOne" | "oneToOne" | "manyToMany";
-                twoWay: boolean;
-                onDelete: "setNull" | "cascade" | "restrict";
+                format?: string | undefined;
+                status?: string | undefined;
+                attributes?: string[] | undefined;
+                orders?: string[] | undefined;
+                $createdAt?: string | undefined;
+                $updatedAt?: string | undefined;
                 error?: string | undefined;
-                required?: boolean | undefined;
-                array?: boolean | undefined;
-                twoWayKey?: string | undefined;
-                side?: "parent" | "child" | undefined;
-                importMapping?: {
-                    originalIdField: string;
-                    targetField?: string | undefined;
-                } | undefined;
+                xdefault?: string | null | undefined;
             })[];
             columns: undefined;
             indexes: {
@@ -541,7 +672,9 @@ export declare const createSessionPreservingYamlConfig: (configPath: string, ses
             enabled?: boolean | undefined;
             documentSecurity?: boolean | undefined;
             databaseId?: string | undefined;
+            databaseIds?: string[] | undefined;
             tableId?: string | undefined;
+            rowSecurity?: boolean | undefined;
         }[] | undefined;
         functions?: {
             $id: string;

package/dist/examples/yamlTerminologyExample.d.ts

@@ -7,7 +7,7 @@
  * 3. Validate terminology consistency
  * 4. Migrate between formats
  */
-import type { CollectionCreate } from "appwrite-utils";
+import { type CollectionCreate } from "appwrite-utils";
 /**
  * Example 1: Generate YAML templates for both collection and table formats
  */

package/dist/examples/yamlTerminologyExample.js

@@ -11,6 +11,7 @@ import { collectionToYaml, generateYamlTemplate, generateExampleYamls, convertTe
 import { createYamlLoader } from "../utils/yamlLoader.js";
 import { YamlImportIntegration } from "../migrations/yaml/YamlImportIntegration.js";
 import { createImportSchemas } from "../migrations/yaml/generateImportSchemas.js";
+import { CollectionCreateSchema } from "appwrite-utils";
 import fs from "fs";
 import path from "path";
 /**
@@ -208,7 +209,7 @@ export async function runYamlTerminologyExamples(outputDir) {
     console.log("🎯 Running YAML Terminology Examples\\n");
     try {
         // Example collection for demonstrations
-        const exampleCollection = {
+        const exampleCollectionInput = {
             name: "Product",
             $id: "product",
             enabled: true,
@@ -223,7 +224,7 @@ export async function runYamlTerminologyExamples(outputDir) {
                 },
                 {
                     key: "price",
-                    type: "float",
+                    type: "double",
                     required: true,
                     min: 0
                 },
@@ -233,7 +234,8 @@ export async function runYamlTerminologyExamples(outputDir) {
                     relationType: "manyToOne",
                     relatedCollection: "Categories",
                     twoWay: false,
-                    onDelete: "setNull"
+                    onDelete: "setNull",
+                    required: false
                 }
             ],
             indexes: [
@@ -245,6 +247,7 @@ export async function runYamlTerminologyExamples(outputDir) {
             ],
             importDefs: []
         };
+        const exampleCollection = CollectionCreateSchema.parse(exampleCollectionInput);
         // Run examples
         await generateTemplateExamples(outputDir);
         console.log("\\n" + "=".repeat(60) + "\\n");

package/dist/functions/fnConfigDiscovery.d.ts

@@ -0,0 +1,3 @@
+import { type AppwriteFunction } from 'appwrite-utils';
+export declare function discoverFnConfigs(startDir: string): AppwriteFunction[];
+export declare function mergeDiscoveredFunctions(central?: AppwriteFunction[], discovered?: AppwriteFunction[]): AppwriteFunction[];

package/dist/functions/fnConfigDiscovery.js

@@ -0,0 +1,108 @@
+import fs from 'node:fs';
+import path from 'node:path';
+import yaml from 'js-yaml';
+import { homedir } from 'node:os';
+import { AppwriteFunctionSchema } from 'appwrite-utils';
+import { shouldIgnoreDirectory } from '../utils/directoryUtils.js';
+import { MessageFormatter } from '../shared/messageFormatter.js';
+function findGitRoot(startDir) {
+    let dir = path.resolve(startDir);
+    while (dir !== path.parse(dir).root) {
+        if (fs.existsSync(path.join(dir, '.git')))
+            return dir;
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            break;
+        dir = parent;
+    }
+    return path.resolve(startDir);
+}
+function expandTilde(p) {
+    if (!p)
+        return p;
+    if (p === '~' || p.startsWith('~/'))
+        return p.replace(/^~(?=$|\/|\\)/, homedir());
+    return p;
+}
+export function discoverFnConfigs(startDir) {
+    const root = findGitRoot(startDir);
+    const results = [];
+    const visit = (dir, depth = 0) => {
+        if (depth > 5)
+            return; // cap depth
+        const base = path.basename(dir);
+        if (shouldIgnoreDirectory(base))
+            return;
+        let entries = [];
+        try {
+            entries = fs.readdirSync(dir, { withFileTypes: true });
+        }
+        catch {
+            return;
+        }
+        // Check for .fnconfig.yaml / .fnconfig.yml
+        for (const fname of ['.fnconfig.yaml', '.fnconfig.yml']) {
+            const cfgPath = path.join(dir, fname);
+            if (fs.existsSync(cfgPath)) {
+                try {
+                    const raw = fs.readFileSync(cfgPath, 'utf8');
+                    const data = yaml.load(raw);
+                    const parsed = AppwriteFunctionSchema.parse({
+                        $id: data.id || data.$id,
+                        name: data.name,
+                        runtime: data.runtime,
+                        execute: data.execute || [],
+                        events: data.events || [],
+                        schedule: data.schedule,
+                        timeout: data.timeout,
+                        enabled: data.enabled,
+                        logging: data.logging,
+                        entrypoint: data.entrypoint,
+                        commands: data.commands,
+                        scopes: data.scopes,
+                        installationId: data.installationId,
+                        providerRepositoryId: data.providerRepositoryId,
+                        providerBranch: data.providerBranch,
+                        providerSilentMode: data.providerSilentMode,
+                        providerRootDirectory: data.providerRootDirectory,
+                        templateRepository: data.templateRepository,
+                        templateOwner: data.templateOwner,
+                        templateRootDirectory: data.templateRootDirectory,
+                        templateVersion: data.templateVersion,
+                        specification: data.specification,
+                        dirPath: data.dirPath,
+                        predeployCommands: data.predeployCommands,
+                        deployDir: data.deployDir,
+                        ignore: data.ignore,
+                    });
+                    // Resolve dirPath relative to the config file directory
+                    let dirPath = parsed.dirPath || '.';
+                    dirPath = expandTilde(dirPath);
+                    if (!path.isAbsolute(dirPath))
+                        dirPath = path.resolve(path.dirname(cfgPath), dirPath);
+                    const merged = { ...parsed, dirPath };
+                    results.push(merged);
+                }
+                catch (e) {
+                    MessageFormatter.warning(`Failed to parse ${cfgPath}: ${e instanceof Error ? e.message : String(e)}`, { prefix: 'Functions' });
+                }
+            }
+        }
+        for (const entry of entries) {
+            if (entry.isDirectory())
+                visit(path.join(dir, entry.name), depth + 1);
+        }
+    };
+    visit(root, 0);
+    return results;
+}
+export function mergeDiscoveredFunctions(central = [], discovered = []) {
+    const map = new Map();
+    for (const f of central)
+        if (f?.$id)
+            map.set(f.$id, f);
+    for (const f of discovered)
+        if (f?.$id)
+            map.set(f.$id, f); // discovered overrides
+    return Array.from(map.values());
+}