fix(add): add handling of merge option

packages/generators/add-generator.ts

@@ -1,82 +1,36 @@
-import Generator = require("yeoman-generator");
+import {
+	replaceAt,
+	traverseAndGetProperties,
+	webpackDevServerSchema,
+	webpackSchema,
+} from "@webpack-cli/utils/generators/add";
 
-import * as glob from "glob-all";
-import * as autoComplete from "inquirer-autocomplete-prompt";
-import * as path from "path";
+import {
+	actionTypeQuestion,
+	entryTypeQuestion,
+	manualOrListInput,
+	mergeFileQuestion,
+	topScopeQuestion,
+} from "@webpack-cli/utils/generators/add/questions";
 
 import npmExists from "@webpack-cli/utils/npm-exists";
 import { getPackageManager } from "@webpack-cli/utils/package-manager";
-import PROP_TYPES from "@webpack-cli/utils/prop-types";
 import {
 	AutoComplete,
 	Confirm,
 	IInquirerInput,
 	Input,
+	InputValidate,
 	List,
 } from "@webpack-cli/webpack-scaffold";
-
+import { existsSync } from "fs";
+import * as glob from "glob-all";
+import * as autoComplete from "inquirer-autocomplete-prompt";
+import { resolve } from "path";
+import Generator = require("yeoman-generator");
 import { ISchemaProperties, IWebpackOptions } from "./types";
 import entryQuestions from "./utils/entry";
-
-// tslint:disable:no-var-requires
-const webpackDevServerSchema = require("webpack-dev-server/lib/options.json");
-const webpackSchema = require("./utils/optionsSchema.json");
-const PROPS: string[] = Array.from(PROP_TYPES.keys());
-
-/**
- *
- * Replaces the string with a substring at the given index
- * https://gist.github.com/efenacigiray/9367920
- *
- * @param	{String} string - string to be modified
- * @param	{Number} index - index to replace from
- * @param	{String} replace - string to replace starting from index
- *
- * @returns	{String} string - The newly mutated string
- *
- */
-function replaceAt(str: string, index: number, replace: string): string {
-	return str.substring(0, index) + replace + str.substring(index + 1);
-}
-
-/**
- *
- * Checks if the given array has a given property
- *
- * @param	{Array} arr - array to check
- * @param	{String} prop - property to check existence of
- *
- * @returns	{Boolean} hasProp - Boolean indicating if the property
- * is present
- */
-const traverseAndGetProperties = (arr: object[], prop: string): boolean => {
-	let hasProp = false;
-	arr.forEach((p: object): void => {
-		if (p[prop]) {
-			hasProp = true;
-		}
-	});
-	return hasProp;
-};
-
-/**
- *
- * Search config properties
- *
- * @param {Object} answers	Prompt answers object
- * @param {String} input	Input search string
- *
- * @returns {Promise} Returns promise which resolves to filtered props
- *
- */
-const searchProps = (answers: object, input: string): Promise<string[]> => {
-	input = input || "";
-	return Promise.resolve(
-		PROPS.filter((prop: string): boolean =>
-			prop.toLowerCase().includes(input.toLowerCase()),
-		),
-	);
-};
+import validate from "./utils/validate";
 
 /**
  *
@@ -93,7 +47,8 @@ export default class AddGenerator extends Generator {
 		config: {
 			configName?: string,
 			topScope?: string[],
-			item?: string;
+			item?: string,
+			merge?: IWebpackOptions,
 			webpackOptions?: IWebpackOptions,
 		},
 	};
@@ -115,24 +70,12 @@ export default class AddGenerator extends Generator {
 		const done: (_?: void) => void | boolean = this.async();
 		let action: string;
 		const self: this = this;
-		const manualOrListInput: (promptAction: string) => IInquirerInput = (promptAction: string) =>
-			Input("actionAnswer", `What do you want to add to ${promptAction}?`);
 		let inputPrompt: IInquirerInput;
 
 		// first index indicates if it has a deep prop, 2nd indicates what kind of
 		const isDeepProp: any[] = [false, false];
 
-		return this.prompt([
-			AutoComplete(
-				"actionType",
-				"What property do you want to add to?",
-				{
-					pageSize: 7,
-					source: searchProps,
-					suggestOnly: false,
-				},
-			),
-		])
+		return this.prompt([actionTypeQuestion])
 			.then((actionTypeAnswer: {
 				actionType: string,
 			}) => {
@@ -145,9 +88,7 @@ export default class AddGenerator extends Generator {
 			})
 			.then((_: void) => {
 				if (action === "entry") {
-					return this.prompt([
-						Confirm("entryType", "Will your application have multiple bundles?", false),
-					])
+					return this.prompt([entryTypeQuestion])
 						.then((entryTypeAnswer: {
 							entryType: boolean,
 						}) => {
@@ -162,16 +103,24 @@ export default class AddGenerator extends Generator {
 						});
 					} else {
 						if (action === "topScope") {
-							return this.prompt([
-								Input("topScope", "What do you want to add to topScope?"),
-							])
+							return this.prompt([topScopeQuestion])
 							.then((topScopeAnswer: {
 								topScope: string;
 							}) => {
 								this.configuration.config.topScope.push(topScopeAnswer.topScope);
 								done();
 							});
 						}
+						if (action === "merge") {
+							return this.prompt([mergeFileQuestion])
+							.then((mergeFileAnswer: {
+								mergeFile: string;
+							}) => {
+								const resolvedPath = resolve(process.cwd(), mergeFileAnswer.mergeFile);
+								const mergeConfig = require(resolvedPath);
+								this.configuration.config.merge = mergeConfig;
+							});
+						}
 					}
 				const temp = action;
 				if (action === "resolveLoader") {
@@ -366,7 +315,7 @@ export default class AddGenerator extends Generator {
 								pluginsSchemaPath.indexOf("optimize") >= 0
 									? "webpack.optimize"
 									: "webpack";
-							const resolvePluginsPath: string = path.resolve(pluginsSchemaPath);
+							const resolvePluginsPath: string = resolve(pluginsSchemaPath);
 							const pluginSchema: object = resolvePluginsPath
 								? require(resolvePluginsPath)
 								: null;

packages/utils/generators/add/index.ts

@@ -0,0 +1,62 @@
+import PROP_TYPES from "../../prop-types";
+
+const PROPS: string[] = Array.from(PROP_TYPES.keys());
+
+// tslint:disable:no-var-requires
+export const webpackDevServerSchema = require("webpack-dev-server/lib/options.json");
+export const webpackSchema = require("../optionsSchema.json");
+
+/**
+ *
+ * Replaces the string with a substring at the given index
+ * https://gist.github.com/efenacigiray/9367920
+ *
+ * @param	{String} string - string to be modified
+ * @param	{Number} index - index to replace from
+ * @param	{String} replace - string to replace starting from index
+ *
+ * @returns	{String} string - The newly mutated string
+ *
+ */
+export function replaceAt(str: string, index: number, replace: string): string {
+	return str.substring(0, index) + replace + str.substring(index + 1);
+}
+
+/**
+ *
+ * Checks if the given array has a given property
+ *
+ * @param	{Array} arr - array to check
+ * @param	{String} prop - property to check existence of
+ *
+ * @returns	{Boolean} hasProp - Boolean indicating if the property
+ * is present
+ */
+export const traverseAndGetProperties = (arr: object[], prop: string): boolean => {
+	let hasProp: boolean = false;
+	arr.forEach((p: object): void => {
+		if (p[prop]) {
+			hasProp = true;
+		}
+	});
+	return hasProp;
+};
+
+/**
+ *
+ * Search config properties
+ *
+ * @param {Object} answers	Prompt answers object
+ * @param {String} input	Input search string
+ *
+ * @returns {Promise} Returns promise which resolves to filtered props
+ *
+ */
+export const searchProps = (answers: object, input: string): Promise<string[]> => {
+	input = input || "";
+	return Promise.resolve(
+		PROPS.filter((prop: string): boolean =>
+			prop.toLowerCase().includes(input.toLowerCase()),
+		),
+	);
+};

