ac-storage 0.13.0 → 0.14.0

package/dist/bundle.cjs

@@ -565,28 +565,36 @@ class DefaultValueProvider {
     constructor(navigate = null) {
         this.#navigate = navigate;
     }
-    get(key) {
+    /**
+     *
+     */
+    get(key, baseValue) {
         if (this.#navigate == null) {
-            return undefined;
+            return baseValue;
         }
         const result = this.#navigate.walk(key, { allowIntermediate: true });
         if (result == null) {
             return undefined;
         }
         else if (isJSONTypeData(result.value)) {
-            const defaultValue = result.value.default_value;
-            return ((defaultValue != null)
-                ? defaultValue
-                : undefined);
+            if (baseValue != null) {
+                return baseValue;
+            }
+            else {
+                const defaultValue = result.value.default_value;
+                return ((defaultValue != null)
+                    ? defaultValue
+                    : undefined);
+            }
         }
         else {
             // for (const [key, value] of Object.entries(result.value)) {
             //     console.log(key, value);
             // }
-            return this.#getDefaultData(result.value);
+            return this.#getDefaultData(result.value, baseValue);
         }
     }
-    #getDefaultData(typeData) {
+    #getDefaultData(typeData, baseValue) {
         if (t$1 in typeData) {
             if (typeData.value.default_value != null) {
                 return typeData.value.default_value;
@@ -594,18 +602,17 @@ class DefaultValueProvider {
             return undefined;
         }
         else {
-            let hasKey = false;
-            const result = {};
+            let result = baseValue;
             for (const [key, value] of Object.entries(typeData)) {
                 const defaultValue = this.#getDefaultData(value);
                 if (defaultValue !== undefined) {
-                    result[key] = defaultValue;
-                    hasKey = true;
+                    result ??= {};
+                    if (!(key in result)) {
+                        result[key] = defaultValue;
+                    }
                 }
             }
-            return (hasKey
-                ? result
-                : undefined);
+            return result;
         }
     }
 }
@@ -685,8 +692,8 @@ class JSONAccessor {
     getOne(key) {
         this.#ensureNotDropped();
         let value = this.#getData(key);
-        if (value == null) {
-            value = this.#defaultValueProvider.get(key);
+        if (value == null || typeof value === 'object') {
+            value = this.#defaultValueProvider.get(key, value);
         }
         return value;
     }
@@ -695,8 +702,8 @@ class JSONAccessor {
         const result = {};
         for (const key of keys) {
             let value = this.#getData(key);
-            if (value == null) {
-                value = this.#defaultValueProvider.get(key);
+            if (value == null || typeof value === 'object') {
+                value = this.#defaultValueProvider.get(key, value);
             }
             const resolved = resolveNestedRef(result, key, true);
             resolved.parent[resolved.key] = value;