@endora-commerce/mod-cms 0.109.0 → 0.111.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/README.md +1 -0
- package/dist/admin/components/AdminCatalogPreviewProvider.d.ts +9 -0
- package/dist/admin/components/AdminCatalogPreviewProvider.js +37 -3
- package/dist/admin/components/FormBlockFields.d.ts +15 -0
- package/dist/admin/components/FormBlockFields.js +23 -0
- package/dist/admin/components/PageBuilderEditor.js +11 -2
- package/dist/admin/components/admin-catalog-preview-map.d.ts +5 -5
- package/dist/admin/components/admin-catalog-preview-map.js +5 -5
- package/dist/admin/components/block-contributions.d.ts +15 -0
- package/dist/admin/components/block-contributions.js +22 -0
- package/dist/admin/index.js +7 -0
- package/dist/admin/pages/BrandPage.js +9 -3
- package/dist/admin/zones/ProductContentEditor.d.ts +27 -0
- package/dist/admin/zones/ProductContentEditor.js +28 -0
- package/dist/backend/index.d.ts +3 -0
- package/dist/backend/index.js +31 -3
- package/dist/backend/plugin.d.ts +8 -0
- package/dist/backend/plugin.js +4 -0
- package/dist/backend/routes.admin.js +3 -4
- package/dist/backend/routes.storefront.js +15 -4
- package/dist/backend/services/asset-embed-resolver.d.ts +18 -10
- package/dist/backend/services/asset-embed-resolver.js +35 -30
- package/dist/backend/services/cms-block-read-port.js +3 -0
- package/dist/backend/services/cms-block-service.js +4 -1
- package/dist/backend/services/cms-cache.d.ts +4 -4
- package/dist/backend/services/cms-cache.js +1 -1
- package/dist/backend/services/cms-content-invalidator.d.ts +9 -1
- package/dist/backend/services/cms-content-invalidator.js +21 -1
- package/dist/backend/services/cms-hook-service.js +6 -1
- package/dist/backend/services/cms-page-read-port.d.ts +6 -0
- package/dist/backend/services/cms-page-read-port.js +22 -0
- package/dist/backend/services/cms-page-service.d.ts +7 -0
- package/dist/backend/services/cms-page-service.js +31 -6
- package/dist/backend/services/cms-template-service.js +4 -1
- package/dist/backend/services/reserved-segment-registry.d.ts +16 -0
- package/dist/backend/services/reserved-segment-registry.js +31 -0
- package/dist/backend/services/storefront-resolver.d.ts +7 -3
- package/dist/backend/services/storefront-resolver.js +8 -12
- package/dist/manifest.d.ts +13 -1
- package/dist/test-support/index.d.ts +20 -0
- package/dist/test-support/index.js +20 -0
- package/docs/cms/brand.md +1 -1
- package/docs/cms/index.md +29 -16
- package/i18n/en.json +30 -24
- package/i18n/pl.json +8 -2
- package/package.json +24 -18
- package/dist/admin/api/cms-client.d.ts.map +0 -1
- package/dist/admin/api/cms-client.js.map +0 -1
- package/dist/admin/components/AdminCatalogPreviewProvider.d.ts.map +0 -1
- package/dist/admin/components/AdminCatalogPreviewProvider.js.map +0 -1
- package/dist/admin/components/AdminCmsAssetProvider.d.ts.map +0 -1
- package/dist/admin/components/AdminCmsAssetProvider.js.map +0 -1
- package/dist/admin/components/BackgroundFields.d.ts.map +0 -1
- package/dist/admin/components/BackgroundFields.js.map +0 -1
- package/dist/admin/components/BrandFontFields.d.ts.map +0 -1
- package/dist/admin/components/BrandFontFields.js.map +0 -1
- package/dist/admin/components/BrandPreview.d.ts.map +0 -1
- package/dist/admin/components/BrandPreview.js.map +0 -1
- package/dist/admin/components/CarouselAddSlideMenu.d.ts.map +0 -1
- package/dist/admin/components/CarouselAddSlideMenu.js.map +0 -1
- package/dist/admin/components/CarouselFields.d.ts.map +0 -1
- package/dist/admin/components/CarouselFields.js.map +0 -1
- package/dist/admin/components/CarouselPreviewNav.d.ts.map +0 -1
- package/dist/admin/components/CarouselPreviewNav.js.map +0 -1
- package/dist/admin/components/ComponentDragHandle.d.ts.map +0 -1
- package/dist/admin/components/ComponentDragHandle.js.map +0 -1
- package/dist/admin/components/ContentSliderActionBarExtras.d.ts.map +0 -1
- package/dist/admin/components/ContentSliderActionBarExtras.js.map +0 -1
- package/dist/admin/components/HeroFields.d.ts.map +0 -1
- package/dist/admin/components/HeroFields.js.map +0 -1
- package/dist/admin/components/HookBlockAttachmentsPanel.d.ts.map +0 -1
- package/dist/admin/components/HookBlockAttachmentsPanel.js.map +0 -1
- package/dist/admin/components/ListingFields.d.ts.map +0 -1
- package/dist/admin/components/ListingFields.js.map +0 -1
- package/dist/admin/components/NewsletterSignupFields.d.ts.map +0 -1
- package/dist/admin/components/NewsletterSignupFields.js.map +0 -1
- package/dist/admin/components/PageBuilderActionBar.d.ts.map +0 -1
- package/dist/admin/components/PageBuilderActionBar.js.map +0 -1
- package/dist/admin/components/PageBuilderDrawer.d.ts.map +0 -1
- package/dist/admin/components/PageBuilderDrawer.js.map +0 -1
- package/dist/admin/components/PageBuilderEditor.d.ts.map +0 -1
- package/dist/admin/components/PageBuilderEditor.js.map +0 -1
- package/dist/admin/components/PageBuilderTranslateAction.d.ts.map +0 -1
- package/dist/admin/components/PageBuilderTranslateAction.js.map +0 -1
- package/dist/admin/components/PageNavigationFields.d.ts.map +0 -1
- package/dist/admin/components/PageNavigationFields.js.map +0 -1
- package/dist/admin/components/PreviewBrandTokens.d.ts.map +0 -1
- package/dist/admin/components/PreviewBrandTokens.js.map +0 -1
- package/dist/admin/components/PuckActionGuard.d.ts.map +0 -1
- package/dist/admin/components/PuckActionGuard.js.map +0 -1
- package/dist/admin/components/RowLayoutPicker.d.ts.map +0 -1
- package/dist/admin/components/RowLayoutPicker.js.map +0 -1
- package/dist/admin/components/SectionBlockFields.d.ts.map +0 -1
- package/dist/admin/components/SectionBlockFields.js.map +0 -1
- package/dist/admin/components/SectionPresetsPanel.d.ts.map +0 -1
- package/dist/admin/components/SectionPresetsPanel.js.map +0 -1
- package/dist/admin/components/SliderPreviewActionBarExtras.d.ts.map +0 -1
- package/dist/admin/components/SliderPreviewActionBarExtras.js.map +0 -1
- package/dist/admin/components/TranslationNotice.d.ts.map +0 -1
- package/dist/admin/components/TranslationNotice.js.map +0 -1
- package/dist/admin/components/admin-catalog-preview-map.d.ts.map +0 -1
- package/dist/admin/components/admin-catalog-preview-map.js.map +0 -1
- package/dist/admin/components/block-contributions.d.ts.map +0 -1
- package/dist/admin/components/block-contributions.js.map +0 -1
- package/dist/admin/components/build-viewports.d.ts.map +0 -1
- package/dist/admin/components/build-viewports.js.map +0 -1
- package/dist/admin/components/cms-template-layout.d.ts.map +0 -1
- package/dist/admin/components/cms-template-layout.js.map +0 -1
- package/dist/admin/components/page-builder-i18n.d.ts.map +0 -1
- package/dist/admin/components/page-builder-i18n.js.map +0 -1
- package/dist/admin/components/puck-safe.d.ts.map +0 -1
- package/dist/admin/components/puck-safe.js.map +0 -1
- package/dist/admin/components/scope-utils.d.ts.map +0 -1
- package/dist/admin/components/scope-utils.js.map +0 -1
- package/dist/admin/editors/BlockEditor.d.ts.map +0 -1
- package/dist/admin/editors/BlockEditor.js.map +0 -1
- package/dist/admin/editors/PageEditor.d.ts.map +0 -1
- package/dist/admin/editors/PageEditor.js.map +0 -1
- package/dist/admin/editors/TemplateEditor.d.ts.map +0 -1
- package/dist/admin/editors/TemplateEditor.js.map +0 -1
- package/dist/admin/index.d.ts.map +0 -1
- package/dist/admin/index.js.map +0 -1
- package/dist/admin/pages/BlocksListPage.d.ts.map +0 -1
- package/dist/admin/pages/BlocksListPage.js.map +0 -1
- package/dist/admin/pages/BrandPage.d.ts.map +0 -1
- package/dist/admin/pages/BrandPage.js.map +0 -1
- package/dist/admin/pages/HooksPage.d.ts.map +0 -1
- package/dist/admin/pages/HooksPage.js.map +0 -1
- package/dist/admin/pages/PagesListPage.d.ts.map +0 -1
- package/dist/admin/pages/PagesListPage.js.map +0 -1
- package/dist/admin/pages/TemplatesListPage.d.ts.map +0 -1
- package/dist/admin/pages/TemplatesListPage.js.map +0 -1
- package/dist/admin/zones/CategoryContentEditor.d.ts.map +0 -1
- package/dist/admin/zones/CategoryContentEditor.js.map +0 -1
- package/dist/admin-ui/index.d.ts.map +0 -1
- package/dist/admin-ui/index.js.map +0 -1
- package/dist/backend/cli/block-names.d.ts.map +0 -1
- package/dist/backend/cli/block-names.js.map +0 -1
- package/dist/backend/commands/translate-page-builder-content.command.d.ts.map +0 -1
- package/dist/backend/commands/translate-page-builder-content.command.js.map +0 -1
- package/dist/backend/entities/cms-block.entity.d.ts.map +0 -1
- package/dist/backend/entities/cms-block.entity.js.map +0 -1
- package/dist/backend/entities/cms-brand-tokens.entity.d.ts.map +0 -1
- package/dist/backend/entities/cms-brand-tokens.entity.js.map +0 -1
- package/dist/backend/entities/cms-hook-block-attachment.entity.d.ts.map +0 -1
- package/dist/backend/entities/cms-hook-block-attachment.entity.js.map +0 -1
- package/dist/backend/entities/cms-hook.entity.d.ts.map +0 -1
- package/dist/backend/entities/cms-hook.entity.js.map +0 -1
- package/dist/backend/entities/cms-page.entity.d.ts.map +0 -1
- package/dist/backend/entities/cms-page.entity.js.map +0 -1
- package/dist/backend/entities/cms-template.entity.d.ts.map +0 -1
- package/dist/backend/entities/cms-template.entity.js.map +0 -1
- package/dist/backend/index.d.ts.map +0 -1
- package/dist/backend/index.js.map +0 -1
- package/dist/backend/plugin.d.ts.map +0 -1
- package/dist/backend/plugin.js.map +0 -1
- package/dist/backend/routes.admin.d.ts.map +0 -1
- package/dist/backend/routes.admin.js.map +0 -1
- package/dist/backend/routes.storefront.d.ts.map +0 -1
- package/dist/backend/routes.storefront.js.map +0 -1
- package/dist/backend/services/anchor-guard.d.ts.map +0 -1
- package/dist/backend/services/anchor-guard.js.map +0 -1
- package/dist/backend/services/asset-embed-resolver.d.ts.map +0 -1
- package/dist/backend/services/asset-embed-resolver.js.map +0 -1
- package/dist/backend/services/asset-references.d.ts.map +0 -1
- package/dist/backend/services/asset-references.js.map +0 -1
- package/dist/backend/services/brand-tokens-service.d.ts.map +0 -1
- package/dist/backend/services/brand-tokens-service.js.map +0 -1
- package/dist/backend/services/channel-language-prefixes.d.ts.map +0 -1
- package/dist/backend/services/channel-language-prefixes.js.map +0 -1
- package/dist/backend/services/cms-block-read-port.d.ts.map +0 -1
- package/dist/backend/services/cms-block-read-port.js.map +0 -1
- package/dist/backend/services/cms-block-seed-port.d.ts.map +0 -1
- package/dist/backend/services/cms-block-seed-port.js.map +0 -1
- package/dist/backend/services/cms-block-service.d.ts.map +0 -1
- package/dist/backend/services/cms-block-service.js.map +0 -1
- package/dist/backend/services/cms-cache.d.ts.map +0 -1
- package/dist/backend/services/cms-cache.js.map +0 -1
- package/dist/backend/services/cms-content-invalidator.d.ts.map +0 -1
- package/dist/backend/services/cms-content-invalidator.js.map +0 -1
- package/dist/backend/services/cms-hook-service.d.ts.map +0 -1
- package/dist/backend/services/cms-hook-service.js.map +0 -1
- package/dist/backend/services/cms-language-reference.d.ts.map +0 -1
- package/dist/backend/services/cms-language-reference.js.map +0 -1
- package/dist/backend/services/cms-page-read-port.d.ts.map +0 -1
- package/dist/backend/services/cms-page-read-port.js.map +0 -1
- package/dist/backend/services/cms-page-service.d.ts.map +0 -1
- package/dist/backend/services/cms-page-service.js.map +0 -1
- package/dist/backend/services/cms-reference-registry.d.ts.map +0 -1
- package/dist/backend/services/cms-reference-registry.js.map +0 -1
- package/dist/backend/services/cms-template-service.d.ts.map +0 -1
- package/dist/backend/services/cms-template-service.js.map +0 -1
- package/dist/backend/services/contact-form/contact-form-mail.d.ts.map +0 -1
- package/dist/backend/services/contact-form/contact-form-mail.js.map +0 -1
- package/dist/backend/services/contact-form/contact-form.service.d.ts.map +0 -1
- package/dist/backend/services/contact-form/contact-form.service.js.map +0 -1
- package/dist/backend/services/contact-form/recipients-validator.d.ts.map +0 -1
- package/dist/backend/services/contact-form/recipients-validator.js.map +0 -1
- package/dist/backend/services/content-tree-walker.d.ts.map +0 -1
- package/dist/backend/services/content-tree-walker.js.map +0 -1
- package/dist/backend/services/page-builder-registry.d.ts.map +0 -1
- package/dist/backend/services/page-builder-registry.js.map +0 -1
- package/dist/backend/services/page-paths.d.ts.map +0 -1
- package/dist/backend/services/page-paths.js.map +0 -1
- package/dist/backend/services/seed-hooks.d.ts.map +0 -1
- package/dist/backend/services/seed-hooks.js.map +0 -1
- package/dist/backend/services/storefront-resolver.d.ts.map +0 -1
- package/dist/backend/services/storefront-resolver.js.map +0 -1
- package/dist/backend/services/translation/capability.d.ts.map +0 -1
- package/dist/backend/services/translation/capability.js.map +0 -1
- package/dist/backend/services/translation/chunk.d.ts.map +0 -1
- package/dist/backend/services/translation/chunk.js.map +0 -1
- package/dist/backend/services/translation/extract.d.ts.map +0 -1
- package/dist/backend/services/translation/extract.js.map +0 -1
- package/dist/backend/services/translation/html-codec.d.ts.map +0 -1
- package/dist/backend/services/translation/html-codec.js.map +0 -1
- package/dist/backend/services/translation/inject.d.ts.map +0 -1
- package/dist/backend/services/translation/inject.js.map +0 -1
- package/dist/backend/services/translation/limits.d.ts.map +0 -1
- package/dist/backend/services/translation/limits.js.map +0 -1
- package/dist/backend/services/translation/max-source-characters-validator.d.ts.map +0 -1
- package/dist/backend/services/translation/max-source-characters-validator.js.map +0 -1
- package/dist/backend/services/translation/page-builder-translation.service.d.ts.map +0 -1
- package/dist/backend/services/translation/page-builder-translation.service.js.map +0 -1
- package/dist/backend/services/translation/placeholders.d.ts.map +0 -1
- package/dist/backend/services/translation/placeholders.js.map +0 -1
- package/dist/backend/services/translation/prompt.d.ts.map +0 -1
- package/dist/backend/services/translation/prompt.js.map +0 -1
- package/dist/backend/services/translation/provider-error-map.d.ts.map +0 -1
- package/dist/backend/services/translation/provider-error-map.js.map +0 -1
- package/dist/backend/services/translation/tiptap-inline-codec.d.ts.map +0 -1
- package/dist/backend/services/translation/tiptap-inline-codec.js.map +0 -1
- package/dist/backend/services/translation/translation.service.d.ts.map +0 -1
- package/dist/backend/services/translation/translation.service.js.map +0 -1
- package/dist/manifest.d.ts.map +0 -1
- package/dist/manifest.js.map +0 -1
- package/dist/migrations/20260425T162418_cms_pages_init.d.ts.map +0 -1
- package/dist/migrations/20260425T162418_cms_pages_init.js.map +0 -1
- package/dist/migrations/20260505T130214_cms_init.d.ts.map +0 -1
- package/dist/migrations/20260505T130214_cms_init.js.map +0 -1
- package/dist/migrations/20260903T101741_cms_namespace_block_names.d.ts.map +0 -1
- package/dist/migrations/20260903T101741_cms_namespace_block_names.js.map +0 -1
- package/dist/migrations/20260912T094733_cms_sales_channel_cms_pages.d.ts.map +0 -1
- package/dist/migrations/20260912T094733_cms_sales_channel_cms_pages.js.map +0 -1
- package/dist/migrations/20260912T125709_cms_page_body_asset_ref_index.d.ts.map +0 -1
- package/dist/migrations/20260912T125709_cms_page_body_asset_ref_index.js.map +0 -1
- package/dist/migrations/20261022T163218_cms_brand_tokens.d.ts.map +0 -1
- package/dist/migrations/20261022T163218_cms_brand_tokens.js.map +0 -1
- package/dist/migrations/20261023T052237_cms_page_tree_and_share.d.ts.map +0 -1
- package/dist/migrations/20261023T052237_cms_page_tree_and_share.js.map +0 -1
- package/dist/migrations/20261027T165458_cms_page_parent_path_in_url.d.ts.map +0 -1
- package/dist/migrations/20261027T165458_cms_page_parent_path_in_url.js.map +0 -1
- package/dist/migrations/20261028T090524_cms_page_breadcrumbs_overlay.d.ts.map +0 -1
- package/dist/migrations/20261028T090524_cms_page_breadcrumbs_overlay.js.map +0 -1
- package/dist/migrations/20261029T131218_cms_page_translations.d.ts.map +0 -1
- package/dist/migrations/20261029T131218_cms_page_translations.js.map +0 -1
- package/dist/migrations/index.d.ts.map +0 -1
- package/dist/migrations/index.js.map +0 -1
|
@@ -1,17 +1,25 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AssetReadPort } from '@endora-commerce/contracts';
|
|
2
2
|
import type { CmsAssetResolver } from './storefront-resolver.js';
|
|
3
3
|
/**
|
|
4
|
-
* How
|
|
4
|
+
* How the asset ids a page, block or template embeds become the details the
|
|
5
5
|
* storefront response carries (`specs/110-instance-repository/` T118c).
|
|
6
6
|
*
|
|
7
|
-
* A function of the port rather than of a `ModuleContext`, so the mapping
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
* `lazyPort<
|
|
11
|
-
*
|
|
7
|
+
* A function of the port rather than of a `ModuleContext`, so the mapping is
|
|
8
|
+
* testable over a stubbed `AssetReadPort` with no container composed.
|
|
9
|
+
* `backend/index.ts` supplies the real one as
|
|
10
|
+
* `lazyPort<AssetReadPort>(ctx, 'assetReadPort')`, whose proxy resolves per call,
|
|
11
|
+
* so nothing here captures a registration.
|
|
12
12
|
*
|
|
13
|
-
*
|
|
14
|
-
* the
|
|
13
|
+
* **A batch, and the read port, not `AssetsLibraryPort.getAsset` per embed**
|
|
14
|
+
* (issue #685). `getAsset` builds the admin detail, whose "used by" list walks
|
|
15
|
+
* every page, block, template, post, product and menu; a home page with ~150
|
|
16
|
+
* images ran that walk ~150 times per cache miss and kept Postgres saturated for
|
|
17
|
+
* every other request. Here it is two keyed reads for the whole tree: the URLs
|
|
18
|
+
* the detail would carry (signed for a private asset, as before), then the four
|
|
19
|
+
* fields an embed renders for the ids that have one — so a stray string under an
|
|
20
|
+
* `assetId` key never reaches the row read. An asset that is gone is absent from
|
|
21
|
+
* the map and the page renders without it; there is no `catch`, so the owner
|
|
22
|
+
* being off still answers as itself.
|
|
15
23
|
*/
|
|
16
|
-
export declare function createAssetEmbedResolver(assets: Pick<
|
|
24
|
+
export declare function createAssetEmbedResolver(assets: Pick<AssetReadPort, 'resolveUrls' | 'findByIds'>): CmsAssetResolver;
|
|
17
25
|
//# sourceMappingURL=asset-embed-resolver.d.ts.map
|
|
@@ -1,40 +1,45 @@
|
|
|
1
|
-
import { rethrowIfModuleDisabled } from '@endora-commerce/platform/kernel';
|
|
2
1
|
/**
|
|
3
|
-
* How
|
|
2
|
+
* How the asset ids a page, block or template embeds become the details the
|
|
4
3
|
* storefront response carries (`specs/110-instance-repository/` T118c).
|
|
5
4
|
*
|
|
6
|
-
* A function of the port rather than of a `ModuleContext`, so the mapping
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
* `lazyPort<
|
|
10
|
-
*
|
|
5
|
+
* A function of the port rather than of a `ModuleContext`, so the mapping is
|
|
6
|
+
* testable over a stubbed `AssetReadPort` with no container composed.
|
|
7
|
+
* `backend/index.ts` supplies the real one as
|
|
8
|
+
* `lazyPort<AssetReadPort>(ctx, 'assetReadPort')`, whose proxy resolves per call,
|
|
9
|
+
* so nothing here captures a registration.
|
|
11
10
|
*
|
|
12
|
-
*
|
|
13
|
-
* the
|
|
11
|
+
* **A batch, and the read port, not `AssetsLibraryPort.getAsset` per embed**
|
|
12
|
+
* (issue #685). `getAsset` builds the admin detail, whose "used by" list walks
|
|
13
|
+
* every page, block, template, post, product and menu; a home page with ~150
|
|
14
|
+
* images ran that walk ~150 times per cache miss and kept Postgres saturated for
|
|
15
|
+
* every other request. Here it is two keyed reads for the whole tree: the URLs
|
|
16
|
+
* the detail would carry (signed for a private asset, as before), then the four
|
|
17
|
+
* fields an embed renders for the ids that have one — so a stray string under an
|
|
18
|
+
* `assetId` key never reaches the row read. An asset that is gone is absent from
|
|
19
|
+
* the map and the page renders without it; there is no `catch`, so the owner
|
|
20
|
+
* being off still answers as itself.
|
|
14
21
|
*/
|
|
15
22
|
export function createAssetEmbedResolver(assets) {
|
|
16
|
-
return async (
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
return
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
// this fail-closed on the day that changes.
|
|
35
|
-
rethrowIfModuleDisabled(err);
|
|
36
|
-
return null;
|
|
23
|
+
return async (assetIds) => {
|
|
24
|
+
const out = new Map();
|
|
25
|
+
if (assetIds.length === 0)
|
|
26
|
+
return out;
|
|
27
|
+
const urls = await assets.resolveUrls(assetIds);
|
|
28
|
+
if (urls.size === 0)
|
|
29
|
+
return out;
|
|
30
|
+
for (const record of await assets.findByIds([...urls.keys()], { liveOnly: true })) {
|
|
31
|
+
const url = urls.get(record.id);
|
|
32
|
+
if (!url)
|
|
33
|
+
continue;
|
|
34
|
+
out.set(record.id, {
|
|
35
|
+
url,
|
|
36
|
+
mimeType: record.mimeType,
|
|
37
|
+
filename: record.filename,
|
|
38
|
+
label: record.label,
|
|
39
|
+
visibility: record.visibility,
|
|
40
|
+
});
|
|
37
41
|
}
|
|
42
|
+
return out;
|
|
38
43
|
};
|
|
39
44
|
}
|
|
40
45
|
//# sourceMappingURL=asset-embed-resolver.js.map
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { CmsBlock } from '../entities/cms-block.entity.js';
|
|
2
|
+
import { isUuidShape } from '@endora-commerce/contracts';
|
|
2
3
|
/**
|
|
3
4
|
* The block read model `cms` publishes (`specs/110-instance-repository/` T118c).
|
|
4
5
|
*
|
|
@@ -33,6 +34,8 @@ export class CmsBlockReadService {
|
|
|
33
34
|
* deactivated block is content an operator has withdrawn, and loading its
|
|
34
35
|
* tree to throw it away is a read nobody asked for.
|
|
35
36
|
*/
|
|
37
|
+
if (!isUuidShape(id))
|
|
38
|
+
return null;
|
|
36
39
|
const block = await this.emFactory().findOne(CmsBlock, { id, active: true });
|
|
37
40
|
if (!block)
|
|
38
41
|
return null;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'crypto';
|
|
2
|
-
import { ERROR_CODES, } from '@endora-commerce/contracts';
|
|
2
|
+
import { ERROR_CODES, isUuidShape, } from '@endora-commerce/contracts';
|
|
3
3
|
import { HttpError } from '@endora-commerce/platform/http';
|
|
4
4
|
import { walkUnknownComponents } from './content-tree-walker.js';
|
|
5
5
|
import { assertAnchors } from './anchor-guard.js';
|
|
@@ -242,6 +242,9 @@ export class CmsBlockService {
|
|
|
242
242
|
await this.invalidateForBlockCodes([row.code]);
|
|
243
243
|
}
|
|
244
244
|
async findRow(id, em = this.emFactory()) {
|
|
245
|
+
// A malformed id names no row; PostgreSQL would answer it with a 500 (issue #781).
|
|
246
|
+
if (!isUuidShape(id))
|
|
247
|
+
return null;
|
|
245
248
|
const rows = (await em.execute('select * from cms_blocks where id = ?', [
|
|
246
249
|
id,
|
|
247
250
|
]));
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Redis } from 'ioredis';
|
|
2
|
-
import type {
|
|
2
|
+
import type { CmsResolvedBlockByCode, CmsResolvedHook, CmsResolvedPage } from '@endora-commerce/contracts';
|
|
3
3
|
/**
|
|
4
4
|
* Storefront read-through cache for the CMS module — feature 014 / T094 (R10).
|
|
5
5
|
*
|
|
@@ -7,7 +7,7 @@ import type { CmsResolvedBlock, CmsResolvedHook, CmsResolvedPage } from '@endora
|
|
|
7
7
|
* families:
|
|
8
8
|
*
|
|
9
9
|
* - `cms:v1:page:<slug>:<channel>:<language>` → CmsResolvedPage
|
|
10
|
-
* - `cms:v1:block:<code>:<channel>:<language>` →
|
|
10
|
+
* - `cms:v1:block:<code>:<channel>:<language>` → CmsResolvedBlockByCode
|
|
11
11
|
* - `cms:v1:hook:<code>:<channel>:<language>` → CmsResolvedHook
|
|
12
12
|
*
|
|
13
13
|
* TTL is fixed at 5 minutes; invalidation runs on every Page / Block /
|
|
@@ -42,8 +42,8 @@ export declare class CmsCache {
|
|
|
42
42
|
static hookKey(code: string, channel: string, language: string): string;
|
|
43
43
|
getPage(slug: string, channel: string, language: string): Promise<CmsResolvedPage | null>;
|
|
44
44
|
setPage(slug: string, channel: string, language: string, value: CmsResolvedPage): Promise<void>;
|
|
45
|
-
getBlock(code: string, channel: string, language: string): Promise<
|
|
46
|
-
setBlock(code: string, channel: string, language: string, value:
|
|
45
|
+
getBlock(code: string, channel: string, language: string): Promise<CmsResolvedBlockByCode | null>;
|
|
46
|
+
setBlock(code: string, channel: string, language: string, value: CmsResolvedBlockByCode): Promise<void>;
|
|
47
47
|
getHook(code: string, channel: string, language: string): Promise<CmsResolvedHook | null>;
|
|
48
48
|
setHook(code: string, channel: string, language: string, value: CmsResolvedHook): Promise<void>;
|
|
49
49
|
/** Drop every page-keyed entry for a given slug across every channel/language. */
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* families:
|
|
6
6
|
*
|
|
7
7
|
* - `cms:v1:page:<slug>:<channel>:<language>` → CmsResolvedPage
|
|
8
|
-
* - `cms:v1:block:<code>:<channel>:<language>` →
|
|
8
|
+
* - `cms:v1:block:<code>:<channel>:<language>` → CmsResolvedBlockByCode
|
|
9
9
|
* - `cms:v1:hook:<code>:<channel>:<language>` → CmsResolvedHook
|
|
10
10
|
*
|
|
11
11
|
* TTL is fixed at 5 minutes; invalidation runs on every Page / Block /
|
|
@@ -49,6 +49,13 @@ export declare class CmsContentInvalidator {
|
|
|
49
49
|
blocksChanged(codes: Iterable<string>): Promise<void>;
|
|
50
50
|
/** A template changed — it reaches the storefront only inlined into a page. */
|
|
51
51
|
templateChanged(): Promise<void>;
|
|
52
|
+
/**
|
|
53
|
+
* An asset changed that a page, a block or a hook may embed (issue #363).
|
|
54
|
+
* Every resolved answer carries its assets' URLs, and nothing records which
|
|
55
|
+
* answer embeds which asset, so every entry goes — the broad drop a template
|
|
56
|
+
* takes, at the rate operators edit assets.
|
|
57
|
+
*/
|
|
58
|
+
assetsChanged(assetIds: Iterable<string>): Promise<void>;
|
|
52
59
|
/** A hook, or what is attached to it, changed. */
|
|
53
60
|
hooksChanged(codes: Iterable<string>): Promise<void>;
|
|
54
61
|
}
|
|
@@ -59,7 +66,8 @@ export declare class CmsContentInvalidator {
|
|
|
59
66
|
*
|
|
60
67
|
* A page names its own slugs and the page index, which lists it. A block names
|
|
61
68
|
* itself and the two broad tags of what may inline it. A template names every
|
|
62
|
-
* page and nothing else: no reader fetches a template by code.
|
|
69
|
+
* page and nothing else: no reader fetches a template by code. An asset names
|
|
70
|
+
* every page, block and hook read, because each may embed it.
|
|
63
71
|
*/
|
|
64
72
|
export declare function storefrontTagsFor(change: CmsContentChange): string[];
|
|
65
73
|
//# sourceMappingURL=cms-content-invalidator.d.ts.map
|
|
@@ -41,6 +41,19 @@ export class CmsContentInvalidator {
|
|
|
41
41
|
await this.cache?.invalidateAll();
|
|
42
42
|
await this.publish({ kind: 'template' });
|
|
43
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* An asset changed that a page, a block or a hook may embed (issue #363).
|
|
46
|
+
* Every resolved answer carries its assets' URLs, and nothing records which
|
|
47
|
+
* answer embeds which asset, so every entry goes — the broad drop a template
|
|
48
|
+
* takes, at the rate operators edit assets.
|
|
49
|
+
*/
|
|
50
|
+
async assetsChanged(assetIds) {
|
|
51
|
+
const named = nonEmpty(assetIds);
|
|
52
|
+
if (named.length === 0)
|
|
53
|
+
return;
|
|
54
|
+
await this.cache?.invalidateAll();
|
|
55
|
+
await this.publish({ kind: 'assets', assetIds: named });
|
|
56
|
+
}
|
|
44
57
|
/** A hook, or what is attached to it, changed. */
|
|
45
58
|
async hooksChanged(codes) {
|
|
46
59
|
const named = nonEmpty(codes);
|
|
@@ -60,7 +73,8 @@ function nonEmpty(values) {
|
|
|
60
73
|
*
|
|
61
74
|
* A page names its own slugs and the page index, which lists it. A block names
|
|
62
75
|
* itself and the two broad tags of what may inline it. A template names every
|
|
63
|
-
* page and nothing else: no reader fetches a template by code.
|
|
76
|
+
* page and nothing else: no reader fetches a template by code. An asset names
|
|
77
|
+
* every page, block and hook read, because each may embed it.
|
|
64
78
|
*/
|
|
65
79
|
export function storefrontTagsFor(change) {
|
|
66
80
|
switch (change.kind) {
|
|
@@ -80,6 +94,12 @@ export function storefrontTagsFor(change) {
|
|
|
80
94
|
return [CMS_STOREFRONT_CACHE_TAGS.pages];
|
|
81
95
|
case 'hook':
|
|
82
96
|
return change.codes.map((code) => CMS_STOREFRONT_CACHE_TAGS.hook(code));
|
|
97
|
+
case 'assets':
|
|
98
|
+
return [
|
|
99
|
+
CMS_STOREFRONT_CACHE_TAGS.pages,
|
|
100
|
+
CMS_STOREFRONT_CACHE_TAGS.blocks,
|
|
101
|
+
CMS_STOREFRONT_CACHE_TAGS.hooks,
|
|
102
|
+
];
|
|
83
103
|
}
|
|
84
104
|
}
|
|
85
105
|
//# sourceMappingURL=cms-content-invalidator.js.map
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'crypto';
|
|
2
|
-
import { ERROR_CODES, } from '@endora-commerce/contracts';
|
|
2
|
+
import { ERROR_CODES, isUuidShape, } from '@endora-commerce/contracts';
|
|
3
3
|
import { HttpError } from '@endora-commerce/platform/http';
|
|
4
4
|
/**
|
|
5
5
|
* The audit `objectType` of every Hook write, attachments included. An
|
|
@@ -57,6 +57,8 @@ export class CmsHookService {
|
|
|
57
57
|
}
|
|
58
58
|
/** Where a block sits on a hook, or `null` when it is not attached. */
|
|
59
59
|
async attachmentPosition(em, hookId, blockId) {
|
|
60
|
+
if (!isUuidShape(hookId) || !isUuidShape(blockId))
|
|
61
|
+
return null;
|
|
60
62
|
const rows = (await em.execute('select position from cms_hook_block_attachments where hook_id = ? and block_id = ? limit 1', [hookId, blockId]));
|
|
61
63
|
return rows[0]?.position ?? null;
|
|
62
64
|
}
|
|
@@ -247,6 +249,9 @@ export class CmsHookService {
|
|
|
247
249
|
await this.invalidateForHookId(hookId);
|
|
248
250
|
}
|
|
249
251
|
async findRow(id, em = this.emFactory()) {
|
|
252
|
+
// A malformed id names no row; PostgreSQL would answer it with a 500 (issue #781).
|
|
253
|
+
if (!isUuidShape(id))
|
|
254
|
+
return null;
|
|
250
255
|
const rows = (await em.execute(`select h.*,
|
|
251
256
|
(select count(*) from cms_hook_block_attachments a where a.hook_id = h.id) as attachment_count
|
|
252
257
|
from cms_hooks h
|
|
@@ -23,6 +23,12 @@ export declare class CmsPageReadService implements CmsPageReadPort {
|
|
|
23
23
|
* however many links a menu holds.
|
|
24
24
|
*/
|
|
25
25
|
findStorefrontLinks(ids: readonly string[], scope: CmsPageStorefrontLinkScope): Promise<CmsPageStorefrontLink[]>;
|
|
26
|
+
/**
|
|
27
|
+
* Feature 171 — every first slug segment the channel's pages hold, in every
|
|
28
|
+
* language, lower-cased. A page served under its parent's path has its parent's
|
|
29
|
+
* first segment, and the parent is a page of the channel too.
|
|
30
|
+
*/
|
|
31
|
+
firstSegmentsInChannel(salesChannelId: string): Promise<string[]>;
|
|
26
32
|
}
|
|
27
33
|
export declare function toCmsPageRecord(page: CmsPage): CmsPageRecord;
|
|
28
34
|
//# sourceMappingURL=cms-page-read-port.d.ts.map
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { firstSlugSegment } from '@endora-commerce/contracts';
|
|
1
2
|
import { CmsPage } from '../entities/cms-page.entity.js';
|
|
2
3
|
import { loadChannelPageNodes, pageStorefrontLinks } from './page-paths.js';
|
|
3
4
|
/**
|
|
@@ -54,6 +55,27 @@ export class CmsPageReadService {
|
|
|
54
55
|
translations: page.translations,
|
|
55
56
|
})), ids, scope);
|
|
56
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* Feature 171 — every first slug segment the channel's pages hold, in every
|
|
60
|
+
* language, lower-cased. A page served under its parent's path has its parent's
|
|
61
|
+
* first segment, and the parent is a page of the channel too.
|
|
62
|
+
*/
|
|
63
|
+
async firstSegmentsInChannel(salesChannelId) {
|
|
64
|
+
const rows = (await this.emFactory().execute(`select p.slug, p.translations
|
|
65
|
+
from cms_pages p
|
|
66
|
+
join cms_page_sales_channels s on s.page_id = p.id
|
|
67
|
+
where s.sales_channel_id = ?`, [salesChannelId]));
|
|
68
|
+
const segments = new Set();
|
|
69
|
+
for (const row of rows) {
|
|
70
|
+
const slugs = [row.slug, ...Object.values(row.translations ?? {}).map((t) => t?.slug ?? '')];
|
|
71
|
+
for (const slug of slugs) {
|
|
72
|
+
const segment = firstSlugSegment(slug ?? '');
|
|
73
|
+
if (segment.length > 0)
|
|
74
|
+
segments.add(segment);
|
|
75
|
+
}
|
|
76
|
+
}
|
|
77
|
+
return [...segments];
|
|
78
|
+
}
|
|
57
79
|
}
|
|
58
80
|
export function toCmsPageRecord(page) {
|
|
59
81
|
return {
|
|
@@ -91,6 +91,13 @@ export declare class CmsPageService {
|
|
|
91
91
|
*/
|
|
92
92
|
private languagePrefixesResolver;
|
|
93
93
|
setLanguagePrefixesResolver(resolver: (() => Promise<ReadonlyMap<string, readonly string[]>>) | null): void;
|
|
94
|
+
/**
|
|
95
|
+
* Feature 171 (research R5) — first segments other modules serve in the given
|
|
96
|
+
* channels (the blog's prefixes), each with the module that claims it. Absent
|
|
97
|
+
* until `registerModule` installs it, which claims nothing.
|
|
98
|
+
*/
|
|
99
|
+
private claimedSegmentsResolver;
|
|
100
|
+
setClaimedSegmentsResolver(resolver: ((salesChannelIds: readonly string[]) => Promise<ReadonlyMap<string, string>>) | null): void;
|
|
94
101
|
/** The channels' language prefixes → channel codes (feature 167). */
|
|
95
102
|
languagePrefixes(): Promise<ReadonlyMap<string, readonly string[]>>;
|
|
96
103
|
/**
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'crypto';
|
|
2
|
-
import { ERROR_CODES, firstSlugSegment, } from '@endora-commerce/contracts';
|
|
2
|
+
import { ERROR_CODES, firstSlugSegment, isUuidShape, } from '@endora-commerce/contracts';
|
|
3
3
|
import { HttpError } from '@endora-commerce/platform/http';
|
|
4
4
|
import { SalesChannel } from '@endora-commerce/platform/kernel';
|
|
5
5
|
import { walkBlockEmbeds, walkUnknownComponents } from './content-tree-walker.js';
|
|
@@ -118,6 +118,15 @@ export class CmsPageService {
|
|
|
118
118
|
setLanguagePrefixesResolver(resolver) {
|
|
119
119
|
this.languagePrefixesResolver = resolver;
|
|
120
120
|
}
|
|
121
|
+
/**
|
|
122
|
+
* Feature 171 (research R5) — first segments other modules serve in the given
|
|
123
|
+
* channels (the blog's prefixes), each with the module that claims it. Absent
|
|
124
|
+
* until `registerModule` installs it, which claims nothing.
|
|
125
|
+
*/
|
|
126
|
+
claimedSegmentsResolver = null;
|
|
127
|
+
setClaimedSegmentsResolver(resolver) {
|
|
128
|
+
this.claimedSegmentsResolver = resolver;
|
|
129
|
+
}
|
|
121
130
|
/** The channels' language prefixes → channel codes (feature 167). */
|
|
122
131
|
async languagePrefixes() {
|
|
123
132
|
return this.languagePrefixesResolver ? this.languagePrefixesResolver() : new Map();
|
|
@@ -147,10 +156,18 @@ export class CmsPageService {
|
|
|
147
156
|
* `{segment}` placeholder in the operator's own language (§5.4): the code for
|
|
148
157
|
* a consumer to branch on, the sentence for the operator to read.
|
|
149
158
|
*/
|
|
150
|
-
async assertSlugNotReserved(slug) {
|
|
159
|
+
async assertSlugNotReserved(slug, salesChannelIds) {
|
|
151
160
|
const segment = firstSlugSegment(slug);
|
|
152
161
|
if (segment.length === 0)
|
|
153
162
|
return;
|
|
163
|
+
// Feature 171 — a segment another module serves in one of the page's channels
|
|
164
|
+
// (the blog's prefix) is that module's address there, never the page's.
|
|
165
|
+
const claimedBy = this.claimedSegmentsResolver
|
|
166
|
+
? (await this.claimedSegmentsResolver(salesChannelIds)).get(segment)
|
|
167
|
+
: undefined;
|
|
168
|
+
if (claimedBy !== undefined) {
|
|
169
|
+
throw new HttpError(409, ERROR_CODES.CMS_SLUG_RESERVED, `The first path segment "${segment}" is served by the ${claimedBy} module in this sales channel.`, { segment, claimedBy });
|
|
170
|
+
}
|
|
154
171
|
const reserved = await this.reservedSegments();
|
|
155
172
|
// Feature 167 (FR-040, OR-5, OR-12) — a language prefix of any channel is the
|
|
156
173
|
// storefront's too: the URL `/<prefix>/…` is that language's page, never the
|
|
@@ -396,8 +413,9 @@ export class CmsPageService {
|
|
|
396
413
|
// against the deployment's configuration and touches no row, so opening a
|
|
397
414
|
// transaction to refuse it would hold a connection for the length of a
|
|
398
415
|
// settings read.
|
|
399
|
-
for (const slug of this.requestedSlugs(input.slug, input.translations))
|
|
400
|
-
await this.assertSlugNotReserved(slug);
|
|
416
|
+
for (const slug of this.requestedSlugs(input.slug, input.translations)) {
|
|
417
|
+
await this.assertSlugNotReserved(slug, input.salesChannelIds);
|
|
418
|
+
}
|
|
401
419
|
const translations = normalizeTranslations(input.translations ?? {});
|
|
402
420
|
this.assertTranslationsInLanguages(translations, input.languages);
|
|
403
421
|
const id = randomUUID();
|
|
@@ -478,8 +496,12 @@ export class CmsPageService {
|
|
|
478
496
|
// would make every page whose slug predates the deployment's reserved set
|
|
479
497
|
// uneditable — a rule that punishes the operator for a decision somebody
|
|
480
498
|
// else made later.
|
|
481
|
-
|
|
482
|
-
|
|
499
|
+
const requested = this.requestedSlugs(input.slug, input.translations);
|
|
500
|
+
if (requested.length > 0) {
|
|
501
|
+
const channelIds = input.salesChannelIds ?? (await this.channelIdsFor(id));
|
|
502
|
+
for (const slug of requested)
|
|
503
|
+
await this.assertSlugNotReserved(slug, channelIds);
|
|
504
|
+
}
|
|
483
505
|
const translations = input.translations !== undefined ? normalizeTranslations(input.translations) : undefined;
|
|
484
506
|
const slugsToInvalidate = new Set();
|
|
485
507
|
let addressesMoved = false;
|
|
@@ -705,6 +727,9 @@ export class CmsPageService {
|
|
|
705
727
|
return this.get(id);
|
|
706
728
|
}
|
|
707
729
|
async findRow(id, em = this.emFactory()) {
|
|
730
|
+
// A malformed id names no row; PostgreSQL would answer it with a 500 (issue #781).
|
|
731
|
+
if (!isUuidShape(id))
|
|
732
|
+
return null;
|
|
708
733
|
const rows = (await em.execute('select * from cms_pages where id = ?', [
|
|
709
734
|
id,
|
|
710
735
|
]));
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { randomUUID } from 'crypto';
|
|
2
|
-
import { ERROR_CODES, } from '@endora-commerce/contracts';
|
|
2
|
+
import { ERROR_CODES, isUuidShape, } from '@endora-commerce/contracts';
|
|
3
3
|
import { HttpError } from '@endora-commerce/platform/http';
|
|
4
4
|
import { walkUnknownComponents } from './content-tree-walker.js';
|
|
5
5
|
import { assertAnchors } from './anchor-guard.js';
|
|
@@ -237,6 +237,9 @@ export class CmsTemplateService {
|
|
|
237
237
|
await this.invalidateAll();
|
|
238
238
|
}
|
|
239
239
|
async findRow(id, em = this.emFactory()) {
|
|
240
|
+
// A malformed id names no row; PostgreSQL would answer it with a 500 (issue #781).
|
|
241
|
+
if (!isUuidShape(id))
|
|
242
|
+
return null;
|
|
240
243
|
const rows = (await em.execute('select * from cms_templates where id = ?', [
|
|
241
244
|
id,
|
|
242
245
|
]));
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import type { CmsReservedSegmentContributor, CmsReservedSegmentRegistryPort } from '@endora-commerce/contracts';
|
|
2
|
+
/**
|
|
3
|
+
* Feature 171 (`specs/171-blog-i18n-authors/` research R5) — the first segments other
|
|
4
|
+
* modules serve on the storefront, per channel. The page service refuses a slug that
|
|
5
|
+
* starts with one, as it refuses a language prefix (feature 167).
|
|
6
|
+
*
|
|
7
|
+
* A contributor whose module is switched off claims nothing: its address is not
|
|
8
|
+
* served then, and a page may take it (Constitution XVII).
|
|
9
|
+
*/
|
|
10
|
+
export declare class CmsReservedSegmentRegistry implements CmsReservedSegmentRegistryPort {
|
|
11
|
+
#private;
|
|
12
|
+
register(contributor: CmsReservedSegmentContributor): void;
|
|
13
|
+
/** Every claimed segment of the given channels → the module claiming it. */
|
|
14
|
+
claimedIn(salesChannelIds: readonly string[]): Promise<Map<string, string>>;
|
|
15
|
+
}
|
|
16
|
+
//# sourceMappingURL=reserved-segment-registry.d.ts.map
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
import { effectiveState } from '@endora-commerce/platform/kernel';
|
|
2
|
+
/**
|
|
3
|
+
* Feature 171 (`specs/171-blog-i18n-authors/` research R5) — the first segments other
|
|
4
|
+
* modules serve on the storefront, per channel. The page service refuses a slug that
|
|
5
|
+
* starts with one, as it refuses a language prefix (feature 167).
|
|
6
|
+
*
|
|
7
|
+
* A contributor whose module is switched off claims nothing: its address is not
|
|
8
|
+
* served then, and a page may take it (Constitution XVII).
|
|
9
|
+
*/
|
|
10
|
+
export class CmsReservedSegmentRegistry {
|
|
11
|
+
#contributors = [];
|
|
12
|
+
register(contributor) {
|
|
13
|
+
this.#contributors.push(contributor);
|
|
14
|
+
}
|
|
15
|
+
/** Every claimed segment of the given channels → the module claiming it. */
|
|
16
|
+
async claimedIn(salesChannelIds) {
|
|
17
|
+
const claimed = new Map();
|
|
18
|
+
for (const contributor of this.#contributors) {
|
|
19
|
+
if (!effectiveState.isPresent(contributor.contributorModuleId))
|
|
20
|
+
continue;
|
|
21
|
+
for (const channelId of salesChannelIds) {
|
|
22
|
+
for (const segment of await contributor.segmentsFor(channelId)) {
|
|
23
|
+
if (!claimed.has(segment.toLowerCase()))
|
|
24
|
+
claimed.set(segment.toLowerCase(), contributor.contributorModuleId);
|
|
25
|
+
}
|
|
26
|
+
}
|
|
27
|
+
}
|
|
28
|
+
return claimed;
|
|
29
|
+
}
|
|
30
|
+
}
|
|
31
|
+
//# sourceMappingURL=reserved-segment-registry.js.map
|
|
@@ -1,7 +1,11 @@
|
|
|
1
1
|
import type { EntityManager } from '@mikro-orm/postgresql';
|
|
2
|
-
import { type CmsAssetEmbedResolution, type CmsPageIndexEntry, type
|
|
2
|
+
import { type CmsAssetEmbedResolution, type CmsPageIndexEntry, type CmsResolvedBlockByCode, type CmsResolvedHook, type CmsResolvedPage } from '@endora-commerce/contracts';
|
|
3
3
|
import { CmsCache } from './cms-cache.js';
|
|
4
|
-
|
|
4
|
+
/**
|
|
5
|
+
* The embed details of these asset ids, in one call per tree rather than one per
|
|
6
|
+
* asset (issue #685); an id that resolves to nothing is absent from the map.
|
|
7
|
+
*/
|
|
8
|
+
export type CmsAssetResolver = (assetIds: readonly string[]) => Promise<Map<string, CmsAssetEmbedResolution>>;
|
|
5
9
|
/**
|
|
6
10
|
* The asset id `cms.default_share_image_asset_id` holds for one sales channel,
|
|
7
11
|
* or `null` when it is empty (feature 163, FR-033). Late-bound, like the asset
|
|
@@ -103,7 +107,7 @@ export declare class StorefrontResolver {
|
|
|
103
107
|
resolvedChannel: ResolvedChannel;
|
|
104
108
|
language?: string | undefined;
|
|
105
109
|
code: string;
|
|
106
|
-
}): Promise<
|
|
110
|
+
}): Promise<CmsResolvedBlockByCode | null>;
|
|
107
111
|
resolveHookByCode(input: {
|
|
108
112
|
resolvedChannel: ResolvedChannel;
|
|
109
113
|
language?: string | undefined;
|
|
@@ -57,7 +57,7 @@ export class StorefrontResolver {
|
|
|
57
57
|
async shareImageUrl(assetId) {
|
|
58
58
|
if (!assetId || !this.assetResolver)
|
|
59
59
|
return null;
|
|
60
|
-
const resolved = await this.assetResolver(assetId);
|
|
60
|
+
const resolved = (await this.assetResolver([assetId])).get(assetId);
|
|
61
61
|
return resolved && resolved.visibility === 'public' ? resolved.url : null;
|
|
62
62
|
}
|
|
63
63
|
/**
|
|
@@ -101,13 +101,7 @@ export class StorefrontResolver {
|
|
|
101
101
|
walkAssetIds(tree, ids);
|
|
102
102
|
if (ids.size === 0)
|
|
103
103
|
return {};
|
|
104
|
-
|
|
105
|
-
await Promise.all(Array.from(ids).map(async (assetId) => {
|
|
106
|
-
const resolved = await resolver(assetId);
|
|
107
|
-
if (resolved)
|
|
108
|
-
assets[assetId] = resolved;
|
|
109
|
-
}));
|
|
110
|
-
return assets;
|
|
104
|
+
return Object.fromEntries(await resolver([...ids]));
|
|
111
105
|
}
|
|
112
106
|
async resolvePageBySlug(input) {
|
|
113
107
|
const em = this.emFactory();
|
|
@@ -364,13 +358,13 @@ export class StorefrontResolver {
|
|
|
364
358
|
const language = this.resolveLanguage(block, input.language, channel.default_language);
|
|
365
359
|
if (!language)
|
|
366
360
|
return null;
|
|
361
|
+
const data = block.content.languages?.[language] ?? {};
|
|
367
362
|
const resolved = {
|
|
368
363
|
id: block.id,
|
|
369
364
|
code: block.code,
|
|
370
365
|
language,
|
|
371
|
-
content: {
|
|
372
|
-
|
|
373
|
-
},
|
|
366
|
+
content: { data },
|
|
367
|
+
assets: await this.resolveAssetsForTrees([data]),
|
|
374
368
|
};
|
|
375
369
|
if (this.cache) {
|
|
376
370
|
await this.cache.setBlock(input.code, channel.code, cacheLanguage, resolved);
|
|
@@ -431,7 +425,9 @@ export class StorefrontResolver {
|
|
|
431
425
|
},
|
|
432
426
|
});
|
|
433
427
|
}
|
|
434
|
-
|
|
428
|
+
// One batch for every block's tree (issue #685), never a read per block or per image.
|
|
429
|
+
const assets = await this.resolveAssetsForTrees(blocks.map((block) => block.content.data));
|
|
430
|
+
const resolved = { hookCode: hook.code, blocks, assets };
|
|
435
431
|
if (this.cache) {
|
|
436
432
|
await this.cache.setHook(input.code, channel.code, cacheLanguage, resolved);
|
|
437
433
|
}
|
package/dist/manifest.d.ts
CHANGED
|
@@ -143,6 +143,7 @@ export declare const manifest: {
|
|
|
143
143
|
weight: number;
|
|
144
144
|
descriptionKey?: string | undefined;
|
|
145
145
|
requiredPermission?: string | undefined;
|
|
146
|
+
entryApiRoute?: string | undefined;
|
|
146
147
|
keywordsKey?: string | undefined;
|
|
147
148
|
}[] | undefined;
|
|
148
149
|
permissions?: {
|
|
@@ -152,6 +153,12 @@ export declare const manifest: {
|
|
|
152
153
|
description?: string | undefined;
|
|
153
154
|
requires?: string[] | undefined;
|
|
154
155
|
}[] | undefined;
|
|
156
|
+
organizationPermissions?: {
|
|
157
|
+
code: string;
|
|
158
|
+
label: string;
|
|
159
|
+
description: string;
|
|
160
|
+
memberDefault: boolean;
|
|
161
|
+
}[] | undefined;
|
|
155
162
|
transactionalEmails?: {
|
|
156
163
|
code: string;
|
|
157
164
|
name: string;
|
|
@@ -180,7 +187,7 @@ export declare const manifest: {
|
|
|
180
187
|
category: string;
|
|
181
188
|
contexts: ("cms" | "newsletter" | "email" | "invoice" | "document")[];
|
|
182
189
|
fields: Record<string, {
|
|
183
|
-
type: "number" | "object" | "array" | "
|
|
190
|
+
type: "number" | "object" | "array" | "text" | "select" | "external" | "uuid" | "textarea" | "radio" | "richtext";
|
|
184
191
|
label?: string | undefined;
|
|
185
192
|
required?: boolean | undefined;
|
|
186
193
|
options?: {
|
|
@@ -239,6 +246,11 @@ export declare const manifest: {
|
|
|
239
246
|
consumers: ("admin" | "backend" | "storefront")[];
|
|
240
247
|
addressOf: "admin" | "backend" | "storefront" | null;
|
|
241
248
|
}[] | undefined;
|
|
249
|
+
hookableActions?: {
|
|
250
|
+
action: string;
|
|
251
|
+
objectType: string;
|
|
252
|
+
phases: ("beforeCommit" | "afterCommit")[];
|
|
253
|
+
}[] | undefined;
|
|
242
254
|
};
|
|
243
255
|
export declare function resolvePageBuilderBreakpointsFromEnv(): PageBuilderBreakpoints;
|
|
244
256
|
/**
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* `cms`' test support (`@endora-commerce/test-kit/support`): the tables of this
|
|
3
|
+
* module whose rows must not survive from one test file into the next.
|
|
4
|
+
*
|
|
5
|
+
* **Why the templates are here (issue #1087).** A template's sales-channel
|
|
6
|
+
* bindings hang off `sales_channels`, which the harness truncates and reseeds
|
|
7
|
+
* for every booting file, so they cascade away — but `cms_templates` itself
|
|
8
|
+
* hangs off nothing the truncate reaches. A template one file created therefore
|
|
9
|
+
* stood, bound to no channel, for every later file on the same worker
|
|
10
|
+
* database, and `seeded-content-renders.test.ts`, which reads the table whole
|
|
11
|
+
* because the harness seeds no template, failed on a
|
|
12
|
+
* `cta-free-shipping-<stamp>` written by `quickstart-smoke.test.ts`. A test
|
|
13
|
+
* that needs a template writes its own.
|
|
14
|
+
*
|
|
15
|
+
* `cms_template_sales_channels` is named beside it although it cascades today
|
|
16
|
+
* from both `cms_templates` and `sales_channels`: a cascade is a property of
|
|
17
|
+
* today's foreign keys, not a guarantee, and the reset should not depend on it.
|
|
18
|
+
*/
|
|
19
|
+
export declare const volatileTables: readonly string[];
|
|
20
|
+
//# sourceMappingURL=index.d.ts.map
|