@kuindji/sql-type-parser - npm Package Compare versions

Comparing version 0.4.15 to 0.4.16

dist/db.d.ts

@@ -60,2 +60,8 @@ /**
 /**
+ * Merge result type with user-provided overrides.
+ * Overrides take precedence over inferred types.
+ * Short-circuits when Overrides is empty for zero performance cost.
+ */
+export type MergeOverrides<Result, Overrides> = keyof Overrides extends never ? Result : Prettify<Omit<Result, keyof Overrides> & Overrides>;
+/**
  * Result type for a SELECT query builder (flattened for better IDE display)
@@ -80,2 +86,3 @@ */
  * - Infers the result type from the query
+ * - Optionally merges user-provided type overrides into the result
  *
@@ -104,2 +111,10 @@ * @example
  *
+ * // With type overrides (e.g., when inference isn't precise enough)
+ * type Overrides = { created_at: Date }  // Override timestamp string → Date
+ * const selectWithOverrides = createSelectFn<Schema, Overrides>((sql, params) =>
+ *   db.query(sql, params)
+ * )
+ * const users2 = await selectWithOverrides("SELECT id, created_at FROM users")
+ * // users2: Array<{ id: number; created_at: Date }>
+ *
  * // Invalid queries cause compile errors
@@ -110,6 +125,6 @@ * const bad = await select("SELECT unknown FROM users")
  */
