@eventcatalog/core 5.0.0-beta.34 → 5.0.0-beta.35

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.
@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
36
36
  var import_os = __toESM(require("os"), 1);
37
37
 
38
38
  // package.json
39
- var version = "5.0.0-beta.34";
39
+ var version = "5.0.0-beta.35";
40
40
 
41
41
  // src/constants.ts
42
42
  var VERSION = version;
@@ -1,8 +1,8 @@
1
1
  import {
2
2
  raiseEvent
3
- } from "../chunk-GTI7UNJD.js";
3
+ } from "../chunk-TXV7VMAS.js";
4
4
  import "../chunk-CPW6G62V.js";
5
- import "../chunk-UDWBR66A.js";
5
+ import "../chunk-4NFKVUXN.js";
6
6
  export {
7
7
  raiseEvent
8
8
  };
@@ -169,7 +169,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
169
169
  var import_os = __toESM(require("os"), 1);
170
170
 
171
171
  // package.json
172
- var version = "5.0.0-beta.34";
172
+ var version = "5.0.0-beta.35";
173
173
 
174
174
  // src/constants.ts
175
175
  var VERSION = version;
@@ -1,12 +1,12 @@
1
1
  import {
2
2
  log_build_default
3
- } from "../chunk-EFFYDIIZ.js";
3
+ } from "../chunk-3V4QU6X4.js";
4
4
  import "../chunk-AD7CL772.js";
5
+ import "../chunk-TXV7VMAS.js";
5
6
  import "../chunk-ZAZHAVKB.js";
6
7
  import "../chunk-CA6WCQ2T.js";
7
- import "../chunk-GTI7UNJD.js";
8
8
  import "../chunk-CPW6G62V.js";
9
- import "../chunk-UDWBR66A.js";
9
+ import "../chunk-4NFKVUXN.js";
10
10
  import "../chunk-4G7FSRPN.js";
11
11
  export {
12
12
  log_build_default as default
@@ -1,6 +1,9 @@
1
1
  import {
2
2
  getLicenseAnalytics
3
3
  } from "./chunk-AD7CL772.js";
4
+ import {
5
+ raiseEvent
6
+ } from "./chunk-TXV7VMAS.js";
4
7
  import {
5
8
  countResources,
6
9
  hashCatalogContent,
@@ -11,9 +14,6 @@ import {
11
14
  getStudioMode,
12
15
  serializeStudioUsage
13
16
  } from "./chunk-CA6WCQ2T.js";
14
- import {
15
- raiseEvent
16
- } from "./chunk-GTI7UNJD.js";
17
17
  import {
18
18
  TELEMETRY_REQUEST_TIMEOUT_MS,
19
19
  isTelemetryDisabled
@@ -1,3 +1,7 @@
1
+ import {
2
+ getFederationDiagnostics,
3
+ resolveFederationRules
4
+ } from "./chunk-JJPB6EOZ.js";
1
5
  import {
2
6
  withFederationOutputTransaction
3
7
  } from "./chunk-WRNH5C3U.js";
@@ -6,14 +10,10 @@ import {
6
10
  } from "./chunk-5EPNFDT5.js";
7
11
  import {
8
12
  createFederationSourceProvider
9
- } from "./chunk-6K7XZAYI.js";
13
+ } from "./chunk-A2RZR3U4.js";
10
14
  import {
11
15
  createFederationContentCache
12
16
  } from "./chunk-R7Z5ALYI.js";
13
- import {
14
- getFederationDiagnostics,
15
- resolveFederationRules
16
- } from "./chunk-JJPB6EOZ.js";
17
17
  import {
18
18
  getEventCatalogConfigFile
19
19
  } from "./chunk-4G7FSRPN.js";
@@ -1,5 +1,5 @@
1
1
  // package.json
2
- var version = "5.0.0-beta.34";
2
+ var version = "5.0.0-beta.35";
3
3
 
4
4
  // src/constants.ts
5
5
  var VERSION = version;
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  VERSION
3
- } from "./chunk-UDWBR66A.js";
3
+ } from "./chunk-4NFKVUXN.js";
4
4
 
