@travetto/cli 7.0.0-rc.3 → 7.0.0-rc.5

package/README.md

@@ -213,9 +213,9 @@ export class BasicCommand {
 
 **Terminal: Basic Command**
 ```bash
-$ trv basic:arglist -h
+$ trv basic:arg-list -h
 
-Usage: basic:arglist [options] <volumes...:number>
+Usage: basic:arg-list [options] <volumes...:number>
 
 Options:
   -r, --reverse
@@ -224,19 +224,19 @@ Options:
 
 **Terminal: Basic Arg List**
 ```bash
-$ trv basic:arglist 10 5 3 9 8 1
+$ trv basic:arg-list 10 5 3 9 8 1
 
 1 3 5 8 9 10
 ```
 
 **Terminal: Basic Arg List with Invalid Number**
 ```bash
-$ trv basic:arglist 10 5 3 9 20 1
+$ trv basic:arg-list 10 5 3 9 20 1
 
 Execution failed:
  * Argument volumes[4] is greater than (10)
 
-Usage: basic:arglist [options] <volumes...:number>
+Usage: basic:arg-list [options] <volumes...:number>
 
 Options:
   -r, --reverse
@@ -245,7 +245,7 @@ Options:
 
 **Terminal: Basic Arg List with Reverse**
 ```bash
-$ trv basic:arglist -r 10 5 3 9 8 1
+$ trv basic:arg-list -r 10 5 3 9 8 1
 
 10 9 8 5 3 1
 ```
@@ -479,7 +479,7 @@ export class WebHttpCommand implements CliCommandShape {
   port?: number;
 
   /** Kill conflicting port owner */
-  killConflict?: boolean;
+  killConflict?: boolean = Runtime.envType === 'development';
 
   preMain(): void {
     if (this.port) {
@@ -491,18 +491,18 @@ export class WebHttpCommand implements CliCommandShape {
     await Registry.init();
     const instance = await DependencyRegistryIndex.getInstance(toConcrete<WebHttpServer>());
 
-    const handle = await Util.acquireWithRetry(
-      () => instance.serve(),
-      NetUtil.freePortOnConflict,
-      this.killConflict && !Runtime.production ? 5 : 1
-    );
-
-    return handle.complete;
+    if (this.killConflict) {
+      const handle = await Util.acquireWithRetry(() => instance.serve(), NetUtil.freePortOnConflict, 5);
+      return handle.complete;
+    } else {
+      const handle = await instance.serve();
+      return handle.complete;
+    }
   }
 }
 ```
 
-As noted in the example above, `fields` is specified in this execution, with support for `module`, and `env`. These env flag is directly tied to the [Runtime](https://github.com/travetto/travetto/tree/main/module/runtime/src/context.ts#L13) `name` defined in the [Runtime](https://github.com/travetto/travetto/tree/main/module/runtime#readme "Runtime for travetto applications.") module. 
+As noted in the example above, `fields` is specified in this execution, with support for `module`, and `env`. These env flag is directly tied to the [Runtime](https://github.com/travetto/travetto/tree/main/module/runtime/src/context.ts#L12) `name` defined in the [Runtime](https://github.com/travetto/travetto/tree/main/module/runtime#readme "Runtime for travetto applications.") module. 
 
 The `module` field is slightly more complex, but is geared towards supporting commands within a monorepo context.  This flag ensures that a module is specified if running from the root of the monorepo, and that the module provided is real, and can run the desired command.  When running from an explicit module folder in the monorepo, the module flag is ignored.
 
@@ -550,13 +550,13 @@ Options:
 Available Services
 --------------------
  * dynamodb@3.1.0
- * elasticsearch@9.2.1
+ * elasticsearch@9.2.3
  * firestore@latest
  * mongodb@8.2
  * mysql@9.5
  * postgresql@18.1
  * redis@8.4
- * s3@4.10.0
+ * s3@4.11.0
 ```
 
 A sample of all services available to the entire framework:
@@ -568,13 +568,13 @@ $ trv service status
 Service          Version    Status
 -------------------------------------------------
 dynamodb           3.1.0    Running 93af422e793a
-elasticsearch      9.2.1    Running ed76ee063d13
+elasticsearch      9.2.3    Running ed76ee063d13
 firestore         latest    Running feec2e5e95b4
 mongodb              8.2    Running 5513eba6734e
 mysql                9.5    Running 307bc66d442a
 postgresql          18.1    Running e78291e71040
 redis                8.4    Running 77ba279b4e30
-s3                4.10.0    Running fdacfc55b9e3
+s3                4.11.0    Running fdacfc55b9e3
 ```
 
 ### Defining new Services

package/bin/trv.js

@@ -1,7 +1,4 @@
 #!/usr/bin/env node
-
-globalThis.__entry_point__ = __filename;
-
 // @ts-check
-require('@travetto/compiler/bin/entry.common.js')
-  .load(operations => operations.exec('@travetto/cli/support/entry.trv.js'));
+import { load } from '@travetto/compiler/bin/entry.common.js';
+load(operations => operations.exec('@travetto/cli/support/entry.trv.js'));

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@travetto/cli",
-  "version": "7.0.0-rc.3",
+  "version": "7.0.0-rc.5",
+  "type": "module",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
     "cli",
@@ -28,8 +29,8 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/schema": "^7.0.0-rc.3",
-    "@travetto/terminal": "^7.0.0-rc.3"
+    "@travetto/schema": "^7.0.0-rc.5",
+    "@travetto/terminal": "^7.0.0-rc.5"
   },
   "travetto": {
     "displayName": "Command Line Interface",

package/src/registry/decorator.ts

@@ -69,7 +69,7 @@ const FIELD_CONFIG: {
         type: Boolean,
         aliases: ['-cr'],
         description: 'Should the invocation automatically restart on source changes',
-        default: Runtime.env === 'development',
+        default: Runtime.envType === 'development',
         required: { active: false },
       },
     }
@@ -79,7 +79,7 @@ const FIELD_CONFIG: {
  * Decorator to register a CLI command
  *
  * @augments `@travetto/schema:Schema`
- * @example main
+ * @example method:main
  * @kind decorator
  */
 export function CliCommand(config: CliCommandConfigOptions = {}) {

package/src/registry/registry-index.ts

@@ -80,7 +80,6 @@ export class CliCommandRegistryIndex implements RegistryIndex {
     const uninitialized = filtered
       .filter(cls => !this.store.finalized(cls));
 
-
     // Initialize any uninitialized commands
     if (uninitialized.length) {
       // Ensure processed

package/src/util.ts

@@ -92,7 +92,6 @@ export class CliUtil {
       restarts.push(Date.now());
     }
 
-
     if (exhaustedRestarts) {
       console.error(`Bailing, due to ${maxRetries} restarts in under 10s`);
     }

package/support/cli.cli_schema.ts

@@ -7,7 +7,6 @@ import { CliCommandRegistryIndex } from '../src/registry/registry-index.ts';
 import { CliUtil } from '../src/util.ts';
 import { CliSchemaExportUtil } from '../src/schema-export.ts';
 
-
 /**
  * Generates the schema for all CLI operations
  */