Merge pull request #907 from contentstack/pre-stage

stage

Author: v1shalpatel

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2025 Contentstack
+Copyright (c) 2026 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

api/package-lock.json

@@ -25,26 +25,27 @@
   },
   "homepage": "https://github.com/contentstack/migration-v2.git#readme",
   "dependencies": {
-    "@contentstack/cli": "^1.51.1",
-    "@contentstack/cli-utilities": "^1.14.2",
+    "@contentstack/cli": "^1.53.1",
+    "@contentstack/cli-utilities": "^1.15.0",
     "@contentstack/json-rte-serializer": "^3.0.4",
-    "@contentstack/marketplace-sdk": "^1.4.0",
+    "@contentstack/marketplace-sdk": "^1.4.1",
     "axios": "^1.12.0",
     "chokidar": "^3.6.0",
     "cors": "^2.8.5",
     "dayjs": "^1.11.18",
     "dotenv": "^16.3.1",
-    "express": "^4.21.0",
-    "express-validator": "^7.3.0",
+    "express": "^4.22.0",
+    "express-validator": "^7.3.1",
     "express-winston": "^4.2.0",
     "fs-extra": "^11.2.0",
     "fs-readdir-recursive": "^1.1.0",
     "helmet": "^8.0.0",
     "html-to-json-parser": "^2.0.1",
     "http": "^0.0.1-security",
+    "js-yaml": "^4.1.1",
     "jsdom": "^24.1.0",
     "jsonpath": "^1.1.1",
-    "jsonwebtoken": "^9.0.2",
+    "jsonwebtoken": "^9.0.3",
     "lowdb": "^7.0.1",
     "mkdirp": "^3.0.1",
     "p-limit": "^6.2.0",

api/package.json

@@ -60,11 +60,26 @@ const putTestData = async (req: Request) => {
         if (item?.advanced) {
           item.advanced.initial = structuredClone(item?.advanced);
         }
+        if(item?.refrenceTo) {
+          item.initialRefrenceTo = item?.refrenceTo;
+        }
       });
     });
 
 
 
+    const sanitizeObject = (obj: Record<string, any>) => {
+      const blockedKeys = ['__proto__', 'prototype', 'constructor'];
+      const safeObj: Record<string, any> = {};
+    
+      for (const key in obj) {
+        if (!blockedKeys.includes(key)) {
+          safeObj[key] = obj[key];
+        }
+      }
+      return safeObj;
+    };    
+
     /*
     this code snippet iterates over an array of contentTypes and performs 
     some operations on each element. 
@@ -75,18 +90,38 @@ const putTestData = async (req: Request) => {
     Finally, it updates the fieldMapping property of each type in the contentTypes array with the fieldIds array.
     */
     await FieldMapperModel.read();
-    contentTypes.map((type: any, index: any) => {
+    contentTypes.forEach((type: any, index: number) => {
       const fieldIds: string[] = [];
-      const fields = Array?.isArray?.(type?.fieldMapping) ? type?.fieldMapping?.filter((field: any) => field)?.map?.((field: any) => {
-        const id = field?.id ? field?.id?.replace(/[{}]/g, "")?.toLowerCase() : uuidv4();
-        field.id = id;
-        fieldIds.push(id);
-        return { id, projectId, contentTypeId: type?.id, isDeleted: false, ...field };
-      }) : [];
-
+    
+      const fields = Array.isArray(type?.fieldMapping) ?
+        type.fieldMapping
+            .filter(Boolean)
+            .map((field: any) => {
+              const safeField = sanitizeObject(field);
+    
+              const id =
+                safeField?.id ?
+                  safeField.id.replace(/[{}]/g, '').toLowerCase()
+                  : uuidv4();
+    
+              fieldIds.push(id);
+    
+              return {
+                ...safeField,
+                id,
+                projectId,
+                contentTypeId: type?.id,
+                isDeleted: false,
+              };
+            })
+        : [];
+    
       FieldMapperModel.update((data: any) => {
-        data.field_mapper = [...(data?.field_mapper ?? []), ...(fields ?? [])];
-      });
+        data.field_mapper = [
+          ...(Array.isArray(data?.field_mapper) ? data.field_mapper : []),
+          ...fields,
+        ];
+      });  
       if (
         Array?.isArray?.(contentType) &&
         Number?.isInteger?.(index) &&
@@ -277,8 +312,7 @@ const getFieldMapping = async (req: Request) => {
 
     const fieldMapping: any = fieldData?.map((field: any) => {
       if (field?.advanced?.initial) {
-        const { initial, ...restAdvanced } = field?.advanced;
-        return { ...field, advanced: restAdvanced };
+        return { ...field, advanced: field?.advanced };
       }
       return field;
     });
@@ -775,7 +809,6 @@ const resetToInitialMapping = async (req: Request) => {
         );
         if (fieldIndex > -1) {
           FieldMapperModel.update((data: any) => {
-            
               data.field_mapper[fieldIndex] = {
                 ...field,
                 contentstackField: field?.otherCmsField,
@@ -784,7 +817,11 @@ const resetToInitialMapping = async (req: Request) => {
                 advanced: {
                   ...field?.advanced?.initial,
                   initial: field?.advanced?.initial,
-                }
+                },
+                ...(field?.referenceTo && {
+                  referenceTo: field?.initialRefrenceTo
+                }),
+                isDeleted: false,
               }
           });
         }

api/src/services/contentMapper.service.ts

@@ -56,13 +56,19 @@ const createGlobalField = async ({
     }
     }
 
+    const safeFileGlobalFields = fileGlobalFields;
+    
+    const existingUids = new Set(
+      safeFileGlobalFields?.map?.((gf: { uid: string }) => gf?.uid)
+    );
+    
     const mergedGlobalFields = [
-    ...globalfields,
-    ...(fileGlobalFields?.filter(
-        (fileField: { uid: string }) =>
-        !globalfields?.some((gf: { uid: string }) => gf?.uid === fileField?.uid)
-    ) || [])
+        ...globalfields.filter(
+        (fileField: { uid: string }) => !existingUids?.has(fileField?.uid)
+      ),
+      ...safeFileGlobalFields,
     ];
+    
     await fs.promises.mkdir(path.dirname(filePath), { recursive: true });
     await fs.promises.writeFile(filePath, JSON.stringify(mergedGlobalFields, null, 2));