@gorgo/medusa-integration 0.3.0-beta.4 → 0.3.0

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.
Files changed (28) hide show
  1. package/.medusa/server/src/admin/index.js +335 -109
  2. package/.medusa/server/src/admin/index.mjs +338 -112
  3. package/.medusa/server/src/api/admin/integrations/license-status/recheck/route.d.ts +8 -0
  4. package/.medusa/server/src/api/admin/integrations/license-status/recheck/route.js +14 -0
  5. package/.medusa/server/src/api/admin/integrations/license-status/route.d.ts +3 -3
  6. package/.medusa/server/src/api/admin/integrations/license-status/route.js +3 -3
  7. package/.medusa/server/src/lib/__tests__/catalog-fallback.unit.spec.js +32 -8
  8. package/.medusa/server/src/lib/catalog.generated.js +70 -14
  9. package/.medusa/server/src/modules/integration/loaders/__tests__/check-licenses.unit.spec.js +102 -146
  10. package/.medusa/server/src/modules/integration/loaders/__tests__/resolve-package-meta.unit.spec.d.ts +1 -0
  11. package/.medusa/server/src/modules/integration/loaders/__tests__/resolve-package-meta.unit.spec.js +34 -0
  12. package/.medusa/server/src/modules/integration/loaders/check-licenses.d.ts +5 -4
  13. package/.medusa/server/src/modules/integration/loaders/check-licenses.js +47 -70
  14. package/.medusa/server/src/modules/integration/loaders/resolve-package-meta.js +18 -3
  15. package/.medusa/server/src/modules/integration/services/__tests__/integration-module.unit.spec.js +49 -1
  16. package/.medusa/server/src/modules/integration/services/integration-module.d.ts +7 -1
  17. package/.medusa/server/src/modules/integration/services/integration-module.js +27 -6
  18. package/.medusa/server/src/modules/integration/types/index.d.ts +29 -9
  19. package/.medusa/server/src/modules/integration/types/index.js +2 -4
  20. package/.medusa/server/src/modules/integration/utils/__tests__/license-entry.unit.spec.d.ts +1 -0
  21. package/.medusa/server/src/modules/integration/utils/__tests__/license-entry.unit.spec.js +88 -0
  22. package/.medusa/server/src/modules/integration/utils/license-entry.d.ts +7 -0
  23. package/.medusa/server/src/modules/integration/utils/license-entry.js +29 -0
  24. package/.medusa/server/src/types/http/integration/admin/entities.d.ts +2 -1
  25. package/README.md +7 -3
  26. package/package.json +4 -3
  27. package/.medusa/server/src/modules/integration/loaders/license-state.d.ts +0 -15
  28. package/.medusa/server/src/modules/integration/loaders/license-state.js +0 -43
@@ -6,33 +6,29 @@ const track = globals_1.jest.fn();
6
6
  globals_1.jest.mock("@gorgo/telemetry", () => ({
7
7
  createTelemetryClient: () => ({ track }),
8
8
  }));
9
- const reportLicense = globals_1.jest.fn(() => true);
10
- const licenseState = globals_1.jest.fn(() => ({ state: "ok" }));
11
- function makeContainer(descriptors, packageMeta, backendUrl) {
12
- const registrations = {};
13
- for (const key of Object.keys(descriptors))
9
+ const configureLicense = globals_1.jest.fn();
10
+ const registerLicensedPackage = globals_1.jest.fn((input) => input.packageName);
11
+ const licenseStates = globals_1.jest.fn(() => ({}));
12
+ const recheckLicense = globals_1.jest.fn(async () => undefined);
13
+ const PAID = "@gorgo-store/medusa-erp-1c";
14
+ const TOKEN = "gorgo_live_" + "ab".repeat(24);
15
+ const logger = { warn: globals_1.jest.fn(), info: globals_1.jest.fn() };
16
+ function makeContainer(identifiers, packageMeta) {
17
+ const registrations = { somethingElse: true };
18
+ for (const key of Object.keys(identifiers))
14
19
  registrations[key] = true;
15
- registrations.somethingElse = true;
16
- const registered = {};
17
20
  return {
18
21
  registrations,
19
- registered,
20
- register(entry) {
21
- for (const [key, value] of Object.entries(entry)) {
22
- const resolver = value?.resolve;
23
- registered[key] = typeof resolver === "function" ? resolver() : value;
24
- }
25
- },
26
22
  resolve(key) {
27
23
  if (key === types_1.INTEGRATION_PACKAGE_META_KEY)
28
24
  return packageMeta;
29
- if (key === "configModule")
30
- return { admin: { backendUrl } };
31
- if (descriptors[key])
32
- return {
33
- descriptor: descriptors[key],
34
- getIdentifier: () => descriptors[key].identifier,
35
- };
25
+ if (key === "configModule") {
26
+ return { admin: { backendUrl: "https://api.shop.example.com" }, projectConfig: { workerMode: "server" } };
27
+ }
28
+ if (key === "logger")
29
+ return logger;
30
+ if (identifiers[key])
31
+ return { getIdentifier: () => identifiers[key] };
36
32
  throw new Error(`not registered: ${key}`);
37
33
  },
38
34
  };
@@ -41,149 +37,109 @@ async function run(container, options = {}) {
41
37
  const loader = require("../check-licenses").default;
42
38
  await loader({ container, options });
43
39
  }
40
+ function onChange() {
41
+ return configureLicense.mock.calls[0][0].onChange;
42
+ }
44
43
  (0, globals_1.describe)("checkLicenses loader", () => {
45
44
  (0, globals_1.beforeEach)(() => {
46
45
  globals_1.jest.resetModules();
47
- require("../license-state").resetLicenseStateStoreForTests();
48
- track.mockClear();
49
- reportLicense.mockClear();
50
- delete process.env.GORGO_LICENSE;
51
- licenseState.mockClear();
52
- licenseState.mockImplementation(() => ({ state: "ok" }));
53
- globals_1.jest.doMock("@gorgo-store/license", () => ({ reportLicense, licenseState }), {
54
- virtual: true,
55
- });
46
+ for (const fn of [track, configureLicense, registerLicensedPackage, licenseStates, recheckLicense])
47
+ fn.mockClear();
48
+ globals_1.jest.doMock("@gorgo/license", () => ({ configureLicense, registerLicensedPackage, licenseStates, recheckLicense }));
56
49
  });
57
- (0, globals_1.it)("does nothing when the verifier package is not installed", async () => {
58
- globals_1.jest.dontMock("@gorgo-store/license");
59
- globals_1.jest.doMock("@gorgo-store/license", () => {
60
- throw new Error("Cannot find module");
61
- }, { virtual: true });
62
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}a`]: { identifier: "a" } }, { a: { name: "@gorgo-store/a", license: "required" } });
63
- await (0, globals_1.expect)(run(container)).resolves.toBeUndefined();
64
- (0, globals_1.expect)(reportLicense).not.toHaveBeenCalled();
65
- });
66
- (0, globals_1.it)("skips a package that does not declare gorgo.license", async () => {
67
- const container = makeContainer({
68
- [`${types_1.IntegrationProviderRegistrationPrefix}free`]: { identifier: "free" },
69
- [`${types_1.IntegrationProviderRegistrationPrefix}paid`]: { identifier: "paid" },
70
- }, {
71
- free: { name: "@gorgo/free" },
72
- paid: { name: "@gorgo-store/paid", license: "required" },
50
+ (0, globals_1.it)("registers every package that declares gorgo.license, once per package", async () => {
51
+ const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}onec`]: "onec", [`${types_1.IntegrationProviderRegistrationPrefix}onec_two`]: "onec", [`${types_1.IntegrationProviderRegistrationPrefix}free`]: "free", [`${types_1.IntegrationProviderRegistrationPrefix}opt`]: "opt" }, {
52
+ onec: { name: PAID, version: "0.3.0", license: "required" },
53
+ free: { name: "@gorgo/medusa-payment-yookassa", version: "1.0.0", license: null },
54
+ opt: { name: "@gorgo-store/optional", version: "1.0.0", license: "optional" },
73
55
  });
74
56
  await run(container);
75
- (0, globals_1.expect)(reportLicense).toHaveBeenCalledTimes(1);
76
- (0, globals_1.expect)(reportLicense.mock.calls[0]?.[0]).toMatchObject({
77
- packageName: "@gorgo-store/paid",
57
+ (0, globals_1.expect)(registerLicensedPackage.mock.calls).toEqual([[{ packageName: PAID, packageVersion: "0.3.0" }]]);
58
+ });
59
+ (0, globals_1.it)("configures the check from the module options and the config module", async () => {
60
+ await run(makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}onec`]: "onec" }, { onec: { name: PAID, license: "required" } }), {
61
+ license: "gorgo_live_from_options",
78
62
  });
63
+ (0, globals_1.expect)(configureLicense).toHaveBeenCalledWith(globals_1.expect.objectContaining({
64
+ license: "gorgo_live_from_options",
65
+ backendUrl: "https://api.shop.example.com",
66
+ workerMode: "server",
67
+ logger,
68
+ }));
79
69
  });
80
- (0, globals_1.it)("checks a package once even with several provider instances", async () => {
81
- const container = makeContainer({
82
- [`${types_1.IntegrationProviderRegistrationPrefix}p_one`]: { identifier: "p" },
83
- [`${types_1.IntegrationProviderRegistrationPrefix}p_two`]: { identifier: "p" },
84
- }, { p: { name: "@gorgo-store/p", license: "required" } });
85
- await run(container);
86
- (0, globals_1.expect)(reportLicense).toHaveBeenCalledTimes(1);
70
+ (0, globals_1.it)("leaves the key to GORGO_LICENSE when the module options have none", async () => {
71
+ await run(makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}onec`]: "onec" }, { onec: { name: PAID, license: "required" } }));
72
+ (0, globals_1.expect)(configureLicense.mock.calls[0][0].license).toBeUndefined();
87
73
  });