5
5
  // src/utils/cli-logger.ts
6
6
  import pc from "picocolors";
@@ -4,7 +4,7 @@ import {
4
4
  } from "./chunk-CPW6G62V.js";
5
5
  import {
6
6
  VERSION
7
- } from "./chunk-UDWBR66A.js";
7
+ } from "./chunk-4NFKVUXN.js";
8
8
 
9
9
  // src/analytics/analytics.js
10
10
  import os from "os";
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  logger
3
- } from "./chunk-2BXQDWRV.js";
3
+ } from "./chunk-IITLANIL.js";
4
4
  import {
5
5
  cleanup,
6
6
  getEventCatalogConfigFile
@@ -25,7 +25,7 @@ __export(constants_exports, {
25
25
  module.exports = __toCommonJS(constants_exports);
26
26
 
27
27
  // package.json
28
- var version = "5.0.0-beta.34";
28
+ var version = "5.0.0-beta.35";
29
29
 
30
30
  // src/constants.ts
31
31
  var VERSION = version;
package/dist/constants.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import {
2
2
  VERSION
3
- } from "./chunk-UDWBR66A.js";
3
+ } from "./chunk-4NFKVUXN.js";
4
4
  export {
5
5
  VERSION
6
6
  };
@@ -174,7 +174,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
174
174
  var import_picocolors = __toESM(require("picocolors"), 1);
175
175
 
176
176
  // package.json
177
- var version = "5.0.0-beta.34";
177
+ var version = "5.0.0-beta.35";
178
178
 
179
179
  // src/constants.ts
180
180
  var VERSION = version;
@@ -1,34 +1,35 @@
1
- import {
2
- runMigrations
3
- } from "./chunk-XUAF2H54.js";
4
- import "./chunk-CA4U2JP7.js";
5
- import {
6
- stopChildWithParent
7
- } from "./chunk-S5GWAUG5.js";
8
1
  import {
9
2
  log_build_default
10
- } from "./chunk-EFFYDIIZ.js";
3
+ } from "./chunk-3V4QU6X4.js";
11
4
  import {
12
5
  getLicenseStatus,
13
6
  printLicenseStatus
14
7
  } from "./chunk-AD7CL772.js";
8
+ import "./chunk-TXV7VMAS.js";
15
9
  import "./chunk-ZAZHAVKB.js";
16
10
  import "./chunk-CA6WCQ2T.js";
11
+ import "./chunk-CPW6G62V.js";
12
+ import {
13
+ runMigrations
14
+ } from "./chunk-XUAF2H54.js";
15
+ import "./chunk-CA4U2JP7.js";
16
+ import {
17
+ stopChildWithParent
18
+ } from "./chunk-S5GWAUG5.js";
17
19
  import {
18
20
  FederationConflictError,
19
21
  FederationDiagnosticError,
20
22
  federateCatalog
21
- } from "./chunk-OX6TSVHY.js";
22
- import "./chunk-WRNH5C3U.js";
23
- import "./chunk-5EPNFDT5.js";
24
- import "./chunk-6K7XZAYI.js";
25
- import "./chunk-352FGP6W.js";
26
- import "./chunk-R7Z5ALYI.js";
23
+ } from "./chunk-46TBJZC3.js";
27
24
  import {
28
25
  getFederationDiagnosticCounts,
29
26
  getVisibleFederationDiagnostics
30
27
  } from "./chunk-JJPB6EOZ.js";
28
+ import "./chunk-WRNH5C3U.js";
29
+ import "./chunk-5EPNFDT5.js";
30
+ import "./chunk-A2RZR3U4.js";
31
31
  import "./chunk-SDZQJTJW.js";
