appwrite-cli 13.1.0-rc.3 → 13.1.0

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 13.1.0
+
+- Mark `appwrite generate` command as stable
+- Improve permissions param to be a typesafe callback
+- Fix relationship handling in generated code
+- Fix `appwrite client` properly hanlding `--key` parameter
+- Fix `init site` not working on Windows
+
 ## 13.1.0-rc.3
 
 - Allow generation of server side CRUD operations on databases and tables

package/README.md

@@ -29,7 +29,7 @@ Once the installation is complete, you can verify the install using
 
 ```sh
 $ appwrite -v
-13.1.0-rc.3
+13.1.0
 ```
 
 ### 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.1.0-rc.3
+13.1.0
 ```
 
 ## Getting Started 

package/dist/bundle-win-arm64.mjs

@@ -93398,7 +93398,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: "13.1.0-rc.3",
+  version: "13.1.0",
   license: "BSD-3-Clause",
   main: "dist/index.js",
   types: "dist/index.d.ts",
@@ -93437,7 +93437,6 @@ var package_default = {
     dotenv: "^16.4.5",
     ejs: "^3.1.9",
     handlebars: "^4.7.7",
-    "form-data": "^4.0.0",
     ignore: "^7.0.5",
     inquirer: "^8.2.4",
     "inquirer-search-list": "^1.2.6",
@@ -107649,7 +107648,7 @@ import childProcess from "child_process";
 // lib/constants.ts
 var SDK_TITLE = "Appwrite";
 var SDK_TITLE_LOWER = "appwrite";
-var SDK_VERSION = "13.1.0-rc.3";
+var SDK_VERSION = "13.1.0";
 var SDK_NAME = "Command Line";
 var SDK_PLATFORM = "console";
 var SDK_LANGUAGE = "cli";
@@ -133108,6 +133107,7 @@ var commandDescriptions = {
   push: `The push command provides a convenient wrapper for pushing your functions, collections, buckets, teams, and messaging-topics.`,
   run: `The run command allows you to run the project locally to allow easy development and quick debugging.`,
   functions: `The functions command allows you to view, create, and manage your Cloud Functions.`,
+  generate: `The generate command allows you to generate a type-safe SDK from your ${SDK_TITLE} project configuration.`,
   health: `The health command allows you to both validate and monitor your ${SDK_TITLE} server's health.`,
   pull: `The pull command helps you pull your ${SDK_TITLE} project, functions, collections, buckets, teams, and messaging-topics`,
   locale: `The locale command allows you to customize your app based on your users' location.`,
