@redneckz/wildless-cms-uni-blocks 0.14.328 → 0.14.330
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/bundle/bundle.umd.js +1 -1
- package/bundle/bundle.umd.min.js +1 -1
- package/dist/content-page-repository/transformContentPage.js +7 -1
- package/dist/content-page-repository/transformContentPage.js.map +1 -1
- package/dist/utils/mergeJson.js +6 -3
- package/dist/utils/mergeJson.js.map +1 -1
- package/lib/content-page-repository/transformContentPage.js +7 -1
- package/lib/content-page-repository/transformContentPage.js.map +1 -1
- package/lib/utils/mergeJson.js +6 -3
- package/lib/utils/mergeJson.js.map +1 -1
- package/mobile/bundle/bundle.umd.js +1 -1
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/dist/content-page-repository/transformContentPage.js +7 -1
- package/mobile/dist/content-page-repository/transformContentPage.js.map +1 -1
- package/mobile/dist/utils/mergeJson.js +6 -3
- package/mobile/dist/utils/mergeJson.js.map +1 -1
- package/mobile/lib/content-page-repository/transformContentPage.js +7 -1
- package/mobile/lib/content-page-repository/transformContentPage.js.map +1 -1
- package/mobile/lib/utils/mergeJson.js +6 -3
- package/mobile/lib/utils/mergeJson.js.map +1 -1
- package/mobile/src/components/ProductGallery/ProductGallery.example.json +8 -4
- package/mobile/src/content-page-repository/transformContentPage.ts +10 -1
- package/mobile/src/utils/mergeJson.ts +8 -4
- package/package.json +1 -1
- package/src/components/ProductGallery/ProductGallery.example.json +8 -4
- package/src/content-page-repository/transformContentPage.ts +10 -1
- package/src/utils/mergeJson.ts +8 -4
|
@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
5
5
|
exports.generatedPagePath = exports.transformContentPage = void 0;
|
|
6
6
|
const fs_1 = __importDefault(require("fs"));
|
|
7
7
|
const util_1 = __importDefault(require("util"));
|
|
8
|
+
const mergeJson_1 = require("../utils/mergeJson");
|
|
8
9
|
const clearAttachmentHref_1 = require("./clearAttachmentHref");
|
|
9
10
|
const mapJSON_1 = require("./mapJSON");
|
|
10
11
|
const transformAttachmentLink_1 = require("./transformAttachmentLink");
|
|
@@ -28,9 +29,14 @@ const DOCUMENT_EXT_LIST = [
|
|
|
28
29
|
'.zip',
|
|
29
30
|
'.7z',
|
|
30
31
|
];
|
|
32
|
+
const DEFAULT_PARENT_CONTENT = {};
|
|
31
33
|
async function transformContentPage(pagePath, options) {
|
|
32
34
|
const content = JSON.parse(await readFile(pagePath, 'utf8'));
|
|
33
|
-
const
|
|
35
|
+
const parentContent = await (content?.extends
|
|
36
|
+
? JSON.parse(await readFile(content.extends, 'utf-8'))
|
|
37
|
+
: DEFAULT_PARENT_CONTENT);
|
|
38
|
+
const mergedContent = (0, mergeJson_1.mergeJson)(parentContent, content);
|
|
39
|
+
const result = await (0, mapJSON_1.mapJSON)(mergedContent, async (value, [key]) => {
|
|
34
40
|
try {
|
|
35
41
|
if (isMarkdown(key, value)) {
|
|
36
42
|
return await (0, transformMarkdown_1.transformMarkdown)(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformContentPage.js","sourceRoot":"","sources":["../../src/content-page-repository/transformContentPage.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"transformContentPage.js","sourceRoot":"","sources":["../../src/content-page-repository/transformContentPage.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/mergeJson.js
CHANGED
|
@@ -14,8 +14,11 @@ const applyDiff = (json) => tableFunc_1.tableFunc
|
|
|
14
14
|
.if(([diffKey, diffValue]) => (0, json_ref_1.isJSONRecord)(diffValue) && (0, json_ref_1.isJSONRecord)(json[diffKey]))
|
|
15
15
|
.then(([diffKey, diffValue]) => (0, exports.mergeJson)(json[diffKey], diffValue))
|
|
16
16
|
.else(([, diffValue]) => diffValue);
|
|
17
|
-
const mergeArraysWithId = (target, diff) => target
|
|
18
|
-
|
|
17
|
+
const mergeArraysWithId = (target, diff) => target
|
|
18
|
+
.map((item) => {
|
|
19
|
+
const diffItem = diff.find(byId(item.__id));
|
|
19
20
|
return diffItem ? (0, exports.mergeJson)(item, diffItem) : item;
|
|
20
|
-
})
|
|
21
|
+
})
|
|
22
|
+
.concat(diff.filter((d) => !target.find(byId(d.__id))));
|
|
23
|
+
const byId = (id) => (element) => element?.__id === id;
|
|
21
24
|
//# sourceMappingURL=mergeJson.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeJson.js","sourceRoot":"","sources":["../../src/utils/mergeJson.ts"],"names":[],"mappings":";;AAAA,iDAAkF;AAClF,2CAAwC;AAExC,MAAM,sBAAsB,GAAG,CAAC,KAAe,EAAyB,EAAE,CACxE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,IAAI,CAAC,IAAI,MAAM,IAAI,IAAI,CAAC,CAAC;AAI/E,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,KAAiB,EAAc,EAAE,CAC3E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAC1B,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACjC,GAAG,MAAM;IACT,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;CACjD,CAAC,EACF,IAAI,CACL,CAAC;AAPS,QAAA,SAAS,aAOlB;AAEJ,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,EAAE,CACrC,qBAAS;KACN,EAAE,CACD,CAAC,CAAC,OAAO,EAAE,SAAS,CAAiC,EAAE,EAAE,CACvD,sBAAsB,CAAC,SAAS,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAC7E;KACA,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAC7B,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAiB,EAAE,SAAyB,CAAC,CAC5E;KACA,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,SAAS,CAAC,IAAI,IAAA,uBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;KACpF,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,OAAO,CAAe,EAAE,SAAuB,CAAC,CAAC;KAC/F,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;AAExC,MAAM,iBAAiB,GAAG,CAAC,MAAoB,EAAE,IAAkB,EAAgB,EAAE,CACnF,MAAM,
|
|
1
|
+
{"version":3,"file":"mergeJson.js","sourceRoot":"","sources":["../../src/utils/mergeJson.ts"],"names":[],"mappings":";;AAAA,iDAAkF;AAClF,2CAAwC;AAExC,MAAM,sBAAsB,GAAG,CAAC,KAAe,EAAyB,EAAE,CACxE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,IAAI,CAAC,IAAI,MAAM,IAAI,IAAI,CAAC,CAAC;AAI/E,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,KAAiB,EAAc,EAAE,CAC3E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAC1B,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACjC,GAAG,MAAM;IACT,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;CACjD,CAAC,EACF,IAAI,CACL,CAAC;AAPS,QAAA,SAAS,aAOlB;AAEJ,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,EAAE,CACrC,qBAAS;KACN,EAAE,CACD,CAAC,CAAC,OAAO,EAAE,SAAS,CAAiC,EAAE,EAAE,CACvD,sBAAsB,CAAC,SAAS,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAC7E;KACA,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAC7B,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAiB,EAAE,SAAyB,CAAC,CAC5E;KACA,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,IAAA,uBAAY,EAAC,SAAS,CAAC,IAAI,IAAA,uBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;KACpF,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,IAAA,iBAAS,EAAC,IAAI,CAAC,OAAO,CAAe,EAAE,SAAuB,CAAC,CAAC;KAC/F,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;AAExC,MAAM,iBAAiB,GAAG,CAAC,MAAoB,EAAE,IAAkB,EAAgB,EAAE,CACnF,MAAM;KACH,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;IACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC,CAAC;IAEtD,OAAO,QAAQ,CAAC,CAAC,CAAC,IAAA,iBAAS,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACrD,CAAC,CAAC;KACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAc,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtE,MAAM,IAAI,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,EAAE,IAAI,KAAK,EAAE,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import util from 'util';
|
|
3
|
+
import { mergeJson } from '../utils/mergeJson.js';
|
|
3
4
|
import { ATTACHMENT_PREFIX } from './clearAttachmentHref.js';
|
|
4
5
|
import { mapJSON } from './mapJSON.js';
|
|
5
6
|
import { transformAttachmentLink } from './transformAttachmentLink.js';
|
|
@@ -23,9 +24,14 @@ const DOCUMENT_EXT_LIST = [
|
|
|
23
24
|
'.zip',
|
|
24
25
|
'.7z',
|
|
25
26
|
];
|
|
27
|
+
const DEFAULT_PARENT_CONTENT = {};
|
|
26
28
|
export async function transformContentPage(pagePath, options) {
|
|
27
29
|
const content = JSON.parse(await readFile(pagePath, 'utf8'));
|
|
28
|
-
const
|
|
30
|
+
const parentContent = await (content?.extends
|
|
31
|
+
? JSON.parse(await readFile(content.extends, 'utf-8'))
|
|
32
|
+
: DEFAULT_PARENT_CONTENT);
|
|
33
|
+
const mergedContent = mergeJson(parentContent, content);
|
|
34
|
+
const result = await mapJSON(mergedContent, async (value, [key]) => {
|
|
29
35
|
try {
|
|
30
36
|
if (isMarkdown(key, value)) {
|
|
31
37
|
return await transformMarkdown(value);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"transformContentPage.js","sourceRoot":"","sources":["../../src/content-page-repository/transformContentPage.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"transformContentPage.js","sourceRoot":"","sources":["../../src/content-page-repository/transformContentPage.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/mergeJson.js
CHANGED
|
@@ -11,8 +11,11 @@ const applyDiff = (json) => tableFunc
|
|
|
11
11
|
.if(([diffKey, diffValue]) => isJSONRecord(diffValue) && isJSONRecord(json[diffKey]))
|
|
12
12
|
.then(([diffKey, diffValue]) => mergeJson(json[diffKey], diffValue))
|
|
13
13
|
.else(([, diffValue]) => diffValue);
|
|
14
|
-
const mergeArraysWithId = (target, diff) => target
|
|
15
|
-
|
|
14
|
+
const mergeArraysWithId = (target, diff) => target
|
|
15
|
+
.map((item) => {
|
|
16
|
+
const diffItem = diff.find(byId(item.__id));
|
|
16
17
|
return diffItem ? mergeJson(item, diffItem) : item;
|
|
17
|
-
})
|
|
18
|
+
})
|
|
19
|
+
.concat(diff.filter((d) => !target.find(byId(d.__id))));
|
|
20
|
+
const byId = (id) => (element) => element?.__id === id;
|
|
18
21
|
//# sourceMappingURL=mergeJson.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mergeJson.js","sourceRoot":"","sources":["../../src/utils/mergeJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAkC,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,sBAAsB,GAAG,CAAC,KAAe,EAAyB,EAAE,CACxE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,IAAI,IAAI,CAAC,CAAC;AAItF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,KAAiB,EAAc,EAAE,CAC3E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAC1B,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACjC,GAAG,MAAM;IACT,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;CACjD,CAAC,EACF,IAAI,CACL,CAAC;AAEJ,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,EAAE,CACrC,SAAS;KACN,EAAE,CACD,CAAC,CAAC,OAAO,EAAE,SAAS,CAAiC,EAAE,EAAE,CACvD,sBAAsB,CAAC,SAAS,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAC7E;KACA,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAC7B,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAiB,EAAE,SAAyB,CAAC,CAC5E;KACA,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;KACpF,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAe,EAAE,SAAuB,CAAC,CAAC;KAC/F,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;AAExC,MAAM,iBAAiB,GAAG,CAAC,MAAoB,EAAE,IAAkB,EAAgB,EAAE,CACnF,MAAM,
|
|
1
|
+
{"version":3,"file":"mergeJson.js","sourceRoot":"","sources":["../../src/utils/mergeJson.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAkC,MAAM,oBAAoB,CAAC;AAClF,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,MAAM,sBAAsB,GAAG,CAAC,KAAe,EAAyB,EAAE,CACxE,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,IAAI,IAAI,CAAC,CAAC;AAItF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,KAAiB,EAAc,EAAE,CAC3E,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,MAAM,CAC1B,CAAC,MAAM,EAAE,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,CAAC;IACjC,GAAG,MAAM;IACT,CAAC,OAAO,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;CACjD,CAAC,EACF,IAAI,CACL,CAAC;AAEJ,MAAM,SAAS,GAAG,CAAC,IAAgB,EAAE,EAAE,CACrC,SAAS;KACN,EAAE,CACD,CAAC,CAAC,OAAO,EAAE,SAAS,CAAiC,EAAE,EAAE,CACvD,sBAAsB,CAAC,SAAS,CAAC,IAAI,sBAAsB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAC7E;KACA,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAC7B,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAiB,EAAE,SAAyB,CAAC,CAC5E;KACA,EAAE,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;KACpF,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAe,EAAE,SAAuB,CAAC,CAAC;KAC/F,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC;AAExC,MAAM,iBAAiB,GAAG,CAAC,MAAoB,EAAE,IAAkB,EAAgB,EAAE,CACnF,MAAM;KACH,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;IACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC,CAAC;IAEtD,OAAO,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AACrD,CAAC,CAAC;KACD,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAc,CAAC,CAAC,CAAC,CAAC,CAAC;AAEtE,MAAM,IAAI,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,CAAC,OAAY,EAAE,EAAE,CAAC,OAAO,EAAE,IAAI,KAAK,EAAE,CAAC"}
|