@casekit/sql 0.0.0-20250331202540 → 0.0.1

package/build/sql.d.ts

@@ -1,5 +1,5 @@
 import pg from "pg";
-import { ZodSchema, z } from "zod";
+import { ZodType, z } from "zod";
 type SQLStatementTaggedTemplateLiteral<ResultType extends pg.QueryResultRow = pg.QueryResultRow> = (fragments: TemplateStringsArray, ...values: readonly unknown[]) => SQLStatement<ResultType>;
 /**
  * @function
@@ -17,13 +17,13 @@ type SQLStatementTaggedTemplateLiteral<ResultType extends pg.QueryResultRow = pg
  * `;
  */
 declare function sql<ResultType extends pg.QueryResultRow = pg.QueryResultRow>(fragments: TemplateStringsArray, ...values: readonly unknown[]): SQLStatement<ResultType>;
-declare function sql<ResultType extends pg.QueryResultRow = pg.QueryResultRow>(schema: z.ZodSchema<ResultType>): SQLStatementTaggedTemplateLiteral<ResultType>;
+declare function sql<ResultType extends pg.QueryResultRow = pg.QueryResultRow>(schema: z.ZodType<ResultType>): SQLStatementTaggedTemplateLiteral<ResultType>;
 declare namespace sql {
     var array: (values: readonly unknown[]) => SQLValueArray;
-    var ident: (value: string) => SQLStatement<pg.QueryResultRow>;
-    var literal: (value: string) => SQLStatement<pg.QueryResultRow>;
-    var join: (values: SQLStatement[], separator?: string) => SQLStatement<pg.QueryResultRow>;
-    var value: (value: unknown) => SQLValueArray | SQLStatement<pg.QueryResultRow>;
+    var ident: (value: string) => SQLStatement<import("pg").QueryResultRow>;
+    var literal: (value: string) => SQLStatement<import("pg").QueryResultRow>;
+    var join: (values: SQLStatement[], separator?: string) => SQLStatement<import("pg").QueryResultRow>;
+    var value: (value: unknown) => SQLValueArray | SQLStatement<import("pg").QueryResultRow>;
 }
 /**
  * Class representing a SQL statement created by the `sql` template tag.
@@ -39,8 +39,11 @@ declare namespace sql {
 export declare class SQLStatement<ResultType extends pg.QueryResultRow = pg.QueryResultRow> {
     readonly _text: string[];
     readonly _values: unknown[];
-    protected _schema?: ZodSchema<ResultType>;
+    protected _schema?: ZodType<ResultType>;
     constructor(text?: readonly string[] | string, values?: readonly unknown[]);
+    private static readonly __classId;
+    readonly __classId: symbol;
+    static [Symbol.hasInstance](obj: any): boolean;
     /**
      * This accessor is called by node-postgres when passed as a query,
      * allowing us to pass a SQLStatement to `client.query` directly.
@@ -76,12 +79,12 @@ export declare class SQLStatement<ResultType extends pg.QueryResultRow = pg.Quer
      * The Zod schema that will be used to parse and validate
      * the results of the query when it is passed to `orm.query`.
      */
-    get schema(): ZodSchema<ResultType> | undefined;
+    get schema(): ZodType<ResultType> | undefined;
     /**
      * Assign a zod schema to this SQLStatement, which will be used to validate
      * the result of the query when it is passed to `orm.query`.
      */
