object-shape-tester - npm Package Compare versions

Comparing version 2.3.1 to 2.3.2

dist/cjs/define-shape/type-equality.js

@@ -5,6 +5,10 @@ "use strict";
 const run_time_assertions_1 = require("run-time-assertions");
-function haveEqualTypes(a, b) {
-    const constructorsMatch = a?.constructor === b?.constructor;
-    return (0, run_time_assertions_1.getRunTimeType)(a) === (0, run_time_assertions_1.getRunTimeType)(b) && constructorsMatch;
+function haveEqualTypes(subject, shape) {
+    const shapeConstructor = shape?.constructor;
+    const subjectPrototype = subject?.constructor?.prototype;
+    const constructorsEqual = subject?.constructor === shapeConstructor;
+    const constructorsInstanceOf = shapeConstructor && subjectPrototype ? subjectPrototype instanceof shapeConstructor : false;
+    const constructorsMatch = constructorsEqual || constructorsInstanceOf;
+    return (0, run_time_assertions_1.getRunTimeType)(subject) === (0, run_time_assertions_1.getRunTimeType)(shape) && constructorsMatch;
 }
 exports.haveEqualTypes = haveEqualTypes;

dist/cjs/verify-shape/verify-shape.js

@@ -241,4 +241,10 @@ "use strict";
     if ((0, common_1.isObject)(shape)) {
+        const shapeKeys = new Set((0, common_1.getObjectTypedKeys)(shape));
         const subjectKeys = new Set((0, common_1.getObjectTypedKeys)(subject));
-        const shapeKeys = new Set((0, common_1.getObjectTypedKeys)(shape));
+        shapeKeys.forEach((shapeKey) => {
+            // try to account for non-enumerable keys
+            if (shapeKey in subject) {
+                subjectKeys.add(shapeKey);
+            }
+        });
         if (!options.ignoreExtraKeys) {
@@ -245,0 +251,0 @@ subjectKeys.forEach((subjectKey) => {

dist/esm/define-shape/type-equality.js

 import { getRunTimeType } from 'run-time-assertions';
-export function haveEqualTypes(a, b) {
-    const constructorsMatch = a?.constructor === b?.constructor;
-    return getRunTimeType(a) === getRunTimeType(b) && constructorsMatch;
+export function haveEqualTypes(subject, shape) {
+    const shapeConstructor = shape?.constructor;
+    const subjectPrototype = subject?.constructor?.prototype;
+    const constructorsEqual = subject?.constructor === shapeConstructor;
+    const constructorsInstanceOf = shapeConstructor && subjectPrototype ? subjectPrototype instanceof shapeConstructor : false;
+    const constructorsMatch = constructorsEqual || constructorsInstanceOf;
+    return getRunTimeType(subject) === getRunTimeType(shape) && constructorsMatch;
 }

dist/esm/verify-shape/verify-shape.js

@@ -236,4 +236,10 @@ import { combineErrorMessages, getObjectTypedKeys, isLengthAtLeast, isObject, mapObjectValues, } from '@augment-vir/common';
     if (isObject(shape)) {
+        const shapeKeys = new Set(getObjectTypedKeys(shape));
         const subjectKeys = new Set(getObjectTypedKeys(subject));
-        const shapeKeys = new Set(getObjectTypedKeys(shape));
+        shapeKeys.forEach((shapeKey) => {
+            // try to account for non-enumerable keys
+            if (shapeKey in subject) {
+                subjectKeys.add(shapeKey);
+            }
+        });
         if (!options.ignoreExtraKeys) {
@@ -240,0 +246,0 @@ subjectKeys.forEach((subjectKey) => {

dist/types/define-shape/type-equality.d.ts

@@ -1,1 +0,1 @@
-export declare function haveEqualTypes(a: unknown, b: unknown): boolean;
+export declare function haveEqualTypes(subject: unknown, shape: unknown): boolean;

package.json

 {
     "name": "object-shape-tester",
-    "version": "2.3.1",
+    "version": "2.3.2",
     "description": "Test object properties and value types.",
@@ -5,0 +5,0 @@ "keywords": [],

No alert changes

Improved metrics

Total package byte prevSize

78051

increased by1.43%

Lines of code

1523

increased by1.33%

No dependency changes