@roots/bud-build 6.3.5 → 6.4.0

package/lib/service.js

@@ -1,26 +1,43 @@
 import { __decorate } from "tslib";
-import { Service } from '@roots/bud-framework/service';
-import { bind } from 'helpful-decorators';
-import { isFunction, isUndefined } from 'lodash-es';
-import * as config from './config/index.js';
+import * as Service from '@roots/bud-framework/service';
+import { bind } from '@roots/bud-support/decorators';
+import { isFunction, isUndefined } from '@roots/bud-support/lodash-es';
 import * as items from './handlers/items.js';
 import * as loaders from './handlers/loaders.js';
-import * as rules from './handlers/rules.js';
-import Item from './item.js';
-import Loader from './loader.js';
-import Rule from './rule.js';
+import * as rules from './handlers/rules/rules.js';
+import Item from './item/item.js';
+import Loader from './loader/loader.js';
+import * as Rule from './rule/rule.js';
 /**
  * Webpack configuration builder class
  *
  * @public
  */
-export default class Build extends Service {
+export default class Build extends Service.Base {
     constructor() {
         super(...arguments);
         /**
          * @public
          */
         this.config = {};
+        /**
+         * Registered loaders
+         *
+         * @public
+         */
+        this.loaders = {};
+        /**
+         * Registered rules
+         *
+         * @public
+         */
+        this.rules = {};
+        /**
+         * Registered items
+         *
+         * @public
+         */
+        this.items = {};
     }
     /**
      * Make webpack configuration
@@ -29,45 +46,23 @@ export default class Build extends Service {
      * @decorator `@bind`
      */
     async make() {
-        await this.app.extensions.runAll('_beforeBuild');
-        await this.app.hooks.fire('build.before');
-        await Promise.all([
-            ['entry'],
-            ['plugins', true],
-            ['resolve', true],
-            ['bail'],
-            ['cache'],
-            ['context'],
-            ['devtool'],
-            ['experiments'],
-            ['externals'],
-            ['externalsType'],
-            ['infrastructureLogging'],
-            ['loader'],
-            ['mode'],
-            ['module'],
-            ['name'],
-            ['node'],
-            ['output'],
-            ['optimization'],
-            ['parallelism'],
-            ['performance'],
-            ['profile'],
-            ['recordsPath'],
-            ['stats'],
-            ['target'],
-            ['watch'],
-            ['watchOptions'],
-        ].map(async ([propKey, isAsync]) => {
-            const propValue = isAsync === true
-                ? await this.app.hooks.filterAsync(`build.${propKey}`)
-                : this.app.hooks.filter(`build.${propKey}`);
-            if (isUndefined(propValue))
+        this.app.log(`bud.build.make called`);
+        try {
+            await this.app.hooks.fire(`build.before`);
+        }
+        catch (error) {
+            this.logger.error(error);
+        }
+        await import(`./config/builder.js`).then(async (obj) => await Promise.all(Object.entries(obj).map(async ([prop, factory]) => {
+            const value = await factory(this.app);
+            if (isUndefined(value))
                 return;
-            Object.assign(this.config, { [propKey]: propValue });
-            return Promise.resolve();
-        }));
-        await this.app.hooks.fire('build.after');
+            this.logger.success(`built`, prop);
+            this.logger.info(value);
+            this.config[prop] = value;
+        })));
+        this.logger.success(`configuration successfully built`);
+        await this.app.hooks.fire(`build.after`);
         return this.config;
     }
     /**
@@ -81,31 +76,22 @@ export default class Build extends Service {
      * @decorator `@bind`
      */
     async register() {
-        await Promise.all(Object.entries(loaders).map(async ([key, loaderFactory]) => {
-            const value = await loaderFactory(this.app);
-            if (!this.loaders)
-                this.loaders = { [key]: value };
-            else
-                this.loaders[key] = value;
-        }));
-        await Promise.all(Object.entries(items).map(async ([key, itemFactory]) => {
-            const value = await itemFactory(this.app);
-            if (!this.items)
-                this.items = { [key]: value };
-            else
-                this.items[key] = value;
-        }));
+        Object.entries(loaders).map(([key, loaderFactory]) => {
+            const value = loaderFactory(this.app);
+            this.setLoader(key, value);
+        });
+        Object.entries(items).map(([key, itemFactory]) => {
+            const value = itemFactory(this.app);
+            this.setItem(key, value);
+        });
         this.items.precss = this.app.isProduction
             ? this.items.minicss
             : this.items.style;
-        await Promise.all(Object.entries(rules).map(async ([key, ruleFactory]) => {
-            const value = await ruleFactory(this.app);
-            if (!this.rules)
-                this.rules = { [key]: value };
-            else
-                this.rules[key] = value;
-        }));
-        await config.builder.build(this.app);
+        Object.entries(rules)
+            .reverse()
+            .map(([key, ruleFactory]) => {
+            this.setRule(key, ruleFactory(this.app));
+        });
     }
     /**
      * Set Rule
@@ -118,10 +104,15 @@ export default class Build extends Service {
      * @decorator `@bind`
      */
     setRule(name, options) {
-        const processedOptions = isFunction(options)
+        if (options instanceof Rule.default) {
+            this.rules[name] = options;
+            this.logger.info(`set rule`, name, this.rules[name]);
+            return this;
+        }
+        this.rules[name] = isFunction(options)
             ? options(this.makeRule())
             : this.makeRule(options);
-        Object.assign(this.rules, { [name]: processedOptions });
+        this.logger.info(`set rule`, name, this.rules[name]);
         return this;
     }
     /**
@@ -134,20 +125,31 @@ export default class Build extends Service {
      * @decorator `@bind`
      */
     makeRule(options) {
-        return new Rule(() => this.app, options);
+        return new Rule.default(() => this.app, options);
+    }
+    getLoader(name) {
+        if (!this.loaders[name])
+            this.logger.error(`loader ${name} was requested but is not registered`);
+        return this.loaders[name];
     }
     /**
      * Set Loader
      *
      * @param name - Loader key
-     * @param options - Loader constructor properties
+     * @param definition - Loader constructor properties
      * @returns the Loader
      *
      * @public
      * @decorator `@bind`
      */
-    setLoader(name, options) {
-        Object.assign(this.loaders, { [name]: this.makeLoader(options) });
+    setLoader(name, definition) {
+        const loader = isUndefined(definition)
+            ? this.makeLoader(name)
+            : definition instanceof Loader
+                ? definition
+                : this.makeLoader(definition);
+        this.loaders[name] = loader;
+        this.logger.info(`set loader`, loader);
         return this;
     }
     /**
@@ -159,8 +161,13 @@ export default class Build extends Service {
      * @public
      * @decorator `@bind`
      */
-    makeLoader(options) {
-        return new Loader(() => this.app, options);
+    makeLoader(src) {
+        return new Loader(() => this.app, src);
+    }
+    getItem(name) {
+        if (!this.items[name])
+            this.logger.error(`loader ${name} was requested but is not registered`);
+        return this.items[name];
     }
     /**
      * Set Item
@@ -173,10 +180,14 @@ export default class Build extends Service {
      * @decorator `@bind`
      */
     setItem(name, options) {
-        const processedOptions = isFunction(options)
-            ? options(this.makeItem())
-            : this.makeItem(options);
-        Object.assign(this.items, { [name]: processedOptions });
+        const maybeOptionsCallback = isUndefined(options)
+            ? { ident: name, loader: name }
+            : options;
+        const item = isFunction(maybeOptionsCallback)
+            ? maybeOptionsCallback(this.makeItem())
+            : this.makeItem(maybeOptionsCallback);
+        this.items[name] = item;
+        this.logger.info(`set item`, item);
         return this;
     }
     /**
@@ -192,6 +203,10 @@ export default class Build extends Service {
         return new Item(() => this.app, options);
     }
 }
+/**
+ * @public
+ */
+Build.label = `build`;
 __decorate([
     bind
 ], Build.prototype, "make", null);
@@ -204,12 +219,18 @@ __decorate([
 __decorate([
     bind
 ], Build.prototype, "makeRule", null);
+__decorate([
+    bind
+], Build.prototype, "getLoader", null);
 __decorate([
     bind
 ], Build.prototype, "setLoader", null);
 __decorate([
     bind
 ], Build.prototype, "makeLoader", null);
+__decorate([
+    bind
+], Build.prototype, "getItem", null);
 __decorate([
     bind
 ], Build.prototype, "setItem", null);

package/lib/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"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"}

package/lib/shared/base.d.ts

@@ -1,6 +1,7 @@
-import type { Bud, Build } from '@roots/bud-framework';
-export default class Base implements Build.Base {
-    protected _app: () => Bud;
+import type { Bud } from '@roots/bud-framework';
+import type { Base as BuildBase } from '@roots/bud-framework/services/build';
+export default class Base implements BuildBase {
+    protected _app?: () => Bud;
     /**
      * Application getter
      *
@@ -12,7 +13,7 @@ export default class Base implements Build.Base {
      *
      * @public
      */
-    constructor(_app: () => Bud);
+    constructor(_app?: () => Bud);
     wrap<T = any>(input: T | ((app: Bud) => T)): (app: Bud) => T;
     unwrap<T = any>(input: T | ((app: Bud, ...options: Array<any>) => T), ...options: Array<any>): T;
 }

package/lib/shared/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/shared/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAE,KAAK,EAAC,MAAM,sBAAsB,CAAA;AAIpD,MAAM,CAAC,OAAO,OAAO,IAAK,YAAW,KAAK,CAAC,IAAI;IAe1B,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG;IAd5C;;;;OAIG;IACH,IAAW,GAAG,IAAI,GAAG,CAEpB;IAED;;;;OAIG;gBAC0B,IAAI,EAAE,MAAM,GAAG;IAGrC,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IAK5D,MAAM,CAAC,CAAC,GAAG,GAAG,EACnB,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EACpD,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,GACrB,CAAC;CAGL"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../src/shared/base.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,sBAAsB,CAAA;AAC7C,OAAO,KAAK,EAAC,IAAI,IAAI,SAAS,EAAC,MAAM,qCAAqC,CAAA;AAI1E,MAAM,CAAC,OAAO,OAAO,IAAK,YAAW,SAAS;IAezB,SAAS,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG;IAd7C;;;;OAIG;IACH,IAAW,GAAG,IAAI,GAAG,CAEpB;IAED;;;;OAIG;gBAC0B,IAAI,CAAC,EAAE,MAAM,GAAG;IAGtC,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;IAK5D,MAAM,CAAC,CAAC,GAAG,GAAG,EACnB,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EACpD,GAAG,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,GACrB,CAAC;CAGL"}

package/lib/shared/base.js

@@ -1,6 +1,6 @@
 import { __decorate } from "tslib";
-import { bind } from 'helpful-decorators';
-import { isFunction } from 'lodash-es';
+import { bind } from '@roots/bud-support/decorators';
+import { isFunction } from '@roots/bud-support/lodash-es';
 export default class Base {
     /**
      * Constructor

package/lib/shared/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/shared/base.ts"],"names":[],"mappings":";AACA,OAAO,EAAC,IAAI,EAAC,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,WAAW,CAAA;AAEpC,MAAM,CAAC,OAAO,OAAO,IAAI;IAUvB;;;;OAIG;IACH,YAA6B,IAAe;QAAf,SAAI,GAAJ,IAAI,CAAW;IAAG,CAAC;IAdhD;;;;OAIG;IACH,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,IAAI,EAAE,CAAA;IACpB,CAAC;IAUM,IAAI,CAAU,KAA4B;QAC/C,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAA;IAChD,CAAC;IAGM,MAAM,CACX,KAAoD,EACpD,GAAG,OAAmB;QAEtB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IAChE,CAAC;CACF;AAXC;IADC,IAAI;gCAGJ;AAGD;IADC,IAAI;kCAMJ"}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../src/shared/base.ts"],"names":[],"mappings":";AAEA,OAAO,EAAC,IAAI,EAAC,MAAM,+BAA+B,CAAA;AAClD,OAAO,EAAC,UAAU,EAAC,MAAM,8BAA8B,CAAA;AAEvD,MAAM,CAAC,OAAO,OAAO,IAAI;IAUvB;;;;OAIG;IACH,YAA6B,IAAgB;QAAhB,SAAI,GAAJ,IAAI,CAAY;IAAG,CAAC;IAdjD;;;;OAIG;IACH,IAAW,GAAG;QACZ,OAAO,IAAI,CAAC,IAAI,EAAE,CAAA;IACpB,CAAC;IAUM,IAAI,CAAU,KAA4B;QAC/C,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,KAAK,CAAA;IAChD,CAAC;IAGM,MAAM,CACX,KAAoD,EACpD,GAAG,OAAmB;QAEtB,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAA;IAChE,CAAC;CACF;AAXC;IADC,IAAI;gCAGJ;AAGD;IADC,IAAI;kCAMJ"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@roots/bud-build",
   "description": "Bud webpack config build controller",
-  "version": "6.3.5",
+  "version": "6.4.0",
   "homepage": "https://roots.io/bud",
   "repository": {
     "type": "git",
@@ -41,11 +41,11 @@
   "types": "./lib/index.d.ts",
   "exports": {
     ".": "./lib/index.js",
-    "./item": "./lib/item.js",
+    "./item": "./lib/item/item.js",
     "./items": "./lib/handlers/items.js",
-    "./loader": "./lib/loader.js",
+    "./loader": "./lib/loader/loader.js",
     "./loaders": "./lib/handlers/loaders.js",
-    "./rule": "./lib/rule.js",
+    "./rule": "./lib/rule/rule.js",
     "./rules": "./lib/handlers/rules.js",
     "./service": "./lib/service.js"
   },
@@ -55,19 +55,19 @@
         "./lib/index.d.ts"
       ],
       "item": [
-        "./lib/item.d.ts"
+        "./lib/item/item.d.ts"
       ],
       "items": [
         "./lib/handlers/items.d.ts"
       ],
       "loader": [
-        "./lib/loader.d.ts"
+        "./lib/loader/loader.d.ts"
       ],
       "loaders": [
         "./lib/handlers/loaders.d.ts"
       ],
       "rule": [
-        "./lib/rule.d.ts"
+        "./lib/rule/rule.d.ts"
       ],
       "rules": [
         "./lib/handlers/rules.d.ts"
@@ -78,24 +78,23 @@
     }
   },
   "devDependencies": {
+    "@jest/globals": "29.0.1",
     "@skypack/package-check": "0.2.2",
     "@types/fs-extra": "9.0.13",
-    "@types/lodash": "4.14.182",
-    "@types/lodash-es": "4.17.6",
     "@types/mini-css-extract-plugin": "2.5.0",
-    "@types/node": "16.11.45",
+    "@types/node": "16.11.48",
     "webpack": "5.73.0"
   },
   "dependencies": {
-    "@roots/bud-framework": "6.3.5",
+    "@roots/bud-framework": "6.4.0",
+    "@roots/bud-support": "6.4.0",
     "css-loader": "^6.5.1",
     "csv-loader": "^3.0.3",
     "file-loader": "^6.2.0",
     "fs-extra": "10.1.0",
     "helpful-decorators": "2.1.0",
-    "html-loader": "^4.0.0",
+    "html-loader": "^4.1.0",
     "json5": "2.2.1",
-    "lodash-es": "4.17.21",
     "mini-css-extract-plugin": "^2.4.5",
     "remark": "14.0.2",
     "remark-html": "15.0.1",

package/lib/config/filenameFormat.d.ts

@@ -1,13 +0,0 @@
-import type { Bud } from '@roots/bud-framework';
-/**
- * Filename
- *
- * @param app - Bud
- * @param extension - Filename extension
- *
- * @returns filename format
- *
- * @public
- */
-export declare const filenameFormat: (app: Bud, extension?: string) => string;
-//# sourceMappingURL=filenameFormat.d.ts.map

package/lib/config/filenameFormat.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"filenameFormat.d.ts","sourceRoot":"","sources":["../../src/config/filenameFormat.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,sBAAsB,CAAA;AAE7C;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc,QAAS,GAAG,cAAc,MAAM,KAAG,MAU7D,CAAA"}

package/lib/config/filenameFormat.js

@@ -1,21 +0,0 @@
-/**
- * Filename
- *
- * @param app - Bud
- * @param extension - Filename extension
- *
- * @returns filename format
- *
- * @public
- */
-export const filenameFormat = (app, extension) => {
-    if (!extension) {
-        extension = app.hooks.filter('build.experiments.outputModule')
-            ? '.mjs'
-            : '.js';
-    }
-    return app.hooks.filter('feature.hash')
-        ? app.hooks.filter('value.hashFormat').concat(extension)
-        : app.hooks.filter('value.fileFormat').concat(extension);
-};
-//# sourceMappingURL=filenameFormat.js.map

package/lib/config/filenameFormat.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"filenameFormat.js","sourceRoot":"","sources":["../../src/config/filenameFormat.ts"],"names":[],"mappings":"AAEA;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAQ,EAAE,SAAkB,EAAU,EAAE;IACrE,IAAI,CAAC,SAAS,EAAE;QACd,SAAS,GAAG,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,gCAAgC,CAAC;YAC5D,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,KAAK,CAAA;KACV;IAED,OAAO,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,cAAc,CAAC;QACrC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;QACxD,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;AAC5D,CAAC,CAAA"}

package/lib/config/index.d.ts

@@ -1,3 +0,0 @@
-import * as builder from './builder.js';
-export { builder };
-//# sourceMappingURL=index.d.ts.map

package/lib/config/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAC,OAAO,EAAC,CAAA"}

package/lib/config/index.js

@@ -1,3 +0,0 @@
-import * as builder from './builder.js';
-export { builder };
-//# sourceMappingURL=index.js.map

package/lib/config/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,OAAO,MAAM,cAAc,CAAA;AACvC,OAAO,EAAC,OAAO,EAAC,CAAA"}

package/lib/handlers/rules.d.ts

@@ -1,85 +0,0 @@
-import type { Bud } from '@roots/bud-framework/bud';
-import type { Rule } from '@roots/bud-framework/services/build';
-/**
- * .js rule
- *
- * @public
- */
-export declare const js: (app: Bud) => Promise<Rule>;
-/**
- * .css rule
- *
- * @public
- */
-export declare const css: (app: Bud) => Promise<Rule>;
-/**
- * .module.css rule
- *
- * @public
- */
-export declare const cssModule: (app: Bud) => Promise<Rule>;
-/**
- * .jpg, .jpeg, .png, .gif rule
- *
- * @public
- */
-export declare const image: (app: Bud) => Promise<Rule>;
-/**
- * .webp assets factorry
- *
- * @remarks
- * Returns {@link Rule} for `asset/resource`
- *
- * @public
- */
-export declare const webp: (app: Bud) => Promise<Rule>;
-/**
- * Returns {@link Rule} for `.woff`/`.otf` handling
- * .svg rule
- *
- * @public
- */
-export declare const svg: (app: Bud) => Promise<Rule>;
-/**
- * .woff, .woff2, .otf rule
- *
- * @public
- */
-export declare const font: (app: Bud) => Promise<Rule>;
-/**
- * Returns {@link Rule} for `.jsonc` handling
- *
- * @public
- */
-export declare const json: (app: Bud) => Promise<Rule>;
-/**
- * Returns {@link Rule} for `.yml` / `.yaml` handling
- *
- * @public
- */
-export declare const yml: (app: Bud) => Promise<Rule>;
-/**
- * Returns {@link Rule} for `.html` handling
- *
- * @public
- */
-export declare const html: (app: Bud) => Promise<Rule>;
-/**
- * Returns {@link Rule} for `.csv` handling
- *
- * @public
- */
-export declare const csv: (app: Bud) => Promise<Rule>;
-/**
- * Returns {@link Rule} for `.xml` handling
- *
- * @public
- */
-export declare const xml: (app: Bud) => Promise<Rule>;
-/**
- * Returns {@link Rule} for `.toml` handling
- *
- * @public
- */
-export declare const toml: (app: Bud) => Promise<Rule>;
-//# sourceMappingURL=rules.d.ts.map

package/lib/handlers/rules.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"rules.d.ts","sourceRoot":"","sources":["../../src/handlers/rules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,GAAG,EAAC,MAAM,0BAA0B,CAAA;AACjD,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,qCAAqC,CAAA;AAI7D;;;;GAIG;AACH,eAAO,MAAM,EAAE,QAAe,GAAG,KAAG,QAAQ,IAAI,CAKjC,CAAA;AAEf;;;;GAIG;AACH,eAAO,MAAM,GAAG,QAAe,GAAG,KAAG,QAAQ,IAAI,CAKnB,CAAA;AAE9B;;;;GAIG;AACH,eAAO,MAAM,SAAS,QAAe,GAAG,KAAG,QAAQ,IAAI,CAKnB,CAAA;AAEpC;;;;GAIG;AACH,eAAO,MAAM,KAAK,QAAe,GAAG,KAAG,QAAQ,IAAI,CAc5C,CAAA;AAEP;;;;;;;GAOG;AACH,eAAO,MAAM,IAAI,QAAe,GAAG,KAAG,QAAQ,IAAI,CAc3C,CAAA;AAEP;;;;;GAKG;AACH,eAAO,MAAM,GAAG,QAAe,GAAG,KAAG,QAAQ,IAAI,CAc1C,CAAA;AAEP;;;;GAIG;AACH,eAAO,MAAM,IAAI,QAAe,GAAG,KAAG,QAAQ,IAAI,CAc3C,CAAA;AAEP;;;;GAIG;AACH,eAAO,MAAM,IAAI,QAAe,GAAG,KAAG,QAAQ,IAAI,CAOR,CAAA;AAE1C;;;;GAIG;AACH,eAAO,MAAM,GAAG,QAAe,GAAG,KAAG,QAAQ,IAAI,CAM7B,CAAA;AAEpB;;;;GAIG;AACH,eAAO,MAAM,IAAI,QAAe,GAAG,KAAG,QAAQ,IAAI,CAM7B,CAAA;AAErB;;;;GAIG;AACH,eAAO,MAAM,GAAG,QAAe,GAAG,KAAG,QAAQ,IAAI,CAM7B,CAAA;AAEpB;;;;GAIG;AACH,eAAO,MAAM,GAAG,QAAe,GAAG,KAAG,QAAQ,IAAI,CAM7B,CAAA;AAEpB;;;;GAIG;AACH,eAAO,MAAM,IAAI,QAAe,GAAG,KAAG,QAAQ,IAAI,CAOT,CAAA"}