@redneckz/wildless-cms-uni-blocks 0.15.338 → 0.15.339

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.
Files changed (45) hide show
  1. package/bundle/bundle.umd.js +1 -1
  2. package/bundle/bundle.umd.min.js +1 -1
  3. package/bundle/components/ContentPage/computeAPIFallback.d.ts +1 -2
  4. package/bundle/model/Fallback.d.ts +0 -1
  5. package/dist/components/ContentPage/computeAPIFallback.d.ts +1 -2
  6. package/dist/components/ContentPage/computeAPIFallback.js +2 -16
  7. package/dist/components/ContentPage/computeAPIFallback.js.map +1 -1
  8. package/dist/model/Fallback.d.ts +0 -1
  9. package/lib/components/ContentPage/computeAPIFallback.d.ts +1 -2
  10. package/lib/components/ContentPage/computeAPIFallback.js +2 -16
  11. package/lib/components/ContentPage/computeAPIFallback.js.map +1 -1
  12. package/lib/model/Fallback.d.ts +0 -1
  13. package/mobile/bundle/bundle.umd.js +1 -1
  14. package/mobile/bundle/bundle.umd.min.js +1 -1
  15. package/mobile/bundle/components/ContentPage/computeAPIFallback.d.ts +1 -2
  16. package/mobile/bundle/model/Fallback.d.ts +0 -1
  17. package/mobile/dist/components/ContentPage/computeAPIFallback.d.ts +1 -2
  18. package/mobile/dist/components/ContentPage/computeAPIFallback.js +2 -16
  19. package/mobile/dist/components/ContentPage/computeAPIFallback.js.map +1 -1
  20. package/mobile/dist/model/Fallback.d.ts +0 -1
  21. package/mobile/lib/components/ContentPage/computeAPIFallback.d.ts +1 -2
  22. package/mobile/lib/components/ContentPage/computeAPIFallback.js +2 -16
  23. package/mobile/lib/components/ContentPage/computeAPIFallback.js.map +1 -1
  24. package/mobile/lib/model/Fallback.d.ts +0 -1
  25. package/mobile/src/components/ContentPage/computeAPIFallback.ts +3 -35
  26. package/mobile/src/model/Fallback.ts +0 -1
  27. package/package.json +1 -1
  28. package/src/components/ContentPage/computeAPIFallback.ts +3 -35
  29. package/src/model/Fallback.ts +0 -1
  30. package/bundle/components/ContentPage/loadModuleFallback.d.ts +0 -2
  31. package/dist/components/ContentPage/loadModuleFallback.d.ts +0 -2
  32. package/dist/components/ContentPage/loadModuleFallback.js +0 -36
  33. package/dist/components/ContentPage/loadModuleFallback.js.map +0 -1
  34. package/lib/components/ContentPage/loadModuleFallback.d.ts +0 -2
  35. package/lib/components/ContentPage/loadModuleFallback.js +0 -10
  36. package/lib/components/ContentPage/loadModuleFallback.js.map +0 -1
  37. package/mobile/bundle/components/ContentPage/loadModuleFallback.d.ts +0 -2
  38. package/mobile/dist/components/ContentPage/loadModuleFallback.d.ts +0 -2
  39. package/mobile/dist/components/ContentPage/loadModuleFallback.js +0 -36
  40. package/mobile/dist/components/ContentPage/loadModuleFallback.js.map +0 -1
  41. package/mobile/lib/components/ContentPage/loadModuleFallback.d.ts +0 -2
  42. package/mobile/lib/components/ContentPage/loadModuleFallback.js +0 -10
  43. package/mobile/lib/components/ContentPage/loadModuleFallback.js.map +0 -1
  44. package/mobile/src/components/ContentPage/loadModuleFallback.ts +0 -11
  45. package/src/components/ContentPage/loadModuleFallback.ts +0 -11
@@ -1,4 +1,3 @@
1
- import { type BlocksRegistry } from '../../model/BlocksRegistry';
2
1
  import { type ContentPageDef } from '../../model/ContentPageDef';
3
2
  import { type Fallback } from '../../model/Fallback';
4
- export declare const computeAPIFallback: (blocksRegistry: BlocksRegistry, contentPageData: ContentPageDef) => Promise<Fallback>;
3
+ export declare const computeAPIFallback: (contentPageData: ContentPageDef) => Promise<Fallback>;
@@ -1,5 +1,4 @@
1
1
  declare type Key = string;