88
- (0, globals_1.it)("prefers options.license over GORGO_LICENSE", async () => {
89
- process.env.GORGO_LICENSE = "from-env";
90
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}p`]: { identifier: "p" } }, { p: { name: "@gorgo-store/p", license: "required" } }, "https://shop.example.com");
91
- await run(container, { license: "from-options" });
92
- (0, globals_1.expect)(reportLicense.mock.calls[0]?.[0]).toMatchObject({
93
- license: "from-options",
94
- backendUrl: "https://shop.example.com",
95
- });
74
+ (0, globals_1.it)("configures the check even with no paid package, for providers that register on their own", async () => {
75
+ await run(makeContainer({}, {}));
76
+ (0, globals_1.expect)(configureLicense).toHaveBeenCalledTimes(1);
77
+ (0, globals_1.expect)(registerLicensedPackage).not.toHaveBeenCalled();
96
78
  });
97
- (0, globals_1.it)("falls back to GORGO_LICENSE", async () => {
98
- process.env.GORGO_LICENSE = "from-env";
99
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}p`]: { identifier: "p" } }, { p: { name: "@gorgo-store/p", license: "required" } });
100
- await run(container);
101
- (0, globals_1.expect)(reportLicense.mock.calls[0]?.[0]).toMatchObject({ license: "from-env" });
79
+ (0, globals_1.it)("configures the check once however many paid packages there are, so one listener reports", async () => {
80
+ await run(makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}onec`]: "onec", [`${types_1.IntegrationProviderRegistrationPrefix}other`]: "other" }, {
81
+ onec: { name: PAID, license: "required" },
82
+ other: { name: "@gorgo-store/sandbox-medusa-payment-integration", license: "required" },
83
+ }));
84
+ (0, globals_1.expect)(configureLicense).toHaveBeenCalledTimes(1);
85
+ (0, globals_1.expect)(registerLicensedPackage).toHaveBeenCalledTimes(2);
102
86
  });
103
- (0, globals_1.it)("skips a provider whose package name cannot be resolved", async () => {
104
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}p`]: { identifier: "p" } }, { p: { name: null, license: "required" } });
105
- await run(container);
106
- (0, globals_1.expect)(reportLicense).not.toHaveBeenCalled();
87
+ (0, globals_1.it)("sends the verdicts of its own packages to telemetry without the key", async () => {
88
+ await run(makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}onec`]: "onec" }, { onec: { name: PAID, license: "required" } }), {
89
+ license: "gorgo_live_secret",
90
+ });
91
+ onChange()(PAID, { state: "pending" });
92
+ onChange()(PAID, { state: "ok" }, { state: "pending" });
93
+ onChange()(PAID, { state: "failed", reason: "domain_not_allowed" }, { state: "ok" });
94
+ onChange()(PAID, { state: "unreachable" }, { state: "failed" });
95
+ onChange()("@gorgo-store/medusa-payment-tkassa", { state: "failed", reason: "no_subscription" });
96
+ (0, globals_1.expect)(track.mock.calls).toEqual([
97
+ ["license.ok", { package: PAID }],
98
+ ["license.failed", { package: PAID, reason: "domain_not_allowed" }],
99
+ ["license.unreachable", { package: PAID }],
100
+ ]);
101
+ (0, globals_1.expect)(JSON.stringify(track.mock.calls)).not.toContain("gorgo_live_secret");
107
102
  });
108
- (0, globals_1.it)("keeps going when the verifier throws", async () => {
109
- reportLicense.mockImplementationOnce(() => {
103
+ (0, globals_1.it)("never fails the module when the library throws", async () => {
104
+ registerLicensedPackage.mockImplementationOnce(() => {
110
105
  throw new Error("boom");
111
106
  });
112
- const container = makeContainer({
113
- [`${types_1.IntegrationProviderRegistrationPrefix}a`]: { identifier: "a" },
114
- [`${types_1.IntegrationProviderRegistrationPrefix}b`]: { identifier: "b" },
115
- }, {
116
- a: { name: "@gorgo-store/a", license: "required" },
117
- b: { name: "@gorgo-store/b", license: "required" },
118
- });
119
- await (0, globals_1.expect)(run(container)).resolves.toBeUndefined();
120
- (0, globals_1.expect)(reportLicense).toHaveBeenCalledTimes(2);
107
+ await (0, globals_1.expect)(run(makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}onec`]: "onec" }, { onec: { name: PAID, license: "required" } }))).resolves.toBeUndefined();
121
108
  });
