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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/cli",
-  "version": "3.4.0-rc.3",
+  "version": "3.4.0-rc.5",
   "description": "CLI infrastructure for Travetto framework",
   "keywords": [
     "cli",
@@ -29,7 +29,7 @@
     "directory": "module/cli"
   },
   "dependencies": {
-    "@travetto/schema": "^3.4.0-rc.2",
+    "@travetto/schema": "^3.4.0-rc.4",
     "@travetto/terminal": "^3.4.0-rc.0"
   },
   "travetto": {

package/src/util.ts

@@ -1,7 +1,5 @@
-import fs from 'fs/promises';
-
-import { Env, ExecUtil } from '@travetto/base';
-import { path, RootIndex } from '@travetto/manifest';
+import { CompilerClient, Env, ExecUtil } from '@travetto/base';
+import { RootIndex } from '@travetto/manifest';
 
 import { CliCommandShape } from './types';
 import { CliCommandRegistry } from './registry';
@@ -40,23 +38,43 @@ export class CliUtil {
    * Dispatch IPC payload
    */
   static async triggerIpc<T extends CliCommandShape>(action: 'run', cmd: T): Promise<boolean> {
-    const file = process.env.TRV_CLI_IPC;
+    if (!process.env.TRV_CLI_IPC) {
+      return false;
+    }
+
+    const client = new CompilerClient({});
+
+    const info = await client.getInfo(true);
 
-    if (!file) {
+    if (!info) { // Server not running
       return false;
     }
 
+    const defaultEnvKeys = new Set(Object.keys(info.env ?? {}));
+    defaultEnvKeys.add('PS1').add('INIT_CWD').add('COLOR').add('LANGUAGE').add('PROFILEHOME').add('_');
+
+    const env = Object.fromEntries(
+      Object.entries(process.env).filter(([k]) =>
+        !defaultEnvKeys.has(k) && !/^(npm_|GTK|GDK|TRV|NODE|GIT|TERM_)/.test(k) && !/VSCODE/.test(k)
+      )
+    );
+
     const cfg = CliCommandRegistry.getConfig(cmd);
-    const payload = JSON.stringify({
-      type: `@travetto/cli:${action}`, data: {
+    const req = {
+      type: `@travetto/cli:${action}`,
+      ipc: process.env.TRV_CLI_IPC,
+      data: {
         name: cfg.name,
         commandModule: cfg.module,
         module: RootIndex.manifest.mainModule,
-        args: process.argv.slice(3)
+        args: process.argv.slice(3),
+        env
       }
-    });
-    await fs.mkdir(path.dirname(file), { recursive: true });
-    await fs.appendFile(file, `${payload}\n`);
+    };
+
+    console.log('Triggering IPC request', req);
+
+    await client.sendEvent('custom', req);
     return true;
   }
 

package/support/transformer.cli.ts

@@ -1,6 +1,6 @@
 import ts from 'typescript';
 
-import { TransformerState, DecoratorMeta, DecoratorUtil, AfterClass } from '@travetto/transformer';
+import { TransformerState, DecoratorMeta, AfterClass } from '@travetto/transformer';
 import { SchemaTransformUtil } from '@travetto/schema/support/transform-util';
 
 /**
@@ -29,22 +29,6 @@ export class CliCommandTransformer {
       return node;
     }
 
-    const declArgs = [...dec.expression.arguments];
-
-    // Name only, need a config object
-    if (declArgs.length === 0) {
-      declArgs.push(state.fromLiteral({}));
-    }
-
-    // Compute new declaration
-    const newDec = state.factory.createDecorator(
-      state.factory.createCallExpression(
-        dec.expression.expression,
-        dec.expression.typeArguments,
-        [...declArgs]
-      )
-    );
-
     const members = node.members.map(x => ts.isMethodDeclaration(x) && x === runMethod ?
       state.factory.updateMethodDeclaration(
         x,
@@ -59,7 +43,7 @@ export class CliCommandTransformer {
       ) : x);
 
     return state.factory.updateClassDeclaration(node,
-      DecoratorUtil.spliceDecorators(node, dec, [newDec]),
+      node.modifiers,
       node.name,
       node.typeParameters,
       node.heritageClauses,