@shing.wong/sure-factor 0.1.1 → 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/CHANGELOG.md +136 -0
- package/README.md +35 -4
- package/dist/format.d.ts.map +1 -1
- package/dist/format.js +39 -6
- package/dist/format.js.map +1 -1
- package/dist/generate-store.d.ts.map +1 -1
- package/dist/generate-store.js +43 -13
- package/dist/generate-store.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/introspect.d.ts +25 -1
- package/dist/introspect.d.ts.map +1 -1
- package/dist/introspect.js +416 -25
- package/dist/introspect.js.map +1 -1
- package/dist/parse-yaml.d.ts.map +1 -1
- package/dist/parse-yaml.js +27 -11
- package/dist/parse-yaml.js.map +1 -1
- package/dist/sanitize.d.ts +24 -0
- package/dist/sanitize.d.ts.map +1 -1
- package/dist/sanitize.js +142 -4
- package/dist/sanitize.js.map +1 -1
- package/package.json +13 -5
package/dist/introspect.js
CHANGED
|
@@ -1,39 +1,430 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
/** Cast a driver row set for mapping; the SQL determines the row shape. */
|
|
2
|
+
function rows(result) {
|
|
3
|
+
return result.rows;
|
|
4
|
+
}
|
|
5
|
+
export class PostgresConnectionError extends Error {
|
|
6
|
+
constructor(cause) {
|
|
7
|
+
const reason = cause instanceof Error ? cause.message : String(cause);
|
|
8
|
+
super(`Could not connect to PostgreSQL: ${reason}. Check the connection string, or use introspectSchemaFromDdl() to introspect from a DDL string without a live connection.`, {
|
|
9
|
+
cause,
|
|
10
|
+
});
|
|
11
|
+
this.name = 'PostgresConnectionError';
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Introspect a live PostgreSQL database.
|
|
16
|
+
*
|
|
17
|
+
* Loads the `pg` driver lazily so it stays an optional dependency. `schemas`
|
|
18
|
+
* is honoured rather than ignored: the catalog query is restricted to it, and
|
|
19
|
+
* an empty list is rejected instead of silently introspecting everything.
|
|
20
|
+
*/
|
|
21
|
+
export async function introspectSchema(connectionString, schemas = ['public'], client) {
|
|
22
|
+
if (typeof connectionString !== 'string' || connectionString.trim() === '') {
|
|
23
|
+
throw new TypeError('introspectSchema requires a non-empty connectionString');
|
|
24
|
+
}
|
|
25
|
+
if (!Array.isArray(schemas) || schemas.length === 0) {
|
|
26
|
+
throw new TypeError('introspectSchema requires at least one schema name');
|
|
27
|
+
}
|
|
28
|
+
let queryable = client;
|
|
29
|
+
let shouldClose = false;
|
|
30
|
+
if (!queryable) {
|
|
31
|
+
// `pg` is a regular dependency, so it is imported normally. The driver is
|
|
32
|
+
// still loaded lazily (inside the function) to keep DDL-only usage from
|
|
33
|
+
// paying for it at import time.
|
|
34
|
+
const { Client } = await import('pg');
|
|
35
|
+
const created = new Client({ connectionString });
|
|
36
|
+
try {
|
|
37
|
+
await created.connect();
|
|
38
|
+
}
|
|
39
|
+
catch (err) {
|
|
40
|
+
// Close the half-open socket before surfacing the failure.
|
|
41
|
+
await created.end().catch(() => undefined);
|
|
42
|
+
throw new PostgresConnectionError(err);
|
|
43
|
+
}
|
|
44
|
+
queryable = created;
|
|
45
|
+
shouldClose = true;
|
|
46
|
+
}
|
|
47
|
+
try {
|
|
48
|
+
const tableResult = await queryable.query(`SELECT table_schema, table_name
|
|
49
|
+
FROM information_schema.tables
|
|
50
|
+
WHERE table_type = 'BASE TABLE'
|
|
51
|
+
AND table_schema = ANY($1::text[])
|
|
52
|
+
ORDER BY table_schema, table_name`, [schemas]);
|
|
53
|
+
const columnResult = await queryable.query(`SELECT table_schema, table_name, column_name, data_type, is_nullable,
|
|
54
|
+
character_maximum_length, column_default AS default_value, ordinal_position
|
|
55
|
+
FROM information_schema.columns
|
|
56
|
+
WHERE table_schema = ANY($1::text[])
|
|
57
|
+
ORDER BY table_schema, table_name, ordinal_position`, [schemas]);
|
|
58
|
+
const constraintResult = await queryable.query(`SELECT c.table_schema,
|
|
59
|
+
c.table_name,
|
|
60
|
+
c.column_name,
|
|
61
|
+
(tc.constraint_type = 'PRIMARY KEY') AS primary_key,
|
|
62
|
+
fcu.table_name AS foreign_table,
|
|
63
|
+
fcu.column_name AS foreign_column
|
|
64
|
+
FROM information_schema.columns c
|
|
65
|
+
LEFT JOIN information_schema.table_constraints tc
|
|
66
|
+
ON tc.table_schema = c.table_schema
|
|
67
|
+
AND tc.table_name = c.table_name
|
|
68
|
+
AND tc.constraint_type IN ('PRIMARY KEY', 'FOREIGN KEY')
|
|
69
|
+
LEFT JOIN information_schema.key_column_usage kcu
|
|
70
|
+
ON kcu.constraint_schema = tc.constraint_schema
|
|
71
|
+
AND kcu.constraint_name = tc.constraint_name
|
|
72
|
+
LEFT JOIN information_schema.constraint_column_usage ccu
|
|
73
|
+
ON ccu.constraint_schema = tc.constraint_schema
|
|
74
|
+
AND ccu.constraint_name = tc.constraint_name
|
|
75
|
+
LEFT JOIN information_schema.referential_constraints rc
|
|
76
|
+
ON rc.constraint_schema = tc.constraint_schema
|
|
77
|
+
AND rc.constraint_name = tc.constraint_name
|
|
78
|
+
LEFT JOIN information_schema.key_column_usage fcu
|
|
79
|
+
ON fcu.constraint_schema = rc.unique_constraint_schema
|
|
80
|
+
AND fcu.constraint_name = rc.unique_constraint_name
|
|
81
|
+
WHERE c.table_schema = ANY($1::text[])`, [schemas]);
|
|
82
|
+
const keyOf = (s, t) => `${s}.${t}`;
|
|
83
|
+
const constraints = new Map();
|
|
84
|
+
for (const row of rows(constraintResult)) {
|
|
85
|
+
const key = keyOf(row.table_schema, row.table_name);
|
|
86
|
+
const existing = constraints.get(key) ?? { primaryKey: false, foreignKey: null };
|
|
87
|
+
if (row.primary_key)
|
|
88
|
+
existing.primaryKey = true;
|
|
89
|
+
if (row.foreign_table && row.foreign_column) {
|
|
90
|
+
existing.foreignKey = { table: row.foreign_table, column: row.foreign_column };
|
|
91
|
+
}
|
|
92
|
+
constraints.set(key, existing);
|
|
93
|
+
}
|
|
94
|
+
const columnsByTable = new Map();
|
|
95
|
+
for (const row of rows(columnResult)) {
|
|
96
|
+
const key = keyOf(row.table_schema, row.table_name);
|
|
97
|
+
const meta = constraints.get(key);
|
|
98
|
+
const list = columnsByTable.get(key) ?? [];
|
|
99
|
+
list.push({
|
|
100
|
+
columnName: row.column_name,
|
|
101
|
+
dataType: row.data_type,
|
|
102
|
+
isNullable: row.is_nullable === 'YES',
|
|
103
|
+
maxLength: row.character_maximum_length ?? null,
|
|
104
|
+
defaultValue: row.default_value ?? null,
|
|
105
|
+
isPrimaryKey: meta?.primaryKey ?? false,
|
|
106
|
+
foreignKey: meta?.foreignKey ?? null,
|
|
107
|
+
});
|
|
108
|
+
columnsByTable.set(key, list);
|
|
109
|
+
}
|
|
110
|
+
const tables = rows(tableResult).map(row => ({
|
|
111
|
+
tableName: row.table_name,
|
|
112
|
+
schema: row.table_schema,
|
|
113
|
+
columns: columnsByTable.get(keyOf(row.table_schema, row.table_name)) ?? [],
|
|
114
|
+
}));
|
|
115
|
+
return { tables };
|
|
116
|
+
}
|
|
117
|
+
finally {
|
|
118
|
+
// Only close a connection this call opened; an injected client stays the
|
|
119
|
+
// caller's responsibility.
|
|
120
|
+
if (shouldClose)
|
|
121
|
+
await queryable.end?.();
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
const IDENT = '"(?:[^"]|"")*"|[A-Za-z_][A-Za-z0-9_$]*';
|
|
125
|
+
const QUALIFIED = `(?:${IDENT}\\s*\\.\\s*)?${IDENT}`;
|
|
126
|
+
/** Strip surrounding double quotes and unescape doubled quotes. */
|
|
127
|
+
function unquoteIdent(ident) {
|
|
128
|
+
const v = ident.trim();
|
|
129
|
+
if (v.startsWith('"') && v.endsWith('"') && v.length >= 2) {
|
|
130
|
+
return v.slice(1, -1).replace(/""/g, '"');
|
|
131
|
+
}
|
|
132
|
+
return v;
|
|
133
|
+
}
|
|
134
|
+
// A schema qualifier is captured as its own group. `QUALIFIED` cannot be used
|
|
135
|
+
// for the head because the table name must remain group 2; note the qualifier
|
|
136
|
+
// group allows whitespace around the dot but the table name may not absorb it.
|
|
137
|
+
const TABLE_HEAD_RE = new RegExp(`CREATE\\s+TABLE\\s+(?:IF\\s+NOT\\s+EXISTS\\s+)?(${IDENT})\\s*\\.\\s*(${IDENT})`, 'gi');
|
|
138
|
+
const UNQUALIFIED_TABLE_RE = new RegExp(`CREATE\\s+TABLE\\s+(?:IF\\s+NOT\\s+EXISTS\\s+)?(${IDENT})`, 'gi');
|
|
139
|
+
/** Locate the `(` that opens a table's column block. */
|
|
140
|
+
function findOpenParen(ddl, from) {
|
|
141
|
+
for (let i = from; i < ddl.length; i++) {
|
|
142
|
+
if (ddl[i] === '(')
|
|
143
|
+
return i;
|
|
144
|
+
}
|
|
145
|
+
return -1;
|
|
146
|
+
}
|
|
147
|
+
/**
|
|
148
|
+
* Read a balanced parenthesised block starting at `start` (which must index the
|
|
149
|
+
* opening paren), skipping over string and quoted-identifier literals.
|
|
150
|
+
*
|
|
151
|
+
* A non-greedy `\(([\s\S]*?)\)` cannot be used here: it stops at the first
|
|
152
|
+
* `)`, which is usually inside `VARCHAR(255)` or `DEFAULT NOW()`, truncating
|
|
153
|
+
* every multi-column table.
|
|
154
|
+
*/
|
|
155
|
+
function readBalancedBlock(ddl, start) {
|
|
156
|
+
if (ddl[start] !== '(')
|
|
157
|
+
return null;
|
|
158
|
+
let depth = 0;
|
|
159
|
+
let i = start;
|
|
160
|
+
while (i < ddl.length) {
|
|
161
|
+
const ch = ddl[i];
|
|
162
|
+
if (ch === "'" || ch === '"') {
|
|
163
|
+
const quote = ch;
|
|
164
|
+
i++;
|
|
165
|
+
while (i < ddl.length) {
|
|
166
|
+
if (ddl[i] === quote) {
|
|
167
|
+
if (ddl[i + 1] === quote) {
|
|
168
|
+
i += 2;
|
|
169
|
+
continue;
|
|
170
|
+
}
|
|
171
|
+
break;
|
|
172
|
+
}
|
|
173
|
+
i++;
|
|
174
|
+
}
|
|
175
|
+
i++;
|
|
176
|
+
continue;
|
|
177
|
+
}
|
|
178
|
+
if (ch === '(')
|
|
179
|
+
depth++;
|
|
180
|
+
else if (ch === ')') {
|
|
181
|
+
depth--;
|
|
182
|
+
if (depth === 0)
|
|
183
|
+
return { body: ddl.slice(start + 1, i), end: i + 1 };
|
|
184
|
+
}
|
|
185
|
+
i++;
|
|
186
|
+
}
|
|
187
|
+
return null;
|
|
188
|
+
}
|
|
189
|
+
/**
|
|
190
|
+
* Split a column block on top-level commas, so `DECIMAL(10, 2)` stays intact.
|
|
191
|
+
*
|
|
192
|
+
* Quoted-identifier literals are skipped. A double quote is only an identifier
|
|
193
|
+
* delimiter at the start of a token: inside `VARCHAR(255) DEFAULT 'a"b(c)'` the
|
|
194
|
+
* quote belongs to a string literal and must not open a quoted identifier, or
|
|
195
|
+
* the following comma would be misread as a column separator.
|
|
196
|
+
*/
|
|
197
|
+
function splitTopLevel(body) {
|
|
198
|
+
const out = [];
|
|
199
|
+
let depth = 0;
|
|
200
|
+
let current = '';
|
|
201
|
+
for (let i = 0; i < body.length; i++) {
|
|
202
|
+
const ch = body[i];
|
|
203
|
+
if (ch === "'") {
|
|
204
|
+
current += ch;
|
|
205
|
+
i++;
|
|
206
|
+
while (i < body.length) {
|
|
207
|
+
current += body[i];
|
|
208
|
+
if (body[i] === "'") {
|
|
209
|
+
if (body[i + 1] === "'") {
|
|
210
|
+
current += body[i + 1];
|
|
211
|
+
i++;
|
|
212
|
+
}
|
|
213
|
+
else
|
|
214
|
+
break;
|
|
215
|
+
}
|
|
216
|
+
i++;
|
|
217
|
+
}
|
|
218
|
+
continue;
|
|
219
|
+
}
|
|
220
|
+
if (ch === '"') {
|
|
221
|
+
current += ch;
|
|
222
|
+
i++;
|
|
223
|
+
while (i < body.length) {
|
|
224
|
+
current += body[i];
|
|
225
|
+
if (body[i] === '"') {
|
|
226
|
+
if (body[i + 1] === '"') {
|
|
227
|
+
current += body[i + 1];
|
|
228
|
+
i++;
|
|
229
|
+
}
|
|
230
|
+
else
|
|
231
|
+
break;
|
|
232
|
+
}
|
|
233
|
+
i++;
|
|
234
|
+
}
|
|
235
|
+
continue;
|
|
236
|
+
}
|
|
237
|
+
if (ch === '(')
|
|
238
|
+
depth++;
|
|
239
|
+
else if (ch === ')')
|
|
240
|
+
depth--;
|
|
241
|
+
else if (ch === ',' && depth === 0) {
|
|
242
|
+
out.push(current);
|
|
243
|
+
current = '';
|
|
244
|
+
continue;
|
|
245
|
+
}
|
|
246
|
+
current += ch;
|
|
247
|
+
}
|
|
248
|
+
if (current.trim())
|
|
249
|
+
out.push(current);
|
|
250
|
+
return out;
|
|
251
|
+
}
|
|
252
|
+
/**
|
|
253
|
+
* Split a column definition into name, type and the remainder.
|
|
254
|
+
*
|
|
255
|
+
* Returns the *raw* name text (quotes intact) so `"user data"` survives
|
|
256
|
+
* whitespace splitting, which would otherwise cut the name at the space.
|
|
257
|
+
*/
|
|
258
|
+
function splitColumnDef(trimmed) {
|
|
259
|
+
let i = 0;
|
|
260
|
+
let name = '';
|
|
261
|
+
if (trimmed.startsWith('"')) {
|
|
262
|
+
i = 1;
|
|
263
|
+
while (i < trimmed.length) {
|
|
264
|
+
if (trimmed[i] === '"') {
|
|
265
|
+
if (trimmed[i + 1] === '"') {
|
|
266
|
+
name += '""';
|
|
267
|
+
i += 2;
|
|
268
|
+
continue;
|
|
269
|
+
}
|
|
270
|
+
i++;
|
|
271
|
+
break;
|
|
272
|
+
}
|
|
273
|
+
name += trimmed[i];
|
|
274
|
+
i++;
|
|
275
|
+
}
|
|
276
|
+
}
|
|
277
|
+
else {
|
|
278
|
+
while (i < trimmed.length && !/\s/.test(trimmed[i])) {
|
|
279
|
+
name += trimmed[i];
|
|
280
|
+
i++;
|
|
281
|
+
}
|
|
282
|
+
}
|
|
283
|
+
if (!name)
|
|
284
|
+
return null;
|
|
285
|
+
while (i < trimmed.length && /\s/.test(trimmed[i]))
|
|
286
|
+
i++;
|
|
287
|
+
let type = '';
|
|
288
|
+
if (trimmed.startsWith('"', i)) {
|
|
289
|
+
i++;
|
|
290
|
+
while (i < trimmed.length) {
|
|
291
|
+
if (trimmed[i] === '"') {
|
|
292
|
+
if (trimmed[i + 1] === '"') {
|
|
293
|
+
type += '""';
|
|
294
|
+
i += 2;
|
|
295
|
+
continue;
|
|
296
|
+
}
|
|
297
|
+
i++;
|
|
298
|
+
break;
|
|
299
|
+
}
|
|
300
|
+
type += trimmed[i];
|
|
301
|
+
i++;
|
|
302
|
+
}
|
|
303
|
+
}
|
|
304
|
+
else {
|
|
305
|
+
while (i < trimmed.length && !/\s/.test(trimmed[i])) {
|
|
306
|
+
type += trimmed[i];
|
|
307
|
+
i++;
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
if (!type)
|
|
311
|
+
return null;
|
|
312
|
+
const rest = trimmed.slice(i).trim();
|
|
313
|
+
return { name, type, rest };
|
|
3
314
|
}
|
|
4
315
|
export function introspectSchemaFromDdl(ddl) {
|
|
5
316
|
const tables = [];
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
317
|
+
// Quoted identifiers are matched and unquoted, so names like "user data" or
|
|
318
|
+
// "User" survive. The column block is read with balanced-paren scanning, and
|
|
319
|
+
// the trailing semicolon is optional, so a final statement without a
|
|
320
|
+
// terminator (or one followed by a comment) still parses.
|
|
321
|
+
TABLE_HEAD_RE.lastIndex = 0;
|
|
322
|
+
UNQUALIFIED_TABLE_RE.lastIndex = 0;
|
|
323
|
+
// Walk both patterns in step and take whichever matched earliest, so a
|
|
324
|
+
// schema-qualified name is not mistaken for an unqualified one.
|
|
325
|
+
let nextQualified = TABLE_HEAD_RE.exec(ddl);
|
|
326
|
+
let nextPlain = UNQUALIFIED_TABLE_RE.exec(ddl);
|
|
327
|
+
for (;;) {
|
|
328
|
+
const useQualified = nextQualified !== null && (nextPlain === null || nextQualified.index <= nextPlain.index);
|
|
329
|
+
const match = useQualified ? nextQualified : nextPlain;
|
|
330
|
+
if (!match)
|
|
331
|
+
break;
|
|
332
|
+
const schema = useQualified && match[1] !== undefined ? unquoteIdent(match[1]).toLowerCase() : null;
|
|
333
|
+
// The table name may be followed by whitespace before the column block, so
|
|
334
|
+
// the opening paren is located rather than assumed.
|
|
335
|
+
const openIdx = findOpenParen(ddl, match.index + match[0].length);
|
|
336
|
+
if (openIdx === -1)
|
|
337
|
+
break;
|
|
338
|
+
const block = readBalancedBlock(ddl, openIdx);
|
|
339
|
+
if (!block)
|
|
340
|
+
break;
|
|
341
|
+
if (useQualified) {
|
|
342
|
+
TABLE_HEAD_RE.lastIndex = block.end;
|
|
343
|
+
nextQualified = TABLE_HEAD_RE.exec(ddl);
|
|
344
|
+
}
|
|
345
|
+
else {
|
|
346
|
+
UNQUALIFIED_TABLE_RE.lastIndex = block.end;
|
|
347
|
+
nextPlain = UNQUALIFIED_TABLE_RE.exec(ddl);
|
|
348
|
+
}
|
|
349
|
+
// Group 1 is the schema (qualified pattern) or the table name (plain
|
|
350
|
+
// pattern); group 2 is the table name only for the qualified pattern.
|
|
351
|
+
const rawName = useQualified ? match[2] : match[1];
|
|
352
|
+
if (rawName === undefined)
|
|
353
|
+
break;
|
|
354
|
+
const tableName = unquoteIdent(rawName).toLowerCase();
|
|
12
355
|
const columns = [];
|
|
13
|
-
const
|
|
14
|
-
|
|
15
|
-
const trimmed =
|
|
16
|
-
if (!trimmed
|
|
356
|
+
for (const rawPart of splitTopLevel(block.body)) {
|
|
357
|
+
// Collapse newlines so a multi-line column definition reads as one unit.
|
|
358
|
+
const trimmed = rawPart.replace(/\s+/g, ' ').trim();
|
|
359
|
+
if (!trimmed)
|
|
360
|
+
continue;
|
|
361
|
+
const upper = trimmed.toUpperCase();
|
|
362
|
+
if (upper.startsWith('CONSTRAINT') ||
|
|
363
|
+
upper.startsWith('PRIMARY KEY') ||
|
|
364
|
+
upper.startsWith('FOREIGN KEY') ||
|
|
365
|
+
upper.startsWith('UNIQUE') ||
|
|
366
|
+
upper.startsWith('CHECK') ||
|
|
367
|
+
upper.startsWith('EXCLUDE')) {
|
|
17
368
|
continue;
|
|
18
|
-
|
|
19
|
-
|
|
369
|
+
}
|
|
370
|
+
// A quoted name may contain spaces ("user data"), so the definition is
|
|
371
|
+
// tokenised with quote awareness instead of split(/\s+/).
|
|
372
|
+
const parsed = splitColumnDef(trimmed);
|
|
373
|
+
if (!parsed)
|
|
20
374
|
continue;
|
|
21
|
-
const colName =
|
|
22
|
-
const rawType =
|
|
375
|
+
const colName = unquoteIdent(parsed.name);
|
|
376
|
+
const rawType = parsed.type.toUpperCase();
|
|
23
377
|
const maxLengthMatch = rawType.match(/VARCHAR\s*\(\s*(\d+)\s*\)/i);
|
|
24
378
|
const maxLength = maxLengthMatch ? parseInt(maxLengthMatch[1], 10) : null;
|
|
25
|
-
|
|
26
|
-
|
|
379
|
+
// Type inference is ordered, and each test is deliberately narrow.
|
|
380
|
+
//
|
|
381
|
+
// Word boundaries alone are not enough: BIGSERIAL must normalise to
|
|
382
|
+
// 'integer' even though SERIAL is mid-word, while CITEXT must NOT
|
|
383
|
+
// normalise to 'text' for the same reason. So the integer test uses
|
|
384
|
+
// explicit alternatives, and the time test runs first because
|
|
385
|
+
// TIMESTAMPTZ contains TIMESTAMP, which contains DATE.
|
|
386
|
+
//
|
|
387
|
+
// Time types are returned raw on purpose. A timestamp is not a date, and
|
|
388
|
+
// the `date-iso` catalog type matches only `data_type = 'date'`, so
|
|
389
|
+
// reporting 'date' for a timestamp column would attach a date-only
|
|
390
|
+
// validation regex to it. Types with no catalog equivalent (TIMESTAMPTZ,
|
|
391
|
+
// CITEXT) also fall through, which is more honest than mislabelling them.
|
|
392
|
+
// No leading \b on SERIAL: in BIGSERIAL / SMALLSERIAL it is mid-word, and
|
|
393
|
+
// a boundary there would miss the most common auto-increment spelling.
|
|
394
|
+
const isIntegerType = /\b(?:TINYINT|SMALLINT|MEDIUMINT|INTEGER|INT|BIGINT)\b|SERIAL/.test(rawType);
|
|
395
|
+
const isTimeType = /\b(?:TIMESTAMPTZ|TIMESTAMP|TIME)\b/.test(rawType);
|
|
396
|
+
const dataType = maxLengthMatch
|
|
397
|
+
? 'varchar'
|
|
398
|
+
: isTimeType
|
|
399
|
+
? rawType
|
|
400
|
+
: isIntegerType
|
|
401
|
+
? 'integer'
|
|
402
|
+
: /\bDATE\b/.test(rawType)
|
|
403
|
+
? 'date'
|
|
404
|
+
: /\bBOOL/.test(rawType)
|
|
405
|
+
? 'boolean'
|
|
406
|
+
: /\bUUID\b/.test(rawType)
|
|
407
|
+
? 'uuid'
|
|
408
|
+
: /\bJSON/.test(rawType)
|
|
409
|
+
? 'json'
|
|
410
|
+
: /\bTEXT\b/.test(rawType)
|
|
411
|
+
? 'text'
|
|
412
|
+
: rawType;
|
|
413
|
+
const originalRest = parsed.rest;
|
|
27
414
|
const rest = originalRest.toUpperCase();
|
|
28
|
-
const isNullable =
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
const
|
|
32
|
-
const
|
|
33
|
-
const
|
|
415
|
+
const isNullable = !/\bNOT\s+NULL\b/i.test(rest);
|
|
416
|
+
// Capture a balanced call such as DEFAULT NOW() rather than stopping at
|
|
417
|
+
// its first ')'.
|
|
418
|
+
const defaultValueMatch = /\bDEFAULT\s+('(?:[^']|'')*'|"(?:[^"]|"")*"|[A-Za-z_][\w$]*(?:\s*\([^)]*\))?|-?[\d.]+|true|false)/i.exec(originalRest);
|
|
419
|
+
const defaultValue = defaultValueMatch ? defaultValueMatch[1] : null;
|
|
420
|
+
const isPrimaryKey = /\bPRIMARY\s+KEY\b/i.test(rest);
|
|
421
|
+
const fkMatch = new RegExp(`REFERENCES\\s+(${QUALIFIED})\\s*\\(\\s*(${IDENT})\\s*\\)`, 'i').exec(trimmed);
|
|
422
|
+
const foreignKey = fkMatch
|
|
423
|
+
? { table: unquoteIdent(fkMatch[1]).toLowerCase(), column: unquoteIdent(fkMatch[2]).toLowerCase() }
|
|
424
|
+
: null;
|
|
34
425
|
columns.push({ columnName: colName, dataType, isNullable, maxLength, defaultValue, isPrimaryKey, foreignKey });
|
|
35
426
|
}
|
|
36
|
-
tables.push({ tableName, schema, columns });
|
|
427
|
+
tables.push({ tableName, schema: schema ?? 'public', columns });
|
|
37
428
|
}
|
|
38
429
|
return { tables };
|
|
39
430
|
}
|
package/dist/introspect.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"introspect.js","sourceRoot":"","sources":["../src/introspect.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"introspect.js","sourceRoot":"","sources":["../src/introspect.ts"],"names":[],"mappings":"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"}
|
package/dist/parse-yaml.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-yaml.d.ts","sourceRoot":"","sources":["../src/parse-yaml.ts"],"names":[],"mappings":"AAyDA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"parse-yaml.d.ts","sourceRoot":"","sources":["../src/parse-yaml.ts"],"names":[],"mappings":"AAyDA,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAoGtE"}
|
package/dist/parse-yaml.js
CHANGED
|
@@ -70,38 +70,54 @@ export function parseYaml(text) {
|
|
|
70
70
|
const path = [
|
|
71
71
|
{ indent: -1, obj: root },
|
|
72
72
|
];
|
|
73
|
-
|
|
74
|
-
|
|
73
|
+
// Stack of open block arrays. `indent` is the indentation shared by that
|
|
74
|
+
// array's `- ` items, or -1 until the first item is seen. A stack (rather
|
|
75
|
+
// than a single target) lets a block array nested inside an array item
|
|
76
|
+
// hand control back to the outer array when it ends.
|
|
77
|
+
const arrays = [];
|
|
75
78
|
for (let i = 0; i < lines.length; i++) {
|
|
76
79
|
const trimmed = lines[i].trim();
|
|
77
80
|
if (!trimmed || trimmed.startsWith('#'))
|
|
78
81
|
continue;
|
|
79
82
|
const indent = lines[i].length - lines[i].trimStart().length;
|
|
80
|
-
|
|
81
|
-
|
|
83
|
+
const isItem = trimmed.startsWith('- ');
|
|
84
|
+
// Leave every block array whose items sit deeper than this line. This
|
|
85
|
+
// runs for `- ` items too, so an item at the outer indent closes a
|
|
86
|
+
// deeper nested array first.
|
|
87
|
+
while (arrays.length > 0) {
|
|
88
|
+
const open = arrays[arrays.length - 1];
|
|
89
|
+
if (open.indent >= 0 && indent < open.indent)
|
|
90
|
+
arrays.pop();
|
|
91
|
+
else
|
|
92
|
+
break;
|
|
82
93
|
}
|
|
83
94
|
while (path.length > 1 && path[path.length - 1].indent >= indent) {
|
|
84
95
|
path.pop();
|
|
85
96
|
}
|
|
86
97
|
const current = path[path.length - 1];
|
|
87
|
-
if (
|
|
98
|
+
if (isItem) {
|
|
99
|
+
const open = arrays[arrays.length - 1];
|
|
100
|
+
if (open && open.indent === -1)
|
|
101
|
+
open.indent = indent;
|
|
102
|
+
// Only an item sharing the array's own indent belongs to it; deeper
|
|
103
|
+
// items belong to an array nested inside the current item.
|
|
104
|
+
const target = open && open.indent === indent ? open : undefined;
|
|
88
105
|
const itemRaw = trimmed.slice(2).trim();
|
|
89
106
|
const itemColon = itemRaw.indexOf(':');
|
|
90
107
|
if (itemColon !== -1 && itemColon < itemRaw.length - 1 && itemRaw[itemColon + 1] === ' ') {
|
|
91
108
|
const itemKey = itemRaw.slice(0, itemColon).trim();
|
|
92
109
|
const itemVal = itemRaw.slice(itemColon + 1).trim();
|
|
93
110
|
const itemObj = { [itemKey]: parseYamlValue(itemVal) };
|
|
94
|
-
if (
|
|
111
|
+
if (target) {
|
|
95
112
|
;
|
|
96
|
-
|
|
113
|
+
target.obj[target.key].push(itemObj);
|
|
97
114
|
}
|
|
98
115
|
path.push({ indent, obj: itemObj });
|
|
99
|
-
arrayTarget = null;
|
|
100
116
|
}
|
|
101
117
|
else {
|
|
102
|
-
if (
|
|
118
|
+
if (target) {
|
|
103
119
|
;
|
|
104
|
-
|
|
120
|
+
target.obj[target.key].push(parseYamlValue(itemRaw));
|
|
105
121
|
}
|
|
106
122
|
}
|
|
107
123
|
continue;
|
|
@@ -131,7 +147,7 @@ export function parseYaml(text) {
|
|
|
131
147
|
if (val === '') {
|
|
132
148
|
if (isNextLineArray(lines, i, indent)) {
|
|
133
149
|
current.obj[key] = [];
|
|
134
|
-
|
|
150
|
+
arrays.push({ obj: current.obj, key, indent: -1 });
|
|
135
151
|
}
|
|
136
152
|
else {
|
|
137
153
|
const nested = {};
|
package/dist/parse-yaml.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parse-yaml.js","sourceRoot":"","sources":["../src/parse-yaml.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"parse-yaml.js","sourceRoot":"","sources":["../src/parse-yaml.ts"],"names":[],"mappings":"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"}
|
package/dist/sanitize.d.ts
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
declare const NORMALIZE_FORMS: readonly ["NFC", "NFD", "NFKC", "NFKD"];
|
|
2
|
+
export type NormalizeForm = (typeof NORMALIZE_FORMS)[number];
|
|
3
|
+
/**
|
|
4
|
+
* Apply a Unicode normalization form. Falls back to NFKC for an unknown form
|
|
5
|
+
* instead of letting `String.prototype.normalize` throw a RangeError, since the
|
|
6
|
+
* form usually originates in free-form catalog or config text.
|
|
7
|
+
*/
|
|
1
8
|
export declare function normalize(str: string, form?: string): string;
|
|
2
9
|
export declare function stripDirectionOverrides(str: string): string;
|
|
3
10
|
export declare function stripZeroWidth(str: string): string;
|
|
@@ -8,8 +15,25 @@ export declare function lowercase(str: string): string;
|
|
|
8
15
|
export declare function stripNonDigits(str: string): string;
|
|
9
16
|
export declare function collapseWhitespace(str: string): string;
|
|
10
17
|
export declare function htmlEscape(str: string): string;
|
|
18
|
+
/**
|
|
19
|
+
* Slice without leaving a dangling surrogate half.
|
|
20
|
+
*
|
|
21
|
+
* `String.prototype.slice` counts UTF-16 code units, so cutting at `maxLength`
|
|
22
|
+
* can split an astral character (emoji, many CJK glyphs) and leave a lone
|
|
23
|
+
* surrogate, which is malformed Unicode. Non-finite or non-integer bounds are
|
|
24
|
+
* rejected rather than silently producing '' (NaN) or a reversed range.
|
|
25
|
+
*/
|
|
11
26
|
export declare function slice(str: string, start: number, end?: number): string;
|
|
12
27
|
export declare function sanitize(value: string, steps: string[]): string;
|
|
13
28
|
export declare function sanitizeInput(value: string, maxLength?: number | null): string;
|
|
29
|
+
/**
|
|
30
|
+
* Escape generated output for safe HTML insertion.
|
|
31
|
+
*
|
|
32
|
+
* `richText` is a promise that the value is already safe HTML, which nothing in
|
|
33
|
+
* this package can enforce. Treating it as a bypass made it a fail-open XSS
|
|
34
|
+
* hole for any caller passing untrusted text, so rich text is instead filtered
|
|
35
|
+
* against a tag/attribute allowlist.
|
|
36
|
+
*/
|
|
14
37
|
export declare function sanitizeOutput(value: string, richText?: boolean): string;
|
|
38
|
+
export {};
|
|
15
39
|
//# sourceMappingURL=sanitize.d.ts.map
|
package/dist/sanitize.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../src/sanitize.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"sanitize.d.ts","sourceRoot":"","sources":["../src/sanitize.ts"],"names":[],"mappings":"AAoBA,QAAA,MAAM,eAAe,yCAA0C,CAAA;AAC/D,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,eAAe,CAAC,CAAC,MAAM,CAAC,CAAA;AAM5D;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,GAAE,MAAe,GAAG,MAAM,CASpE;AAED,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEhD;AAED,wBAAgB,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAExC;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE7C;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEtD;AAED,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAE9C;AAED;;;;;;;GAOG;AACH,wBAAgB,KAAK,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,MAAM,CAatE;AA4CD,wBAAgB,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,CAe/D;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,MAAM,CAW9E;AAkGD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAE,OAAe,GAAG,MAAM,CAK/E"}
|