32
+ import "./chunk-352FGP6W.js";
32
33
  import {
33
34
  getProjectOutDir,
34
35
  isAuthEnabled,
@@ -37,10 +38,10 @@ import {
37
38
  } from "./chunk-NKNOXQ62.js";
38
39
  import {
39
40
  generate
40
- } from "./chunk-E544BTTP.js";
41
+ } from "./chunk-U6QKMDW3.js";
41
42
  import {
42
43
  logger
43
- } from "./chunk-2BXQDWRV.js";
44
+ } from "./chunk-IITLANIL.js";
44
45
  import {
45
46
  resolve_catalog_dependencies_default
46
47
  } from "./chunk-PD7KTSYN.js";
@@ -54,8 +55,7 @@ import {
54
55
  import {
55
56
  watch
56
57
  } from "./chunk-U63GDPPY.js";
57
- import "./chunk-GTI7UNJD.js";
58
- import "./chunk-CPW6G62V.js";
58
+ import "./chunk-R7Z5ALYI.js";
59
59
  import {
60
60
  getAstroConfigPath
61
61
  } from "./chunk-VIJJ7JKH.js";
@@ -71,7 +71,7 @@ import {
71
71
  } from "./chunk-LFQJXLHG.js";
72
72
  import {
73
73
  VERSION
74
- } from "./chunk-UDWBR66A.js";
74
+ } from "./chunk-4NFKVUXN.js";
75
75
  import {
76
76
  getEventCatalogConfigFile,
77
77
  verifyRequiredFieldsAreInCatalogConfigFile
@@ -2,14 +2,14 @@ import {
2
2
  FederationConflictError,
3
3
  FederationDiagnosticError,
4
4
  federateCatalog
5
- } from "../chunk-OX6TSVHY.js";
5
+ } from "../chunk-46TBJZC3.js";
6
+ import "../chunk-JJPB6EOZ.js";
6
7
  import "../chunk-WRNH5C3U.js";
7
8
  import "../chunk-5EPNFDT5.js";
8
- import "../chunk-6K7XZAYI.js";
9
+ import "../chunk-A2RZR3U4.js";
10
+ import "../chunk-SDZQJTJW.js";
9
11
  import "../chunk-352FGP6W.js";
10
12
  import "../chunk-R7Z5ALYI.js";
11
- import "../chunk-JJPB6EOZ.js";
12
- import "../chunk-SDZQJTJW.js";
13
13
  import "../chunk-4G7FSRPN.js";
14
14
  export {
15
15
  FederationConflictError,
@@ -1,8 +1,8 @@
1
1
  import {
2
2
  createFederationSourceProvider
3
- } from "../chunk-6K7XZAYI.js";
4
- import "../chunk-352FGP6W.js";
3
+ } from "../chunk-A2RZR3U4.js";
5
4
  import "../chunk-SDZQJTJW.js";
5
+ import "../chunk-352FGP6W.js";
6
6
  export {
7
7
  createFederationSourceProvider
8
8
  };
package/dist/generate.cjs CHANGED
@@ -105,7 +105,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
105
105
  var import_picocolors = __toESM(require("picocolors"), 1);
106
106
 
107
107
  // package.json
108
- var version = "5.0.0-beta.34";
108
+ var version = "5.0.0-beta.35";
109
109
 
110
110
  // src/constants.ts
111
111
  var VERSION = version;
package/dist/generate.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import {
2
2
  generate
3
- } from "./chunk-E544BTTP.js";
4
- import "./chunk-2BXQDWRV.js";
5
- import "./chunk-UDWBR66A.js";
3
+ } from "./chunk-U6QKMDW3.js";
4
+ import "./chunk-IITLANIL.js";
5
+ import "./chunk-4NFKVUXN.js";
6
6
  import "./chunk-4G7FSRPN.js";
7
7
  export {
8
8
  generate
@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
36
36
  var import_picocolors = __toESM(require("picocolors"), 1);
37
37
 
38
38
  // package.json
39
- var version = "5.0.0-beta.34";
39
+ var version = "5.0.0-beta.35";
40
40
 
41
41
  // src/constants.ts
42
42
  var VERSION = version;
@@ -1,7 +1,7 @@
1
1
  import {
2
2
  logger
3
- } from "../chunk-2BXQDWRV.js";
4
- import "../chunk-UDWBR66A.js";
3
+ } from "../chunk-IITLANIL.js";
4
+ import "../chunk-4NFKVUXN.js";
5
5
  export {
6
6
  logger
7
7
  };
