@aurabase/gen 0.7.4 → 0.7.5

package/dist/cli.cjs

@@ -21,11 +21,13 @@ function mapColType(colType, ctx) {
       case "uuid":
       case "timestamp":
       case "timestamptz":
+      case "tsvector":
       case "date":
       case "time":
       case "bytea":
-      case "numeric":
         return "string";
+      case "numeric":
+        return ctx.numericAsString ? "string" : "number";
       case "int":
       case "int2":
       case "int4":
@@ -53,20 +55,29 @@ function mapColType(colType, ctx) {
 }
 function mapPgType(raw, ctx) {
   if (raw.startsWith("_")) return `${mapPgType(raw.slice(1), ctx)}[]`;
+  if (raw.endsWith("[]")) return `${mapPgType(raw.slice(0, -2), ctx)}[]`;
   switch (raw) {
     case "int2":
     case "int4":
     case "int8":
     case "float4":
     case "float8":
+    case "smallint":
+    case "integer":
+    case "bigint":
+    case "real":
+    case "double precision":
       return "number";
     case "numeric":
-      return "string";
+      return ctx.numericAsString ? "string" : "number";
     case "bool":
+    case "boolean":
       return "boolean";
     case "text":
     case "varchar":
     case "bpchar":
+    case "character varying":
+    case "character":
     case "citext":
     case "uuid":
     case "date":
@@ -74,8 +85,15 @@ function mapPgType(raw, ctx) {
     case "timetz":
     case "timestamp":
     case "timestamptz":
+    case "time without time zone":
+    case "time with time zone":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+    case "tsvector":
     case "bytea":
       return "string";
+    case "vector":
+      return "number[]";
     case "json":
     case "jsonb":
       return "Json";
@@ -94,15 +112,14 @@ function tsType(col, ctx) {
 function genRow(cols, ctx) {
   return cols.map((c) => `          ${c.name}: ${tsType(c, ctx)}`).join("\n");
 }
-var AUTO_COLS = /* @__PURE__ */ new Set(["id", "created_at", "updated_at"]);
 function isInsertOptional(col) {
-  return col.nullable || col.default_val != null || AUTO_COLS.has(col.name);
+  return col.nullable || col.default_val != null || col.is_identity === true;
 }
 function genInsert(cols, ctx) {
-  return cols.map((c) => `          ${c.name}${isInsertOptional(c) ? "?" : ""}: ${tsType(c, ctx)}`).join("\n");
+  return cols.filter((c) => c.is_generated !== true).map((c) => `          ${c.name}${isInsertOptional(c) ? "?" : ""}: ${tsType(c, ctx)}`).join("\n");
 }
 function genUpdate(cols, ctx) {
-  return cols.map((c) => `          ${c.name}?: ${tsType(c, ctx)}`).join("\n");
+  return cols.filter((c) => c.is_generated !== true).map((c) => `          ${c.name}?: ${tsType(c, ctx)}`).join("\n");
 }
 function genRelationships(t) {
   const fks = t.columns.filter((c) => c.references);
@@ -111,7 +128,7 @@ function genRelationships(t) {
   for (const c of fks) {
     const ref = c.references;
     const name = ref.constraint_name ?? `${t.name}_${c.name}_fkey`;
-    const key = ref.constraint_name ?? `\0synthetic\0${c.name}`;
+    const key = ref.constraint_name ?? `__synthetic__${c.name}`;
     let g = groups.get(key);
     if (!g) {
       g = { name, columns: [], refTable: ref.table, refColumns: [], cols: [] };
@@ -121,8 +138,19 @@ function genRelationships(t) {
     g.refColumns.push(ref.column);
     g.cols.push(c);
   }
+  const sameColSet = (a, b) => {
+    if (!a || a.length !== b.length || a.length === 0) return false;
+    const setA = new Set(a);
+    return b.every((c) => setA.has(c));
+  };
   const entries = [...groups.values()].map((g) => {
-    const isOneToOne = g.cols.every((c) => c.unique || t.primary_key === c.name);
+    const isOneToOne = g.cols.length === 1 ? g.cols[0].unique || t.primary_key === g.cols[0].name || t.primary_key_columns?.length === 1 && t.primary_key_columns[0] === g.cols[0].name || Boolean(
+      t.unique_constraints?.some((uc) => uc.length === 1 && uc[0] === g.cols[0].name)
+    ) || Boolean(
+      t.indexes?.some(
+        (idx) => idx.unique && idx.columns.length === 1 && idx.columns[0] === g.cols[0].name
+      )
+    ) : sameColSet(t.primary_key_columns, g.columns) || Boolean(t.unique_constraints?.some((uc) => sameColSet(uc, g.columns))) || Boolean(t.indexes?.some((idx) => idx.unique && sameColSet(idx.columns, g.columns)));
     const cols = g.columns.map((c) => `'${c}'`).join(", ");
     const refCols = g.refColumns.map((c) => `'${c}'`).join(", ");
     return `          {
@@ -138,12 +166,21 @@ ${entries.join(",\n")}
         ]`;
 }
 function genFunctionArgs(fn, ctx) {
-  const inputArgs = fn.args.filter((a) => a.mode.toUpperCase() !== "OUT");
+  const inputArgs = fn.args.filter((a) => !isReturnColumn(a));
   if (inputArgs.length === 0) return "Record<string, never>";
   const entries = inputArgs.map((a) => `${a.name}: ${mapPgType(a.data_type, ctx)}`).join("; ");
   return `{ ${entries} }`;
 }
+function isReturnColumn(a) {
+  const m = a.mode.toUpperCase();
+  return m === "OUT" || m === "TABLE";
+}
 function mapReturnType(fn, ctx) {
+  const cols = fn.args.filter(isReturnColumn);
+  if (fn.returns === "record" && cols.length > 0) {
+    const row = `{ ${cols.map((c) => `${c.name}: ${mapPgType(c.data_type, ctx)}`).join("; ")} }`;
+    return fn.is_set_returning ? `${row}[]` : row;
+  }
   const base = mapPgType(fn.returns, ctx);
   if (!fn.is_set_returning) return base;
   return base === "unknown" ? "Record<string, unknown>[]" : `${base}[]`;
@@ -208,8 +245,8 @@ ${entries.join("\n")}
     }`;
 }
 var HEADER = `// ============================================================
-// Types TypeScript auto-g\xE9n\xE9r\xE9s par Aurabase (@aurabase/gen)
-// NE PAS MODIFIER \u2014 r\xE9g\xE9n\xE9rer avec \`npx @aurabase/gen\`
+// Auto-generated TypeScript types by Aurabase (@aurabase/gen)
+// DO NOT EDIT \u2014 regenerate with \`npx @aurabase/gen\`
 // ============================================================
 `;
 function generateDatabaseTypes(tables, options = {}) {
@@ -222,7 +259,8 @@ function generateDatabaseTypes(tables, options = {}) {
     typeName,
     schemaName,
     enumNames: new Set(enums.map((e) => e.name)),
-    relationNames
+    relationNames,
+    numericAsString: options.numericAsString === true
   };
   const functionsBody = genFunctionsBody(options.functions ?? [], ctx);
   const enumsBody = genEnumsBody(enums);
@@ -345,7 +383,10 @@ export type Enums<
 }
 
 // src/cli.ts
-var VERSION = "0.7.3";
+function resolvePackageVersion() {
+  return "0.7.5";
+}
+var VERSION = resolvePackageVersion();
 function loadEnvFiles() {
   const envCandidates = [".env.local", ".env.development.local", ".env.development", ".env"];
   for (const file of envCandidates) {
@@ -421,6 +462,12 @@ function parseArgs(argv) {
       case "--allow-empty":
         a.allowEmpty = true;
         break;
+      case "--check":
+        a.check = true;
+        break;
+      case "--numeric-as-string":
+        a.numericAsString = true;
+        break;
       case "--help":
       case "-h":
         a.help = true;
@@ -438,27 +485,29 @@ aurabase-gen (v${VERSION}) \u2014 TypeScript type generator for Aurabase
 
 USAGE:
   npx @aurabase/gen [options]
-  aurabase-gen --url <projectUrl> --key <apiKey> [--out <file>]
+  aurabase-gen --url <projectUrl> --key <serviceRoleKey> [--out <file>]
 
 OPTIONS:
-  --url <url>         Aurabase project URL (e.g. https://my-project.aurabase.cloud)
-                      [Auto-detected: NEXT_PUBLIC_AURABASE_URL]
-  --key <key>         Project API key (anon or service_role)
-                      [Auto-detected: AURABASE_SERVICE_ROLE_KEY, then NEXT_PUBLIC_AURABASE_ANON_KEY]
-  -o, --out <file>    Output file (e.g. src/types/database.types.ts)
-                      If omitted, the result is written to stdout.
-  -s, --schema <name> Database schema name (default: 'public')
-  -t, --type-name <t> Name of the main generated interface (default: 'Database')
-  --allow-empty       Generate the types even if some tables have no declared columns
-  -h, --help          Show this help
-  -v, --version       Show the version
+  --url <url>          Aurabase project URL (e.g. https://my-project.aurabase.cloud)
+                       [Auto-detected: NEXT_PUBLIC_AURABASE_URL]
+  --key <key>          Project service_role key (aura_sk_...) for schema introspection
+                       [Auto-detected: AURABASE_SERVICE_ROLE_KEY]
+  -o, --out <file>     Output file (e.g. src/types/database.types.ts)
+                       If omitted, the result is written to stdout.
+  -s, --schema <name>  Database schema name (default: 'public')
+  -t, --type-name <t>  Name of the main generated interface (default: 'Database')
+  --allow-empty        Generate the types even if some tables have no declared columns
+  --numeric-as-string  Map Postgres numeric columns/args to string instead of number
+  --check              Exit non-zero if --out differs from regenerated types (CI guard)
+  -h, --help           Show this help
+  -v, --version        Show the version
 
 EXAMPLES:
   # Generation reading the environment variables automatically (.env / .env.local):
   npx @aurabase/gen --out src/types/database.types.ts
 
   # Explicit parameters:
-  npx @aurabase/gen --url https://xyz.aurabase.cloud --key aura_anon_123 --out db.types.ts
+  npx @aurabase/gen --url https://xyz.aurabase.cloud --key aura_sk_... --out db.types.ts
 `;
 async function main() {
   loadEnvFiles();
@@ -472,17 +521,26 @@ async function main() {
     process.exit(0);
   }
   const url = args.url ?? process.env.NEXT_PUBLIC_AURABASE_URL;
-  const key = args.key ?? process.env.AURABASE_SERVICE_ROLE_KEY ?? process.env.NEXT_PUBLIC_AURABASE_ANON_KEY;
+  const key = args.key ?? process.env.AURABASE_SERVICE_ROLE_KEY;
   if (!url || !key) {
-    console.error("[aurabase-gen] Error: the project URL and/or API key is missing.\n");
+    console.error("[aurabase-gen] Error: the project URL and/or service_role key is missing.\n");
     console.error(
-      "Provide them through the CLI arguments (--url and --key) or in your environment variables (.env / .env.local):"
+      "Provide them through CLI arguments (--url and --key) or environment variables (.env / .env.local):"
     );
     console.error("  NEXT_PUBLIC_AURABASE_URL=https://<slug>.aurabase.cloud");
-    console.error("  NEXT_PUBLIC_AURABASE_ANON_KEY=aura_anon_...\n");
+    console.error("  AURABASE_SERVICE_ROLE_KEY=aura_sk_...\n");
     console.error("Run `npx @aurabase/gen --help` to see all the available options.");
     process.exit(1);
   }
+  if (key.startsWith("aura_anon_") || key.startsWith("aura_auth_")) {
+    console.error(
+      "[aurabase-gen] Error: schema introspection requires a service_role key (aura_sk_...), not an anon/auth key."
+    );
+    console.error(
+      "Set AURABASE_SERVICE_ROLE_KEY or pass --key aura_sk_... (never commit service_role keys)."
+    );
+    process.exit(1);
+  }
   const schemaName = args.schema ?? process.env.AURABASE_SCHEMA ?? "public";
   const outPath = args.out ?? process.env.AURABASE_TYPES_OUT;
   const client = aurabaseJs.createClient(url, key);
@@ -507,8 +565,23 @@ async function main() {
     typeName: args.typeName,
     functions,
     enums,
-    views
+    views,
+    numericAsString: args.numericAsString
   });
+  if (args.check) {
+    if (!outPath) {
+      console.error("[aurabase-gen] Error: --check requires --out <file>.");
+      process.exit(1);
+    }
+    if (!fs.existsSync(outPath) || fs.readFileSync(outPath, "utf-8") !== output) {
+      console.error(
+        `[aurabase-gen] Types in ${outPath} are out of date. Re-run aurabase-gen without --check.`
+      );
+      process.exit(1);
+    }
+    console.error(`[aurabase-gen] \u2713 ${outPath} is up to date.`);
+    return;
+  }
   if (outPath) {
     fs.writeFileSync(outPath, output);
     console.error(

package/dist/cli.d.cts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-declare const VERSION = "0.7.3";
+declare const VERSION: string;
 /**
  * Charge les fichiers .env locaux s'ils existent dans le répertoire courant.
  * Tente .env.local, .env.development.local, .env.development, .env par ordre de priorité.
@@ -26,6 +26,8 @@ interface Args {
     schema?: string;
     typeName?: string;
     allowEmpty?: boolean;
+    check?: boolean;
+    numericAsString?: boolean;
     help?: boolean;
     version?: boolean;
 }

package/dist/cli.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-declare const VERSION = "0.7.3";
+declare const VERSION: string;
 /**
  * Charge les fichiers .env locaux s'ils existent dans le répertoire courant.
  * Tente .env.local, .env.development.local, .env.development, .env par ordre de priorité.
@@ -26,6 +26,8 @@ interface Args {
     schema?: string;
     typeName?: string;
     allowEmpty?: boolean;
+    check?: boolean;
+    numericAsString?: boolean;
     help?: boolean;
     version?: boolean;
 }

package/dist/cli.js

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { writeFileSync, existsSync, readFileSync } from 'fs';
+import { existsSync, readFileSync, writeFileSync } from 'fs';
 import { resolve } from 'path';
 import { createClient } from '@aurabase/aurabase-js';
 
@@ -19,11 +19,13 @@ function mapColType(colType, ctx) {
       case "uuid":
       case "timestamp":
       case "timestamptz":
+      case "tsvector":
       case "date":
       case "time":
       case "bytea":
-      case "numeric":
         return "string";
+      case "numeric":
+        return ctx.numericAsString ? "string" : "number";
       case "int":
       case "int2":
       case "int4":
@@ -51,20 +53,29 @@ function mapColType(colType, ctx) {
 }
 function mapPgType(raw, ctx) {
   if (raw.startsWith("_")) return `${mapPgType(raw.slice(1), ctx)}[]`;
+  if (raw.endsWith("[]")) return `${mapPgType(raw.slice(0, -2), ctx)}[]`;
   switch (raw) {
     case "int2":
     case "int4":
     case "int8":
     case "float4":
     case "float8":
+    case "smallint":
+    case "integer":
+    case "bigint":
+    case "real":
+    case "double precision":
       return "number";
     case "numeric":
-      return "string";
+      return ctx.numericAsString ? "string" : "number";
     case "bool":
+    case "boolean":
       return "boolean";
     case "text":
     case "varchar":
     case "bpchar":
+    case "character varying":
+    case "character":
     case "citext":
     case "uuid":
     case "date":
@@ -72,8 +83,15 @@ function mapPgType(raw, ctx) {
     case "timetz":
     case "timestamp":
     case "timestamptz":
+    case "time without time zone":
+    case "time with time zone":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+    case "tsvector":
     case "bytea":
       return "string";
+    case "vector":
+      return "number[]";
     case "json":
     case "jsonb":
       return "Json";
@@ -92,15 +110,14 @@ function tsType(col, ctx) {
 function genRow(cols, ctx) {
   return cols.map((c) => `          ${c.name}: ${tsType(c, ctx)}`).join("\n");
 }
-var AUTO_COLS = /* @__PURE__ */ new Set(["id", "created_at", "updated_at"]);
 function isInsertOptional(col) {
-  return col.nullable || col.default_val != null || AUTO_COLS.has(col.name);
+  return col.nullable || col.default_val != null || col.is_identity === true;
 }
 function genInsert(cols, ctx) {
-  return cols.map((c) => `          ${c.name}${isInsertOptional(c) ? "?" : ""}: ${tsType(c, ctx)}`).join("\n");
+  return cols.filter((c) => c.is_generated !== true).map((c) => `          ${c.name}${isInsertOptional(c) ? "?" : ""}: ${tsType(c, ctx)}`).join("\n");
 }
 function genUpdate(cols, ctx) {
-  return cols.map((c) => `          ${c.name}?: ${tsType(c, ctx)}`).join("\n");
+  return cols.filter((c) => c.is_generated !== true).map((c) => `          ${c.name}?: ${tsType(c, ctx)}`).join("\n");
 }
 function genRelationships(t) {
   const fks = t.columns.filter((c) => c.references);
@@ -109,7 +126,7 @@ function genRelationships(t) {
   for (const c of fks) {
     const ref = c.references;
     const name = ref.constraint_name ?? `${t.name}_${c.name}_fkey`;
-    const key = ref.constraint_name ?? `\0synthetic\0${c.name}`;
+    const key = ref.constraint_name ?? `__synthetic__${c.name}`;
     let g = groups.get(key);
     if (!g) {
       g = { name, columns: [], refTable: ref.table, refColumns: [], cols: [] };
@@ -119,8 +136,19 @@ function genRelationships(t) {
     g.refColumns.push(ref.column);
     g.cols.push(c);
   }
+  const sameColSet = (a, b) => {
+    if (!a || a.length !== b.length || a.length === 0) return false;
+    const setA = new Set(a);
+    return b.every((c) => setA.has(c));
+  };
   const entries = [...groups.values()].map((g) => {
-    const isOneToOne = g.cols.every((c) => c.unique || t.primary_key === c.name);
+    const isOneToOne = g.cols.length === 1 ? g.cols[0].unique || t.primary_key === g.cols[0].name || t.primary_key_columns?.length === 1 && t.primary_key_columns[0] === g.cols[0].name || Boolean(
+      t.unique_constraints?.some((uc) => uc.length === 1 && uc[0] === g.cols[0].name)
+    ) || Boolean(
+      t.indexes?.some(
+        (idx) => idx.unique && idx.columns.length === 1 && idx.columns[0] === g.cols[0].name
+      )
+    ) : sameColSet(t.primary_key_columns, g.columns) || Boolean(t.unique_constraints?.some((uc) => sameColSet(uc, g.columns))) || Boolean(t.indexes?.some((idx) => idx.unique && sameColSet(idx.columns, g.columns)));
     const cols = g.columns.map((c) => `'${c}'`).join(", ");
     const refCols = g.refColumns.map((c) => `'${c}'`).join(", ");
     return `          {
@@ -136,12 +164,21 @@ ${entries.join(",\n")}
         ]`;
 }
 function genFunctionArgs(fn, ctx) {
-  const inputArgs = fn.args.filter((a) => a.mode.toUpperCase() !== "OUT");
+  const inputArgs = fn.args.filter((a) => !isReturnColumn(a));
   if (inputArgs.length === 0) return "Record<string, never>";
   const entries = inputArgs.map((a) => `${a.name}: ${mapPgType(a.data_type, ctx)}`).join("; ");
   return `{ ${entries} }`;
 }
+function isReturnColumn(a) {
+  const m = a.mode.toUpperCase();
+  return m === "OUT" || m === "TABLE";
+}
 function mapReturnType(fn, ctx) {
+  const cols = fn.args.filter(isReturnColumn);
+  if (fn.returns === "record" && cols.length > 0) {
+    const row = `{ ${cols.map((c) => `${c.name}: ${mapPgType(c.data_type, ctx)}`).join("; ")} }`;
+    return fn.is_set_returning ? `${row}[]` : row;
+  }
   const base = mapPgType(fn.returns, ctx);
   if (!fn.is_set_returning) return base;
   return base === "unknown" ? "Record<string, unknown>[]" : `${base}[]`;
@@ -206,8 +243,8 @@ ${entries.join("\n")}
     }`;
 }
 var HEADER = `// ============================================================
-// Types TypeScript auto-g\xE9n\xE9r\xE9s par Aurabase (@aurabase/gen)
-// NE PAS MODIFIER \u2014 r\xE9g\xE9n\xE9rer avec \`npx @aurabase/gen\`
+// Auto-generated TypeScript types by Aurabase (@aurabase/gen)
+// DO NOT EDIT \u2014 regenerate with \`npx @aurabase/gen\`
 // ============================================================
 `;
 function generateDatabaseTypes(tables, options = {}) {
@@ -220,7 +257,8 @@ function generateDatabaseTypes(tables, options = {}) {
     typeName,
     schemaName,
     enumNames: new Set(enums.map((e) => e.name)),
-    relationNames
+    relationNames,
+    numericAsString: options.numericAsString === true
   };
   const functionsBody = genFunctionsBody(options.functions ?? [], ctx);
   const enumsBody = genEnumsBody(enums);
@@ -343,7 +381,10 @@ export type Enums<
 }
 
 // src/cli.ts
-var VERSION = "0.7.3";
+function resolvePackageVersion() {
+  return "0.7.5";
+}
+var VERSION = resolvePackageVersion();
 function loadEnvFiles() {
   const envCandidates = [".env.local", ".env.development.local", ".env.development", ".env"];
   for (const file of envCandidates) {
@@ -419,6 +460,12 @@ function parseArgs(argv) {
       case "--allow-empty":
         a.allowEmpty = true;
         break;
+      case "--check":
+        a.check = true;
+        break;
+      case "--numeric-as-string":
+        a.numericAsString = true;
+        break;
       case "--help":
       case "-h":
         a.help = true;
@@ -436,27 +483,29 @@ aurabase-gen (v${VERSION}) \u2014 TypeScript type generator for Aurabase
 
 USAGE:
   npx @aurabase/gen [options]
-  aurabase-gen --url <projectUrl> --key <apiKey> [--out <file>]
+  aurabase-gen --url <projectUrl> --key <serviceRoleKey> [--out <file>]
 
 OPTIONS:
-  --url <url>         Aurabase project URL (e.g. https://my-project.aurabase.cloud)
-                      [Auto-detected: NEXT_PUBLIC_AURABASE_URL]
-  --key <key>         Project API key (anon or service_role)
-                      [Auto-detected: AURABASE_SERVICE_ROLE_KEY, then NEXT_PUBLIC_AURABASE_ANON_KEY]
-  -o, --out <file>    Output file (e.g. src/types/database.types.ts)
-                      If omitted, the result is written to stdout.
-  -s, --schema <name> Database schema name (default: 'public')
-  -t, --type-name <t> Name of the main generated interface (default: 'Database')
-  --allow-empty       Generate the types even if some tables have no declared columns
-  -h, --help          Show this help
-  -v, --version       Show the version
+  --url <url>          Aurabase project URL (e.g. https://my-project.aurabase.cloud)
+                       [Auto-detected: NEXT_PUBLIC_AURABASE_URL]
+  --key <key>          Project service_role key (aura_sk_...) for schema introspection
+                       [Auto-detected: AURABASE_SERVICE_ROLE_KEY]
+  -o, --out <file>     Output file (e.g. src/types/database.types.ts)
+                       If omitted, the result is written to stdout.
+  -s, --schema <name>  Database schema name (default: 'public')
+  -t, --type-name <t>  Name of the main generated interface (default: 'Database')
+  --allow-empty        Generate the types even if some tables have no declared columns
+  --numeric-as-string  Map Postgres numeric columns/args to string instead of number
+  --check              Exit non-zero if --out differs from regenerated types (CI guard)
+  -h, --help           Show this help
+  -v, --version        Show the version
 
 EXAMPLES:
   # Generation reading the environment variables automatically (.env / .env.local):
   npx @aurabase/gen --out src/types/database.types.ts
 
   # Explicit parameters:
-  npx @aurabase/gen --url https://xyz.aurabase.cloud --key aura_anon_123 --out db.types.ts
+  npx @aurabase/gen --url https://xyz.aurabase.cloud --key aura_sk_... --out db.types.ts
 `;
 async function main() {
   loadEnvFiles();
@@ -470,17 +519,26 @@ async function main() {
     process.exit(0);
   }
   const url = args.url ?? process.env.NEXT_PUBLIC_AURABASE_URL;
-  const key = args.key ?? process.env.AURABASE_SERVICE_ROLE_KEY ?? process.env.NEXT_PUBLIC_AURABASE_ANON_KEY;
+  const key = args.key ?? process.env.AURABASE_SERVICE_ROLE_KEY;
   if (!url || !key) {
-    console.error("[aurabase-gen] Error: the project URL and/or API key is missing.\n");
+    console.error("[aurabase-gen] Error: the project URL and/or service_role key is missing.\n");
     console.error(
-      "Provide them through the CLI arguments (--url and --key) or in your environment variables (.env / .env.local):"
+      "Provide them through CLI arguments (--url and --key) or environment variables (.env / .env.local):"
     );
     console.error("  NEXT_PUBLIC_AURABASE_URL=https://<slug>.aurabase.cloud");
-    console.error("  NEXT_PUBLIC_AURABASE_ANON_KEY=aura_anon_...\n");
+    console.error("  AURABASE_SERVICE_ROLE_KEY=aura_sk_...\n");
     console.error("Run `npx @aurabase/gen --help` to see all the available options.");
     process.exit(1);
   }
+  if (key.startsWith("aura_anon_") || key.startsWith("aura_auth_")) {
+    console.error(
+      "[aurabase-gen] Error: schema introspection requires a service_role key (aura_sk_...), not an anon/auth key."
+    );
+    console.error(
+      "Set AURABASE_SERVICE_ROLE_KEY or pass --key aura_sk_... (never commit service_role keys)."
+    );
+    process.exit(1);
+  }
   const schemaName = args.schema ?? process.env.AURABASE_SCHEMA ?? "public";
   const outPath = args.out ?? process.env.AURABASE_TYPES_OUT;
   const client = createClient(url, key);
@@ -505,8 +563,23 @@ async function main() {
     typeName: args.typeName,
     functions,
     enums,
-    views
+    views,
+    numericAsString: args.numericAsString
   });
+  if (args.check) {
+    if (!outPath) {
+      console.error("[aurabase-gen] Error: --check requires --out <file>.");
+      process.exit(1);
+    }
+    if (!existsSync(outPath) || readFileSync(outPath, "utf-8") !== output) {
+      console.error(
+        `[aurabase-gen] Types in ${outPath} are out of date. Re-run aurabase-gen without --check.`
+      );
+      process.exit(1);
+    }
+    console.error(`[aurabase-gen] \u2713 ${outPath} is up to date.`);
+    return;
+  }
   if (outPath) {
     writeFileSync(outPath, output);
     console.error(

package/dist/index.cjs

@@ -16,11 +16,13 @@ function mapColType(colType, ctx) {
       case "uuid":
       case "timestamp":
       case "timestamptz":
+      case "tsvector":
       case "date":
       case "time":
       case "bytea":
-      case "numeric":
         return "string";
+      case "numeric":
+        return ctx.numericAsString ? "string" : "number";
       case "int":
       case "int2":
       case "int4":
@@ -48,20 +50,29 @@ function mapColType(colType, ctx) {
 }
 function mapPgType(raw, ctx) {
   if (raw.startsWith("_")) return `${mapPgType(raw.slice(1), ctx)}[]`;
+  if (raw.endsWith("[]")) return `${mapPgType(raw.slice(0, -2), ctx)}[]`;
   switch (raw) {
     case "int2":
     case "int4":
     case "int8":
     case "float4":
     case "float8":
+    case "smallint":
+    case "integer":
+    case "bigint":
+    case "real":
+    case "double precision":
       return "number";
     case "numeric":
-      return "string";
+      return ctx.numericAsString ? "string" : "number";
     case "bool":
+    case "boolean":
       return "boolean";
     case "text":
     case "varchar":
     case "bpchar":
+    case "character varying":
+    case "character":
     case "citext":
     case "uuid":
     case "date":
@@ -69,8 +80,15 @@ function mapPgType(raw, ctx) {
     case "timetz":
     case "timestamp":
     case "timestamptz":
+    case "time without time zone":
+    case "time with time zone":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+    case "tsvector":
     case "bytea":
       return "string";
+    case "vector":
+      return "number[]";
     case "json":
     case "jsonb":
       return "Json";
@@ -89,15 +107,14 @@ function tsType(col, ctx) {
 function genRow(cols, ctx) {
   return cols.map((c) => `          ${c.name}: ${tsType(c, ctx)}`).join("\n");
 }
-var AUTO_COLS = /* @__PURE__ */ new Set(["id", "created_at", "updated_at"]);
 function isInsertOptional(col) {
-  return col.nullable || col.default_val != null || AUTO_COLS.has(col.name);
+  return col.nullable || col.default_val != null || col.is_identity === true;
 }
 function genInsert(cols, ctx) {
-  return cols.map((c) => `          ${c.name}${isInsertOptional(c) ? "?" : ""}: ${tsType(c, ctx)}`).join("\n");
+  return cols.filter((c) => c.is_generated !== true).map((c) => `          ${c.name}${isInsertOptional(c) ? "?" : ""}: ${tsType(c, ctx)}`).join("\n");
 }
 function genUpdate(cols, ctx) {
-  return cols.map((c) => `          ${c.name}?: ${tsType(c, ctx)}`).join("\n");
+  return cols.filter((c) => c.is_generated !== true).map((c) => `          ${c.name}?: ${tsType(c, ctx)}`).join("\n");
 }
 function genRelationships(t) {
   const fks = t.columns.filter((c) => c.references);
@@ -106,7 +123,7 @@ function genRelationships(t) {
   for (const c of fks) {
     const ref = c.references;
     const name = ref.constraint_name ?? `${t.name}_${c.name}_fkey`;
-    const key = ref.constraint_name ?? `\0synthetic\0${c.name}`;
+    const key = ref.constraint_name ?? `__synthetic__${c.name}`;
     let g = groups.get(key);
     if (!g) {
       g = { name, columns: [], refTable: ref.table, refColumns: [], cols: [] };
@@ -116,8 +133,19 @@ function genRelationships(t) {
     g.refColumns.push(ref.column);
     g.cols.push(c);
   }
+  const sameColSet = (a, b) => {
+    if (!a || a.length !== b.length || a.length === 0) return false;
+    const setA = new Set(a);
+    return b.every((c) => setA.has(c));
+  };
   const entries = [...groups.values()].map((g) => {
-    const isOneToOne = g.cols.every((c) => c.unique || t.primary_key === c.name);
+    const isOneToOne = g.cols.length === 1 ? g.cols[0].unique || t.primary_key === g.cols[0].name || t.primary_key_columns?.length === 1 && t.primary_key_columns[0] === g.cols[0].name || Boolean(
+      t.unique_constraints?.some((uc) => uc.length === 1 && uc[0] === g.cols[0].name)
+    ) || Boolean(
+      t.indexes?.some(
+        (idx) => idx.unique && idx.columns.length === 1 && idx.columns[0] === g.cols[0].name
+      )
+    ) : sameColSet(t.primary_key_columns, g.columns) || Boolean(t.unique_constraints?.some((uc) => sameColSet(uc, g.columns))) || Boolean(t.indexes?.some((idx) => idx.unique && sameColSet(idx.columns, g.columns)));
     const cols = g.columns.map((c) => `'${c}'`).join(", ");
     const refCols = g.refColumns.map((c) => `'${c}'`).join(", ");
     return `          {
@@ -133,12 +161,21 @@ ${entries.join(",\n")}
         ]`;
 }
 function genFunctionArgs(fn, ctx) {
-  const inputArgs = fn.args.filter((a) => a.mode.toUpperCase() !== "OUT");
+  const inputArgs = fn.args.filter((a) => !isReturnColumn(a));
   if (inputArgs.length === 0) return "Record<string, never>";
   const entries = inputArgs.map((a) => `${a.name}: ${mapPgType(a.data_type, ctx)}`).join("; ");
   return `{ ${entries} }`;
 }
+function isReturnColumn(a) {
+  const m = a.mode.toUpperCase();
+  return m === "OUT" || m === "TABLE";
+}
 function mapReturnType(fn, ctx) {
+  const cols = fn.args.filter(isReturnColumn);
+  if (fn.returns === "record" && cols.length > 0) {
+    const row = `{ ${cols.map((c) => `${c.name}: ${mapPgType(c.data_type, ctx)}`).join("; ")} }`;
+    return fn.is_set_returning ? `${row}[]` : row;
+  }
   const base = mapPgType(fn.returns, ctx);
   if (!fn.is_set_returning) return base;
   return base === "unknown" ? "Record<string, unknown>[]" : `${base}[]`;
@@ -203,8 +240,8 @@ ${entries.join("\n")}
     }`;
 }
 var HEADER = `// ============================================================
-// Types TypeScript auto-g\xE9n\xE9r\xE9s par Aurabase (@aurabase/gen)
-// NE PAS MODIFIER \u2014 r\xE9g\xE9n\xE9rer avec \`npx @aurabase/gen\`
+// Auto-generated TypeScript types by Aurabase (@aurabase/gen)
+// DO NOT EDIT \u2014 regenerate with \`npx @aurabase/gen\`
 // ============================================================
 `;
 function generateDatabaseTypes(tables, options = {}) {
@@ -217,7 +254,8 @@ function generateDatabaseTypes(tables, options = {}) {
     typeName,
     schemaName,
     enumNames: new Set(enums.map((e) => e.name)),
-    relationNames
+    relationNames,
+    numericAsString: options.numericAsString === true
   };
   const functionsBody = genFunctionsBody(options.functions ?? [], ctx);
   const enumsBody = genEnumsBody(enums);

package/dist/index.d.cts

@@ -6,6 +6,8 @@ interface GenerateOptions {
     functions?: SchemaFunction[];
     enums?: SchemaEnum[];
     views?: SchemaTable[];
+    /** When true, maps Postgres `numeric` columns/args to `string` instead of `number`. */
+    numericAsString?: boolean;
 }
 declare function generateDatabaseTypes(tables: SchemaTable[], options?: GenerateOptions): string;
 

package/dist/index.d.ts

@@ -6,6 +6,8 @@ interface GenerateOptions {
     functions?: SchemaFunction[];
     enums?: SchemaEnum[];
     views?: SchemaTable[];
+    /** When true, maps Postgres `numeric` columns/args to `string` instead of `number`. */
+    numericAsString?: boolean;
 }
 declare function generateDatabaseTypes(tables: SchemaTable[], options?: GenerateOptions): string;
 

package/dist/index.js

@@ -14,11 +14,13 @@ function mapColType(colType, ctx) {
       case "uuid":
       case "timestamp":
       case "timestamptz":
+      case "tsvector":
       case "date":
       case "time":
       case "bytea":
-      case "numeric":
         return "string";
+      case "numeric":
+        return ctx.numericAsString ? "string" : "number";
       case "int":
       case "int2":
       case "int4":
@@ -46,20 +48,29 @@ function mapColType(colType, ctx) {
 }
 function mapPgType(raw, ctx) {
   if (raw.startsWith("_")) return `${mapPgType(raw.slice(1), ctx)}[]`;
+  if (raw.endsWith("[]")) return `${mapPgType(raw.slice(0, -2), ctx)}[]`;
   switch (raw) {
     case "int2":
     case "int4":
     case "int8":
     case "float4":
     case "float8":
+    case "smallint":
+    case "integer":
+    case "bigint":
+    case "real":
+    case "double precision":
       return "number";
     case "numeric":
-      return "string";
+      return ctx.numericAsString ? "string" : "number";
     case "bool":
+    case "boolean":
       return "boolean";
     case "text":
     case "varchar":
     case "bpchar":
+    case "character varying":
+    case "character":
     case "citext":
     case "uuid":
     case "date":
@@ -67,8 +78,15 @@ function mapPgType(raw, ctx) {
     case "timetz":
     case "timestamp":
     case "timestamptz":
+    case "time without time zone":
+    case "time with time zone":
+    case "timestamp without time zone":
+    case "timestamp with time zone":
+    case "tsvector":
     case "bytea":
       return "string";
+    case "vector":
+      return "number[]";
     case "json":
     case "jsonb":
       return "Json";
@@ -87,15 +105,14 @@ function tsType(col, ctx) {
 function genRow(cols, ctx) {
   return cols.map((c) => `          ${c.name}: ${tsType(c, ctx)}`).join("\n");
 }
-var AUTO_COLS = /* @__PURE__ */ new Set(["id", "created_at", "updated_at"]);
 function isInsertOptional(col) {
-  return col.nullable || col.default_val != null || AUTO_COLS.has(col.name);
+  return col.nullable || col.default_val != null || col.is_identity === true;
 }
 function genInsert(cols, ctx) {
-  return cols.map((c) => `          ${c.name}${isInsertOptional(c) ? "?" : ""}: ${tsType(c, ctx)}`).join("\n");
+  return cols.filter((c) => c.is_generated !== true).map((c) => `          ${c.name}${isInsertOptional(c) ? "?" : ""}: ${tsType(c, ctx)}`).join("\n");
 }
 function genUpdate(cols, ctx) {
-  return cols.map((c) => `          ${c.name}?: ${tsType(c, ctx)}`).join("\n");
+  return cols.filter((c) => c.is_generated !== true).map((c) => `          ${c.name}?: ${tsType(c, ctx)}`).join("\n");
 }
 function genRelationships(t) {
   const fks = t.columns.filter((c) => c.references);
@@ -104,7 +121,7 @@ function genRelationships(t) {
   for (const c of fks) {
     const ref = c.references;
     const name = ref.constraint_name ?? `${t.name}_${c.name}_fkey`;
-    const key = ref.constraint_name ?? `\0synthetic\0${c.name}`;
+    const key = ref.constraint_name ?? `__synthetic__${c.name}`;
     let g = groups.get(key);
     if (!g) {
       g = { name, columns: [], refTable: ref.table, refColumns: [], cols: [] };
@@ -114,8 +131,19 @@ function genRelationships(t) {
     g.refColumns.push(ref.column);
     g.cols.push(c);
   }
+  const sameColSet = (a, b) => {
+    if (!a || a.length !== b.length || a.length === 0) return false;
+    const setA = new Set(a);
+    return b.every((c) => setA.has(c));
+  };
   const entries = [...groups.values()].map((g) => {
-    const isOneToOne = g.cols.every((c) => c.unique || t.primary_key === c.name);
+    const isOneToOne = g.cols.length === 1 ? g.cols[0].unique || t.primary_key === g.cols[0].name || t.primary_key_columns?.length === 1 && t.primary_key_columns[0] === g.cols[0].name || Boolean(
+      t.unique_constraints?.some((uc) => uc.length === 1 && uc[0] === g.cols[0].name)
+    ) || Boolean(
+      t.indexes?.some(
+        (idx) => idx.unique && idx.columns.length === 1 && idx.columns[0] === g.cols[0].name
+      )
+    ) : sameColSet(t.primary_key_columns, g.columns) || Boolean(t.unique_constraints?.some((uc) => sameColSet(uc, g.columns))) || Boolean(t.indexes?.some((idx) => idx.unique && sameColSet(idx.columns, g.columns)));
     const cols = g.columns.map((c) => `'${c}'`).join(", ");
     const refCols = g.refColumns.map((c) => `'${c}'`).join(", ");
     return `          {
@@ -131,12 +159,21 @@ ${entries.join(",\n")}
         ]`;
 }
 function genFunctionArgs(fn, ctx) {
-  const inputArgs = fn.args.filter((a) => a.mode.toUpperCase() !== "OUT");
+  const inputArgs = fn.args.filter((a) => !isReturnColumn(a));
   if (inputArgs.length === 0) return "Record<string, never>";
   const entries = inputArgs.map((a) => `${a.name}: ${mapPgType(a.data_type, ctx)}`).join("; ");
   return `{ ${entries} }`;
 }
+function isReturnColumn(a) {
+  const m = a.mode.toUpperCase();
+  return m === "OUT" || m === "TABLE";
+}
 function mapReturnType(fn, ctx) {
+  const cols = fn.args.filter(isReturnColumn);
+  if (fn.returns === "record" && cols.length > 0) {
+    const row = `{ ${cols.map((c) => `${c.name}: ${mapPgType(c.data_type, ctx)}`).join("; ")} }`;
+    return fn.is_set_returning ? `${row}[]` : row;
+  }
   const base = mapPgType(fn.returns, ctx);
   if (!fn.is_set_returning) return base;
   return base === "unknown" ? "Record<string, unknown>[]" : `${base}[]`;
@@ -201,8 +238,8 @@ ${entries.join("\n")}
     }`;
 }
 var HEADER = `// ============================================================
-// Types TypeScript auto-g\xE9n\xE9r\xE9s par Aurabase (@aurabase/gen)
-// NE PAS MODIFIER \u2014 r\xE9g\xE9n\xE9rer avec \`npx @aurabase/gen\`
+// Auto-generated TypeScript types by Aurabase (@aurabase/gen)
+// DO NOT EDIT \u2014 regenerate with \`npx @aurabase/gen\`
 // ============================================================
 `;
 function generateDatabaseTypes(tables, options = {}) {
@@ -215,7 +252,8 @@ function generateDatabaseTypes(tables, options = {}) {
     typeName,
     schemaName,
     enumNames: new Set(enums.map((e) => e.name)),
-    relationNames
+    relationNames,
+    numericAsString: options.numericAsString === true
   };
   const functionsBody = genFunctionsBody(options.functions ?? [], ctx);
   const enumsBody = genEnumsBody(enums);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aurabase/gen",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Générateur de types TypeScript Database pour le SDK Aurabase (CLI aurabase-gen)",
   "type": "module",
   "main": "dist/index.cjs",
@@ -49,13 +49,13 @@
     "types"
   ],
   "dependencies": {
-    "@aurabase/core": "0.7.4",
-    "@aurabase/aurabase-js": "0.7.4"
+    "@aurabase/core": "0.7.5",
+    "@aurabase/aurabase-js": "0.7.5"
   },
   "devDependencies": {
     "tsup": "^8.0.0",
     "typescript": "^5.5.0",
-    "vitest": "^4.1.6",
+    "vitest": "^4.1.12",
     "@types/node": "20.14.15"
   },
   "scripts": {