@master/css-cli 2.0.0-rc.17 → 2.0.0-rc.19

package/README.md

@@ -41,7 +41,7 @@
             <img alt="Follow @mastercorg" src="https://img.shields.io/static/v1?label=%20&message=twitter&color=f6f7f8&logo=twitter&style=for-the-badge">
         </picture>
     </a>
-    <a aria-label="Github Actions" href="https://github.com/1aron/repo/actions/workflows/release.yml">
+    <a aria-label="Github Actions" href="https://github.com/master-co/css/actions/workflows/release.yml">
         <picture>
             <source media="(prefers-color-scheme: dark)" srcset="https://img.shields.io/github/actions/workflow/status/master-co/css/release.yml?branch=rc&label=%20&message=twitter&color=212022&logo=githubactions&style=for-the-badge">
             <source media="(prefers-color-scheme: light)" srcset="https://img.shields.io/github/actions/workflow/status/master-co/css/release.yml?branch=rc&label=%20&message=twitter&color=f6f7f8&logo=githubactions&style=for-the-badge&logoColor=%23000">

package/dist/bin/index.mjs

@@ -1,293 +1,4 @@
 #!/usr/bin/env node
-import { resolve } from 'node:path';
-import { Command } from 'commander';
-import { readJSONFileSync } from '@techor/fs';
-import { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import CSSExtractor from '@master/css-extractor';
-import log from '@techor/log';
-import prettyHartime from 'pretty-hrtime';
-import { explorePathsSync } from '@techor/glob';
-import exploreConfig from 'explore-config';
-import { readFile, writeFileSync } from 'fs';
-import { brotliCompressSync } from 'zlib';
-import { render } from '@master/css-server';
+import runProgram from '../core.mjs';
 
-var commandExtract = ((program)=>program.command('extract').argument('[source paths]', 'The glob pattern path to extract sources').option('-w, --watch', 'Watch file changed and generate CSS rules.').option('-o, --output <path>', 'Specify your CSS file output path').option('-v, --verbose <level>', 'Verbose logging 0~N', '1').option('--no-export', 'Print only CSS results.').option('--options <path>', 'Specify your extractor options sources', 'master.css-extractor').action(async function(specifiedSourcePaths, options) {
-        const { watch, output, verbose, cwd, options: customOptions } = options || {};
-        const extractor = new CSSExtractor(customOptions, cwd);
-        extractor.on('init', (options)=>{
-            if (specifiedSourcePaths?.length) {
-                options.include = [];
-                options.exclude = [];
-            } else {
-                if (!options.exclude?.includes('**/node_modules/**')) {
-                    options.exclude?.push('**/node_modules/**');
-                }
-                if (!options.exclude?.includes('node_modules')) {
-                    options.exclude?.push('node_modules');
-                }
-            }
-            options.output = output;
-            options.verbose = verbose ? +verbose : options.verbose;
-        });
-        extractor.init();
-        const insert = async ()=>{
-            /**
-             * true: Ignore `.include` and `.exclude` when specifying sources explicitly.
-             * else: Insert according to the source of `.include` - `.exclude`.
-             */ if (specifiedSourcePaths?.length) {
-                await extractor.insertFiles(specifiedSourcePaths);
-            } else {
-                await extractor.insertFiles(extractor.allowedSourcePaths);
-            }
-        };
-        if (watch) {
-            const reset = async ()=>{
-                await insert();
-                /* If the specified source does not exist, watch the .include - .exclude */ if (!specifiedSourcePaths?.length && extractor.options.include) {
-                    await extractor.watchSource(extractor.options.include, {
-                        ignored: extractor.options.exclude
-                    });
-                }
-            };
-            extractor.on('watchStart', async ()=>{
-                await extractor.prepare();
-                await reset();
-                log``;
-                log.t`Start watching source changes`;
-            }).on('reset', async ()=>{
-                await reset();
-                log``;
-                log.t`Restart watching source changes`;
-            }).on('change', ()=>{
-                if (options?.export) {
-                    extractor.export();
-                } else {
-                    console.log(extractor.css.text);
-                }
-            }).on('watchClose', ()=>{
-                log``;
-                log.t`Stop watching source changes`;
-            });
-            await extractor.startWatch();
-        } else {
-            await extractor.prepare();
-            await insert();
-            if (options?.export) {
-                extractor.export();
-            } else {
-                console.log(extractor.css.text);
-            }
-        }
-    }));
-
-function getDefaultExportFromCjs (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
-}
-
-var bytes$2 = {exports: {}};
-
-/*!
- * bytes
- * Copyright(c) 2012-2014 TJ Holowaychuk
- * Copyright(c) 2015 Jed Watson
- * MIT Licensed
- */
-/**
- * Module exports.
- * @public
- */ bytes$2.exports = bytes;
-bytes$2.exports.format = format;
-bytes$2.exports.parse = parse;
-/**
- * Module variables.
- * @private
- */ var formatThousandsRegExp = /\B(?=(\d{3})+(?!\d))/g;
-var formatDecimalsRegExp = /(?:\.0*|(\.[^0]+)0+)$/;
-var map = {
-    b: 1,
-    kb: 1 << 10,
-    mb: 1 << 20,
-    gb: 1 << 30,
-    tb: Math.pow(1024, 4),
-    pb: Math.pow(1024, 5)
-};
-var parseRegExp = /^((-|\+)?(\d+(?:\.\d+)?)) *(kb|mb|gb|tb|pb)$/i;
-/**
- * Convert the given value in bytes into a string or parse to string to an integer in bytes.
- *
- * @param {string|number} value
- * @param {{
- *  case: [string],
- *  decimalPlaces: [number]
- *  fixedDecimals: [boolean]
- *  thousandsSeparator: [string]
- *  unitSeparator: [string]
- *  }} [options] bytes options.
- *
- * @returns {string|number|null}
- */ function bytes(value, options) {
-    if (typeof value === 'string') {
-        return parse(value);
-    }
-    if (typeof value === 'number') {
-        return format(value, options);
-    }
-    return null;
-}
-/**
- * Format the given value in bytes into a string.
- *
- * If the value is negative, it is kept as such. If it is a float,
- * it is rounded.
- *
- * @param {number} value
- * @param {object} [options]
- * @param {number} [options.decimalPlaces=2]
- * @param {number} [options.fixedDecimals=false]
- * @param {string} [options.thousandsSeparator=]
- * @param {string} [options.unit=]
- * @param {string} [options.unitSeparator=]
- *
- * @returns {string|null}
- * @public
- */ function format(value, options) {
-    if (!Number.isFinite(value)) {
-        return null;
-    }
-    var mag = Math.abs(value);
-    var thousandsSeparator = options && options.thousandsSeparator || '';
-    var unitSeparator = options && options.unitSeparator || '';
-    var decimalPlaces = options && options.decimalPlaces !== undefined ? options.decimalPlaces : 2;
-    var fixedDecimals = Boolean(options && options.fixedDecimals);
-    var unit = options && options.unit || '';
-    if (!unit || !map[unit.toLowerCase()]) {
-        if (mag >= map.pb) {
-            unit = 'PB';
-        } else if (mag >= map.tb) {
-            unit = 'TB';
-        } else if (mag >= map.gb) {
-            unit = 'GB';
-        } else if (mag >= map.mb) {
-            unit = 'MB';
-        } else if (mag >= map.kb) {
-            unit = 'KB';
-        } else {
-            unit = 'B';
-        }
-    }
-    var val = value / map[unit.toLowerCase()];
-    var str = val.toFixed(decimalPlaces);
-    if (!fixedDecimals) {
-        str = str.replace(formatDecimalsRegExp, '$1');
-    }
-    if (thousandsSeparator) {
-        str = str.split('.').map(function(s, i) {
-            return i === 0 ? s.replace(formatThousandsRegExp, thousandsSeparator) : s;
-        }).join('.');
-    }
-    return str + unitSeparator + unit;
-}
-/**
- * Parse the string value into an integer in bytes.
- *
- * If no unit is given, it is assumed the value is in bytes.
- *
- * @param {number|string} val
- *
- * @returns {number|null}
- * @public
- */ function parse(val) {
-    if (typeof val === 'number' && !isNaN(val)) {
-        return val;
-    }
-    if (typeof val !== 'string') {
-        return null;
-    }
-    // Test if the string passed is valid
-    var results = parseRegExp.exec(val);
-    var floatValue;
-    var unit = 'b';
-    if (!results) {
-        // Nothing could be extracted from the given string
-        floatValue = parseInt(val, 10);
-        unit = 'b';
-    } else {
-        // Retrieve the value and the unit
-        floatValue = parseFloat(results[1]);
-        unit = results[4].toLowerCase();
-    }
-    if (isNaN(floatValue)) {
-        return null;
-    }
-    return Math.floor(map[unit] * floatValue);
-}
-
-var bytesExports = bytes$2.exports;
-var bytes$1 = /*@__PURE__*/getDefaultExportFromCjs(bytesExports);
-
-var commandRender = ((program)=>program.command('render').description('Scans HTML and injects generated CSS rules').argument('<source paths>', 'The path in glob patterns of the source of the HTML file').option('-c --config <path>', 'The source path of the Master CSS configuration', 'master.css').option('-a --analyze', 'Analyze injected CSS and HTML size ( brotli ) without writing to file').action(async function(filePatterns, options = {
-        config: 'master.css'
-    }) {
-        const sourcePaths = explorePathsSync(filePatterns);
-        if (sourcePaths.length) {
-            const renderStart = process.hrtime();
-            const col1Width = Math.max(sourcePaths.reduce((max, current)=>{
-                if (current.length > max.length) {
-                    return current;
-                } else {
-                    return max;
-                }
-            }).length + 10, 20);
-            const col2Width = 8;
-            const config = typeof options.config === 'string' ? exploreConfig(options.config, {
-                found: (basename)=>log.i`Loaded **${basename}**`
-            }) : undefined;
-            log``;
-            log`${'  Source Files'.padEnd(col1Width)}${'CSS Size'.padStart(col2Width)}`;
-            await Promise.all(sourcePaths.map(async (filename)=>new Promise((resolve, reject)=>{
-                    readFile(filename, {
-                        encoding: 'utf-8'
-                    }, (err, content)=>{
-                        if (err) reject(err);
-                        const { html, css } = render(content, config);
-                        const renderedCSSText = css?.text;
-                        const renderedCSSSize = renderedCSSText ? options.analyze ? brotliCompressSync(renderedCSSText).length : renderedCSSText.length : 0;
-                        if (!options.analyze) {
-                            if (content !== html) {
-                                writeFileSync(filename, html);
-                            }
-                        }
-                        const prettifiedCSSSize = bytes$1(renderedCSSSize, {
-                            space: false
-                        });
-                        log.ok`**${filename}**${' '.repeat(col1Width - filename.length - 2)}${prettifiedCSSSize.padStart(col2Width)}`;
-                        resolve();
-                    });
-                })));
-            const renderTime = process.hrtime(renderStart);
-            if (options.analyze) {
-                log`${' '.repeat(col1Width)}${'(Brotli)'.padStart(col2Width)}`;
-                log``;
-                log.success`**${sourcePaths.length}** files analyzed in ${prettyHartime(renderTime).replace(' ', '')}`;
-                log``;
-                log.i`The CSS output will be smaller because it doesn't yet consider the bytes shared with HTML.`;
-            } else {
-                log`${' '.repeat(col1Width)}${'(Raw)'.padStart(col2Width)}`;
-                log``;
-                log.success`**${sourcePaths.length}** files rendered in ${prettyHartime(renderTime).replace(' ', '')}`;
-            }
-        } else {
-            log.i`No **${filePatterns}** files found`;
-        }
-    }));
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const pkg = readJSONFileSync(resolve(__dirname, '../../package.json'));
-const program = new Command();
-program.name(pkg.name).description(pkg.description).version(pkg.version || '0.0.0');
-commandExtract(program);
-commandRender(program);
-program.parse();
+runProgram();

package/dist/commands/extract.mjs

@@ -0,0 +1,73 @@
+import log from '@techor/log';
+
+var commandExtract = ((program)=>program.command('extract').argument('[source paths]', 'The glob pattern path to extract sources').option('-w, --watch', 'Watch file changed and generate CSS rules.').option('-o, --output <path>', 'Specify your CSS file output path').option('-v, --verbose <level>', 'Verbose logging 0~N', '1').option('--no-export', 'Print only CSS results.').option('--options <path>', 'Specify your extractor options sources', 'master.css-extractor').action(async function(specifiedSourcePaths, options) {
+        const { CSSExtractor } = await import('@master/css-extractor');
+        const { watch, output, verbose, cwd, options: customOptions } = options || {};
+        const extractor = new CSSExtractor(customOptions, cwd);
+        extractor.on('init', (options)=>{
+            if (specifiedSourcePaths?.length) {
+                options.include = [];
+                options.exclude = [];
+            } else {
+                if (!options.exclude?.includes('**/node_modules/**')) {
+                    options.exclude?.push('**/node_modules/**');
+                }
+                if (!options.exclude?.includes('node_modules')) {
+                    options.exclude?.push('node_modules');
+                }
+            }
+            options.output = output;
+            options.verbose = verbose ? +verbose : options.verbose;
+        });
+        extractor.init();
+        const insert = async ()=>{
+            /**
+             * true: Ignore `.include` and `.exclude` when specifying sources explicitly.
+             * else: Insert according to the source of `.include` - `.exclude`.
+             */ if (specifiedSourcePaths?.length) {
+                await extractor.insertFiles(specifiedSourcePaths);
+            } else {
+                await extractor.insertFiles(extractor.allowedSourcePaths);
+            }
+        };
+        if (watch) {
+            const reset = async ()=>{
+                await insert();
+                /* If the specified source does not exist, watch the .include - .exclude */ if (!specifiedSourcePaths?.length && extractor.options.include) {
+                    await extractor.watchSource(extractor.options.include, {
+                        ignored: extractor.options.exclude
+                    });
+                }
+            };
+            extractor.on('watchStart', async ()=>{
+                await extractor.prepare();
+                await reset();
+                log``;
+                log.t`Start watching source changes`;
+            }).on('reset', async ()=>{
+                await reset();
+                log``;
+                log.t`Restart watching source changes`;
+            }).on('change', ()=>{
+                if (options?.export) {
+                    extractor.export();
+                } else {
+                    console.log(extractor.css.text);
+                }
+            }).on('watchClose', ()=>{
+                log``;
+                log.t`Stop watching source changes`;
+            });
+            await extractor.startWatch();
+        } else {
+            await extractor.prepare();
+            await insert();
+            if (options?.export) {
+                extractor.export();
+            } else {
+                console.log(extractor.css.text);
+            }
+        }
+    }));
+
+export { commandExtract as default };

package/dist/commands/render.mjs

@@ -0,0 +1,66 @@
+import log from '@techor/log';
+import prettyHartime from 'pretty-hrtime';
+import { explorePathsSync } from '@techor/glob';
+import exploreConfig from 'explore-config';
+import { readFile, writeFileSync } from 'fs';
+import { brotliCompressSync } from 'zlib';
+import bytes from 'bytes';
+
+var commandRender = ((program)=>program.command('render').description('Scans HTML and injects generated CSS rules').argument('<source paths>', 'The path in glob patterns of the source of the HTML file').option('-c --config <path>', 'The source path of the Master CSS configuration', 'master.css').option('-a --analyze', 'Analyze injected CSS and HTML size ( brotli ) without writing to file').action(async function(filePatterns, options = {
+        config: 'master.css'
+    }) {
+        const { render } = await import('@master/css-server');
+        const sourcePaths = explorePathsSync(filePatterns);
+        if (sourcePaths.length) {
+            const renderStart = process.hrtime();
+            const col1Width = Math.max(sourcePaths.reduce((max, current)=>{
+                if (current.length > max.length) {
+                    return current;
+                } else {
+                    return max;
+                }
+            }).length + 10, 20);
+            const col2Width = 8;
+            const config = typeof options.config === 'string' ? exploreConfig(options.config, {
+                found: (basename)=>log.i`Loaded **${basename}**`
+            }) : undefined;
+            log``;
+            log`${'  Source Files'.padEnd(col1Width)}${'CSS Size'.padStart(col2Width)}`;
+            await Promise.all(sourcePaths.map(async (filename)=>new Promise((resolve, reject)=>{
+                    readFile(filename, {
+                        encoding: 'utf-8'
+                    }, (err, content)=>{
+                        if (err) reject(err);
+                        const { html, css } = render(content, config);
+                        const renderedCSSText = css?.text;
+                        const renderedCSSSize = renderedCSSText ? options.analyze ? brotliCompressSync(renderedCSSText).length : renderedCSSText.length : 0;
+                        if (!options.analyze) {
+                            if (content !== html) {
+                                writeFileSync(filename, html);
+                            }
+                        }
+                        const prettifiedCSSSize = bytes(renderedCSSSize, {
+                            space: false
+                        });
+                        log.ok`**${filename}**${' '.repeat(col1Width - filename.length - 2)}${prettifiedCSSSize.padStart(col2Width)}`;
+                        resolve();
+                    });
+                })));
+            const renderTime = process.hrtime(renderStart);
+            if (options.analyze) {
+                log`${' '.repeat(col1Width)}${'(Brotli)'.padStart(col2Width)}`;
+                log``;
+                log.success`**${sourcePaths.length}** files analyzed in ${prettyHartime(renderTime).replace(' ', '')}`;
+                log``;
+                log.i`The CSS output will be smaller because it doesn't yet consider the bytes shared with HTML.`;
+            } else {
+                log`${' '.repeat(col1Width)}${'(Raw)'.padStart(col2Width)}`;
+                log``;
+                log.success`**${sourcePaths.length}** files rendered in ${prettyHartime(renderTime).replace(' ', '')}`;
+            }
+        } else {
+            log.i`No **${filePatterns}** files found`;
+        }
+    }));
+
+export { commandRender as default };

package/dist/core.mjs

@@ -0,0 +1,21 @@
+import { resolve } from 'node:path';
+import { Command } from 'commander';
+import { readJSONFileSync } from '@techor/fs';
+import { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import commandExtract from './commands/extract.mjs';
+import commandRender from './commands/render.mjs';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const pkg = readJSONFileSync(resolve(__dirname, '../package.json'));
+function runProgram(argv = process.argv) {
+    const program = new Command();
+    program.name(pkg.name).description(pkg.description).version(pkg.version || '0.0.0');
+    commandExtract(program);
+    commandRender(program);
+    program.parse(argv);
+    return program;
+}
+
+export { runProgram as default };

package/package.json

@@ -1 +1 @@
-{"name":"@master/css-cli","scripts":{"build":"techor build","dev":"pnpm build --watch","lint":"eslint ./src","type-check":"tsc --noEmit","test":"jest"},"type":"module","license":"MIT","description":"Master CSS CLI","author":"Aoyue Design LLC.","funding":"https://css.master.co/docs/donate","homepage":"https://css.master.co","bugs":{"url":"https://github.com/master-co/css/issues"},"repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/cli"},"keywords":["cli","css","mastercss"],"bin":{"mcss":"./dist/bin/index.mjs","mastercss":"./dist/bin/index.mjs"},"files":["dist"],"publishConfig":{"access":"public"},"dependencies":{"@master/css":"^2.0.0-rc.17","@master/css-extractor":"^2.0.0-rc.17","@master/css-server":"^2.0.0-rc.17","@techor/extend":"^3.0.11","@techor/fs":"^3.0.11","@techor/glob":"^3.0.11","@techor/log":"^3.0.11","chokidar":"^3.5.3","commander":"^12.0.0","explore-config":"^3.0.11","minimatch":"^9.0.1","pretty-hrtime":"^1.0.3"},"devDependencies":{"@types/pretty-hrtime":"^1.0.3","fast-glob":"^3.3.2"},"version":"2.0.0-rc.17"}
+{"name":"@master/css-cli","scripts":{"build":"techor build \"src/**/*.ts\" --formats esm","dev":"pnpm build --watch","lint":"eslint ./src","type-check":"tsc --noEmit","test":"jest"},"type":"module","license":"MIT","description":"Master CSS CLI","author":"Aoyue Design LLC.","funding":"https://css.master.co/docs/donate","homepage":"https://css.master.co","bugs":{"url":"https://github.com/master-co/css/issues"},"repository":{"type":"git","url":"https://github.com/master-co/css.git","directory":"packages/cli"},"keywords":["cli","css","mastercss"],"bin":{"mcss":"./dist/bin/index.mjs","mastercss":"./dist/bin/index.mjs"},"files":["dist"],"publishConfig":{"access":"public","provenance":true},"dependencies":{"@master/css":"^2.0.0-rc.19","@master/css-extractor":"^2.0.0-rc.19","@master/css-server":"^2.0.0-rc.19","@techor/extend":"^3.0.16","@techor/fs":"^3.0.16","@techor/glob":"^3.0.16","@techor/log":"^3.0.16","bytes":"^3.1.2","chokidar":"^3.6.0","commander":"^12.0.0","explore-config":"^3.0.16","minimatch":"^9.0.3","pretty-hrtime":"^1.0.3"},"devDependencies":{"@types/pretty-hrtime":"^1.0.3","fast-glob":"^3.3.2"},"version":"2.0.0-rc.19"}