@effect-app/infra 2.9.2 → 2.9.3
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/CHANGELOG.md +6 -0
- package/_cjs/QueueMaker/SQLQueue.cjs +3 -4
- package/_cjs/QueueMaker/SQLQueue.cjs.map +1 -1
- package/_cjs/Store/utils.cjs +3 -2
- package/_cjs/Store/utils.cjs.map +1 -1
- package/_cjs/adapters/SQL/Model.cjs +5 -4
- package/_cjs/adapters/SQL/Model.cjs.map +1 -1
- package/dist/QueueMaker/SQLQueue.d.ts.map +1 -1
- package/dist/QueueMaker/SQLQueue.js +4 -5
- package/dist/Store/utils.js +3 -3
- package/dist/adapters/SQL/Model.d.ts +18 -18
- package/dist/adapters/SQL/Model.js +5 -5
- package/package.json +1 -1
- package/src/QueueMaker/SQLQueue.ts +3 -4
- package/src/Store/utils.ts +2 -2
- package/src/adapters/SQL/Model.ts +4 -4
package/CHANGELOG.md
CHANGED
|
@@ -9,7 +9,6 @@ var _setupRequest = require("@effect-app/infra/api/setupRequest");
|
|
|
9
9
|
var _errors = require("@effect-app/infra/QueueMaker/errors");
|
|
10
10
|
var _service = require("@effect-app/infra/QueueMaker/service");
|
|
11
11
|
var _sql = require("@effect/sql");
|
|
12
|
-
var _crypto = require("crypto");
|
|
13
12
|
var _dateFns = require("date-fns");
|
|
14
13
|
var _effectApp = require("effect-app");
|
|
15
14
|
var _utils = require("effect-app/utils");
|
|
@@ -66,7 +65,7 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
66
65
|
name: queueName,
|
|
67
66
|
processingAt: _effectApp.Option.none(),
|
|
68
67
|
finishedAt: _effectApp.Option.none(),
|
|
69
|
-
etag:
|
|
68
|
+
etag: crypto.randomUUID()
|
|
70
69
|
}));
|
|
71
70
|
}),
|
|
72
71
|
take: _effectApp.Effect.gen(function* () {
|
|
@@ -82,7 +81,7 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
82
81
|
return yield* drainRepo.update(Drain.update.make({
|
|
83
82
|
...rest,
|
|
84
83
|
processingAt: _effectApp.Option.some(new Date())
|
|
85
|
-
}) // auto in lib , etag: randomUUID()
|
|
84
|
+
}) // auto in lib , etag: crypto.randomUUID()
|
|
86
85
|
);
|
|
87
86
|
}
|
|
88
87
|
if (first) return first;
|
|
@@ -96,7 +95,7 @@ function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
96
95
|
}) => drainRepo.updateVoid(Drain.update.make({
|
|
97
96
|
...q,
|
|
98
97
|
finishedAt: _effectApp.Option.some(new Date())
|
|
99
|
-
})) // auto in lib , etag: randomUUID()
|
|
98
|
+
})) // auto in lib , etag: crypto.randomUUID()
|
|
100
99
|
};
|
|
101
100
|
return {
|
|
102
101
|
publish: (...messages) => _effectApp.Effect.gen(function* () {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLQueue.cjs","names":["_setupRequest","require","_errors","_service","_sql","
|
|
1
|
+
{"version":3,"file":"SQLQueue.cjs","names":["_setupRequest","require","_errors","_service","_sql","_dateFns","_effectApp","_utils","_SQL","_logger","QueueId","exports","S","Number","pipe","brand","makeSQLQueue","queueName","queueDrainName","schema","drainSchema","Effect","gen","base","id","SQLModel","Generated","meta","JsonFromString","QueueMeta","name","NonEmptyString255","createdAt","DateTimeInsert","updatedAt","DateTimeUpdate","processingAt","FieldOption","Date","finishedAt","etag","String","Queue","Class","body","Drain","sql","SqlClient","queueRepo","makeRepository","tableName","spanPrefix","idColumn","versionColumn","drainRepo","decodeDrain","decode","drain","sync","subMinutes","andThen","limit","getTime","q","offer","insertVoid","insert","make","Option","none","crypto","randomUUID","take","first","withTracerEnabled","dec","rest","update","some","sleep","finish","updateVoid","publish","messages","requestContext","getRequestContext","forEach","m","discard","withSpan","captureStackTrace","kind","attributes","map","_","_tag","handleEvent","sessionId","silenceAndReportError","reportNonInterruptedFailure","processMessage","msg","succeed","flatMap","effect","InfraLogger","logInfo","annotateLogs","pretty","zipRight","setupRequestContext","span","withParentSpan","Tracer","externalSpan","x","uninterruptible","fork","Fiber","join","tap","forever"],"sources":["../../src/QueueMaker/SQLQueue.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/_cjs/Store/utils.cjs
CHANGED
|
@@ -10,16 +10,17 @@ exports.lowerThan = lowerThan;
|
|
|
10
10
|
exports.lowerThanExclusive = lowerThanExclusive;
|
|
11
11
|
exports.lowercaseIfString = lowercaseIfString;
|
|
12
12
|
exports.makeUpdateETag = exports.makeETag = void 0;
|
|
13
|
-
var _crypto = require("crypto");
|
|
13
|
+
var _crypto = _interopRequireDefault(require("crypto"));
|
|
14
14
|
var _effectApp = require("effect-app");
|
|
15
15
|
var _errors = require("../errors.cjs");
|
|
16
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
16
17
|
const makeETag = ({
|
|
17
18
|
_etag,
|
|
18
19
|
...e
|
|
19
20
|
}) => ({
|
|
20
21
|
...e,
|
|
21
22
|
// we have to hash the JSON, as hashing the object might contain elements that won't be serialized anyway
|
|
22
|
-
_etag:
|
|
23
|
+
_etag: _crypto.default.createHash("sha256").update(JSON.stringify(e)).digest("hex")
|
|
23
24
|
});
|
|
24
25
|
exports.makeETag = makeETag;
|
|
25
26
|
const makeUpdateETag = type => (e, current) => _effectApp.Effect.gen(function* () {
|
package/_cjs/Store/utils.cjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.cjs","names":["_crypto","require","_effectApp","_errors","makeETag","_etag","
|
|
1
|
+
{"version":3,"file":"utils.cjs","names":["_crypto","_interopRequireDefault","require","_effectApp","_errors","e","__esModule","default","makeETag","_etag","crypto","createHash","update","JSON","stringify","digest","exports","makeUpdateETag","type","current","Effect","gen","mapError","OptimisticConcurrencyException","id","found","Option","isSome","value","newE","lowercaseIfString","val","toLowerCase","compare","valA","valB","lowerThan","lowerThanExclusive","greaterThan","greaterThanExclusive"],"sources":["../../src/Store/utils.ts"],"sourcesContent":[null],"mappings":";;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AACA,IAAAE,OAAA,GAAAF,OAAA;AAA6D,SAAAD,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAGtD,MAAMG,QAAQ,GAAGA,CACtB;EAAEC,KAAK;EAAE,GAAGJ;AAAC,CAAK,MAEjB;EACC,GAAGA,CAAC;EACJ;EACAI,KAAK,EAAEC,eAAM,CAACC,UAAU,CAAC,QAAQ,CAAC,CAACC,MAAM,CAACC,IAAI,CAACC,SAAS,CAACT,CAAC,CAAC,CAAC,CAACU,MAAM,CAAC,KAAK;CAC1E,CAAQ;AAAAC,OAAA,CAAAR,QAAA,GAAAA,QAAA;AAEJ,MAAMS,cAAc,GACxBC,IAAY,IAAK,CAAiDb,CAAI,EAAEc,OAAkB,KACzFC,iBAAM,CAACC,GAAG,CAAC,aAAS;EAClB,IAAIhB,CAAC,CAACI,KAAK,EAAE;IACX,OAAOW,iBAAM,CAACE,QAAQ,CACpBH,OAAO,EACP,MAAM,IAAII,sCAA8B,CAAC;MAAEL,IAAI;MAAEM,EAAE,EAAEnB,CAAC,CAACmB,EAAE;MAAEL,OAAO,EAAE,EAAE;MAAEM,KAAK,EAAEpB,CAAC,CAACI;IAAK,CAAE,CAAC,CAC1F;EACH;EACA,IAAIiB,iBAAM,CAACC,MAAM,CAACR,OAAO,CAAC,IAAIA,OAAO,CAACS,KAAK,CAACnB,KAAK,KAAKJ,CAAC,CAACI,KAAK,EAAE;IAC7D,OAAO,OAAO,IAAIc,sCAA8B,CAAC;MAC/CL,IAAI;MACJM,EAAE,EAAEL,OAAO,CAACS,KAAK,CAACJ,EAAE;MACpBL,OAAO,EAAEA,OAAO,CAACS,KAAK,CAACnB,KAAK;MAC5BgB,KAAK,EAAEpB,CAAC,CAACI;KACV,CAAC;EACJ;EACA,MAAMoB,IAAI,GAAGrB,QAAQ,CAACH,CAAC,CAAC;EACxB,OAAOwB,IAAI;AACb,CAAC,CAAC;AAAAb,OAAA,CAAAC,cAAA,GAAAA,cAAA;AAEA,SAAUa,iBAAiBA,CAAIC,GAAM;EACzC,IAAI,OAAOA,GAAG,KAAK,QAAQ,EAAE;IAC3B,OAAOA,GAAG,CAACC,WAAW,EAAE;EAC1B;EACA,OAAOD,GAAG;AACZ;AAEM,SAAUE,OAAOA,CAACC,IAAa,EAAEC,IAAa;EAClD,OAAOD,IAAI,KAAKC,IAAI;AACtB;AAEM,SAAUC,SAASA,CAACF,IAAsB,EAAEC,IAAsB;EACtE,OAAOD,IAAI,GAAGC,IAAI;AACpB;AAEM,SAAUE,kBAAkBA,CAACH,IAAsB,EAAEC,IAAsB;EAC/E,OAAOD,IAAI,IAAIC,IAAI;AACrB;AAEM,SAAUG,WAAWA,CAACJ,IAAsB,EAAEC,IAAsB;EACxE,OAAOD,IAAI,GAAGC,IAAI;AACpB;AAEM,SAAUI,oBAAoBA,CAACL,IAAsB,EAAEC,IAAsB;EACjF,OAAOD,IAAI,IAAIC,IAAI;AACrB","ignoreList":[]}
|
|
@@ -9,12 +9,13 @@ var VariantSchema = _interopRequireWildcard(require("@effect/experimental/Varian
|
|
|
9
9
|
var _SqlClient = require("@effect/sql/SqlClient");
|
|
10
10
|
var SqlResolver = _interopRequireWildcard(require("@effect/sql/SqlResolver"));
|
|
11
11
|
var SqlSchema = _interopRequireWildcard(require("@effect/sql/SqlSchema"));
|
|
12
|
-
var _crypto = require("crypto");
|
|
12
|
+
var _crypto = _interopRequireDefault(require("crypto"));
|
|
13
13
|
var DateTime = _interopRequireWildcard(require("effect/DateTime"));
|
|
14
14
|
var Effect = _interopRequireWildcard(require("effect/Effect"));
|
|
15
15
|
var Option = _interopRequireWildcard(require("effect/Option"));
|
|
16
16
|
var ParseResult = _interopRequireWildcard(require("effect/ParseResult"));
|
|
17
17
|
var Schema = _interopRequireWildcard(require("effect/Schema"));
|
|
18
|
+
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
18
19
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
19
20
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
20
21
|
/* eslint-disable @typescript-eslint/no-unsafe-member-access */
|
|
@@ -345,12 +346,12 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = LAST_INSERT_ID(
|
|
|
345
346
|
execute: versionColumn ? request => sql.onDialectOrElse({
|
|
346
347
|
mysql: () => sql`update ${sql(options.tableName)} set ${sql.update({
|
|
347
348
|
...request,
|
|
348
|
-
[versionColumn]:
|
|
349
|
+
[versionColumn]: _crypto.default.randomUUID()
|
|
349
350
|
}, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]};
|
|
350
351
|
select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idColumn]};`.unprepared.pipe(Effect.map(([, results]) => results)),
|
|
351
352
|
orElse: () => sql`update ${sql(options.tableName)} set ${sql.update({
|
|
352
353
|
...request,
|
|
353
|
-
[versionColumn]:
|
|
354
|
+
[versionColumn]: _crypto.default.randomUUID()
|
|
354
355
|
}, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]} returning *`
|
|
355
356
|
}) : request => sql.onDialectOrElse({
|
|
356
357
|
mysql: () => sql`update ${sql(options.tableName)} set ${sql.update(request, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]};
|
|
@@ -368,7 +369,7 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idCol
|
|
|
368
369
|
Request: Model.update,
|
|
369
370
|
execute: versionColumn ? request => sql`update ${sql(options.tableName)} set ${sql.update({
|
|
370
371
|
...request,
|
|
371
|
-
[versionColumn]:
|
|
372
|
+
[versionColumn]: _crypto.default.randomUUID()
|
|
372
373
|
}, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]}` : request => sql`update ${sql(options.tableName)} set ${sql.update(request, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]}`
|
|
373
374
|
});
|
|
374
375
|
const updateVoid = update => updateVoidSchema(update).pipe(Effect.orDie, Effect.withSpan(`${options.spanPrefix}.updateVoid`, {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Model.cjs","names":["RRX","_interopRequireWildcard","require","VariantSchema","_SqlClient","SqlResolver","SqlSchema","_crypto","DateTime","Effect","Option","ParseResult","Schema","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Class","Field","FieldExcept","FieldOnly","Struct","Union","extract","fieldEvolve","fieldFromKey","make","variants","defaultVariant","exports","fields","Override","Generated","schema","select","update","json","GeneratedByApp","insert","Sensitive","FieldOption","OptionFromNullOr","optionalWith","as","jsonCreate","nullable","jsonUpdate","DateTimeFromDate","transform","ValidDateFromSelf","DateTimeUtcFromSelf","decode","unsafeFromDate","encode","toDateUtc","Date","transformOrFail","String","s","_","ast","pipe","map","removeTime","match","onNone","fail","Type","onSome","dt","succeed","formatIsoDate","DateWithNow","Overrideable","generate","now","DateTimeWithNow","formatIso","DateTimeFromDateWithNow","DateFromSelf","DateTimeFromNumberWithNow","Number","toEpochMillis","DateTimeInsert","DateTimeUtc","DateTimeInsertFromDate","DateTimeInsertFromNumber","DateTimeUtcFromNumber","DateTimeUpdate","DateTimeUpdateFromDate","DateTimeUpdateFromNumber","JsonFromString","parsed","parseJson","makeRepository","Model","options","gen","sql","SqlClient","idSchema","idColumn","versionColumn","insertSchema","single","Request","Result","execute","request","onDialectOrElse","mysql","tableName","unprepared","results","orElse","returning","orDie","withSpan","spanPrefix","captureStackTrace","attributes","insertVoidSchema","void","insertVoid","updateSchema","randomUUID","updateVoidSchema","updateVoid","findByIdSchema","findOne","id","findById","deleteSchema","delete_","delete","makeDataLoaders","insertResolver","ordered","forEach","concurrency","insertLoader","dataLoader","window","maxBatchSize","insertExecute","makeExecute","insertVoidResolver","insertVoidLoader","insertVoidExecute","findByIdResolver","Id","ResultId","ids","in","findByIdLoader","findByIdExecute","deleteResolver","deleteLoader","deleteExecute"],"sources":["../../../src/adapters/SQL/Model.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"file":"Model.cjs","names":["RRX","_interopRequireWildcard","require","VariantSchema","_SqlClient","SqlResolver","SqlSchema","_crypto","_interopRequireDefault","DateTime","Effect","Option","ParseResult","Schema","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Class","Field","FieldExcept","FieldOnly","Struct","Union","extract","fieldEvolve","fieldFromKey","make","variants","defaultVariant","exports","fields","Override","Generated","schema","select","update","json","GeneratedByApp","insert","Sensitive","FieldOption","OptionFromNullOr","optionalWith","as","jsonCreate","nullable","jsonUpdate","DateTimeFromDate","transform","ValidDateFromSelf","DateTimeUtcFromSelf","decode","unsafeFromDate","encode","toDateUtc","Date","transformOrFail","String","s","_","ast","pipe","map","removeTime","match","onNone","fail","Type","onSome","dt","succeed","formatIsoDate","DateWithNow","Overrideable","generate","now","DateTimeWithNow","formatIso","DateTimeFromDateWithNow","DateFromSelf","DateTimeFromNumberWithNow","Number","toEpochMillis","DateTimeInsert","DateTimeUtc","DateTimeInsertFromDate","DateTimeInsertFromNumber","DateTimeUtcFromNumber","DateTimeUpdate","DateTimeUpdateFromDate","DateTimeUpdateFromNumber","JsonFromString","parsed","parseJson","makeRepository","Model","options","gen","sql","SqlClient","idSchema","idColumn","versionColumn","insertSchema","single","Request","Result","execute","request","onDialectOrElse","mysql","tableName","unprepared","results","orElse","returning","orDie","withSpan","spanPrefix","captureStackTrace","attributes","insertVoidSchema","void","insertVoid","updateSchema","crypto","randomUUID","updateVoidSchema","updateVoid","findByIdSchema","findOne","id","findById","deleteSchema","delete_","delete","makeDataLoaders","insertResolver","ordered","forEach","concurrency","insertLoader","dataLoader","window","maxBatchSize","insertExecute","makeExecute","insertVoidResolver","insertVoidLoader","insertVoidExecute","findByIdResolver","Id","ResultId","ids","in","findByIdLoader","findByIdExecute","deleteResolver","deleteLoader","deleteExecute"],"sources":["../../../src/adapters/SQL/Model.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../src/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;
|
|
1
|
+
{"version":3,"file":"SQLQueue.d.ts","sourceRoot":"","sources":["../../src/QueueMaker/SQLQueue.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EAAE,MAAM,EAAiB,CAAC,EAAE,MAAM,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAK1D,eAAO,MAAM,OAAO;;aAAoC,CAAA;AACxD,MAAM,MAAM,OAAO,GAAG,OAAO,OAAO,CAAC,IAAI,CAAA;AAGzC,wBAAgB,YAAY,CAC1B,GAAG,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC5C,QAAQ,SAAS;IAAE,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EACjD,IAAI,EACJ,SAAS,EAET,SAAS,EAAE,iBAAiB,EAC5B,cAAc,EAAE,iBAAiB,EACjC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,EAC3B,WAAW,EAAE,CAAC,CAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC;;YA0G9B,MAAM,EAAE,MAAM,eACP,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,cAC/C,MAAM;+BA6DzB"}
|
|
@@ -2,7 +2,6 @@ import { getRequestContext, setupRequestContext } from "@effect-app/infra/api/se
|
|
|
2
2
|
import { reportNonInterruptedFailure } from "@effect-app/infra/QueueMaker/errors";
|
|
3
3
|
import { QueueMeta } from "@effect-app/infra/QueueMaker/service";
|
|
4
4
|
import { SqlClient } from "@effect/sql";
|
|
5
|
-
import { randomUUID } from "crypto";
|
|
6
5
|
import { subMinutes } from "date-fns";
|
|
7
6
|
import { Effect, Fiber, Option, S, Tracer } from "effect-app";
|
|
8
7
|
import { pretty } from "effect-app/utils";
|
|
@@ -64,7 +63,7 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
64
63
|
name: queueName,
|
|
65
64
|
processingAt: Option.none(),
|
|
66
65
|
finishedAt: Option.none(),
|
|
67
|
-
etag: randomUUID()
|
|
66
|
+
etag: crypto.randomUUID()
|
|
68
67
|
}));
|
|
69
68
|
}),
|
|
70
69
|
take: Effect.gen(function* () {
|
|
@@ -73,7 +72,7 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
73
72
|
if (first) {
|
|
74
73
|
const dec = yield* decodeDrain(first);
|
|
75
74
|
const { createdAt, updatedAt, ...rest } = dec;
|
|
76
|
-
return yield* drainRepo.update(Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }) // auto in lib , etag: randomUUID()
|
|
75
|
+
return yield* drainRepo.update(Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }) // auto in lib , etag: crypto.randomUUID()
|
|
77
76
|
);
|
|
78
77
|
}
|
|
79
78
|
if (first)
|
|
@@ -81,7 +80,7 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
81
80
|
yield* Effect.sleep(250);
|
|
82
81
|
}
|
|
83
82
|
}),
|
|
84
|
-
finish: ({ createdAt, updatedAt, ...q }) => drainRepo.updateVoid(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: randomUUID()
|
|
83
|
+
finish: ({ createdAt, updatedAt, ...q }) => drainRepo.updateVoid(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: crypto.randomUUID()
|
|
85
84
|
};
|
|
86
85
|
return {
|
|
87
86
|
publish: (...messages) => Effect
|
|
@@ -133,4 +132,4 @@ export function makeSQLQueue(queueName, queueDrainName, schema, drainSchema) {
|
|
|
133
132
|
};
|
|
134
133
|
});
|
|
135
134
|
}
|
|
136
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
135
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU1FMUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvUXVldWVNYWtlci9TUUxRdWV1ZS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEVBQUUsaUJBQWlCLEVBQUUsbUJBQW1CLEVBQUUsTUFBTSxvQ0FBb0MsQ0FBQTtBQUMzRixPQUFPLEVBQUUsMkJBQTJCLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUVqRixPQUFPLEVBQUUsU0FBUyxFQUFFLE1BQU0sc0NBQXNDLENBQUE7QUFDaEUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUN2QyxPQUFPLEVBQUUsVUFBVSxFQUFFLE1BQU0sVUFBVSxDQUFBO0FBQ3JDLE9BQU8sRUFBRSxNQUFNLEVBQUUsS0FBSyxFQUFFLE1BQU0sRUFBRSxDQUFDLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBRTdELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxrQkFBa0IsQ0FBQTtBQUN6QyxPQUFPLEVBQUUsUUFBUSxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDN0MsT0FBTyxFQUFFLFdBQVcsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUUxQyxNQUFNLENBQUMsTUFBTSxPQUFPLEdBQUcsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFBO0FBR3hELG9GQUFvRjtBQUNwRixNQUFNLFVBQVUsWUFBWSxDQU0xQixTQUE0QixFQUM1QixjQUFpQyxFQUNqQyxNQUEyQixFQUMzQixXQUEwQztJQUUxQyxPQUFPLE1BQU0sQ0FBQyxHQUFHLENBQUMsUUFBUSxDQUFDO1FBQ3pCLE1BQU0sSUFBSSxHQUFHO1lBQ1gsRUFBRSxFQUFFLFFBQVEsQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDO1lBQy9CLElBQUksRUFBRSxRQUFRLENBQUMsY0FBYyxDQUFDLFNBQVMsQ0FBQztZQUN4QyxJQUFJ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
|
package/dist/Store/utils.js
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import
|
|
1
|
+
import crypto from "crypto";
|
|
2
2
|
import { Effect, Option } from "effect-app";
|
|
3
3
|
import { OptimisticConcurrencyException } from "../errors.js";
|
|
4
4
|
export const makeETag = ({ _etag, ...e }) => ({
|
|
5
5
|
...e,
|
|
6
6
|
// we have to hash the JSON, as hashing the object might contain elements that won't be serialized anyway
|
|
7
|
-
_etag: createHash("sha256").update(JSON.stringify(e)).digest("hex")
|
|
7
|
+
_etag: crypto.createHash("sha256").update(JSON.stringify(e)).digest("hex")
|
|
8
8
|
});
|
|
9
9
|
export const makeUpdateETag = (type) => (e, current) => Effect.gen(function* () {
|
|
10
10
|
if (e._etag) {
|
|
@@ -42,4 +42,4 @@ export function greaterThan(valA, valB) {
|
|
|
42
42
|
export function greaterThanExclusive(valA, valB) {
|
|
43
43
|
return valA >= valB;
|
|
44
44
|
}
|
|
45
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
45
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvU3RvcmUvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsT0FBTyxNQUFNLE1BQU0sUUFBUSxDQUFBO0FBQzNCLE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxFQUFFLE1BQU0sWUFBWSxDQUFBO0FBQzNDLE9BQU8sRUFBRSw4QkFBOEIsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUc3RCxNQUFNLENBQUMsTUFBTSxRQUFRLEdBQUcsQ0FDdEIsRUFBRSxLQUFLLEVBQUUsR0FBRyxDQUFDLEVBQUssRUFDZixFQUFFLENBQ0wsQ0FBQztJQUNDLEdBQUcsQ0FBQztJQUNKLHlHQUF5RztJQUN6RyxLQUFLLEVBQUUsTUFBTSxDQUFDLFVBQVUsQ0FBQyxRQUFRLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUM7Q0FDM0UsQ0FBUSxDQUFBO0FBRVgsTUFBTSxDQUFDLE1BQU0sY0FBYyxHQUN6QixDQUFDLElBQVksRUFBRSxFQUFFLENBQUMsQ0FBaUQsQ0FBSSxFQUFFLE9BQWtCLEVBQUUsRUFBRSxDQUM3RixNQUFNLENBQUMsR0FBRyxDQUFDLFFBQVEsQ0FBQztJQUNsQixJQUFJLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQztRQUNaLEtBQUssQ0FBQyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQ3BCLE9BQU8sRUFDUCxHQUFHLEVBQUUsQ0FBQyxJQUFJLDhCQUE4QixDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsRUFBRSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxDQUMxRixDQUFBO0lBQ0gsQ0FBQztJQUNELElBQUksTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsSUFBSSxPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUssS0FBSyxDQUFDLENBQUMsS0FBSyxFQUFFLENBQUM7UUFDOUQsT0FBTyxLQUFLLENBQUMsQ0FBQyxJQUFJLDhCQUE4QixDQUFDO1lBQy9DLElBQUk7WUFDSixFQUFFLEVBQUUsT0FBTyxDQUFDLEtBQUssQ0FBQyxFQUFFO1lBQ3BCLE9BQU8sRUFBRSxPQUFPLENBQUMsS0FBSyxDQUFDLEtBQUs7WUFDNUIsS0FBSyxFQUFFLENBQUMsQ0FBQyxLQUFLO1NBQ2YsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUNELE1BQU0sSUFBSSxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUN4QixPQUFPLElBQUksQ0FBQTtBQUNiLENBQUMsQ0FBQyxDQUFBO0FBRU4sTUFBTSxVQUFVLGlCQUFpQixDQUFJLEdBQU07SUFDekMsSUFBSSxPQUFPLEdBQUcsS0FBSyxRQUFRLEVBQUUsQ0FBQztRQUM1QixPQUFPLEdBQUcsQ0FBQyxXQUFXLEVBQUUsQ0FBQTtJQUMxQixDQUFDO0lBQ0QsT0FBTyxHQUFHLENBQUE7QUFDWixDQUFDO0FBRUQsTUFBTSxVQUFVLE9BQU8sQ0FBQyxJQUFhLEVBQUUsSUFBYTtJQUNsRCxPQUFPLElBQUksS0FBSyxJQUFJLENBQUE7QUFDdEIsQ0FBQztBQUVELE1BQU0sVUFBVSxTQUFTLENBQUMsSUFBc0IsRUFBRSxJQUFzQjtJQUN0RSxPQUFPLElBQUksR0FBRyxJQUFJLENBQUE7QUFDcEIsQ0FBQztBQUVELE1BQU0sVUFBVSxrQkFBa0IsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQy9FLE9BQU8sSUFBSSxJQUFJLElBQUksQ0FBQTtBQUNyQixDQUFDO0FBRUQsTUFBTSxVQUFVLFdBQVcsQ0FBQyxJQUFzQixFQUFFLElBQXNCO0lBQ3hFLE9BQU8sSUFBSSxHQUFHLElBQUksQ0FBQTtBQUNwQixDQUFDO0FBRUQsTUFBTSxVQUFVLG9CQUFvQixDQUFDLElBQXNCLEVBQUUsSUFBc0I7SUFDakYsT0FBTyxJQUFJLElBQUksSUFBSSxDQUFBO0FBQ3JCLENBQUMifQ==
|
|
@@ -7,43 +7,43 @@ import * as Effect from "effect/Effect";
|
|
|
7
7
|
import * as Option from "effect/Option";
|
|
8
8
|
import * as Schema from "effect/Schema";
|
|
9
9
|
import type { Scope } from "effect/Scope";
|
|
10
|
-
declare const Class: <Self = never>(identifier: string) => <const Fields extends VariantSchema.Struct.Fields>(fields: Fields & VariantSchema.Struct.Validate<Fields, "select" | "
|
|
10
|
+
declare const Class: <Self = never>(identifier: string) => <const Fields extends VariantSchema.Struct.Fields>(fields: Fields & VariantSchema.Struct.Validate<Fields, "select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate">, annotations?: Schema.Annotations.Schema<Self, readonly []> | undefined) => [Self] extends [never] ? "Missing `Self` generic - use `class Self extends Class<Self>()({ ... })`" : VariantSchema.Class<Self, Fields, VariantSchema.ExtractFields<"select", Fields, true> extends infer T ? { [K in keyof T]: VariantSchema.ExtractFields<"select", Fields, true>[K]; } : never, Schema.Struct.Type<VariantSchema.ExtractFields<"select", Fields, true> extends infer T ? { [K in keyof T]: VariantSchema.ExtractFields<"select", Fields, true>[K]; } : never>, Schema.Struct.Encoded<VariantSchema.ExtractFields<"select", Fields, true> extends infer T ? { [K in keyof T]: VariantSchema.ExtractFields<"select", Fields, true>[K]; } : never>, Schema.Schema.Context<(VariantSchema.ExtractFields<"select", Fields, true> extends infer T ? { [K in keyof T]: VariantSchema.ExtractFields<"select", Fields, true>[K]; } : never)[keyof VariantSchema.ExtractFields<"select", Fields, true>]>, Schema.Struct.Constructor<VariantSchema.ExtractFields<"select", Fields, true> extends infer T ? { [K in keyof T]: VariantSchema.ExtractFields<"select", Fields, true>[K]; } : never>> & {
|
|
11
11
|
readonly select: Schema.Struct<VariantSchema.ExtractFields<"select", Fields, false> extends infer T_1 ? { [K_1 in keyof T_1]: VariantSchema.ExtractFields<"select", Fields, false>[K_1]; } : never>;
|
|
12
|
-
readonly
|
|
13
|
-
readonly
|
|
12
|
+
readonly insert: Schema.Struct<VariantSchema.ExtractFields<"insert", Fields, false> extends infer T_2 ? { [K_2 in keyof T_2]: VariantSchema.ExtractFields<"insert", Fields, false>[K_2]; } : never>;
|
|
13
|
+
readonly update: Schema.Struct<VariantSchema.ExtractFields<"update", Fields, false> extends infer T_3 ? { [K_3 in keyof T_3]: VariantSchema.ExtractFields<"update", Fields, false>[K_3]; } : never>;
|
|
14
14
|
readonly json: Schema.Struct<VariantSchema.ExtractFields<"json", Fields, false> extends infer T_4 ? { [K_4 in keyof T_4]: VariantSchema.ExtractFields<"json", Fields, false>[K_4]; } : never>;
|
|
15
15
|
readonly jsonCreate: Schema.Struct<VariantSchema.ExtractFields<"jsonCreate", Fields, false> extends infer T_5 ? { [K_5 in keyof T_5]: VariantSchema.ExtractFields<"jsonCreate", Fields, false>[K_5]; } : never>;
|
|
16
16
|
readonly jsonUpdate: Schema.Struct<VariantSchema.ExtractFields<"jsonUpdate", Fields, false> extends infer T_6 ? { [K_6 in keyof T_6]: VariantSchema.ExtractFields<"jsonUpdate", Fields, false>[K_6]; } : never>;
|
|
17
|
-
}, Field: <const A extends VariantSchema.Field.ConfigWithKeys<"select" | "
|
|
18
|
-
<V extends "select" | "
|
|
19
|
-
<V extends "select" | "
|
|
17
|
+
}, Field: <const A extends VariantSchema.Field.ConfigWithKeys<"select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate">>(config: A & { readonly [K in Exclude<keyof A, "select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate">]: never; }) => VariantSchema.Field<A>, FieldExcept: <const Keys extends readonly ("select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate")[]>(...keys: Keys) => <S extends Schema.Schema.All | Schema.PropertySignature.All>(schema: S) => VariantSchema.Field<{ readonly [K in Exclude<"select", Keys[number]> | Exclude<"insert", Keys[number]> | Exclude<"update", Keys[number]> | Exclude<"json", Keys[number]> | Exclude<"jsonCreate", Keys[number]> | Exclude<"jsonUpdate", Keys[number]>]: S; }>, FieldOnly: <const Keys extends readonly ("select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate")[]>(...keys: Keys) => <S extends Schema.Schema.All | Schema.PropertySignature.All>(schema: S) => VariantSchema.Field<{ readonly [K in Keys[number]]: S; }>, Struct: <const A extends VariantSchema.Struct.Fields>(fields: A & VariantSchema.Struct.Validate<A, "select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate">) => VariantSchema.Struct<A>, Union: <const Members extends ReadonlyArray<VariantSchema.Struct<any>>>(...members: Members) => VariantSchema.Union<Members> & VariantSchema.Union.Variants<Members, "select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate">, extract: {
|
|
18
|
+
<V extends "select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate">(variant: V): <A extends VariantSchema.Struct<any>>(self: A) => VariantSchema.Extract<V, A, V extends "select" ? true : false>;
|
|
19
|
+
<V extends "select" | "insert" | "update" | "json" | "jsonCreate" | "jsonUpdate", A extends VariantSchema.Struct<any>>(self: A, variant: V): VariantSchema.Extract<V, A, V extends "select" ? true : false>;
|
|
20
20
|
}, fieldEvolve: {
|
|
21
21
|
<Self extends VariantSchema.Field<any> | VariantSchema.Field.ValueAny, const Mapping extends Self extends VariantSchema.Field<infer S extends VariantSchema.Field.Config> ? { readonly [K in keyof S]?: (variant: S[K]) => VariantSchema.Field.ValueAny; } : {
|
|
22
22
|
readonly select?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
23
|
-
readonly update?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
24
23
|
readonly insert?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
24
|
+
readonly update?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
25
25
|
readonly json?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
26
26
|
readonly jsonCreate?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
27
27
|
readonly jsonUpdate?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
28
28
|
}>(f: Mapping): (self: Self) => VariantSchema.Field<Self extends VariantSchema.Field<infer S_1 extends VariantSchema.Field.Config> ? { readonly [K_1 in keyof S_1]: K_1 extends keyof Mapping ? Mapping[K_1] extends (arg: any) => any ? ReturnType<Mapping[K_1]> : S_1[K_1] : S_1[K_1]; } : {
|
|
29
29
|
readonly select: "select" extends infer T ? T extends "select" ? T extends keyof Mapping ? Mapping[T] extends (arg: any) => any ? ReturnType<Mapping[T]> : Self : Self : never : never;
|
|
30
|
-
readonly
|
|
31
|
-
readonly
|
|
30
|
+
readonly insert: "insert" extends infer T_1 ? T_1 extends "insert" ? T_1 extends keyof Mapping ? Mapping[T_1] extends (arg: any) => any ? ReturnType<Mapping[T_1]> : Self : Self : never : never;
|
|
31
|
+
readonly update: "update" extends infer T_2 ? T_2 extends "update" ? T_2 extends keyof Mapping ? Mapping[T_2] extends (arg: any) => any ? ReturnType<Mapping[T_2]> : Self : Self : never : never;
|
|
32
32
|
readonly json: "json" extends infer T_3 ? T_3 extends "json" ? T_3 extends keyof Mapping ? Mapping[T_3] extends (arg: any) => any ? ReturnType<Mapping[T_3]> : Self : Self : never : never;
|
|
33
33
|
readonly jsonCreate: "jsonCreate" extends infer T_4 ? T_4 extends "jsonCreate" ? T_4 extends keyof Mapping ? Mapping[T_4] extends (arg: any) => any ? ReturnType<Mapping[T_4]> : Self : Self : never : never;
|
|
34
34
|
readonly jsonUpdate: "jsonUpdate" extends infer T_5 ? T_5 extends "jsonUpdate" ? T_5 extends keyof Mapping ? Mapping[T_5] extends (arg: any) => any ? ReturnType<Mapping[T_5]> : Self : Self : never : never;
|
|
35
35
|
}>;
|
|
36
36
|
<Self extends VariantSchema.Field<any> | VariantSchema.Field.ValueAny, const Mapping_1 extends Self extends VariantSchema.Field<infer S extends VariantSchema.Field.Config> ? { readonly [K in keyof S]?: (variant: S[K]) => VariantSchema.Field.ValueAny; } : {
|
|
37
37
|
readonly select?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
38
|
-
readonly update?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
39
38
|
readonly insert?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
39
|
+
readonly update?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
40
40
|
readonly json?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
41
41
|
readonly jsonCreate?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
42
42
|
readonly jsonUpdate?: (variant: Self) => VariantSchema.Field.ValueAny;
|
|
43
43
|
}>(self: Self, f: Mapping_1): VariantSchema.Field<Self extends VariantSchema.Field<infer S_1 extends VariantSchema.Field.Config> ? { readonly [K_1 in keyof S_1]: K_1 extends keyof Mapping_1 ? Mapping_1[K_1] extends (arg: any) => any ? ReturnType<Mapping_1[K_1]> : S_1[K_1] : S_1[K_1]; } : {
|
|
44
44
|
readonly select: "select" extends infer T ? T extends "select" ? T extends keyof Mapping_1 ? Mapping_1[T] extends (arg: any) => any ? ReturnType<Mapping_1[T]> : Self : Self : never : never;
|
|
45
|
-
readonly
|
|
46
|
-
readonly
|
|
45
|
+
readonly insert: "insert" extends infer T_1 ? T_1 extends "insert" ? T_1 extends keyof Mapping_1 ? Mapping_1[T_1] extends (arg: any) => any ? ReturnType<Mapping_1[T_1]> : Self : Self : never : never;
|
|
46
|
+
readonly update: "update" extends infer T_2 ? T_2 extends "update" ? T_2 extends keyof Mapping_1 ? Mapping_1[T_2] extends (arg: any) => any ? ReturnType<Mapping_1[T_2]> : Self : Self : never : never;
|
|
47
47
|
readonly json: "json" extends infer T_3 ? T_3 extends "json" ? T_3 extends keyof Mapping_1 ? Mapping_1[T_3] extends (arg: any) => any ? ReturnType<Mapping_1[T_3]> : Self : Self : never : never;
|
|
48
48
|
readonly jsonCreate: "jsonCreate" extends infer T_4 ? T_4 extends "jsonCreate" ? T_4 extends keyof Mapping_1 ? Mapping_1[T_4] extends (arg: any) => any ? ReturnType<Mapping_1[T_4]> : Self : Self : never : never;
|
|
49
49
|
readonly jsonUpdate: "jsonUpdate" extends infer T_5 ? T_5 extends "jsonUpdate" ? T_5 extends keyof Mapping_1 ? Mapping_1[T_5] extends (arg: any) => any ? ReturnType<Mapping_1[T_5]> : Self : Self : never : never;
|
|
@@ -51,30 +51,30 @@ declare const Class: <Self = never>(identifier: string) => <const Fields extends
|
|
|
51
51
|
}, fieldFromKey: {
|
|
52
52
|
<Self extends VariantSchema.Field<any> | VariantSchema.Field.ValueAny, const Mapping_2 extends Self extends VariantSchema.Field<infer S extends VariantSchema.Field.Config> ? { readonly [K in keyof S]?: string; } : {
|
|
53
53
|
readonly select?: string;
|
|
54
|
-
readonly update?: string;
|
|
55
54
|
readonly insert?: string;
|
|
55
|
+
readonly update?: string;
|
|
56
56
|
readonly json?: string;
|
|
57
57
|
readonly jsonCreate?: string;
|
|
58
58
|
readonly jsonUpdate?: string;
|
|
59
59
|
}>(mapping: Mapping_2): (self: Self) => VariantSchema.Field<Self extends VariantSchema.Field<infer S_1 extends VariantSchema.Field.Config> ? { readonly [K_1 in keyof S_1]: K_1 extends keyof Mapping_2 ? Mapping_2[K_1] extends string ? VariantSchema.fromKey.Rename<S_1[K_1], Mapping_2[K_1]> : S_1[K_1] : S_1[K_1]; } : {
|
|
60
60
|
readonly select: "select" extends infer T ? T extends "select" ? T extends keyof Mapping_2 ? Mapping_2[T] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T]> : Self : Self : never : never;
|
|
61
|
-
readonly
|
|
62
|
-
readonly
|
|
61
|
+
readonly insert: "insert" extends infer T_1 ? T_1 extends "insert" ? T_1 extends keyof Mapping_2 ? Mapping_2[T_1] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T_1]> : Self : Self : never : never;
|
|
62
|
+
readonly update: "update" extends infer T_2 ? T_2 extends "update" ? T_2 extends keyof Mapping_2 ? Mapping_2[T_2] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T_2]> : Self : Self : never : never;
|
|
63
63
|
readonly json: "json" extends infer T_3 ? T_3 extends "json" ? T_3 extends keyof Mapping_2 ? Mapping_2[T_3] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T_3]> : Self : Self : never : never;
|
|
64
64
|
readonly jsonCreate: "jsonCreate" extends infer T_4 ? T_4 extends "jsonCreate" ? T_4 extends keyof Mapping_2 ? Mapping_2[T_4] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T_4]> : Self : Self : never : never;
|
|
65
65
|
readonly jsonUpdate: "jsonUpdate" extends infer T_5 ? T_5 extends "jsonUpdate" ? T_5 extends keyof Mapping_2 ? Mapping_2[T_5] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T_5]> : Self : Self : never : never;
|
|
66
66
|
}>;
|
|
67
67
|
<Self extends VariantSchema.Field<any> | VariantSchema.Field.ValueAny, const Mapping_3 extends Self extends VariantSchema.Field<infer S extends VariantSchema.Field.Config> ? { readonly [K in keyof S]?: string; } : {
|
|
68
68
|
readonly select?: string;
|
|
69
|
-
readonly update?: string;
|
|
70
69
|
readonly insert?: string;
|
|
70
|
+
readonly update?: string;
|
|
71
71
|
readonly json?: string;
|
|
72
72
|
readonly jsonCreate?: string;
|
|
73
73
|
readonly jsonUpdate?: string;
|
|
74
74
|
}>(self: Self, mapping: Mapping_3): VariantSchema.Field<Self extends VariantSchema.Field<infer S_1 extends VariantSchema.Field.Config> ? { readonly [K_1 in keyof S_1]: K_1 extends keyof Mapping_3 ? Mapping_3[K_1] extends string ? VariantSchema.fromKey.Rename<S_1[K_1], Mapping_3[K_1]> : S_1[K_1] : S_1[K_1]; } : {
|
|
75
75
|
readonly select: "select" extends infer T ? T extends "select" ? T extends keyof Mapping_3 ? Mapping_3[T] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T]> : Self : Self : never : never;
|
|
76
|
-
readonly
|
|
77
|
-
readonly
|
|
76
|
+
readonly insert: "insert" extends infer T_1 ? T_1 extends "insert" ? T_1 extends keyof Mapping_3 ? Mapping_3[T_1] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T_1]> : Self : Self : never : never;
|
|
77
|
+
readonly update: "update" extends infer T_2 ? T_2 extends "update" ? T_2 extends keyof Mapping_3 ? Mapping_3[T_2] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T_2]> : Self : Self : never : never;
|
|
78
78
|
readonly json: "json" extends infer T_3 ? T_3 extends "json" ? T_3 extends keyof Mapping_3 ? Mapping_3[T_3] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T_3]> : Self : Self : never : never;
|
|
79
79
|
readonly jsonCreate: "jsonCreate" extends infer T_4 ? T_4 extends "jsonCreate" ? T_4 extends keyof Mapping_3 ? Mapping_3[T_4] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T_4]> : Self : Self : never : never;
|
|
80
80
|
readonly jsonUpdate: "jsonUpdate" extends infer T_5 ? T_5 extends "jsonUpdate" ? T_5 extends keyof Mapping_3 ? Mapping_3[T_5] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T_5]> : Self : Self : never : never;
|
|
@@ -12,7 +12,7 @@ import * as VariantSchema from "@effect/experimental/VariantSchema";
|
|
|
12
12
|
import { SqlClient } from "@effect/sql/SqlClient";
|
|
13
13
|
import * as SqlResolver from "@effect/sql/SqlResolver";
|
|
14
14
|
import * as SqlSchema from "@effect/sql/SqlSchema";
|
|
15
|
-
import
|
|
15
|
+
import crypto from "crypto"; // TODO
|
|
16
16
|
import * as DateTime from "effect/DateTime";
|
|
17
17
|
import * as Effect from "effect/Effect";
|
|
18
18
|
import * as Option from "effect/Option";
|
|
@@ -383,11 +383,11 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = LAST_INSERT_ID(
|
|
|
383
383
|
Result: Model,
|
|
384
384
|
execute: versionColumn
|
|
385
385
|
? (request) => sql.onDialectOrElse({
|
|
386
|
-
mysql: () => sql `update ${sql(options.tableName)} set ${sql.update({ ...request, [versionColumn]: randomUUID() }, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]};
|
|
386
|
+
mysql: () => sql `update ${sql(options.tableName)} set ${sql.update({ ...request, [versionColumn]: crypto.randomUUID() }, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]};
|
|
387
387
|
select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idColumn]};`
|
|
388
388
|
.unprepared
|
|
389
389
|
.pipe(Effect.map(([, results]) => results)),
|
|
390
|
-
orElse: () => sql `update ${sql(options.tableName)} set ${sql.update({ ...request, [versionColumn]: randomUUID() }, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]} returning *`
|
|
390
|
+
orElse: () => sql `update ${sql(options.tableName)} set ${sql.update({ ...request, [versionColumn]: crypto.randomUUID() }, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]} returning *`
|
|
391
391
|
})
|
|
392
392
|
: (request) => sql.onDialectOrElse({
|
|
393
393
|
mysql: () => sql `update ${sql(options.tableName)} set ${sql.update(request, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]};
|
|
@@ -404,7 +404,7 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idCol
|
|
|
404
404
|
const updateVoidSchema = SqlSchema.void({
|
|
405
405
|
Request: Model.update,
|
|
406
406
|
execute: versionColumn
|
|
407
|
-
? (request) => sql `update ${sql(options.tableName)} set ${sql.update({ ...request, [versionColumn]: randomUUID() }, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]}`
|
|
407
|
+
? (request) => sql `update ${sql(options.tableName)} set ${sql.update({ ...request, [versionColumn]: crypto.randomUUID() }, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]}`
|
|
408
408
|
: (request) => sql `update ${sql(options.tableName)} set ${sql.update(request, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]}`
|
|
409
409
|
});
|
|
410
410
|
const updateVoid = (update) => updateVoidSchema(update).pipe(Effect.orDie, Effect.withSpan(`${options.spanPrefix}.updateVoid`, {
|
|
@@ -505,4 +505,4 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = LAST_INSERT_ID(
|
|
|
505
505
|
}));
|
|
506
506
|
return { insert, insertVoid, findById, delete: delete_ };
|
|
507
507
|
});
|
|
508
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/adapters/SQL/Model.ts"],"names":[],"mappings":"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"}
|
|
508
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/adapters/SQL/Model.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -3,7 +3,6 @@ import { reportNonInterruptedFailure } from "@effect-app/infra/QueueMaker/errors
|
|
|
3
3
|
import type { QueueBase } from "@effect-app/infra/QueueMaker/service"
|
|
4
4
|
import { QueueMeta } from "@effect-app/infra/QueueMaker/service"
|
|
5
5
|
import { SqlClient } from "@effect/sql"
|
|
6
|
-
import { randomUUID } from "crypto"
|
|
7
6
|
import { subMinutes } from "date-fns"
|
|
8
7
|
import { Effect, Fiber, Option, S, Tracer } from "effect-app"
|
|
9
8
|
import type { NonEmptyString255 } from "effect-app/Schema"
|
|
@@ -88,7 +87,7 @@ export function makeSQLQueue<
|
|
|
88
87
|
name: queueName,
|
|
89
88
|
processingAt: Option.none(),
|
|
90
89
|
finishedAt: Option.none(),
|
|
91
|
-
etag: randomUUID()
|
|
90
|
+
etag: crypto.randomUUID()
|
|
92
91
|
})
|
|
93
92
|
)
|
|
94
93
|
}),
|
|
@@ -99,7 +98,7 @@ export function makeSQLQueue<
|
|
|
99
98
|
const dec = yield* decodeDrain(first)
|
|
100
99
|
const { createdAt, updatedAt, ...rest } = dec
|
|
101
100
|
return yield* drainRepo.update(
|
|
102
|
-
Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }) // auto in lib , etag: randomUUID()
|
|
101
|
+
Drain.update.make({ ...rest, processingAt: Option.some(new Date()) }) // auto in lib , etag: crypto.randomUUID()
|
|
103
102
|
)
|
|
104
103
|
}
|
|
105
104
|
if (first) return first
|
|
@@ -107,7 +106,7 @@ export function makeSQLQueue<
|
|
|
107
106
|
}
|
|
108
107
|
}),
|
|
109
108
|
finish: ({ createdAt, updatedAt, ...q }: Drain) =>
|
|
110
|
-
drainRepo.updateVoid(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: randomUUID()
|
|
109
|
+
drainRepo.updateVoid(Drain.update.make({ ...q, finishedAt: Option.some(new Date()) })) // auto in lib , etag: crypto.randomUUID()
|
|
111
110
|
}
|
|
112
111
|
return {
|
|
113
112
|
publish: (...messages) =>
|
package/src/Store/utils.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import crypto from "crypto"
|
|
2
2
|
import { Effect, Option } from "effect-app"
|
|
3
3
|
import { OptimisticConcurrencyException } from "../errors.js"
|
|
4
4
|
import type { PersistenceModelType, SupportedValues2 } from "./service.js"
|
|
@@ -9,7 +9,7 @@ export const makeETag = <E extends PersistenceModelType<{}>>(
|
|
|
9
9
|
({
|
|
10
10
|
...e,
|
|
11
11
|
// we have to hash the JSON, as hashing the object might contain elements that won't be serialized anyway
|
|
12
|
-
_etag: createHash("sha256").update(JSON.stringify(e)).digest("hex")
|
|
12
|
+
_etag: crypto.createHash("sha256").update(JSON.stringify(e)).digest("hex")
|
|
13
13
|
}) as any
|
|
14
14
|
|
|
15
15
|
export const makeUpdateETag =
|
|
@@ -12,7 +12,7 @@ import * as VariantSchema from "@effect/experimental/VariantSchema"
|
|
|
12
12
|
import { SqlClient } from "@effect/sql/SqlClient"
|
|
13
13
|
import * as SqlResolver from "@effect/sql/SqlResolver"
|
|
14
14
|
import * as SqlSchema from "@effect/sql/SqlSchema"
|
|
15
|
-
import
|
|
15
|
+
import crypto from "crypto" // TODO
|
|
16
16
|
import type { Brand } from "effect/Brand"
|
|
17
17
|
import * as DateTime from "effect/DateTime"
|
|
18
18
|
import type { DurationInput } from "effect/Duration"
|
|
@@ -711,7 +711,7 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = LAST_INSERT_ID(
|
|
|
711
711
|
sql.onDialectOrElse({
|
|
712
712
|
mysql: () =>
|
|
713
713
|
sql`update ${sql(options.tableName)} set ${
|
|
714
|
-
sql.update({ ...request, [versionColumn]: randomUUID() }, [idColumn])
|
|
714
|
+
sql.update({ ...request, [versionColumn]: crypto.randomUUID() }, [idColumn])
|
|
715
715
|
} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]};
|
|
716
716
|
select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idColumn]};`
|
|
717
717
|
.unprepared
|
|
@@ -720,7 +720,7 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idCol
|
|
|
720
720
|
),
|
|
721
721
|
orElse: () =>
|
|
722
722
|
sql`update ${sql(options.tableName)} set ${
|
|
723
|
-
sql.update({ ...request, [versionColumn]: randomUUID() }, [idColumn])
|
|
723
|
+
sql.update({ ...request, [versionColumn]: crypto.randomUUID() }, [idColumn])
|
|
724
724
|
} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${
|
|
725
725
|
request[versionColumn]
|
|
726
726
|
} returning *`
|
|
@@ -758,7 +758,7 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idCol
|
|
|
758
758
|
execute: versionColumn
|
|
759
759
|
? (request) =>
|
|
760
760
|
sql`update ${sql(options.tableName)} set ${
|
|
761
|
-
sql.update({ ...request, [versionColumn]: randomUUID() }, [idColumn])
|
|
761
|
+
sql.update({ ...request, [versionColumn]: crypto.randomUUID() }, [idColumn])
|
|
762
762
|
} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]}`
|
|
763
763
|
: (request) =>
|
|
764
764
|
sql`update ${sql(options.tableName)} set ${sql.update(request, [idColumn])} where ${sql(idColumn)} = ${
|