@oliasoft-open-source/node-json-migrator 3.0.0-beta-10 → 3.1.0-beta-1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/index.cjs +240 -237
- package/dist/index.d.cts +6 -0
- package/dist/index.d.mts +6 -0
- package/dist/index.mjs +241 -238
- package/package.json +13 -13
package/dist/index.cjs
CHANGED
|
@@ -825,10 +825,6 @@ var isArguments = baseIsArguments(/* @__PURE__ */ function() {
|
|
|
825
825
|
return isObjectLike(value) && hasOwnProperty$8.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
|
|
826
826
|
};
|
|
827
827
|
|
|
828
|
-
function getDefaultExportFromCjs (x) {
|
|
829
|
-
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
|
|
830
|
-
}
|
|
831
|
-
|
|
832
828
|
function stubFalse() {
|
|
833
829
|
return false;
|
|
834
830
|
}
|
|
@@ -2345,221 +2341,213 @@ const LoaderModule = { loadModuleFromString };
|
|
|
2345
2341
|
|
|
2346
2342
|
const hash = (string) => crypto.createHash("sha256").update(string).digest("hex");
|
|
2347
2343
|
|
|
2348
|
-
|
|
2349
|
-
|
|
2350
|
-
|
|
2351
|
-
|
|
2352
|
-
|
|
2353
|
-
|
|
2354
|
-
|
|
2355
|
-
|
|
2356
|
-
|
|
2357
|
-
|
|
2358
|
-
|
|
2359
|
-
|
|
2360
|
-
|
|
2361
|
-
|
|
2362
|
-
|
|
2363
|
-
|
|
2364
|
-
|
|
2365
|
-
|
|
2366
|
-
|
|
2367
|
-
|
|
2368
|
-
|
|
2369
|
-
|
|
2370
|
-
|
|
2371
|
-
|
|
2372
|
-
|
|
2373
|
-
|
|
2374
|
-
|
|
2375
|
-
|
|
2376
|
-
|
|
2377
|
-
|
|
2378
|
-
|
|
2379
|
-
|
|
2380
|
-
|
|
2381
|
-
|
|
2382
|
-
|
|
2383
|
-
|
|
2384
|
-
|
|
2385
|
-
|
|
2386
|
-
|
|
2387
|
-
|
|
2388
|
-
|
|
2389
|
-
|
|
2390
|
-
|
|
2391
|
-
|
|
2392
|
-
|
|
2393
|
-
|
|
2394
|
-
|
|
2395
|
-
|
|
2396
|
-
|
|
2397
|
-
|
|
2398
|
-
|
|
2399
|
-
if (begs.length) {
|
|
2400
|
-
result = [left, right];
|
|
2401
|
-
}
|
|
2402
|
-
}
|
|
2403
|
-
return result;
|
|
2404
|
-
}
|
|
2405
|
-
return balancedMatch;
|
|
2406
|
-
}
|
|
2407
|
-
|
|
2408
|
-
var braceExpansion;
|
|
2409
|
-
var hasRequiredBraceExpansion;
|
|
2410
|
-
|
|
2411
|
-
function requireBraceExpansion () {
|
|
2412
|
-
if (hasRequiredBraceExpansion) return braceExpansion;
|
|
2413
|
-
hasRequiredBraceExpansion = 1;
|
|
2414
|
-
var balanced = requireBalancedMatch();
|
|
2415
|
-
braceExpansion = expandTop;
|
|
2416
|
-
var escSlash = "\0SLASH" + Math.random() + "\0";
|
|
2417
|
-
var escOpen = "\0OPEN" + Math.random() + "\0";
|
|
2418
|
-
var escClose = "\0CLOSE" + Math.random() + "\0";
|
|
2419
|
-
var escComma = "\0COMMA" + Math.random() + "\0";
|
|
2420
|
-
var escPeriod = "\0PERIOD" + Math.random() + "\0";
|
|
2421
|
-
function numeric(str) {
|
|
2422
|
-
return parseInt(str, 10) == str ? parseInt(str, 10) : str.charCodeAt(0);
|
|
2423
|
-
}
|
|
2424
|
-
function escapeBraces(str) {
|
|
2425
|
-
return str.split("\\\\").join(escSlash).split("\\{").join(escOpen).split("\\}").join(escClose).split("\\,").join(escComma).split("\\.").join(escPeriod);
|
|
2426
|
-
}
|
|
2427
|
-
function unescapeBraces(str) {
|
|
2428
|
-
return str.split(escSlash).join("\\").split(escOpen).join("{").split(escClose).join("}").split(escComma).join(",").split(escPeriod).join(".");
|
|
2429
|
-
}
|
|
2430
|
-
function parseCommaParts(str) {
|
|
2431
|
-
if (!str)
|
|
2432
|
-
return [""];
|
|
2433
|
-
var parts = [];
|
|
2434
|
-
var m = balanced("{", "}", str);
|
|
2435
|
-
if (!m)
|
|
2436
|
-
return str.split(",");
|
|
2437
|
-
var pre = m.pre;
|
|
2438
|
-
var body = m.body;
|
|
2439
|
-
var post = m.post;
|
|
2440
|
-
var p = pre.split(",");
|
|
2441
|
-
p[p.length - 1] += "{" + body + "}";
|
|
2442
|
-
var postParts = parseCommaParts(post);
|
|
2443
|
-
if (post.length) {
|
|
2444
|
-
p[p.length - 1] += postParts.shift();
|
|
2445
|
-
p.push.apply(p, postParts);
|
|
2446
|
-
}
|
|
2447
|
-
parts.push.apply(parts, p);
|
|
2448
|
-
return parts;
|
|
2449
|
-
}
|
|
2450
|
-
function expandTop(str) {
|
|
2451
|
-
if (!str)
|
|
2452
|
-
return [];
|
|
2453
|
-
if (str.substr(0, 2) === "{}") {
|
|
2454
|
-
str = "\\{\\}" + str.substr(2);
|
|
2455
|
-
}
|
|
2456
|
-
return expand(escapeBraces(str), true).map(unescapeBraces);
|
|
2457
|
-
}
|
|
2458
|
-
function embrace(str) {
|
|
2459
|
-
return "{" + str + "}";
|
|
2460
|
-
}
|
|
2461
|
-
function isPadded(el) {
|
|
2462
|
-
return /^-?0\d/.test(el);
|
|
2463
|
-
}
|
|
2464
|
-
function lte(i, y) {
|
|
2465
|
-
return i <= y;
|
|
2466
|
-
}
|
|
2467
|
-
function gte(i, y) {
|
|
2468
|
-
return i >= y;
|
|
2469
|
-
}
|
|
2470
|
-
function expand(str, isTop) {
|
|
2471
|
-
var expansions = [];
|
|
2472
|
-
var m = balanced("{", "}", str);
|
|
2473
|
-
if (!m) return [str];
|
|
2474
|
-
var pre = m.pre;
|
|
2475
|
-
var post = m.post.length ? expand(m.post, false) : [""];
|
|
2476
|
-
if (/\$$/.test(m.pre)) {
|
|
2477
|
-
for (var k = 0; k < post.length; k++) {
|
|
2478
|
-
var expansion = pre + "{" + m.body + "}" + post[k];
|
|
2479
|
-
expansions.push(expansion);
|
|
2480
|
-
}
|
|
2481
|
-
} else {
|
|
2482
|
-
var isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
|
|
2483
|
-
var isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
|
|
2484
|
-
var isSequence = isNumericSequence || isAlphaSequence;
|
|
2485
|
-
var isOptions = m.body.indexOf(",") >= 0;
|
|
2486
|
-
if (!isSequence && !isOptions) {
|
|
2487
|
-
if (m.post.match(/,.*\}/)) {
|
|
2488
|
-
str = m.pre + "{" + m.body + escClose + m.post;
|
|
2489
|
-
return expand(str);
|
|
2490
|
-
}
|
|
2491
|
-
return [str];
|
|
2492
|
-
}
|
|
2493
|
-
var n;
|
|
2494
|
-
if (isSequence) {
|
|
2495
|
-
n = m.body.split(/\.\./);
|
|
2496
|
-
} else {
|
|
2497
|
-
n = parseCommaParts(m.body);
|
|
2498
|
-
if (n.length === 1) {
|
|
2499
|
-
n = expand(n[0], false).map(embrace);
|
|
2500
|
-
if (n.length === 1) {
|
|
2501
|
-
return post.map(function(p) {
|
|
2502
|
-
return m.pre + n[0] + p;
|
|
2503
|
-
});
|
|
2504
|
-
}
|
|
2505
|
-
}
|
|
2506
|
-
}
|
|
2507
|
-
var N;
|
|
2508
|
-
if (isSequence) {
|
|
2509
|
-
var x = numeric(n[0]);
|
|
2510
|
-
var y = numeric(n[1]);
|
|
2511
|
-
var width = Math.max(n[0].length, n[1].length);
|
|
2512
|
-
var incr = n.length == 3 ? Math.abs(numeric(n[2])) : 1;
|
|
2513
|
-
var test = lte;
|
|
2514
|
-
var reverse = y < x;
|
|
2515
|
-
if (reverse) {
|
|
2516
|
-
incr *= -1;
|
|
2517
|
-
test = gte;
|
|
2518
|
-
}
|
|
2519
|
-
var pad = n.some(isPadded);
|
|
2520
|
-
N = [];
|
|
2521
|
-
for (var i = x; test(i, y); i += incr) {
|
|
2522
|
-
var c;
|
|
2523
|
-
if (isAlphaSequence) {
|
|
2524
|
-
c = String.fromCharCode(i);
|
|
2525
|
-
if (c === "\\")
|
|
2526
|
-
c = "";
|
|
2527
|
-
} else {
|
|
2528
|
-
c = String(i);
|
|
2529
|
-
if (pad) {
|
|
2530
|
-
var need = width - c.length;
|
|
2531
|
-
if (need > 0) {
|
|
2532
|
-
var z = new Array(need + 1).join("0");
|
|
2533
|
-
if (i < 0)
|
|
2534
|
-
c = "-" + z + c.slice(1);
|
|
2535
|
-
else
|
|
2536
|
-
c = z + c;
|
|
2537
|
-
}
|
|
2538
|
-
}
|
|
2539
|
-
}
|
|
2540
|
-
N.push(c);
|
|
2541
|
-
}
|
|
2542
|
-
} else {
|
|
2543
|
-
N = [];
|
|
2544
|
-
for (var j = 0; j < n.length; j++) {
|
|
2545
|
-
N.push.apply(N, expand(n[j], false));
|
|
2546
|
-
}
|
|
2547
|
-
}
|
|
2548
|
-
for (var j = 0; j < N.length; j++) {
|
|
2549
|
-
for (var k = 0; k < post.length; k++) {
|
|
2550
|
-
var expansion = pre + N[j] + post[k];
|
|
2551
|
-
if (!isTop || isSequence || expansion)
|
|
2552
|
-
expansions.push(expansion);
|
|
2553
|
-
}
|
|
2554
|
-
}
|
|
2555
|
-
}
|
|
2556
|
-
return expansions;
|
|
2557
|
-
}
|
|
2558
|
-
return braceExpansion;
|
|
2559
|
-
}
|
|
2344
|
+
const balanced = (a, b, str) => {
|
|
2345
|
+
const ma = a instanceof RegExp ? maybeMatch(a, str) : a;
|
|
2346
|
+
const mb = b instanceof RegExp ? maybeMatch(b, str) : b;
|
|
2347
|
+
const r = ma !== null && mb != null && range(ma, mb, str);
|
|
2348
|
+
return r && {
|
|
2349
|
+
start: r[0],
|
|
2350
|
+
end: r[1],
|
|
2351
|
+
pre: str.slice(0, r[0]),
|
|
2352
|
+
body: str.slice(r[0] + ma.length, r[1]),
|
|
2353
|
+
post: str.slice(r[1] + mb.length)
|
|
2354
|
+
};
|
|
2355
|
+
};
|
|
2356
|
+
const maybeMatch = (reg, str) => {
|
|
2357
|
+
const m = str.match(reg);
|
|
2358
|
+
return m ? m[0] : null;
|
|
2359
|
+
};
|
|
2360
|
+
const range = (a, b, str) => {
|
|
2361
|
+
let begs, beg, left, right = void 0, result;
|
|
2362
|
+
let ai = str.indexOf(a);
|
|
2363
|
+
let bi = str.indexOf(b, ai + 1);
|
|
2364
|
+
let i = ai;
|
|
2365
|
+
if (ai >= 0 && bi > 0) {
|
|
2366
|
+
if (a === b) {
|
|
2367
|
+
return [ai, bi];
|
|
2368
|
+
}
|
|
2369
|
+
begs = [];
|
|
2370
|
+
left = str.length;
|
|
2371
|
+
while (i >= 0 && !result) {
|
|
2372
|
+
if (i === ai) {
|
|
2373
|
+
begs.push(i);
|
|
2374
|
+
ai = str.indexOf(a, i + 1);
|
|
2375
|
+
} else if (begs.length === 1) {
|
|
2376
|
+
const r = begs.pop();
|
|
2377
|
+
if (r !== void 0)
|
|
2378
|
+
result = [r, bi];
|
|
2379
|
+
} else {
|
|
2380
|
+
beg = begs.pop();
|
|
2381
|
+
if (beg !== void 0 && beg < left) {
|
|
2382
|
+
left = beg;
|
|
2383
|
+
right = bi;
|
|
2384
|
+
}
|
|
2385
|
+
bi = str.indexOf(b, i + 1);
|
|
2386
|
+
}
|
|
2387
|
+
i = ai < bi && ai >= 0 ? ai : bi;
|
|
2388
|
+
}
|
|
2389
|
+
if (begs.length && right !== void 0) {
|
|
2390
|
+
result = [left, right];
|
|
2391
|
+
}
|
|
2392
|
+
}
|
|
2393
|
+
return result;
|
|
2394
|
+
};
|
|
2560
2395
|
|
|
2561
|
-
|
|
2562
|
-
|
|
2396
|
+
const escSlash = "\0SLASH" + Math.random() + "\0";
|
|
2397
|
+
const escOpen = "\0OPEN" + Math.random() + "\0";
|
|
2398
|
+
const escClose = "\0CLOSE" + Math.random() + "\0";
|
|
2399
|
+
const escComma = "\0COMMA" + Math.random() + "\0";
|
|
2400
|
+
const escPeriod = "\0PERIOD" + Math.random() + "\0";
|
|
2401
|
+
const escSlashPattern = new RegExp(escSlash, "g");
|
|
2402
|
+
const escOpenPattern = new RegExp(escOpen, "g");
|
|
2403
|
+
const escClosePattern = new RegExp(escClose, "g");
|
|
2404
|
+
const escCommaPattern = new RegExp(escComma, "g");
|
|
2405
|
+
const escPeriodPattern = new RegExp(escPeriod, "g");
|
|
2406
|
+
const slashPattern = /\\\\/g;
|
|
2407
|
+
const openPattern = /\\{/g;
|
|
2408
|
+
const closePattern = /\\}/g;
|
|
2409
|
+
const commaPattern = /\\,/g;
|
|
2410
|
+
const periodPattern = /\\./g;
|
|
2411
|
+
function numeric(str) {
|
|
2412
|
+
return !isNaN(str) ? parseInt(str, 10) : str.charCodeAt(0);
|
|
2413
|
+
}
|
|
2414
|
+
function escapeBraces(str) {
|
|
2415
|
+
return str.replace(slashPattern, escSlash).replace(openPattern, escOpen).replace(closePattern, escClose).replace(commaPattern, escComma).replace(periodPattern, escPeriod);
|
|
2416
|
+
}
|
|
2417
|
+
function unescapeBraces(str) {
|
|
2418
|
+
return str.replace(escSlashPattern, "\\").replace(escOpenPattern, "{").replace(escClosePattern, "}").replace(escCommaPattern, ",").replace(escPeriodPattern, ".");
|
|
2419
|
+
}
|
|
2420
|
+
function parseCommaParts(str) {
|
|
2421
|
+
if (!str) {
|
|
2422
|
+
return [""];
|
|
2423
|
+
}
|
|
2424
|
+
const parts = [];
|
|
2425
|
+
const m = balanced("{", "}", str);
|
|
2426
|
+
if (!m) {
|
|
2427
|
+
return str.split(",");
|
|
2428
|
+
}
|
|
2429
|
+
const { pre, body, post } = m;
|
|
2430
|
+
const p = pre.split(",");
|
|
2431
|
+
p[p.length - 1] += "{" + body + "}";
|
|
2432
|
+
const postParts = parseCommaParts(post);
|
|
2433
|
+
if (post.length) {
|
|
2434
|
+
p[p.length - 1] += postParts.shift();
|
|
2435
|
+
p.push.apply(p, postParts);
|
|
2436
|
+
}
|
|
2437
|
+
parts.push.apply(parts, p);
|
|
2438
|
+
return parts;
|
|
2439
|
+
}
|
|
2440
|
+
function expand(str) {
|
|
2441
|
+
if (!str) {
|
|
2442
|
+
return [];
|
|
2443
|
+
}
|
|
2444
|
+
if (str.slice(0, 2) === "{}") {
|
|
2445
|
+
str = "\\{\\}" + str.slice(2);
|
|
2446
|
+
}
|
|
2447
|
+
return expand_(escapeBraces(str), true).map(unescapeBraces);
|
|
2448
|
+
}
|
|
2449
|
+
function embrace(str) {
|
|
2450
|
+
return "{" + str + "}";
|
|
2451
|
+
}
|
|
2452
|
+
function isPadded(el) {
|
|
2453
|
+
return /^-?0\d/.test(el);
|
|
2454
|
+
}
|
|
2455
|
+
function lte(i, y) {
|
|
2456
|
+
return i <= y;
|
|
2457
|
+
}
|
|
2458
|
+
function gte(i, y) {
|
|
2459
|
+
return i >= y;
|
|
2460
|
+
}
|
|
2461
|
+
function expand_(str, isTop) {
|
|
2462
|
+
const expansions = [];
|
|
2463
|
+
const m = balanced("{", "}", str);
|
|
2464
|
+
if (!m)
|
|
2465
|
+
return [str];
|
|
2466
|
+
const pre = m.pre;
|
|
2467
|
+
const post = m.post.length ? expand_(m.post, false) : [""];
|
|
2468
|
+
if (/\$$/.test(m.pre)) {
|
|
2469
|
+
for (let k = 0; k < post.length; k++) {
|
|
2470
|
+
const expansion = pre + "{" + m.body + "}" + post[k];
|
|
2471
|
+
expansions.push(expansion);
|
|
2472
|
+
}
|
|
2473
|
+
} else {
|
|
2474
|
+
const isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
|
|
2475
|
+
const isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
|
|
2476
|
+
const isSequence = isNumericSequence || isAlphaSequence;
|
|
2477
|
+
const isOptions = m.body.indexOf(",") >= 0;
|
|
2478
|
+
if (!isSequence && !isOptions) {
|
|
2479
|
+
if (m.post.match(/,(?!,).*\}/)) {
|
|
2480
|
+
str = m.pre + "{" + m.body + escClose + m.post;
|
|
2481
|
+
return expand_(str);
|
|
2482
|
+
}
|
|
2483
|
+
return [str];
|
|
2484
|
+
}
|
|
2485
|
+
let n;
|
|
2486
|
+
if (isSequence) {
|
|
2487
|
+
n = m.body.split(/\.\./);
|
|
2488
|
+
} else {
|
|
2489
|
+
n = parseCommaParts(m.body);
|
|
2490
|
+
if (n.length === 1 && n[0] !== void 0) {
|
|
2491
|
+
n = expand_(n[0], false).map(embrace);
|
|
2492
|
+
if (n.length === 1) {
|
|
2493
|
+
return post.map((p) => m.pre + n[0] + p);
|
|
2494
|
+
}
|
|
2495
|
+
}
|
|
2496
|
+
}
|
|
2497
|
+
let N;
|
|
2498
|
+
if (isSequence && n[0] !== void 0 && n[1] !== void 0) {
|
|
2499
|
+
const x = numeric(n[0]);
|
|
2500
|
+
const y = numeric(n[1]);
|
|
2501
|
+
const width = Math.max(n[0].length, n[1].length);
|
|
2502
|
+
let incr = n.length === 3 && n[2] !== void 0 ? Math.abs(numeric(n[2])) : 1;
|
|
2503
|
+
let test = lte;
|
|
2504
|
+
const reverse = y < x;
|
|
2505
|
+
if (reverse) {
|
|
2506
|
+
incr *= -1;
|
|
2507
|
+
test = gte;
|
|
2508
|
+
}
|
|
2509
|
+
const pad = n.some(isPadded);
|
|
2510
|
+
N = [];
|
|
2511
|
+
for (let i = x; test(i, y); i += incr) {
|
|
2512
|
+
let c;
|
|
2513
|
+
if (isAlphaSequence) {
|
|
2514
|
+
c = String.fromCharCode(i);
|
|
2515
|
+
if (c === "\\") {
|
|
2516
|
+
c = "";
|
|
2517
|
+
}
|
|
2518
|
+
} else {
|
|
2519
|
+
c = String(i);
|
|
2520
|
+
if (pad) {
|
|
2521
|
+
const need = width - c.length;
|
|
2522
|
+
if (need > 0) {
|
|
2523
|
+
const z = new Array(need + 1).join("0");
|
|
2524
|
+
if (i < 0) {
|
|
2525
|
+
c = "-" + z + c.slice(1);
|
|
2526
|
+
} else {
|
|
2527
|
+
c = z + c;
|
|
2528
|
+
}
|
|
2529
|
+
}
|
|
2530
|
+
}
|
|
2531
|
+
}
|
|
2532
|
+
N.push(c);
|
|
2533
|
+
}
|
|
2534
|
+
} else {
|
|
2535
|
+
N = [];
|
|
2536
|
+
for (let j = 0; j < n.length; j++) {
|
|
2537
|
+
N.push.apply(N, expand_(n[j], false));
|
|
2538
|
+
}
|
|
2539
|
+
}
|
|
2540
|
+
for (let j = 0; j < N.length; j++) {
|
|
2541
|
+
for (let k = 0; k < post.length; k++) {
|
|
2542
|
+
const expansion = pre + N[j] + post[k];
|
|
2543
|
+
if (!isTop || isSequence || expansion) {
|
|
2544
|
+
expansions.push(expansion);
|
|
2545
|
+
}
|
|
2546
|
+
}
|
|
2547
|
+
}
|
|
2548
|
+
}
|
|
2549
|
+
return expansions;
|
|
2550
|
+
}
|
|
2563
2551
|
|
|
2564
2552
|
const MAX_PATTERN_LENGTH = 1024 * 64;
|
|
2565
2553
|
const assertValidPattern = (pattern) => {
|
|
@@ -3079,7 +3067,7 @@ class AST {
|
|
|
3079
3067
|
this.#hasMagic = void 0;
|
|
3080
3068
|
return [s, unescape(this.toString()), false, false];
|
|
3081
3069
|
}
|
|
3082
|
-
let bodyDotAllowed = !repeated || allowDot || dot ||
|
|
3070
|
+
let bodyDotAllowed = !repeated || allowDot || dot || !startNoDot ? "" : this.#partsToRegExp(true);
|
|
3083
3071
|
if (bodyDotAllowed === body) {
|
|
3084
3072
|
bodyDotAllowed = "";
|
|
3085
3073
|
}
|
|
@@ -6157,7 +6145,7 @@ const IFREG = 8;
|
|
|
6157
6145
|
const IFLNK = 10;
|
|
6158
6146
|
const IFSOCK = 12;
|
|
6159
6147
|
const IFMT = 15;
|
|
6160
|
-
const IFMT_UNKNOWN =
|
|
6148
|
+
const IFMT_UNKNOWN = ~IFMT;
|
|
6161
6149
|
const READDIR_CALLED = 16;
|
|
6162
6150
|
const LSTAT_CALLED = 32;
|
|
6163
6151
|
const ENOTDIR = 64;
|
|
@@ -6419,7 +6407,7 @@ class PathBase {
|
|
|
6419
6407
|
}
|
|
6420
6408
|
const children = Object.assign([], { provisional: 0 });
|
|
6421
6409
|
this.#children.set(this, children);
|
|
6422
|
-
this.#type &=
|
|
6410
|
+
this.#type &= ~READDIR_CALLED;
|
|
6423
6411
|
return children;
|
|
6424
6412
|
}
|
|
6425
6413
|
/**
|
|
@@ -8941,14 +8929,15 @@ const migrationTablesExist = (db, entity) => {
|
|
|
8941
8929
|
SELECT EXISTS (
|
|
8942
8930
|
SELECT FROM information_schema.tables
|
|
8943
8931
|
WHERE table_schema = 'public'
|
|
8944
|
-
AND table_name =
|
|
8932
|
+
AND table_name = $(tableName)
|
|
8945
8933
|
)
|
|
8946
8934
|
`;
|
|
8947
|
-
|
|
8935
|
+
const params = { tableName: `${entity}_migrations` };
|
|
8936
|
+
return db.one(query, params);
|
|
8948
8937
|
};
|
|
8949
8938
|
const createMigrationsTables = (db, entity) => {
|
|
8950
8939
|
const query = `
|
|
8951
|
-
CREATE TABLE IF NOT EXISTS $
|
|
8940
|
+
CREATE TABLE IF NOT EXISTS $(migrationsTable:name) (
|
|
8952
8941
|
file_hash TEXT NOT NULL PRIMARY KEY,
|
|
8953
8942
|
file_name TEXT NOT NULL,
|
|
8954
8943
|
sequence TEXT NOT NULL,
|
|
@@ -8956,20 +8945,26 @@ const createMigrationsTables = (db, entity) => {
|
|
|
8956
8945
|
UNIQUE (file_name),
|
|
8957
8946
|
UNIQUE (sequence)
|
|
8958
8947
|
);
|
|
8959
|
-
CREATE TABLE IF NOT EXISTS $
|
|
8948
|
+
CREATE TABLE IF NOT EXISTS $(versionsTable:name) (
|
|
8960
8949
|
version TEXT NOT NULL PRIMARY KEY,
|
|
8961
8950
|
plan TEXT NOT NULL,
|
|
8962
8951
|
created_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
|
8963
8952
|
);
|
|
8964
8953
|
`;
|
|
8965
|
-
|
|
8954
|
+
const params = {
|
|
8955
|
+
migrationsTable: `${entity}_migrations`,
|
|
8956
|
+
versionsTable: `${entity}_versions`
|
|
8957
|
+
};
|
|
8958
|
+
return db.none(query, params);
|
|
8966
8959
|
};
|
|
8967
8960
|
const getMigrationRecords = (db, entity) => {
|
|
8968
8961
|
const query = `
|
|
8969
|
-
SELECT file_hash, file_name, sequence
|
|
8962
|
+
SELECT file_hash, file_name, sequence
|
|
8963
|
+
FROM $(migrationsTable:name)
|
|
8970
8964
|
ORDER BY sequence
|
|
8971
8965
|
`;
|
|
8972
|
-
|
|
8966
|
+
const params = { migrationsTable: `${entity}_migrations` };
|
|
8967
|
+
return db.manyOrNone(query, params).then(
|
|
8973
8968
|
(data) => data.map((r) => ({
|
|
8974
8969
|
fileHash: r.file_hash,
|
|
8975
8970
|
fileName: r.file_name,
|
|
@@ -8987,7 +8982,7 @@ const insertMigrationsRecords = (db, pgpHelpers, entity, migrations) => {
|
|
|
8987
8982
|
const cs = new pgpHelpers.ColumnSet(
|
|
8988
8983
|
["file_name", "file_hash", "sequence"],
|
|
8989
8984
|
{
|
|
8990
|
-
table: `${entity}_migrations`
|
|
8985
|
+
table: new pgpHelpers.TableName({ table: `${entity}_migrations` })
|
|
8991
8986
|
}
|
|
8992
8987
|
);
|
|
8993
8988
|
const onConflict = " ON CONFLICT(file_name) DO NOTHING";
|
|
@@ -8996,13 +8991,14 @@ const insertMigrationsRecords = (db, pgpHelpers, entity, migrations) => {
|
|
|
8996
8991
|
}
|
|
8997
8992
|
};
|
|
8998
8993
|
const replaceMigrationsRecords = async (db, pgpHelpers, entity, migrations) => {
|
|
8999
|
-
const
|
|
9000
|
-
|
|
8994
|
+
const query = `DELETE FROM $(migrationsTableName:name)`;
|
|
8995
|
+
const params = { migrationsTableName: `${entity}_migrations` };
|
|
8996
|
+
await db.none(query, params);
|
|
9001
8997
|
await insertMigrationsRecords(db, pgpHelpers, entity, migrations);
|
|
9002
8998
|
};
|
|
9003
8999
|
const insertVersions = (db, pgpHelpers, entity, records) => {
|
|
9004
9000
|
const cs = new pgpHelpers.ColumnSet(["version", "plan"], {
|
|
9005
|
-
table: `${entity}_versions`
|
|
9001
|
+
table: new pgpHelpers.TableName({ table: `${entity}_versions` })
|
|
9006
9002
|
});
|
|
9007
9003
|
const onConflict = " ON CONFLICT(version) DO NOTHING";
|
|
9008
9004
|
const query = pgpHelpers.insert(records, cs) + onConflict;
|
|
@@ -9010,19 +9006,26 @@ const insertVersions = (db, pgpHelpers, entity, records) => {
|
|
|
9010
9006
|
};
|
|
9011
9007
|
const getPlanFromVersion = (db, entity, version) => {
|
|
9012
9008
|
const query = `
|
|
9013
|
-
SELECT plan FROM $
|
|
9014
|
-
WHERE version=$
|
|
9009
|
+
SELECT plan FROM $(versionsTable:name)
|
|
9010
|
+
WHERE version=$(version);
|
|
9015
9011
|
`;
|
|
9016
|
-
|
|
9012
|
+
const params = {
|
|
9013
|
+
version,
|
|
9014
|
+
versionsTable: `${entity}_versions`
|
|
9015
|
+
};
|
|
9016
|
+
return db.oneOrNone(query, params, (r) => r?.plan || null);
|
|
9017
9017
|
};
|
|
9018
9018
|
const getVersions = async (db, entity) => {
|
|
9019
9019
|
const query = `
|
|
9020
9020
|
SELECT
|
|
9021
9021
|
version,
|
|
9022
9022
|
plan
|
|
9023
|
-
FROM $
|
|
9023
|
+
FROM $(versionsTable:name) ORDER BY created_on DESC
|
|
9024
9024
|
`;
|
|
9025
|
-
|
|
9025
|
+
const params = {
|
|
9026
|
+
versionsTable: `${entity}_versions`
|
|
9027
|
+
};
|
|
9028
|
+
return db.any(query, params);
|
|
9026
9029
|
};
|
|
9027
9030
|
|
|
9028
9031
|
let cachedPlannedVersion = null;
|
package/dist/index.d.cts
CHANGED
|
@@ -17,11 +17,17 @@ type TMigration = {
|
|
|
17
17
|
script?: string;
|
|
18
18
|
migrator?: (payload: unknown) => unknown;
|
|
19
19
|
};
|
|
20
|
+
type TEntityColumnNames = {
|
|
21
|
+
id: string;
|
|
22
|
+
created: string;
|
|
23
|
+
};
|
|
20
24
|
type TConfig = {
|
|
21
25
|
directory: string;
|
|
22
26
|
database?: IDatabase<unknown>;
|
|
23
27
|
pgpHelpers?: IHelpers;
|
|
24
28
|
entity?: string;
|
|
29
|
+
entityColumnNames: TEntityColumnNames;
|
|
30
|
+
entityIdColumnName?: string;
|
|
25
31
|
version?: string;
|
|
26
32
|
printPendingFileNames?: boolean;
|
|
27
33
|
force?: boolean;
|
package/dist/index.d.mts
CHANGED
|
@@ -17,11 +17,17 @@ type TMigration = {
|
|
|
17
17
|
script?: string;
|
|
18
18
|
migrator?: (payload: unknown) => unknown;
|
|
19
19
|
};
|
|
20
|
+
type TEntityColumnNames = {
|
|
21
|
+
id: string;
|
|
22
|
+
created: string;
|
|
23
|
+
};
|
|
20
24
|
type TConfig = {
|
|
21
25
|
directory: string;
|
|
22
26
|
database?: IDatabase<unknown>;
|
|
23
27
|
pgpHelpers?: IHelpers;
|
|
24
28
|
entity?: string;
|
|
29
|
+
entityColumnNames: TEntityColumnNames;
|
|
30
|
+
entityIdColumnName?: string;
|
|
25
31
|
version?: string;
|
|
26
32
|
printPendingFileNames?: boolean;
|
|
27
33
|
force?: boolean;
|
package/dist/index.mjs
CHANGED
|
@@ -804,10 +804,6 @@ var isArguments = baseIsArguments(/* @__PURE__ */ function() {
|
|
|
804
804
|
return isObjectLike(value) && hasOwnProperty$8.call(value, "callee") && !propertyIsEnumerable$1.call(value, "callee");
|
|
805
805
|
};
|
|
806
806
|
|
|
807
|
-
function getDefaultExportFromCjs (x) {
|
|
808
|
-
return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
|
|
809
|
-
}
|
|
810
|
-
|
|
811
807
|
function stubFalse() {
|
|
812
808
|
return false;
|
|
813
809
|
}
|
|
@@ -2324,221 +2320,213 @@ const LoaderModule = { loadModuleFromString };
|
|
|
2324
2320
|
|
|
2325
2321
|
const hash = (string) => createHash("sha256").update(string).digest("hex");
|
|
2326
2322
|
|
|
2327
|
-
|
|
2328
|
-
|
|
2329
|
-
|
|
2330
|
-
|
|
2331
|
-
|
|
2332
|
-
|
|
2333
|
-
|
|
2334
|
-
|
|
2335
|
-
|
|
2336
|
-
|
|
2337
|
-
|
|
2338
|
-
|
|
2339
|
-
|
|
2340
|
-
|
|
2341
|
-
|
|
2342
|
-
|
|
2343
|
-
|
|
2344
|
-
|
|
2345
|
-
|
|
2346
|
-
|
|
2347
|
-
|
|
2348
|
-
|
|
2349
|
-
|
|
2350
|
-
|
|
2351
|
-
|
|
2352
|
-
|
|
2353
|
-
|
|
2354
|
-
|
|
2355
|
-
|
|
2356
|
-
|
|
2357
|
-
|
|
2358
|
-
|
|
2359
|
-
|
|
2360
|
-
|
|
2361
|
-
|
|
2362
|
-
|
|
2363
|
-
|
|
2364
|
-
|
|
2365
|
-
|
|
2366
|
-
|
|
2367
|
-
|
|
2368
|
-
|
|
2369
|
-
|
|
2370
|
-
|
|
2371
|
-
|
|
2372
|
-
|
|
2373
|
-
|
|
2374
|
-
|
|
2375
|
-
|
|
2376
|
-
|
|
2377
|
-
|
|
2378
|
-
|
|
2379
|
-
|
|
2380
|
-
|
|
2381
|
-
|
|
2382
|
-
|
|
2383
|
-
|
|
2384
|
-
|
|
2385
|
-
|
|
2386
|
-
|
|
2387
|
-
|
|
2388
|
-
|
|
2389
|
-
|
|
2390
|
-
|
|
2391
|
-
|
|
2392
|
-
|
|
2393
|
-
|
|
2394
|
-
|
|
2395
|
-
|
|
2396
|
-
|
|
2397
|
-
|
|
2398
|
-
|
|
2399
|
-
|
|
2400
|
-
|
|
2401
|
-
|
|
2402
|
-
|
|
2403
|
-
|
|
2404
|
-
|
|
2405
|
-
|
|
2406
|
-
|
|
2407
|
-
|
|
2408
|
-
|
|
2409
|
-
|
|
2410
|
-
|
|
2411
|
-
|
|
2412
|
-
|
|
2413
|
-
|
|
2414
|
-
|
|
2415
|
-
|
|
2416
|
-
|
|
2417
|
-
|
|
2418
|
-
|
|
2419
|
-
|
|
2420
|
-
|
|
2421
|
-
|
|
2422
|
-
|
|
2423
|
-
|
|
2424
|
-
|
|
2425
|
-
|
|
2426
|
-
|
|
2427
|
-
|
|
2428
|
-
|
|
2429
|
-
|
|
2430
|
-
|
|
2431
|
-
|
|
2432
|
-
|
|
2433
|
-
|
|
2434
|
-
|
|
2435
|
-
|
|
2436
|
-
|
|
2437
|
-
|
|
2438
|
-
|
|
2439
|
-
|
|
2440
|
-
|
|
2441
|
-
|
|
2442
|
-
|
|
2443
|
-
|
|
2444
|
-
|
|
2445
|
-
|
|
2446
|
-
|
|
2447
|
-
|
|
2448
|
-
|
|
2449
|
-
|
|
2450
|
-
|
|
2451
|
-
|
|
2452
|
-
|
|
2453
|
-
|
|
2454
|
-
|
|
2455
|
-
|
|
2456
|
-
|
|
2457
|
-
|
|
2458
|
-
|
|
2459
|
-
|
|
2460
|
-
|
|
2461
|
-
|
|
2462
|
-
|
|
2463
|
-
|
|
2464
|
-
|
|
2465
|
-
|
|
2466
|
-
|
|
2467
|
-
|
|
2468
|
-
|
|
2469
|
-
|
|
2470
|
-
|
|
2471
|
-
|
|
2472
|
-
|
|
2473
|
-
|
|
2474
|
-
|
|
2475
|
-
|
|
2476
|
-
|
|
2477
|
-
|
|
2478
|
-
|
|
2479
|
-
|
|
2480
|
-
|
|
2481
|
-
|
|
2482
|
-
|
|
2483
|
-
|
|
2484
|
-
|
|
2485
|
-
|
|
2486
|
-
|
|
2487
|
-
|
|
2488
|
-
|
|
2489
|
-
|
|
2490
|
-
|
|
2491
|
-
|
|
2492
|
-
|
|
2493
|
-
|
|
2494
|
-
|
|
2495
|
-
|
|
2496
|
-
|
|
2497
|
-
|
|
2498
|
-
|
|
2499
|
-
|
|
2500
|
-
|
|
2501
|
-
|
|
2502
|
-
|
|
2503
|
-
|
|
2504
|
-
|
|
2505
|
-
|
|
2506
|
-
|
|
2507
|
-
|
|
2508
|
-
|
|
2509
|
-
|
|
2510
|
-
|
|
2511
|
-
|
|
2512
|
-
|
|
2513
|
-
|
|
2514
|
-
|
|
2515
|
-
|
|
2516
|
-
|
|
2517
|
-
|
|
2518
|
-
|
|
2519
|
-
|
|
2520
|
-
|
|
2521
|
-
|
|
2522
|
-
|
|
2523
|
-
|
|
2524
|
-
|
|
2525
|
-
|
|
2526
|
-
|
|
2527
|
-
|
|
2528
|
-
|
|
2529
|
-
|
|
2530
|
-
|
|
2531
|
-
|
|
2532
|
-
|
|
2533
|
-
|
|
2534
|
-
}
|
|
2535
|
-
return expansions;
|
|
2536
|
-
}
|
|
2537
|
-
return braceExpansion;
|
|
2538
|
-
}
|
|
2539
|
-
|
|
2540
|
-
var braceExpansionExports = requireBraceExpansion();
|
|
2541
|
-
var expand = /*@__PURE__*/getDefaultExportFromCjs(braceExpansionExports);
|
|
2323
|
+
const balanced = (a, b, str) => {
|
|
2324
|
+
const ma = a instanceof RegExp ? maybeMatch(a, str) : a;
|
|
2325
|
+
const mb = b instanceof RegExp ? maybeMatch(b, str) : b;
|
|
2326
|
+
const r = ma !== null && mb != null && range(ma, mb, str);
|
|
2327
|
+
return r && {
|
|
2328
|
+
start: r[0],
|
|
2329
|
+
end: r[1],
|
|
2330
|
+
pre: str.slice(0, r[0]),
|
|
2331
|
+
body: str.slice(r[0] + ma.length, r[1]),
|
|
2332
|
+
post: str.slice(r[1] + mb.length)
|
|
2333
|
+
};
|
|
2334
|
+
};
|
|
2335
|
+
const maybeMatch = (reg, str) => {
|
|
2336
|
+
const m = str.match(reg);
|
|
2337
|
+
return m ? m[0] : null;
|
|
2338
|
+
};
|
|
2339
|
+
const range = (a, b, str) => {
|
|
2340
|
+
let begs, beg, left, right = void 0, result;
|
|
2341
|
+
let ai = str.indexOf(a);
|
|
2342
|
+
let bi = str.indexOf(b, ai + 1);
|
|
2343
|
+
let i = ai;
|
|
2344
|
+
if (ai >= 0 && bi > 0) {
|
|
2345
|
+
if (a === b) {
|
|
2346
|
+
return [ai, bi];
|
|
2347
|
+
}
|
|
2348
|
+
begs = [];
|
|
2349
|
+
left = str.length;
|
|
2350
|
+
while (i >= 0 && !result) {
|
|
2351
|
+
if (i === ai) {
|
|
2352
|
+
begs.push(i);
|
|
2353
|
+
ai = str.indexOf(a, i + 1);
|
|
2354
|
+
} else if (begs.length === 1) {
|
|
2355
|
+
const r = begs.pop();
|
|
2356
|
+
if (r !== void 0)
|
|
2357
|
+
result = [r, bi];
|
|
2358
|
+
} else {
|
|
2359
|
+
beg = begs.pop();
|
|
2360
|
+
if (beg !== void 0 && beg < left) {
|
|
2361
|
+
left = beg;
|
|
2362
|
+
right = bi;
|
|
2363
|
+
}
|
|
2364
|
+
bi = str.indexOf(b, i + 1);
|
|
2365
|
+
}
|
|
2366
|
+
i = ai < bi && ai >= 0 ? ai : bi;
|
|
2367
|
+
}
|
|
2368
|
+
if (begs.length && right !== void 0) {
|
|
2369
|
+
result = [left, right];
|
|
2370
|
+
}
|
|
2371
|
+
}
|
|
2372
|
+
return result;
|
|
2373
|
+
};
|
|
2374
|
+
|
|
2375
|
+
const escSlash = "\0SLASH" + Math.random() + "\0";
|
|
2376
|
+
const escOpen = "\0OPEN" + Math.random() + "\0";
|
|
2377
|
+
const escClose = "\0CLOSE" + Math.random() + "\0";
|
|
2378
|
+
const escComma = "\0COMMA" + Math.random() + "\0";
|
|
2379
|
+
const escPeriod = "\0PERIOD" + Math.random() + "\0";
|
|
2380
|
+
const escSlashPattern = new RegExp(escSlash, "g");
|
|
2381
|
+
const escOpenPattern = new RegExp(escOpen, "g");
|
|
2382
|
+
const escClosePattern = new RegExp(escClose, "g");
|
|
2383
|
+
const escCommaPattern = new RegExp(escComma, "g");
|
|
2384
|
+
const escPeriodPattern = new RegExp(escPeriod, "g");
|
|
2385
|
+
const slashPattern = /\\\\/g;
|
|
2386
|
+
const openPattern = /\\{/g;
|
|
2387
|
+
const closePattern = /\\}/g;
|
|
2388
|
+
const commaPattern = /\\,/g;
|
|
2389
|
+
const periodPattern = /\\./g;
|
|
2390
|
+
function numeric(str) {
|
|
2391
|
+
return !isNaN(str) ? parseInt(str, 10) : str.charCodeAt(0);
|
|
2392
|
+
}
|
|
2393
|
+
function escapeBraces(str) {
|
|
2394
|
+
return str.replace(slashPattern, escSlash).replace(openPattern, escOpen).replace(closePattern, escClose).replace(commaPattern, escComma).replace(periodPattern, escPeriod);
|
|
2395
|
+
}
|
|
2396
|
+
function unescapeBraces(str) {
|
|
2397
|
+
return str.replace(escSlashPattern, "\\").replace(escOpenPattern, "{").replace(escClosePattern, "}").replace(escCommaPattern, ",").replace(escPeriodPattern, ".");
|
|
2398
|
+
}
|
|
2399
|
+
function parseCommaParts(str) {
|
|
2400
|
+
if (!str) {
|
|
2401
|
+
return [""];
|
|
2402
|
+
}
|
|
2403
|
+
const parts = [];
|
|
2404
|
+
const m = balanced("{", "}", str);
|
|
2405
|
+
if (!m) {
|
|
2406
|
+
return str.split(",");
|
|
2407
|
+
}
|
|
2408
|
+
const { pre, body, post } = m;
|
|
2409
|
+
const p = pre.split(",");
|
|
2410
|
+
p[p.length - 1] += "{" + body + "}";
|
|
2411
|
+
const postParts = parseCommaParts(post);
|
|
2412
|
+
if (post.length) {
|
|
2413
|
+
p[p.length - 1] += postParts.shift();
|
|
2414
|
+
p.push.apply(p, postParts);
|
|
2415
|
+
}
|
|
2416
|
+
parts.push.apply(parts, p);
|
|
2417
|
+
return parts;
|
|
2418
|
+
}
|
|
2419
|
+
function expand(str) {
|
|
2420
|
+
if (!str) {
|
|
2421
|
+
return [];
|
|
2422
|
+
}
|
|
2423
|
+
if (str.slice(0, 2) === "{}") {
|
|
2424
|
+
str = "\\{\\}" + str.slice(2);
|
|
2425
|
+
}
|
|
2426
|
+
return expand_(escapeBraces(str), true).map(unescapeBraces);
|
|
2427
|
+
}
|
|
2428
|
+
function embrace(str) {
|
|
2429
|
+
return "{" + str + "}";
|
|
2430
|
+
}
|
|
2431
|
+
function isPadded(el) {
|
|
2432
|
+
return /^-?0\d/.test(el);
|
|
2433
|
+
}
|
|
2434
|
+
function lte(i, y) {
|
|
2435
|
+
return i <= y;
|
|
2436
|
+
}
|
|
2437
|
+
function gte(i, y) {
|
|
2438
|
+
return i >= y;
|
|
2439
|
+
}
|
|
2440
|
+
function expand_(str, isTop) {
|
|
2441
|
+
const expansions = [];
|
|
2442
|
+
const m = balanced("{", "}", str);
|
|
2443
|
+
if (!m)
|
|
2444
|
+
return [str];
|
|
2445
|
+
const pre = m.pre;
|
|
2446
|
+
const post = m.post.length ? expand_(m.post, false) : [""];
|
|
2447
|
+
if (/\$$/.test(m.pre)) {
|
|
2448
|
+
for (let k = 0; k < post.length; k++) {
|
|
2449
|
+
const expansion = pre + "{" + m.body + "}" + post[k];
|
|
2450
|
+
expansions.push(expansion);
|
|
2451
|
+
}
|
|
2452
|
+
} else {
|
|
2453
|
+
const isNumericSequence = /^-?\d+\.\.-?\d+(?:\.\.-?\d+)?$/.test(m.body);
|
|
2454
|
+
const isAlphaSequence = /^[a-zA-Z]\.\.[a-zA-Z](?:\.\.-?\d+)?$/.test(m.body);
|
|
2455
|
+
const isSequence = isNumericSequence || isAlphaSequence;
|
|
2456
|
+
const isOptions = m.body.indexOf(",") >= 0;
|
|
2457
|
+
if (!isSequence && !isOptions) {
|
|
2458
|
+
if (m.post.match(/,(?!,).*\}/)) {
|
|
2459
|
+
str = m.pre + "{" + m.body + escClose + m.post;
|
|
2460
|
+
return expand_(str);
|
|
2461
|
+
}
|
|
2462
|
+
return [str];
|
|
2463
|
+
}
|
|
2464
|
+
let n;
|
|
2465
|
+
if (isSequence) {
|
|
2466
|
+
n = m.body.split(/\.\./);
|
|
2467
|
+
} else {
|
|
2468
|
+
n = parseCommaParts(m.body);
|
|
2469
|
+
if (n.length === 1 && n[0] !== void 0) {
|
|
2470
|
+
n = expand_(n[0], false).map(embrace);
|
|
2471
|
+
if (n.length === 1) {
|
|
2472
|
+
return post.map((p) => m.pre + n[0] + p);
|
|
2473
|
+
}
|
|
2474
|
+
}
|
|
2475
|
+
}
|
|
2476
|
+
let N;
|
|
2477
|
+
if (isSequence && n[0] !== void 0 && n[1] !== void 0) {
|
|
2478
|
+
const x = numeric(n[0]);
|
|
2479
|
+
const y = numeric(n[1]);
|
|
2480
|
+
const width = Math.max(n[0].length, n[1].length);
|
|
2481
|
+
let incr = n.length === 3 && n[2] !== void 0 ? Math.abs(numeric(n[2])) : 1;
|
|
2482
|
+
let test = lte;
|
|
2483
|
+
const reverse = y < x;
|
|
2484
|
+
if (reverse) {
|
|
2485
|
+
incr *= -1;
|
|
2486
|
+
test = gte;
|
|
2487
|
+
}
|
|
2488
|
+
const pad = n.some(isPadded);
|
|
2489
|
+
N = [];
|
|
2490
|
+
for (let i = x; test(i, y); i += incr) {
|
|
2491
|
+
let c;
|
|
2492
|
+
if (isAlphaSequence) {
|
|
2493
|
+
c = String.fromCharCode(i);
|
|
2494
|
+
if (c === "\\") {
|
|
2495
|
+
c = "";
|
|
2496
|
+
}
|
|
2497
|
+
} else {
|
|
2498
|
+
c = String(i);
|
|
2499
|
+
if (pad) {
|
|
2500
|
+
const need = width - c.length;
|
|
2501
|
+
if (need > 0) {
|
|
2502
|
+
const z = new Array(need + 1).join("0");
|
|
2503
|
+
if (i < 0) {
|
|
2504
|
+
c = "-" + z + c.slice(1);
|
|
2505
|
+
} else {
|
|
2506
|
+
c = z + c;
|
|
2507
|
+
}
|
|
2508
|
+
}
|
|
2509
|
+
}
|
|
2510
|
+
}
|
|
2511
|
+
N.push(c);
|
|
2512
|
+
}
|
|
2513
|
+
} else {
|
|
2514
|
+
N = [];
|
|
2515
|
+
for (let j = 0; j < n.length; j++) {
|
|
2516
|
+
N.push.apply(N, expand_(n[j], false));
|
|
2517
|
+
}
|
|
2518
|
+
}
|
|
2519
|
+
for (let j = 0; j < N.length; j++) {
|
|
2520
|
+
for (let k = 0; k < post.length; k++) {
|
|
2521
|
+
const expansion = pre + N[j] + post[k];
|
|
2522
|
+
if (!isTop || isSequence || expansion) {
|
|
2523
|
+
expansions.push(expansion);
|
|
2524
|
+
}
|
|
2525
|
+
}
|
|
2526
|
+
}
|
|
2527
|
+
}
|
|
2528
|
+
return expansions;
|
|
2529
|
+
}
|
|
2542
2530
|
|
|
2543
2531
|
const MAX_PATTERN_LENGTH = 1024 * 64;
|
|
2544
2532
|
const assertValidPattern = (pattern) => {
|
|
@@ -3058,7 +3046,7 @@ class AST {
|
|
|
3058
3046
|
this.#hasMagic = void 0;
|
|
3059
3047
|
return [s, unescape(this.toString()), false, false];
|
|
3060
3048
|
}
|
|
3061
|
-
let bodyDotAllowed = !repeated || allowDot || dot ||
|
|
3049
|
+
let bodyDotAllowed = !repeated || allowDot || dot || !startNoDot ? "" : this.#partsToRegExp(true);
|
|
3062
3050
|
if (bodyDotAllowed === body) {
|
|
3063
3051
|
bodyDotAllowed = "";
|
|
3064
3052
|
}
|
|
@@ -6136,7 +6124,7 @@ const IFREG = 8;
|
|
|
6136
6124
|
const IFLNK = 10;
|
|
6137
6125
|
const IFSOCK = 12;
|
|
6138
6126
|
const IFMT = 15;
|
|
6139
|
-
const IFMT_UNKNOWN =
|
|
6127
|
+
const IFMT_UNKNOWN = ~IFMT;
|
|
6140
6128
|
const READDIR_CALLED = 16;
|
|
6141
6129
|
const LSTAT_CALLED = 32;
|
|
6142
6130
|
const ENOTDIR = 64;
|
|
@@ -6398,7 +6386,7 @@ class PathBase {
|
|
|
6398
6386
|
}
|
|
6399
6387
|
const children = Object.assign([], { provisional: 0 });
|
|
6400
6388
|
this.#children.set(this, children);
|
|
6401
|
-
this.#type &=
|
|
6389
|
+
this.#type &= ~READDIR_CALLED;
|
|
6402
6390
|
return children;
|
|
6403
6391
|
}
|
|
6404
6392
|
/**
|
|
@@ -8920,14 +8908,15 @@ const migrationTablesExist = (db, entity) => {
|
|
|
8920
8908
|
SELECT EXISTS (
|
|
8921
8909
|
SELECT FROM information_schema.tables
|
|
8922
8910
|
WHERE table_schema = 'public'
|
|
8923
|
-
AND table_name =
|
|
8911
|
+
AND table_name = $(tableName)
|
|
8924
8912
|
)
|
|
8925
8913
|
`;
|
|
8926
|
-
|
|
8914
|
+
const params = { tableName: `${entity}_migrations` };
|
|
8915
|
+
return db.one(query, params);
|
|
8927
8916
|
};
|
|
8928
8917
|
const createMigrationsTables = (db, entity) => {
|
|
8929
8918
|
const query = `
|
|
8930
|
-
CREATE TABLE IF NOT EXISTS $
|
|
8919
|
+
CREATE TABLE IF NOT EXISTS $(migrationsTable:name) (
|
|
8931
8920
|
file_hash TEXT NOT NULL PRIMARY KEY,
|
|
8932
8921
|
file_name TEXT NOT NULL,
|
|
8933
8922
|
sequence TEXT NOT NULL,
|
|
@@ -8935,20 +8924,26 @@ const createMigrationsTables = (db, entity) => {
|
|
|
8935
8924
|
UNIQUE (file_name),
|
|
8936
8925
|
UNIQUE (sequence)
|
|
8937
8926
|
);
|
|
8938
|
-
CREATE TABLE IF NOT EXISTS $
|
|
8927
|
+
CREATE TABLE IF NOT EXISTS $(versionsTable:name) (
|
|
8939
8928
|
version TEXT NOT NULL PRIMARY KEY,
|
|
8940
8929
|
plan TEXT NOT NULL,
|
|
8941
8930
|
created_on TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
|
|
8942
8931
|
);
|
|
8943
8932
|
`;
|
|
8944
|
-
|
|
8933
|
+
const params = {
|
|
8934
|
+
migrationsTable: `${entity}_migrations`,
|
|
8935
|
+
versionsTable: `${entity}_versions`
|
|
8936
|
+
};
|
|
8937
|
+
return db.none(query, params);
|
|
8945
8938
|
};
|
|
8946
8939
|
const getMigrationRecords = (db, entity) => {
|
|
8947
8940
|
const query = `
|
|
8948
|
-
SELECT file_hash, file_name, sequence
|
|
8941
|
+
SELECT file_hash, file_name, sequence
|
|
8942
|
+
FROM $(migrationsTable:name)
|
|
8949
8943
|
ORDER BY sequence
|
|
8950
8944
|
`;
|
|
8951
|
-
|
|
8945
|
+
const params = { migrationsTable: `${entity}_migrations` };
|
|
8946
|
+
return db.manyOrNone(query, params).then(
|
|
8952
8947
|
(data) => data.map((r) => ({
|
|
8953
8948
|
fileHash: r.file_hash,
|
|
8954
8949
|
fileName: r.file_name,
|
|
@@ -8966,7 +8961,7 @@ const insertMigrationsRecords = (db, pgpHelpers, entity, migrations) => {
|
|
|
8966
8961
|
const cs = new pgpHelpers.ColumnSet(
|
|
8967
8962
|
["file_name", "file_hash", "sequence"],
|
|
8968
8963
|
{
|
|
8969
|
-
table: `${entity}_migrations`
|
|
8964
|
+
table: new pgpHelpers.TableName({ table: `${entity}_migrations` })
|
|
8970
8965
|
}
|
|
8971
8966
|
);
|
|
8972
8967
|
const onConflict = " ON CONFLICT(file_name) DO NOTHING";
|
|
@@ -8975,13 +8970,14 @@ const insertMigrationsRecords = (db, pgpHelpers, entity, migrations) => {
|
|
|
8975
8970
|
}
|
|
8976
8971
|
};
|
|
8977
8972
|
const replaceMigrationsRecords = async (db, pgpHelpers, entity, migrations) => {
|
|
8978
|
-
const
|
|
8979
|
-
|
|
8973
|
+
const query = `DELETE FROM $(migrationsTableName:name)`;
|
|
8974
|
+
const params = { migrationsTableName: `${entity}_migrations` };
|
|
8975
|
+
await db.none(query, params);
|
|
8980
8976
|
await insertMigrationsRecords(db, pgpHelpers, entity, migrations);
|
|
8981
8977
|
};
|
|
8982
8978
|
const insertVersions = (db, pgpHelpers, entity, records) => {
|
|
8983
8979
|
const cs = new pgpHelpers.ColumnSet(["version", "plan"], {
|
|
8984
|
-
table: `${entity}_versions`
|
|
8980
|
+
table: new pgpHelpers.TableName({ table: `${entity}_versions` })
|
|
8985
8981
|
});
|
|
8986
8982
|
const onConflict = " ON CONFLICT(version) DO NOTHING";
|
|
8987
8983
|
const query = pgpHelpers.insert(records, cs) + onConflict;
|
|
@@ -8989,19 +8985,26 @@ const insertVersions = (db, pgpHelpers, entity, records) => {
|
|
|
8989
8985
|
};
|
|
8990
8986
|
const getPlanFromVersion = (db, entity, version) => {
|
|
8991
8987
|
const query = `
|
|
8992
|
-
SELECT plan FROM $
|
|
8993
|
-
WHERE version=$
|
|
8988
|
+
SELECT plan FROM $(versionsTable:name)
|
|
8989
|
+
WHERE version=$(version);
|
|
8994
8990
|
`;
|
|
8995
|
-
|
|
8991
|
+
const params = {
|
|
8992
|
+
version,
|
|
8993
|
+
versionsTable: `${entity}_versions`
|
|
8994
|
+
};
|
|
8995
|
+
return db.oneOrNone(query, params, (r) => r?.plan || null);
|
|
8996
8996
|
};
|
|
8997
8997
|
const getVersions = async (db, entity) => {
|
|
8998
8998
|
const query = `
|
|
8999
8999
|
SELECT
|
|
9000
9000
|
version,
|
|
9001
9001
|
plan
|
|
9002
|
-
FROM $
|
|
9002
|
+
FROM $(versionsTable:name) ORDER BY created_on DESC
|
|
9003
9003
|
`;
|
|
9004
|
-
|
|
9004
|
+
const params = {
|
|
9005
|
+
versionsTable: `${entity}_versions`
|
|
9006
|
+
};
|
|
9007
|
+
return db.any(query, params);
|
|
9005
9008
|
};
|
|
9006
9009
|
|
|
9007
9010
|
let cachedPlannedVersion = null;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@oliasoft-open-source/node-json-migrator",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.1.0-beta-1",
|
|
4
4
|
"description": "A library for JSON migrations",
|
|
5
5
|
"homepage": "https://oliasoft-open-source.gitlab.io/node-postgresql-migrator",
|
|
6
6
|
"bugs": {
|
|
@@ -49,7 +49,7 @@
|
|
|
49
49
|
]
|
|
50
50
|
},
|
|
51
51
|
"dependencies": {
|
|
52
|
-
"ajv": "^8.
|
|
52
|
+
"ajv": "^8.17.1",
|
|
53
53
|
"ajv-errors": "^3.0.0",
|
|
54
54
|
"module-from-string": "^3.3.1",
|
|
55
55
|
"pg-promise": "^11"
|
|
@@ -57,23 +57,23 @@
|
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@types/lodash-es": "^4.17.12",
|
|
59
59
|
"@types/mock-fs": "^4.13.4",
|
|
60
|
-
"@types/node": "^
|
|
60
|
+
"@types/node": "^24.1.0",
|
|
61
61
|
"chalk": "^5.4.1",
|
|
62
|
-
"esbuild": "^0.25.
|
|
63
|
-
"eslint": "^9.
|
|
64
|
-
"eslint-config-prettier": "^10.1.
|
|
65
|
-
"glob": "^11.0.
|
|
62
|
+
"esbuild": "^0.25.8",
|
|
63
|
+
"eslint": "^9.32.0",
|
|
64
|
+
"eslint-config-prettier": "^10.1.8",
|
|
65
|
+
"glob": "^11.0.3",
|
|
66
66
|
"husky": "^9.1.7",
|
|
67
67
|
"immer": "^10.1.1",
|
|
68
|
-
"lint-staged": "^
|
|
68
|
+
"lint-staged": "^16.1.2",
|
|
69
69
|
"lodash-es": "^4.17.21",
|
|
70
70
|
"mock-fs": "^5.5.0",
|
|
71
71
|
"pg-mem": "^3.0.5",
|
|
72
|
-
"pkgroll": "^2.
|
|
73
|
-
"prettier": "3.
|
|
74
|
-
"tsx": "^4.
|
|
75
|
-
"typescript": "^5.8.
|
|
76
|
-
"typescript-eslint": "^8.
|
|
72
|
+
"pkgroll": "^2.14.5",
|
|
73
|
+
"prettier": "3.6.2",
|
|
74
|
+
"tsx": "^4.20.3",
|
|
75
|
+
"typescript": "^5.8.3",
|
|
76
|
+
"typescript-eslint": "^8.38.0"
|
|
77
77
|
},
|
|
78
78
|
"peerDependencies": {
|
|
79
79
|
"pg-promise": "^11"
|