@c9up/atlas 0.2.0 → 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/README.md +8 -0
- package/db.darwin-arm64.node +0 -0
- package/db.darwin-x64.node +0 -0
- package/db.linux-arm64-gnu.node +0 -0
- package/db.linux-x64-gnu.node +0 -0
- package/db.win32-x64-msvc.node +0 -0
- package/dist/AtlasProvider.d.ts +60 -7
- package/dist/AtlasProvider.d.ts.map +1 -1
- package/dist/AtlasProvider.js +204 -38
- package/dist/AtlasProvider.js.map +1 -1
- package/dist/BaseEntity.d.ts +17 -0
- package/dist/BaseEntity.d.ts.map +1 -1
- package/dist/BaseEntity.js.map +1 -1
- package/dist/BaseModel.d.ts +63 -27
- package/dist/BaseModel.d.ts.map +1 -1
- package/dist/BaseModel.js +108 -51
- package/dist/BaseModel.js.map +1 -1
- package/dist/BaseRepository.d.ts +11 -1
- package/dist/BaseRepository.d.ts.map +1 -1
- package/dist/BaseRepository.js +95 -20
- package/dist/BaseRepository.js.map +1 -1
- package/dist/ConnectionManager.d.ts +106 -0
- package/dist/ConnectionManager.d.ts.map +1 -0
- package/dist/ConnectionManager.js +228 -0
- package/dist/ConnectionManager.js.map +1 -0
- package/dist/ModelQuery.d.ts +256 -43
- package/dist/ModelQuery.d.ts.map +1 -1
- package/dist/ModelQuery.js +899 -231
- package/dist/ModelQuery.js.map +1 -1
- package/dist/Transaction.d.ts +54 -1
- package/dist/Transaction.d.ts.map +1 -1
- package/dist/Transaction.js +121 -59
- package/dist/Transaction.js.map +1 -1
- package/dist/adapters/NapiDbAdapter.d.ts +11 -0
- package/dist/adapters/NapiDbAdapter.d.ts.map +1 -1
- package/dist/adapters/NapiDbAdapter.js +35 -7
- package/dist/adapters/NapiDbAdapter.js.map +1 -1
- package/dist/console/contract.d.ts +62 -0
- package/dist/console/contract.d.ts.map +1 -0
- package/dist/console/contract.js +38 -0
- package/dist/console/contract.js.map +1 -0
- package/dist/console/factoryCommands.d.ts +23 -0
- package/dist/console/factoryCommands.d.ts.map +1 -0
- package/dist/console/factoryCommands.js +62 -0
- package/dist/console/factoryCommands.js.map +1 -0
- package/dist/console/migrationCommands.d.ts +38 -8
- package/dist/console/migrationCommands.d.ts.map +1 -1
- package/dist/console/migrationCommands.js +157 -50
- package/dist/console/migrationCommands.js.map +1 -1
- package/dist/console/schemaCheckCommand.d.ts +11 -17
- package/dist/console/schemaCheckCommand.d.ts.map +1 -1
- package/dist/console/schemaCheckCommand.js +21 -15
- package/dist/console/schemaCheckCommand.js.map +1 -1
- package/dist/console/schemaDumpCommand.d.ts +30 -0
- package/dist/console/schemaDumpCommand.d.ts.map +1 -0
- package/dist/console/schemaDumpCommand.js +69 -0
- package/dist/console/schemaDumpCommand.js.map +1 -0
- package/dist/console/schemaGenerateCommand.d.ts +100 -0
- package/dist/console/schemaGenerateCommand.d.ts.map +1 -0
- package/dist/console/schemaGenerateCommand.js +246 -0
- package/dist/console/schemaGenerateCommand.js.map +1 -0
- package/dist/console/seederCommands.d.ts +46 -0
- package/dist/console/seederCommands.d.ts.map +1 -0
- package/dist/console/seederCommands.js +136 -0
- package/dist/console/seederCommands.js.map +1 -0
- package/dist/decorators/entity.d.ts +13 -2
- package/dist/decorators/entity.d.ts.map +1 -1
- package/dist/decorators/entity.js +10 -0
- package/dist/decorators/entity.js.map +1 -1
- package/dist/decorators/hooks.d.ts +3 -3
- package/dist/decorators/hooks.d.ts.map +1 -1
- package/dist/decorators/hooks.js.map +1 -1
- package/dist/events.d.ts +5 -0
- package/dist/events.d.ts.map +1 -1
- package/dist/events.js.map +1 -1
- package/dist/factories.d.ts +8 -0
- package/dist/factories.d.ts.map +1 -0
- package/dist/factories.js +8 -0
- package/dist/factories.js.map +1 -0
- package/dist/index.d.ts +11 -5
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +12 -4
- package/dist/index.js.map +1 -1
- package/dist/lucid-schema.d.ts +15 -0
- package/dist/lucid-schema.d.ts.map +1 -0
- package/dist/lucid-schema.js +16 -0
- package/dist/lucid-schema.js.map +1 -0
- package/dist/orm.d.ts +14 -0
- package/dist/orm.d.ts.map +1 -0
- package/dist/orm.js +14 -0
- package/dist/orm.js.map +1 -0
- package/dist/query/DatabaseQueryBuilder.d.ts +557 -0
- package/dist/query/DatabaseQueryBuilder.d.ts.map +1 -0
- package/dist/query/DatabaseQueryBuilder.js +1798 -0
- package/dist/query/DatabaseQueryBuilder.js.map +1 -0
- package/dist/query/DmlBuilder.d.ts +62 -0
- package/dist/query/DmlBuilder.d.ts.map +1 -0
- package/dist/query/DmlBuilder.js +84 -0
- package/dist/query/DmlBuilder.js.map +1 -0
- package/dist/query/QueryBuilder.d.ts +5 -0
- package/dist/query/QueryBuilder.d.ts.map +1 -1
- package/dist/query/QueryBuilder.js +7 -0
- package/dist/query/QueryBuilder.js.map +1 -1
- package/dist/query/RawQueryBuilder.d.ts +47 -0
- package/dist/query/RawQueryBuilder.d.ts.map +1 -0
- package/dist/query/RawQueryBuilder.js +138 -0
- package/dist/query/RawQueryBuilder.js.map +1 -0
- package/dist/query/interpolate.d.ts +45 -0
- package/dist/query/interpolate.d.ts.map +1 -0
- package/dist/query/interpolate.js +51 -0
- package/dist/query/interpolate.js.map +1 -0
- package/dist/query/native.d.ts +8 -0
- package/dist/query/native.d.ts.map +1 -1
- package/dist/query/native.js +14 -0
- package/dist/query/native.js.map +1 -1
- package/dist/query/operators.d.ts +4 -0
- package/dist/query/operators.d.ts.map +1 -0
- package/dist/query/operators.js +27 -0
- package/dist/query/operators.js.map +1 -0
- package/dist/schema/Migration.d.ts +31 -7
- package/dist/schema/Migration.d.ts.map +1 -1
- package/dist/schema/Migration.js +34 -7
- package/dist/schema/Migration.js.map +1 -1
- package/dist/schema/MigrationRunner.d.ts +56 -6
- package/dist/schema/MigrationRunner.d.ts.map +1 -1
- package/dist/schema/MigrationRunner.js +382 -112
- package/dist/schema/MigrationRunner.js.map +1 -1
- package/dist/schema/Schema.d.ts +59 -2
- package/dist/schema/Schema.d.ts.map +1 -1
- package/dist/schema/Schema.js +143 -9
- package/dist/schema/Schema.js.map +1 -1
- package/dist/schema/SchemaDumper.d.ts +121 -0
- package/dist/schema/SchemaDumper.d.ts.map +1 -0
- package/dist/schema/SchemaDumper.js +365 -0
- package/dist/schema/SchemaDumper.js.map +1 -0
- package/dist/schema/Seeder.d.ts +13 -0
- package/dist/schema/Seeder.d.ts.map +1 -1
- package/dist/schema/Seeder.js +28 -5
- package/dist/schema/Seeder.js.map +1 -1
- package/dist/schema/TableBuilder.d.ts +27 -8
- package/dist/schema/TableBuilder.d.ts.map +1 -1
- package/dist/schema/TableBuilder.js +50 -12
- package/dist/schema/TableBuilder.js.map +1 -1
- package/dist/schema/catalog.d.ts +25 -1
- package/dist/schema/catalog.d.ts.map +1 -1
- package/dist/schema/catalog.js +69 -22
- package/dist/schema/catalog.js.map +1 -1
- package/dist/schema/introspect.d.ts +1 -1
- package/dist/schema/introspect.d.ts.map +1 -1
- package/dist/schema/introspect.js +26 -11
- package/dist/schema/introspect.js.map +1 -1
- package/dist/seeders.d.ts +7 -0
- package/dist/seeders.d.ts.map +1 -0
- package/dist/seeders.js +7 -0
- package/dist/seeders.js.map +1 -0
- package/dist/services/db.d.ts +120 -9
- package/dist/services/db.d.ts.map +1 -1
- package/dist/services/db.js +182 -26
- package/dist/services/db.js.map +1 -1
- package/dist/testing/DatabaseCleanup.d.ts +29 -6
- package/dist/testing/DatabaseCleanup.d.ts.map +1 -1
- package/dist/testing/DatabaseCleanup.js +44 -17
- package/dist/testing/DatabaseCleanup.js.map +1 -1
- package/dist/testing/DbAssertions.d.ts +48 -0
- package/dist/testing/DbAssertions.d.ts.map +1 -0
- package/dist/testing/DbAssertions.js +80 -0
- package/dist/testing/DbAssertions.js.map +1 -0
- package/dist/testing/Factory.d.ts +111 -25
- package/dist/testing/Factory.d.ts.map +1 -1
- package/dist/testing/Factory.js +331 -56
- package/dist/testing/Factory.js.map +1 -1
- package/dist/testing/TestUtils.d.ts +49 -0
- package/dist/testing/TestUtils.d.ts.map +1 -0
- package/dist/testing/TestUtils.js +79 -0
- package/dist/testing/TestUtils.js.map +1 -0
- package/dist/testing/index.d.ts +3 -1
- package/dist/testing/index.d.ts.map +1 -1
- package/dist/testing/index.js +3 -1
- package/dist/testing/index.js.map +1 -1
- package/dist/types/relations.d.ts +31 -0
- package/dist/types/relations.d.ts.map +1 -0
- package/dist/types/relations.js +20 -0
- package/dist/types/relations.js.map +1 -0
- package/index.darwin-arm64.node +0 -0
- package/index.darwin-x64.node +0 -0
- package/index.linux-arm64-gnu.node +0 -0
- package/index.linux-x64-gnu.node +0 -0
- package/index.win32-x64-msvc.node +0 -0
- package/package.json +30 -2
- package/src/AtlasProvider.ts +297 -51
- package/src/BaseEntity.ts +29 -0
- package/src/BaseModel.ts +174 -37
- package/src/BaseRepository.ts +136 -17
- package/src/ConnectionManager.ts +298 -0
- package/src/ModelQuery.ts +1309 -260
- package/src/Transaction.ts +194 -60
- package/src/adapters/NapiDbAdapter.ts +72 -14
- package/src/console/contract.ts +96 -0
- package/src/console/factoryCommands.ts +73 -0
- package/src/console/migrationCommands.ts +253 -63
- package/src/console/schemaCheckCommand.ts +26 -22
- package/src/console/schemaDumpCommand.ts +96 -0
- package/src/console/schemaGenerateCommand.ts +380 -0
- package/src/console/seederCommands.ts +174 -0
- package/src/decorators/entity.ts +18 -2
- package/src/decorators/hooks.ts +5 -3
- package/src/events.ts +5 -0
- package/src/factories.ts +10 -0
- package/src/index.ts +50 -3
- package/src/lucid-schema.ts +22 -0
- package/src/orm.ts +13 -0
- package/src/query/DatabaseQueryBuilder.ts +2724 -0
- package/src/query/DmlBuilder.ts +131 -0
- package/src/query/QueryBuilder.ts +8 -0
- package/src/query/RawQueryBuilder.ts +173 -0
- package/src/query/interpolate.ts +73 -0
- package/src/query/native.ts +29 -0
- package/src/query/operators.ts +27 -0
- package/src/schema/Migration.ts +36 -7
- package/src/schema/MigrationRunner.ts +483 -119
- package/src/schema/Schema.ts +168 -19
- package/src/schema/SchemaDumper.ts +518 -0
- package/src/schema/Seeder.ts +47 -10
- package/src/schema/TableBuilder.ts +48 -11
- package/src/schema/catalog.ts +94 -24
- package/src/schema/introspect.ts +26 -9
- package/src/seeders.ts +16 -0
- package/src/services/db.ts +343 -31
- package/src/testing/DatabaseCleanup.ts +73 -21
- package/src/testing/DbAssertions.ts +127 -0
- package/src/testing/Factory.ts +559 -79
- package/src/testing/TestUtils.ts +123 -0
- package/src/testing/index.ts +12 -1
- package/src/types/relations.ts +43 -0
package/dist/Transaction.js
CHANGED
|
@@ -4,7 +4,91 @@
|
|
|
4
4
|
* @implements MISS-1
|
|
5
5
|
*/
|
|
6
6
|
import { randomBytes } from "node:crypto";
|
|
7
|
+
import { EventEmitter } from "node:events";
|
|
8
|
+
import { makeTransactionQueryBuilders, } from "./query/DatabaseQueryBuilder.js";
|
|
9
|
+
import { getAtlasDialect } from "./query/native.js";
|
|
7
10
|
import { isTransactionClient, TRANSACTION_BRAND, } from "./utils/transactionBrand.js";
|
|
11
|
+
/**
|
|
12
|
+
* Build the overloaded `transaction()` method for a client. Managed when given a
|
|
13
|
+
* callback (auto RELEASE / ROLLBACK TO), manual otherwise — both open a SAVEPOINT
|
|
14
|
+
* on `getParent()`. The impl signature is deliberately broader than the overloads.
|
|
15
|
+
*/
|
|
16
|
+
export function makeNestedTransactionFn(getParent) {
|
|
17
|
+
function tx(arg1, arg2) {
|
|
18
|
+
const parent = getParent();
|
|
19
|
+
const callback = typeof arg1 === "function" ? arg1 : undefined;
|
|
20
|
+
const options = typeof arg1 === "function" ? arg2 : arg1;
|
|
21
|
+
return callback
|
|
22
|
+
? runManagedSavepoint(parent, callback, options)
|
|
23
|
+
: openSavepoint(parent);
|
|
24
|
+
}
|
|
25
|
+
return tx;
|
|
26
|
+
}
|
|
27
|
+
/** Managed nested savepoint: open, run the callback, RELEASE on success / ROLLBACK TO on throw. */
|
|
28
|
+
async function runManagedSavepoint(parent, callback, _options) {
|
|
29
|
+
const sp = await openSavepoint(parent);
|
|
30
|
+
try {
|
|
31
|
+
const result = await callback(sp);
|
|
32
|
+
await sp.commit();
|
|
33
|
+
return result;
|
|
34
|
+
}
|
|
35
|
+
catch (err) {
|
|
36
|
+
try {
|
|
37
|
+
await sp.rollback();
|
|
38
|
+
}
|
|
39
|
+
catch {
|
|
40
|
+
/* best-effort */
|
|
41
|
+
}
|
|
42
|
+
throw err;
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
/**
|
|
46
|
+
* Open a SAVEPOINT-backed nested transaction client on `parent`. Shared by the
|
|
47
|
+
* standalone {@link transaction} helper, `trx.transaction()`, and the napi pinned
|
|
48
|
+
* client. Commit RELEASEs the savepoint and forwards hooks to the parent (a
|
|
49
|
+
* nested commit isn't durable until the root commits); rollback does ROLLBACK TO
|
|
50
|
+
* + RELEASE and fires the local rollback hooks.
|
|
51
|
+
*/
|
|
52
|
+
export async function openSavepoint(parent) {
|
|
53
|
+
const name = `sp_${randomBytes(6).toString("hex")}`;
|
|
54
|
+
await parent.execute(`SAVEPOINT ${name}`, []);
|
|
55
|
+
const commitHooks = [];
|
|
56
|
+
const rollbackHooks = [];
|
|
57
|
+
const evt = makeTrxEvents();
|
|
58
|
+
const base = {
|
|
59
|
+
execute: parent.execute.bind(parent),
|
|
60
|
+
query: parent.query.bind(parent),
|
|
61
|
+
async commit() {
|
|
62
|
+
await parent.execute(`RELEASE SAVEPOINT ${name}`, []);
|
|
63
|
+
evt.emit("commit"); // synchronous EventEmitter notification (this savepoint)
|
|
64
|
+
for (const hook of commitHooks)
|
|
65
|
+
parent.after("commit", hook);
|
|
66
|
+
for (const hook of rollbackHooks)
|
|
67
|
+
parent.after("rollback", hook);
|
|
68
|
+
},
|
|
69
|
+
async rollback() {
|
|
70
|
+
await parent.execute(`ROLLBACK TO SAVEPOINT ${name}`, []);
|
|
71
|
+
try {
|
|
72
|
+
await parent.execute(`RELEASE SAVEPOINT ${name}`, []);
|
|
73
|
+
}
|
|
74
|
+
catch {
|
|
75
|
+
/* best-effort — the savepoint is already logically unwound */
|
|
76
|
+
}
|
|
77
|
+
evt.emit("rollback");
|
|
78
|
+
await runAfterHooks(rollbackHooks);
|
|
79
|
+
},
|
|
80
|
+
after(event, cb) {
|
|
81
|
+
(event === "commit" ? commitHooks : rollbackHooks).push(cb);
|
|
82
|
+
},
|
|
83
|
+
on: evt.on,
|
|
84
|
+
once: evt.once,
|
|
85
|
+
off: evt.off,
|
|
86
|
+
isNested: true,
|
|
87
|
+
[TRANSACTION_BRAND]: true,
|
|
88
|
+
};
|
|
89
|
+
const trx = Object.assign(base, makeTransactionQueryBuilders(base, getAtlasDialect()), { transaction: makeNestedTransactionFn(() => trx) });
|
|
90
|
+
return trx;
|
|
91
|
+
}
|
|
8
92
|
/**
|
|
9
93
|
* Run every registered after-hook, swallowing errors — a post-commit side
|
|
10
94
|
* effect must never surface a failure on a transaction the caller already saw
|
|
@@ -20,66 +104,37 @@ export async function runAfterHooks(hooks) {
|
|
|
20
104
|
}
|
|
21
105
|
}
|
|
22
106
|
}
|
|
107
|
+
/**
|
|
108
|
+
* The `on`/`once`/`off` EventEmitter surface for a transaction client, plus an
|
|
109
|
+
* internal `emit` the client fires at commit/rollback. Distinct from `after`
|
|
110
|
+
* hooks: these are synchronous, per-client, pre-hook notifications (Lucid — the
|
|
111
|
+
* trx client is a Node EventEmitter). `on`/`once`/`off` return the client for
|
|
112
|
+
* chaining via their `this` binding.
|
|
113
|
+
*/
|
|
114
|
+
export function makeTrxEvents() {
|
|
115
|
+
const ee = new EventEmitter();
|
|
116
|
+
return {
|
|
117
|
+
on(e, cb) {
|
|
118
|
+
ee.on(e, cb);
|
|
119
|
+
return this;
|
|
120
|
+
},
|
|
121
|
+
once(e, cb) {
|
|
122
|
+
ee.once(e, cb);
|
|
123
|
+
return this;
|
|
124
|
+
},
|
|
125
|
+
off(e, cb) {
|
|
126
|
+
ee.off(e, cb);
|
|
127
|
+
return this;
|
|
128
|
+
},
|
|
129
|
+
emit(e) {
|
|
130
|
+
ee.emit(e);
|
|
131
|
+
},
|
|
132
|
+
};
|
|
133
|
+
}
|
|
23
134
|
export async function transaction(db, callback, options) {
|
|
135
|
+
// Nested (the caller passed a live trx) → a SAVEPOINT-backed managed savepoint.
|
|
24
136
|
if (isTransactionClient(db)) {
|
|
25
|
-
|
|
26
|
-
const name = `sp_${randomBytes(6).toString("hex")}`;
|
|
27
|
-
await parent.execute(`SAVEPOINT ${name}`, []);
|
|
28
|
-
const commitHooks = [];
|
|
29
|
-
const rollbackHooks = [];
|
|
30
|
-
const trx = {
|
|
31
|
-
execute: parent.execute.bind(parent),
|
|
32
|
-
query: parent.query.bind(parent),
|
|
33
|
-
async commit() {
|
|
34
|
-
await parent.execute(`RELEASE SAVEPOINT ${name}`, []);
|
|
35
|
-
// A nested commit is NOT durable until the root commits — forward BOTH
|
|
36
|
-
// hook sets to the parent. Commit hooks fire on the real (root) commit
|
|
37
|
-
// and drop if the outer later rolls back. Rollback hooks must ALSO
|
|
38
|
-
// forward: this savepoint's released work is folded into the parent, so
|
|
39
|
-
// an outer rollback undoes it too — dropping them here would strand any
|
|
40
|
-
// in-memory restoration a nested caller registered on `after('rollback')`
|
|
41
|
-
// (the work IS rolled back, just by the parent). The parent fires exactly
|
|
42
|
-
// one of its two hook sets, so no double-run.
|
|
43
|
-
for (const hook of commitHooks)
|
|
44
|
-
parent.after("commit", hook);
|
|
45
|
-
for (const hook of rollbackHooks)
|
|
46
|
-
parent.after("rollback", hook);
|
|
47
|
-
},
|
|
48
|
-
async rollback() {
|
|
49
|
-
await parent.execute(`ROLLBACK TO SAVEPOINT ${name}`, []);
|
|
50
|
-
// ROLLBACK TO leaves the savepoint ESTABLISHED — release it so it doesn't
|
|
51
|
-
// stay stacked on the connection through a long outer transaction with
|
|
52
|
-
// many nested failures. Best-effort: the rollback already unwound the
|
|
53
|
-
// work, so a RELEASE failure must not surface. (PG/MySQL/SQLite all
|
|
54
|
-
// accept RELEASE after ROLLBACK TO.)
|
|
55
|
-
try {
|
|
56
|
-
await parent.execute(`RELEASE SAVEPOINT ${name}`, []);
|
|
57
|
-
}
|
|
58
|
-
catch {
|
|
59
|
-
/* best-effort — the savepoint is already logically unwound */
|
|
60
|
-
}
|
|
61
|
-
await runAfterHooks(rollbackHooks);
|
|
62
|
-
},
|
|
63
|
-
after(event, cb) {
|
|
64
|
-
(event === "commit" ? commitHooks : rollbackHooks).push(cb);
|
|
65
|
-
},
|
|
66
|
-
isNested: true,
|
|
67
|
-
[TRANSACTION_BRAND]: true,
|
|
68
|
-
};
|
|
69
|
-
try {
|
|
70
|
-
const result = await callback(trx);
|
|
71
|
-
await trx.commit();
|
|
72
|
-
return result;
|
|
73
|
-
}
|
|
74
|
-
catch (err) {
|
|
75
|
-
try {
|
|
76
|
-
await trx.rollback();
|
|
77
|
-
}
|
|
78
|
-
catch {
|
|
79
|
-
/* best-effort */
|
|
80
|
-
}
|
|
81
|
-
throw err;
|
|
82
|
-
}
|
|
137
|
+
return runManagedSavepoint(db, callback, options);
|
|
83
138
|
}
|
|
84
139
|
// Pinned interactive transaction (napi-backed): db.transaction() acquires ONE
|
|
85
140
|
// connection and issues BEGIN on it; the managed form commits on success /
|
|
@@ -94,23 +149,30 @@ export async function transaction(db, callback, options) {
|
|
|
94
149
|
await db.execute("BEGIN", []);
|
|
95
150
|
const commitHooks = [];
|
|
96
151
|
const rollbackHooks = [];
|
|
97
|
-
const
|
|
152
|
+
const evt = makeTrxEvents();
|
|
153
|
+
const base = {
|
|
98
154
|
execute: db.execute.bind(db),
|
|
99
155
|
query: db.query.bind(db),
|
|
100
156
|
async commit() {
|
|
101
157
|
await db.execute("COMMIT", []);
|
|
158
|
+
evt.emit("commit"); // synchronous EventEmitter notification
|
|
102
159
|
await runAfterHooks(commitHooks);
|
|
103
160
|
},
|
|
104
161
|
async rollback() {
|
|
105
162
|
await db.execute("ROLLBACK", []);
|
|
163
|
+
evt.emit("rollback");
|
|
106
164
|
await runAfterHooks(rollbackHooks);
|
|
107
165
|
},
|
|
108
166
|
after(event, cb) {
|
|
109
167
|
(event === "commit" ? commitHooks : rollbackHooks).push(cb);
|
|
110
168
|
},
|
|
169
|
+
on: evt.on,
|
|
170
|
+
once: evt.once,
|
|
171
|
+
off: evt.off,
|
|
111
172
|
isNested: false,
|
|
112
173
|
[TRANSACTION_BRAND]: true,
|
|
113
174
|
};
|
|
175
|
+
const trx = Object.assign(base, makeTransactionQueryBuilders(base, getAtlasDialect()), { transaction: makeNestedTransactionFn(() => trx) });
|
|
114
176
|
try {
|
|
115
177
|
const result = await callback(trx);
|
|
116
178
|
await trx.commit();
|
package/dist/Transaction.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../src/Transaction.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"Transaction.js","sourceRoot":"","sources":["../src/Transaction.ts"],"names":[],"mappings":"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"}
|
|
@@ -34,6 +34,17 @@ export interface QueryMeta {
|
|
|
34
34
|
* `debug: false` — this is what `ModelQuery.debug()` sets.
|
|
35
35
|
*/
|
|
36
36
|
debug?: boolean;
|
|
37
|
+
/**
|
|
38
|
+
* Arbitrary metadata attached to the `db:query` event (Adonis Lucid
|
|
39
|
+
* `reporterData`) — request id, user id, feature flag, … — for listeners.
|
|
40
|
+
*/
|
|
41
|
+
reporterData?: Record<string, unknown>;
|
|
42
|
+
/**
|
|
43
|
+
* Server-side statement timeout in ms (Lucid `timeout(ms, { cancel: true })`).
|
|
44
|
+
* Routes to the driver's `statement_timeout` (Postgres) / `MAX_EXECUTION_TIME`
|
|
45
|
+
* (MySQL SELECT) so the server aborts the query — not just the client race.
|
|
46
|
+
*/
|
|
47
|
+
serverTimeoutMs?: number;
|
|
37
48
|
}
|
|
38
49
|
/** Per-connection observability settings (Lucid's `debug` connection option). */
|
|
39
50
|
export interface ObservabilityOptions {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NapiDbAdapter.d.ts","sourceRoot":"","sources":["../../src/adapters/NapiDbAdapter.ts"],"names":[],"mappings":"AAAA;;GAEG;
|
|
1
|
+
{"version":3,"file":"NapiDbAdapter.d.ts","sourceRoot":"","sources":["../../src/adapters/NapiDbAdapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,8 @@
|
|
|
2
2
|
* NapiDbAdapter — bridges the Rust atlas-db NAPI binding to Atlas.
|
|
3
3
|
*/
|
|
4
4
|
import { emitDbQuery, hasDbQueryListeners } from "../events.js";
|
|
5
|
-
import {
|
|
5
|
+
import { makeTransactionQueryBuilders } from "../query/DatabaseQueryBuilder.js";
|
|
6
|
+
import { makeNestedTransactionFn, makeTrxEvents, runAfterHooks, } from "../Transaction.js";
|
|
6
7
|
import { dialectFromUrl } from "../utils/dialectFromUrl.js";
|
|
7
8
|
import { TRANSACTION_BRAND } from "../utils/transactionBrand.js";
|
|
8
9
|
/**
|
|
@@ -85,10 +86,15 @@ export async function createNapiConnection(url, poolMin = 1, poolMax = 10, pragm
|
|
|
85
86
|
// COMMIT / ROLLBACK is durable (Lucid `trx.after(...)`), errors swallowed.
|
|
86
87
|
const commitHooks = [];
|
|
87
88
|
const rollbackHooks = [];
|
|
88
|
-
|
|
89
|
+
const evt = makeTrxEvents();
|
|
90
|
+
const base = {
|
|
89
91
|
async execute(sql, params = []) {
|
|
90
|
-
const
|
|
91
|
-
|
|
92
|
+
const json = await native.execute(sql, JSON.stringify(params, napiReplacer));
|
|
93
|
+
const r = JSON.parse(json);
|
|
94
|
+
return {
|
|
95
|
+
rowsAffected: Number(r.rows_affected),
|
|
96
|
+
lastInsertId: r.last_insert_id == null ? undefined : Number(r.last_insert_id),
|
|
97
|
+
};
|
|
92
98
|
},
|
|
93
99
|
async query(sql, params = []) {
|
|
94
100
|
const json = await native.query(sql, JSON.stringify(params, napiReplacer));
|
|
@@ -96,18 +102,28 @@ export async function createNapiConnection(url, poolMin = 1, poolMax = 10, pragm
|
|
|
96
102
|
},
|
|
97
103
|
async commit() {
|
|
98
104
|
await native.commit();
|
|
105
|
+
evt.emit("commit"); // synchronous EventEmitter notification (Lucid trx.on)
|
|
99
106
|
await runAfterHooks(commitHooks);
|
|
100
107
|
},
|
|
101
108
|
async rollback() {
|
|
102
109
|
await native.rollback();
|
|
110
|
+
evt.emit("rollback");
|
|
103
111
|
await runAfterHooks(rollbackHooks);
|
|
104
112
|
},
|
|
105
113
|
after(event, cb) {
|
|
106
114
|
(event === "commit" ? commitHooks : rollbackHooks).push(cb);
|
|
107
115
|
},
|
|
116
|
+
on: evt.on,
|
|
117
|
+
once: evt.once,
|
|
118
|
+
off: evt.off,
|
|
108
119
|
isNested: false,
|
|
109
120
|
[TRANSACTION_BRAND]: true,
|
|
110
121
|
};
|
|
122
|
+
// Lucid: the transaction client is also a query-builder entry point
|
|
123
|
+
// (trx.table()/from()/insertQuery()), routed through THIS pinned connection.
|
|
124
|
+
// `trx.transaction()` opens a SAVEPOINT-backed nested client on this one.
|
|
125
|
+
const client = Object.assign(base, makeTransactionQueryBuilders(base, dialect), { transaction: makeNestedTransactionFn(() => client) });
|
|
126
|
+
return client;
|
|
111
127
|
}
|
|
112
128
|
async function transaction(arg1, arg2) {
|
|
113
129
|
const callback = typeof arg1 === "function" ? arg1 : undefined;
|
|
@@ -153,6 +169,7 @@ export async function createNapiConnection(url, poolMin = 1, poolMax = 10, pragm
|
|
|
153
169
|
method: meta?.method,
|
|
154
170
|
ddl: meta?.ddl,
|
|
155
171
|
inTransaction: false,
|
|
172
|
+
reporterData: meta?.reporterData,
|
|
156
173
|
});
|
|
157
174
|
return result;
|
|
158
175
|
}
|
|
@@ -167,6 +184,7 @@ export async function createNapiConnection(url, poolMin = 1, poolMax = 10, pragm
|
|
|
167
184
|
ddl: meta?.ddl,
|
|
168
185
|
inTransaction: false,
|
|
169
186
|
error: error instanceof Error ? error : new Error(String(error)),
|
|
187
|
+
reporterData: meta?.reporterData,
|
|
170
188
|
});
|
|
171
189
|
throw error;
|
|
172
190
|
}
|
|
@@ -176,14 +194,24 @@ export async function createNapiConnection(url, poolMin = 1, poolMax = 10, pragm
|
|
|
176
194
|
transaction,
|
|
177
195
|
async query(sql, params = [], meta) {
|
|
178
196
|
return observed(sql, params, meta, async () => {
|
|
179
|
-
const
|
|
197
|
+
const paramsJson = JSON.stringify(params, napiReplacer);
|
|
198
|
+
const json = meta?.serverTimeoutMs != null
|
|
199
|
+
? await db.queryTimed(sql, paramsJson, meta.serverTimeoutMs)
|
|
200
|
+
: await db.query(sql, paramsJson);
|
|
180
201
|
return JSON.parse(json, napiReviver);
|
|
181
202
|
});
|
|
182
203
|
},
|
|
183
204
|
async execute(sql, params = [], meta) {
|
|
184
205
|
return observed(sql, params, meta, async () => {
|
|
185
|
-
const
|
|
186
|
-
|
|
206
|
+
const paramsJson = JSON.stringify(params, napiReplacer);
|
|
207
|
+
const json = meta?.serverTimeoutMs != null
|
|
208
|
+
? await db.executeTimed(sql, paramsJson, meta.serverTimeoutMs)
|
|
209
|
+
: await db.execute(sql, paramsJson);
|
|
210
|
+
const r = JSON.parse(json);
|
|
211
|
+
return {
|
|
212
|
+
rowsAffected: Number(r.rows_affected),
|
|
213
|
+
lastInsertId: r.last_insert_id == null ? undefined : Number(r.last_insert_id),
|
|
214
|
+
};
|
|
187
215
|
});
|
|
188
216
|
},
|
|
189
217
|
async runInTransaction(batch) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NapiDbAdapter.js","sourceRoot":"","sources":["../../src/adapters/NapiDbAdapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAEN,aAAa,GAEb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE;;;;;GAKG;AACH,SAAS,YAAY,CAAC,IAAY,EAAE,KAAc;IACjD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;IACpE,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QACjC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1D,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,WAAW,CAAC,IAAY,EAAE,KAAc;IAChD,IACC,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACrB,QAAQ,IAAI,KAAK;QACjB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAC9B,CAAC;QACF,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QACtD,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;
|
|
1
|
+
{"version":3,"file":"NapiDbAdapter.js","sourceRoot":"","sources":["../../src/adapters/NapiDbAdapter.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,EAEN,uBAAuB,EACvB,aAAa,EACb,aAAa,GAEb,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEjE;;;;;GAKG;AACH,SAAS,YAAY,CAAC,IAAY,EAAE,KAAc;IACjD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,EAAE,OAAO,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC;IACpE,IAAI,KAAK,YAAY,UAAU,EAAE,CAAC;QACjC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC1D,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AAED;;;;;GAKG;AACH,SAAS,WAAW,CAAC,IAAY,EAAE,KAAc;IAChD,IACC,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QACrB,QAAQ,IAAI,KAAK;QACjB,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,KAAK,CAAC,EAC9B,CAAC;QACF,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,OAAO,UAAU,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QACtD,CAAC;IACF,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC;AA2KD;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACzC,GAAW,EACX,OAAO,GAAG,CAAC,EACX,OAAO,GAAG,EAAE,EACZ,OAAyC,EACzC,KAA2B,EAC3B,gBAAsC,EAAE;IAExC,MAAM,EAAE,KAAK,GAAG,KAAK,EAAE,cAAc,EAAE,GAAG,aAAa,CAAC;IACxD,kEAAkE;IAClE,MAAM,MAAM,GAAG,MAAM,YAAY,EAAE,CAAC;IAEpC,6DAA6D;IAC7D,mEAAmE;IACnE,+DAA+D;IAC/D,+DAA+D;IAC/D,mEAAmE;IACnE,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC;IACpC,IAAI,OAAO,KAAK,QAAQ,IAAI,OAAO,EAAE,CAAC;QACrC,MAAM,IAAI,GAAG,iBAAiB,CAAC;QAC/B,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACpD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrB,MAAM,IAAI,KAAK,CACd,sCAAsC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAC3D,CAAC;YACH,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,KAAK,CACd,4CAA4C,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAC5E,CAAC;YACH,CAAC;QACF,CAAC;IACF,CAAC;IACD,oEAAoE;IACpE,mEAAmE;IACnE,gEAAgE;IAChE,qEAAqE;IACrE,+DAA+D;IAC/D,iEAAiE;IACjE,MAAM,UAAU,GACf,OAAO,KAAK,QAAQ,IAAI,OAAO;QAC9B,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAC3B,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAqB,CAC9C;QACF,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,EAAE,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,OAAO,CAC3C,GAAG,EACH,OAAO,EACP,OAAO,EACP,UAAU,EACV,KAAK,EAAE,OAAO,EACd,KAAK,EAAE,SAAS,EAChB,KAAK,EAAE,SAAS,CAChB,CAAC;IAEF,4EAA4E;IAC5E,0EAA0E;IAC1E,2EAA2E;IAC3E,KAAK,UAAU,UAAU,CACxB,cAA+B;QAE/B,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9C,sEAAsE;QACtE,2EAA2E;QAC3E,MAAM,WAAW,GAAgB,EAAE,CAAC;QACpC,MAAM,aAAa,GAAgB,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,aAAa,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG;YACZ,KAAK,CAAC,OAAO,CACZ,GAAW,EACX,SAAoB,EAAE;gBAEtB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAChC,GAAG,EACH,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CACpC,CAAC;gBACF,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC3B,OAAO;oBACN,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;oBACrC,YAAY,EACX,CAAC,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC;iBAChE,CAAC;YACH,CAAC;YACD,KAAK,CAAC,KAAK,CACV,GAAW,EACX,SAAoB,EAAE;gBAEtB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,KAAK,CAC9B,GAAG,EACH,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CACpC,CAAC;gBACF,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAQ,CAAC;YAC7C,CAAC;YACD,KAAK,CAAC,MAAM;gBACX,MAAM,MAAM,CAAC,MAAM,EAAE,CAAC;gBACtB,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,uDAAuD;gBAC3E,MAAM,aAAa,CAAC,WAAW,CAAC,CAAC;YAClC,CAAC;YACD,KAAK,CAAC,QAAQ;gBACb,MAAM,MAAM,CAAC,QAAQ,EAAE,CAAC;gBACxB,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBACrB,MAAM,aAAa,CAAC,aAAa,CAAC,CAAC;YACpC,CAAC;YACD,KAAK,CAAC,KAA4B,EAAE,EAAa;gBAChD,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC7D,CAAC;YACD,EAAE,EAAE,GAAG,CAAC,EAAE;YACV,IAAI,EAAE,GAAG,CAAC,IAAI;YACd,GAAG,EAAE,GAAG,CAAC,GAAG;YACZ,QAAQ,EAAE,KAAK;YACf,CAAC,iBAAiB,CAAC,EAAE,IAAa;SAClC,CAAC;QACF,oEAAoE;QACpE,6EAA6E;QAC7E,0EAA0E;QAC1E,MAAM,MAAM,GAAsB,MAAM,CAAC,MAAM,CAC9C,IAAI,EACJ,4BAA4B,CAAC,IAAI,EAAE,OAAO,CAAC,EAC3C,EAAE,WAAW,EAAE,uBAAuB,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,EAAE,CACtD,CAAC;QACF,OAAO,MAAM,CAAC;IACf,CAAC;IAUD,KAAK,UAAU,WAAW,CACzB,IAAwE,EACxE,IAAyB;QAEzB,MAAM,QAAQ,GAAG,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;QAC/D,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACzD,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QACtD,IAAI,CAAC,QAAQ;YAAE,OAAO,GAAG,CAAC;QAC1B,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;YACnB,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACd,IAAI,CAAC;gBACJ,MAAM,GAAG,CAAC,QAAQ,EAAE,CAAC;YACtB,CAAC;YAAC,MAAM,CAAC;gBACR,iBAAiB;YAClB,CAAC;YACD,MAAM,GAAG,CAAC;QACX,CAAC;IACF,CAAC;IAED;;;;;;;OAOG;IACH,KAAK,UAAU,QAAQ,CACtB,GAAW,EACX,MAAiB,EACjB,IAA2B,EAC3B,EAAoB;QAEpB,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,mBAAmB,EAAE;YAAE,OAAO,EAAE,EAAE,CAAC;QAEnE,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,CAAC;QACpC,IAAI,CAAC;YACJ,MAAM,MAAM,GAAG,MAAM,EAAE,EAAE,CAAC;YAC1B,WAAW,CAAC;gBACX,GAAG;gBACH,QAAQ,EAAE,MAAM;gBAChB,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS;gBACvC,UAAU,EAAE,cAAc;gBAC1B,KAAK,EAAE,IAAI,EAAE,KAAK;gBAClB,MAAM,EAAE,IAAI,EAAE,MAAM;gBACpB,GAAG,EAAE,IAAI,EAAE,GAAG;gBACd,aAAa,EAAE,KAAK;gBACpB,YAAY,EAAE,IAAI,EAAE,YAAY;aAChC,CAAC,CAAC;YACH,OAAO,MAAM,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YAChB,WAAW,CAAC;gBACX,GAAG;gBACH,QAAQ,EAAE,MAAM;gBAChB,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,GAAG,SAAS;gBACvC,UAAU,EAAE,cAAc;gBAC1B,KAAK,EAAE,IAAI,EAAE,KAAK;gBAClB,MAAM,EAAE,IAAI,EAAE,MAAM;gBACpB,GAAG,EAAE,IAAI,EAAE,GAAG;gBACd,aAAa,EAAE,KAAK;gBACpB,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;gBAChE,YAAY,EAAE,IAAI,EAAE,YAAY;aAChC,CAAC,CAAC;YACH,MAAM,KAAK,CAAC;QACb,CAAC;IACF,CAAC;IAED,OAAO;QACN,OAAO;QACP,WAAW;QACX,KAAK,CAAC,KAAK,CACV,GAAW,EACX,SAAoB,EAAE,EACtB,IAAgB;YAEhB,OAAO,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE;gBAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;gBACxD,MAAM,IAAI,GACT,IAAI,EAAE,eAAe,IAAI,IAAI;oBAC5B,CAAC,CAAC,MAAM,EAAE,CAAC,UAAU,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC;oBAC5D,CAAC,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gBACpC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,WAAW,CAAQ,CAAC;YAC7C,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,KAAK,CAAC,OAAO,CACZ,GAAW,EACX,SAAoB,EAAE,EACtB,IAAgB;YAEhB,OAAO,QAAQ,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,IAAI,EAAE;gBAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC;gBACxD,MAAM,IAAI,GACT,IAAI,EAAE,eAAe,IAAI,IAAI;oBAC5B,CAAC,CAAC,MAAM,EAAE,CAAC,YAAY,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC,eAAe,CAAC;oBAC9D,CAAC,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,CAAC;gBACtC,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC3B,OAAO;oBACN,YAAY,EAAE,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC;oBACrC,YAAY,EACX,CAAC,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC;iBAChE,CAAC;YACH,CAAC,CAAC,CAAC;QACJ,CAAC;QAED,KAAK,CAAC,gBAAgB,CAAC,KAAgC;YACtD,2CAA2C;YAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,CAAC;YAC1D,OAAO,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC,CAAC;QACnE,CAAC;QAED,KAAK,CAAC,KAAK;YACV,MAAM,EAAE,CAAC,KAAK,EAAE,CAAC;QAClB,CAAC;QAED,KAAK,CAAC,IAAI;YACT,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC;QACjB,CAAC;KACD,CAAC;AACH,CAAC;AAED,8EAA8E;AAC9E,6BAA6B;AAE7B,uFAAuF;AACvF,KAAK,UAAU,YAAY;IAC1B,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC;IAClC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAC1B,2EAA2E;IAC3E,2EAA2E;IAC3E,iFAAiF;IACjF,MAAM,MAAM,GACX,QAAQ,KAAK,OAAO;QACnB,CAAC,CAAC,GAAG,QAAQ,IAAI,IAAI,MAAM;QAC3B,CAAC,CAAC,QAAQ,KAAK,OAAO;YACrB,CAAC,CAAC,GAAG,QAAQ,IAAI,IAAI,OAAO;YAC5B,CAAC,CAAC,GAAG,QAAQ,IAAI,IAAI,EAAE,CAAC;IAC3B,MAAM,UAAU,GAAG,MAAM,MAAM,OAAO,CAAC;IAEvC,IAAI,CAAC;QACJ,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,aAAa,CAAC,CAAC;QACtD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;QACnD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;QACpD,MAAM,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/C,MAAM,IAAI,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACrD,mFAAmF;QACnF,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC;QACtD,OAAO,OAAO,CAAC,UAAU,CAAe,CAAC;IAC1C,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACd,wEAAwE;QACxE,yEAAyE;QACzE,gEAAgE;QAChE,MAAM,IAAI,KAAK,CACd,0CAA0C,UAAU,SAAS,QAAQ,IAAI,IAAI,IAAI;YAChF,mCAAmC,EACpC,EAAE,KAAK,EAAE,GAAG,EAAE,CACd,CAAC;IACH,CAAC;AACF,CAAC"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The console command contract, declared locally.
|
|
3
|
+
*
|
|
4
|
+
* Atlas stays framework-agnostic: it must not import `@c9up/ream`, so it
|
|
5
|
+
* describes the shape Ream's console kernel dispatches against rather than
|
|
6
|
+
* importing it. Same reasoning as the previous `AtlasCommand` interface — only
|
|
7
|
+
* the shape changed, from a plain object to a class carrying its inputs as
|
|
8
|
+
* metadata.
|
|
9
|
+
*
|
|
10
|
+
* Ream's decorators (`@args` / `@flags`) live in the framework, so the helpers
|
|
11
|
+
* below build the same metadata without them.
|
|
12
|
+
*/
|
|
13
|
+
export interface CommandOptions {
|
|
14
|
+
/** Boot the application before `run()`. Off by default. */
|
|
15
|
+
startApp?: boolean;
|
|
16
|
+
staysAlive?: boolean;
|
|
17
|
+
allowUnknownFlags?: boolean;
|
|
18
|
+
}
|
|
19
|
+
export interface ArgumentMetaData {
|
|
20
|
+
type: "string" | "spread";
|
|
21
|
+
propertyName: string;
|
|
22
|
+
argumentName: string;
|
|
23
|
+
description?: string;
|
|
24
|
+
required: boolean;
|
|
25
|
+
default?: string | string[];
|
|
26
|
+
}
|
|
27
|
+
export interface FlagMetaData {
|
|
28
|
+
type: "string" | "boolean" | "number" | "array";
|
|
29
|
+
propertyName: string;
|
|
30
|
+
flagName: string;
|
|
31
|
+
description?: string;
|
|
32
|
+
alias: string[];
|
|
33
|
+
default?: string | string[] | number | boolean;
|
|
34
|
+
required: boolean;
|
|
35
|
+
}
|
|
36
|
+
/** The static side the kernel reads. */
|
|
37
|
+
export interface AtlasCommandClass {
|
|
38
|
+
new (): {
|
|
39
|
+
run(): Promise<void> | void;
|
|
40
|
+
};
|
|
41
|
+
commandName: string;
|
|
42
|
+
description: string;
|
|
43
|
+
options?: CommandOptions;
|
|
44
|
+
args?: readonly ArgumentMetaData[];
|
|
45
|
+
flags?: readonly FlagMetaData[];
|
|
46
|
+
help?: string | string[];
|
|
47
|
+
}
|
|
48
|
+
export declare function flag(propertyName: string, type: FlagMetaData["type"], options?: {
|
|
49
|
+
flagName?: string;
|
|
50
|
+
description?: string;
|
|
51
|
+
alias?: string[];
|
|
52
|
+
default?: FlagMetaData["default"];
|
|
53
|
+
required?: boolean;
|
|
54
|
+
}): FlagMetaData;
|
|
55
|
+
export declare function argument(propertyName: string, options?: {
|
|
56
|
+
type?: ArgumentMetaData["type"];
|
|
57
|
+
argumentName?: string;
|
|
58
|
+
description?: string;
|
|
59
|
+
required?: boolean;
|
|
60
|
+
default?: ArgumentMetaData["default"];
|
|
61
|
+
}): ArgumentMetaData;
|
|
62
|
+
//# sourceMappingURL=contract.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contract.d.ts","sourceRoot":"","sources":["../../src/console/contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,MAAM,WAAW,cAAc;IAC9B,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAChC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC1B,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC5B;AAED,MAAM,WAAW,YAAY;IAC5B,IAAI,EAAE,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,OAAO,CAAC;IAChD,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC;IAC/C,QAAQ,EAAE,OAAO,CAAC;CAClB;AAED,wCAAwC;AACxC,MAAM,WAAW,iBAAiB;IACjC,QAAQ;QAAE,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;KAAE,CAAC;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,EAAE,cAAc,CAAC;IACzB,IAAI,CAAC,EAAE,SAAS,gBAAgB,EAAE,CAAC;IACnC,KAAK,CAAC,EAAE,SAAS,YAAY,EAAE,CAAC;IAChC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACzB;AAOD,wBAAgB,IAAI,CACnB,YAAY,EAAE,MAAM,EACpB,IAAI,EAAE,YAAY,CAAC,MAAM,CAAC,EAC1B,OAAO,GAAE;IACR,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;IACjB,OAAO,CAAC,EAAE,YAAY,CAAC,SAAS,CAAC,CAAC;IAClC,QAAQ,CAAC,EAAE,OAAO,CAAC;CACd,GACJ,YAAY,CAUd;AAED,wBAAgB,QAAQ,CACvB,YAAY,EAAE,MAAM,EACpB,OAAO,GAAE;IACR,IAAI,CAAC,EAAE,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAChC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;CACjC,GACJ,gBAAgB,CASlB"}
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The console command contract, declared locally.
|
|
3
|
+
*
|
|
4
|
+
* Atlas stays framework-agnostic: it must not import `@c9up/ream`, so it
|
|
5
|
+
* describes the shape Ream's console kernel dispatches against rather than
|
|
6
|
+
* importing it. Same reasoning as the previous `AtlasCommand` interface — only
|
|
7
|
+
* the shape changed, from a plain object to a class carrying its inputs as
|
|
8
|
+
* metadata.
|
|
9
|
+
*
|
|
10
|
+
* Ream's decorators (`@args` / `@flags`) live in the framework, so the helpers
|
|
11
|
+
* below build the same metadata without them.
|
|
12
|
+
*/
|
|
13
|
+
/** `startServer` → `start-server`, matching the framework's decorators. */
|
|
14
|
+
function dashCase(value) {
|
|
15
|
+
return value.replace(/([a-z0-9])([A-Z])/g, "$1-$2").toLowerCase();
|
|
16
|
+
}
|
|
17
|
+
export function flag(propertyName, type, options = {}) {
|
|
18
|
+
return {
|
|
19
|
+
type,
|
|
20
|
+
propertyName,
|
|
21
|
+
flagName: options.flagName ?? dashCase(propertyName),
|
|
22
|
+
description: options.description,
|
|
23
|
+
alias: options.alias ?? [],
|
|
24
|
+
default: options.default,
|
|
25
|
+
required: options.required ?? false,
|
|
26
|
+
};
|
|
27
|
+
}
|
|
28
|
+
export function argument(propertyName, options = {}) {
|
|
29
|
+
return {
|
|
30
|
+
type: options.type ?? "string",
|
|
31
|
+
propertyName,
|
|
32
|
+
argumentName: options.argumentName ?? dashCase(propertyName),
|
|
33
|
+
description: options.description,
|
|
34
|
+
required: options.required ?? options.default === undefined,
|
|
35
|
+
default: options.default,
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=contract.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"contract.js","sourceRoot":"","sources":["../../src/console/contract.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAuCH,2EAA2E;AAC3E,SAAS,QAAQ,CAAC,KAAa;IAC9B,OAAO,KAAK,CAAC,OAAO,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;AACnE,CAAC;AAED,MAAM,UAAU,IAAI,CACnB,YAAoB,EACpB,IAA0B,EAC1B,UAMI,EAAE;IAEN,OAAO;QACN,IAAI;QACJ,YAAY;QACZ,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,QAAQ,CAAC,YAAY,CAAC;QACpD,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,KAAK,EAAE,OAAO,CAAC,KAAK,IAAI,EAAE;QAC1B,OAAO,EAAE,OAAO,CAAC,OAAO;QACxB,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,KAAK;KACnC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,QAAQ,CACvB,YAAoB,EACpB,UAMI,EAAE;IAEN,OAAO;QACN,IAAI,EAAE,OAAO,CAAC,IAAI,IAAI,QAAQ;QAC9B,YAAY;QACZ,YAAY,EAAE,OAAO,CAAC,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC;QAC5D,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS;QAC3D,OAAO,EAAE,OAAO,CAAC,OAAO;KACxB,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Factory console command — `make:factory` (Adonis Lucid). Scaffolds a model
|
|
3
|
+
* factory file. Same shape as the migration/seeder commands: a plain
|
|
4
|
+
* `{ name, description, run }` object registered in `reamrc.commands`.
|
|
5
|
+
*
|
|
6
|
+
* @example
|
|
7
|
+
* // commands/make-factory.ts
|
|
8
|
+
* import { makeFactoryCommand } from '@c9up/atlas'
|
|
9
|
+
* export default makeFactoryCommand({ factoriesDir: 'database/factories' })
|
|
10
|
+
* // run: <console-entry> make:factory User
|
|
11
|
+
*/
|
|
12
|
+
import { type AtlasCommandClass } from "./contract.js";
|
|
13
|
+
export interface FactoryCommandOptions {
|
|
14
|
+
/** Directory the factory files are scaffolded into. */
|
|
15
|
+
factoriesDir: string;
|
|
16
|
+
}
|
|
17
|
+
/**
|
|
18
|
+
* `make:factory <Model>` — scaffold `<Model>Factory.ts` in `factoriesDir`. The
|
|
19
|
+
* name is validated (no path separators / traversal) and written with `wx` so an
|
|
20
|
+
* existing factory is never clobbered.
|
|
21
|
+
*/
|
|
22
|
+
export declare function makeFactoryCommand(options: FactoryCommandOptions): AtlasCommandClass;
|
|
23
|
+
//# sourceMappingURL=factoryCommands.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"factoryCommands.d.ts","sourceRoot":"","sources":["../../src/console/factoryCommands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,EAAE,KAAK,iBAAiB,EAAY,MAAM,eAAe,CAAC;AAEjE,MAAM,WAAW,qBAAqB;IACrC,uDAAuD;IACvD,YAAY,EAAE,MAAM,CAAC;CACrB;AAaD;;;;GAIG;AACH,wBAAgB,kBAAkB,CACjC,OAAO,EAAE,qBAAqB,GAC5B,iBAAiB,CA+BnB"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Factory console command — `make:factory` (Adonis Lucid). Scaffolds a model
|
|
3
|
+
* factory file. Same shape as the migration/seeder commands: a plain
|
|
4
|
+
* `{ name, description, run }` object registered in `reamrc.commands`.
|
|
5
|
+
*
|
|
6
|
+
* @example
|
|
7
|
+
* // commands/make-factory.ts
|
|
8
|
+
* import { makeFactoryCommand } from '@c9up/atlas'
|
|
9
|
+
* export default makeFactoryCommand({ factoriesDir: 'database/factories' })
|
|
10
|
+
* // run: <console-entry> make:factory User
|
|
11
|
+
*/
|
|
12
|
+
import * as fsp from "node:fs/promises";
|
|
13
|
+
import * as path from "node:path";
|
|
14
|
+
import { camelToSnake } from "../utils/casing.js";
|
|
15
|
+
import { assertSafeName } from "../utils/safePath.js";
|
|
16
|
+
import { argument } from "./contract.js";
|
|
17
|
+
/** Scaffold body for a fresh factory (`make:factory <Model>`). */
|
|
18
|
+
function factoryStub(model) {
|
|
19
|
+
return `import { factory } from '@c9up/atlas'
|
|
20
|
+
import ${model} from '#models/${model.toLowerCase()}'
|
|
21
|
+
|
|
22
|
+
export const ${model}Factory = factory(${model}, ({ faker }) => ({
|
|
23
|
+
// email: faker.internet.email(),
|
|
24
|
+
}))
|
|
25
|
+
`;
|
|
26
|
+
}
|
|
27
|
+
/**
|
|
28
|
+
* `make:factory <Model>` — scaffold `<Model>Factory.ts` in `factoriesDir`. The
|
|
29
|
+
* name is validated (no path separators / traversal) and written with `wx` so an
|
|
30
|
+
* existing factory is never clobbered.
|
|
31
|
+
*/
|
|
32
|
+
export function makeFactoryCommand(options) {
|
|
33
|
+
return class MakeFactory {
|
|
34
|
+
static commandName = "make:factory";
|
|
35
|
+
static description = "Scaffold a new model factory file";
|
|
36
|
+
// Pure filesystem work: no reason to boot the app and open a connection.
|
|
37
|
+
static options = { startApp: false };
|
|
38
|
+
static args = [
|
|
39
|
+
argument("model", { description: "Model the factory is built for" }),
|
|
40
|
+
];
|
|
41
|
+
async run() {
|
|
42
|
+
// A missing model is caught by the kernel before `run()` — it reports
|
|
43
|
+
// the required argument by name, so there is no usage check here.
|
|
44
|
+
// Lucid convention: `make:factory User` → `user_factory.ts`
|
|
45
|
+
// (`BlogPost` → `blog_post_factory.ts`).
|
|
46
|
+
const fileName = `${camelToSnake(this.model)}_factory.ts`;
|
|
47
|
+
try {
|
|
48
|
+
assertSafeName(fileName, "FACTORY_INVALID", "factory");
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
console.error(`[atlas] invalid factory name: ${this.model}`);
|
|
52
|
+
process.exitCode = 1;
|
|
53
|
+
return;
|
|
54
|
+
}
|
|
55
|
+
const filePath = path.join(options.factoriesDir, fileName);
|
|
56
|
+
await fsp.mkdir(options.factoriesDir, { recursive: true });
|
|
57
|
+
await fsp.writeFile(filePath, factoryStub(this.model), { flag: "wx" });
|
|
58
|
+
console.log(`Created ${filePath}`);
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
}
|
|
62
|
+
//# sourceMappingURL=factoryCommands.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"factoryCommands.js","sourceRoot":"","sources":["../../src/console/factoryCommands.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,KAAK,GAAG,MAAM,kBAAkB,CAAC;AACxC,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAA0B,QAAQ,EAAE,MAAM,eAAe,CAAC;AAOjE,kEAAkE;AAClE,SAAS,WAAW,CAAC,KAAa;IACjC,OAAO;SACC,KAAK,kBAAkB,KAAK,CAAC,WAAW,EAAE;;eAEpC,KAAK,qBAAqB,KAAK;;;CAG7C,CAAC;AACF,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CACjC,OAA8B;IAE9B,OAAO,MAAM,WAAW;QACvB,MAAM,CAAC,WAAW,GAAG,cAAc,CAAC;QACpC,MAAM,CAAC,WAAW,GAAG,mCAAmC,CAAC;QACzD,yEAAyE;QACzE,MAAM,CAAC,OAAO,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACrC,MAAM,CAAC,IAAI,GAAG;YACb,QAAQ,CAAC,OAAO,EAAE,EAAE,WAAW,EAAE,gCAAgC,EAAE,CAAC;SACpE,CAAC;QAIF,KAAK,CAAC,GAAG;YACR,sEAAsE;YACtE,kEAAkE;YAClE,4DAA4D;YAC5D,yCAAyC;YACzC,MAAM,QAAQ,GAAG,GAAG,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC;YAC1D,IAAI,CAAC;gBACJ,cAAc,CAAC,QAAQ,EAAE,iBAAiB,EAAE,SAAS,CAAC,CAAC;YACxD,CAAC;YAAC,MAAM,CAAC;gBACR,OAAO,CAAC,KAAK,CAAC,iCAAiC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;gBAC7D,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;gBACrB,OAAO;YACR,CAAC;YACD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC;YAC3D,MAAM,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;YAC3D,MAAM,GAAG,CAAC,SAAS,CAAC,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;YACvE,OAAO,CAAC,GAAG,CAAC,WAAW,QAAQ,EAAE,CAAC,CAAC;QACpC,CAAC;KACD,CAAC;AACH,CAAC"}
|