122
- (0, globals_1.it)("registers the verdict per package for the admin surface", async () => {
123
- licenseState.mockImplementation(() => ({ state: "stale" }));
124
- const container = makeContainer({
125
- [`${types_1.IntegrationProviderRegistrationPrefix}p_one`]: { identifier: "p" },
126
- [`${types_1.IntegrationProviderRegistrationPrefix}p_two`]: { identifier: "q" },
127
- }, {
128
- p: { name: "@gorgo-store/p", license: "required" },
129
- q: { name: "@gorgo-store/p", license: "required" },
130
- });
131
- await run(container);
132
- const state = container.registered[types_1.INTEGRATION_LICENSE_STATE_KEY];
133
- (0, globals_1.expect)(state["@gorgo-store/p"]).toMatchObject({
134
- package: "@gorgo-store/p",
135
- state: "stale",
109
+ });
110
+ (0, globals_1.describe)("with the real @gorgo/license", () => {
111
+ let fetchMock;
112
+ (0, globals_1.beforeEach)(() => {
113
+ globals_1.jest.resetModules();
114
+ globals_1.jest.dontMock("@gorgo/license");
115
+ globals_1.jest.useFakeTimers();
116
+ process.env.GORGO_LICENSE = TOKEN;
117
+ fetchMock = globals_1.jest.fn(async (_url, init) => {
118
+ const { packages } = JSON.parse(init.body);
119
+ return new Response(JSON.stringify({
120
+ ok: true,
121
+ project: { handle: "shop", name: "Shop" },
122
+ environment: null,
123
+ packages: packages.map(({ name }) => ({ name, ok: true, cutoff: null, ends_at: null, latest_allowed_version: null })),
124
+ }));
136
125
  });
137
- (0, globals_1.expect)(state["@gorgo-store/p"].identifiers.sort()).toEqual(["p", "q"]);
138
- });
139
- (0, globals_1.it)("marks a package undetermined when the verifier has no verdict", async () => {
140
- licenseState.mockImplementation(() => undefined);
141
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}p`]: { identifier: "p" } }, { p: { name: "@gorgo-store/p", license: "required" } });
142
- await run(container);
143
- const state = container.registered[types_1.INTEGRATION_LICENSE_STATE_KEY];
144
- (0, globals_1.expect)(state["@gorgo-store/p"].state).toBe("undetermined");
145
- });
146
- (0, globals_1.it)("passes the package version so the platform can apply the subscription cutoff", async () => {
147
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}p`]: { identifier: "p" } }, { p: { name: "@gorgo-store/p", version: "1.4.0", license: "required" } });
148
- await run(container);
149
- (0, globals_1.expect)(reportLicense).toHaveBeenCalledWith(globals_1.expect.objectContaining({ packageName: "@gorgo-store/p", packageVersion: "1.4.0" }));
126
+ global.fetch = fetchMock;
150
127
  });
151
- (0, globals_1.it)("shows the verdict the online check reached after boot", async () => {
152
- let live = { state: "pending" };
153
- licenseState.mockImplementation(() => live);
154
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}p`]: { identifier: "p" } }, { p: { name: "@gorgo-store/p", license: "required" } });
155
- await run(container);
156
- const { licenseStates } = require("../license-state");
157
- (0, globals_1.expect)(licenseStates()).toEqual([
158
- { package: "@gorgo-store/p", state: "undetermined", identifiers: ["p"] },
159
- ]);
160
- live = { state: "failed", reason: "no_subscription" };
161
- (0, globals_1.expect)(licenseStates()).toEqual([
162
- {
163
- package: "@gorgo-store/p",
164
- state: "failed",
165
- reason: "no_subscription",
166
- identifiers: ["p"],
167
- },
168
- ]);
169
- live = { state: "ok" };
170
- (0, globals_1.expect)(licenseStates()[0]).toEqual({
171
- package: "@gorgo-store/p",
172
- state: "ok",
173
- identifiers: ["p"],
174
- });
128
+ (0, globals_1.afterEach)(() => {
129
+ globals_1.jest.useRealTimers();
130
+ delete process.env.GORGO_LICENSE;
175
131
  });
176
- globals_1.it.each(["pending", "unreachable", "something-new"])("reports %s as not verified yet", async (raw) => {
177
- licenseState.mockImplementation(() => ({ state: raw }));
178
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}p`]: { identifier: "p" } }, { p: { name: "@gorgo-store/p", license: "required" } });
179
- await run(container);
180
- const state = container.registered[types_1.INTEGRATION_LICENSE_STATE_KEY];
181
- (0, globals_1.expect)(state["@gorgo-store/p"].state).toBe("undetermined");
132
+ (0, globals_1.it)("does not reach the network when no package is paid, so stores with free plugins send nothing", async () => {
133
+ await run(makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}free`]: "free" }, { free: { name: "@gorgo/medusa-payment-yookassa", version: "1.0.0", license: null } }));
134
+ await globals_1.jest.advanceTimersByTimeAsync(3_000);
135
+ (0, globals_1.expect)(fetchMock).not.toHaveBeenCalled();
182
136
  });
183
- (0, globals_1.it)("does not check a package that only declares gorgo.license optional", async () => {
184
- const container = makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}p`]: { identifier: "p" } }, { p: { name: "@gorgo-store/p", license: "optional" } });
185
- await run(container);
186
- (0, globals_1.expect)(reportLicense).not.toHaveBeenCalled();
137
+ (0, globals_1.it)("asks the platform once about the paid packages", async () => {
138
+ await run(makeContainer({ [`${types_1.IntegrationProviderRegistrationPrefix}onec`]: "onec" }, { onec: { name: PAID, version: "0.3.0", license: "required" } }));
139
+ await globals_1.jest.advanceTimersByTimeAsync(3_000);
140
+ (0, globals_1.expect)(fetchMock).toHaveBeenCalledTimes(1);
141
+ const body = JSON.parse(fetchMock.mock.calls[0][1].body);
142
+ (0, globals_1.expect)(body.packages).toEqual([{ name: PAID, version: "0.3.0" }]);
187
143
  });
