fix: better logic for when to prompt for workspace root and workspaces (#244)

Author: wesleytodd

index.js

@@ -116,25 +116,35 @@ function initOpts () {
         }
       },
 
-      workspaces: {
-        type: 'string',
-        prompt: {
-          message: 'Workspaces:',
-          filter: parseList
-        }
-      },
-
       workspaceRoot: {
         type: 'string',
         flag: {
           key: 'workspace-root'
         },
         prompt: {
           message: 'Workspace Root:',
+          default: (promptInput, allInput) => {
+            return allInput.cwd;
+          },
           when: (promptInput, defaultWhen, allInput) => {
-            if (allInput.workspaceRoot !== allInput.cwd) {
+            if (defaultWhen && allInput.workspaceRoot !== allInput.cwd) {
               return true;
             }
+            return false;
+          }
+        }
+      },
+
+      workspaces: {
+        type: 'string',
+        prompt: {
+          message: 'Workspaces:',
+          filter: parseList,
+          when: (promptInput, defaultWhen, allInput) => {
+            // Only ask this when running from a workspace root
+            if (allInput.workspaceRoot !== allInput.cwd) {
+              return false;
+            }
             return defaultWhen;
           }
         }

package.json

@@ -42,7 +42,7 @@
     "fs-extra": "^11.1.1",
     "loggerr": "^3.0.0",
     "npm-package-arg": "^11.0.1",
-    "opta": "^1.1.5",
+    "opta": "^1.1.6",
     "safe-parse-list": "^0.1.1",
     "validate-npm-package-name": "^5.0.0"
   },

test/index.js

@@ -59,8 +59,8 @@ suite('create-package-json', () => {
           assert.strictEqual(prompts[4].name, 'repository');
           assert.strictEqual(prompts[5].name, 'keywords');
           assert.strictEqual(prompts[6].name, 'license');
-          assert.strictEqual(prompts[7].name, 'workspaces');
-          assert.strictEqual(prompts[8].name, 'workspaceRoot');
+          assert.strictEqual(prompts[7].name, 'workspaceRoot');
+          assert.strictEqual(prompts[8].name, 'workspaces');
           assert.strictEqual(prompts[9].name, 'type');
           assert.strictEqual(prompts[10].name, 'main');
           assert.strictEqual(prompts[11].name, 'dependencies');

test/monorepo.js

@@ -90,4 +90,33 @@ suite('monorepo', () => {
     assert.strictEqual(pkg.workspaces, undefined);
     assert.strictEqual(pkg.dependencies['english-days'], '^1.0.0');
   });
+
+  test('create a new workspace package.json in an existing monorepo passing workspaceRoot', async () => {
+    await fix.setup('monorepo');
+    const pkg = await createPackageJson(
+      {
+        cwd: path.join(fix.TMP, 'baz'),
+        workspaceRoot: fix.TMP
+      },
+      optaUtils.test.promptModule({
+        prompts: {
+          workspaceRoot: {
+            assert: (p) => {
+              assert.strictEqual(p.name, 'workspaceRoot');
+              assert.strictEqual(p.when(), false);
+            }
+          },
+          workspaces: {
+            assert: (p) => {
+              assert.strictEqual(p.name, 'workspaces');
+              assert.strictEqual(p.when(), false);
+            }
+          }
+        }
+      })
+    );
+
+    assert.strictEqual(pkg.name, 'baz');
+    assert.strictEqual(pkg.workspaces, undefined);
+  });
 });