chirag-appwrite-cli 0.1.0 → 0.1.1

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

@@ -3,7 +3,7 @@ const { AttributeType } = require('../attribute');
 const { LanguageMeta } = require("./language");
 
 class Swift extends LanguageMeta {
-  getType(attribute) {
+  getType(attribute, collections) {
     let type = "";
     switch (attribute.type) {
       case AttributeType.STRING:
@@ -24,7 +24,11 @@ class Swift extends LanguageMeta {
         type = "Bool";
         break;
       case AttributeType.RELATIONSHIP:
-        type = LanguageMeta.toPascalCase(attribute.relatedCollection);
+        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}]`;
         }
@@ -41,15 +45,11 @@ class Swift extends LanguageMeta {
     return type;
   }
 
-  getCurrentDirectory() {
-    return process.cwd();
-  }
-
   getTemplate() {
     return `import Foundation
 
 /// This file is auto-generated by the Appwrite CLI. 
-/// You can regenerate it by running \`appwrite types -l <%- strict ? '--strict ' : '' %>swift <%- path %>\`.
+/// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
 
 <% for (const attribute of collection.attributes) { -%>
 <% if (attribute.format === 'enum') { -%>
@@ -63,7 +63,7 @@ public enum <%- toPascalCase(attribute.key) %>: String, Codable, CaseIterable {
 <% } -%>
 public class <%- toPascalCase(collection.name) %>: Codable {
 <% for (const attribute of collection.attributes) { -%>
-    public let <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute) %>
+    public let <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %>
 <% } %>
     enum CodingKeys: String, CodingKey {
 <% for (const attribute of collection.attributes) { -%>
@@ -73,7 +73,7 @@ public class <%- toPascalCase(collection.name) %>: Codable {
 
     public init(
 <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
-        <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
+        <%- strict ? toCamelCase(attribute.key) : attribute.key %>: <%- getType(attribute, collections) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
     ) {
 <% for (const attribute of collection.attributes) { -%>
@@ -86,9 +86,9 @@ public class <%- toPascalCase(collection.name) %>: Codable {
 
 <% for (const attribute of collection.attributes) { -%>
 <% if (!(!attribute.required && attribute.default === null)) { -%>
-        self.<%- strict ? toCamelCase(attribute.key) : attribute.key %> = try container.decode(<%- getType(attribute).replace('?', '') %>.self, forKey: .<%- strict ? toCamelCase(attribute.key) : attribute.key %>)
+        self.<%- strict ? toCamelCase(attribute.key) : attribute.key %> = try container.decode(<%- getType(attribute, collections).replace('?', '') %>.self, forKey: .<%- strict ? toCamelCase(attribute.key) : attribute.key %>)
 <% } else { -%>
-        self.<%- strict ? toCamelCase(attribute.key) : attribute.key %> = try container.decodeIfPresent(<%- getType(attribute).replace('?', '') %>.self, forKey: .<%- strict ? toCamelCase(attribute.key) : attribute.key %>)
+        self.<%- strict ? toCamelCase(attribute.key) : attribute.key %> = try container.decodeIfPresent(<%- getType(attribute, collections).replace('?', '') %>.self, forKey: .<%- strict ? toCamelCase(attribute.key) : attribute.key %>)
 <% } -%>
 <% } -%>
     }
@@ -124,9 +124,9 @@ public class <%- toPascalCase(collection.name) %>: Codable {
 <% for (const [index, attribute] of Object.entries(collection.attributes)) { -%>
 <% if (attribute.type === 'relationship') { -%>
 <% if ((attribute.relationType === 'oneToMany' && attribute.side === 'parent') || (attribute.relationType === 'manyToOne' && attribute.side === 'child') || attribute.relationType === 'manyToMany') { -%>
-            <%- strict ? toCamelCase(attribute.key) : attribute.key %>: map["<%- attribute.key %>"] as<% if (!attribute.required) { %>?<% } else { %>!<% } %> [<%- toPascalCase(attribute.relatedCollection) %>]<% if (index < collection.attributes.length - 1) { %>,<% } %>
+            <%- strict ? toCamelCase(attribute.key) : attribute.key %>: map["<%- attribute.key %>"] as<% if (!attribute.required) { %>?<% } else { %>!<% } %> [<%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %>]<% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } else { -%>
-            <%- strict ? toCamelCase(attribute.key) : attribute.key %>: map["<%- attribute.key %>"] as<% if (!attribute.required) { %>?<% } else { %>!<% } %> <%- toPascalCase(attribute.relatedCollection) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
+            <%- strict ? toCamelCase(attribute.key) : attribute.key %>: map["<%- attribute.key %>"] as<% if (!attribute.required) { %>?<% } else { %>!<% } %> <%- toPascalCase(collections.find(c => c.$id === attribute.relatedCollection).name) %><% if (index < collection.attributes.length - 1) { %>,<% } %>
 <% } -%>
 <% } else if (attribute.array) { -%>
 <% if (attribute.type === 'string') { -%>

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

@@ -30,6 +30,9 @@ class TypeScript extends LanguageMeta {
         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}[]`;
@@ -69,7 +72,7 @@ class TypeScript extends LanguageMeta {
     return `import { type Models } from '${this._getAppwriteDependency()}';
 
 // This file is auto-generated by the Appwrite CLI. 
-// You can regenerate it by running \`appwrite types -l <%- strict ? '--strict ' : '' %>ts <%- path %>\`.
+// You can regenerate it by running \`appwrite ${process.argv.slice(2).join(' ')}\`.
 
 <% for (const collection of collections) { -%>
 <% for (const attribute of collection.attributes) { -%>

package/package.json

@@ -2,7 +2,7 @@
   "name": "chirag-appwrite-cli",
   "homepage": "https://appwrite.io/support",
   "description": "Repo short description goes here",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "license": "BSD-3-Clause",
   "main": "index.js",
   "bin": {

package/appwrite.json

@@ -1,164 +0,0 @@
-{
-    "projectId": "6839a26e003262977966",
-    "endpoint": "https://fra.cloud.appwrite.io/v1",
-    "projectName": "6839a26e003262977966",
-    "settings": {
-        "services": {
-            "account": true,
-            "avatars": true,
-            "databases": true,
-            "locale": true,
-            "health": true,
-            "storage": true,
-            "teams": true,
-            "users": true,
-            "sites": true,
-            "functions": true,
-            "graphql": true,
-            "messaging": true
-        },
-        "auth": {
-            "methods": {
-                "jwt": true,
-                "phone": true,
-                "invites": true,
-                "anonymous": true,
-                "email-otp": true,
-                "magic-url": true,
-                "email-password": true
-            },
-            "security": {
-                "duration": 31536000,
-                "limit": 0,
-                "sessionsLimit": 10,
-                "passwordHistory": 0,
-                "passwordDictionary": false,
-                "personalDataCheck": false,
-                "sessionAlerts": false,
-                "mockNumbers": []
-            }
-        }
-    },
-    "databases": [
-        {
-            "$id": "testing",
-            "name": "testing",
-            "enabled": true
-        }
-    ],
-    "collections": [
-        {
-            "$id": "687cad390034a29d00ca",
-            "$permissions": [
-                "create(\"any\")",
-                "read(\"any\")",
-                "update(\"any\")",
-                "delete(\"any\")"
-            ],
-            "databaseId": "687cad33002ad8d6c2d9",
-            "name": "sprites",
-            "enabled": true,
-            "documentSecurity": false,
-            "attributes": [
-                {
-                    "key": "title",
-                    "type": "string",
-                    "required": true,
-                    "array": false,
-                    "size": 25,
-                    "default": null,
-                    "encrypt": false
-                },
-                {
-                    "key": "data",
-                    "type": "string",
-                    "required": true,
-                    "array": false,
-                    "size": 64,
-                    "default": null,
-                    "encrypt": false
-                },
-                {
-                    "key": "category_id",
-                    "type": "relationship",
-                    "required": false,
-                    "array": false,
-                    "relatedCollection": "687cc6a30016f0c53718",
-                    "relationType": "manyToOne",
-                    "twoWay": false,
-                    "twoWayKey": "687cc797002f3b978bd3",
-                    "onDelete": "cascade",
-                    "side": "parent"
-                }
-            ],
-            "indexes": [
-                {
-                    "key": "data",
-                    "type": "unique",
-                    "status": "available",
-                    "attributes": [
-                        "data"
-                    ],
-                    "orders": [
-                        "ASC"
-                    ]
-                }
-            ]
-        },
-        {
-            "$id": "687cc6a30016f0c53718",
-            "$permissions": [],
-            "databaseId": "687cad33002ad8d6c2d9",
-            "name": "categories",
-            "enabled": true,
-            "documentSecurity": false,
-            "attributes": [
-                {
-                    "key": "title",
-                    "type": "string",
-                    "required": true,
-                    "array": false,
-                    "size": 25,
-                    "default": null,
-                    "encrypt": false
-                }
-            ],
-            "indexes": [
-                {
-                    "key": "title",
-                    "type": "unique",
-                    "status": "available",
-                    "attributes": [
-                        "title"
-                    ],
-                    "orders": [
-                        "ASC"
-                    ]
-                }
-            ]
-        },
-        {
-            "$id": "687cc9ef0019f871c76b",
-            "$permissions": [],
-            "databaseId": "687cad33002ad8d6c2d9",
-            "name": "validated_sprites",
-            "enabled": true,
-            "documentSecurity": false,
-            "attributes": [
-                {
-                    "key": "sprite_id",
-                    "type": "relationship",
-                    "required": false,
-                    "array": false,
-                    "relatedCollection": "687cad390034a29d00ca",
-                    "relationType": "oneToOne",
-                    "twoWay": false,
-                    "twoWayKey": "687cca0c00021e8cead3",
-                    "onDelete": "cascade",
-                    "side": "parent"
-                }
-            ],
-            "indexes": []
-        }
-    ]
-}