sqlstack 2.0.0 → 3.0.0

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.
Files changed (132) hide show
  1. package/dist/cjs/codegen/generateManifest.d.ts +12 -0
  2. package/dist/cjs/codegen/generateManifest.d.ts.map +1 -1
  3. package/dist/cjs/codegen/generateManifest.js +21 -11
  4. package/dist/cjs/codegen/generateManifest.js.map +1 -1
  5. package/dist/cjs/core/resolver.d.ts +25 -12
  6. package/dist/cjs/core/resolver.d.ts.map +1 -1
  7. package/dist/cjs/core/resolver.js +66 -20
  8. package/dist/cjs/core/resolver.js.map +1 -1
  9. package/dist/cjs/core/sourceScanResolver.d.ts +25 -0
  10. package/dist/cjs/core/sourceScanResolver.d.ts.map +1 -0
  11. package/dist/cjs/core/sourceScanResolver.js +56 -0
  12. package/dist/cjs/core/sourceScanResolver.js.map +1 -0
  13. package/dist/cjs/decorators/query.d.ts.map +1 -1
  14. package/dist/cjs/decorators/query.js +29 -16
  15. package/dist/cjs/decorators/query.js.map +1 -1
  16. package/dist/cjs/families/sqliteFamily.d.ts +26 -0
  17. package/dist/cjs/families/sqliteFamily.d.ts.map +1 -0
  18. package/dist/cjs/families/sqliteFamily.js +187 -0
  19. package/dist/cjs/families/sqliteFamily.js.map +1 -0
  20. package/dist/cjs/family.d.ts +69 -0
  21. package/dist/cjs/family.d.ts.map +1 -0
  22. package/dist/cjs/family.js +206 -0
  23. package/dist/cjs/family.js.map +1 -0
  24. package/dist/cjs/familyBinding.d.ts +22 -0
  25. package/dist/cjs/familyBinding.d.ts.map +1 -0
  26. package/dist/cjs/familyBinding.js +22 -0
  27. package/dist/cjs/familyBinding.js.map +1 -0
  28. package/dist/cjs/index.d.ts +9 -1
  29. package/dist/cjs/index.d.ts.map +1 -1
  30. package/dist/cjs/index.js +14 -2
  31. package/dist/cjs/index.js.map +1 -1
  32. package/dist/cjs/ioc.d.ts +22 -0
  33. package/dist/cjs/ioc.d.ts.map +1 -0
  34. package/dist/cjs/ioc.js +35 -0
  35. package/dist/cjs/ioc.js.map +1 -0
  36. package/dist/cjs/runtime.d.ts +25 -0
  37. package/dist/cjs/runtime.d.ts.map +1 -0
  38. package/dist/cjs/runtime.js +133 -0
  39. package/dist/cjs/runtime.js.map +1 -0
  40. package/dist/cjs/stack.d.ts +101 -0
  41. package/dist/cjs/stack.d.ts.map +1 -0
  42. package/dist/cjs/stack.js +288 -0
  43. package/dist/cjs/stack.js.map +1 -0
  44. package/dist/cjs/testing/builder.d.ts +29 -0
  45. package/dist/cjs/testing/builder.d.ts.map +1 -0
  46. package/dist/cjs/testing/builder.js +131 -0
  47. package/dist/cjs/testing/builder.js.map +1 -0
  48. package/dist/cjs/testing/index.d.ts +10 -0
  49. package/dist/cjs/testing/index.d.ts.map +1 -0
  50. package/dist/cjs/testing/index.js +18 -0
  51. package/dist/cjs/testing/index.js.map +1 -0
  52. package/dist/cjs/testing/postgres/allocator.d.ts +17 -0
  53. package/dist/cjs/testing/postgres/allocator.d.ts.map +1 -0
  54. package/dist/cjs/testing/postgres/allocator.js +54 -0
  55. package/dist/cjs/testing/postgres/allocator.js.map +1 -0
  56. package/dist/cjs/testing/postgres/database.d.ts +21 -0
  57. package/dist/cjs/testing/postgres/database.d.ts.map +1 -0
  58. package/dist/cjs/testing/postgres/database.js +39 -0
  59. package/dist/cjs/testing/postgres/database.js.map +1 -0
  60. package/dist/cjs/testing/postgres/loadData.d.ts +31 -0
  61. package/dist/cjs/testing/postgres/loadData.d.ts.map +1 -0
  62. package/dist/cjs/testing/postgres/loadData.js +184 -0
  63. package/dist/cjs/testing/postgres/loadData.js.map +1 -0
  64. package/dist/cjs/testing/postgres/server.d.ts +19 -0
  65. package/dist/cjs/testing/postgres/server.d.ts.map +1 -0
  66. package/dist/cjs/testing/postgres/server.js +78 -0
  67. package/dist/cjs/testing/postgres/server.js.map +1 -0
  68. package/dist/cjs/testing/schema/ddl.d.ts +14 -0
  69. package/dist/cjs/testing/schema/ddl.d.ts.map +1 -0
  70. package/dist/cjs/testing/schema/ddl.js +54 -0
  71. package/dist/cjs/testing/schema/ddl.js.map +1 -0
  72. package/dist/cjs/testing/schema/normalize.d.ts +7 -0
  73. package/dist/cjs/testing/schema/normalize.d.ts.map +1 -0
  74. package/dist/cjs/testing/schema/normalize.js +202 -0
  75. package/dist/cjs/testing/schema/normalize.js.map +1 -0
  76. package/dist/cjs/testing/schema/parser.d.ts +9 -0
  77. package/dist/cjs/testing/schema/parser.d.ts.map +1 -0
  78. package/dist/cjs/testing/schema/parser.js +80 -0
  79. package/dist/cjs/testing/schema/parser.js.map +1 -0
  80. package/dist/cjs/testing/schema/types.d.ts +82 -0
  81. package/dist/cjs/testing/schema/types.d.ts.map +1 -0
  82. package/dist/cjs/testing/schema/types.js +10 -0
  83. package/dist/cjs/testing/schema/types.js.map +1 -0
  84. package/dist/cjs/transactions.d.ts +14 -5
  85. package/dist/cjs/transactions.d.ts.map +1 -1
  86. package/dist/cjs/transactions.js +40 -24
  87. package/dist/cjs/transactions.js.map +1 -1
  88. package/dist/esm/codegen/generateManifest.js +20 -11
  89. package/dist/esm/codegen/generateManifest.js.map +1 -1
  90. package/dist/esm/core/resolver.js +59 -19
  91. package/dist/esm/core/resolver.js.map +1 -1
  92. package/dist/esm/core/sourceScanResolver.js +51 -0
  93. package/dist/esm/core/sourceScanResolver.js.map +1 -0
  94. package/dist/esm/decorators/query.js +31 -18
  95. package/dist/esm/decorators/query.js.map +1 -1
  96. package/dist/esm/families/sqliteFamily.js +151 -0
  97. package/dist/esm/families/sqliteFamily.js.map +1 -0
  98. package/dist/esm/family.js +202 -0
  99. package/dist/esm/family.js.map +1 -0
  100. package/dist/esm/familyBinding.js +18 -0
  101. package/dist/esm/familyBinding.js.map +1 -0
  102. package/dist/esm/index.js +8 -1
  103. package/dist/esm/index.js.map +1 -1
  104. package/dist/esm/ioc.js +32 -0
  105. package/dist/esm/ioc.js.map +1 -0
  106. package/dist/esm/runtime.js +94 -0
  107. package/dist/esm/runtime.js.map +1 -0
  108. package/dist/esm/stack.js +251 -0
  109. package/dist/esm/stack.js.map +1 -0
  110. package/dist/esm/testing/builder.js +95 -0
  111. package/dist/esm/testing/builder.js.map +1 -0
  112. package/dist/esm/testing/index.js +7 -0
  113. package/dist/esm/testing/index.js.map +1 -0
  114. package/dist/esm/testing/postgres/allocator.js +49 -0
  115. package/dist/esm/testing/postgres/allocator.js.map +1 -0
  116. package/dist/esm/testing/postgres/database.js +36 -0
  117. package/dist/esm/testing/postgres/database.js.map +1 -0
  118. package/dist/esm/testing/postgres/loadData.js +176 -0
  119. package/dist/esm/testing/postgres/loadData.js.map +1 -0
  120. package/dist/esm/testing/postgres/server.js +69 -0
  121. package/dist/esm/testing/postgres/server.js.map +1 -0
  122. package/dist/esm/testing/schema/ddl.js +49 -0
  123. package/dist/esm/testing/schema/ddl.js.map +1 -0
  124. package/dist/esm/testing/schema/normalize.js +164 -0
  125. package/dist/esm/testing/schema/normalize.js.map +1 -0
  126. package/dist/esm/testing/schema/parser.js +43 -0
  127. package/dist/esm/testing/schema/parser.js.map +1 -0
  128. package/dist/esm/testing/schema/types.js +9 -0
  129. package/dist/esm/testing/schema/types.js.map +1 -0
  130. package/dist/esm/transactions.js +39 -24
  131. package/dist/esm/transactions.js.map +1 -1
  132. package/package.json +18 -2