-    withSchema<Schema extends ZodSchema>(schema: Schema): SQLStatement<z.infer<Schema>>;
+    withSchema<Schema extends ZodType<pg.QueryResultRow>>(schema: Schema): SQLStatement<z.infer<Schema>>;
 }
 /**
  * A class to wrap an array value that we don't want
@@ -90,5 +93,8 @@ export declare class SQLStatement<ResultType extends pg.QueryResultRow = pg.Quer
 export declare class SQLValueArray {
     values: unknown[];
     constructor(values: readonly unknown[]);
+    private static readonly __classId;
+    readonly __classId: symbol;
+    static [Symbol.hasInstance](obj: any): boolean;
 }
 export { sql };

package/build/sql.js

@@ -77,7 +77,7 @@ const expandFragment = ([fragment, value]) => {
     }
 };
 function sql(fragmentsOrSchema, ...values) {
-    if (fragmentsOrSchema instanceof z.ZodSchema) {
+    if (fragmentsOrSchema instanceof z.ZodType) {
         return (fragments, ...values) => sql(fragments, ...values).withSchema(fragmentsOrSchema);
     }
     const result = zip(fragmentsOrSchema, values)
@@ -109,17 +109,14 @@ export class SQLStatement {
     // any instantiation of this class in memory, so we encode a random
     // uuid and override instanceof to check this in place of the usual check.
     // see https://github.com/colinhacks/zod/issues/2241 for more info
-    // private static readonly __classId = Symbol.for(
-    //     "@casekit/orm/sql/SQLStatement-1C9E8AD8-4B55-41F0-95D0-934891ADB0C0",
-    // );
-    // public readonly __classId = SQLStatement.__classId;
-    // // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    // static [Symbol.hasInstance](obj: any) {
-    //     return (
-    //         // eslint-disable-next-line
-    //         !!obj && obj.__classId === SQLStatement.__classId
-    //     );
-    // }
+    static __classId = Symbol.for("@casekit/orm/sql/SQLStatement-1C9E8AD8-4B55-41F0-95D0-934891ADB0C0");
+    __classId = SQLStatement.__classId;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static [Symbol.hasInstance](obj) {
+        return (
+        // eslint-disable-next-line
+        !!obj && obj.__classId === SQLStatement.__classId);
+    }
     /**
      * This accessor is called by node-postgres when passed as a query,
      * allowing us to pass a SQLStatement to `client.query` directly.
@@ -191,7 +188,8 @@ export class SQLStatement {
      */
     withSchema(schema) {
         const self = this;
-        self._schema = schema;
+        // @ts-expect-error - TODO figure out how to make this work with ZodType
+        this._schema = schema;
         return self;
     }
 }
@@ -204,6 +202,19 @@ export class SQLValueArray {
     constructor(values) {
         this.values = [...values];
     }
+    // this weirdness deals with the case where we have multiple instantiations
+    // of this class, breaking instanceof. we want instanceof to work for
+    // any instantiation of this class in memory, so we encode a random
+    // uuid and override instanceof to check this in place of the usual check.
+    // see https://github.com/colinhacks/zod/issues/2241 for more info
+    static __classId = Symbol.for("@casekit/orm/sql/SQLValueArray-67F77E7C-EB62-46DD-813E-BF58710D5CEC");
+    __classId = SQLValueArray.__classId;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    static [Symbol.hasInstance](obj) {
+        return (
+        // eslint-disable-next-line
+        !!obj && obj.__classId === SQLValueArray.__classId);
+    }
 }
 const array = (values) => new SQLValueArray(values);
 const ident = (value) => new SQLStatement(pg.escapeIdentifier(value));

package/package.json

@@ -1,26 +1,27 @@
 {
   "name": "@casekit/sql",
   "description": "",
-  "version": "0.0.0-20250331202540",
+  "version": "0.0.1",
   "author": "",
   "dependencies": {
     "@casekit/unindent": "^1.0.5",
-    "es-toolkit": "^1.33.0",
-    "sql-formatter": "^15.5.1",
-    "@casekit/toolbox": "0.0.0-20250331202540"
+    "es-toolkit": "^1.39.3",
+    "sql-formatter": "^15.6.5",
+    "@casekit/toolbox": "0.0.1"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-    "@types/node": "^22.13.13",
-    "@types/pg": "^8.11.11",
-    "@vitest/coverage-v8": "^3.0.9",
-    "dotenv": "^16.4.7",
+    "@types/node": "^24.0.3",
+    "@types/pg": "^8.15.4",
+    "@vitest/coverage-v8": "^3.2.4",
+    "dotenv": "^16.5.0",
     "prettier": "^3.5.3",
-    "prettier-plugin-svelte": "^3.3.3",
+    "prettier-plugin-svelte": "^3.4.0",
+    "typescript": "^5.8.3",
     "vite-tsconfig-paths": "^5.1.4",
-    "vitest": "^3.0.9",
-    "@casekit/prettier-config": "0.0.0-20250331202540",
-    "@casekit/tsconfig": "0.0.0-20250331202540"
+    "vitest": "^3.2.4",
+    "@casekit/tsconfig": "0.0.1",
+    "@casekit/prettier-config": "0.0.1"
   },
   "exports": {
     ".": "./build/index.js"
@@ -33,10 +34,9 @@
   },
   "keywords": [],
   "license": "ISC",
-  "main": "index.js",
   "peerDependencies": {
     "pg": "^8.13.1",
-    "zod": "^3.24.2"
+    "zod": "^4.0.17"
   },
   "prettier": "@casekit/prettier-config",
   "type": "module",