@gem-sdk/core 1.46.0-staging.16 → 1.46.0-staging.23

package/dist/cjs/helpers/third-party/generateAppBlockConfigs.js

@@ -15,7 +15,20 @@ const generateAppBlockConfigs = (component)=>{
         if (!config) return;
         configs.push(config);
     });
-    return configs;
+    if (!configs.length) return null;
+    return {
+        newBlocks: extractBlocks(configs),
+        newBlockOrder: extractBlockOrder(configs)
+    };
 };
+function extractBlocks(array) {
+    return array.reduce((acc, item)=>{
+        acc[item.key] = item.value;
+        return acc;
+    }, {});
+}
+function extractBlockOrder(array) {
+    return array.map((item)=>item.key);
+}
 
 exports.generateAppBlockConfigs = generateAppBlockConfigs;

package/dist/cjs/helpers/third-party/getAppBlocks.js

@@ -1,40 +1,30 @@
 'use strict';
 
-var removeMatchingKey = require('../remove-matching-key.js');
 var addAppBlockId = require('./addAppBlockId.js');
 var generateAppBlockConfigs = require('./generateAppBlockConfigs.js');
+var mergeBlock = require('./mergeBlock.js');
+var mergeBlockOrder = require('./mergeBlockOrder.js');
+var removeGPAppItems = require('./removeGPAppItems.js');
 
-const getAppBlocks = (section, currentBlock, currentBlockOrder)=>{
+const getAppBlocks = (section)=>{
+    if (!section?.appBlocks) return {};
+    const { blocks: currentBlock, block_order: currentBlockOrder } = JSON.parse(section.appBlocks);
+    if (!currentBlock || !currentBlockOrder) return {};
     const component = JSON.parse(section?.component || '');
     const componentWithAppBlockId = addAppBlockId.addAppBlockId(component);
     const appBlockConfigs = generateAppBlockConfigs.generateAppBlockConfigs(componentWithAppBlockId);
-    if (!appBlockConfigs?.length) {
+    if (!appBlockConfigs) {
         return {
-            blocks: currentBlock,
-            block_order: currentBlockOrder
+            blocks: removeGPAppItems.removeAllGPAppItemsFromBlocks(currentBlock),
+            block_order: removeGPAppItems.removeAllGPAppItemsFromBlockOrder(currentBlockOrder)
         };
     }
-    let newBlocks = currentBlock;
-    let newBlockOrder = currentBlockOrder;
-    appBlockConfigs.forEach(({ key, value })=>{
-        const newBlock = {
-            [key]: value
-        };
-        const oldKeyRemovedBlock = removeMatchingKey.removeMatchingKey(newBlocks, key);
-        newBlocks = {
-            ...oldKeyRemovedBlock,
-            ...newBlock
-        };
-        newBlockOrder = newBlockOrder ? [
-            ...newBlockOrder,
-            key
-        ] : [
-            key
-        ];
-    });
+    const { newBlocks, newBlockOrder } = appBlockConfigs;
+    const blocks = mergeBlock.mergeBlocks(newBlocks, currentBlock);
+    const block_order = mergeBlockOrder.mergeBlockOrder(newBlockOrder, currentBlockOrder);
     return {
-        blocks: newBlocks,
-        block_order: newBlockOrder
+        blocks,
+        block_order
     };
 };
 

package/dist/cjs/helpers/third-party/mergeBlock.js

@@ -0,0 +1,19 @@
+'use strict';
+
+function mergeBlocks(newBlocks, blocks) {
+    if (!blocks) return newBlocks;
+    const result = {};
+    // Add all non-gp_app blocks from the original blocks
+    for (const [key, value] of Object.entries(blocks)){
+        if (!key.startsWith('gp_app')) {
+            result[key] = value;
+        }
+    }
+    // Add all blocks from new-blocks
+    for (const [key, value] of Object.entries(newBlocks)){
+        result[key] = value;
+    }
+    return result;
+}
+
+exports.mergeBlocks = mergeBlocks;

package/dist/cjs/helpers/third-party/mergeBlockOrder.js

@@ -0,0 +1,47 @@
+'use strict';
+
+var constant = require('./constant.js');
+
+function isGpAppItem(item) {
+    if (!item) return false;
+    return item.startsWith(constant.THIRD_PARTY_APP_BLOCK_ID_PREFIX);
+}
+function filterCurrentOrder(currentOrder, newOrderSet) {
+    return currentOrder.filter((item)=>!isGpAppItem(item) || newOrderSet.has(item));
+}
+function processNonGpAppItem(item, resultOrder) {
+    resultOrder.push(item);
+}
+function processGpAppItems(newOrder, newOrderIndex, resultOrder) {
+    while(newOrderIndex < newOrder.length && isGpAppItem(newOrder[newOrderIndex])){
+        resultOrder.push(newOrder[newOrderIndex]);
+        newOrderIndex++;
+    }
+    return newOrderIndex;
+}
+function addRemainingGpAppItems(newOrder, startIndex, resultOrder) {
+    for(let i = startIndex; i < newOrder.length; i++){
+        const item = newOrder[i];
+        if (item && isGpAppItem(item)) {
+            resultOrder.push(item);
+        }
+    }
+}
+function mergeBlockOrder(newOrder, currentOrder) {
+    if (!currentOrder) return newOrder;
+    const newOrderSet = new Set(newOrder);
+    const filteredCurrentOrder = filterCurrentOrder(currentOrder, newOrderSet);
+    const resultOrder = [];
+    let newOrderIndex = 0;
+    filteredCurrentOrder.forEach((item)=>{
+        if (!isGpAppItem(item)) {
+            processNonGpAppItem(item, resultOrder);
+            return;
+        }
+        newOrderIndex = processGpAppItems(newOrder, newOrderIndex, resultOrder);
+    });
+    addRemainingGpAppItems(newOrder, newOrderIndex, resultOrder);
+    return resultOrder;
+}
+
+exports.mergeBlockOrder = mergeBlockOrder;

package/dist/cjs/helpers/third-party/removeGPAppItems.js

@@ -0,0 +1,18 @@
+'use strict';
+
+var constant = require('./constant.js');
+
+const removeAllGPAppItemsFromBlocks = (blocks)=>{
+    for(const key in blocks){
+        if (key.startsWith(constant.THIRD_PARTY_APP_BLOCK_ID_PREFIX)) {
+            delete blocks[key];
+        }
+    }
+    return blocks;
+};
+const removeAllGPAppItemsFromBlockOrder = (blockOrder)=>{
+    return blockOrder.filter((item)=>!item.includes(constant.THIRD_PARTY_APP_BLOCK_ID_PREFIX));
+};
+
+exports.removeAllGPAppItemsFromBlockOrder = removeAllGPAppItemsFromBlockOrder;
+exports.removeAllGPAppItemsFromBlocks = removeAllGPAppItemsFromBlocks;

package/dist/esm/helpers/third-party/generateAppBlockConfigs.js

@@ -13,7 +13,20 @@ const generateAppBlockConfigs = (component)=>{
         if (!config) return;
         configs.push(config);
     });
-    return configs;
+    if (!configs.length) return null;
+    return {
+        newBlocks: extractBlocks(configs),
+        newBlockOrder: extractBlockOrder(configs)
+    };
 };