188
144
  });
189
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"check-licenses.unit.spec.js","sourceRoot":"","sources":["../../../../../../../src/modules/integration/loaders/__tests__/check-licenses.unit.spec.ts"],"names":[],"mappings":"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"}
145
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"check-licenses.unit.spec.js","sourceRoot":"","sources":["../../../../../../../src/modules/integration/loaders/__tests__/check-licenses.unit.spec.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,34 @@
1
+ "use strict";
2
+ var __importDefault = (this && this.__importDefault) || function (mod) {
3
+ return (mod && mod.__esModule) ? mod : { "default": mod };
4
+ };
5
+ Object.defineProperty(exports, "__esModule", { value: true });
6
+ const globals_1 = require("@jest/globals");
7
+ const node_fs_1 = require("node:fs");
8
+ const node_os_1 = require("node:os");
9
+ const node_path_1 = __importDefault(require("node:path"));
10
+ const resolve_package_meta_1 = require("../resolve-package-meta");
11
+ /** A Medusa project with one provider package installed in its own node_modules. */
12
+ function projectWithProvider() {
13
+ const root = (0, node_fs_1.mkdtempSync)(node_path_1.default.join((0, node_os_1.tmpdir)(), "gorgo-project-"));
14
+ const pkg = node_path_1.default.join(root, "node_modules", "@acme", "paid");
15
+ (0, node_fs_1.mkdirSync)(node_path_1.default.join(pkg, "providers", "thing"), { recursive: true });
16
+ (0, node_fs_1.writeFileSync)(node_path_1.default.join(pkg, "package.json"), JSON.stringify({ name: "@acme/paid", version: "1.2.3" }));
17
+ (0, node_fs_1.writeFileSync)(node_path_1.default.join(pkg, "providers", "thing", "index.js"), "module.exports = { default: { services: [{ identifier: 'thing' }] } }");
18
+ return root;
19
+ }
20
+ (0, globals_1.afterEach)(() => {
21
+ globals_1.jest.restoreAllMocks();
22
+ });
23
+ (0, globals_1.describe)("resolvePackageMetaByIdentifier", () => {
24
+ (0, globals_1.it)("finds a provider package installed in the project, not next to this module", () => {
25
+ globals_1.jest.spyOn(process, "cwd").mockReturnValue(projectWithProvider());
26
+ const meta = (0, resolve_package_meta_1.resolvePackageMetaByIdentifier)([{ resolve: "@acme/paid/providers/thing" }]);
27
+ (0, globals_1.expect)(meta.thing).toMatchObject({ name: "@acme/paid", version: "1.2.3" });
28
+ });
29
+ (0, globals_1.it)("skips a provider it cannot resolve", () => {
30
+ globals_1.jest.spyOn(process, "cwd").mockReturnValue((0, node_fs_1.mkdtempSync)(node_path_1.default.join((0, node_os_1.tmpdir)(), "gorgo-empty-")));
31
+ (0, globals_1.expect)((0, resolve_package_meta_1.resolvePackageMetaByIdentifier)([{ resolve: "@acme/missing/providers/thing" }])).toEqual({});
32
+ });
33
+ });
34
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZS1wYWNrYWdlLW1ldGEudW5pdC5zcGVjLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vLi4vLi4vc3JjL21vZHVsZXMvaW50ZWdyYXRpb24vbG9hZGVycy9fX3Rlc3RzX18vcmVzb2x2ZS1wYWNrYWdlLW1ldGEudW5pdC5zcGVjLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBQUEsMkNBQXFFO0FBQ3JFLHFDQUErRDtBQUMvRCxxQ0FBZ0M7QUFDaEMsMERBQTRCO0FBQzVCLGtFQUF3RTtBQUV4RSxvRkFBb0Y7QUFDcEYsU0FBUyxtQkFBbUI7SUFDMUIsTUFBTSxJQUFJLEdBQUcsSUFBQSxxQkFBVyxFQUFDLG1CQUFJLENBQUMsSUFBSSxDQUFDLElBQUEsZ0JBQU0sR0FBRSxFQUFFLGdCQUFnQixDQUFDLENBQUMsQ0FBQTtJQUMvRCxNQUFNLEdBQUcsR0FBRyxtQkFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsY0FBYyxFQUFFLE9BQU8sRUFBRSxNQUFNLENBQUMsQ0FBQTtJQUM1RCxJQUFBLG1CQUFTLEVBQUMsbUJBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLFdBQVcsRUFBRSxPQUFPLENBQUMsRUFBRSxFQUFFLFNBQVMsRUFBRSxJQUFJLEVBQUUsQ0FBQyxDQUFBO0lBQ3BFLElBQUEsdUJBQWEsRUFBQyxtQkFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsY0FBYyxDQUFDLEVBQUUsSUFBSSxDQUFDLFNBQVMsQ0FBQyxFQUFFLElBQUksRUFBRSxZQUFZLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxDQUFDLENBQUMsQ0FBQTtJQUN2RyxJQUFBLHVCQUFhLEVBQ1gsbUJBQUksQ0FBQyxJQUFJLENBQUMsR0FBRyxFQUFFLFdBQVcsRUFBRSxPQUFPLEVBQUUsVUFBVSxDQUFDLEVBQ2hELHVFQUF1RSxDQUN4RSxDQUFBO0lBQ0QsT0FBTyxJQUFJLENBQUE7QUFDYixDQUFDO0FBRUQsSUFBQSxtQkFBUyxFQUFDLEdBQUcsRUFBRTtJQUNiLGNBQUksQ0FBQyxlQUFlLEVBQUUsQ0FBQTtBQUN4QixDQUFDLENBQUMsQ0FBQTtBQUVGLElBQUEsa0JBQVEsRUFBQyxnQ0FBZ0MsRUFBRSxHQUFHLEVBQUU7SUFDOUMsSUFBQSxZQUFFLEVBQUMsNEVBQTRFLEVBQUUsR0FBRyxFQUFFO1FBQ3BGLGNBQUksQ0FBQyxLQUFLLENBQUMsT0FBTyxFQUFFLEtBQUssQ0FBQyxDQUFDLGVBQWUsQ0FBQyxtQkFBbUIsRUFBRSxDQUFDLENBQUE7UUFFakUsTUFBTSxJQUFJLEdBQUcsSUFBQSxxREFBOEIsRUFBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLDRCQUE0QixFQUFTLENBQUMsQ0FBQyxDQUFBO1FBRS9GLElBQUEsZ0JBQU0sRUFBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsYUFBYSxDQUFDLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxPQUFPLEVBQUUsT0FBTyxFQUFFLENBQUMsQ0FBQTtJQUM1RSxDQUFDLENBQUMsQ0FBQTtJQUVGLElBQUEsWUFBRSxFQUFDLG9DQUFvQyxFQUFFLEdBQUcsRUFBRTtRQUM1QyxjQUFJLENBQUMsS0FBSyxDQUFDLE9BQU8sRUFBRSxLQUFLLENBQUMsQ0FBQyxlQUFlLENBQUMsSUFBQSxxQkFBVyxFQUFDLG1CQUFJLENBQUMsSUFBSSxDQUFDLElBQUEsZ0JBQU0sR0FBRSxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUU1RixJQUFBLGdCQUFNLEVBQUMsSUFBQSxxREFBOEIsRUFBQyxDQUFDLEVBQUUsT0FBTyxFQUFFLCtCQUErQixFQUFTLENBQUMsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQzNHLENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFDLENBQUEifQ==
@@ -1,9 +1,10 @@
1
1
  import type { LoaderOptions } from "@medusajs/framework/types";
2
2
  import type { IntegrationModuleOptions } from "../types";
3
3
  /**
4
- * Check the license of every registered provider whose package declares `gorgo.license`.
5
- * One check per npm package, never per instance. The verdict is registered in the container
6
- * so the admin surface can read it; a package the verifier cannot judge never blocks boot.
4
+ * Registers every package that declares `"gorgo": { "license": "required" }` with the process-wide
5
+ * check of `@gorgo/license`, once per package however many instances it has. Without such a package
6
+ * the library never reaches the network. The check runs in the background, never blocks boot and
7
+ * never throws; the admin reads its verdicts live.
7
8
  */
8
- declare const _default: ({ container, options, }: LoaderOptions<IntegrationModuleOptions>) => Promise<void>;
9
+ declare const _default: ({ container, options }: LoaderOptions<IntegrationModuleOptions>) => Promise<void>;
9
10
  export default _default;
@@ -1,10 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- const awilix_1 = require("@medusajs/framework/awilix");
3
+ const license_1 = require("@gorgo/license");
4
4
  const telemetry_1 = require("@gorgo/telemetry");
5
5
  const types_1 = require("../types");
6
- const license_state_1 = require("./license-state");
7
- const VERIFIER_PACKAGE = "@gorgo-store/license";
8
6
  function safeResolve(container, key) {
9
7
  try {
10
8
  return container.resolve(key);
@@ -13,85 +11,64 @@ function safeResolve(container, key) {
13
11
  return undefined;
14
12
  }
15
13
  }
16
- function loadVerifier() {
17
- try {
18
- const mod = require(VERIFIER_PACKAGE);
19
- const api = mod?.default ?? mod;
20
- const fn = (mod?.reportLicense ?? api?.reportLicense);
21
- if (typeof fn !== "function")
22
- return null;
23
- const state = (mod?.licenseState ?? api?.licenseState);
24
- return {
25
- reportLicense: fn,
26
- licenseState: typeof state === "function" ? state : undefined,
27
- };
28
- }
29
- catch {
30
- return null;
31
- }
32
- }
33
14
  /**
34
- * Check the license of every registered provider whose package declares `gorgo.license`.
35
- * One check per npm package, never per instance. The verdict is registered in the container
36
- * so the admin surface can read it; a package the verifier cannot judge never blocks boot.
15
+ * Registers every package that declares `"gorgo": { "license": "required" }` with the process-wide
16
+ * check of `@gorgo/license`, once per package however many instances it has. Without such a package
17
+ * the library never reaches the network. The check runs in the background, never blocks boot and
18
+ * never throws; the admin reads its verdicts live.
37
19
  */
38
- exports.default = async ({ container, options, }) => {
39
- const state = (0, license_state_1.licenseStateStore)();
20
+ exports.default = async ({ container, options }) => {
21
+ const packageMeta = safeResolve(container, types_1.INTEGRATION_PACKAGE_META_KEY) ?? {};
22
+ const configModule = safeResolve(container, "configModule");
23
+ const logger = safeResolve(container, "logger");
24
+ const telemetry = (0, telemetry_1.createTelemetryClient)({ packageDir: __dirname });
25
+ const own = new Set();
26
+ const report = (packageName, next) => {
27
+ if (!own.has(packageName))
28
+ return;
29
+ if (next.state === "ok")
30
+ telemetry.track("license.ok", { package: packageName });
31
+ else if (next.state === "unreachable")
32
+ telemetry.track("license.unreachable", { package: packageName });
33
+ else if (next.state === "failed")
34
+ telemetry.track("license.failed", { package: packageName, reason: next.reason });
35
+ };
36
+ // Once per process, before any package registers: one listener, and the settings also reach
37
+ // providers that register their own check, such as a plain payment provider.
40
38
  try {
41
- ;
42
- container.register({
43
- [types_1.INTEGRATION_LICENSE_STATE_KEY]: (0, awilix_1.asValue)(state),
39
+ (0, license_1.configureLicense)({
40
+ license: options?.license,
41
+ backendUrl: configModule?.admin?.backendUrl,
42
+ workerMode: configModule?.projectConfig?.workerMode,
43
+ logger,
44
+ onChange: (packageName, next) => {
45
+ try {
46
+ report(packageName, next);
47
+ }
48
+ catch {
49
+ return;
50
+ }
51
+ },
44
52
  });
45
53
  }
46
54
  catch {
47
- // a container without register (unit tests) still gets the checks below
48
- }
49
- const verifier = loadVerifier();
50
- if (!verifier)
51
55
  return;
52
- (0, license_state_1.setLicenseStateReader)(verifier.licenseState);
53
- const packageMeta = safeResolve(container, types_1.INTEGRATION_PACKAGE_META_KEY) ?? {};
54
- const backendUrl = safeResolve(container, "configModule")?.admin?.backendUrl;
55
- const license = options?.license ?? process.env.GORGO_LICENSE;
56
- const registrations = container.registrations ?? {};
57
- const keys = Object.keys(registrations).filter((key) => key.startsWith(types_1.IntegrationProviderRegistrationPrefix));
58
- const telemetry = (0, telemetry_1.createTelemetryClient)({ packageDir: __dirname });
59
- const seen = new Set();
56
+ }
57
+ const keys = Object.keys(container.registrations ?? {}).filter((key) => key.startsWith(types_1.IntegrationProviderRegistrationPrefix));
60
58
  for (const key of keys) {
61
- const provider = safeResolve(container, key);
62
- const identifier = provider?.getIdentifier?.() ?? provider?.descriptor?.identifier;
63
- if (!identifier)
64
- continue;
65
- const meta = packageMeta[identifier];
66
- if (meta?.license !== "required")
67
- continue;
68
- const packageName = meta.name;
69
- if (!packageName)
70
- continue;
71
- if (seen.has(packageName)) {
72
- state[packageName]?.identifiers.push(identifier);
73
- continue;
74
- }
75
- seen.add(packageName);
76
59
  try {
77
- verifier.reportLicense({
78
- license,
79
- backendUrl,
80
- packageName,
81
- packageVersion: meta.version ?? undefined,
82
- track: (event, props) => telemetry.track(event, props),
83
- });
84
- const verdict = verifier.licenseState?.(packageName);
85
- state[packageName] = {
86
- package: packageName,
87
- state: (0, license_state_1.normalizeLicenseState)(verdict?.state),
88
- ...(verdict?.reason ? { reason: verdict.reason } : {}),
89
- identifiers: [identifier],
90
- };
60
+ const provider = safeResolve(container, key);
61
+ const identifier = provider?.getIdentifier?.() ?? provider?.descriptor?.identifier;
62
+ const meta = identifier ? packageMeta[identifier] : undefined;
63
+ if (meta?.license !== "required" || !meta.name)
64
+ continue;
65
+ if (own.has(meta.name))
66
+ continue;
67
+ own.add((0, license_1.registerLicensedPackage)({ packageName: meta.name, packageVersion: meta.version ?? undefined }) ?? meta.name);
91
68
  }
92
69
  catch {
93
70
  continue;
94
71
  }
95
72
  }
96
73
  };
97
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2stbGljZW5zZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9pbnRlZ3JhdGlvbi9sb2FkZXJzL2NoZWNrLWxpY2Vuc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsdURBQW9EO0FBRXBELGdEQUF3RDtBQUN4RCxvQ0FJaUI7QUFDakIsbURBSXdCO0FBT3hCLE1BQU0sZ0JBQWdCLEdBQUcsc0JBQXNCLENBQUE7QUFtQi9DLFNBQVMsV0FBVyxDQUFDLFNBQWMsRUFBRSxHQUFXO0lBQzlDLElBQUksQ0FBQztRQUNILE9BQU8sU0FBUyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUMvQixDQUFDO0lBQUMsTUFBTSxDQUFDO1FBQ1AsT0FBTyxTQUFTLENBQUE7SUFDbEIsQ0FBQztBQUNILENBQUM7QUFFRCxTQUFTLFlBQVk7SUFDbkIsSUFBSSxDQUFDO1FBQ0gsTUFBTSxHQUFHLEdBQUcsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUE7UUFDckMsTUFBTSxHQUFHLEdBQUcsR0FBRyxFQUFFLE9BQU8sSUFBSSxHQUFHLENBQUE7UUFDL0IsTUFBTSxFQUFFLEdBQUcsQ0FBQyxHQUFHLEVBQUUsYUFBYSxJQUFJLEdBQUcsRUFBRSxhQUFhLENBQVksQ0FBQTtRQUNoRSxJQUFJLE9BQU8sRUFBRSxLQUFLLFVBQVU7WUFBRSxPQUFPLElBQUksQ0FBQTtRQUN6QyxNQUFNLEtBQUssR0FBRyxDQUFDLEdBQUcsRUFBRSxZQUFZLElBQUksR0FBRyxFQUFFLFlBQVksQ0FBWSxDQUFBO1FBQ2pFLE9BQU87WUFDTCxhQUFhLEVBQUUsRUFBbUI7WUFDbEMsWUFBWSxFQUFFLE9BQU8sS0FBSyxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUUsS0FBNEIsQ0FBQyxDQUFDLENBQUMsU0FBUztTQUN0RixDQUFBO0lBQ0gsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLE9BQU8sSUFBSSxDQUFB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
74
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2hlY2stbGljZW5zZXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9pbnRlZ3JhdGlvbi9sb2FkZXJzL2NoZWNrLWxpY2Vuc2VzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNENBQTBFO0FBQzFFLGdEQUF3RDtBQUN4RCxvQ0FBOEY7QUFLOUYsU0FBUyxXQUFXLENBQUMsU0FBYyxFQUFFLEdBQVc7SUFDOUMsSUFBSSxDQUFDO1FBQ0gsT0FBTyxTQUFTLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFBO0lBQy9CLENBQUM7SUFBQyxNQUFNLENBQUM7UUFDUCxPQUFPLFNBQVMsQ0FBQTtJQUNsQixDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsa0JBQWUsS0FBSyxFQUFFLEVBQUUsU0FBUyxFQUFFLE9BQU8sRUFBMkMsRUFBaUIsRUFBRTtJQUN0RyxNQUFNLFdBQVcsR0FBbUIsV0FBVyxDQUFDLFNBQVMsRUFBRSxvQ0FBNEIsQ0FBQyxJQUFJLEVBQUUsQ0FBQTtJQUM5RixNQUFNLFlBQVksR0FBRyxXQUFXLENBQUMsU0FBUyxFQUFFLGNBQWMsQ0FBQyxDQUFBO0lBQzNELE1BQU0sTUFBTSxHQUFHLFdBQVcsQ0FBQyxTQUFTLEVBQUUsUUFBUSxDQUFDLENBQUE7SUFDL0MsTUFBTSxTQUFTLEdBQUcsSUFBQSxpQ0FBcUIsRUFBQyxFQUFFLFVBQVUsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFBO0lBQ2xFLE1BQU0sR0FBRyxHQUFHLElBQUksR0FBRyxFQUFVLENBQUE7SUFFN0IsTUFBTSxNQUFNLEdBQUcsQ0FBQyxXQUFtQixFQUFFLElBQW1CLEVBQUUsRUFBRTtRQUMxRCxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxXQUFXLENBQUM7WUFBRSxPQUFNO1FBQ2pDLElBQUksSUFBSSxDQUFDLEtBQUssS0FBSyxJQUFJO1lBQUUsU0FBUyxDQUFDLEtBQUssQ0FBQyxZQUFZLEVBQUUsRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLENBQUMsQ0FBQTthQUMzRSxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssYUFBYTtZQUFFLFNBQVMsQ0FBQyxLQUFLLENBQUMscUJBQXFCLEVBQUUsRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLENBQUMsQ0FBQTthQUNsRyxJQUFJLElBQUksQ0FBQyxLQUFLLEtBQUssUUFBUTtZQUFFLFNBQVMsQ0FBQyxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsRUFBRSxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUMsTUFBTSxFQUFFLENBQUMsQ0FBQTtJQUNwSCxDQUFDLENBQUE7SUFFRCw0RkFBNEY7SUFDNUYsNkVBQTZFO0lBQzdFLElBQUksQ0FBQztRQUNILElBQUEsMEJBQWdCLEVBQUM7WUFDZixPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU87WUFDekIsVUFBVSxFQUFFLFlBQVksRUFBRSxLQUFLLEVBQUUsVUFBVTtZQUMzQyxVQUFVLEVBQUUsWUFBWSxFQUFFLGFBQWEsRUFBRSxVQUFVO1lBQ25ELE1BQU07WUFDTixRQUFRLEVBQUUsQ0FBQyxXQUFXLEVBQUUsSUFBSSxFQUFFLEVBQUU7Z0JBQzlCLElBQUksQ0FBQztvQkFDSCxNQUFNLENBQUMsV0FBVyxFQUFFLElBQUksQ0FBQyxDQUFBO2dCQUMzQixDQUFDO2dCQUFDLE1BQU0sQ0FBQztvQkFDUCxPQUFNO2dCQUNSLENBQUM7WUFDSCxDQUFDO1NBQ0YsQ0FBQyxDQUFBO0lBQ0osQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLE9BQU07SUFDUixDQUFDO0lBRUQsTUFBTSxJQUFJLEdBQUcsTUFBTSxDQUFDLElBQUksQ0FBRSxTQUFpQixDQUFDLGFBQWEsSUFBSSxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUM5RSxHQUFHLENBQUMsVUFBVSxDQUFDLDZDQUFxQyxDQUFDLENBQ3RELENBQUE7SUFFRCxLQUFLLE1BQU0sR0FBRyxJQUFJLElBQUksRUFBRSxDQUFDO1FBQ3ZCLElBQUksQ0FBQztZQUNILE1BQU0sUUFBUSxHQUFHLFdBQVcsQ0FBQyxTQUFTLEVBQUUsR0FBRyxDQUFDLENBQUE7WUFDNUMsTUFBTSxVQUFVLEdBQUcsUUFBUSxFQUFFLGFBQWEsRUFBRSxFQUFFLElBQUksUUFBUSxFQUFFLFVBQVUsRUFBRSxVQUFVLENBQUE7WUFDbEYsTUFBTSxJQUFJLEdBQUcsVUFBVSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLFNBQVMsQ0FBQTtZQUM3RCxJQUFJLElBQUksRUFBRSxPQUFPLEtBQUssVUFBVSxJQUFJLENBQUMsSUFBSSxDQUFDLElBQUk7Z0JBQUUsU0FBUTtZQUV4RCxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztnQkFBRSxTQUFRO1lBQ2hDLEdBQUcsQ0FBQyxHQUFHLENBQUMsSUFBQSxpQ0FBdUIsRUFBQyxFQUFFLFdBQVcsRUFBRSxJQUFJLENBQUMsSUFBSSxFQUFFLGNBQWMsRUFBRSxJQUFJLENBQUMsT0FBTyxJQUFJLFNBQVMsRUFBRSxDQUFDLElBQUksSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3RILENBQUM7UUFBQyxNQUFNLENBQUM7WUFDUCxTQUFRO1FBQ1YsQ0FBQztJQUNILENBQUM7QUFDSCxDQUFDLENBQUEifQ==
@@ -27,6 +27,20 @@ function readNearestPackageJson(startDir) {
27
27
  dir = parent;
28
28
  }
29
29
  }
30
+ /**
31
+ * A provider shipped by a plugin is a bare specifier ("<plugin>/providers/<name>"), installed for
32
+ * the project rather than for this module, so it resolves from the project directory first, the
33
+ * way Medusa itself loads providers. Under pnpm without hoisting or Yarn PnP the module's own
34
+ * location cannot see the plugin at all.
35
+ */
36
+ function resolveFromProject(spec) {
37
+ try {
38
+ return require.resolve(spec, { paths: [process.cwd()] });
39
+ }
40
+ catch {
41
+ return require.resolve(spec);
42
+ }
43
+ }
30
44
  /**
31
45
  * Resolve npm-package metadata (version/author/url) per provider `identifier` from each
32
46
  * registration's `resolve` specifier. identifier↔package is 1:1, so one lookup keys every
@@ -39,11 +53,12 @@ function resolvePackageMetaByIdentifier(providers) {
39
53
  if (!spec)
40
54
  continue;
41
55
  try {
42
- const pkgJson = readNearestPackageJson(node_path_1.default.dirname(require.resolve(spec)));
56
+ const entryPath = resolveFromProject(spec);
57
+ const pkgJson = readNearestPackageJson(node_path_1.default.dirname(entryPath));
43
58
  if (!pkgJson)
44
59
  continue;
45
60
  const meta = (0, package_meta_1.parsePackageMeta)(pkgJson);
46
- const mod = require(spec);
61
+ const mod = require(entryPath);
47
62
  const services = (mod?.default ?? mod)?.services ?? [];
48
63
  for (const svc of services) {
49
64
  if (svc?.identifier)
@@ -56,4 +71,4 @@ function resolvePackageMetaByIdentifier(providers) {
56
71
  }
57
72
  return out;
58
73
  }
59
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZS1wYWNrYWdlLW1ldGEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9pbnRlZ3JhdGlvbi9sb2FkZXJzL3Jlc29sdmUtcGFja2FnZS1tZXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBNkJBLHdFQW1CQztBQWhERCwwREFBNEI7QUFDNUIscUNBQXNDO0FBRXRDLGlEQUFpRDtBQUdqRCxtRkFBbUY7QUFDbkYsU0FBUyxzQkFBc0IsQ0FBQyxRQUFnQjtJQUM5QyxJQUFJLEdBQUcsR0FBRyxtQkFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUNoQyxpREFBaUQ7SUFDakQsT0FBTyxJQUFJLEVBQUUsQ0FBQztRQUNaLElBQUksQ0FBQztZQUNILE1BQU0sR0FBRyxHQUFHLElBQUEsc0JBQVksRUFBQyxtQkFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsY0FBYyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7WUFDakUsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUMzQixJQUFJLEdBQUcsRUFBRSxJQUFJLElBQUksR0FBRyxFQUFFLE9BQU87Z0JBQUUsT0FBTyxHQUFHLENBQUE7UUFDM0MsQ0FBQztRQUFDLE1BQU0sQ0FBQztZQUNQLGtCQUFrQjtRQUNwQixDQUFDO1FBQ0QsTUFBTSxNQUFNLEdBQUcsbUJBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDaEMsSUFBSSxNQUFNLEtBQUssR0FBRztZQUFFLE9BQU8sSUFBSSxDQUFBO1FBQy9CLEdBQUcsR0FBRyxNQUFNLENBQUE7SUFDZCxDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxTQUFnQiw4QkFBOEIsQ0FBQyxTQUEyQjtJQUN4RSxNQUFNLEdBQUcsR0FBbUIsRUFBRSxDQUFBO0lBQzlCLEtBQUssTUFBTSxLQUFLLElBQUksU0FBUyxFQUFFLENBQUM7UUFDOUIsTUFBTSxJQUFJLEdBQUksS0FBOEIsQ0FBQyxPQUFPLENBQUE7UUFDcEQsSUFBSSxDQUFDLElBQUk7WUFBRSxTQUFRO1FBQ25CLElBQUksQ0FBQztZQUNILE1BQU0sT0FBTyxHQUFHLHNCQUFzQixDQUFDLG1CQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxDQUFBO1lBQzNFLElBQUksQ0FBQyxPQUFPO2dCQUFFLFNBQVE7WUFDdEIsTUFBTSxJQUFJLEdBQUcsSUFBQSwrQkFBZ0IsRUFBQyxPQUFjLENBQUMsQ0FBQTtZQUM3QyxNQUFNLEdBQUcsR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUE7WUFDekIsTUFBTSxRQUFRLEdBQW1DLENBQUMsR0FBRyxFQUFFLE9BQU8sSUFBSSxHQUFHLENBQUMsRUFBRSxRQUFRLElBQUksRUFBRSxDQUFBO1lBQ3RGLEtBQUssTUFBTSxHQUFHLElBQUksUUFBUSxFQUFFLENBQUM7Z0JBQzNCLElBQUksR0FBRyxFQUFFLFVBQVU7b0JBQUUsR0FBRyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsR0FBRyxJQUFJLENBQUE7WUFDakQsQ0FBQztRQUNILENBQUM7UUFBQyxNQUFNLENBQUM7WUFDUCw2REFBNkQ7UUFDL0QsQ0FBQztJQUNILENBQUM7SUFDRCxPQUFPLEdBQUcsQ0FBQTtBQUNaLENBQUMifQ==
74
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVzb2x2ZS1wYWNrYWdlLW1ldGEuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi8uLi8uLi9zcmMvbW9kdWxlcy9pbnRlZ3JhdGlvbi9sb2FkZXJzL3Jlc29sdmUtcGFja2FnZS1tZXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7O0FBMkNBLHdFQW9CQztBQS9ERCwwREFBNEI7QUFDNUIscUNBQXNDO0FBRXRDLGlEQUFpRDtBQUdqRCxtRkFBbUY7QUFDbkYsU0FBUyxzQkFBc0IsQ0FBQyxRQUFnQjtJQUM5QyxJQUFJLEdBQUcsR0FBRyxtQkFBSSxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQTtJQUNoQyxpREFBaUQ7SUFDakQsT0FBTyxJQUFJLEVBQUUsQ0FBQztRQUNaLElBQUksQ0FBQztZQUNILE1BQU0sR0FBRyxHQUFHLElBQUEsc0JBQVksRUFBQyxtQkFBSSxDQUFDLElBQUksQ0FBQyxHQUFHLEVBQUUsY0FBYyxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUE7WUFDakUsTUFBTSxHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUMzQixJQUFJLEdBQUcsRUFBRSxJQUFJLElBQUksR0FBRyxFQUFFLE9BQU87Z0JBQUUsT0FBTyxHQUFHLENBQUE7UUFDM0MsQ0FBQztRQUFDLE1BQU0sQ0FBQztZQUNQLGtCQUFrQjtRQUNwQixDQUFDO1FBQ0QsTUFBTSxNQUFNLEdBQUcsbUJBQUksQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLENBQUE7UUFDaEMsSUFBSSxNQUFNLEtBQUssR0FBRztZQUFFLE9BQU8sSUFBSSxDQUFBO1FBQy9CLEdBQUcsR0FBRyxNQUFNLENBQUE7SUFDZCxDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7OztHQUtHO0FBQ0gsU0FBUyxrQkFBa0IsQ0FBQyxJQUFZO0lBQ3RDLElBQUksQ0FBQztRQUNILE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLEVBQUUsRUFBRSxLQUFLLEVBQUUsQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLENBQUMsRUFBRSxDQUFDLENBQUE7SUFDMUQsQ0FBQztJQUFDLE1BQU0sQ0FBQztRQUNQLE9BQU8sT0FBTyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUM5QixDQUFDO0FBQ0gsQ0FBQztBQUVEOzs7O0dBSUc7QUFDSCxTQUFnQiw4QkFBOEIsQ0FBQyxTQUEyQjtJQUN4RSxNQUFNLEdBQUcsR0FBbUIsRUFBRSxDQUFBO0lBQzlCLEtBQUssTUFBTSxLQUFLLElBQUksU0FBUyxFQUFFLENBQUM7UUFDOUIsTUFBTSxJQUFJLEdBQUksS0FBOEIsQ0FBQyxPQUFPLENBQUE7UUFDcEQsSUFBSSxDQUFDLElBQUk7WUFBRSxTQUFRO1FBQ25CLElBQUksQ0FBQztZQUNILE1BQU0sU0FBUyxHQUFHLGtCQUFrQixDQUFDLElBQUksQ0FBQyxDQUFBO1lBQzFDLE1BQU0sT0FBTyxHQUFHLHNCQUFzQixDQUFDLG1CQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7WUFDL0QsSUFBSSxDQUFDLE9BQU87Z0JBQUUsU0FBUTtZQUN0QixNQUFNLElBQUksR0FBRyxJQUFBLCtCQUFnQixFQUFDLE9BQWMsQ0FBQyxDQUFBO1lBQzdDLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyxTQUFTLENBQUMsQ0FBQTtZQUM5QixNQUFNLFFBQVEsR0FBbUMsQ0FBQyxHQUFHLEVBQUUsT0FBTyxJQUFJLEdBQUcsQ0FBQyxFQUFFLFFBQVEsSUFBSSxFQUFFLENBQUE7WUFDdEYsS0FBSyxNQUFNLEdBQUcsSUFBSSxRQUFRLEVBQUUsQ0FBQztnQkFDM0IsSUFBSSxHQUFHLEVBQUUsVUFBVTtvQkFBRSxHQUFHLENBQUMsR0FBRyxDQUFDLFVBQVUsQ0FBQyxHQUFHLElBQUksQ0FBQTtZQUNqRCxDQUFDO1FBQ0gsQ0FBQztRQUFDLE1BQU0sQ0FBQztZQUNQLDZEQUE2RDtRQUMvRCxDQUFDO0lBQ0gsQ0FBQztJQUNELE9BQU8sR0FBRyxDQUFBO0FBQ1osQ0FBQyJ9