merge master

Author: ricardo-devis-agullo

package.json

@@ -44,7 +44,13 @@
     "oc"
   ],
   "devDependencies": {
+    "@types/errorhandler": "^1.5.0",
+    "@types/express": "^4.17.13",
+    "@types/morgan": "^1.9.3",
+    "@types/multer": "^1.4.7",
+    "@types/colors": "^1.2.1",
     "@types/node": "^16.9.6",
+    "@types/semver": "^7.3.8",
     "@types/yargs": "^17.0.3",
     "@typescript-eslint/eslint-plugin": "^4.31.2",
     "@typescript-eslint/parser": "^4.31.2",

src/cli/commands.js renamed to src/cli/commands.ts

@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports = {
+export default {
   usage: 'Usage: $0 <command> [options]',
   commands: {
     clean: {

src/cli/domain/clean.js

@@ -0,0 +1,23 @@
+import async from 'async';
+import fs from 'fs-extra';
+import makeGetComponentsByDir from './get-components-by-dir';
+import path from 'path';
+
+const getComponentsByDir = makeGetComponentsByDir();
+
+export function fetchList(dirPath: string, callback: Callback<string[]>) {
+  return getComponentsByDir(dirPath, (err, list) => {
+    if (err) return (callback as any)(err);
+    if (list.length === 0) return callback(null, []);
+
+    const toRemove = list.map(folder => path.join(folder, 'node_modules'));
+    const folderExists = (folder, cb) =>
+      fs.exists(folder, exists => cb(null, exists));
+
+    async.filterSeries(toRemove, folderExists, callback as any);
+  });
+}
+
+export function remove(list: string[], callback: Callback<string>) {
+  return async.eachSeries(list, fs.remove, callback as any);
+}

src/cli/domain/clean.ts

@@ -1,12 +1,9 @@
-'use strict';
+import fs from 'fs-extra';
+import path from 'path';
 
-const fs = require('fs-extra');
-const path = require('path');
-const _ = require('lodash');
-
-module.exports = function() {
-  return function(componentsDir, callback) {
-    const isOcComponent = function(file) {
+export default function getComponentsByDir() {
+  return function(componentsDir: string, callback: Callback<string[]>) {
+    const isOcComponent = function(file: string) {
       const filePath = path.resolve(componentsDir, file),
         packagePath = path.join(filePath, 'package.json');
       let content;
@@ -23,10 +20,10 @@ module.exports = function() {
 
       const packagedProperty = content.oc && content.oc.packaged;
 
-      return _.isUndefined(packagedProperty);
+      return typeof packagedProperty === 'undefined';
     };
 
-    let dirContent;
+    let dirContent: string[];
 
     try {
       dirContent = fs.readdirSync(componentsDir);
@@ -40,4 +37,4 @@ module.exports = function() {
 
     callback(null, components);
   };
-};
+}

src/cli/domain/get-components-by-dir.js renamed to src/cli/domain/get-components-by-dir.ts

@@ -4,8 +4,8 @@ const fs = require('fs-extra');
 const path = require('path');
 const _ = require('lodash');
 
-const settings = require('../../resources/settings');
-const strings = require('../../resources/');
+const settings = require('../../resources/settings').default;
+const strings = require('../../resources/').default;
 
 const isMockValid = plugin => {
   const isFunction = _.isFunction(plugin);

src/cli/domain/get-mocked-plugins.js

@@ -1,6 +1,6 @@
 'use strict';
 
-const strings = require('../../../resources');
+const strings = require('../../../resources').default;
 
 module.exports = (options, cb) => {
   const { componentPath, pkg, template } = options;

src/cli/domain/handle-dependencies/ensure-compiler-is-declared-as-devDependency.js

@@ -0,0 +1,17 @@
+import path from 'path';
+import moduleExists from '../../../utils/module-exists';
+
+export default function getMissingDependencies(
+  dependencies: Record<string, string> = {}
+) {
+  const missing: string[] = [];
+
+  Object.entries(dependencies).forEach(([dependency, version]) => {
+    const pathToModule = path.resolve('node_modules/', dependency);
+    if (!moduleExists(pathToModule)) {
+      missing.push(`${dependency}@${version || 'latest'}`);
+    }
+  });
+
+  return missing;
+}

src/cli/domain/handle-dependencies/get-missing-dependencies.js

@@ -11,7 +11,7 @@ const getCompiler = require('./get-compiler');
 const installMissingDependencies = require('./install-missing-dependencies');
 const linkMissingDependencies = require('./link-missing-dependencies');
 const isTemplateLegacy = require('../../../utils/is-template-legacy').default;
-const strings = require('../../../resources');
+const strings = require('../../../resources').default;
 
 const getComponentPackageJson = (componentPath, cb) =>
   fs.readJson(path.join(componentPath, 'package.json'), cb);