@xylex-group/athena 2.7.0 → 2.8.0

package/dist/cli/index.js

@@ -129,59 +129,6 @@ function escapeStringLiteral(value) {
   return `'${value.replace(/\\/g, "\\\\").replace(/'/g, "\\'")}'`;
 }
 
-// src/generator/placeholders.ts
-function createStyleTokens(prefix, value) {
-  return {
-    [prefix]: value,
-    [`${prefix}_camel`]: applyNamingStyle(value, "camel"),
-    [`${prefix}_pascal`]: applyNamingStyle(value, "pascal"),
-    [`${prefix}_snake`]: applyNamingStyle(value, "snake"),
-    [`${prefix}_kebab`]: applyNamingStyle(value, "kebab")
-  };
-}
-function renderTemplate(template, tokenMap) {
-  return template.replace(/\{([A-Za-z0-9_]+)\}/g, (_match, token) => {
-    if (!(token in tokenMap)) {
-      throw new Error(`Unknown placeholder token "${token}" in template "${template}"`);
-    }
-    return tokenMap[token];
-  });
-}
-function resolvePlaceholderMap(baseTokens, outputConfig) {
-  const resolved = {
-    ...baseTokens
-  };
-  const reservedTokenKeys = new Set(Object.keys(baseTokens));
-  const entries = Object.entries(outputConfig.placeholderMap ?? {});
-  for (let index = 0; index < entries.length; index += 1) {
-    const [key, value] = entries[index];
-    if (reservedTokenKeys.has(key)) {
-      continue;
-    }
-    let current = value;
-    for (let depth = 0; depth < 8; depth += 1) {
-      const next = renderTemplate(current, resolved);
-      if (next === current) {
-        break;
-      }
-      current = next;
-    }
-    resolved[key] = current;
-  }
-  return resolved;
-}
-function renderOutputPath(template, context, outputConfig) {
-  const baseTokens = {
-    provider: context.provider,
-    kind: context.kind,
-    ...createStyleTokens("database", context.database),
-    ...createStyleTokens("schema", context.schema),
-    ...createStyleTokens("model", context.model)
-  };
-  const tokens = resolvePlaceholderMap(baseTokens, outputConfig);
-  return renderTemplate(template, tokens);
-}
-
 // src/generator/postgres-type-mapping.ts
 var NUMBER_TYPES = /* @__PURE__ */ new Set([
   "int2",
@@ -755,6 +702,7 @@ var DEFAULT_TARGETS = {
   database: "athena/relations.ts",
   registry: "athena/config.ts"
 };
+var DEFAULT_OUTPUT_FORMAT = "define-model";
 var DEFAULT_NAMING = {
   modelType: "pascal",
   modelConst: "camel",
@@ -770,6 +718,9 @@ var DEFAULT_EXPERIMENTAL_FLAGS = {
   postgresGatewayIntrospection: false,
   scyllaProviderContracts: true
 };
+var DEFAULT_INTERNAL_CONFIG = {
+  schemaVersion: 1
+};
 var PROJECT_ENV_FILENAMES = [".env", ".env.local"];
 var DIRECT_CONNECTION_STRING_ENV_KEYS = [
   "ATHENA_GENERATOR_PG_URL",
@@ -786,6 +737,27 @@ var GATEWAY_API_KEY_ENV_KEYS = [
   "ATHENA_GATEWAY_API_KEY",
   "ATHENA_GENERATOR_API_KEY"
 ];
+var GENERATOR_SCHEMA_ENV_KEYS = ["ATHENA_GENERATOR_SCHEMAS"];
+var OUTPUT_FORMAT_ENV_KEYS = ["ATHENA_GENERATOR_OUTPUT_FORMAT"];
+var MODEL_TARGET_ENV_KEYS = ["ATHENA_GENERATOR_MODEL_TARGET"];
+var SCHEMA_TARGET_ENV_KEYS = ["ATHENA_GENERATOR_SCHEMA_TARGET"];
+var DATABASE_TARGET_ENV_KEYS = ["ATHENA_GENERATOR_DATABASE_TARGET"];
+var REGISTRY_TARGET_ENV_KEYS = ["ATHENA_GENERATOR_REGISTRY_TARGET"];
+var PLACEHOLDER_MAP_ENV_KEYS = ["ATHENA_GENERATOR_PLACEHOLDER_MAP"];
+var MODEL_TYPE_ENV_KEYS = ["ATHENA_GENERATOR_MODEL_TYPE", "ATHENA_GENERATOR_MODEL_STYLE"];
+var MODEL_CONST_ENV_KEYS = ["ATHENA_GENERATOR_MODEL_CONST"];
+var SCHEMA_CONST_ENV_KEYS = ["ATHENA_GENERATOR_SCHEMA_CONST"];
+var DATABASE_CONST_ENV_KEYS = ["ATHENA_GENERATOR_DATABASE_CONST"];
+var REGISTRY_CONST_ENV_KEYS = ["ATHENA_GENERATOR_REGISTRY_CONST"];
+var EMIT_RELATIONS_ENV_KEYS = ["ATHENA_GENERATOR_EMIT_RELATIONS"];
+var EMIT_REGISTRY_ENV_KEYS = ["ATHENA_GENERATOR_EMIT_REGISTRY"];
+var GATEWAY_BACKEND_ENV_KEYS = ["ATHENA_GENERATOR_BACKEND"];
+var GATEWAY_EXPERIMENTAL_ENV_KEYS = ["ATHENA_GENERATOR_GATEWAY_EXPERIMENTAL"];
+var SCYLLA_PROVIDER_CONTRACTS_ENV_KEYS = ["ATHENA_GENERATOR_SCYLLA_PROVIDER_CONTRACTS"];
+var ENV_ONLY_CONFIG_PATH = "[environment defaults]";
+var NAMING_STYLE_VALUES = ["preserve", "camel", "pascal", "snake", "kebab"];
+var OUTPUT_FORMAT_VALUES = ["define-model", "table-builder"];
+var BACKEND_TYPE_VALUES = ["athena", "postgrest", "postgresql", "scylladb"];
 function normalizeRawEnvValue(rawValue) {
   if (rawValue.startsWith('"') && rawValue.endsWith('"') && rawValue.length >= 2) {
     const inner = rawValue.slice(1, -1);
@@ -877,6 +849,50 @@ function resolveFallbackValue(fallbackKeys) {
   }
   return void 0;
 }
+function normalizeOneOfValue(rawValue, allowedValues, envKeys) {
+  if (!rawValue) {
+    return void 0;
+  }
+  if (allowedValues.includes(rawValue)) {
+    return rawValue;
+  }
+  throw new Error(
+    `Generator config env vars ${envKeys.join(", ")} must resolve to one of: ${allowedValues.join(", ")}. Received: ${rawValue}.`
+  );
+}
+function resolveOptionalOneOf(envKeys, allowedValues) {
+  return normalizeOneOfValue(resolveFallbackValue(envKeys), allowedValues, envKeys);
+}
+function resolveOptionalBoolean(envKeys) {
+  const rawValue = resolveFallbackValue(envKeys);
+  return rawValue === void 0 ? void 0 : parseBooleanFlag2(rawValue, false);
+}
+function resolveOptionalJson(envKeys) {
+  const rawValue = resolveFallbackValue(envKeys);
+  if (rawValue === void 0) {
+    return void 0;
+  }
+  try {
+    return JSON.parse(rawValue);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new Error(
+      `Generator config env vars ${envKeys.join(", ")} must contain valid JSON. ${message}`
+    );
+  }
+}
+function deriveDatabaseNameFromConnectionString(connectionString) {
+  try {
+    const parsedUrl = new URL(connectionString);
+    if (!POSTGRES_PROTOCOLS.has(parsedUrl.protocol)) {
+      return void 0;
+    }
+    const pathname = parsedUrl.pathname.replace(/^\/+/, "").trim();
+    return pathname.length > 0 ? decodeURIComponent(pathname) : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function normalizeOptionalString(value, fallbackKeys) {
   if (typeof value === "string") {
     const trimmed = value.trim();
@@ -950,12 +966,13 @@ function normalizeExperimentalFlags(input) {
 }
 function normalizeOutputConfig(output) {
   return {
+    format: output?.format ?? DEFAULT_OUTPUT_FORMAT,
     targets: {
       ...DEFAULT_TARGETS,
-      ...output.targets ?? {}
+      ...output?.targets ?? {}
     },
     placeholderMap: {
-      ...output.placeholderMap ?? {}
+      ...output?.placeholderMap ?? {}
     }
   };
 }
@@ -966,7 +983,7 @@ function normalizeProviderConfig(provider) {
       "provider.connectionString",
       DIRECT_CONNECTION_STRING_ENV_KEYS
     );
-    const database = normalizeOptionalString(provider.database, POSTGRES_DATABASE_ENV_KEYS);
+    const database = normalizeOptionalString(provider.database, POSTGRES_DATABASE_ENV_KEYS) ?? deriveDatabaseNameFromConnectionString(connectionString);
     return {
       ...provider,
       connectionString: applyPostgresPasswordFallback(connectionString),
@@ -985,11 +1002,7 @@ function normalizeProviderConfig(provider) {
       "provider.apiKey",
       GATEWAY_API_KEY_ENV_KEYS
     );
-    const database = normalizeRequiredString(
-      provider.database,
-      "provider.database",
-      POSTGRES_DATABASE_ENV_KEYS
-    );
+    const database = normalizeOptionalString(provider.database, POSTGRES_DATABASE_ENV_KEYS) ?? "postgres";
     return {
       ...provider,
       gatewayUrl,
@@ -998,6 +1011,26 @@ function normalizeProviderConfig(provider) {
       schemas: normalizeSchemaSelection(provider.schemas)
     };
   }
+  if (provider.kind === "scylla" && provider.mode === "direct") {
+    if (!provider.contactPoints?.length) {
+      throw new Error(
+        "Generator config is missing provider.contactPoints for scylla direct mode."
+      );
+    }
+    const keyspace = normalizeOptionalString(provider.keyspace, []);
+    if (!keyspace) {
+      throw new Error(
+        "Generator config is missing provider.keyspace for scylla direct mode."
+      );
+    }
+    return {
+      kind: "scylla",
+      mode: "direct",
+      contactPoints: provider.contactPoints.slice(),
+      keyspace,
+      datacenter: normalizeOptionalString(provider.datacenter, [])
+    };
+  }
   return provider;
 }
 function isAthenaGeneratorConfig(value) {
@@ -1005,7 +1038,7 @@ function isAthenaGeneratorConfig(value) {
     return false;
   }
   const record = value;
-  return Boolean(record.provider && typeof record.provider === "object") && Boolean(record.output && typeof record.output === "object");
+  return Boolean(record.provider && typeof record.provider === "object") && (record.output === void 0 || typeof record.output === "object");
 }
 function normalizeGeneratorConfig(input) {
   return {
@@ -1016,7 +1049,10 @@ function normalizeGeneratorConfig(input) {
       ...input.naming ?? {}
     },
     features: normalizeFeatureFlags(input.features),
-    experimental: normalizeExperimentalFlags(input.experimental)
+    experimental: normalizeExperimentalFlags(input.experimental),
+    internal: {
+      ...DEFAULT_INTERNAL_CONFIG
+    }
   };
 }
 function findGeneratorConfigPath(cwd = process.cwd()) {
@@ -1070,16 +1106,123 @@ function importConfigModule(moduleSpecifier) {
   );
   return runtimeImport(moduleSpecifier);
 }
+function buildEnvironmentOutputConfig() {
+  const format = resolveOptionalOneOf(OUTPUT_FORMAT_ENV_KEYS, OUTPUT_FORMAT_VALUES);
+  const modelTarget = resolveFallbackValue(MODEL_TARGET_ENV_KEYS);
+  const schemaTarget = resolveFallbackValue(SCHEMA_TARGET_ENV_KEYS);
+  const databaseTarget = resolveFallbackValue(DATABASE_TARGET_ENV_KEYS);
+  const registryTarget = resolveFallbackValue(REGISTRY_TARGET_ENV_KEYS);
+  const placeholderMap = resolveOptionalJson(PLACEHOLDER_MAP_ENV_KEYS);
+  if (format === void 0 && modelTarget === void 0 && schemaTarget === void 0 && databaseTarget === void 0 && registryTarget === void 0 && placeholderMap === void 0) {
+    return void 0;
+  }
+  return {
+    format,
+    targets: {
+      ...modelTarget ? { model: modelTarget } : {},
+      ...schemaTarget ? { schema: schemaTarget } : {},
+      ...databaseTarget ? { database: databaseTarget } : {},
+      ...registryTarget ? { registry: registryTarget } : {}
+    },
+    placeholderMap
+  };
+}
+function buildEnvironmentNamingConfig() {
+  const modelType = resolveOptionalOneOf(MODEL_TYPE_ENV_KEYS, NAMING_STYLE_VALUES);
+  const modelConst = resolveOptionalOneOf(MODEL_CONST_ENV_KEYS, NAMING_STYLE_VALUES);
+  const schemaConst = resolveOptionalOneOf(SCHEMA_CONST_ENV_KEYS, NAMING_STYLE_VALUES);
+  const databaseConst = resolveOptionalOneOf(DATABASE_CONST_ENV_KEYS, NAMING_STYLE_VALUES);
+  const registryConst = resolveOptionalOneOf(REGISTRY_CONST_ENV_KEYS, NAMING_STYLE_VALUES);
+  if (modelType === void 0 && modelConst === void 0 && schemaConst === void 0 && databaseConst === void 0 && registryConst === void 0) {
+    return void 0;
+  }
+  return {
+    ...modelType ? { modelType } : {},
+    ...modelConst ? { modelConst } : {},
+    ...schemaConst ? { schemaConst } : {},
+    ...databaseConst ? { databaseConst } : {},
+    ...registryConst ? { registryConst } : {}
+  };
+}
+function buildEnvironmentFeatureFlags() {
+  const emitRelations = resolveOptionalBoolean(EMIT_RELATIONS_ENV_KEYS);
+  const emitRegistry = resolveOptionalBoolean(EMIT_REGISTRY_ENV_KEYS);
+  if (emitRelations === void 0 && emitRegistry === void 0) {
+    return void 0;
+  }
+  return {
+    ...emitRelations !== void 0 ? { emitRelations } : {},
+    ...emitRegistry !== void 0 ? { emitRegistry } : {}
+  };
+}
+function buildEnvironmentExperimentalFlags() {
+  const postgresGatewayIntrospection = resolveOptionalBoolean(GATEWAY_EXPERIMENTAL_ENV_KEYS);
+  const scyllaProviderContracts = resolveOptionalBoolean(SCYLLA_PROVIDER_CONTRACTS_ENV_KEYS);
+  if (postgresGatewayIntrospection === void 0 && scyllaProviderContracts === void 0) {
+    return void 0;
+  }
+  return {
+    ...postgresGatewayIntrospection !== void 0 ? { postgresGatewayIntrospection } : {},
+    ...scyllaProviderContracts !== void 0 ? { scyllaProviderContracts } : {}
+  };
+}
+function buildEnvironmentProviderConfig() {
+  const directConnectionString = resolveFallbackValue(DIRECT_CONNECTION_STRING_ENV_KEYS);
+  if (directConnectionString) {
+    return {
+      kind: "postgres",
+      mode: "direct",
+      connectionString: directConnectionString,
+      database: normalizeOptionalString(void 0, POSTGRES_DATABASE_ENV_KEYS),
+      schemas: normalizeSchemaSelection(resolveFallbackValue(GENERATOR_SCHEMA_ENV_KEYS))
+    };
+  }
+  const gatewayUrl = resolveFallbackValue(GATEWAY_URL_ENV_KEYS);
+  const apiKey = resolveFallbackValue(GATEWAY_API_KEY_ENV_KEYS);
+  if (gatewayUrl && apiKey) {
+    const backend = resolveOptionalOneOf(GATEWAY_BACKEND_ENV_KEYS, BACKEND_TYPE_VALUES);
+    return {
+      kind: "postgres",
+      mode: "gateway",
+      gatewayUrl,
+      apiKey,
+      database: normalizeOptionalString(void 0, POSTGRES_DATABASE_ENV_KEYS),
+      schemas: normalizeSchemaSelection(resolveFallbackValue(GENERATOR_SCHEMA_ENV_KEYS)),
+      backend
+    };
+  }
+  return void 0;
+}
+function createEnvironmentGeneratorConfig() {
+  const provider = buildEnvironmentProviderConfig();
+  if (!provider) {
+    return void 0;
+  }
+  return {
+    provider,
+    output: buildEnvironmentOutputConfig(),
+    naming: buildEnvironmentNamingConfig(),
+    features: buildEnvironmentFeatureFlags(),
+    experimental: buildEnvironmentExperimentalFlags()
+  };
+}
 async function loadGeneratorConfig(options = {}) {
   const cwd = options.cwd ?? process.cwd();
   const restoreProjectEnv = applyProjectEnv(cwd);
-  const resolvedPath = options.configPath ? resolve(cwd, options.configPath) : findGeneratorConfigPath(cwd);
-  if (!resolvedPath) {
-    throw new Error(
-      `No generator config found in ${cwd}. Expected one of: ${DEFAULT_CONFIG_CANDIDATES.join(", ")}`
-    );
-  }
   try {
+    const resolvedPath = options.configPath ? resolve(cwd, options.configPath) : findGeneratorConfigPath(cwd);
+    if (!resolvedPath) {
+      const environmentConfig = createEnvironmentGeneratorConfig();
+      if (environmentConfig) {
+        return {
+          configPath: ENV_ONLY_CONFIG_PATH,
+          config: normalizeGeneratorConfig(environmentConfig)
+        };
+      }
+      throw new Error(
+        `No generator config found in ${cwd}. Expected one of: ${DEFAULT_CONFIG_CANDIDATES.join(", ")}. To run without a config file, set DATABASE_URL (direct mode) or ATHENA_URL + ATHENA_API_KEY (gateway mode).`
+      );
+    }
     const moduleUrl = pathToFileURL(resolvedPath);
     const module = await importConfigModule(`${moduleUrl.href}?cacheBust=${Date.now()}`);
     const rawConfig = extractConfigExport(module);
@@ -1092,7 +1235,60 @@ async function loadGeneratorConfig(options = {}) {
   }
 }
 
-// src/generator/renderer.ts
+// src/generator/placeholders.ts
+function createStyleTokens(prefix, value) {
+  return {
+    [prefix]: value,
+    [`${prefix}_camel`]: applyNamingStyle(value, "camel"),
+    [`${prefix}_pascal`]: applyNamingStyle(value, "pascal"),
+    [`${prefix}_snake`]: applyNamingStyle(value, "snake"),
+    [`${prefix}_kebab`]: applyNamingStyle(value, "kebab")
+  };
+}
+function renderTemplate(template, tokenMap) {
+  return template.replace(/\{([A-Za-z0-9_]+)\}/g, (_match, token) => {
+    if (!(token in tokenMap)) {
+      throw new Error(`Unknown placeholder token "${token}" in template "${template}"`);
+    }
+    return tokenMap[token];
+  });
+}
+function resolvePlaceholderMap(baseTokens, outputConfig) {
+  const resolved = {
+    ...baseTokens
+  };
+  const reservedTokenKeys = new Set(Object.keys(baseTokens));
+  const entries = Object.entries(outputConfig.placeholderMap ?? {});
+  for (let index = 0; index < entries.length; index += 1) {
+    const [key, value] = entries[index];
+    if (reservedTokenKeys.has(key)) {
+      continue;
+    }
+    let current = value;
+    for (let depth = 0; depth < 8; depth += 1) {
+      const next = renderTemplate(current, resolved);
+      if (next === current) {
+        break;
+      }
+      current = next;
+    }
+    resolved[key] = current;
+  }
+  return resolved;
+}
+function renderOutputPath(template, context, outputConfig) {
+  const baseTokens = {
+    provider: context.provider,
+    kind: context.kind,
+    ...createStyleTokens("database", context.database),
+    ...createStyleTokens("schema", context.schema),
+    ...createStyleTokens("model", context.model)
+  };
+  const tokens = resolvePlaceholderMap(baseTokens, outputConfig);
+  return renderTemplate(template, tokens);
+}
+
+// src/generator/render-shared.ts
 function normalizePath(pathValue) {
   return pathValue.replace(/\\/g, "/");
 }
@@ -1105,11 +1301,13 @@ function toModuleImportPath(fromFile, targetFile) {
   );
   return relativePath.startsWith(".") ? relativePath : `./${relativePath}`;
 }
+function resolveOutputPath(target, tokens, config) {
+  return normalizePath(renderOutputPath(target, tokens, config.output));
+}
 function renderObjectKey(key) {
-  const escaped = escapeTypePropertyName(key);
-  return escaped.startsWith("'") ? escaped : escaped;
+  return escapeTypePropertyName(key);
 }
-function renderRelation(relation) {
+function renderRelationLiteral(relation) {
   const through = relation.through ? `,
       through: {
         schema: ${escapeStringLiteral(relation.through.schema)},
@@ -1125,54 +1323,12 @@ function renderRelation(relation) {
       targetColumns: [${relation.targetColumns.map((value) => escapeStringLiteral(value)).join(", ")}]${through}
     }`;
 }
-function renderModelArtifact(snapshot, descriptor, config) {
-  const columnLines = Object.values(descriptor.table.columns).map((column) => {
-    const propertyName = escapeTypePropertyName(column.name);
-    const baseType = resolvePostgresColumnType(column);
-    const isOptional = column.isNullable;
-    const typeWithNullability = column.isNullable ? `${baseType} | null` : baseType;
-    return `  ${propertyName}${isOptional ? "?" : ""}: ${typeWithNullability}`;
-  }).join("\n");
-  const nullableLines = Object.values(descriptor.table.columns).map((column) => `      ${renderObjectKey(column.name)}: ${column.isNullable ? "true" : "false"}`).join(",\n");
-  const relationEntries = Object.entries(descriptor.table.relations);
-  const relationBlock = config.features.emitRelations && relationEntries.length > 0 ? `,
-    relations: {
-${relationEntries.map(([relationKey2, relationValue]) => `      ${renderObjectKey(relationKey2)}: ${renderRelation(relationValue)}`).join(",\n")}
-    }` : "";
-  const content = `import { defineModel } from '@xylex-group/athena'
-
-export interface ${descriptor.rowTypeName} {
-${columnLines}
-}
-
-export type ${descriptor.insertTypeName} = Partial<${descriptor.rowTypeName}>
-export type ${descriptor.updateTypeName} = Partial<${descriptor.insertTypeName}>
-
-export const ${descriptor.modelConstName} = defineModel<${descriptor.rowTypeName}, ${descriptor.insertTypeName}, ${descriptor.updateTypeName}>({
-  meta: {
-    database: ${escapeStringLiteral(snapshot.database)},
-    schema: ${escapeStringLiteral(descriptor.schemaName)},
-    model: ${escapeStringLiteral(descriptor.tableName)},
-    tableName: ${escapeStringLiteral(`${descriptor.schemaName}.${descriptor.tableName}`)},
-    primaryKey: [${descriptor.table.primaryKey.map((value) => escapeStringLiteral(value)).join(", ")}],
-    nullable: {
-${nullableLines}
-    }${relationBlock}
-  }
-})
-`;
-  return {
-    kind: "model",
-    path: descriptor.filePath,
-    content
-  };
-}
 function renderSchemaArtifact(descriptor) {
   const importLines = descriptor.models.map((modelDescriptor) => {
     const importPath = toModuleImportPath(descriptor.filePath, modelDescriptor.filePath);
-    return `import { ${modelDescriptor.modelConstName} } from '${importPath}'`;
+    return `import { ${modelDescriptor.exportConstName} } from '${importPath}'`;
   }).join("\n");
-  const modelEntries = descriptor.models.map((modelDescriptor) => `  ${renderObjectKey(modelDescriptor.tableName)}: ${modelDescriptor.modelConstName}`).join(",\n");
+  const modelEntries = descriptor.models.map((modelDescriptor) => `  ${renderObjectKey(modelDescriptor.tableName)}: ${modelDescriptor.exportConstName}`).join(",\n");
   const content = `import { defineSchema } from '@xylex-group/athena'
 ${importLines ? `
 ${importLines}
@@ -1207,11 +1363,18 @@ ${schemaEntries}
     content
   };
 }
-function renderRegistryArtifact(registryPath, databasePath, databaseConstName, registryConstName, databaseName) {
+function renderRegistryArtifact(registryPath, databasePath, databaseConstName, registryConstName, databaseName, generatedAt, outputFormat, schemaVersion) {
   const databaseImportPath = toModuleImportPath(registryPath, databasePath);
   const content = `import { defineRegistry } from '@xylex-group/athena'
 import { ${databaseConstName} } from '${databaseImportPath}'
 
+export const __athena_schema_meta = {
+  schemaVersion: ${schemaVersion},
+  generatedAt: ${escapeStringLiteral(generatedAt)},
+  database: ${escapeStringLiteral(databaseName)},
+  outputFormat: ${escapeStringLiteral(outputFormat)},
+} as const
+
 export const ${registryConstName} = defineRegistry({
   ${renderObjectKey(databaseName)}: ${databaseConstName}
 })
@@ -1290,123 +1453,332 @@ function scopeDuplicateDescriptorPathsBySchema(descriptors) {
   }
   return nextDescriptors;
 }
-var ArtifactComposer = class {
-  constructor(snapshot, config) {
-    this.snapshot = snapshot;
-    this.config = config;
-  }
-  compose() {
-    const providerName = this.snapshot.backend;
-    const databaseName = this.snapshot.database;
-    const modelDescriptors = [];
-    for (const schemaName of Object.keys(this.snapshot.schemas).sort()) {
-      const schema = this.snapshot.schemas[schemaName];
-      for (const tableName of Object.keys(schema.tables).sort()) {
-        const table = schema.tables[tableName];
-        const rowTypeName = `${toSafeIdentifier(`${schemaName} ${tableName}`, this.config.naming.modelType, "Model")}Row`;
-        const insertTypeName = `${toSafeIdentifier(`${schemaName} ${tableName}`, this.config.naming.modelType, "Model")}Insert`;
-        const updateTypeName = `${toSafeIdentifier(`${schemaName} ${tableName}`, this.config.naming.modelType, "Model")}Update`;
-        const modelConstName = `${toSafeIdentifier(`${schemaName} ${tableName} model`, this.config.naming.modelConst, "model")}`;
-        const modelPath = normalizePath(
-          renderOutputPath(this.config.output.targets.model, {
+function composeGeneratorArtifacts(input) {
+  const { snapshot, config, createModelDescriptor, renderModelArtifact: renderModelArtifact3 } = input;
+  const providerName = snapshot.backend;
+  const databaseName = snapshot.database;
+  const modelDescriptors = [];
+  for (const schemaName of Object.keys(snapshot.schemas).sort()) {
+    const schema = snapshot.schemas[schemaName];
+    for (const tableName of Object.keys(schema.tables).sort()) {
+      modelDescriptors.push(
+        createModelDescriptor({
+          providerName,
+          databaseName,
+          schemaName,
+          tableName,
+          table: schema.tables[tableName]
+        })
+      );
+    }
+  }
+  const scopedModelDescriptors = scopeDuplicateDescriptorPathsBySchema(modelDescriptors);
+  let schemaDescriptors = Object.keys(snapshot.schemas).sort().map((schemaName) => ({
+    schemaName,
+    filePath: resolveOutputPath(
+      config.output.targets.schema,
+      {
+        provider: providerName,
+        kind: "schema",
+        database: databaseName,
+        schema: schemaName,
+        model: "index"
+      },
+      config
+    ),
+    schemaConstName: toSafeIdentifier(
+      `${schemaName} schema`,
+      config.naming.schemaConst,
+      "schema"
+    ),
+    models: scopedModelDescriptors.filter((model) => model.schemaName === schemaName)
+  }));
+  schemaDescriptors = scopeDuplicateDescriptorPathsBySchema(schemaDescriptors);
+  const databaseDescriptor = {
+    filePath: resolveOutputPath(
+      config.output.targets.database,
+      {
+        provider: providerName,
+        kind: "database",
+        database: databaseName,
+        schema: "index",
+        model: "index"
+      },
+      config
+    ),
+    databaseConstName: toSafeIdentifier(
+      `${databaseName} database`,
+      config.naming.databaseConst,
+      "database"
+    ),
+    schemas: schemaDescriptors
+  };
+  const files = [];
+  for (const modelDescriptor of scopedModelDescriptors) {
+    files.push(renderModelArtifact3(modelDescriptor));
+  }
+  for (const schemaDescriptor of schemaDescriptors) {
+    files.push(renderSchemaArtifact(schemaDescriptor));
+  }
+  files.push(renderDatabaseArtifact(databaseDescriptor));
+  if (config.features.emitRegistry) {
+    const registryPath = resolveOutputPath(
+      config.output.targets.registry,
+      {
+        provider: providerName,
+        kind: "registry",
+        database: databaseName,
+        schema: "index",
+        model: "index"
+      },
+      config
+    );
+    files.push(
+      renderRegistryArtifact(
+        registryPath,
+        databaseDescriptor.filePath,
+        databaseDescriptor.databaseConstName,
+        toSafeIdentifier("registry", config.naming.registryConst, "registry"),
+        databaseName,
+        snapshot.generatedAt,
+        config.output.format,
+        config.internal.schemaVersion
+      )
+    );
+  }
+  assertNoDuplicatePaths(files);
+  return {
+    snapshot,
+    files
+  };
+}
+
+// src/generator/table-builder-renderer.ts
+var SAFE_NUMBER_TYPES = /* @__PURE__ */ new Set([
+  "int2",
+  "int4",
+  "float4",
+  "float8",
+  "smallint",
+  "integer",
+  "real",
+  "double precision"
+]);
+var JSON_TYPES = /* @__PURE__ */ new Set(["json", "jsonb"]);
+var BOOLEAN_TYPES = /* @__PURE__ */ new Set(["bool", "boolean"]);
+var STRING_TYPES = /* @__PURE__ */ new Set([
+  "int8",
+  "bigint",
+  "serial8",
+  "bigserial",
+  "numeric",
+  "decimal",
+  "money",
+  "bytea"
+]);
+function normalizeTypeLabel2(column) {
+  const preferred = (column.udtName || column.dataType).toLowerCase().trim();
+  if (column.arrayDimensions > 0 && preferred.startsWith("_")) {
+    return preferred.slice(1);
+  }
+  return preferred;
+}
+function renderColumnBuilder(column) {
+  const label = normalizeTypeLabel2(column);
+  let helper;
+  let expression;
+  if (column.typeKind === "enum" && column.enumValues && column.enumValues.length > 0) {
+    helper = "enumeration";
+    expression = `enumeration([${column.enumValues.map((value) => escapeStringLiteral(value)).join(", ")}] as const)`;
+  } else if (column.arrayDimensions > 0 || JSON_TYPES.has(label) || column.typeKind === "composite") {
+    helper = "json";
+    expression = `json<${resolvePostgresColumnType(column)}>()`;
+  } else if (BOOLEAN_TYPES.has(label)) {
+    helper = "boolean";
+    expression = "boolean()";
+  } else if (SAFE_NUMBER_TYPES.has(label)) {
+    helper = "number";
+    expression = "number()";
+  } else if (STRING_TYPES.has(label)) {
+    helper = "string";
+    expression = "string()";
+  } else {
+    helper = "string";
+    expression = "string()";
+  }
+  if (column.isNullable) {
+    expression = `${expression}.optional()`;
+  }
+  if (column.hasDefault) {
+    expression = `${expression}.defaulted()`;
+  }
+  if (column.isGenerated) {
+    expression = `${expression}.generated()`;
+  }
+  return { helper, expression };
+}
+function renderModelArtifact(descriptor, config) {
+  const helperImports = /* @__PURE__ */ new Set(["table"]);
+  const columnLines = Object.entries(descriptor.table.columns).map(([columnName, column]) => {
+    const propertyName = escapeTypePropertyName(columnName);
+    const rendered = renderColumnBuilder(column);
+    helperImports.add(rendered.helper);
+    return `    ${propertyName}: ${rendered.expression}`;
+  }).join(",\n");
+  const helperImportLine = Array.from(helperImports).sort().join(", ");
+  const rowSchemaConstName = `${descriptor.tableConstName}_row_schema`;
+  const insertSchemaConstName = `${descriptor.tableConstName}_insert_schema`;
+  const updateSchemaConstName = `${descriptor.tableConstName}_update_schema`;
+  const formSchemaConstName = `${descriptor.tableConstName}_form_schema`;
+  const relationEntries = Object.entries(descriptor.table.relations);
+  const relationsAssignment = config.features.emitRelations && relationEntries.length > 0 ? `
+Object.assign(${descriptor.tableConstName}.meta, {
+  relations: {
+${relationEntries.map(([relationKey2, relationValue]) => `    ${renderObjectKey(relationKey2)}: ${renderRelationLiteral(relationValue)}`).join(",\n")}
+  }
+})
+` : "";
+  const content = `import { ${helperImportLine} } from '@xylex-group/athena'
+import type { FormValuesOf, InsertOf, RowOf, UpdateOf } from '@xylex-group/athena'
+
+export const ${descriptor.tableConstName} = table(${escapeStringLiteral(descriptor.tableName)})
+  .schema(${escapeStringLiteral(descriptor.schemaName)})
+  .columns({
+${columnLines}
+  })
+  .primaryKey(${descriptor.table.primaryKey.map((value) => escapeStringLiteral(value)).join(", ")})
+${relationsAssignment ? `${relationsAssignment}` : ""}
+export type ${descriptor.rowTypeName} = RowOf<typeof ${descriptor.tableConstName}>
+export type ${descriptor.insertTypeName} = InsertOf<typeof ${descriptor.tableConstName}>
+export type ${descriptor.updateTypeName} = UpdateOf<typeof ${descriptor.tableConstName}>
+export type ${descriptor.formValuesTypeName} = FormValuesOf<typeof ${descriptor.tableConstName}>
+
+export const ${rowSchemaConstName} = ${descriptor.tableConstName}.schemas.row
+export const ${insertSchemaConstName} = ${descriptor.tableConstName}.schemas.insert
+export const ${updateSchemaConstName} = ${descriptor.tableConstName}.schemas.update
+export const ${formSchemaConstName} = ${descriptor.tableConstName}.schemas.form
+`;
+  return {
+    kind: "model",
+    path: descriptor.filePath,
+    content
+  };
+}
+function generateTableBuilderArtifactsFromSnapshot(snapshot, config) {
+  const normalizedConfig = "internal" in config ? config : normalizeGeneratorConfig(config);
+  return composeGeneratorArtifacts({
+    snapshot,
+    config: normalizedConfig,
+    createModelDescriptor({ providerName, databaseName, schemaName, tableName, table }) {
+      const tableConstName = toSafeIdentifier(tableName, "preserve", "table");
+      return {
+        schemaName,
+        tableName,
+        filePath: resolveOutputPath(
+          normalizedConfig.output.targets.model,
+          {
+            provider: providerName,
+            kind: "model",
+            database: databaseName,
+            schema: schemaName,
+            model: tableName
+          },
+          normalizedConfig
+        ),
+        rowTypeName: `${toSafeIdentifier(`${schemaName} ${tableName}`, normalizedConfig.naming.modelType, "Model")}Row`,
+        insertTypeName: `${toSafeIdentifier(`${schemaName} ${tableName}`, normalizedConfig.naming.modelType, "Model")}Insert`,
+        updateTypeName: `${toSafeIdentifier(`${schemaName} ${tableName}`, normalizedConfig.naming.modelType, "Model")}Update`,
+        formValuesTypeName: `${toSafeIdentifier(`${schemaName} ${tableName}`, normalizedConfig.naming.modelType, "Model")}FormValues`,
+        tableConstName,
+        exportConstName: tableConstName,
+        table
+      };
+    },
+    renderModelArtifact: (descriptor) => renderModelArtifact(descriptor, normalizedConfig)
+  });
+}
+
+// src/generator/renderer.ts
+function renderModelArtifact2(databaseName, descriptor, config) {
+  const columnLines = Object.values(descriptor.table.columns).map((column) => {
+    const propertyName = escapeTypePropertyName(column.name);
+    const baseType = resolvePostgresColumnType(column);
+    const isOptional = column.isNullable;
+    const typeWithNullability = column.isNullable ? `${baseType} | null` : baseType;
+    return `  ${propertyName}${isOptional ? "?" : ""}: ${typeWithNullability}`;
+  }).join("\n");
+  const nullableLines = Object.values(descriptor.table.columns).map((column) => `      ${renderObjectKey(column.name)}: ${column.isNullable ? "true" : "false"}`).join(",\n");
+  const relationEntries = Object.entries(descriptor.table.relations);
+  const relationBlock = config.features.emitRelations && relationEntries.length > 0 ? `,
+    relations: {
+${relationEntries.map(([relationKey2, relationValue]) => `      ${renderObjectKey(relationKey2)}: ${renderRelationLiteral(relationValue)}`).join(",\n")}
+    }` : "";
+  const content = `import { defineModel } from '@xylex-group/athena'
+
+export interface ${descriptor.rowTypeName} {
+${columnLines}
+}
+
+export type ${descriptor.insertTypeName} = Partial<${descriptor.rowTypeName}>
+export type ${descriptor.updateTypeName} = Partial<${descriptor.insertTypeName}>
+
+export const ${descriptor.modelConstName} = defineModel<${descriptor.rowTypeName}, ${descriptor.insertTypeName}, ${descriptor.updateTypeName}>({
+  meta: {
+    database: ${escapeStringLiteral(databaseName)},
+    schema: ${escapeStringLiteral(descriptor.schemaName)},
+    model: ${escapeStringLiteral(descriptor.tableName)},
+    tableName: ${escapeStringLiteral(`${descriptor.schemaName}.${descriptor.tableName}`)},
+    primaryKey: [${descriptor.table.primaryKey.map((value) => escapeStringLiteral(value)).join(", ")}],
+    nullable: {
+${nullableLines}
+    }${relationBlock}
+  }
+})
+`;
+  return {
+    kind: "model",
+    path: descriptor.filePath,
+    content
+  };
+}
+function generateArtifactsFromSnapshot(snapshot, config) {
+  const normalizedConfig = "internal" in config ? config : normalizeGeneratorConfig(config);
+  if (normalizedConfig.output.format === "table-builder") {
+    return generateTableBuilderArtifactsFromSnapshot(snapshot, normalizedConfig);
+  }
+  return composeGeneratorArtifacts({
+    snapshot,
+    config: normalizedConfig,
+    createModelDescriptor({ providerName, databaseName, schemaName, tableName, table }) {
+      const modelConstName = toSafeIdentifier(
+        `${schemaName} ${tableName} model`,
+        normalizedConfig.naming.modelConst,
+        "model"
+      );
+      return {
+        schemaName,
+        tableName,
+        filePath: resolveOutputPath(
+          normalizedConfig.output.targets.model,
+          {
             provider: providerName,
             kind: "model",
             database: databaseName,
             schema: schemaName,
             model: tableName
-          }, this.config.output)
-        );
-        modelDescriptors.push({
-          schemaName,
-          tableName,
-          filePath: modelPath,
-          rowTypeName,
-          insertTypeName,
-          updateTypeName,
-          modelConstName,
-          table
-        });
-      }
-    }
-    const scopedModelDescriptors = scopeDuplicateDescriptorPathsBySchema(modelDescriptors);
-    let schemaDescriptors = Object.keys(this.snapshot.schemas).sort().map((schemaName) => {
-      const schemaPath = normalizePath(
-        renderOutputPath(this.config.output.targets.schema, {
-          provider: providerName,
-          kind: "schema",
-          database: databaseName,
-          schema: schemaName,
-          model: "index"
-        }, this.config.output)
-      );
-      return {
-        schemaName,
-        filePath: schemaPath,
-        schemaConstName: toSafeIdentifier(
-          `${schemaName} schema`,
-          this.config.naming.schemaConst,
-          "schema"
+          },
+          normalizedConfig
         ),
-        models: scopedModelDescriptors.filter((model) => model.schemaName === schemaName)
+        rowTypeName: `${toSafeIdentifier(`${schemaName} ${tableName}`, normalizedConfig.naming.modelType, "Model")}Row`,
+        insertTypeName: `${toSafeIdentifier(`${schemaName} ${tableName}`, normalizedConfig.naming.modelType, "Model")}Insert`,
+        updateTypeName: `${toSafeIdentifier(`${schemaName} ${tableName}`, normalizedConfig.naming.modelType, "Model")}Update`,
+        modelConstName,
+        exportConstName: modelConstName,
+        table
       };
-    });
-    schemaDescriptors = scopeDuplicateDescriptorPathsBySchema(schemaDescriptors);
-    const databasePath = normalizePath(
-      renderOutputPath(this.config.output.targets.database, {
-        provider: providerName,
-        kind: "database",
-        database: databaseName,
-        schema: "index",
-        model: "index"
-      }, this.config.output)
-    );
-    const databaseDescriptor = {
-      filePath: databasePath,
-      databaseConstName: toSafeIdentifier(
-        `${databaseName} database`,
-        this.config.naming.databaseConst,
-        "database"
-      ),
-      schemas: schemaDescriptors
-    };
-    const files = [];
-    for (const modelDescriptor of scopedModelDescriptors) {
-      files.push(renderModelArtifact(this.snapshot, modelDescriptor, this.config));
-    }
-    for (const schemaDescriptor of schemaDescriptors) {
-      files.push(renderSchemaArtifact(schemaDescriptor));
-    }
-    files.push(renderDatabaseArtifact(databaseDescriptor));
-    if (this.config.features.emitRegistry) {
-      const registryPath = normalizePath(
-        renderOutputPath(this.config.output.targets.registry, {
-          provider: providerName,
-          kind: "registry",
-          database: databaseName,
-          schema: "index",
-          model: "index"
-        }, this.config.output)
-      );
-      files.push(
-        renderRegistryArtifact(
-          registryPath,
-          databaseDescriptor.filePath,
-          databaseDescriptor.databaseConstName,
-          toSafeIdentifier("registry", this.config.naming.registryConst, "registry"),
-          databaseName
-        )
-      );
-    }
-    assertNoDuplicatePaths(files);
-    return {
-      snapshot: this.snapshot,
-      files
-    };
-  }
-};
-function generateArtifactsFromSnapshot(snapshot, config) {
-  const normalizedConfig = "naming" in config && "features" in config && "experimental" in config ? config : normalizeGeneratorConfig(config);
-  return new ArtifactComposer(snapshot, normalizedConfig).compose();
+    },
+    renderModelArtifact: (descriptor) => renderModelArtifact2(snapshot.database, descriptor, normalizedConfig)
+  });
 }
 
 // src/gateway/url.ts
@@ -1511,7 +1883,7 @@ var getSessionCookie = (request, config) => {
 
 // package.json
 var package_default = {
-  version: "2.7.0"
+  version: "2.8.0"
 };
 
 // src/sdk-version.ts
@@ -3458,11 +3830,12 @@ function createAuthClient(config = {}) {
 // src/db/module.ts
 function createDbModule(input) {
   const db = {
-    from(table, options) {
-      return input.from(table, options);
-    },
-    select(table, columns, options) {
-      return input.from(table).select(columns, options);
+    from: input.from,
+    select(table, first, second) {
+      if (first && typeof first === "object" && !Array.isArray(first)) {
+        return input.from(table).select(void 0, first);
+      }
+      return input.from(table).select(first, second);
     },
     insert(table, values, options) {
       return Array.isArray(values) ? input.from(table).insert(values, options) : input.from(table).insert(values, options);
@@ -4129,6 +4502,15 @@ function appendQuery(path, query) {
 function storagePath(path) {
   return path;
 }
+function resolveStorageEndpointPath(endpoint, runtimeOptions) {
+  if (!runtimeOptions?.stripBasePath) {
+    return endpoint;
+  }
+  const [pathname, queryText] = String(endpoint).split("?", 2);
+  const trimmedPathname = pathname.startsWith("/storage/") ? pathname.slice("/storage".length) : pathname === "/storage" ? "/" : pathname;
+  const resolvedPath = trimmedPathname.startsWith("/") ? trimmedPathname : `/${trimmedPathname}`;
+  return storagePath(queryText ? `${resolvedPath}?${queryText}` : resolvedPath);
+}
 function withPathParam(path, name, value) {
   return path.replace(`{${name}}`, encodeURIComponent(value));
 }
@@ -4167,8 +4549,8 @@ async function callStorageEndpoint(gateway, endpoint, method, envelope, payload,
   let url;
   let headers;
   try {
-    const baseUrl = options?.baseUrl ? normalizeAthenaGatewayBaseUrl(options.baseUrl) : gateway.baseUrl;
-    url = buildAthenaGatewayUrl(baseUrl, endpoint);
+    const baseUrl = options?.baseUrl ? normalizeAthenaGatewayBaseUrl(options.baseUrl) : runtimeOptions?.baseUrl ? normalizeAthenaGatewayBaseUrl(runtimeOptions.baseUrl) : gateway.baseUrl;
+    url = buildAthenaGatewayUrl(baseUrl, resolveStorageEndpointPath(endpoint, runtimeOptions));
     headers = gateway.buildHeaders(options);
   } catch (error) {
     return rejectStorageError(
@@ -4292,8 +4674,8 @@ async function callStorageBinaryEndpoint(gateway, endpoint, method, options, run
   let url;
   let headers;
   try {
-    const baseUrl = options?.baseUrl ? normalizeAthenaGatewayBaseUrl(options.baseUrl) : gateway.baseUrl;
-    url = buildAthenaGatewayUrl(baseUrl, endpoint);
+    const baseUrl = options?.baseUrl ? normalizeAthenaGatewayBaseUrl(options.baseUrl) : runtimeOptions?.baseUrl ? normalizeAthenaGatewayBaseUrl(runtimeOptions.baseUrl) : gateway.baseUrl;
+    url = buildAthenaGatewayUrl(baseUrl, resolveStorageEndpointPath(endpoint, runtimeOptions));
     headers = gateway.buildHeaders(options);
   } catch (error) {
     return rejectStorageError(
@@ -4454,8 +4836,8 @@ async function callStorageUploadBinaryEndpoint(gateway, endpoint, body, options,
   let url;
   let headers;
   try {
-    const baseUrl = options?.baseUrl ? normalizeAthenaGatewayBaseUrl(options.baseUrl) : gateway.baseUrl;
-    url = buildAthenaGatewayUrl(baseUrl, endpoint);
+    const baseUrl = options?.baseUrl ? normalizeAthenaGatewayBaseUrl(options.baseUrl) : runtimeOptions?.baseUrl ? normalizeAthenaGatewayBaseUrl(runtimeOptions.baseUrl) : gateway.baseUrl;
+    url = buildAthenaGatewayUrl(baseUrl, resolveStorageEndpointPath(endpoint, runtimeOptions));
     headers = gateway.buildHeaders(options);
   } catch (error) {
     return rejectStorageError(
@@ -4579,6 +4961,7 @@ async function callStorageUploadBinaryEndpoint(gateway, endpoint, body, options,
   return parsedBody.parsed.data;
 }
 function createStorageModule(gateway, runtimeOptions) {
+  const resolvedRuntimeOptions = runtimeOptions;
   const callRaw = (path, method, payload, options) => callStorageEndpoint(
     gateway,
     storagePath(path),
@@ -4586,7 +4969,7 @@ function createStorageModule(gateway, runtimeOptions) {
     "raw",
     payload,
     options,
-    runtimeOptions
+    resolvedRuntimeOptions
   );
   const callAthena2 = (path, method, payload, options) => callStorageEndpoint(
     gateway,
@@ -4595,7 +4978,7 @@ function createStorageModule(gateway, runtimeOptions) {
     "athena",
     payload,
     options,
-    runtimeOptions
+    resolvedRuntimeOptions
   );
   const base = {
     listStorageCatalogs(options) {
@@ -4637,7 +5020,7 @@ function createStorageModule(gateway, runtimeOptions) {
         withPathParam("/storage/files/{file_id}/proxy", "file_id", fileId),
         query
       );
-      return callStorageBinaryEndpoint(gateway, storagePath(path), "GET", options, runtimeOptions);
+      return callStorageBinaryEndpoint(gateway, storagePath(path), "GET", options, resolvedRuntimeOptions);
     },
     updateStorageFile(fileId, input, options) {
       return callAthena2(withPathParam("/storage/files/{file_id}", "file_id", fileId), "PATCH", input, options);
@@ -4684,7 +5067,7 @@ function createStorageModule(gateway, runtimeOptions) {
         storagePath(withPathParam("/storage/files/{file_id}/upload", "file_id", fileId)),
         body,
         options,
-        runtimeOptions
+        resolvedRuntimeOptions
       );
     },
     search(input, options) {
@@ -4880,6 +5263,13 @@ function createStorageModule(gateway, runtimeOptions) {
   };
 }
 
+// src/client-builder.ts
+var DEFAULT_BACKEND = { type: "athena" };
+function toBackendConfig(value) {
+  if (!value) return DEFAULT_BACKEND;
+  return typeof value === "string" ? { type: value } : value;
+}
+
 // src/query-ast.ts
 var UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
 var FILTER_OPERATORS = /* @__PURE__ */ new Set([
@@ -5502,20 +5892,437 @@ function createSelectTransportPlan(input) {
   };
 }
 
+// src/query-debug-ast.ts
+var ATHENA_DEBUG_AST_KEY = "__athenaDebugAst";
+function cloneConditions(conditions) {
+  return conditions.map((condition) => ({ ...condition }));
+}
+function cloneTableBuilderStateAst(state) {
+  return {
+    conditions: cloneConditions(state.conditions),
+    limit: state.limit,
+    offset: state.offset,
+    order: state.order ? { ...state.order } : void 0,
+    currentPage: state.currentPage,
+    pageSize: state.pageSize,
+    totalPages: state.totalPages
+  };
+}
+function cloneRpcBuilderStateAst(state) {
+  return {
+    filters: state.filters.map((filter) => ({ ...filter })),
+    limit: state.limit,
+    offset: state.offset,
+    order: state.order ? { ...state.order } : void 0
+  };
+}
+function toSelectTransportAst(plan) {
+  if (plan.kind === "query") {
+    return {
+      mode: "typed-query",
+      endpoint: "/gateway/query",
+      payload: plan.payload
+    };
+  }
+  return {
+    mode: plan.payload.select !== void 0 ? "structured-fetch" : "compiled-fetch",
+    endpoint: "/gateway/fetch",
+    payload: plan.payload
+  };
+}
+function resolveDebugTableName(tableName) {
+  return tableName ?? "__unknown_table__";
+}
+function buildSelectDebugAst(input) {
+  return {
+    version: 1,
+    kind: "select",
+    tableName: input.tableName,
+    input: {
+      columns: input.columns,
+      state: cloneTableBuilderStateAst(input.state)
+    },
+    transport: toSelectTransportAst(input.plan)
+  };
+}
+function buildFindManyCompiledDebugAst(input) {
+  return {
+    version: 1,
+    kind: "findMany",
+    tableName: input.tableName,
+    input: {
+      select: input.options.select,
+      where: input.options.where,
+      orderBy: input.options.orderBy,
+      limit: input.options.limit
+    },
+    compiled: {
+      columns: input.compiledColumns,
+      baseState: cloneTableBuilderStateAst(input.baseState),
+      executionState: cloneTableBuilderStateAst(input.executionState)
+    },
+    transport: planToFindManyTransport(input.plan)
+  };
+}
+function buildFindManyDirectDebugAst(input) {
+  return {
+    version: 1,
+    kind: "findMany",
+    tableName: input.tableName,
+    input: {
+      select: input.options.select,
+      where: input.options.where,
+      orderBy: input.options.orderBy,
+      limit: input.options.limit
+    },
+    compiled: {
+      columns: input.compiledColumns,
+      baseState: cloneTableBuilderStateAst(input.baseState),
+      executionState: cloneTableBuilderStateAst(input.executionState)
+    },
+    transport: {
+      mode: "direct-ast-fetch",
+      endpoint: "/gateway/fetch",
+      payload: input.payload
+    }
+  };
+}
+function planToFindManyTransport(plan) {
+  if (plan.kind === "query") {
+    return {
+      mode: "compiled-query",
+      endpoint: "/gateway/query",
+      payload: plan.payload
+    };
+  }
+  return {
+    mode: plan.payload.select !== void 0 ? "structured-fetch" : "compiled-fetch",
+    endpoint: "/gateway/fetch",
+    payload: plan.payload
+  };
+}
+function buildInsertDebugAst(payload) {
+  return {
+    version: 1,
+    kind: "insert",
+    tableName: payload.table_name,
+    input: {
+      values: payload.insert_body,
+      returning: payload.columns,
+      count: payload.count,
+      head: payload.head,
+      defaultToNull: payload.default_to_null
+    },
+    transport: {
+      mode: "insert",
+      endpoint: "/gateway/insert",
+      payload
+    }
+  };
+}
+function buildUpsertDebugAst(payload) {
+  return {
+    version: 1,
+    kind: "upsert",
+    tableName: payload.table_name,
+    input: {
+      values: payload.insert_body,
+      updateBody: payload.update_body,
+      onConflict: payload.on_conflict,
+      returning: payload.columns,
+      count: payload.count,
+      head: payload.head,
+      defaultToNull: payload.default_to_null
+    },
+    transport: {
+      mode: "upsert",
+      endpoint: "/gateway/insert",
+      payload
+    }
+  };
+}
+function buildUpdateDebugAst(input) {
+  return {
+    version: 1,
+    kind: "update",
+    tableName: resolveDebugTableName(input.payload.table_name),
+    input: {
+      values: input.payload.set,
+      state: cloneTableBuilderStateAst(input.state),
+      returning: input.payload.columns
+    },
+    transport: {
+      mode: "update",
+      endpoint: "/gateway/update",
+      payload: input.payload
+    }
+  };
+}
+function buildDeleteDebugAst(input) {
+  return {
+    version: 1,
+    kind: "delete",
+    tableName: input.payload.table_name,
+    input: {
+      resourceId: input.payload.resource_id,
+      state: cloneTableBuilderStateAst(input.state),
+      returning: input.payload.columns
+    },
+    transport: {
+      mode: "delete",
+      endpoint: "/gateway/delete",
+      payload: input.payload
+    }
+  };
+}
+function buildRpcDebugAst(input) {
+  return {
+    version: 1,
+    kind: "rpc",
+    functionName: input.functionName,
+    input: {
+      args: input.args,
+      select: input.selectedColumns,
+      state: cloneRpcBuilderStateAst(input.state)
+    },
+    transport: {
+      mode: input.endpoint === "/gateway/rpc" ? "rpc-post" : "rpc-get",
+      endpoint: input.endpoint,
+      payload: input.payload
+    }
+  };
+}
+function buildRawQueryDebugAst(query) {
+  return {
+    version: 1,
+    kind: "query",
+    input: {
+      query
+    },
+    transport: {
+      mode: "raw-query",
+      endpoint: "/gateway/query",
+      payload: {
+        query
+      }
+    }
+  };
+}
+function attachAthenaDebugAst(target, ast) {
+  if (!ast) {
+    return;
+  }
+  if (!target || typeof target !== "object" && typeof target !== "function") {
+    return;
+  }
+  Object.defineProperty(target, ATHENA_DEBUG_AST_KEY, {
+    value: ast,
+    enumerable: false,
+    configurable: true,
+    writable: false
+  });
+}
+
+// src/query-tracing.ts
+var QUERY_TRACE_STACK_SKIP_PATTERNS = [
+  "src\\client.ts",
+  "src/client.ts",
+  "src\\query-tracing.ts",
+  "src/query-tracing.ts",
+  "dist\\client.",
+  "dist/client.",
+  "dist\\query-tracing.",
+  "dist/query-tracing.",
+  "node_modules\\@xylex-group\\athena",
+  "node_modules/@xylex-group/athena",
+  "node:internal",
+  "internal/process"
+];
+function parseQueryTraceCallsiteFrame(frame) {
+  const trimmed = frame.trim();
+  if (!trimmed) {
+    return null;
+  }
+  let body = trimmed.replace(/^at\s+/, "");
+  if (body.startsWith("async ")) {
+    body = body.slice(6);
+  }
+  let functionName;
+  let location = body;
+  const wrappedMatch = body.match(/^(.*?)\s+\((.*)\)$/);
+  if (wrappedMatch) {
+    functionName = wrappedMatch[1].trim() || void 0;
+    location = wrappedMatch[2].trim();
+  }
+  const locationMatch = location.match(/^(.*):(\d+):(\d+)$/);
+  if (!locationMatch) {
+    return null;
+  }
+  const filePath = locationMatch[1].replace(/^file:\/\//, "");
+  const line = Number(locationMatch[2]);
+  const column = Number(locationMatch[3]);
+  if (!Number.isFinite(line) || !Number.isFinite(column)) {
+    return null;
+  }
+  const normalizedPath = filePath.replace(/\\/g, "/");
+  const fileName = normalizedPath.split("/").at(-1) ?? filePath;
+  return {
+    filePath,
+    fileName,
+    line,
+    column,
+    frame: trimmed,
+    functionName
+  };
+}
+function captureQueryTraceCallsite() {
+  const stack = new Error().stack;
+  if (!stack) return null;
+  const frames = stack.split("\n").slice(2).map((frame) => frame.trim()).filter(Boolean);
+  for (const frame of frames) {
+    if (QUERY_TRACE_STACK_SKIP_PATTERNS.some((pattern) => frame.includes(pattern))) {
+      continue;
+    }
+    const callsite = parseQueryTraceCallsiteFrame(frame);
+    if (callsite) return callsite;
+  }
+  const fallback = frames.find((frame) => !frame.includes("captureQueryTraceCallsite"));
+  return fallback ? parseQueryTraceCallsiteFrame(fallback) : null;
+}
+function defaultQueryTraceLogger(event) {
+  const target = event.table ?? event.functionName ?? "gateway";
+  const outcomeState = event.outcome?.error ? "error" : "ok";
+  const banner = `[athena-js][trace] ${event.operation.toUpperCase()} ${event.endpoint} ${target} ${event.durationMs}ms ${outcomeState}`;
+  console.info(banner, event);
+}
+function captureTraceCallsite(tracer) {
+  return tracer?.captureCallsite() ?? null;
+}
+function createTraceCallsiteStore(tracer, initialCallsite) {
+  let storedCallsite = initialCallsite ?? void 0;
+  return {
+    resolve(callsite) {
+      if (callsite) {
+        storedCallsite = callsite;
+        return callsite;
+      }
+      if (storedCallsite !== void 0) {
+        return storedCallsite;
+      }
+      const capturedCallsite = captureTraceCallsite(tracer);
+      if (capturedCallsite) {
+        storedCallsite = capturedCallsite;
+      }
+      return capturedCallsite;
+    }
+  };
+}
+function createQueryTracer(experimental) {
+  const traceOption = experimental?.traceQueries;
+  if (!traceOption) {
+    return void 0;
+  }
+  const logger = typeof traceOption === "object" && traceOption.logger ? traceOption.logger : defaultQueryTraceLogger;
+  const emit = (event) => {
+    try {
+      logger(event);
+    } catch (error) {
+      console.warn("[athena-js][trace] logger failed", error);
+    }
+  };
+  return {
+    captureCallsite: captureQueryTraceCallsite,
+    publishSuccess(context, result, durationMs, callsite) {
+      emit({
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        durationMs,
+        operation: context.operation,
+        endpoint: context.endpoint,
+        table: context.table,
+        functionName: context.functionName,
+        sql: context.sql,
+        payload: context.payload,
+        ast: context.ast,
+        options: context.options,
+        callsite,
+        outcome: {
+          status: result.status,
+          error: result.error,
+          errorDetails: result.errorDetails ?? null,
+          count: result.count ?? null,
+          data: result.data,
+          raw: result.raw
+        }
+      });
+    },
+    publishFailure(context, error, durationMs, callsite) {
+      emit({
+        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+        durationMs,
+        operation: context.operation,
+        endpoint: context.endpoint,
+        table: context.table,
+        functionName: context.functionName,
+        sql: context.sql,
+        payload: context.payload,
+        ast: context.ast,
+        options: context.options,
+        callsite,
+        thrownError: error
+      });
+    }
+  };
+}
+async function executeWithQueryTrace(tracer, context, runner, callsiteOverride) {
+  const callsite = tracer ? callsiteOverride ?? tracer.captureCallsite() : null;
+  const startedAt = tracer ? Date.now() : 0;
+  try {
+    const result = await runner();
+    attachAthenaDebugAst(result, context.ast);
+    if (tracer) {
+      tracer.publishSuccess(context, result, Date.now() - startedAt, callsite);
+    }
+    return result;
+  } catch (error) {
+    attachAthenaDebugAst(error, context.ast);
+    if (tracer) {
+      tracer.publishFailure(context, error, Date.now() - startedAt, callsite);
+    }
+    throw error;
+  }
+}
+
+// src/schema/model-target.ts
+function normalizeOptionalName(value) {
+  const normalized = value?.trim();
+  return normalized ? normalized : void 0;
+}
+function isAthenaModelTarget(value) {
+  if (!value || typeof value !== "object") {
+    return false;
+  }
+  const candidate = value;
+  return Boolean(candidate.meta && Array.isArray(candidate.meta.primaryKey));
+}
+function resolveAthenaModelTargetTableName(target, options = {}) {
+  const explicitTableName = normalizeOptionalName(target.meta.tableName);
+  if (explicitTableName) {
+    return explicitTableName;
+  }
+  const schemaName = normalizeOptionalName(target.meta.schema ?? options.fallbackSchema);
+  const modelName = normalizeOptionalName(target.meta.model ?? options.fallbackModel);
+  if (!modelName) {
+    throw new Error(
+      "Athena model target is missing meta.model or meta.tableName. Provide one of those before calling from(model)."
+    );
+  }
+  return schemaName ? `${schemaName}.${modelName}` : modelName;
+}
+
 // src/client.ts
 var DEFAULT_COLUMNS = "*";
 var SAFE_CAST_PATTERN = /^[a-z_][a-z0-9_]*(?:\[\])?$/i;
 var ATHENA_NORMALIZED_ERROR_KEY = "__athenaNormalizedError";
-var QUERY_TRACE_STACK_SKIP_PATTERNS = [
-  "src\\client.ts",
-  "src/client.ts",
-  "dist\\client.",
-  "dist/client.",
-  "node_modules\\@xylex-group\\athena",
-  "node_modules/@xylex-group/athena",
-  "node:internal",
-  "internal/process"
-];
 function formatResult(response) {
   const result = {
     data: response.data ?? null,
@@ -5657,154 +6464,6 @@ function createResultError(response, result, normalized) {
     raw: result.raw
   };
 }
-function parseQueryTraceCallsiteFrame(frame) {
-  const trimmed = frame.trim();
-  if (!trimmed) {
-    return null;
-  }
-  let body = trimmed.replace(/^at\s+/, "");
-  if (body.startsWith("async ")) {
-    body = body.slice(6);
-  }
-  let functionName;
-  let location = body;
-  const wrappedMatch = body.match(/^(.*?)\s+\((.*)\)$/);
-  if (wrappedMatch) {
-    functionName = wrappedMatch[1].trim() || void 0;
-    location = wrappedMatch[2].trim();
-  }
-  const locationMatch = location.match(/^(.*):(\d+):(\d+)$/);
-  if (!locationMatch) {
-    return null;
-  }
-  const filePath = locationMatch[1].replace(/^file:\/\//, "");
-  const line = Number(locationMatch[2]);
-  const column = Number(locationMatch[3]);
-  if (!Number.isFinite(line) || !Number.isFinite(column)) {
-    return null;
-  }
-  const normalizedPath = filePath.replace(/\\/g, "/");
-  const fileName = normalizedPath.split("/").at(-1) ?? filePath;
-  return {
-    filePath,
-    fileName,
-    line,
-    column,
-    frame: trimmed,
-    functionName
-  };
-}
-function captureQueryTraceCallsite() {
-  const stack = new Error().stack;
-  if (!stack) return null;
-  const frames = stack.split("\n").slice(2).map((frame) => frame.trim()).filter(Boolean);
-  for (const frame of frames) {
-    if (QUERY_TRACE_STACK_SKIP_PATTERNS.some((pattern) => frame.includes(pattern))) {
-      continue;
-    }
-    const callsite = parseQueryTraceCallsiteFrame(frame);
-    if (callsite) return callsite;
-  }
-  const fallback = frames.find((frame) => !frame.includes("captureQueryTraceCallsite"));
-  return fallback ? parseQueryTraceCallsiteFrame(fallback) : null;
-}
-function defaultQueryTraceLogger(event) {
-  const target = event.table ?? event.functionName ?? "gateway";
-  const outcomeState = event.outcome?.error ? "error" : "ok";
-  const banner = `[athena-js][trace] ${event.operation.toUpperCase()} ${event.endpoint} ${target} ${event.durationMs}ms ${outcomeState}`;
-  console.info(banner, event);
-}
-function captureTraceCallsite(tracer) {
-  return tracer?.captureCallsite() ?? null;
-}
-function createTraceCallsiteStore(tracer, initialCallsite) {
-  let storedCallsite = initialCallsite ?? void 0;
-  return {
-    resolve(callsite) {
-      if (callsite) {
-        storedCallsite = callsite;
-        return callsite;
-      }
-      if (storedCallsite !== void 0) {
-        return storedCallsite;
-      }
-      const capturedCallsite = captureTraceCallsite(tracer);
-      if (capturedCallsite) {
-        storedCallsite = capturedCallsite;
-      }
-      return capturedCallsite;
-    }
-  };
-}
-function createQueryTracer(experimental) {
-  const traceOption = experimental?.traceQueries;
-  if (!traceOption) {
-    return void 0;
-  }
-  const logger = typeof traceOption === "object" && traceOption.logger ? traceOption.logger : defaultQueryTraceLogger;
-  const emit = (event) => {
-    try {
-      logger(event);
-    } catch (error) {
-      console.warn("[athena-js][trace] logger failed", error);
-    }
-  };
-  return {
-    captureCallsite: captureQueryTraceCallsite,
-    publishSuccess(context, result, durationMs, callsite) {
-      emit({
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        durationMs,
-        operation: context.operation,
-        endpoint: context.endpoint,
-        table: context.table,
-        functionName: context.functionName,
-        sql: context.sql,
-        payload: context.payload,
-        options: context.options,
-        callsite,
-        outcome: {
-          status: result.status,
-          error: result.error,
-          errorDetails: result.errorDetails ?? null,
-          count: result.count ?? null,
-          data: result.data,
-          raw: result.raw
-        }
-      });
-    },
-    publishFailure(context, error, durationMs, callsite) {
-      emit({
-        timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-        durationMs,
-        operation: context.operation,
-        endpoint: context.endpoint,
-        table: context.table,
-        functionName: context.functionName,
-        sql: context.sql,
-        payload: context.payload,
-        options: context.options,
-        callsite,
-        thrownError: error
-      });
-    }
-  };
-}
-async function executeWithQueryTrace(tracer, context, runner, callsiteOverride) {
-  if (!tracer) {
-    return runner();
-  }
-  const callsite = callsiteOverride ?? tracer.captureCallsite();
-  const startedAt = Date.now();
-  try {
-    const result = await runner();
-    tracer.publishSuccess(context, result, Date.now() - startedAt, callsite);
-    return result;
-  } catch (error) {
-    tracer.publishFailure(context, error, Date.now() - startedAt, callsite);
-    throw error;
-  }
-}
 function toSingleResult(response) {
   const payload = response.data;
   const singleData = Array.isArray(payload) ? payload.length ? payload[0] : null : payload ?? null;
@@ -5832,6 +6491,15 @@ function asAthenaJsonObject(value) {
 function asAthenaJsonObjectArray(values) {
   return values;
 }
+function normalizeSelectColumnsInput(columns) {
+  if (columns === void 0) {
+    return void 0;
+  }
+  if (typeof columns === "string") {
+    return columns;
+  }
+  return [...columns];
+}
 function createMutationQuery(executor, defaultColumns = DEFAULT_COLUMNS, tracer, initialCallsite) {
   let selectedColumns = defaultColumns === null ? void 0 : defaultColumns;
   let selectedOptions;
@@ -5841,25 +6509,29 @@ function createMutationQuery(executor, defaultColumns = DEFAULT_COLUMNS, tracer,
     const payloadColumns = columns ?? selectedColumns;
     const payloadOptions = options ?? selectedOptions;
     if (!promise) {
-      promise = executor(payloadColumns, payloadOptions, callsiteStore.resolve(callsite));
+      promise = executor(
+        normalizeSelectColumnsInput(payloadColumns),
+        payloadOptions,
+        callsiteStore.resolve(callsite)
+      );
     }
     return promise;
   };
   const mutationQuery = {
-    select(columns = selectedColumns, options) {
+    select(columns, options) {
       selectedColumns = columns;
       selectedOptions = options ?? selectedOptions;
       return run(columns, options, captureTraceCallsite(tracer));
     },
-    returning(columns = selectedColumns, options) {
+    returning(columns, options) {
       return mutationQuery.select(columns, options);
     },
-    single(columns = selectedColumns, options) {
+    single(columns, options) {
       selectedColumns = columns;
       selectedOptions = options ?? selectedOptions;
       return run(columns, options, captureTraceCallsite(tracer)).then(toSingleResult);
     },
-    maybeSingle(columns = selectedColumns, options) {
+    maybeSingle(columns, options) {
       return mutationQuery.single(columns, options);
     },
     then(onfulfilled, onrejected) {
@@ -6416,7 +7088,10 @@ function createFilterMethods(state, addCondition, self) {
 }
 function toRpcSelect(columns) {
   if (!columns) return void 0;
-  return Array.isArray(columns) ? columns.join(",") : columns;
+  if (typeof columns === "string") {
+    return columns;
+  }
+  return columns.join(",");
 }
 function createRpcFilterMethods(filters, self) {
   const addFilter = (operator, column, value) => {
@@ -6465,7 +7140,7 @@ function createRpcFilterMethods(filters, self) {
     }
   };
 }
-function createRpcBuilder(functionName, args, baseOptions, client, formatGatewayResult, tracer, initialCallsite) {
+function createRpcBuilder(functionName, args, baseOptions, client, formatGatewayResult, tracer, initialCallsite, debugAstEnabled = false) {
   const state = {
     filters: []
   };
@@ -6475,6 +7150,7 @@ function createRpcBuilder(functionName, args, baseOptions, client, formatGateway
   const callsiteStore = createTraceCallsiteStore(tracer, initialCallsite);
   const executeRpc = async (columns, options, callsite) => {
     const mergedOptions = mergeOptions(baseOptions, options);
+    const normalizedSelectedColumns = normalizeSelectColumnsInput(columns);
     const payload = {
       function: functionName,
       args,
@@ -6489,6 +7165,14 @@ function createRpcBuilder(functionName, args, baseOptions, client, formatGateway
     };
     const endpoint = mergedOptions?.get ? `/rpc/${functionName}` : "/gateway/rpc";
     const sql = buildRpcDebugSql(payload);
+    const debugAst = debugAstEnabled ? buildRpcDebugAst({
+      functionName,
+      args,
+      selectedColumns: normalizedSelectedColumns,
+      state,
+      payload,
+      endpoint
+    }) : void 0;
     return executeWithQueryTrace(
       tracer,
       {
@@ -6497,6 +7181,7 @@ function createRpcBuilder(functionName, args, baseOptions, client, formatGateway
         functionName,
         sql,
         payload,
+        ast: debugAst,
         options: mergedOptions
       },
       async () => {
@@ -6517,7 +7202,7 @@ function createRpcBuilder(functionName, args, baseOptions, client, formatGateway
   const builder = {};
   const filterMethods = createRpcFilterMethods(state.filters, builder);
   Object.assign(builder, filterMethods, {
-    select(columns = selectedColumns, options) {
+    select(columns, options) {
       selectedColumns = columns;
       selectedOptions = options ?? selectedOptions;
       return run(columns, options, captureTraceCallsite(tracer));
@@ -6562,6 +7247,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
   const state = {
     conditions: []
   };
+  const debugAstEnabled = Boolean(experimental?.debugAst);
   const addCondition = (operator, column, value, hints) => {
     const condition = { operator };
     if (column) {
@@ -6605,15 +7291,27 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
     addCondition,
     builder
   );
-  const runSelect = async (columns = DEFAULT_COLUMNS, options, executionState = snapshotState(), callsite) => {
+  const runSelect = async (columns = DEFAULT_COLUMNS, options, executionState = snapshotState(), callsite, debugAstFactory) => {
+    const runtimeColumns = normalizeSelectColumnsInput(columns) ?? DEFAULT_COLUMNS;
     const resolvedTableName = resolveTableNameForCall(tableName, options?.schema);
     const plan = createSelectTransportPlan({
       tableName: resolvedTableName,
-      columns,
+      columns: runtimeColumns,
       state: executionState,
       options,
       buildTypedSelectQuery
     });
+    const debugAst = debugAstEnabled ? debugAstFactory?.({
+      tableName: resolvedTableName,
+      columns: runtimeColumns,
+      executionState,
+      plan
+    }) ?? buildSelectDebugAst({
+      tableName: resolvedTableName,
+      columns: runtimeColumns,
+      state: executionState,
+      plan
+    }) : void 0;
     if (plan.kind === "query") {
       return executeExperimentalRead(
         experimental,
@@ -6625,6 +7323,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
             table: resolvedTableName,
             sql: plan.query,
             payload: plan.payload,
+            ast: debugAst,
             options
           },
           async () => {
@@ -6649,6 +7348,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
           table: resolvedTableName,
           sql,
           payload: plan.payload,
+          ast: debugAst,
           options
         },
         async () => {
@@ -6662,7 +7362,11 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
   const createSelectChain = (columns, options, initialCallsite) => {
     const chain = {};
     const callsiteStore = createTraceCallsiteStore(tracer, initialCallsite);
-    const filterMethods2 = createFilterMethods(state, addCondition, chain);
+    const filterMethods2 = createFilterMethods(
+      state,
+      addCondition,
+      chain
+    );
     Object.assign(chain, filterMethods2, {
       async single(cols, opts) {
         const r = await runSelect(
@@ -6749,6 +7453,14 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
           limit: executionState.limit,
           order: executionState.order
         });
+        const debugAst = debugAstEnabled ? buildFindManyDirectDebugAst({
+          tableName: resolvedTableName,
+          options,
+          compiledColumns: columns,
+          baseState,
+          executionState,
+          payload
+        }) : void 0;
         return executeExperimentalRead(
           experimental,
           () => executeWithQueryTrace(
@@ -6758,7 +7470,8 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
               endpoint: "/gateway/fetch",
               table: resolvedTableName,
               sql,
-              payload
+              payload,
+              ast: debugAst
             },
             async () => {
               const response = await client.fetchGateway(
@@ -6774,7 +7487,15 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
         columns,
         void 0,
         executionState,
-        callsite
+        callsite,
+        debugAstEnabled ? ({ tableName: resolvedTableName, executionState: tracedState, plan }) => buildFindManyCompiledDebugAst({
+          tableName: resolvedTableName,
+          options,
+          compiledColumns: columns,
+          baseState,
+          executionState: tracedState,
+          plan
+        }) : void 0
       );
     },
     insert(values, options) {
@@ -6794,6 +7515,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
             payload.default_to_null = mergedOptions.defaultToNull;
           }
           const sql = buildInsertDebugSql(payload);
+          const debugAst = debugAstEnabled ? buildInsertDebugAst(payload) : void 0;
           return executeWithQueryTrace(
             tracer,
             {
@@ -6802,6 +7524,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
               table: resolvedTableName,
               sql,
               payload,
+              ast: debugAst,
               options: mergedOptions
             },
             async () => {
@@ -6827,6 +7550,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
           payload.default_to_null = mergedOptions.defaultToNull;
         }
         const sql = buildInsertDebugSql(payload);
+        const debugAst = debugAstEnabled ? buildInsertDebugAst(payload) : void 0;
         return executeWithQueryTrace(
           tracer,
           {
@@ -6835,6 +7559,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
             table: resolvedTableName,
             sql,
             payload,
+            ast: debugAst,
             options: mergedOptions
           },
           async () => {
@@ -6865,6 +7590,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
             payload.default_to_null = mergedOptions.defaultToNull;
           }
           const sql = buildInsertDebugSql(payload);
+          const debugAst = debugAstEnabled ? buildUpsertDebugAst(payload) : void 0;
           return executeWithQueryTrace(
             tracer,
             {
@@ -6873,6 +7599,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
               table: resolvedTableName,
               sql,
               payload,
+              ast: debugAst,
               options: mergedOptions
             },
             async () => {
@@ -6900,6 +7627,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
           payload.default_to_null = mergedOptions.defaultToNull;
         }
         const sql = buildInsertDebugSql(payload);
+        const debugAst = debugAstEnabled ? buildUpsertDebugAst(payload) : void 0;
         return executeWithQueryTrace(
           tracer,
           {
@@ -6908,6 +7636,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
             table: resolvedTableName,
             sql,
             payload,
+            ast: debugAst,
             options: mergedOptions
           },
           async () => {
@@ -6922,7 +7651,8 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
     update(values, options) {
       const mutationCallsite = captureTraceCallsite(tracer);
       const executeUpdate = async (columns, selectOptions, callsite) => {
-        const filters = state.conditions.length ? [...state.conditions] : void 0;
+        const executionState = snapshotState();
+        const filters = executionState.conditions.length ? [...executionState.conditions] : void 0;
         const mergedOptions = mergeOptions(options, selectOptions);
         const resolvedTableName = resolveTableNameForCall(tableName, mergedOptions?.schema);
         const payload = {
@@ -6931,12 +7661,16 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
           conditions: filters,
           strip_nulls: mergedOptions?.stripNulls ?? true
         };
-        if (state.order) payload.sort_by = state.order;
-        if (state.currentPage !== void 0) payload.current_page = state.currentPage;
-        if (state.pageSize !== void 0) payload.page_size = state.pageSize;
-        if (state.totalPages !== void 0) payload.total_pages = state.totalPages;
+        if (executionState.order) payload.sort_by = executionState.order;
+        if (executionState.currentPage !== void 0) payload.current_page = executionState.currentPage;
+        if (executionState.pageSize !== void 0) payload.page_size = executionState.pageSize;
+        if (executionState.totalPages !== void 0) payload.total_pages = executionState.totalPages;
         if (columns) payload.columns = columns;
         const sql = buildUpdateDebugSql(payload);
+        const debugAst = debugAstEnabled ? buildUpdateDebugAst({
+          state: executionState,
+          payload
+        }) : void 0;
         return executeWithQueryTrace(
           tracer,
           {
@@ -6945,6 +7679,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
             table: resolvedTableName,
             sql,
             payload,
+            ast: debugAst,
             options: mergedOptions
           },
           async () => {
@@ -6968,6 +7703,11 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
       }
       const mutationCallsite = captureTraceCallsite(tracer);
       const executeDelete = async (columns, selectOptions, callsite) => {
+        const executionState = snapshotState();
+        const debugState = {
+          ...executionState,
+          conditions: filters ? filters.map((condition) => ({ ...condition })) : []
+        };
         const mergedOptions = mergeOptions(options, selectOptions);
         const resolvedTableName = resolveTableNameForCall(tableName, mergedOptions?.schema);
         const payload = {
@@ -6975,12 +7715,16 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
           resource_id: resourceId,
           conditions: filters
         };
-        if (state.order) payload.sort_by = state.order;
-        if (state.currentPage !== void 0) payload.current_page = state.currentPage;
-        if (state.pageSize !== void 0) payload.page_size = state.pageSize;
-        if (state.totalPages !== void 0) payload.total_pages = state.totalPages;
+        if (executionState.order) payload.sort_by = executionState.order;
+        if (executionState.currentPage !== void 0) payload.current_page = executionState.currentPage;
+        if (executionState.pageSize !== void 0) payload.page_size = executionState.pageSize;
+        if (executionState.totalPages !== void 0) payload.total_pages = executionState.totalPages;
         if (columns) payload.columns = columns;
         const sql = buildDeleteDebugSql(payload);
+        const debugAst = debugAstEnabled ? buildDeleteDebugAst({
+          state: debugState,
+          payload
+        }) : void 0;
         return executeWithQueryTrace(
           tracer,
           {
@@ -6989,6 +7733,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
             table: resolvedTableName,
             sql,
             payload,
+            ast: debugAst,
             options: mergedOptions
           },
           async () => {
@@ -7016,6 +7761,7 @@ function createTableBuilder(tableName, client, formatGatewayResult, tracer, expe
   return builder;
 }
 function createQueryBuilder(client, formatGatewayResult, experimental, tracer) {
+  const debugAstEnabled = Boolean(experimental?.debugAst);
   return async function query(query, options) {
     const normalizedQuery = query.trim();
     if (!normalizedQuery) {
@@ -7032,6 +7778,7 @@ function createQueryBuilder(client, formatGatewayResult, experimental, tracer) {
           endpoint: "/gateway/query",
           sql: normalizedQuery,
           payload,
+          ast: debugAstEnabled ? buildRawQueryDebugAst(normalizedQuery) : void 0,
           options
         },
         async () => {
@@ -7043,6 +7790,63 @@ function createQueryBuilder(client, formatGatewayResult, experimental, tracer) {
     );
   };
 }
+function resolveClientServiceBaseUrl(value, label) {
+  if (value === void 0 || value === null) {
+    return void 0;
+  }
+  return normalizeAthenaGatewayBaseUrl(value, { label });
+}
+function appendServicePath(baseUrl, segment) {
+  const normalizedBaseUrl = normalizeAthenaGatewayBaseUrl(baseUrl, { label: "Athena public base URL" });
+  return `${normalizedBaseUrl}/${segment.replace(/^\/+/, "")}`;
+}
+function resolveServiceUrlOverride(value, label) {
+  return resolveClientServiceBaseUrl(value, label);
+}
+function resolveServiceUrls(config) {
+  const baseUrl = resolveClientServiceBaseUrl(config.url, "Athena public base URL");
+  return {
+    dbUrl: resolveServiceUrlOverride(config.db?.url, "Athena DB base URL") ?? resolveServiceUrlOverride(config.gateway?.url, "Athena gateway base URL") ?? resolveServiceUrlOverride(config.dbUrl, "Athena DB base URL") ?? resolveServiceUrlOverride(config.gatewayUrl, "Athena gateway base URL") ?? (baseUrl ? appendServicePath(baseUrl, "db") : void 0),
+    authUrl: resolveServiceUrlOverride(config.auth?.url, "Athena auth base URL") ?? resolveServiceUrlOverride(config.auth?.baseUrl, "Athena auth base URL") ?? resolveServiceUrlOverride(config.authUrl, "Athena auth base URL") ?? (baseUrl ? appendServicePath(baseUrl, "auth") : void 0),
+    storageUrl: resolveServiceUrlOverride(config.storage?.url, "Athena storage base URL") ?? resolveServiceUrlOverride(config.storageUrl, "Athena storage base URL") ?? (baseUrl ? appendServicePath(baseUrl, "storage") : void 0)
+  };
+}
+function normalizeAuthClientConfig(auth, defaultBaseUrl) {
+  if (!auth && defaultBaseUrl === void 0) {
+    return void 0;
+  }
+  const { url, ...rest } = auth ?? {};
+  const normalized = {
+    ...rest
+  };
+  const resolvedBaseUrl = resolveClientServiceBaseUrl(
+    url ?? rest.baseUrl ?? defaultBaseUrl,
+    "Athena auth base URL"
+  );
+  if (resolvedBaseUrl !== void 0) {
+    normalized.baseUrl = resolvedBaseUrl;
+  }
+  return normalized;
+}
+function resolveCreateClientConfig(config) {
+  const resolvedUrls = resolveServiceUrls(config);
+  if (!resolvedUrls.dbUrl) {
+    throw new Error(
+      "Athena DB base URL is required. Pass createClient(url, key) for a unified root, or set db.url / gateway.url / gatewayUrl explicitly."
+    );
+  }
+  return {
+    baseUrl: resolvedUrls.dbUrl,
+    apiKey: config.key,
+    client: config.client,
+    backend: toBackendConfig(config.backend),
+    headers: config.headers,
+    auth: config.auth,
+    authUrl: resolvedUrls.authUrl,
+    storageUrl: resolvedUrls.storageUrl,
+    experimental: config.experimental
+  };
+}
 function createClientFromConfig(config) {
   const gatewayHeaders = {
     ...config.headers ?? {}
@@ -7057,16 +7861,33 @@ function createClientFromConfig(config) {
     backend: config.backend,
     headers: gatewayHeaders
   });
-  const formatGatewayResult = createResultFormatter();
+  const formatGatewayResult = createResultFormatter(config.experimental);
   const queryTracer = createQueryTracer(config.experimental);
-  const auth = createAuthClient(config.auth);
-  const from = (table, options) => createTableBuilder(
-    resolveTableNameForCall(table, options?.schema),
-    gateway,
-    formatGatewayResult,
-    queryTracer,
-    config.experimental
-  );
+  const auth = createAuthClient(normalizeAuthClientConfig(config.auth, config.authUrl));
+  function from(tableOrModel, options) {
+    if (isAthenaModelTarget(tableOrModel)) {
+      if (options?.schema !== void 0) {
+        throw new Error(
+          "from(model) does not accept a schema override because the model already defines its target."
+        );
+      }
+      return createTableBuilder(
+        resolveAthenaModelTargetTableName(tableOrModel),
+        gateway,
+        formatGatewayResult,
+        queryTracer,
+        config.experimental
+      );
+    }
+    const resolvedTableName = resolveTableNameForCall(tableOrModel, options?.schema);
+    return createTableBuilder(
+      resolvedTableName,
+      gateway,
+      formatGatewayResult,
+      queryTracer,
+      config.experimental
+    );
+  }
   const rpc = (fn, args, options) => {
     const normalizedFn = fn.trim();
     if (!normalizedFn) {
@@ -7079,10 +7900,16 @@ function createClientFromConfig(config) {
       gateway,
       formatGatewayResult,
       queryTracer,
-      captureTraceCallsite(queryTracer)
+      captureTraceCallsite(queryTracer),
+      Boolean(config.experimental?.debugAst)
     );
   };
-  const query = createQueryBuilder(gateway, formatGatewayResult, config.experimental, queryTracer);
+  const query = createQueryBuilder(
+    gateway,
+    formatGatewayResult,
+    config.experimental,
+    queryTracer
+  );
   const db = createDbModule({ from, rpc, query });
   const sdkClient = {
     from,
@@ -7095,27 +7922,27 @@ function createClientFromConfig(config) {
   if (config.experimental?.athenaStorageBackend) {
     const storageClient = {
       ...sdkClient,
-      storage: createStorageModule(gateway, config.experimental.storage)
+      storage: createStorageModule(gateway, {
+        ...config.experimental.storage,
+        ...config.storageUrl ? {
+          baseUrl: config.storageUrl,
+          stripBasePath: true
+        } : {}
+      })
     };
     return storageClient;
   }
   return sdkClient;
 }
-var DEFAULT_BACKEND = { type: "athena" };
-function toBackendConfig(b) {
-  if (!b) return DEFAULT_BACKEND;
-  return typeof b === "string" ? { type: b } : b;
-}
-function createClient(url, apiKey, options) {
-  return createClientFromConfig({
-    baseUrl: url,
-    apiKey,
-    client: options?.client,
-    backend: toBackendConfig(options?.backend),
-    headers: options?.headers,
-    auth: options?.auth,
-    experimental: options?.experimental
-  });
+function createClient(configOrUrl, apiKey, options) {
+  if (typeof configOrUrl === "string") {
+    return createClientFromConfig(resolveCreateClientConfig({
+      url: configOrUrl,
+      key: apiKey ?? "",
+      ...options
+    }));
+  }
+  return createClientFromConfig(resolveCreateClientConfig(configOrUrl));
 }
 
 // src/schema/postgres-introspection-core.ts
@@ -7712,6 +8539,7 @@ function rootUsage() {
     "",
     "Examples:",
     "  athena-js generate",
+    "  DATABASE_URL=postgres://postgres:postgres@127.0.0.1:5432/app_db athena-js generate --dry-run",
     "  athena-js generate --config ./athena.config.ts --dry-run",
     "  athena-js generate --help"
   ].join("\n");
@@ -7728,8 +8556,14 @@ function generateUsage() {
     "  --dry-run        Build generated files in memory without writing them to disk",
     "  -h, --help       Show help for generate",
     "",
+    "Config resolution:",
+    "  - uses athena.config.* discovery first",
+    "  - falls back to env-only direct mode when DATABASE_URL/PG_URL is present",
+    "  - falls back to env-only gateway mode when ATHENA_URL + ATHENA_API_KEY are present",
+    "",
     "Examples:",
     "  athena-js generate",
+    "  DATABASE_URL=postgres://postgres:postgres@127.0.0.1:5432/app_db athena-js generate --dry-run",
     "  athena-js generate --config ./athena.config.ts --dry-run"
   ].join("\n");
 }