Release 0.13.38

Author: caseywebdev

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pave",
   "type": "module",
-  "version": "0.13.37",
+  "version": "0.13.38",
   "author": "Casey Foster <c@sey.me>",
   "license": "MIT",
   "repository": {

src/get-query-cost.js

@@ -27,21 +27,24 @@ export const getQueryCost = ({ context, path = [], query, schema, type }) => {
     else if (type.arrayOf) nextType = type.arrayOf;
     else if (type.oneOf) {
       cost += Math.max(
-        ...Object.entries(type.oneOf).map(([name, type]) => {
-          const onField = `_on_${name}`;
-          return getQueryCost({
-            context,
-            path: [...path, onField],
-            query: query[onField] ?? {},
-            schema,
-            type
-          });
-        })
+        ...Object.entries(query).map(([alias, _query]) =>
+          alias.startsWith('_on_')
+            ? getQueryCost({
+                context,
+                path: [...path, alias],
+                query: _query,
+                schema,
+                type: type.oneOf[alias.slice(4)]
+              })
+            : 0
+        )
       );
     } else if (type.object) {
       for (const alias in query) {
+        if (alias === '$' || alias === '_') continue;
+
         const _query = query[alias];
-        const _type = type.object[_query._ ?? alias];
+        const _type = type.object[_query._ ?? alias] ?? type.defaultType;
         cost += getQueryCost({
           context,
           path: [...path, alias],

src/get-query-cost.test.js

@@ -20,7 +20,8 @@ export default () => {
                   return size * cost;
                 },
                 type: {
-                  object: { a: { cost: 1 }, b: { cost: 2 }, c: { cost: 3 } }
+                  object: { a: { cost: 1 }, b: { cost: 2 }, c: { cost: 3 } },
+                  defaultType: { cost: 4 }
                 }
               },
               oneOf: {
@@ -43,7 +44,13 @@ export default () => {
         foo: {}, // 5
         bar: {}, // 10
         bar2: { _: 'bar' }, // 10
-        baz: { $: { size: 10 }, a: {}, b: {}, c: {} }, // 60
+        baz: {
+          $: { size: 10 },
+          a: {}, // 1
+          b: {}, // 2
+          c: {}, // 3
+          d: {} // 4
+        }, // 10 * 10 = 100
         oneOf: {
           _on_SuperExpensive: { doot: {} },
           _on_MediumExpensive: { ding: {} }
@@ -53,8 +60,8 @@ export default () => {
           _on_MediumExpensive: { ding: {} },
           _on_Cheap: { dong: {} }
         } // 50
-      } // 235 * 3 = 705
+      } // 275 * 3 = 825
     }),
-    705
+    825
   );
 };