@travetto/model 3.1.8 → 3.1.10

package/README.md

@@ -205,7 +205,7 @@ export interface ModelBulkSupport extends ModelCrudSupport {
 ```
 
 ## Declaration
-Models are declared via the [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L12) decorator, which allows the system to know that this is a class that is compatible with the module.  The only requirement for a model is the [ModelType](https://github.com/travetto/travetto/tree/main/module/model/src/types/model.ts#L9)
+Models are declared via the [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L13) decorator, which allows the system to know that this is a class that is compatible with the module.  The only requirement for a model is the [ModelType](https://github.com/travetto/travetto/tree/main/module/model/src/types/model.ts#L9)
 
 **Code: ModelType**
 ```typescript
@@ -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
    */
@@ -384,7 +380,7 @@ export class MemoryPolymorphicSuite extends ModelPolymorphismSuite {
 ```
 
 ## CLI - model:export
-The module provides the ability to generate an export of the model structure from all the various [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L12)s within the application.  This is useful for being able to generate the appropriate files to manually create the data schemas in production.
+The module provides the ability to generate an export of the model structure from all the various [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L13)s within the application.  This is useful for being able to generate the appropriate files to manually create the data schemas in production.
 
 **Terminal: Running model export**
 ```bash
@@ -407,7 +403,7 @@ Models
 ```
 
 ## CLI - model:install
-The module provides the ability to install all the various [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L12)s within the application given the current configuration being targeted.  This is useful for being able to prepare the datastore manually.
+The module provides the ability to install all the various [@Model](https://github.com/travetto/travetto/tree/main/module/model/src/registry/decorator.ts#L13)s within the application given the current configuration being targeted.  This is useful for being able to prepare the datastore manually.
 
 **Terminal: Running model install**
 ```bash

package/package.json

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

package/src/registry/decorator.ts

@@ -1,4 +1,5 @@
 import { Class } from '@travetto/base';
+import { SchemaRegistry } from '@travetto/schema';
 
 import { ModelType } from '../types/model';
 import { ModelRegistry } from './model';
@@ -15,6 +16,7 @@ export function Model(conf: Partial<ModelOptions<ModelType>> | string = {}) {
       conf = { store: conf };
     }
     ModelRegistry.register(target, conf);
+    SchemaRegistry.register(target, { baseType: conf.baseType });
     return target;
   };
 }

package/src/registry/model.ts

@@ -63,9 +63,9 @@ 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) {
-      config.subType = schema.subType; // Copy from schema
-      delete view.type.required; // Allow type to be optional
+    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
     }
     return config;
   }
@@ -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
    */