@endora-commerce/mod-cms 0.108.0 → 0.110.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/api/cms-client.d.ts +19 -3
- package/dist/admin/api/cms-client.d.ts.map +1 -1
- package/dist/admin/api/cms-client.js +23 -2
- package/dist/admin/api/cms-client.js.map +1 -1
- package/dist/admin/components/AdminCatalogPreviewProvider.d.ts +9 -0
- package/dist/admin/components/AdminCatalogPreviewProvider.d.ts.map +1 -1
- package/dist/admin/components/AdminCatalogPreviewProvider.js +88 -3
- package/dist/admin/components/AdminCatalogPreviewProvider.js.map +1 -1
- package/dist/admin/components/BackgroundFields.d.ts +16 -0
- package/dist/admin/components/BackgroundFields.d.ts.map +1 -1
- package/dist/admin/components/BackgroundFields.js +58 -11
- package/dist/admin/components/BackgroundFields.js.map +1 -1
- package/dist/admin/components/BrandFontFields.d.ts +17 -0
- package/dist/admin/components/BrandFontFields.d.ts.map +1 -0
- package/dist/admin/components/BrandFontFields.js +39 -0
- package/dist/admin/components/BrandFontFields.js.map +1 -0
- package/dist/admin/components/BrandPreview.d.ts +29 -0
- package/dist/admin/components/BrandPreview.d.ts.map +1 -0
- package/dist/admin/components/BrandPreview.js +130 -0
- package/dist/admin/components/BrandPreview.js.map +1 -0
- package/dist/admin/components/CarouselAddSlideMenu.d.ts +5 -0
- package/dist/admin/components/CarouselAddSlideMenu.d.ts.map +1 -0
- package/dist/admin/components/CarouselAddSlideMenu.js +84 -0
- package/dist/admin/components/CarouselAddSlideMenu.js.map +1 -0
- package/dist/admin/components/CarouselFields.d.ts +6 -0
- package/dist/admin/components/CarouselFields.d.ts.map +1 -0
- package/dist/admin/components/CarouselFields.js +55 -0
- package/dist/admin/components/CarouselFields.js.map +1 -0
- package/dist/admin/components/ContentSliderActionBarExtras.d.ts.map +1 -1
- package/dist/admin/components/ContentSliderActionBarExtras.js +13 -6
- package/dist/admin/components/ContentSliderActionBarExtras.js.map +1 -1
- package/dist/admin/components/FormBlockFields.d.ts +15 -0
- package/dist/admin/components/FormBlockFields.d.ts.map +1 -0
- package/dist/admin/components/FormBlockFields.js +23 -0
- package/dist/admin/components/FormBlockFields.js.map +1 -0
- package/dist/admin/components/HeroFields.d.ts +47 -0
- package/dist/admin/components/HeroFields.d.ts.map +1 -0
- package/dist/admin/components/HeroFields.js +92 -0
- package/dist/admin/components/HeroFields.js.map +1 -0
- package/dist/admin/components/ListingFields.d.ts +6 -0
- package/dist/admin/components/ListingFields.d.ts.map +1 -0
- package/dist/admin/components/ListingFields.js +54 -0
- package/dist/admin/components/ListingFields.js.map +1 -0
- package/dist/admin/components/NewsletterSignupFields.d.ts +18 -0
- package/dist/admin/components/NewsletterSignupFields.d.ts.map +1 -0
- package/dist/admin/components/NewsletterSignupFields.js +38 -0
- package/dist/admin/components/NewsletterSignupFields.js.map +1 -0
- package/dist/admin/components/PageBuilderActionBar.d.ts.map +1 -1
- package/dist/admin/components/PageBuilderActionBar.js +1 -6
- package/dist/admin/components/PageBuilderActionBar.js.map +1 -1
- package/dist/admin/components/PageBuilderEditor.d.ts +43 -2
- package/dist/admin/components/PageBuilderEditor.d.ts.map +1 -1
- package/dist/admin/components/PageBuilderEditor.js +218 -123
- package/dist/admin/components/PageBuilderEditor.js.map +1 -1
- package/dist/admin/components/PageNavigationFields.d.ts +6 -0
- package/dist/admin/components/PageNavigationFields.d.ts.map +1 -0
- package/dist/admin/components/PageNavigationFields.js +29 -0
- package/dist/admin/components/PageNavigationFields.js.map +1 -0
- package/dist/admin/components/PreviewBrandTokens.d.ts +25 -0
- package/dist/admin/components/PreviewBrandTokens.d.ts.map +1 -0
- package/dist/admin/components/PreviewBrandTokens.js +68 -0
- package/dist/admin/components/PreviewBrandTokens.js.map +1 -0
- package/dist/admin/components/SectionBlockFields.d.ts +44 -0
- package/dist/admin/components/SectionBlockFields.d.ts.map +1 -0
- package/dist/admin/components/SectionBlockFields.js +114 -0
- package/dist/admin/components/SectionBlockFields.js.map +1 -0
- package/dist/admin/components/SectionPresetsPanel.d.ts +11 -0
- package/dist/admin/components/SectionPresetsPanel.d.ts.map +1 -0
- package/dist/admin/components/SectionPresetsPanel.js +82 -0
- package/dist/admin/components/SectionPresetsPanel.js.map +1 -0
- package/dist/admin/components/SliderPreviewActionBarExtras.d.ts +1 -1
- package/dist/admin/components/SliderPreviewActionBarExtras.d.ts.map +1 -1
- package/dist/admin/components/SliderPreviewActionBarExtras.js +1 -5
- package/dist/admin/components/SliderPreviewActionBarExtras.js.map +1 -1
- package/dist/admin/components/admin-catalog-preview-map.d.ts +10 -1
- package/dist/admin/components/admin-catalog-preview-map.d.ts.map +1 -1
- package/dist/admin/components/admin-catalog-preview-map.js +11 -1
- package/dist/admin/components/admin-catalog-preview-map.js.map +1 -1
- package/dist/admin/components/block-contributions.d.ts +15 -0
- package/dist/admin/components/block-contributions.d.ts.map +1 -1
- package/dist/admin/components/block-contributions.js +22 -0
- package/dist/admin/components/block-contributions.js.map +1 -1
- package/dist/admin/components/page-builder-i18n.d.ts +24 -2
- package/dist/admin/components/page-builder-i18n.d.ts.map +1 -1
- package/dist/admin/components/page-builder-i18n.js +102 -9
- package/dist/admin/components/page-builder-i18n.js.map +1 -1
- package/dist/admin/editors/PageEditor.d.ts.map +1 -1
- package/dist/admin/editors/PageEditor.js +270 -38
- package/dist/admin/editors/PageEditor.js.map +1 -1
- package/dist/admin/index.d.ts +1 -1
- package/dist/admin/index.d.ts.map +1 -1
- package/dist/admin/index.js +28 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/pages/BrandPage.d.ts +19 -0
- package/dist/admin/pages/BrandPage.d.ts.map +1 -0
- package/dist/admin/pages/BrandPage.js +316 -0
- package/dist/admin/pages/BrandPage.js.map +1 -0
- package/dist/admin/pages/PagesListPage.d.ts.map +1 -1
- package/dist/admin/pages/PagesListPage.js +4 -1
- package/dist/admin/pages/PagesListPage.js.map +1 -1
- package/dist/admin/zones/ProductContentEditor.d.ts +27 -0
- package/dist/admin/zones/ProductContentEditor.d.ts.map +1 -0
- package/dist/admin/zones/ProductContentEditor.js +28 -0
- package/dist/admin/zones/ProductContentEditor.js.map +1 -0
- package/dist/backend/cli/block-names.d.ts +2 -1
- package/dist/backend/cli/block-names.d.ts.map +1 -1
- package/dist/backend/cli/block-names.js.map +1 -1
- package/dist/backend/entities/cms-brand-tokens.entity.d.ts +20 -0
- package/dist/backend/entities/cms-brand-tokens.entity.d.ts.map +1 -0
- package/dist/backend/entities/cms-brand-tokens.entity.js +57 -0
- package/dist/backend/entities/cms-brand-tokens.entity.js.map +1 -0
- package/dist/backend/entities/cms-page.entity.d.ts +32 -1
- package/dist/backend/entities/cms-page.entity.d.ts.map +1 -1
- package/dist/backend/entities/cms-page.entity.js +63 -0
- package/dist/backend/entities/cms-page.entity.js.map +1 -1
- package/dist/backend/index.d.ts +8 -1
- package/dist/backend/index.d.ts.map +1 -1
- package/dist/backend/index.js +90 -10
- package/dist/backend/index.js.map +1 -1
- package/dist/backend/plugin.d.ts +18 -2
- package/dist/backend/plugin.d.ts.map +1 -1
- package/dist/backend/plugin.js +23 -1
- package/dist/backend/plugin.js.map +1 -1
- package/dist/backend/routes.admin.d.ts +2 -0
- package/dist/backend/routes.admin.d.ts.map +1 -1
- package/dist/backend/routes.admin.js +42 -8
- package/dist/backend/routes.admin.js.map +1 -1
- package/dist/backend/routes.storefront.d.ts +24 -1
- package/dist/backend/routes.storefront.d.ts.map +1 -1
- package/dist/backend/routes.storefront.js +55 -2
- package/dist/backend/routes.storefront.js.map +1 -1
- package/dist/backend/services/anchor-guard.d.ts +10 -0
- package/dist/backend/services/anchor-guard.d.ts.map +1 -0
- package/dist/backend/services/anchor-guard.js +132 -0
- package/dist/backend/services/anchor-guard.js.map +1 -0
- package/dist/backend/services/asset-embed-resolver.d.ts +18 -10
- package/dist/backend/services/asset-embed-resolver.d.ts.map +1 -1
- package/dist/backend/services/asset-embed-resolver.js +35 -30
- package/dist/backend/services/asset-embed-resolver.js.map +1 -1
- package/dist/backend/services/asset-references.d.ts.map +1 -1
- package/dist/backend/services/asset-references.js +46 -30
- package/dist/backend/services/asset-references.js.map +1 -1
- package/dist/backend/services/brand-tokens-service.d.ts +84 -0
- package/dist/backend/services/brand-tokens-service.d.ts.map +1 -0
- package/dist/backend/services/brand-tokens-service.js +159 -0
- package/dist/backend/services/brand-tokens-service.js.map +1 -0
- package/dist/backend/services/channel-language-prefixes.d.ts +11 -0
- package/dist/backend/services/channel-language-prefixes.d.ts.map +1 -0
- package/dist/backend/services/channel-language-prefixes.js +24 -0
- package/dist/backend/services/channel-language-prefixes.js.map +1 -0
- package/dist/backend/services/cms-block-read-port.d.ts.map +1 -1
- package/dist/backend/services/cms-block-read-port.js +3 -0
- package/dist/backend/services/cms-block-read-port.js.map +1 -1
- package/dist/backend/services/cms-block-service.d.ts.map +1 -1
- package/dist/backend/services/cms-block-service.js +7 -1
- package/dist/backend/services/cms-block-service.js.map +1 -1
- package/dist/backend/services/cms-cache.d.ts +10 -0
- package/dist/backend/services/cms-cache.d.ts.map +1 -1
- package/dist/backend/services/cms-cache.js +9 -0
- package/dist/backend/services/cms-cache.js.map +1 -1
- package/dist/backend/services/cms-content-invalidator.d.ts +13 -4
- package/dist/backend/services/cms-content-invalidator.d.ts.map +1 -1
- package/dist/backend/services/cms-content-invalidator.js +13 -6
- package/dist/backend/services/cms-content-invalidator.js.map +1 -1
- package/dist/backend/services/cms-hook-service.d.ts.map +1 -1
- package/dist/backend/services/cms-hook-service.js +6 -1
- package/dist/backend/services/cms-hook-service.js.map +1 -1
- package/dist/backend/services/cms-page-read-port.d.ts +12 -1
- package/dist/backend/services/cms-page-read-port.d.ts.map +1 -1
- package/dist/backend/services/cms-page-read-port.js +49 -0
- package/dist/backend/services/cms-page-read-port.js.map +1 -1
- package/dist/backend/services/cms-page-service.d.ts +79 -1
- package/dist/backend/services/cms-page-service.d.ts.map +1 -1
- package/dist/backend/services/cms-page-service.js +344 -19
- package/dist/backend/services/cms-page-service.js.map +1 -1
- package/dist/backend/services/cms-template-service.d.ts.map +1 -1
- package/dist/backend/services/cms-template-service.js +7 -1
- package/dist/backend/services/cms-template-service.js.map +1 -1
- package/dist/backend/services/contact-form/contact-form-mail.d.ts +22 -0
- package/dist/backend/services/contact-form/contact-form-mail.d.ts.map +1 -0
- package/dist/backend/services/contact-form/contact-form-mail.js +64 -0
- package/dist/backend/services/contact-form/contact-form-mail.js.map +1 -0
- package/dist/backend/services/contact-form/contact-form.service.d.ts +35 -0
- package/dist/backend/services/contact-form/contact-form.service.d.ts.map +1 -0
- package/dist/backend/services/contact-form/contact-form.service.js +75 -0
- package/dist/backend/services/contact-form/contact-form.service.js.map +1 -0
- package/dist/backend/services/contact-form/recipients-validator.d.ts +8 -0
- package/dist/backend/services/contact-form/recipients-validator.d.ts.map +1 -0
- package/dist/backend/services/contact-form/recipients-validator.js +23 -0
- package/dist/backend/services/contact-form/recipients-validator.js.map +1 -0
- package/dist/backend/services/content-tree-walker.d.ts +12 -0
- package/dist/backend/services/content-tree-walker.d.ts.map +1 -1
- package/dist/backend/services/content-tree-walker.js +40 -0
- package/dist/backend/services/content-tree-walker.js.map +1 -1
- package/dist/backend/services/page-builder-registry.d.ts +11 -2
- package/dist/backend/services/page-builder-registry.d.ts.map +1 -1
- package/dist/backend/services/page-builder-registry.js +10 -1
- package/dist/backend/services/page-builder-registry.js.map +1 -1
- package/dist/backend/services/page-paths.d.ts +87 -0
- package/dist/backend/services/page-paths.d.ts.map +1 -0
- package/dist/backend/services/page-paths.js +177 -0
- package/dist/backend/services/page-paths.js.map +1 -0
- package/dist/backend/services/reserved-segment-registry.d.ts +16 -0
- package/dist/backend/services/reserved-segment-registry.d.ts.map +1 -0
- package/dist/backend/services/reserved-segment-registry.js +31 -0
- package/dist/backend/services/reserved-segment-registry.js.map +1 -0
- package/dist/backend/services/storefront-resolver.d.ts +58 -3
- package/dist/backend/services/storefront-resolver.d.ts.map +1 -1
- package/dist/backend/services/storefront-resolver.js +314 -29
- package/dist/backend/services/storefront-resolver.js.map +1 -1
- package/dist/backend/services/translation/extract.d.ts.map +1 -1
- package/dist/backend/services/translation/extract.js +9 -1
- package/dist/backend/services/translation/extract.js.map +1 -1
- package/dist/manifest.d.ts +19 -1
- package/dist/manifest.d.ts.map +1 -1
- package/dist/manifest.js +592 -73
- package/dist/manifest.js.map +1 -1
- package/dist/migrations/20261022T163218_cms_brand_tokens.d.ts +24 -0
- package/dist/migrations/20261022T163218_cms_brand_tokens.d.ts.map +1 -0
- package/dist/migrations/20261022T163218_cms_brand_tokens.js +38 -0
- package/dist/migrations/20261022T163218_cms_brand_tokens.js.map +1 -0
- package/dist/migrations/20261023T052237_cms_page_tree_and_share.d.ts +24 -0
- package/dist/migrations/20261023T052237_cms_page_tree_and_share.d.ts.map +1 -0
- package/dist/migrations/20261023T052237_cms_page_tree_and_share.js +51 -0
- package/dist/migrations/20261023T052237_cms_page_tree_and_share.js.map +1 -0
- package/dist/migrations/20261027T165458_cms_page_parent_path_in_url.d.ts +16 -0
- package/dist/migrations/20261027T165458_cms_page_parent_path_in_url.d.ts.map +1 -0
- package/dist/migrations/20261027T165458_cms_page_parent_path_in_url.js +20 -0
- package/dist/migrations/20261027T165458_cms_page_parent_path_in_url.js.map +1 -0
- package/dist/migrations/20261028T090524_cms_page_breadcrumbs_overlay.d.ts +14 -0
- package/dist/migrations/20261028T090524_cms_page_breadcrumbs_overlay.d.ts.map +1 -0
- package/dist/migrations/20261028T090524_cms_page_breadcrumbs_overlay.js +18 -0
- package/dist/migrations/20261028T090524_cms_page_breadcrumbs_overlay.js.map +1 -0
- package/dist/migrations/20261029T131218_cms_page_translations.d.ts +15 -0
- package/dist/migrations/20261029T131218_cms_page_translations.d.ts.map +1 -0
- package/dist/migrations/20261029T131218_cms_page_translations.js +19 -0
- package/dist/migrations/20261029T131218_cms_page_translations.js.map +1 -0
- package/dist/migrations/index.d.ts +6 -1
- package/dist/migrations/index.d.ts.map +1 -1
- package/dist/migrations/index.js +11 -1
- package/dist/migrations/index.js.map +1 -1
- package/docs/cms/brand.md +310 -0
- package/docs/cms/contact-form.md +161 -0
- package/docs/cms/extending-page-builder.md +210 -15
- package/docs/cms/index.md +1232 -39
- package/docs/cms/page-navigation.md +83 -0
- package/i18n/en.json +2787 -45
- package/i18n/pl.json +2765 -23
- package/package.json +20 -18
- package/dist/admin/components/ButtonLinkFields.d.ts +0 -6
- package/dist/admin/components/ButtonLinkFields.d.ts.map +0 -1
- package/dist/admin/components/ButtonLinkFields.js +0 -127
- package/dist/admin/components/ButtonLinkFields.js.map +0 -1
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-embed-resolver.js","sourceRoot":"","sources":["../../../src/backend/services/asset-embed-resolver.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"asset-embed-resolver.js","sourceRoot":"","sources":["../../../src/backend/services/asset-embed-resolver.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,MAAM,UAAU,wBAAwB,CACtC,MAAwD;IAExD,OAAO,KAAK,EAAE,QAAQ,EAAE,EAAE;QACxB,MAAM,GAAG,GAAG,IAAI,GAAG,EAAmC,CAAC;QACvD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC;QACtC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAChD,IAAI,IAAI,CAAC,IAAI,KAAK,CAAC;YAAE,OAAO,GAAG,CAAC;QAChC,KAAK,MAAM,MAAM,IAAI,MAAM,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC;YAClF,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAChC,IAAI,CAAC,GAAG;gBAAE,SAAS;YACnB,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE;gBACjB,GAAG;gBACH,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,QAAQ,EAAE,MAAM,CAAC,QAAQ;gBACzB,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,UAAU,EAAE,MAAM,CAAC,UAAU;aAC9B,CAAC,CAAC;QACL,CAAC;QACD,OAAO,GAAG,CAAC;IACb,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-references.d.ts","sourceRoot":"","sources":["../../../src/backend/services/asset-references.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"asset-references.d.ts","sourceRoot":"","sources":["../../../src/backend/services/asset-references.ts"],"names":[],"mappings":"AAuBA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EAGV,0BAA0B,EAC3B,MAAM,4BAA4B,CAAC;AAEpC,wBAAgB,0BAA0B,CACxC,QAAQ,EAAE,0BAA0B,EACpC,SAAS,EAAE,MAAM,aAAa,GAC7B,IAAI,CAEN"}
|
|
@@ -5,15 +5,21 @@
|
|
|
5
5
|
// - cms_pages.content
|
|
6
6
|
// - cms_blocks.content
|
|
7
7
|
// - cms_templates.content
|
|
8
|
+
// - cms_pages.share_image_asset_id (feature 163, data-model §1.1 — a
|
|
9
|
+
// plain uuid column, not an FK, because assets live in `assets_library`)
|
|
8
10
|
//
|
|
9
|
-
// Match shape: any
|
|
10
|
-
//
|
|
11
|
-
// wildcard-key match — handles components like LibraryImage,
|
|
11
|
+
// Match shape: any string value anywhere in the tree that equals the
|
|
12
|
+
// requested id, whatever its key — handles components like LibraryImage,
|
|
12
13
|
// Button.iconAssetId, Card.mainImageAssetId, etc.
|
|
13
14
|
//
|
|
14
|
-
//
|
|
15
|
-
//
|
|
16
|
-
//
|
|
15
|
+
// One statement for the whole batch (`specs/166-asset-reference-visibility/`
|
|
16
|
+
// research R-6): every string value of each document (`strict $.**` visits
|
|
17
|
+
// every level, array elements included) is matched against the asked ids, so
|
|
18
|
+
// a document is walked once however many ids are asked, and the matched value
|
|
19
|
+
// is the asset id each hit is tagged with. It used to be one statement per
|
|
20
|
+
// asked id. The ids travel as one `text[]` literal built from hex-and-dash
|
|
21
|
+
// characters only — `em.execute` formats a JavaScript array as a list, not as
|
|
22
|
+
// one array value.
|
|
17
23
|
export function registerCmsAssetReferences(registry, emFactory) {
|
|
18
24
|
registry.register(cmsAssetReferenceDescriptor(emFactory));
|
|
19
25
|
}
|
|
@@ -21,34 +27,44 @@ function cmsAssetReferenceDescriptor(emFactory) {
|
|
|
21
27
|
return {
|
|
22
28
|
ownerModuleId: 'cms',
|
|
23
29
|
async findReferences(assetIds) {
|
|
24
|
-
|
|
30
|
+
const ids = [
|
|
31
|
+
...new Set(assetIds.map((raw) => raw.replace(/[^0-9a-fA-F-]/g, '')).filter((id) => id !== '')),
|
|
32
|
+
];
|
|
33
|
+
if (ids.length === 0)
|
|
25
34
|
return [];
|
|
26
|
-
const
|
|
27
|
-
const
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
35
|
+
const asked = `{${ids.map((id) => `"${id}"`).join(',')}}`;
|
|
36
|
+
const rows = (await emFactory().execute(`with asked as (select unnest(?::text[]) as aid)
|
|
37
|
+
select distinct p.id::text as id, p.name, 'cms_page' as kind, v.value #>> '{}' as asset_id
|
|
38
|
+
from cms_pages p
|
|
39
|
+
cross join lateral jsonb_path_query(p.content, 'strict $.**') as v(value)
|
|
40
|
+
where jsonb_typeof(v.value) = 'string'
|
|
41
|
+
and v.value #>> '{}' in (select aid from asked)
|
|
42
|
+
union all
|
|
43
|
+
select p.id::text as id, p.name, 'cms_page_share_image' as kind, a.aid as asset_id
|
|
44
|
+
from cms_pages p
|
|
45
|
+
join asked a on p.share_image_asset_id::text = lower(a.aid)
|
|
46
|
+
union all
|
|
47
|
+
select distinct b.id::text as id, b.name, 'cms_block' as kind, v.value #>> '{}' as asset_id
|
|
48
|
+
from cms_blocks b
|
|
49
|
+
cross join lateral jsonb_path_query(b.content, 'strict $.**') as v(value)
|
|
50
|
+
where jsonb_typeof(v.value) = 'string'
|
|
51
|
+
and v.value #>> '{}' in (select aid from asked)
|
|
52
|
+
union all
|
|
53
|
+
select distinct t.id::text as id, t.name, 'cms_template' as kind, v.value #>> '{}' as asset_id
|
|
54
|
+
from cms_templates t
|
|
55
|
+
cross join lateral jsonb_path_query(t.content, 'strict $.**') as v(value)
|
|
56
|
+
where jsonb_typeof(v.value) = 'string'
|
|
57
|
+
and v.value #>> '{}' in (select aid from asked)`, [asked]));
|
|
58
|
+
return rows.map((r) => {
|
|
59
|
+
const label = r.kind === 'cms_page'
|
|
60
|
+
? `CMS page "${r.name}"`
|
|
61
|
+
: r.kind === 'cms_page_share_image'
|
|
62
|
+
? `CMS page "${r.name}" (sharing image)`
|
|
45
63
|
: r.kind === 'cms_block'
|
|
46
64
|
? `CMS block "${r.name}"`
|
|
47
65
|
: `CMS template "${r.name}"`;
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
}
|
|
51
|
-
return out;
|
|
66
|
+
return { assetId: r.asset_id, kind: 'cms_body_embed', entityId: r.id, label };
|
|
67
|
+
});
|
|
52
68
|
},
|
|
53
69
|
};
|
|
54
70
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"asset-references.js","sourceRoot":"","sources":["../../../src/backend/services/asset-references.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,wEAAwE;AACxE,+BAA+B;AAC/B,wBAAwB;AACxB,yBAAyB;AACzB,4BAA4B;AAC5B,EAAE;AACF,qEAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"asset-references.js","sourceRoot":"","sources":["../../../src/backend/services/asset-references.ts"],"names":[],"mappings":"AAAA,sEAAsE;AACtE,EAAE;AACF,wEAAwE;AACxE,+BAA+B;AAC/B,wBAAwB;AACxB,yBAAyB;AACzB,4BAA4B;AAC5B,uEAAuE;AACvE,6EAA6E;AAC7E,EAAE;AACF,qEAAqE;AACrE,yEAAyE;AACzE,kDAAkD;AAClD,EAAE;AACF,6EAA6E;AAC7E,2EAA2E;AAC3E,6EAA6E;AAC7E,8EAA8E;AAC9E,2EAA2E;AAC3E,2EAA2E;AAC3E,8EAA8E;AAC9E,mBAAmB;AASnB,MAAM,UAAU,0BAA0B,CACxC,QAAoC,EACpC,SAA8B;IAE9B,QAAQ,CAAC,QAAQ,CAAC,2BAA2B,CAAC,SAAS,CAAC,CAAC,CAAC;AAC5D,CAAC;AAED,SAAS,2BAA2B,CAClC,SAA8B;IAE9B,OAAO;QACL,aAAa,EAAE,KAAK;QACpB,KAAK,CAAC,cAAc,CAAC,QAAkB;YACrC,MAAM,GAAG,GAAG;gBACV,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;aAC/F,CAAC;YACF,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;gBAAE,OAAO,EAAE,CAAC;YAChC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;YAC1D,MAAM,IAAI,GAAG,CAAC,MAAM,SAAS,EAAE,CAAC,OAAO,CACrC;;;;;;;;;;;;;;;;;;;;;4DAqBoD,EACpD,CAAC,KAAK,CAAC,CACR,CAAwE,CAAC;YAE1E,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;gBACpB,MAAM,KAAK,GACT,CAAC,CAAC,IAAI,KAAK,UAAU;oBACnB,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,GAAG;oBACxB,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,sBAAsB;wBACjC,CAAC,CAAC,aAAa,CAAC,CAAC,IAAI,mBAAmB;wBACxC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW;4BACxB,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,GAAG;4BACzB,CAAC,CAAC,iBAAiB,CAAC,CAAC,IAAI,GAAG,CAAC;gBACnC,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC;YAChF,CAAC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import type { EntityManager } from '@mikro-orm/postgresql';
|
|
2
|
+
import { type CmsBrandTokens, type CmsBrandTokensScope, type CmsBrandTokensScopeState, type ContrastFinding } from '@endora-commerce/contracts';
|
|
3
|
+
import type { CommandBus } from '@endora-commerce/platform/commands';
|
|
4
|
+
/**
|
|
5
|
+
* Brand tokens (`specs/163-page-builder-marketing-pages/` research R-1, R-2;
|
|
6
|
+
* `contracts/storefront-and-admin-api.md` §1).
|
|
7
|
+
*
|
|
8
|
+
* One complete set per scope in `cms_brand_tokens`: the global row
|
|
9
|
+
* (`sales_channel_id is null`) and one optional override per sales channel.
|
|
10
|
+
* The effective set of a channel is its own row, else the global row, else
|
|
11
|
+
* {@link DEFAULT_BRAND_TOKENS} — whole sets, never merged token by token.
|
|
12
|
+
*
|
|
13
|
+
* Every write is the Command `cms.brand_tokens.update` (Constitution XIII): the
|
|
14
|
+
* row is upserted or deleted on the Command's EntityManager, so the write and
|
|
15
|
+
* its single audit entry commit or roll back together. Nothing here goes
|
|
16
|
+
* through the settings write path, which audits outside a transaction and would
|
|
17
|
+
* record a second entry for the same change (R-1).
|
|
18
|
+
*
|
|
19
|
+
* The storefront keeps the read in its Data Cache under `cms:brand`; the tag is
|
|
20
|
+
* revalidated after the commit, never before it and never for a rolled-back
|
|
21
|
+
* write. Revalidation is best-effort: a failure is logged and the save stands.
|
|
22
|
+
*/
|
|
23
|
+
export declare const CMS_BRAND_TOKENS_UPDATE_ACTION = "cms.brand_tokens.update";
|
|
24
|
+
export declare const CMS_BRAND_TOKENS_OBJECT_TYPE = "cms_brand_tokens";
|
|
25
|
+
/** The audit object id of the global set; a channel's set is named by its id. */
|
|
26
|
+
export declare const CMS_BRAND_TOKENS_GLOBAL_OBJECT_ID = "global";
|
|
27
|
+
export interface BrandTokensRead {
|
|
28
|
+
global: CmsBrandTokensScopeState;
|
|
29
|
+
/** `null` when the read names no channel. */
|
|
30
|
+
channel: (CmsBrandTokensScopeState & {
|
|
31
|
+
salesChannelId: string;
|
|
32
|
+
}) | null;
|
|
33
|
+
effective: CmsBrandTokens;
|
|
34
|
+
}
|
|
35
|
+
export interface BrandTokensUpdateResult {
|
|
36
|
+
/** The scope's version after the write; 0 once its row is removed. */
|
|
37
|
+
version: number;
|
|
38
|
+
/** The saved set's contrast findings (`[]` for a removal). */
|
|
39
|
+
warnings: ContrastFinding[];
|
|
40
|
+
}
|
|
41
|
+
export interface BrandTokensLogger {
|
|
42
|
+
warn: (obj: unknown, msg: string) => void;
|
|
43
|
+
}
|
|
44
|
+
export interface CmsBrandTokensServiceOptions {
|
|
45
|
+
emFactory: () => EntityManager;
|
|
46
|
+
commandBus: Pick<CommandBus, 'run'>;
|
|
47
|
+
/**
|
|
48
|
+
* Asks the storefront to drop Data Cache entries by tag. The composition
|
|
49
|
+
* binds it to `cmsStorefrontRevalidator`; absent, nothing is revalidated.
|
|
50
|
+
*/
|
|
51
|
+
revalidateStorefront?: (tags: string[]) => Promise<void>;
|
|
52
|
+
}
|
|
53
|
+
export declare class CmsBrandTokensService {
|
|
54
|
+
private readonly options;
|
|
55
|
+
private logger;
|
|
56
|
+
constructor(options: CmsBrandTokensServiceOptions);
|
|
57
|
+
/** Installed where `app.log` exists — the route registrar. */
|
|
58
|
+
setLogger(logger: BrandTokensLogger): void;
|
|
59
|
+
/**
|
|
60
|
+
* The global set, the named channel's set and the effective one, in one
|
|
61
|
+
* indexed query for both rows.
|
|
62
|
+
*/
|
|
63
|
+
read(salesChannelId: string | null): Promise<BrandTokensRead>;
|
|
64
|
+
/** The effective set for a channel, or the global set for `null`. */
|
|
65
|
+
effective(salesChannelId: string | null): Promise<CmsBrandTokens>;
|
|
66
|
+
/**
|
|
67
|
+
* Save or remove one scope's set as the Command `cms.brand_tokens.update`.
|
|
68
|
+
* `tokens: null` removes the scope's row: a channel then inherits the global
|
|
69
|
+
* set, and the global scope falls back to the built-in defaults.
|
|
70
|
+
*/
|
|
71
|
+
update(scope: CmsBrandTokensScope, tokens: CmsBrandTokens | null, expectedVersion: number): Promise<BrandTokensUpdateResult>;
|
|
72
|
+
/** What an audit entry keeps of a set: its scope, the whole set and its version. */
|
|
73
|
+
private auditState;
|
|
74
|
+
/**
|
|
75
|
+
* A stored set as the API states it. A row the current schema refuses — a
|
|
76
|
+
* set written before a schema change — reads as unset, so the next level
|
|
77
|
+
* applies rather than a page styled from a value nobody can save again.
|
|
78
|
+
*/
|
|
79
|
+
private stateOf;
|
|
80
|
+
private assertChannelExists;
|
|
81
|
+
/** Not awaited: the save has answered, and a slow storefront is not the operator's wait. */
|
|
82
|
+
private revalidateAfterCommit;
|
|
83
|
+
}
|
|
84
|
+
//# sourceMappingURL=brand-tokens-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"brand-tokens-service.d.ts","sourceRoot":"","sources":["../../../src/backend/services/brand-tokens-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAML,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,wBAAwB,EAC7B,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAc,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAIjF;;;;;;;;;;;;;;;;;;GAkBG;AAEH,eAAO,MAAM,8BAA8B,4BAA4B,CAAC;AACxE,eAAO,MAAM,4BAA4B,qBAAqB,CAAC;AAC/D,iFAAiF;AACjF,eAAO,MAAM,iCAAiC,WAAW,CAAC;AAQ1D,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,wBAAwB,CAAC;IACjC,6CAA6C;IAC7C,OAAO,EAAE,CAAC,wBAAwB,GAAG;QAAE,cAAc,EAAE,MAAM,CAAA;KAAE,CAAC,GAAG,IAAI,CAAC;IACxE,SAAS,EAAE,cAAc,CAAC;CAC3B;AAED,MAAM,WAAW,uBAAuB;IACtC,sEAAsE;IACtE,OAAO,EAAE,MAAM,CAAC;IAChB,8DAA8D;IAC9D,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,4BAA4B;IAC3C,SAAS,EAAE,MAAM,aAAa,CAAC;IAC/B,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IACpC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1D;AAID,qBAAa,qBAAqB;IAGpB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAFpC,OAAO,CAAC,MAAM,CAAgC;gBAEjB,OAAO,EAAE,4BAA4B;IAElE,8DAA8D;IAC9D,SAAS,CAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI;IAI1C;;;OAGG;IACG,IAAI,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,eAAe,CAAC;IAuBnE,qEAAqE;IAC/D,SAAS,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,OAAO,CAAC,cAAc,CAAC;IAIvE;;;;OAIG;IACG,MAAM,CACV,KAAK,EAAE,mBAAmB,EAC1B,MAAM,EAAE,cAAc,GAAG,IAAI,EAC7B,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,uBAAuB,CAAC;IA2EnC,oFAAoF;IACpF,OAAO,CAAC,UAAU;IAIlB;;;;OAIG;IACH,OAAO,CAAC,OAAO;YAaD,mBAAmB;IAUjC,4FAA4F;IAC5F,OAAO,CAAC,qBAAqB;CAS9B"}
|
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
import { randomUUID } from 'crypto';
|
|
2
|
+
import { CMS_STOREFRONT_CACHE_TAGS, DEFAULT_BRAND_TOKENS, ERROR_CODES, assessBrandContrast, cmsBrandTokensSchema, } from '@endora-commerce/contracts';
|
|
3
|
+
import { HttpError } from '@endora-commerce/platform/http';
|
|
4
|
+
import { SalesChannel } from '@endora-commerce/platform/kernel';
|
|
5
|
+
/**
|
|
6
|
+
* Brand tokens (`specs/163-page-builder-marketing-pages/` research R-1, R-2;
|
|
7
|
+
* `contracts/storefront-and-admin-api.md` §1).
|
|
8
|
+
*
|
|
9
|
+
* One complete set per scope in `cms_brand_tokens`: the global row
|
|
10
|
+
* (`sales_channel_id is null`) and one optional override per sales channel.
|
|
11
|
+
* The effective set of a channel is its own row, else the global row, else
|
|
12
|
+
* {@link DEFAULT_BRAND_TOKENS} — whole sets, never merged token by token.
|
|
13
|
+
*
|
|
14
|
+
* Every write is the Command `cms.brand_tokens.update` (Constitution XIII): the
|
|
15
|
+
* row is upserted or deleted on the Command's EntityManager, so the write and
|
|
16
|
+
* its single audit entry commit or roll back together. Nothing here goes
|
|
17
|
+
* through the settings write path, which audits outside a transaction and would
|
|
18
|
+
* record a second entry for the same change (R-1).
|
|
19
|
+
*
|
|
20
|
+
* The storefront keeps the read in its Data Cache under `cms:brand`; the tag is
|
|
21
|
+
* revalidated after the commit, never before it and never for a rolled-back
|
|
22
|
+
* write. Revalidation is best-effort: a failure is logged and the save stands.
|
|
23
|
+
*/
|
|
24
|
+
export const CMS_BRAND_TOKENS_UPDATE_ACTION = 'cms.brand_tokens.update';
|
|
25
|
+
export const CMS_BRAND_TOKENS_OBJECT_TYPE = 'cms_brand_tokens';
|
|
26
|
+
/** The audit object id of the global set; a channel's set is named by its id. */
|
|
27
|
+
export const CMS_BRAND_TOKENS_GLOBAL_OBJECT_ID = 'global';
|
|
28
|
+
const NO_STATE = { tokens: null, version: 0 };
|
|
29
|
+
export class CmsBrandTokensService {
|
|
30
|
+
options;
|
|
31
|
+
logger;
|
|
32
|
+
constructor(options) {
|
|
33
|
+
this.options = options;
|
|
34
|
+
}
|
|
35
|
+
/** Installed where `app.log` exists — the route registrar. */
|
|
36
|
+
setLogger(logger) {
|
|
37
|
+
this.logger = logger;
|
|
38
|
+
}
|
|
39
|
+
/**
|
|
40
|
+
* The global set, the named channel's set and the effective one, in one
|
|
41
|
+
* indexed query for both rows.
|
|
42
|
+
*/
|
|
43
|
+
async read(salesChannelId) {
|
|
44
|
+
const rows = (await this.options.emFactory().execute(salesChannelId === null
|
|
45
|
+
? `select sales_channel_id::text as sales_channel_id, tokens, version
|
|
46
|
+
from cms_brand_tokens where sales_channel_id is null`
|
|
47
|
+
: `select sales_channel_id::text as sales_channel_id, tokens, version
|
|
48
|
+
from cms_brand_tokens where sales_channel_id is null or sales_channel_id = ?`, salesChannelId === null ? [] : [salesChannelId]));
|
|
49
|
+
const globalRow = rows.find((row) => row.sales_channel_id === null);
|
|
50
|
+
const channelRow = salesChannelId === null ? undefined : rows.find((row) => row.sales_channel_id === salesChannelId);
|
|
51
|
+
const global = this.stateOf(globalRow);
|
|
52
|
+
const channel = salesChannelId === null ? null : { salesChannelId, ...this.stateOf(channelRow) };
|
|
53
|
+
return {
|
|
54
|
+
global,
|
|
55
|
+
channel,
|
|
56
|
+
effective: channel?.tokens ?? global.tokens ?? DEFAULT_BRAND_TOKENS,
|
|
57
|
+
};
|
|
58
|
+
}
|
|
59
|
+
/** The effective set for a channel, or the global set for `null`. */
|
|
60
|
+
async effective(salesChannelId) {
|
|
61
|
+
return (await this.read(salesChannelId)).effective;
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Save or remove one scope's set as the Command `cms.brand_tokens.update`.
|
|
65
|
+
* `tokens: null` removes the scope's row: a channel then inherits the global
|
|
66
|
+
* set, and the global scope falls back to the built-in defaults.
|
|
67
|
+
*/
|
|
68
|
+
async update(scope, tokens, expectedVersion) {
|
|
69
|
+
const salesChannelId = scope.kind === 'channel' ? scope.salesChannelId : null;
|
|
70
|
+
if (salesChannelId !== null)
|
|
71
|
+
await this.assertChannelExists(salesChannelId);
|
|
72
|
+
const { version, changed } = await this.options.commandBus.run({
|
|
73
|
+
action: CMS_BRAND_TOKENS_UPDATE_ACTION,
|
|
74
|
+
objectType: CMS_BRAND_TOKENS_OBJECT_TYPE,
|
|
75
|
+
objectId: salesChannelId ?? CMS_BRAND_TOKENS_GLOBAL_OBJECT_ID,
|
|
76
|
+
run: async ({ em: tx }) => {
|
|
77
|
+
const [row] = (await tx.execute(`select sales_channel_id::text as sales_channel_id, tokens, version
|
|
78
|
+
from cms_brand_tokens where sales_channel_id is not distinct from ?
|
|
79
|
+
for update`, [salesChannelId]));
|
|
80
|
+
const current = row?.version ?? 0;
|
|
81
|
+
if (expectedVersion !== current) {
|
|
82
|
+
throw new HttpError(409, ERROR_CODES.VERSION_CONFLICT, 'The brand tokens were updated concurrently.');
|
|
83
|
+
}
|
|
84
|
+
const before = row ? this.auditState(salesChannelId, row.tokens, row.version) : null;
|
|
85
|
+
if (tokens === null) {
|
|
86
|
+
// Nothing stored and nothing asked for: no write, so no audit entry.
|
|
87
|
+
if (!row)
|
|
88
|
+
return { result: { version: 0, changed: false }, skipAudit: true };
|
|
89
|
+
await tx.execute('delete from cms_brand_tokens where sales_channel_id is not distinct from ?', [salesChannelId]);
|
|
90
|
+
return { result: { version: 0, changed: true }, before, after: null };
|
|
91
|
+
}
|
|
92
|
+
const next = current + 1;
|
|
93
|
+
if (row) {
|
|
94
|
+
await tx.execute(`update cms_brand_tokens set tokens = ?::jsonb, version = ?, updated_at = now()
|
|
95
|
+
where sales_channel_id is not distinct from ?`, [JSON.stringify(tokens), next, salesChannelId]);
|
|
96
|
+
}
|
|
97
|
+
else {
|
|
98
|
+
// A concurrent first save of the same scope loses on the unique
|
|
99
|
+
// constraint; `on conflict do nothing` turns that into the 409 it is.
|
|
100
|
+
const inserted = (await tx.execute(`insert into cms_brand_tokens (id, sales_channel_id, tokens, version, updated_at)
|
|
101
|
+
values (?, ?, ?::jsonb, ?, now())
|
|
102
|
+
on conflict do nothing
|
|
103
|
+
returning id`, [randomUUID(), salesChannelId, JSON.stringify(tokens), next]));
|
|
104
|
+
if (Array.isArray(inserted) && inserted.length === 0) {
|
|
105
|
+
throw new HttpError(409, ERROR_CODES.VERSION_CONFLICT, 'The brand tokens were updated concurrently.');
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
return {
|
|
109
|
+
result: { version: next, changed: true },
|
|
110
|
+
before,
|
|
111
|
+
after: this.auditState(salesChannelId, tokens, next),
|
|
112
|
+
};
|
|
113
|
+
},
|
|
114
|
+
});
|
|
115
|
+
if (changed)
|
|
116
|
+
this.revalidateAfterCommit();
|
|
117
|
+
return { version, warnings: tokens === null ? [] : assessBrandContrast(tokens) };
|
|
118
|
+
}
|
|
119
|
+
/** What an audit entry keeps of a set: its scope, the whole set and its version. */
|
|
120
|
+
auditState(salesChannelId, tokens, version) {
|
|
121
|
+
return { salesChannelId, tokens: tokens, version };
|
|
122
|
+
}
|
|
123
|
+
/**
|
|
124
|
+
* A stored set as the API states it. A row the current schema refuses — a
|
|
125
|
+
* set written before a schema change — reads as unset, so the next level
|
|
126
|
+
* applies rather than a page styled from a value nobody can save again.
|
|
127
|
+
*/
|
|
128
|
+
stateOf(row) {
|
|
129
|
+
if (!row)
|
|
130
|
+
return NO_STATE;
|
|
131
|
+
const parsed = cmsBrandTokensSchema.safeParse(row.tokens);
|
|
132
|
+
if (!parsed.success) {
|
|
133
|
+
this.logger?.warn({ salesChannelId: row.sales_channel_id, issues: parsed.error.issues.length }, '[cms-brand-tokens] stored set no longer matches the schema; ignored');
|
|
134
|
+
return { tokens: null, version: row.version };
|
|
135
|
+
}
|
|
136
|
+
return { tokens: parsed.data, version: row.version };
|
|
137
|
+
}
|
|
138
|
+
async assertChannelExists(salesChannelId) {
|
|
139
|
+
// The kernel's own entity, the sanctioned access to its table (D-87).
|
|
140
|
+
const channel = await this.options
|
|
141
|
+
.emFactory()
|
|
142
|
+
.findOne(SalesChannel, { id: salesChannelId }, { fields: ['id'] });
|
|
143
|
+
if (!channel) {
|
|
144
|
+
throw new HttpError(404, ERROR_CODES.UNKNOWN_SALES_CHANNEL, 'Sales channel not found.');
|
|
145
|
+
}
|
|
146
|
+
}
|
|
147
|
+
/** Not awaited: the save has answered, and a slow storefront is not the operator's wait. */
|
|
148
|
+
revalidateAfterCommit() {
|
|
149
|
+
const revalidate = this.options.revalidateStorefront;
|
|
150
|
+
if (!revalidate)
|
|
151
|
+
return;
|
|
152
|
+
void Promise.resolve()
|
|
153
|
+
.then(() => revalidate([CMS_STOREFRONT_CACHE_TAGS.brand]))
|
|
154
|
+
.catch((err) => {
|
|
155
|
+
this.logger?.warn({ err }, '[cms-brand-tokens] storefront revalidation failed');
|
|
156
|
+
});
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
//# sourceMappingURL=brand-tokens-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"brand-tokens-service.js","sourceRoot":"","sources":["../../../src/backend/services/brand-tokens-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import { type ChannelUrlFacts } from '@endora-commerce/contracts';
|
|
2
|
+
/**
|
|
3
|
+
* Feature 167 (FR-040, FR-041) — every storefront language prefix and split alias of
|
|
4
|
+
* the given channels, each with the codes of the channels that use it. A CMS page slug
|
|
5
|
+
* starting with one of these is refused, and an existing page whose first segment is
|
|
6
|
+
* one is marked as shadowed: `/<prefix>/…` is that language's storefront page.
|
|
7
|
+
*/
|
|
8
|
+
export declare function channelLanguagePrefixes(channels: ReadonlyArray<ChannelUrlFacts & {
|
|
9
|
+
readonly code: string;
|
|
10
|
+
}>): Map<string, string[]>;
|
|
11
|
+
//# sourceMappingURL=channel-language-prefixes.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channel-language-prefixes.d.ts","sourceRoot":"","sources":["../../../src/backend/services/channel-language-prefixes.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,eAAe,EACrB,MAAM,4BAA4B,CAAC;AAEpC;;;;;GAKG;AACH,wBAAgB,uBAAuB,CACrC,QAAQ,EAAE,aAAa,CAAC,eAAe,GAAG;IAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GACnE,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAYvB"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { channelUrlLanguageAliases, channelUrlLanguages, } from '@endora-commerce/contracts';
|
|
2
|
+
/**
|
|
3
|
+
* Feature 167 (FR-040, FR-041) — every storefront language prefix and split alias of
|
|
4
|
+
* the given channels, each with the codes of the channels that use it. A CMS page slug
|
|
5
|
+
* starting with one of these is refused, and an existing page whose first segment is
|
|
6
|
+
* one is marked as shadowed: `/<prefix>/…` is that language's storefront page.
|
|
7
|
+
*/
|
|
8
|
+
export function channelLanguagePrefixes(channels) {
|
|
9
|
+
const out = new Map();
|
|
10
|
+
const add = (segment, code) => {
|
|
11
|
+
const codes = out.get(segment) ?? [];
|
|
12
|
+
if (!codes.includes(code))
|
|
13
|
+
codes.push(code);
|
|
14
|
+
out.set(segment, codes);
|
|
15
|
+
};
|
|
16
|
+
for (const channel of channels) {
|
|
17
|
+
for (const language of channelUrlLanguages(channel))
|
|
18
|
+
add(language.prefix, channel.code);
|
|
19
|
+
for (const alias of channelUrlLanguageAliases(channel))
|
|
20
|
+
add(alias.alias, channel.code);
|
|
21
|
+
}
|
|
22
|
+
return out;
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=channel-language-prefixes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"channel-language-prefixes.js","sourceRoot":"","sources":["../../../src/backend/services/channel-language-prefixes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,yBAAyB,EACzB,mBAAmB,GAEpB,MAAM,4BAA4B,CAAC;AAEpC;;;;;GAKG;AACH,MAAM,UAAU,uBAAuB,CACrC,QAAoE;IAEpE,MAAM,GAAG,GAAG,IAAI,GAAG,EAAoB,CAAC;IACxC,MAAM,GAAG,GAAG,CAAC,OAAe,EAAE,IAAY,EAAQ,EAAE;QAClD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACrC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC;YAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5C,GAAG,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAC1B,CAAC,CAAC;IACF,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,KAAK,MAAM,QAAQ,IAAI,mBAAmB,CAAC,OAAO,CAAC;YAAE,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QACxF,KAAK,MAAM,KAAK,IAAI,yBAAyB,CAAC,OAAO,CAAC;YAAE,GAAG,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IACzF,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cms-block-read-port.d.ts","sourceRoot":"","sources":["../../../src/backend/services/cms-block-read-port.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"cms-block-read-port.d.ts","sourceRoot":"","sources":["../../../src/backend/services/cms-block-read-port.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,KAAK,EACV,gBAAgB,EAChB,cAAc,EACd,uBAAuB,EACxB,MAAM,4BAA4B,CAAC;AAIpC;;;;;;;;;;;;;;;;;GAiBG;AACH,qBAAa,mBAAoB,YAAW,gBAAgB;IAC9C,OAAO,CAAC,QAAQ,CAAC,SAAS;gBAAT,SAAS,EAAE,MAAM,aAAa;IAErD,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,IAAI,CAAC;IAKpD,iBAAiB,CACrB,EAAE,EAAE,MAAM,EACV,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,uBAAuB,GAAG,IAAI,CAAC;CAqB3C"}
|
|
@@ -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 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cms-block-read-port.js","sourceRoot":"","sources":["../../../src/backend/services/cms-block-read-port.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"cms-block-read-port.js","sourceRoot":"","sources":["../../../src/backend/services/cms-block-read-port.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAEzD;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,OAAO,mBAAmB;IACD;IAA7B,YAA6B,SAA8B;QAA9B,cAAS,GAAT,SAAS,CAAqB;IAAG,CAAC;IAE/D,KAAK,CAAC,QAAQ,CAAC,EAAU;QACvB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;QAC/D,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACjF,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,EAAU,EACV,QAAgB;QAEhB;;;;;WAKG;QACH,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC;QAClC,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,SAAS,EAAE,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAC7E,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,SAAS,GAAI,KAAK,CAAC,OAAmD,CAAC,SAAS,CAAC;QACvF,MAAM,IAAI,GAAG,SAAS,EAAE,CAAC,QAAQ,CAAC,CAAC;QACnC,0EAA0E;QAC1E,0EAA0E;QAC1E,6EAA6E;QAC7E,+CAA+C;QAC/C,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO,IAAI,CAAC;QAEpC,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5D,CAAC;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cms-block-service.d.ts","sourceRoot":"","sources":["../../../src/backend/services/cms-block-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,
|
|
1
|
+
{"version":3,"file":"cms-block-service.d.ts","sourceRoot":"","sources":["../../../src/backend/services/cms-block-service.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AAC3D,OAAO,EAEL,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,qBAAqB,EAC1B,KAAK,oBAAoB,EAE1B,MAAM,4BAA4B,CAAC;AAEpC,OAAO,KAAK,EAAc,UAAU,EAAE,MAAM,oCAAoC,CAAC;AAGjF,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAC;AAuB1E;;;;;;;;;;;;;GAaG;AACH,qBAAa,eAAe;IAExB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B;;;;OAIG;IACH,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;gBATZ,SAAS,EAAE,MAAM,aAAa;IAC/C;;;;OAIG;IACc,UAAU,EAAE,UAAU,EACtB,mBAAmB,EAAE,MAAM,QAAQ,CAAC,MAAM,CAAC,EAC3C,UAAU,EAAE,oBAAoB,EAChC,WAAW,CAAC,EAAE,qBAAqB,YAAA;IAGtD,qFAAqF;YACvE,uBAAuB;IAIrC;;;;;OAKG;YACW,UAAU;IAYlB,IAAI,CAAC,OAAO,GAAE;QAAE,cAAc,CAAC,EAAE,MAAM,CAAA;KAAO,GAAG,OAAO,CAAC;QAC7D,IAAI,EAAE,eAAe,EAAE,CAAC;QACxB,UAAU,EAAE,IAAI,CAAC;KAClB,CAAC;IAwBI,MAAM,CAAC,KAAK,EAAE,qBAAqB,GAAG,OAAO,CAAC,cAAc,CAAC;IAsC7D,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAMxC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,oBAAoB,GAAG,OAAO,CAAC,cAAc,CAAC;IA6DvE,UAAU,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAyCjG,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAyBzB,OAAO;YASP,mBAAmB;YAoBnB,mBAAmB;YAkBnB,aAAa;IAQ3B,OAAO,CAAC,aAAa;YAMP,SAAS;YAeT,QAAQ;IAStB,OAAO,CAAC,GAAG;CAGZ"}
|
|
@@ -1,7 +1,8 @@
|
|
|
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
|
+
import { assertAnchors } from './anchor-guard.js';
|
|
5
6
|
const emptyContent = { languages: {} };
|
|
6
7
|
/**
|
|
7
8
|
* The audit `objectType` of every Block write. One value, so the trail of one
|
|
@@ -189,6 +190,8 @@ export class CmsBlockService {
|
|
|
189
190
|
if (!row)
|
|
190
191
|
throw new HttpError(404, ERROR_CODES.CMS_BLOCK_NOT_FOUND, 'CMS Block not found.');
|
|
191
192
|
this.assertVersion(row, version);
|
|
193
|
+
// One anchor names one place in this language's tree (feature 163, R-8).
|
|
194
|
+
assertAnchors({ [language]: data });
|
|
192
195
|
invalidatedCode = row.code;
|
|
193
196
|
const unknown = walkUnknownComponents(data, new Set(this.knownComponentNames()));
|
|
194
197
|
if (unknown.size > 0) {
|
|
@@ -239,6 +242,9 @@ export class CmsBlockService {
|
|
|
239
242
|
await this.invalidateForBlockCodes([row.code]);
|
|
240
243
|
}
|
|
241
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;
|
|
242
248
|
const rows = (await em.execute('select * from cms_blocks where id = ?', [
|
|
243
249
|
id,
|
|
244
250
|
]));
|