@effect/sql-sqlite-node 0.1.17 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -3,7 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.makeCompiler = exports.make = exports.layer = exports.SqliteClient = void 0;
6
+ exports.make = exports.layer = exports.TypeId = exports.SqliteClient = void 0;
7
7
  var Client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Client"));
8
8
  var _Error = /*#__PURE__*/require("@effect/sql/Error");
9
9
  var Statement = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Statement"));
@@ -50,18 +50,23 @@ function _interopRequireWildcard(e, r) {
50
50
  * @since 1.0.0
51
51
  */
52
52
 
53
+ /**
54
+ * @category type ids
55
+ * @since 1.0.0
56
+ */
57
+ const TypeId = exports.TypeId = /*#__PURE__*/Symbol.for("@effect/sql-sqlite-node/Client");
53
58
  /**
54
59
  * @category tags
55
60
  * @since 1.0.0
56
61
  */
57
- const SqliteClient = exports.SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-node/SqliteClient");
62
+ const SqliteClient = exports.SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-node/Client");
58
63
  /**
59
64
  * @category constructor
60
65
  * @since 1.0.0
61
66
  */
62
67
  const make = options => Effect.gen(function* (_) {
63
- const compiler = makeCompiler(options.transformQueryNames);
64
- const transformRows = Client.defaultTransforms(options.transformResultNames).array;
68
+ const compiler = Statement.makeCompilerSqlite(options.transformQueryNames);
69
+ const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
65
70
  const makeConnection = Effect.gen(function* (_) {
66
71
  const db = new _betterSqlite.default(options.filename, {
67
72
  readonly: options.readonly ?? false
@@ -149,6 +154,7 @@ const make = options => Effect.gen(function* (_) {
149
154
  transactionAcquirer,
150
155
  spanAttributes: [["db.system", "sqlite"]]
151
156
  }), {
157
+ [TypeId]: TypeId,
152
158
  config: options,
153
159
  export: Effect.flatMap(acquirer, _ => _.export),
154
160
  loadExtension: path => Effect.flatMap(acquirer, _ => _.loadExtension(path))
@@ -159,18 +165,6 @@ const make = options => Effect.gen(function* (_) {
159
165
  * @since 1.0.0
160
166
  */
161
167
  exports.make = make;
162
- const layer = config => Layer.scoped(SqliteClient, Effect.flatMap(Config.unwrap(config), make));
168
+ 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)))));
163
169
  exports.layer = layer;
164
- const escape = /*#__PURE__*/Statement.defaultEscape("\"");
165
- /**
166
- * @category compiler
167
- * @since 1.0.0
168
- */
169
- const makeCompiler = transform => Statement.makeCompiler({
170
- placeholder: _ => `?`,
171
- onIdentifier: transform ? _ => escape(transform(_)) : escape,
172
- onRecordUpdate: () => ["", []],
173
- onCustom: () => ["", []]
174
- });
175
- exports.makeCompiler = makeCompiler;
176
170
  //# sourceMappingURL=Client.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Client.js","names":["Client","_interopRequireWildcard","require","_Error","Statement","_betterSqlite","_interopRequireDefault","Cache","Config","Context","Duration","Effect","_Function","Layer","Scope","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","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","filename","readonly","addFinalizer","sync","close","disableWAL","pragma","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","error","SqlError","runStatement","statement","params","reader","all","run","flatMap","s","runRaw","map","runTransform","runValues","acquireUseRelease","pipe","raw","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","config","layer","scoped","unwrap","escape","defaultEscape","transform","placeholder","onIdentifier","onRecordUpdate","onCustom"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"Client.js","names":["Client","_interopRequireWildcard","require","_Error","Statement","_betterSqlite","_interopRequireDefault","Cache","Config","Context","Duration","Effect","_Function","Layer","Scope","obj","__esModule","default","_getRequireWildcardCache","e","WeakMap","r","t","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","filename","readonly","addFinalizer","sync","close","disableWAL","pragma","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","error","SqlError","runStatement","statement","params","reader","all","run","flatMap","s","runRaw","map","runTransform","runValues","acquireUseRelease","pipe","raw","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","config","layer","scopedContext","unwrap","client","add"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -25,7 +25,7 @@ Object.keys(Migrator).forEach(function (key) {
25
25
  });
26
26
  var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Effect"));
27
27
  var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("effect/Layer"));
28
- var Client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Client.js"));
28
+ var _Client = /*#__PURE__*/require("./Client.js");
29
29
  function _getRequireWildcardCache(e) {
30
30
  if ("function" != typeof WeakMap) return null;
31
31
  var r = new WeakMap(),
@@ -64,18 +64,9 @@ function _interopRequireWildcard(e, r) {
64
64
  * @since 1.0.0
65
65
  */
66
66
  const run = exports.run = /*#__PURE__*/Migrator.make({
67
- getClient: Client.SqliteClient,
68
- ensureTable(sql, table) {
69
- return sql`
70
- CREATE TABLE IF NOT EXISTS ${sql(table)} (
71
- migration_id integer PRIMARY KEY NOT NULL,
72
- created_at datetime NOT NULL DEFAULT current_timestamp,
73
- name VARCHAR(255) NOT NULL
74
- )
75
- `;
76
- },
77
- dumpSchema(sql, path, table) {
67
+ dumpSchema(path, table) {
78
68
  const dump = args => Effect.gen(function* (_) {
69
+ const sql = yield* _Client.SqliteClient;
79
70
  const dump = yield* _(Command.make("sqlite3", sql.config.filename, ...args), Command.string);
80
71
  return dump.replace(/^create table sqlite_sequence\(.*$/im, "").replace(/\n{2,}/gm, "\n\n").trim();
81
72
  }).pipe(Effect.mapError(error => new Migrator.MigrationError({
@@ -1 +1 @@
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":[]}
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","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":";;;;;;;;;;AAGA,IAAAA,OAAA,gBAAAC,uBAAA,eAAAC,OAAA;AAEA,IAAAC,WAAA,gBAAAD,OAAA;AACA,IAAAE,KAAA,gBAAAF,OAAA;AAGA,IAAAG,QAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AAQAI,MAAA,CAAAC,IAAA,CAAAF,QAAA,EAAAG,OAAA,WAAAC,GAAA;EAAA,IAAAA,GAAA,kBAAAA,GAAA;EAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAC,YAAA,EAAAJ,GAAA;EAAA,IAAAA,GAAA,IAAAK,OAAA,IAAAA,OAAA,CAAAL,GAAA,MAAAJ,QAAA,CAAAI,GAAA;EAAAH,MAAA,CAAAS,cAAA,CAAAD,OAAA,EAAAL,GAAA;IAAAO,UAAA;IAAAC,GAAA,WAAAA,CAAA;MAAA,OAAAZ,QAAA,CAAAI,GAAA;IAAA;EAAA;AAAA;AAPA,IAAAS,MAAA,gBAAAjB,uBAAA,eAAAC,OAAA;AACA,IAAAiB,KAAA,gBAAAlB,uBAAA,eAAAC,OAAA;AACA,IAAAkB,OAAA,gBAAAlB,OAAA;AAA0C,SAAAmB,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,SAAArB,wBAAAqB,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,CAAAR,GAAA,CAAAK,CAAA;EAAA,IAAAO,CAAA;MAAAC,SAAA;IAAA;IAAAC,CAAA,GAAAzB,MAAA,CAAAS,cAAA,IAAAT,MAAA,CAAA0B,wBAAA;EAAA,SAAAC,CAAA,IAAAX,CAAA,oBAAAW,CAAA,OAAAtB,cAAA,CAAAC,IAAA,CAAAU,CAAA,EAAAW,CAAA;IAAA,IAAAC,CAAA,GAAAH,CAAA,GAAAzB,MAAA,CAAA0B,wBAAA,CAAAV,CAAA,EAAAW,CAAA;IAAAC,CAAA,KAAAA,CAAA,CAAAjB,GAAA,IAAAiB,CAAA,CAAAC,GAAA,IAAA7B,MAAA,CAAAS,cAAA,CAAAc,CAAA,EAAAI,CAAA,EAAAC,CAAA,IAAAL,CAAA,CAAAI,CAAA,IAAAX,CAAA,CAAAW,CAAA;EAAA;EAAA,OAAAJ,CAAA,CAAAF,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAU,GAAA,CAAAb,CAAA,EAAAO,CAAA,GAAAA,CAAA;AAAA;AAZ1C;;;;AAcA;;;;AAKA;;;;AAIO,MAAMO,GAAG,GAAAtB,OAAA,CAAAsB,GAAA,gBAMZ/B,QAAQ,CAACgC,IAAI,CAAC;EAChBC,UAAUA,CAACC,IAAI,EAAEC,KAAK;IACpB,MAAMC,IAAI,GAAIC,IAAmB,IAC/BxB,MAAM,CAACyB,GAAG,CAAC,WAAUC,CAAC;MACpB,MAAMC,GAAG,GAAG,OAAOzB,OAAA,CAAA0B,YAAY;MAC/B,MAAML,IAAI,GAAG,OAAOG,CAAC,CACnB5C,OAAO,CAACqC,IAAI,CAAC,SAAS,EAAEQ,GAAG,CAACE,MAAM,CAACC,QAAQ,EAAE,GAAGN,IAAI,CAAC,EACrD1C,OAAO,CAACiD,MAAM,CACf;MACD,OAAOR,IAAI,CAACS,OAAO,CAAC,sCAAsC,EAAE,EAAE,CAAC,CAC5DA,OAAO,CAAC,UAAU,EAAE,MAAM,CAAC,CAC3BC,IAAI,EAAE;IACX,CAAC,CAAC,CAACC,IAAI,CACLlC,MAAM,CAACmC,QAAQ,CAAEC,KAAK,IAAK,IAAIjD,QAAQ,CAACkD,cAAc,CAAC;MAAEC,MAAM,EAAE,QAAQ;MAAEC,OAAO,EAAEH,KAAK,CAACG;IAAO,CAAE,CAAC,CAAC,CACtG;IAEH,MAAMnB,UAAU,GAAGG,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;IAEpC,MAAMiB,cAAc,GAAGjB,IAAI,CAAC,CAC1B,OAAO,EACP,gBAAgBD,KAAK,EAAE,EACvB,iBAAiBA,KAAK,EAAE,CACzB,CAAC;IAEF,MAAMmB,OAAO,GAAGzC,MAAM,CAAC0C,GAAG,CACxB1C,MAAM,CAAC2C,GAAG,CAAC,CAACvB,UAAU,EAAEoB,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,IAC5BhD,MAAM,CAACyB,GAAG,CAAC,WAAUC,CAAC;MACpB,MAAMuB,EAAE,GAAG,OAAOvB,CAAC,CAACzC,WAAA,CAAAiE,UAAU,CAAC;MAC/B,MAAM7B,IAAI,GAAG,OAAOK,CAAC,CAACxC,KAAA,CAAAiE,IAAI,CAAC;MAC3B,MAAM5B,IAAI,GAAG,OAAOG,CAAC,CAACe,OAAO,CAAC;MAC9B,OAAOf,CAAC,CAACuB,EAAE,CAACG,aAAa,CAAC/B,IAAI,CAACgC,OAAO,CAACL,IAAI,CAAC,EAAE;QAAEM,SAAS,EAAE;MAAI,CAAE,CAAC,CAAC;MACnE,OAAO5B,CAAC,CAACuB,EAAE,CAACM,eAAe,CAACP,IAAI,EAAEzB,IAAI,CAAC,CAAC;IAC1C,CAAC,CAAC,CAACW,IAAI,CACLlC,MAAM,CAACmC,QAAQ,CAAEC,KAAK,IAAK,IAAIjD,QAAQ,CAACkD,cAAc,CAAC;MAAEC,MAAM,EAAE,QAAQ;MAAEC,OAAO,EAAEH,KAAK,CAACG;IAAO,CAAE,CAAC,CAAC,CACtG;IAEH,OAAOQ,QAAQ,CAAC1B,IAAI,CAAC;EACvB;CACD,CAAC;AAEF;;;;AAIO,MAAMmC,KAAK,GAChBC,OAAoC,IAKjCxD,KAAK,CAACyD,aAAa,CAACxC,GAAG,CAACuC,OAAO,CAAC,CAAC;AAAA7D,OAAA,CAAA4D,KAAA,GAAAA,KAAA","ignoreList":[]}
package/dist/cjs/index.js CHANGED
@@ -3,19 +3,11 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
- exports.statement = exports.schema = exports.resolver = exports.migrator = exports.error = exports.client = void 0;
6
+ exports.migrator = exports.client = void 0;
7
7
  var _client = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Client.js"));
8
8
  exports.client = _client;
9
- var _error = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Error"));
10
- exports.error = _error;
11
9
  var _migrator = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("./Migrator.js"));
12
10
  exports.migrator = _migrator;
13
- var _resolver = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Resolver"));
14
- exports.resolver = _resolver;
15
- var _schema = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Schema"));
16
- exports.schema = _schema;
17
- var _statement = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/sql/Statement"));
18
- exports.statement = _statement;
19
11
  function _getRequireWildcardCache(e) {
20
12
  if ("function" != typeof WeakMap) return null;
21
13
  var r = new WeakMap(),
@@ -3,7 +3,6 @@
3
3
  */
4
4
  import * as Client from "@effect/sql/Client";
5
5
  import { SqlError } from "@effect/sql/Error";
6
- import * as Statement from "@effect/sql/Statement";
7
6
  import * as Config from "effect/Config";
8
7
  import type { ConfigError } from "effect/ConfigError";
9
8
  import * as Context from "effect/Context";
@@ -11,14 +10,27 @@ import * as Duration from "effect/Duration";
11
10
  import * as Effect from "effect/Effect";
12
11
  import * as Layer from "effect/Layer";
13
12
  import * as Scope from "effect/Scope";
13
+ /**
14
+ * @category type ids
15
+ * @since 1.0.0
16
+ */
17
+ export declare const TypeId: unique symbol;
18
+ /**
19
+ * @category type ids
20
+ * @since 1.0.0
21
+ */
22
+ export type TypeId = typeof TypeId;
14
23
  /**
15
24
  * @category models
16
25
  * @since 1.0.0
17
26
  */
18
27
  export interface SqliteClient extends Client.Client {
28
+ readonly [TypeId]: TypeId;
19
29
  readonly config: SqliteClientConfig;
20
30
  readonly export: Effect.Effect<Uint8Array, SqlError>;
21
31
  readonly loadExtension: (path: string) => Effect.Effect<void, SqlError>;
32
+ /** Not supported in sqlite */
33
+ readonly updateValues: never;
22
34
  }
23
35
  /**
24
36
  * @category tags
@@ -47,10 +59,5 @@ export declare const make: (options: SqliteClientConfig) => Effect.Effect<Sqlite
47
59
  * @category layers
48
60
  * @since 1.0.0
49
61
  */
50
- export declare const layer: (config: Config.Config.Wrap<SqliteClientConfig>) => Layer.Layer<SqliteClient, ConfigError>;
51
- /**
52
- * @category compiler
53
- * @since 1.0.0
54
- */
55
- export declare const makeCompiler: (transform?: (_: string) => string) => Statement.Compiler;
62
+ export declare const layer: (config: Config.Config.Wrap<SqliteClientConfig>) => Layer.Layer<SqliteClient | Client.Client, ConfigError>;
56
63
  //# sourceMappingURL=Client.d.ts.map
@@ -1 +1 @@
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;AAGlD,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,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,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,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAC7D,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,CA2I7C,CAAA;AAEJ;;;GAGG;AACH,eAAO,MAAM,KAAK,WACR,OAAO,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAC7C,MAAM,KAAK,CAAC,YAAY,EAAE,WAAW,CAIrC,CAAA;AAIH;;;GAGG;AACH,eAAO,MAAM,YAAY,eAAgB,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,uBAM1D,CAAA"}
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;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,QAAQ,MAAM,iBAAiB,CAAA;AAC3C,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,MAAqD,CAAA;AAEjF;;;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,yCAAqE,CAAA;AAE9F;;;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,gBAAgB,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;IAC9C,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,aAAa,GAAG,SAAS,CAAA;IAC7D,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,CA4I7C,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"}
@@ -1,11 +1,12 @@
1
1
  import type { CommandExecutor } from "@effect/platform/CommandExecutor";
2
2
  import { FileSystem } from "@effect/platform/FileSystem";
3
3
  import { Path } from "@effect/platform/Path";
4
+ import type * as Client from "@effect/sql/Client";
4
5
  import type { SqlError } from "@effect/sql/Error";
5
6
  import * as Migrator from "@effect/sql/Migrator";
6
7
  import * as Effect from "effect/Effect";
7
8
  import * as Layer from "effect/Layer";
8
- import * as Client from "./Client.js";
9
+ import { SqliteClient } from "./Client.js";
9
10
  /**
10
11
  * @since 1.0.0
11
12
  */
@@ -14,10 +15,10 @@ export * from "@effect/sql/Migrator";
14
15
  * @category constructor
15
16
  * @since 1.0.0
16
17
  */
17
- 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>;
18
+ 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>;
18
19
  /**
19
20
  * @category constructor
20
21
  * @since 1.0.0
21
22
  */
22
- export declare const layer: <R>(options: Migrator.MigratorOptions<R>) => Layer.Layer<never, SqlError | Migrator.MigrationError, R | Client.SqliteClient | FileSystem | Path | CommandExecutor>;
23
+ export declare const layer: <R>(options: Migrator.MigratorOptions<R>) => Layer.Layer<never, SqlError | Migrator.MigrationError, SqliteClient | Client.Client | CommandExecutor | FileSystem | Path | R>;
23
24
  //# sourceMappingURL=Migrator.d.ts.map
@@ -1 +1 @@
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,MAAM,KAAK,CACZ,KAAK,EACL,QAAQ,GAAG,SAAS,cAAc,EAClC,CAAC,GAAG,OAAO,YAAY,GAAG,UAAU,GAAG,IAAI,GAAG,eAAe,CACzB,CAAA"}
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,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"}
@@ -5,24 +5,8 @@
5
5
  * @since 1.0.0
6
6
  */
7
7
  export * as client from "./Client.js";
8
- /**
9
- * @since 1.0.0
10
- */
11
- export * as error from "@effect/sql/Error";
12
8
  /**
13
9
  * @since 1.0.0
14
10
  */
15
11
  export * as migrator from "./Migrator.js";
16
- /**
17
- * @since 1.0.0
18
- */
19
- export * as resolver from "@effect/sql/Resolver";
20
- /**
21
- * @since 1.0.0
22
- */
23
- export * as schema from "@effect/sql/Schema";
24
- /**
25
- * @since 1.0.0
26
- */
27
- export * as statement from "@effect/sql/Statement";
28
12
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
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"}
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,QAAQ,MAAM,eAAe,CAAA"}
@@ -13,18 +13,23 @@ import * as Effect from "effect/Effect";
13
13
  import { identity } from "effect/Function";
14
14
  import * as Layer from "effect/Layer";
15
15
  import * as Scope from "effect/Scope";
16
+ /**
17
+ * @category type ids
18
+ * @since 1.0.0
19
+ */
20
+ export const TypeId = /*#__PURE__*/Symbol.for("@effect/sql-sqlite-node/Client");
16
21
  /**
17
22
  * @category tags
18
23
  * @since 1.0.0
19
24
  */
20
- export const SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-node/SqliteClient");
25
+ export const SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-node/Client");
21
26
  /**
22
27
  * @category constructor
23
28
  * @since 1.0.0
24
29
  */
25
30
  export const make = options => Effect.gen(function* (_) {
26
- const compiler = makeCompiler(options.transformQueryNames);
27
- const transformRows = Client.defaultTransforms(options.transformResultNames).array;
31
+ const compiler = Statement.makeCompilerSqlite(options.transformQueryNames);
32
+ const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
28
33
  const makeConnection = Effect.gen(function* (_) {
29
34
  const db = new Sqlite(options.filename, {
30
35
  readonly: options.readonly ?? false
@@ -112,6 +117,7 @@ export const make = options => Effect.gen(function* (_) {
112
117
  transactionAcquirer,
113
118
  spanAttributes: [["db.system", "sqlite"]]
114
119
  }), {
120
+ [TypeId]: TypeId,
115
121
  config: options,
116
122
  export: Effect.flatMap(acquirer, _ => _.export),
117
123
  loadExtension: path => Effect.flatMap(acquirer, _ => _.loadExtension(path))
@@ -121,16 +127,5 @@ export const make = options => Effect.gen(function* (_) {
121
127
  * @category layers
122
128
  * @since 1.0.0
123
129
  */
124
- export const layer = config => Layer.scoped(SqliteClient, Effect.flatMap(Config.unwrap(config), make));
125
- const escape = /*#__PURE__*/Statement.defaultEscape("\"");
126
- /**
127
- * @category compiler
128
- * @since 1.0.0
129
- */
130
- export const makeCompiler = transform => Statement.makeCompiler({
131
- placeholder: _ => `?`,
132
- onIdentifier: transform ? _ => escape(transform(_)) : escape,
133
- onRecordUpdate: () => ["", []],
134
- onCustom: () => ["", []]
135
- });
130
+ 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)))));
136
131
  //# sourceMappingURL=Client.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"Client.js","names":["Client","SqlError","Statement","Sqlite","Cache","Config","Context","Duration","Effect","identity","Layer","Scope","SqliteClient","GenericTag","make","options","gen","_","compiler","makeCompiler","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","filename","readonly","addFinalizer","sync","close","disableWAL","pragma","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","error","runStatement","statement","params","reader","all","run","flatMap","get","s","runRaw","map","runTransform","runValues","acquireUseRelease","pipe","raw","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","config","layer","scoped","unwrap","escape","defaultEscape","transform","placeholder","onIdentifier","onRecordUpdate","onCustom"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"file":"Client.js","names":["Client","SqlError","Statement","Sqlite","Cache","Config","Context","Duration","Effect","identity","Layer","Scope","TypeId","Symbol","for","SqliteClient","GenericTag","make","options","gen","_","compiler","makeCompilerSqlite","transformQueryNames","transformRows","defaultTransforms","transformResultNames","array","makeConnection","db","filename","readonly","addFinalizer","sync","close","disableWAL","pragma","prepareCache","capacity","prepareCacheSize","timeToLive","prepareCacheTTL","minutes","lookup","sql","try","prepare","catch","error","runStatement","statement","params","reader","all","run","flatMap","get","s","runRaw","map","runTransform","runValues","acquireUseRelease","pipe","raw","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","config","layer","scopedContext","unwrap","client","add"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
@@ -7,7 +7,7 @@ import { Path } from "@effect/platform/Path";
7
7
  import * as Migrator from "@effect/sql/Migrator";
8
8
  import * as Effect from "effect/Effect";
9
9
  import * as Layer from "effect/Layer";
10
- import * as Client from "./Client.js";
10
+ import { SqliteClient } from "./Client.js";
11
11
  /**
12
12
  * @since 1.0.0
13
13
  */
@@ -17,18 +17,9 @@ export * from "@effect/sql/Migrator";
17
17
  * @since 1.0.0
18
18
  */
19
19
  export const run = /*#__PURE__*/Migrator.make({
20
- getClient: Client.SqliteClient,
21
- ensureTable(sql, table) {
22
- return sql`
23
- CREATE TABLE IF NOT EXISTS ${sql(table)} (
24
- migration_id integer PRIMARY KEY NOT NULL,
25
- created_at datetime NOT NULL DEFAULT current_timestamp,
26
- name VARCHAR(255) NOT NULL
27
- )
28
- `;
29
- },
30
- dumpSchema(sql, path, table) {
20
+ dumpSchema(path, table) {
31
21
  const dump = args => Effect.gen(function* (_) {
22
+ const sql = yield* SqliteClient;
32
23
  const dump = yield* _(Command.make("sqlite3", sql.config.filename, ...args), Command.string);
33
24
  return dump.replace(/^create table sqlite_sequence\(.*$/im, "").replace(/\n{2,}/gm, "\n\n").trim();
34
25
  }).pipe(Effect.mapError(error => new Migrator.MigrationError({
@@ -1 +1 @@
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":[]}
1
+ {"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,EAAEQ,GAAG,CAACC,MAAM,CAACC,QAAQ,EAAE,GAAGL,IAAI,CAAC,EACrDb,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/dist/esm/index.js CHANGED
@@ -5,24 +5,8 @@
5
5
  * @since 1.0.0
6
6
  */
7
7
  export * as client from "./Client.js";
8
- /**
9
- * @since 1.0.0
10
- */
11
- export * as error from "@effect/sql/Error";
12
8
  /**
13
9
  * @since 1.0.0
14
10
  */
15
11
  export * as migrator from "./Migrator.js";
16
- /**
17
- * @since 1.0.0
18
- */
19
- export * as resolver from "@effect/sql/Resolver";
20
- /**
21
- * @since 1.0.0
22
- */
23
- export * as schema from "@effect/sql/Schema";
24
- /**
25
- * @since 1.0.0
26
- */
27
- export * as statement from "@effect/sql/Statement";
28
12
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
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":[]}
1
+ {"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":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@effect/sql-sqlite-node",
3
- "version": "0.1.17",
3
+ "version": "0.2.1",
4
4
  "description": "A SQLite toolkit for Effect",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -13,8 +13,8 @@
13
13
  "better-sqlite3": "^9.6.0"
14
14
  },
15
15
  "peerDependencies": {
16
- "@effect/platform": "^0.52.2",
17
- "@effect/sql": "^0.1.17",
16
+ "@effect/platform": "^0.52.3",
17
+ "@effect/sql": "^0.2.1",
18
18
  "effect": "^3.1.2"
19
19
  },
20
20
  "publishConfig": {
package/src/Client.ts CHANGED
@@ -16,23 +16,37 @@ import { identity } from "effect/Function"
16
16
  import * as Layer from "effect/Layer"
17
17
  import * as Scope from "effect/Scope"
18
18
 
19
+ /**
20
+ * @category type ids
21
+ * @since 1.0.0
22
+ */
23
+ export const TypeId: unique symbol = Symbol.for("@effect/sql-sqlite-node/Client")
24
+
25
+ /**
26
+ * @category type ids
27
+ * @since 1.0.0
28
+ */
29
+ export type TypeId = typeof TypeId
30
+
19
31
  /**
20
32
  * @category models
21
33
  * @since 1.0.0
22
34
  */
23
35
  export interface SqliteClient extends Client.Client {
36
+ readonly [TypeId]: TypeId
24
37
  readonly config: SqliteClientConfig
25
38
  readonly export: Effect.Effect<Uint8Array, SqlError>
26
39
  readonly loadExtension: (path: string) => Effect.Effect<void, SqlError>
40
+
41
+ /** Not supported in sqlite */
42
+ readonly updateValues: never
27
43
  }
28
44
 
29
45
  /**
30
46
  * @category tags
31
47
  * @since 1.0.0
32
48
  */
33
- export const SqliteClient: Context.Tag<SqliteClient, SqliteClient> = Context.GenericTag(
34
- "@effect/sql-sqlite-node/SqliteClient"
35
- )
49
+ export const SqliteClient = Context.GenericTag<SqliteClient>("@effect/sql-sqlite-node/Client")
36
50
 
37
51
  /**
38
52
  * @category models
@@ -62,8 +76,8 @@ export const make = (
62
76
  options: SqliteClientConfig
63
77
  ): Effect.Effect<SqliteClient, never, Scope.Scope> =>
64
78
  Effect.gen(function*(_) {
65
- const compiler = makeCompiler(options.transformQueryNames)
66
- const transformRows = Client.defaultTransforms(
79
+ const compiler = Statement.makeCompilerSqlite(options.transformQueryNames)
80
+ const transformRows = Statement.defaultTransforms(
67
81
  options.transformResultNames!
68
82
  ).array
69
83
 
@@ -192,8 +206,9 @@ export const make = (
192
206
  compiler,
193
207
  transactionAcquirer,
194
208
  spanAttributes: [["db.system", "sqlite"]]
195
- }),
209
+ }) as SqliteClient,
196
210
  {
211
+ [TypeId]: TypeId as TypeId,
197
212
  config: options,
198
213
  export: Effect.flatMap(acquirer, (_) => _.export),
199
214
  loadExtension: (path: string) => Effect.flatMap(acquirer, (_) => _.loadExtension(path))
@@ -207,22 +222,14 @@ export const make = (
207
222
  */
208
223
  export const layer = (
209
224
  config: Config.Config.Wrap<SqliteClientConfig>
210
- ): Layer.Layer<SqliteClient, ConfigError> =>
211
- Layer.scoped(
212
- SqliteClient,
213
- Effect.flatMap(Config.unwrap(config), make)
225
+ ): Layer.Layer<SqliteClient | Client.Client, ConfigError> =>
226
+ Layer.scopedContext(
227
+ Config.unwrap(config).pipe(
228
+ Effect.flatMap(make),
229
+ Effect.map((client) =>
230
+ Context.make(SqliteClient, client).pipe(
231
+ Context.add(Client.Client, client)
232
+ )
233
+ )
234
+ )
214
235
  )
215
-
216
- const escape = Statement.defaultEscape("\"")
217
-
218
- /**
219
- * @category compiler
220
- * @since 1.0.0
221
- */
222
- export const makeCompiler = (transform?: (_: string) => string) =>
223
- Statement.makeCompiler({
224
- placeholder: (_) => `?`,
225
- onIdentifier: transform ? (_) => escape(transform(_)) : escape,
226
- onRecordUpdate: () => ["", []],
227
- onCustom: () => ["", []]
228
- })
package/src/Migrator.ts CHANGED
@@ -5,11 +5,12 @@ import * as Command from "@effect/platform/Command"
5
5
  import type { CommandExecutor } from "@effect/platform/CommandExecutor"
6
6
  import { FileSystem } from "@effect/platform/FileSystem"
7
7
  import { Path } from "@effect/platform/Path"
8
+ import type * as Client from "@effect/sql/Client"
8
9
  import type { SqlError } from "@effect/sql/Error"
9
10
  import * as Migrator from "@effect/sql/Migrator"
10
11
  import * as Effect from "effect/Effect"
11
12
  import * as Layer from "effect/Layer"
12
- import * as Client from "./Client.js"
13
+ import { SqliteClient } from "./Client.js"
13
14
 
14
15
  /**
15
16
  * @since 1.0.0
@@ -20,26 +21,17 @@ export * from "@effect/sql/Migrator"
20
21
  * @category constructor
21
22
  * @since 1.0.0
22
23
  */
23
- export const run: <R>(
24
- options: Migrator.MigratorOptions<R>
24
+ export const run: <R2 = never>(
25
+ options: Migrator.MigratorOptions<R2>
25
26
  ) => Effect.Effect<
26
27
  ReadonlyArray<readonly [id: number, name: string]>,
27
- SqlError | Migrator.MigrationError,
28
- Client.SqliteClient | R | FileSystem | Path | CommandExecutor
28
+ Migrator.MigrationError | SqlError,
29
+ FileSystem | Path | SqliteClient | Client.Client | CommandExecutor | R2
29
30
  > = Migrator.make({
30
- getClient: Client.SqliteClient,
31
- ensureTable(sql, table) {
32
- return sql`
33
- CREATE TABLE IF NOT EXISTS ${sql(table)} (
34
- migration_id integer PRIMARY KEY NOT NULL,
35
- created_at datetime NOT NULL DEFAULT current_timestamp,
36
- name VARCHAR(255) NOT NULL
37
- )
38
- `
39
- },
40
- dumpSchema(sql, path, table) {
31
+ dumpSchema(path, table) {
41
32
  const dump = (args: Array<string>) =>
42
33
  Effect.gen(function*(_) {
34
+ const sql = yield* SqliteClient
43
35
  const dump = yield* _(
44
36
  Command.make("sqlite3", sql.config.filename, ...args),
45
37
  Command.string
@@ -88,5 +80,5 @@ export const layer = <R>(
88
80
  ): Layer.Layer<
89
81
  never,
90
82
  SqlError | Migrator.MigrationError,
91
- R | Client.SqliteClient | FileSystem | Path | CommandExecutor
83
+ SqliteClient | Client.Client | CommandExecutor | FileSystem | Path | R
92
84
  > => Layer.effectDiscard(run(options))
package/src/index.ts CHANGED
@@ -7,27 +7,7 @@
7
7
  */
8
8
  export * as client from "./Client.js"
9
9
 
10
- /**
11
- * @since 1.0.0
12
- */
13
- export * as error from "@effect/sql/Error"
14
-
15
10
  /**
16
11
  * @since 1.0.0
17
12
  */
18
13
  export * as migrator from "./Migrator.js"
19
-
20
- /**
21
- * @since 1.0.0
22
- */
23
- export * as resolver from "@effect/sql/Resolver"
24
-
25
- /**
26
- * @since 1.0.0
27
- */
28
- export * as schema from "@effect/sql/Schema"
29
-
30
- /**
31
- * @since 1.0.0
32
- */
33
- export * as statement from "@effect/sql/Statement"