@travetto/model 3.4.0-rc.7 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "3.4.0-rc.7",
+  "version": "3.4.0",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
     "datastore",
@@ -26,14 +26,14 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^3.4.0-rc.6",
-    "@travetto/di": "^3.4.0-rc.6",
-    "@travetto/registry": "^3.4.0-rc.7",
-    "@travetto/schema": "^3.4.0-rc.6"
+    "@travetto/config": "^3.4.0",
+    "@travetto/di": "^3.4.0",
+    "@travetto/registry": "^3.4.0",
+    "@travetto/schema": "^3.4.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.0-rc.7",
-    "@travetto/test": "^3.4.0-rc.6"
+    "@travetto/cli": "^3.4.0",
+    "@travetto/test": "^3.4.0"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/support/base-command.ts

@@ -1,4 +1,4 @@
-import { ConsoleManager, GlobalEnvConfig } from '@travetto/base';
+import { ConsoleManager, EnvInit } from '@travetto/base';
 import { CliValidationError, CliCommandShape, cliTpl } from '@travetto/cli';
 import { RootRegistry } from '@travetto/registry';
 
@@ -16,7 +16,7 @@ export abstract class BaseModelCommand implements CliCommandShape {
 
   abstract getOp(): keyof ModelStorageSupport;
 
-  envInit(): GlobalEnvConfig {
+  envInit(): EnvInit {
     return { debug: false };
   }
 
@@ -40,7 +40,7 @@ export abstract class BaseModelCommand implements CliCommandShape {
     await RootRegistry.init();
 
     const candidates = await ModelCandidateUtil.export(this.getOp());
-    if (!candidates.providers.includes(provider)) {
+    if (provider && !candidates.providers.includes(provider)) {
       return { message: `provider: ${provider} is not a valid provider`, source: 'arg' };
     }
     const badModel = models.find(x => x !== '*' && !candidates.models.includes(x));

package/support/bin/candidate.ts

@@ -42,7 +42,7 @@ export class ModelCandidateUtil {
   static async getProviders(op?: keyof ModelStorageSupport): Promise<InjectableConfig[]> {
     // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
     const types = DependencyRegistry.getCandidateTypes<ModelStorageSupport>(ModelStorageSupportTarget as unknown as Class<ModelStorageSupport>);
-    return types.filter(x => !op || x.class.prototype[op]);
+    return types.filter(x => !op || x.class.prototype?.[op]);
   }
 
   /**

package/support/cli.model_export.ts

@@ -7,7 +7,7 @@ import { ModelCandidateUtil } from './bin/candidate';
 /**
  * Exports model schemas
  */
-@CliCommand({ fields: ['env', 'module'] })
+@CliCommand({ addEnv: true, addModule: true })
 export class ModelExportCommand extends BaseModelCommand {
 
   getOp(): 'exportModel' { return 'exportModel'; }

package/support/cli.model_install.ts

@@ -7,7 +7,7 @@ import { ModelCandidateUtil } from './bin/candidate';
 /**
  * Installing models
  */
-@CliCommand({ fields: ['env', 'module'] })
+@CliCommand({ addEnv: true, addModule: true })
 export class ModelInstallCommand extends BaseModelCommand {
 
   getOp(): 'createModel' { return 'createModel'; }

package/support/test/stream.ts

@@ -12,7 +12,7 @@ import { ModelStreamSupport } from '../../src/service/stream';
 @Suite()
 export abstract class ModelStreamSuite extends BaseModelSuite<ModelStreamSupport> {
 
-  fixture = new TestFixtures(['@travetto/model#support/fixtures']);
+  fixture = new TestFixtures(['@travetto/model']);
 
   async getHash(stream: Readable): Promise<string> {
     const hash = crypto.createHash('sha1');