Merge branch 'master' into bug/VB-447-cslp-fix

Author: csAyushDubey

.talismanrc

@@ -3,8 +3,8 @@ fileignoreconfig:
   ignore_detectors:
     - filecontent
 - filename: package-lock.json
-  checksum: 9746d3b1ac67da5dc0f3ec6f8798166bc8b9c1e4c736de01f7c52b2f9cc194be
+  checksum: 030162c3c72502ccac30f3ce0172f1c2ae31a794544e0e1096771326780ea21b
 - filename: src/entry-editable.ts
   checksum: f9c4694229205fca252bb087482a3e408c6ad3b237cd108e337bcff49458db5c
 - filename: .husky/pre-commit
-  checksum: 5baabd7d2c391648163f9371f0e5e9484f8fb90fa2284cfc378732ec3192c193
+  checksum: 5baabd7d2c391648163f9371f0e5e9484f8fb90fa2284cfc378732ec3192c193

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## [1.5.0](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.4.1) (2025-09-01)
+ - Improve null checks in find embedded entry and find embedded asset functions
+
 ## [1.4.1](https://github.com/contentstack/contentstack-utils-javascript/tree/v1.4.1) (2025-05-26)
  - Chore: Handle case sensitivity for contentType and locale
 

__test__/find-embedded-objects.test.ts

@@ -2,13 +2,13 @@ import { EmbeddedItem, EmbedModel } from '../src/Models/embedded-object'
 import { entryEmbeddedEntries, entryEmbeddedAssets, assetRichTextJson, entryRichTextJson } from './mock/entry-mock';
 import { assetDisplayJson } from './mock/embedded-object-mock';
 import { Attributes, createMetadata, Metadata } from '../src/Models/metadata-model';
-import { findEmbeddedEntry, findEmbeddedAsset, findRenderString, findEmbeddedItems } from '../src/helper/find-embeded-object';
+import { findEmbeddedEntry, findEmbeddedAsset, findRenderString, findEmbeddedItems, findGQLEmbeddedItems } from '../src/helper/find-embeded-object';
 import StyleType from '../src/embedded-types/style-type';
 import { EntryNode } from '../src/Models/json-rte-model';
 
 const assetRichTextMetadata = createMetadata(assetRichTextJson as unknown as Attributes)
 const entryRichTextMetadata = createMetadata(entryRichTextJson as unknown as Attributes)
