Updating rule definition shortcuts, adding oneOf

README.md

@@ -739,6 +739,31 @@ config.module
       .tap(options => merge(options, { plugins: ['babel-plugin-syntax-object-rest-spread'] }));
 ```
 
+#### Config module rules oneOfs (conditional rules):
+
+```js
+config.module.rules{}.oneOfs : ChainedMap<Rule>
+
+config.module
+  .rule(name)
+    .oneOf(name)
+
+// Example
+
+config.module
+  .rule('css')
+    .oneOf('inline')
+      .resourceQuery(/inline/)
+      .use('url')
+        .loader('url-loader')
+        .end()
+      .end()
+    .oneOf('external')
+      .resourceQuery(/external/)
+      .use('file')
+        .loader('file-loader')
+```
+
 ---
 
 ### Merging Config
@@ -861,12 +886,19 @@ config.merge({
         [key]: value,
 
         enforce,
-        test,
+        issuer,
         parser,
+        resource,
+        resourceQuery,
+        test,
 
         include: [...paths],
         exclude: [...paths],
 
+        oneOf: {
+          [name]: Rule
+        },
+
         use: {
           [name]: {
             loader: LoaderString,

package.json

@@ -20,11 +20,11 @@
     "changelog": "changelog mozilla-neutrino/webpack-chain all --markdown > CHANGELOG.md"
   },
   "dependencies": {
-    "deepmerge": "^1.5.0"
+    "deepmerge": "^1.5.1"
   },
   "devDependencies": {
-    "ava": "^0.21.0",
+    "ava": "^0.22.0",
     "changelog": "^1.4.0",
-    "webpack": "^3.4.1"
+    "webpack": "^3.5.6"
   }
 }

src/Rule.js

@@ -2,13 +2,14 @@ const ChainedMap = require('./ChainedMap');
 const ChainedSet = require('./ChainedSet');
 const Use = require('./Use');
 
-module.exports = class extends ChainedMap {
+module.exports = class Rule extends ChainedMap {
   constructor(parent) {
     super(parent);
     this.uses = new ChainedMap(this);
     this.include = new ChainedSet(this);
     this.exclude = new ChainedSet(this);
-    this.extend(['parser', 'test', 'enforce']);
+    this.oneOfs = new ChainedMap(this);
+    this.extend(['parser', 'test', 'enforce', 'issuer', 'resource', 'resourceQuery']);
   }
 
   use(name) {
@@ -19,6 +20,14 @@ module.exports = class extends ChainedMap {
     return this.uses.get(name);
   }
 
+  oneOf(name) {
+    if (!this.oneOfs.has(name)) {
+      this.oneOfs.set(name, new Rule(this));
+    }
+
+    return this.oneOfs.get(name);
+  }
+
   pre() {
     return this.enforce('pre');
   }
@@ -31,6 +40,7 @@ module.exports = class extends ChainedMap {
     return this.clean(Object.assign(this.entries() || {}, {
       include: this.include.values(),
       exclude: this.exclude.values(),
+      oneOf: this.oneOfs.values().map(r => r.toConfig()),
       use: this.uses.values().map(use => use.toConfig())
     }));
   }
@@ -53,6 +63,12 @@ module.exports = class extends ChainedMap {
               .forEach(name => this.use(name).merge(value[name]));
           }
 
+          case 'oneOf': {
+            return Object
+              .keys(value)
+              .forEach(name => this.oneOf(name).merge(value[name]))
+          }
+
           case 'test': {
             return this.test(value instanceof RegExp ? value : new RegExp(value));
           }

test/Rule.js

@@ -28,6 +28,14 @@ test('use', t => {
   t.true(rule.uses.has('babel'));
 });
 
+test('oneOf', t => {
+  const rule = new Rule();
+  const instance = rule.oneOf('babel').end();
+
+  t.is(instance, rule);
+  t.true(rule.oneOfs.has('babel'));
+});
+
 test('pre', t => {
   const rule = new Rule();
   const instance = rule.pre();
@@ -78,13 +86,24 @@ test('toConfig with values', t => {
     .test(/\.js$/)
     .use('babel')
       .loader('babel-loader')
-      .options({ presets: ['alpha'] });
+      .options({ presets: ['alpha'] })
+      .end()
+    .oneOf('inline')
+      .resourceQuery(/inline/)
+      .use('url')
+        .loader('url-loader');
 
   t.deepEqual(rule.toConfig(), {
     test: /\.js$/,
     enforce: 'pre',
     include: ['alpha', 'beta'],
     exclude: ['alpha', 'beta'],
+    oneOf: [{
+      resourceQuery: /inline/,
+      use: [{
+        loader: 'url-loader'
+      }]
+    }],
     use: [{
       loader: 'babel-loader',
       options: {
@@ -101,6 +120,16 @@ test('merge empty', t => {
     test: /\.js$/,
     include: ['alpha', 'beta'],
     exclude: ['alpha', 'beta'],
+    oneOf: {
+      inline: {
+        resourceQuery: /inline/,
+        use: {
+          url: {
+            loader: 'url-loader'
+          }
+        }
+      }
+    },
     use: {
       babel: {
         loader: 'babel-loader',
@@ -118,6 +147,12 @@ test('merge empty', t => {
     test: /\.js$/,
     include: ['alpha', 'beta'],
     exclude: ['alpha', 'beta'],
+    oneOf: [{
+      resourceQuery: /inline/,
+      use: [{
+        loader: 'url-loader'
+      }]
+    }],
     use: [{
       loader: 'babel-loader',
       options: {
@@ -143,6 +178,16 @@ test('merge with values', t => {
     enforce: 'pre',
     include: ['alpha', 'beta'],
     exclude: ['alpha', 'beta'],
+    oneOf: {
+      inline: {
+        resourceQuery: /inline/,
+        use: {
+          url: {
+            loader: 'url-loader'
+          }
+        }
+      }
+    },
     use: {
       babel: {
         options: {
@@ -157,6 +202,12 @@ test('merge with values', t => {
     enforce: 'pre',
     include: ['gamma', 'delta', 'alpha', 'beta'],
     exclude: ['alpha', 'beta'],
+    oneOf: [{
+      resourceQuery: /inline/,
+      use: [{
+        loader: 'url-loader'
+      }]
+    }],
     use: [{
       loader: 'babel-loader',
       options: {