feat(utils): rename props, provide packageRootPath

Signed-off-by: Charlike Mike Reagent <[email protected]>

Author: tunnckoCore

@tunnckocore/utils/src/index.js

@@ -79,19 +79,19 @@ function parseJson(fp) {
 
 function getWorkspacesAndExtensions(cwd = process.cwd()) {
   const fromRoot = (...x) => path.resolve(cwd, ...x);
-  const packagePath = fromRoot('package.json');
-  const lernaPath = fromRoot('lerna.json');
-  const pkg = parseJson(packagePath);
-  const lerna = parseJson(lernaPath);
+  const packageJsonPath = fromRoot('package.json');
+  const lernaJsonPath = fromRoot('lerna.json');
+  const packageJson = parseJson(packageJsonPath);
+  const lernaJson = parseJson(lernaJsonPath);
 
   const workspaces = []
-    .concat(lerna.packages || (pkg.workspaces || []))
+    .concat(lernaJson.packages || (packageJson.workspaces || []))
     .filter((x) => typeof x === 'string')
     .filter(Boolean)
     .reduce((acc, ws) => acc.concat(ws.split(',')), [])
     .map((ws) => path.dirname(ws));
   // console.log('workspaces', workspaces);
-  let exts = [].concat(pkg.extensions).filter(Boolean);
+  let exts = [].concat(packageJson.extensions).filter(Boolean);
 
   if (exts.length === 0) {
     exts = ['tsx', 'ts', 'jsx', ...EXTENSIONS];
@@ -102,5 +102,17 @@ function getWorkspacesAndExtensions(cwd = process.cwd()) {
 
   const extensions = exts.map((x) => `.${x}`);
 
-  return { workspaces, extensions, exts, lerna, lernaPath, pkg, packagePath };
+  const fpath = [lernaJsonPath, packageJsonPath].find((x) => fs.existsSync(x));
+  const packageRootPath = fpath ? path.dirname(fpath) : null;
+
+  return {
+    workspaces,
+    extensions,
+    exts,
+    lernaJson,
+    lernaJsonPath,
+    packageJson,
+    packageJsonPath,
+    packageRootPath,
+  };
 }

@tunnckocore/utils/test/index.js

@@ -12,7 +12,7 @@ test('get extensions and workspaces - no workspaces', () => {
   const result = getWorkspacesAndExtensions(rootDir);
 
   expect(result.workspaces).toStrictEqual([]);
-  expect(result.lerna).toStrictEqual({});
+  expect(result.lernaJson).toStrictEqual({});
   expect(result.exts).toStrictEqual(['tsx', 'ts', 'jsx', 'js', 'mjs']);
   expect(result.extensions).toStrictEqual([
     '.tsx',
@@ -31,10 +31,10 @@ test('getWorkspacesAndExtensions - correct workspaces', () => {
   expect(result.workspaces).toStrictEqual(['@tunnckocore', '@helios']);
   expect(result.extensions).toStrictEqual(['.js', '.jsx', '.ts']);
   expect(result.exts).toStrictEqual(['js', 'jsx', 'ts']);
-  expect(result.lerna).toStrictEqual({
+  expect(result.lernaJson).toStrictEqual({
     packages: ['@tunnckocore/*', '@helios/*'],
   });
-  expect(result.pkg).toStrictEqual({
+  expect(result.packageJson).toStrictEqual({
     name: 'lerna-monorepo',
     extensions: result.exts,
   });
@@ -45,6 +45,13 @@ test('createAliases return empty alias object', () => {
   const result = createAliases(cwd);
 
   expect(result.alias).toStrictEqual({});
+  expect(typeof result.packageJsonPath).toStrictEqual('string');
+  expect(result.packageJsonPath.startsWith(cwd)).toStrictEqual(true);
+
+  expect(typeof result.lernaJsonPath).toStrictEqual('string');
+  expect(result.lernaJsonPath.startsWith(cwd)).toStrictEqual(true);
+
+  expect(result.packageRootPath).toStrictEqual(null);
 });
 
 test('createAliases return correct aliases for yarn workspaces', () => {
@@ -59,14 +66,16 @@ test('createAliases return correct aliases for yarn workspaces', () => {
     }, {});
 
   expect(result.alias).toStrictEqual(toAliases('src'));
-  expect(result.lerna).toStrictEqual({});
+  expect(result.lernaJson).toStrictEqual({});
   expect(result.exts).toStrictEqual(['js', 'ts']);
-  expect(result.pkg).toStrictEqual({
+  expect(result.packageJson).toStrictEqual({
     extensions: result.exts,
     workspaces: ['@tunnckocore/*', '@hela/*'],
   });
-  expect(result.lernaPath).toStrictEqual(path.join(yarnRoot, 'lerna.json'));
-  expect(result.packagePath).toStrictEqual(path.join(yarnRoot, 'package.json'));
+  expect(result.lernaJsonPath).toStrictEqual(path.join(yarnRoot, 'lerna.json'));
+  expect(result.packageJsonPath).toStrictEqual(
+    path.join(yarnRoot, 'package.json'),
+  );
 });
 
 test('createAliases return correct aliases for Lerna workspaces', () => {
@@ -81,16 +90,18 @@ test('createAliases return correct aliases for Lerna workspaces', () => {
     }, {});
 
   expect(res.alias).toStrictEqual(toAliases(''));
-  expect(res.lerna).toStrictEqual({
+  expect(res.lernaJson).toStrictEqual({
     packages: ['@tunnckocore/*', '@helios/*'],
   });
   expect(res.exts).toStrictEqual(['js', 'jsx', 'ts']);
-  expect(res.pkg).toStrictEqual({
+  expect(res.packageJson).toStrictEqual({
     name: 'lerna-monorepo',
     extensions: ['js', 'jsx', 'ts'],
   });
-  expect(res.lernaPath).toStrictEqual(path.join(lernaRoot, 'lerna.json'));
-  expect(res.packagePath).toStrictEqual(path.join(lernaRoot, 'package.json'));
+  expect(res.lernaJsonPath).toStrictEqual(path.join(lernaRoot, 'lerna.json'));
+  expect(res.packageJsonPath).toStrictEqual(
+    path.join(lernaRoot, 'package.json'),
+  );
 });
 
 test('isMonorepo - true for workspaces root', () => {
@@ -101,3 +112,35 @@ test('isMonorepo - true for workspaces root', () => {
 test('isMonorepo - false regular repository', () => {
   expect(isMonorepo(path.dirname(__dirname))).toStrictEqual(false);
 });
+
+test('correct *Path properties when Lerna monorepo', () => {
+  const lernaRoot = path.join(__dirname, 'fixtures', 'lerna');
+  const result = createAliases(lernaRoot);
+
+  expect(typeof result.lernaJsonPath).toStrictEqual('string');
+  expect(typeof result.packageJsonPath).toStrictEqual('string');
+  expect(typeof result.packageRootPath).toStrictEqual('string');
+
+  expect(path.dirname(result.lernaJsonPath)).toStrictEqual(
+    result.packageRootPath,
+  );
+
+  expect(result.packageJson).toBeTruthy();
+  expect(typeof result.packageJson).toStrictEqual('object');
+});
+
+test('correct *Path properties when Yarn Workspaces monorepo', () => {
+  const yarnWorkspaces = path.join(__dirname, 'fixtures', 'yarn-workspaces');
+  const result = createAliases(yarnWorkspaces);
+
+  expect(typeof result.lernaJsonPath).toStrictEqual('string');
+  expect(typeof result.packageJsonPath).toStrictEqual('string');
+  expect(typeof result.packageRootPath).toStrictEqual('string');
+
+  expect(path.dirname(result.packageJsonPath)).toStrictEqual(
+    result.packageRootPath,
+  );
+
+  expect(result.packageJson).toBeTruthy();
+  expect(typeof result.packageJson).toStrictEqual('object');
+});

package.json

@@ -22,7 +22,7 @@
     "build": "jest -c jest.build.config.js",
     "release": "lerna version && lerna publish from-package",
     "cr": "node create-package.js",
-    "resque": "lerna exec 'babel src -d dist/main --presets @tunnckocore --source-maps both' --stream"
+    "resque": "lerna exec 'babel src -d dist/main --presets @tunnckocore --source-maps both' --stream --scope '@tunnckocore/*jest-runner*' --scope 'jest-runner-rollup'"
   },
   "dependencies": {
     "@babel/cli": "^7.6.0",