canopycms 0.0.61-int.75 → 0.0.61
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/ai/handler.js +1 -1
- package/dist/ai/handler.js.map +1 -1
- package/dist/api/assets.d.ts.map +1 -1
- package/dist/api/assets.js +36 -4
- package/dist/api/assets.js.map +1 -1
- package/dist/api/branch-status.d.ts.map +1 -1
- package/dist/api/branch-status.js +56 -0
- package/dist/api/branch-status.js.map +1 -1
- package/dist/api/branch-withdraw.d.ts.map +1 -1
- package/dist/api/branch-withdraw.js +14 -3
- package/dist/api/branch-withdraw.js.map +1 -1
- package/dist/api/branch.d.ts +31 -2
- package/dist/api/branch.d.ts.map +1 -1
- package/dist/api/branch.js +252 -13
- package/dist/api/branch.js.map +1 -1
- package/dist/api/content.d.ts.map +1 -1
- package/dist/api/content.js +12 -4
- package/dist/api/content.js.map +1 -1
- package/dist/api/entries.d.ts.map +1 -1
- package/dist/api/entries.js +11 -9
- package/dist/api/entries.js.map +1 -1
- package/dist/api/guards.d.ts.map +1 -1
- package/dist/api/guards.js +12 -5
- package/dist/api/guards.js.map +1 -1
- package/dist/api/permissions.d.ts +2 -2
- package/dist/api/permissions.d.ts.map +1 -1
- package/dist/api/permissions.js +51 -3
- package/dist/api/permissions.js.map +1 -1
- package/dist/api/reference-options.d.ts.map +1 -1
- package/dist/api/reference-options.js +10 -17
- package/dist/api/reference-options.js.map +1 -1
- package/dist/api/resolve-references.d.ts.map +1 -1
- package/dist/api/resolve-references.js +3 -1
- package/dist/api/resolve-references.js.map +1 -1
- package/dist/api/schema.d.ts.map +1 -1
- package/dist/api/schema.js +3 -2
- package/dist/api/schema.js.map +1 -1
- package/dist/api/settings-helpers.d.ts.map +1 -1
- package/dist/api/settings-helpers.js +6 -5
- package/dist/api/settings-helpers.js.map +1 -1
- package/dist/assets/pipeline.d.ts +11 -2
- package/dist/assets/pipeline.d.ts.map +1 -1
- package/dist/assets/pipeline.js +114 -2
- package/dist/assets/pipeline.js.map +1 -1
- package/dist/assets/transform-directives.d.ts +18 -0
- package/dist/assets/transform-directives.d.ts.map +1 -1
- package/dist/assets/transform-directives.js +18 -0
- package/dist/assets/transform-directives.js.map +1 -1
- package/dist/assets/transform.d.ts.map +1 -1
- package/dist/assets/transform.js +1 -10
- package/dist/assets/transform.js.map +1 -1
- package/dist/auth/types.d.ts +29 -0
- package/dist/auth/types.d.ts.map +1 -1
- package/dist/authorization/index.d.ts +1 -1
- package/dist/authorization/index.d.ts.map +1 -1
- package/dist/authorization/index.js +1 -1
- package/dist/authorization/index.js.map +1 -1
- package/dist/authorization/protected-branch.d.ts +75 -0
- package/dist/authorization/protected-branch.d.ts.map +1 -1
- package/dist/authorization/protected-branch.js +39 -0
- package/dist/authorization/protected-branch.js.map +1 -1
- package/dist/branch-registry.d.ts.map +1 -1
- package/dist/branch-registry.js +5 -1
- package/dist/branch-registry.js.map +1 -1
- package/dist/branch-schema-cache.d.ts.map +1 -1
- package/dist/branch-schema-cache.js +9 -0
- package/dist/branch-schema-cache.js.map +1 -1
- package/dist/build/generate-ai-content.js +1 -1
- package/dist/build/generate-ai-content.js.map +1 -1
- package/dist/cli/cli.js +1442 -828
- package/dist/cli/generate-ai-content.js +404 -136
- package/dist/cli/init.d.ts +8 -2
- package/dist/cli/init.d.ts.map +1 -1
- package/dist/cli/init.js +440 -151
- package/dist/cli/init.js.map +1 -1
- package/dist/cli/project-detect.d.ts +89 -0
- package/dist/cli/project-detect.d.ts.map +1 -0
- package/dist/cli/project-detect.js +240 -0
- package/dist/cli/project-detect.js.map +1 -0
- package/dist/cli/template-files/Dockerfile.cms.template +11 -6
- package/dist/cli/template-files/cdk-app.ts.template +82 -0
- package/dist/cli/template-files/cdk.json.template +9 -0
- package/dist/cli/template-files/cms-stack.ts.template +124 -0
- package/dist/cli/template-files/deploy-cms.yml.template +125 -13
- package/dist/cli/template-files/dockerignore.template +2 -1
- package/dist/cli/templates.d.ts +26 -2
- package/dist/cli/templates.d.ts.map +1 -1
- package/dist/cli/templates.js +36 -4
- package/dist/cli/templates.js.map +1 -1
- package/dist/config/schemas/config.d.ts +2 -3
- package/dist/config/schemas/config.d.ts.map +1 -1
- package/dist/config/schemas/config.js +21 -1
- package/dist/config/schemas/config.js.map +1 -1
- package/dist/config/validation.d.ts +9 -0
- package/dist/config/validation.d.ts.map +1 -1
- package/dist/config/validation.js +22 -12
- package/dist/config/validation.js.map +1 -1
- package/dist/content-reader.js +1 -1
- package/dist/content-reader.js.map +1 -1
- package/dist/content-store.d.ts +11 -0
- package/dist/content-store.d.ts.map +1 -1
- package/dist/content-store.js +2 -1
- package/dist/content-store.js.map +1 -1
- package/dist/dev-content-watcher.d.ts.map +1 -1
- package/dist/dev-content-watcher.js +4 -1
- package/dist/dev-content-watcher.js.map +1 -1
- package/dist/editor/BranchManager.d.ts +15 -0
- package/dist/editor/BranchManager.d.ts.map +1 -1
- package/dist/editor/BranchManager.js +43 -9
- package/dist/editor/BranchManager.js.map +1 -1
- package/dist/editor/CanopyEditor.d.ts.map +1 -1
- package/dist/editor/CanopyEditor.js +2 -2
- package/dist/editor/CanopyEditor.js.map +1 -1
- package/dist/editor/Editor.d.ts.map +1 -1
- package/dist/editor/Editor.js +110 -48
- package/dist/editor/Editor.js.map +1 -1
- package/dist/editor/admin/SystemHealthPanel.d.ts.map +1 -1
- package/dist/editor/admin/SystemHealthPanel.js +9 -8
- package/dist/editor/admin/SystemHealthPanel.js.map +1 -1
- package/dist/editor/components/EditorHeader.d.ts +6 -0
- package/dist/editor/components/EditorHeader.d.ts.map +1 -1
- package/dist/editor/components/EditorHeader.js +76 -23
- package/dist/editor/components/EditorHeader.js.map +1 -1
- package/dist/editor/components/EntryCreateModal.d.ts.map +1 -1
- package/dist/editor/components/EntryCreateModal.js +21 -6
- package/dist/editor/components/EntryCreateModal.js.map +1 -1
- package/dist/editor/context/SWRProvider.d.ts +31 -0
- package/dist/editor/context/SWRProvider.d.ts.map +1 -0
- package/dist/editor/context/SWRProvider.js +12 -0
- package/dist/editor/context/SWRProvider.js.map +1 -0
- package/dist/editor/context/index.d.ts +3 -0
- package/dist/editor/context/index.d.ts.map +1 -1
- package/dist/editor/context/index.js +3 -0
- package/dist/editor/context/index.js.map +1 -1
- package/dist/editor/editor-utils.d.ts.map +1 -1
- package/dist/editor/editor-utils.js +8 -2
- package/dist/editor/editor-utils.js.map +1 -1
- package/dist/editor/fields/ImageField.d.ts.map +1 -1
- package/dist/editor/fields/ImageField.js +27 -3
- package/dist/editor/fields/ImageField.js.map +1 -1
- package/dist/editor/fields/ReferenceField.d.ts.map +1 -1
- package/dist/editor/fields/ReferenceField.js +52 -31
- package/dist/editor/fields/ReferenceField.js.map +1 -1
- package/dist/editor/hooks/__test__/test-utils.d.ts +38 -3
- package/dist/editor/hooks/__test__/test-utils.d.ts.map +1 -1
- package/dist/editor/hooks/__test__/test-utils.js +50 -4
- package/dist/editor/hooks/__test__/test-utils.js.map +1 -1
- package/dist/editor/hooks/index.d.ts +4 -1
- package/dist/editor/hooks/index.d.ts.map +1 -1
- package/dist/editor/hooks/index.js +4 -1
- package/dist/editor/hooks/index.js.map +1 -1
- package/dist/editor/hooks/useBranchManager.d.ts +21 -1
- package/dist/editor/hooks/useBranchManager.d.ts.map +1 -1
- package/dist/editor/hooks/useBranchManager.js +68 -32
- package/dist/editor/hooks/useBranchManager.js.map +1 -1
- package/dist/editor/hooks/useBranchesData.d.ts +57 -0
- package/dist/editor/hooks/useBranchesData.d.ts.map +1 -0
- package/dist/editor/hooks/useBranchesData.js +69 -0
- package/dist/editor/hooks/useBranchesData.js.map +1 -0
- package/dist/editor/hooks/useCommentSystem.d.ts.map +1 -1
- package/dist/editor/hooks/useCommentSystem.js +24 -22
- package/dist/editor/hooks/useCommentSystem.js.map +1 -1
- package/dist/editor/hooks/useCommentsData.d.ts +29 -0
- package/dist/editor/hooks/useCommentsData.d.ts.map +1 -0
- package/dist/editor/hooks/useCommentsData.js +40 -0
- package/dist/editor/hooks/useCommentsData.js.map +1 -0
- package/dist/editor/hooks/useDraftManager.d.ts.map +1 -1
- package/dist/editor/hooks/useDraftManager.js +32 -18
- package/dist/editor/hooks/useDraftManager.js.map +1 -1
- package/dist/editor/hooks/useEntriesData.d.ts +35 -0
- package/dist/editor/hooks/useEntriesData.d.ts.map +1 -0
- package/dist/editor/hooks/useEntriesData.js +96 -0
- package/dist/editor/hooks/useEntriesData.js.map +1 -0
- package/dist/editor/hooks/useEntryManager.d.ts +8 -15
- package/dist/editor/hooks/useEntryManager.d.ts.map +1 -1
- package/dist/editor/hooks/useEntryManager.js +259 -117
- package/dist/editor/hooks/useEntryManager.js.map +1 -1
- package/dist/editor/hooks/usePermissionManager.d.ts +2 -2
- package/dist/editor/hooks/usePermissionManager.d.ts.map +1 -1
- package/dist/editor/hooks/usePermissionManager.js +11 -9
- package/dist/editor/hooks/usePermissionManager.js.map +1 -1
- package/dist/editor/hooks/useReferenceResolution.d.ts.map +1 -1
- package/dist/editor/hooks/useReferenceResolution.js +24 -1
- package/dist/editor/hooks/useReferenceResolution.js.map +1 -1
- package/dist/editor/media/MediaLibraryBody.d.ts.map +1 -1
- package/dist/editor/media/MediaLibraryBody.js +12 -2
- package/dist/editor/media/MediaLibraryBody.js.map +1 -1
- package/dist/editor/permission-manager/GroupSelector.d.ts.map +1 -1
- package/dist/editor/permission-manager/GroupSelector.js +7 -2
- package/dist/editor/permission-manager/GroupSelector.js.map +1 -1
- package/dist/editor/permission-manager/hooks/useGroupsAndUsers.d.ts +3 -3
- package/dist/editor/permission-manager/hooks/useGroupsAndUsers.d.ts.map +1 -1
- package/dist/editor/permission-manager/hooks/useGroupsAndUsers.js +1 -0
- package/dist/editor/permission-manager/hooks/useGroupsAndUsers.js.map +1 -1
- package/dist/editor/permission-manager/types.d.ts +6 -4
- package/dist/editor/permission-manager/types.d.ts.map +1 -1
- package/dist/editor/test-setup.js +8 -0
- package/dist/editor/test-setup.js.map +1 -1
- package/dist/git-manager.d.ts +126 -9
- package/dist/git-manager.d.ts.map +1 -1
- package/dist/git-manager.js +251 -27
- package/dist/git-manager.js.map +1 -1
- package/dist/github-service.d.ts.map +1 -1
- package/dist/github-service.js +13 -7
- package/dist/github-service.js.map +1 -1
- package/dist/http/handler.d.ts.map +1 -1
- package/dist/http/handler.js +8 -2
- package/dist/http/handler.js.map +1 -1
- package/dist/operating-mode/client-unsafe-strategy.d.ts.map +1 -1
- package/dist/operating-mode/client-unsafe-strategy.js +7 -8
- package/dist/operating-mode/client-unsafe-strategy.js.map +1 -1
- package/dist/operating-mode/deployment-name.d.ts +28 -0
- package/dist/operating-mode/deployment-name.d.ts.map +1 -0
- package/dist/operating-mode/deployment-name.js +78 -0
- package/dist/operating-mode/deployment-name.js.map +1 -0
- package/dist/operating-mode/index.d.ts +5 -1
- package/dist/operating-mode/index.d.ts.map +1 -1
- package/dist/operating-mode/index.js +7 -1
- package/dist/operating-mode/index.js.map +1 -1
- package/dist/operating-mode/types.d.ts +13 -3
- package/dist/operating-mode/types.d.ts.map +1 -1
- package/dist/paths/branch-name.d.ts +38 -0
- package/dist/paths/branch-name.d.ts.map +1 -1
- package/dist/paths/branch-name.js +46 -0
- package/dist/paths/branch-name.js.map +1 -1
- package/dist/paths/index.d.ts +1 -1
- package/dist/paths/index.d.ts.map +1 -1
- package/dist/paths/index.js +1 -1
- package/dist/paths/index.js.map +1 -1
- package/dist/reference-resolver.d.ts +6 -2
- package/dist/reference-resolver.d.ts.map +1 -1
- package/dist/reference-resolver.js +8 -1
- package/dist/reference-resolver.js.map +1 -1
- package/dist/schema/meta-loader.d.ts.map +1 -1
- package/dist/schema/meta-loader.js +10 -2
- package/dist/schema/meta-loader.js.map +1 -1
- package/dist/schema/schema-store.d.ts +11 -2
- package/dist/schema/schema-store.d.ts.map +1 -1
- package/dist/schema/schema-store.js +23 -11
- package/dist/schema/schema-store.js.map +1 -1
- package/dist/settings-workspace.d.ts +0 -15
- package/dist/settings-workspace.d.ts.map +1 -1
- package/dist/settings-workspace.js +97 -1
- package/dist/settings-workspace.js.map +1 -1
- package/dist/types.d.ts +63 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/utils/debug.d.ts +11 -0
- package/dist/utils/debug.d.ts.map +1 -1
- package/dist/utils/debug.js +12 -1
- package/dist/utils/debug.js.map +1 -1
- package/dist/utils/git.d.ts +38 -0
- package/dist/utils/git.d.ts.map +1 -1
- package/dist/utils/git.js +69 -0
- package/dist/utils/git.js.map +1 -1
- package/dist/utils/logger.d.ts +71 -0
- package/dist/utils/logger.d.ts.map +1 -0
- package/dist/utils/logger.js +85 -0
- package/dist/utils/logger.js.map +1 -0
- package/dist/validation/entry-type-reference-validator.d.ts +33 -0
- package/dist/validation/entry-type-reference-validator.d.ts.map +1 -0
- package/dist/validation/entry-type-reference-validator.js +110 -0
- package/dist/validation/entry-type-reference-validator.js.map +1 -0
- package/dist/worker/cms-worker.d.ts +232 -3
- package/dist/worker/cms-worker.d.ts.map +1 -1
- package/dist/worker/cms-worker.js +856 -87
- package/dist/worker/cms-worker.js.map +1 -1
- package/dist/worker/log.d.ts +61 -0
- package/dist/worker/log.d.ts.map +1 -0
- package/dist/worker/log.js +74 -0
- package/dist/worker/log.js.map +1 -0
- package/package.json +3 -1
package/dist/ai/handler.js
CHANGED
|
@@ -43,7 +43,7 @@ export function createAIContentHandler(options) {
|
|
|
43
43
|
const flatSchema = _testFlatSchema ??
|
|
44
44
|
(await schemaCache.getSchema(branchRoot, entrySchemaRegistry, contentRootName)).flatSchema;
|
|
45
45
|
// Create store and generate
|
|
46
|
-
const store = new ContentStore(branchRoot, flatSchema);
|
|
46
|
+
const store = new ContentStore(branchRoot, flatSchema, { contentRootName });
|
|
47
47
|
const result = await generateAIContent({
|
|
48
48
|
store,
|
|
49
49
|
flatSchema,
|
package/dist/ai/handler.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/ai/handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAG1D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAChD,OAAO,EAAE,iBAAiB,EAAuB,MAAM,YAAY,CAAA;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AAWpD;;;;;;;;;GASG;AACH,MAAM,UAAU,sBAAsB,CACpC,OAAgC;IAEhC,MAAM,EAAE,MAAM,EAAE,mBAAmB,EAAE,QAAQ,EAAE,eAAe,EAAE,GAAG,OAAO,CAAA;IAC1E,MAAM,WAAW,GAAG,IAAI,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;IACtD,IAAI,YAAY,GAA0B,IAAI,CAAA;IAE9C,MAAM,QAAQ,GAAG,KAAK,IAA6B,EAAE;QACnD,mEAAmE;QACnE,IAAI,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;YAC3B,YAAY,GAAG,IAAI,CAAA;QACrB,CAAC;QAED,IAAI,YAAY;YAAE,OAAO,YAAY,CAAA;QAErC,sBAAsB;QACtB,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAA;QAClD,MAAM,eAAe,GAAG,MAAM,CAAC,WAAW,IAAI,SAAS,CAAA;QAEvD,8CAA8C;QAC9C,MAAM,UAAU,GACd,eAAe;YACf,CAAC,MAAM,WAAW,CAAC,SAAS,CAAC,UAAU,EAAE,mBAAmB,EAAE,eAAe,CAAC,CAAC,CAAC,UAAU,CAAA;QAE5F,4BAA4B;QAC5B,MAAM,KAAK,GAAG,IAAI,YAAY,CAAC,UAAU,EAAE,UAAU,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"handler.js","sourceRoot":"","sources":["../../src/ai/handler.ts"],"names":[],"mappings":"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"}
|
package/dist/api/assets.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/api/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,SAAS,CAAA;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,OAAO,KAAK,EAAE,SAAS,EAAc,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;
|
|
1
|
+
{"version":3,"file":"assets.d.ts","sourceRoot":"","sources":["../../src/api/assets.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,SAAS,CAAA;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAA;AAErD,OAAO,KAAK,EAAE,SAAS,EAAc,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAShF,6EAA6E;AAC7E,MAAM,MAAM,WAAW,GAAG,SAAS,GAAG;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,CAAA;AAoBrD,uCAAuC;AACvC,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,CAAA;AAE5F,6CAA6C;AAC7C,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC;IAAE,MAAM,EAAE,kBAAkB,CAAA;CAAE,CAAC,CAAA;AAE9E,iEAAiE;AACjE,MAAM,MAAM,qBAAqB,GAAG,WAAW,CAAC;IAAE,KAAK,EAAE,WAAW,CAAA;CAAE,CAAC,CAAA;AAEvE,0CAA0C;AAC1C,MAAM,MAAM,mBAAmB,GAAG,WAAW,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAAA;AAQnE,QAAA,MAAM,sBAAsB;;;;;;;;;;;;EAI1B,CAAA;AACF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAErE,QAAA,MAAM,uBAAuB;;;;;;;;;EAG3B,CAAA;AACF,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAEvE;;;;;GAKG;AACH,QAAA,MAAM,sBAAsB;;;;;;;;;EAG1B,CAAA;AACF,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,CAAA;AAOrE,QAAA,MAAM,uBAAuB;;;;;;EAAkC,CAAA;AAC/D,MAAM,MAAM,iBAAiB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,uBAAuB,CAAC,CAAA;AAgcvE;;GAEG;AACH,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAMf,CAAA;AAEV;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,eAI3B,CAAA"}
|
package/dist/api/assets.js
CHANGED
|
@@ -6,6 +6,7 @@ import { finalizeStagedUpload } from '../assets/finalize.js';
|
|
|
6
6
|
import { assetSrc } from '../assets/asset-src.js';
|
|
7
7
|
import { formatDirectives, parseTransformPath } from '../assets/transform-directives.js';
|
|
8
8
|
import { applyTransform } from '../assets/transform.js';
|
|
9
|
+
import { isAdmin } from '../authorization/helpers.js';
|
|
9
10
|
function toAssetRecord(meta) {
|
|
10
11
|
return { ...meta, src: assetSrc(meta) };
|
|
11
12
|
}
|
|
@@ -190,14 +191,41 @@ const listAssetsHandler = async (ctx, _req, params) => {
|
|
|
190
191
|
return { ok: true, status: 200, data: { assets: items.map(toAssetRecord), nextCursor } };
|
|
191
192
|
};
|
|
192
193
|
/**
|
|
193
|
-
* Delete asset -
|
|
194
|
+
* Delete asset - an Admin may delete any asset; anyone else may delete only an
|
|
195
|
+
* asset whose recorded `uploadedBy` is them. `key` is the asset's hash32 and is
|
|
194
196
|
* validated (32 lowercase hex chars) by `deleteAssetParamsSchema` before this
|
|
195
197
|
* handler ever runs. Deletes the meta sidecar only - blobs are immortal until
|
|
196
198
|
* a future GC worker task (see assets-media-system.md).
|
|
199
|
+
*
|
|
200
|
+
* The ownership check lives here rather than in a declarative guard because it
|
|
201
|
+
* needs the asset itself: guards run before the handler and cannot read meta.
|
|
202
|
+
*
|
|
203
|
+
* Two deliberate choices, both fail-closed:
|
|
204
|
+
* - Meta with no `uploadedBy` (the field is optional) is admin-only. Falling
|
|
205
|
+
* back to "anyone may delete" would open every legacy asset to everyone.
|
|
206
|
+
* - A missing asset returns the same 403 as an unowned one for non-admins, so
|
|
207
|
+
* the endpoint isn't an existence oracle over a content-addressed keyspace.
|
|
208
|
+
*
|
|
209
|
+
* Note `uploadedBy` records the FIRST uploader only: finalizeAsset dedups on
|
|
210
|
+
* the content hash and returns the existing meta, so a second person uploading
|
|
211
|
+
* an identical file gains no delete rights over it. Benign (a 403 where they
|
|
212
|
+
* expected success, never the reverse) - see
|
|
213
|
+
* .claude/future-tasks/asset-listing-cross-branch-exposure.md.
|
|
214
|
+
*
|
|
215
|
+
* COUPLED to the blob-GC follow-up in asset-review-followups.md: this
|
|
216
|
+
* permission is safe because delete is a de-list, not a destroy - nothing that
|
|
217
|
+
* another branch references breaks. If GC ever makes delete destroy the
|
|
218
|
+
* underlying blob, revisit this (it would then need a reference check).
|
|
197
219
|
*/
|
|
198
|
-
const deleteAssetHandler = async (
|
|
220
|
+
const deleteAssetHandler = async (ctx, req, params) => {
|
|
199
221
|
if (!ctx.assetStore)
|
|
200
222
|
return { ok: false, status: 501, error: 'Asset store not configured' };
|
|
223
|
+
if (!isAdmin(req.user.groups)) {
|
|
224
|
+
const meta = await ctx.assetStore.getMeta(params.key);
|
|
225
|
+
if (!meta?.uploadedBy || meta.uploadedBy !== req.user.userId) {
|
|
226
|
+
return { ok: false, status: 403, error: 'You can only delete assets you uploaded' };
|
|
227
|
+
}
|
|
228
|
+
}
|
|
201
229
|
await ctx.assetStore.deleteMeta(params.key);
|
|
202
230
|
return { ok: true, status: 200, data: { deleted: true } };
|
|
203
231
|
};
|
|
@@ -242,7 +270,12 @@ async function serveLazyTransform(assetStore, key) {
|
|
|
242
270
|
}
|
|
243
271
|
const transformed = await applyTransform({ data: original.data, ext: original.ext }, parsed.directives);
|
|
244
272
|
if (!transformed.ok) {
|
|
245
|
-
|
|
273
|
+
// Pass the real status through rather than flattening every rejection to
|
|
274
|
+
// 502 - `applyTransform` already distinguishes client-input errors (400
|
|
275
|
+
// unsupported format, 413 oversized output) from a genuine decode
|
|
276
|
+
// failure (422), none of which are "this server failed" (502). Mirrors
|
|
277
|
+
// the prod transform Lambda's own handler.ts, which makes the same fix.
|
|
278
|
+
return { ok: false, status: transformed.status, error: transformed.error };
|
|
246
279
|
}
|
|
247
280
|
const canonicalKey = `${ASSET_PREFIXES.transform}/${formatDirectives(parsed.directives)}/${parsed.hash32}/${parsed.slug}.${parsed.ext}`;
|
|
248
281
|
await assetStore.putPublicObject({
|
|
@@ -383,7 +416,6 @@ const deleteAsset = defineEndpoint({
|
|
|
383
416
|
responseType: 'AssetDeleteResponse',
|
|
384
417
|
response: {},
|
|
385
418
|
defaultMockData: { deleted: true },
|
|
386
|
-
guards: ['admin'],
|
|
387
419
|
handler: deleteAssetHandler,
|
|
388
420
|
});
|
|
389
421
|
/**
|
package/dist/api/assets.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/api/assets.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"assets.js","sourceRoot":"","sources":["../../src/api/assets.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-status.d.ts","sourceRoot":"","sources":["../../src/api/branch-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"branch-status.d.ts","sourceRoot":"","sources":["../../src/api/branch-status.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAY9C,YAAY,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAA;AA0MzD;;GAEG;AACH,eAAO,MAAM,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAOlB,CAAA"}
|
|
@@ -7,6 +7,7 @@ import { defineEndpoint } from './route-builder.js';
|
|
|
7
7
|
import { canPerformWorkflowAction, getBranchProtection } from '../authorization/index.js';
|
|
8
8
|
import { syncSubmitPr } from './github-sync.js';
|
|
9
9
|
import { getErrorMessage, redactCredentials, sanitizeErrorMessage } from '../utils/error.js';
|
|
10
|
+
import { isNonFastForwardRejection } from '../utils/git.js';
|
|
10
11
|
const getBranchStatusHandler = async (gc, _ctx, _req, _params) => {
|
|
11
12
|
const { branchContext } = gc;
|
|
12
13
|
return { ok: true, status: 200, data: { branch: branchContext.branch } };
|
|
@@ -28,6 +29,36 @@ const submitBranchForMergeHandler = async (gc, ctx, req, _params) => {
|
|
|
28
29
|
error: 'Only the branch creator or users with explicit branch access can submit this branch',
|
|
29
30
|
};
|
|
30
31
|
}
|
|
32
|
+
// Only an 'editing' branch may be submitted. This mirrors
|
|
33
|
+
// getBranchWriteProtection's rule exactly -- writes are blocked on any branch
|
|
34
|
+
// whose status has left 'editing' -- so "can I edit this?" and "can I submit
|
|
35
|
+
// this?" stay one question. Submitting a branch you are not allowed to edit
|
|
36
|
+
// is incoherent: its content cannot have changed since the last submit.
|
|
37
|
+
//
|
|
38
|
+
// The 'submittableBranch' guard above answers a different question (is this
|
|
39
|
+
// the protected base branch?) and reads no status at all, so without this the
|
|
40
|
+
// submit path had no status gate anywhere -- unlike withdraw, approve and
|
|
41
|
+
// request-changes, which have always had one. An archived (merged) branch
|
|
42
|
+
// could therefore be re-submitted by its creator: the working tree is clean so
|
|
43
|
+
// nothing is committed, but it re-stamped the branch 'submitted', overwrote
|
|
44
|
+
// the merged PR's title/body via syncSubmitPr's update path, and in prod (no
|
|
45
|
+
// direct githubService) enqueued a worker task that 422s on pulls.create,
|
|
46
|
+
// since createOrUpdatePullRequest finds no OPEN PR to update.
|
|
47
|
+
//
|
|
48
|
+
// Fails closed on a missing status: branch.json is read with a bare
|
|
49
|
+
// JSON.parse (branch-metadata.ts) with no schema validation, so a damaged or
|
|
50
|
+
// hand-repaired file can yield `undefined` at runtime. Same reasoning, and
|
|
51
|
+
// same wording, as runWritableBranchGuard's unreadable-status arm.
|
|
52
|
+
const status = branchContext.branch.status;
|
|
53
|
+
if (status !== 'editing') {
|
|
54
|
+
return {
|
|
55
|
+
ok: false,
|
|
56
|
+
status: 400,
|
|
57
|
+
error: status === undefined
|
|
58
|
+
? `Branch "${branchContext.branch.name}" has no readable workflow status and cannot be submitted until its metadata is repaired.`
|
|
59
|
+
: `Cannot submit branch with status '${status}'. Only 'editing' branches can be submitted.`,
|
|
60
|
+
};
|
|
61
|
+
}
|
|
31
62
|
// Commit and push changes
|
|
32
63
|
try {
|
|
33
64
|
await ctx.services.submitBranch({ context: branchContext });
|
|
@@ -39,6 +70,31 @@ const submitBranchForMergeHandler = async (gc, ctx, req, _params) => {
|
|
|
39
70
|
// (e.g. x-access-token:TOKEN@github.com in git errors) are redacted even
|
|
40
71
|
// from server logs — a live installation token must never persist in logs.
|
|
41
72
|
console.error(`CanopyCMS: Failed to push branch changes (${branchContext.branchRoot}):`, redactCredentials(message));
|
|
73
|
+
// A non-fast-forward rejection means this branch and the deployment's
|
|
74
|
+
// local repository have diverged. Retrying the identical push can never
|
|
75
|
+
// succeed (see isNonFastForwardRejection), so surface 409 instead of the
|
|
76
|
+
// generic 500 below. Everything else (network, auth, lock contention)
|
|
77
|
+
// keeps the existing 500 path unchanged.
|
|
78
|
+
//
|
|
79
|
+
// This push targets the deployment's OWN local origin (remote.git), not
|
|
80
|
+
// GitHub, so the message deliberately states only the observable fact and
|
|
81
|
+
// names no cause: a foreign deployment cannot reach this repo, and the
|
|
82
|
+
// realistic explanations are all internal (the worker's rebase loop
|
|
83
|
+
// reconciling the branch, or a commit reaching remote.git that this
|
|
84
|
+
// workspace never had). It also never advises renaming the branch --
|
|
85
|
+
// a branch that reaches this point has usually been submitted before, so
|
|
86
|
+
// it may well have an open PR that a rename would orphan.
|
|
87
|
+
if (isNonFastForwardRejection(message)) {
|
|
88
|
+
return {
|
|
89
|
+
ok: false,
|
|
90
|
+
status: 409,
|
|
91
|
+
error: `Could not submit "${branchContext.branch.name}": it has diverged from the copy in ` +
|
|
92
|
+
`this deployment's repository and needs to be reconciled before it can be submitted. ` +
|
|
93
|
+
`The background worker reconciles branches when the base branch moves, so this often ` +
|
|
94
|
+
`clears on its own within a few minutes -- try again shortly, and ask an administrator ` +
|
|
95
|
+
`to check the worker if it persists.`,
|
|
96
|
+
};
|
|
97
|
+
}
|
|
42
98
|
return {
|
|
43
99
|
ok: false,
|
|
44
100
|
status: 500,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-status.js","sourceRoot":"","sources":["../../src/api/branch-status.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAIhD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAChF,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"branch-status.js","sourceRoot":"","sources":["../../src/api/branch-status.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-withdraw.d.ts","sourceRoot":"","sources":["../../src/api/branch-withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;
|
|
1
|
+
{"version":3,"file":"branch-withdraw.d.ts","sourceRoot":"","sources":["../../src/api/branch-withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAoF9C;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;8BAoBzB,CAAA"}
|
|
@@ -21,12 +21,23 @@ const withdrawBranchHandler = async (gc, ctx, req, _params) => {
|
|
|
21
21
|
error: 'Only the branch creator or users with explicit branch access can withdraw this branch',
|
|
22
22
|
};
|
|
23
23
|
}
|
|
24
|
-
// Verify branch is in
|
|
25
|
-
|
|
24
|
+
// Verify branch is in a withdrawable status.
|
|
25
|
+
//
|
|
26
|
+
// 'approved' is accepted alongside 'submitted' because withdraw is its only
|
|
27
|
+
// non-destructive exit. Every non-'editing' status blocks content writes, and
|
|
28
|
+
// request-changes requires 'submitted' -- so before this, an approved branch
|
|
29
|
+
// could only be escaped by a raw workflow.submit call, which silently
|
|
30
|
+
// discarded the approval and is now refused by the submit status gate
|
|
31
|
+
// (api/branch-status.ts). Without this, closing that hole would seal the dead
|
|
32
|
+
// end completely, leaving deletion as the only way out.
|
|
33
|
+
//
|
|
34
|
+
// 'archived' stays refused: the PR is merged and there is nothing to return to.
|
|
35
|
+
const status = branchContext.branch.status;
|
|
36
|
+
if (status !== 'submitted' && status !== 'approved') {
|
|
26
37
|
return {
|
|
27
38
|
ok: false,
|
|
28
39
|
status: 400,
|
|
29
|
-
error: `Cannot withdraw branch with status '${
|
|
40
|
+
error: `Cannot withdraw branch with status '${status}'. Only 'submitted' or 'approved' branches can be withdrawn.`,
|
|
30
41
|
};
|
|
31
42
|
}
|
|
32
43
|
// Convert PR to draft (sync via githubService, or async via task queue) --
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch-withdraw.js","sourceRoot":"","sources":["../../src/api/branch-withdraw.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAIhD,OAAO,EAAE,4BAA4B,EAAE,MAAM,oBAAoB,CAAA;AACjE,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAA;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAA;AAElD,MAAM,qBAAqB,GAAG,KAAK,EACjC,EAAoC,EACpC,GAAe,EACf,GAAe,EACf,OAA0C,EACjB,EAAE;IAC3B,MAAM,EAAE,aAAa,EAAE,GAAG,EAAE,CAAA;IAE5B,6EAA6E;IAC7E,4EAA4E;IAC5E,6EAA6E;IAC7E,yEAAyE;IACzE,MAAM,aAAa,GAAG,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,mBAAmB,IAAI,MAAM,CAAA;IACvE,MAAM,EAAE,WAAW,EAAE,GAAG,mBAAmB,CACzC,GAAG,CAAC,QAAQ,CAAC,MAAM,EACnB,aAAa,CAAC,MAAM,CAAC,IAAI,EACzB,aAAa,CAAC,MAAM,CAAC,UAAU,CAChC,CAAA;IACD,MAAM,WAAW,GAAG,wBAAwB,CAAC,aAAa,EAAE,GAAG,CAAC,IAAI,EAAE,aAAa,EAAE;QACnF,iBAAiB,EAAE,WAAW;KAC/B,CAAC,CAAA;IACF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO;YACL,EAAE,EAAE,KAAK;YACT,MAAM,EAAE,GAAG;YACX,KAAK,EACH,uFAAuF;SAC1F,CAAA;IACH,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"branch-withdraw.js","sourceRoot":"","sources":["../../src/api/branch-withdraw.ts"],"names":[],"mappings":"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"}
|
package/dist/api/branch.d.ts
CHANGED
|
@@ -9,12 +9,41 @@ export type BranchResponse = ApiResponse<{
|
|
|
9
9
|
/**
|
|
10
10
|
* A listed branch plus server-computed protected-base-branch flags (see
|
|
11
11
|
* authorization/protected-branch.ts). Optional on the wire, matching the
|
|
12
|
-
* `defaultBranch` precedent
|
|
13
|
-
* server
|
|
12
|
+
* `defaultBranch` precedent -- this server always emits all three, but an
|
|
13
|
+
* older server won't. That optionality does not make the two directions
|
|
14
|
+
* symmetric: the editor client now defaults every missing flag fail-closed
|
|
15
|
+
* (`?? true`), so a NEW client talking to an OLD server that omits these
|
|
16
|
+
* fields degrades to fully locked -- read-only, Submit hidden, and (see
|
|
17
|
+
* EditorHeader's `branchDataUnavailable`) a "could not be loaded" banner --
|
|
18
|
+
* rather than silently behaving as if nothing changed. That is by design:
|
|
19
|
+
* wire compatibility here means "doesn't break", not "behaves the same".
|
|
14
20
|
*/
|
|
15
21
|
export interface BranchListItem extends BranchMetadata {
|
|
16
22
|
isProtected?: boolean;
|
|
17
23
|
readOnly?: boolean;
|
|
24
|
+
/**
|
|
25
|
+
* True when content writes are rejected -- base-branch read-only OR a status
|
|
26
|
+
* lock (submitted/approved/archived). The editor renders its locked state off
|
|
27
|
+
* this instead of re-deriving the status rule client-side; `readOnly` still
|
|
28
|
+
* distinguishes WHICH lock applies, for banner copy.
|
|
29
|
+
*/
|
|
30
|
+
writeBlocked?: boolean;
|
|
31
|
+
/**
|
|
32
|
+
* Populated from {@link BranchWriteProtection.submitBlockedIncludingStatus}
|
|
33
|
+
* -- READ THAT DOC COMMENT before touching this field. On the wire this
|
|
34
|
+
* name means the COMPOUND answer (base-branch OR non-'editing' status),
|
|
35
|
+
* mirroring how `writeBlocked` above is the compound of `readOnly` + status
|
|
36
|
+
* while `readOnly` alone is just the base-branch part: `isProtected` /
|
|
37
|
+
* `submitBlocked` here is the same two-part shape (protected-branch.ts's
|
|
38
|
+
* `submitBlockedIncludingStatus = protection.submitBlocked || status !==
|
|
39
|
+
* 'editing'`). Do NOT "simplify" this to `protection.submitBlocked` --
|
|
40
|
+
* that field means ONLY "is the base branch" (it is what
|
|
41
|
+
* `api/guards.ts`'s `submittableBranch` guard reads, and that guard must
|
|
42
|
+
* keep refusing the base branch regardless of status), so swapping it in
|
|
43
|
+
* here would silently stop blocking submit on a submitted/approved/
|
|
44
|
+
* archived non-base branch.
|
|
45
|
+
*/
|
|
46
|
+
submitBlocked?: boolean;
|
|
18
47
|
}
|
|
19
48
|
/** Response type for listing branches */
|
|
20
49
|
export type BranchListResponse = ApiResponse<{
|
package/dist/api/branch.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/api/branch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAAuB,aAAa,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAIlF,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;
|
|
1
|
+
{"version":3,"file":"branch.d.ts","sourceRoot":"","sources":["../../src/api/branch.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,OAAO,KAAK,EAAuB,aAAa,EAAE,cAAc,EAAE,MAAM,UAAU,CAAA;AAIlF,OAAO,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAA;AAalE,OAAO,EAAoB,iBAAiB,EAAE,MAAM,cAAc,CAAA;AAIlE,0EAA0E;AAC1E,MAAM,MAAM,cAAc,GAAG,WAAW,CAAC;IAAE,MAAM,EAAE,cAAc,CAAA;CAAE,CAAC,CAAA;AAEpE;;;;;;;;;;;GAWG;AACH,MAAM,WAAW,cAAe,SAAQ,cAAc;IACpD,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;;;;OAKG;IACH,YAAY,CAAC,EAAE,OAAO,CAAA;IACtB;;;;;;;;;;;;;;OAcG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;CACxB;AAED,yCAAyC;AACzC,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAC;IAC3C,QAAQ,EAAE,cAAc,EAAE,CAAA;IAC1B;;;;OAIG;IACH,aAAa,CAAC,EAAE,MAAM,CAAA;CACvB,CAAC,CAAA;AAEF,wCAAwC;AACxC,MAAM,MAAM,oBAAoB,GAAG,WAAW,CAAC;IAC7C,OAAO,EAAE,OAAO,CAAA;IAChB;;;;OAIG;IACH,cAAc,CAAC,EAAE,MAAM,CAAA;CACxB,CAAC,CAAA;AAMF,QAAA,MAAM,sBAAsB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAU1B,CAAA;AAEF,QAAA,MAAM,4BAA4B;;;;;;;;;EAGhC,CAAA;AASF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,WAAW,CAAA;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AAGzC;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,UAAU,EAChB,iBAAiB,cAAc,EAAE,KAChC;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAkCpC,CAAA;AAED,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAA;CAClC;AAiCD,eAAO,MAAM,mBAAmB,GAC9B,KAAK,UAAU,EACf,KAAK,UAAU,EACf,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,sBAAsB,CAAC,KAC3C,OAAO,CAAC,cAAc,CAkQxB,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,KAAK,UAAU,EACf,KAAK,UAAU,KACd,OAAO,CAAC,kBAAkB,CAgF5B,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,MAAM,UAAU,EAChB,eAAe,aAAa,KAC3B;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAYpC,CAAA;AAED,eAAO,MAAM,mBAAmB,GAC9B,KAAK,UAAU,EACf,KAAK,UAAU,EACf,QAAQ,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,KACxC,OAAO,CAAC,oBAAoB,CA0K9B,CAAA;AAED,MAAM,WAAW,sBAAsB;IACrC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAA;IACvB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAA;CACzB;AAED;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAChC,MAAM,UAAU,EAChB,eAAe,aAAa,KAC3B;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAYpC,CAAA;AAED,eAAO,MAAM,yBAAyB,GACpC,KAAK,UAAU,EACf,KAAK,UAAU,EACf,QAAQ,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,EACzC,MAAM,CAAC,CAAC,KAAK,CAAC,OAAO,4BAA4B,CAAC,KACjD,OAAO,CAAC,cAAc,CA8DxB,CAAA;AAiGD;;GAEG;AACH,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAKhB,CAAA"}
|