@@ -0,0 +1,164 @@
1
+ import * as path from 'path';
2
+ import * as fs from 'fs';
3
+ import { SqlStackError } from '../../core/errors.js';
4
+ export class TestSchemaError extends SqlStackError {
5
+ constructor(message, source) {
6
+ super(source ? `${message} (schema source: ${source})` : message);
7
+ this.name = 'TestSchemaError';
8
+ }
9
+ }
10
+ const IDENT = /^[A-Za-z_][A-Za-z0-9_]*$/;
11
+ function assertIdentifier(kind, name, source) {
12
+ if (!IDENT.test(name)) {
13
+ throw new TestSchemaError(`Invalid ${kind} name ${JSON.stringify(name)}: names must match /^[A-Za-z_][A-Za-z0-9_]*$/`, source);
14
+ }
15
+ }
16
+ function parseReference(raw, where, source) {
17
+ if (typeof raw !== 'string') {
18
+ throw new TestSchemaError(`Invalid "references" at ${where}: expected a string like "table.column"`, source);
19
+ }
20
+ // Accept "table.column" or "table(column)".
21
+ let m = /^([A-Za-z_][A-Za-z0-9_]*)\.([A-Za-z_][A-Za-z0-9_]*)$/.exec(raw);
22
+ if (!m)
23
+ m = /^([A-Za-z_][A-Za-z0-9_]*)\(([A-Za-z_][A-Za-z0-9_]*)\)$/.exec(raw);
24
+ if (!m) {
25
+ throw new TestSchemaError(`Invalid "references" syntax ${JSON.stringify(raw)} at ${where}: use "table.column" or "table(column)"`, source);
26
+ }
27
+ return { table: m[1], column: m[2] };
28
+ }
29
+ const COLUMN_KEYS = new Set(['type', 'nullable', 'primary', 'unique', 'default', 'references']);
30
+ function normalizeColumn(tableName, name, decl, source) {
31
+ const where = `${tableName}.${name}`;
32
+ assertIdentifier('column', name, source);
33
+ let obj;
34
+ if (typeof decl === 'string') {
35
+ obj = { type: decl };
36
+ }
37
+ else if (decl && typeof decl === 'object' && !Array.isArray(decl)) {
38
+ obj = decl;
39
+ }
40
+ else {
41
+ throw new TestSchemaError(`Malformed column declaration at ${where}: expected a type string or an object`, source);
42
+ }
43
+ for (const key of Object.keys(obj)) {
44
+ if (!COLUMN_KEYS.has(key)) {
45
+ throw new TestSchemaError(`Unknown column property ${JSON.stringify(key)} at ${where}: supported properties are ${[...COLUMN_KEYS].join(', ')}`, source);
46
+ }
47
+ }
48
+ const type = obj.type;
49
+ if (typeof type !== 'string' || type.trim() === '') {
50
+ throw new TestSchemaError(`Missing or invalid "type" at ${where}: a non-empty string is required`, source);
51
+ }
52
+ for (const flag of ['nullable', 'primary', 'unique']) {
53
+ if (obj[flag] !== undefined && typeof obj[flag] !== 'boolean') {
54
+ throw new TestSchemaError(`Invalid "${flag}" at ${where}: expected a boolean`, source);
55
+ }
56
+ }
57
+ const def = obj.default;
58
+ if (def !== undefined && !['string', 'number', 'boolean'].includes(typeof def)) {
59
+ throw new TestSchemaError(`Invalid "default" at ${where}: expected a string, number, or boolean`, source);
60
+ }
61
+ const primary = obj.primary === true;
62
+ return {
63
+ name,
64
+ type: type.trim(),
65
+ nullable: obj.nullable === undefined ? !primary : obj.nullable,
66
+ primary,
67
+ unique: obj.unique === true,
68
+ hasDefault: def !== undefined,
69
+ default: def,
70
+ references: obj.references === undefined ? undefined : parseReference(obj.references, where, source),
71
+ };
72
+ }
73
+ function normalizeTable(name, decl, source) {
74
+ assertIdentifier('table', name, source);
75
+ if (!decl || typeof decl !== 'object' || Array.isArray(decl)) {
76
+ throw new TestSchemaError(`Malformed table declaration "${name}": expected an object with "columns"`, source);
77
+ }
78
+ const columnsDecl = decl.columns;
79
+ if (!columnsDecl || typeof columnsDecl !== 'object' || Array.isArray(columnsDecl)) {
80
+ throw new TestSchemaError(`Table "${name}" is missing a "columns" map`, source);
81
+ }
82
+ const columns = Object.entries(columnsDecl).map(([colName, colDecl]) => normalizeColumn(name, colName, colDecl, source));
83
+ if (columns.length === 0) {
84
+ throw new TestSchemaError(`Table "${name}" declares no columns`, source);
85
+ }
86
+ const primaryKey = columns.filter((c) => c.primary).map((c) => c.name);
87
+ return { name, columns: Object.freeze(columns), primaryKey: Object.freeze(primaryKey) };
88
+ }
89
+ function normalizeSqlEntry(raw, index, options, source) {
90
+ if (typeof raw !== 'string' || raw.trim() === '') {
91
+ throw new TestSchemaError(`Invalid sql entry #${index}: expected a non-empty string`, source);
92
+ }
93
+ const looksLikeFile = !raw.includes('\n') && /\.sql$/i.test(raw.trim());
94
+ if (!looksLikeFile) {
95
+ return { kind: 'inline', index, sql: raw };
96
+ }
97
+ const authored = raw.trim();
98
+ if (!options.sourceDir) {
99
+ throw new TestSchemaError(`sql entry #${index} references file "${authored}" but no sourceDir is available. ` +
100
+ `Pass the schema as a file path, or provide { sourceDir } so relative .sql paths can be resolved ` +
101
+ `(paths are never resolved against process.cwd() implicitly).`, source);
102
+ }
103
+ const resolvedPath = path.resolve(options.sourceDir, authored);
104
+ if (!fs.existsSync(resolvedPath)) {
105
+ throw new TestSchemaError(`sql entry #${index}: file not found: ${authored} (resolved to ${resolvedPath})`, source);
106
+ }
107
+ return { kind: 'file', index, sourcePath: authored, resolvedPath };
108
+ }
109
+ export function normalizeTestSchema(doc, options = {}) {
110
+ const source = options.sourceLabel ?? '<inline schema>';
111
+ if (!doc || typeof doc !== 'object' || Array.isArray(doc)) {
112
+ throw new TestSchemaError('Test schema must be a YAML mapping / object', source);
113
+ }
114
+ const root = doc;
115
+ if (root.version !== 1) {
116
+ throw new TestSchemaError(`Unsupported test schema version: ${JSON.stringify(root.version)} (expected: version: 1)`, source);
117
+ }
118
+ if (root.dialect !== 'postgres') {
119
+ throw new TestSchemaError(`Unsupported test schema dialect: ${JSON.stringify(root.dialect)} (expected: dialect: postgres)`, source);
120
+ }
121
+ for (const key of Object.keys(root)) {
122
+ if (!['version', 'dialect', 'tables', 'sql'].includes(key)) {
123
+ throw new TestSchemaError(`Unknown top-level key ${JSON.stringify(key)} in test schema`, source);
124
+ }
125
+ }
126
+ let tables = [];
127
+ if (root.tables !== undefined) {
128
+ if (!root.tables || typeof root.tables !== 'object' || Array.isArray(root.tables)) {
129
+ throw new TestSchemaError('"tables" must be a mapping of table name to declaration', source);
130
+ }
131
+ tables = Object.entries(root.tables).map(([name, decl]) => normalizeTable(name, decl, source));
132
+ }
133
+ // Validate references that point at structured tables.
134
+ const byName = new Map(tables.map((t) => [t.name, t]));
135
+ for (const t of tables) {
136
+ for (const c of t.columns) {
137
+ const ref = c.references;
138
+ if (ref && byName.has(ref.table)) {
139
+ const target = byName.get(ref.table);
140
+ if (!target.columns.some((tc) => tc.name === ref.column)) {
141
+ throw new TestSchemaError(`Column ${t.name}.${c.name} references ${ref.table}.${ref.column}, but table "${ref.table}" declares no column "${ref.column}"`, source);
142
+ }
143
+ }
144
+ }
145
+ }
146
+ let sql = [];
147
+ if (root.sql !== undefined) {
148
+ if (!Array.isArray(root.sql)) {
149
+ throw new TestSchemaError('"sql" must be a list of inline SQL strings or .sql file paths', source);
150
+ }
151
+ sql = root.sql.map((entry, i) => normalizeSqlEntry(entry, i, options, source));
152
+ }
153
+ if (tables.length === 0 && sql.length === 0) {
154
+ throw new TestSchemaError('Test schema declares no tables and no sql entries', source);
155
+ }
156
+ return Object.freeze({
157
+ version: 1,
158
+ dialect: 'postgres',
159
+ tables: Object.freeze(tables),
160
+ sql: Object.freeze(sql),
161
+ source,
162
+ });
163
+ }
164
+ //# sourceMappingURL=normalize.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"normalize.js","sourceRoot":"","sources":["../../../../src/testing/schema/normalize.ts"],"names":[],"mappings":"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","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs';\nimport { SqlStackError } from '../../core/errors';\nimport type {\n NormalizedColumn,\n NormalizedReference,\n NormalizedTable,\n NormalizedTestSchema,\n ParseTestSchemaOptions,\n RawSqlEntry,\n} from './types';\n\nexport class TestSchemaError extends SqlStackError {\n constructor(message: string, source?: string) {\n super(source ? `${message} (schema source: ${source})` : message);\n this.name = 'TestSchemaError';\n }\n}\n\nconst IDENT = /^[A-Za-z_][A-Za-z0-9_]*$/;\n\nfunction assertIdentifier(kind: string, name: string, source: string): void {\n if (!IDENT.test(name)) {\n throw new TestSchemaError(\n `Invalid ${kind} name ${JSON.stringify(name)}: names must match /^[A-Za-z_][A-Za-z0-9_]*$/`,\n source\n );\n }\n}\n\nfunction parseReference(raw: unknown, where: string, source: string): NormalizedReference {\n if (typeof raw !== 'string') {\n throw new TestSchemaError(`Invalid \"references\" at ${where}: expected a string like \"table.column\"`, source);\n }\n // Accept \"table.column\" or \"table(column)\".\n let m = /^([A-Za-z_][A-Za-z0-9_]*)\\.([A-Za-z_][A-Za-z0-9_]*)$/.exec(raw);\n if (!m) m = /^([A-Za-z_][A-Za-z0-9_]*)\\(([A-Za-z_][A-Za-z0-9_]*)\\)$/.exec(raw);\n if (!m) {\n throw new TestSchemaError(\n `Invalid \"references\" syntax ${JSON.stringify(raw)} at ${where}: use \"table.column\" or \"table(column)\"`,\n source\n );\n }\n return { table: m[1]!, column: m[2]! };\n}\n\nconst COLUMN_KEYS = new Set(['type', 'nullable', 'primary', 'unique', 'default', 'references']);\n\nfunction normalizeColumn(tableName: string, name: string, decl: unknown, source: string): NormalizedColumn {\n const where = `${tableName}.${name}`;\n assertIdentifier('column', name, source);\n let obj: Record<string, unknown>;\n if (typeof decl === 'string') {\n obj = { type: decl };\n } else if (decl && typeof decl === 'object' && !Array.isArray(decl)) {\n obj = decl as Record<string, unknown>;\n } else {\n throw new TestSchemaError(\n `Malformed column declaration at ${where}: expected a type string or an object`,\n source\n );\n }\n for (const key of Object.keys(obj)) {\n if (!COLUMN_KEYS.has(key)) {\n throw new TestSchemaError(\n `Unknown column property ${JSON.stringify(key)} at ${where}: supported properties are ${[...COLUMN_KEYS].join(', ')}`,\n source\n );\n }\n }\n const type = obj.type;\n if (typeof type !== 'string' || type.trim() === '') {\n throw new TestSchemaError(`Missing or invalid \"type\" at ${where}: a non-empty string is required`, source);\n }\n for (const flag of ['nullable', 'primary', 'unique'] as const) {\n if (obj[flag] !== undefined && typeof obj[flag] !== 'boolean') {\n throw new TestSchemaError(`Invalid \"${flag}\" at ${where}: expected a boolean`, source);\n }\n }\n const def = obj.default;\n if (def !== undefined && !['string', 'number', 'boolean'].includes(typeof def)) {\n throw new TestSchemaError(`Invalid \"default\" at ${where}: expected a string, number, or boolean`, source);\n }\n const primary = obj.primary === true;\n return {\n name,\n type: type.trim(),\n nullable: obj.nullable === undefined ? !primary : (obj.nullable as boolean),\n primary,\n unique: obj.unique === true,\n hasDefault: def !== undefined,\n default: def as string | number | boolean | undefined,\n references: obj.references === undefined ? undefined : parseReference(obj.references, where, source),\n };\n}\n\nfunction normalizeTable(name: string, decl: unknown, source: string): NormalizedTable {\n assertIdentifier('table', name, source);\n if (!decl || typeof decl !== 'object' || Array.isArray(decl)) {\n throw new TestSchemaError(`Malformed table declaration \"${name}\": expected an object with \"columns\"`, source);\n }\n const columnsDecl = (decl as Record<string, unknown>).columns;\n if (!columnsDecl || typeof columnsDecl !== 'object' || Array.isArray(columnsDecl)) {\n throw new TestSchemaError(`Table \"${name}\" is missing a \"columns\" map`, source);\n }\n const columns = Object.entries(columnsDecl as Record<string, unknown>).map(([colName, colDecl]) =>\n normalizeColumn(name, colName, colDecl, source)\n );\n if (columns.length === 0) {\n throw new TestSchemaError(`Table \"${name}\" declares no columns`, source);\n }\n const primaryKey = columns.filter((c) => c.primary).map((c) => c.name);\n return { name, columns: Object.freeze(columns), primaryKey: Object.freeze(primaryKey) };\n}\n\nfunction normalizeSqlEntry(\n raw: unknown,\n index: number,\n options: ParseTestSchemaOptions,\n source: string\n): RawSqlEntry {\n if (typeof raw !== 'string' || raw.trim() === '') {\n throw new TestSchemaError(`Invalid sql entry #${index}: expected a non-empty string`, source);\n }\n const looksLikeFile = !raw.includes('\\n') && /\\.sql$/i.test(raw.trim());\n if (!looksLikeFile) {\n return { kind: 'inline', index, sql: raw };\n }\n const authored = raw.trim();\n if (!options.sourceDir) {\n throw new TestSchemaError(\n `sql entry #${index} references file \"${authored}\" but no sourceDir is available. ` +\n `Pass the schema as a file path, or provide { sourceDir } so relative .sql paths can be resolved ` +\n `(paths are never resolved against process.cwd() implicitly).`,\n source\n );\n }\n const resolvedPath = path.resolve(options.sourceDir, authored);\n if (!fs.existsSync(resolvedPath)) {\n throw new TestSchemaError(\n `sql entry #${index}: file not found: ${authored} (resolved to ${resolvedPath})`,\n source\n );\n }\n return { kind: 'file', index, sourcePath: authored, resolvedPath };\n}\n\nexport function normalizeTestSchema(\n doc: unknown,\n options: ParseTestSchemaOptions = {}\n): NormalizedTestSchema {\n const source = options.sourceLabel ?? '<inline schema>';\n if (!doc || typeof doc !== 'object' || Array.isArray(doc)) {\n throw new TestSchemaError('Test schema must be a YAML mapping / object', source);\n }\n const root = doc as Record<string, unknown>;\n if (root.version !== 1) {\n throw new TestSchemaError(\n `Unsupported test schema version: ${JSON.stringify(root.version)} (expected: version: 1)`,\n source\n );\n }\n if (root.dialect !== 'postgres') {\n throw new TestSchemaError(\n `Unsupported test schema dialect: ${JSON.stringify(root.dialect)} (expected: dialect: postgres)`,\n source\n );\n }\n for (const key of Object.keys(root)) {\n if (!['version', 'dialect', 'tables', 'sql'].includes(key)) {\n throw new TestSchemaError(`Unknown top-level key ${JSON.stringify(key)} in test schema`, source);\n }\n }\n\n let tables: NormalizedTable[] = [];\n if (root.tables !== undefined) {\n if (!root.tables || typeof root.tables !== 'object' || Array.isArray(root.tables)) {\n throw new TestSchemaError('\"tables\" must be a mapping of table name to declaration', source);\n }\n tables = Object.entries(root.tables as Record<string, unknown>).map(([name, decl]) =>\n normalizeTable(name, decl, source)\n );\n }\n\n // Validate references that point at structured tables.\n const byName = new Map(tables.map((t) => [t.name, t]));\n for (const t of tables) {\n for (const c of t.columns) {\n const ref = c.references;\n if (ref && byName.has(ref.table)) {\n const target = byName.get(ref.table)!;\n if (!target.columns.some((tc) => tc.name === ref.column)) {\n throw new TestSchemaError(\n `Column ${t.name}.${c.name} references ${ref.table}.${ref.column}, but table \"${ref.table}\" declares no column \"${ref.column}\"`,\n source\n );\n }\n }\n }\n }\n\n let sql: RawSqlEntry[] = [];\n if (root.sql !== undefined) {\n if (!Array.isArray(root.sql)) {\n throw new TestSchemaError('\"sql\" must be a list of inline SQL strings or .sql file paths', source);\n }\n sql = root.sql.map((entry, i) => normalizeSqlEntry(entry, i, options, source));\n }\n\n if (tables.length === 0 && sql.length === 0) {\n throw new TestSchemaError('Test schema declares no tables and no sql entries', source);\n }\n\n return Object.freeze({\n version: 1 as const,\n dialect: 'postgres' as const,\n tables: Object.freeze(tables),\n sql: Object.freeze(sql),\n source,\n });\n}\n"]}
@@ -0,0 +1,43 @@
1
+ import * as path from 'path';
2
+ import * as fs from 'fs';
3
+ import { parse as parseYaml } from 'yaml';
4
+ import { normalizeTestSchema, TestSchemaError } from './normalize.js';
5
+ /**
6
+ * Parse a test schema from a YAML string, a plain object, or a .yml/.yaml
7
+ * file path. When given a file path, relative raw .sql entries resolve
8
+ * against the file's own directory unless options.sourceDir overrides it.
9
+ */
10
+ export function parseTestSchema(input, options = {}) {
11
+ if (typeof input === 'object') {
12
+ return normalizeTestSchema(input, options);
13
+ }
14
+ if (isSchemaFilePath(input)) {
15
+ const filePath = path.resolve(input);
16
+ let text;
17
+ try {
18
+ text = fs.readFileSync(filePath, 'utf8');
19
+ }
20
+ catch (err) {
21
+ throw new TestSchemaError(`Cannot read test schema file: ${filePath} (${err.message})`);
22
+ }
23
+ return parseYamlText(text, {
24
+ sourceDir: options.sourceDir ?? path.dirname(filePath),
25
+ sourceLabel: options.sourceLabel ?? filePath,
26
+ });
27
+ }
28
+ return parseYamlText(input, options);
29
+ }
30
+ export function isSchemaFilePath(input) {
31
+ return !input.includes('\n') && /\.ya?ml$/i.test(input.trim());
32
+ }
33
+ function parseYamlText(text, options) {
34
+ let doc;
35
+ try {
36
+ doc = parseYaml(text);
37
+ }
38
+ catch (err) {
39
+ throw new TestSchemaError(`Failed to parse test schema YAML: ${err.message}`, options.sourceLabel);
40
+ }
41
+ return normalizeTestSchema(doc, options);
42
+ }
43
+ //# sourceMappingURL=parser.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"parser.js","sourceRoot":"","sources":["../../../../src/testing/schema/parser.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,KAAK,EAAE,MAAM,IAAI,CAAC;AACzB,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGnE;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAC7B,KAAsB,EACtB,UAAkC,EAAE;IAEpC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC7C,CAAC;IACD,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;QAC5B,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACrC,IAAI,IAAY,CAAC;QACjB,IAAI,CAAC;YACH,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;QAC3C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,IAAI,eAAe,CACvB,iCAAiC,QAAQ,KAAM,GAAa,CAAC,OAAO,GAAG,CACxE,CAAC;QACJ,CAAC;QACD,OAAO,aAAa,CAAC,IAAI,EAAE;YACzB,SAAS,EAAE,OAAO,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;YACtD,WAAW,EAAE,OAAO,CAAC,WAAW,IAAI,QAAQ;SAC7C,CAAC,CAAC;IACL,CAAC;IACD,OAAO,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,KAAa;IAC5C,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;AACjE,CAAC;AAED,SAAS,aAAa,CAAC,IAAY,EAAE,OAA+B;IAClE,IAAI,GAAY,CAAC;IACjB,IAAI,CAAC;QACH,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;IACxB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,eAAe,CACvB,qCAAsC,GAAa,CAAC,OAAO,EAAE,EAC7D,OAAO,CAAC,WAAW,CACpB,CAAC;IACJ,CAAC;IACD,OAAO,mBAAmB,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;AAC3C,CAAC","sourcesContent":["import * as path from 'path';\nimport * as fs from 'fs';\nimport { parse as parseYaml } from 'yaml';\nimport { normalizeTestSchema, TestSchemaError } from './normalize';\nimport type { NormalizedTestSchema, ParseTestSchemaOptions } from './types';\n\n/**\n * Parse a test schema from a YAML string, a plain object, or a .yml/.yaml\n * file path. When given a file path, relative raw .sql entries resolve\n * against the file's own directory unless options.sourceDir overrides it.\n */\nexport function parseTestSchema(\n input: string | object,\n options: ParseTestSchemaOptions = {}\n): NormalizedTestSchema {\n if (typeof input === 'object') {\n return normalizeTestSchema(input, options);\n }\n if (isSchemaFilePath(input)) {\n const filePath = path.resolve(input);\n let text: string;\n try {\n text = fs.readFileSync(filePath, 'utf8');\n } catch (err) {\n throw new TestSchemaError(\n `Cannot read test schema file: ${filePath} (${(err as Error).message})`\n );\n }\n return parseYamlText(text, {\n sourceDir: options.sourceDir ?? path.dirname(filePath),\n sourceLabel: options.sourceLabel ?? filePath,\n });\n }\n return parseYamlText(input, options);\n}\n\nexport function isSchemaFilePath(input: string): boolean {\n return !input.includes('\\n') && /\\.ya?ml$/i.test(input.trim());\n}\n\nfunction parseYamlText(text: string, options: ParseTestSchemaOptions): NormalizedTestSchema {\n let doc: unknown;\n try {\n doc = parseYaml(text);\n } catch (err) {\n throw new TestSchemaError(\n `Failed to parse test schema YAML: ${(err as Error).message}`,\n options.sourceLabel\n );\n }\n return normalizeTestSchema(doc, options);\n}\n"]}
@@ -0,0 +1,9 @@
1
+ /**
2
+ * Types for the sqlstack/testing versioned YAML test-schema.
3
+ *
4
+ * The structured vocabulary is intentionally small (type / nullable /
5
+ * primary / unique / default / references). PostgreSQL type strings pass
6
+ * through; raw SQL covers everything the vocabulary cannot express.
7
+ */
8
+ export {};
9
+ //# sourceMappingURL=types.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/testing/schema/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG","sourcesContent":["/**\n * Types for the sqlstack/testing versioned YAML test-schema.\n *\n * The structured vocabulary is intentionally small (type / nullable /\n * primary / unique / default / references). PostgreSQL type strings pass\n * through; raw SQL covers everything the vocabulary cannot express.\n */\n\n/** A column declaration after shorthand expansion (scalar string => { type }). */\nexport interface TestColumnInput {\n type: string;\n nullable?: boolean;\n primary?: boolean;\n unique?: boolean;\n /** Raw SQL default expression (emitted verbatim into DDL). */\n default?: string | number | boolean;\n /** Reference target: \"table.column\" or \"table(column)\". */\n references?: string;\n}\n\nexport interface TestTableInput {\n columns: Record<string, string | TestColumnInput>;\n}\n\n/** Root YAML document shape. */\nexport interface TestSchemaInput {\n version: number;\n dialect: string;\n tables?: Record<string, TestTableInput>;\n sql?: string[];\n}\n\n/** Normalized (immutable) representations ------------------------------- */\n\nexport interface NormalizedReference {\n readonly table: string;\n readonly column: string;\n}\n\nexport interface NormalizedColumn {\n readonly name: string;\n readonly type: string;\n readonly nullable: boolean;\n readonly primary: boolean;\n readonly unique: boolean;\n readonly hasDefault: boolean;\n readonly default?: string | number | boolean;\n readonly references?: NormalizedReference;\n}\n\nexport interface NormalizedTable {\n readonly name: string;\n /** Authored column order preserved. */\n readonly columns: readonly NormalizedColumn[];\n /** Ordered declared primary-key column names. */\n readonly primaryKey: readonly string[];\n}\n\nexport type RawSqlEntry =\n | {\n readonly kind: 'inline';\n readonly index: number;\n readonly sql: string;\n }\n | {\n readonly kind: 'file';\n readonly index: number;\n /** Path as authored in the YAML. */\n readonly sourcePath: string;\n /** Absolute resolved path. */\n readonly resolvedPath: string;\n };\n\nexport interface NormalizedTestSchema {\n readonly version: 1;\n readonly dialect: 'postgres';\n /** Authored table order preserved. */\n readonly tables: readonly NormalizedTable[];\n readonly sql: readonly RawSqlEntry[];\n /** Where the schema came from, for diagnostics. */\n readonly source: string;\n}\n\nexport interface ParseTestSchemaOptions {\n /**\n * Directory used to resolve relative .sql file entries. Required when the\n * schema contains file entries and no source file path is known. Never\n * defaults to process.cwd() implicitly.\n */\n sourceDir?: string;\n /** Label used in diagnostics (e.g. the YAML file path). */\n sourceLabel?: string;\n}\n"]}
@@ -11,9 +11,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
11
11
  };
