@adaptive-ds/project-registry 0.2.4 → 0.4.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.
- package/dist/access/projectAuthorize.d.ts.map +1 -1
- package/dist/access/projectAuthorize.js +15 -6
- package/dist/access/projectAuthorize.js.map +1 -1
- package/dist/access-log/projectAccessLogListUseCase.d.ts.map +1 -1
- package/dist/access-log/projectAccessLogListUseCase.js +3 -3
- package/dist/access-log/projectAccessLogListUseCase.js.map +1 -1
- package/dist/api/projectRegistryApiHandlerCreate.d.ts.map +1 -1
- package/dist/api/projectRegistryApiHandlerCreate.js +99 -38
- package/dist/api/projectRegistryApiHandlerCreate.js.map +1 -1
- package/dist/caddy/caddyConfigInspect.js +1 -1
- package/dist/caddy/caddyConfigInspect.js.map +1 -1
- package/dist/caddy/caddyConfigInspectUseCase.js +1 -1
- package/dist/caddy/caddyConfigInspectUseCase.js.map +1 -1
- package/dist/caddy/caddyConfigSelect.d.ts.map +1 -1
- package/dist/caddy/caddyConfigSelect.js +2 -2
- package/dist/caddy/caddyConfigSelect.js.map +1 -1
- package/dist/caddy/projectDocsUrls.d.ts.map +1 -1
- package/dist/caddy/projectDocsUrls.js +51 -25
- package/dist/caddy/projectDocsUrls.js.map +1 -1
- package/dist/caddy/projectDocsUrlsUseCase.d.ts.map +1 -1
- package/dist/caddy/projectDocsUrlsUseCase.js +7 -13
- package/dist/caddy/projectDocsUrlsUseCase.js.map +1 -1
- package/dist/cli/ProjectRegistryCliInvocation.d.ts +4 -0
- package/dist/cli/ProjectRegistryCliInvocation.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliArgumentsParse.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliArgumentsParse.js +75 -9
- package/dist/cli/projectRegistryCliArgumentsParse.js.map +1 -1
- package/dist/cli/projectRegistryCliHelp.d.ts +1 -1
- package/dist/cli/projectRegistryCliHelp.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliHelp.js +6 -0
- package/dist/cli/projectRegistryCliHelp.js.map +1 -1
- package/dist/cli/projectRegistryCliOutputFormat.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliOutputFormat.js +2 -0
- package/dist/cli/projectRegistryCliOutputFormat.js.map +1 -1
- package/dist/cli/projectRegistryCliRequest.d.ts +6 -1
- package/dist/cli/projectRegistryCliRequest.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliRequest.js +15 -10
- package/dist/cli/projectRegistryCliRequest.js.map +1 -1
- package/dist/cli/projectRegistryCliRun.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliRun.js +117 -10
- package/dist/cli/projectRegistryCliRun.js.map +1 -1
- package/dist/cli/projectRegistryCliSocketResolve.d.ts.map +1 -1
- package/dist/cli/projectRegistryCliSocketResolve.js +10 -8
- package/dist/cli/projectRegistryCliSocketResolve.js.map +1 -1
- package/dist/identity/preferredUsernameMap.d.ts.map +1 -1
- package/dist/identity/preferredUsernameMap.js +7 -3
- package/dist/identity/preferredUsernameMap.js.map +1 -1
- package/dist/identity/userRoleResolve.d.ts.map +1 -1
- package/dist/identity/userRoleResolve.js +8 -4
- package/dist/identity/userRoleResolve.js.map +1 -1
- package/dist/identity/visibleUserDirectoryList.d.ts.map +1 -1
- package/dist/identity/visibleUserDirectoryList.js +37 -14
- package/dist/identity/visibleUserDirectoryList.js.map +1 -1
- package/dist/project/projectCollisions.d.ts.map +1 -1
- package/dist/project/projectCollisions.js +4 -4
- package/dist/project/projectCollisions.js.map +1 -1
- package/dist/project/projectCreate.d.ts.map +1 -1
- package/dist/project/projectCreate.js +2 -2
- package/dist/project/projectCreate.js.map +1 -1
- package/dist/project/projectDelete.d.ts.map +1 -1
- package/dist/project/projectDelete.js +2 -2
- package/dist/project/projectDelete.js.map +1 -1
- package/dist/project/projectEdit.d.ts.map +1 -1
- package/dist/project/projectEdit.js +8 -4
- package/dist/project/projectEdit.js.map +1 -1
- package/dist/project/projectGet.d.ts.map +1 -1
- package/dist/project/projectGet.js +2 -2
- package/dist/project/projectGet.js.map +1 -1
- package/dist/project/projectInputSchema.d.ts +1 -0
- package/dist/project/projectInputSchema.d.ts.map +1 -1
- package/dist/project/projectInputSchema.js +2 -0
- package/dist/project/projectInputSchema.js.map +1 -1
- package/dist/project/projectLabelsSchema.d.ts +3 -0
- package/dist/project/projectLabelsSchema.d.ts.map +1 -0
- package/dist/project/projectLabelsSchema.js +30 -0
- package/dist/project/projectLabelsSchema.js.map +1 -0
- package/dist/project/projectMutationExpectedRevision.d.ts.map +1 -1
- package/dist/project/projectMutationExpectedRevision.js +5 -5
- package/dist/project/projectMutationExpectedRevision.js.map +1 -1
- package/dist/project/projectNormalize.d.ts.map +1 -1
- package/dist/project/projectNormalize.js +4 -3
- package/dist/project/projectNormalize.js.map +1 -1
- package/dist/project/projectPortNext.d.ts.map +1 -1
- package/dist/project/projectPortNext.js +3 -3
- package/dist/project/projectPortNext.js.map +1 -1
- package/dist/project/projectSchema.d.ts +1 -0
- package/dist/project/projectSchema.d.ts.map +1 -1
- package/dist/project/projectSchema.js +2 -0
- package/dist/project/projectSchema.js.map +1 -1
- package/dist/project/projectValidate.d.ts.map +1 -1
- package/dist/project/projectValidate.js +4 -4
- package/dist/project/projectValidate.js.map +1 -1
- package/dist/project-store/projectRepositoryOpen.d.ts.map +1 -1
- package/dist/project-store/projectRepositoryOpen.js +12 -12
- package/dist/project-store/projectRepositoryOpen.js.map +1 -1
- package/dist/session/sessionActorResolve.d.ts.map +1 -1
- package/dist/session/sessionActorResolve.js +29 -17
- package/dist/session/sessionActorResolve.js.map +1 -1
- package/dist/session/sessionRequestResolve.d.ts.map +1 -1
- package/dist/session/sessionRequestResolve.js +8 -4
- package/dist/session/sessionRequestResolve.js.map +1 -1
- package/dist/ui/assets/index-CQMmJz6j.js +1 -0
- package/dist/ui/index.html +1 -1
- package/dist/zitadel/zitadelCallbackHandle.d.ts.map +1 -1
- package/dist/zitadel/zitadelCallbackHandle.js +17 -10
- package/dist/zitadel/zitadelCallbackHandle.js.map +1 -1
- package/dist/zitadel/zitadelLoginStart.d.ts.map +1 -1
- package/dist/zitadel/zitadelLoginStart.js +15 -10
- package/dist/zitadel/zitadelLoginStart.js.map +1 -1
- package/package.json +1 -1
- package/dist/ui/assets/index-CSCiyyWx.js +0 -1
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createResult,
|
|
1
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
2
2
|
import { projectDomainNormalize } from "./projectDomainNormalize.js";
|
|
3
3
|
import { projectKey } from "./projectKey.js";
|
|
4
4
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
@@ -41,7 +41,7 @@ export function projectCollisions(projects, options = {}) {
|
|
|
41
41
|
for (const project of projectCollisionCandidates(projects, options)) {
|
|
42
42
|
const previousKey = keys.find((candidate) => projectKeyEqual(candidate, project));
|
|
43
43
|
if (previousKey && previousKey !== project) {
|
|
44
|
-
return
|
|
44
|
+
return createResultErrorCode(op, `project key collision: ${projectKey(project)}`, "projects.conflict");
|
|
45
45
|
}
|
|
46
46
|
keys.push(project);
|
|
47
47
|
if (!projectActive(project))
|
|
@@ -52,13 +52,13 @@ export function projectCollisions(projects, options = {}) {
|
|
|
52
52
|
for (const domain of new Set(caddy.domains.map(projectDomainNormalize))) {
|
|
53
53
|
const previous = domains.get(domain);
|
|
54
54
|
if (previous && !projectKeyEqual(previous, project)) {
|
|
55
|
-
return
|
|
55
|
+
return createResultErrorCode(op, `active domain collision: ${domain} used by ${projectKey(previous)} and ${projectKey(project)}`, "projects.conflict");
|
|
56
56
|
}
|
|
57
57
|
domains.set(domain, project);
|
|
58
58
|
}
|
|
59
59
|
const previous = ports.get(caddy.port);
|
|
60
60
|
if (previous && !projectKeyEqual(previous, project)) {
|
|
61
|
-
return
|
|
61
|
+
return createResultErrorCode(op, `active port collision: ${caddy.port} used by ${projectKey(previous)} and ${projectKey(project)}`, "projects.conflict");
|
|
62
62
|
}
|
|
63
63
|
ports.set(caddy.port, project);
|
|
64
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectCollisions.js","sourceRoot":"","sources":["../../src/project/projectCollisions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectCollisions.js","sourceRoot":"","sources":["../../src/project/projectCollisions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectCreate.d.ts","sourceRoot":"","sources":["../../src/project/projectCreate.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectCreate.d.ts","sourceRoot":"","sources":["../../src/project/projectCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAavE,wBAAsB,aAAa,CACjC,OAAO,EAAE,qBAAqB,EAC9B,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,sBAAsB,GACtC,aAAa,CAAC,yBAAyB,CAAC,CAyB1C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createResultErrorCode } from "#result";
|
|
2
2
|
import { projectMutationExpectedRevision } from "./projectMutationExpectedRevision.js";
|
|
3
3
|
import { projectNormalize } from "./projectNormalize.js";
|
|
4
4
|
import { projectOwnerAuthorize } from "./projectOwnerAuthorize.js";
|
|
@@ -18,7 +18,7 @@ export async function projectCreate(options, input, mutationOptions) {
|
|
|
18
18
|
return actorR;
|
|
19
19
|
const owner = projectInputOwner(input);
|
|
20
20
|
if (owner === undefined)
|
|
21
|
-
return
|
|
21
|
+
return createResultErrorCode(op, "project owner is required", "request.invalid");
|
|
22
22
|
const authorizationR = await projectOwnerAuthorize(options.access, actorR.data, owner);
|
|
23
23
|
if (!authorizationR.success)
|
|
24
24
|
return authorizationR;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectCreate.js","sourceRoot":"","sources":["../../src/project/projectCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"projectCreate.js","sourceRoot":"","sources":["../../src/project/projectCreate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAsB,MAAM,SAAS,CAAA;AAInE,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAA;AACtF,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAElE,SAAS,iBAAiB,CAAC,KAAc;IACvC,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAA;IACjF,MAAM,KAAK,GAAI,KAAiC,CAAC,KAAK,CAAA;IACtD,IAAI,OAAO,KAAK,KAAK,QAAQ;QAAE,OAAO,SAAS,CAAA;IAC/C,MAAM,eAAe,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IACpC,OAAO,eAAe,KAAK,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAA;AAC7D,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA8B,EAC9B,KAAc,EACd,eAAuC;IAEvC,MAAM,EAAE,GAAG,eAAe,CAAA;IAC1B,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAA;IAClD,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAA;IAElC,MAAM,KAAK,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAA;IACtC,IAAI,KAAK,KAAK,SAAS;QAAE,OAAO,qBAAqB,CAAC,EAAE,EAAE,2BAA2B,EAAE,iBAAiB,CAAC,CAAA;IAEzG,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAA;IACtF,IAAI,CAAC,cAAc,CAAC,OAAO;QAAE,OAAO,cAAc,CAAA;IAElD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;IACjD,IAAI,CAAC,SAAS,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IAExC,MAAM,iBAAiB,GAAG,+BAA+B,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IACvG,IAAI,CAAC,iBAAiB,CAAC,OAAO;QAAE,OAAO,iBAAiB,CAAA;IAExD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,KAAK,EAAE;QACvC,QAAQ,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ;QACjC,SAAS,EAAE,OAAO,CAAC,SAAS;KAC7B,CAAC,CAAA;IACF,IAAI,CAAC,QAAQ,CAAC,OAAO;QAAE,OAAO,QAAQ,CAAA;IAEtC,MAAM,iBAAiB,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,IAAI,EAAE,CAAA;IACnG,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;AACpE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectDelete.d.ts","sourceRoot":"","sources":["../../src/project/projectDelete.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectDelete.d.ts","sourceRoot":"","sources":["../../src/project/projectDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAC9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAKjD,wBAAsB,aAAa,CACjC,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,UAAU,EACf,eAAe,EAAE,sBAAsB,GACtC,aAAa,CAAC,yBAAyB,CAAC,CAkB1C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createResultErrorCode } from "#result";
|
|
2
2
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
3
3
|
import { projectMutationExpectedRevision } from "./projectMutationExpectedRevision.js";
|
|
4
4
|
import { projectOwnerAuthorize } from "./projectOwnerAuthorize.js";
|
|
@@ -13,7 +13,7 @@ export async function projectDelete(options, key, mutationOptions) {
|
|
|
13
13
|
if (!snapshotR.success)
|
|
14
14
|
return snapshotR;
|
|
15
15
|
if (!snapshotR.data.projects.some((project) => projectKeyEqual(project, key))) {
|
|
16
|
-
return
|
|
16
|
+
return createResultErrorCode("projectDelete", "project not found", "projects.not-found");
|
|
17
17
|
}
|
|
18
18
|
const expectedRevisionR = projectMutationExpectedRevision(mutationOptions, snapshotR.data.revision, "projectDelete");
|
|
19
19
|
if (!expectedRevisionR.success)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectDelete.js","sourceRoot":"","sources":["../../src/project/projectDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"projectDelete.js","sourceRoot":"","sources":["../../src/project/projectDelete.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAsB,MAAM,SAAS,CAAA;AAKnE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,+BAA+B,EAAE,MAAM,sCAAsC,CAAA;AACtF,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAElE,MAAM,CAAC,KAAK,UAAU,aAAa,CACjC,OAA8B,EAC9B,GAAe,EACf,eAAuC;IAEvC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,YAAY,EAAE,CAAA;IAClD,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,MAAM,CAAA;IAElC,MAAM,cAAc,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,KAAK,CAAC,CAAA;IAC1F,IAAI,CAAC,cAAc,CAAC,OAAO;QAAE,OAAO,cAAc,CAAA;IAElD,MAAM,SAAS,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,CAAA;IACjD,IAAI,CAAC,SAAS,CAAC,OAAO;QAAE,OAAO,SAAS,CAAA;IACxC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,EAAE,CAAC;QAC9E,OAAO,qBAAqB,CAAC,eAAe,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,CAAA;IAC1F,CAAC;IAED,MAAM,iBAAiB,GAAG,+BAA+B,CAAC,eAAe,EAAE,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAA;IACpH,IAAI,CAAC,iBAAiB,CAAC,OAAO;QAAE,OAAO,iBAAiB,CAAA;IAExD,MAAM,iBAAiB,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,EAAE,iBAAiB,CAAC,IAAI,EAAE,CAAA;IACnG,OAAO,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAA;AAC1D,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectEdit.d.ts","sourceRoot":"","sources":["../../src/project/projectEdit.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectEdit.d.ts","sourceRoot":"","sources":["../../src/project/projectEdit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAyB,KAAK,aAAa,EAAE,MAAM,SAAS,CAAA;AACnE,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAE9F,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AACzE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AACvE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAyDjD,wBAAsB,WAAW,CAC/B,OAAO,EAAE,qBAAqB,EAC9B,GAAG,EAAE,UAAU,EACf,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,sBAAsB,GACtC,aAAa,CAAC,yBAAyB,CAAC,CAgC1C"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { createResultErrorCode } from "#result";
|
|
2
2
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
3
3
|
import { projectMutationExpectedRevision } from "./projectMutationExpectedRevision.js";
|
|
4
4
|
import { projectNormalize } from "./projectNormalize.js";
|
|
@@ -24,6 +24,10 @@ function projectEditRecordMerge(existing, patch) {
|
|
|
24
24
|
for (const [key, value] of Object.entries(existing))
|
|
25
25
|
merged[key] = value;
|
|
26
26
|
for (const [key, value] of Object.entries(patch)) {
|
|
27
|
+
if (key === "labels") {
|
|
28
|
+
merged[key] = value;
|
|
29
|
+
continue;
|
|
30
|
+
}
|
|
27
31
|
const existingValue = Object.hasOwn(merged, key) ? merged[key] : undefined;
|
|
28
32
|
if (value &&
|
|
29
33
|
typeof value === "object" &&
|
|
@@ -58,14 +62,14 @@ export async function projectEdit(options, key, input, mutationOptions) {
|
|
|
58
62
|
if (!authorizationR.success)
|
|
59
63
|
return authorizationR;
|
|
60
64
|
if (projectInputIdentityMatches(input, key) === false) {
|
|
61
|
-
return
|
|
65
|
+
return createResultErrorCode(op, "project owner and name are immutable", "request.invalid");
|
|
62
66
|
}
|
|
63
67
|
const snapshotR = await options.repository.read();
|
|
64
68
|
if (!snapshotR.success)
|
|
65
69
|
return snapshotR;
|
|
66
70
|
const existing = snapshotR.data.projects.find((project) => projectKeyEqual(project, key));
|
|
67
71
|
if (!existing)
|
|
68
|
-
return
|
|
72
|
+
return createResultErrorCode(op, "project not found", "projects.not-found");
|
|
69
73
|
const projectR = projectNormalize(projectEditInputMerge(existing, input), {
|
|
70
74
|
projects: snapshotR.data.projects,
|
|
71
75
|
portRange: options.portRange,
|
|
@@ -75,7 +79,7 @@ export async function projectEdit(options, key, input, mutationOptions) {
|
|
|
75
79
|
if (!projectR.success)
|
|
76
80
|
return projectR;
|
|
77
81
|
if (!projectKeyEqual(projectR.data, key))
|
|
78
|
-
return
|
|
82
|
+
return createResultErrorCode(op, "project owner and name are immutable", "request.invalid");
|
|
79
83
|
const expectedRevisionR = projectMutationExpectedRevision(mutationOptions, snapshotR.data.revision, op);
|
|
80
84
|
if (!expectedRevisionR.success)
|
|
81
85
|
return expectedRevisionR;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectEdit.js","sourceRoot":"","sources":["../../src/project/projectEdit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"projectEdit.js","sourceRoot":"","sources":["../../src/project/projectEdit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectGet.d.ts","sourceRoot":"","sources":["../../src/project/projectGet.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectGet.d.ts","sourceRoot":"","sources":["../../src/project/projectGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAIjD,wBAAgB,UAAU,CAAC,QAAQ,EAAE,SAAS,OAAO,EAAE,EAAE,GAAG,EAAE,UAAU,GAAG,MAAM,CAAC,OAAO,CAAC,CAOzF"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { createResult,
|
|
1
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
2
2
|
import { projectKey } from "./projectKey.js";
|
|
3
3
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
4
4
|
export function projectGet(projects, key) {
|
|
5
5
|
const op = "projectGet";
|
|
6
6
|
const project = projects.find((item) => projectKeyEqual(item, key));
|
|
7
7
|
if (!project) {
|
|
8
|
-
return
|
|
8
|
+
return { ...createResultErrorCode(op, "project not found", "projects.not-found"), errorData: projectKey(key) };
|
|
9
9
|
}
|
|
10
10
|
return createResult(project);
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectGet.js","sourceRoot":"","sources":["../../src/project/projectGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectGet.js","sourceRoot":"","sources":["../../src/project/projectGet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAe,MAAM,SAAS,CAAA;AAG1E,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEtD,MAAM,UAAU,UAAU,CAAC,QAA4B,EAAE,GAAe;IACtE,MAAM,EAAE,GAAG,YAAY,CAAA;IACvB,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAA;IACnE,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,EAAE,GAAG,qBAAqB,CAAC,EAAE,EAAE,mBAAmB,EAAE,oBAAoB,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,EAAE,CAAA;IAChH,CAAC;IACD,OAAO,YAAY,CAAC,OAAO,CAAC,CAAA;AAC9B,CAAC"}
|
|
@@ -7,6 +7,7 @@ export declare const projectInputSchema: a.ObjectSchema<{
|
|
|
7
7
|
readonly type: a.OptionalSchema<a.PicklistSchema<["own", "internal", "customer"], undefined>, "customer">;
|
|
8
8
|
readonly order: a.OptionalSchema<a.SchemaWithPipe<readonly [a.NumberSchema<undefined>, a.FiniteAction<number, undefined>]>, number>;
|
|
9
9
|
readonly services: a.OptionalSchema<a.ArraySchema<a.SchemaWithPipe<readonly [a.StringSchema<undefined>, a.RegexAction<string, undefined>]>, undefined>, readonly []>;
|
|
10
|
+
readonly labels: a.OptionalSchema<a.SchemaWithPipe<readonly [a.CustomSchema<Record<string, string>, a.ErrorMessage<a.CustomIssue> | undefined>, a.TransformAction<Record<string, string>, Record<string, string>>]>, {}>;
|
|
10
11
|
readonly github: a.OptionalSchema<a.StringSchema<undefined>, undefined>;
|
|
11
12
|
readonly previewUrl: a.OptionalSchema<a.StringSchema<undefined>, undefined>;
|
|
12
13
|
readonly previewPort: a.OptionalSchema<a.StringSchema<undefined>, undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectInputSchema.d.ts","sourceRoot":"","sources":["../../src/project/projectInputSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"projectInputSchema.d.ts","sourceRoot":"","sources":["../../src/project/projectInputSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AA8B5B,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAe7B,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,kBAAkB,CAAC,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as a from "valibot";
|
|
2
2
|
import { projectHeaderUpSchema } from "./projectHeaderUpSchema.js";
|
|
3
|
+
import { projectLabelsSchema } from "./projectLabelsSchema.js";
|
|
3
4
|
const serviceUnitSchema = a.pipe(a.string(), a.regex(/^[A-Za-z0-9_.@:-]+(?:\.service)?$/));
|
|
4
5
|
const nonEmptyTextSchema = a.pipe(a.string(), a.regex(/\S/));
|
|
5
6
|
const finiteNumberSchema = a.pipe(a.number(), a.finite());
|
|
@@ -32,6 +33,7 @@ export const projectInputSchema = a.object({
|
|
|
32
33
|
type: a.optional(a.picklist(["own", "internal", "customer"]), "customer"),
|
|
33
34
|
order: a.optional(finiteNumberSchema, Number.MAX_SAFE_INTEGER),
|
|
34
35
|
services: a.optional(a.array(serviceUnitSchema), []),
|
|
36
|
+
labels: a.optional(projectLabelsSchema, {}),
|
|
35
37
|
github: a.optional(a.string()),
|
|
36
38
|
previewUrl: a.optional(a.string()),
|
|
37
39
|
previewPort: a.optional(a.string()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectInputSchema.js","sourceRoot":"","sources":["../../src/project/projectInputSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"projectInputSchema.js","sourceRoot":"","sources":["../../src/project/projectInputSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAA;AAE9D,MAAM,iBAAiB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,mCAAmC,CAAC,CAAC,CAAA;AAC1F,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;AAC5D,MAAM,kBAAkB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC,CAAA;AACzD,MAAM,oBAAoB,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;AAC/D,MAAM,2BAA2B,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAA;AAEtE,MAAM,uBAAuB,GAAG,CAAC,CAAC,MAAM,CAAC;IACvC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;IACnF,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5D,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC;IACpE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC;IAC1D,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,IAAI,CAAC;IACnC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC;IACtC,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,qBAAqB,EAAE,EAAE,CAAC;IAC/C,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC;IACxC,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC9B,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACpD,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAChC,cAAc,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACtC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC7D,YAAY,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC;IAC5C,GAAG,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC;IACnC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,CAAC;CAC9C,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,CAAC,MAAM,CAAC;IACzC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC1C,KAAK,EAAE,kBAAkB;IACzB,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;IACzD,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACnC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,UAAU,EAAE,UAAU,CAAC,CAAC,EAAE,UAAU,CAAC;IACzE,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,kBAAkB,EAAE,MAAM,CAAC,gBAAgB,CAAC;IAC9D,QAAQ,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE,EAAE,CAAC;IACpD,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,mBAAmB,EAAE,EAAE,CAAC;IAC3C,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC9B,UAAU,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAClC,WAAW,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACnC,aAAa,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACrC,mBAAmB,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IAC3C,KAAK,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;CACvD,CAAC,CAAA"}
|
|
@@ -0,0 +1,3 @@
|
|
|
1
|
+
import * as a from "valibot";
|
|
2
|
+
export declare const projectLabelsSchema: a.SchemaWithPipe<readonly [a.CustomSchema<Record<string, string>, a.ErrorMessage<a.CustomIssue> | undefined>, a.TransformAction<Record<string, string>, Record<string, string>>]>;
|
|
3
|
+
//# sourceMappingURL=projectLabelsSchema.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectLabelsSchema.d.ts","sourceRoot":"","sources":["../../src/project/projectLabelsSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AA+B5B,eAAO,MAAM,mBAAmB,mLAM/B,CAAA"}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import * as a from "valibot";
|
|
2
|
+
function projectLabelsRecord(input) {
|
|
3
|
+
if (input === null || typeof input !== "object" || Array.isArray(input))
|
|
4
|
+
return false;
|
|
5
|
+
try {
|
|
6
|
+
return Object.keys(input).every((key) => {
|
|
7
|
+
if (key.trim() === "")
|
|
8
|
+
return false;
|
|
9
|
+
const descriptor = Object.getOwnPropertyDescriptor(input, key);
|
|
10
|
+
return descriptor !== undefined && "value" in descriptor && typeof descriptor.value === "string";
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
catch {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
function projectLabelsCopy(input) {
|
|
18
|
+
const output = {};
|
|
19
|
+
for (const key of Object.keys(input)) {
|
|
20
|
+
Object.defineProperty(output, key, {
|
|
21
|
+
configurable: true,
|
|
22
|
+
enumerable: true,
|
|
23
|
+
value: input[key],
|
|
24
|
+
writable: true,
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
return output;
|
|
28
|
+
}
|
|
29
|
+
export const projectLabelsSchema = a.pipe(a.custom(projectLabelsRecord, "labels must be an object of string values with non-blank keys"), a.transform(projectLabelsCopy));
|
|
30
|
+
//# sourceMappingURL=projectLabelsSchema.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"projectLabelsSchema.js","sourceRoot":"","sources":["../../src/project/projectLabelsSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAE5B,SAAS,mBAAmB,CAAC,KAAc;IACzC,IAAI,KAAK,KAAK,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAErF,IAAI,CAAC;QACH,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;YACtC,IAAI,GAAG,CAAC,IAAI,EAAE,KAAK,EAAE;gBAAE,OAAO,KAAK,CAAA;YACnC,MAAM,UAAU,GAAG,MAAM,CAAC,wBAAwB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;YAC9D,OAAO,UAAU,KAAK,SAAS,IAAI,OAAO,IAAI,UAAU,IAAI,OAAO,UAAU,CAAC,KAAK,KAAK,QAAQ,CAAA;QAClG,CAAC,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,SAAS,iBAAiB,CAAC,KAA6B;IACtD,MAAM,MAAM,GAA2B,EAAE,CAAA;IAEzC,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,GAAG,EAAE;YACjC,YAAY,EAAE,IAAI;YAClB,UAAU,EAAE,IAAI;YAChB,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC;YACjB,QAAQ,EAAE,IAAI;SACf,CAAC,CAAA;IACJ,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAC,IAAI,CACvC,CAAC,CAAC,MAAM,CACN,mBAAmB,EACnB,+DAA+D,CAChE,EACD,CAAC,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAC/B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectMutationExpectedRevision.d.ts","sourceRoot":"","sources":["../../src/project/projectMutationExpectedRevision.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectMutationExpectedRevision.d.ts","sourceRoot":"","sources":["../../src/project/projectMutationExpectedRevision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,+CAA+C,CAAA;AAG9F,wBAAgB,+BAA+B,CAC7C,KAAK,EAAE,OAAO,EACd,eAAe,EAAE,OAAO,EACxB,EAAE,EAAE,MAAM,GACT,MAAM,CAAC,yBAAyB,CAAC,CAoBnC"}
|
|
@@ -1,20 +1,20 @@
|
|
|
1
|
-
import { createResult,
|
|
1
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
2
2
|
import { projectRevisionValidate } from "./projectRevisionValidate.js";
|
|
3
3
|
export function projectMutationExpectedRevision(input, currentRevision, op) {
|
|
4
4
|
const currentRevisionR = projectRevisionValidate(currentRevision, op);
|
|
5
5
|
if (!currentRevisionR.success) {
|
|
6
|
-
return
|
|
6
|
+
return createResultErrorCode(op, `current revision is invalid: ${currentRevisionR.errorMessage}`, "request.invalid");
|
|
7
7
|
}
|
|
8
8
|
if (!input || typeof input !== "object" || Array.isArray(input)) {
|
|
9
|
-
return
|
|
9
|
+
return createResultErrorCode(op, "expectedRevision must be a non-empty string", "request.invalid");
|
|
10
10
|
}
|
|
11
11
|
const expectedRevision = input.expectedRevision;
|
|
12
12
|
const expectedRevisionR = projectRevisionValidate(expectedRevision, op);
|
|
13
13
|
if (!expectedRevisionR.success) {
|
|
14
|
-
return
|
|
14
|
+
return createResultErrorCode(op, "expectedRevision must be a non-empty string", "request.invalid");
|
|
15
15
|
}
|
|
16
16
|
if (expectedRevisionR.data === "" && currentRevisionR.data !== "") {
|
|
17
|
-
return
|
|
17
|
+
return createResultErrorCode(op, "expectedRevision must be a non-empty string", "request.invalid");
|
|
18
18
|
}
|
|
19
19
|
return createResult(expectedRevisionR.data);
|
|
20
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectMutationExpectedRevision.js","sourceRoot":"","sources":["../../src/project/projectMutationExpectedRevision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectMutationExpectedRevision.js","sourceRoot":"","sources":["../../src/project/projectMutationExpectedRevision.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAe,MAAM,SAAS,CAAA;AAE1E,OAAO,EAAE,uBAAuB,EAAE,MAAM,8BAA8B,CAAA;AAEtE,MAAM,UAAU,+BAA+B,CAC7C,KAAc,EACd,eAAwB,EACxB,EAAU;IAEV,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,eAAe,EAAE,EAAE,CAAC,CAAA;IACrE,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;QAC9B,OAAO,qBAAqB,CAAC,EAAE,EAAE,gCAAgC,gBAAgB,CAAC,YAAY,EAAE,EAAE,iBAAiB,CAAC,CAAA;IACtH,CAAC;IAED,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QAChE,OAAO,qBAAqB,CAAC,EAAE,EAAE,6CAA6C,EAAE,iBAAiB,CAAC,CAAA;IACpG,CAAC;IAED,MAAM,gBAAgB,GAAI,KAAiC,CAAC,gBAAgB,CAAA;IAC5E,MAAM,iBAAiB,GAAG,uBAAuB,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAA;IACvE,IAAI,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC;QAC/B,OAAO,qBAAqB,CAAC,EAAE,EAAE,6CAA6C,EAAE,iBAAiB,CAAC,CAAA;IACpG,CAAC;IACD,IAAI,iBAAiB,CAAC,IAAI,KAAK,EAAE,IAAI,gBAAgB,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;QAClE,OAAO,qBAAqB,CAAC,EAAE,EAAE,6CAA6C,EAAE,iBAAiB,CAAC,CAAA;IACpG,CAAC;IAED,OAAO,YAAY,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAA;AAC7C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectNormalize.d.ts","sourceRoot":"","sources":["../../src/project/projectNormalize.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectNormalize.d.ts","sourceRoot":"","sources":["../../src/project/projectNormalize.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAG1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,EAAE,KAAK,gBAAgB,EAAmB,MAAM,sBAAsB,CAAA;AAC7E,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAGjD,MAAM,MAAM,uBAAuB,GAAG;IACpC,QAAQ,CAAC,EAAE,SAAS,OAAO,EAAE,CAAA;IAC7B,SAAS,CAAC,EAAE,gBAAgB,CAAA;IAC5B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAsJD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,GAAE,uBAA4B,GAAG,MAAM,CAAC,OAAO,CAAC,CAgBvG"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import * as a from "valibot";
|
|
2
|
-
import { createResult,
|
|
2
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
3
3
|
import { projectDomainNormalize } from "./projectDomainNormalize.js";
|
|
4
4
|
import { projectInputSchema } from "./projectInputSchema.js";
|
|
5
5
|
import { projectPortNext } from "./projectPortNext.js";
|
|
@@ -130,6 +130,7 @@ function projectInputNormalize(input) {
|
|
|
130
130
|
type: typeValue(record.type),
|
|
131
131
|
order: orderValue(record.order),
|
|
132
132
|
services: serviceValues(record.services),
|
|
133
|
+
labels: record.labels,
|
|
133
134
|
};
|
|
134
135
|
const description = stringValue(record.description);
|
|
135
136
|
if (description !== undefined)
|
|
@@ -157,7 +158,7 @@ export function projectNormalize(input, options = {}) {
|
|
|
157
158
|
const op = "projectNormalize";
|
|
158
159
|
const parsed = a.safeParse(projectInputSchema, projectInputNormalize(input));
|
|
159
160
|
if (!parsed.success)
|
|
160
|
-
return
|
|
161
|
+
return createResultErrorCode(op, a.summarize(parsed.issues), "request.invalid");
|
|
161
162
|
let normalized = parsed.output;
|
|
162
163
|
if (normalized.caddy && normalized.caddy.port === undefined) {
|
|
163
164
|
const excludeKey = options.excludeProject ?? options.excludeKey;
|
|
@@ -168,7 +169,7 @@ export function projectNormalize(input, options = {}) {
|
|
|
168
169
|
}
|
|
169
170
|
const projectResult = projectValidate(normalized, options);
|
|
170
171
|
if (!projectResult.success)
|
|
171
|
-
return
|
|
172
|
+
return { ...projectResult, op };
|
|
172
173
|
return createResult(projectResult.data);
|
|
173
174
|
}
|
|
174
175
|
//# sourceMappingURL=projectNormalize.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectNormalize.js","sourceRoot":"","sources":["../../src/project/projectNormalize.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectNormalize.js","sourceRoot":"","sources":["../../src/project/projectNormalize.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectPortNext.d.ts","sourceRoot":"","sources":["../../src/project/projectPortNext.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectPortNext.d.ts","sourceRoot":"","sources":["../../src/project/projectPortNext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAC1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEjD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,MAAM,CAAA;IACZ,EAAE,EAAE,MAAM,CAAA;CACX,CAAA;AAWD,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,SAAS,OAAO,EAAE,EAC5B,KAAK,GAAE,gBAAmC,EAC1C,UAAU,CAAC,EAAE,UAAU,GACtB,MAAM,CAAC,MAAM,CAAC,CAiBhB"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { createResult,
|
|
1
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
2
2
|
import { projectKeyEqual } from "./projectKeyEqual.js";
|
|
3
3
|
const defaultPortRange = { from: 3000, to: 3999 };
|
|
4
4
|
function projectPortRangeValidate(range) {
|
|
@@ -14,7 +14,7 @@ export function projectPortNext(projects, range = defaultPortRange, excludeKey)
|
|
|
14
14
|
const op = "projectPortNext";
|
|
15
15
|
const rangeError = projectPortRangeValidate(range);
|
|
16
16
|
if (rangeError)
|
|
17
|
-
return
|
|
17
|
+
return createResultErrorCode(op, rangeError, "request.invalid");
|
|
18
18
|
const used = new Set();
|
|
19
19
|
for (const project of projects) {
|
|
20
20
|
if (excludeKey && projectKeyEqual(project, excludeKey))
|
|
@@ -27,6 +27,6 @@ export function projectPortNext(projects, range = defaultPortRange, excludeKey)
|
|
|
27
27
|
if (!used.has(port))
|
|
28
28
|
return createResult(port);
|
|
29
29
|
}
|
|
30
|
-
return
|
|
30
|
+
return createResultErrorCode(op, `no free port in range ${range.from}-${range.to}`, "request.invalid");
|
|
31
31
|
}
|
|
32
32
|
//# sourceMappingURL=projectPortNext.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectPortNext.js","sourceRoot":"","sources":["../../src/project/projectPortNext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectPortNext.js","sourceRoot":"","sources":["../../src/project/projectPortNext.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAe,MAAM,SAAS,CAAA;AAE1E,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAQtD,MAAM,gBAAgB,GAAqB,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,CAAA;AAEnE,SAAS,wBAAwB,CAAC,KAAuB;IACvD,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QAAE,OAAO,oCAAoC,CAAA;IAC7G,IAAI,KAAK,CAAC,IAAI,GAAG,CAAC,IAAI,KAAK,CAAC,EAAE,GAAG,KAAK;QAAE,OAAO,+CAA+C,CAAA;IAC9F,IAAI,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,EAAE;QAAE,OAAO,0CAA0C,CAAA;IAC5E,OAAO,SAAS,CAAA;AAClB,CAAC;AAED,MAAM,UAAU,eAAe,CAC7B,QAA4B,EAC5B,QAA0B,gBAAgB,EAC1C,UAAuB;IAEvB,MAAM,EAAE,GAAG,iBAAiB,CAAA;IAC5B,MAAM,UAAU,GAAG,wBAAwB,CAAC,KAAK,CAAC,CAAA;IAClD,IAAI,UAAU;QAAE,OAAO,qBAAqB,CAAC,EAAE,EAAE,UAAU,EAAE,iBAAiB,CAAC,CAAA;IAE/E,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAA;IAC9B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,UAAU,IAAI,eAAe,CAAC,OAAO,EAAE,UAAU,CAAC;YAAE,SAAQ;QAChE,IAAI,CAAC,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,QAAQ;YAAE,SAAQ;QACtD,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAC9B,CAAC;IAED,KAAK,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;YAAE,OAAO,YAAY,CAAC,IAAI,CAAC,CAAA;IAChD,CAAC;IAED,OAAO,qBAAqB,CAAC,EAAE,EAAE,yBAAyB,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,EAAE,EAAE,EAAE,iBAAiB,CAAC,CAAA;AACxG,CAAC"}
|
|
@@ -7,6 +7,7 @@ export declare const projectSchema: a.StrictObjectSchema<{
|
|
|
7
7
|
readonly type: a.OptionalSchema<a.PicklistSchema<["own", "internal", "customer"], undefined>, "customer">;
|
|
8
8
|
readonly order: a.OptionalSchema<a.SchemaWithPipe<readonly [a.NumberSchema<undefined>, a.FiniteAction<number, undefined>]>, number>;
|
|
9
9
|
readonly services: a.OptionalSchema<a.SchemaWithPipe<readonly [a.ArraySchema<a.SchemaWithPipe<readonly [a.StringSchema<undefined>, a.RegexAction<string, undefined>]>, undefined>, a.CheckAction<string[], "services must be deduplicated">]>, readonly []>;
|
|
10
|
+
readonly labels: a.OptionalSchema<a.SchemaWithPipe<readonly [a.CustomSchema<Record<string, string>, a.ErrorMessage<a.CustomIssue> | undefined>, a.TransformAction<Record<string, string>, Record<string, string>>]>, {}>;
|
|
10
11
|
readonly github: a.OptionalSchema<a.StringSchema<undefined>, undefined>;
|
|
11
12
|
readonly previewUrl: a.OptionalSchema<a.StringSchema<undefined>, undefined>;
|
|
12
13
|
readonly previewPort: a.OptionalSchema<a.StringSchema<undefined>, undefined>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSchema.d.ts","sourceRoot":"","sources":["../../src/project/projectSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"projectSchema.d.ts","sourceRoot":"","sources":["../../src/project/projectSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAkC5B,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;aAexB,CAAA;AAEF,MAAM,MAAM,OAAO,GAAG,CAAC,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAA"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as a from "valibot";
|
|
2
2
|
import { projectHeaderUpSchema } from "./projectHeaderUpSchema.js";
|
|
3
|
+
import { projectLabelsSchema } from "./projectLabelsSchema.js";
|
|
3
4
|
const serviceUnitSchema = a.pipe(a.string(), a.regex(/^[A-Za-z0-9_.@:-]+(?:\.service)?$/));
|
|
4
5
|
const nonEmptyTextSchema = a.pipe(a.string(), a.regex(/\S/));
|
|
5
6
|
const finiteNumberSchema = a.pipe(a.number(), a.finite());
|
|
@@ -33,6 +34,7 @@ export const projectSchema = a.strictObject({
|
|
|
33
34
|
type: a.optional(a.picklist(["own", "internal", "customer"]), "customer"),
|
|
34
35
|
order: a.optional(finiteNumberSchema, Number.MAX_SAFE_INTEGER),
|
|
35
36
|
services: a.optional(projectServicesSchema, []),
|
|
37
|
+
labels: a.optional(projectLabelsSchema, {}),
|
|
36
38
|
github: a.optional(a.string()),
|
|
37
39
|
previewUrl: a.optional(a.string()),
|
|
38
40
|
previewPort: a.optional(a.string()),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectSchema.js","sourceRoot":"","sources":["../../src/project/projectSchema.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;
|
|
1
|
+
{"version":3,"file":"projectSchema.js","sourceRoot":"","sources":["../../src/project/projectSchema.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectValidate.d.ts","sourceRoot":"","sources":["../../src/project/projectValidate.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectValidate.d.ts","sourceRoot":"","sources":["../../src/project/projectValidate.ts"],"names":[],"mappings":"AACA,OAAO,EAAuC,KAAK,MAAM,EAAE,MAAM,SAAS,CAAA;AAE1E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAGjD,MAAM,MAAM,sBAAsB,GAAG;IACnC,QAAQ,CAAC,EAAE,SAAS,OAAO,EAAE,CAAA;IAC7B,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB,CAAA;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,GAAE,sBAA2B,GAAG,MAAM,CAAC,OAAO,CAAC,CAoBrG"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import * as a from "valibot";
|
|
2
|
-
import { createResult,
|
|
2
|
+
import { createResult, createResultErrorCode } from "#result";
|
|
3
3
|
import { projectCollisions } from "./projectCollisions.js";
|
|
4
4
|
import { projectSchema } from "./projectSchema.js";
|
|
5
5
|
export function projectValidate(input, options = {}) {
|
|
6
6
|
const op = "projectValidate";
|
|
7
7
|
const parsed = a.safeParse(projectSchema, input);
|
|
8
8
|
if (!parsed.success)
|
|
9
|
-
return
|
|
9
|
+
return createResultErrorCode(op, a.summarize(parsed.issues), "request.invalid");
|
|
10
10
|
if (options.projects !== undefined) {
|
|
11
11
|
for (const project of options.projects) {
|
|
12
12
|
const existing = a.safeParse(projectSchema, project);
|
|
13
13
|
if (!existing.success)
|
|
14
|
-
return
|
|
14
|
+
return createResultErrorCode(op, a.summarize(existing.issues), "request.invalid");
|
|
15
15
|
}
|
|
16
16
|
const collisions = projectCollisions(options.projects, {
|
|
17
17
|
excludeKey: options.excludeKey,
|
|
@@ -19,7 +19,7 @@ export function projectValidate(input, options = {}) {
|
|
|
19
19
|
replacement: parsed.output,
|
|
20
20
|
});
|
|
21
21
|
if (!collisions.success)
|
|
22
|
-
return
|
|
22
|
+
return { ...collisions, op };
|
|
23
23
|
}
|
|
24
24
|
return createResult(parsed.output);
|
|
25
25
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectValidate.js","sourceRoot":"","sources":["../../src/project/projectValidate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"projectValidate.js","sourceRoot":"","sources":["../../src/project/projectValidate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAe,MAAM,SAAS,CAAA;AAC1E,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAQlD,MAAM,UAAU,eAAe,CAAC,KAAc,EAAE,UAAkC,EAAE;IAClF,MAAM,EAAE,GAAG,iBAAiB,CAAA;IAC5B,MAAM,MAAM,GAAG,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,KAAK,CAAC,CAAA;IAChD,IAAI,CAAC,MAAM,CAAC,OAAO;QAAE,OAAO,qBAAqB,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,CAAA;IAEpG,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,EAAE,CAAC;QACnC,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC;YACvC,MAAM,QAAQ,GAAG,CAAC,CAAC,SAAS,CAAC,aAAa,EAAE,OAAO,CAAC,CAAA;YACpD,IAAI,CAAC,QAAQ,CAAC,OAAO;gBAAE,OAAO,qBAAqB,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,CAAA;QAC1G,CAAC;QAED,MAAM,UAAU,GAAG,iBAAiB,CAAC,OAAO,CAAC,QAAQ,EAAE;YACrD,UAAU,EAAE,OAAO,CAAC,UAAU;YAC9B,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,WAAW,EAAE,MAAM,CAAC,MAAM;SAC3B,CAAC,CAAA;QACF,IAAI,CAAC,UAAU,CAAC,OAAO;YAAE,OAAO,EAAE,GAAG,UAAU,EAAE,EAAE,EAAE,CAAA;IACvD,CAAC;IAED,OAAO,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AACpC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"projectRepositoryOpen.d.ts","sourceRoot":"","sources":["../../src/project-store/projectRepositoryOpen.ts"],"names":[],"mappings":"AAaA,OAAO,
|
|
1
|
+
{"version":3,"file":"projectRepositoryOpen.d.ts","sourceRoot":"","sources":["../../src/project-store/projectRepositoryOpen.ts"],"names":[],"mappings":"AAaA,OAAO,EAA0D,KAAK,aAAa,EAAe,MAAM,SAAS,CAAA;AASjH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AA2zB/D,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAgG9F"}
|