appwrite-cli 13.0.0-rc.1 → 13.0.0-rc.3

package/lib/type-generation/languages/swift.ts

@@ -1,67 +1,79 @@
-import { AttributeType } from '../attribute';
-import { LanguageMeta, Attribute, Collection } from './language';
+import { AttributeType } from "../attribute.js";
+import { LanguageMeta, Attribute, Collection } from "./language.js";
 
 export class Swift extends LanguageMeta {
-    getType(attribute: Attribute, collections?: Collection[], collectionName?: string): string {
-        let type = '';
-        switch (attribute.type) {
-            case AttributeType.STRING:
-            case AttributeType.EMAIL:
-            case AttributeType.DATETIME:
-                type = 'String';
-                if (attribute.format === AttributeType.ENUM) {
-                    type = LanguageMeta.toPascalCase(collectionName!) + LanguageMeta.toPascalCase(attribute.key);
-                }
-                break;
-            case AttributeType.INTEGER:
-                type = 'Int';
-                break;
-            case AttributeType.FLOAT:
-                type = 'Double';
-                break;
-            case AttributeType.BOOLEAN:
-                type = 'Bool';
-                break;
-            case AttributeType.RELATIONSHIP:
-                const relatedCollection = collections?.find((c) => c.$id === attribute.relatedCollection);
-                if (!relatedCollection) {
-                    throw new Error(`Related collection with ID '${attribute.relatedCollection}' not found.`);
-                }
-                type = LanguageMeta.toPascalCase(relatedCollection.name);
-                if (
-                    (attribute.relationType === 'oneToMany' && attribute.side === 'parent') ||
-                    (attribute.relationType === 'manyToOne' && attribute.side === 'child') ||
-                    attribute.relationType === 'manyToMany'
-                ) {
-                    type = `[${type}]`;
-                }
-                break;
-            case AttributeType.POINT:
-                type = '[Double]';
-                break;
-            case AttributeType.LINESTRING:
-                type = '[[Double]]';
-                break;
-            case AttributeType.POLYGON:
-                type = '[[[Double]]]';
-                break;
-            default:
-                throw new Error(`Unknown attribute type: ${attribute.type}`);
+  getType(
+    attribute: Attribute,
+    collections?: Collection[],
+    collectionName?: string,
+  ): string {
+    let type = "";
+    switch (attribute.type) {
+      case AttributeType.STRING:
+      case AttributeType.EMAIL:
+      case AttributeType.DATETIME:
+        type = "String";
+        if (attribute.format === AttributeType.ENUM) {
+          type =
+            LanguageMeta.toPascalCase(collectionName!) +
+            LanguageMeta.toPascalCase(attribute.key);
         }
-        if (attribute.array) {
-            type = '[' + type + ']';
+        break;
+      case AttributeType.INTEGER:
+        type = "Int";
+        break;
+      case AttributeType.FLOAT:
+        type = "Double";
+        break;
+      case AttributeType.BOOLEAN:
+        type = "Bool";
+        break;
+      case AttributeType.RELATIONSHIP:
+        const relatedCollection = collections?.find(
+          (c) => c.$id === attribute.relatedCollection,
+        );
+        if (!relatedCollection) {
+          throw new Error(
+            `Related collection with ID '${attribute.relatedCollection}' not found.`,
+          );
         }
-        if (!attribute.required && attribute.default === null) {
-            type += '?';
+        type = LanguageMeta.toPascalCase(relatedCollection.name);
+        if (
+          (attribute.relationType === "oneToMany" &&
+            attribute.side === "parent") ||
+          (attribute.relationType === "manyToOne" &&
+            attribute.side === "child") ||
+          attribute.relationType === "manyToMany"
+        ) {
+          type = `[${type}]`;
         }
-        return type;
+        break;
+      case AttributeType.POINT:
+        type = "[Double]";
+        break;
+      case AttributeType.LINESTRING:
+        type = "[[Double]]";
+        break;
+      case AttributeType.POLYGON:
+        type = "[[[Double]]]";
+        break;
+      default:
+        throw new Error(`Unknown attribute type: ${attribute.type}`);
     }
+    if (attribute.array) {
+      type = "[" + type + "]";
+    }
+    if (!attribute.required && attribute.default === null) {
+      type += "?";
+    }
+    return type;
+  }
 
-    getTemplate(): string {
-        return `import Foundation
+  getTemplate(): string {
+    return `import Foundation
 
 /// This file is auto-generated by the Appwrite CLI. 
-/// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
+/// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(" ")}\`.
 
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
@@ -171,10 +183,9 @@ public class <%- toPascalCase(collection.name) %>: Codable {
         )
     }
 }`;
-    }
+  }
 
-    getFileName(collection: Collection): string {
-        return LanguageMeta.toPascalCase(collection.name) + '.swift';
-    }
+  getFileName(collection: Collection): string {
+    return LanguageMeta.toPascalCase(collection.name) + ".swift";
+  }
 }
-

package/lib/type-generation/languages/typescript.ts

@@ -1,89 +1,106 @@
-import fs = require('fs');
-import path = require('path');
-import { AttributeType } from '../attribute';
-import { LanguageMeta, Attribute, Collection } from './language';
+import fs from "fs";
+import path from "path";
+import { AttributeType } from "../attribute.js";
+import { LanguageMeta, Attribute, Collection } from "./language.js";
 
 export class TypeScript extends LanguageMeta {
-    getType(attribute: Attribute, collections?: Collection[], collectionName?: string): string {
-        let type = '';
-        switch (attribute.type) {
-            case AttributeType.STRING:
-            case AttributeType.EMAIL:
-            case AttributeType.DATETIME:
-            case AttributeType.IP:
-            case AttributeType.URL:
-                type = 'string';
-                if (attribute.format === AttributeType.ENUM) {
-                    type = LanguageMeta.toPascalCase(collectionName!) + LanguageMeta.toPascalCase(attribute.key);
-                }
-                break;
-            case AttributeType.INTEGER:
-                type = 'number';
-                break;
-            case AttributeType.FLOAT:
-                type = 'number';
-                break;
-            case AttributeType.BOOLEAN:
-                type = 'boolean';
-                break;
-            case AttributeType.RELATIONSHIP:
-                const relatedCollection = collections?.find((c) => c.$id === attribute.relatedCollection);
-                if (!relatedCollection) {
-                    throw new Error(`Related collection with ID '${attribute.relatedCollection}' not found.`);
-                }
-                type = LanguageMeta.toPascalCase(relatedCollection.name);
-                if (
-                    (attribute.relationType === 'oneToMany' && attribute.side === 'parent') ||
-                    (attribute.relationType === 'manyToOne' && attribute.side === 'child') ||
-                    attribute.relationType === 'manyToMany'
-                ) {
-                    type = `${type}[]`;
-                }
-                break;
-            case AttributeType.POINT:
-                type = 'Array<number>';
-                break;
-            case AttributeType.LINESTRING:
-                type = 'Array<Array<number>>';
-                break;
-            case AttributeType.POLYGON:
-                type = 'Array<Array<Array<number>>>';
-                break;
-            default:
-                throw new Error(`Unknown attribute type: ${attribute.type}`);
+  getType(
+    attribute: Attribute,
+    collections?: Collection[],
+    collectionName?: string,
+  ): string {
+    let type = "";
+    switch (attribute.type) {
+      case AttributeType.STRING:
+      case AttributeType.EMAIL:
+      case AttributeType.DATETIME:
+      case AttributeType.IP:
+      case AttributeType.URL:
+        type = "string";
+        if (attribute.format === AttributeType.ENUM) {
+          type =
+            LanguageMeta.toPascalCase(collectionName!) +
+            LanguageMeta.toPascalCase(attribute.key);
         }
-        if (attribute.array) {
-            type += '[]';
+        break;
+      case AttributeType.INTEGER:
+        type = "number";
+        break;
+      case AttributeType.FLOAT:
+        type = "number";
+        break;
+      case AttributeType.BOOLEAN:
+        type = "boolean";
+        break;
+      case AttributeType.RELATIONSHIP:
+        const relatedCollection = collections?.find(
+          (c) => c.$id === attribute.relatedCollection,
+        );
+        if (!relatedCollection) {
+          throw new Error(
+            `Related collection with ID '${attribute.relatedCollection}' not found.`,
+          );
         }
-        if (!attribute.required && attribute.default === null) {
-            type += ' | null';
+        type = LanguageMeta.toPascalCase(relatedCollection.name);
+        if (
+          (attribute.relationType === "oneToMany" &&
+            attribute.side === "parent") ||
+          (attribute.relationType === "manyToOne" &&
+            attribute.side === "child") ||
+          attribute.relationType === "manyToMany"
+        ) {
+          type = `${type}[]`;
         }
-        return type;
+        break;
+      case AttributeType.POINT:
+        type = "Array<number>";
+        break;
+      case AttributeType.LINESTRING:
+        type = "Array<Array<number>>";
+        break;
+      case AttributeType.POLYGON:
+        type = "Array<Array<Array<number>>>";
+        break;
+      default:
+        throw new Error(`Unknown attribute type: ${attribute.type}`);
     }
-
-    isSingleFile(): boolean {
-        return true;
+    if (attribute.array) {
+      type += "[]";
+    }
+    if (!attribute.required && attribute.default === null) {
+      type += " | null";
     }
+    return type;
+  }
 
-    private _getAppwriteDependency(): string {
-        if (fs.existsSync(path.resolve(process.cwd(), 'package.json'))) {
-            const packageJsonRaw = fs.readFileSync(path.resolve(process.cwd(), 'package.json'));
-            const packageJson = JSON.parse(packageJsonRaw.toString('utf-8'));
-            return packageJson.dependencies && packageJson.dependencies['node-appwrite'] ? 'node-appwrite' : 'appwrite';
-        }
+  isSingleFile(): boolean {
+    return true;
+  }
 
-        if (fs.existsSync(path.resolve(process.cwd(), 'deno.json'))) {
-            return 'https://deno.land/x/appwrite/mod.ts';
-        }
+  private _getAppwriteDependency(): string {
+    if (fs.existsSync(path.resolve(process.cwd(), "package.json"))) {
+      const packageJsonRaw = fs.readFileSync(
+        path.resolve(process.cwd(), "package.json"),
+      );
+      const packageJson = JSON.parse(packageJsonRaw.toString("utf-8"));
+      return packageJson.dependencies &&
+        packageJson.dependencies["node-appwrite"]
+        ? "node-appwrite"
+        : "appwrite";
+    }
 
-        return 'appwrite';
+    if (fs.existsSync(path.resolve(process.cwd(), "deno.json"))) {
+      return "https://deno.land/x/appwrite/mod.ts";
     }
 
-    getTemplate(): string {
-        return `import type { Models } from '${this._getAppwriteDependency()}';
+    return "appwrite";
+  }
+
+  getTemplate(): string {
+    return `import type { Models } from '${this._getAppwriteDependency()}';
 
 // This file is auto-generated by the Appwrite CLI.
-// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
+// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(" ")}\`.
 
 <% for (const collection of collections) { -%>
 <% for (const attribute of collection.attributes) { -%>
@@ -108,9 +125,9 @@ export type <%- toPascalCase(collection.name) %> = Models.Row & {
 }<% if (index < collections.length - 1) { %>
 <% } %>
 <% } -%>`;
-    }
+  }
 
-    getFileName(_: Collection | undefined): string {
-        return 'appwrite.d.ts';
-    }
+  getFileName(_: Collection | undefined): string {
+    return "appwrite.d.ts";
+  }
 }

package/lib/types.ts

@@ -1,150 +1,75 @@
-export interface CliConfig {
-    verbose: boolean;
-    json: boolean;
-    force: boolean;
-    all: boolean;
-    ids: string[];
-    report: boolean;
-    reportData: Record<string, unknown>;
-}
+import type { File } from "undici";
+import type { ReadableStream } from "node:stream/web";
+
+export type ResponseType = "json" | "arraybuffer";
 
 export interface Headers {
-    [key: string]: string;
+  [key: string]: string;
 }
 
 export interface RequestParams {
-    [key: string]: unknown;
+  [key: string]: unknown;
 }
 
 export interface FileUpload {
-    type: 'file';
-    file: Buffer | ReadableStream;
-    filename: string;
+  type: "file";
+  file: File;
+  filename: string;
 }
 
-export type ResponseType = 'json' | 'arraybuffer';
-
-export interface ConfigData {
-    [key: string]: unknown;
+export interface FileInput {
+  type: "file";
+  stream: ReadableStream;
+  filename: string;
+  size: number;
 }
 
-export interface SessionData {
-    endpoint: string;
-    email?: string;
-    phone?: string;
-    cookie?: string;
+export interface UploadProgress {
+  $id: string;
+  progress: number;
+  sizeUploaded: number;
+  chunksTotal: number;
+  chunksUploaded: number;
 }
 
-export interface GlobalConfigData {
-    sessions: {
-        [key: string]: SessionData;
-    };
-    current: string;
-    cookie?: string;
-}
-
-export interface ProjectConfigData {
-    projectId?: string;
-    projectName?: string;
-    functions?: FunctionConfig[];
-    collections?: CollectionConfig[];
-    databases?: DatabaseConfig[];
-    buckets?: BucketConfig[];
-    teams?: TeamConfig[];
-    topics?: TopicConfig[];
-}
-
-export interface FunctionConfig {
-    $id: string;
-    name: string;
-    runtime: string;
-    path: string;
-    entrypoint: string;
-    execute?: string[];
-    enabled?: boolean;
-    logging?: boolean;
-    events?: string[];
-    schedule?: string;
-    timeout?: number;
-    vars?: Record<string, string>;
-    commands?: string;
-    scopes?: string[];
-    specification?: string;
-}
-
-export interface CollectionConfig {
-    $id: string;
-    $permissions?: string[];
-    databaseId: string;
-    name: string;
-    enabled?: boolean;
-    documentSecurity?: boolean;
-    attributes?: AttributeConfig[];
-    indexes?: IndexConfig[];
-}
-
-export interface AttributeConfig {
-    key: string;
-    type: string;
-    required?: boolean;
-    array?: boolean;
-    size?: number;
-    default?: unknown;
-    min?: number;
-    max?: number;
-    format?: string;
-    elements?: string[];
-    relatedCollection?: string;
-    relationType?: string;
-    twoWay?: boolean;
-    twoWayKey?: string;
-    onDelete?: string;
-    side?: string;
-    encrypt?: boolean;
-}
-
-export interface IndexConfig {
-    key: string;
-    type: string;
-    status?: string;
-    attributes?: string[];
-    orders?: string[];
-}
-
-export interface DatabaseConfig {
-    $id: string;
-    name: string;
-    enabled?: boolean;
+export interface ConfigData {
+  [key: string]: unknown;
 }
 
-export interface BucketConfig {
-    $id: string;
-    $permissions?: string[];
-    name: string;
-    enabled?: boolean;
-    fileSecurity?: boolean;
-    maximumFileSize?: number;
-    allowedFileExtensions?: string[];
-    compression?: string;
-    encryption?: boolean;
-    antivirus?: boolean;
+export interface Entity {
+  $id: string;
+  [key: string]: unknown;
 }
 
-export interface TeamConfig {
-    $id: string;
-    name: string;
+export interface ParsedData {
+  [key: string]: unknown;
 }
 
-export interface TopicConfig {
-    $id: string;
-    name: string;
-    subscribe?: string[];
+export interface CommandDescription {
+  [key: string]: string;
 }
 
-export interface CommandDescription {
-    [key: string]: string;
+export interface CliConfig {
+  verbose: boolean;
+  json: boolean;
+  force: boolean;
+  all: boolean;
+  ids: string[];
+  report: boolean;
+  reportData: Record<string, unknown>;
 }
 
-export interface ParsedData {
-    [key: string]: unknown;
+export interface SessionData {
+  endpoint: string;
+  email?: string;
+  phone?: string;
+  cookie?: string;
+}
+
+export interface GlobalConfigData extends ConfigData {
+  sessions: {
+    [key: string]: SessionData;
+  };
+  current: string;
+  cookie?: string;
 }