fraiseql 2.2.0 → 2.2.1

package/dist/index.d.mts

@@ -855,8 +855,14 @@ declare function Type(_config?: TypeConfig): <T extends {
 /**
  * Configuration for Query and Mutation decorators.
  */
+interface SqlSourceDispatchConfig {
+    argument: string;
+    mapping?: Record<string, string>;
+    template?: string;
+}
 interface OperationConfig {
     sqlSource?: string;
+    sqlSourceDispatch?: SqlSourceDispatchConfig;
     autoParams?: Record<string, boolean>;
     operation?: string;
     jsonbColumn?: string;
@@ -1108,34 +1114,46 @@ declare function registerTypeFields(typeName: string, fields: Field[], descripti
     crud?: boolean | string[];
     cascade?: boolean;
 }): void;
+/**
+ * Config object form for registerQuery.
+ */
+interface RegisterQueryConfig {
+    returnType: string;
+    returnsList?: boolean;
+    nullable?: boolean;
+    arguments?: ArgumentDefinition[];
+    description?: string;
+    sqlSource?: string;
+    sqlSourceDispatch?: {
+        argument: string;
+        mapping?: Record<string, string>;
+        template?: string;
+    };
+    [key: string]: unknown;
+}
 /**
  * Helper function to manually register query with full metadata.
  *
- * @param name - Query name
- * @param returnType - Return type name
- * @param returnsList - Whether query returns a list
- * @param nullable - Whether result can be null
- * @param args - Argument definitions
- * @param description - Optional query description
- * @param config - Additional configuration
+ * Accepts either the classic positional style:
+ *   registerQuery(name, returnType, returnsList, nullable, args, description?, config?)
+ *
+ * Or a compact object style:
+ *   registerQuery(name, { returnType, returnsList?, nullable?, arguments?, sqlSourceDispatch?, ... })
  *
  * @example
  * ```ts
- * registerQuery(
- *   "users",
- *   "User",
- *   true,
- *   false,
- *   [
- *     { name: "limit", type: "Int", nullable: false, default: 10 },
- *     { name: "offset", type: "Int", nullable: false, default: 0 }
- *   ],
- *   "Get list of users",
- *   { sql_source: "v_user" }
- * );
+ * registerQuery("orders", {
+ *   returnType: "Order",
+ *   returnsList: true,
+ *   sqlSourceDispatch: {
+ *     argument: "interval",
+ *     mapping: { DAY: "tf_orders_day", WEEK: "tf_orders_week" },
+ *   },
+ *   arguments: [{ name: "interval", type: "TimeInterval", nullable: false }],
+ * });
  * ```
  */
-declare function registerQuery(name: string, returnType: string, returnsList: boolean, nullable: boolean, args: ArgumentDefinition[], description?: string, config?: Record<string, unknown>): void;
+declare function registerQuery(name: string, returnTypeOrConfig: string | RegisterQueryConfig, returnsList?: boolean, nullable?: boolean, args?: ArgumentDefinition[], description?: string, config?: Record<string, unknown>): void;
 /**
  * Helper function to manually register mutation with full metadata.
  *

package/dist/index.d.ts

@@ -855,8 +855,14 @@ declare function Type(_config?: TypeConfig): <T extends {
 /**
  * Configuration for Query and Mutation decorators.
  */
+interface SqlSourceDispatchConfig {
+    argument: string;
+    mapping?: Record<string, string>;
+    template?: string;
+}
 interface OperationConfig {
     sqlSource?: string;
+    sqlSourceDispatch?: SqlSourceDispatchConfig;
     autoParams?: Record<string, boolean>;
     operation?: string;
     jsonbColumn?: string;
@@ -1108,34 +1114,46 @@ declare function registerTypeFields(typeName: string, fields: Field[], descripti
     crud?: boolean | string[];
     cascade?: boolean;
 }): void;
+/**
+ * Config object form for registerQuery.
+ */
+interface RegisterQueryConfig {
+    returnType: string;
+    returnsList?: boolean;
+    nullable?: boolean;
+    arguments?: ArgumentDefinition[];
+    description?: string;
+    sqlSource?: string;
+    sqlSourceDispatch?: {
+        argument: string;
+        mapping?: Record<string, string>;
+        template?: string;
+    };
+    [key: string]: unknown;
+}
 /**
  * Helper function to manually register query with full metadata.
  *
- * @param name - Query name
- * @param returnType - Return type name
- * @param returnsList - Whether query returns a list
- * @param nullable - Whether result can be null
- * @param args - Argument definitions
- * @param description - Optional query description
- * @param config - Additional configuration
+ * Accepts either the classic positional style:
+ *   registerQuery(name, returnType, returnsList, nullable, args, description?, config?)
+ *
+ * Or a compact object style:
+ *   registerQuery(name, { returnType, returnsList?, nullable?, arguments?, sqlSourceDispatch?, ... })
  *
  * @example
  * ```ts
- * registerQuery(
- *   "users",
- *   "User",
- *   true,
- *   false,
- *   [
- *     { name: "limit", type: "Int", nullable: false, default: 10 },
- *     { name: "offset", type: "Int", nullable: false, default: 0 }
- *   ],
- *   "Get list of users",
- *   { sql_source: "v_user" }
- * );
+ * registerQuery("orders", {
+ *   returnType: "Order",
+ *   returnsList: true,
+ *   sqlSourceDispatch: {
+ *     argument: "interval",
+ *     mapping: { DAY: "tf_orders_day", WEEK: "tf_orders_week" },
+ *   },
+ *   arguments: [{ name: "interval", type: "TimeInterval", nullable: false }],
+ * });
  * ```
  */
-declare function registerQuery(name: string, returnType: string, returnsList: boolean, nullable: boolean, args: ArgumentDefinition[], description?: string, config?: Record<string, unknown>): void;
+declare function registerQuery(name: string, returnTypeOrConfig: string | RegisterQueryConfig, returnsList?: boolean, nullable?: boolean, args?: ArgumentDefinition[], description?: string, config?: Record<string, unknown>): void;
 /**
  * Helper function to manually register mutation with full metadata.
  *

package/dist/index.js

@@ -230,6 +230,7 @@ var VALID_REST_METHODS = /* @__PURE__ */ new Set(["GET", "POST", "PUT", "PATCH",
 function normaliseConfig(config2) {
   const keyMap = {
     sqlSource: "sql_source",
+    sqlSourceDispatch: "sql_source_dispatch",
     autoParams: "auto_params",
     jsonbColumn: "jsonb_column",
     cacheTtlSeconds: "cache_ttl_seconds",
@@ -861,8 +862,53 @@ function registerTypeFields(typeName, fields, description, options) {
     generateCrudOperations(typeName, fields, options.crud, options.sqlSource, options.cascade);
   }
 }
-function registerQuery(name, returnType, returnsList, nullable, args, description, config2) {
-  SchemaRegistry.registerQuery(name, returnType, returnsList, nullable, args, description, config2);
+var SAFE_SQL_IDENT = /^[A-Za-z_][A-Za-z0-9_$]*$/;
+function registerQuery(name, returnTypeOrConfig, returnsList, nullable, args, description, config2) {
+  if (typeof returnTypeOrConfig === "object" && returnTypeOrConfig !== null) {
+    const cfg = returnTypeOrConfig;
+    const dispatch = cfg.sqlSourceDispatch;
+    if (dispatch !== void 0) {
+      if (cfg.sqlSource !== void 0) {
+        throw new Error(
+          `registerQuery('${name}'): sqlSource and sqlSourceDispatch are mutually exclusive.`
+        );
+      }
+      const dispatchArg = dispatch.argument;
+      const queryArgs = cfg.arguments ?? [];
+      const argDef = queryArgs.find((a) => a.name === dispatchArg);
+      if (argDef === void 0) {
+        throw new Error(
+          `registerQuery('${name}'): sqlSourceDispatch argument '${dispatchArg}' not found in arguments list.`
+        );
+      }
+      if (argDef.nullable) {
+        throw new Error(
+          `registerQuery('${name}'): sqlSourceDispatch argument '${dispatchArg}' must be non-nullable.`
+        );
+      }
+      if (dispatch.mapping !== void 0) {
+        for (const [key, value] of Object.entries(dispatch.mapping)) {
+          if (!SAFE_SQL_IDENT.test(value)) {
+            throw new Error(
+              `registerQuery('${name}'): sql_source_dispatch mapping value '${value}' for key '${key}' is not a safe SQL identifier.`
+            );
+          }
+        }
+      }
+    }
+    const { returnType, returnsList: rl, nullable: nl, arguments: qArgs, description: desc, ...rest } = cfg;
+    SchemaRegistry.registerQuery(
+      name,
+      returnType,
+      rl ?? false,
+      nl ?? false,
+      qArgs ?? [],
+      desc,
+      rest
+    );
+    return;
+  }
+  SchemaRegistry.registerQuery(name, returnTypeOrConfig, returnsList ?? false, nullable ?? false, args ?? [], description, config2);
 }
 function registerMutation(name, returnType, returnsList, nullable, args, description, config2) {
   SchemaRegistry.registerMutation(

package/dist/index.mjs

@@ -151,6 +151,7 @@ var VALID_REST_METHODS = /* @__PURE__ */ new Set(["GET", "POST", "PUT", "PATCH",
 function normaliseConfig(config2) {
   const keyMap = {
     sqlSource: "sql_source",
+    sqlSourceDispatch: "sql_source_dispatch",
     autoParams: "auto_params",
     jsonbColumn: "jsonb_column",
     cacheTtlSeconds: "cache_ttl_seconds",
@@ -782,8 +783,53 @@ function registerTypeFields(typeName, fields, description, options) {
     generateCrudOperations(typeName, fields, options.crud, options.sqlSource, options.cascade);
   }
 }
-function registerQuery(name, returnType, returnsList, nullable, args, description, config2) {
-  SchemaRegistry.registerQuery(name, returnType, returnsList, nullable, args, description, config2);
+var SAFE_SQL_IDENT = /^[A-Za-z_][A-Za-z0-9_$]*$/;
+function registerQuery(name, returnTypeOrConfig, returnsList, nullable, args, description, config2) {
+  if (typeof returnTypeOrConfig === "object" && returnTypeOrConfig !== null) {
+    const cfg = returnTypeOrConfig;
+    const dispatch = cfg.sqlSourceDispatch;
+    if (dispatch !== void 0) {
+      if (cfg.sqlSource !== void 0) {
+        throw new Error(
+          `registerQuery('${name}'): sqlSource and sqlSourceDispatch are mutually exclusive.`
+        );
+      }
+      const dispatchArg = dispatch.argument;
+      const queryArgs = cfg.arguments ?? [];
+      const argDef = queryArgs.find((a) => a.name === dispatchArg);
+      if (argDef === void 0) {
+        throw new Error(
+          `registerQuery('${name}'): sqlSourceDispatch argument '${dispatchArg}' not found in arguments list.`
+        );
+      }
+      if (argDef.nullable) {
+        throw new Error(
+          `registerQuery('${name}'): sqlSourceDispatch argument '${dispatchArg}' must be non-nullable.`
+        );
+      }
+      if (dispatch.mapping !== void 0) {
+        for (const [key, value] of Object.entries(dispatch.mapping)) {
+          if (!SAFE_SQL_IDENT.test(value)) {
+            throw new Error(
+              `registerQuery('${name}'): sql_source_dispatch mapping value '${value}' for key '${key}' is not a safe SQL identifier.`
+            );
+          }
+        }
+      }
+    }
+    const { returnType, returnsList: rl, nullable: nl, arguments: qArgs, description: desc, ...rest } = cfg;
+    SchemaRegistry.registerQuery(
+      name,
+      returnType,
+      rl ?? false,
+      nl ?? false,
+      qArgs ?? [],
+      desc,
+      rest
+    );
+    return;
+  }
+  SchemaRegistry.registerQuery(name, returnTypeOrConfig, returnsList ?? false, nullable ?? false, args ?? [], description, config2);
 }
 function registerMutation(name, returnType, returnsList, nullable, args, description, config2) {
   SchemaRegistry.registerMutation(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fraiseql",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "FraiseQL v2 - Compiled GraphQL execution engine (schema authoring + HTTP client)",
   "main": "dist/index.js",
   "module": "dist/index.mjs",