feat(core): set path property based on cwd when running generators

nrwl · Dec 30, 2020 · 1cb152e · 1cb152e
1 parent 67fde2d
commit 1cb152e
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 10 deletions.
diff --git a/packages/tao/src/commands/generate.ts b/packages/tao/src/commands/generate.ts
@@ -176,6 +176,7 @@ export async function taoNew(cwd: string, args: string[], isVerbose = false) {
       null,
       schema,
       opts.interactive,
+      null,
       null
     );
     return (await import('./ngcli-adapter')).invokeNew(
@@ -222,7 +223,8 @@ export async function generate(
       workspaceDefinition,
       schema,
       opts.interactive,
-      ws.calculateDefaultProjectName(cwd, workspaceDefinition)
+      ws.calculateDefaultProjectName(cwd, workspaceDefinition),
+      ws.relativeCwd(cwd)
     );
 
     if (ws.isNxGenerator(opts.collectionName, normalizedGeneratorName)) {

diff --git a/packages/tao/src/commands/run.ts b/packages/tao/src/commands/run.ts
@@ -157,7 +157,8 @@ export async function run(
       opts.configuration,
       target,
       schema,
-      defaultProjectName
+      defaultProjectName,
+      ws.relativeCwd(cwd)
     );
     if (opts.help) {
       printRunHelp(opts, schema);

diff --git a/packages/tao/src/shared/params.spec.ts b/packages/tao/src/shared/params.spec.ts
@@ -347,6 +347,7 @@ describe('params', () => {
           },
         },
         ['argv-value'],
+        null,
         null
       );
 
@@ -368,11 +369,33 @@ describe('params', () => {
           },
         },
         [],
-        'myProject'
+        'myProject',
+        null
       );
 
       expect(params).toEqual({ a: 'myProject' });
     });
+
+    it('should use relativeCwd to set path', () => {
+      const params = {};
+      convertSmartDefaultsIntoNamedParams(
+        params,
+        {
+          properties: {
+            a: {
+              type: 'string',
+              format: 'path',
+              visible: false,
+            },
+          },
+        },
+        [],
+        null,
+        './somepath'
+      );
+
+      expect(params).toEqual({ a: './somepath' });
+    });
   });
 
   describe('validateOptsAgainstSchema', () => {

diff --git a/packages/tao/src/shared/params.ts b/packages/tao/src/shared/params.ts
@@ -10,6 +10,8 @@ type PropertyDescription = {
   items?: any;
   alias?: string;
   description?: string;
+  format?: string;
+  visible?: boolean;
   default?: string | number | boolean | string[];
   $ref?: string;
   $default?: { $source: 'argv'; index: number } | { $source: 'projectName' };
@@ -324,7 +326,8 @@ export function combineOptionsForExecutor(
   config: string,
   target: TargetConfiguration,
   schema: Schema,
-  defaultProjectName: string | null
+  defaultProjectName: string | null,
+  relativeCwd: string | null
 ) {
   const r = convertAliases(
     coerceTypesInOptions(commandLineOpts, schema),
@@ -338,7 +341,8 @@ export function combineOptionsForExecutor(
     combined,
     schema,
     (commandLineOpts['_'] as string[]) || [],
-    defaultProjectName
+    defaultProjectName,
+    relativeCwd
   );
   setDefaults(combined, schema);
   validateOptsAgainstSchema(combined, schema);
@@ -352,7 +356,8 @@ export async function combineOptionsForGenerator(
   wc: WorkspaceConfiguration | null,
   schema: Schema,
   isInteractive: boolean,
-  defaultProjectName: string | null
+  defaultProjectName: string | null,
+  relativeCwd: string | null
 ) {
   const generatorDefaults = wc
     ? getGeneratorDefaults(
@@ -371,7 +376,8 @@ export async function combineOptionsForGenerator(
     combined,
     schema,
     (commandLineOpts['_'] as string[]) || [],
-    defaultProjectName
+    defaultProjectName,
+    relativeCwd
   );
 
   if (isInteractive && isTTY()) {
@@ -388,7 +394,8 @@ export function convertSmartDefaultsIntoNamedParams(
   opts: { [k: string]: any },
   schema: Schema,
   argv: string[],
-  defaultProjectName: string | null
+  defaultProjectName: string | null,
+  relativeCwd: string | null
 ) {
   Object.entries(schema.properties).forEach(([k, v]) => {
     if (
@@ -405,6 +412,13 @@ export function convertSmartDefaultsIntoNamedParams(
       defaultProjectName
     ) {
       opts[k] = defaultProjectName;
+    } else if (
+      opts[k] === undefined &&
+      v.format === 'path' &&
+      v.visible === false &&
+      relativeCwd
+    ) {
+      opts[k] = relativeCwd;
     }
   });
   delete opts['_'];

diff --git a/packages/tao/src/shared/workspace.ts b/packages/tao/src/shared/workspace.ts
@@ -127,12 +127,20 @@ export function workspaceConfigName(root: string) {
 export class Workspaces {
   constructor(private root: string) {}
 
-  calculateDefaultProjectName(cwd: string, wc: WorkspaceConfiguration) {
+  relativeCwd(cwd: string) {
     let relativeCwd = cwd.split(this.root)[1];
     if (relativeCwd) {
-      relativeCwd = relativeCwd.startsWith('/')
+      return relativeCwd.startsWith('/')
         ? relativeCwd.substring(1)
         : relativeCwd;
+    } else {
+      return null;
+    }
+  }
+
+  calculateDefaultProjectName(cwd: string, wc: WorkspaceConfiguration) {
+    const relativeCwd = this.relativeCwd(cwd);
+    if (relativeCwd) {
       const matchingProject = Object.keys(wc.projects).find((p) => {
         const projectRoot = wc.projects[p].root;
         return (