balm-core 5.0.2 → 5.1.0

package/tslib/tasks/public/html.js

@@ -1,33 +1,31 @@
-var _HtmlTask_updateAssetsPath, _HtmlTask_hasSourcePath;
-import { __classPrivateFieldGet } from "tslib";
 import { PUBLIC_URL } from '../../config/constants.js';
 class HtmlTask extends BalmJS.BalmTask {
     constructor() {
         super('html');
-        _HtmlTask_updateAssetsPath.set(this, (type) => {
-            const isManifest = type === 'manifest';
-            const assetsType = isManifest ? 'img' : type;
-            const from = BalmJS.config.paths.source[assetsType];
-            const to = BalmJS.file.assetsPath(BalmJS.config.paths.target[assetsType]);
-            const assetsPathSrc = new RegExp(isManifest ? `/?${from}` : `${PUBLIC_URL}/${from}`, 'g');
-            const assetsPathDest = `${PUBLIC_URL}/${to}`;
-            BalmJS.logger.debug(`${this.name} task - assets path`, {
-                regex: assetsPathSrc,
-                replacement: assetsPathDest
-            }, {
-                pre: true
-            });
-            return BalmJS.plugins.replace(assetsPathSrc, assetsPathDest);
-        });
-        _HtmlTask_hasSourcePath.set(this, (type) => {
-            return !!BalmJS.config.paths.source[type];
-        });
         this.defaultInput = [
             node.path.join(BalmJS.file.templateBasePath, '*.html'),
             node.path.join(BalmJS.file.templateBasePath, BalmJS.config.pwa.manifest)
         ];
         this.defaultOutput = BalmJS.config.dest.base;
     }
+    #updateAssetsPath = (type) => {
+        const isManifest = type === 'manifest';
+        const assetsType = isManifest ? 'img' : type;
+        const from = BalmJS.config.paths.source[assetsType];
+        const to = BalmJS.file.assetsPath(BalmJS.config.paths.target[assetsType]);
+        const assetsPathSrc = new RegExp(isManifest ? `/?${from}` : `${PUBLIC_URL}/${from}`, 'g');
+        const assetsPathDest = `${PUBLIC_URL}/${to}`;
+        BalmJS.logger.debug(`${this.name} task - assets path`, {
+            regex: assetsPathSrc,
+            replacement: assetsPathDest
+        }, {
+            pre: true
+        });
+        return BalmJS.plugins.replace(assetsPathSrc, assetsPathDest);
+    };
+    #hasSourcePath = (type) => {
+        return !!BalmJS.config.paths.source[type];
+    };
     recipe(input, output) {
         const balmHtml = () => {
             this.init(input, output);
@@ -46,9 +44,9 @@ class HtmlTask extends BalmJS.BalmTask {
                 ['css', 'js', 'img', 'media', 'manifest'].forEach((type) => {
                     const canUpdate = type === 'manifest'
                         ? BalmJS.config.pwa.enabled
-                        : __classPrivateFieldGet(this, _HtmlTask_hasSourcePath, "f").call(this, type);
+                        : this.#hasSourcePath(type);
                     if (canUpdate) {
-                        stream = stream.pipe(__classPrivateFieldGet(this, _HtmlTask_updateAssetsPath, "f").call(this, type));
+                        stream = stream.pipe(this.#updateAssetsPath(type));
                     }
                 });
                 stream = BalmJS.config.assets.cache
@@ -58,10 +56,10 @@ class HtmlTask extends BalmJS.BalmTask {
             else {
                 ['css', 'js', 'img', 'media'].forEach((type, index) => {
                     const canUpdate = index > 1
-                        ? __classPrivateFieldGet(this, _HtmlTask_hasSourcePath, "f").call(this, type) && !BalmJS.config.inFrontend
-                        : __classPrivateFieldGet(this, _HtmlTask_hasSourcePath, "f").call(this, type);
+                        ? this.#hasSourcePath(type) && !BalmJS.config.inFrontend
+                        : this.#hasSourcePath(type);
                     if (canUpdate) {
-                        stream = stream.pipe(__classPrivateFieldGet(this, _HtmlTask_updateAssetsPath, "f").call(this, type));
+                        stream = stream.pipe(this.#updateAssetsPath(type));
                     }
                 });
                 stream = stream.pipe(BalmJS.file.setPublicPath());
@@ -74,5 +72,4 @@ class HtmlTask extends BalmJS.BalmTask {
         return this.recipe();
     }
 }
-_HtmlTask_updateAssetsPath = new WeakMap(), _HtmlTask_hasSourcePath = new WeakMap();
 export default HtmlTask;

package/tslib/tasks/public/publish.js

@@ -1,35 +1,33 @@
-var _PublishTask_release;
-import { __classPrivateFieldGet } from "tslib";
 import mergeStream from '../../utilities/merge-stream.js';
 class PublishTask extends BalmJS.BalmTask {
     constructor() {
         super('publish');
-        _PublishTask_release.set(this, (input, output, renameOptions = {}) => {
-            if (input && output) {
-                this.init(node.path.join(BalmJS.config.dest.base, input), node.path.join(BalmJS.config.assets.root, output));
-            }
-            else {
-                this.init();
-            }
-            return this.src
-                .pipe($.if(!BalmJS.utils.isArray(this.input), BalmJS.plugins.rename(renameOptions)))
-                .pipe(gulp.dest(this.output));
-        });
         this.defaultInput = [
             BalmJS.file.matchAllFiles(BalmJS.config.dest.static),
             node.path.join(`!${BalmJS.config.dest.base}`, '*.*')
         ];
         this.defaultOutput = BalmJS.config.assets.static;
     }
+    #release = (input, output, renameOptions = {}) => {
+        if (input && output) {
+            this.init(node.path.join(BalmJS.config.dest.base, input), node.path.join(BalmJS.config.assets.root, output));
+        }
+        else {
+            this.init();
+        }
+        return this.src
+            .pipe($.if(!BalmJS.utils.isArray(this.input), BalmJS.plugins.rename(renameOptions)))
+            .pipe(gulp.dest(this.output));
+    };
     recipe(input, output, renameOptions) {
         const balmPublish = (callback) => {
             if (BalmJS.config.env.isProd) {
                 if (BalmJS.utils.isArray(input)) {
-                    const tasks = input.map((template) => __classPrivateFieldGet(this, _PublishTask_release, "f").call(this, template.input, template.output, template.renameOptions));
+                    const tasks = input.map((template) => this.#release(template.input, template.output, template.renameOptions));
                     return mergeStream(...tasks);
                 }
                 else {
-                    return __classPrivateFieldGet(this, _PublishTask_release, "f").call(this, input, output, renameOptions);
+                    return this.#release(input, output, renameOptions);
                 }
             }
             else {
@@ -43,5 +41,4 @@ class PublishTask extends BalmJS.BalmTask {
         callback();
     }
 }
-_PublishTask_release = new WeakMap();
 export default PublishTask;

package/tslib/tasks/public/remove.js

@@ -1,23 +1,21 @@
-var _RemoveTask_getFiles;
-import { __classPrivateFieldGet } from "tslib";
 import { deleteAsync } from 'del';
 class RemoveTask extends BalmJS.BalmTask {
     constructor() {
         super('remove');
-        _RemoveTask_getFiles.set(this, (input) => {
-            let files = BalmJS.file.absPaths(input);
-            files = BalmJS.utils.isArray(input)
-                ? files.map((file) => file.replace(/\\/g, '/'))
-                : files.replace(/\\/g, '/');
-            return files;
-        });
     }
+    #getFiles = (input) => {
+        let files = BalmJS.file.absPaths(input);
+        files = BalmJS.utils.isArray(input)
+            ? files.map((file) => file.replace(/\\/g, '/'))
+            : files.replace(/\\/g, '/');
+        return files;
+    };
     recipe(input) {
         const balmRemove = async (callback) => {
             const canDel = !!((BalmJS.utils.isString(input) && input.trim()) ||
                 (BalmJS.utils.isArray(input) && input.length));
             if (canDel) {
-                const files = __classPrivateFieldGet(this, _RemoveTask_getFiles, "f").call(this, input);
+                const files = this.#getFiles(input);
                 BalmJS.logger.debug(`${this.name} task`, {
                     files
                 }, {
@@ -43,5 +41,4 @@ class RemoveTask extends BalmJS.BalmTask {
         callback();
     }
 }
-_RemoveTask_getFiles = new WeakMap();
 export default RemoveTask;

package/tslib/tasks/public/sass.js

@@ -1,10 +1,9 @@
-import { isLegacy } from '../../plugins/sass.js';
 class SassTask extends BalmJS.BalmStyleTask {
     constructor() {
         super('sass');
     }
     get options() {
-        return Object.assign(isLegacy
+        return Object.assign(node.isLegacySass
             ? {
                 includePaths: BalmJS.file.stylePaths,
                 outputStyle: 'expanded'

package/tslib/tasks/public/server.js

@@ -1,43 +1,8 @@
-var _ServerTask_watchTask, _ServerTask_onWatch;
-import { __classPrivateFieldGet } from "tslib";
 import detectPort from '../../utilities/detect-port.js';
 import getMiddlewares from '../../middlewares/index.js';
 class ServerTask extends BalmJS.BalmTask {
     constructor() {
         super('serve');
-        _ServerTask_watchTask.set(this, (taskName, serverReload = false) => {
-            const balmTask = BalmJS.tasks.get(taskName).fn;
-            const reload = (done) => {
-                server.reload();
-                done();
-            };
-            return serverReload ? gulp.series(balmTask, reload) : balmTask;
-        });
-        _ServerTask_onWatch.set(this, () => {
-            const { watch } = gulp;
-            const watchOptions = {
-                cwd: BalmJS.config.workspace
-            };
-            watch([
-                `${BalmJS.config.src.img}/**/*`,
-                `${BalmJS.config.dest.font}/**/*`,
-                ...BalmJS.config.server.extraWatchFiles
-            ], watchOptions).on('change', server.reload);
-            watch(`${BalmJS.file.templateBasePath}/*.html`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, 'html', true));
-            watch(`${BalmJS.config.src.css}/**/*.${BalmJS.config.styles.extname}`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, BalmJS.config.inFrontend ? this.styleName : 'style'));
-            if (!BalmJS.config.server.useHMR) {
-                watch(`${BalmJS.config.src.js}/**/*`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, BalmJS.config.scripts.bundler, true));
-            }
-            watch(`${BalmJS.config.src.base}/modernizr.json`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, 'modernizr'));
-            watch(`${BalmJS.config.src.font}/**/*`, watchOptions, __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, 'font'));
-            if (BalmJS.config.ftp.watchFiles.length) {
-                watch(BalmJS.config.ftp.watchFiles, watchOptions).on('change', (path) => {
-                    BalmJS.logger.debug(`${this.name} task`, `File ${path} was changed`);
-                    BalmJS.watchFtpFile = path;
-                    __classPrivateFieldGet(this, _ServerTask_watchTask, "f").call(this, 'ftp', true)();
-                });
-            }
-        });
         if (BalmJS.config.env.isDev) {
             detectPort(BalmJS.config.server.port, BalmJS.config.server.host).then((port) => {
                 if (BalmJS.config.server.port !== port) {
@@ -47,6 +12,39 @@ class ServerTask extends BalmJS.BalmTask {
             }, () => { });
         }
     }
+    #watchTask = (taskName, serverReload = false) => {
+        const balmTask = BalmJS.tasks.get(taskName).fn;
+        const reload = (done) => {
+            server.reload();
+            done();
+        };
+        return serverReload ? gulp.series(balmTask, reload) : balmTask;
+    };
+    #onWatch = () => {
+        const { watch } = gulp;
+        const watchOptions = {
+            cwd: BalmJS.config.workspace
+        };
+        watch([
+            `${BalmJS.config.src.img}/**/*`,
+            `${BalmJS.config.dest.font}/**/*`,
+            ...BalmJS.config.server.extraWatchFiles
+        ], watchOptions).on('change', server.reload);
+        watch(`${BalmJS.file.templateBasePath}/*.html`, watchOptions, this.#watchTask('html', true));
+        watch(`${BalmJS.config.src.css}/**/*.${BalmJS.config.styles.extname}`, watchOptions, this.#watchTask(BalmJS.config.inFrontend ? this.styleName : 'style'));
+        if (!BalmJS.config.server.useHMR) {
+            watch(`${BalmJS.config.src.js}/**/*`, watchOptions, this.#watchTask(BalmJS.config.scripts.bundler, true));
+        }
+        watch(`${BalmJS.config.src.base}/modernizr.json`, watchOptions, this.#watchTask('modernizr'));
+        watch(`${BalmJS.config.src.font}/**/*`, watchOptions, this.#watchTask('font'));
+        if (BalmJS.config.ftp.watchFiles.length) {
+            watch(BalmJS.config.ftp.watchFiles, watchOptions).on('change', (path) => {
+                BalmJS.logger.debug(`${this.name} task`, `File ${path} was changed`);
+                BalmJS.watchFtpFile = path;
+                this.#watchTask('ftp', true)();
+            });
+        }
+    };
     recipe(customHandler) {
         const balmServe = (callback) => {
             if (BalmJS.server) {
@@ -102,7 +100,7 @@ class ServerTask extends BalmJS.BalmTask {
                 if (BalmJS.config.env.isDev) {
                     BalmJS.server = server.init(bsOptions);
                     if (BalmJS.config.useDefaults) {
-                        __classPrivateFieldGet(this, _ServerTask_onWatch, "f").call(this);
+                        this.#onWatch();
                     }
                     else {
                         BalmJS.watching = true;
@@ -128,5 +126,4 @@ class ServerTask extends BalmJS.BalmTask {
         return this.recipe();
     }
 }
-_ServerTask_watchTask = new WeakMap(), _ServerTask_onWatch = new WeakMap();
 export default ServerTask;

package/tslib/tasks/public/url.js

@@ -1,31 +1,29 @@
-var _UrlTask_urlProcessing;
-import { __classPrivateFieldGet } from "tslib";
 class UrlTask extends BalmJS.BalmTask {
     constructor() {
         super('url');
-        _UrlTask_urlProcessing.set(this, (type) => {
-            const pattern = BalmJS.config.paths.source[type]
-                .split('/')
-                .pop();
-            const pathSrc = new RegExp(`\\.{2}/${pattern}/`, 'g');
-            const pathDest = `../${BalmJS.config.paths.target[type]}/`;
-            BalmJS.logger.debug(`${this.name} task`, {
-                regex: pathSrc,
-                replacement: pathDest
-            }, {
-                pre: true
-            });
-            return BalmJS.plugins.replace(pathSrc, pathDest);
-        });
         this.defaultOutput = BalmJS.config.dest.css;
         this.defaultInput = BalmJS.file.matchAllFiles(this.defaultOutput, '*.css');
     }
+    #urlProcessing = (type) => {
+        const pattern = BalmJS.config.paths.source[type]
+            .split('/')
+            .pop();
+        const pathSrc = new RegExp(`\\.{2}/${pattern}/`, 'g');
+        const pathDest = `../${BalmJS.config.paths.target[type]}/`;
+        BalmJS.logger.debug(`${this.name} task`, {
+            regex: pathSrc,
+            replacement: pathDest
+        }, {
+            pre: true
+        });
+        return BalmJS.plugins.replace(pathSrc, pathDest);
+    };
     recipe(input, output) {
         const balmUrl = () => {
             this.init(input, output);
             return this.src
-                .pipe(__classPrivateFieldGet(this, _UrlTask_urlProcessing, "f").call(this, 'img'))
-                .pipe(__classPrivateFieldGet(this, _UrlTask_urlProcessing, "f").call(this, 'font'))
+                .pipe(this.#urlProcessing('img'))
+                .pipe(this.#urlProcessing('font'))
                 .pipe(gulp.dest(this.output));
         };
         return balmUrl;
@@ -34,5 +32,4 @@ class UrlTask extends BalmJS.BalmTask {
         return this.recipe();
     }
 }
-_UrlTask_urlProcessing = new WeakMap();
 export default UrlTask;

package/tslib/utilities/compiling.js

@@ -1,21 +1,16 @@
-var _BalmCompiling_firstCompile;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import loading from './loading.js';
 class BalmCompiling {
-    constructor() {
-        _BalmCompiling_firstCompile.set(this, true);
-    }
+    #firstCompile = true;
     start() {
-        if (!BalmJS.useCacache && __classPrivateFieldGet(this, _BalmCompiling_firstCompile, "f")) {
+        if (!BalmJS.useCacache && this.#firstCompile) {
             loading.render('Compiling to JS...');
         }
     }
     stop() {
-        if (!BalmJS.useCacache && __classPrivateFieldGet(this, _BalmCompiling_firstCompile, "f")) {
-            __classPrivateFieldSet(this, _BalmCompiling_firstCompile, false, "f");
+        if (!BalmJS.useCacache && this.#firstCompile) {
+            this.#firstCompile = false;
             loading.clear();
         }
     }
 }
-_BalmCompiling_firstCompile = new WeakMap();
 export default new BalmCompiling();

package/tslib/utilities/loading.js

@@ -1,31 +1,25 @@
-var _BalmLoading_stream, _BalmLoading_frameIndex, _BalmLoading_frameCount;
-import { __classPrivateFieldGet, __classPrivateFieldSet } from "tslib";
 import readline from 'readline';
 import spinner from '../config/spinner.js';
 class BalmLoading {
-    constructor() {
-        _BalmLoading_stream.set(this, process.stderr);
-        _BalmLoading_frameIndex.set(this, 0);
-        _BalmLoading_frameCount.set(this, spinner.frames.length);
-    }
+    #stream = process.stderr;
+    #frameIndex = 0;
+    #frameCount = spinner.frames.length;
     get frame() {
-        var _a;
-        const currentFrame = spinner.frames[__classPrivateFieldGet(this, _BalmLoading_frameIndex, "f")];
-        __classPrivateFieldSet(this, _BalmLoading_frameIndex, __classPrivateFieldSet(this, _BalmLoading_frameIndex, (_a = __classPrivateFieldGet(this, _BalmLoading_frameIndex, "f"), ++_a), "f") % __classPrivateFieldGet(this, _BalmLoading_frameCount, "f"), "f");
+        const currentFrame = spinner.frames[this.#frameIndex];
+        this.#frameIndex = ++this.#frameIndex % this.#frameCount;
         return currentFrame;
     }
     clear() {
-        readline.clearLine(__classPrivateFieldGet(this, _BalmLoading_stream, "f"), 0);
-        readline.cursorTo(__classPrivateFieldGet(this, _BalmLoading_stream, "f"), 0);
+        readline.clearLine(this.#stream, 0);
+        readline.cursorTo(this.#stream, 0);
     }
     render(text = `${this.frame} BalmJS is initializing...`) {
         this.clear();
-        __classPrivateFieldGet(this, _BalmLoading_stream, "f").write(text);
+        this.#stream.write(text);
     }
     succeed() {
         this.clear();
         console.log(`BalmJS core version: ${BalmJS.version}`);
     }
 }
-_BalmLoading_stream = new WeakMap(), _BalmLoading_frameIndex = new WeakMap(), _BalmLoading_frameCount = new WeakMap();
 export default new BalmLoading();

package/tslib/utilities/logger.js

@@ -1,5 +1,3 @@
-var _Logger_log;
-import { __classPrivateFieldGet } from "tslib";
 import util from 'node:util';
 import fancyLog from 'fancy-log';
 import color from './color.js';
@@ -39,23 +37,21 @@ const LOG = {
     end: '^'.padEnd(36, '.')
 };
 class Logger {
-    constructor() {
-        _Logger_log.set(this, (obj, pre = false) => {
-            const options = Object.assign({
-                showHidden: false,
-                depth: 2,
-                colors: true
-            }, BalmJS.config.logs.formatOptions);
-            return pre ? util.inspect(obj, options) : obj;
-        });
-    }
+    #log = (obj, pre = false) => {
+        const options = Object.assign({
+            showHidden: false,
+            depth: 2,
+            colors: true
+        }, BalmJS.config.logs.formatOptions);
+        return pre ? util.inspect(obj, options) : obj;
+    };
     success(label, message, options = {}) {
         const logOptions = Object.assign({
             logLevel: BalmJS.LogLevel.Trace
         }, options);
         if (BalmJS.config.logs.level <= logOptions.logLevel) {
             console.log(LOG.beginning);
-            fancyLog(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.OK), __classPrivateFieldGet(this, _Logger_log, "f").call(this, message, logOptions.pre));
+            fancyLog(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.OK), this.#log(message, logOptions.pre));
             console.log(LOG.end);
         }
     }
@@ -64,7 +60,7 @@ class Logger {
             logLevel: BalmJS.LogLevel.Debug
         }, options);
         if (BalmJS.config.logs.level <= logOptions.logLevel) {
-            fancyLog.info(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.DEBUG), __classPrivateFieldGet(this, _Logger_log, "f").call(this, message, logOptions.pre));
+            fancyLog.info(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.DEBUG), this.#log(message, logOptions.pre));
         }
     }
     info(label, message, options = {}) {
@@ -72,7 +68,7 @@ class Logger {
             logLevel: BalmJS.LogLevel.Info
         }, options);
         if (BalmJS.config.logs.level <= logOptions.logLevel) {
-            fancyLog.info(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.INFO), __classPrivateFieldGet(this, _Logger_log, "f").call(this, message, logOptions.pre));
+            fancyLog.info(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.INFO), this.#log(message, logOptions.pre));
         }
     }
     warn(label, message, options = {}) {
@@ -80,7 +76,7 @@ class Logger {
             logLevel: BalmJS.LogLevel.Warn
         }, options);
         if (BalmJS.config.logs.level <= logOptions.logLevel) {
-            fancyLog.warn(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.WARN), __classPrivateFieldGet(this, _Logger_log, "f").call(this, message, logOptions.pre));
+            fancyLog.warn(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.WARN), this.#log(message, logOptions.pre));
         }
     }
     error(label, message, options = {}) {
@@ -89,9 +85,8 @@ class Logger {
             pre: false
         }, options);
         if (BalmJS.config.logs.level <= logOptions.logLevel) {
-            fancyLog.error(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.ERROR), __classPrivateFieldGet(this, _Logger_log, "f").call(this, message, logOptions.pre));
+            fancyLog.error(LOG.FORMAT, LOG.PREFIX, color(`<${label}>`, LOG.ERROR), this.#log(message, logOptions.pre));
         }
     }
 }
-_Logger_log = new WeakMap();
 export default new Logger();