@effect/sql-sqlite-bun - npm Package Compare versions

Comparing version 0.0.0-snapshot-78b767c2b1625186e17131761a0edbac25d21850 to 0.0.0-snapshot-a451d9997e8c09bbbfb2025dcfec7f669464c9d8

dist/cjs/Client.js

@@ -6,6 +6,7 @@ "use strict";
 });
-exports.makeCompiler = exports.make = exports.layer = exports.SqliteClient = void 0;
+exports.make = exports.layer = exports.TypeId = exports.SqliteClient = void 0;
 var Client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Client"));
 var _Error = /*#__PURE__*/require("@effect/sql/Error");
 var Statement = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Statement"));
+var Otel = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@opentelemetry/semantic-conventions"));
 var _bunSqlite = /*#__PURE__*/require("bun:sqlite");
@@ -48,6 +49,11 @@ var Config = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Config"));
 /**
+ * @category type ids
+ * @since 1.0.0
+ */
+const TypeId = exports.TypeId = /*#__PURE__*/Symbol.for("@effect/sql-sqlite-bun/Client");
+/**
  * @category tags
  * @since 1.0.0
  */
-const SqliteClient = exports.SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-bun/SqliteClient");
+const SqliteClient = exports.SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-bun/Client");
 /**
@@ -58,4 +64,4 @@ * @category constructor
 const make = options => Effect.gen(function* (_) {
-  const compiler = makeCompiler(options.transformQueryNames);
-  const transformRows = Client.defaultTransforms(options.transformResultNames).array;
+  const compiler = Statement.makeCompilerSqlite(options.transformQueryNames);
+  const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
   const makeConnection = Effect.gen(function* (_) {
@@ -121,4 +127,6 @@ const db = new _bunSqlite.Database(options.filename, {
     compiler,
-    transactionAcquirer
+    transactionAcquirer,
+    spanAttributes: [[Otel.SEMATTRS_DB_SYSTEM, Otel.DBSYSTEMVALUES_SQLITE]]
   }), {
+    [TypeId]: TypeId,
     config: options,
@@ -134,16 +142,4 @@ export: Effect.flatMap(acquirer, _ => _.export),
 exports.make = make;
-const layer = config => Layer.scoped(SqliteClient, Effect.flatMap(Config.unwrap(config), make));
+const layer = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(SqliteClient, client).pipe(Context.add(Client.Client, client)))));
 exports.layer = layer;
-const escape = /*#__PURE__*/Statement.defaultEscape("\"");
-/**
- * @category compiler
- * @since 1.0.0
- */
-const makeCompiler = transform => Statement.makeCompiler({
-  placeholder: _ => `?`,
-  onIdentifier: transform ? _ => escape(transform(_)) : escape,
-  onRecordUpdate: () => ["", []],
-  onCustom: () => ["", []]
-});
-exports.makeCompiler = makeCompiler;
 //# sourceMappingURL=Client.js.map

