@redneckz/wildless-cms-uni-blocks 0.14.859 → 0.14.860

package/mobile/src/components/ContentPage/computeAPIFallback.ts

@@ -1,21 +1,53 @@
 import { type JSONNode } from '@redneckz/json-op';
 import { collectRef, resolveJPointer } from '@redneckz/json-ref';
 import { ContentPageRepository } from '../../content-page-repository/ContentPageRepository';
+import { type BlocksRegistry } from '../../model/BlocksRegistry';
 import { type ContentPageDef } from '../../model/ContentPageDef';
-import { type Fallback } from '../../model/Fallback';
+import { type Fallback, type FallbackMap } from '../../model/Fallback';
 import { unique } from '../../utils/unique';
 import { joinPath } from '../../utils/url';
+import { loadModuleFallback } from './loadModuleFallback';
 
 type FallbackEntry = [key: string, data: JSONNode];
 
 const BASE_DIR = 'content';
 
-export const computeAPIFallback = async (contentPageData: ContentPageDef): Promise<Fallback> => {
+export const computeAPIFallback = async (
+  blocksRegistry: BlocksRegistry,
+  contentPageData: ContentPageDef,
+): Promise<Fallback> => {
   return Object.fromEntries(
-    (await computeFallbackFromContentRefs(contentPageData)).filter(([key, data]) => key && data),
+    (
+      await Promise.all([
+        computeFallbackFromModules(blocksRegistry),
+        computeFallbackFromContentRefs(contentPageData),
+      ])
+    )
+      .flatMap((_) => _)
+      .filter(([key, data]) => key && data),
   );
 };
 
+const computeFallbackFromModules = async (
+  blocksRegistry: BlocksRegistry,
+): Promise<FallbackEntry[]> => {
+  const fallbackMap: FallbackMap = (
+    await Promise.all(Object.keys(blocksRegistry).map(loadModuleFallback))
+  )
+    .filter((_): _ is FallbackMap => Boolean(_))
+    .reduce((acc, _) => ({ ...acc, ..._ }), {});
+
+  return (
+    await Promise.allSettled(
+      Object.entries(fallbackMap).map(
+        async ([key, fetcher]): Promise<FallbackEntry> => [key, await fetcher()],
+      ),
+    )
+  )
+    .filter((_): _ is PromiseFulfilledResult<FallbackEntry> => _.status === 'fulfilled')
+    .map(({ value }) => value);
+};
+
 const computeFallbackFromContentRefs = async (
   contentPageData: ContentPageDef,
 ): Promise<FallbackEntry[]> => {

package/mobile/src/components/ContentPage/loadModuleFallback.ts

@@ -0,0 +1,11 @@
+import { type FallbackMap } from '../../model/Fallback';
+
+export const loadModuleFallback = async (blockName: string): Promise<FallbackMap | undefined> => {
+  try {
+    const blockFallback = await import(`../${blockName}/${blockName}.fallback`);
+
+    return blockFallback?.fallback ? await blockFallback.fallback() : undefined;
+  } catch (error) {
+    return undefined;
+  }
+};

package/mobile/src/components/ContentPage/mapSlot.ts

@@ -0,0 +1,18 @@
+import { type BlockDef, type Slot } from '../../model/ContentPageDef';
+
+export const mapSlot =
+  (mapper: (blocks?: BlockDef[]) => BlockDef[]) =>
+  <S extends Slot>(slot: S): S => ({
+    ...slot,
+    ...(slot.blocks ? { blocks: mapper(slot.blocks) } : {}),
+    ...(slot.slots
+      ? {
+          slots: Object.fromEntries(
+            Object.entries(slot.slots).map(([slotKey, slotBlocks]) => [
+              slotKey,
+              mapper(slotBlocks),
+            ]),
+          ),
+        }
+      : {}),
+  });

package/mobile/src/components/ContentPage/normalizeBlock.ts

@@ -0,0 +1,25 @@
+import { type BlocksRegistry } from '../../model/BlocksRegistry';
+import { type BlockDef, type Slot } from '../../model/ContentPageDef';
+import { mapSlot } from './mapSlot';
+import { toMobileBlock } from './toMobileBlock';
+
+export function normalizeBlock<S extends Slot>(block?: S, blocksRegistry?: BlocksRegistry): S {
+  const { mobile } = (block || {}) as BlockDef;
+
+  return mapSlot(filterBlocks(blocksRegistry))((mobile ? toMobileBlock(block) : block) || {}) as S;
+}
+
+const filterBlocks =
+  (blocksRegistry?: BlocksRegistry) =>
+  (blocks?: BlockDef[]): BlockDef[] =>
+    blocks
+      ? blocks
+          ?.filter(
+            (block) =>
+              blocksRegistry &&
+              (block?.type || block?.mobile?.type || '') in blocksRegistry &&
+              !block.mobile?.hidden &&
+              !block?.hidden,
+          )
+          .map((block) => normalizeBlock(block, blocksRegistry))
+      : [];

package/mobile/src/components/ContentPage/normalizePage.ts

@@ -0,0 +1,8 @@
+import { type BlocksRegistry } from '../../model/BlocksRegistry';
+import { type ContentPageDef } from '../../model/ContentPageDef';
+import { normalizeBlock } from './normalizeBlock';
+
+export const normalizePage =
+  (blocksRegistry: BlocksRegistry) =>
+  (contentPage: ContentPageDef | undefined | null): ContentPageDef =>
+    contentPage ? normalizeBlock(contentPage, blocksRegistry) : {};

package/mobile/src/components/ContentPage/toMobileBlock.ts

@@ -0,0 +1,11 @@
+import { type BlockDef } from '../../model/ContentPageDef';
+
+export function toMobileBlock(block: BlockDef = {}): BlockDef {
+  const { mobile, ...desktop } = block;
+
+  return {
+    ...desktop,
+    ...(mobile?.style ? { style: mobile.style } : {}),
+    ...(mobile?.content ? { content: mobile.content } : {}),
+  };
+}

package/mobile/src/model/Fallback.ts

@@ -1,4 +1,5 @@
 type Key = string;
 type Data = any;
 
+export type FallbackMap = Record<Key, () => Promise<Data>>;
 export type Fallback = Record<Key, Data>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.859",
+  "version": "0.14.860",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/ContentPage/ContentPage.fixture.mobile.tsx

@@ -4,12 +4,15 @@ import '../../setup-fixture';
 import { type ContentPageDef } from '../../model/ContentPageDef';
 import { Blocks } from '../Blocks';
 import { ContentPage } from './ContentPage';
+import { normalizePage } from './normalizePage';
 import { useContentPageData } from './useContentPageData';
 
 export default {
   default: () => {
     const data = useContentPageData(Blocks);
 
-    return <ContentPage blocksRegistry={Blocks} data={data as ContentPageDef} />;
+    return (
+      <ContentPage blocksRegistry={Blocks} data={normalizePage(Blocks)(data as ContentPageDef)} />
+    );
   },
 };

package/src/components/ContentPage/ContentPage.fixture.tsx

@@ -5,6 +5,7 @@ import { type BlockDecorator } from '../../model/BlockDecorator';
 import { type ContentPageDef } from '../../model/ContentPageDef';
 import { Blocks } from '../Blocks';
 import { ContentPage } from './ContentPage';
+import { normalizePage } from './normalizePage';
 import { useContentPageData } from './useContentPageData';
 
 const blockDecorator: BlockDecorator = ({ blockClassName, block, render }, i) => (
@@ -32,7 +33,11 @@ export default {
     const data = useContentPageData(Blocks);
 
     return (
-      <ContentPage className="bg-main" blocksRegistry={Blocks} data={data as ContentPageDef} />
+      <ContentPage
+        className="bg-main"
+        blocksRegistry={Blocks}
+        data={normalizePage(Blocks)(data as ContentPageDef)}
+      />
     );
   },
   editor: () => {
@@ -43,7 +48,7 @@ export default {
         <ContentPage
           className="bg-transparent"
           blocksRegistry={Blocks}
-          data={data as ContentPageDef}
+          data={normalizePage(Blocks)(data as ContentPageDef)}
           blockDecorator={blockDecorator}
         />
       </div>

package/src/components/ContentPage/computeAPIFallback.ts

@@ -1,21 +1,53 @@
 import { type JSONNode } from '@redneckz/json-op';
 import { collectRef, resolveJPointer } from '@redneckz/json-ref';
 import { ContentPageRepository } from '../../content-page-repository/ContentPageRepository';
+import { type BlocksRegistry } from '../../model/BlocksRegistry';
 import { type ContentPageDef } from '../../model/ContentPageDef';
-import { type Fallback } from '../../model/Fallback';
+import { type Fallback, type FallbackMap } from '../../model/Fallback';
 import { unique } from '../../utils/unique';
 import { joinPath } from '../../utils/url';
+import { loadModuleFallback } from './loadModuleFallback';
 
 type FallbackEntry = [key: string, data: JSONNode];
 
 const BASE_DIR = 'content';
 
-export const computeAPIFallback = async (contentPageData: ContentPageDef): Promise<Fallback> => {
+export const computeAPIFallback = async (
+  blocksRegistry: BlocksRegistry,
+  contentPageData: ContentPageDef,
+): Promise<Fallback> => {
   return Object.fromEntries(
-    (await computeFallbackFromContentRefs(contentPageData)).filter(([key, data]) => key && data),
+    (
+      await Promise.all([
+        computeFallbackFromModules(blocksRegistry),
+        computeFallbackFromContentRefs(contentPageData),
+      ])
+    )
+      .flatMap((_) => _)
+      .filter(([key, data]) => key && data),
   );
 };
 
+const computeFallbackFromModules = async (
+  blocksRegistry: BlocksRegistry,
+): Promise<FallbackEntry[]> => {
+  const fallbackMap: FallbackMap = (
+    await Promise.all(Object.keys(blocksRegistry).map(loadModuleFallback))
+  )
+    .filter((_): _ is FallbackMap => Boolean(_))
+    .reduce((acc, _) => ({ ...acc, ..._ }), {});
+
+  return (
+    await Promise.allSettled(
+      Object.entries(fallbackMap).map(
+        async ([key, fetcher]): Promise<FallbackEntry> => [key, await fetcher()],
+      ),
+    )
+  )
+    .filter((_): _ is PromiseFulfilledResult<FallbackEntry> => _.status === 'fulfilled')
+    .map(({ value }) => value);
+};
+
 const computeFallbackFromContentRefs = async (
   contentPageData: ContentPageDef,
 ): Promise<FallbackEntry[]> => {

package/src/components/ContentPage/loadModuleFallback.ts

@@ -0,0 +1,11 @@
+import { type FallbackMap } from '../../model/Fallback';
+
+export const loadModuleFallback = async (blockName: string): Promise<FallbackMap | undefined> => {
+  try {
+    const blockFallback = await import(`../${blockName}/${blockName}.fallback`);
+
+    return blockFallback?.fallback ? await blockFallback.fallback() : undefined;
+  } catch (error) {
+    return undefined;
+  }
+};

package/src/components/ContentPage/mapSlot.ts

@@ -0,0 +1,18 @@
+import { type BlockDef, type Slot } from '../../model/ContentPageDef';
+
+export const mapSlot =
+  (mapper: (blocks?: BlockDef[]) => BlockDef[]) =>
+  <S extends Slot>(slot: S): S => ({
+    ...slot,
+    ...(slot.blocks ? { blocks: mapper(slot.blocks) } : {}),
+    ...(slot.slots
+      ? {
+          slots: Object.fromEntries(
+            Object.entries(slot.slots).map(([slotKey, slotBlocks]) => [
+              slotKey,
+              mapper(slotBlocks),
+            ]),
+          ),
+        }
+      : {}),
+  });

package/src/components/ContentPage/normalizeBlock.mobile.ts

@@ -0,0 +1,25 @@
+import { type BlocksRegistry } from '../../model/BlocksRegistry';
+import { type BlockDef, type Slot } from '../../model/ContentPageDef';
+import { mapSlot } from './mapSlot';
+import { toMobileBlock } from './toMobileBlock';
+
+export function normalizeBlock<S extends Slot>(block?: S, blocksRegistry?: BlocksRegistry): S {
+  const { mobile } = (block || {}) as BlockDef;
+
+  return mapSlot(filterBlocks(blocksRegistry))((mobile ? toMobileBlock(block) : block) || {}) as S;
+}
+
+const filterBlocks =
+  (blocksRegistry?: BlocksRegistry) =>
+  (blocks?: BlockDef[]): BlockDef[] =>
+    blocks
+      ? blocks
+          ?.filter(
+            (block) =>
+              blocksRegistry &&
+              (block?.type || block?.mobile?.type || '') in blocksRegistry &&
+              !block.mobile?.hidden &&
+              !block?.hidden,
+          )
+          .map((block) => normalizeBlock(block, blocksRegistry))
+      : [];

package/src/components/ContentPage/normalizeBlock.ts

@@ -0,0 +1,21 @@
+import { type BlocksRegistry } from '../../model/BlocksRegistry';
+import { type BlockDef, type Slot } from '../../model/ContentPageDef';
+import { mapSlot } from './mapSlot';
+
+export function normalizeBlock<S extends Slot>(block?: S, blocksRegistry?: BlocksRegistry): S {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const { mobile, ...result } = (block || {}) as BlockDef;
+
+  return mapSlot(filterBlocks(blocksRegistry))({ ...result }) as S;
+}
+
+const filterBlocks =
+  (blocksRegistry?: BlocksRegistry) =>
+  (blocks?: BlockDef[]): BlockDef[] =>
+    blocks
+      ? blocks
+          ?.filter(
+            (block) => blocksRegistry && (block?.type || '') in blocksRegistry && !block?.hidden,
+          )
+          .map((block) => normalizeBlock(block, blocksRegistry))
+      : [];

package/src/components/ContentPage/normalizePage.ts

@@ -0,0 +1,8 @@
+import { type BlocksRegistry } from '../../model/BlocksRegistry';
+import { type ContentPageDef } from '../../model/ContentPageDef';
+import { normalizeBlock } from './normalizeBlock';
+
+export const normalizePage =
+  (blocksRegistry: BlocksRegistry) =>
+  (contentPage: ContentPageDef | undefined | null): ContentPageDef =>
+    contentPage ? normalizeBlock(contentPage, blocksRegistry) : {};

package/src/components/ContentPage/toMobileBlock.ts

@@ -0,0 +1,11 @@
+import { type BlockDef } from '../../model/ContentPageDef';
+
+export function toMobileBlock(block: BlockDef = {}): BlockDef {
+  const { mobile, ...desktop } = block;
+
+  return {
+    ...desktop,
+    ...(mobile?.style ? { style: mobile.style } : {}),
+    ...(mobile?.content ? { content: mobile.content } : {}),
+  };
+}

package/src/model/Fallback.ts

@@ -1,4 +1,5 @@
 type Key = string;
 type Data = any;
 
+export type FallbackMap = Record<Key, () => Promise<Data>>;
 export type Fallback = Record<Key, Data>;