@@ -204,12 +204,22 @@ function normalizeUserData(session: any): NormalizedUser {
204
204
  }
205
205
  }
206
206
 
207
+ // The host of a token's issuer (e.g. `dev-123.okta.com`), or '' when it isn't a URL
208
+ const issuerHost = (issuer: unknown) => {
209
+ try {
210
+ return new URL(String(issuer)).hostname;
211
+ } catch {
212
+ return '';
213
+ }
214
+ };
215
+
207
216
  function detectProvider(session: any): string {
208
217
  const account = session.account;
209
218
  if (account?.provider) return account.provider;
210
219
 
211
220
  if (session.user?.sub?.startsWith('auth0|')) return 'auth0';
212
- if (session.user?.iss?.includes('okta.com') || session.user?.provider?.includes('okta')) return 'okta';
221
+ const host = issuerHost(session.user?.iss);
222
+ if (host === 'okta.com' || host.endsWith('.okta.com') || session.user?.provider?.includes('okta')) return 'okta';
213
223
  if (session.user?.iss?.includes('microsoft')) return 'microsoft';
214
224
  if (session.user?.iss?.includes('google')) return 'google';
215
225
 
@@ -49,7 +49,9 @@ const stripLikeC4Comments = (content: string) => content.replace(/\/\*[\s\S]*?\*
49
49
  const parseLikeC4Views = (content: string, filePath: string): LikeC4View[] => {
50
50
  const contentWithoutComments = stripLikeC4Comments(content);
51
51
  const viewDeclarationPattern =
52
- /\b(?:(dynamic|deployment)\s+)?view(?:\s+([A-Za-z_][\w.-]*))?(?:\s+of\s+[A-Za-z_][\w.-]*(?:\.[A-Za-z_][\w.-]*)*)?\s*\{/g;
52
+ // `of` names an element, dotted or not (`[\w.-]*` takes the dots: a separate group for each dotted part made the
53
+ // pattern backtrack heavily on a long dotted name without its `{`)
54
+ /\b(?:(dynamic|deployment)\s+)?view(?:\s+([A-Za-z_][\w.-]*))?(?:\s+of\s+[A-Za-z_][\w.-]*)?\s*\{/g;
53
55
  const views: LikeC4View[] = [];
54
56
  let match: RegExpExecArray | null;
55
57
 
package/package.json CHANGED
@@ -7,7 +7,7 @@
7
7
  },
8
8
  "license": "BUSL-1.1",
9
9
  "type": "module",
10
- "version": "5.0.0-beta.34",
10
+ "version": "5.0.0-beta.35",
11
11
  "publishConfig": {
12
12
  "access": "public"
13
13
  },
@@ -141,8 +141,8 @@
141
141
  "yjs": "^13.6.33",
142
142
  "zod": "^4.6.6",
143
143
  "@eventcatalog/linter": "1.2.0-beta.5",
144
- "@eventcatalog/sdk": "2.30.0-beta.2",
145
- "@eventcatalog/visualiser": "^5.0.0-beta.8"
144
+ "@eventcatalog/visualiser": "^5.0.0-beta.8",
145
+ "@eventcatalog/sdk": "2.30.0-beta.2"
146
146
  },
147
147
  "devDependencies": {
148
148
  "@astrojs/check": "^0.9.10",
@@ -1,9 +1,9 @@
1
- import {
2
- createGitHubSourceProvider
3
- } from "./chunk-352FGP6W.js";
4
1
  import {
5
2
  createFileSystemSourceProvider
6
3
  } from "./chunk-SDZQJTJW.js";
4
+ import {
5
+ createGitHubSourceProvider
6
+ } from "./chunk-352FGP6W.js";
7
7
 
8
8
  // src/federation/source-provider.ts
9
9
  var createFederationSourceProvider = (projectDirectory, providers = {}) => {