12
12
  var _TransactionHandle_state, _TransactionHandle_owned, _TransactionHandle_finished;
13
13
  import { AsyncLocalStorage } from 'node:async_hooks';
14
- import { SqlStackDB } from './registry.js';
15
14
  import { createPgDb, createMysqlDb } from './adapters/index.js';
16
15
  import { RollbackTransactionError, SqlStackError } from './core/errors.js';
16
+ import { resolveExecution, legacyEntry } from './runtime.js';
17
17
  const als = new AsyncLocalStorage();
18
18
  function getStore() {
19
19
  return als.getStore();
@@ -31,14 +31,17 @@ function unwrapRollbackCause(err) {
31
31
  return typeof err.cause === 'undefined' ? err : err.cause;
32
32
  }
33
33
  export class TransactionHandle {
34
- constructor(dbName, state, owned) {
34
+ constructor(entry, state, owned) {
35
35
  _TransactionHandle_state.set(this, void 0);
36
36
  _TransactionHandle_owned.set(this, void 0);
37
37
  _TransactionHandle_finished.set(this, false);
38
- this.dbName = dbName;
38
+ this.entry = entry;
39
39
  __classPrivateFieldSet(this, _TransactionHandle_state, state, "f");
40
40
  __classPrivateFieldSet(this, _TransactionHandle_owned, owned, "f");
41
41
  }
42
+ get dbName() {
43
+ return this.entry.name;
44
+ }
42
45
  async ensureStarted() {
43
46
  await __classPrivateFieldGet(this, _TransactionHandle_state, "f").ensureStarted();
44
47
  }
@@ -78,13 +81,13 @@ export class TransactionHandle {
78
81
  }
79
82
  _TransactionHandle_state = new WeakMap(), _TransactionHandle_owned = new WeakMap(), _TransactionHandle_finished = new WeakMap();
80
83
  class TxState {
81
- constructor(dbName, db, options) {
84
+ constructor(entry, options) {
82
85
  this.depth = 1;
83
86
  this.started = false;
84
87
  this.completed = false;
85
88
  this.rollbackOnly = false;
86
- this.dbName = dbName;
87
- this.db = db;
89
+ this.entry = entry;
90
+ this.db = entry.db;
88
91
  this.options = {
89
92
  lazy: options?.lazy ?? true,
90
93
  nested: options?.nested ?? 'join',
@@ -192,40 +195,52 @@ class TxState {
192
195
  throw err;
193
196
  }
194
197
  }
195
- function enterTx(dbName, options) {
198
+ function enterTx(entry, options) {
196
199
  const { store, isNew } = getOrCreateStore();
197
- const existing = store.txByDb.get(dbName);
200
+ const existing = store.txByDb.get(entry);
198
201
  if (existing) {
199
202
  existing.depth++;
200
- return { handle: new TransactionHandle(dbName, existing, false), store, isNewStore: isNew };
203
+ return { handle: new TransactionHandle(entry, existing, false), store, isNewStore: isNew };
201
204
  }
202
- const { db } = SqlStackDB.getEntry(dbName);
203
- const state = new TxState(dbName, db, options);
204
- store.txByDb.set(dbName, state);
205
- return { handle: new TransactionHandle(dbName, state, true), store, isNewStore: isNew };
205
+ const state = new TxState(entry, options);
206
+ store.txByDb.set(entry, state);
207
+ return { handle: new TransactionHandle(entry, state, true), store, isNewStore: isNew };
206
208
  }
207
- async function exitTx(dbName, store) {
208
- const state = store.txByDb.get(dbName);
209
+ async function exitTx(entry, store) {
210
+ const state = store.txByDb.get(entry);
209
211
  if (!state)
210
212
  return;
211
213
  state.depth = Math.max(0, state.depth - 1);
212
214
  if (state.depth === 0) {
213
- store.txByDb.delete(dbName);
215
+ store.txByDb.delete(entry);
214
216
  }
215
217
  }
218
+ /**
219
+ * @deprecated Synchronous lookup against the legacy global registry only.
220
+ * Under an active IoC root, use `currentTransactionFor(entry)` with an entry
221
+ * from the root's SqlStack (`stack.getEntry(name)`).
222
+ */
216
223
  export function currentTransaction(db) {
217
224
  const store = getStore();
218
225
  if (!store)
219
226
  return undefined;
220
- const resolved = SqlStackDB.getEntry(db).name;
221
- const state = store.txByDb.get(resolved);
227
+ const entry = legacyEntry(db);
228
+ const state = store.txByDb.get(entry);
229
+ if (!state)
230
+ return undefined;
231
+ return new TransactionHandle(entry, state, false);
232
+ }
233
+ /** Active transaction handle for a concrete database entry, if any. */
234
+ export function currentTransactionFor(entry) {
235
+ const store = getStore();
236
+ const state = store?.txByDb.get(entry);
222
237
  if (!state)
223
238
  return undefined;
224
- return new TransactionHandle(resolved, state, false);
239
+ return new TransactionHandle(entry, state, false);
225
240
  }
226
241
  export async function withTransaction(fn, options) {
227
- const resolved = SqlStackDB.getEntry(options?.db).name;
228
- const { handle, store, isNewStore } = enterTx(resolved, options);
242
+ const { entry } = await resolveExecution(options?.db);
243
+ const { handle, store, isNewStore } = enterTx(entry, options);
229
244
  const run = async () => {
230
245
  try {
231
246
  const out = await fn();
@@ -237,7 +252,7 @@ export async function withTransaction(fn, options) {
237
252
  throw err;
238
253
  }
239
254
  finally {
240
- await exitTx(resolved, store);
255
+ await exitTx(entry, store);
241
256
  }
242
257
  };
243
258
  return isNewStore ? await als.run(store, run) : await run();
@@ -261,8 +276,8 @@ function wrapMethod(_target, _prop, desc, options) {
261
276
  return await withTransaction(() => original.apply(this, callArgs), options);
262
277
  };
263
278
  }
264
- export function getActiveTransaction(dbName) {
279
+ export function getActiveTransaction(entry) {
265
280
  const store = getStore();
266
- return store?.txByDb.get(dbName);
281
+ return store?.txByDb.get(entry);
267
282
  }
268
283
  //# sourceMappingURL=transactions.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"transactions.js","sourceRoot":"","sources":["../../src/transactions.ts"],"names":[],"mappings":"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","sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport type { Database, QueryResult } from './registry';\nimport { SqlStackDB } from './registry';\nimport { createPgDb, createMysqlDb } from './adapters';\nimport { RollbackTransactionError, SqlStackError } from './core/errors';\n\nexport type TransactionOptions = {\n db?: string;\n lazy?: boolean;\n nested?: 'join';\n};\n\ntype TxStore = {\n txByDb: Map<string, TxState>;\n};\n\nconst als = new AsyncLocalStorage<TxStore>();\n\nfunction getStore(): TxStore | undefined {\n return als.getStore();\n}\n\nfunction getOrCreateStore(): { store: TxStore; isNew: boolean } {\n const existing = getStore();\n if (existing) return { store: existing, isNew: false };\n return { store: { txByDb: new Map() }, isNew: true };\n}\n\nfunction isRollbackTransactionError(err: unknown): err is RollbackTransactionError {\n return err instanceof RollbackTransactionError;\n}\n\nfunction unwrapRollbackCause(err: RollbackTransactionError): unknown {\n return typeof err.cause === 'undefined' ? err : err.cause;\n}\n\nexport class TransactionHandle {\n readonly dbName: string;\n #state: TxState;\n #owned: boolean;\n #finished = false;\n\n constructor(dbName: string, state: TxState, owned: boolean) {\n this.dbName = dbName;\n this.#state = state;\n this.#owned = owned;\n }\n\n async ensureStarted() {\n await this.#state.ensureStarted();\n }\n\n rollbackOnly(errorToThrow?: unknown) {\n this.#state.rollbackOnly = true;\n if (typeof errorToThrow !== 'undefined') {\n this.#state.rollbackError = errorToThrow;\n }\n }\n\n async commit() {\n if (!this.#owned) return;\n await this.#state.commitIfStarted();\n }\n\n async rollback() {\n if (!this.#owned) return;\n await this.#state.rollbackIfStarted();\n }\n\n async release() {\n if (!this.#owned) return;\n await this.#state.release();\n }\n\n async finishOnSuccess() {\n if (!this.#owned || this.#finished) return;\n this.#finished = true;\n await this.#state.finishOnSuccess();\n }\n\n async finishOnError(err: unknown) {\n if (!this.#owned || this.#finished) return;\n this.#finished = true;\n await this.#state.finishOnError(err);\n }\n}\n\nclass TxState {\n readonly dbName: string;\n readonly db: Database;\n readonly options: Required<Pick<TransactionOptions, 'lazy'>> & Pick<TransactionOptions, 'nested'>;\n depth = 1;\n started = false;\n completed = false;\n rollbackOnly = false;\n rollbackError: unknown | undefined;\n\n private txDb: Database | undefined;\n private releaseFn: (() => Promise<void>) | undefined;\n\n constructor(dbName: string, db: Database, options: TransactionOptions | undefined) {\n this.dbName = dbName;\n this.db = db;\n this.options = {\n lazy: options?.lazy ?? true,\n nested: options?.nested ?? 'join',\n };\n }\n\n get activeDb(): Database {\n return this.txDb ?? this.db;\n }\n\n async ensureStarted() {\n if (this.started) return;\n\n const dialect = this.db.dialect ?? 'sqlite';\n if (dialect === 'postgres') {\n const pool: any = this.db.conn;\n if (!pool || typeof pool.connect !== 'function') {\n throw new SqlStackError('Postgres transactions require a pg Pool with .connect() as Database.conn');\n }\n const client = await pool.connect();\n this.txDb = createPgDb(client);\n this.releaseFn = async () => {\n if (typeof client.release === 'function') client.release();\n };\n await this.txDb.query('BEGIN', []);\n this.started = true;\n return;\n }\n\n if (dialect === 'mysql') {\n const pool: any = this.db.conn;\n if (!pool || typeof pool.getConnection !== 'function') {\n throw new SqlStackError('MySQL transactions require a mysql2 Pool with .getConnection() as Database.conn');\n }\n const conn = await pool.getConnection();\n this.txDb = createMysqlDb(conn);\n this.releaseFn = async () => {\n if (typeof conn.release === 'function') conn.release();\n };\n await this.txDb.query('START TRANSACTION', []);\n this.started = true;\n return;\n }\n\n // sqlite: existing connection is already bound\n await this.db.query('BEGIN', []);\n this.started = true;\n }\n\n async query(sql: string, params: unknown[]): Promise<QueryResult> {\n await this.ensureStarted();\n return await this.activeDb.query(sql, params);\n }\n\n async commitIfStarted() {\n if (this.completed) return;\n if (!this.started) {\n this.completed = true;\n return;\n }\n await this.activeDb.query('COMMIT', []);\n this.completed = true;\n }\n\n async rollbackIfStarted() {\n if (this.completed) return;\n if (!this.started) {\n this.completed = true;\n return;\n }\n await this.activeDb.query('ROLLBACK', []);\n this.completed = true;\n }\n\n async release() {\n try {\n if (this.releaseFn) await this.releaseFn();\n } finally {\n this.txDb = undefined;\n this.releaseFn = undefined;\n }\n }\n\n async finishOnSuccess() {\n try {\n if (this.rollbackOnly) {\n await this.rollbackIfStarted();\n if (typeof this.rollbackError !== 'undefined') throw this.rollbackError;\n throw new RollbackTransactionError();\n }\n await this.commitIfStarted();\n } finally {\n await this.release();\n }\n }\n\n async finishOnError(err: unknown) {\n try {\n await this.rollbackIfStarted();\n } finally {\n await this.release();\n }\n if (isRollbackTransactionError(err)) {\n throw unwrapRollbackCause(err);\n }\n throw err;\n }\n}\n\nfunction enterTx(dbName: string, options?: TransactionOptions): { handle: TransactionHandle; store: TxStore; isNewStore: boolean } {\n const { store, isNew } = getOrCreateStore();\n const existing = store.txByDb.get(dbName);\n if (existing) {\n existing.depth++;\n return { handle: new TransactionHandle(dbName, existing, false), store, isNewStore: isNew };\n }\n const { db } = SqlStackDB.getEntry(dbName);\n const state = new TxState(dbName, db, options);\n store.txByDb.set(dbName, state);\n return { handle: new TransactionHandle(dbName, state, true), store, isNewStore: isNew };\n}\n\nasync function exitTx(dbName: string, store: TxStore) {\n const state = store.txByDb.get(dbName);\n if (!state) return;\n state.depth = Math.max(0, state.depth - 1);\n if (state.depth === 0) {\n store.txByDb.delete(dbName);\n }\n}\n\nexport function currentTransaction(db?: string): TransactionHandle | undefined {\n const store = getStore();\n if (!store) return undefined;\n const resolved = SqlStackDB.getEntry(db).name;\n const state = store.txByDb.get(resolved);\n if (!state) return undefined;\n return new TransactionHandle(resolved, state, false);\n}\n\nexport async function withTransaction<T>(fn: () => Promise<T>, options?: TransactionOptions): Promise<T> {\n const resolved = SqlStackDB.getEntry(options?.db).name;\n const { handle, store, isNewStore } = enterTx(resolved, options);\n\n const run = async () => {\n try {\n const out = await fn();\n await handle.finishOnSuccess();\n return out;\n } catch (err) {\n await handle.finishOnError(err);\n throw err;\n } finally {\n await exitTx(resolved, store);\n }\n };\n\n return isNewStore ? await als.run(store, run) : await run();\n}\n\nexport type TransactionDecorator = {\n (target: any, prop: string | symbol, desc: PropertyDescriptor): void;\n (options?: TransactionOptions): (target: any, prop: string | symbol, desc: PropertyDescriptor) => void;\n};\n\nexport const transaction: TransactionDecorator = function (...args: any[]) {\n // @transaction\n if (args.length === 3 && typeof args[2]?.value === 'function') {\n const [target, prop, desc] = args as [any, string | symbol, PropertyDescriptor];\n wrapMethod(target, prop, desc, undefined);\n return;\n }\n // @transaction() or @transaction({ ... })\n const options: TransactionOptions | undefined = args.length > 0 ? args[0] : undefined;\n return function (target: any, prop: string | symbol, desc: PropertyDescriptor) {\n wrapMethod(target, prop, desc, options);\n };\n} as any;\n\nfunction wrapMethod(_target: any, _prop: string | symbol, desc: PropertyDescriptor, options?: TransactionOptions) {\n const original = desc.value;\n desc.value = async function (...callArgs: any[]) {\n return await withTransaction(() => original.apply(this, callArgs), options);\n };\n}\n\nexport type ActiveTransaction = {\n query(sql: string, params: unknown[]): Promise<QueryResult>;\n};\n\nexport function getActiveTransaction(dbName: string): ActiveTransaction | undefined {\n const store = getStore();\n return store?.txByDb.get(dbName);\n}\n"]}
1
+ {"version":3,"file":"transactions.js","sourceRoot":"","sources":["../../src/transactions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,wBAAwB,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAExE,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAe1D,MAAM,GAAG,GAAG,IAAI,iBAAiB,EAAW,CAAC;AAE7C,SAAS,QAAQ;IACf,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAED,SAAS,gBAAgB;IACvB,MAAM,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAC5B,IAAI,QAAQ;QAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;IACvD,OAAO,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,0BAA0B,CAAC,GAAY;IAC9C,OAAO,GAAG,YAAY,wBAAwB,CAAC;AACjD,CAAC;AAED,SAAS,mBAAmB,CAAC,GAA6B;IACxD,OAAO,OAAO,GAAG,CAAC,KAAK,KAAK,WAAW,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC;AAC5D,CAAC;AAED,MAAM,OAAO,iBAAiB;IAM5B,YAAY,KAAoB,EAAE,KAAc,EAAE,KAAc;QAJhE,2CAAgB;QAChB,2CAAgB;QAChB,sCAAY,KAAK,EAAC;QAGhB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,uBAAA,IAAI,4BAAU,KAAK,MAAA,CAAC;QACpB,uBAAA,IAAI,4BAAU,KAAK,MAAA,CAAC;IACtB,CAAC;IAED,IAAI,MAAM;QACR,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,MAAM,uBAAA,IAAI,gCAAO,CAAC,aAAa,EAAE,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,YAAsB;QACjC,uBAAA,IAAI,gCAAO,CAAC,YAAY,GAAG,IAAI,CAAC;QAChC,IAAI,OAAO,YAAY,KAAK,WAAW,EAAE,CAAC;YACxC,uBAAA,IAAI,gCAAO,CAAC,aAAa,GAAG,YAAY,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,MAAM;QACV,IAAI,CAAC,uBAAA,IAAI,gCAAO;YAAE,OAAO;QACzB,MAAM,uBAAA,IAAI,gCAAO,CAAC,eAAe,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,IAAI,CAAC,uBAAA,IAAI,gCAAO;YAAE,OAAO;QACzB,MAAM,uBAAA,IAAI,gCAAO,CAAC,iBAAiB,EAAE,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC,uBAAA,IAAI,gCAAO;YAAE,OAAO;QACzB,MAAM,uBAAA,IAAI,gCAAO,CAAC,OAAO,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC,uBAAA,IAAI,gCAAO,IAAI,uBAAA,IAAI,mCAAU;YAAE,OAAO;QAC3C,uBAAA,IAAI,+BAAa,IAAI,MAAA,CAAC;QACtB,MAAM,uBAAA,IAAI,gCAAO,CAAC,eAAe,EAAE,CAAC;IACtC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAY;QAC9B,IAAI,CAAC,uBAAA,IAAI,gCAAO,IAAI,uBAAA,IAAI,mCAAU;YAAE,OAAO;QAC3C,uBAAA,IAAI,+BAAa,IAAI,MAAA,CAAC;QACtB,MAAM,uBAAA,IAAI,gCAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACvC,CAAC;CACF;;AAED,MAAM,OAAO;IAaX,YAAY,KAAoB,EAAE,OAAuC;QATzE,UAAK,GAAG,CAAC,CAAC;QACV,YAAO,GAAG,KAAK,CAAC;QAChB,cAAS,GAAG,KAAK,CAAC;QAClB,iBAAY,GAAG,KAAK,CAAC;QAOnB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,EAAE,CAAC;QACnB,IAAI,CAAC,OAAO,GAAG;YACb,IAAI,EAAE,OAAO,EAAE,IAAI,IAAI,IAAI;YAC3B,MAAM,EAAE,OAAO,EAAE,MAAM,IAAI,MAAM;SAClC,CAAC;IACJ,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,EAAE,CAAC;IAC9B,CAAC;IAED,KAAK,CAAC,aAAa;QACjB,IAAI,IAAI,CAAC,OAAO;YAAE,OAAO;QAEzB,MAAM,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,QAAQ,CAAC;QAC5C,IAAI,OAAO,KAAK,UAAU,EAAE,CAAC;YAC3B,MAAM,IAAI,GAAQ,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;YAC/B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;gBAChD,MAAM,IAAI,aAAa,CAAC,0EAA0E,CAAC,CAAC;YACtG,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;YAC/B,IAAI,CAAC,SAAS,GAAG,KAAK,IAAI,EAAE;gBAC1B,IAAI,OAAO,MAAM,CAAC,OAAO,KAAK,UAAU;oBAAE,MAAM,CAAC,OAAO,EAAE,CAAC;YAC7D,CAAC,CAAC;YACF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACnC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO;QACT,CAAC;QAED,IAAI,OAAO,KAAK,OAAO,EAAE,CAAC;YACxB,MAAM,IAAI,GAAQ,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC;YAC/B,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,UAAU,EAAE,CAAC;gBACtD,MAAM,IAAI,aAAa,CAAC,iFAAiF,CAAC,CAAC;YAC7G,CAAC;YACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;YACxC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;YAChC,IAAI,CAAC,SAAS,GAAG,KAAK,IAAI,EAAE;gBAC1B,IAAI,OAAO,IAAI,CAAC,OAAO,KAAK,UAAU;oBAAE,IAAI,CAAC,OAAO,EAAE,CAAC;YACzD,CAAC,CAAC;YACF,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;YAC/C,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YACpB,OAAO;QACT,CAAC;QAED,+CAA+C;QAC/C,MAAM,IAAI,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QACjC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,GAAW,EAAE,MAAiB;QACxC,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;QAC3B,OAAO,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACxC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,iBAAiB;QACrB,IAAI,IAAI,CAAC,SAAS;YAAE,OAAO;QAC3B,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;YAClB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;YACtB,OAAO;QACT,CAAC;QACD,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;IACxB,CAAC;IAED,KAAK,CAAC,OAAO;QACX,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,SAAS;gBAAE,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC;QAC7C,CAAC;gBAAS,CAAC;YACT,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC;YACtB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC7B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe;QACnB,IAAI,CAAC;YACH,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtB,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBAC/B,IAAI,OAAO,IAAI,CAAC,aAAa,KAAK,WAAW;oBAAE,MAAM,IAAI,CAAC,aAAa,CAAC;gBACxE,MAAM,IAAI,wBAAwB,EAAE,CAAC;YACvC,CAAC;YACD,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;QAC/B,CAAC;gBAAS,CAAC;YACT,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAY;QAC9B,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACjC,CAAC;gBAAS,CAAC;YACT,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACvB,CAAC;QACD,IAAI,0BAA0B,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,MAAM,mBAAmB,CAAC,GAAG,CAAC,CAAC;QACjC,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;CACF;AAED,SAAS,OAAO,CAAC,KAAoB,EAAE,OAA4B;IACjE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC5C,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,QAAQ,EAAE,CAAC;QACb,QAAQ,CAAC,KAAK,EAAE,CAAC;QACjB,OAAO,EAAE,MAAM,EAAE,IAAI,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IAC7F,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC1C,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC/B,OAAO,EAAE,MAAM,EAAE,IAAI,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;AACzF,CAAC;AAED,KAAK,UAAU,MAAM,CAAC,KAAoB,EAAE,KAAc;IACxD,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,CAAC,KAAK;QAAE,OAAO;IACnB,KAAK,CAAC,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IAC3C,IAAI,KAAK,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;QACtB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IAC7B,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,EAAW;IAC5C,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,MAAM,KAAK,GAAG,WAAW,CAAC,EAAE,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,OAAO,IAAI,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACpD,CAAC;AAED,uEAAuE;AACvE,MAAM,UAAU,qBAAqB,CAAC,KAAoB;IACxD,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,MAAM,KAAK,GAAG,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACvC,IAAI,CAAC,KAAK;QAAE,OAAO,SAAS,CAAC;IAC7B,OAAO,IAAI,iBAAiB,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAI,EAAoB,EAAE,OAA4B;IACzF,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,gBAAgB,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAE9D,MAAM,GAAG,GAAG,KAAK,IAAI,EAAE;QACrB,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,EAAE,EAAE,CAAC;YACvB,MAAM,MAAM,CAAC,eAAe,EAAE,CAAC;YAC/B,OAAO,GAAG,CAAC;QACb,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,GAAG,CAAC;QACZ,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC;IAEF,OAAO,UAAU,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,EAAE,CAAC;AAC9D,CAAC;AAOD,MAAM,CAAC,MAAM,WAAW,GAAyB,UAAU,GAAG,IAAW;IACvE,eAAe;IACf,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,UAAU,EAAE,CAAC;QAC9D,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,IAAkD,CAAC;QAChF,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAC1C,OAAO;IACT,CAAC;IACD,0CAA0C;IAC1C,MAAM,OAAO,GAAmC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACtF,OAAO,UAAU,MAAW,EAAE,IAAqB,EAAE,IAAwB;QAC3E,UAAU,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC;IAC1C,CAAC,CAAC;AACJ,CAAQ,CAAC;AAET,SAAS,UAAU,CAAC,OAAY,EAAE,KAAsB,EAAE,IAAwB,EAAE,OAA4B;IAC9G,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC;IAC5B,IAAI,CAAC,KAAK,GAAG,KAAK,WAAW,GAAG,QAAe;QAC7C,OAAO,MAAM,eAAe,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,OAAO,CAAC,CAAC;IAC9E,CAAC,CAAC;AACJ,CAAC;AAMD,MAAM,UAAU,oBAAoB,CAAC,KAAoB;IACvD,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;IACzB,OAAO,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAClC,CAAC","sourcesContent":["import { AsyncLocalStorage } from 'node:async_hooks';\nimport type { Database, QueryResult } from './registry';\nimport { createPgDb, createMysqlDb } from './adapters';\nimport { RollbackTransactionError, SqlStackError } from './core/errors';\nimport type { DatabaseEntry } from './stack';\nimport { resolveExecution, legacyEntry } from './runtime';\n\nexport type TransactionOptions = {\n db?: string;\n lazy?: boolean;\n nested?: 'join';\n};\n\n// Keyed by concrete DatabaseEntry identity (owning stack + registration), so\n// two roots transacting on the same name (\"primary\") can never collide\n// (spec 16 §20, spec 17 §14).\ntype TxStore = {\n txByDb: Map<DatabaseEntry, TxState>;\n};\n\nconst als = new AsyncLocalStorage<TxStore>();\n\nfunction getStore(): TxStore | undefined {\n return als.getStore();\n}\n\nfunction getOrCreateStore(): { store: TxStore; isNew: boolean } {\n const existing = getStore();\n if (existing) return { store: existing, isNew: false };\n return { store: { txByDb: new Map() }, isNew: true };\n}\n\nfunction isRollbackTransactionError(err: unknown): err is RollbackTransactionError {\n return err instanceof RollbackTransactionError;\n}\n\nfunction unwrapRollbackCause(err: RollbackTransactionError): unknown {\n return typeof err.cause === 'undefined' ? err : err.cause;\n}\n\nexport class TransactionHandle {\n readonly entry: DatabaseEntry;\n #state: TxState;\n #owned: boolean;\n #finished = false;\n\n constructor(entry: DatabaseEntry, state: TxState, owned: boolean) {\n this.entry = entry;\n this.#state = state;\n this.#owned = owned;\n }\n\n get dbName(): string {\n return this.entry.name;\n }\n\n async ensureStarted() {\n await this.#state.ensureStarted();\n }\n\n rollbackOnly(errorToThrow?: unknown) {\n this.#state.rollbackOnly = true;\n if (typeof errorToThrow !== 'undefined') {\n this.#state.rollbackError = errorToThrow;\n }\n }\n\n async commit() {\n if (!this.#owned) return;\n await this.#state.commitIfStarted();\n }\n\n async rollback() {\n if (!this.#owned) return;\n await this.#state.rollbackIfStarted();\n }\n\n async release() {\n if (!this.#owned) return;\n await this.#state.release();\n }\n\n async finishOnSuccess() {\n if (!this.#owned || this.#finished) return;\n this.#finished = true;\n await this.#state.finishOnSuccess();\n }\n\n async finishOnError(err: unknown) {\n if (!this.#owned || this.#finished) return;\n this.#finished = true;\n await this.#state.finishOnError(err);\n }\n}\n\nclass TxState {\n readonly entry: DatabaseEntry;\n readonly db: Database;\n readonly options: Required<Pick<TransactionOptions, 'lazy'>> & Pick<TransactionOptions, 'nested'>;\n depth = 1;\n started = false;\n completed = false;\n rollbackOnly = false;\n rollbackError: unknown | undefined;\n\n private txDb: Database | undefined;\n private releaseFn: (() => Promise<void>) | undefined;\n\n constructor(entry: DatabaseEntry, options: TransactionOptions | undefined) {\n this.entry = entry;\n this.db = entry.db;\n this.options = {\n lazy: options?.lazy ?? true,\n nested: options?.nested ?? 'join',\n };\n }\n\n get activeDb(): Database {\n return this.txDb ?? this.db;\n }\n\n async ensureStarted() {\n if (this.started) return;\n\n const dialect = this.db.dialect ?? 'sqlite';\n if (dialect === 'postgres') {\n const pool: any = this.db.conn;\n if (!pool || typeof pool.connect !== 'function') {\n throw new SqlStackError('Postgres transactions require a pg Pool with .connect() as Database.conn');\n }\n const client = await pool.connect();\n this.txDb = createPgDb(client);\n this.releaseFn = async () => {\n if (typeof client.release === 'function') client.release();\n };\n await this.txDb.query('BEGIN', []);\n this.started = true;\n return;\n }\n\n if (dialect === 'mysql') {\n const pool: any = this.db.conn;\n if (!pool || typeof pool.getConnection !== 'function') {\n throw new SqlStackError('MySQL transactions require a mysql2 Pool with .getConnection() as Database.conn');\n }\n const conn = await pool.getConnection();\n this.txDb = createMysqlDb(conn);\n this.releaseFn = async () => {\n if (typeof conn.release === 'function') conn.release();\n };\n await this.txDb.query('START TRANSACTION', []);\n this.started = true;\n return;\n }\n\n // sqlite: existing connection is already bound\n await this.db.query('BEGIN', []);\n this.started = true;\n }\n\n async query(sql: string, params: unknown[]): Promise<QueryResult> {\n await this.ensureStarted();\n return await this.activeDb.query(sql, params);\n }\n\n async commitIfStarted() {\n if (this.completed) return;\n if (!this.started) {\n this.completed = true;\n return;\n }\n await this.activeDb.query('COMMIT', []);\n this.completed = true;\n }\n\n async rollbackIfStarted() {\n if (this.completed) return;\n if (!this.started) {\n this.completed = true;\n return;\n }\n await this.activeDb.query('ROLLBACK', []);\n this.completed = true;\n }\n\n async release() {\n try {\n if (this.releaseFn) await this.releaseFn();\n } finally {\n this.txDb = undefined;\n this.releaseFn = undefined;\n }\n }\n\n async finishOnSuccess() {\n try {\n if (this.rollbackOnly) {\n await this.rollbackIfStarted();\n if (typeof this.rollbackError !== 'undefined') throw this.rollbackError;\n throw new RollbackTransactionError();\n }\n await this.commitIfStarted();\n } finally {\n await this.release();\n }\n }\n\n async finishOnError(err: unknown) {\n try {\n await this.rollbackIfStarted();\n } finally {\n await this.release();\n }\n if (isRollbackTransactionError(err)) {\n throw unwrapRollbackCause(err);\n }\n throw err;\n }\n}\n\nfunction enterTx(entry: DatabaseEntry, options?: TransactionOptions): { handle: TransactionHandle; store: TxStore; isNewStore: boolean } {\n const { store, isNew } = getOrCreateStore();\n const existing = store.txByDb.get(entry);\n if (existing) {\n existing.depth++;\n return { handle: new TransactionHandle(entry, existing, false), store, isNewStore: isNew };\n }\n const state = new TxState(entry, options);\n store.txByDb.set(entry, state);\n return { handle: new TransactionHandle(entry, state, true), store, isNewStore: isNew };\n}\n\nasync function exitTx(entry: DatabaseEntry, store: TxStore) {\n const state = store.txByDb.get(entry);\n if (!state) return;\n state.depth = Math.max(0, state.depth - 1);\n if (state.depth === 0) {\n store.txByDb.delete(entry);\n }\n}\n\n/**\n * @deprecated Synchronous lookup against the legacy global registry only.\n * Under an active IoC root, use `currentTransactionFor(entry)` with an entry\n * from the root's SqlStack (`stack.getEntry(name)`).\n */\nexport function currentTransaction(db?: string): TransactionHandle | undefined {\n const store = getStore();\n if (!store) return undefined;\n const entry = legacyEntry(db);\n const state = store.txByDb.get(entry);\n if (!state) return undefined;\n return new TransactionHandle(entry, state, false);\n}\n\n/** Active transaction handle for a concrete database entry, if any. */\nexport function currentTransactionFor(entry: DatabaseEntry): TransactionHandle | undefined {\n const store = getStore();\n const state = store?.txByDb.get(entry);\n if (!state) return undefined;\n return new TransactionHandle(entry, state, false);\n}\n\nexport async function withTransaction<T>(fn: () => Promise<T>, options?: TransactionOptions): Promise<T> {\n const { entry } = await resolveExecution(options?.db);\n const { handle, store, isNewStore } = enterTx(entry, options);\n\n const run = async () => {\n try {\n const out = await fn();\n await handle.finishOnSuccess();\n return out;\n } catch (err) {\n await handle.finishOnError(err);\n throw err;\n } finally {\n await exitTx(entry, store);\n }\n };\n\n return isNewStore ? await als.run(store, run) : await run();\n}\n\nexport type TransactionDecorator = {\n (target: any, prop: string | symbol, desc: PropertyDescriptor): void;\n (options?: TransactionOptions): (target: any, prop: string | symbol, desc: PropertyDescriptor) => void;\n};\n\nexport const transaction: TransactionDecorator = function (...args: any[]) {\n // @transaction\n if (args.length === 3 && typeof args[2]?.value === 'function') {\n const [target, prop, desc] = args as [any, string | symbol, PropertyDescriptor];\n wrapMethod(target, prop, desc, undefined);\n return;\n }\n // @transaction() or @transaction({ ... })\n const options: TransactionOptions | undefined = args.length > 0 ? args[0] : undefined;\n return function (target: any, prop: string | symbol, desc: PropertyDescriptor) {\n wrapMethod(target, prop, desc, options);\n };\n} as any;\n\nfunction wrapMethod(_target: any, _prop: string | symbol, desc: PropertyDescriptor, options?: TransactionOptions) {\n const original = desc.value;\n desc.value = async function (...callArgs: any[]) {\n return await withTransaction(() => original.apply(this, callArgs), options);\n };\n}\n\nexport type ActiveTransaction = {\n query(sql: string, params: unknown[]): Promise<QueryResult>;\n};\n\nexport function getActiveTransaction(entry: DatabaseEntry): ActiveTransaction | undefined {\n const store = getStore();\n return store?.txByDb.get(entry);\n}\n"]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "sqlstack",
3
- "version": "2.0.0",
3
+ "version": "3.0.0",
4
4
  "description": "",
5
5
  "license": "ISC",
6
6
  "author": "",
@@ -35,6 +35,16 @@
35
35
  "types": "./dist/cjs/codegen/generateManifest.d.ts",
36
36
  "require": "./dist/cjs/codegen/generateManifest.js",
37
37
  "import": "./dist/esm/codegen/generateManifest.js"
38
+ },
39
+ "./testing": {
40
+ "types": "./dist/cjs/testing/index.d.ts",
41
+ "require": "./dist/cjs/testing/index.js",
42
+ "import": "./dist/esm/testing/index.js"
43
+ },
44
+ "./ioc": {
45
+ "types": "./dist/cjs/ioc.d.ts",
46
+ "require": "./dist/cjs/ioc.js",
47
+ "import": "./dist/esm/ioc.js"
38
48
  }
39
49
  },
40
50
  "bin": {
@@ -60,6 +70,7 @@
60
70
  "db:logs:mysql": "docker logs -f sqlstack-mysql"
61
71
  },
62
72
  "devDependencies": {
73
+ "@noego/ioc": "file:../ioc",
63
74
  "@types/jest": "^29.5.13",
64
75
  "better-sqlite3": "^12.3.0",
65
76
  "jest": "^29.7.0",
@@ -73,9 +84,11 @@
73
84
  "dependencies": {
74
85
  "ajv": "^8.17.1",
75
86
  "ajv-formats": "^2.1.1",
76
- "reflect-metadata": "^0.1.13"
87
+ "reflect-metadata": "^0.1.13",
88
+ "yaml": "^2.9.0"
77
89
  },
78
90
  "peerDependencies": {
91
+ "@noego/ioc": "*",
79
92
  "better-sqlite3": "*",
80
93
  "mysql2": "*",
81
94
  "pg": "*",
@@ -94,6 +107,9 @@
94
107
  },
95
108
  "pg": {
96
109
  "optional": true
110
+ },
111
+ "@noego/ioc": {
112
+ "optional": true
97
113
  }
98
114
  },
99
115
  "engines": {