@travetto/model 3.1.9 → 3.1.10

package/README.md

@@ -216,10 +216,6 @@ export interface ModelType {
    * If not provided, will be computed on create
    */
   id: string;
-  /**
-   * Type of model to save
-   */
-  type?: string;
   /**
    * Run before saving
    */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "3.1.9",
+  "version": "3.1.10",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -26,13 +26,13 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^3.1.3",
+    "@travetto/config": "^3.1.4",
     "@travetto/di": "^3.1.1",
     "@travetto/registry": "^3.1.1",
-    "@travetto/schema": "^3.1.3"
+    "@travetto/schema": "^3.1.4"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.1.3",
+    "@travetto/cli": "^3.1.4",
     "@travetto/test": "^3.1.1"
   },
   "peerDependenciesMeta": {

package/src/registry/model.ts

@@ -63,7 +63,7 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
     const view = schema.views[AllViewⲐ].schema;
     delete view.id.required; // Allow ids to be optional
 
-    if ('type' in view && this.getBaseModel(cls) !== cls) {
+    if (schema.subTypeField in view && this.getBaseModel(cls) !== cls) {
       config.subType = !!schema.subTypeName; // Copy from schema
       delete view[schema.subTypeField].required; // Allow type to be optional
     }
@@ -134,8 +134,9 @@ class $ModelRegistry extends MetadataRegistry<ModelOptions<ModelType>> {
   getStore(cls: Class): string {
     if (!this.stores.has(cls)) {
       const config = this.get(cls) ?? this.getOrCreatePending(cls);
-      if (config.subType) {
-        return this.getStore(this.getBaseModel(cls));
+      const base = this.getBaseModel(cls);
+      if (base !== cls) {
+        return this.getStore(base);
       }
 
       const name = config.store ?? cls.name.toLowerCase();

package/src/types/model.ts

@@ -13,10 +13,6 @@ export interface ModelType {
    * If not provided, will be computed on create
    */
   id: string;
-  /**
-   * Type of model to save
-   */
-  type?: string;
   /**
    * Run before saving
    */