Moving the resolver functions to the core package

Author: ringods

packages/cli/bin/install-edition.js

@@ -10,9 +10,11 @@ const {
   wrapAsync,
   writeJsonAsync,
   getJSONKey,
+} = require('./utils');
+const {
   resolveFileInPackage,
   resolveDirInPackage,
-} = require('./utils');
+} = require('@pattern-lab/core/src/lib/resolver');
 
 // https://github.com/TehShrike/deepmerge#overwrite-array
 const overwriteMerge = (destinationArray, sourceArray, options) => sourceArray;

packages/cli/bin/install-plugin.js

@@ -2,11 +2,8 @@
 
 const _ = require('lodash');
 
-const {
-  checkAndInstallPackage,
-  wrapAsync,
-  resolveFileInPackage,
-} = require('./utils');
+const { checkAndInstallPackage, wrapAsync } = require('./utils');
+const { resolveFileInPackage } = require('@pattern-lab/core/src/lib/resolver');
 
 const installPlugin = (plugin, config) =>
   wrapAsync(function*() {

packages/cli/bin/install-starterkit.js

@@ -6,9 +6,11 @@ const {
   wrapAsync,
   checkAndInstallPackage,
   readJsonAsync,
+} = require('./utils');
+const {
   resolveFileInPackage,
   resolveDirInPackage,
-} = require('./utils');
+} = require('@pattern-lab/core/src/lib/resolver');
 
 const installStarterkit = (starterkit, config) =>
   wrapAsync(function*() {

packages/cli/bin/utils.js

@@ -6,6 +6,7 @@ const path = require('path');
 const chalk = require('chalk');
 const EventEmitter = require('events').EventEmitter;
 const hasYarn = require('has-yarn');
+const { resolveFileInPackage } = require('@pattern-lab/core/src/lib/resolver');
 
 /**
  * @name log
@@ -182,30 +183,6 @@ const writeJsonAsync = (filePath, data) =>
     yield fs.outputJSON(filePath, data, { spaces: 2 });
   });
 
-/**
- * @func resolveFileInPackage
- * Resolves a file inside a package
- */
-const resolveFileInPackage = (packageName, ...pathElements) => {
-  return require.resolve(path.join(packageName, ...pathElements));
-};
-
-/**
- * @func resolveDirInPackage
- * Resolves a file inside a package
- */
-const resolveDirInPackage = (packageName, ...pathElements) => {
-  return path.dirname(resolveFileInPackage(packageName, pathElements));
-};
-
-/**
- * @func resolvePackageFolder
- * Resolves the location of a package on disc
- */
-const resolvePackageFolder = packageName => {
-  return path.dirname(resolveDirInPackage(packageName, 'package.json'));
-};
-
 /**
  * @func getJSONKey
  * Installs package, then returns the value for the given JSON file's key within
@@ -237,7 +214,4 @@ module.exports = {
   checkAndInstallPackage,
   noop,
   getJSONKey,
-  resolveFileInPackage,
-  resolveDirInPackage,
-  resolvePackageFolder,
 };

packages/core/src/lib/resolver.js

@@ -0,0 +1,33 @@
+'use strict';
+
+const path = require('path');
+
+/**
+ * @func resolveFileInPackage
+ * Resolves a file inside a package
+ */
+const resolveFileInPackage = (packageName, ...pathElements) => {
+  return require.resolve(path.join(packageName, ...pathElements));
+};
+
+/**
+ * @func resolveDirInPackage
+ * Resolves a file inside a package
+ */
+const resolveDirInPackage = (packageName, ...pathElements) => {
+  return path.dirname(resolveFileInPackage(packageName, ...pathElements));
+};
+
+/**
+ * @func resolvePackageFolder
+ * Resolves the location of a package on disc
+ */
+const resolvePackageFolder = packageName => {
+  return path.dirname(resolveFileInPackage(packageName, 'package.json'));
+};
+
+module.exports = {
+  resolveFileInPackage,
+  resolveDirInPackage,
+  resolvePackageFolder,
+};

packages/core/src/lib/starterkit_manager.js

@@ -29,7 +29,7 @@ const starterkit_manager = function(config) {
         kitDirStats = fs.statSync(kitPath);
       } catch (ex) {
         logger.warning(
-          `${starterkitName} not found, use npm to install it first.`
+          `${starterkitName} not found, use npm or another package manager to install it first.`
         );
         logger.warning(`${starterkitName} not loaded.`);
         return;