2
2
  declare type Data = any;
3
- export declare type FallbackMap = Record<Key, () => Promise<Data>>;
4
3
  export declare type Fallback = Record<Key, Data>;
5
4
  export {};
@@ -1,4 +1,3 @@
1
- import { type BlocksRegistry } from '../../model/BlocksRegistry';
2
1
  import { type ContentPageDef } from '../../model/ContentPageDef';
3
2
  import { type Fallback } from '../../model/Fallback';
4
- export declare const computeAPIFallback: (blocksRegistry: BlocksRegistry, contentPageData: ContentPageDef) => Promise<Fallback>;
3
+ export declare const computeAPIFallback: (contentPageData: ContentPageDef) => Promise<Fallback>;
@@ -4,25 +4,11 @@ const json_ref_1 = require("@redneckz/json-ref");
4
4
  const promises_1 = require("fs/promises");
5
5
  const unique_1 = require("../../utils/unique");
6
6
  const url_1 = require("../../utils/url");
7
- const loadModuleFallback_1 = require("./loadModuleFallback");
8
7
  const BASE_DIR = 'content';
9
- const computeAPIFallback = async (blocksRegistry, contentPageData) => {
10
- return Object.fromEntries((await Promise.all([
11
- computeFallbackFromModules(blocksRegistry),
12
- computeFallbackFromContentRefs(contentPageData),
13
- ]))
14
- .flatMap((_) => _)
15
- .filter(([key, data]) => key && data));
8
+ const computeAPIFallback = async (contentPageData) => {
9
+ return Object.fromEntries((await computeFallbackFromContentRefs(contentPageData)).filter(([key, data]) => key && data));
16
10
  };
17
11
  exports.computeAPIFallback = computeAPIFallback;
18
- const computeFallbackFromModules = async (blocksRegistry) => {
19
- const fallbackMap = (await Promise.all(Object.keys(blocksRegistry).map(loadModuleFallback_1.loadModuleFallback)))
20
- .filter((_) => Boolean(_))
21
- .reduce((acc, _) => ({ ...acc, ..._ }), {});
22
- return (await Promise.allSettled(Object.entries(fallbackMap).map(async ([key, fetcher]) => [key, await fetcher()])))
23
- .filter((_) => _.status === 'fulfilled')
24
- .map(({ value }) => value);
25
- };
26
12
  const computeFallbackFromContentRefs = async (contentPageData) => {
27
13
  const refs = (0, unique_1.unique)((0, json_ref_1.collectRef)(contentPageData));
28
14
  return (await Promise.allSettled(refs.map(async (_) => [_, JSON.parse(await (0, promises_1.readFile)((0, url_1.joinPath)(BASE_DIR, _), 'utf-8'))])))
@@ -1 +1 @@
1
- {"version":3,"file":"computeAPIFallback.js","sourceRoot":"","sources":["../../../src/components/ContentPage/computeAPIFallback.ts"],"names":[],"mappings":";;AAAA,iDAAgF;AAChF,0CAAuC;AAIvC,+CAA4C;AAC5C,yCAA2C;AAC3C,6DAA0D;AAI1D,MAAM,QAAQ,GAAG,SAAS,CAAC;AAEpB,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,eAA+B,EACZ,EAAE;IACrB,OAAO,MAAM,CAAC,WAAW,CACvB,CACE,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,0BAA0B,CAAC,cAAc,CAAC;QAC1C,8BAA8B,CAAC,eAAe,CAAC;KAChD,CAAC,CACH;SACE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACjB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CACxC,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,kBAAkB,sBAc7B;AAEF,MAAM,0BAA0B,GAAG,KAAK,EACtC,cAA8B,EACJ,EAAE;IAC5B,MAAM,WAAW,GAAgB,CAC/B,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,uCAAkB,CAAC,CAAC,CACvE;SACE,MAAM,CAAC,CAAC,CAAC,EAAoB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC3C,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAE9C,OAAO,CACL,MAAM,OAAO,CAAC,UAAU,CACtB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAC7B,KAAK,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,EAA0B,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,OAAO,EAAE,CAAC,CACzE,CACF,CACF;SACE,MAAM,CAAC,CAAC,CAAC,EAA8C,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;SACnF,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,KAAK,EAC1C,eAA+B,EACL,EAAE;IAC5B,MAAM,IAAI,GAAG,IAAA,eAAM,EAAC,IAAA,qBAAU,EAAC,eAA2B,CAAC,CAAC,CAAC;IAE7D,OAAO,CACL,MAAM,OAAO,CAAC,UAAU,CACtB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,IAAA,cAAQ,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CACvF,CACF;SACE,MAAM,CAAC,CAAC,CAAC,EAA8C,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;SACnF,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAA,0BAAe,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC"}
1
+ {"version":3,"file":"computeAPIFallback.js","sourceRoot":"","sources":["../../../src/components/ContentPage/computeAPIFallback.ts"],"names":[],"mappings":";;AAAA,iDAAgF;AAChF,0CAAuC;AAGvC,+CAA4C;AAC5C,yCAA2C;AAI3C,MAAM,QAAQ,GAAG,SAAS,CAAC;AAEpB,MAAM,kBAAkB,GAAG,KAAK,EAAE,eAA+B,EAAqB,EAAE;IAC7F,OAAO,MAAM,CAAC,WAAW,CACvB,CAAC,MAAM,8BAA8B,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAC7F,CAAC;AACJ,CAAC,CAAC;AAJW,QAAA,kBAAkB,sBAI7B;AAEF,MAAM,8BAA8B,GAAG,KAAK,EAC1C,eAA+B,EACL,EAAE;IAC5B,MAAM,IAAI,GAAG,IAAA,eAAM,EAAC,IAAA,qBAAU,EAAC,eAA2B,CAAC,CAAC,CAAC;IAE7D,OAAO,CACL,MAAM,OAAO,CAAC,UAAU,CACtB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,IAAA,mBAAQ,EAAC,IAAA,cAAQ,EAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CACvF,CACF;SACE,MAAM,CAAC,CAAC,CAAC,EAA8C,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;SACnF,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,IAAA,0BAAe,EAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC"}
@@ -1,5 +1,4 @@
1
1
  declare type Key = string;
2
2
  declare type Data = any;
3
- export declare type FallbackMap = Record<Key, () => Promise<Data>>;
4
3
  export declare type Fallback = Record<Key, Data>;
5
4
  export {};
@@ -1,4 +1,3 @@
1
- import { type BlocksRegistry } from '../../model/BlocksRegistry';
2
1
  import { type ContentPageDef } from '../../model/ContentPageDef';
3
2
  import { type Fallback } from '../../model/Fallback';
4
- export declare const computeAPIFallback: (blocksRegistry: BlocksRegistry, contentPageData: ContentPageDef) => Promise<Fallback>;
3
+ export declare const computeAPIFallback: (contentPageData: ContentPageDef) => Promise<Fallback>;
@@ -2,23 +2,9 @@ import { collectRef, resolveJPointer } from '@redneckz/json-ref';
2
2
  import { readFile } from 'fs/promises';
3
3
  import { unique } from '../../utils/unique.js';
4
4
  import { joinPath } from '../../utils/url.js';
5
- import { loadModuleFallback } from './loadModuleFallback.js';
6
5
  const BASE_DIR = 'content';
7
- export const computeAPIFallback = async (blocksRegistry, contentPageData) => {
8
- return Object.fromEntries((await Promise.all([
9
- computeFallbackFromModules(blocksRegistry),
10
- computeFallbackFromContentRefs(contentPageData),
11
- ]))
12
- .flatMap((_) => _)
13
- .filter(([key, data]) => key && data));
14
- };
15
- const computeFallbackFromModules = async (blocksRegistry) => {
16
- const fallbackMap = (await Promise.all(Object.keys(blocksRegistry).map(loadModuleFallback)))
17
- .filter((_) => Boolean(_))
18
- .reduce((acc, _) => ({ ...acc, ..._ }), {});
19
- return (await Promise.allSettled(Object.entries(fallbackMap).map(async ([key, fetcher]) => [key, await fetcher()])))
20
- .filter((_) => _.status === 'fulfilled')
21
- .map(({ value }) => value);
6
+ export const computeAPIFallback = async (contentPageData) => {
7
+ return Object.fromEntries((await computeFallbackFromContentRefs(contentPageData)).filter(([key, data]) => key && data));
22
8
  };
23
9
  const computeFallbackFromContentRefs = async (contentPageData) => {
24
10
  const refs = unique(collectRef(contentPageData));
@@ -1 +1 @@
1
- {"version":3,"file":"computeAPIFallback.js","sourceRoot":"","sources":["../../../src/components/ContentPage/computeAPIFallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAiB,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAIvC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAI1D,MAAM,QAAQ,GAAG,SAAS,CAAC;AAE3B,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,cAA8B,EAC9B,eAA+B,EACZ,EAAE;IACrB,OAAO,MAAM,CAAC,WAAW,CACvB,CACE,MAAM,OAAO,CAAC,GAAG,CAAC;QAChB,0BAA0B,CAAC,cAAc,CAAC;QAC1C,8BAA8B,CAAC,eAAe,CAAC;KAChD,CAAC,CACH;SACE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;SACjB,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CACxC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,0BAA0B,GAAG,KAAK,EACtC,cAA8B,EACJ,EAAE;IAC5B,MAAM,WAAW,GAAgB,CAC/B,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAC,CACvE;SACE,MAAM,CAAC,CAAC,CAAC,EAAoB,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC3C,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAE9C,OAAO,CACL,MAAM,OAAO,CAAC,UAAU,CACtB,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,GAAG,CAC7B,KAAK,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,EAA0B,EAAE,CAAC,CAAC,GAAG,EAAE,MAAM,OAAO,EAAE,CAAC,CACzE,CACF,CACF;SACE,MAAM,CAAC,CAAC,CAAC,EAA8C,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;SACnF,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,KAAK,EAC1C,eAA+B,EACL,EAAE;IAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,eAA2B,CAAC,CAAC,CAAC;IAE7D,OAAO,CACL,MAAM,OAAO,CAAC,UAAU,CACtB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CACvF,CACF;SACE,MAAM,CAAC,CAAC,CAAC,EAA8C,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;SACnF,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC"}
1
+ {"version":3,"file":"computeAPIFallback.js","sourceRoot":"","sources":["../../../src/components/ContentPage/computeAPIFallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,eAAe,EAAiB,MAAM,oBAAoB,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAGvC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAI3C,MAAM,QAAQ,GAAG,SAAS,CAAC;AAE3B,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,eAA+B,EAAqB,EAAE;IAC7F,OAAO,MAAM,CAAC,WAAW,CACvB,CAAC,MAAM,8BAA8B,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,CAC7F,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,8BAA8B,GAAG,KAAK,EAC1C,eAA+B,EACL,EAAE;IAC5B,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,eAA2B,CAAC,CAAC,CAAC;IAE7D,OAAO,CACL,MAAM,OAAO,CAAC,UAAU,CACtB,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CACvF,CACF;SACE,MAAM,CAAC,CAAC,CAAC,EAA8C,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,WAAW,CAAC;SACnF,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC;SACzB,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,eAAe,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;AAC7D,CAAC,CAAC"}
@@ -1,5 +1,4 @@
1
1
  declare type Key = string;
2
2
  declare type Data = any;
3
- export declare type FallbackMap = Record<Key, () => Promise<Data>>;
4
3
  export declare type Fallback = Record<Key, Data>;
5
4
  export {};
@@ -1,52 +1,20 @@
1
1
  import { collectRef, resolveJPointer, type JSONNode } from '@redneckz/json-ref';
2
2
  import { readFile } from 'fs/promises';
3
- import { type BlocksRegistry } from '../../model/BlocksRegistry';
4
3
  import { type ContentPageDef } from '../../model/ContentPageDef';
5
- import { type Fallback, type FallbackMap } from '../../model/Fallback';
4
+ import { type Fallback } from '../../model/Fallback';
6
5
  import { unique } from '../../utils/unique';
7
6
  import { joinPath } from '../../utils/url';
8
- import { loadModuleFallback } from './loadModuleFallback';
9
7
 
10
8
  type FallbackEntry = [key: string, data: JSONNode];
11
9
 
12
10
  const BASE_DIR = 'content';
13
11
 
14
- export const computeAPIFallback = async (
15
- blocksRegistry: BlocksRegistry,
16
- contentPageData: ContentPageDef,
17
- ): Promise<Fallback> => {
12
+ export const computeAPIFallback = async (contentPageData: ContentPageDef): Promise<Fallback> => {
18
13
  return Object.fromEntries(
19
- (
20
- await Promise.all([
21
- computeFallbackFromModules(blocksRegistry),
22
- computeFallbackFromContentRefs(contentPageData),
23
- ])
24
- )
25
- .flatMap((_) => _)
26
- .filter(([key, data]) => key && data),
14
+ (await computeFallbackFromContentRefs(contentPageData)).filter(([key, data]) => key && data),
27
15
  );
28
16
  };
29
17
 
30
- const computeFallbackFromModules = async (
31
- blocksRegistry: BlocksRegistry,
32
- ): Promise<FallbackEntry[]> => {
33
- const fallbackMap: FallbackMap = (
34
- await Promise.all(Object.keys(blocksRegistry).map(loadModuleFallback))
35
- )
36
- .filter((_): _ is FallbackMap => Boolean(_))
37
- .reduce((acc, _) => ({ ...acc, ..._ }), {});
38
-
39
- return (
40
- await Promise.allSettled(
41
- Object.entries(fallbackMap).map(
42
- async ([key, fetcher]): Promise<FallbackEntry> => [key, await fetcher()],
43
- ),
44
- )
45
- )
46
- .filter((_): _ is PromiseFulfilledResult<FallbackEntry> => _.status === 'fulfilled')
47
- .map(({ value }) => value);
48
- };
49
-
50
18
  const computeFallbackFromContentRefs = async (
51
19
  contentPageData: ContentPageDef,
52
20
  ): Promise<FallbackEntry[]> => {
@@ -1,5 +1,4 @@
1
1
  type Key = string;
2
2
  type Data = any;
3
3
 
4
- export type FallbackMap = Record<Key, () => Promise<Data>>;
5
4
  export type Fallback = Record<Key, Data>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@redneckz/wildless-cms-uni-blocks",
3
- "version": "0.15.338",
3
+ "version": "0.15.339",
4
4
  "private": false,
5
5
  "license": "MIT",
6
6
  "author": "ЦК",
@@ -1,52 +1,20 @@
1
1
  import { collectRef, resolveJPointer, type JSONNode } from '@redneckz/json-ref';
2
2
  import { readFile } from 'fs/promises';
3
- import { type BlocksRegistry } from '../../model/BlocksRegistry';
4
3
  import { type ContentPageDef } from '../../model/ContentPageDef';
5
- import { type Fallback, type FallbackMap } from '../../model/Fallback';
4
+ import { type Fallback } from '../../model/Fallback';
6
5
  import { unique } from '../../utils/unique';
7
6
  import { joinPath } from '../../utils/url';
8
- import { loadModuleFallback } from './loadModuleFallback';
9
7
 
10
8
  type FallbackEntry = [key: string, data: JSONNode];
11
9
 
12
10
  const BASE_DIR = 'content';
13
11
 
14
- export const computeAPIFallback = async (
15
- blocksRegistry: BlocksRegistry,
16
- contentPageData: ContentPageDef,
17
- ): Promise<Fallback> => {
12
+ export const computeAPIFallback = async (contentPageData: ContentPageDef): Promise<Fallback> => {
18
13
  return Object.fromEntries(
19
- (
20
- await Promise.all([
21
- computeFallbackFromModules(blocksRegistry),
22
- computeFallbackFromContentRefs(contentPageData),
23
- ])
24
- )
25
- .flatMap((_) => _)
26
- .filter(([key, data]) => key && data),
14
+ (await computeFallbackFromContentRefs(contentPageData)).filter(([key, data]) => key && data),
27
15
  );
28
16
  };
29
17
 
30
- const computeFallbackFromModules = async (
31
- blocksRegistry: BlocksRegistry,
32
- ): Promise<FallbackEntry[]> => {
33
- const fallbackMap: FallbackMap = (
34
- await Promise.all(Object.keys(blocksRegistry).map(loadModuleFallback))
35
- )
36
- .filter((_): _ is FallbackMap => Boolean(_))
37
- .reduce((acc, _) => ({ ...acc, ..._ }), {});
38
-
39
- return (
40
- await Promise.allSettled(
41
- Object.entries(fallbackMap).map(
42
- async ([key, fetcher]): Promise<FallbackEntry> => [key, await fetcher()],
43
- ),
44
- )
45
- )
46
- .filter((_): _ is PromiseFulfilledResult<FallbackEntry> => _.status === 'fulfilled')
47
- .map(({ value }) => value);
48
- };
49
-
50
18
  const computeFallbackFromContentRefs = async (
51
19
  contentPageData: ContentPageDef,
52
20
  ): Promise<FallbackEntry[]> => {
@@ -1,5 +1,4 @@
1
1
  type Key = string;
2
2
  type Data = any;
3
3
 
4
- export type FallbackMap = Record<Key, () => Promise<Data>>;
5
4
  export type Fallback = Record<Key, Data>;
@@ -1,2 +0,0 @@
1
- import { type FallbackMap } from '../../model/Fallback';
2
- export declare const loadModuleFallback: (blockName: string) => Promise<FallbackMap | undefined>;
@@ -1,2 +0,0 @@
1
- import { type FallbackMap } from '../../model/Fallback';
2
- export declare const loadModuleFallback: (blockName: string) => Promise<FallbackMap | undefined>;
@@ -1,36 +0,0 @@
1
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
2
- if (k2 === undefined) k2 = k;
3
- var desc = Object.getOwnPropertyDescriptor(m, k);
4
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
5
- desc = { enumerable: true, get: function() { return m[k]; } };
6
- }
7
- Object.defineProperty(o, k2, desc);
8
- }) : (function(o, m, k, k2) {
9
- if (k2 === undefined) k2 = k;
10
- o[k2] = m[k];
11
- }));
12
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
13
- Object.defineProperty(o, "default", { enumerable: true, value: v });
14
- }) : function(o, v) {
15
- o["default"] = v;
16
- });
17
- var __importStar = (this && this.__importStar) || function (mod) {
18
- if (mod && mod.__esModule) return mod;
19
- var result = {};
20
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
21
- __setModuleDefault(result, mod);
22
- return result;
23
- };
24
- Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.loadModuleFallback = void 0;
26
- const loadModuleFallback = async (blockName) => {
27
- try {
28
- const blockFallback = await Promise.resolve().then(() => __importStar(require(`../${blockName}/${blockName}.fallback`)));
29
- return blockFallback?.fallback ? await blockFallback.fallback() : undefined;
30
- }
31
- catch (error) {
32
- return undefined;
33
- }
34
- };
35
- exports.loadModuleFallback = loadModuleFallback;
36
- //# sourceMappingURL=loadModuleFallback.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"loadModuleFallback.js","sourceRoot":"","sources":["../../../src/components/ContentPage/loadModuleFallback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAEO,MAAM,kBAAkB,GAAG,KAAK,EAAE,SAAiB,EAAoC,EAAE;IAC9F,IAAI;QACF,MAAM,aAAa,GAAG,wDAAa,MAAM,SAAS,IAAI,SAAS,WAAW,GAAC,CAAC;QAE5E,OAAO,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;KAC7E;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AARW,QAAA,kBAAkB,sBAQ7B"}
@@ -1,2 +0,0 @@
1
- import { type FallbackMap } from '../../model/Fallback';
2
- export declare const loadModuleFallback: (blockName: string) => Promise<FallbackMap | undefined>;
@@ -1,10 +0,0 @@
1
- export const loadModuleFallback = async (blockName) => {
2
- try {
3
- const blockFallback = await import(`../${blockName}/${blockName}.fallback.js`);
4
- return blockFallback?.fallback ? await blockFallback.fallback() : undefined;
5
- }
6
- catch (error) {
7
- return undefined;
8
- }
9
- };
10
- //# sourceMappingURL=loadModuleFallback.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"loadModuleFallback.js","sourceRoot":"","sources":["../../../src/components/ContentPage/loadModuleFallback.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,SAAiB,EAAoC,EAAE;IAC9F,IAAI;QACF,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,MAAM,SAAS,IAAI,SAAS,WAAW,CAAC,CAAC;QAE5E,OAAO,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;KAC7E;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC"}
@@ -1,2 +0,0 @@
1
- import { type FallbackMap } from '../../model/Fallback';
2
- export declare const loadModuleFallback: (blockName: string) => Promise<FallbackMap | undefined>;
@@ -1,2 +0,0 @@
1
- import { type FallbackMap } from '../../model/Fallback';
2
- export declare const loadModuleFallback: (blockName: string) => Promise<FallbackMap | undefined>;
@@ -1,36 +0,0 @@
1
- var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
2
- if (k2 === undefined) k2 = k;
3
- var desc = Object.getOwnPropertyDescriptor(m, k);
4
- if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
5
- desc = { enumerable: true, get: function() { return m[k]; } };
6
- }
7
- Object.defineProperty(o, k2, desc);
8
- }) : (function(o, m, k, k2) {
9
- if (k2 === undefined) k2 = k;
10
- o[k2] = m[k];
11
- }));
12
- var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
13
- Object.defineProperty(o, "default", { enumerable: true, value: v });
14
- }) : function(o, v) {
15
- o["default"] = v;
16
- });
17
- var __importStar = (this && this.__importStar) || function (mod) {
18
- if (mod && mod.__esModule) return mod;
19
- var result = {};
20
- if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
21
- __setModuleDefault(result, mod);
22
- return result;
23
- };
24
- Object.defineProperty(exports, "__esModule", { value: true });
25
- exports.loadModuleFallback = void 0;
26
- const loadModuleFallback = async (blockName) => {
27
- try {
28
- const blockFallback = await Promise.resolve().then(() => __importStar(require(`../${blockName}/${blockName}.fallback`)));
29
- return blockFallback?.fallback ? await blockFallback.fallback() : undefined;
30
- }
31
- catch (error) {
32
- return undefined;
33
- }
34
- };
35
- exports.loadModuleFallback = loadModuleFallback;
36
- //# sourceMappingURL=loadModuleFallback.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"loadModuleFallback.js","sourceRoot":"","sources":["../../../src/components/ContentPage/loadModuleFallback.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAEO,MAAM,kBAAkB,GAAG,KAAK,EAAE,SAAiB,EAAoC,EAAE;IAC9F,IAAI;QACF,MAAM,aAAa,GAAG,wDAAa,MAAM,SAAS,IAAI,SAAS,WAAW,GAAC,CAAC;QAE5E,OAAO,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;KAC7E;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC;AARW,QAAA,kBAAkB,sBAQ7B"}
@@ -1,2 +0,0 @@
1
- import { type FallbackMap } from '../../model/Fallback';
2
- export declare const loadModuleFallback: (blockName: string) => Promise<FallbackMap | undefined>;
@@ -1,10 +0,0 @@
1
- export const loadModuleFallback = async (blockName) => {
2
- try {
3
- const blockFallback = await import(`../${blockName}/${blockName}.fallback.js`);
4
- return blockFallback?.fallback ? await blockFallback.fallback() : undefined;
5
- }
6
- catch (error) {
7
- return undefined;
8
- }
9
- };
10
- //# sourceMappingURL=loadModuleFallback.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"loadModuleFallback.js","sourceRoot":"","sources":["../../../src/components/ContentPage/loadModuleFallback.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EAAE,SAAiB,EAAoC,EAAE;IAC9F,IAAI;QACF,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,MAAM,SAAS,IAAI,SAAS,WAAW,CAAC,CAAC;QAE5E,OAAO,aAAa,EAAE,QAAQ,CAAC,CAAC,CAAC,MAAM,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;KAC7E;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,SAAS,CAAC;KAClB;AACH,CAAC,CAAC"}
@@ -1,11 +0,0 @@
1
- import { type FallbackMap } from '../../model/Fallback';
2
-
3
- export const loadModuleFallback = async (blockName: string): Promise<FallbackMap | undefined> => {
4
- try {
5
- const blockFallback = await import(`../${blockName}/${blockName}.fallback`);
6
-
7
- return blockFallback?.fallback ? await blockFallback.fallback() : undefined;
8
- } catch (error) {
9
- return undefined;
10
- }
11
- };
@@ -1,11 +0,0 @@
1
- import { type FallbackMap } from '../../model/Fallback';
2
-
3
- export const loadModuleFallback = async (blockName: string): Promise<FallbackMap | undefined> => {
4
- try {
5
- const blockFallback = await import(`../${blockName}/${blockName}.fallback`);
6
-
7
- return blockFallback?.fallback ? await blockFallback.fallback() : undefined;
8
- } catch (error) {
9
- return undefined;
10
- }
11
- };