@medusajs/framework 2.9.0-snapshot-20250807111503 → 2.9.0-snapshot-20250813104336
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 +2 -2
- package/dist/config/config.d.ts.map +1 -1
- package/dist/config/config.js +4 -4
- package/dist/config/config.js.map +1 -1
- package/dist/config/loader.js +1 -1
- package/dist/config/loader.js.map +1 -1
- package/dist/http/express-loader.d.ts +3 -1
- package/dist/http/express-loader.d.ts.map +1 -1
- package/dist/http/express-loader.js +8 -7
- package/dist/http/express-loader.js.map +1 -1
- package/dist/http/router.d.ts +3 -1
- package/dist/http/router.d.ts.map +1 -1
- package/dist/http/router.js +28 -24
- package/dist/http/router.js.map +1 -1
- package/dist/links/link-loader.d.ts +2 -1
- package/dist/links/link-loader.d.ts.map +1 -1
- package/dist/links/link-loader.js +8 -6
- package/dist/links/link-loader.js.map +1 -1
- package/package.json +9 -9
package/dist/config/config.d.ts
CHANGED
|
@@ -19,10 +19,10 @@ export declare class ConfigManager {
|
|
|
19
19
|
protected buildHttpConfig(projectConfig: Partial<ConfigModule["projectConfig"]>): ConfigModule["projectConfig"]["http"];
|
|
20
20
|
/**
|
|
21
21
|
* Normalizes the project config object and assign the defaults if needed
|
|
22
|
-
* @param
|
|
22
|
+
* @param config
|
|
23
23
|
* @protected
|
|
24
24
|
*/
|
|
25
|
-
protected normalizeProjectConfig(
|
|
25
|
+
protected normalizeProjectConfig(config: Partial<ConfigModule>): 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":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEtC,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,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAEtC,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,MAAM,EAAE,OAAO,CAAC,YAAY,CAAC,GAC5B,YAAY,CAAC,eAAe,CAAC;IAiChC;;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;CAkBjB"}
|
package/dist/config/config.js
CHANGED
|
@@ -87,14 +87,14 @@ class ConfigManager {
|
|
|
87
87
|
}
|
|
88
88
|
/**
|
|
89
89
|
* Normalizes the project config object and assign the defaults if needed
|
|
90
|
-
* @param
|
|
90
|
+
* @param config
|
|
91
91
|
* @protected
|
|
92
92
|
*/
|
|
93
|
-
normalizeProjectConfig(
|
|
94
|
-
const projConfig =
|
|
93
|
+
normalizeProjectConfig(config) {
|
|
94
|
+
const projConfig = config?.projectConfig ?? {};
|
|
95
95
|
const outputConfig = (0, utils_1.deepCopy)(projConfig);
|
|
96
96
|
if (!outputConfig?.redisUrl) {
|
|
97
|
-
const customLogger =
|
|
97
|
+
const customLogger = config?.logger ?? logger_1.logger;
|
|
98
98
|
customLogger.log(`redisUrl not found. A fake redis instance will be used.`);
|
|
99
99
|
}
|
|
100
100
|
outputConfig.http = this.buildHttpConfig(projConfig);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAqD;AACrD,sCAAkC;AAGlC,MAAa,aAAa;IA8BxB,IAAI,MAAM;QACR,IAAI,CAAC,uBAAA,IAAI,6BAAQ,EAAE,CAAC;YAClB,IAAI,CAAC,YAAY,CACf,wHAAwH,CACzH,CAAA;QACH,CAAC;QACD,OAAO,uBAAA,IAAI,6BAAQ,CAAA;IACrB,CAAC;IAED,IAAI,OAAO;QACT,OAAO,uBAAA,IAAI,8BAAS,CAAA;IACtB,CAAC;IAED,IAAI,YAAY;QACd,OAAO,uBAAA,IAAI,iEAAc,CAAA;IAC3B,CAAC;IAED;;QA9CA;;;WAGG;QACH,yCAAgB;QAmBhB;;;WAGG;QACH,wCAAsB;IAmBP,CAAC;IAEhB;;;;OAIG;IACO,YAAY,CAAC,KAAa;QAClC,IAAI,uBAAA,IAAI,iEAAc,EAAE,CAAC;YACvB,MAAM,IAAI,KAAK,CAAC,eAAe,KAAK,EAAE,CAAC,CAAA;QACzC,CAAC;QAED,eAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;IACpB,CAAC;IAED;;;;OAIG;IACO,eAAe,CACvB,aAAqD;QAErD,MAAM,IAAI,GAAG,CAAC,aAAa,CAAC,IAAI;YAC9B,EAAE,CAA0C,CAAA;QAE9C,IAAI,CAAC,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,IAAI,CAAA;QAC9C,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAA;QACnC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,CAAA;QACrC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,IAAI,EAAE,CAAA;QAErC,IAAI,CAAC,UAAU,KAAK,EAAE,CAAA;QACtB,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,IAAI,CAAC,YAAY,CAAA;QAE7C,IAAI,CAAC,SAAS,GAAG,IAAI,EAAE,SAAS,IAAI,OAAO,CAAC,GAAG,CAAC,UAAU,CAAA;QAC1D,IAAI,CAAC,YAAY,GAAG,IAAI,EAAE,YAAY,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,CAAA;QAEpE,IACE,IAAI,EAAE,YAAY;YAClB,CAAC,CAAC,IAAI,CAAC,gBAAgB,IAAI,CAAC,IAAI,CAAC,gBAAgB,CAAC,UAAU,EAAE,MAAM,CAAC;gBACnE,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,EAClD,CAAC;YACD,IAAI,CAAC,YAAY,CACf,gQAAgQ,CACjQ,CAAA;QACH,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC;YACpB,IAAI,CAAC,YAAY,CACf,4BACE,uBAAA,IAAI,iEAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,8BAC5B,EAAE,CACH,CAAA;YAED,IAAI,CAAC,SAAS,GAAG,aAAa,CAAA;QAChC,CAAC;QAED,IAAI,CAAC,YAAY,GAAG,CAAC,aAAa,CAAC,IAAI,EAAE,YAAY;YACnD,OAAO,CAAC,GAAG,CAAC,aAAa,CAAE,CAAA;QAE7B,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;YACvB,IAAI,CAAC,YAAY,CACf,+BACE,uBAAA,IAAI,iEAAc,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,+BAC5B,EAAE,CACH,CAAA;YAED,IAAI,CAAC,YAAY,GAAG,aAAa,CAAA;QACnC,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;IAED;;;;OAIG;IACO,sBAAsB,CAC9B,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/config/config.ts"],"names":[],"mappings":"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"}
|
package/dist/config/loader.js
CHANGED
|
@@ -12,7 +12,7 @@ const handleConfigError = (error) => {
|
|
|
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));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":";;;AA4BA,oCAiBC;AA7CD,2CAA0E;AAC1E,mCAAmC;AACnC,4CAAwC;AACxC,sCAAmD;AACnD,qCAAwC;AAGxC,MAAM,iBAAiB,GAAG,CAAC,KAAY,EAAQ,EAAE;IAC/C,eAAa,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAChE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChB,eAAa,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAClC,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"loader.js","sourceRoot":"","sources":["../../src/config/loader.ts"],"names":[],"mappings":";;;AA4BA,oCAiBC;AA7CD,2CAA0E;AAC1E,mCAAmC;AACnC,4CAAwC;AACxC,sCAAmD;AACnD,qCAAwC;AAGxC,MAAM,iBAAiB,GAAG,CAAC,KAAY,EAAQ,EAAE;IAC/C,eAAa,CAAC,KAAK,CAAC,4BAA4B,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAChE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAChB,eAAa,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAA;IAClC,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,iBAAyB,eAAe;IAExC,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,6 +1,8 @@
|
|
|
1
|
+
import { MedusaContainer } from "@medusajs/framework/types";
|
|
1
2
|
import { Express } from "express";
|
|
2
|
-
export declare function expressLoader({ app }: {
|
|
3
|
+
export declare function expressLoader({ app, container, }: {
|
|
3
4
|
app: Express;
|
|
5
|
+
container: MedusaContainer;
|
|
4
6
|
}): Promise<{
|
|
5
7
|
app: Express;
|
|
6
8
|
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":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAK3D,OAAgB,EAAE,OAAO,EAAkB,MAAM,SAAS,CAAA;AAY1D,wBAAsB,aAAa,CAAC,EAClC,GAAG,EACH,SAAS,GACV,EAAE;IACD,GAAG,EAAE,OAAO,CAAA;IACZ,SAAS,EAAE,eAAe,CAAA;CAC3B,GAAG,OAAO,CAAC;IACV,GAAG,EAAE,OAAO,CAAA;IACZ,QAAQ,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAC9B,CAAC,CAyID"}
|
|
@@ -4,7 +4,8 @@ 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/utils");
|
|
7
|
+
const utils_1 = require("@medusajs/framework/utils");
|
|
8
|
+
const utils_2 = require("@medusajs/utils");
|
|
8
9
|
const connect_redis_1 = __importDefault(require("connect-redis"));
|
|
9
10
|
const cookie_parser_1 = __importDefault(require("cookie-parser"));
|
|
10
11
|
const express_1 = __importDefault(require("express"));
|
|
@@ -13,10 +14,9 @@ const ioredis_1 = __importDefault(require("ioredis"));
|
|
|
13
14
|
const morgan_1 = __importDefault(require("morgan"));
|
|
14
15
|
const path_1 = __importDefault(require("path"));
|
|
15
16
|
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, container, }) {
|
|
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,6 +24,7 @@ async function expressLoader({ app }) {
|
|
|
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);
|
|
27
28
|
let sameSite = false;
|
|
28
29
|
let secure = false;
|
|
29
30
|
if (isProduction || isStaging) {
|
|
@@ -48,8 +49,8 @@ async function expressLoader({ app }) {
|
|
|
48
49
|
};
|
|
49
50
|
let redisClient;
|
|
50
51
|
if (configModule?.projectConfig.sessionOptions?.dynamodbOptions) {
|
|
51
|
-
const storeFactory = await (0,
|
|
52
|
-
const client = await (0,
|
|
52
|
+
const storeFactory = await (0, utils_2.dynamicImport)("connect-dynamodb");
|
|
53
|
+
const client = await (0, utils_2.dynamicImport)("@aws-sdk/client-dynamodb");
|
|
53
54
|
const DynamoDBStore = storeFactory({ session: express_session_1.default });
|
|
54
55
|
sessionOpts.store = new DynamoDBStore({
|
|
55
56
|
...configModule.projectConfig.sessionOptions.dynamodbOptions,
|
|
@@ -73,7 +74,7 @@ async function expressLoader({ app }) {
|
|
|
73
74
|
return (isTest ||
|
|
74
75
|
isHealthCheck(req) ||
|
|
75
76
|
NOISY_ENDPOINTS_CHUNKS.some((chunk) => req.url.includes(chunk)) ||
|
|
76
|
-
!
|
|
77
|
+
!logger.shouldLog("http"));
|
|
77
78
|
}
|
|
78
79
|
let loggingMiddleware;
|
|
79
80
|
/**
|
|
@@ -112,7 +113,7 @@ async function expressLoader({ app }) {
|
|
|
112
113
|
loggingMiddleware = (0, morgan_1.default)(":method :url ← :referrer (:status) - :response-time ms", {
|
|
113
114
|
skip: shouldSkipHttpLog,
|
|
114
115
|
stream: {
|
|
115
|
-
write: (message) =>
|
|
116
|
+
write: (message) => logger.http(message.trim()),
|
|
116
117
|
},
|
|
117
118
|
});
|
|
118
119
|
}
|
|
@@ -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":"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"}
|
package/dist/http/router.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { Express, RequestHandler } from "express";
|
|
2
2
|
import type { MiddlewareFunction, RouteHandler } from "./types";
|
|
3
|
+
import { MedusaContainer } from "@medusajs/types";
|
|
3
4
|
export declare class ApiLoader {
|
|
4
5
|
#private;
|
|
5
6
|
/**
|
|
@@ -18,10 +19,11 @@ export declare class ApiLoader {
|
|
|
18
19
|
route: string;
|
|
19
20
|
method?: string;
|
|
20
21
|
}) => RequestHandler | MiddlewareFunction;
|
|
21
|
-
constructor({ app, sourceDir, baseRestrictedFields, }: {
|
|
22
|
+
constructor({ app, sourceDir, baseRestrictedFields, container, }: {
|
|
22
23
|
app: Express;
|
|
23
24
|
sourceDir: string | string[];
|
|
24
25
|
baseRestrictedFields?: string[];
|
|
26
|
+
container: MedusaContainer;
|
|
25
27
|
});
|
|
26
28
|
load(): Promise<void>;
|
|
27
29
|
}
|
|
@@ -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":"AAEA,OAAO,KAAK,EAAuB,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAC3E,OAAO,KAAK,EAOV,kBAAkB,EAGlB,YAAY,EACb,MAAM,SAAS,CAAA;AAEhB,OAAO,EAAU,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAazD,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;gBAgB5B,EACV,GAAG,EACH,SAAS,EACT,oBAAyB,EACzB,SAAS,GACV,EAAE;QACD,GAAG,EAAE,OAAO,CAAA;QACZ,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;QAC5B,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAA;QAC/B,SAAS,EAAE,eAAe,CAAA;KAC3B;IA2RK,IAAI;CA6GX"}
|
package/dist/http/router.js
CHANGED
|
@@ -13,25 +13,24 @@ 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, _ApiLoader_loadHttpResources, _ApiLoader_registerExpressHandler, _ApiLoader_assignRestrictedFields, _ApiLoader_createCorsOptions, _ApiLoader_applyCorsMiddleware, _ApiLoader_applyAuthMiddleware, _ApiLoader_applyBodyParserMiddleware, _ApiLoader_assignAdditionalDataValidator, _ApiLoader_applyStorePublishableKeyMiddleware;
|
|
16
|
+
var _ApiLoader_instances, _a, _ApiLoader_app, _ApiLoader_sourceDirs, _ApiLoader_logger, _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 reporter_1 = __importDefault(require("@medusajs/cli/dist/reporter"));
|
|
20
|
-
const cors_1 = __importDefault(require("cors"));
|
|
21
19
|
const utils_1 = require("@medusajs/utils");
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
const routes_sorter_1 = require("./routes-sorter");
|
|
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");
|
|
20
|
+
const cors_1 = __importDefault(require("cors"));
|
|
21
|
+
const config_1 = require("../config");
|
|
29
22
|
const middleware_file_loader_1 = require("./middleware-file-loader");
|
|
23
|
+
const middlewares_1 = require("./middlewares");
|
|
30
24
|
const bodyparser_1 = require("./middlewares/bodyparser");
|
|
31
25
|
const ensure_publishable_api_key_1 = require("./middlewares/ensure-publishable-api-key");
|
|
32
|
-
const
|
|
26
|
+
const error_handler_1 = require("./middlewares/error-handler");
|
|
27
|
+
const routes_finder_1 = require("./routes-finder");
|
|
28
|
+
const routes_loader_1 = require("./routes-loader");
|
|
29
|
+
const routes_sorter_1 = require("./routes-sorter");
|
|
30
|
+
const restricted_fields_1 = require("./utils/restricted-fields");
|
|
31
|
+
const wrap_handler_1 = require("./utils/wrap-handler");
|
|
33
32
|
class ApiLoader {
|
|
34
|
-
constructor({ app, sourceDir, baseRestrictedFields = [], }) {
|
|
33
|
+
constructor({ app, sourceDir, baseRestrictedFields = [], container, }) {
|
|
35
34
|
_ApiLoader_instances.add(this);
|
|
36
35
|
/**
|
|
37
36
|
* An express instance
|
|
@@ -43,9 +42,11 @@ class ApiLoader {
|
|
|
43
42
|
* @private
|
|
44
43
|
*/
|
|
45
44
|
_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");
|
|
49
50
|
}
|
|
50
51
|
async load() {
|
|
51
52
|
const { errorHandler: sourceErrorHandler, middlewares, routes, routesFinder, bodyParserConfigRoutes, additionalDataValidatorRoutes, } = await __classPrivateFieldGet(this, _ApiLoader_instances, "m", _ApiLoader_loadHttpResources).call(this);
|
|
@@ -113,7 +114,7 @@ class ApiLoader {
|
|
|
113
114
|
}
|
|
114
115
|
}
|
|
115
116
|
exports.ApiLoader = ApiLoader;
|
|
116
|
-
_a = ApiLoader, _ApiLoader_app = new WeakMap(), _ApiLoader_sourceDirs = new WeakMap(), _ApiLoader_instances = new WeakSet(), _ApiLoader_loadHttpResources =
|
|
117
|
+
_a = ApiLoader, _ApiLoader_app = new WeakMap(), _ApiLoader_sourceDirs = new WeakMap(), _ApiLoader_logger = new WeakMap(), _ApiLoader_instances = new WeakSet(), _ApiLoader_loadHttpResources =
|
|
117
118
|
/**
|
|
118
119
|
* Loads routes, middleware, bodyParserConfig routes, routes that have
|
|
119
120
|
* opted out for Auth and CORS and the error handler.
|
|
@@ -135,7 +136,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
135
136
|
};
|
|
136
137
|
}, _ApiLoader_registerExpressHandler = function _ApiLoader_registerExpressHandler(route) {
|
|
137
138
|
if ("isRoute" in route) {
|
|
138
|
-
|
|
139
|
+
__classPrivateFieldGet(this, _ApiLoader_logger, "f").debug(`registering route ${route.method} ${route.matcher}`);
|
|
139
140
|
const handler = _a.traceRoute
|
|
140
141
|
? _a.traceRoute(route.handler, {
|
|
141
142
|
route: route.matcher,
|
|
@@ -146,7 +147,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
146
147
|
return;
|
|
147
148
|
}
|
|
148
149
|
if (!route.methods) {
|
|
149
|
-
|
|
150
|
+
__classPrivateFieldGet(this, _ApiLoader_logger, "f").debug(`registering global middleware for ${route.matcher}`);
|
|
150
151
|
const handler = _a.traceMiddleware
|
|
151
152
|
? _a.traceMiddleware(route.handler, {
|
|
152
153
|
route: route.matcher,
|
|
@@ -159,7 +160,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
159
160
|
? route.methods
|
|
160
161
|
: [route.methods];
|
|
161
162
|
methods.forEach((method) => {
|
|
162
|
-
|
|
163
|
+
__classPrivateFieldGet(this, _ApiLoader_logger, "f").debug(`registering route middleware ${method} ${route.matcher}`);
|
|
163
164
|
const handler = _a.traceMiddleware
|
|
164
165
|
? _a.traceMiddleware((0, wrap_handler_1.wrapHandler)(route.handler), {
|
|
165
166
|
route: route.matcher,
|
|
@@ -185,6 +186,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
185
186
|
preflightContinue: false,
|
|
186
187
|
};
|
|
187
188
|
}, _ApiLoader_applyCorsMiddleware = function _ApiLoader_applyCorsMiddleware(routesFinder, namespace, toggleKey, corsOptions) {
|
|
189
|
+
const logger = __classPrivateFieldGet(this, _ApiLoader_logger, "f");
|
|
188
190
|
const corsFn = (0, cors_1.default)(corsOptions);
|
|
189
191
|
const corsMiddleware = function corsMiddleware(req, res, next) {
|
|
190
192
|
let method = req.method;
|
|
@@ -196,7 +198,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
196
198
|
if (matchingRoute && matchingRoute[toggleKey] === true) {
|
|
197
199
|
return corsFn(req, res, next);
|
|
198
200
|
}
|
|
199
|
-
|
|
201
|
+
logger.debug(`Skipping CORS middleware ${req.method} ${path}`);
|
|
200
202
|
return next();
|
|
201
203
|
};
|
|
202
204
|
__classPrivateFieldGet(this, _ApiLoader_app, "f").use(namespace, _a.traceMiddleware
|
|
@@ -205,16 +207,17 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
205
207
|
})
|
|
206
208
|
: corsMiddleware);
|
|
207
209
|
}, _ApiLoader_applyAuthMiddleware = function _ApiLoader_applyAuthMiddleware(routesFinder, namespace, actorType, authType, options) {
|
|
208
|
-
|
|
210
|
+
const logger = __classPrivateFieldGet(this, _ApiLoader_logger, "f");
|
|
211
|
+
logger.debug(`Registering auth middleware for prefix ${namespace}`);
|
|
209
212
|
const originalFn = (0, middlewares_1.authenticate)(actorType, authType, options);
|
|
210
213
|
const authMiddleware = function authMiddleware(req, res, next) {
|
|
211
214
|
const path = `${namespace}${req.path}`;
|
|
212
215
|
const matchingRoute = routesFinder.find(path, req.method);
|
|
213
216
|
if (matchingRoute && matchingRoute.optedOutOfAuth) {
|
|
214
|
-
|
|
217
|
+
logger.debug(`Skipping auth ${req.method} ${path}`);
|
|
215
218
|
return next();
|
|
216
219
|
}
|
|
217
|
-
|
|
220
|
+
logger.debug(`Authenticating route ${req.method} ${path}`);
|
|
218
221
|
return originalFn(req, res, next);
|
|
219
222
|
};
|
|
220
223
|
__classPrivateFieldGet(this, _ApiLoader_app, "f").use(namespace, _a.traceMiddleware
|
|
@@ -223,14 +226,15 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
223
226
|
})
|
|
224
227
|
: authMiddleware);
|
|
225
228
|
}, _ApiLoader_applyBodyParserMiddleware = function _ApiLoader_applyBodyParserMiddleware(namespace, routesFinder) {
|
|
226
|
-
|
|
229
|
+
__classPrivateFieldGet(this, _ApiLoader_logger, "f").debug(`Registering bodyparser middleware for prefix ${namespace}`);
|
|
227
230
|
__classPrivateFieldGet(this, _ApiLoader_app, "f").use(namespace, (0, bodyparser_1.createBodyParserMiddlewaresStack)(namespace, routesFinder, _a.traceMiddleware));
|
|
228
231
|
}, _ApiLoader_assignAdditionalDataValidator = function _ApiLoader_assignAdditionalDataValidator(namespace, routesFinder) {
|
|
229
|
-
|
|
232
|
+
const logger = __classPrivateFieldGet(this, _ApiLoader_logger, "f");
|
|
233
|
+
logger.debug(`Registering assignAdditionalDataValidator middleware for prefix ${namespace}`);
|
|
230
234
|
const additionalDataValidator = function additionalDataValidator(req, _, next) {
|
|
231
235
|
const matchingRoute = routesFinder.find(req.path, req.method);
|
|
232
236
|
if (matchingRoute && matchingRoute.validator) {
|
|
233
|
-
|
|
237
|
+
logger.debug(`Using validator to validate additional data on ${req.method} ${req.path}`);
|
|
234
238
|
req.additionalDataValidator = matchingRoute.validator;
|
|
235
239
|
}
|
|
236
240
|
return next();
|
|
@@ -241,7 +245,7 @@ async function _ApiLoader_loadHttpResources() {
|
|
|
241
245
|
})
|
|
242
246
|
: additionalDataValidator);
|
|
243
247
|
}, _ApiLoader_applyStorePublishableKeyMiddleware = function _ApiLoader_applyStorePublishableKeyMiddleware(namespace) {
|
|
244
|
-
|
|
248
|
+
__classPrivateFieldGet(this, _ApiLoader_logger, "f").debug(`Registering publishable key middleware for namespace ${namespace}`);
|
|
245
249
|
let middleware = _a.traceMiddleware
|
|
246
250
|
? _a.traceMiddleware(ensure_publishable_api_key_1.ensurePublishableApiKeyMiddleware, {
|
|
247
251
|
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":";;;;;;;;;;;;;;;;;;AAAA,2CAA6E;AAC7E,gDAAwC;AAgBxC,sCAAyC;AACzC,qEAA+D;AAC/D,+CAAsD;AACtD,yDAA2E;AAC3E,yFAA4F;AAC5F,+DAA0D;AAC1D,mDAA8C;AAC9C,mDAA8C;AAC9C,mDAA8C;AAC9C,iEAA4D;AAC5D,uDAAkD;AAElD,MAAa,SAAS;IAiCpB,YAAY,EACV,GAAG,EACH,SAAS,EACT,oBAAoB,GAAG,EAAE,EACzB,SAAS,GAMV;;QAxBD;;;WAGG;QACM,iCAAa;QAEtB;;;WAGG;QACM,wCAAqB;QAErB,oCAAe;QAatB,uBAAA,IAAI,kBAAQ,GAAG,MAAA,CAAA;QACf,uBAAA,IAAI,yBAAe,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,MAAA,CAAA;QACrE,uBAAA,IAAI,+DAAwB,MAA5B,IAAI,EAAyB,oBAAoB,IAAI,EAAE,CAAC,CAAA;QACxD,uBAAA,IAAI,qBAAW,SAAS,CAAC,OAAO,CAAC,iCAAyB,CAAC,MAAM,CAAC,MAAA,CAAA;IACpE,CAAC;IAsRD,KAAK,CAAC,IAAI;QACR,MAAM,EACJ,YAAY,EAAE,kBAAkB,EAChC,WAAW,EACX,MAAM,EACN,YAAY,EACZ,sBAAsB,EACtB,6BAA6B,GAC9B,GAAG,MAAM,uBAAA,IAAI,0DAAmB,MAAvB,IAAI,CAAqB,CAAA;QAEnC;;;WAGG;QACH,MAAM,sBAAsB,GAAG,IAAI,4BAAY,CAC7C,IAAI,4BAAY,CAAC,sBAAsB,CAAC,CAAC,IAAI,CAAC;YAC5C,QAAQ;YACR,QAAQ;YACR,OAAO;YACP,UAAU;YACV,QAAQ;SACT,CAAC,CACH,CAAA;QACD,uBAAA,IAAI,kEAA2B,MAA/B,IAAI,EAA4B,GAAG,EAAE,sBAAsB,CAAC,CAAA;QAE5D;;;WAGG;QACH,IAAI,6BAA6B,CAAC,MAAM,EAAE,CAAC;YACzC,MAAM,mCAAmC,GACvC,IAAI,4BAAY,CACd,IAAI,4BAAY,CAAC,6BAA6B,CAAC,CAAC,IAAI,CAAC;gBACnD,QAAQ;gBACR,QAAQ;gBACR,OAAO;gBACP,UAAU;gBACV,QAAQ;aACT,CAAC,CACH,CAAA;YACH,uBAAA,IAAI,sEAA+B,MAAnC,IAAI,EACF,GAAG,EACH,mCAAmC,CACpC,CAAA;QACH,CAAC;QAED;;WAEG;QACH,uBAAA,IAAI,4DAAqB,MAAzB,IAAI,EACF,YAAY,EACZ,QAAQ,EACR,uBAAuB,EACvB,uBAAA,IAAI,0DAAmB,MAAvB,IAAI,EAAoB,sBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAC3E,CAAA;QACD,uBAAA,IAAI,4DAAqB,MAAzB,IAAI,EAAsB,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE;YACxD,QAAQ;YACR,SAAS;YACT,SAAS;SACV,CAAC,CAAA;QAEF,uBAAA,IAAI,4DAAqB,MAAzB,IAAI,EACF,YAAY,EACZ,QAAQ,EACR,uBAAuB,EACvB,uBAAA,IAAI,0DAAmB,MAAvB,IAAI,EAAoB,sBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,CAC3E,CAAA;QACD;;WAEG;QACH,uBAAA,IAAI,2EAAoC,MAAxC,IAAI,EAAqC,QAAQ,CAAC,CAAA;QAElD,uBAAA,IAAI,4DAAqB,MAAzB,IAAI,EACF,YAAY,EACZ,QAAQ,EACR,UAAU,EACV,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB;YACE,oBAAoB,EAAE,IAAI;SAC3B,CACF,CAAA;QAED;;WAEG;QACH,uBAAA,IAAI,4DAAqB,MAAzB,IAAI,EACF,YAAY,EACZ,OAAO,EACP,sBAAsB,EACtB,uBAAA,IAAI,0DAAmB,MAAvB,IAAI,EAAoB,sBAAa,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAC1E,CAAA;QAED,MAAM,gBAAgB,GAAI,EAAiD;aACxE,MAAM,CAAC,WAAW,CAAC;aACnB,MAAM,CAAC,MAAM,CAAC,CAAA;QAEjB,MAAM,YAAY,GAAG,IAAI,4BAAY,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAA;QAC9D,YAAY,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC7B,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;gBACvB,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;YACzB,CAAC;YACD,uBAAA,IAAI,+DAAwB,MAA5B,IAAI,EAAyB,KAAK,CAAC,CAAA;QACrC,CAAC,CAAC,CAAA;QAEF;;WAEG;QACH,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,kBAAkB,IAAI,IAAA,4BAAY,GAAE,CAAC,CAAA;IACrD,CAAC;CACF;AAnbD,8BAmbC;;AAjYC;;;GAGG;AACH,KAAK;IACH,MAAM,YAAY,GAAG,IAAI,4BAAY,EAAE,CAAA;IACvC,MAAM,gBAAgB,GAAG,IAAI,6CAAoB,EAAE,CAAA;IAEnD,KAAK,IAAI,GAAG,IAAI,uBAAA,IAAI,6BAAY,EAAE,CAAC;QACjC,MAAM,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;QAC/B,MAAM,gBAAgB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACrC,CAAC;IAED,OAAO;QACL,MAAM,EAAE,YAAY,CAAC,SAAS,EAAE;QAChC,YAAY,EAAE,IAAI,4BAAY,EAAmB;QACjD,WAAW,EAAE,gBAAgB,CAAC,cAAc,EAAE;QAC9C,YAAY,EAAE,gBAAgB,CAAC,eAAe,EAEjC;QACb,sBAAsB,EAAE,gBAAgB,CAAC,yBAAyB,EAAE;QACpE,6BAA6B,EAC3B,gBAAgB,CAAC,gCAAgC,EAAE;KACtD,CAAA;AACH,CAAC,iFAMC,KAA+D;IAE/D,IAAI,SAAS,IAAI,KAAK,EAAE,CAAC;QACvB,uBAAA,IAAI,yBAAQ,CAAC,KAAK,CAAC,qBAAqB,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACxE,MAAM,OAAO,GAAG,EAAS,CAAC,UAAU;YAClC,CAAC,CAAC,EAAS,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,EAAE;gBAClC,KAAK,EAAE,KAAK,CAAC,OAAO;gBACpB,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB,CAAC;YACJ,CAAC,CAAC,KAAK,CAAC,OAAO,CAAA;QAEjB,uBAAA,IAAI,sBAAK,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAA,0BAAW,EAAC,OAAO,CAAC,CAAC,CAAA;QAC1E,OAAM;IACR,CAAC;IAED,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;QACnB,uBAAA,IAAI,yBAAQ,CAAC,KAAK,CAAC,qCAAqC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;QACxE,MAAM,OAAO,GAAG,EAAS,CAAC,eAAe;YACvC,CAAC,CAAE,EAAS,CAAC,eAAe,CAAC,KAAK,CAAC,OAAO,EAAE;gBACxC,KAAK,EAAE,KAAK,CAAC,OAAO;aACrB,CAAoB;YACvB,CAAC,CAAE,KAAK,CAAC,OAA0B,CAAA;QAErC,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,IAAA,0BAAW,EAAC,OAAO,CAAC,CAAC,CAAA;QAClD,OAAM;IACR,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC;QAC1C,CAAC,CAAC,KAAK,CAAC,OAAO;QACf,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;IACnB,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QACzB,uBAAA,IAAI,yBAAQ,CAAC,KAAK,CAChB,gCAAgC,MAAM,IAAI,KAAK,CAAC,OAAO,EAAE,CAC1D,CAAA;QACD,MAAM,OAAO,GAAG,EAAS,CAAC,eAAe;YACvC,CAAC,CAAE,EAAS,CAAC,eAAe,CAAC,IAAA,0BAAW,EAAC,KAAK,CAAC,OAAO,CAAC,EAAE;gBACrD,KAAK,EAAE,KAAK,CAAC,OAAO;gBACpB,MAAM,EAAE,MAAM;aACf,CAAoB;YACvB,CAAC,CAAC,IAAA,0BAAW,EAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAE9B,uBAAA,IAAI,sBAAK,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;IACzD,CAAC,CAAC,CAAA;AACJ,CAAC,iFAKuB,oBAA8B;IACpD,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CACvB,GAAkB,EAClB,CAAiB,EACjB,IAAwB,EACxB,EAAE;QACF,GAAG,CAAC,gBAAgB,GAAG,IAAI,oCAAgB,EAAE,CAAA;QAC7C,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAA;QAC9C,IAAI,EAAE,CAAA;IACR,CAAC,CAA8B,CAAC,CAAA;IAEhC,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CACvB,GAAkB,EAClB,CAAiB,EACjB,IAAwB,EACxB,EAAE;QACF,GAAG,CAAC,gBAAgB,GAAG,IAAI,oCAAgB,EAAE,CAAA;QAC7C,IAAI,EAAE,CAAA;IACR,CAAC,CAA8B,CAAC,CAAA;AAClC,CAAC,uEAKkB,MAAc;IAC/B,OAAO;QACL,MAAM,EAAE,IAAA,wBAAgB,EAAC,MAAM,CAAC;QAChC,WAAW,EAAE,IAAI;QACjB,iBAAiB,EAAE,KAAK;KACzB,CAAA;AACH,CAAC,2EAMC,YAA2C,EAC3C,SAAiB,EACjB,SAG2B,EAC3B,WAAwB;IAExB,MAAM,MAAM,GAAG,uBAAA,IAAI,yBAAQ,CAAA;IAC3B,MAAM,MAAM,GAAG,IAAA,cAAI,EAAC,WAAW,CAAC,CAAA;IAChC,MAAM,cAAc,GAAmB,SAAS,cAAc,CAC5D,GAAG,EACH,GAAG,EACH,IAAI;QAEJ,IAAI,MAAM,GAAW,GAAG,CAAC,MAAM,CAAA;QAC/B,IAAI,GAAG,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC7B,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,+BAA+B,CAAC,IAAI,GAAG,CAAC,MAAM,CAAA;QACrE,CAAC;QAED,MAAM,IAAI,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,IAAI,EAAE,CAAA;QACtC,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,MAAwB,CAAC,CAAA;QACvE,IAAI,aAAa,IAAI,aAAa,CAAC,SAAS,CAAC,KAAK,IAAI,EAAE,CAAC;YACvD,OAAO,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;QAC/B,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAA;QAC9D,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;IAED,uBAAA,IAAI,sBAAK,CAAC,GAAG,CACX,SAAS,EACT,EAAS,CAAC,eAAe;QACvB,CAAC,CAAE,EAAS,CAAC,eAAe,CAAC,cAAc,EAAE;YACzC,KAAK,EAAE,SAAS;SACjB,CAAoB;QACvB,CAAC,CAAC,cAAc,CACnB,CAAA;AACH,CAAC,2EAOC,YAA2C,EAC3C,SAAiB,EACjB,SAA4B,EAC5B,QAA+B,EAC/B,OAAyE;IAEzE,MAAM,MAAM,GAAG,uBAAA,IAAI,yBAAQ,CAAA;IAC3B,MAAM,CAAC,KAAK,CAAC,0CAA0C,SAAS,EAAE,CAAC,CAAA;IAEnE,MAAM,UAAU,GAAG,IAAA,0BAAY,EAAC,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC7D,MAAM,cAAc,GAAmB,SAAS,cAAc,CAC5D,GAAG,EACH,GAAG,EACH,IAAI;QAEJ,MAAM,IAAI,GAAG,GAAG,SAAS,GAAG,GAAG,CAAC,IAAI,EAAE,CAAA;QACtC,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CACrC,IAAI,EACJ,GAAG,CAAC,MAAwB,CAC7B,CAAA;QACD,IAAI,aAAa,IAAI,aAAa,CAAC,cAAc,EAAE,CAAC;YAClD,MAAM,CAAC,KAAK,CAAC,iBAAiB,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAA;YACnD,OAAO,IAAI,EAAE,CAAA;QACf,CAAC;QAED,MAAM,CAAC,KAAK,CAAC,wBAAwB,GAAG,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC,CAAA;QAC1D,OAAO,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;IACnC,CAAC,CAAA;IAED,uBAAA,IAAI,sBAAK,CAAC,GAAG,CACX,SAAS,EACT,EAAS,CAAC,eAAe;QACvB,CAAC,CAAE,EAAS,CAAC,eAAe,CAAC,cAAc,EAAE;YACzC,KAAK,EAAE,SAAS;SACjB,CAAoB;QACvB,CAAC,CAAC,cAAc,CACnB,CAAA;AACH,CAAC,uFAMC,SAAiB,EACjB,YAAiD;IAEjD,uBAAA,IAAI,yBAAQ,CAAC,KAAK,CAChB,gDAAgD,SAAS,EAAE,CAC5D,CAAA;IACD,uBAAA,IAAI,sBAAK,CAAC,GAAG,CACX,SAAS,EACT,IAAA,6CAAgC,EAC9B,SAAS,EACT,YAAY,EACZ,EAAS,CAAC,eAAe,CAC1B,CACF,CAAA;AACH,CAAC,+FAOC,SAAiB,EACjB,YAAwD;IAExD,MAAM,MAAM,GAAG,uBAAA,IAAI,yBAAQ,CAAA;IAC3B,MAAM,CAAC,KAAK,CACV,mEAAmE,SAAS,EAAE,CAC/E,CAAA;IAED,MAAM,uBAAuB,GAAG,SAAS,uBAAuB,CAC9D,GAAkB,EAClB,CAAiB,EACjB,IAAwB;QAExB,MAAM,aAAa,GAAG,YAAY,CAAC,IAAI,CACrC,GAAG,CAAC,IAAI,EACR,GAAG,CAAC,MAAwB,CAC7B,CAAA;QACD,IAAI,aAAa,IAAI,aAAa,CAAC,SAAS,EAAE,CAAC;YAC7C,MAAM,CAAC,KAAK,CACV,kDAAkD,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,CAC3E,CAAA;YACD,GAAG,CAAC,uBAAuB,GAAG,aAAa,CAAC,SAAS,CAAA;QACvD,CAAC;QACD,OAAO,IAAI,EAAE,CAAA;IACf,CAAC,CAAA;IAED,uBAAA,IAAI,sBAAK,CAAC,GAAG,CACX,SAAS,EACT,EAAS,CAAC,eAAe;QACvB,CAAC,CAAE,EAAS,CAAC,eAAe,CAAC,uBAAuB,EAAE;YAClD,KAAK,EAAE,SAAS;SACjB,CAAoB;QACvB,CAAC,CAAE,uBAA0C,CAChD,CAAA;AACH,CAAC,yGAMmC,SAAiB;IACnD,uBAAA,IAAI,yBAAQ,CAAC,KAAK,CAChB,wDAAwD,SAAS,EAAE,CACpE,CAAA;IACD,IAAI,UAAU,GAAG,EAAS,CAAC,eAAe;QACxC,CAAC,CAAC,EAAS,CAAC,eAAe,CAAC,8DAAiC,EAAE;YAC3D,KAAK,EAAE,SAAS;SACjB,CAAC;QACJ,CAAC,CAAC,8DAAiC,CAAA;IAErC,uBAAA,IAAI,sBAAK,CAAC,GAAG,CAAC,SAAS,EAAE,UAA4B,CAAC,CAAA;AACxD,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
|
+
import { Logger } from "@medusajs/types";
|
|
1
2
|
export declare class LinkLoader {
|
|
2
3
|
#private;
|
|
3
|
-
constructor(sourceDir: string | string[]);
|
|
4
|
+
constructor(sourceDir: string | string[], logger?: Logger);
|
|
4
5
|
/**
|
|
5
6
|
* Load links from the source paths, links are registering themselves,
|
|
6
7
|
* 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":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAA;AAOxC,qBAAa,UAAU;;gBAqBT,SAAS,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,MAAM,CAAC,EAAE,MAAM;IAKzD;;;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, _LinkLoader_logger;
|
|
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, logger) {
|
|
22
22
|
/**
|
|
23
23
|
* The directory from which to load the links
|
|
24
24
|
* @private
|
|
@@ -35,7 +35,9 @@ class LinkLoader {
|
|
|
35
35
|
/(\.ts\.map|\.js\.map|\.d\.ts|\.md)/,
|
|
36
36
|
/^_[^/\\]*(\.[^/\\]+)?$/,
|
|
37
37
|
]);
|
|
38
|
+
_LinkLoader_logger.set(this, void 0);
|
|
38
39
|
__classPrivateFieldSet(this, _LinkLoader_sourceDir, sourceDir, "f");
|
|
40
|
+
__classPrivateFieldSet(this, _LinkLoader_logger, logger ?? logger_1.logger, "f");
|
|
39
41
|
}
|
|
40
42
|
/**
|
|
41
43
|
* Load links from the source paths, links are registering themselves,
|
|
@@ -50,7 +52,7 @@ class LinkLoader {
|
|
|
50
52
|
await (0, promises_1.access)(sourcePath);
|
|
51
53
|
}
|
|
52
54
|
catch {
|
|
53
|
-
|
|
55
|
+
__classPrivateFieldGet(this, _LinkLoader_logger, "f").info(`No link to load from ${sourcePath}. skipped.`);
|
|
54
56
|
return;
|
|
55
57
|
}
|
|
56
58
|
return await (0, utils_1.readDirRecursive)(sourcePath).then(async (entries) => {
|
|
@@ -58,7 +60,7 @@ class LinkLoader {
|
|
|
58
60
|
return (!entry.isDirectory() &&
|
|
59
61
|
!__classPrivateFieldGet(this, _LinkLoader_excludes, "f").some((exclude) => exclude.test(entry.name)));
|
|
60
62
|
});
|
|
61
|
-
|
|
63
|
+
__classPrivateFieldGet(this, _LinkLoader_logger, "f").debug(`Registering links from ${sourcePath}.`);
|
|
62
64
|
return await (0, utils_1.promiseAll)(fileEntries.map(async (entry) => {
|
|
63
65
|
const fullPath = (0, path_1.join)(entry.path, entry.name);
|
|
64
66
|
return await (0, utils_1.dynamicImport)(fullPath);
|
|
@@ -66,9 +68,9 @@ class LinkLoader {
|
|
|
66
68
|
});
|
|
67
69
|
});
|
|
68
70
|
await (0, utils_1.promiseAll)(promises);
|
|
69
|
-
|
|
71
|
+
__classPrivateFieldGet(this, _LinkLoader_logger, "f").debug(`Links registered.`);
|
|
70
72
|
}
|
|
71
73
|
}
|
|
72
74
|
exports.LinkLoader = LinkLoader;
|
|
73
|
-
_LinkLoader_sourceDir = new WeakMap(), _LinkLoader_excludes = new WeakMap();
|
|
75
|
+
_LinkLoader_sourceDir = new WeakMap(), _LinkLoader_excludes = new WeakMap(), _LinkLoader_logger = new WeakMap();
|
|
74
76
|
//# 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":";;;;;;;;;;;;;;;AACA,2CAA6E;AAE7E,0CAAoC;AACpC,+BAA2B;AAC3B,sCAAmD;AAEnD,MAAa,UAAU;IAqBrB,YAAY,SAA4B,EAAE,MAAe;QApBzD;;;WAGG;QACH,wCAA6B;QAE7B;;;WAGG;QACH,+BAAsB;YACpB,WAAW;YACX,WAAW;YACX,YAAY;YACZ,oCAAoC;YACpC,wBAAwB;SACzB,EAAA;QAED,qCAAe;QAGb,uBAAA,IAAI,yBAAc,SAAS,MAAA,CAAA;QAC3B,uBAAA,IAAI,sBAAW,MAAM,IAAI,eAAa,MAAA,CAAA;IACxC,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,uBAAA,IAAI,0BAAQ,CAAC,IAAI,CAAC,wBAAwB,UAAU,YAAY,CAAC,CAAA;gBACjE,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,uBAAA,IAAI,0BAAQ,CAAC,KAAK,CAAC,0BAA0B,UAAU,GAAG,CAAC,CAAA;gBAE3D,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,uBAAA,IAAI,0BAAQ,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAA;IACzC,CAAC;CACF;AAlED,gCAkEC"}
|
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-20250813104336",
|
|
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-20250813104336",
|
|
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-20250813104336",
|
|
80
|
+
"@medusajs/orchestration": "2.9.0-snapshot-20250813104336",
|
|
81
|
+
"@medusajs/telemetry": "2.9.0-snapshot-20250813104336",
|
|
82
|
+
"@medusajs/types": "2.9.0-snapshot-20250813104336",
|
|
83
|
+
"@medusajs/utils": "2.9.0-snapshot-20250813104336",
|
|
84
|
+
"@medusajs/workflows-sdk": "2.9.0-snapshot-20250813104336",
|
|
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-20250813104336",
|
|
106
106
|
"@mikro-orm/cli": "6.4.3",
|
|
107
107
|
"@mikro-orm/core": "6.4.3",
|
|
108
108
|
"@mikro-orm/knex": "6.4.3",
|