dist/cjs/Client.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Client.js","names":["Client","_interopRequireWildcard","require","_Error","Statement","_bunSqlite","Config","Context","Effect","_Function","Layer","Scope","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","SqliteClient","exports","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","Database","filename","readonly","readwrite","create","addFinalizer","sync","close","disableWAL","run","sql","params","try","query","all","catch","error","SqlError","runTransform","map","runValues","values","identity","execute","executeValues","executeWithoutTransform","executeRaw","executeStream","_sql","_params","dieMessage","export","serialize","loadExtension","path","semaphore","makeSemaphore","connection","acquirer","withPermits","succeed","transactionAcquirer","uninterruptibleMask","restore","as","zipRight","take","tap","scope","release","assign","config","flatMap","layer","scoped","unwrap","escape","defaultEscape","transform","placeholder","onIdentifier","onRecordUpdate","onCustom"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":";;;;;;AAGA,IAAAA,MAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAEA,IAAAC,MAAA,gBAAAD,OAAA;AACA,IAAAE,SAAA,gBAAAH,uBAAA,eAAAC,OAAA;AACA,IAAAG,UAAA,gBAAAH,OAAA;AACA,IAAAI,MAAA,gBAAAL,uBAAA,eAAAC,OAAA;AAEA,IAAAK,OAAA,gBAAAN,uBAAA,eAAAC,OAAA;AACA,IAAAM,MAAA,gBAAAP,uBAAA,eAAAC,OAAA;AACA,IAAAO,SAAA,gBAAAP,OAAA;AACA,IAAAQ,KAAA,gBAAAT,uBAAA,eAAAC,OAAA;AACA,IAAAS,KAAA,gBAAAV,uBAAA,eAAAC,OAAA;AAAqC,SAAAU,yBAAAC,CAAA;EAAA,yBAAAC,OAAA;EAAA,IAAAC,CAAA,OAAAD,OAAA;IAAAE,CAAA,OAAAF,OAAA;EAAA,QAAAF,wBAAA,YAAAA,CAAAC,CAAA;IAAA,OAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA;EAAA,GAAAF,CAAA;AAAA;AAAA,SAAAZ,wBAAAY,CAAA,EAAAE,CAAA;EAAA,KAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA;EAAA,aAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA;IAAAK,OAAA,EAAAL;EAAA;EAAA,IAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA;EAAA,IAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA;EAAA,IAAAQ,CAAA;MAAAC,SAAA;IAAA;IAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA;EAAA,SAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA;IAAA,IAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA;IAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA;EAAA;EAAA,OAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA;AAdrC;;;;AA0BA;;;;AAIO,MAAMW,YAAY,GAAAC,OAAA,CAAAD,YAAA,gBAA4CzB,OAAO,CAAC2B,UAAU,CACrF,qCAAqC,CACtC;AAsBD;;;;AAIO,MAAMC,IAAI,GACfC,OAA2B,IAE3B5B,MAAM,CAAC6B,GAAG,CAAC,WAAUC,CAAC;EACpB,MAAMC,QAAQ,GAAGC,YAAY,CAACJ,OAAO,CAACK,mBAAmB,CAAC;EAC1D,MAAMC,aAAa,GAAG1C,MAAM,CAAC2C,iBAAiB,CAC5CP,OAAO,CAACQ,oBAAqB,CAC9B,CAACC,KAAK;EAEP,MAAMC,cAAc,GAAGtC,MAAM,CAAC6B,GAAG,CAAC,WAAUC,CAAC;IAC3C,MAAMS,EAAE,GAAG,IAAI1C,UAAA,CAAA2C,QAAQ,CAACZ,OAAO,CAACa,QAAQ,EAAE;MACxCC,QAAQ,EAAEd,OAAO,CAACc,QAAQ;MAC1BC,SAAS,EAAEf,OAAO,CAACe,SAAS,IAAI,IAAI;MACpCC,MAAM,EAAEhB,OAAO,CAACgB,MAAM,IAAI;KACpB,CAAC;IACT,OAAOd,CAAC,CAAC9B,MAAM,CAAC6C,YAAY,CAAC,MAAM7C,MAAM,CAAC8C,IAAI,CAAC,MAAMP,EAAE,CAACQ,KAAK,EAAE,CAAC,CAAC,CAAC;IAElE,IAAInB,OAAO,CAACoB,UAAU,KAAK,IAAI,EAAE;MAC/BT,EAAE,CAACU,GAAG,CAAC,4BAA4B,CAAC;IACtC;IAEA,MAAMA,GAAG,GAAGA,CACVC,GAAW,EACXC,MAAA,GAA6C,EAAE,KAE/CnD,MAAM,CAACoD,GAAG,CAAC;MACTA,GAAG,EAAEA,CAAA,KAAMb,EAAE,CAACc,KAAK,CAACH,GAAG,CAAC,CAACI,GAAG,CAAC,GAAIH,MAAc,CAAe;MAC9DI,KAAK,EAAGC,KAAK,IAAK,IAAI7D,MAAA,CAAA8D,QAAQ,CAAC;QAAED;MAAK,CAAE;KACzC,CAAC;IAEJ,MAAME,YAAY,GAAG9B,OAAO,CAACQ,oBAAoB,GAC7C,CAACc,GAAW,EAAEC,MAA2C,KAAKnD,MAAM,CAAC2D,GAAG,CAACV,GAAG,CAACC,GAAG,EAAEC,MAAM,CAAC,EAAEjB,aAAa,CAAC,GACzGe,GAAG;IAEP,MAAMW,SAAS,GAAGA,CAChBV,GAAW,EACXC,MAAA,GAA6C,EAAE,KAE/CnD,MAAM,CAACoD,GAAG,CAAC;MACTA,GAAG,EAAEA,CAAA,KAAMb,EAAE,CAACc,KAAK,CAACH,GAAG,CAAC,CAACW,MAAM,CAAC,GAAIV,MAAc,CAAe;MACjEI,KAAK,EAAGC,KAAK,IAAK,IAAI7D,MAAA,CAAA8D,QAAQ,CAAC;QAAED;MAAK,CAAE;KACzC,CAAC;IAEJ,OAAO,IAAAvD,SAAA,CAAA6D,QAAQ,EAAmB;MAChCC,OAAOA,CAACb,GAAG,EAAEC,MAAM;QACjB,OAAOO,YAAY,CAACR,GAAG,EAAEC,MAAM,CAAC;MAClC,CAAC;MACDa,aAAaA,CAACd,GAAG,EAAEC,MAAM;QACvB,OAAOS,SAAS,CAACV,GAAG,EAAEC,MAAM,CAAC;MAC/B,CAAC;MACDc,uBAAuBA,CAACf,GAAG,EAAEC,MAAM;QACjC,OAAOF,GAAG,CAACC,GAAG,EAAEC,MAAM,CAAC;MACzB,CAAC;MACDe,UAAUA,CAAChB,GAAG,EAAEC,MAAM;QACpB,OAAOO,YAAY,CAACR,GAAG,EAAEC,MAAM,CAAC;MAClC,CAAC;MACDgB,aAAaA,CAACC,IAAI,EAAEC,OAAO;QACzB,OAAOrE,MAAM,CAACsE,UAAU,CAAC,+BAA+B,CAAC;MAC3D,CAAC;MACDC,MAAM,EAAEvE,MAAM,CAACoD,GAAG,CAAC;QACjBA,GAAG,EAAEA,CAAA,KAAMb,EAAE,CAACiC,SAAS,EAAE;QACzBjB,KAAK,EAAGC,KAAK,IAAK,IAAI7D,MAAA,CAAA8D,QAAQ,CAAC;UAAED;QAAK,CAAE;OACzC,CAAC;MACFiB,aAAa,EAAGC,IAAI,IAClB1E,MAAM,CAACoD,GAAG,CAAC;QACTA,GAAG,EAAEA,CAAA,KAAMb,EAAE,CAACkC,aAAa,CAACC,IAAI,CAAC;QACjCnB,KAAK,EAAGC,KAAK,IAAK,IAAI7D,MAAA,CAAA8D,QAAQ,CAAC;UAAED;QAAK,CAAE;OACzC;KACJ,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMmB,SAAS,GAAG,OAAO7C,CAAC,CAAC9B,MAAM,CAAC4E,aAAa,CAAC,CAAC,CAAC,CAAC;EACnD,MAAMC,UAAU,GAAG,OAAO/C,CAAC,CAACQ,cAAc,CAAC;EAE3C,MAAMwC,QAAQ,GAAGH,SAAS,CAACI,WAAW,CAAC,CAAC,CAAC,CAAC/E,MAAM,CAACgF,OAAO,CAACH,UAAU,CAAC,CAAC;EACrE,MAAMI,mBAAmB,GAAGjF,MAAM,CAACkF,mBAAmB,CAAEC,OAAO,IAC7DnF,MAAM,CAACoF,EAAE,CACPpF,MAAM,CAACqF,QAAQ,CACbF,OAAO,CAACR,SAAS,CAACW,IAAI,CAAC,CAAC,CAAC,CAAC,EAC1BtF,MAAM,CAACuF,GAAG,CACRvF,MAAM,CAACwF,KAAK,EACXA,KAAK,IAAKrF,KAAK,CAAC0C,YAAY,CAAC2C,KAAK,EAAEb,SAAS,CAACc,OAAO,CAAC,CAAC,CAAC,CAAC,CAC3D,CACF,EACDZ,UAAU,CACX,CACF;EAED,OAAO7D,MAAM,CAAC0E,MAAM,CAClBlG,MAAM,CAACmC,IAAI,CAAC;IACVmD,QAAQ;IACR/C,QAAQ;IACRkD;GACD,CAAC,EACF;IACEU,MAAM,EAAE/D,OAAO;IACf2C,MAAM,EAAEvE,MAAM,CAAC4F,OAAO,CAACd,QAAQ,EAAGhD,CAAC,IAAKA,CAAC,CAACyC,MAAM,CAAC;IACjDE,aAAa,EAAGC,IAAY,IAAK1E,MAAM,CAAC4F,OAAO,CAACd,QAAQ,EAAGhD,CAAC,IAAKA,CAAC,CAAC2C,aAAa,CAACC,IAAI,CAAC;GACvF,CACF;AACH,CAAC,CAAC;AAEJ;;;;AAAAjD,OAAA,CAAAE,IAAA,GAAAA,IAAA;AAIO,MAAMkE,KAAK,GAChBF,MAA8C,IAE9CzF,KAAK,CAAC4F,MAAM,CACVtE,YAAY,EACZxB,MAAM,CAAC4F,OAAO,CAAC9F,MAAM,CAACiG,MAAM,CAACJ,MAAM,CAAC,EAAEhE,IAAI,CAAC,CAC5C;AAAAF,OAAA,CAAAoE,KAAA,GAAAA,KAAA;AAEH,MAAMG,MAAM,gBAAGpG,SAAS,CAACqG,aAAa,CAAC,IAAI,CAAC;AAE5C;;;;AAIO,MAAMjE,YAAY,GAAIkE,SAAiC,IAC5DtG,SAAS,CAACoC,YAAY,CAAC;EACrBmE,WAAW,EAAGrE,CAAC,IAAK,GAAG;EACvBsE,YAAY,EAAEF,SAAS,GAAIpE,CAAC,IAAKkE,MAAM,CAACE,SAAS,CAACpE,CAAC,CAAC,CAAC,GAAGkE,MAAM;EAC9DK,cAAc,EAAEA,CAAA,KAAM,CAAC,EAAE,EAAE,EAAE,CAAC;EAC9BC,QAAQ,EAAEA,CAAA,KAAM,CAAC,EAAE,EAAE,EAAE;CACxB,CAAC;AAAA7E,OAAA,CAAAO,YAAA,GAAAA,YAAA","ignoreList":[]}
+{"version":3,"file":"Client.js","names":["Client","_interopRequireWildcard","require","_Error","Statement","Otel","_bunSqlite","Config","Context","Effect","_Function","Layer","Scope","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","TypeId","exports","Symbol","for","SqliteClient","GenericTag","make","options","gen","_","compiler","makeCompilerSqlite","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","Database","filename","readonly","readwrite","create","addFinalizer","sync","close","disableWAL","run","sql","params","try","query","all","catch","error","SqlError","runTransform","map","runValues","values","identity","execute","executeValues","executeWithoutTransform","executeRaw","executeStream","_sql","_params","dieMessage","export","serialize","loadExtension","path","semaphore","makeSemaphore","connection","acquirer","withPermits","succeed","transactionAcquirer","uninterruptibleMask","restore","as","zipRight","take","tap","scope","release","assign","spanAttributes","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_SQLITE","config","flatMap","layer","scopedContext","unwrap","pipe","client","add"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

dist/cjs/index.js

@@ -6,15 +6,7 @@ "use strict";
 });
