Merge pull request #201 from appwrite/dev

feat: Command Line SDK update for version 10.0.1

Author: abnegate

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Change Log
 
+## 10.0.1
+
+* Fix CLI Dart model generation issues
+* Fix row permissions and security sync
+* Fix error when pushing columns with relationships
+* Fix resource name from attributes to columns for TablesDB indexes
+
 ## 10.0.0
 
 * **Breaking:** Removed Avatars CLI command and all related subcommands; corresponding examples deleted

README.md

@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-10.0.0
+10.0.1
 ```
 
 ### Install using prebuilt binaries
@@ -60,7 +60,7 @@ $ scoop install https://raw.githubusercontent.com/appwrite/sdk-for-cli/master/sc
 Once the installation completes, you can verify your install using
 ```
 $ appwrite -v
-10.0.0
+10.0.1
 ```
 
 ## Getting Started 

install.ps1

@@ -13,8 +13,8 @@
 # You can use "View source" of this page to see the full script.
 
 # REPO
-$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/10.0.0/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/10.0.0/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/10.0.1/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/10.0.1/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

install.sh

@@ -97,7 +97,7 @@ printSuccess() {
 downloadBinary() {
     echo "[2/4] Downloading executable for $OS ($ARCH) ..."
 
-    GITHUB_LATEST_VERSION="10.0.0"
+    GITHUB_LATEST_VERSION="10.0.1"
     GITHUB_FILE="appwrite-cli-${OS}-${ARCH}"
     GITHUB_URL="https://github.com/$GITHUB_REPOSITORY_NAME/releases/download/$GITHUB_LATEST_VERSION/$GITHUB_FILE"
 

lib/client.js

@@ -16,8 +16,8 @@ class Client {
       'x-sdk-name': 'Command Line',
       'x-sdk-platform': 'console',
       'x-sdk-language': 'cli',
-      'x-sdk-version': '10.0.0',
-      'user-agent' : `AppwriteCLI/10.0.0 (${os.type()} ${os.version()}; ${os.arch()})`,
+      'x-sdk-version': '10.0.1',
+      'user-agent' : `AppwriteCLI/10.0.1 (${os.type()} ${os.version()}; ${os.arch()})`,
       'X-Appwrite-Response-Format' : '1.8.0',
     };
   }

lib/commands/projects.js

@@ -1234,7 +1234,7 @@ const projectsListPlatforms = async ({projectId,parseOutput = true, overrideForC
 /**
  * @typedef {Object} ProjectsCreatePlatformRequestParams
  * @property {string} projectId Project unique ID.
- * @property {PlatformType} type Platform type.
+ * @property {PlatformType} type Platform type. Possible values are: web, flutter-web, flutter-ios, flutter-android, flutter-linux, flutter-macos, flutter-windows, apple-ios, apple-macos, apple-watchos, apple-tvos, android, unity, react-native-ios, react-native-android.
  * @property {string} name Platform name. Max length: 128 chars.
  * @property {string} key Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.
  * @property {string} store App store or Google Play store ID. Max length: 256 chars.
@@ -2354,7 +2354,7 @@ projects
     .command(`create-platform`)
     .description(`Create a new platform for your project. Use this endpoint to register a new platform where your users will run your application which will interact with the Appwrite API.`)
     .requiredOption(`--project-id <project-id>`, `Project unique ID.`)
-    .requiredOption(`--type <type>`, `Platform type.`)
+    .requiredOption(`--type <type>`, `Platform type. Possible values are: web, flutter-web, flutter-ios, flutter-android, flutter-linux, flutter-macos, flutter-windows, apple-ios, apple-macos, apple-watchos, apple-tvos, android, unity, react-native-ios, react-native-android.`)
     .requiredOption(`--name <name>`, `Platform name. Max length: 128 chars.`)
     .option(`--key <key>`, `Package name for Android or bundle ID for iOS or macOS. Max length: 256 chars.`)
     .option(`--store <store>`, `App store or Google Play store ID. Max length: 256 chars.`)

lib/commands/pull.js

@@ -358,7 +358,7 @@ const pullTable = async () => {
     });
     if (fetchResponse["databases"].length <= 0) {
         log("No tables found.");
-        success(`Successfully pulled ${chalk.bold(totalTables)} tables from ${chalk.bold(totalTablesDBs)} tables databases.`);
+        success(`Successfully pulled ${chalk.bold(totalTables)} tables from ${chalk.bold(totalTablesDBs)} tableDBs.`);
         return;
     }
 
@@ -398,7 +398,7 @@ const pullTable = async () => {
         }
     }
 
-    success(`Successfully pulled ${chalk.bold(totalTables)} tables from ${chalk.bold(totalTablesDBs)} tables databases.`);
+    success(`Successfully pulled ${chalk.bold(totalTables)} tables from ${chalk.bold(totalTablesDBs)} tableDBs.`);
 }
 
 const pullBucket = async () => {

lib/commands/push.js

@@ -50,10 +50,12 @@ const {
     databasesUpdateCollection
 } = require("./databases");
 const {
+    tablesDBCreate,
     tablesDBGet,
+    tablesDBUpdate,
+    tablesDBCreateTable,
     tablesDBGetTable,
-    tablesDBUpdateTable,
-    tablesDBCreateTable
+    tablesDBUpdateTable
 } = require("./tables-db");
 const {
     storageGetBucket, storageUpdateBucket, storageCreateBucket
@@ -548,7 +550,7 @@ const createAttribute = (databaseId, collectionId, attribute) => {
             return databasesCreateRelationshipAttribute({
                 databaseId,
                 collectionId,
-                relatedCollectionId: attribute.relatedCollection,
+                relatedCollectionId: attribute.relatedTable ?? attribute.relatedCollection,
                 type: attribute.relationType,
                 twoWay: attribute.twoWay,
                 key: attribute.key,
@@ -667,7 +669,7 @@ const updateAttribute = (databaseId, collectionId, attribute) => {
             return databasesUpdateRelationshipAttribute({
                 databaseId,
                 collectionId,
-                relatedCollectionId: attribute.relatedCollection,
+                relatedCollectionId: attribute.relatedTable ?? attribute.relatedCollection,
                 type: attribute.relationType,
                 twoWay: attribute.twoWay,
                 key: attribute.key,
@@ -881,7 +883,7 @@ const createIndexes = async (indexes, collection) => {
             collectionId: collection['$id'],
             key: index.key,
             type: index.type,
-            attributes: index.attributes,
+            attributes: index.columns ?? index.attributes,
             orders: index.orders,
             parseOutput: false
         });
@@ -1730,7 +1732,7 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
 
     const databases = Array.from(new Set(tables.map(table => table['databaseId'])));
 
-    // Parallel db actions
+    // Parallel tablesDB actions
     await Promise.all(databases.map(async (databaseId) => {
         const localDatabase = localConfig.getTablesDB(databaseId);
 
@@ -1741,7 +1743,7 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
             });
 
             if (database.name !== (localDatabase.name ?? databaseId)) {
-                await databasesUpdate({
+                await tablesDBUpdate({
                     databaseId: databaseId,
                     name: localDatabase.name ?? databaseId,
                     parseOutput: false
@@ -1752,7 +1754,7 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
         } catch (err) {
             log(`Database ${databaseId} not found. Creating it now ...`);
 
-            await databasesCreate({
+            await tablesDBCreate({
                 databaseId: databaseId,
                 name: localDatabase.name ?? databaseId,
                 parseOutput: false,
@@ -1761,10 +1763,12 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
     }));
 
 
-    if (!(await approveChanges(tables, tablesDBGetTable, KeysTable, 'tableId', 'tables', ['columns', 'indexes'], 'databaseId', 'databaseId',))) {
+    if (!(await approveChanges(tables, tablesDBGetTable, KeysTable, 'tableId', 'tables', ['columns', 'indexes'], 'databaseId', 'databaseId'))) {
         return;
     }
-    // Parallel collection actions
+    let tablesChanged = new Set();
+
+    // Parallel tables actions
     await Promise.all(tables.map(async (table) => {
         try {
             const remoteTable = await tablesDBGetTable({
@@ -1773,15 +1777,23 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
                 parseOutput: false,
             });
 
-            if (remoteTable.name !== table.name) {
+            const changes = [];
+            if (remoteTable.name !== table.name) changes.push('name');
+            if (remoteTable.rowSecurity !== table.rowSecurity) changes.push('rowSecurity');
+            if (JSON.stringify(remoteTable['$permissions']) !== JSON.stringify(table['$permissions'])) changes.push('permissions');
+
+            if (changes.length > 0) {
                 await tablesDBUpdateTable({
                     databaseId: table['databaseId'],
                     tableId: table['$id'],
                     name: table.name,
-                    parseOutput: false
+                    parseOutput: false,
+                    rowSecurity: table.rowSecurity,
+                    permissions: table['$permissions']
                 })
 
-                success(`Updated ${table.name} ( ${table['$id']} ) name`);
+                success(`Updated ${table.name} ( ${table['$id']} ) - ${changes.join(', ')}`);
+                tablesChanged.add(table['$id']);
             }
             table.remoteVersion = remoteTable;
 
@@ -1794,16 +1806,19 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
                     databaseId: table['databaseId'],
                     tableId: table['$id'],
                     name: table.name,
-                    documentSecurity: table.documentSecurity,
+                    rowSecurity: table.rowSecurity,
                     permissions: table['$permissions'],
                     parseOutput: false
                 })
+
+                success(`Created ${table.name} ( ${table['$id']} )`);
+                tablesChanged.add(table['$id']);
             } else {
                 throw e;
             }
         }
     }))
-    let numberOfTables = 0;
+
     // Serialize attribute actions
     for (let table of tables) {
         let columns = table.columns;
@@ -1831,11 +1846,11 @@ const pushTable = async ({ returnOnZero, attempts } = { returnOnZero: false }) =
         } catch (e) {
             throw e;
         }
-        numberOfTables++;
+        tablesChanged.add(table['$id']);
         success(`Successfully pushed ${table.name} ( ${table['$id']} )`);
     }
 
-    success(`Successfully pushed ${numberOfTables} tables`);
+    success(`Successfully pushed ${tablesChanged.size} tables`);
 }
 
 const pushCollection = async ({ returnOnZero, attempts } = { returnOnZero: false }) => {

lib/config.js

@@ -9,7 +9,7 @@ const KeysSite = new Set(["path", "$id", "name", "enabled", "logging", "timeout"
 const KeysFunction = new Set(["path", "$id", "execute", "name", "enabled", "logging", "runtime", "specification", "scopes", "events", "schedule", "timeout", "entrypoint", "commands", "vars"]);
 const KeysDatabase = new Set(["$id", "name", "enabled"]);
 const KeysCollection = new Set(["$id", "$permissions", "databaseId", "name", "enabled", "documentSecurity", "attributes", "indexes"]);
-const KeysTable = new Set(["$id", "$permissions", "databaseId", "name", "enabled", "documentSecurity", "columns", "indexes"]);
+const KeysTable = new Set(["$id", "$permissions", "databaseId", "name", "enabled", "rowSecurity", "columns", "indexes"]);
 const KeysStorage = new Set(["$id", "$permissions", "fileSecurity", "name", "enabled", "maximumFileSize", "allowedFileExtensions", "compression", "encryption", "antivirus"]);
 const KeysTopics = new Set(["$id", "name", "subscribe"]);
 const KeysTeams = new Set(["$id", "name"]);
@@ -62,12 +62,13 @@ const KeysColumns = new Set([
     "onDelete",
     "side",
     // Indexes
-    "attributes",
+    "columns",
     "orders",
     // Strings
     "encrypt",
 ]);
 const KeyIndexes = new Set(["key", "type", "status", "attributes", "orders"]);
+const KeyIndexesColumns = new Set(["key", "type", "status", "columns", "orders"]);
 
 function whitelistKeys(value, keys, nestedKeys = {}) {
     if (Array.isArray(value)) {
@@ -404,7 +405,7 @@ class Local extends Config {
     addTable(props) {
         props = whitelistKeys(props, KeysTable, {
             columns: KeysColumns,
-            indexes: KeyIndexes
+            indexes: KeyIndexesColumns
         });
 
         if (!this.has("tables")) {

lib/parser.js

@@ -122,7 +122,7 @@ const parseError = (err) => {
             } catch {
             }
 
-            const version = '10.0.0';
+            const version = '10.0.1';
             const stepsToReproduce = `Running \`appwrite ${cliConfig.reportData.data.args.join(' ')}\``;
             const yourEnvironment = `CLI version: ${version}\nOperation System: ${os.type()}\nAppwrite version: ${appwriteVersion}\nIs Cloud: ${isCloud()}`;