@cfworker/json-schema 4.1.0 → 4.1.3

package/src/validate.ts

@@ -13,6 +13,48 @@ import { ucs2length } from './ucs2-length.js';
 
 export type Evaluated = Record<string | number, boolean>;
 
+function hasOwnProperty(instance: object, key: PropertyKey): boolean {
+  return Object.prototype.hasOwnProperty.call(instance, key);
+}
+
+function decimalInteger(
+  value: number
+): [coefficient: bigint, exponent: number] {
+  const coefficientAndExponent = Math.abs(value).toString().split('e');
+  const coefficient = coefficientAndExponent[0]!;
+  const exponent = coefficientAndExponent[1] ?? '0';
+  const point = coefficient.indexOf('.');
+  const fractionLength = point === -1 ? 0 : coefficient.length - point - 1;
+  return [
+    BigInt(coefficient.replace('.', '')),
+    Number(exponent) - fractionLength
+  ];
+}
+
+function isMultipleOf(instance: number, divisor: number): boolean {
+  if (!Number.isFinite(instance) || !Number.isFinite(divisor) || divisor <= 0) {
+    return false;
+  }
+
+  const [instanceCoefficient, instanceExponent] = decimalInteger(instance);
+  const [divisorCoefficient, divisorExponent] = decimalInteger(divisor);
+  const exponentDifference = instanceExponent - divisorExponent;
+
+  if (exponentDifference >= 0) {
+    return (
+      (instanceCoefficient * 10n ** BigInt(exponentDifference)) %
+        divisorCoefficient ===
+      0n
+    );
+  }
+
+  return (
+    instanceCoefficient %
+      (divisorCoefficient * 10n ** BigInt(-exponentDifference)) ===
+    0n
+  );
+}
+
 export function validate(
   instance: any,
   schema: Schema | boolean,
@@ -307,8 +349,7 @@ export function validate(
     const keywordLocation = `${schemaLocation}/anyOf`;
     const errorsLength = errors.length;
     let anyValid = false;
-    for (let i = 0; i < $anyOf.length; i++) {
-      const subSchema = $anyOf[i];
+    for (const [i, subSchema] of $anyOf.entries()) {
       const subEvaluated: Evaluated = Object.create(evaluated);
       const result = validate(
         instance,
@@ -343,8 +384,7 @@ export function validate(
     const keywordLocation = `${schemaLocation}/allOf`;
     const errorsLength = errors.length;
     let allValid = true;
-    for (let i = 0; i < $allOf.length; i++) {
-      const subSchema = $allOf[i];
+    for (const [i, subSchema] of $allOf.entries()) {
       const subEvaluated: Evaluated = Object.create(evaluated);
       const result = validate(
         instance,
@@ -480,7 +520,7 @@ export function validate(
   if (instanceType === 'object') {
     if ($required !== undefined) {
       for (const key of $required) {
-        if (!(key in instance)) {
+        if (!hasOwnProperty(instance, key)) {
           errors.push({
             instanceLocation,
             keyword: 'required',
@@ -542,10 +582,10 @@ export function validate(
     if ($dependentRequired !== undefined) {
       const keywordLocation = `${schemaLocation}/dependantRequired`;
       for (const key in $dependentRequired) {
-        if (key in instance) {
+        if (hasOwnProperty(instance, key)) {
           const required = $dependentRequired[key] as string[];
           for (const dependantKey of required) {
-            if (!(dependantKey in instance)) {
+            if (!hasOwnProperty(instance, dependantKey)) {
               errors.push({
                 instanceLocation,
                 keyword: 'dependentRequired',
@@ -559,12 +599,12 @@ export function validate(
     }
 
     if ($dependentSchemas !== undefined) {
-      for (const key in $dependentSchemas) {
+      for (const [key, dependentSchema] of Object.entries($dependentSchemas)) {
         const keywordLocation = `${schemaLocation}/dependentSchemas`;
-        if (key in instance) {
+        if (hasOwnProperty(instance, key)) {
           const result = validate(
             instance,
-            $dependentSchemas[key],
+            dependentSchema,
             draft,
             lookup,
             shortCircuit,
@@ -591,11 +631,11 @@ export function validate(
     if ($dependencies !== undefined) {
       const keywordLocation = `${schemaLocation}/dependencies`;
       for (const key in $dependencies) {
-        if (key in instance) {
+        if (hasOwnProperty(instance, key)) {
           const propsOrSchema = $dependencies[key] as Schema | string[];
           if (Array.isArray(propsOrSchema)) {
             for (const dependantKey of propsOrSchema) {
-              if (!(dependantKey in instance)) {
+              if (!hasOwnProperty(instance, dependantKey)) {
                 errors.push({
                   instanceLocation,
                   keyword: 'dependencies',
@@ -637,14 +677,14 @@ export function validate(
 
     if ($properties !== undefined) {
       const keywordLocation = `${schemaLocation}/properties`;
-      for (const key in $properties) {
-        if (!(key in instance)) {
+      for (const [key, propertySchema] of Object.entries($properties)) {
+        if (!hasOwnProperty(instance, key)) {
           continue;
         }
         const subInstancePointer = `${instanceLocation}/${encodePointer(key)}`;
         const result = validate(
           instance[key],
-          $properties[key],
+          propertySchema,
           draft,
           lookup,
           shortCircuit,
@@ -652,8 +692,11 @@ export function validate(
           subInstancePointer,
           `${keywordLocation}/${encodePointer(key)}`
         );
+        // Covered by "properties" whether or not it is valid, so "additionalProperties"
+        // must not apply to it. Only a valid result is an annotation for "unevaluatedProperties".
+        thisEvaluated[key] = true;
         if (result.valid) {
-          evaluated[key] = thisEvaluated[key] = true;
+          evaluated[key] = true;
         } else {
           stop = shortCircuit;
           errors.push(
@@ -672,9 +715,8 @@ export function validate(
 
     if (!stop && $patternProperties !== undefined) {
       const keywordLocation = `${schemaLocation}/patternProperties`;
-      for (const pattern in $patternProperties) {
+      for (const [pattern, subSchema] of Object.entries($patternProperties)) {
         const regex = new RegExp(pattern, 'u');
-        const subSchema = $patternProperties[pattern];
         for (const key in instance) {
           if (!regex.test(key)) {
             continue;
@@ -692,8 +734,10 @@ export function validate(
             subInstancePointer,
             `${keywordLocation}/${encodePointer(pattern)}`
           );
+          // Covered by "patternProperties" whether or not it is valid; see "properties" above.
+          thisEvaluated[key] = true;
           if (result.valid) {
-            evaluated[key] = thisEvaluated[key] = true;
+            evaluated[key] = true;
           } else {
             stop = shortCircuit;
             errors.push(
@@ -804,7 +848,7 @@ export function validate(
       for (; i < length2; i++) {
         const result = validate(
           instance[i],
-          $prefixItems[i],
+          $prefixItems[i]!,
           draft,
           lookup,
           shortCircuit,
@@ -836,7 +880,7 @@ export function validate(
         for (; i < length2; i++) {
           const result = validate(
             instance[i],
-            $items[i],
+            $items[i]!,
             draft,
             lookup,
             shortCircuit,
@@ -960,11 +1004,7 @@ export function validate(
           errors.length = errorsLength;
         }
 
-        if (
-          $minContains === undefined &&
-          $maxContains === undefined &&
-          contained === 0
-        ) {
+        if ($minContains === undefined && contained === 0) {
           errors.splice(errorsLength, 0, {
             instanceLocation,
             keyword: 'contains',
@@ -1108,11 +1148,7 @@ export function validate(
       }
     }
     if ($multipleOf !== undefined) {
-      const remainder = instance % $multipleOf;
-      if (
-        Math.abs(0 - remainder) >= 1.1920929e-7 &&
-        Math.abs($multipleOf - remainder) >= 1.1920929e-7
-      ) {
+      if (!isMultipleOf(instance, $multipleOf)) {
         errors.push({
           instanceLocation,
           keyword: 'multipleOf',