@roots/bud-build 5.3.2 → 5.6.0

package/lib/cjs/Loader/index.js

@@ -1,40 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Loader = void 0;
-const Framework = __importStar(require("@roots/bud-framework"));
-const bud_support_1 = require("@roots/bud-support");
-const { isFunction } = bud_support_1.lodash;
+const Base_1 = require("../shared/Base");
 /**
  * Framework Loader
  *
  * @public
  */
-class Loader extends Framework.Loader.Abstract {
+class Loader extends Base_1.Base {
     /**
      * Class constructor
      *
@@ -42,35 +15,16 @@ class Loader extends Framework.Loader.Abstract {
      *
      * @public
      */
-    constructor(src) {
-        super();
-        this.src = this.normalizeInput(src);
+    constructor(_app, src) {
+        super(_app);
+        this.src = src;
     }
-    /**
-     * Factory producing the final loader path
-     *
-     * @param app - {@link @roots/bud-Bud#Bud}
-     * @returns final loader path
-     *
-     * @public
-     * @decorator `@bind`
-     */
-    make(app) {
-        return this.src(app);
+    getSrc() {
+        return this.unwrap(this.src);
     }
-    /**
-     * Ensure that a userInput is assigned to the class as a {@link @roots/bud-Bud#Factory | Factory}
-     *
-     * @param input - input value
-     * @returns normalized value from user input
-     *
-     * @public
-     */
-    normalizeInput(input) {
-        return isFunction(input) ? input : () => input;
+    setSrc(src) {
+        this.src = this.wrap(src);
+        return this;
     }
 }
-__decorate([
-    bud_support_1.bind
-], Loader.prototype, "make", null);
 exports.Loader = Loader;

package/lib/cjs/Rule/index.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Rule = void 0;
 const bud_support_1 = require("@roots/bud-support");
 const Base_1 = require("../shared/Base");
+const { isFunction, isString } = bud_support_1.lodash;
 /**
  * Framework Rule
  *
@@ -20,9 +21,8 @@ class Rule extends Base_1.Base {
      *
      * @public
      */
-    constructor(app, options) {
-        super();
-        this.app = app;
+    constructor(_app, options) {
+        super(_app);
         if (!options)
             return;
         options.test && this.setTest(options.test);
@@ -42,7 +42,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     getTest() {
-        return this.test ? this.test(this.app) : null;
+        return this.unwrap(this.test);
     }
     /**
      * Set test value
@@ -51,7 +51,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     setTest(test) {
-        this.test = this.normalizeInput(test);
+        this.test = this.wrap(test);
         return this;
     }
     /**
@@ -61,7 +61,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     getParser() {
-        return this.parser ? this.parser(this.app) : null;
+        return this.unwrap(this.parser);
     }
     /**
      * Set parser value
@@ -70,7 +70,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     setParser(parser) {
-        this.parser = this.normalizeInput(parser);
+        this.parser = this.wrap(parser);
         return this;
     }
     /**
@@ -80,7 +80,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     getUse() {
-        return this.use ? this.use(this.app) : null;
+        return this.unwrap(this.use)?.filter(isString) ?? [];
     }
     /**
      * Set use value
@@ -88,8 +88,10 @@ class Rule extends Base_1.Base {
      * @public
      * @decorator `@bind`
      */
-    setUse(use) {
-        this.use = this.normalizeInput(use);
+    setUse(input) {
+        this.use =
+            (isFunction(input) ? input(this.getUse() ?? [], this.app) : input) ??
+                [];
         return this;
     }
     /**
@@ -99,7 +101,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     getInclude() {
-        return this.include ? this.include(this.app) : null;
+        return this.unwrap(this.include);
     }
     /**
      * Set exclude value
@@ -108,7 +110,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     setInclude(include) {
-        this.include = this.normalizeInput(include);
+        this.include = this.wrap(include);
         return this;
     }
     /**
@@ -118,7 +120,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     getExclude() {
-        return this.exclude ? this.exclude(this.app) : null;
+        return this.unwrap(this.exclude);
     }
     /**
      * Set exclude value
@@ -127,7 +129,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     setExclude(exclude) {
-        this.exclude = this.normalizeInput(exclude);
+        this.exclude = this.wrap(exclude);
         return this;
     }
     /**
@@ -137,7 +139,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     getType() {
-        return this.type ? this.type(this.app) : null;
+        return this.unwrap(this.type);
     }
     /**
      * Set type value
@@ -146,7 +148,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     setType(type) {
-        this.type = this.normalizeInput(type);
+        this.type = this.wrap(type);
         return this;
     }
     /**
@@ -156,7 +158,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     getGenerator() {
-        return this.generator ? this.generator(this.app) : null;
+        return this.unwrap(this.generator);
     }
     /**
      * Set generator value
@@ -165,7 +167,7 @@ class Rule extends Base_1.Base {
      * @decorator `@bind`
      */
     setGenerator(generator) {
-        this.generator = this.normalizeInput(generator);
+        this.generator = this.wrap(generator);
         return this;
     }
     /**
@@ -177,34 +179,18 @@ class Rule extends Base_1.Base {
      * @public
      * @decorator `@bind`
      */
-    make() {
-        const output = {
-            test: this.test(this.app),
-        };
+    toWebpack() {
+        const output = { test: this.getTest() };
         this.use &&
             Object.assign(output, {
-                use: this.use(this.app).map(item => item.make(this.app)),
-            });
-        this.include &&
-            Object.assign(output, {
-                include: this.include(this.app),
-            });
-        this.exclude &&
-            Object.assign(output, {
-                exclude: this.exclude(this.app),
-            });
-        this.type &&
-            Object.assign(output, {
-                type: this.type(this.app),
-            });
-        this.parser &&
-            Object.assign(output, {
-                parser: this.parser(this.app),
+                use: this.getUse().map(item => this.app.build.items[item].toWebpack()),
             });
+        this.include && Object.assign(output, { include: this.getInclude() });
+        this.exclude && Object.assign(output, { exclude: this.getExclude() });
+        this.type && Object.assign(output, { type: this.getType() });
+        this.parser && Object.assign(output, { parser: this.getParser() });
         this.generator &&
-            Object.assign(output, {
-                generator: this.generator(this.app),
-            });
+            Object.assign(output, { generator: this.getGenerator() });
         return output;
     }
 }
@@ -252,5 +238,5 @@ __decorate([
 ], Rule.prototype, "setGenerator", null);
 __decorate([
     bud_support_1.bind
-], Rule.prototype, "make", null);
+], Rule.prototype, "toWebpack", null);
 exports.Rule = Rule;

package/lib/cjs/index.js

@@ -28,14 +28,7 @@ exports.rules = exports.loaders = exports.items = exports.Rule = exports.Item =
  * @see https://roots.io/bud
  * @see https://github.com/roots/bud
  *
- * @remarks
- * - 💁 Composable - Build exceptional applications with a modular, configurable build system
- *
- * - 💪 Modern - Modern framework written in TypeScript with an expressive API
- *
- * - 🌱 Easy - Low bundle size and fast build times
- *
- *  @packageDocumentation
+ * @packageDocumentation
  */
 var Build_1 = require("./Build");
 Object.defineProperty(exports, "Build", { enumerable: true, get: function () { return Build_1.Build; } });

package/lib/cjs/shared/Base.js

@@ -4,8 +4,17 @@ exports.Base = void 0;
 const bud_support_1 = require("@roots/bud-support");
 const { isFunction } = bud_support_1.lodash;
 class Base {
-    normalizeInput(input) {
+    constructor(_app) {
+        this._app = _app;
+    }
+    get app() {
+        return this._app();
+    }
+    wrap(input) {
         return isFunction(input) ? input : () => input;
     }
+    unwrap(input, ...options) {
+        return isFunction(input) ? input(this.app, ...options) : input;
+    }
 }
 exports.Base = Base;