@stamhoofd/structures 2.126.0 → 2.126.2
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/AppType.d.ts +10 -2
- package/dist/AppType.d.ts.map +1 -1
- package/dist/AppType.js +26 -18
- package/dist/AppType.js.map +1 -1
- package/dist/Organization.d.ts +1 -5
- package/dist/Organization.d.ts.map +1 -1
- package/dist/Organization.js +3 -20
- package/dist/Organization.js.map +1 -1
- package/package.json +3 -3
package/dist/AppType.d.ts
CHANGED
|
@@ -17,9 +17,17 @@ export declare const getAppNameDescription: (app: AppType) => string | null;
|
|
|
17
17
|
* current = switching between apps in the same scope (member portal <-> admin portal of same organization)
|
|
18
18
|
* other = switching between different organizations, or when searching organizations
|
|
19
19
|
*/
|
|
20
|
-
export type AppDisplayPosition = 'bar' | 'current' | 'other';
|
|
20
|
+
export type AppDisplayPosition = 'bar' | 'small-bar' | 'current' | 'other';
|
|
21
21
|
export declare const getAppTitle: (app: AppType | "auto", organization: Organization | undefined | null, displayPosition?: AppDisplayPosition) => string;
|
|
22
22
|
export declare const getAppDescription: (app: AppType | "auto", organization: Organization | undefined | null, displayPosition?: AppDisplayPosition) => string | null;
|
|
23
|
+
/**
|
|
24
|
+
*
|
|
25
|
+
* @param app
|
|
26
|
+
* @param organization
|
|
27
|
+
* @param preferDashboard
|
|
28
|
+
* @param i18n set to false to explicitly remove the default locale in the url
|
|
29
|
+
* @returns
|
|
30
|
+
*/
|
|
23
31
|
export declare function getAppHost(app: AppType | null, organization: {
|
|
24
32
|
i18n: {
|
|
25
33
|
locale: string;
|
|
@@ -31,5 +39,5 @@ export declare function getAppHost(app: AppType | null, organization: {
|
|
|
31
39
|
} | null, preferDashboard?: boolean, i18n?: {
|
|
32
40
|
language: Language;
|
|
33
41
|
locale: string;
|
|
34
|
-
}): string;
|
|
42
|
+
} | null | false): string;
|
|
35
43
|
//# sourceMappingURL=AppType.d.ts.map
|
package/dist/AppType.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppType.d.ts","sourceRoot":"","sources":["../src/AppType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,MAAM,OAAO,GAAG,cAAc,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,cAAc,CAAC;AAEnG;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAuCnE;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,UAEpC;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,oEAoBnC;AAED,eAAO,MAAM,UAAU,GAAI,KAAK,OAAO,WAQtC,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,KAAK,OAAO,kBAOjD,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,KAAK,GAAG,SAAS,GAAG,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"AppType.d.ts","sourceRoot":"","sources":["../src/AppType.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,MAAM,MAAM,OAAO,GAAG,cAAc,GAAG,WAAW,GAAG,OAAO,GAAG,SAAS,GAAG,MAAM,GAAG,cAAc,CAAC;AAEnG;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,OAAO,GAAG,gBAAgB,CAuCnE;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,OAAO,UAEpC;AAED,wBAAgB,QAAQ,CAAC,GAAG,EAAE,MAAM,oEAoBnC;AAED,eAAO,MAAM,UAAU,GAAI,KAAK,OAAO,WAQtC,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,KAAK,OAAO,kBAOjD,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,kBAAkB,GAAG,KAAK,GAAG,WAAW,GAAG,SAAS,GAAG,OAAO,CAAC;AAE3E,eAAO,MAAM,WAAW,GAAI,KAAK,OAAO,GAAG,MAAM,EAAE,cAAc,YAAY,GAAG,SAAS,GAAG,IAAI,EAAE,kBAAiB,kBAA4B,WAU9I,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAAI,KAAK,OAAO,GAAG,MAAM,EAAE,cAAc,YAAY,GAAG,SAAS,GAAG,IAAI,EAAE,kBAAiB,kBAA4B,kBAiBpJ,CAAC;AAYF;;;;;;;GAOG;AACH,wBAAgB,UAAU,CACtB,GAAG,EAAE,OAAO,GAAG,IAAI,EACnB,YAAY,EAAE;IACV,IAAI,EAAE;QACF,MAAM,EAAE,MAAM,CAAC;QACf,QAAQ,EAAE,QAAQ,CAAC;KACtB,CAAC;IACF,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,GAAG,EAAE,MAAM,CAAC;CACf,GAAG,IAAI,EACR,eAAe,UAAQ,EACvB,IAAI,CAAC,EAAE;IAAE,QAAQ,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,GAAG,KAAK,GAC7D,MAAM,CAsDR"}
|
package/dist/AppType.js
CHANGED
|
@@ -68,7 +68,7 @@ export function uriToApp(uri) {
|
|
|
68
68
|
}
|
|
69
69
|
export const getAppName = (app) => {
|
|
70
70
|
switch (app) {
|
|
71
|
-
case 'dashboard': return STAMHOOFD.userMode === 'organization' ? $t('%6v') : $t('%44');
|
|
71
|
+
case 'dashboard': return STAMHOOFD.userMode === 'organization' || !!STAMHOOFD.singleOrganization ? $t('%6v') : $t('%44');
|
|
72
72
|
case 'registration': return $t('%2g');
|
|
73
73
|
case 'admin': return $t(`%IW`);
|
|
74
74
|
case 'webshop': return $t(`%2N`);
|
|
@@ -84,17 +84,11 @@ export const getAppNameDescription = (app) => {
|
|
|
84
84
|
return null;
|
|
85
85
|
};
|
|
86
86
|
export const getAppTitle = (app, organization, displayPosition = 'other') => {
|
|
87
|
-
if (displayPosition === 'bar') {
|
|
88
|
-
if (organization) {
|
|
89
|
-
return organization.name;
|
|
90
|
-
}
|
|
91
|
-
return getAppName(app);
|
|
92
|
-
}
|
|
93
87
|
if (displayPosition === 'current' && app !== 'auto') {
|
|
94
88
|
return getAppName(app);
|
|
95
89
|
}
|
|
96
90
|
// Other
|
|
97
|
-
if (!organization) {
|
|
91
|
+
if (!organization || STAMHOOFD.singleOrganization) {
|
|
98
92
|
return getAppName(app);
|
|
99
93
|
}
|
|
100
94
|
return organization.name;
|
|
@@ -110,11 +104,28 @@ export const getAppDescription = (app, organization, displayPosition = 'other')
|
|
|
110
104
|
return getAppNameDescription(app);
|
|
111
105
|
}
|
|
112
106
|
// Other
|
|
113
|
-
if (!organization) {
|
|
107
|
+
if (!organization || STAMHOOFD.singleOrganization) {
|
|
114
108
|
return getAppNameDescription(app);
|
|
115
109
|
}
|
|
116
110
|
return organization.address.anonymousString();
|
|
117
111
|
};
|
|
112
|
+
function localeUri(i18n) {
|
|
113
|
+
if (!i18n) {
|
|
114
|
+
return '';
|
|
115
|
+
}
|
|
116
|
+
if (STAMHOOFD.fixedCountry) {
|
|
117
|
+
return '/' + i18n.language.toString();
|
|
118
|
+
}
|
|
119
|
+
return '/' + i18n.locale;
|
|
120
|
+
}
|
|
121
|
+
/**
|
|
122
|
+
*
|
|
123
|
+
* @param app
|
|
124
|
+
* @param organization
|
|
125
|
+
* @param preferDashboard
|
|
126
|
+
* @param i18n set to false to explicitly remove the default locale in the url
|
|
127
|
+
* @returns
|
|
128
|
+
*/
|
|
118
129
|
export function getAppHost(app, organization, preferDashboard = false, i18n) {
|
|
119
130
|
if (organization && organization.registerDomain && !preferDashboard && app !== 'admin' && STAMHOOFD.userMode === 'organization') {
|
|
120
131
|
let d = organization.registerDomain;
|
|
@@ -128,7 +139,7 @@ export function getAppHost(app, organization, preferDashboard = false, i18n) {
|
|
|
128
139
|
}
|
|
129
140
|
if (!STAMHOOFD.domains.registration || preferDashboard || !organization) {
|
|
130
141
|
if (!app) {
|
|
131
|
-
return STAMHOOFD.domains.dashboard + (i18n ?? organization?.i18n
|
|
142
|
+
return STAMHOOFD.domains.dashboard + localeUri(i18n ?? organization?.i18n);
|
|
132
143
|
}
|
|
133
144
|
let includeUri = true;
|
|
134
145
|
if (app === 'registration' && STAMHOOFD.userMode === 'platform') {
|
|
@@ -147,17 +158,14 @@ export function getAppHost(app, organization, preferDashboard = false, i18n) {
|
|
|
147
158
|
}
|
|
148
159
|
if (includeUri && !organization) {
|
|
149
160
|
// App requires organization scope, but we don't have one
|
|
150
|
-
return STAMHOOFD.domains.dashboard + (i18n
|
|
161
|
+
return STAMHOOFD.domains.dashboard + localeUri(i18n);
|
|
151
162
|
}
|
|
152
|
-
return STAMHOOFD.domains.dashboard + (i18n ?? organization?.i18n
|
|
153
|
-
}
|
|
154
|
-
let defaultDomain = STAMHOOFD.domains.registration[organization.address.country] ?? STAMHOOFD.domains.registration[''];
|
|
155
|
-
if (i18n ?? organization.i18n) {
|
|
156
|
-
defaultDomain += '/' + ((i18n ?? organization.i18n).locale);
|
|
163
|
+
return STAMHOOFD.domains.dashboard + localeUri(i18n ?? organization?.i18n) + '/' + appToUri(app) + (includeUri && organization ? '/' + organization.uri : '');
|
|
157
164
|
}
|
|
165
|
+
const defaultDomain = STAMHOOFD.domains.registration[organization.address.country] ?? STAMHOOFD.domains.registration[''];
|
|
158
166
|
if (!app) {
|
|
159
|
-
return organization.uri + '.' + defaultDomain;
|
|
167
|
+
return organization.uri + '.' + defaultDomain + localeUri(i18n ?? organization?.i18n);
|
|
160
168
|
}
|
|
161
|
-
return organization.uri + '.' + defaultDomain + '/' + appToUri(app);
|
|
169
|
+
return organization.uri + '.' + defaultDomain + localeUri(i18n ?? organization?.i18n) + '/' + appToUri(app);
|
|
162
170
|
}
|
|
163
171
|
//# sourceMappingURL=AppType.js.map
|
package/dist/AppType.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppType.js","sourceRoot":"","sources":["../src/AppType.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAIzD;;GAEG;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAY;IAC7C,QAAQ,GAAG,EAAE,CAAC;QACV,KAAK,OAAO;YACR,OAAO,IAAI,gBAAgB,CAAC;gBACxB,EAAE,EAAE,UAAU;gBACd,EAAE,EAAE,UAAU;gBACd,EAAE,EAAE,YAAY;aACnB,CAAC,CAAC;QACP,KAAK,WAAW;YACZ,OAAO,IAAI,gBAAgB,CAAC;gBACxB,EAAE,EAAE,YAAY;gBAChB,EAAE,EAAE,WAAW;gBACf,EAAE,EAAE,WAAW;aAClB,CAAC,CAAC;QACP,KAAK,cAAc;YACf,OAAO,IAAI,gBAAgB,CAAC;gBACxB,EAAE,EAAE,OAAO;gBACX,EAAE,EAAE,SAAS;gBACb,EAAE,EAAE,SAAS;aAChB,CAAC,CAAC;QACP,KAAK,SAAS;YACV,OAAO,IAAI,gBAAgB,CAAC;gBACxB,EAAE,EAAE,MAAM;gBACV,EAAE,EAAE,MAAM;gBACV,EAAE,EAAE,MAAM;aACb,CAAC,CAAC;QACP,KAAK,MAAM;YACP,OAAO,IAAI,gBAAgB,CAAC;gBACxB,EAAE,EAAE,MAAM;gBACV,EAAE,EAAE,MAAM;gBACV,EAAE,EAAE,MAAM;aACb,CAAC,CAAC;QACP,KAAK,cAAc;YACf,OAAO,IAAI,gBAAgB,CAAC;gBACxB,EAAE,EAAE,cAAc;gBAClB,EAAE,EAAE,cAAc;gBAClB,EAAE,EAAE,cAAc;aACrB,CAAC,CAAC;IACX,CAAC;AACL,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAY;IACjC,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,GAAW;IAChC,uFAAuF;IACvF,KAAK,MAAM,GAAG,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,CAAU,EAAE,CAAC;QACxF,MAAM,CAAC,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;QAEpC,IAAI,OAAO,CAAC,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC;YACxD,IAAI,UAAU,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;gBACnC,OAAO,GAAG,CAAC;YACf,CAAC;QACL,CAAC;aAAM,CAAC;YACJ,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,YAAY,EAAE,CAAC;gBAChC,MAAM,UAAU,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,IAAgB,CAAC,CAAC;gBACnE,IAAI,UAAU,IAAI,GAAG,KAAK,UAAU,EAAE,CAAC;oBACnC,OAAO,GAAG,CAAC;gBACf,CAAC;YACL,CAAC;QACL,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC;AAClB,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,GAAY,EAAE,EAAE;IACvC,QAAQ,GAAG,EAAE,CAAC;QACV,KAAK,WAAW,CAAC,CAAC,OAAO,SAAS,CAAC,QAAQ,KAAK,cAAc,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"AppType.js","sourceRoot":"","sources":["../src/AppType.ts"],"names":[],"mappings":"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"}
|
package/dist/Organization.d.ts
CHANGED
|
@@ -39,11 +39,7 @@ export declare class BaseOrganization extends AutoEncoder {
|
|
|
39
39
|
getRegistrationHost(i18n?: {
|
|
40
40
|
language: Language;
|
|
41
41
|
locale: string;
|
|
42
|
-
}): string;
|
|
43
|
-
getDefaultRegistrationHost(i18n?: {
|
|
44
|
-
language: Language;
|
|
45
|
-
locale: string;
|
|
46
|
-
}): string;
|
|
42
|
+
} | null | false): string;
|
|
47
43
|
/**
|
|
48
44
|
* Used for redirecting
|
|
49
45
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Organization.d.ts","sourceRoot":"","sources":["../src/Organization.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,WAAW,EAAqD,MAAM,6BAA6B,CAAC;AAG3H,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAEjD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAGvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACpE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACnC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACtF,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AACtE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qCAAqC,CAAC;AAC1E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAE/E,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACtE,OAAO,EAAE,8BAA8B,EAAsB,MAAM,yBAAyB,CAAC;AAE7F,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEhE,qBAAa,gBAAiB,SAAQ,WAAW;IAE7C,EAAE,EAAE,MAAM,CAAC;IAEX;;OAEG;IAEH,IAAI,SAAM;IAGV,MAAM,UAAQ;IAGd,OAAO,EAAE,MAAM,GAAG,IAAI,CAAQ;IAG9B,cAAc,EAAE,MAAM,GAAG,IAAI,CAAQ;IAGrC,GAAG,SAAM;IAGT,IAAI,EAAE,oBAAoB,CAAC;IAG3B,OAAO,UAAsB;IAG7B,SAAS,OAAc;IAEvB;;OAEG;IACH,IAAI,IAAI;;;MAEP;IAED;;OAEG;IACH,mBAAmB,CAAC,IAAI,CAAC,EAAE;QAAE,QAAQ,EAAE,QAAQ,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAAG,
|
|
1
|
+
{"version":3,"file":"Organization.d.ts","sourceRoot":"","sources":["../src/Organization.ts"],"names":[],"mappings":"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"}
|
package/dist/Organization.js
CHANGED
|
@@ -3,7 +3,7 @@ import { ArrayDecoder, AutoEncoder, BooleanDecoder, DateDecoder, field, StringDe
|
|
|
3
3
|
import { v4 as uuidv4 } from 'uuid';
|
|
4
4
|
import { Language } from '@stamhoofd/types/Language';
|
|
5
5
|
import { Address } from './addresses/Address.js';
|
|
6
|
-
import { appToUri } from './AppType.js';
|
|
6
|
+
import { appToUri, getAppHost } from './AppType.js';
|
|
7
7
|
import { Company } from './Company.js';
|
|
8
8
|
import { compileToInMemoryFilter } from './filters/InMemoryFilter.js';
|
|
9
9
|
import { organizationItemInMemoryFilterCompilers } from './filters/inMemoryFilterDefinitions.js';
|
|
@@ -37,24 +37,7 @@ export class BaseOrganization extends AutoEncoder {
|
|
|
37
37
|
* Potentially includes a path
|
|
38
38
|
*/
|
|
39
39
|
getRegistrationHost(i18n) {
|
|
40
|
-
|
|
41
|
-
let d = this.registerDomain;
|
|
42
|
-
if (i18n && i18n.language !== this.i18n.language) {
|
|
43
|
-
d += '/' + i18n.language;
|
|
44
|
-
}
|
|
45
|
-
return d + '/' + appToUri('registration');
|
|
46
|
-
}
|
|
47
|
-
return this.getDefaultRegistrationHost(i18n);
|
|
48
|
-
}
|
|
49
|
-
getDefaultRegistrationHost(i18n) {
|
|
50
|
-
if (!STAMHOOFD.domains.registration) {
|
|
51
|
-
return STAMHOOFD.domains.dashboard + '/' + (i18n?.locale ?? this.i18n.locale) + '/' + appToUri('registration') + '/' + this.uri;
|
|
52
|
-
}
|
|
53
|
-
let defaultDomain = STAMHOOFD.domains.registration[this.address.country] ?? STAMHOOFD.domains.registration[''];
|
|
54
|
-
if (i18n && i18n.language !== this.i18n.language) {
|
|
55
|
-
defaultDomain += '/' + i18n.language;
|
|
56
|
-
}
|
|
57
|
-
return this.uri + '.' + defaultDomain + '/' + appToUri('registration');
|
|
40
|
+
return getAppHost('registration', this, false, i18n);
|
|
58
41
|
}
|
|
59
42
|
/**
|
|
60
43
|
* Used for redirecting
|
|
@@ -69,7 +52,7 @@ export class BaseOrganization extends AutoEncoder {
|
|
|
69
52
|
return this.uri + '.' + (STAMHOOFD.domains.registration[this.address.country] ?? STAMHOOFD.domains.registration['']);
|
|
70
53
|
}
|
|
71
54
|
get registerUrl() {
|
|
72
|
-
return 'https://' + this.getRegistrationHost();
|
|
55
|
+
return 'https://' + this.getRegistrationHost(false);
|
|
73
56
|
}
|
|
74
57
|
get dashboardUrl() {
|
|
75
58
|
return 'https://' + STAMHOOFD.domains.dashboard + '/' + appToUri('dashboard') + '/' + this.uri;
|
package/dist/Organization.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Organization.js","sourceRoot":"","sources":["../src/Organization.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC3H,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"Organization.js","sourceRoot":"","sources":["../src/Organization.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,cAAc,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC3H,OAAO,EAAE,EAAE,IAAI,MAAM,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,OAAO,EAAE,uBAAuB,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,EAAE,uCAAuC,EAAE,MAAM,wCAAwC,CAAC;AAEjG,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAKnC,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kCAAkC,CAAC;AAC/E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,8BAA8B,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7F,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEhE,MAAM,OAAO,gBAAiB,SAAQ,WAAW;IAE7C,EAAE,CAAS;IAEX;;OAEG;IAEH,IAAI,GAAG,EAAE,CAAC;IAGV,MAAM,GAAG,IAAI,CAAC;IAGd,OAAO,GAAkB,IAAI,CAAC;IAG9B,cAAc,GAAkB,IAAI,CAAC;IAGrC,GAAG,GAAG,EAAE,CAAC;IAGT,IAAI,CAAuB;IAG3B,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAG7B,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB;;OAEG;IACH,IAAI,IAAI;QACJ,OAAO,EAAE,QAAQ,EAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,EAAE,KAAK,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC;IAC9E,CAAC;IAED;;OAEG;IACH,mBAAmB,CAAC,IAA4D;QAC5E,OAAO,UAAU,CAAC,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACzD,CAAC;IAED;;OAEG;IACH,IAAI,sBAAsB;QACtB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,cAAc,CAAC;QAC/B,CAAC;QAED,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QAChB,CAAC;QAED,OAAO,IAAI,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IACzH,CAAC;IAED,IAAI,WAAW;QACX,OAAO,UAAU,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,YAAY;QACZ,OAAO,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,SAAS,GAAG,GAAG,GAAG,QAAQ,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;IACnG,CAAC;IAED,IAAI,eAAe;QACf,OAAO,SAAS,CAAC,OAAO,CAAC,SAAS,CAAC;IACvC,CAAC;IAED;;OAEG;IACH,IAAI,gBAAgB;QAChB,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM;YAC7B,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS;YACrB,CAAC,CAAC;gBACM,OAAO,CAAC,MAAM,CAAC;oBACX,IAAI,EAAE,IAAI,CAAC,IAAI;oBACf,OAAO,EAAE,IAAI,CAAC,OAAO;iBACxB,CAAC;aACL,CAAC;IACd,CAAC;CACJ;AAnFG;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC;4CACrD;AAMX;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC;8CACxB;AAGV;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;gDACnC;AAGd;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;iDACrD;AAG9B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;wDAC9C;AAGrC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;6CACxD;AAGT;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;8CACnE;AAG3B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;iDACC;AAG7B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;mDACvB;AA0D3B,MAAM,OAAO,YAAa,SAAQ,gBAAgB;IAE9C,eAAe,GAAG,IAAI,CAAC;IAEvB;;;OAGG;IAEH,MAAM,GAAY,EAAE,CAAC;IAGrB,MAAM,CAAiC;IAEvC;;OAEG;IACH,IAAI,eAAe;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,YAAY,EAAE,CAAC;IACnD,CAAC;IAED,uBAAuB,CAAC,WAAuE;QAC3F,OAAO,IAAI,CAAC,eAAe,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC;IAChE,CAAC;IAED,IAAI,oBAAoB;QACpB,OAAO,IAAI,CAAC,MAAM,CAAC,iBAAiB,CAAC,YAAY,EAAE,CAAC;IACxD,CAAC;IAED;;;;OAIG;IACH,IAAI,mBAAmB;QACnB,OAAO,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,IAAI,YAAY;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;IACpC,CAAC;IAED;;OAEG;IACH,IAAI,kBAAkB;QAClB,OAAO,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC;IAC1C,CAAC;IAED;;OAEG;IACH,IAAI,iBAAiB;QACjB,OAAO,IAAI,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;IAED,qBAAqB,CAAC,KAAc;QAChC,MAAM,SAAS,GAAG,IAAI,CAAC,oBAAoB,CAAC,CAAC,+FAA+F;QAC5I,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC;QAE9D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;gBACpC,SAAS;YACb,CAAC;YACD,IAAI,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,EAAE,CAAC;gBAC7H,SAAS;YACb,CAAC;YAED,IAAI,KAAK,CAAC,QAAQ,CAAC,gBAAgB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBAC9D,SAAS;YACb,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,0BAA0B,CAAC,KAAc;QACrC,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,YAAY,EAAE,CAAC;QAE9D,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YACzB,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACf,SAAS;YACb,CAAC;YACD,IAAI,KAAK,CAAC,QAAQ,CAAC,gBAAgB,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,CAAC;gBAC9D,SAAS;YACb,CAAC;YACD,OAAO,IAAI,CAAC;QAChB,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;OAKG;IACH,eAAe,CAAC,OAA2L;QACvM,OAAO,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IACtE,CAAC;IAED;;;OAGG;IACH,wBAAwB,CAAC,QAAgB;QACrC,OAAO,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IAEH,WAAW,GAAuC,IAAI,CAAC;IAEvD;;OAEG;IAEH,QAAQ,GAAqB,EAAE,CAAC;IAEhC;;;OAGG;IACH,OAAO,CAA0B;IAEjC;;;OAGG;IACH,IAAI,kBAAkB;QAClB,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,IAAI,CAAC,WAAW,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC;IACtJ,CAAC;IAED,IAAI,qBAAqB;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,IAAI,SAAS,CAAC,QAAQ,KAAK,UAAU,CAAC;IAC9E,CAAC;IAED,eAAe,CAAC,OAAuB;QACnC,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,gBAAgB;QACZ,OAAO,IAAI,CAAC,WAAW,EAAE,aAAa,IAAI,IAAI,GAAG,EAAE,CAAC;IACxD,CAAC;IAED,kBAAkB,CAAC,KAAmB;QAClC,OAAQ,IAAqB,CAAC,KAAK,CAAC;YAChC,WAAW,EAAE,2BAA2B,CAAC,KAAK,CAAC;gBAC3C,aAAa,EAAE,KAAK;aACvB,CAAC;SACL,CAAS,CAAC;IACf,CAAC;IAED,eAAe,CAAC,MAAuB;QACnC,IAAI,CAAC;YACD,MAAM,cAAc,GAAG,uBAAuB,CAAC,MAAM,EAAE,uCAAuC,CAAC,CAAC;YAChG,MAAM,KAAK,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;YACnC,OAAO,CAAC,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC;YACtD,OAAO,KAAK,CAAC;QACjB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,OAAO,CAAC,KAAK,CAAC,8BAA8B,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC7D,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAED,aAAa,CAAC,OAAyC;QACnD,mBAAmB;QACnB,KAAK,MAAM,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE,mBAAmB,IAAI,EAAE,EAAE,CAAC;YAC3D,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,EAAE,CAAC,CAAC;YACtD,IAAI,OAAO,EAAE,CAAC;gBACV,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;YAC5B,CAAC;QACL,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC3D,IAAI,OAAO,EAAE,CAAC;YACV,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;QACjC,CAAC;QAED,sBAAsB;IAC1B,CAAC;IAED,oFAAoF;IACpF,IAAI,qBAAqB;QACrB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,gBAAgB,CAAC,KAAK;eACzC,IAAI,CAAC,IAAI,CAAC,oBAAoB,KAAK,oBAAoB,CAAC,wBAAwB,CAAC;IAC5F,CAAC;CACJ;AA9LG;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;qDAC1B;AAOvB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;4CACtE;AAGrB;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,8BAA8B,EAAE,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC,8BAA8B,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,kBAAkB,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;4CAChI;AAwGvC;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,2BAA2B,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;iDACrB;AAMvD;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;8CACrD;AAwEpC,MAAM,OAAO,0BAA2B,SAAQ,WAAW;IAEvD,YAAY,CAAe;IAE3B;;OAEG;IAEH,OAAO,GAAmB,IAAI,CAAC;IAE/B;;OAEG;IAEH,QAAQ,GAAqB,EAAE,CAAC;CACnC;AAbG;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC;gEACN;AAM3B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;2DACb;AAM/B;IADC,KAAK,CAAC,EAAE,OAAO,EAAE,IAAI,YAAY,CAAC,cAAc,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;4DACnC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@stamhoofd/structures",
|
|
3
|
-
"version": "2.126.
|
|
3
|
+
"version": "2.126.2",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"module": "./dist/index.js",
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
34
|
"@simonbackx/simple-errors": "1.5.0",
|
|
35
|
-
"@stamhoofd/test-utils": "2.126.
|
|
35
|
+
"@stamhoofd/test-utils": "2.126.2",
|
|
36
36
|
"@types/uuid": "8.3.4",
|
|
37
37
|
"uuid": "14.0.0",
|
|
38
38
|
"vitest": "4.1.8"
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"publishConfig": {
|
|
48
48
|
"access": "public"
|
|
49
49
|
},
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "ccfe4c07df84adf3b7720912aac11cba65811358"
|
|
51
51
|
}
|