Merge pull request #232 from appwrite/dev

Author: abnegate

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## 13.0.0-rc.5
+
+- Fix Push all not working correctly
+
 ## 13.0.0-rc.4
 
 - Fix CLI ES module import issues

README.md

@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-13.0.0-rc.4
+13.0.0-rc.5
 ```
 
 ### 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
-13.0.0-rc.4
+13.0.0-rc.5
 ```
 
 ## 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/13.0.0-rc.4/appwrite-cli-win-x64.exe"
-$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0-rc.4/appwrite-cli-win-arm64.exe"
+$GITHUB_x64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0-rc.5/appwrite-cli-win-x64.exe"
+$GITHUB_arm64_URL = "https://github.com/appwrite/sdk-for-cli/releases/download/13.0.0-rc.5/appwrite-cli-win-arm64.exe"
 
 $APPWRITE_BINARY_NAME = "appwrite.exe"
 

install.sh

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

lib/client.ts

@@ -19,7 +19,7 @@ import {
   SDK_TITLE,
 } from "./constants.js";
 
-const JSONBigInt = JSONbig({ storeAsString: false });
+const JSONBigInt = JSONbig({ useNativeBigInt: true });
 
 class Client {
   private endpoint: string;

lib/commands/config.ts

@@ -127,10 +127,10 @@ const SettingsSchema = z
           .optional(),
         security: z
           .object({
-            duration: z.number().optional(),
-            limit: z.number().optional(),
-            sessionsLimit: z.number().optional(),
-            passwordHistory: z.number().optional(),
+            duration: z.union([z.number(), z.bigint()]).optional(),
+            limit: z.union([z.number(), z.bigint()]).optional(),
+            sessionsLimit: z.union([z.number(), z.bigint()]).optional(),
+            passwordHistory: z.union([z.number(), z.bigint()]).optional(),
             passwordDictionary: z.boolean().optional(),
             personalDataCheck: z.boolean().optional(),
             sessionAlerts: z.boolean().optional(),
@@ -155,7 +155,7 @@ const SiteSchema = z
     name: z.string(),
     enabled: z.boolean().optional(),
     logging: z.boolean().optional(),
-    timeout: z.number().optional(),
+    timeout: z.union([z.number(), z.bigint()]).optional(),
     framework: z.string().optional(),
     buildRuntime: z.string().optional(),
     adapter: z.string().optional(),
@@ -182,7 +182,7 @@ const FunctionSchema = z
     scopes: z.array(z.string()).optional(),
     events: z.array(z.string()).optional(),
     schedule: z.string().optional(),
-    timeout: z.number().optional(),
+    timeout: z.union([z.number(), z.bigint()]).optional(),
     entrypoint: z.string().optional(),
     commands: z.string().optional(),
     vars: z.record(z.string(), z.string()).optional(),

lib/commands/push.ts

@@ -1,4 +1,5 @@
 import fs from "fs";
+import path from "path";
 import { parse as parseDotenv } from "dotenv";
 import chalk from "chalk";
 import inquirer from "inquirer";
@@ -25,7 +26,9 @@ import {
   questionsPushBuckets,
   questionsPushTeams,
   questionsPushFunctions,
+  questionsPushFunctionsCode,
   questionsPushSites,
+  questionsPushSitesCode,
   questionsGetEntrypoint,
   questionsPushCollections,
   questionsPushTables,
@@ -414,23 +417,23 @@ export class Push {
         this.log("Applying auth security settings ...");
         await projectsService.updateAuthDuration({
           projectId,
-          duration: settings.auth.security.duration,
+          duration: Number(settings.auth.security.duration),
         });
         await projectsService.updateAuthLimit({
           projectId,
-          limit: settings.auth.security.limit,
+          limit: Number(settings.auth.security.limit),
         });
         await projectsService.updateAuthSessionsLimit({
           projectId,
-          limit: settings.auth.security.sessionsLimit,
+          limit: Number(settings.auth.security.sessionsLimit),
         });
         await projectsService.updateAuthPasswordDictionary({
           projectId,
           enabled: settings.auth.security.passwordDictionary,
         });
         await projectsService.updateAuthPasswordHistory({
           projectId,
-          limit: settings.auth.security.passwordHistory,
+          limit: Number(settings.auth.security.passwordHistory),
         });
         await projectsService.updatePersonalDataCheck({
           projectId,
@@ -807,6 +810,27 @@ export class Push {
           return;
         }
 
+        if (!func.path) {
+          errors.push(new Error(`Function '${func.name}' has no path configured`));
+          updaterRow.fail({
+            errorMessage: `No path configured for function`,
+          });
+          return;
+        }
+
+        if (
+          !fs.existsSync(func.path) ||
+          fs.readdirSync(func.path).length === 0
+        ) {
+          errors.push(
+            new Error(`Deployment not found or empty at path: ${func.path}`),
+          );
+          updaterRow.fail({
+            errorMessage: `path not found or empty: ${path.relative(process.cwd(), path.resolve(func.path))}`,
+          });
+          return;
+        }
+
         try {
           updaterRow.update({ status: "Pushing" }).replaceSpinner(SPINNER_DOTS);
           const functionsServiceDeploy = await getFunctionsService(
@@ -838,7 +862,7 @@ export class Push {
           switch (e.code) {
             case "ENOENT":
               updaterRow.fail({
-                errorMessage: "Not found in the current directory. Skipping...",
+                errorMessage: `Deployment not found at path: ${path.resolve(func.path)}`,
               });
               break;
             default:
@@ -1145,6 +1169,27 @@ export class Push {
           return;
         }
 
+        if (!site.path) {
+          errors.push(new Error(`Site '${site.name}' has no path configured`));
+          updaterRow.fail({
+            errorMessage: `No path configured for site`,
+          });
+          return;
+        }
+
+        if (
+          !fs.existsSync(site.path) ||
+          fs.readdirSync(site.path).length === 0
+        ) {
+          errors.push(
+            new Error(`Deployment not found or empty at path: ${site.path}`),
+          );
+          updaterRow.fail({
+            errorMessage: `path not found or empty: ${path.relative(process.cwd(), path.resolve(site.path))}`,
+          });
+          return;
+        }
+
         try {
           updaterRow.update({ status: "Pushing" }).replaceSpinner(SPINNER_DOTS);
           const sitesServiceDeploy = await getSitesService(this.projectClient);
@@ -1174,7 +1219,7 @@ export class Push {
           switch (e.code) {
             case "ENOENT":
               updaterRow.fail({
-                errorMessage: "Not found in the current directory. Skipping...",
+                errorMessage: `Deployment not found at path: ${path.resolve(site.path)}`,
               });
               break;
             default:
@@ -1593,13 +1638,47 @@ const pushResources = async ({
   if (cliConfig.all) {
     checkDeployConditions(localConfig);
 
+    const functions = localConfig.getFunctions();
+    let allowFunctionsCodePush: boolean | null =
+      cliConfig.force === true ? true : null;
+    if (functions.length > 0 && allowFunctionsCodePush === null) {
+      const codeAnswer = await inquirer.prompt(questionsPushFunctionsCode);
+      allowFunctionsCodePush = codeAnswer.override;
+    }
+
+    const sites = localConfig.getSites();
+    let allowSitesCodePush: boolean | null =
+      cliConfig.force === true ? true : null;
+    if (sites.length > 0 && allowSitesCodePush === null) {
+      const codeAnswer = await inquirer.prompt(questionsPushSitesCode);
+      allowSitesCodePush = codeAnswer.override;
+    }
+
     const pushInstance = await createPushInstance();
-    const config = localConfig.getProject() as ConfigType;
+    const project = localConfig.getProject();
+    const config: ConfigType = {
+      projectId: project.projectId ?? "",
+      projectName: project.projectName,
+      settings: project.projectSettings,
+      functions,
+      sites,
+      collections: localConfig.getCollections(),
+      databases: localConfig.getDatabases(),
+      tables: localConfig.getTables(),
+      tablesDB: localConfig.getTablesDBs(),
+      buckets: localConfig.getBuckets(),
+      teams: localConfig.getTeams(),
+      topics: localConfig.getMessagingTopics(),
+    };
 
     await pushInstance.pushResources(config, {
+      all: cliConfig.all,
       skipDeprecated,
-      functionOptions: { code: true, withVariables: false },
-      siteOptions: { code: true, withVariables: false },
+      functionOptions: {
+        code: allowFunctionsCodePush === true,
+        withVariables: false,
+      },
+      siteOptions: { code: allowSitesCodePush === true, withVariables: false },
     });
   } else {
     const actions: Record<string, (options?: any) => Promise<void>> = {
@@ -1763,12 +1842,20 @@ const pushSite = async ({
     return;
   }
 
+  let allowCodePush: boolean | null = cliConfig.force === true ? true : null;
+  if (code !== false && allowCodePush === null) {
+    const codeAnswer = await inquirer.prompt(questionsPushSitesCode);
+    allowCodePush = codeAnswer.override;
+  }
+
+  const shouldPushCode = code !== false && allowCodePush === true;
+
   log("Pushing sites ...");
 
   const pushInstance = await createPushInstance();
   const result = await pushInstance.pushSites(sites, {
     async: asyncDeploy,
-    code,
+    code: shouldPushCode,
     withVariables,
   });
 
@@ -1883,12 +1970,20 @@ const pushFunction = async ({
     return;
   }
 
+  let allowCodePush: boolean | null = cliConfig.force === true ? true : null;
+  if (code !== false && allowCodePush === null) {
+    const codeAnswer = await inquirer.prompt(questionsPushFunctionsCode);
+    allowCodePush = codeAnswer.override;
+  }
+
+  const shouldPushCode = code !== false && allowCodePush === true;
+
   log("Pushing functions ...");
 
   const pushInstance = await createPushInstance();
   const result = await pushInstance.pushFunctions(functions, {
     async: asyncDeploy,
-    code,
+    code: shouldPushCode,
     withVariables,
   });
 

lib/commands/schema.ts

@@ -9,7 +9,7 @@ import * as fs from "fs";
 import * as path from "path";
 import { Db } from "./db.js";
 
-const JSONBig = JSONbig({ storeAsString: false });
+const JSONBig = JSONbig({ useNativeBigInt: true });
 
 export class Schema {
   private pullCommand: Pull;

lib/commands/utils/attributes.ts

@@ -1,7 +1,7 @@
 import chalk from "chalk";
 import { getDatabasesService } from "../../services.js";
 import { KeysAttributes } from "../../config.js";
-import { log, success, cliConfig, drawTable } from "../../parser.js";
+import { log, success, error, cliConfig, drawTable } from "../../parser.js";
 import { Pools } from "./pools.js";
 import inquirer from "inquirer";
 
@@ -591,15 +591,21 @@ export class Attributes {
 
     if (changes.length > 0) {
       changedAttributes = changes.map((change) => change.attribute);
-      await Promise.all(
-        changedAttributes.map((changed) =>
-          this.updateAttribute(
-            collection["databaseId"],
-            collection["$id"],
-            changed,
+      try {
+        await Promise.all(
+          changedAttributes.map((changed) =>
+            this.updateAttribute(
+              collection["databaseId"],
+              collection["$id"],
+              changed,
+            ),
           ),
-        ),
-      );
+        );
+      } catch (err) {
+        error(
+          `Error updating attribute for ${collection["$id"]}: ${String(err)}`,
+        );
+      }
     }
 
     const deletingAttributes = deleting.map((change) => change.attribute);

lib/commands/utils/pools.ts

@@ -44,7 +44,7 @@ export class Pools {
     }
 
     if (this.pollMaxDebounces === this.POLL_DEFAULT_VALUE) {
-      let steps = Math.max(1, Math.ceil(total / this.STEP_SIZE));
+      let steps = Math.max(1, Math.ceil(Number(total) / this.STEP_SIZE));
       if (steps > 1 && iteration === 1) {
         this.pollMaxDebounces *= steps;
 
@@ -83,7 +83,7 @@ export class Pools {
     }
 
     if (this.pollMaxDebounces === this.POLL_DEFAULT_VALUE) {
-      let steps = Math.max(1, Math.ceil(total / this.STEP_SIZE));
+      let steps = Math.max(1, Math.ceil(Number(total) / this.STEP_SIZE));
       if (steps > 1 && iteration === 1) {
         this.pollMaxDebounces *= steps;