[fix] webpack-config-composer minor things

- .gitignore lib
- don't use Object.assign
- get data.config without ... operator in case it's a get field

packages/webpack-config-composer/.gitignore

@@ -6,3 +6,4 @@ node_modules
 # should use latest dep, as an app that consumes a module would have its
 # own lockfile, but remove this if you want to commit the package lock file.
 *-lock*
+lib

packages/webpack-config-composer/package.json

@@ -28,8 +28,8 @@
     "src"
   ],
   "dependencies": {
-    "lodash": "^4.13.1",
-    "tslib": "^2.1.0"
+    "lodash": "^4.17.21",
+    "tslib": "^2.2.0"
   },
   "devDependencies": {
     "@istanbuljs/nyc-config-typescript": "^1.0.1",
@@ -59,10 +59,6 @@
     "typedoc": "^0.20.13",
     "typescript": "^4.1.3"
   },
-  "engines": {
-    "node": ">= 6",
-    "npm": ">= 3"
-  },
   "mocha": {
     "require": [
       "ts-node/register",
@@ -91,7 +87,8 @@
       "gulpfile.js",
       "test",
       "xrun*.js",
-      "xrun*.ts"
+      "xrun*.ts",
+      "lib"
     ],
     "check-coverage": true,
     "statements": 100,

packages/webpack-config-composer/src/partial.ts

@@ -14,7 +14,7 @@ class Partial {
     if (typeof data === "function") {
       this[DATA] = { config: data };
     } else {
-      this[DATA] = Object.assign({ config: {}, options: {} }, data);
+      this[DATA] = { config: {}, options: {}, ...data };
     }
     this.setOverride(_.identity);
   }
@@ -28,7 +28,7 @@ class Partial {
   }
 
   set options(options) {
-    this[DATA].options = Object.assign({}, options);
+    this[DATA].options = { ...options };
   }
 
   get options() {
@@ -44,27 +44,20 @@ class Partial {
   }
 
   compose(options) {
-    options = Object.assign({}, this.options, options);
+    options = { ...this.options, ...options };
 
-    const config = this.config.webpackPartial || this.config;
-    const configType = typeof config;
+    let config = this.config;
 
-    let ret;
-
-    if (configType === "object") {
-      ret = config;
-    } else if (configType === "function") {
-      ret = config(options);
-      if (typeof ret === "function") {
-        ret = ret(options);
+    while (typeof config === "function") {
+      config = config(options);
+      if (config && config.webpackPartial) {
+        config = config.webpackPartial;
       }
-    } else {
-      throw new Error(`can't process config from Partial ${this._name}`);
     }
 
-    const override = this[OVERRIDE](ret, options);
+    const override = this[OVERRIDE](config, options);
 
-    return override || ret;
+    return override || config;
   }
 }
 

packages/webpack-config-composer/test/spec/delete-custom-props.spec.ts

@@ -1,5 +1,3 @@
-
-
 import deleteCustomProps from "../../src/delete-custom-props";
 import { expect } from "chai";
 
@@ -8,8 +6,8 @@ describe("delete custom props", () => {
     const o = {
       module: {
         __dirname: "/test",
-        _name: "test"
-      }
+        _name: "test",
+      },
     };
     const x = deleteCustomProps(o);
     expect(x.module.__dirname).to.equal("/test");
@@ -20,8 +18,8 @@ describe("delete custom props", () => {
     const o = {
       module: {
         __filename: "/test",
-        _name: "test"
-      }
+        _name: "test",
+      },
     };
     const x = deleteCustomProps(o);
     expect(x.module.__filename).to.equal("/test");

packages/webpack-config-composer/test/spec/head-concat-array-merge.spec.ts

@@ -1,5 +1,3 @@
-
-
 import headConcatArrayMerge from "../../src/head-concat-array-merge";
 import { expect } from "chai";