@@ -136225,23 +136225,19 @@ var initSite = async () => {
   let selected = {
     template: templateDetails.frameworks[0].providerRootDirectory
   };
-  let gitCloneCommands = "";
+  let dirSetupCommands = "";
   const sparse = selected.template.startsWith("./") ? selected.template.substring(2) : selected.template;
   log("Fetching site code ...");
   if (selected.template === "./") {
-    gitCloneCommands = `
-            mkdir -p .
-            cd .
+    dirSetupCommands = `
+            cd ${templatesDir}
             git init
             git remote add origin ${repo}
-            git config --global init.defaultBranch main
-            git fetch --depth=1 origin refs/tags/$(git ls-remote --tags origin "${templateDetails.providerVersion}" | tail -n 1 | awk -F '/' '{print $3}')
-            git checkout FETCH_HEAD
+            git config --global init.defaultBranch main   
         `.trim();
   } else {
-    gitCloneCommands = `
-            mkdir -p .
-            cd .
+    dirSetupCommands = `
+            cd ${templatesDir}
             git init
             git remote add origin ${repo}
             git config --global init.defaultBranch main
@@ -136249,17 +136245,29 @@ var initSite = async () => {
             echo "${sparse}" >> .git/info/sparse-checkout
             git config --add remote.origin.fetch '+refs/heads/*:refs/remotes/origin/*'
             git config remote.origin.tagopt --no-tags
-            git fetch --depth=1 origin refs/tags/$(git ls-remote --tags origin "${templateDetails.providerVersion}" | tail -n 1 | awk -F '/' '{print $3}')
-            git checkout FETCH_HEAD
         `.trim();
   }
+  let windowsGitCloneCommands = `
+            $tag = (git ls-remote --tags origin "${templateDetails.providerVersion}" | Select-Object -Last 1) -replace '.*refs/tags/', ''
+            git fetch --depth=1 origin "refs/tags/$tag"
+            git checkout FETCH_HEAD
+            `.trim();
+  let unixGitCloneCommands = `
+            git fetch --depth=1 origin refs/tags/$(git ls-remote --tags origin "${templateDetails.providerVersion}" | tail -n 1 | awk -F '/' '{print $3}')
+            git checkout FETCH_HEAD
+            `.trim();
+  let usedShell = null;
   if (process.platform === "win32") {
-    gitCloneCommands = 'cmd /c "' + gitCloneCommands + '"';
+    dirSetupCommands = dirSetupCommands + "\n" + windowsGitCloneCommands;
+    usedShell = "powershell.exe";
+  } else {
+    dirSetupCommands = dirSetupCommands + "\n" + unixGitCloneCommands;
   }
   try {
-    childProcess2.execSync(gitCloneCommands, {
+    childProcess2.execSync(dirSetupCommands, {
       stdio: "pipe",
-      cwd: templatesDir
+      cwd: templatesDir,
+      shell: usedShell
     });
   } catch (err) {
     if (err.message.includes("error: unknown option")) {
@@ -136280,28 +136288,11 @@ Suggestion: It appears that git is not installed, try installing git then trying
       throw err;
     }
   }
-  fs5.rmSync(path4.join(templatesDir, ".git"), { recursive: true });
-  const copyRecursiveSync = (src, dest) => {
-    let exists = fs5.existsSync(src);
-    let stats = exists && fs5.statSync(src);
-    let isDirectory = exists && stats && stats.isDirectory();
-    if (isDirectory) {
-      if (!fs5.existsSync(dest)) {
-        fs5.mkdirSync(dest);
-      }
-      fs5.readdirSync(src).forEach(function(childItemName) {
-        copyRecursiveSync(
-          path4.join(src, childItemName),
-          path4.join(dest, childItemName)
-        );
-      });
-    } else {
-      fs5.copyFileSync(src, dest);
-    }
-  };
-  copyRecursiveSync(
+  fs5.rmSync(path4.join(templatesDir, ".git"), { recursive: true, force: true });
+  fs5.cpSync(
     selected.template === "./" ? templatesDir : path4.join(templatesDir, selected.template),
-    siteDir
+    siteDir,
+    { recursive: true, force: true }
   );
   fs5.rmSync(templatesDir, { recursive: true, force: true });
   const readmePath = path4.join(process.cwd(), "sites", siteName, "README.md");
@@ -136612,7 +136603,7 @@ class <%- toPascalCase(collection.name) %> {
 // lib/shared/typescript-type-utils.ts
 import * as fs7 from "fs";
 import * as path6 from "path";
-function getTypeScriptType(attribute, entities, entityName) {
+function getTypeScriptType(attribute, entities, entityName, forCreate = false) {
   let type = "";
   switch (attribute.type) {
     case "string":
@@ -136637,7 +136628,8 @@ function getTypeScriptType(attribute, entities, entityName) {
       if (!relatedEntity) {
         throw new Error(`Related entity with ID '${relatedId}' not found.`);
       }
-      type = LanguageMeta.toPascalCase(relatedEntity.name);
+      const baseName = LanguageMeta.toPascalCase(relatedEntity.name);
+      type = forCreate ? `((${baseName}Create & { $id?: string; $permissions?: string[] }) | string)` : baseName;
       if (attribute.relationType === "oneToMany" && attribute.side === "parent" || attribute.relationType === "manyToOne" && attribute.side === "child" || attribute.relationType === "manyToMany") {
         type = `${type}[]`;
       }
@@ -142167,6 +142159,9 @@ var BaseDatabasesGenerator = class {
       if (!fs15.existsSync(fileDir)) {
         fs15.mkdirSync(fileDir, { recursive: true });
       }
+      if (relativePath === "constants.ts" && fs15.existsSync(filePath)) {
+        continue;
+      }
       fs15.writeFileSync(filePath, content, "utf-8");
     }
   }
@@ -142178,10 +142173,10 @@ var BaseDatabasesGenerator = class {
 };
 
 // lib/commands/generators/typescript/templates/types.ts.hbs
-var types_ts_default = "import { type Models, Permission } from '{{appwriteDep}}';\n\n{{{ENUMS}}}{{{TYPES}}}\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 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";
 
 // lib/commands/generators/typescript/templates/databases.ts.hbs
-var databases_ts_default = 'import { Client, TablesDB, ID, Query, type Models, Permission } from \'{{appwriteDep}}\';\nimport type { DatabaseHandle, DatabaseId, DatabaseTableMap, DatabaseTables, QueryBuilder } from \'./types.js\';\n{{#if supportsServerSide}}\nimport { PROJECT_ID, ENDPOINT, API_KEY } from \'./constants.js\';\n{{else}}\nimport { PROJECT_ID, ENDPOINT } from \'./constants.js\';\n{{/if}}\n\nconst createQueryBuilder = <T>(): QueryBuilder<T> => ({\n  equal: (field, value) => Query.equal(String(field), value as any),\n  notEqual: (field, value) => Query.notEqual(String(field), value as any),\n  lessThan: (field, value) => Query.lessThan(String(field), value as any),\n  lessThanEqual: (field, value) => Query.lessThanEqual(String(field), value as any),\n  greaterThan: (field, value) => Query.greaterThan(String(field), value as any),\n  greaterThanEqual: (field, value) => Query.greaterThanEqual(String(field), value as any),\n  contains: (field, value) => Query.contains(String(field), value as any),\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 any, end as any),\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 serializePermissions = (permissions?: Permission[]): string[] | undefined =>\n  permissions?.map((permission) => permission.toString());\n\nfunction createTableApi<T extends Models.Row>(\n  tablesDB: TablesDB,\n  databaseId: string,\n  tableId: string,\n) {\n  return {\n    create: (data: any, options?: { rowId?: string; permissions?: Permission[]; transactionId?: string }) =>\n      tablesDB.createRow<T>({\n        databaseId,\n        tableId,\n        rowId: options?.rowId ?? ID.unique(),\n        data,\n        permissions: serializePermissions(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: any, options?: { permissions?: Permission[]; transactionId?: string }) =>\n      tablesDB.updateRow<T>({\n        databaseId,\n        tableId,\n        rowId: id,\n        data,\n        ...(options?.permissions ? { permissions: serializePermissions(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: any) => 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>(tableName: T): DatabaseTableMap[D][T] => {\n      if (!hasOwn(dbMap, tableName)) {\n        throw new Error(`Unknown table "${tableName}" in database "${databaseId}"`);\n      }\n\n      if (!tableApiCache.has(tableName)) {\n        const tableId = dbMap[tableName];\n        const api = createTableApi(tablesDB, databaseId, tableId);\n        {{{BULK_REMOVAL}}}\n        tableApiCache.set(tableName, api);\n      }\n      return tableApiCache.get(tableName) as DatabaseTableMap[D][T];\n    },\n{{#if supportsServerSide}}\n    create: (tableId: string, name: string, options?: { permissions?: Permission[]; rowSecurity?: boolean; enabled?: boolean; columns?: any[]; indexes?: any[] }) =>\n      tablesDB.createTable({\n        databaseId,\n        tableId,\n        name,\n        permissions: serializePermissions(options?.permissions),\n        rowSecurity: options?.rowSecurity,\n        enabled: options?.enabled,\n        columns: options?.columns,\n        indexes: options?.indexes,\n      }),\n    update: (tableName: string, name: string, options?: { permissions?: Permission[]; rowSecurity?: boolean; enabled?: boolean }) => {\n      if (!hasOwn(dbMap, tableName)) {\n        throw new Error(`Unknown table "${tableName}" in database "${databaseId}"`);\n      }\n      const tableId = dbMap[tableName];\n      return tablesDB.updateTable({\n        databaseId,\n        tableId,\n        name,\n        permissions: serializePermissions(options?.permissions),\n        rowSecurity: options?.rowSecurity,\n        enabled: options?.enabled,\n      });\n    },\n    delete: async (tableName: string) => {\n      if (!hasOwn(dbMap, tableName)) {\n        throw new Error(`Unknown table "${tableName}" in database "${databaseId}"`);\n      }\n      const tableId = dbMap[tableName];\n      await tablesDB.deleteTable({\n        databaseId,\n        tableId,\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, name: string, options?: { enabled?: boolean }) =>\n      tablesDB.update({\n        databaseId,\n        name,\n        enabled: options?.enabled,\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';
+var databases_ts_default = 'import { Client, TablesDB, ID, Query, type Models, Permission, Role } from \'{{appwriteDep}}\';\nimport type { DatabaseHandle, DatabaseId, DatabaseTableMap, DatabaseTables, QueryBuilder, PermissionBuilder, RoleBuilder, RoleString } from \'./types.js\';\n{{#if supportsServerSide}}\nimport { PROJECT_ID, ENDPOINT, API_KEY } from \'./constants.js\';\n{{else}}\nimport { PROJECT_ID, ENDPOINT } from \'./constants.js\';\n{{/if}}\n\nconst createQueryBuilder = <T>(): QueryBuilder<T> => ({\n  equal: (field, value) => Query.equal(String(field), value as any),\n  notEqual: (field, value) => Query.notEqual(String(field), value as any),\n  lessThan: (field, value) => Query.lessThan(String(field), value as any),\n  lessThanEqual: (field, value) => Query.lessThanEqual(String(field), value as any),\n  greaterThan: (field, value) => Query.greaterThan(String(field), value as any),\n  greaterThanEqual: (field, value) => Query.greaterThanEqual(String(field), value as any),\n  contains: (field, value) => Query.contains(String(field), value as any),\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 any, end as any),\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: any, 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,\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: any, 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,\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: any) => 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?: any[]; indexes?: any[] }) =>\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 ?? tableId, // TODO: remove this fallback once fixed in other SDKs\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';
 
 // lib/commands/generators/typescript/templates/index.ts.hbs
 var index_ts_default = '/**\n * {{sdkTitle}} Generated SDK\n *\n * This file is auto-generated. Do not edit manually.\n * Re-run `{{executableName}} generate` to regenerate.\n */\n\nexport { databases } from "./databases.js";\nexport * from "./types.js";\n';
@@ -142194,6 +142189,8 @@ var typesTemplate = import_handlebars.default.compile(String(types_ts_default));
 var databasesTemplate = import_handlebars.default.compile(String(databases_ts_default));
 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 TypeScriptDatabasesGenerator = class extends BaseDatabasesGenerator {
   language = "typescript";
   fileExtension = "ts";
@@ -142222,16 +142219,19 @@ var TypeScriptDatabasesGenerator = class extends BaseDatabasesGenerator {
       $id: e.$id,
       name: e.name
     }));
-    const attributes = this.buildAttributes(entity, typeEntities, "    ");
-    const createType = attributes.trim().length === 0 ? `export type ${typeName}Create = Record<string, never>` : `export type ${typeName}Create = {
-${attributes}
+    const createAttributes = this.buildAttributes(entity, typeEntities, "    ", true);
+    const rowAttributes = this.buildAttributes(entity, typeEntities, "    ", false);
+    const createType = createAttributes.trim().length === 0 ? `export type ${typeName}Create = Record<string, never>` : `export type ${typeName}Create = {
+${createAttributes}
+}`;
+    const rowType = rowAttributes.trim().length === 0 ? `export type ${typeName} = Models.Row` : `export type ${typeName} = Models.Row & {
+${rowAttributes}
 }`;
-    const rowType = `export type ${typeName} = Models.Row & ${typeName}Create`;
     return `${createType}
 
 ${rowType}`;
   }
-  buildAttributes(entity, typeEntities, indent) {
+  buildAttributes(entity, typeEntities, indent, forCreate = false) {
     const fields = this.getFields(entity);
     if (!fields) return "";
     return fields.map((attr) => {
@@ -142248,7 +142248,7 @@ ${rowType}`;
         relationType: attr.relationType,
         side: attr.side
       };
-      return `${indent}${JSON.stringify(attr.key)}${attr.required ? "" : "?"}: ${getTypeScriptType(typeAttr, typeEntities, entity.name)};`;
+      return `${indent}${JSON.stringify(attr.key)}${attr.required ? "" : "?"}: ${getTypeScriptType(typeAttr, typeEntities, entity.name, forCreate)};`;
     }).join("\n");
   }
   generateEnums(entities) {
@@ -142301,21 +142301,24 @@ ${enumValues}
         const createFields = this.buildAttributes(
           entity,
           typeEntities,
-          "        "
+          "        ",
+          true
+          // forCreate - relationships use Create suffix
         );
         const createInline = createFields.trim().length === 0 ? "Record<string, never>" : `{
 ${createFields}
       }`;
-        const baseMethods = `      create: (data: ${createInline}, options?: { rowId?: string; permissions?: Permission[]; transactionId?: string }) => Promise<${typeName}>;
+        const queryCallback = getQueryCallbackInline(typeName);
+        const baseMethods = `      create: (data: ${createInline}, options?: { rowId?: string; permissions?: ${PERMISSION_CALLBACK_INLINE}; transactionId?: string }) => Promise<${typeName}>;
       get: (id: string) => Promise<${typeName}>;
-      update: (id: string, data: Partial<${createInline}>, options?: { permissions?: Permission[]; transactionId?: string }) => Promise<${typeName}>;
+      update: (id: string, data: Partial<${createInline}>, options?: { permissions?: ${PERMISSION_CALLBACK_INLINE}; transactionId?: string }) => Promise<${typeName}>;
       delete: (id: string, options?: { transactionId?: string }) => Promise<void>;
-      list: (options?: { queries?: (q: QueryBuilder<${typeName}>) => string[] }) => Promise<{ total: number; rows: ${typeName}[] }>;`;
+      list: (options?: { queries?: ${queryCallback} }) => Promise<{ total: number; rows: ${typeName}[] }>;`;
         const canUseBulkMethods = supportsServerSide && !this.hasRelationshipColumns(entity);
         const bulkMethods = canUseBulkMethods ? `
       createMany: (rows: Array<${createInline} & { $id?: string; $permissions?: string[] }>, options?: { transactionId?: string }) => Promise<{ total: number; rows: ${typeName}[] }>;
-      updateMany: (data: Partial<${createInline}>, options?: { queries?: (q: QueryBuilder<${typeName}>) => string[]; transactionId?: string }) => Promise<{ total: number; rows: ${typeName}[] }>;
-      deleteMany: (options?: { queries?: (q: QueryBuilder<${typeName}>) => string[]; transactionId?: string }) => Promise<{ total: number; rows: ${typeName}[] }>;` : "";
+      updateMany: (data: Partial<${createInline}>, options?: { queries?: ${queryCallback}; transactionId?: string }) => Promise<{ total: number; rows: ${typeName}[] }>;
+      deleteMany: (options?: { queries?: ${queryCallback}; transactionId?: string }) => Promise<{ total: number; rows: ${typeName}[] }>;` : "";
         return `    ${JSON.stringify(entity.name)}: {
 ${baseMethods}${bulkMethods}
     }`;
@@ -142328,40 +142331,18 @@ ${tableTypes}
 ${dbReturnTypes}
 };
 
-export type DatabaseCreateOptions = {
-  enabled?: boolean;
-};
-
-export type DatabaseUpdateOptions = {
-  enabled?: boolean;
-};
-
-export type TableCreateOptions = {
-  permissions?: Permission[];
-  rowSecurity?: boolean;
-  enabled?: boolean;
-  columns?: any[];
-  indexes?: any[];
-};
-
-export type TableUpdateOptions = {
-  permissions?: Permission[];
-  rowSecurity?: boolean;
-  enabled?: boolean;
-};
-
 export type DatabaseHandle<D extends DatabaseId> = {
-  use: <T extends keyof DatabaseTableMap[D] & string>(tableName: T) => DatabaseTableMap[D][T];
-${supportsServerSide ? `  create: (tableId: string, name: string, options?: TableCreateOptions) => Promise<Models.Table>;
-  update: <T extends keyof DatabaseTableMap[D] & string>(tableName: T, name: string, options?: TableUpdateOptions) => Promise<Models.Table>;
-  delete: <T extends keyof DatabaseTableMap[D] & string>(tableName: T) => Promise<void>;` : ""}
+  use: <T extends keyof DatabaseTableMap[D] & string>(tableId: T) => DatabaseTableMap[D][T];
+${supportsServerSide ? `  create: (tableId: string, name: string, options?: { permissions?: ${PERMISSION_CALLBACK_INLINE}; rowSecurity?: boolean; enabled?: boolean; columns?: any[]; indexes?: any[] }) => Promise<Models.Table>;
+  update: <T extends keyof DatabaseTableMap[D] & string>(tableId: T, options?: { name?: string; permissions?: ${PERMISSION_CALLBACK_INLINE}; rowSecurity?: boolean; enabled?: boolean }) => Promise<Models.Table>;
+  delete: <T extends keyof DatabaseTableMap[D] & string>(tableId: T) => Promise<void>;` : ""}
 };
 
 export type DatabaseTables = {
   use: <D extends DatabaseId>(databaseId: D) => DatabaseHandle<D>;
-${supportsServerSide ? `  create: (databaseId: string, name: string, options?: DatabaseCreateOptions) => Promise<Models.Database>;
-  update: (databaseId: DatabaseId, name: string, options?: DatabaseUpdateOptions) => Promise<Models.Database>;
-  delete: (databaseId: DatabaseId) => Promise<void>;` : ""}
+${supportsServerSide ? `  create: (databaseId: string, name: string, options?: { enabled?: boolean }) => Promise<Models.Database>;
+  update: <D extends DatabaseId>(databaseId: D, options?: { name?: string; enabled?: boolean }) => Promise<Models.Database>;
+  delete: <D extends DatabaseId>(databaseId: D) => Promise<void>;` : ""}
 };`;
   }
   generateTypesFile(config2) {
@@ -142444,14 +142425,14 @@ ${supportsServerSide ? `  create: (databaseId: string, name: string, options?: D
   }
   generateBulkCheck(supportsBulk) {
     if (!supportsBulk) return "";
-    return `const hasBulkMethods = (dbId: string, tableName: string) => !tablesWithRelationships.has(\`\${dbId}:\${tableName}\`);
+    return `const hasBulkMethods = (dbId: string, tableId: string) => !tablesWithRelationships.has(\`\${dbId}:\${tableId}\`);
 `;
   }
   generateBulkRemoval(supportsBulk) {
     if (!supportsBulk) return "";
     return `
         // Remove bulk methods for tables with relationships
-        if (!hasBulkMethods(databaseId, tableName)) {
+        if (!hasBulkMethods(databaseId, tableId)) {
           delete (api as any).createMany;
           delete (api as any).updateMany;
           delete (api as any).deleteMany;
@@ -142575,7 +142556,7 @@ var generateAction = async (options) => {
   let detectedLanguage;
   const serverSideOverride = options.server ?? "auto";
   if (!["auto", "true", "false"].includes(serverSideOverride)) {
-    error48(`Invalid --server-side value: ${serverSideOverride}`);
+    error48(`Invalid --server value: ${serverSideOverride}`);
     process.exit(1);
   }
   if (options.language) {
@@ -142640,9 +142621,6 @@ Use --language to specify the target language. Supported: ${supported}`
       const firstEntity = entities?.[0];
       const dbId = firstEntity?.databaseId ?? "databaseId";
       const tableName = firstEntity?.name ?? "tableName";
-      const formatAccessor = (value) => /^[A-Za-z_$][A-Za-z0-9_$]*$/.test(value) ? `.${value}` : `[${JSON.stringify(value)}]`;
-      const dbAccessor = formatAccessor(dbId);
-      const tableAccessor = formatAccessor(tableName);
       console.log("");
       log(`Import the generated SDK in your project:`);
       console.log(
@@ -142669,7 +142647,7 @@ var generate = new Command("generate").description(
   `Generate a type-safe SDK from your ${SDK_TITLE} project configuration`
 ).option(
   "-o, --output <directory>",
-  "Output directory for generated files (default: generated)",
+  "Output directory for generated files",
   "generated"
 ).option(
   "-l, --language <language>",
@@ -142678,6 +142656,19 @@ var generate = new Command("generate").description(
   "--server <mode>",
   "Override server-side generation (auto|true|false)",
   "auto"
+).addHelpText(
+  "after",
+  `
+Example:
+  Import the generated SDK in your project:
+    import { databases } from "./generated/${SDK_TITLE_LOWER}/index.js";
+
+  Configure your SDK constants:
+    set values in ./generated/${SDK_TITLE_LOWER}/constants.ts
+
+  Usage:
+    const mydb = databases.use("databaseId");
+    await mydb.use("tableName").create({ ... });`
 ).action(actionRunner(generateAction));
 
 // lib/commands/services/account.ts