@travetto/model 8.0.0-alpha.0 → 8.0.0-alpha.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/model",
-  "version": "8.0.0-alpha.0",
+  "version": "8.0.0-alpha.2",
   "type": "module",
   "description": "Datastore abstraction for core operations.",
   "keywords": [
@@ -27,14 +27,14 @@
     "directory": "module/model"
   },
   "dependencies": {
-    "@travetto/config": "^8.0.0-alpha.0",
-    "@travetto/di": "^8.0.0-alpha.0",
-    "@travetto/registry": "^8.0.0-alpha.0",
-    "@travetto/schema": "^8.0.0-alpha.0"
+    "@travetto/config": "^8.0.0-alpha.2",
+    "@travetto/di": "^8.0.0-alpha.2",
+    "@travetto/registry": "^8.0.0-alpha.2",
+    "@travetto/schema": "^8.0.0-alpha.2"
   },
   "peerDependencies": {
-    "@travetto/cli": "^8.0.0-alpha.0",
-    "@travetto/test": "^8.0.0-alpha.0"
+    "@travetto/cli": "^8.0.0-alpha.3",
+    "@travetto/test": "^8.0.0-alpha.2"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/util/blob.ts

@@ -10,4 +10,9 @@ export class ModelBlobUtil {
    * Type guard for determining if service supports blob operations
    */
   static isSupported = hasFunction<ModelBlobSupport>('getBlob');
+
+  /**
+   * Type guard for determining if service supports blob write urls
+   */
+  static isWriteUrlSupported = hasFunction<ModelBlobSupport>('getBlobWriteUrl');
 }

package/support/base-command.ts

@@ -1,7 +1,7 @@
 import { Env } from '@travetto/runtime';
-import { type CliValidationError, type CliCommandShape, cliTpl } from '@travetto/cli';
+import { type CliCommandShape, cliTpl, CliModuleFlag, CliProfilesFlag } from '@travetto/cli';
 import { Registry } from '@travetto/registry';
-import { Schema } from '@travetto/schema';
+import { Schema, type ValidationError } from '@travetto/schema';
 
 import type { ModelStorageSupport } from '../src/types/storage.ts';
 
@@ -13,9 +13,26 @@ import { ModelCandidateUtil } from './bin/candidate.ts';
 @Schema()
 export abstract class BaseModelCommand implements CliCommandShape {
 
+  static async validate(operation: keyof ModelStorageSupport, provider: string, models: string[]): Promise<ValidationError | undefined> {
+    const candidates = await ModelCandidateUtil.export(operation);
+    if (provider && !candidates.providers.includes(provider)) {
+      return { message: `provider: ${provider} is not a valid provider`, source: 'arg', kind: 'invalid', path: 'provider' };
+    }
+    const badModel = models.find(model => model !== '*' && !candidates.models.includes(model));
+    if (badModel) {
+      return { message: `model: ${badModel} is not a valid model`, source: 'arg', kind: 'invalid', path: 'models' };
+    }
+  }
+
+  @CliProfilesFlag()
+  profile: string[];
+
+  @CliModuleFlag({ short: 'm' })
+  module: string;
+
   abstract getOperation(): keyof ModelStorageSupport;
 
-  preMain(): void {
+  finalize(): void {
     Env.DEBUG.set(false);
   }
 
@@ -34,18 +51,5 @@ export abstract class BaseModelCommand implements CliCommandShape {
     ];
   }
 
-  async validate(provider: string, models: string[]): Promise<CliValidationError | undefined> {
-    await Registry.init();
-
-    const candidates = await ModelCandidateUtil.export(this.getOperation());
-    if (provider && !candidates.providers.includes(provider)) {
-      return { message: `provider: ${provider} is not a valid provider`, source: 'arg' };
-    }
-    const badModel = models.find(model => model !== '*' && !candidates.models.includes(model));
-    if (badModel) {
-      return { message: `model: ${badModel} is not a valid model`, source: 'arg' };
-    }
-  }
-
   abstract main(...args: unknown[]): ReturnType<CliCommandShape['main']>;
 }

package/support/cli.model_export.ts

@@ -1,4 +1,5 @@
 import { CliCommand } from '@travetto/cli';
+import { MethodValidator } from '@travetto/schema';
 
 import { BaseModelCommand } from './base-command.ts';
 import { ModelExportUtil } from './bin/export.ts';
@@ -7,11 +8,12 @@ import { ModelCandidateUtil } from './bin/candidate.ts';
 /**
  * Exports model schemas
  */
-@CliCommand({ with: { profiles: true, module: true } })
+@CliCommand()
 export class ModelExportCommand extends BaseModelCommand {
 
   getOperation(): 'exportModel' { return 'exportModel'; }
 
+  @MethodValidator(BaseModelCommand.validate.bind(null, 'exportModel'))
   async main(provider: string, models: string[]): Promise<void> {
     const resolved = await ModelCandidateUtil.resolve(provider, models);
     await ModelExportUtil.run(resolved.provider, resolved.models);

package/support/cli.model_install.ts

@@ -1,4 +1,5 @@
 import { CliCommand, cliTpl } from '@travetto/cli';
+import { MethodValidator } from '@travetto/schema';
 
 import { BaseModelCommand } from './base-command.ts';
 import { ModelInstallUtil } from './bin/install.ts';
@@ -7,11 +8,12 @@ import { ModelCandidateUtil } from './bin/candidate.ts';
 /**
  * Installing models
  */
-@CliCommand({ with: { profiles: true, module: true } })
+@CliCommand()
 export class ModelInstallCommand extends BaseModelCommand {
 
   getOperation(): 'upsertModel' { return 'upsertModel'; }
 
+  @MethodValidator(BaseModelCommand.validate.bind(null, 'upsertModel'))
   async main(provider: string, models: string[]): Promise<void> {
     const resolved = await ModelCandidateUtil.resolve(provider, models);
     await ModelInstallUtil.run(resolved.provider, resolved.models);

package/support/test/blob.ts

@@ -6,6 +6,7 @@ import { BinaryMetadataUtil, BinaryUtil, Util } from '@travetto/runtime';
 import { BaseModelSuite } from '@travetto/model/support/test/base.ts';
 
 import type { ModelBlobSupport } from '../../src/types/blob.ts';
+import { ModelBlobUtil } from '../../src/util/blob.ts';
 
 @Suite()
 export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
@@ -150,8 +151,7 @@ export abstract class ModelBlobSuite extends BaseModelSuite<ModelBlobSupport> {
     assert(savedMeta.hash === undefined);
   }
 
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  @Test({ skip: (x: unknown) => !(x as ModelBlobSuite).serviceClass.prototype.getBlobWriteUrl })
+  @Test({ skip: ModelBlobSuite.ifNot(ModelBlobUtil.isWriteUrlSupported) })
   async signedUrl() {
     const service = await this.service;
 

package/support/test/suite.ts

@@ -45,16 +45,17 @@ class ModelSuiteHandler<T extends { configClass: Class<ConfigType>, serviceClass
   async afterEach(instance: T) {
     const service = await DependencyRegistryIndex.getInstance<T>(instance.serviceClass, this.qualifier);
     if (ModelStorageUtil.isSupported(service)) {
-      const models = ModelRegistryIndex.getClasses().filter(m => m === SchemaRegistryIndex.getBaseClass(m));
+      const models = ModelRegistryIndex.getClasses()
+        .filter(model => model === SchemaRegistryIndex.getBaseClass(model));
 
       if (ModelBlobUtil.isSupported(service) && service.truncateBlob) {
         await service.truncateBlob();
       }
 
       if (service.truncateModel) {
-        await Promise.all(models.map(x => service.truncateModel!(x)));
+        await Promise.all(models.map(model => service.truncateModel!(model)));
       } else if (service.deleteModel) {
-        await Promise.all(models.map(x => service.deleteModel!(x)));
+        await Promise.all(models.map(model => service.deleteModel!(model)));
       } else {
         await service.deleteStorage(); // Purge it all
       }