@scalar/validation 0.6.5 → 0.6.6

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scalar/validation
 
+## 0.6.6
+
+### Patch Changes
+
+- [#10417](https://github.com/scalar/scalar/pull/10417): Reduce union scoring overhead for literals, arrays, records, and missing optional values while preserving branch selection.
+
 ## 0.6.5
 
 ### Patch Changes

package/dist/coerce.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coerce.d.ts","sourceRoot":"","sources":["../src/coerce.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AA6CrC;;;;;;;;;GASG;AACH,KAAK,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AAqWxC;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;AAE1E;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,MAAM,GAAI,CAAC,SAAS,MAAM,EACrC,QAAQ,CAAC,EACT,OAAO,OAAO,EACd,QAAO,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAiB,EAC5D,YAAW,SAAyB,KACnC,UAAU,CAAC,CAAC,CAAyF,CAAA"}
+{"version":3,"file":"coerce.d.ts","sourceRoot":"","sources":["../src/coerce.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAA;AACtC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,SAAS,CAAA;AA6CrC;;;;;;;;;GASG;AACH,KAAK,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AA+WxC;;;;;;;;;;;;;GAaG;AACH,KAAK,UAAU,CAAC,CAAC,SAAS,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;AAE1E;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,MAAM,GAAI,CAAC,SAAS,MAAM,EACrC,QAAQ,CAAC,EACT,OAAO,OAAO,EACd,QAAO,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAiB,EAC5D,YAAW,SAAyB,KACnC,UAAU,CAAC,CAAC,CAAyF,CAAA"}

package/dist/coerce.js

@@ -98,13 +98,30 @@ const isDiscriminatorProperty = (schema) => {
  * descent into child values.
  */
 const scoreUnion = (schema, value, lazyCache, scoringCache = new WeakMap(), valueDepth = 0, lazyDepth = 0) => {
+    // These scores do not descend into the value, so they cannot encounter a cycle.
+    // In particular, literals are common in discriminator and enum unions and do
+    // not need a separate validation traversal or its cache allocation.
+    if (schema.type === 'literal') {
+        // Keep strict equality in sync with the literal branch of validateInner in validate.ts.
+        return value === schema.value ? 1 : 0;
+    }
+    if (schema.type === 'array') {
+        return Array.isArray(value) ? 1 : 0;
+    }
+    if (schema.type === 'record') {
+        // TODO: implement smarter scoring for records
+        return isObject(value) ? 1 : 0;
+    }
+    if (schema.type === 'optional' && value === undefined) {
+        return 1;
+    }
+    const trackable = isObject(value);
     // Short-circuit on cycles: this exact (value, schema) pair is already being
     // scored higher up the call stack. The enclosing call's score subsumes any
     // contribution we could compute here, so return a neutral positive score.
-    if (isObject(value) && scoringCache.get(value)?.has(schema)) {
+    if (trackable && scoringCache.get(value)?.has(schema)) {
         return 1;
     }
-    const trackable = isObject(value);
     if (trackable) {
         const schemas = scoringCache.get(value) ?? new Set();
         schemas.add(schema);
@@ -112,7 +129,7 @@ const scoreUnion = (schema, value, lazyCache, scoringCache = new WeakMap(), valu
     }
     try {
         if (schema.type === 'object') {
-            if (!isObject(value)) {
+            if (!trackable) {
                 return 0;
             }
             const keys = Object.keys(schema.properties);
@@ -148,16 +165,8 @@ const scoreUnion = (schema, value, lazyCache, scoringCache = new WeakMap(), valu
                 return acc + (base > 0 ? base : 1);
             }, 0);
         }
-        if (schema.type === 'array') {
-            // Score 1 if value is an array, otherwise 0
-            return Array.isArray(value) ? 1 : 0;
-        }
-        if (schema.type === 'record') {
-            // TODO: implement smarter scoring for records (just a placeholder for now)
-            return isObject(value) ? 1 : 0;
-        }
         if (schema.type === 'optional') {
-            return value === undefined ? 1 : scoreUnion(schema.schema, value, lazyCache, scoringCache, valueDepth, lazyDepth);
+            return scoreUnion(schema.schema, value, lazyCache, scoringCache, valueDepth, lazyDepth);
         }
         if (schema.type === 'union') {
             // For a union, use the highest score among all sub-schemas

package/package.json

@@ -15,7 +15,7 @@
     "coerce",
     "scalar"
   ],
-  "version": "0.6.5",
+  "version": "0.6.6",
   "engines": {
     "node": ">=20"
   },