@travetto/schema 4.0.1 → 4.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/schema",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Data type registry for runtime validation, reflection and binding.",
   "keywords": [
     "schema",
@@ -27,7 +27,7 @@
     "directory": "module/schema"
   },
   "dependencies": {
-    "@travetto/registry": "^4.0.1"
+    "@travetto/registry": "^4.0.2"
   },
   "peerDependencies": {
     "@travetto/transformer": "^4.0.1"

package/src/bind-util.ts

@@ -148,7 +148,7 @@ export class BindUtil {
       return data;
     }
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-    const cls = SchemaRegistry.resolveSubTypeForInstance<T>(cons, data as T);
+    const cls = SchemaRegistry.resolveInstanceType<T>(cons, data as T);
     if (data instanceof cls) {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       return data as T;

package/src/service/registry.ts

@@ -101,11 +101,13 @@ class $SchemaRegistry extends MetadataRegistry<ClassConfig, FieldConfig> {
   }
 
   /**
-   * Find the subtype for a given instance
+   * Find the resolved type for a given instance
    * @param cls Class for instance
    * @param o Actual instance
    */
-  resolveSubTypeForInstance<T>(cls: Class<T>, o: T): Class {
+  resolveInstanceType<T>(cls: Class<T>, o: T): Class {
+    cls = SchemaRegistry.get(cls.Ⲑid).class; // Resolve by id to handle any stale references
+
     const base = this.getBaseSchema(cls);
     const clsSchema = this.get(cls);
     const baseSchema = this.get(base);

package/src/validate/validator.ts

@@ -13,7 +13,7 @@ import { isValidationError, TypeMismatchError, ValidationResultError } from './e
  */
 function resolveSchema<T>(base: Class<T>, o: T, view?: string): SchemaConfig {
   return SchemaRegistry.getViewSchema(
-    SchemaRegistry.resolveSubTypeForInstance(base, o), view
+    SchemaRegistry.resolveInstanceType(base, o), view
   ).schema;
 }
 
@@ -272,7 +272,7 @@ export class SchemaValidator {
       // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
       throw new TypeMismatchError(cls.name, (o as ClassInstance).constructor.name);
     }
-    cls = SchemaRegistry.resolveSubTypeForInstance(cls, o);
+    cls = SchemaRegistry.resolveInstanceType(cls, o);
 
     const config = SchemaRegistry.getViewSchema(cls, view);