@medusajs/framework 2.20.1 → 2.20.2-preview-20260904091918
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/migrations/migrator.d.ts +1 -0
- package/dist/migrations/migrator.d.ts.map +1 -1
- package/dist/migrations/migrator.js.map +1 -1
- package/dist/migrations/run-migration-scripts.d.ts.map +1 -1
- package/dist/migrations/run-migration-scripts.js +130 -17
- package/dist/migrations/run-migration-scripts.js.map +1 -1
- package/package.json +10 -10
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../src/migrations/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAGjD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAI7C,qBAAa,QAAQ;;IACnB,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAA;IAEtC,SAAS,CAAC,SAAS,EAAE,eAAe,CAAA;IACpC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;gBAIrB,EAAE,SAAS,EAAE,EAAE;QAAE,SAAS,EAAE,eAAe,CAAA;KAAE;IAQzD;;OAEG;IACH,SAAS,CAAC,aAAa;;;IAUjB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB/B,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBtC,qBAAqB,IAAI,OAAO,
|
|
1
|
+
{"version":3,"file":"migrator.d.ts","sourceRoot":"","sources":["../../src/migrations/migrator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAGjD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAA;AAI7C,qBAAa,QAAQ;;IACnB,SAAS,CAAC,oBAAoB,EAAE,MAAM,CAAA;IAEtC,SAAS,CAAC,SAAS,EAAE,eAAe,CAAA;IACpC,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,GAAG,CAAC,CAAA;gBAIrB,EAAE,SAAS,EAAE,EAAE;QAAE,SAAS,EAAE,eAAe,CAAA;KAAE;IAQzD;;OAEG;IACH,SAAS,CAAC,aAAa;;;IAUjB,cAAc,IAAI,OAAO,CAAC,IAAI,CAAC;IAoB/B,qBAAqB,IAAI,OAAO,CAAC,IAAI,CAAC;IAwBtC,qBAAqB,IAAI,OAAO,CACpC;QAAE,WAAW,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,IAAI,GAAG,IAAI,CAAA;KAAE,EAAE,CACrD;IAYK,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBpE;;;;;;;OAOG;IACG,kBAAkB,CACtB,KAAK,EAAE,MAAM,EAAE,EACf,EAAE,KAAK,EAAE,GAAE;QAAE,KAAK,CAAC,EAAE,OAAO,CAAA;KAAqB,GAChD,OAAO,CAAC,MAAM,EAAE,CAAC;cAiCJ,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;IAUrD,GAAG,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAIjC,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;CAGlE"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/migrations/migrator.ts"],"names":[],"mappings":";;;;;;;;;AACA,+BAA2B;AAC3B,+BAA2B;AAE3B,sCAAkC;AAClC,oCAAoD;AAEpD,MAAa,QAAQ;IAQnB,YAAY,EAAE,SAAS,EAAkC;QAFzD,uCAAwC,IAAI,GAAG,EAAE,EAAA;QAG/C,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC1B,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CACxC,iCAAyB,CAAC,aAAa,CACxC,CAAA;QACD,IAAI,CAAC,oBAAoB,GAAG,sBAAsB,CAAA;IACpD,CAAC;IAED;;OAEG;IACO,aAAa;QACrB,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAA;QAClC,OAAO;YACL,UAAU;gBACR,MAAM,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;gBAC1C,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAA;YACrD,CAAC;SACF,CAAA;IACH,CAAC;IAED,KAAK,CAAC,cAAc;QAClB,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CACzC,iCAAyB,CAAC,aAAa,CACxC,CAAA;QAED,IAAI,CAAC;YACH,MAAM,YAAY,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;QACzC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC3B,eAAM,CAAC,KAAK,CACV,0BAA0B,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,CACjE,CAAA;gBACD,eAAM,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;YAC/D,CAAC;iBAAM,CAAC;gBACN,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;YACrB,CAAC;YACD,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB;QACzB,IAAI,CAAC;YACH,wBAAwB;YACxB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;;;;8BAIxB,IAAI,CAAC,oBAAoB;;OAEhD,CAAC,CAAA;YAEF,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;gBAChC,eAAM,CAAC,IAAI,CACT,8BAA8B,IAAI,CAAC,oBAAoB,MAAM,CAC9D,CAAA;gBACD,MAAM,IAAI,CAAC,oBAAoB,EAAE,CAAA;gBACjC,eAAM,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAA;YACtD,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,eAAM,CAAC,KAAK,CAAC,2CAA2C,EAAE,KAAK,CAAC,CAAA;YAChE,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC;IAED,KAAK,CAAC,qBAAqB;
|
|
1
|
+
{"version":3,"file":"migrator.js","sourceRoot":"","sources":["../../src/migrations/migrator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-migration-scripts.d.ts","sourceRoot":"","sources":["../../src/migrations/run-migration-scripts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAIjD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,wBAAyB,SAAQ,QAAQ;;IACpD,SAAS,CAAC,oBAAoB,SAAsB;gBAExC,EAAE,SAAS,EAAE,EAAE;QAAE,SAAS,EAAE,eAAe,CAAA;KAAE;IAIzD;;;OAGG;IACG,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"run-migration-scripts.d.ts","sourceRoot":"","sources":["../../src/migrations/run-migration-scripts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAIjD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAA;AAErC,qBAAa,wBAAyB,SAAQ,QAAQ;;IACpD,SAAS,CAAC,oBAAoB,SAAsB;gBAExC,EAAE,SAAS,EAAE,EAAE;QAAE,SAAS,EAAE,eAAe,CAAA;KAAE;IAIzD;;;OAGG;IACG,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAgFnC,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAiBvD,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC;CAoJtD"}
|
|
@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
4
4
|
if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
|
|
5
5
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
6
6
|
};
|
|
7
|
-
var _MigrationScriptsMigrator_instances,
|
|
7
|
+
var _MigrationScriptsMigrator_instances, _MigrationScriptsMigrator_hashStringToInt, _MigrationScriptsMigrator_claimMigration, _MigrationScriptsMigrator_updateMigrationFinishedAt;
|
|
8
8
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
9
9
|
exports.MigrationScriptsMigrator = void 0;
|
|
10
10
|
const utils_1 = require("@medusajs/utils");
|
|
@@ -38,32 +38,46 @@ class MigrationScriptsMigrator extends migrator_1.Migrator {
|
|
|
38
38
|
throw new Error(`Failed to load migration script ${script}. No default export found.`);
|
|
39
39
|
}
|
|
40
40
|
const scriptName = (0, path_1.basename)(script);
|
|
41
|
-
const err = await this.insertMigration([
|
|
42
|
-
{ script_name: scriptName },
|
|
43
|
-
]).catch((e) => e);
|
|
44
41
|
/**
|
|
45
|
-
*
|
|
46
|
-
*
|
|
47
|
-
* unique constraint.
|
|
42
|
+
* The script is skipped when it has already been executed, or when
|
|
43
|
+
* another process is running it right now.
|
|
48
44
|
*/
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
45
|
+
const claim = await __classPrivateFieldGet(this, _MigrationScriptsMigrator_instances, "m", _MigrationScriptsMigrator_claimMigration).call(this, scriptName);
|
|
46
|
+
if (!claim.claimed) {
|
|
47
|
+
if (claim.reason === "running-elsewhere") {
|
|
48
|
+
/**
|
|
49
|
+
* When a previous run died without closing its connection cleanly,
|
|
50
|
+
* Postgres keeps that connection, and the advisory lock it holds,
|
|
51
|
+
* until it detects the half-open connection. Until then the script
|
|
52
|
+
* is reported as running elsewhere. It is picked up again by a
|
|
53
|
+
* later run, once the connection has been reaped.
|
|
54
|
+
*/
|
|
55
|
+
logger_1.logger.info(`Skipping migration script ${script}. It is being executed by another process`);
|
|
52
56
|
}
|
|
53
|
-
|
|
57
|
+
continue;
|
|
58
|
+
}
|
|
59
|
+
if (claim.wasInterrupted) {
|
|
60
|
+
logger_1.logger.warn(`Migration script ${script} did not complete during a previous run and is being executed again`);
|
|
54
61
|
}
|
|
55
62
|
logger_1.logger.info(`Running migration script ${script}`);
|
|
56
63
|
try {
|
|
57
64
|
const tracker = this.trackDuration();
|
|
58
65
|
await scriptFn.default({ container: this.container });
|
|
59
|
-
|
|
66
|
+
/**
|
|
67
|
+
* The script is only considered executed once it ran to completion.
|
|
68
|
+
* Until `finished_at` is set, the record is treated as pending and
|
|
69
|
+
* the script will be picked up again by the next run.
|
|
70
|
+
*/
|
|
60
71
|
await __classPrivateFieldGet(this, _MigrationScriptsMigrator_instances, "m", _MigrationScriptsMigrator_updateMigrationFinishedAt).call(this, scriptName);
|
|
72
|
+
logger_1.logger.info(`Migration script ${script} completed (${tracker.getSeconds()}s)`);
|
|
61
73
|
}
|
|
62
74
|
catch (error) {
|
|
63
75
|
logger_1.logger.error(`Failed to run migration script ${script}:`, error);
|
|
64
|
-
await __classPrivateFieldGet(this, _MigrationScriptsMigrator_instances, "m", _MigrationScriptsMigrator_deleteMigration).call(this, scriptName);
|
|
65
76
|
throw error;
|
|
66
77
|
}
|
|
78
|
+
finally {
|
|
79
|
+
await claim.release();
|
|
80
|
+
}
|
|
67
81
|
}
|
|
68
82
|
}
|
|
69
83
|
finally {
|
|
@@ -71,7 +85,14 @@ class MigrationScriptsMigrator extends migrator_1.Migrator {
|
|
|
71
85
|
}
|
|
72
86
|
}
|
|
73
87
|
async getPendingMigrations(migrationPaths) {
|
|
74
|
-
|
|
88
|
+
/**
|
|
89
|
+
* A script is only considered executed once it has finished running. Scripts
|
|
90
|
+
* that were interrupted (e.g. a deadlock, a crash or a killed process) have
|
|
91
|
+
* a record without a `finished_at` and must be run again.
|
|
92
|
+
*/
|
|
93
|
+
const executedMigrations = new Set((await this.getExecutedMigrations())
|
|
94
|
+
.filter((item) => !!item.finished_at)
|
|
95
|
+
.map((item) => item.script_name));
|
|
75
96
|
const all = await this.loadMigrationFiles(migrationPaths);
|
|
76
97
|
return all.filter((item) => !executedMigrations.has((0, path_1.basename)(item)));
|
|
77
98
|
}
|
|
@@ -89,9 +110,101 @@ class MigrationScriptsMigrator extends migrator_1.Migrator {
|
|
|
89
110
|
}
|
|
90
111
|
}
|
|
91
112
|
exports.MigrationScriptsMigrator = MigrationScriptsMigrator;
|
|
92
|
-
_MigrationScriptsMigrator_instances = new WeakSet(),
|
|
113
|
+
_MigrationScriptsMigrator_instances = new WeakSet(), _MigrationScriptsMigrator_hashStringToInt = function _MigrationScriptsMigrator_hashStringToInt(str) {
|
|
114
|
+
let hash = 5381;
|
|
115
|
+
for (let i = str.length; i--;) {
|
|
116
|
+
hash = (hash * 33) ^ str.charCodeAt(i);
|
|
117
|
+
}
|
|
118
|
+
return hash | 0;
|
|
119
|
+
}, _MigrationScriptsMigrator_claimMigration =
|
|
120
|
+
/**
|
|
121
|
+
* Claims a migration script before running it.
|
|
122
|
+
*
|
|
123
|
+
* Two guarantees are needed here, and they pull in opposite directions:
|
|
124
|
+
*
|
|
125
|
+
* - A script that was interrupted (deadlock, crash, killed process) must be
|
|
126
|
+
* picked up again by a later run.
|
|
127
|
+
* - A script that another process is running right now must not be run a
|
|
128
|
+
* second time in parallel.
|
|
129
|
+
*
|
|
130
|
+
* The database record alone cannot tell those two apart: in both cases the
|
|
131
|
+
* record exists without a `finished_at`. The difference is whether the
|
|
132
|
+
* process that claimed it is still alive, so a session-level advisory lock is
|
|
133
|
+
* held on a dedicated connection for as long as the script runs. Postgres
|
|
134
|
+
* releases that lock by itself once the connection goes away, which is
|
|
135
|
+
* exactly what happens when a process dies, while a live process keeps
|
|
136
|
+
* holding it.
|
|
137
|
+
*
|
|
138
|
+
* @param scriptName - The name of the script to claim
|
|
139
|
+
* @returns The outcome of the claim, and a `release` to call once the script
|
|
140
|
+
* is done.
|
|
141
|
+
*/
|
|
142
|
+
async function _MigrationScriptsMigrator_claimMigration(scriptName) {
|
|
143
|
+
const lockKey = __classPrivateFieldGet(this, _MigrationScriptsMigrator_instances, "m", _MigrationScriptsMigrator_hashStringToInt).call(this, `${this.migration_table_name}:${scriptName}`);
|
|
144
|
+
const client = this.pgConnection.client;
|
|
145
|
+
const connection = await client.acquireConnection();
|
|
146
|
+
let released = false;
|
|
147
|
+
const release = async (unlock) => {
|
|
148
|
+
if (released) {
|
|
149
|
+
return;
|
|
150
|
+
}
|
|
151
|
+
released = true;
|
|
152
|
+
try {
|
|
153
|
+
if (unlock) {
|
|
154
|
+
await connection.query("SELECT pg_advisory_unlock($1)", [lockKey]);
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
finally {
|
|
158
|
+
await client.releaseConnection(connection);
|
|
159
|
+
}
|
|
160
|
+
};
|
|
161
|
+
try {
|
|
162
|
+
/**
|
|
163
|
+
* `pg_try_advisory_lock` never waits. It either takes the lock and
|
|
164
|
+
* returns true, or returns false when someone else is holding it.
|
|
165
|
+
*/
|
|
166
|
+
const lock = await connection.query("SELECT pg_try_advisory_lock($1) AS acquired", [lockKey]);
|
|
167
|
+
if (!lock.rows[0].acquired) {
|
|
168
|
+
await release(false);
|
|
169
|
+
return {
|
|
170
|
+
claimed: false,
|
|
171
|
+
reason: "running-elsewhere",
|
|
172
|
+
release: async () => { },
|
|
173
|
+
};
|
|
174
|
+
}
|
|
175
|
+
/**
|
|
176
|
+
* The lock is held, so no other process can be claiming this script at
|
|
177
|
+
* the same time and the existing record can be read safely.
|
|
178
|
+
*/
|
|
179
|
+
const existing = await connection.query(`SELECT finished_at FROM ${this.migration_table_name} WHERE script_name = $1`, [scriptName]);
|
|
180
|
+
const record = existing.rows[0];
|
|
181
|
+
if (record?.finished_at) {
|
|
182
|
+
await release(true);
|
|
183
|
+
return {
|
|
184
|
+
claimed: false,
|
|
185
|
+
reason: "already-executed",
|
|
186
|
+
release: async () => { },
|
|
187
|
+
};
|
|
188
|
+
}
|
|
189
|
+
/**
|
|
190
|
+
* A record without a `finished_at` belongs to a run that was interrupted.
|
|
191
|
+
*/
|
|
192
|
+
const wasInterrupted = !!record;
|
|
193
|
+
/**
|
|
194
|
+
* The record is inserted, or re-claimed when a previous run left it
|
|
195
|
+
* without a `finished_at`. The `WHERE` clause keeps the statement safe on
|
|
196
|
+
* its own, so a finished record can never be re-claimed by it.
|
|
197
|
+
*/
|
|
198
|
+
await connection.query(`INSERT INTO ${this.migration_table_name} (script_name) VALUES ($1)
|
|
199
|
+
ON CONFLICT (script_name) DO UPDATE SET created_at = NOW()
|
|
200
|
+
WHERE ${this.migration_table_name}.finished_at IS NULL`, [scriptName]);
|
|
201
|
+
return { claimed: true, wasInterrupted, release: () => release(true) };
|
|
202
|
+
}
|
|
203
|
+
catch (error) {
|
|
204
|
+
await release(true);
|
|
205
|
+
throw error;
|
|
206
|
+
}
|
|
207
|
+
}, _MigrationScriptsMigrator_updateMigrationFinishedAt = function _MigrationScriptsMigrator_updateMigrationFinishedAt(scriptName) {
|
|
93
208
|
return this.pgConnection.raw(`UPDATE ${this.migration_table_name} SET finished_at = NOW() WHERE script_name = ?`, [scriptName]);
|
|
94
|
-
}, _MigrationScriptsMigrator_deleteMigration = function _MigrationScriptsMigrator_deleteMigration(scriptName) {
|
|
95
|
-
return this.pgConnection.raw(`DELETE FROM ${this.migration_table_name} WHERE script_name = ?`, [scriptName]);
|
|
96
209
|
};
|
|
97
210
|
//# sourceMappingURL=run-migration-scripts.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-migration-scripts.js","sourceRoot":"","sources":["../../src/migrations/run-migration-scripts.ts"],"names":[],"mappings":";;;;;;;;;AACA,2CAAuE;AACvE,+BAA+B;AAC/B,sCAAkC;AAClC,yCAAqC;AAErC,MAAa,wBAAyB,SAAQ,mBAAQ;IAGpD,YAAY,EAAE,SAAS,EAAkC;QACvD,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;;QAHZ,yBAAoB,GAAG,mBAAmB,CAAA;IAIpD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,GAAG,CAAC,KAAe;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,eAAO,CAAC,OAAO,CAAC,CAAA;QAE3D,MAAM,OAAO,GAAG,2BAA2B,CAAA;QAC3C,MAAM,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE;YACjC,MAAM,EAAE,EAAE,GAAG,EAAE;SAChB,CAAC,CAAA;QAEF,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;YAC1D,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;gBACjC,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAa,EAAC,MAAM,CAAC,CAAA;gBAE5C,IAAI,IAAA,qBAAa,EAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5B,SAAQ;gBACV,CAAC;gBAED,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CACb,mCAAmC,MAAM,4BAA4B,CACtE,CAAA;gBACH,CAAC;gBAED,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAA;gBAEnC,MAAM,
|
|
1
|
+
{"version":3,"file":"run-migration-scripts.js","sourceRoot":"","sources":["../../src/migrations/run-migration-scripts.ts"],"names":[],"mappings":";;;;;;;;;AACA,2CAAuE;AACvE,+BAA+B;AAC/B,sCAAkC;AAClC,yCAAqC;AAErC,MAAa,wBAAyB,SAAQ,mBAAQ;IAGpD,YAAY,EAAE,SAAS,EAAkC;QACvD,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC,CAAA;;QAHZ,yBAAoB,GAAG,mBAAmB,CAAA;IAIpD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,GAAG,CAAC,KAAe;QACvB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,eAAO,CAAC,OAAO,CAAC,CAAA;QAE3D,MAAM,OAAO,GAAG,2BAA2B,CAAA;QAC3C,MAAM,WAAW,CAAC,OAAO,CAAC,OAAO,EAAE;YACjC,MAAM,EAAE,EAAE,GAAG,EAAE;SAChB,CAAC,CAAA;QAEF,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAA;YAC1D,KAAK,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;gBACjC,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAa,EAAC,MAAM,CAAC,CAAA;gBAE5C,IAAI,IAAA,qBAAa,EAAC,QAAQ,CAAC,EAAE,CAAC;oBAC5B,SAAQ;gBACV,CAAC;gBAED,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CACb,mCAAmC,MAAM,4BAA4B,CACtE,CAAA;gBACH,CAAC;gBAED,MAAM,UAAU,GAAG,IAAA,eAAQ,EAAC,MAAM,CAAC,CAAA;gBAEnC;;;mBAGG;gBACH,MAAM,KAAK,GAAG,MAAM,uBAAA,IAAI,qFAAgB,MAApB,IAAI,EAAiB,UAAU,CAAC,CAAA;gBACpD,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;oBACnB,IAAI,KAAK,CAAC,MAAM,KAAK,mBAAmB,EAAE,CAAC;wBACzC;;;;;;2BAMG;wBACH,eAAM,CAAC,IAAI,CACT,6BAA6B,MAAM,2CAA2C,CAC/E,CAAA;oBACH,CAAC;oBACD,SAAQ;gBACV,CAAC;gBAED,IAAI,KAAK,CAAC,cAAc,EAAE,CAAC;oBACzB,eAAM,CAAC,IAAI,CACT,oBAAoB,MAAM,qEAAqE,CAChG,CAAA;gBACH,CAAC;gBAED,eAAM,CAAC,IAAI,CAAC,4BAA4B,MAAM,EAAE,CAAC,CAAA;gBACjD,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,IAAI,CAAC,aAAa,EAAE,CAAA;oBAEpC,MAAM,QAAQ,CAAC,OAAO,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAA;oBAErD;;;;uBAIG;oBACH,MAAM,uBAAA,IAAI,gGAA2B,MAA/B,IAAI,EAA4B,UAAU,CAAC,CAAA;oBAEjD,eAAM,CAAC,IAAI,CACT,oBAAoB,MAAM,eAAe,OAAO,CAAC,UAAU,EAAE,IAAI,CAClE,CAAA;gBACH,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,eAAM,CAAC,KAAK,CAAC,kCAAkC,MAAM,GAAG,EAAE,KAAK,CAAC,CAAA;oBAChE,MAAM,KAAK,CAAA;gBACb,CAAC;wBAAS,CAAC;oBACT,MAAM,KAAK,CAAC,OAAO,EAAE,CAAA;gBACvB,CAAC;YACH,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,WAAW,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACpC,CAAC;IACH,CAAC;IAED,KAAK,CAAC,oBAAoB,CAAC,cAAwB;QACjD;;;;WAIG;QACH,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAChC,CAAC,MAAM,IAAI,CAAC,qBAAqB,EAAE,CAAC;aACjC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,CAAC;aACpC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,CACnC,CAAA;QAED,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;QAEzD,OAAO,GAAG,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAA,eAAQ,EAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IACtE,CAAC;IAES,KAAK,CAAC,oBAAoB;QAClC,MAAM,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC;mCACG,IAAI,CAAC,oBAAoB;;;;;;;oEAOQ,IAAI,CAAC,oBAAoB;KACxF,CAAC,CAAA;IACJ,CAAC;CAyIF;AAhQD,4DAgQC;oJAnIkB,GAAW;IAC1B,IAAI,IAAI,GAAG,IAAI,CAAA;IACf,KAAK,IAAI,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,GAAI,CAAC;QAC/B,IAAI,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,CAAA;IACxC,CAAC;IACD,OAAO,IAAI,GAAG,CAAC,CAAA;AACjB,CAAC;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,KAAK,mDAAiB,UAAkB;IAStC,MAAM,OAAO,GAAG,uBAAA,IAAI,sFAAiB,MAArB,IAAI,EAClB,GAAG,IAAI,CAAC,oBAAoB,IAAI,UAAU,EAAE,CAC7C,CAAA;IAED,MAAM,MAAM,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAA;IACvC,MAAM,UAAU,GAAG,MAAM,MAAM,CAAC,iBAAiB,EAAE,CAAA;IAEnD,IAAI,QAAQ,GAAG,KAAK,CAAA;IACpB,MAAM,OAAO,GAAG,KAAK,EAAE,MAAe,EAAE,EAAE;QACxC,IAAI,QAAQ,EAAE,CAAC;YACb,OAAM;QACR,CAAC;QACD,QAAQ,GAAG,IAAI,CAAA;QAEf,IAAI,CAAC;YACH,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,UAAU,CAAC,KAAK,CAAC,+BAA+B,EAAE,CAAC,OAAO,CAAC,CAAC,CAAA;YACpE,CAAC;QACH,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QAC5C,CAAC;IACH,CAAC,CAAA;IAED,IAAI,CAAC;QACH;;;WAGG;QACH,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,KAAK,CACjC,6CAA6C,EAC7C,CAAC,OAAO,CAAC,CACV,CAAA;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC;YAC3B,MAAM,OAAO,CAAC,KAAK,CAAC,CAAA;YACpB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,mBAAmB;gBAC3B,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;aACxB,CAAA;QACH,CAAC;QAED;;;WAGG;QACH,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,KAAK,CACrC,2BAA2B,IAAI,CAAC,oBAAoB,yBAAyB,EAC7E,CAAC,UAAU,CAAC,CACb,CAAA;QAED,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;QAE/B,IAAI,MAAM,EAAE,WAAW,EAAE,CAAC;YACxB,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;YACnB,OAAO;gBACL,OAAO,EAAE,KAAK;gBACd,MAAM,EAAE,kBAAkB;gBAC1B,OAAO,EAAE,KAAK,IAAI,EAAE,GAAE,CAAC;aACxB,CAAA;QACH,CAAC;QAED;;WAEG;QACH,MAAM,cAAc,GAAG,CAAC,CAAC,MAAM,CAAA;QAE/B;;;;WAIG;QACH,MAAM,UAAU,CAAC,KAAK,CACpB,eAAe,IAAI,CAAC,oBAAoB;;iBAE/B,IAAI,CAAC,oBAAoB,sBAAsB,EACxD,CAAC,UAAU,CAAC,CACb,CAAA;QAED,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAA;IACxE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;QACnB,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC,qHAE0B,UAAkB;IAC3C,OAAO,IAAI,CAAC,YAAY,CAAC,GAAG,CAC1B,UAAU,IAAI,CAAC,oBAAoB,gDAAgD,EACnF,CAAC,UAAU,CAAC,CACb,CAAA;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@medusajs/framework",
|
|
3
|
-
"version": "2.20.
|
|
3
|
+
"version": "2.20.2-preview-20260904091918",
|
|
4
4
|
"description": "Framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -75,18 +75,18 @@
|
|
|
75
75
|
"test": "../../../node_modules/.bin/jest --bail --forceExit --testPathPattern=src"
|
|
76
76
|
},
|
|
77
77
|
"devDependencies": {
|
|
78
|
-
"@medusajs/cli": "2.20.
|
|
78
|
+
"@medusajs/cli": "2.20.2-preview-20260904091918"
|
|
79
79
|
},
|
|
80
80
|
"dependencies": {
|
|
81
81
|
"@aws-sdk/client-dynamodb": "^3.980.0",
|
|
82
82
|
"@jercle/yargonaut": "^1.1.5",
|
|
83
|
-
"@medusajs/deps": "2.20.
|
|
84
|
-
"@medusajs/modules-sdk": "2.20.
|
|
85
|
-
"@medusajs/orchestration": "2.20.
|
|
86
|
-
"@medusajs/telemetry": "2.20.
|
|
87
|
-
"@medusajs/types": "2.20.
|
|
88
|
-
"@medusajs/utils": "2.20.
|
|
89
|
-
"@medusajs/workflows-sdk": "2.20.
|
|
83
|
+
"@medusajs/deps": "2.20.2-preview-20260904091918",
|
|
84
|
+
"@medusajs/modules-sdk": "2.20.2-preview-20260904091918",
|
|
85
|
+
"@medusajs/orchestration": "2.20.2-preview-20260904091918",
|
|
86
|
+
"@medusajs/telemetry": "2.20.2-preview-20260904091918",
|
|
87
|
+
"@medusajs/types": "2.20.2-preview-20260904091918",
|
|
88
|
+
"@medusajs/utils": "2.20.2-preview-20260904091918",
|
|
89
|
+
"@medusajs/workflows-sdk": "2.20.2-preview-20260904091918",
|
|
90
90
|
"@types/express": "^4.17.21",
|
|
91
91
|
"chokidar": "^4.0.3",
|
|
92
92
|
"compression": "^1.8.1",
|
|
@@ -106,7 +106,7 @@
|
|
|
106
106
|
"zod-validation-error": "5.0.0"
|
|
107
107
|
},
|
|
108
108
|
"peerDependencies": {
|
|
109
|
-
"@medusajs/cli": "2.20.
|
|
109
|
+
"@medusajs/cli": "2.20.2-preview-20260904091918",
|
|
110
110
|
"ioredis": "^5.4.1"
|
|
111
111
|
},
|
|
112
112
|
"peerDependenciesMeta": {
|