@typesql/kysely 0.0.1 → 0.0.2

package/dist/client.d.ts

@@ -1,5 +1,5 @@
 import { CompiledQuery, type QueryResult } from "kysely";
-import type { Query, RowType } from "@typesql/core";
+import type { Executor, Query, RowType } from "@typesql/core";
 /**
  * What the helpers use from a `Kysely<DB>` or `Transaction<DB>`. Queries run through
  * `withoutPlugins()`: typesql's row types describe what the driver returns, so result
@@ -11,6 +11,8 @@ export interface KyselyExecutor {
     };
 }
 type AnyQuery = Query<unknown, readonly unknown[]>;
+/** An `Executor` for core's `q.execute()`: runs queries on a Kysely instance (or transaction), without its plugins. */
+export declare function executor(db: KyselyExecutor): Executor;
 /** Run a typesql query on a Kysely instance (or transaction) and return its rows, typed from the query. */
 export declare function query<Q extends AnyQuery>(db: KyselyExecutor, q: Q): Promise<RowType<Q>[]>;
 /** Run a statement for its side effect and return the affected row count (`numAffectedRows`, or 0). */

package/dist/client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAEpD;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,cAAc,IAAI;QAAE,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC;CACzF;AAED,KAAK,QAAQ,GAAG,KAAK,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC;AAMnD,2GAA2G;AAC3G,wBAAsB,KAAK,CAAC,CAAC,SAAS,QAAQ,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAG/F;AAED,uGAAuG;AACvG,wBAAsB,OAAO,CAAC,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAG9E"}
+{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,KAAK,WAAW,EAAE,MAAM,QAAQ,CAAC;AACzD,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,MAAM,WAAW,cAAc;IAC7B,cAAc,IAAI;QAAE,YAAY,CAAC,CAAC,EAAE,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;KAAE,CAAC;CACzF;AAED,KAAK,QAAQ,GAAG,KAAK,CAAC,OAAO,EAAE,SAAS,OAAO,EAAE,CAAC,CAAC;AAMnD,uHAAuH;AACvH,wBAAgB,QAAQ,CAAC,EAAE,EAAE,cAAc,GAAG,QAAQ,CAErD;AAED,2GAA2G;AAC3G,wBAAsB,KAAK,CAAC,CAAC,SAAS,QAAQ,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAG/F;AAED,uGAAuG;AACvG,wBAAsB,OAAO,CAAC,EAAE,EAAE,cAAc,EAAE,CAAC,EAAE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,CAG9E"}

package/dist/client.js

@@ -1,15 +1,19 @@
 import { CompiledQuery } from "kysely";
-function run(db, q) {
-    return db.withoutPlugins().executeQuery(CompiledQuery.raw(q.text, Array.from(q.values)));
+function run(db, text, values) {
+    return db.withoutPlugins().executeQuery(CompiledQuery.raw(text, Array.from(values)));
+}
+/** An `Executor` for core's `q.execute()`: runs queries on a Kysely instance (or transaction), without its plugins. */
+export function executor(db) {
+    return async (text, values) => (await run(db, text, values)).rows;
 }
 /** Run a typesql query on a Kysely instance (or transaction) and return its rows, typed from the query. */
 export async function query(db, q) {
-    const result = await run(db, q);
+    const result = await run(db, q.text, q.values);
     return result.rows;
 }
 /** Run a statement for its side effect and return the affected row count (`numAffectedRows`, or 0). */
 export async function execute(db, q) {
-    const result = await run(db, q);
+    const result = await run(db, q.text, q.values);
     return Number(result.numAffectedRows ?? 0n);
 }
 //# sourceMappingURL=client.js.map

package/dist/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,QAAQ,CAAC;AAczD,SAAS,GAAG,CAAI,EAAkB,EAAE,CAAW;IAC7C,OAAO,EAAE,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAqB,CAAC,CAAC;AAC/G,CAAC;AAED,2GAA2G;AAC3G,MAAM,CAAC,KAAK,UAAU,KAAK,CAAqB,EAAkB,EAAE,CAAI;IACtE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAa,EAAE,EAAE,CAAC,CAAC,CAAC;IAC5C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC;AAED,uGAAuG;AACvG,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAkB,EAAE,CAAW;IAC3D,MAAM,MAAM,GAAG,MAAM,GAAG,CAAU,EAAE,EAAE,CAAC,CAAC,CAAC;IACzC,OAAO,MAAM,CAAC,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;AAC9C,CAAC"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAoB,MAAM,QAAQ,CAAC;AAczD,SAAS,GAAG,CAAI,EAAkB,EAAE,IAAY,EAAE,MAA0B;IAC1E,OAAO,EAAE,CAAC,cAAc,EAAE,CAAC,YAAY,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAqB,CAAC,CAAC;AAC3G,CAAC;AAED,uHAAuH;AACvH,MAAM,UAAU,QAAQ,CAAC,EAAkB;IACzC,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,GAAG,CAAU,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7E,CAAC;AAED,2GAA2G;AAC3G,MAAM,CAAC,KAAK,UAAU,KAAK,CAAqB,EAAkB,EAAE,CAAI;IACtE,MAAM,MAAM,GAAG,MAAM,GAAG,CAAa,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IAC3D,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC;AAED,uGAAuG;AACvG,MAAM,CAAC,KAAK,UAAU,OAAO,CAAC,EAAkB,EAAE,CAAW;IAC3D,MAAM,MAAM,GAAG,MAAM,GAAG,CAAU,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;IACxD,OAAO,MAAM,CAAC,MAAM,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;AAC9C,CAAC"}

package/dist/index.d.ts

@@ -1,7 +1,9 @@
 import { type DefaultTypeMap, type Sql } from "@typesql/core";
+import { type KyselyExecutor } from "./client.js";
 import type { FromKysely, KyselyOptions, KyselyOverrides } from "./from-kysely.js";
+export { NoResultError, type Executor } from "@typesql/core";
 export type { FromKysely, KyselyOverrides, KyselyOptions, TableOverride, ColumnOverride, InferColumn, SnakeCase } from "./from-kysely.js";
-export { query, execute, type KyselyExecutor } from "./client.js";
+export { query, execute, executor, type KyselyExecutor } from "./client.js";
 /**
  * `createSql` from core with a Kysely `DB` interface as the schema:
  * `createSql<DB>()` is `createSql<FromKysely<DB>, DefaultTypeMap>()`.
@@ -9,6 +11,8 @@ export { query, execute, type KyselyExecutor } from "./client.js";
  *   const sql = createSql<DB>();
  *   const sql = createSql<DB, PgTypeMap, { users: { id: "int8" } }>();
  *   const sql = createSql<DB, DefaultTypeMap, {}, { camelCase: true }>();
+ *
+ * With a `db` (a `Kysely` instance or transaction), the queries' `execute*` methods run on it.
  */
-export declare function createSql<DB, TM = DefaultTypeMap, Overrides extends KyselyOverrides = {}, Options extends KyselyOptions = {}>(): Sql<FromKysely<DB, Overrides, Options>, TM>;
+export declare function createSql<DB, TM = DefaultTypeMap, Overrides extends KyselyOverrides = {}, Options extends KyselyOptions = {}>(db?: KyselyExecutor): Sql<FromKysely<DB, Overrides, Options>, TM>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,cAAc,EAAE,KAAK,GAAG,EAAE,MAAM,eAAe,CAAC;AAC1F,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnF,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1I,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAElE;;;;;;;GAOG;AACH,wBAAgB,SAAS,CACvB,EAAE,EACF,EAAE,GAAG,cAAc,EACnB,SAAS,SAAS,eAAe,GAAG,EAAE,EACtC,OAAO,SAAS,aAAa,GAAG,EAAE,KAC/B,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAE/C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,cAAc,EAAE,KAAK,GAAG,EAAE,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAY,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAEnF,OAAO,EAAE,aAAa,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC7D,YAAY,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1I,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,cAAc,EAAE,MAAM,aAAa,CAAC;AAE5E;;;;;;;;;GASG;AACH,wBAAgB,SAAS,CACvB,EAAE,EACF,EAAE,GAAG,cAAc,EACnB,SAAS,SAAS,eAAe,GAAG,EAAE,EACtC,OAAO,SAAS,aAAa,GAAG,EAAE,EAClC,EAAE,CAAC,EAAE,cAAc,GAAG,GAAG,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAElE"}

package/dist/index.js

@@ -1,5 +1,7 @@
 import { createSql as createCoreSql } from "@typesql/core";
-export { query, execute } from "./client.js";
+import { executor } from "./client.js";
+export { NoResultError } from "@typesql/core";
+export { query, execute, executor } from "./client.js";
 /**
  * `createSql` from core with a Kysely `DB` interface as the schema:
  * `createSql<DB>()` is `createSql<FromKysely<DB>, DefaultTypeMap>()`.
@@ -7,8 +9,10 @@ export { query, execute } from "./client.js";
  *   const sql = createSql<DB>();
  *   const sql = createSql<DB, PgTypeMap, { users: { id: "int8" } }>();
  *   const sql = createSql<DB, DefaultTypeMap, {}, { camelCase: true }>();
+ *
+ * With a `db` (a `Kysely` instance or transaction), the queries' `execute*` methods run on it.
  */
-export function createSql() {
-    return createCoreSql();
+export function createSql(db) {
+    return createCoreSql(db && executor(db));
 }
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,aAAa,EAAiC,MAAM,eAAe,CAAC;AAI1F,OAAO,EAAE,KAAK,EAAE,OAAO,EAAuB,MAAM,aAAa,CAAC;AAElE;;;;;;;GAOG;AACH,MAAM,UAAU,SAAS;IAMvB,OAAO,aAAa,EAA0C,CAAC;AACjE,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,IAAI,aAAa,EAAiC,MAAM,eAAe,CAAC;AAC1F,OAAO,EAAE,QAAQ,EAAuB,MAAM,aAAa,CAAC;AAG5D,OAAO,EAAE,aAAa,EAAiB,MAAM,eAAe,CAAC;AAE7D,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAuB,MAAM,aAAa,CAAC;AAE5E;;;;;;;;;GASG;AACH,MAAM,UAAU,SAAS,CAKvB,EAAmB;IACnB,OAAO,aAAa,CAAyC,EAAE,IAAI,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;AACnF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typesql/kysely",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "Use Kysely database interfaces (kysely-codegen, prisma-kysely) as a typesql schema.",
   "license": "MIT",
   "repository": {
@@ -28,7 +28,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@typesql/core": "0.0.1"
+    "@typesql/core": "0.0.2"
   },
   "peerDependencies": {
     "kysely": ">=0.27"

package/src/client.ts

@@ -1,5 +1,5 @@
 import { CompiledQuery, type QueryResult } from "kysely";
-import type { Query, RowType } from "@typesql/core";
+import type { Executor, Query, RowType } from "@typesql/core";
 
 /**
  * What the helpers use from a `Kysely<DB>` or `Transaction<DB>`. Queries run through
@@ -12,18 +12,23 @@ export interface KyselyExecutor {
 
 type AnyQuery = Query<unknown, readonly unknown[]>;
 
-function run<R>(db: KyselyExecutor, q: AnyQuery): Promise<QueryResult<R>> {
-  return db.withoutPlugins().executeQuery(CompiledQuery.raw(q.text, Array.from(q.values)) as CompiledQuery<R>);
+function run<R>(db: KyselyExecutor, text: string, values: readonly unknown[]): Promise<QueryResult<R>> {
+  return db.withoutPlugins().executeQuery(CompiledQuery.raw(text, Array.from(values)) as CompiledQuery<R>);
+}
+
+/** An `Executor` for core's `q.execute()`: runs queries on a Kysely instance (or transaction), without its plugins. */
+export function executor(db: KyselyExecutor): Executor {
+  return async (text, values) => (await run<unknown>(db, text, values)).rows;
 }
 
 /** Run a typesql query on a Kysely instance (or transaction) and return its rows, typed from the query. */
 export async function query<Q extends AnyQuery>(db: KyselyExecutor, q: Q): Promise<RowType<Q>[]> {
-  const result = await run<RowType<Q>>(db, q);
+  const result = await run<RowType<Q>>(db, q.text, q.values);
   return result.rows;
 }
 
 /** Run a statement for its side effect and return the affected row count (`numAffectedRows`, or 0). */
 export async function execute(db: KyselyExecutor, q: AnyQuery): Promise<number> {
-  const result = await run<unknown>(db, q);
+  const result = await run<unknown>(db, q.text, q.values);
   return Number(result.numAffectedRows ?? 0n);
 }

package/src/index.ts

@@ -1,8 +1,10 @@
 import { createSql as createCoreSql, type DefaultTypeMap, type Sql } from "@typesql/core";
+import { executor, type KyselyExecutor } from "./client.js";
 import type { FromKysely, KyselyOptions, KyselyOverrides } from "./from-kysely.js";
 
+export { NoResultError, type Executor } from "@typesql/core";
 export type { FromKysely, KyselyOverrides, KyselyOptions, TableOverride, ColumnOverride, InferColumn, SnakeCase } from "./from-kysely.js";
-export { query, execute, type KyselyExecutor } from "./client.js";
+export { query, execute, executor, type KyselyExecutor } from "./client.js";
 
 /**
  * `createSql` from core with a Kysely `DB` interface as the schema:
@@ -11,12 +13,14 @@ export { query, execute, type KyselyExecutor } from "./client.js";
  *   const sql = createSql<DB>();
  *   const sql = createSql<DB, PgTypeMap, { users: { id: "int8" } }>();
  *   const sql = createSql<DB, DefaultTypeMap, {}, { camelCase: true }>();
+ *
+ * With a `db` (a `Kysely` instance or transaction), the queries' `execute*` methods run on it.
  */
 export function createSql<
   DB,
   TM = DefaultTypeMap,
   Overrides extends KyselyOverrides = {},
   Options extends KyselyOptions = {},
->(): Sql<FromKysely<DB, Overrides, Options>, TM> {
-  return createCoreSql<FromKysely<DB, Overrides, Options>, TM>();
+>(db?: KyselyExecutor): Sql<FromKysely<DB, Overrides, Options>, TM> {
+  return createCoreSql<FromKysely<DB, Overrides, Options>, TM>(db && executor(db));
 }