packages/utils/generators/add/questions/index.ts

@@ -0,0 +1,62 @@
+import {
+	AutoComplete,
+	Confirm,
+	IInquirerInput,
+	Input,
+	InputValidate,
+	List,
+} from "@webpack-cli/webpack-scaffold";
+import { existsSync } from "fs";
+import { resolve } from "path";
+import {
+	searchProps,
+} from "../index";
+
+/**
+ * Returns Inquirer question for given action
+ * @param action string
+ */
+export const manualOrListInput: (action: string) => IInquirerInput = (action: string) => {
+	const actionQuestion = `What do you want to add to ${action}?`;
+	return Input("actionAnswer", actionQuestion);
+};
+
+export const actionTypeQuestion = AutoComplete(
+	"actionType",
+	"What property do you want to add to?",
+	{
+		pageSize: 7,
+		source: searchProps,
+		suggestOnly: false,
+	},
+);
+
+export const entryTypeQuestion = Confirm(
+	"entryType",
+	"Will your application have multiple bundles?",
+	false,
+);
+
+export const topScopeQuestion = Input(
+	"topScope",
+	"What do you want to add to topScope?",
+);
+
+const mergeFileQuestionFunction = () => {
+ const question = "What is the location of webpack configuration with which you want to merge current configuration?";
+ const validator = (path: string) => {
+		const resolvedPath = resolve(process.cwd(), path);
+		if (existsSync(resolvedPath)) {
+			if (/\.js$/.test(path)) {
+				if (typeof require(resolvedPath) !== "object") {
+					return "Given file doesn't export an Object";
+				}
+				return true;
+			}
+			return "Path doesn't corresponds to a javascript file";
+		}
+		return "Invalid path provided";
+	};
+ return InputValidate("mergeFile", question, validator);
+};
+export const mergeFileQuestion = mergeFileQuestionFunction();