-export declare function createSelectFn<Schema extends DatabaseSchema>(handler: QueryHandler): {
-    <Q extends string>(query: ValidQuery<Q, Schema>, params?: unknown[]): Promise<SelectResultArray<Q, Schema>>;
-    <Result>(query: UntypedSelectBuilder<Result>, params?: unknown[]): Promise<Result[]>;
-    <B extends SelectQueryBuilder<Schema, any, any>>(query: ValidQueryBuilder<Schema, B>, params?: unknown[]): Promise<SelectBuilderResultArray<B>>;
+export declare function createSelectFn<Schema extends DatabaseSchema, Overrides extends Record<string, unknown> = {}>(handler: QueryHandler): {
+    <Q extends string>(query: ValidQuery<Q, Schema>, params?: unknown[]): Promise<MergeOverrides<SelectResultArray<Q, Schema>[number], Overrides>[]>;
+    <Result>(query: UntypedSelectBuilder<Result>, params?: unknown[]): Promise<MergeOverrides<Result, Overrides>[]>;
+    <B extends SelectQueryBuilder<Schema, any, any>>(query: ValidQueryBuilder<Schema, B>, params?: unknown[]): Promise<MergeOverrides<SelectBuilderResult<B>, Overrides>[]>;
 };
@@ -116,0 +131,0 @@ /**

dist/db.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"db.d.ts","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"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"}

dist/db.js

@@ -33,2 +33,3 @@ /**
  * - Infers the result type from the query
+ * - Optionally merges user-provided type overrides into the result
  *
@@ -57,2 +58,10 @@ * @example
  *
+ * // With type overrides (e.g., when inference isn't precise enough)
+ * type Overrides = { created_at: Date }  // Override timestamp string → Date
+ * const selectWithOverrides = createSelectFn<Schema, Overrides>((sql, params) =>
+ *   db.query(sql, params)
+ * )
+ * const users2 = await selectWithOverrides("SELECT id, created_at FROM users")
+ * // users2: Array<{ id: number; created_at: Date }>
+ *
  * // Invalid queries cause compile errors
@@ -59,0 +68,0 @@ * const bad = await select("SELECT unknown FROM users")

dist/db.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAkGH,+EAA+E;AAC/E,oBAAoB;AACpB,+EAA+E;AAE/E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,UAAU,cAAc,CAC1B,OAAqB;IAsBrB,SAAS,MAAM,CACX,KAG0C,EAC1C,MAAkB;QAElB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC,KAAK,EAAE,MAAM,CAAiB,CAAC;QAClD,CAAC;QAED,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAAE,CAAC;QACvD,OAAO,OAAO,CAAC,GAAG,EAAE,WAAW,CAAiB,CAAC;IACrD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}
+{"version":3,"file":"db.js","sourceRoot":"","sources":["../src/db.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AA2GH,+EAA+E;AAC/E,oBAAoB;AACpB,+EAA+E;AAE/E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;AACH,MAAM,UAAU,cAAc,CAI1B,OAAqB;IAwBrB,SAAS,MAAM,CACX,KAG0C,EAC1C,MAAkB;QAElB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC5B,OAAO,OAAO,CAAC,KAAK,EAAE,MAAM,CAAiB,CAAC;QAClD,CAAC;QAED,MAAM,GAAG,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC;QAC7B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAE,GAAG,KAAK,CAAC,SAAS,EAAE,CAAE,CAAC;QACvD,OAAO,OAAO,CAAC,GAAG,EAAE,WAAW,CAAiB,CAAC;IACrD,CAAC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC"}

dist/index.d.ts

@@ -39,3 +39,3 @@ /**
 export { createSelectFn } from "./db.js";
-export type { IsValidSelect, SelectBuilderResult, SelectBuilderResultArray, SelectResult, SelectResultArray, ValidQuery, ValidQueryBuilder, } from "./db.js";
+export type { IsValidSelect, MergeOverrides, SelectBuilderResult, SelectBuilderResultArray, SelectResult, SelectResultArray, ValidQuery, ValidQueryBuilder, } from "./db.js";
 //# sourceMappingURL=index.d.ts.map

dist/index.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

dist/select/builder-runtime/assemble-select-sql.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"assemble-select-sql.d.ts","sourceRoot":"","sources":["../../../src/select/builder-runtime/assemble-select-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAMtE;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,CAuHnE"}
+{"version":3,"file":"assemble-select-sql.d.ts","sourceRoot":"","sources":["../../../src/select/builder-runtime/assemble-select-sql.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAMtE;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,CAmInE"}

dist/select/builder-runtime/assemble-select-sql.js

@@ -105,9 +105,20 @@ // ============================================================================
     // Replace named parameters (:name) with positional placeholders ($N)
+    // Params are ordered by their first appearance in the SQL
     const namedParams = state.namedParams;
     if (namedParams && Object.keys(namedParams).length > 0) {
-        const paramNames = Object.keys(namedParams);
-        for (let i = 0; i < paramNames.length; i++) {
-            const name = paramNames[i];
+        // Find all param references in order of appearance
+        const paramRegex = /:([a-zA-Z_][a-zA-Z0-9_]*)(?![a-zA-Z0-9_])/g;
+        const usedParams = [];
+        let match;
+        while ((match = paramRegex.exec(sql)) !== null) {
+            const name = match[1];
+            // Only add if it's a known param and not already added
+            if (name in namedParams && !usedParams.includes(name)) {
+                usedParams.push(name);
+            }
+        }
+        // Replace each param with its positional placeholder
+        for (let i = 0; i < usedParams.length; i++) {
+            const name = usedParams[i];
             // Replace :name with $N (1-indexed)
-            // Use word boundary to avoid replacing :name inside :username
             const regex = new RegExp(`:${name}(?![a-zA-Z0-9_])`, "g");
@@ -114,0 +125,0 @@ sql = sql.replace(regex, `$${i + 1}`);

dist/select/builder-runtime/assemble-select-sql.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"assemble-select-sql.js","sourceRoot":"","sources":["../../../src/select/builder-runtime/assemble-select-sql.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"assemble-select-sql.js","sourceRoot":"","sources":["../../../src/select/builder-runtime/assemble-select-sql.ts"],"names":[],"mappings":"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"}

dist/select/builder.js

@@ -259,6 +259,29 @@ import { assembleSelectSQL } from "./builder-runtime/assemble-select-sql.js";
     getParams() {
-        // Return named params values in key order (same order as $N placeholders)
+        // Return named params values in order of first appearance in the SQL
+        // (same order as $N placeholders)
         const namedParams = this._state.namedParams;
         if (namedParams && Object.keys(namedParams).length > 0) {
-            return Object.values(namedParams);
+            // Build the combined SQL fragments string
+            const allSqlFragments = [
+                ...Object.values(this._state.cteSql),
+                ...Object.values(this._state.selectSql).flat(),
+                this._state.fromSql ?? "",
+                ...Object.values(this._state.joinSql),
+                ...Object.values(this._state.whereSql),
+                ...Object.values(this._state.groupBySql),
+                ...Object.values(this._state.havingSql),
+                ...Object.values(this._state.orderBySql),
+                this._state.unionSql ?? "",
+            ].join(" ");
+            // Find params in order of first appearance
+            const paramRegex = /:([a-zA-Z_][a-zA-Z0-9_]*)(?![a-zA-Z0-9_])/g;
+            const usedParams = [];
+            let match;
+            while ((match = paramRegex.exec(allSqlFragments)) !== null) {
+                const name = match[1];
+                if (name in namedParams && !usedParams.includes(name)) {
+                    usedParams.push(name);
+                }
+            }
+            return usedParams.map(name => namedParams[name]);
         }
@@ -265,0 +288,0 @@ // Fallback to legacy positional params

dist/select/builder.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/select/builder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder.js","sourceRoot":"","sources":["../../src/select/builder.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "@kuindji/sql-type-parser",
-  "version": "0.4.15",
+  "version": "0.4.16",
   "description": "Type-level SQL parser for TypeScript",
@@ -5,0 +5,0 @@ "author": "Ivan Kuindzhi",

No alert changes

Improved metrics

Total package byte prevSize

1054202

0.45%

Lines of code

10571

0.55%

No dependency changes