appwrite-cli 18.0.1 → 18.1.0

package/dist/index.cjs

@@ -35485,7 +35485,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           return positiveOption || option2;
         };
-        const getErrorMessage = (option2) => {
+        const getErrorMessage2 = (option2) => {
           const bestOption = findBestOptionFromValue(option2);
           const optionKey = bestOption.attributeName();
           const source = this.getOptionValueSource(optionKey);
@@ -35494,7 +35494,7 @@ Expecting one of '${allowedValues.join("', '")}'`);
           }
           return `option '${bestOption.flags}'`;
         };
-        const message = `error: ${getErrorMessage(option)} cannot be used with ${getErrorMessage(conflictingOption)}`;
+        const message = `error: ${getErrorMessage2(option)} cannot be used with ${getErrorMessage2(conflictingOption)}`;
         this.error(message, { code: "commander.conflictingOption" });
       }
       /**
@@ -64957,6 +64957,7 @@ module.exports = __toCommonJS(index_exports);
 var import_fs7 = __toESM(require("fs"), 1);
 var import_path6 = __toESM(require("path"), 1);
 var import_node_readline = __toESM(require("node:readline"), 1);
+var import_node_util = require("node:util");
 var import_dotenv = __toESM(require_main(), 1);
 var import_chalk9 = __toESM(require_source(), 1);
 var import_inquirer3 = __toESM(require_inquirer(), 1);
@@ -65007,7 +65008,7 @@ var id_default = ID;
 // lib/constants.ts
 var SDK_TITLE = "Appwrite";
 var SDK_TITLE_LOWER = "appwrite";
-var SDK_VERSION = "18.0.0";
+var SDK_VERSION = "18.1.0";
 var SDK_LOGO = "\n    _                            _ _           ___   __   _____\n   /_\\  _ __  _ ____      ___ __(_) |_ ___    / __\\ / /   \\_   \\\n  //_\\\\| '_ \\| '_ \\ \\ /\\ / / '__| | __/ _ \\  / /   / /     / /\\/\n /  _  \\ |_) | |_) \\ V  V /| |  | | ||  __/ / /___/ /___/\\/ /_\n \\_/ \\_/ .__/| .__/ \\_/\\_/ |_|  |_|\\__\\___| \\____/\\____/\\____/\n       |_|   |_|\n\n";
 var EXECUTABLE_NAME = "appwrite";
 var UPDATE_CHECK_INTERVAL_MS = 24 * 60 * 60 * 1e3;
@@ -79283,6 +79284,8 @@ var getSafeDirectoryName = (value, fallback) => {
 var siteRequiresBuildCommand = (site) => {
   return !(site.framework === "other" && site.adapter === "static");
 };
+var WINDOWS_EXECUTABLE_NAME = `${EXECUTABLE_NAME.toLowerCase()}.exe`;
+var HOMEBREW_FORMULA_NAME = EXECUTABLE_NAME.toLowerCase();
 var isCloudHostname = (hostname3) => hostname3 === "cloud.appwrite.io" || hostname3.endsWith(".cloud.appwrite.io");
 var getConsoleBaseUrl = (endpoint) => {
   try {
@@ -103666,7 +103669,7 @@ var package_default = {
   type: "module",
   homepage: "https://appwrite.io/support",
   description: "Appwrite is an open-source self-hosted backend server that abstracts and simplifies complex and repetitive development tasks behind a very simple REST API",
-  version: "18.0.1",
+  version: "18.1.0",
   license: "BSD-3-Clause",
   main: "dist/index.cjs",
   module: "dist/index.js",
@@ -103698,9 +103701,9 @@ var package_default = {
     "build:types": "tsc -p tsconfig.json --emitDeclarationOnly",
     "build:runtime": "npm run build:lib:runtime && npm run build:cli",
     "build:lib:runtime": "npm run build:lib:esm && npm run build:lib:cjs",
-    "build:lib:esm": "esbuild index.ts --bundle --platform=node --target=node18 --format=esm --loader:.hbs=text --outfile=dist/index.js",
-    "build:lib:cjs": "esbuild index.ts --bundle --platform=node --target=node18 --format=cjs --loader:.hbs=text --outfile=dist/index.cjs",
-    "build:cli": "esbuild cli.ts --bundle --platform=node --target=node18 --format=cjs --loader:.hbs=text --external:fsevents --outfile=dist/cli.cjs",
+    "build:lib:esm": "esbuild index.ts --bundle --platform=node --target=node18 --format=esm --loader:.hbs=text --external:terminal-image --outfile=dist/index.js",
+    "build:lib:cjs": "esbuild index.ts --bundle --platform=node --target=node18 --format=cjs --loader:.hbs=text --external:terminal-image --outfile=dist/index.cjs",
+    "build:cli": "esbuild cli.ts --bundle --platform=node --target=node18 --format=cjs --loader:.hbs=text --external:fsevents --external:terminal-image --outfile=dist/cli.cjs",
     lint: "eslint .",
     format: 'prettier --write "**/*.{js,ts,json,md}"',
     generate: "tsx scripts/generate-commands.ts",
@@ -103711,7 +103714,7 @@ var package_default = {
     "mac-x64": "bun build cli.ts --compile --sourcemap=inline --target=bun-darwin-x64 --outfile build/appwrite-cli-darwin-x64",
     "mac-arm64": "bun build cli.ts --compile --sourcemap=inline --target=bun-darwin-arm64 --outfile build/appwrite-cli-darwin-arm64",
     "windows-x64": "bun build cli.ts --compile --sourcemap=inline --target=bun-windows-x64 --outfile build/appwrite-cli-win-x64.exe",
-    "windows-arm64": "esbuild cli.ts --bundle --loader:.hbs=text --platform=node --target=node18 --format=esm --external:fsevents --outfile=dist/bundle-win-arm64.mjs && pkg dist/bundle-win-arm64.mjs -t node18-win-arm64 -o build/appwrite-cli-win-arm64.exe"
+    "windows-arm64": "esbuild cli.ts --bundle --loader:.hbs=text --platform=node --target=node18 --format=esm --external:fsevents --external:terminal-image --outfile=dist/bundle-win-arm64.mjs && pkg dist/bundle-win-arm64.mjs -t node18-win-arm64 -o build/appwrite-cli-win-arm64.exe"
   },
   dependencies: {
     "@appwrite.io/console": "~9.1.0",
@@ -103730,9 +103733,13 @@ var package_default = {
     "string-width": "^7.2.0",
     tail: "^2.2.6",
     tar: "^7.4.3",
+    "terminal-image": "^3.1.1",
     undici: "^6.24.0",
     zod: "^4.3.5"
   },
+  overrides: {
+    phin: "3.7.1"
+  },
   devDependencies: {
     "@typescript-eslint/eslint-plugin": "^8.0.0",
     "@typescript-eslint/parser": "^8.0.0",
@@ -105042,9 +105049,9 @@ var import_chalk5 = __toESM(require_source(), 1);
 
 // lib/sdks.ts
 var import_os4 = __toESM(require("os"), 1);
-var sdkForConsole = async (requiresAuth = true) => {
+var sdkForConsole = async (requiresAuth = true, endpointOverride) => {
   const client = new Client();
-  const endpoint = globalConfig2.getEndpoint() || DEFAULT_ENDPOINT;
+  const endpoint = endpointOverride || globalConfig2.getEndpoint() || DEFAULT_ENDPOINT;
   const cookie = globalConfig2.getCookie();
   const selfSigned = globalConfig2.getSelfSigned();
   if (requiresAuth && cookie === "") {
@@ -106837,8 +106844,18 @@ var DEPLOYMENT_TIMEOUT_MS = 10 * 60 * 1e3;
 var DEPLOYMENT_TIMEOUT_MINUTES = Math.round(
   DEPLOYMENT_TIMEOUT_MS / (60 * 1e3)
 );
+var SITE_SCREENSHOT_FINALIZATION_TIMEOUT_MS = 30 * 1e3;
+var SITE_SCREENSHOT_BUCKET_ID = "screenshots";
+var SITE_SCREENSHOT_PREVIEW_WIDTH = 480;
+var SITE_SCREENSHOT_PREVIEW_HEIGHT = 270;
+var SITE_TERMINAL_PREVIEW_TARGET_WIDTH = 72;
+var SITE_TERMINAL_PREVIEW_MAX_WIDTH = 80;
+var SITE_TERMINAL_PREVIEW_MAX_HEIGHT = 22;
+var SITE_TERMINAL_PREVIEW_MIN_HEIGHT = 8;
 var WAITING_JOKE_THRESHOLD_MS = 30 * 1e3;
 var WAITING_JOKE_URL = "https://xkcd.com/303/";
+var ANSI_RESET = "\x1B[0m";
+var terminalImageModulePromise;
 function getDeploymentProgressText(status, waitingSince) {
   if (status === "waiting" && waitingSince !== null && Date.now() - waitingSince >= WAITING_JOKE_THRESHOLD_MS) {
     return `Still waiting... ${WAITING_JOKE_URL}`;
@@ -106848,6 +106865,184 @@ function getDeploymentProgressText(status, waitingSince) {
 function getDeploymentTimeoutErrorMessage() {
   return `Deployment got stuck for more than ${DEPLOYMENT_TIMEOUT_MINUTES} minutes`;
 }
+async function getTerminalImage() {
+  terminalImageModulePromise ??= import("terminal-image").then(
+    (module2) => module2.default
+  );
+  return terminalImageModulePromise;
+}
+function getErrorMessage(error49) {
+  if (error49 instanceof Error && error49.message.trim().length > 0) {
+    return error49.message.trim();
+  }
+  if (Array.isArray(error49)) {
+    const messages = error49.map((entry) => getErrorMessage(entry)).filter((entry) => entry !== "Unknown error");
+    if (messages.length > 0) {
+      return messages.join("; ");
+    }
+  }
+  if (typeof error49 === "string" && error49.trim().length > 0) {
+    return error49.trim();
+  }
+  if (error49 && typeof error49 === "object") {
+    const objectMessage = Reflect.get(error49, "message");
+    if (typeof objectMessage === "string" && objectMessage.trim().length > 0) {
+      return objectMessage.trim();
+    }
+    try {
+      return JSON.stringify(error49);
+    } catch (_serializationError) {
+    }
+  }
+  return "Unknown error";
+}
+function getSiteDeploymentScreenshots(deployment) {
+  const screenshotLight = typeof deployment["screenshotLight"] === "string" && deployment["screenshotLight"].trim().length > 0 ? deployment["screenshotLight"] : void 0;
+  const screenshotDark = typeof deployment["screenshotDark"] === "string" && deployment["screenshotDark"].trim().length > 0 ? deployment["screenshotDark"] : void 0;
+  return {
+    screenshotLight,
+    screenshotDark
+  };
+}
+function hasSiteDeploymentScreenshots(deployment) {
+  const { screenshotLight, screenshotDark } = getSiteDeploymentScreenshots(deployment);
+  return Boolean(screenshotLight || screenshotDark);
+}
+function shouldRenderSiteTerminalPreview() {
+  return Boolean(process.stdout.isTTY) && !cliConfig.json && !cliConfig.raw;
+}
+function getSiteTerminalPreviewWidth() {
+  const columns = process.stdout.columns ?? 80;
+  return Math.max(
+    16,
+    Math.min(
+      columns - 4,
+      SITE_TERMINAL_PREVIEW_TARGET_WIDTH,
+      SITE_TERMINAL_PREVIEW_MAX_WIDTH
+    )
+  );
+}
+function getSiteTerminalPreviewHeight() {
+  const rows = process.stdout.rows ?? 24;
+  return Math.max(
+    SITE_TERMINAL_PREVIEW_MIN_HEIGHT,
+    Math.min(rows - 10, SITE_TERMINAL_PREVIEW_MAX_HEIGHT)
+  );
+}
+async function renderImageBufferToTerminalPreview(buffer) {
+  const terminalImage = await getTerminalImage();
+  const originalTermProgram = process.env.TERM_PROGRAM;
+  const originalTermProgramVersion = process.env.TERM_PROGRAM_VERSION;
+  const originalKonsoleVersion = process.env.KONSOLE_VERSION;
+  const originalKittyWindowId = process.env.KITTY_WINDOW_ID;
+  delete process.env.TERM_PROGRAM;
+  delete process.env.TERM_PROGRAM_VERSION;
+  delete process.env.KONSOLE_VERSION;
+  delete process.env.KITTY_WINDOW_ID;
+  try {
+    return await terminalImage.buffer(buffer, {
+      width: getSiteTerminalPreviewWidth(),
+      height: getSiteTerminalPreviewHeight(),
+      preserveAspectRatio: true
+    });
+  } finally {
+    if (originalTermProgram === void 0) {
+      delete process.env.TERM_PROGRAM;
+    } else {
+      process.env.TERM_PROGRAM = originalTermProgram;
+    }
+    if (originalTermProgramVersion === void 0) {
+      delete process.env.TERM_PROGRAM_VERSION;
+    } else {
+      process.env.TERM_PROGRAM_VERSION = originalTermProgramVersion;
+    }
+    if (originalKonsoleVersion === void 0) {
+      delete process.env.KONSOLE_VERSION;
+    } else {
+      process.env.KONSOLE_VERSION = originalKonsoleVersion;
+    }
+    if (originalKittyWindowId === void 0) {
+      delete process.env.KITTY_WINDOW_ID;
+    } else {
+      process.env.KITTY_WINDOW_ID = originalKittyWindowId;
+    }
+  }
+}
+async function fetchSiteScreenshotPreview(params) {
+  const previewUrl = params.renderer.storageService.getFilePreview({
+    bucketId: SITE_SCREENSHOT_BUCKET_ID,
+    fileId: params.fileId,
+    width: SITE_SCREENSHOT_PREVIEW_WIDTH,
+    height: SITE_SCREENSHOT_PREVIEW_HEIGHT,
+    output: ImageFormat.Png
+  });
+  const imageData = await params.renderer.consoleClient.call(
+    "get",
+    new URL(previewUrl),
+    {},
+    {},
+    "arrayBuffer"
+  );
+  if (!(imageData instanceof ArrayBuffer)) {
+    throw new Error("Failed to download the site screenshot preview.");
+  }
+  return renderImageBufferToTerminalPreview(Buffer.from(imageData));
+}
+function frameTerminalPreview(preview) {
+  const lines = preview.split("\n").map((line) => line.replace(/\s+$/, ""));
+  while (lines.length > 0 && (0, import_node_util.stripVTControlCharacters)(lines[0]).trim().length === 0) {
+    lines.shift();
+  }
+  while (lines.length > 0 && (0, import_node_util.stripVTControlCharacters)(lines[lines.length - 1]).trim().length === 0) {
+    lines.pop();
+  }
+  if (lines.length === 0) {
+    return "";
+  }
+  const contentWidth = Math.max(
+    ...lines.map((line) => (0, import_node_util.stripVTControlCharacters)(line).length)
+  );
+  const border = `+-${"-".repeat(contentWidth)}-+`;
+  return [
+    border,
+    ...lines.map((line) => {
+      const visibleWidth = (0, import_node_util.stripVTControlCharacters)(line).length;
+      return `| ${line}${ANSI_RESET}${" ".repeat(contentWidth - visibleWidth)} |`;
+    }),
+    border
+  ].join("\n");
+}
+async function renderSiteTerminalPreview(params) {
+  const warnings = /* @__PURE__ */ new Set();
+  const candidates = [
+    { fileId: params.screenshotDark, label: "dark" },
+    { fileId: params.screenshotLight, label: "light" }
+  ];
+  for (const candidate of candidates) {
+    const { fileId, label } = candidate;
+    if (!fileId) {
+      continue;
+    }
+    try {
+      const preview = await fetchSiteScreenshotPreview({
+        renderer: params.renderer,
+        fileId
+      });
+      return {
+        preview: frameTerminalPreview(preview),
+        warnings: []
+      };
+    } catch (previewError) {
+      warnings.add(
+        `${label === "dark" ? "Dark mode" : "Light mode"} screenshot: ${getErrorMessage(previewError)}`
+      );
+    }
+  }
+  return {
+    preview: void 0,
+    warnings: [...warnings]
+  };
+}
 function withDeploymentLogsHint(message, deploymentLogsController) {
   const hint2 = deploymentLogsController.getToggleHint();
   return hint2.length > 0 ? `${message} \u2022 ${hint2}` : message;
@@ -107724,7 +107919,7 @@ var Push = class {
                   deploymentLogsController
                 )
               });
-              const timeoutDeadline = Date.now() + DEPLOYMENT_TIMEOUT_MS;
+              let timeoutDeadline = Date.now() + DEPLOYMENT_TIMEOUT_MS;
               while (true) {
                 if (Date.now() > timeoutDeadline) {
                   deploymentLogPrinter.complete();
@@ -108111,6 +108306,8 @@ var Push = class {
               deploymentId
             );
             let waitingSince = null;
+            let readyWithoutScreenshotsSince = null;
+            let activationApplied = false;
             const deploymentLogPrinter = createDeploymentLogPrinter({
               label: `site:${site.name}`,
               showPrefix: sites.length > 1,
@@ -108150,7 +108347,7 @@ var Push = class {
                   deploymentLogsController
                 )
               });
-              const timeoutDeadline = Date.now() + DEPLOYMENT_TIMEOUT_MS;
+              let timeoutDeadline = Date.now() + DEPLOYMENT_TIMEOUT_MS;
               while (true) {
                 if (Date.now() > timeoutDeadline) {
                   deploymentLogPrinter.complete();
@@ -108184,7 +108381,9 @@ var Push = class {
                   waitingSince = null;
                 }
                 if (status === "ready") {
-                  if (activate) {
+                  const { screenshotLight, screenshotDark } = getSiteDeploymentScreenshots(response);
+                  const screenshotsReady = hasSiteDeploymentScreenshots(response);
+                  if (activate && !activationApplied) {
                     currentDeploymentEnd = "Setting active deployment...";
                     updaterRow.update({
                       status: "Activating",
@@ -108200,6 +108399,28 @@ var Push = class {
                       siteId: site["$id"],
                       deploymentId
                     });
+                    activationApplied = true;
+                  }
+                  if (!screenshotsReady) {
+                    readyWithoutScreenshotsSince ??= Date.now();
+                    timeoutDeadline = Math.max(
+                      timeoutDeadline,
+                      readyWithoutScreenshotsSince + SITE_SCREENSHOT_FINALIZATION_TIMEOUT_MS
+                    );
+                    if (Date.now() - readyWithoutScreenshotsSince < SITE_SCREENSHOT_FINALIZATION_TIMEOUT_MS) {
+                      currentDeploymentEnd = "Finalizing deployment preview...";
+                      updaterRow.update({
+                        status: "Finalizing",
+                        end: withDeploymentLogsHint(
+                          currentDeploymentEnd,
+                          deploymentLogsController
+                        )
+                      });
+                      await new Promise(
+                        (resolve3) => setTimeout(resolve3, POLL_DEBOUNCE2)
+                      );
+                      continue;
+                    }
                   }
                   successfullyDeployed++;
                   let url2 = "";
@@ -108226,7 +108447,14 @@ var Push = class {
                     status: activate ? "Deployed" : "Built",
                     end: ""
                   });
-                  deploymentLogs.push({ url: url2, consoleUrl });
+                  deploymentLogs.push({
+                    name: site.name,
+                    url: url2,
+                    consoleUrl,
+                    screenshotLight,
+                    screenshotDark,
+                    screenshotsPending: !screenshotsReady
+                  });
                   break;
                 } else if (status === "failed") {
                   deploymentLogPrinter.complete();
@@ -108281,16 +108509,76 @@ var Push = class {
       Spinner.stop();
     }
     if (deploymentLogs.length > 0) {
+      let sitePreviewRenderer = null;
+      let sitePreviewSetupWarning = null;
+      const emittedPreviewWarnings = /* @__PURE__ */ new Set();
+      if (shouldRenderSiteTerminalPreview() && deploymentLogs.some(
+        (deploymentLog) => deploymentLog.screenshotLight || deploymentLog.screenshotDark
+      )) {
+        try {
+          const consoleClient = await sdkForConsole(
+            true,
+            localConfig.getEndpoint() || globalConfig2.getEndpoint()
+          );
+          sitePreviewRenderer = {
+            consoleClient,
+            storageService: await getStorageService(consoleClient)
+          };
+        } catch (previewSetupError) {
+          sitePreviewSetupWarning = getErrorMessage(previewSetupError);
+        }
+      }
       process.stdout.write("\n");
-      deploymentLogs.forEach((dl, index) => {
+      for (const [index, dl] of deploymentLogs.entries()) {
         if (index > 0) {
           process.stdout.write("\n");
         }
+        if (deploymentLogs.length > 1) {
+          process.stdout.write(`${import_chalk9.default.cyan.bold(`Site: ${dl.name}`)}
+`);
+        }
+        if (dl.screenshotsPending) {
+          hint(
+            "Deployment is ready, but screenshot generation is still finalizing. Open the deployment page to view it once it is available."
+          );
+        }
+        if (sitePreviewRenderer && (dl.screenshotLight || dl.screenshotDark)) {
+          const preview = await renderSiteTerminalPreview({
+            renderer: sitePreviewRenderer,
+            screenshotLight: dl.screenshotLight,
+            screenshotDark: dl.screenshotDark
+          });
+          if (preview.preview) {
+            process.stdout.write(
+              `
+${import_chalk9.default.cyan.bold("Screenshot preview")}
+
+`
+            );
+            process.stdout.write(`${preview.preview}
+
+`);
+          }
+          for (const previewWarning of preview.warnings) {
+            const warningMessage = `Screenshot preview unavailable: ${previewWarning}`;
+            if (emittedPreviewWarnings.has(warningMessage)) {
+              continue;
+            }
+            emittedPreviewWarnings.add(warningMessage);
+            hint(warningMessage);
+          }
+        } else if (sitePreviewSetupWarning && (dl.screenshotLight || dl.screenshotDark)) {
+          const warningMessage = `Screenshot preview unavailable: ${sitePreviewSetupWarning}`;
+          if (!emittedPreviewWarnings.has(warningMessage)) {
+            emittedPreviewWarnings.add(warningMessage);
+            hint(warningMessage);
+          }
+        }
         if (dl.url) {
           this.log(`Preview link: ${import_chalk9.default.cyan(dl.url)}`);
         }
         this.log(`Deployment page: ${import_chalk9.default.cyan(dl.consoleUrl)}`);
-      });
+      }
       process.stdout.write("\n");
     }
     return {
@@ -110541,7 +110829,7 @@ var BaseDatabasesGenerator = class {
 };
 
 // lib/commands/generators/typescript/templates/types.ts.hbs
-var types_ts_default = "import { type Models } from '{{appwriteDep}}';\n\n{{{ENUMS}}}{{{TYPES}}}\ndeclare const __roleStringBrand: unique symbol;\nexport type RoleString = string & { readonly [__roleStringBrand]: never };\n\nexport type RoleBuilder = {\n  any: () => RoleString;\n  user: (userId: string, status?: string) => RoleString;\n  users: (status?: string) => RoleString;\n  guests: () => RoleString;\n  team: (teamId: string, role?: string) => RoleString;\n  member: (memberId: string) => RoleString;\n  label: (label: string) => RoleString;\n}\n\nexport type PermissionBuilder = {\n  read: (role: RoleString) => string;\n  write: (role: RoleString) => string;\n  create: (role: RoleString) => string;\n  update: (role: RoleString) => string;\n  delete: (role: RoleString) => string;\n}\n\nexport type PermissionCallback = (permission: PermissionBuilder, role: RoleBuilder) => string[];\n\nexport type QueryValue = string | number | boolean;\n\nexport type ExtractQueryValue<T> = T extends (infer U)[]\n  ? U extends QueryValue ? U : never\n  : T extends QueryValue | null ? NonNullable<T> : never;\n\nexport type QueryableKeys<T> = {\n  [K in keyof T]: ExtractQueryValue<T[K]> extends never ? never : K;\n}[keyof T];\n\nexport type QueryBuilder<T> = {\n  equal: <K extends QueryableKeys<T>>(field: K, value: ExtractQueryValue<T[K]>) => string;\n  notEqual: <K extends QueryableKeys<T>>(field: K, value: ExtractQueryValue<T[K]>) => string;\n  lessThan: <K extends QueryableKeys<T>>(field: K, value: ExtractQueryValue<T[K]>) => string;\n  lessThanEqual: <K extends QueryableKeys<T>>(field: K, value: ExtractQueryValue<T[K]>) => string;\n  greaterThan: <K extends QueryableKeys<T>>(field: K, value: ExtractQueryValue<T[K]>) => string;\n  greaterThanEqual: <K extends QueryableKeys<T>>(field: K, value: ExtractQueryValue<T[K]>) => string;\n  contains: <K extends QueryableKeys<T>>(field: K, value: ExtractQueryValue<T[K]>) => string;\n  search: <K extends QueryableKeys<T>>(field: K, value: string) => string;\n  isNull: <K extends QueryableKeys<T>>(field: K) => string;\n  isNotNull: <K extends QueryableKeys<T>>(field: K) => string;\n  startsWith: <K extends QueryableKeys<T>>(field: K, value: string) => string;\n  endsWith: <K extends QueryableKeys<T>>(field: K, value: string) => string;\n  between: <K extends QueryableKeys<T>>(field: K, start: ExtractQueryValue<T[K]>, end: ExtractQueryValue<T[K]>) => string;\n  select: <K extends keyof T>(fields: K[]) => string;\n  orderAsc: <K extends keyof T>(field: K) => string;\n  orderDesc: <K extends keyof T>(field: K) => string;\n  limit: (value: number) => string;\n  offset: (value: number) => string;\n  cursorAfter: (documentId: string) => string;\n  cursorBefore: (documentId: string) => string;\n  or: (...queries: string[]) => string;\n  and: (...queries: string[]) => string;\n}\n\nexport type DatabaseId = {{{databaseIdType}}};\n\n{{{DATABASE_TABLES_TYPE}}}\n";
+var types_ts_default = "import { type Models } from '{{appwriteDep}}';\n\n{{{ENUMS}}}{{{TYPES}}}\ndeclare const __roleStringBrand: unique symbol;\nexport type RoleString = string & { readonly [__roleStringBrand]: never };\n\nexport type RoleBuilder = {\n  any: () => RoleString;\n  user: (userId: string, status?: string) => RoleString;\n  users: (status?: string) => RoleString;\n  guests: () => RoleString;\n  team: (teamId: string, role?: string) => RoleString;\n  member: (memberId: string) => RoleString;\n  label: (label: string) => RoleString;\n}\n\nexport type PermissionBuilder = {\n  read: (role: RoleString) => string;\n  write: (role: RoleString) => string;\n  create: (role: RoleString) => string;\n  update: (role: RoleString) => string;\n  delete: (role: RoleString) => string;\n}\n\nexport type PermissionCallback = (permission: PermissionBuilder, role: RoleBuilder) => string[];\n\nexport type QueryValue = string | number | boolean;\n\nexport type ExtractQueryValue<T> = T extends (infer U)[]\n  ? U extends QueryValue ? U : never\n  : T extends QueryValue | null ? NonNullable<T> : never;\n\nexport type QueryableKeys<T> = {\n  [K in keyof T]: ExtractQueryValue<T[K]> extends never ? never : K;\n}[keyof T];\n\nexport type QueryableFieldValue<T, K> = K extends keyof T\n  ? ExtractQueryValue<T[K]>\n  : never;\n\nexport type QueryBuilder<T> = {\n  equal: <K extends QueryableKeys<T>>(field: K, value: QueryableFieldValue<T, K>) => string;\n  notEqual: <K extends QueryableKeys<T>>(field: K, value: QueryableFieldValue<T, K>) => string;\n  lessThan: <K extends QueryableKeys<T>>(field: K, value: QueryableFieldValue<T, K>) => string;\n  lessThanEqual: <K extends QueryableKeys<T>>(field: K, value: QueryableFieldValue<T, K>) => string;\n  greaterThan: <K extends QueryableKeys<T>>(field: K, value: QueryableFieldValue<T, K>) => string;\n  greaterThanEqual: <K extends QueryableKeys<T>>(field: K, value: QueryableFieldValue<T, K>) => string;\n  contains: <K extends QueryableKeys<T>>(field: K, value: QueryableFieldValue<T, K>) => string;\n  search: <K extends QueryableKeys<T>>(field: K, value: string) => string;\n  isNull: <K extends QueryableKeys<T>>(field: K) => string;\n  isNotNull: <K extends QueryableKeys<T>>(field: K) => string;\n  startsWith: <K extends QueryableKeys<T>>(field: K, value: string) => string;\n  endsWith: <K extends QueryableKeys<T>>(field: K, value: string) => string;\n  between: <K extends QueryableKeys<T>>(field: K, start: QueryableFieldValue<T, K>, end: QueryableFieldValue<T, K>) => string;\n  select: <K extends keyof T>(fields: K[]) => string;\n  orderAsc: <K extends keyof T>(field: K) => string;\n  orderDesc: <K extends keyof T>(field: K) => string;\n  limit: (value: number) => string;\n  offset: (value: number) => string;\n  cursorAfter: (documentId: string) => string;\n  cursorBefore: (documentId: string) => string;\n  or: (...queries: string[]) => string;\n  and: (...queries: string[]) => string;\n}\n\nexport type DatabaseId = {{{databaseIdType}}};\n\n{{{DATABASE_TABLES_TYPE}}}\n";
 
 // lib/commands/generators/typescript/templates/databases.ts.hbs
 var databases_ts_default = 'import { Client, TablesDB, ID, Query, type Models, Permission, Role } from \'{{appwriteDep}}\';\nimport type { DatabaseHandle, DatabaseId, DatabaseTableMap, DatabaseTables, QueryBuilder, QueryValue, PermissionBuilder, RoleBuilder, RoleString } from \'./types{{importExt}}\';\n{{#if supportsServerSide}}\nimport { PROJECT_ID, ENDPOINT, API_KEY } from \'./constants{{importExt}}\';\n{{else}}\nimport { PROJECT_ID, ENDPOINT } from \'./constants{{importExt}}\';\n{{/if}}\n\nconst createQueryBuilder = <T>(): QueryBuilder<T> => ({\n  equal: (field, value) => Query.equal(String(field), value as QueryValue),\n  notEqual: (field, value) => Query.notEqual(String(field), value as QueryValue),\n  lessThan: (field, value) => Query.lessThan(String(field), value as QueryValue),\n  lessThanEqual: (field, value) => Query.lessThanEqual(String(field), value as QueryValue),\n  greaterThan: (field, value) => Query.greaterThan(String(field), value as QueryValue),\n  greaterThanEqual: (field, value) => Query.greaterThanEqual(String(field), value as QueryValue),\n  contains: (field, value) => Query.contains(String(field), value as string | QueryValue[]),\n  search: (field, value) => Query.search(String(field), value),\n  isNull: (field) => Query.isNull(String(field)),\n  isNotNull: (field) => Query.isNotNull(String(field)),\n  startsWith: (field, value) => Query.startsWith(String(field), value),\n  endsWith: (field, value) => Query.endsWith(String(field), value),\n  between: (field, start, end) => Query.between(String(field), start as string | number, end as string | number),\n  select: (fields) => Query.select(fields.map(String)),\n  orderAsc: (field) => Query.orderAsc(String(field)),\n  orderDesc: (field) => Query.orderDesc(String(field)),\n  limit: (value) => Query.limit(value),\n  offset: (value) => Query.offset(value),\n  cursorAfter: (documentId) => Query.cursorAfter(documentId),\n  cursorBefore: (documentId) => Query.cursorBefore(documentId),\n  or: (...queries) => Query.or(queries),\n  and: (...queries) => Query.and(queries),\n});\n\n{{{TABLE_ID_MAP}}}\n\n{{{TABLES_WITH_RELATIONSHIPS}}}\n\nconst roleBuilder: RoleBuilder = {\n  any: () => Role.any() as RoleString,\n  user: (userId, status?) => Role.user(userId, status) as RoleString,\n  users: (status?) => Role.users(status) as RoleString,\n  guests: () => Role.guests() as RoleString,\n  team: (teamId, role?) => Role.team(teamId, role) as RoleString,\n  member: (memberId) => Role.member(memberId) as RoleString,\n  label: (label) => Role.label(label) as RoleString,\n};\n\nconst permissionBuilder: PermissionBuilder = {\n  read: (role) => Permission.read(role),\n  write: (role) => Permission.write(role),\n  create: (role) => Permission.create(role),\n  update: (role) => Permission.update(role),\n  delete: (role) => Permission.delete(role),\n};\n\nconst resolvePermissions = (callback?: (permission: { read: (role: RoleString) => string; write: (role: RoleString) => string; create: (role: RoleString) => string; update: (role: RoleString) => string; delete: (role: RoleString) => string }, role: { any: () => RoleString; user: (userId: string, status?: string) => RoleString; users: (status?: string) => RoleString; guests: () => RoleString; team: (teamId: string, role?: string) => RoleString; member: (memberId: string) => RoleString; label: (label: string) => RoleString }) => string[]): string[] | undefined =>\n  callback?.(permissionBuilder, roleBuilder);\n\nfunction createTableApi<T extends Models.Row>(\n  tablesDB: TablesDB,\n  databaseId: string,\n  tableId: string,\n) {\n  return {\n    create: (data: Omit<T, keyof Models.Row>, options?: { rowId?: string; permissions?: (permission: { read: (role: RoleString) => string; write: (role: RoleString) => string; create: (role: RoleString) => string; update: (role: RoleString) => string; delete: (role: RoleString) => string }, role: { any: () => RoleString; user: (userId: string, status?: string) => RoleString; users: (status?: string) => RoleString; guests: () => RoleString; team: (teamId: string, role?: string) => RoleString; member: (memberId: string) => RoleString; label: (label: string) => RoleString }) => string[]; transactionId?: string }) =>\n      tablesDB.createRow<T>({\n        databaseId,\n        tableId,\n        rowId: options?.rowId ?? ID.unique(),\n        data: data as T extends Models.DefaultRow ? Partial<Models.Row> & Record<string, unknown> : Partial<Models.Row> & Omit<T, keyof Models.Row>,\n        permissions: resolvePermissions(options?.permissions),\n        transactionId: options?.transactionId,\n      }),\n    get: (id: string) =>\n      tablesDB.getRow<T>({\n        databaseId,\n        tableId,\n        rowId: id,\n      }),\n    update: (id: string, data: Partial<Omit<T, keyof Models.Row>>, options?: { permissions?: (permission: { read: (role: RoleString) => string; write: (role: RoleString) => string; create: (role: RoleString) => string; update: (role: RoleString) => string; delete: (role: RoleString) => string }, role: { any: () => RoleString; user: (userId: string, status?: string) => RoleString; users: (status?: string) => RoleString; guests: () => RoleString; team: (teamId: string, role?: string) => RoleString; member: (memberId: string) => RoleString; label: (label: string) => RoleString }) => string[]; transactionId?: string }) =>\n      tablesDB.updateRow<T>({\n        databaseId,\n        tableId,\n        rowId: id,\n        data: data as T extends Models.DefaultRow ? Partial<Models.Row> & Record<string, unknown> : Partial<Models.Row> & Partial<Omit<T, keyof Models.Row>>,\n        ...(options?.permissions ? { permissions: resolvePermissions(options.permissions) } : {}),\n        transactionId: options?.transactionId,\n      }),\n    delete: async (id: string, options?: { transactionId?: string }) => {\n      await tablesDB.deleteRow({\n        databaseId,\n        tableId,\n        rowId: id,\n        transactionId: options?.transactionId,\n      });\n    },\n    list: (options?: { queries?: (q: QueryBuilder<T>) => string[] }) =>\n      tablesDB.listRows<T>({\n        databaseId,\n        tableId,\n        queries: options?.queries?.(createQueryBuilder<T>()),\n      }),{{{BULK_METHODS}}}\n  };\n}\n\n{{{BULK_CHECK}}}\nconst hasOwn = (obj: unknown, key: string): boolean =>\n  obj != null && Object.prototype.hasOwnProperty.call(obj, key);\n\nfunction createDatabaseHandle<D extends DatabaseId>(\n  tablesDB: TablesDB,\n  databaseId: D,\n): DatabaseHandle<D> {\n  const tableApiCache = new Map<string, unknown>();\n  const dbMap = tableIdMap[databaseId];\n\n  return {\n    use: <T extends keyof DatabaseTableMap[D] & string>(tableId: T): DatabaseTableMap[D][T] => {\n      if (!hasOwn(dbMap, tableId)) {\n        throw new Error(`Unknown table "${tableId}" in database "${databaseId}"`);\n      }\n\n      if (!tableApiCache.has(tableId)) {\n        const resolvedTableId = dbMap[tableId];\n        const api = createTableApi(tablesDB, databaseId, resolvedTableId);\n        {{{BULK_REMOVAL}}}\n        tableApiCache.set(tableId, api);\n      }\n      return tableApiCache.get(tableId) as DatabaseTableMap[D][T];\n    },\n{{#if supportsServerSide}}\n    create: (tableId: string, name: string, options?: { permissions?: (permission: { read: (role: RoleString) => string; write: (role: RoleString) => string; create: (role: RoleString) => string; update: (role: RoleString) => string; delete: (role: RoleString) => string }, role: { any: () => RoleString; user: (userId: string, status?: string) => RoleString; users: (status?: string) => RoleString; guests: () => RoleString; team: (teamId: string, role?: string) => RoleString; member: (memberId: string) => RoleString; label: (label: string) => RoleString }) => string[]; rowSecurity?: boolean; enabled?: boolean; columns?: object[]; indexes?: object[] }) =>\n      tablesDB.createTable({\n        databaseId,\n        tableId,\n        name,\n        permissions: resolvePermissions(options?.permissions),\n        rowSecurity: options?.rowSecurity,\n        enabled: options?.enabled,\n        columns: options?.columns,\n        indexes: options?.indexes,\n      }),\n    update: (tableId: string, options?: { name?: string; permissions?: (permission: { read: (role: RoleString) => string; write: (role: RoleString) => string; create: (role: RoleString) => string; update: (role: RoleString) => string; delete: (role: RoleString) => string }, role: { any: () => RoleString; user: (userId: string, status?: string) => RoleString; users: (status?: string) => RoleString; guests: () => RoleString; team: (teamId: string, role?: string) => RoleString; member: (memberId: string) => RoleString; label: (label: string) => RoleString }) => string[]; rowSecurity?: boolean; enabled?: boolean }) => {\n      if (!hasOwn(dbMap, tableId)) {\n        throw new Error(`Unknown table "${tableId}" in database "${databaseId}"`);\n      }\n      const resolvedTableId = dbMap[tableId];\n      return tablesDB.updateTable({\n        databaseId,\n        tableId: resolvedTableId,\n        name: options?.name,\n        permissions: resolvePermissions(options?.permissions),\n        rowSecurity: options?.rowSecurity,\n        enabled: options?.enabled,\n      });\n    },\n    delete: async (tableId: string) => {\n      if (!hasOwn(dbMap, tableId)) {\n        throw new Error(`Unknown table "${tableId}" in database "${databaseId}"`);\n      }\n      const resolvedTableId = dbMap[tableId];\n      await tablesDB.deleteTable({\n        databaseId,\n        tableId: resolvedTableId,\n      });\n    },\n{{/if}}\n  };\n}\n\nfunction createDatabasesApi(tablesDB: TablesDB): DatabaseTables {\n  const dbCache = new Map<DatabaseId, ReturnType<typeof createDatabaseHandle>>();\n\n  return {\n    use: (databaseId: DatabaseId) => {\n      if (!hasOwn(tableIdMap, databaseId)) {\n        throw new Error(`Unknown database "${databaseId}"`);\n      }\n\n      if (!dbCache.has(databaseId)) {\n        dbCache.set(databaseId, createDatabaseHandle(tablesDB, databaseId));\n      }\n      return dbCache.get(databaseId);\n    },\n{{#if supportsServerSide}}\n    create: (databaseId: string, name: string, options?: { enabled?: boolean }) =>\n      tablesDB.create({\n        databaseId,\n        name,\n        enabled: options?.enabled,\n      }),\n    update: (databaseId: DatabaseId, options?: { name?: string; enabled?: boolean }) => {\n      return tablesDB.update({\n        databaseId,\n        name: options?.name ?? databaseId,\n        enabled: options?.enabled,\n      });\n    },\n    delete: async (databaseId: DatabaseId) => {\n      await tablesDB.delete({\n        databaseId,\n      });\n    },\n{{/if}}\n  } as DatabaseTables;\n}\n\n// Initialize client\nconst client = new Client()\n  .setEndpoint(ENDPOINT)\n  .setProject(PROJECT_ID){{#if supportsServerSide}}\n  .setKey(API_KEY){{/if}};\n\nconst tablesDB = new TablesDB(client);\n\nexport const databases: DatabaseTables = createDatabasesApi(tablesDB);\n';
@@ -110558,7 +110846,7 @@ var databasesTemplate = import_handlebars.default.compile(String(databases_ts_de
 var indexTemplate = import_handlebars.default.compile(String(index_ts_default));
 var constantsTemplate = import_handlebars.default.compile(String(constants_ts_default));
 var PERMISSION_CALLBACK_INLINE = `(permission: { read: (role: RoleString) => string; write: (role: RoleString) => string; create: (role: RoleString) => string; update: (role: RoleString) => string; delete: (role: RoleString) => string }, role: { any: () => RoleString; user: (userId: string, status?: string) => RoleString; users: (status?: string) => RoleString; guests: () => RoleString; team: (teamId: string, role?: string) => RoleString; member: (memberId: string) => RoleString; label: (label: string) => RoleString }) => string[]`;
-var getQueryCallbackInline = (typeName) => `(q: { equal: <K extends QueryableKeys<${typeName}>>(field: K, value: ExtractQueryValue<${typeName}[K]>) => string; notEqual: <K extends QueryableKeys<${typeName}>>(field: K, value: ExtractQueryValue<${typeName}[K]>) => string; lessThan: <K extends QueryableKeys<${typeName}>>(field: K, value: ExtractQueryValue<${typeName}[K]>) => string; lessThanEqual: <K extends QueryableKeys<${typeName}>>(field: K, value: ExtractQueryValue<${typeName}[K]>) => string; greaterThan: <K extends QueryableKeys<${typeName}>>(field: K, value: ExtractQueryValue<${typeName}[K]>) => string; greaterThanEqual: <K extends QueryableKeys<${typeName}>>(field: K, value: ExtractQueryValue<${typeName}[K]>) => string; contains: <K extends QueryableKeys<${typeName}>>(field: K, value: ExtractQueryValue<${typeName}[K]>) => string; search: <K extends QueryableKeys<${typeName}>>(field: K, value: string) => string; isNull: <K extends QueryableKeys<${typeName}>>(field: K) => string; isNotNull: <K extends QueryableKeys<${typeName}>>(field: K) => string; startsWith: <K extends QueryableKeys<${typeName}>>(field: K, value: string) => string; endsWith: <K extends QueryableKeys<${typeName}>>(field: K, value: string) => string; between: <K extends QueryableKeys<${typeName}>>(field: K, start: ExtractQueryValue<${typeName}[K]>, end: ExtractQueryValue<${typeName}[K]>) => string; select: <K extends keyof ${typeName}>(fields: K[]) => string; orderAsc: <K extends keyof ${typeName}>(field: K) => string; orderDesc: <K extends keyof ${typeName}>(field: K) => string; limit: (value: number) => string; offset: (value: number) => string; cursorAfter: (documentId: string) => string; cursorBefore: (documentId: string) => string; or: (...queries: string[]) => string; and: (...queries: string[]) => string }) => string[]`;
+var getQueryCallbackInline = (typeName) => `(q: { equal: <K extends QueryableKeys<${typeName}>>(field: K, value: QueryableFieldValue<${typeName}, K>) => string; notEqual: <K extends QueryableKeys<${typeName}>>(field: K, value: QueryableFieldValue<${typeName}, K>) => string; lessThan: <K extends QueryableKeys<${typeName}>>(field: K, value: QueryableFieldValue<${typeName}, K>) => string; lessThanEqual: <K extends QueryableKeys<${typeName}>>(field: K, value: QueryableFieldValue<${typeName}, K>) => string; greaterThan: <K extends QueryableKeys<${typeName}>>(field: K, value: QueryableFieldValue<${typeName}, K>) => string; greaterThanEqual: <K extends QueryableKeys<${typeName}>>(field: K, value: QueryableFieldValue<${typeName}, K>) => string; contains: <K extends QueryableKeys<${typeName}>>(field: K, value: QueryableFieldValue<${typeName}, K>) => string; search: <K extends QueryableKeys<${typeName}>>(field: K, value: string) => string; isNull: <K extends QueryableKeys<${typeName}>>(field: K) => string; isNotNull: <K extends QueryableKeys<${typeName}>>(field: K) => string; startsWith: <K extends QueryableKeys<${typeName}>>(field: K, value: string) => string; endsWith: <K extends QueryableKeys<${typeName}>>(field: K, value: string) => string; between: <K extends QueryableKeys<${typeName}>>(field: K, start: QueryableFieldValue<${typeName}, K>, end: QueryableFieldValue<${typeName}, K>) => string; select: <K extends keyof ${typeName}>(fields: K[]) => string; orderAsc: <K extends keyof ${typeName}>(field: K) => string; orderDesc: <K extends keyof ${typeName}>(field: K) => string; limit: (value: number) => string; offset: (value: number) => string; cursorAfter: (documentId: string) => string; cursorBefore: (documentId: string) => string; or: (...queries: string[]) => string; and: (...queries: string[]) => string }) => string[]`;
 var TypeScriptDatabasesGenerator = class extends BaseDatabasesGenerator {
   language = "typescript";
   fileExtension = "ts";