hybrids - npm Package Compare versions

Comparing version 8.2.6 to 8.2.7

package.json

 {
   "name": "hybrids",
-  "version": "8.2.6",
+  "version": "8.2.7",
   "description": "A JavaScript framework for creating fully-featured web applications, components libraries, and single web components with unique declarative and functional architecture",
@@ -5,0 +5,0 @@ "type": "module",

src/store.js

@@ -1496,2 +1496,9 @@ import * as cache from "./cache.js";
 
+  const resolveId = options.id
+    ? options.id
+    : (host, value) => {
+        if (value !== null && typeof value === "object") return value.id;
+        return value ? String(value) : undefined;
+      };
+
   let draft;
@@ -1520,23 +1527,21 @@ if (options.draft) {
     Model = draft.model;
-  }
 
-  if (!options.id && config.enumerable && !config.list) {
     return {
       get(host, value) {
-        const valueConfig = definitions.get(value);
-        const id = valueConfig !== undefined ? value.id : value;
+        let id = resolveId(host, value);
 
-        if (draft && (value === undefined || value === null)) {
-          const draftModel = draft.create({}, { id: undefined });
-          syncCache(draft, undefined, draftModel, false);
-          return get(Model, undefined);
+        if (!id && (value === undefined || value === null)) {
+          const draftModel = draft.create({});
+          id = draftModel.id;
+
+          syncCache(draft, draftModel.id, draftModel, false);
         }
 
-        return value ? get(Model, id) : undefined;
+        return get(Model, id);
       },
-      set: (_, v) => v,
-      connect: draft
+      set: options.id ? undefined : (_, v) => v,
+      connect: config.enumerable
         ? (host, key) => () => {
             const model = host[key];
-            if (model && model.id) clear(model, true);
+            if (model) clear(model, true);
           }
@@ -1547,39 +1552,27 @@ : undefined,
 
-  return {
-    get: (host, value) => {
-      const valueConfig = definitions.get(value);
-      const id =
-        (options.id && options.id(host)) ||
-        (valueConfig !== undefined ? value.id : value);
+  if (options.id) {
+    return {
+      get(host, value) {
+        const id = resolveId(host);
+        const nextValue = config.list || id ? get(Model, id) : undefined;
 
-      if (draft && !id && (value === undefined || value === null)) {
-        const draftModel = draft.create({});
-        syncCache(draft, undefined, draftModel, false);
-        return get(Model, undefined);
-      }
+        if (nextValue !== value && ready(value) && !ready(nextValue)) {
+          const tempValue = cloneModel(value);
+          cache.set(tempValue, "state", () => getModelState(nextValue));
+          return tempValue;
+        }
 
-      if (!config.list && config.enumerable && id === undefined)
-        return undefined;
+        return nextValue;
+      },
+    };
+  }
 
-      const nextValue = get(Model, id);
-
-      if (nextValue !== value && ready(value) && !ready(nextValue)) {
-        const tempValue = cloneModel(value);
-        cache.set(tempValue, "state", () => getModelState(nextValue));
-        return tempValue;
-      }
-
-      return nextValue;
+  return {
+    get(host, value) {
+      const id = resolveId(host, value);
+      return !config.enumerable || config.list || value
+        ? get(Model, id)
+        : undefined;
     },
-    set:
-      (!options.id && config.list) || (draft && !config.enumerable)
-        ? (_, v) => v
-        : undefined,
-    connect:
-      draft && config.enumerable
-        ? (host, key) => () => {
-            const model = host[key];
-            if (model && model.id) clear(model, true);
-          }
-        : undefined,
+    set: (_, v) => v,
   };
@@ -1586,0 +1579,0 @@ }

No alert changes

Worsened metrics

Total package byte prevSize

200204

decreased by-0.22%

Lines of code

6365

decreased by-0.11%

No dependency changes