@travetto/model 3.0.0-rc.10 → 3.0.0-rc.12

package/README.md

@@ -388,8 +388,6 @@ Usage:  model:export [options] [provider] [models...]
 Options:
   -e, --env <env>  Application environment
   -h, --help       display help for command
-
-
 ```
 
 ## CLI - model:install
@@ -405,6 +403,4 @@ Usage:  model:install [options] [provider] [models...]
 Options:
   -e, --env <env>  Application environment
   -h, --help       display help for command
-
-
 ```

package/package.json

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

package/support/bin/candidate.ts

@@ -3,6 +3,8 @@ import { Class, ExecUtil } from '@travetto/base';
 import { GlobalTerminal } from '@travetto/terminal';
 import { ModelRegistry } from '@travetto/model';
 import { InjectableConfig, DependencyRegistry } from '@travetto/di';
+import { RootRegistry } from '@travetto/registry';
+
 import { ModelStorageSupportTarget } from '@travetto/model/src/internal/service/common';
 
 import type { ModelStorageSupport } from '../../src/service/storage';
@@ -15,6 +17,10 @@ type CandidateNames = { providers: string[], models: string[] };
  */
 export class ModelCandidateUtil {
 
+  static async export(op: keyof ModelStorageSupport): Promise<{ models: string[], providers: string[] }> {
+    return { models: await this.getModelNames(), providers: await this.getProviderNames(op) };
+  }
+
   /**
    * Get all models
    */
@@ -64,8 +70,10 @@ export class ModelCandidateUtil {
    * @returns
    */
   static async getCandidates(op: keyof ModelStorageSupport): Promise<CandidateNames> {
-    const main = RootIndex.resolveFileImport('@travetto/model/support/main.candidate.ts');
-    return GlobalTerminal.withWaiting('Resolving', ExecUtil.worker<CandidateNames>(main, [op]).message);
+    return GlobalTerminal.withWaiting('Resolving', ExecUtil.worker<CandidateNames>(
+      RootIndex.resolveFileImport('@travetto/cli/support/cli.ts'),
+      ['main', '@travetto/model/support/bin/candidate.ts', op]
+    ).message);
   }
 
   /**
@@ -80,4 +88,12 @@ export class ModelCandidateUtil {
       models: await this.#getModels(models)
     };
   }
+}
+
+/**
+ * Handles direct invocation
+ */
+export async function main(op: keyof ModelStorageSupport): Promise<{ models: string[], providers: string[] }> {
+  await RootRegistry.init();
+  return await ModelCandidateUtil.export(op);
 }

package/support/main.candidate.ts

@@ -1,16 +0,0 @@
-import { RootRegistry } from '@travetto/registry';
-
-import type { ModelStorageSupport } from '../src/service/storage';
-import { ModelCandidateUtil } from './bin/candidate';
-
-/**
- * Handles direct invocation
- */
-export async function main(op: keyof ModelStorageSupport): Promise<{ models: string[], providers: string[] }> {
-  await RootRegistry.init();
-
-  return {
-    models: await ModelCandidateUtil.getModelNames(),
-    providers: await ModelCandidateUtil.getProviderNames(op)
-  };
-}