-const assetDisplayMetadata =  createMetadata(assetDisplayJson as unknown as Attributes)
+const assetDisplayMetadata = createMetadata(assetDisplayJson as unknown as Attributes)
 
 describe('Embedded object render from content', () => {
     it('Find Embedded Entry no matching uids with blank embedded Entry test', done => {
@@ -62,11 +62,11 @@ describe('Embedded object render from content', () => {
     })
 
     it('Find Render string from undefined objects test', done => {
-        
+
         const renderString = findRenderString(entryEmbeddedAssets._embedded_items.rich_text_editor[0], undefined)
         expect(renderString).toEqual('')
         done()
-    }) 
+    })
 
     it('Find Render string from default renderOption', done => {
         const renderString = findRenderString(entryEmbeddedEntries._embedded_items.rich_text_editor[0], entryRichTextMetadata)
@@ -82,31 +82,74 @@ describe('Embedded object render from content', () => {
 
     it('Find Render string from passed renderOption', done => {
         let renderString = findRenderString(entryEmbeddedEntries._embedded_items.rich_text_editor[0], entryRichTextMetadata, {
-            [StyleType.BLOCK]: (item:EmbeddedItem | EntryNode, metadata: Metadata) => `<div><div>${item.title || item.uid}</div><div>Content type: <span>${item._content_type_uid}</span></div></div>`
+            [StyleType.BLOCK]: (item: EmbeddedItem | EntryNode, metadata: Metadata) => `<div><div>${item.title || item.uid}</div><div>Content type: <span>${item._content_type_uid}</span></div></div>`
         })
         expect(renderString).toEqual('<div><div>Update this title</div><div>Content type: <span>content_block</span></div></div>')
-        
+
         renderString = findRenderString(entryEmbeddedEntries._embedded_items.rich_text_editor[0], entryRichTextMetadata, {
-            [StyleType.BLOCK]: 
+            [StyleType.BLOCK]:
             {
                 'embeddedrte':
-                (item:EmbeddedItem | EntryNode, metadata: Metadata) => `<div>${item.title || item.uid}<div>Content type: <span>${item._content_type_uid}</span></div></div>`
+                    (item: EmbeddedItem | EntryNode, metadata: Metadata) => `<div>${item.title || item.uid}<div>Content type: <span>${item._content_type_uid}</span></div></div>`
             }
         })
         expect(renderString).toEqual('<div>Update this title<div>Content type: <span>content_block</span></div></div>')
 
         renderString = findRenderString(entryEmbeddedEntries._embedded_items.rich_text_editor[0], entryRichTextMetadata, {
-            [StyleType.BLOCK]: 
+            [StyleType.BLOCK]:
             {
                 'content-type':
-                (item:EmbeddedItem | EntryNode, metadata: Metadata) => `<div><div>${item.title || item.uid}</div><div>Content type: <span>${item._content_type_uid}</span></div></div>`
+                    (item: EmbeddedItem | EntryNode, metadata: Metadata) => `<div><div>${item.title || item.uid}</div><div>Content type: <span>${item._content_type_uid}</span></div></div>`
             }
         })
         expect(renderString).toEqual('<div><p>Update this title</p><p>Content type: <span>content_block</span></p></div>')
         done()
     })
 })
 
+describe('findEmbeddedEntry edge cases', () => {
+    it('should return empty array if embeddeditems contains null or undefined', () => {
+        const result = findEmbeddedEntry('uid', 'contentType', [null, undefined]);
+        expect(result).toEqual([]);
+    });
+
+    it('should skip falsy entries in embeddeditems', () => {
+        const validEntry = { uid: 'uid', _content_type_uid: 'contentType' };
+        const result = findEmbeddedEntry('uid', 'contentType', [null, validEntry, undefined]);
+        expect(result).toEqual([validEntry]);
+    });
+});
+
+describe('findEmbeddedAsset edge cases', () => {
+    it('should return empty array if embeddedAssets contains null or undefined', () => {
+        const result = findEmbeddedAsset('uid', [null, undefined]);
+        expect(result).toEqual([]);
+    });
+
+    it('should skip falsy assets in embeddedAssets', () => {
+        const validAsset = { uid: 'uid' };
+        const result = findEmbeddedAsset('uid', [null, validAsset, undefined]);
+        expect(result).toEqual([validAsset]);
+    });
+});
+
+describe('findGQLEmbeddedItems edge cases', () => {
+    it('should return empty array if metadata is null', () => {
+        const result = findGQLEmbeddedItems(null as any, [{ uid: 'uid' }]);
+        expect(result).toEqual([]);
+    });
+
+    it('should return empty array if items is null', () => {
+        const result = findGQLEmbeddedItems({ itemType: 'entry', itemUid: 'uid', contentTypeUid: 'ct', attributes: {} } as any, null as any);
+        expect(result).toEqual([]);
+    });
+
+    it('should return empty array if both metadata and items are null', () => {
+        const result = findGQLEmbeddedItems(null as any, null as any);
+        expect(result).toEqual([]);
+    });
+});
+
 function makeFindEntry(uid: string = '', contentTypeUid: string = '', embeddeditems?: EmbeddedItem[]) {
     return findEmbeddedEntry(uid, contentTypeUid, embeddeditems)
 }
@@ -115,7 +158,7 @@ function makeFindAsset(uid: string = '', embeddedAssets?: EmbeddedItem[]) {
     return findEmbeddedAsset(uid, embeddedAssets)
 }
 
-function reduceToArray (embedModel: EmbedModel<EmbeddedItem>): EmbeddedItem[]{
+function reduceToArray(embedModel: EmbedModel<EmbeddedItem>): EmbeddedItem[] {
     return Object.values(embedModel).reduce((accumulator, value) => accumulator.concat(value), [])
 }