Merge pull request #917 from orbitjs/settings-syntax

Streamline syntax for processing of settings
orbitjs · Jan 21, 2022 · dbf103b · dbf103b
2 parents 38f8c9b + 2e5bde9
commit dbf103b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 19 deletions.
diff --git a/packages/@orbit/indexeddb/src/indexeddb-source.ts b/packages/@orbit/indexeddb/src/indexeddb-source.ts
@@ -111,15 +111,11 @@ export class IndexedDBSource<
       settings.cacheSettings ?? {};
     cacheSettings.schema = settings.schema;
     cacheSettings.keyMap = settings.keyMap;
-    cacheSettings.queryBuilder =
-      cacheSettings.queryBuilder ?? this.queryBuilder;
-    cacheSettings.transformBuilder =
-      cacheSettings.transformBuilder ?? this.transformBuilder;
-    cacheSettings.namespace = cacheSettings.namespace ?? settings.namespace;
-    cacheSettings.defaultQueryOptions =
-      cacheSettings.defaultQueryOptions ?? settings.defaultQueryOptions;
-    cacheSettings.defaultTransformOptions =
-      cacheSettings.defaultTransformOptions ?? settings.defaultTransformOptions;
+    cacheSettings.queryBuilder ??= this.queryBuilder;
+    cacheSettings.transformBuilder ??= this.transformBuilder;
+    cacheSettings.defaultQueryOptions ??= settings.defaultQueryOptions;
+    cacheSettings.defaultTransformOptions ??= settings.defaultTransformOptions;
+    cacheSettings.namespace ??= settings.namespace;
 
     if (
       cacheSettings.validatorFor === undefined &&

diff --git a/packages/@orbit/local-storage/src/local-storage-source.ts b/packages/@orbit/local-storage/src/local-storage-source.ts
@@ -115,16 +115,12 @@ export class LocalStorageSource<
       settings.cacheSettings ?? {};
     cacheSettings.schema = settings.schema;
     cacheSettings.keyMap = settings.keyMap;
-    cacheSettings.queryBuilder =
-      cacheSettings.queryBuilder ?? this.queryBuilder;
-    cacheSettings.transformBuilder =
-      cacheSettings.transformBuilder ?? this.transformBuilder;
-    cacheSettings.defaultQueryOptions =
-      cacheSettings.defaultQueryOptions ?? settings.defaultQueryOptions;
-    cacheSettings.defaultTransformOptions =
-      cacheSettings.defaultTransformOptions ?? settings.defaultTransformOptions;
-    cacheSettings.namespace = cacheSettings.namespace ?? settings.namespace;
-    cacheSettings.delimiter = cacheSettings.delimiter ?? settings.delimiter;
+    cacheSettings.queryBuilder ??= this.queryBuilder;
+    cacheSettings.transformBuilder ??= this.transformBuilder;
+    cacheSettings.defaultQueryOptions ??= settings.defaultQueryOptions;
+    cacheSettings.defaultTransformOptions ??= settings.defaultTransformOptions;
+    cacheSettings.namespace ??= settings.namespace;
+    cacheSettings.delimiter ??= settings.delimiter;
 
     if (
       cacheSettings.validatorFor === undefined &&