+function extractBlocks(array) {
+    return array.reduce((acc, item)=>{
+        acc[item.key] = item.value;
+        return acc;
+    }, {});
+}
+function extractBlockOrder(array) {
+    return array.map((item)=>item.key);
+}
 
 export { generateAppBlockConfigs };

package/dist/esm/helpers/third-party/getAppBlocks.js

@@ -1,38 +1,28 @@
-import { removeMatchingKey } from '../remove-matching-key.js';
 import { addAppBlockId } from './addAppBlockId.js';
 import { generateAppBlockConfigs } from './generateAppBlockConfigs.js';
+import { mergeBlocks } from './mergeBlock.js';
+import { mergeBlockOrder } from './mergeBlockOrder.js';
+import { removeAllGPAppItemsFromBlocks, removeAllGPAppItemsFromBlockOrder } from './removeGPAppItems.js';
 
-const getAppBlocks = (section, currentBlock, currentBlockOrder)=>{
+const getAppBlocks = (section)=>{
+    if (!section?.appBlocks) return {};
+    const { blocks: currentBlock, block_order: currentBlockOrder } = JSON.parse(section.appBlocks);
+    if (!currentBlock || !currentBlockOrder) return {};
     const component = JSON.parse(section?.component || '');
     const componentWithAppBlockId = addAppBlockId(component);
     const appBlockConfigs = generateAppBlockConfigs(componentWithAppBlockId);
-    if (!appBlockConfigs?.length) {
+    if (!appBlockConfigs) {
         return {
-            blocks: currentBlock,
-            block_order: currentBlockOrder
+            blocks: removeAllGPAppItemsFromBlocks(currentBlock),
+            block_order: removeAllGPAppItemsFromBlockOrder(currentBlockOrder)
         };
     }
-    let newBlocks = currentBlock;
-    let newBlockOrder = currentBlockOrder;
-    appBlockConfigs.forEach(({ key, value })=>{
-        const newBlock = {
-            [key]: value
-        };
-        const oldKeyRemovedBlock = removeMatchingKey(newBlocks, key);
-        newBlocks = {
-            ...oldKeyRemovedBlock,
-            ...newBlock
-        };
-        newBlockOrder = newBlockOrder ? [
-            ...newBlockOrder,
-            key
-        ] : [
-            key
-        ];
-    });
+    const { newBlocks, newBlockOrder } = appBlockConfigs;
+    const blocks = mergeBlocks(newBlocks, currentBlock);
+    const block_order = mergeBlockOrder(newBlockOrder, currentBlockOrder);
     return {
-        blocks: newBlocks,
-        block_order: newBlockOrder
+        blocks,
+        block_order
     };
 };
 

package/dist/esm/helpers/third-party/mergeBlock.js

@@ -0,0 +1,17 @@
+function mergeBlocks(newBlocks, blocks) {
+    if (!blocks) return newBlocks;
+    const result = {};
+    // Add all non-gp_app blocks from the original blocks
+    for (const [key, value] of Object.entries(blocks)){
+        if (!key.startsWith('gp_app')) {
+            result[key] = value;
+        }
+    }
+    // Add all blocks from new-blocks
+    for (const [key, value] of Object.entries(newBlocks)){
+        result[key] = value;
+    }
+    return result;
+}
+
+export { mergeBlocks };

package/dist/esm/helpers/third-party/mergeBlockOrder.js

@@ -0,0 +1,45 @@
+import { THIRD_PARTY_APP_BLOCK_ID_PREFIX } from './constant.js';
+
+function isGpAppItem(item) {
+    if (!item) return false;
+    return item.startsWith(THIRD_PARTY_APP_BLOCK_ID_PREFIX);
+}
+function filterCurrentOrder(currentOrder, newOrderSet) {
+    return currentOrder.filter((item)=>!isGpAppItem(item) || newOrderSet.has(item));
+}
+function processNonGpAppItem(item, resultOrder) {
+    resultOrder.push(item);
+}
+function processGpAppItems(newOrder, newOrderIndex, resultOrder) {
+    while(newOrderIndex < newOrder.length && isGpAppItem(newOrder[newOrderIndex])){
+        resultOrder.push(newOrder[newOrderIndex]);
+        newOrderIndex++;
+    }
+    return newOrderIndex;
+}
+function addRemainingGpAppItems(newOrder, startIndex, resultOrder) {
+    for(let i = startIndex; i < newOrder.length; i++){
+        const item = newOrder[i];
+        if (item && isGpAppItem(item)) {
+            resultOrder.push(item);
+        }
+    }
+}
+function mergeBlockOrder(newOrder, currentOrder) {
+    if (!currentOrder) return newOrder;
+    const newOrderSet = new Set(newOrder);
+    const filteredCurrentOrder = filterCurrentOrder(currentOrder, newOrderSet);
+    const resultOrder = [];
+    let newOrderIndex = 0;
+    filteredCurrentOrder.forEach((item)=>{
+        if (!isGpAppItem(item)) {
+            processNonGpAppItem(item, resultOrder);
+            return;
+        }
+        newOrderIndex = processGpAppItems(newOrder, newOrderIndex, resultOrder);
+    });
+    addRemainingGpAppItems(newOrder, newOrderIndex, resultOrder);
+    return resultOrder;
+}
+
+export { mergeBlockOrder };

package/dist/esm/helpers/third-party/removeGPAppItems.js

@@ -0,0 +1,15 @@
+import { THIRD_PARTY_APP_BLOCK_ID_PREFIX } from './constant.js';
+
+const removeAllGPAppItemsFromBlocks = (blocks)=>{
+    for(const key in blocks){
+        if (key.startsWith(THIRD_PARTY_APP_BLOCK_ID_PREFIX)) {
+            delete blocks[key];
+        }
+    }
+    return blocks;
+};
+const removeAllGPAppItemsFromBlockOrder = (blockOrder)=>{
+    return blockOrder.filter((item)=>!item.includes(THIRD_PARTY_APP_BLOCK_ID_PREFIX));
+};
+
+export { removeAllGPAppItemsFromBlockOrder, removeAllGPAppItemsFromBlocks };

package/dist/types/index.d.ts

@@ -37365,8 +37365,13 @@ declare const getProductBySlug: (fetcher: FetchFunc, slug?: string) => Promise<P
 
 declare const getAppBlocks: (section: PublishedPageSection$1 & {
     appBlocks: string;
-}, currentBlock: {}, currentBlockOrder: string[]) => {
-    blocks: {};
+}) => {
+    blocks?: undefined;
+    block_order?: undefined;
+} | {
+    blocks: {
+        [key: string]: any;
+    };
     block_order: string[];
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gem-sdk/core",
-  "version": "1.46.0-staging.16",
+  "version": "1.46.0-staging.23",
   "license": "MIT",
   "sideEffects": false,
   "main": "dist/cjs/index.js",

package/dist/cjs/helpers/remove-matching-key.js

@@ -1,12 +0,0 @@
-'use strict';
-
-const removeMatchingKey = (obj, searchText)=>{
-    for(const key in obj){
-        if (key.includes(searchText)) {
-            delete obj[key];
-        }
-    }
-    return obj;
-};
-
-exports.removeMatchingKey = removeMatchingKey;

package/dist/esm/helpers/remove-matching-key.js

@@ -1,10 +0,0 @@
-const removeMatchingKey = (obj, searchText)=>{
-    for(const key in obj){
-        if (key.includes(searchText)) {
-            delete obj[key];
-        }
-    }
-    return obj;
-};
-
-export { removeMatchingKey };