@effect/sql-sqlite-bun 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.
- package/dist/cjs/Client.js +11 -17
- package/dist/cjs/Client.js.map +1 -1
- package/dist/cjs/Migrator.js +3 -12
- package/dist/cjs/Migrator.js.map +1 -1
- package/dist/cjs/index.js +1 -9
- package/dist/dts/Client.d.ts +14 -7
- package/dist/dts/Client.d.ts.map +1 -1
- package/dist/dts/Migrator.d.ts +4 -3
- package/dist/dts/Migrator.d.ts.map +1 -1
- package/dist/dts/index.d.ts +0 -16
- package/dist/dts/index.d.ts.map +1 -1
- package/dist/esm/Client.js +10 -15
- package/dist/esm/Client.js.map +1 -1
- package/dist/esm/Migrator.js +3 -12
- package/dist/esm/Migrator.js.map +1 -1
- package/dist/esm/index.js +0 -16
- package/dist/esm/index.js.map +1 -1
- package/package.json +3 -3
- package/src/Client.ts +31 -24
- package/src/Migrator.ts +10 -18
- package/src/index.ts +0 -20
package/dist/cjs/Client.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.
|
|
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"));
|
|
@@ -43,18 +43,23 @@ function _interopRequireWildcard(e, r) {
|
|
|
43
43
|
* @since 1.0.0
|
|
44
44
|
*/
|
|
45
45
|
|
|
46
|
+
/**
|
|
47
|
+
* @category type ids
|
|
48
|
+
* @since 1.0.0
|
|
49
|
+
*/
|
|
50
|
+
const TypeId = exports.TypeId = /*#__PURE__*/Symbol.for("@effect/sql-sqlite-bun/Client");
|
|
46
51
|
/**
|
|
47
52
|
* @category tags
|
|
48
53
|
* @since 1.0.0
|
|
49
54
|
*/
|
|
50
|
-
const SqliteClient = exports.SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-bun/
|
|
55
|
+
const SqliteClient = exports.SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-bun/Client");
|
|
51
56
|
/**
|
|
52
57
|
* @category constructor
|
|
53
58
|
* @since 1.0.0
|
|
54
59
|
*/
|
|
55
60
|
const make = options => Effect.gen(function* (_) {
|
|
56
|
-
const compiler =
|
|
57
|
-
const transformRows =
|
|
61
|
+
const compiler = Statement.makeCompilerSqlite(options.transformQueryNames);
|
|
62
|
+
const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
|
|
58
63
|
const makeConnection = Effect.gen(function* (_) {
|
|
59
64
|
const db = new _bunSqlite.Database(options.filename, {
|
|
60
65
|
readonly: options.readonly,
|
|
@@ -118,6 +123,7 @@ const make = options => Effect.gen(function* (_) {
|
|
|
118
123
|
transactionAcquirer,
|
|
119
124
|
spanAttributes: [["db.system", "sqlite"]]
|
|
120
125
|
}), {
|
|
126
|
+
[TypeId]: TypeId,
|
|
121
127
|
config: options,
|
|
122
128
|
export: Effect.flatMap(acquirer, _ => _.export),
|
|
123
129
|
loadExtension: path => Effect.flatMap(acquirer, _ => _.loadExtension(path))
|
|
@@ -128,18 +134,6 @@ const make = options => Effect.gen(function* (_) {
|
|
|
128
134
|
* @since 1.0.0
|
|
129
135
|
*/
|
|
130
136
|
exports.make = make;
|
|
131
|
-
const layer = config => Layer.
|
|
137
|
+
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)))));
|
|
132
138
|
exports.layer = layer;
|
|
133
|
-
const escape = /*#__PURE__*/Statement.defaultEscape("\"");
|
|
134
|
-
/**
|
|
135
|
-
* @category compiler
|
|
136
|
-
* @since 1.0.0
|
|
137
|
-
*/
|
|
138
|
-
const makeCompiler = transform => Statement.makeCompiler({
|
|
139
|
-
placeholder: _ => `?`,
|
|
140
|
-
onIdentifier: transform ? _ => escape(transform(_)) : escape,
|
|
141
|
-
onRecordUpdate: () => ["", []],
|
|
142
|
-
onCustom: () => ["", []]
|
|
143
|
-
});
|
|
144
|
-
exports.makeCompiler = makeCompiler;
|
|
145
139
|
//# sourceMappingURL=Client.js.map
|
package/dist/cjs/Client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
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","
|
|
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","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","config","flatMap","layer","scopedContext","unwrap","pipe","client","add"],"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;;;;AAgBA;;;;AAIO,MAAMW,MAAM,GAAAC,OAAA,CAAAD,MAAA,gBAAkBE,MAAM,CAACC,GAAG,CAAC,+BAA+B,CAAC;AAsBhF;;;;AAIO,MAAMC,YAAY,GAAAH,OAAA,CAAAG,YAAA,gBAAG7B,OAAO,CAAC8B,UAAU,CAAe,+BAA+B,CAAC;AAsB7F;;;;AAIO,MAAMC,IAAI,GACfC,OAA2B,IAE3B/B,MAAM,CAACgC,GAAG,CAAC,WAAUC,CAAC;EACpB,MAAMC,QAAQ,GAAGtC,SAAS,CAACuC,kBAAkB,CAACJ,OAAO,CAACK,mBAAmB,CAAC;EAC1E,MAAMC,aAAa,GAAGzC,SAAS,CAAC0C,iBAAiB,CAC/CP,OAAO,CAACQ,oBAAqB,CAC9B,CAACC,KAAK;EAEP,MAAMC,cAAc,GAAGzC,MAAM,CAACgC,GAAG,CAAC,WAAUC,CAAC;IAC3C,MAAMS,EAAE,GAAG,IAAI7C,UAAA,CAAA8C,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,CAACjC,MAAM,CAACgD,YAAY,CAAC,MAAMhD,MAAM,CAACiD,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/CtD,MAAM,CAACuD,GAAG,CAAC;MACTA,GAAG,EAAEA,CAAA,KAAMb,EAAE,CAACc,KAAK,CAACH,GAAG,CAAC,CAACI,GAAG,CAAC,GAAIH,MAAc,CAAe;MAC9DI,KAAK,EAAGC,KAAK,IAAK,IAAIhE,MAAA,CAAAiE,QAAQ,CAAC;QAAED;MAAK,CAAE;KACzC,CAAC;IAEJ,MAAME,YAAY,GAAG9B,OAAO,CAACQ,oBAAoB,GAC7C,CAACc,GAAW,EAAEC,MAA2C,KAAKtD,MAAM,CAAC8D,GAAG,CAACV,GAAG,CAACC,GAAG,EAAEC,MAAM,CAAC,EAAEjB,aAAa,CAAC,GACzGe,GAAG;IAEP,MAAMW,SAAS,GAAGA,CAChBV,GAAW,EACXC,MAAA,GAA6C,EAAE,KAE/CtD,MAAM,CAACuD,GAAG,CAAC;MACTA,GAAG,EAAEA,CAAA,KAAMb,EAAE,CAACc,KAAK,CAACH,GAAG,CAAC,CAACW,MAAM,CAAC,GAAIV,MAAc,CAAe;MACjEI,KAAK,EAAGC,KAAK,IAAK,IAAIhE,MAAA,CAAAiE,QAAQ,CAAC;QAAED;MAAK,CAAE;KACzC,CAAC;IAEJ,OAAO,IAAA1D,SAAA,CAAAgE,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,OAAOxE,MAAM,CAACyE,UAAU,CAAC,+BAA+B,CAAC;MAC3D,CAAC;MACDC,MAAM,EAAE1E,MAAM,CAACuD,GAAG,CAAC;QACjBA,GAAG,EAAEA,CAAA,KAAMb,EAAE,CAACiC,SAAS,EAAE;QACzBjB,KAAK,EAAGC,KAAK,IAAK,IAAIhE,MAAA,CAAAiE,QAAQ,CAAC;UAAED;QAAK,CAAE;OACzC,CAAC;MACFiB,aAAa,EAAGC,IAAI,IAClB7E,MAAM,CAACuD,GAAG,CAAC;QACTA,GAAG,EAAEA,CAAA,KAAMb,EAAE,CAACkC,aAAa,CAACC,IAAI,CAAC;QACjCnB,KAAK,EAAGC,KAAK,IAAK,IAAIhE,MAAA,CAAAiE,QAAQ,CAAC;UAAED;QAAK,CAAE;OACzC;KACJ,CAAC;EACJ,CAAC,CAAC;EAEF,MAAMmB,SAAS,GAAG,OAAO7C,CAAC,CAACjC,MAAM,CAAC+E,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,CAAClF,MAAM,CAACmF,OAAO,CAACH,UAAU,CAAC,CAAC;EACrE,MAAMI,mBAAmB,GAAGpF,MAAM,CAACqF,mBAAmB,CAAEC,OAAO,IAC7DtF,MAAM,CAACuF,EAAE,CACPvF,MAAM,CAACwF,QAAQ,CACbF,OAAO,CAACR,SAAS,CAACW,IAAI,CAAC,CAAC,CAAC,CAAC,EAC1BzF,MAAM,CAAC0F,GAAG,CACR1F,MAAM,CAAC2F,KAAK,EACXA,KAAK,IAAKxF,KAAK,CAAC6C,YAAY,CAAC2C,KAAK,EAAEb,SAAS,CAACc,OAAO,CAAC,CAAC,CAAC,CAAC,CAC3D,CACF,EACDZ,UAAU,CACX,CACF;EAED,OAAOhE,MAAM,CAAC6E,MAAM,CAClBrG,MAAM,CAACsC,IAAI,CAAC;IACVmD,QAAQ;IACR/C,QAAQ;IACRkD,mBAAmB;IACnBU,cAAc,EAAE,CAAC,CAAC,WAAW,EAAE,QAAQ,CAAC;GACzC,CAAiB,EAClB;IACE,CAACtE,MAAM,GAAGA,MAAgB;IAC1BuE,MAAM,EAAEhE,OAAO;IACf2C,MAAM,EAAE1E,MAAM,CAACgG,OAAO,CAACf,QAAQ,EAAGhD,CAAC,IAAKA,CAAC,CAACyC,MAAM,CAAC;IACjDE,aAAa,EAAGC,IAAY,IAAK7E,MAAM,CAACgG,OAAO,CAACf,QAAQ,EAAGhD,CAAC,IAAKA,CAAC,CAAC2C,aAAa,CAACC,IAAI,CAAC;GACvF,CACF;AACH,CAAC,CAAC;AAEJ;;;;AAAApD,OAAA,CAAAK,IAAA,GAAAA,IAAA;AAIO,MAAMmE,KAAK,GAChBF,MAA8C,IAE9C7F,KAAK,CAACgG,aAAa,CACjBpG,MAAM,CAACqG,MAAM,CAACJ,MAAM,CAAC,CAACK,IAAI,CACxBpG,MAAM,CAACgG,OAAO,CAAClE,IAAI,CAAC,EACpB9B,MAAM,CAAC8D,GAAG,CAAEuC,MAAM,IAChBtG,OAAO,CAAC+B,IAAI,CAACF,YAAY,EAAEyE,MAAM,CAAC,CAACD,IAAI,CACrCrG,OAAO,CAACuG,GAAG,CAAC9G,MAAM,CAACA,MAAM,EAAE6G,MAAM,CAAC,CACnC,CACF,CACF,CACF;AAAA5E,OAAA,CAAAwE,KAAA,GAAAA,KAAA","ignoreList":[]}
|
package/dist/cjs/Migrator.js
CHANGED
|
@@ -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
|
|
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
|
-
|
|
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({
|
package/dist/cjs/Migrator.js.map
CHANGED
|
@@ -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","
|
|
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":"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","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.
|
|
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(),
|
package/dist/dts/Client.d.ts
CHANGED
|
@@ -3,21 +3,33 @@
|
|
|
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";
|
|
10
9
|
import * as Effect from "effect/Effect";
|
|
11
10
|
import * as Layer from "effect/Layer";
|
|
12
11
|
import * as Scope from "effect/Scope";
|
|
12
|
+
/**
|
|
13
|
+
* @category type ids
|
|
14
|
+
* @since 1.0.0
|
|
15
|
+
*/
|
|
16
|
+
export declare const TypeId: unique symbol;
|
|
17
|
+
/**
|
|
18
|
+
* @category type ids
|
|
19
|
+
* @since 1.0.0
|
|
20
|
+
*/
|
|
21
|
+
export type TypeId = typeof TypeId;
|
|
13
22
|
/**
|
|
14
23
|
* @category models
|
|
15
24
|
* @since 1.0.0
|
|
16
25
|
*/
|
|
17
26
|
export interface SqliteClient extends Client.Client {
|
|
27
|
+
readonly [TypeId]: TypeId;
|
|
18
28
|
readonly config: SqliteClientConfig;
|
|
19
29
|
readonly export: Effect.Effect<Uint8Array, SqlError>;
|
|
20
30
|
readonly loadExtension: (path: string) => Effect.Effect<void, SqlError>;
|
|
31
|
+
/** Not supported in sqlite */
|
|
32
|
+
readonly updateValues: never;
|
|
21
33
|
}
|
|
22
34
|
/**
|
|
23
35
|
* @category tags
|
|
@@ -46,10 +58,5 @@ export declare const make: (options: SqliteClientConfig) => Effect.Effect<Sqlite
|
|
|
46
58
|
* @category layers
|
|
47
59
|
* @since 1.0.0
|
|
48
60
|
*/
|
|
49
|
-
export declare const layer: (config: Config.Config.Wrap<SqliteClientConfig>) => Layer.Layer<SqliteClient, ConfigError>;
|
|
50
|
-
/**
|
|
51
|
-
* @category compiler
|
|
52
|
-
* @since 1.0.0
|
|
53
|
-
*/
|
|
54
|
-
export declare const makeCompiler: (transform?: (_: string) => string) => Statement.Compiler;
|
|
61
|
+
export declare const layer: (config: Config.Config.Wrap<SqliteClientConfig>) => Layer.Layer<SqliteClient | Client.Client, ConfigError>;
|
|
55
62
|
//# sourceMappingURL=Client.d.ts.map
|
package/dist/dts/Client.d.ts.map
CHANGED
|
@@ -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;
|
|
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;AAG5C,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"}
|
package/dist/dts/Migrator.d.ts
CHANGED
|
@@ -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
|
|
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: <
|
|
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,
|
|
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,
|
|
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"}
|
package/dist/dts/index.d.ts
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.d.ts.map
|
package/dist/dts/index.d.ts.map
CHANGED
|
@@ -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,
|
|
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"}
|
package/dist/esm/Client.js
CHANGED
|
@@ -11,18 +11,23 @@ import * as Effect from "effect/Effect";
|
|
|
11
11
|
import { identity } from "effect/Function";
|
|
12
12
|
import * as Layer from "effect/Layer";
|
|
13
13
|
import * as Scope from "effect/Scope";
|
|
14
|
+
/**
|
|
15
|
+
* @category type ids
|
|
16
|
+
* @since 1.0.0
|
|
17
|
+
*/
|
|
18
|
+
export const TypeId = /*#__PURE__*/Symbol.for("@effect/sql-sqlite-bun/Client");
|
|
14
19
|
/**
|
|
15
20
|
* @category tags
|
|
16
21
|
* @since 1.0.0
|
|
17
22
|
*/
|
|
18
|
-
export const SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-bun/
|
|
23
|
+
export const SqliteClient = /*#__PURE__*/Context.GenericTag("@effect/sql-sqlite-bun/Client");
|
|
19
24
|
/**
|
|
20
25
|
* @category constructor
|
|
21
26
|
* @since 1.0.0
|
|
22
27
|
*/
|
|
23
28
|
export const make = options => Effect.gen(function* (_) {
|
|
24
|
-
const compiler =
|
|
25
|
-
const transformRows =
|
|
29
|
+
const compiler = Statement.makeCompilerSqlite(options.transformQueryNames);
|
|
30
|
+
const transformRows = Statement.defaultTransforms(options.transformResultNames).array;
|
|
26
31
|
const makeConnection = Effect.gen(function* (_) {
|
|
27
32
|
const db = new Database(options.filename, {
|
|
28
33
|
readonly: options.readonly,
|
|
@@ -86,6 +91,7 @@ export const make = options => Effect.gen(function* (_) {
|
|
|
86
91
|
transactionAcquirer,
|
|
87
92
|
spanAttributes: [["db.system", "sqlite"]]
|
|
88
93
|
}), {
|
|
94
|
+
[TypeId]: TypeId,
|
|
89
95
|
config: options,
|
|
90
96
|
export: Effect.flatMap(acquirer, _ => _.export),
|
|
91
97
|
loadExtension: path => Effect.flatMap(acquirer, _ => _.loadExtension(path))
|
|
@@ -95,16 +101,5 @@ export const make = options => Effect.gen(function* (_) {
|
|
|
95
101
|
* @category layers
|
|
96
102
|
* @since 1.0.0
|
|
97
103
|
*/
|
|
98
|
-
export const layer = config => Layer.
|
|
99
|
-
const escape = /*#__PURE__*/Statement.defaultEscape("\"");
|
|
100
|
-
/**
|
|
101
|
-
* @category compiler
|
|
102
|
-
* @since 1.0.0
|
|
103
|
-
*/
|
|
104
|
-
export const makeCompiler = transform => Statement.makeCompiler({
|
|
105
|
-
placeholder: _ => `?`,
|
|
106
|
-
onIdentifier: transform ? _ => escape(transform(_)) : escape,
|
|
107
|
-
onRecordUpdate: () => ["", []],
|
|
108
|
-
onCustom: () => ["", []]
|
|
109
|
-
});
|
|
104
|
+
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)))));
|
|
110
105
|
//# sourceMappingURL=Client.js.map
|
package/dist/esm/Client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Client.js","names":["Client","SqlError","Statement","Database","Config","Context","Effect","identity","Layer","Scope","SqliteClient","GenericTag","make","options","gen","_","compiler","
|
|
1
|
+
{"version":3,"file":"Client.js","names":["Client","SqlError","Statement","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","config","flatMap","layer","scopedContext","unwrap","pipe","client","add"],"sources":["../../src/Client.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/dist/esm/Migrator.js
CHANGED
|
@@ -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
|
|
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
|
-
|
|
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({
|
package/dist/esm/Migrator.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Migrator.js","names":["Command","FileSystem","Path","Migrator","Effect","Layer","
|
|
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,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/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
|
package/dist/esm/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["client","
|
|
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-bun",
|
|
3
|
-
"version": "0.1
|
|
3
|
+
"version": "0.2.1",
|
|
4
4
|
"description": "A SQLite toolkit for Effect",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -10,8 +10,8 @@
|
|
|
10
10
|
},
|
|
11
11
|
"sideEffects": [],
|
|
12
12
|
"peerDependencies": {
|
|
13
|
-
"@effect/platform": "^0.52.
|
|
14
|
-
"@effect/sql": "^0.1
|
|
13
|
+
"@effect/platform": "^0.52.3",
|
|
14
|
+
"@effect/sql": "^0.2.1",
|
|
15
15
|
"effect": "^3.1.2"
|
|
16
16
|
},
|
|
17
17
|
"publishConfig": {
|
package/src/Client.ts
CHANGED
|
@@ -14,23 +14,37 @@ import { identity } from "effect/Function"
|
|
|
14
14
|
import * as Layer from "effect/Layer"
|
|
15
15
|
import * as Scope from "effect/Scope"
|
|
16
16
|
|
|
17
|
+
/**
|
|
18
|
+
* @category type ids
|
|
19
|
+
* @since 1.0.0
|
|
20
|
+
*/
|
|
21
|
+
export const TypeId: unique symbol = Symbol.for("@effect/sql-sqlite-bun/Client")
|
|
22
|
+
|
|
23
|
+
/**
|
|
24
|
+
* @category type ids
|
|
25
|
+
* @since 1.0.0
|
|
26
|
+
*/
|
|
27
|
+
export type TypeId = typeof TypeId
|
|
28
|
+
|
|
17
29
|
/**
|
|
18
30
|
* @category models
|
|
19
31
|
* @since 1.0.0
|
|
20
32
|
*/
|
|
21
33
|
export interface SqliteClient extends Client.Client {
|
|
34
|
+
readonly [TypeId]: TypeId
|
|
22
35
|
readonly config: SqliteClientConfig
|
|
23
36
|
readonly export: Effect.Effect<Uint8Array, SqlError>
|
|
24
37
|
readonly loadExtension: (path: string) => Effect.Effect<void, SqlError>
|
|
38
|
+
|
|
39
|
+
/** Not supported in sqlite */
|
|
40
|
+
readonly updateValues: never
|
|
25
41
|
}
|
|
26
42
|
|
|
27
43
|
/**
|
|
28
44
|
* @category tags
|
|
29
45
|
* @since 1.0.0
|
|
30
46
|
*/
|
|
31
|
-
export const SqliteClient
|
|
32
|
-
"@effect/sql-sqlite-bun/SqliteClient"
|
|
33
|
-
)
|
|
47
|
+
export const SqliteClient = Context.GenericTag<SqliteClient>("@effect/sql-sqlite-bun/Client")
|
|
34
48
|
|
|
35
49
|
/**
|
|
36
50
|
* @category models
|
|
@@ -60,8 +74,8 @@ export const make = (
|
|
|
60
74
|
options: SqliteClientConfig
|
|
61
75
|
): Effect.Effect<SqliteClient, never, Scope.Scope> =>
|
|
62
76
|
Effect.gen(function*(_) {
|
|
63
|
-
const compiler =
|
|
64
|
-
const transformRows =
|
|
77
|
+
const compiler = Statement.makeCompilerSqlite(options.transformQueryNames)
|
|
78
|
+
const transformRows = Statement.defaultTransforms(
|
|
65
79
|
options.transformResultNames!
|
|
66
80
|
).array
|
|
67
81
|
|
|
@@ -150,8 +164,9 @@ export const make = (
|
|
|
150
164
|
compiler,
|
|
151
165
|
transactionAcquirer,
|
|
152
166
|
spanAttributes: [["db.system", "sqlite"]]
|
|
153
|
-
}),
|
|
167
|
+
}) as SqliteClient,
|
|
154
168
|
{
|
|
169
|
+
[TypeId]: TypeId as TypeId,
|
|
155
170
|
config: options,
|
|
156
171
|
export: Effect.flatMap(acquirer, (_) => _.export),
|
|
157
172
|
loadExtension: (path: string) => Effect.flatMap(acquirer, (_) => _.loadExtension(path))
|
|
@@ -165,22 +180,14 @@ export const make = (
|
|
|
165
180
|
*/
|
|
166
181
|
export const layer = (
|
|
167
182
|
config: Config.Config.Wrap<SqliteClientConfig>
|
|
168
|
-
): Layer.Layer<SqliteClient, ConfigError> =>
|
|
169
|
-
Layer.
|
|
170
|
-
|
|
171
|
-
|
|
183
|
+
): Layer.Layer<SqliteClient | Client.Client, ConfigError> =>
|
|
184
|
+
Layer.scopedContext(
|
|
185
|
+
Config.unwrap(config).pipe(
|
|
186
|
+
Effect.flatMap(make),
|
|
187
|
+
Effect.map((client) =>
|
|
188
|
+
Context.make(SqliteClient, client).pipe(
|
|
189
|
+
Context.add(Client.Client, client)
|
|
190
|
+
)
|
|
191
|
+
)
|
|
192
|
+
)
|
|
172
193
|
)
|
|
173
|
-
|
|
174
|
-
const escape = Statement.defaultEscape("\"")
|
|
175
|
-
|
|
176
|
-
/**
|
|
177
|
-
* @category compiler
|
|
178
|
-
* @since 1.0.0
|
|
179
|
-
*/
|
|
180
|
-
export const makeCompiler = (transform?: (_: string) => string) =>
|
|
181
|
-
Statement.makeCompiler({
|
|
182
|
-
placeholder: (_) => `?`,
|
|
183
|
-
onIdentifier: transform ? (_) => escape(transform(_)) : escape,
|
|
184
|
-
onRecordUpdate: () => ["", []],
|
|
185
|
-
onCustom: () => ["", []]
|
|
186
|
-
})
|
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
|
|
13
|
+
import { SqliteClient } from "./Client.js"
|
|
13
14
|
|
|
14
15
|
/**
|
|
15
16
|
* @since 1.0.0
|
|
@@ -20,28 +21,19 @@ export * from "@effect/sql/Migrator"
|
|
|
20
21
|
* @category constructor
|
|
21
22
|
* @since 1.0.0
|
|
22
23
|
*/
|
|
23
|
-
export const run: <
|
|
24
|
-
options: Migrator.MigratorOptions<
|
|
24
|
+
export const run: <R2 = never>(
|
|
25
|
+
options: Migrator.MigratorOptions<R2>
|
|
25
26
|
) => Effect.Effect<
|
|
26
27
|
ReadonlyArray<readonly [id: number, name: string]>,
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
Migrator.MigrationError | SqlError,
|
|
29
|
+
FileSystem | Path | SqliteClient | Client.Client | CommandExecutor | R2
|
|
29
30
|
> = Migrator.make({
|
|
30
|
-
|
|
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
|
-
Command.make("sqlite3", sql.config.filename, ...args),
|
|
36
|
+
Command.make("sqlite3", (sql as SqliteClient).config.filename, ...args),
|
|
45
37
|
Command.string
|
|
46
38
|
)
|
|
47
39
|
return dump.replace(/^create table sqlite_sequence\(.*$/im, "")
|
|
@@ -88,5 +80,5 @@ export const layer = <R>(
|
|
|
88
80
|
): Layer.Layer<
|
|
89
81
|
never,
|
|
90
82
|
SqlError | Migrator.MigrationError,
|
|
91
|
-
|
|
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"
|