-exports.statement = exports.schema = exports.resolver = exports.migrator = exports.error = exports.client = void 0;
+exports.migrator = exports.client = void 0;
 var _client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Client.js"));
 exports.client = _client;
-var _error = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Error"));
-exports.error = _error;
 var _migrator = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Migrator.js"));
 exports.migrator = _migrator;
-var _resolver = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Resolver"));
-exports.resolver = _resolver;
-var _schema = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Schema"));
-exports.schema = _schema;
-var _statement = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Statement"));
-exports.statement = _statement;
 function _getRequireWildcardCache(e) {
@@ -21,0 +13,0 @@ if ("function" != typeof WeakMap) return null;

dist/cjs/Migrator.js

@@ -28,3 +28,3 @@ "use strict";
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
-var Client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Client.js"));
+var _Client = /*#__PURE__*/require("./Client.js");
 function _getRequireWildcardCache(e) {
@@ -68,14 +68,5 @@ if ("function" != typeof WeakMap) return null;
 const run = exports.run = /*#__PURE__*/Migrator.make({
-  getClient: Client.SqliteClient,
-  ensureTable(sql, table) {
-    return sql`
-      CREATE TABLE IF NOT EXISTS ${sql(table)} (
-        migration_id integer PRIMARY KEY NOT NULL,
-        created_at datetime NOT NULL DEFAULT current_timestamp,
-        name VARCHAR(255) NOT NULL
-      )
-    `;
-  },
-  dumpSchema(sql, path, table) {
+  dumpSchema(path, table) {
     const dump = args => Effect.gen(function* (_) {
+      const sql = yield* _Client.SqliteClient;
       const dump = yield* _(Command.make("sqlite3", sql.config.filename, ...args), Command.string);
@@ -82,0 +73,0 @@ return dump.replace(/^create table sqlite_sequence\(.*$/im, "").replace(/\n{2,}/gm, "\n\n").trim();

dist/cjs/Migrator.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Migrator.js","names":["Command","_interopRequireWildcard","require","_FileSystem","_Path","Migrator","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Effect","Layer","Client","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","run","make","getClient","SqliteClient","ensureTable","sql","table","dumpSchema","path","dump","args","gen","_","config","filename","string","replace","trim","pipe","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","FileSystem","Path","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/Migrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Migrator.js","names":["Command","_interopRequireWildcard","require","_FileSystem","_Path","Migrator","Object","keys","forEach","key","prototype","hasOwnProperty","call","_exportNames","exports","defineProperty","enumerable","get","Effect","Layer","_Client","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","n","__proto__","a","getOwnPropertyDescriptor","u","i","set","run","make","dumpSchema","path","table","dump","args","gen","_","sql","SqliteClient","config","filename","string","replace","trim","pipe","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","FileSystem","Path","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/Migrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

dist/dts/Client.d.ts

@@ -6,3 +6,2 @@ /**
 import { SqlError } from "@effect/sql/Error";
-import * as Statement from "@effect/sql/Statement";
 import * as Config from "effect/Config";
@@ -15,2 +14,12 @@ import type { ConfigError } from "effect/ConfigError";
 /**
+ * @category type ids
+ * @since 1.0.0
+ */
+export declare const TypeId: unique symbol;
+/**
+ * @category type ids
+ * @since 1.0.0
+ */
+export type TypeId = typeof TypeId;
+/**
  * @category models
@@ -20,5 +29,8 @@ * @since 1.0.0
 export interface SqliteClient extends Client.Client {
+    readonly [TypeId]: TypeId;
     readonly config: SqliteClientConfig;
     readonly export: Effect.Effect<Uint8Array, SqlError>;
     readonly loadExtension: (path: string) => Effect.Effect<void, SqlError>;
+    /** Not supported in sqlite */
+    readonly updateValues: never;
 }
@@ -52,8 +64,3 @@ /**
  */
-export declare const layer: (config: Config.Config.Wrap<SqliteClientConfig>) => Layer.Layer<SqliteClient, ConfigError>;
-/**
- * @category compiler
- * @since 1.0.0
- */
-export declare const makeCompiler: (transform?: ((_: string) => string) | undefined) => Statement.Compiler;
+export declare const layer: (config: Config.Config.Wrap<SqliteClientConfig>) => Layer.Layer<SqliteClient | Client.Client, ConfigError>;
 //# sourceMappingURL=Client.d.ts.map

dist/dts/Client.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../src/Client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAElD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;GAGG;AACH,MAAM,WAAW,YAAa,SAAQ,MAAM,CAAC,MAAM;IACjD,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACpD,QAAQ,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;CACxE;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY,EAAE,YAAY,CAEhE,CAAA;AAED;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAEzC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AAOD;;;GAGG;AACH,eAAO,MAAM,IAAI,YACN,kBAAkB,KAC1B,aAAa,CAAC,YAAY,EAAE,KAAK,EAAE,WAAW,CAkG7C,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,KAAK,WACR,aAAa,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAC7C,WAAW,CAAC,YAAY,EAAE,WAAW,CAIrC,CAAA;AAIH;;;GAGG;AACH,eAAO,MAAM,YAAY,oBAAoB,MAAM,KAAK,MAAM,oCAM1D,CAAA"}
+{"version":3,"file":"Client.d.ts","sourceRoot":"","sources":["../../src/Client.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAE5C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAI5C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AACrD,OAAO,KAAK,OAAO,MAAM,gBAAgB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAEvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AAErC;;;GAGG;AACH,eAAO,MAAM,MAAM,EAAE,OAAO,MAAoD,CAAA;AAEhF;;;GAGG;AACH,MAAM,MAAM,MAAM,GAAG,OAAO,MAAM,CAAA;AAElC;;;GAGG;AACH,MAAM,WAAW,YAAa,SAAQ,MAAM,CAAC,MAAM;IACjD,QAAQ,CAAC,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAA;IACnC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;IACpD,QAAQ,CAAC,aAAa,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;IAEvE,8BAA8B;IAC9B,QAAQ,CAAC,YAAY,EAAE,KAAK,CAAA;CAC7B;AAED;;;GAGG;AACH,eAAO,MAAM,YAAY,yCAAoE,CAAA;AAE7F;;;GAGG;AACH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;IACzB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACvC,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACrC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACxC,QAAQ,CAAC,UAAU,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAEzC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;IACrE,QAAQ,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,CAAC,GAAG,SAAS,CAAA;CACrE;AAOD;;;GAGG;AACH,eAAO,MAAM,IAAI,YACN,kBAAkB,KAC1B,OAAO,MAAM,CAAC,YAAY,EAAE,KAAK,EAAE,MAAM,KAAK,CAoG7C,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,KAAK,WACR,OAAO,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAC7C,MAAM,KAAK,CAAC,YAAY,GAAG,OAAO,MAAM,EAAE,WAAW,CAUrD,CAAA"}

dist/dts/index.d.ts

@@ -11,19 +11,3 @@ /**
  */
-export * as error from "@effect/sql/Error";
-/**
- * @since 1.0.0
- */
 export * as migrator from "./Migrator.js";
-/**
- * @since 1.0.0
- */
-export * as resolver from "@effect/sql/Resolver";
-/**
- * @since 1.0.0
- */
-export * as schema from "@effect/sql/Schema";
-/**
- * @since 1.0.0
- */
-export * as statement from "@effect/sql/Statement";
 //# sourceMappingURL=index.d.ts.map

dist/dts/index.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;GAEG;AACH,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAE1C;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA;AAEzC;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAEhD;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAE5C;;GAEG;AACH,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH;;GAEG;AACH,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;GAEG;AACH,OAAO,KAAK,QAAQ,MAAM,eAAe,CAAA"}

dist/dts/Migrator.d.ts

 import type { CommandExecutor } from "@effect/platform/CommandExecutor";
 import { FileSystem } from "@effect/platform/FileSystem";
 import { Path } from "@effect/platform/Path";
+import type * as Client from "@effect/sql/Client";
 import type { SqlError } from "@effect/sql/Error";
@@ -8,3 +9,3 @@ import * as Migrator from "@effect/sql/Migrator";
 import * as Layer from "effect/Layer";
-import * as Client from "./Client.js";
+import { SqliteClient } from "./Client.js";
 /**
@@ -18,3 +19,3 @@ * @since 1.0.0
  */
-export declare const run: <R>(options: Migrator.MigratorOptions<R>) => Effect.Effect<ReadonlyArray<readonly [id: number, name: string]>, SqlError | Migrator.MigrationError, Client.SqliteClient | R | FileSystem | Path | CommandExecutor>;
+export declare const run: <R2 = never>(options: Migrator.MigratorOptions<R2>) => Effect.Effect<ReadonlyArray<readonly [id: number, name: string]>, Migrator.MigrationError | SqlError, FileSystem | Path | SqliteClient | Client.Client | CommandExecutor | R2>;
 /**
@@ -24,3 +25,3 @@ * @category constructor
  */
-export declare const layer: <R>(options: Migrator.MigratorOptions<R>) => Layer.Layer<never, SqlError | Migrator.MigrationError, R | Client.SqliteClient | FileSystem | Path | CommandExecutor>;
+export declare const layer: <R>(options: Migrator.MigratorOptions<R>) => Layer.Layer<never, SqlError | Migrator.MigrationError, SqliteClient | Client.Client | CommandExecutor | FileSystem | Path | R>;
 //# sourceMappingURL=Migrator.d.ts.map

dist/dts/Migrator.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Migrator.d.ts","sourceRoot":"","sources":["../../src/Migrator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAErC;;GAEG;AACH,cAAc,sBAAsB,CAAA;AAEpC;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,CAAC,EAClB,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,CAAC,CAAC,KACjC,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,GAAG,QAAQ,CAAC,cAAc,EAClC,MAAM,CAAC,YAAY,GAAG,CAAC,GAAG,UAAU,GAAG,IAAI,GAAG,eAAe,CAoD7D,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,eACP,SAAS,eAAe,CAAC,CAAC,CAAC,KACnC,WAAW,CACZ,KAAK,EACL,QAAQ,GAAG,SAAS,cAAc,EAClC,CAAC,GAAG,OAAO,YAAY,GAAG,UAAU,GAAG,IAAI,GAAG,eAAe,CACzB,CAAA"}
+{"version":3,"file":"Migrator.d.ts","sourceRoot":"","sources":["../../src/Migrator.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,KAAK,KAAK,MAAM,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C;;GAEG;AACH,cAAc,sBAAsB,CAAA;AAEpC;;;GAGG;AACH,eAAO,MAAM,GAAG,EAAE,CAAC,EAAE,GAAG,KAAK,EAC3B,OAAO,EAAE,QAAQ,CAAC,eAAe,CAAC,EAAE,CAAC,KAClC,MAAM,CAAC,MAAM,CAChB,aAAa,CAAC,SAAS,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC,EAClD,QAAQ,CAAC,cAAc,GAAG,QAAQ,EAClC,UAAU,GAAG,IAAI,GAAG,YAAY,GAAG,MAAM,CAAC,MAAM,GAAG,eAAe,GAAG,EAAE,CA2CvE,CAAA;AAEF;;;GAGG;AACH,eAAO,MAAM,KAAK,eACP,SAAS,eAAe,CAAC,CAAC,CAAC,KACnC,MAAM,KAAK,CACZ,KAAK,EACL,QAAQ,GAAG,SAAS,cAAc,EAClC,YAAY,GAAG,OAAO,MAAM,GAAG,eAAe,GAAG,UAAU,GAAG,IAAI,GAAG,CAAC,CAClC,CAAA"}

dist/esm/Client.js

@@ -7,2 +7,3 @@ /**
 import * as Statement from "@effect/sql/Statement";
+import * as Otel from "@opentelemetry/semantic-conventions";
 import { Database } from "bun:sqlite";
@@ -16,6 +17,11 @@ import * as Config from "effect/Config";
 /**
+ * @category type ids
+ * @since 1.0.0
+ */
+export const TypeId = /*#__PURE__*/Symbol.for("@effect/sql-sqlite-bun/Client");
+/**
  * @category tags
  * @since 1.0.0
  */
-export const SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-bun/SqliteClient");
+export const SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-bun/Client");
 /**
@@ -26,4 +32,4 @@ * @category constructor
 export const make = options => Effect.gen(function* (_) {
-  const compiler = makeCompiler(options.transformQueryNames);
-  const transformRows = Client.defaultTransforms(options.transformResultNames).array;
+  const compiler = Statement.makeCompilerSqlite(options.transformQueryNames);
+  const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
   const makeConnection = Effect.gen(function* (_) {
@@ -89,4 +95,6 @@ const db = new Database(options.filename, {
     compiler,
-    transactionAcquirer
+    transactionAcquirer,
+    spanAttributes: [[Otel.SEMATTRS_DB_SYSTEM, Otel.DBSYSTEMVALUES_SQLITE]]
   }), {
+    [TypeId]: TypeId,
     config: options,
@@ -101,14 +109,3 @@ export: Effect.flatMap(acquirer, _ => _.export),
  */
-export const layer = config => Layer.scoped(SqliteClient, Effect.flatMap(Config.unwrap(config), make));
-const escape = /*#__PURE__*/Statement.defaultEscape("\"");
-/**
- * @category compiler
- * @since 1.0.0
- */
-export const makeCompiler = transform => Statement.makeCompiler({
-  placeholder: _ => `?`,
-  onIdentifier: transform ? _ => escape(transform(_)) : escape,
-  onRecordUpdate: () => ["", []],
-  onCustom: () => ["", []]
-});
+export const layer = config => Layer.scopedContext(Config.unwrap(config).pipe(Effect.flatMap(make), Effect.map(client => Context.make(SqliteClient, client).pipe(Context.add(Client.Client, client)))));
 //# sourceMappingURL=Client.js.map

dist/esm/Client.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Client.js","names":["Client","SqlError","Statement","Database","Config","Context","Effect","identity","Layer","Scope","SqliteClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","filename","readonly","readwrite","create","addFinalizer","sync","close","disableWAL","run","sql","params","try","query","all","catch","error","runTransform","map","runValues","values","execute","executeValues","executeWithoutTransform","executeRaw","executeStream","_sql","_params","dieMessage","export","serialize","loadExtension","path","semaphore","makeSemaphore","connection","acquirer","withPermits","succeed","transactionAcquirer","uninterruptibleMask","restore","as","zipRight","take","tap","scope","release","Object","assign","config","flatMap","layer","scoped","unwrap","escape","defaultEscape","transform","placeholder","onIdentifier","onRecordUpdate","onCustom"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Client.js","names":["Client","SqlError","Statement","Otel","Database","Config","Context","Effect","identity","Layer","Scope","TypeId","Symbol","for","SqliteClient","GenericTag","make","options","gen","_","compiler","makeCompilerSqlite","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","filename","readonly","readwrite","create","addFinalizer","sync","close","disableWAL","run","sql","params","try","query","all","catch","error","runTransform","map","runValues","values","execute","executeValues","executeWithoutTransform","executeRaw","executeStream","_sql","_params","dieMessage","export","serialize","loadExtension","path","semaphore","makeSemaphore","connection","acquirer","withPermits","succeed","transactionAcquirer","uninterruptibleMask","restore","as","zipRight","take","tap","scope","release","Object","assign","spanAttributes","SEMATTRS_DB_SYSTEM","DBSYSTEMVALUES_SQLITE","config","flatMap","layer","scopedContext","unwrap","pipe","client","add"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

dist/esm/index.js

@@ -11,19 +11,3 @@ /**
  */
-export * as error from "@effect/sql/Error";
-/**
- * @since 1.0.0
- */
 export * as migrator from "./Migrator.js";
-/**
- * @since 1.0.0
- */
-export * as resolver from "@effect/sql/Resolver";
-/**
- * @since 1.0.0
- */
-export * as schema from "@effect/sql/Schema";
-/**
- * @since 1.0.0
- */
-export * as statement from "@effect/sql/Statement";
 //# sourceMappingURL=index.js.map

dist/esm/index.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"index.js","names":["client","error","migrator","resolver","schema","statement"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,aAAa;AAErC;;;AAGA,OAAO,KAAKC,KAAK,MAAM,mBAAmB;AAE1C;;;AAGA,OAAO,KAAKC,QAAQ,MAAM,eAAe;AAEzC;;;AAGA,OAAO,KAAKC,QAAQ,MAAM,sBAAsB;AAEhD;;;AAGA,OAAO,KAAKC,MAAM,MAAM,oBAAoB;AAE5C;;;AAGA,OAAO,KAAKC,SAAS,MAAM,uBAAuB","ignoreList":[]}
+{"version":3,"file":"index.js","names":["client","migrator"],"sources":["../../src/index.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAIA;;;AAGA,OAAO,KAAKA,MAAM,MAAM,aAAa;AAErC;;;AAGA,OAAO,KAAKC,QAAQ,MAAM,eAAe","ignoreList":[]}

dist/esm/Migrator.js

@@ -10,3 +10,3 @@ /**
 import * as Layer from "effect/Layer";
-import * as Client from "./Client.js";
+import { SqliteClient } from "./Client.js";
 /**
@@ -21,14 +21,5 @@ * @since 1.0.0
 export const run = /*#__PURE__*/Migrator.make({
-  getClient: Client.SqliteClient,
-  ensureTable(sql, table) {
-    return sql`
-      CREATE TABLE IF NOT EXISTS ${sql(table)} (
-        migration_id integer PRIMARY KEY NOT NULL,
-        created_at datetime NOT NULL DEFAULT current_timestamp,
-        name VARCHAR(255) NOT NULL
-      )
-    `;
-  },
-  dumpSchema(sql, path, table) {
+  dumpSchema(path, table) {
     const dump = args => Effect.gen(function* (_) {
+      const sql = yield* SqliteClient;
       const dump = yield* _(Command.make("sqlite3", sql.config.filename, ...args), Command.string);
@@ -35,0 +26,0 @@ return dump.replace(/^create table sqlite_sequence\(.*$/im, "").replace(/\n{2,}/gm, "\n\n").trim();

dist/esm/Migrator.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"Migrator.js","names":["Command","FileSystem","Path","Migrator","Effect","Layer","Client","run","make","getClient","SqliteClient","ensureTable","sql","table","dumpSchema","path","dump","args","gen","_","config","filename","string","replace","trim","pipe","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/Migrator.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Migrator.js","names":["Command","FileSystem","Path","Migrator","Effect","Layer","SqliteClient","run","make","dumpSchema","path","table","dump","args","gen","_","sql","config","filename","string","replace","trim","pipe","mapError","error","MigrationError","reason","message","dumpMigrations","dumpAll","map","all","concurrency","schema","migrations","dumpFile","file","fs","makeDirectory","dirname","recursive","writeFileString","layer","options","effectDiscard"],"sources":["../../src/Migrator.ts"],"sourcesContent":[null],"mappings":"AAAA;;;AAGA,OAAO,KAAKA,OAAO,MAAM,0BAA0B;AAEnD,SAASC,UAAU,QAAQ,6BAA6B;AACxD,SAASC,IAAI,QAAQ,uBAAuB;AAG5C,OAAO,KAAKC,QAAQ,MAAM,sBAAsB;AAChD,OAAO,KAAKC,MAAM,MAAM,eAAe;AACvC,OAAO,KAAKC,KAAK,MAAM,cAAc;AACrC,SAASC,YAAY,QAAQ,aAAa;AAE1C;;;AAGA,cAAc,sBAAsB;AAEpC;;;;AAIA,OAAO,MAAMC,GAAG,gBAMZJ,QAAQ,CAACK,IAAI,CAAC;EAChBC,UAAUA,CAACC,IAAI,EAAEC,KAAK;IACpB,MAAMC,IAAI,GAAIC,IAAmB,IAC/BT,MAAM,CAACU,GAAG,CAAC,WAAUC,CAAC;MACpB,MAAMC,GAAG,GAAG,OAAOV,YAAY;MAC/B,MAAMM,IAAI,GAAG,OAAOG,CAAC,CACnBf,OAAO,CAACQ,IAAI,CAAC,SAAS,EAAGQ,GAAoB,CAACC,MAAM,CAACC,QAAQ,EAAE,GAAGL,IAAI,CAAC,EACvEb,OAAO,CAACmB,MAAM,CACf;MACD,OAAOP,IAAI,CAACQ,OAAO,CAAC,sCAAsC,EAAE,EAAE,CAAC,CAC5DA,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAC3BC,IAAI,EAAE;IACX,CAAC,CAAC,CAACC,IAAI,CACLlB,MAAM,CAACmB,QAAQ,CAAEC,KAAK,IAAK,IAAIrB,QAAQ,CAACsB,cAAc,CAAC;MAAEC,MAAM,EAAE,QAAQ;MAAEC,OAAO,EAAEH,KAAK,CAACG;IAAO,CAAE,CAAC,CAAC,CACtG;IAEH,MAAMlB,UAAU,GAAGG,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;IAEpC,MAAMgB,cAAc,GAAGhB,IAAI,CAAC,CAC1B,OAAO,EACP,gBAAgBD,KAAK,EAAE,EACvB,iBAAiBA,KAAK,EAAE,CACzB,CAAC;IAEF,MAAMkB,OAAO,GAAGzB,MAAM,CAAC0B,GAAG,CACxB1B,MAAM,CAAC2B,GAAG,CAAC,CAACtB,UAAU,EAAEmB,cAAc,CAAC,EAAE;MAAEI,WAAW,EAAE;IAAC,CAAE,CAAC,EAC5D,CAAC,CAACC,MAAM,EAAEC,UAAU,CAAC,KAAKD,MAAM,GAAG,MAAM,GAAGC,UAAU,CACvD;IAED,MAAMC,QAAQ,GAAIC,IAAY,IAC5BhC,MAAM,CAACU,GAAG,CAAC,WAAUC,CAAC;MACpB,MAAMsB,EAAE,GAAG,OAAOtB,CAAC,CAACd,UAAU,CAAC;MAC/B,MAAMS,IAAI,GAAG,OAAOK,CAAC,CAACb,IAAI,CAAC;MAC3B,MAAMU,IAAI,GAAG,OAAOG,CAAC,CAACc,OAAO,CAAC;MAC9B,OAAOd,CAAC,CAACsB,EAAE,CAACC,aAAa,CAAC5B,IAAI,CAAC6B,OAAO,CAACH,IAAI,CAAC,EAAE;QAAEI,SAAS,EAAE;MAAI,CAAE,CAAC,CAAC;MACnE,OAAOzB,CAAC,CAACsB,EAAE,CAACI,eAAe,CAACL,IAAI,EAAExB,IAAI,CAAC,CAAC;IAC1C,CAAC,CAAC,CAACU,IAAI,CACLlB,MAAM,CAACmB,QAAQ,CAAEC,KAAK,IAAK,IAAIrB,QAAQ,CAACsB,cAAc,CAAC;MAAEC,MAAM,EAAE,QAAQ;MAAEC,OAAO,EAAEH,KAAK,CAACG;IAAO,CAAE,CAAC,CAAC,CACtG;IAEH,OAAOQ,QAAQ,CAACzB,IAAI,CAAC;EACvB;CACD,CAAC;AAEF;;;;AAIA,OAAO,MAAMgC,KAAK,GAChBC,OAAoC,IAKjCtC,KAAK,CAACuC,aAAa,CAACrC,GAAG,CAACoC,OAAO,CAAC,CAAC","ignoreList":[]}

package.json

 {
   "name": "@effect/sql-sqlite-bun",
-  "version": "0.0.0-snapshot-78b767c2b1625186e17131761a0edbac25d21850",
+  "version": "0.0.0-snapshot-a451d9997e8c09bbbfb2025dcfec7f669464c9d8",
   "description": "A SQLite toolkit for Effect",
@@ -8,11 +8,17 @@ "license": "MIT",
     "type": "git",
-    "url": "https://github.com/effect-ts/effect.git",
+    "url": "https://github.com/Effect-TS/effect.git",
     "directory": "packages/sql-sqlite-bun"
   },
   "sideEffects": [],
+  "dependencies": {
+    "@opentelemetry/semantic-conventions": "^1.24.1"
+  },
   "peerDependencies": {
-    "@effect/platform": "^0.0.0-snapshot-78b767c2b1625186e17131761a0edbac25d21850",
-    "@effect/sql": "^0.0.0-snapshot-78b767c2b1625186e17131761a0edbac25d21850",
-    "effect": "^0.0.0-snapshot-78b767c2b1625186e17131761a0edbac25d21850"
+    "@effect/platform": "^0.0.0-snapshot-a451d9997e8c09bbbfb2025dcfec7f669464c9d8",
+    "@effect/sql": "^0.0.0-snapshot-a451d9997e8c09bbbfb2025dcfec7f669464c9d8",
+    "effect": "^0.0.0-snapshot-a451d9997e8c09bbbfb2025dcfec7f669464c9d8"
   },
+  "publishConfig": {
+    "provenance": true
+  },
   "main": "./dist/cjs/index.js",
@@ -19,0 +25,0 @@ "module": "./dist/esm/index.js",

src/Client.ts

@@ -8,2 +8,3 @@ /**
 import * as Statement from "@effect/sql/Statement"
+import * as Otel from "@opentelemetry/semantic-conventions"
 import { Database } from "bun:sqlite"
@@ -19,2 +20,14 @@ import * as Config from "effect/Config"
 /**
+ * @category type ids
+ * @since 1.0.0
+ */
+export const TypeId: unique symbol = Symbol.for("@effect/sql-sqlite-bun/Client")
+
+/**
+ * @category type ids
+ * @since 1.0.0
+ */
+export type TypeId = typeof TypeId
+
+/**
  * @category models
@@ -24,5 +37,9 @@ * @since 1.0.0
 export interface SqliteClient extends Client.Client {
+  readonly [TypeId]: TypeId
   readonly config: SqliteClientConfig
   readonly export: Effect.Effect<Uint8Array, SqlError>
   readonly loadExtension: (path: string) => Effect.Effect<void, SqlError>
+
+  /** Not supported in sqlite */
+  readonly updateValues: never
 }
@@ -34,5 +51,3 @@
  */
-export const SqliteClient: Context.Tag<SqliteClient, SqliteClient> = Context.GenericTag(
-  "@effect/sql-sqlite-bun/SqliteClient"
-)
+export const SqliteClient = Context.GenericTag<SqliteClient>("@effect/sql-sqlite-bun/Client")
 
@@ -67,4 +82,4 @@ /**
   Effect.gen(function*(_) {
-    const compiler = makeCompiler(options.transformQueryNames)
-    const transformRows = Client.defaultTransforms(
+    const compiler = Statement.makeCompilerSqlite(options.transformQueryNames)
+    const transformRows = Statement.defaultTransforms(
       options.transformResultNames!
@@ -156,5 +171,7 @@ ).array
         compiler,
-        transactionAcquirer
-      }),
+        transactionAcquirer,
+        spanAttributes: [[Otel.SEMATTRS_DB_SYSTEM, Otel.DBSYSTEMVALUES_SQLITE]]
+      }) as SqliteClient,
       {
+        [TypeId]: TypeId as TypeId,
         config: options,
@@ -173,20 +190,12 @@ export: Effect.flatMap(acquirer, (_) => _.export),
   config: Config.Config.Wrap<SqliteClientConfig>
-): Layer.Layer<SqliteClient, ConfigError> =>
-  Layer.scoped(
-    SqliteClient,
-    Effect.flatMap(Config.unwrap(config), make)
+): Layer.Layer<SqliteClient | Client.Client, ConfigError> =>
+  Layer.scopedContext(
+    Config.unwrap(config).pipe(
+      Effect.flatMap(make),
+      Effect.map((client) =>
+        Context.make(SqliteClient, client).pipe(
+          Context.add(Client.Client, client)
+        )
+      )
+    )
   )
-
-const escape = Statement.defaultEscape("\"")
-
-/**
- * @category compiler
- * @since 1.0.0
- */
-export const makeCompiler = (transform?: (_: string) => string) =>
-  Statement.makeCompiler({
-    placeholder: (_) => `?`,
-    onIdentifier: transform ? (_) => escape(transform(_)) : escape,
-    onRecordUpdate: () => ["", []],
-    onCustom: () => ["", []]
-  })

src/index.ts

@@ -13,22 +13,2 @@ /**
  */
-export * as error from "@effect/sql/Error"
-
-/**
- * @since 1.0.0
- */
 export * as migrator from "./Migrator.js"
-
-/**
- * @since 1.0.0
- */
-export * as resolver from "@effect/sql/Resolver"
-
-/**
- * @since 1.0.0
- */
-export * as schema from "@effect/sql/Schema"
-
-/**
- * @since 1.0.0
- */
-export * as statement from "@effect/sql/Statement"

src/Migrator.ts

@@ -8,2 +8,3 @@ /**
 import { Path } from "@effect/platform/Path"
+import type * as Client from "@effect/sql/Client"
 import type { SqlError } from "@effect/sql/Error"
@@ -13,3 +14,3 @@ import * as Migrator from "@effect/sql/Migrator"
 import * as Layer from "effect/Layer"
-import * as Client from "./Client.js"
+import { SqliteClient } from "./Client.js"
 
@@ -25,24 +26,15 @@ /**
  */
-export const run: <R>(
-  options: Migrator.MigratorOptions<R>
+export const run: <R2 = never>(
+  options: Migrator.MigratorOptions<R2>
 ) => Effect.Effect<
   ReadonlyArray<readonly [id: number, name: string]>,
-  SqlError | Migrator.MigrationError,
-  Client.SqliteClient | R | FileSystem | Path | CommandExecutor
+  Migrator.MigrationError | SqlError,
+  FileSystem | Path | SqliteClient | Client.Client | CommandExecutor | R2
 > = Migrator.make({
-  getClient: Client.SqliteClient,
-  ensureTable(sql, table) {
-    return sql`
-      CREATE TABLE IF NOT EXISTS ${sql(table)} (
-        migration_id integer PRIMARY KEY NOT NULL,
-        created_at datetime NOT NULL DEFAULT current_timestamp,
-        name VARCHAR(255) NOT NULL
-      )
-    `
-  },
-  dumpSchema(sql, path, table) {
+  dumpSchema(path, table) {
     const dump = (args: Array<string>) =>
       Effect.gen(function*(_) {
+        const sql = yield* SqliteClient
         const dump = yield* _(
-          Command.make("sqlite3", sql.config.filename, ...args),
+          Command.make("sqlite3", (sql as SqliteClient).config.filename, ...args),
           Command.string
@@ -94,3 +86,3 @@ )
   SqlError | Migrator.MigrationError,
-  R | Client.SqliteClient | FileSystem | Path | CommandExecutor
+  SqliteClient | Client.Client | CommandExecutor | FileSystem | Path | R
 > => Layer.effectDiscard(run(options))

No alert changes

Worsened metrics

Total package byte prevSize

52379

-3.23%

Dependency count

4

33.33%

Lines of code

795

-8.41%

Dependency changes

• + Added

  @opentelemetry/semantic-conventions@^1.24.1