fix: Using safeArrayPush(dest, source) instead of dest.push(...source) (

oramasearch#506)
BanderasPRO · Oct 4, 2023 · 3bf81b5 · 3bf81b5
1 parent 13ef4c4
commit 3bf81b5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/packages/orama/src/components/index.ts b/packages/orama/src/components/index.ts
@@ -527,9 +527,9 @@ export async function searchByWhereClause<T extends AnyOrama, ResultDocument = T
 
     if (type === 'Flat') {
       if (isArray) {
-        filtersMap[param].push(...flatFilterArr(node, operation as EnumArrComparisonOperator))
+        safeArrayPush(filtersMap[param], flatFilterArr(node, operation as EnumArrComparisonOperator))
       } else {
-        filtersMap[param].push(...flatFilter(node, operation as EnumComparisonOperator))
+        safeArrayPush(filtersMap[param], flatFilter(node, operation as EnumComparisonOperator))
       }
       continue
     }

diff --git a/packages/orama/src/components/sorter.ts b/packages/orama/src/components/sorter.ts
@@ -7,6 +7,7 @@ import {
   InternalDocumentIDStore,
   getInternalDocumentId,
 } from './internal-document-id-store.js';
+import { safeArrayPush } from "../utils.js";
 
 interface PropertySort<K> {
   docs: Map<InternalDocumentID, number>
@@ -56,7 +57,7 @@ function innerCreate<T extends AnyOrama>(
     if (typeof type === 'object' && !Array.isArray(type)) {
       // Nested
       const ret = innerCreate(orama, sharedInternalDocumentStore, type, sortableDeniedProperties, path)
-      sorter.sortableProperties.push(...ret.sortableProperties)
+      safeArrayPush(sorter.sortableProperties, ret.sortableProperties);
       sorter.sorts = {
         ...sorter.sorts,
         ...ret.sorts,

diff --git a/packages/orama/src/trees/flat.ts b/packages/orama/src/trees/flat.ts
@@ -1,6 +1,6 @@
 import { InternalDocumentID } from "../components/internal-document-id-store.js"
 import { EnumArrComparisonOperator, EnumComparisonOperator, Nullable, ScalarSearchableValue } from "../types.js"
-import { intersect } from "../utils.js"
+import { intersect, safeArrayPush } from "../utils.js"
 
 export interface FlatTree {
   numberToDocumentId: Map<ScalarSearchableValue, InternalDocumentID[]>
@@ -69,7 +69,7 @@ export function filter(root: FlatTree, operation: EnumComparisonOperator): Inter
       for (const v of value) {
         const ids = root.numberToDocumentId.get(v)
         if (ids) {
-          result.push(...ids)
+          safeArrayPush(result, ids)
         }
       }
       return result
@@ -85,7 +85,7 @@ export function filter(root: FlatTree, operation: EnumComparisonOperator): Inter
         }
         const ids = root.numberToDocumentId.get(key)
         if (ids) {
-          result.push(...ids)
+          safeArrayPush(result, ids)
         }
       }
       return result

diff --git a/packages/orama/tests/insert.test.ts b/packages/orama/tests/insert.test.ts
@@ -4,6 +4,7 @@ import { Index } from '../src/components/index.js'
 import { getInternalDocumentId } from '../src/components/internal-document-id-store.js'
 import { AnyDocument, create, insert, insertMultiple, search } from '../src/index.js'
 import dataset from './datasets/events.json' assert { type: 'json' }
+import { safeArrayPush } from "../src/utils"
 
 t.test('insert method', t => {
   t.test('should correctly insert and retrieve data', async t => {
@@ -320,7 +321,7 @@ t.test('insert method', t => {
         { boolean: {} },
         { boolean: [] },
       ]
-      invalidDocuments.push(...invalidDocuments.map(d => ({ inner: { ...d } })))
+      safeArrayPush(invalidDocuments, invalidDocuments.map(d => ({ inner: { ...d } })))
       for (const doc of invalidDocuments) {
         await t.rejects(insert(db, doc))
       }