@medusajs/framework 2.9.0-snapshot-20250807121237 → 2.9.0-snapshot-20250814100249
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/config/config.d.ts +1 -1
- package/dist/config/config.d.ts.map +1 -1
- package/dist/config/config.js +4 -7
- package/dist/config/config.js.map +1 -1
- package/dist/config/loader.d.ts +2 -2
- package/dist/config/loader.d.ts.map +1 -1
- package/dist/config/loader.js +4 -4
- package/dist/config/loader.js.map +1 -1
- package/dist/feature-flags/feature-flag-loader.d.ts.map +1 -1
- package/dist/feature-flags/feature-flag-loader.js +6 -5
- package/dist/feature-flags/feature-flag-loader.js.map +1 -1
- package/dist/http/express-loader.d.ts +1 -3
- package/dist/http/express-loader.d.ts.map +1 -1
- package/dist/http/express-loader.js +7 -8
- package/dist/http/express-loader.js.map +1 -1
- package/dist/http/router.d.ts +1 -3
- package/dist/http/router.d.ts.map +1 -1
- package/dist/http/router.js +24 -28
- package/dist/http/router.js.map +1 -1
- package/dist/jobs/job-loader.d.ts +1 -1
- package/dist/jobs/job-loader.d.ts.map +1 -1
- package/dist/jobs/job-loader.js +6 -5
- package/dist/jobs/job-loader.js.map +1 -1
- package/dist/links/link-loader.d.ts +1 -2
- package/dist/links/link-loader.d.ts.map +1 -1
- package/dist/links/link-loader.js +6 -8
- package/dist/links/link-loader.js.map +1 -1
- package/dist/subscribers/subscriber-loader.d.ts +1 -2
- package/dist/subscribers/subscriber-loader.d.ts.map +1 -1
- package/dist/subscribers/subscriber-loader.js +9 -8
- package/dist/subscribers/subscriber-loader.js.map +1 -1
- package/dist/utils/resource-loader.d.ts +1 -3
- package/dist/utils/resource-loader.d.ts.map +1 -1
- package/dist/utils/resource-loader.js +3 -3
- package/dist/utils/resource-loader.js.map +1 -1
- package/dist/workflows/workflow-loader.d.ts +1 -2
- package/dist/workflows/workflow-loader.d.ts.map +1 -1
- package/dist/workflows/workflow-loader.js +5 -4
- package/dist/workflows/workflow-loader.js.map +1 -1
- package/package.json +9 -9
package/dist/config/config.d.ts
CHANGED
|
@@ -22,7 +22,7 @@ export declare class ConfigManager {
|
|
|
22
22
|
* @param projectConfig
|
|
23
23
|
* @protected
|
|
24
24
|
*/
|
|
25
|
-
protected normalizeProjectConfig(projectConfig: Partial<ConfigModule>): ConfigModule["projectConfig"];
|
|
25
|
+
protected normalizeProjectConfig(projectConfig: Partial<ConfigModule["projectConfig"]>): ConfigModule["projectConfig"];
|
|
26
26
|
/**
|
|
27
27
|
* Prepare the full configuration after validation and normalization
|
|
28
28
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAItC,qBAAa,aAAa;;IA8BxB,IAAI,MAAM,IAAI,YAAY,CAOzB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,YAAY,IAAI,OAAO,CAE1B;;IAID;;;;OAIG;IACH,SAAS,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,GAAG,IAAI;IAQnD;;;;OAIG;IACH,SAAS,CAAC,eAAe,CACvB,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GACpD,YAAY,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC;IAmDxC;;;;OAIG;IACH,SAAS,CAAC,sBAAsB,CAC9B,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,GACpD,YAAY,CAAC,eAAe,CAAC;IA+BhC;;OAEG;IACH,UAAU,CAAC,EACT,aAAkB,EAClB,OAAO,GACR,EAAE;QACD,aAAa,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QACpC,OAAO,EAAE,MAAM,CAAA;KAChB,GAAG,YAAY;CAmBjB"}
|
package/dist/config/config.js
CHANGED
|
@@ -91,13 +91,11 @@ class ConfigManager {
|
|
|
91
91
|
* @protected
|
|
92
92
|
*/
|
|
93
93
|
normalizeProjectConfig(projectConfig) {
|
|
94
|
-
const
|
|
95
|
-
const outputConfig = (0, utils_1.deepCopy)(projConfig);
|
|
94
|
+
const outputConfig = (0, utils_1.deepCopy)(projectConfig);
|
|
96
95
|
if (!outputConfig?.redisUrl) {
|
|
97
|
-
|
|
98
|
-
customLogger.log(`redisUrl not found. A fake redis instance will be used.`);
|
|
96
|
+
console.log(`redisUrl not found. A fake redis instance will be used.`);
|
|
99
97
|
}
|
|
100
|
-
outputConfig.http = this.buildHttpConfig(
|
|
98
|
+
outputConfig.http = this.buildHttpConfig(projectConfig);
|
|
101
99
|
let workerMode = outputConfig?.workerMode;
|
|
102
100
|
if (!(0, utils_1.isDefined)(workerMode)) {
|
|
103
101
|
const env = __classPrivateFieldGet(this, _ConfigManager_instances, "a", _ConfigManager_envWorkMode_get);
|
|
@@ -121,7 +119,7 @@ class ConfigManager {
|
|
|
121
119
|
*/
|
|
122
120
|
loadConfig({ projectConfig = {}, baseDir, }) {
|
|
123
121
|
__classPrivateFieldSet(this, _ConfigManager_baseDir, baseDir, "f");
|
|
124
|
-
const normalizedProjectConfig = this.normalizeProjectConfig(projectConfig);
|
|
122
|
+
const normalizedProjectConfig = this.normalizeProjectConfig(projectConfig.projectConfig ?? {});
|
|
125
123
|
__classPrivateFieldSet(this, _ConfigManager_config, {
|
|
126
124
|
projectConfig: normalizedProjectConfig,
|
|
127
125
|
admin: projectConfig.admin ?? {
|
|
@@ -130,7 +128,6 @@ class ConfigManager {
|
|
|
130
128
|
modules: projectConfig.modules ?? {},
|
|
131
129
|
featureFlags: projectConfig.featureFlags ?? {},
|
|
132
130
|
plugins: projectConfig.plugins ?? [],
|
|
133
|
-
logger: projectConfig.logger ?? logger_1.logger,
|
|
134
131
|
}, "f");
|
|
135
132
|
return __classPrivateFieldGet(this, _ConfigManager_config, "f");
|
|
136
133
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"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"}
|
package/dist/config/loader.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import { ConfigManager } from "./config";
|
|
2
1
|
import { ConfigModule } from "./types";
|
|
2
|
+
import { ConfigManager } from "./config";
|
|
3
3
|
export declare const configManager: ConfigManager;
|
|
4
4
|
/**
|
|
5
5
|
* Loads the config file and returns the config module after validating, normalizing the configurations
|
|
@@ -7,5 +7,5 @@ export declare const configManager: ConfigManager;
|
|
|
7
7
|
* @param entryDirectory The directory to find the config file from
|
|
8
8
|
* @param configFileName The name of the config file to search for in the entry directory
|
|
9
9
|
*/
|
|
10
|
-
export declare function configLoader(entryDirectory: string, configFileName
|
|
10
|
+
export declare function configLoader(entryDirectory: string, configFileName: string): Promise<ConfigModule>;
|
|
11
11
|
//# sourceMappingURL=loader.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAGtC,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAYxC,eAAO,MAAM,aAAa,eAAsB,CAAA;AAOhD;;;;;GAKG;AACH,wBAAsB,YAAY,CAChC,cAAc,EAAE,MAAM,EACtB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,YAAY,CAAC,CAcvB"}
|
package/dist/config/loader.js
CHANGED
|
@@ -3,16 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.configManager = void 0;
|
|
4
4
|
exports.configLoader = configLoader;
|
|
5
5
|
const utils_1 = require("@medusajs/utils");
|
|
6
|
-
const awilix_1 = require("awilix");
|
|
7
|
-
const container_1 = require("../container");
|
|
8
6
|
const logger_1 = require("../logger");
|
|
9
7
|
const config_1 = require("./config");
|
|
8
|
+
const container_1 = require("../container");
|
|
9
|
+
const awilix_1 = require("awilix");
|
|
10
10
|
const handleConfigError = (error) => {
|
|
11
11
|
logger_1.logger.error(`Error in loading config: ${error.message}`);
|
|
12
12
|
if (error.stack) {
|
|
13
13
|
logger_1.logger.error(error.stack);
|
|
14
14
|
}
|
|
15
|
-
|
|
15
|
+
process.exit(1);
|
|
16
16
|
};
|
|
17
17
|
exports.configManager = new config_1.ConfigManager();
|
|
18
18
|
container_1.container.register(utils_1.ContainerRegistrationKeys.CONFIG_MODULE, (0, awilix_1.asFunction)(() => exports.configManager.config));
|
|
@@ -22,7 +22,7 @@ container_1.container.register(utils_1.ContainerRegistrationKeys.CONFIG_MODULE,
|
|
|
22
22
|
* @param entryDirectory The directory to find the config file from
|
|
23
23
|
* @param configFileName The name of the config file to search for in the entry directory
|
|
24
24
|
*/
|
|
25
|
-
async function configLoader(entryDirectory, configFileName
|
|
25
|
+
async function configLoader(entryDirectory, configFileName) {
|
|
26
26
|
const config = await (0, utils_1.getConfigFile)(entryDirectory, configFileName);
|
|
27
27
|
if (config.error) {
|
|
28
28
|
handleConfigError(config.error);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":";;;AA4BA,oCAiBC;
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":";;;AA4BA,oCAiBC;AA5CD,2CAA0E;AAC1E,sCAAkC;AAClC,qCAAwC;AACxC,4CAAwC;AACxC,mCAAmC;AAEnC,MAAM,iBAAiB,GAAG,CAAC,KAAY,EAAQ,EAAE;IAC/C,eAAM,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IACzD,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChB,eAAM,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAC3B,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC,CAAA;AAEY,QAAA,aAAa,GAAG,IAAI,sBAAa,EAAE,CAAA;AAEhD,qBAAS,CAAC,QAAQ,CAChB,iCAAyB,CAAC,aAAa,EACvC,IAAA,mBAAU,EAAC,GAAG,EAAE,CAAC,qBAAa,CAAC,MAAM,CAAC,CACvC,CAAA;AAED;;;;;GAKG;AACI,KAAK,UAAU,YAAY,CAChC,cAAsB,EACtB,cAAsB;IAEtB,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAa,EAChC,cAAc,EACd,cAAc,CACf,CAAA;IAED,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACjC,CAAC;IAED,OAAO,qBAAa,CAAC,UAAU,CAAC;QAC9B,aAAa,EAAE,MAAM,CAAC,YAAa;QACnC,OAAO,EAAE,cAAc;KACxB,CAAC,CAAA;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-flag-loader.d.ts","sourceRoot":"","sources":["../../src/feature-flags/feature-flag-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,UAAU,EAOX,MAAM,iBAAiB,CAAA;AAQxB,eAAO,MAAM,iBAAiB,YAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"feature-flag-loader.d.ts","sourceRoot":"","sources":["../../src/feature-flags/feature-flag-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,UAAU,EAOX,MAAM,iBAAiB,CAAA;AAQxB,eAAO,MAAM,iBAAiB,YAAqB,CAAA;AA+DnD;;;GAGG;AACH,wBAAsB,kBAAkB,CACtC,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,UAAU,CAAC,CAuCrB"}
|
|
@@ -8,12 +8,13 @@ const awilix_1 = require("awilix");
|
|
|
8
8
|
const path_1 = require("path");
|
|
9
9
|
const config_1 = require("../config");
|
|
10
10
|
const container_1 = require("../container");
|
|
11
|
+
const logger_1 = require("../logger");
|
|
11
12
|
exports.featureFlagRouter = new utils_1.FlagRouter({});
|
|
12
13
|
container_1.container.register(utils_1.ContainerRegistrationKeys.FEATURE_FLAG_ROUTER, (0, awilix_1.asFunction)(() => exports.featureFlagRouter));
|
|
13
14
|
const excludedFiles = ["index.js", "index.ts"];
|
|
14
15
|
const excludedExtensions = [".d.ts", ".d.ts.map", ".js.map"];
|
|
15
16
|
const flagConfig = {};
|
|
16
|
-
function registerFlag(flag, projectConfigFlags
|
|
17
|
+
function registerFlag(flag, projectConfigFlags) {
|
|
17
18
|
flagConfig[flag.key] = (0, utils_1.isTruthy)(flag.default_val);
|
|
18
19
|
let from;
|
|
19
20
|
if ((0, utils_1.isDefined)(process.env[flag.env_key])) {
|
|
@@ -36,8 +37,8 @@ function registerFlag(flag, projectConfigFlags, logger) {
|
|
|
36
37
|
flagConfig[flag.key] = projectConfigFlags[flag.key];
|
|
37
38
|
}
|
|
38
39
|
}
|
|
39
|
-
if (logger && from) {
|
|
40
|
-
logger.info(`Using flag ${flag.env_key} from ${from} with value ${flagConfig[flag.key]}`);
|
|
40
|
+
if (logger_1.logger && from) {
|
|
41
|
+
logger_1.logger.info(`Using flag ${flag.env_key} from ${from} with value ${flagConfig[flag.key]}`);
|
|
41
42
|
}
|
|
42
43
|
if (flagConfig[flag.key]) {
|
|
43
44
|
(0, telemetry_1.trackFeatureFlag)(flag.key);
|
|
@@ -49,7 +50,7 @@ function registerFlag(flag, projectConfigFlags, logger) {
|
|
|
49
50
|
* @param sourcePath
|
|
50
51
|
*/
|
|
51
52
|
async function featureFlagsLoader(sourcePath) {
|
|
52
|
-
const { featureFlags: projectConfigFlags = {}
|
|
53
|
+
const { featureFlags: projectConfigFlags = {} } = config_1.configManager.config;
|
|
53
54
|
if (!sourcePath) {
|
|
54
55
|
return exports.featureFlagRouter;
|
|
55
56
|
}
|
|
@@ -71,7 +72,7 @@ async function featureFlagsLoader(sourcePath) {
|
|
|
71
72
|
if (!featureFlag) {
|
|
72
73
|
return;
|
|
73
74
|
}
|
|
74
|
-
registerFlag(featureFlag, projectConfigFlags
|
|
75
|
+
registerFlag(featureFlag, projectConfigFlags);
|
|
75
76
|
return;
|
|
76
77
|
});
|
|
77
78
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"feature-flag-loader.js","sourceRoot":"","sources":["../../src/feature-flags/feature-flag-loader.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"feature-flag-loader.js","sourceRoot":"","sources":["../../src/feature-flags/feature-flag-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,6 @@
|
|
|
1
|
-
import { MedusaContainer } from "@medusajs/framework/types";
|
|
2
1
|
import { Express } from "express";
|
|
3
|
-
export declare function expressLoader({ app
|
|
2
|
+
export declare function expressLoader({ app }: {
|
|
4
3
|
app: Express;
|
|
5
|
-
container: MedusaContainer;
|
|
6
4
|
}): Promise<{
|
|
7
5
|
app: Express;
|
|
8
6
|
shutdown: () => Promise<void>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-loader.d.ts","sourceRoot":"","sources":["../../src/http/express-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"express-loader.d.ts","sourceRoot":"","sources":["../../src/http/express-loader.ts"],"names":[],"mappings":"AAGA,OAAgB,EAAE,OAAO,EAAkB,MAAM,SAAS,CAAA;AAa1D,wBAAsB,aAAa,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC;IACtE,GAAG,EAAE,OAAO,CAAA;IACZ,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC9B,CAAC,CAwID"}
|
|
@@ -4,8 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.expressLoader = expressLoader;
|
|
7
|
-
const utils_1 = require("@medusajs/
|
|
8
|
-
const utils_2 = require("@medusajs/utils");
|
|
7
|
+
const utils_1 = require("@medusajs/utils");
|
|
9
8
|
const connect_redis_1 = __importDefault(require("connect-redis"));
|
|
10
9
|
const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
11
10
|
const express_1 = __importDefault(require("express"));
|
|
@@ -14,9 +13,10 @@ const ioredis_1 = __importDefault(require("ioredis"));
|
|
|
14
13
|
const morgan_1 = __importDefault(require("morgan"));
|
|
15
14
|
const path_1 = __importDefault(require("path"));
|
|
16
15
|
const config_1 = require("../config");
|
|
16
|
+
const logger_1 = require("../logger");
|
|
17
17
|
const NOISY_ENDPOINTS_CHUNKS = ["@fs", "@id", "@vite", "@react", "node_modules"];
|
|
18
18
|
const isHealthCheck = (req) => req.path === "/health";
|
|
19
|
-
async function expressLoader({ app
|
|
19
|
+
async function expressLoader({ app }) {
|
|
20
20
|
const baseDir = config_1.configManager.baseDir;
|
|
21
21
|
const configModule = config_1.configManager.config;
|
|
22
22
|
const isProduction = config_1.configManager.isProduction;
|
|
@@ -24,7 +24,6 @@ async function expressLoader({ app, container, }) {
|
|
|
24
24
|
const IS_DEV = NODE_ENV.startsWith("dev");
|
|
25
25
|
const isStaging = NODE_ENV === "staging";
|
|
26
26
|
const isTest = NODE_ENV === "test";
|
|
27
|
-
const logger = container.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
|
|
28
27
|
let sameSite = false;
|
|
29
28
|
let secure = false;
|
|
30
29
|
if (isProduction || isStaging) {
|
|
@@ -49,8 +48,8 @@ async function expressLoader({ app, container, }) {
|
|
|
49
48
|
};
|
|
50
49
|
let redisClient;
|
|
51
50
|
if (configModule?.projectConfig.sessionOptions?.dynamodbOptions) {
|
|
52
|
-
const storeFactory = await (0,
|
|
53
|
-
const client = await (0,
|
|
51
|
+
const storeFactory = await (0, utils_1.dynamicImport)("connect-dynamodb");
|
|
52
|
+
const client = await (0, utils_1.dynamicImport)("@aws-sdk/client-dynamodb");
|
|
54
53
|
const DynamoDBStore = storeFactory({ session: express_session_1.default });
|
|
55
54
|
sessionOpts.store = new DynamoDBStore({
|
|
56
55
|
...configModule.projectConfig.sessionOptions.dynamodbOptions,
|
|
@@ -74,7 +73,7 @@ async function expressLoader({ app, container, }) {
|
|
|
74
73
|
return (isTest ||
|
|
75
74
|
isHealthCheck(req) ||
|
|
76
75
|
NOISY_ENDPOINTS_CHUNKS.some((chunk) => req.url.includes(chunk)) ||
|
|
77
|
-
!logger.shouldLog("http"));
|
|
76
|
+
!logger_1.logger.shouldLog("http"));
|
|
78
77
|
}
|
|
79
78
|
let loggingMiddleware;
|
|
80
79
|
/**
|
|
@@ -113,7 +112,7 @@ async function expressLoader({ app, container, }) {
|
|
|
113
112
|
loggingMiddleware = (0, morgan_1.default)(":method :url ← :referrer (:status) - :response-time ms", {
|
|
114
113
|
skip: shouldSkipHttpLog,
|
|
115
114
|
stream: {
|
|
116
|
-
write: (message) => logger.http(message.trim()),
|
|
115
|
+
write: (message) => logger_1.logger.http(message.trim()),
|
|
117
116
|
},
|
|
118
117
|
});
|
|
119
118
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"express-loader.js","sourceRoot":"","sources":["../../src/http/express-loader.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"express-loader.js","sourceRoot":"","sources":["../../src/http/express-loader.ts"],"names":[],"mappings":";;;;;AAgBA,sCA2IC;AA3JD,2CAA+C;AAC/C,kEAAuC;AACvC,kEAAwC;AACxC,sDAA0D;AAC1D,sEAAqC;AACrC,sDAA2B;AAC3B,oDAA2B;AAC3B,gDAAuB;AACvB,sCAAyC;AACzC,sCAAkC;AAGlC,MAAM,sBAAsB,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,cAAc,CAAC,CAAA;AAEhF,MAAM,aAAa,GAAG,CAAC,GAAkB,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,SAAS,CAAA;AAE7D,KAAK,UAAU,aAAa,CAAC,EAAE,GAAG,EAAoB;IAI3D,MAAM,OAAO,GAAG,sBAAa,CAAC,OAAO,CAAA;IACrC,MAAM,YAAY,GAAG,sBAAa,CAAC,MAAM,CAAA;IACzC,MAAM,YAAY,GAAG,sBAAa,CAAC,YAAY,CAAA;IAC/C,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAA;IACtD,MAAM,MAAM,GAAG,QAAQ,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,SAAS,GAAG,QAAQ,KAAK,SAAS,CAAA;IACxC,MAAM,MAAM,GAAG,QAAQ,KAAK,MAAM,CAAA;IAElC,IAAI,QAAQ,GAAqB,KAAK,CAAA;IACtC,IAAI,MAAM,GAAG,KAAK,CAAA;IAClB,IAAI,YAAY,IAAI,SAAS,EAAE,CAAC;QAC9B,MAAM,GAAG,IAAI,CAAA;QACb,QAAQ,GAAG,MAAM,CAAA;IACnB,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,aAAa,EAAE,GAAG,YAAY,CAAC,aAAa,CAAA;IAC1E,MAAM,WAAW,GAAG;QAClB,IAAI,EAAE,cAAc,EAAE,IAAI,IAAI,aAAa;QAC3C,MAAM,EAAE,cAAc,EAAE,MAAM,IAAI,IAAI;QACtC,OAAO,EAAE,cAAc,EAAE,OAAO,IAAI,KAAK;QACzC,iBAAiB,EAAE,cAAc,EAAE,iBAAiB,IAAI,KAAK;QAC7D,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,cAAc,EAAE,MAAM,IAAI,IAAI,EAAE,YAAY;QACpD,MAAM,EAAE;YACN,QAAQ;YACR,MAAM;YACN,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,IAAI;YAClD,GAAG,aAAa;SACjB;QACD,KAAK,EAAE,IAAI;KACZ,CAAA;IAED,IAAI,WAAkB,CAAA;IAEtB,IAAI,YAAY,EAAE,aAAa,CAAC,cAAc,EAAE,eAAe,EAAE,CAAC;QAChE,MAAM,YAAY,GAAG,MAAM,IAAA,qBAAa,EAAC,kBAAkB,CAAC,CAAA;QAC5D,MAAM,MAAM,GAAG,MAAM,IAAA,qBAAa,EAAC,0BAA0B,CAAC,CAAA;QAC9D,MAAM,aAAa,GAAG,YAAY,CAAC,EAAE,OAAO,EAAP,yBAAO,EAAE,CAAC,CAAA;QAC/C,WAAW,CAAC,KAAK,GAAG,IAAI,aAAa,CAAC;YACpC,GAAG,YAAY,CAAC,aAAa,CAAC,cAAc,CAAC,eAAe;YAC5D,MAAM,EAAE,IAAI,MAAM,CAAC,cAAc,CAC/B,YAAY,CAAC,aAAa,CAAC,cAAc,CAAC,eAAe,CAAC,aAAa,CACxE;SACF,CAAC,CAAA;IACJ,CAAC;SAAM,IAAI,YAAY,EAAE,aAAa,EAAE,QAAQ,EAAE,CAAC;QACjD,MAAM,UAAU,GAAG,IAAA,uBAAW,EAAC,yBAAO,CAAC,CAAA;QACvC,WAAW,GAAG,IAAI,iBAAK,CACrB,YAAY,CAAC,aAAa,CAAC,QAAQ,EACnC,YAAY,CAAC,aAAa,CAAC,YAAY,IAAI,EAAE,CAC9C,CAAA;QACD,WAAW,CAAC,KAAK,GAAG,IAAI,UAAU,CAAC;YACjC,MAAM,EAAE,WAAW;YACnB,MAAM,EAAE,GAAG,YAAY,EAAE,aAAa,EAAE,WAAW,IAAI,EAAE,OAAO;SACjE,CAAC,CAAA;IACJ,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAA;IAEzB;;;OAGG;IACH,SAAS,iBAAiB,CAAC,GAAkB,EAAE,GAAmB;QAChE,OAAO,CACL,MAAM;YACN,aAAa,CAAC,GAAG,CAAC;YAClB,sBAAsB,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;YAC/D,CAAC,eAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAC1B,CAAA;IACH,CAAC;IAED,IAAI,iBAAiC,CAAA;IAErC;;;OAGG;IACH,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,UAAU,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACtC,MAAM,MAAM,GAAG;gBACb,KAAK,EAAE,MAAM;gBACb,YAAY;gBACZ,SAAS,EAAE,GAAG,CAAC,EAAE,IAAI,GAAG;gBAExB,oEAAoE;gBACpE,UAAU,EAAE,GAAG,CAAC,SAAS,IAAI,GAAG;gBAEhC,mCAAmC;gBACnC,YAAY,EAAE,MAAM,CAAC,cAAc,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC;gBAC9C,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;gBAC/B,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC;gBAE1B,mBAAmB;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBACvC,aAAa,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,IAAI,CAAC;gBAC1D,YAAY,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,EAAE,gBAAgB,CAAC,IAAI,CAAC;gBACzD,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;gBAEnD,yDAAyD;gBACzD,QAAQ,EAAE,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,GAAG;gBAC1C,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC;gBAE1C,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;aACpC,CAAA;YAED,OAAO,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;QAC/B,CAAC,CAAA;QAED,iBAAiB,GAAG,IAAA,gBAAM,EAAC,UAAU,EAAE;YACrC,IAAI,EAAE,iBAAiB;SACxB,CAAC,CAAA;IACJ,CAAC;SAAM,CAAC;QACN,iBAAiB,GAAG,IAAA,gBAAM,EACxB,wDAAwD,EACxD;YACE,IAAI,EAAE,iBAAiB;YACvB,MAAM,EAAE;gBACN,KAAK,EAAE,CAAC,OAAe,EAAE,EAAE,CAAC,eAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;aACxD;SACF,CACF,CAAA;IACH,CAAC;IAED,GAAG,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAC1B,GAAG,CAAC,GAAG,CAAC,IAAA,uBAAY,GAAE,CAAC,CAAA;IACvB,GAAG,CAAC,GAAG,CAAC,IAAA,yBAAO,EAAC,WAAW,CAAC,CAAC,CAAA;IAE7B,+FAA+F;IAC/F,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,iBAAO,CAAC,MAAM,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAA;IAEhE,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,WAAW,EAAE,UAAU,EAAE,CAAA;IAC3B,CAAC,CAAA;IAED,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAA;AAC1B,CAAC"}
|
package/dist/http/router.d.ts
CHANGED
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import type { Express, RequestHandler } from "express";
|
|
2
2
|
import type { MiddlewareFunction, RouteHandler } from "./types";
|
|
3
|
-
import { MedusaContainer } from "@medusajs/types";
|
|
4
3
|
export declare class ApiLoader {
|
|
5
4
|
#private;
|
|
6
5
|
/**
|
|
@@ -19,11 +18,10 @@ export declare class ApiLoader {
|
|
|
19
18
|
route: string;
|
|
20
19
|
method?: string;
|
|
21
20
|
}) => RequestHandler | MiddlewareFunction;
|
|
22
|
-
constructor({ app, sourceDir, baseRestrictedFields,
|
|
21
|
+
constructor({ app, sourceDir, baseRestrictedFields, }: {
|
|
23
22
|
app: Express;
|
|
24
23
|
sourceDir: string | string[];
|
|
25
24
|
baseRestrictedFields?: string[];
|
|
26
|
-
container: MedusaContainer;
|
|
27
25
|
});
|
|
28
26
|
load(): Promise<void>;
|
|
29
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/http/router.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"router.d.ts","sourceRoot":"","sources":["../../src/http/router.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,OAAO,EAAE,cAAc,EAAuB,MAAM,SAAS,CAAA;AAC3E,OAAO,KAAK,EAKV,kBAAkB,EAIlB,YAAY,EAEb,MAAM,SAAS,CAAA;AAchB,qBAAa,SAAS;;IACpB;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,EAAE,CAClB,OAAO,EAAE,YAAY,EACrB,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,KACrC,YAAY,CAAA;IAEjB;;;OAGG;IACH,MAAM,CAAC,eAAe,CAAC,EAAE,CACvB,OAAO,EAAE,cAAc,GAAG,kBAAkB,EAC5C,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,KACtC,cAAc,GAAG,kBAAkB,CAAA;gBAc5B,EACV,GAAG,EACH,SAAS,EACT,oBAAyB,GAC1B,EAAE;QACD,GAAG,EAAE,OAAO,CAAA;QACZ,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QAC5B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;KAChC;IAmRK,IAAI;CA6GX"}
|
package/dist/http/router.js
CHANGED
|
@@ -13,24 +13,25 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
13
13
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
14
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
15
|
};
|
|
16
|
-
var _ApiLoader_instances, _a, _ApiLoader_app, _ApiLoader_sourceDirs,
|
|
16
|
+
var _ApiLoader_instances, _a, _ApiLoader_app, _ApiLoader_sourceDirs, _ApiLoader_loadHttpResources, _ApiLoader_registerExpressHandler, _ApiLoader_assignRestrictedFields, _ApiLoader_createCorsOptions, _ApiLoader_applyCorsMiddleware, _ApiLoader_applyAuthMiddleware, _ApiLoader_applyBodyParserMiddleware, _ApiLoader_assignAdditionalDataValidator, _ApiLoader_applyStorePublishableKeyMiddleware;
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
exports.ApiLoader = void 0;
|
|
19
|
-
const
|
|
19
|
+
const reporter_1 = __importDefault(require("@medusajs/cli/dist/reporter"));
|
|
20
20
|
const cors_1 = __importDefault(require("cors"));
|
|
21
|
-
const
|
|
22
|
-
const middleware_file_loader_1 = require("./middleware-file-loader");
|
|
23
|
-
const middlewares_1 = require("./middlewares");
|
|
24
|
-
const bodyparser_1 = require("./middlewares/bodyparser");
|
|
25
|
-
const ensure_publishable_api_key_1 = require("./middlewares/ensure-publishable-api-key");
|
|
26
|
-
const error_handler_1 = require("./middlewares/error-handler");
|
|
27
|
-
const routes_finder_1 = require("./routes-finder");
|
|
21
|
+
const utils_1 = require("@medusajs/utils");
|
|
28
22
|
const routes_loader_1 = require("./routes-loader");
|
|
23
|
+
const routes_finder_1 = require("./routes-finder");
|
|
29
24
|
const routes_sorter_1 = require("./routes-sorter");
|
|
30
|
-
const restricted_fields_1 = require("./utils/restricted-fields");
|
|
31
25
|
const wrap_handler_1 = require("./utils/wrap-handler");
|
|
26
|
+
const middlewares_1 = require("./middlewares");
|
|
27
|
+
const error_handler_1 = require("./middlewares/error-handler");
|
|
28
|
+
const restricted_fields_1 = require("./utils/restricted-fields");
|
|
29
|
+
const middleware_file_loader_1 = require("./middleware-file-loader");
|
|
30
|
+
const bodyparser_1 = require("./middlewares/bodyparser");
|
|
31
|
+
const ensure_publishable_api_key_1 = require("./middlewares/ensure-publishable-api-key");
|
|
32
|
+
const config_1 = require("../config");
|
|
32
33
|
class ApiLoader {
|
|
33
|
-
constructor({ app, sourceDir, baseRestrictedFields = [],
|
|
34
|
+
constructor({ app, sourceDir, baseRestrictedFields = [], }) {
|
|
34
35
|
_ApiLoader_instances.add(this);
|
|
35
36
|
/**
|
|
36
37
|
* An express instance
|
|
@@ -42,11 +43,9 @@ class ApiLoader {
|
|
|
42
43
|
* @private
|
|
43
44
|
*/
|
|
44
45
|
_ApiLoader_sourceDirs.set(this, void 0);
|
|
45
|
-
_ApiLoader_logger.set(this, void 0);
|
|
46
46
|
__classPrivateFieldSet(this, _ApiLoader_app, app, "f");
|
|
47
47
|
__classPrivateFieldSet(this, _ApiLoader_sourceDirs, Array.isArray(sourceDir) ? sourceDir : [sourceDir], "f");
|
|
48
48
|
__classPrivateFieldGet(this, _ApiLoader_instances, "m", _ApiLoader_assignRestrictedFields).call(this, baseRestrictedFields ?? []);
|
|
49
|
-
__classPrivateFieldSet(this, _ApiLoader_logger, container.resolve(utils_1.ContainerRegistrationKeys.LOGGER), "f");
|
|
50
49
|
}
|
|
51
50
|
async load() {
|
|
52
51
|
const { errorHandler: sourceErrorHandler, middlewares, routes, routesFinder, bodyParserConfigRoutes, additionalDataValidatorRoutes, } = await __classPrivateFieldGet(this, _ApiLoader_instances, "m", _ApiLoader_loadHttpResources).call(this);
|
|
@@ -114,7 +113,7 @@ class ApiLoader {
|
|
|
114
113
|
}
|
|
115
114
|
}
|
|
116
115
|
exports.ApiLoader = ApiLoader;
|
|
117
|
-
_a = ApiLoader, _ApiLoader_app = new WeakMap(), _ApiLoader_sourceDirs = new WeakMap(),
|
|
116
|
+
_a = ApiLoader, _ApiLoader_app = new WeakMap(), _ApiLoader_sourceDirs = new WeakMap(), _ApiLoader_instances = new WeakSet(), _ApiLoader_loadHttpResources =
|
|
118
117
|
/**
|
|
119
118
|
* Loads routes, middleware, bodyParserConfig routes, routes that have
|
|
120
119
|
* opted out for Auth and CORS and the error handler.
|
|
@@ -136,7 +135,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
136
135
|
};
|
|
137
136
|
}, _ApiLoader_registerExpressHandler = function _ApiLoader_registerExpressHandler(route) {
|
|
138
137
|
if ("isRoute" in route) {
|
|
139
|
-
|
|
138
|
+
reporter_1.default.debug(`registering route ${route.method} ${route.matcher}`);
|
|
140
139
|
const handler = _a.traceRoute
|
|
141
140
|
? _a.traceRoute(route.handler, {
|
|
142
141
|
route: route.matcher,
|
|
@@ -147,7 +146,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
147
146
|
return;
|
|
148
147
|
}
|
|
149
148
|
if (!route.methods) {
|
|
150
|
-
|
|
149
|
+
reporter_1.default.debug(`registering global middleware for ${route.matcher}`);
|
|
151
150
|
const handler = _a.traceMiddleware
|
|
152
151
|
? _a.traceMiddleware(route.handler, {
|
|
153
152
|
route: route.matcher,
|
|
@@ -160,7 +159,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
160
159
|
? route.methods
|
|
161
160
|
: [route.methods];
|
|
162
161
|
methods.forEach((method) => {
|
|
163
|
-
|
|
162
|
+
reporter_1.default.debug(`registering route middleware ${method} ${route.matcher}`);
|
|
164
163
|
const handler = _a.traceMiddleware
|
|
165
164
|
? _a.traceMiddleware((0, wrap_handler_1.wrapHandler)(route.handler), {
|
|
166
165
|
route: route.matcher,
|
|
@@ -186,7 +185,6 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
186
185
|
preflightContinue: false,
|
|
187
186
|
};
|
|
188
187
|
}, _ApiLoader_applyCorsMiddleware = function _ApiLoader_applyCorsMiddleware(routesFinder, namespace, toggleKey, corsOptions) {
|
|
189
|
-
const logger = __classPrivateFieldGet(this, _ApiLoader_logger, "f");
|
|
190
188
|
const corsFn = (0, cors_1.default)(corsOptions);
|
|
191
189
|
const corsMiddleware = function corsMiddleware(req, res, next) {
|
|
192
190
|
let method = req.method;
|
|
@@ -198,7 +196,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
198
196
|
if (matchingRoute && matchingRoute[toggleKey] === true) {
|
|
199
197
|
return corsFn(req, res, next);
|
|
200
198
|
}
|
|
201
|
-
|
|
199
|
+
reporter_1.default.debug(`Skipping CORS middleware ${req.method} ${path}`);
|
|
202
200
|
return next();
|
|
203
201
|
};
|
|
204
202
|
__classPrivateFieldGet(this, _ApiLoader_app, "f").use(namespace, _a.traceMiddleware
|
|
@@ -207,17 +205,16 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
207
205
|
})
|
|
208
206
|
: corsMiddleware);
|
|
209
207
|
}, _ApiLoader_applyAuthMiddleware = function _ApiLoader_applyAuthMiddleware(routesFinder, namespace, actorType, authType, options) {
|
|
210
|
-
|
|
211
|
-
logger.debug(`Registering auth middleware for prefix ${namespace}`);
|
|
208
|
+
reporter_1.default.debug(`Registering auth middleware for prefix ${namespace}`);
|
|
212
209
|
const originalFn = (0, middlewares_1.authenticate)(actorType, authType, options);
|
|
213
210
|
const authMiddleware = function authMiddleware(req, res, next) {
|
|
214
211
|
const path = `${namespace}${req.path}`;
|
|
215
212
|
const matchingRoute = routesFinder.find(path, req.method);
|
|
216
213
|
if (matchingRoute && matchingRoute.optedOutOfAuth) {
|
|
217
|
-
|
|
214
|
+
reporter_1.default.debug(`Skipping auth ${req.method} ${path}`);
|
|
218
215
|
return next();
|
|
219
216
|
}
|
|
220
|
-
|
|
217
|
+
reporter_1.default.debug(`Authenticating route ${req.method} ${path}`);
|
|
221
218
|
return originalFn(req, res, next);
|
|
222
219
|
};
|
|
223
220
|
__classPrivateFieldGet(this, _ApiLoader_app, "f").use(namespace, _a.traceMiddleware
|
|
@@ -226,15 +223,14 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
226
223
|
})
|
|
227
224
|
: authMiddleware);
|
|
228
225
|
}, _ApiLoader_applyBodyParserMiddleware = function _ApiLoader_applyBodyParserMiddleware(namespace, routesFinder) {
|
|
229
|
-
|
|
226
|
+
reporter_1.default.debug(`Registering bodyparser middleware for prefix ${namespace}`);
|
|
230
227
|
__classPrivateFieldGet(this, _ApiLoader_app, "f").use(namespace, (0, bodyparser_1.createBodyParserMiddlewaresStack)(namespace, routesFinder, _a.traceMiddleware));
|
|
231
228
|
}, _ApiLoader_assignAdditionalDataValidator = function _ApiLoader_assignAdditionalDataValidator(namespace, routesFinder) {
|
|
232
|
-
|
|
233
|
-
logger.debug(`Registering assignAdditionalDataValidator middleware for prefix ${namespace}`);
|
|
229
|
+
reporter_1.default.debug(`Registering assignAdditionalDataValidator middleware for prefix ${namespace}`);
|
|
234
230
|
const additionalDataValidator = function additionalDataValidator(req, _, next) {
|
|
235
231
|
const matchingRoute = routesFinder.find(req.path, req.method);
|
|
236
232
|
if (matchingRoute && matchingRoute.validator) {
|
|
237
|
-
|
|
233
|
+
reporter_1.default.debug(`Using validator to validate additional data on ${req.method} ${req.path}`);
|
|
238
234
|
req.additionalDataValidator = matchingRoute.validator;
|
|
239
235
|
}
|
|
240
236
|
return next();
|
|
@@ -245,7 +241,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
245
241
|
})
|
|
246
242
|
: additionalDataValidator);
|
|
247
243
|
}, _ApiLoader_applyStorePublishableKeyMiddleware = function _ApiLoader_applyStorePublishableKeyMiddleware(namespace) {
|
|
248
|
-
|
|
244
|
+
reporter_1.default.debug(`Registering publishable key middleware for namespace ${namespace}`);
|
|
249
245
|
let middleware = _a.traceMiddleware
|
|
250
246
|
? _a.traceMiddleware(ensure_publishable_api_key_1.ensurePublishableApiKeyMiddleware, {
|
|
251
247
|
route: namespace,
|
package/dist/http/router.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/http/router.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"router.js","sourceRoot":"","sources":["../../src/http/router.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ type CronJobConfig = {
|
|
|
9
9
|
type CronJobHandler = (container: MedusaContainer) => Promise<any>;
|
|
10
10
|
export declare class JobLoader extends ResourceLoader {
|
|
11
11
|
protected resourceName: string;
|
|
12
|
-
constructor(sourceDir: string | string[]
|
|
12
|
+
constructor(sourceDir: string | string[]);
|
|
13
13
|
protected onFileLoaded(path: string, fileExports: {
|
|
14
14
|
default: CronJobHandler;
|
|
15
15
|
config: CronJobConfig;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-loader.d.ts","sourceRoot":"","sources":["../../src/jobs/job-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"job-loader.d.ts","sourceRoot":"","sources":["../../src/jobs/job-loader.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAA;AAC/D,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAQjD,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAEzD,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAAA;IACnC,kBAAkB,CAAC,EAAE,gBAAgB,CAAC,oBAAoB,CAAC,CAAA;CAC5D,CAAA;AAED,KAAK,cAAc,GAAG,CAAC,SAAS,EAAE,eAAe,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;AAElE,qBAAa,SAAU,SAAQ,cAAc;IAC3C,SAAS,CAAC,YAAY,SAAQ;gBAElB,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;cAIxB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE;QACX,OAAO,EAAE,cAAc,CAAA;QACvB,MAAM,EAAE,aAAa,CAAA;KACtB;IAUH;;;;OAIG;IACH,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE;QAC/B,QAAQ,EAAE,MAAM,GAAG,gBAAgB,CAAA;QACnC,IAAI,EAAE,MAAM,CAAA;KACb;IAuBD;;;;;OAKG;IACH,SAAS,CAAC,QAAQ,CAAC,EACjB,MAAM,EACN,OAAO,GACR,EAAE;QACD,MAAM,EAAE,aAAa,CAAA;QACrB,OAAO,EAAE,cAAc,CAAA;KACxB;IAiCD;;OAEG;IACG,IAAI;CAKX"}
|
package/dist/jobs/job-loader.js
CHANGED
|
@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.JobLoader = void 0;
|
|
4
4
|
const utils_1 = require("@medusajs/utils");
|
|
5
5
|
const workflows_sdk_1 = require("@medusajs/workflows-sdk");
|
|
6
|
+
const logger_1 = require("../logger");
|
|
6
7
|
const resource_loader_1 = require("../utils/resource-loader");
|
|
7
8
|
class JobLoader extends resource_loader_1.ResourceLoader {
|
|
8
|
-
constructor(sourceDir
|
|
9
|
-
super(sourceDir
|
|
9
|
+
constructor(sourceDir) {
|
|
10
|
+
super(sourceDir);
|
|
10
11
|
this.resourceName = "job";
|
|
11
12
|
}
|
|
12
13
|
async onFileLoaded(path, fileExports) {
|
|
13
14
|
this.validateConfig(fileExports.config);
|
|
14
|
-
|
|
15
|
+
logger_1.logger.debug(`Registering job from ${path}.`);
|
|
15
16
|
this.register({
|
|
16
17
|
config: fileExports.config,
|
|
17
18
|
handler: fileExports.default,
|
|
@@ -48,7 +49,7 @@ class JobLoader extends resource_loader_1.ResourceLoader {
|
|
|
48
49
|
return new workflows_sdk_1.StepResponse(res, res);
|
|
49
50
|
}
|
|
50
51
|
catch (error) {
|
|
51
|
-
|
|
52
|
+
logger_1.logger.error(`Scheduled job ${config.name} failed with error: ${error.message}`);
|
|
52
53
|
throw error;
|
|
53
54
|
}
|
|
54
55
|
});
|
|
@@ -70,7 +71,7 @@ class JobLoader extends resource_loader_1.ResourceLoader {
|
|
|
70
71
|
*/
|
|
71
72
|
async load() {
|
|
72
73
|
await super.discoverResources();
|
|
73
|
-
|
|
74
|
+
logger_1.logger.debug(`Jobs registered.`);
|
|
74
75
|
}
|
|
75
76
|
}
|
|
76
77
|
exports.JobLoader = JobLoader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"job-loader.js","sourceRoot":"","sources":["../../src/jobs/job-loader.ts"],"names":[],"mappings":";;;AAEA,2CAAuD;AACvD,2DAIgC;AAChC,8DAAyD;AAUzD,MAAa,SAAU,SAAQ,gCAAc;IAG3C,YAAY,SAA4B
|
|
1
|
+
{"version":3,"file":"job-loader.js","sourceRoot":"","sources":["../../src/jobs/job-loader.ts"],"names":[],"mappings":";;;AAEA,2CAAuD;AACvD,2DAIgC;AAChC,sCAAkC;AAClC,8DAAyD;AAUzD,MAAa,SAAU,SAAQ,gCAAc;IAG3C,YAAY,SAA4B;QACtC,KAAK,CAAC,SAAS,CAAC,CAAA;QAHR,iBAAY,GAAG,KAAK,CAAA;IAI9B,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,IAAY,EACZ,WAGC;QAED,IAAI,CAAC,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;QACvC,eAAM,CAAC,KAAK,CAAC,wBAAwB,IAAI,GAAG,CAAC,CAAA;QAC7C,IAAI,CAAC,QAAQ,CAAC;YACZ,MAAM,EAAE,WAAW,CAAC,MAAM;YAC1B,OAAO,EAAE,WAAW,CAAC,OAAO;SAC7B,CAAC,CAAA;IACJ,CAAC;IAED;;;;OAIG;IACO,cAAc,CAAC,MAGxB;QACC,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,wCAAwC,CACzC,CAAA;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;YACrB,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,0DAA0D,CAC3D,CAAA;QACH,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,mBAAW,CACnB,mBAAW,CAAC,KAAK,CAAC,gBAAgB,EAClC,0CAA0C,CAC3C,CAAA;QACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACO,QAAQ,CAAC,EACjB,MAAM,EACN,OAAO,GAIR;QACC,MAAM,YAAY,GAAG,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;QACzC,MAAM,IAAI,GAAG,IAAA,0BAAU,EACrB,GAAG,MAAM,CAAC,IAAI,UAAU,EACxB,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,EAAE;YACvB,MAAM,EAAE,SAAS,EAAE,GAAG,WAAW,CAAA;YACjC,IAAI,CAAC;gBACH,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,SAAS,CAAC,CAAA;gBACpC,OAAO,IAAI,4BAAY,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YACnC,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,eAAM,CAAC,KAAK,CACV,iBAAiB,MAAM,CAAC,IAAI,uBAAuB,KAAK,CAAC,OAAO,EAAE,CACnE,CAAA;gBACD,MAAM,KAAK,CAAA;YACb,CAAC;QACH,CAAC,CACF,CAAA;QAED,MAAM,cAAc,GAAG;YACrB,IAAI,EAAE,YAAY;YAClB,QAAQ,EAAE,IAAA,gBAAQ,EAAC,MAAM,CAAC,QAAQ,CAAC;gBACjC,CAAC,CAAC,MAAM,CAAC,QAAQ;gBACjB,CAAC,CAAC;oBACE,IAAI,EAAE,MAAM,CAAC,QAAQ;oBACrB,kBAAkB,EAAE,MAAM,CAAC,kBAAkB;iBAC9C;SACN,CAAA;QAED,IAAA,8BAAc,EAAC,cAAc,EAAE,GAAG,EAAE;YAClC,IAAI,EAAE,CAAA;QACR,CAAC,CAAC,CAAA;IACJ,CAAC;IAED;;OAEG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAA;QAE/B,eAAM,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAA;IAClC,CAAC;CACF;AA1GD,8BA0GC"}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import { Logger } from "@medusajs/types";
|
|
2
1
|
export declare class LinkLoader {
|
|
3
2
|
#private;
|
|
4
|
-
constructor(sourceDir: string | string[]
|
|
3
|
+
constructor(sourceDir: string | string[]);
|
|
5
4
|
/**
|
|
6
5
|
* Load links from the source paths, links are registering themselves,
|
|
7
6
|
* therefore we only need to import them
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-loader.d.ts","sourceRoot":"","sources":["../../src/links/link-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"link-loader.d.ts","sourceRoot":"","sources":["../../src/links/link-loader.ts"],"names":[],"mappings":"AAMA,qBAAa,UAAU;;gBAmBT,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAIxC;;;OAGG;IACG,IAAI;CAoCX"}
|
|
@@ -10,7 +10,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
|
|
|
10
10
|
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");
|
|
11
11
|
return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
|
|
12
12
|
};
|
|
13
|
-
var _LinkLoader_sourceDir, _LinkLoader_excludes
|
|
13
|
+
var _LinkLoader_sourceDir, _LinkLoader_excludes;
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.LinkLoader = void 0;
|
|
16
16
|
const utils_1 = require("@medusajs/utils");
|
|
@@ -18,7 +18,7 @@ const promises_1 = require("fs/promises");
|
|
|
18
18
|
const path_1 = require("path");
|
|
19
19
|
const logger_1 = require("../logger");
|
|
20
20
|
class LinkLoader {
|
|
21
|
-
constructor(sourceDir
|
|
21
|
+
constructor(sourceDir) {
|
|
22
22
|
/**
|
|
23
23
|
* The directory from which to load the links
|
|
24
24
|
* @private
|
|
@@ -35,9 +35,7 @@ class LinkLoader {
|
|
|
35
35
|
/(\.ts\.map|\.js\.map|\.d\.ts|\.md)/,
|
|
36
36
|
/^_[^/\\]*(\.[^/\\]+)?$/,
|
|
37
37
|
]);
|
|
38
|
-
_LinkLoader_logger.set(this, void 0);
|
|
39
38
|
__classPrivateFieldSet(this, _LinkLoader_sourceDir, sourceDir, "f");
|
|
40
|
-
__classPrivateFieldSet(this, _LinkLoader_logger, logger ?? logger_1.logger, "f");
|
|
41
39
|
}
|
|
42
40
|
/**
|
|
43
41
|
* Load links from the source paths, links are registering themselves,
|
|
@@ -52,7 +50,7 @@ class LinkLoader {
|
|
|
52
50
|
await (0, promises_1.access)(sourcePath);
|
|
53
51
|
}
|
|
54
52
|
catch {
|
|
55
|
-
|
|
53
|
+
logger_1.logger.info(`No link to load from ${sourcePath}. skipped.`);
|
|
56
54
|
return;
|
|
57
55
|
}
|
|
58
56
|
return await (0, utils_1.readDirRecursive)(sourcePath).then(async (entries) => {
|
|
@@ -60,7 +58,7 @@ class LinkLoader {
|
|
|
60
58
|
return (!entry.isDirectory() &&
|
|
61
59
|
!__classPrivateFieldGet(this, _LinkLoader_excludes, "f").some((exclude) => exclude.test(entry.name)));
|
|
62
60
|
});
|
|
63
|
-
|
|
61
|
+
logger_1.logger.debug(`Registering links from ${sourcePath}.`);
|
|
64
62
|
return await (0, utils_1.promiseAll)(fileEntries.map(async (entry) => {
|
|
65
63
|
const fullPath = (0, path_1.join)(entry.path, entry.name);
|
|
66
64
|
return await (0, utils_1.dynamicImport)(fullPath);
|
|
@@ -68,9 +66,9 @@ class LinkLoader {
|
|
|
68
66
|
});
|
|
69
67
|
});
|
|
70
68
|
await (0, utils_1.promiseAll)(promises);
|
|
71
|
-
|
|
69
|
+
logger_1.logger.debug(`Links registered.`);
|
|
72
70
|
}
|
|
73
71
|
}
|
|
74
72
|
exports.LinkLoader = LinkLoader;
|
|
75
|
-
_LinkLoader_sourceDir = new WeakMap(), _LinkLoader_excludes = new WeakMap()
|
|
73
|
+
_LinkLoader_sourceDir = new WeakMap(), _LinkLoader_excludes = new WeakMap();
|
|
76
74
|
//# sourceMappingURL=link-loader.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"link-loader.js","sourceRoot":"","sources":["../../src/links/link-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"link-loader.js","sourceRoot":"","sources":["../../src/links/link-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA6E;AAE7E,0CAAoC;AACpC,+BAA2B;AAC3B,sCAAkC;AAElC,MAAa,UAAU;IAmBrB,YAAY,SAA4B;QAlBxC;;;WAGG;QACH,wCAA6B;QAE7B;;;WAGG;QACH,+BAAsB;YACpB,WAAW;YACX,WAAW;YACX,YAAY;YACZ,oCAAoC;YACpC,wBAAwB;SACzB,EAAA;QAGC,uBAAA,IAAI,yBAAc,SAAS,MAAA,CAAA;IAC7B,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC,uBAAA,IAAI,6BAAW,CAAC;YACzD,CAAC,CAAC,uBAAA,IAAI,6BAAW;YACjB,CAAC,CAAC,CAAC,uBAAA,IAAI,6BAAW,CAAC,CAAA;QAErB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YAC7D,IAAI,CAAC;gBACH,MAAM,IAAA,iBAAM,EAAC,UAAU,CAAC,CAAA;YAC1B,CAAC;YAAC,MAAM,CAAC;gBACP,eAAM,CAAC,IAAI,CAAC,wBAAwB,UAAU,YAAY,CAAC,CAAA;gBAC3D,OAAM;YACR,CAAC;YAED,OAAO,MAAM,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAa,EAAE,EAAE;oBACnD,OAAO,CACL,CAAC,KAAK,CAAC,WAAW,EAAE;wBACpB,CAAC,uBAAA,IAAI,4BAAU,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAC5D,CAAA;gBACH,CAAC,CAAC,CAAA;gBAEF,eAAM,CAAC,KAAK,CAAC,0BAA0B,UAAU,GAAG,CAAC,CAAA;gBAErD,OAAO,MAAM,IAAA,kBAAU,EACrB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,KAAa,EAAE,EAAE;oBACtC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;oBAC7C,OAAO,MAAM,IAAA,qBAAa,EAAC,QAAQ,CAAC,CAAA;gBACtC,CAAC,CAAC,CACH,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,MAAM,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAA;QAE1B,eAAM,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;IACnC,CAAC;CACF;AA/DD,gCA+DC"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
|
-
import { MedusaContainer } from "@medusajs/types";
|
|
2
1
|
import { ResourceLoader } from "../utils/resource-loader";
|
|
3
2
|
export declare class SubscriberLoader extends ResourceLoader {
|
|
4
3
|
#private;
|
|
5
4
|
protected resourceName: string;
|
|
6
|
-
constructor(sourceDir: string | string[], options
|
|
5
|
+
constructor(sourceDir: string | string[], options?: Record<string, unknown>);
|
|
7
6
|
protected onFileLoaded(path: string, fileExports: Record<string, unknown>): Promise<void>;
|
|
8
7
|
private validateSubscriber;
|
|
9
8
|
private inferIdentifier;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriber-loader.d.ts","sourceRoot":"","sources":["../../src/subscribers/subscriber-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"subscriber-loader.d.ts","sourceRoot":"","sources":["../../src/subscribers/subscriber-loader.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AASzD,qBAAa,gBAAiB,SAAQ,cAAc;;IAClD,SAAS,CAAC,YAAY,SAAe;gBAenC,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAC5B,OAAO,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;cAMvB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAgBtC,OAAO,CAAC,kBAAkB;IA4D1B,OAAO,CAAC,eAAe;IA4BvB,OAAO,CAAC,gBAAgB;IAmClB,IAAI;CAsBX"}
|
|
@@ -17,10 +17,11 @@ const utils_1 = require("@medusajs/utils");
|
|
|
17
17
|
const path_1 = require("path");
|
|
18
18
|
const config_1 = require("../config");
|
|
19
19
|
const container_1 = require("../container");
|
|
20
|
+
const logger_1 = require("../logger");
|
|
20
21
|
const resource_loader_1 = require("../utils/resource-loader");
|
|
21
22
|
class SubscriberLoader extends resource_loader_1.ResourceLoader {
|
|
22
|
-
constructor(sourceDir, options = {}
|
|
23
|
-
super(sourceDir
|
|
23
|
+
constructor(sourceDir, options = {}) {
|
|
24
|
+
super(sourceDir);
|
|
24
25
|
this.resourceName = "subscriber";
|
|
25
26
|
/**
|
|
26
27
|
* The options of the plugin from which the subscribers are being loaded
|
|
@@ -36,7 +37,7 @@ class SubscriberLoader extends resource_loader_1.ResourceLoader {
|
|
|
36
37
|
}
|
|
37
38
|
async onFileLoaded(path, fileExports) {
|
|
38
39
|
const isValid = this.validateSubscriber(fileExports, path);
|
|
39
|
-
|
|
40
|
+
logger_1.logger.debug(`Registering subscribers from ${path}.`);
|
|
40
41
|
if (!isValid) {
|
|
41
42
|
return;
|
|
42
43
|
}
|
|
@@ -51,7 +52,7 @@ class SubscriberLoader extends resource_loader_1.ResourceLoader {
|
|
|
51
52
|
/**
|
|
52
53
|
* If the handler is not a function, we can't use it
|
|
53
54
|
*/
|
|
54
|
-
|
|
55
|
+
logger_1.logger.warn(`The subscriber in ${path} is not a function. skipped.`);
|
|
55
56
|
return false;
|
|
56
57
|
}
|
|
57
58
|
const config = subscriber.config;
|
|
@@ -59,7 +60,7 @@ class SubscriberLoader extends resource_loader_1.ResourceLoader {
|
|
|
59
60
|
/**
|
|
60
61
|
* If the subscriber is missing a config, we can't use it
|
|
61
62
|
*/
|
|
62
|
-
|
|
63
|
+
logger_1.logger.warn(`The subscriber in ${path} is missing a config. skipped.`);
|
|
63
64
|
return false;
|
|
64
65
|
}
|
|
65
66
|
if (!config.event) {
|
|
@@ -71,7 +72,7 @@ class SubscriberLoader extends resource_loader_1.ResourceLoader {
|
|
|
71
72
|
throw new Error(`The subscriber in ${path} is missing an event in the config.`);
|
|
72
73
|
}
|
|
73
74
|
else {
|
|
74
|
-
|
|
75
|
+
logger_1.logger.warn(`The subscriber in ${path} is missing an event in the config. skipped.`);
|
|
75
76
|
}
|
|
76
77
|
return false;
|
|
77
78
|
}
|
|
@@ -80,7 +81,7 @@ class SubscriberLoader extends resource_loader_1.ResourceLoader {
|
|
|
80
81
|
/**
|
|
81
82
|
* If the subscribers event is not a string or an array of strings, we can't use it
|
|
82
83
|
*/
|
|
83
|
-
|
|
84
|
+
logger_1.logger.warn(`The subscriber in ${path} has an invalid event config. The event must be a string or an array of strings. skipped.`);
|
|
84
85
|
return false;
|
|
85
86
|
}
|
|
86
87
|
return true;
|
|
@@ -133,7 +134,7 @@ class SubscriberLoader extends resource_loader_1.ResourceLoader {
|
|
|
133
134
|
handler,
|
|
134
135
|
});
|
|
135
136
|
}
|
|
136
|
-
|
|
137
|
+
logger_1.logger.debug(`Subscribers registered.`);
|
|
137
138
|
/**
|
|
138
139
|
* Return the file paths of the registered subscribers, to prevent the
|
|
139
140
|
* backwards compatible loader from trying to register them.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subscriber-loader.js","sourceRoot":"","sources":["../../src/subscribers/subscriber-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"subscriber-loader.js","sourceRoot":"","sources":["../../src/subscribers/subscriber-loader.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { Logger, MedusaContainer } from "@medusajs/types";
|
|
2
1
|
import { Dirent } from "fs";
|
|
3
2
|
export declare abstract class ResourceLoader {
|
|
4
3
|
#private;
|
|
@@ -6,8 +5,7 @@ export declare abstract class ResourceLoader {
|
|
|
6
5
|
* The name of the resource (e.g job, subscriber, workflow)
|
|
7
6
|
*/
|
|
8
7
|
protected abstract resourceName: string;
|
|
9
|
-
|
|
10
|
-
constructor(sourceDir: string | string[], container: MedusaContainer);
|
|
8
|
+
constructor(sourceDir: string | string[]);
|
|
11
9
|
/**
|
|
12
10
|
* Discover resources from the source directory
|
|
13
11
|
* @param exclude - custom exclusion regexes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-loader.d.ts","sourceRoot":"","sources":["../../src/utils/resource-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"resource-loader.d.ts","sourceRoot":"","sources":["../../src/utils/resource-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,IAAI,CAAA;AAK3B,8BAAsB,cAAc;;IAClC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAA;gBAc3B,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;IAIxC;;;;;OAKG;cACa,iBAAiB,CAAC,EAChC,OAAO,EACP,eAAe,GAChB,GAAE;QACD,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;QAClB,eAAe,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAA;KACxC,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAAC;IAmD3C;;;;OAIG;IACH,SAAS,CAAC,QAAQ,CAAC,YAAY,CAC7B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACnC,OAAO,CAAC,IAAI,CAAC,GAAG,KAAK;CACzB"}
|
|
@@ -16,8 +16,9 @@ exports.ResourceLoader = void 0;
|
|
|
16
16
|
const utils_1 = require("@medusajs/utils");
|
|
17
17
|
const promises_1 = require("fs/promises");
|
|
18
18
|
const path_1 = require("path");
|
|
19
|
+
const logger_1 = require("../logger");
|
|
19
20
|
class ResourceLoader {
|
|
20
|
-
constructor(sourceDir
|
|
21
|
+
constructor(sourceDir) {
|
|
21
22
|
/**
|
|
22
23
|
* The directory from which to load the jobs
|
|
23
24
|
* @private
|
|
@@ -29,7 +30,6 @@ class ResourceLoader {
|
|
|
29
30
|
*/
|
|
30
31
|
_ResourceLoader_excludes.set(this, [/^_[^/\\]*(\.[^/\\]+)?$/]);
|
|
31
32
|
__classPrivateFieldSet(this, _ResourceLoader_sourceDir, sourceDir, "f");
|
|
32
|
-
this.logger = container.resolve(utils_1.ContainerRegistrationKeys.LOGGER);
|
|
33
33
|
}
|
|
34
34
|
/**
|
|
35
35
|
* Discover resources from the source directory
|
|
@@ -56,7 +56,7 @@ class ResourceLoader {
|
|
|
56
56
|
await (0, promises_1.access)(sourcePath);
|
|
57
57
|
}
|
|
58
58
|
catch {
|
|
59
|
-
|
|
59
|
+
logger_1.logger.info(`No ${this.resourceName} to load from ${sourcePath}. skipped.`);
|
|
60
60
|
return;
|
|
61
61
|
}
|
|
62
62
|
return await (0, utils_1.readDirRecursive)(sourcePath).then(async (entries) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource-loader.js","sourceRoot":"","sources":["../../src/utils/resource-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"resource-loader.js","sourceRoot":"","sources":["../../src/utils/resource-loader.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA6E;AAE7E,0CAAoC;AACpC,+BAAkC;AAClC,sCAAkC;AAElC,MAAsB,cAAc;IAkBlC,YAAY,SAA4B;QAZxC;;;WAGG;QACH,4CAA6B;QAE7B;;;WAGG;QACH,mCAAsB,CAAC,wBAAwB,CAAC,EAAA;QAG9C,uBAAA,IAAI,6BAAc,SAAS,MAAA,CAAA;IAC7B,CAAC;IAED;;;;;OAKG;IACO,KAAK,CAAC,iBAAiB,CAAC,EAChC,OAAO,EACP,eAAe,MAIb,EAAE;QACJ,OAAO,KAAK,EAAE,CAAA;QACd,eAAe,KAAK,CAAC,KAAa,EAAE,EAAE;YACpC,MAAM,UAAU,GAAG,IAAA,YAAK,EAAC,KAAK,CAAC,IAAI,CAAC,CAAA;YAEpC,OAAO,CACL,CAAC,KAAK,CAAC,WAAW,EAAE;gBACpB,UAAU,CAAC,IAAI,KAAK,OAAO;gBAC3B,CAAC,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAClC,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC;gBACvC,CAAC,uBAAA,IAAI,gCAAU,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;gBAChE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAC1D,CAAA;QACH,CAAC,CAAA;QAED,MAAM,oBAAoB,GAAG,KAAK,CAAC,OAAO,CAAC,uBAAA,IAAI,iCAAW,CAAC;YACzD,CAAC,CAAC,uBAAA,IAAI,iCAAW;YACjB,CAAC,CAAC,CAAC,uBAAA,IAAI,iCAAW,CAAC,CAAA;QAErB,MAAM,QAAQ,GAAG,oBAAoB,CAAC,GAAG,CAAC,KAAK,EAAE,UAAU,EAAE,EAAE;YAC7D,IAAI,CAAC;gBACH,MAAM,IAAA,iBAAM,EAAC,UAAU,CAAC,CAAA;YAC1B,CAAC;YAAC,MAAM,CAAC;gBACP,eAAM,CAAC,IAAI,CACT,MAAM,IAAI,CAAC,YAAY,iBAAiB,UAAU,YAAY,CAC/D,CAAA;gBACD,OAAM;YACR,CAAC;YAED,OAAO,MAAM,IAAA,wBAAgB,EAAC,UAAU,CAAC,CAAC,IAAI,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBAC/D,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,KAAa,EAAE,EAAE,CACnD,eAAe,CAAC,KAAK,CAAC,CACvB,CAAA;gBAED,OAAO,MAAM,IAAA,kBAAU,EACrB,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,KAAa,EAAE,EAAE;oBACtC,MAAM,QAAQ,GAAG,IAAA,WAAI,EAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;oBAE7C,MAAM,OAAO,GAAG,MAAM,IAAA,qBAAa,EAAC,QAAQ,CAAC,CAAA;oBAE7C,MAAM,IAAI,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;oBAC1C,OAAO,OAAO,CAAA;gBAChB,CAAC,CAAC,CACH,CAAA;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;QAEF,MAAM,SAAS,GAAG,MAAM,IAAA,kBAAU,EAAC,QAAQ,CAAC,CAAA;QAC5C,OAAO,SAAS,CAAC,IAAI,EAAE,CAAA;IACzB,CAAC;CAWF;AA9FD,wCA8FC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
|
-
import { MedusaContainer } from "@medusajs/types";
|
|
2
1
|
import { ResourceLoader } from "../utils/resource-loader";
|
|
3
2
|
export declare class WorkflowLoader extends ResourceLoader {
|
|
4
3
|
protected resourceName: string;
|
|
5
|
-
constructor(sourceDir: string | string[]
|
|
4
|
+
constructor(sourceDir: string | string[]);
|
|
6
5
|
protected onFileLoaded(path: string, fileExports: Record<string, unknown>): Promise<void>;
|
|
7
6
|
/**
|
|
8
7
|
* Load workflows from the source paths, workflows are registering themselves,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-loader.d.ts","sourceRoot":"","sources":["../../src/workflows/workflow-loader.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"workflow-loader.d.ts","sourceRoot":"","sources":["../../src/workflows/workflow-loader.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAA;AAEzD,qBAAa,cAAe,SAAQ,cAAc;IAChD,SAAS,CAAC,YAAY,SAAa;gBAEvB,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE;cAIxB,YAAY,CAC1B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAKtC;;;OAGG;IACG,IAAI;CAKX"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.WorkflowLoader = void 0;
|
|
4
|
+
const logger_1 = require("../logger");
|
|
4
5
|
const resource_loader_1 = require("../utils/resource-loader");
|
|
5
6
|
class WorkflowLoader extends resource_loader_1.ResourceLoader {
|
|
6
|
-
constructor(sourceDir
|
|
7
|
-
super(sourceDir
|
|
7
|
+
constructor(sourceDir) {
|
|
8
|
+
super(sourceDir);
|
|
8
9
|
this.resourceName = "workflow";
|
|
9
10
|
}
|
|
10
11
|
async onFileLoaded(path, fileExports) {
|
|
11
|
-
|
|
12
|
+
logger_1.logger.debug(`Registering workflows from ${path}.`);
|
|
12
13
|
}
|
|
13
14
|
/**
|
|
14
15
|
* Load workflows from the source paths, workflows are registering themselves,
|
|
@@ -16,7 +17,7 @@ class WorkflowLoader extends resource_loader_1.ResourceLoader {
|
|
|
16
17
|
*/
|
|
17
18
|
async load() {
|
|
18
19
|
await super.discoverResources();
|
|
19
|
-
|
|
20
|
+
logger_1.logger.debug(`Workflows registered.`);
|
|
20
21
|
}
|
|
21
22
|
}
|
|
22
23
|
exports.WorkflowLoader = WorkflowLoader;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workflow-loader.js","sourceRoot":"","sources":["../../src/workflows/workflow-loader.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"workflow-loader.js","sourceRoot":"","sources":["../../src/workflows/workflow-loader.ts"],"names":[],"mappings":";;;AAAA,sCAAkC;AAClC,8DAAyD;AAEzD,MAAa,cAAe,SAAQ,gCAAc;IAGhD,YAAY,SAA4B;QACtC,KAAK,CAAC,SAAS,CAAC,CAAA;QAHR,iBAAY,GAAG,UAAU,CAAA;IAInC,CAAC;IAES,KAAK,CAAC,YAAY,CAC1B,IAAY,EACZ,WAAoC;QAEpC,eAAM,CAAC,KAAK,CAAC,8BAA8B,IAAI,GAAG,CAAC,CAAA;IACrD,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,IAAI;QACR,MAAM,KAAK,CAAC,iBAAiB,EAAE,CAAA;QAE/B,eAAM,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAA;IACvC,CAAC;CACF;AAvBD,wCAuBC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@medusajs/framework",
|
|
3
|
-
"version": "2.9.0-snapshot-
|
|
3
|
+
"version": "2.9.0-snapshot-20250814100249",
|
|
4
4
|
"description": "Framework",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
57
|
"@aws-sdk/client-dynamodb": "^3.218.0",
|
|
58
|
-
"@medusajs/cli": "2.9.0-snapshot-
|
|
58
|
+
"@medusajs/cli": "2.9.0-snapshot-20250814100249",
|
|
59
59
|
"@mikro-orm/core": "6.4.3",
|
|
60
60
|
"@mikro-orm/knex": "6.4.3",
|
|
61
61
|
"@mikro-orm/migrations": "6.4.3",
|
|
@@ -76,12 +76,12 @@
|
|
|
76
76
|
},
|
|
77
77
|
"dependencies": {
|
|
78
78
|
"@jercle/yargonaut": "^1.1.5",
|
|
79
|
-
"@medusajs/modules-sdk": "2.9.0-snapshot-
|
|
80
|
-
"@medusajs/orchestration": "2.9.0-snapshot-
|
|
81
|
-
"@medusajs/telemetry": "2.9.0-snapshot-
|
|
82
|
-
"@medusajs/types": "2.9.0-snapshot-
|
|
83
|
-
"@medusajs/utils": "2.9.0-snapshot-
|
|
84
|
-
"@medusajs/workflows-sdk": "2.9.0-snapshot-
|
|
79
|
+
"@medusajs/modules-sdk": "2.9.0-snapshot-20250814100249",
|
|
80
|
+
"@medusajs/orchestration": "2.9.0-snapshot-20250814100249",
|
|
81
|
+
"@medusajs/telemetry": "2.9.0-snapshot-20250814100249",
|
|
82
|
+
"@medusajs/types": "2.9.0-snapshot-20250814100249",
|
|
83
|
+
"@medusajs/utils": "2.9.0-snapshot-20250814100249",
|
|
84
|
+
"@medusajs/workflows-sdk": "2.9.0-snapshot-20250814100249",
|
|
85
85
|
"@opentelemetry/api": "^1.9.0",
|
|
86
86
|
"@types/express": "^4.17.17",
|
|
87
87
|
"chokidar": "^3.4.2",
|
|
@@ -102,7 +102,7 @@
|
|
|
102
102
|
},
|
|
103
103
|
"peerDependencies": {
|
|
104
104
|
"@aws-sdk/client-dynamodb": "^3.218.0",
|
|
105
|
-
"@medusajs/cli": "2.9.0-snapshot-
|
|
105
|
+
"@medusajs/cli": "2.9.0-snapshot-20250814100249",
|
|
106
106
|
"@mikro-orm/cli": "6.4.3",
|
|
107
107
|
"@mikro-orm/core": "6.4.3",
|
|
108
108
|
"@mikro-orm/knex": "6.4.3",
|