@adamlui/scss-to-css 2.3.0 → 2.4.0

package/README.md

@@ -29,12 +29,12 @@
 
 ### Recursively compile all SCSS files into minified CSS
 
-<a href="https://www.npmjs.com/package/@adamlui/scss-to-css">
+<a href="https://npmstar.com/compare/@adamlui%2Fscss-to-css">
     <img height=31 src="https://img.shields.io/npm/dm/%40adamlui%2Fscss-to-css?logo=npm&color=af68ff&logoColor=white&labelColor=464646&style=for-the-badge"></a>
 <a href="#%EF%B8%8F-mit-license">
     <img height=31 src="https://img.shields.io/badge/License-MIT-orange.svg?logo=internetarchive&logoColor=white&labelColor=464646&style=for-the-badge"></a>
-<a href="https://github.com/adamlui/js-utils/releases/tag/scss-to-css-2.3.0">
-    <img height=31 src="https://img.shields.io/badge/Latest_Build-2.3.0-44cc11.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
+<a href="https://github.com/adamlui/js-utils/releases/tag/scss-to-css-2.4.0">
+    <img height=31 src="https://img.shields.io/badge/Latest_Build-2.4.0-44cc11.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
 <a href="https://www.npmjs.com/package/@adamlui/scss-to-css?activeTab=code">
     <img height=31 src="https://img.shields.io/npm/unpacked-size/%40adamlui%2Fscss-to-css?style=for-the-badge&logo=ebox&logoColor=white&color=blue&labelColor=464646"></a>
 <a href="https://sonarcloud.io/component_measures?metric=new_vulnerabilities&id=adamlui_scss-to-css:src/scss-to-css.js">
@@ -80,7 +80,7 @@ $ scss-to-css
 
 Sample output:
 
-<img src="https://cdn.jsdelivr.net/gh/adamlui/scss-to-css@b74edea/node.js/media/images/screenshots/cli/scss-to-css-docs-cmd-output.png">
+<img src="https://cdn.jsdelivr.net/gh/adamlui/scss-to-css@fe2867e/assets/images/screenshots/cli/scss-to-css-docs-cmd-output.png">
 
 **📝 Note:** Source maps are also generated by default unless `-S` or `--no-source-maps` is passed.
 

package/dist/cli/index.js

@@ -3,19 +3,15 @@
 (async () => {
     'use strict'
 
-    globalThis.env = {
-        args: process.argv.slice(2),
-        modes: { dev: /[\\/]src(?:[\\/]|$)/i.test(__dirname) },
-        paths: { lib: './lib' }
-    }
-    env.modes.debug = env.args.some(arg => /^--?(?:V|debug(?:[-_]?mode)?)$/.test(arg))
+    // Init ENV
+    const init = require('./lib/init')
+    init.env()
 
     // Import LIBS
-    globalThis.log = require(`${env.paths.lib}/log`)
-    const compile = require(`${env.paths.lib}/compile`),
+    globalThis.log = require('./lib/log')
+    const compile = require('./lib/compile'),
         { findSCSS } = require('../scss-to-css'),
           fs = require('fs'),
-          init = require(`${env.paths.lib}/init`),
           path = require('path')
 
     await init.cli()

package/dist/cli/lib/init.js

@@ -1,12 +1,10 @@
 const language = require('./language'),
       settings = require('./settings')
 
-const dataPath = `../../${ env.modes.dev ? '../' : 'data/' }`
-
 module.exports = {
 
     async cli() {
-        Object.assign(globalThis.cli ??= {}, require(`${dataPath}package-data.json`))
+        Object.assign(globalThis.cli ??= {}, require(`${env.paths.libData}/package-data.json`))
         cli.msgs = await language.getMsgs('en')
         cli.msgs = await language.getMsgs(cli.lang = settings.load('uiLang') || (
             env.modes.debug ? language.generateRandomLang({ excludes: ['en'] }) : language.getSysLang() ))
@@ -27,11 +25,11 @@ module.exports = {
 
         if (fs.existsSync(paths.target)) // use existing config file
             return log.warn(`${cli.msgs.warn_configFileExists}:`, paths.target)
-        if (fs.existsSync(paths.src = path.resolve(__dirname, `${dataPath}${filename}`)))
+        if (fs.existsSync(paths.src = path.resolve(__dirname, `${env.paths.libData}/${filename}`)))
             fs.copyFileSync(paths.src, paths.target) // use found template
 
         else { // use jsDelivr copy
-            const jsdURL = `${require('./jsdelivr').pkgVerURL()}/${filename}/`
+            const jsdURL = `${require('./jsdelivr').getPkgVerURL()}/${filename}`
             log.data(`${cli.msgs.info_fetchingRemoteConfigFrom} ${jsdURL}...`)
             try {
                 const data = require('./data'),
@@ -45,5 +43,15 @@ module.exports = {
         log.success(`${cli.msgs.info_configFileCreated}: ${paths.target}\n`)
         log.tip(`${cli.msgs.tip_editToSetDefaults}.`)
         log.tip(`${cli.msgs.tip_cliArgsPrioritized}.`)
+    },
+
+    env() {
+        Object.assign(globalThis.env ??= {}, {
+            args: process.argv.slice(2),
+            modes: { dev: /[\\/]src(?:[\\/]|$)/i.test(__dirname) },
+            supports: { unicode: require('is-unicode-supported').default() }
+        })
+        env.modes.debug = env.args.some(arg => /^--?(?:V|debug(?:[-_]?mode)?)$/.test(arg))
+        env.paths = { libData: `../../${ env.modes.dev ? '..' : 'data' }` }
     }
 }

package/dist/cli/lib/jsdelivr.js

@@ -1,10 +1,10 @@
 module.exports = {
 
-    pkgVerURL(version) {
+    getPkgVerURL(version) {
         version ||= cli.version ||= require('./pkg').getVer('local') || 'none'
         const verTag = !/^\d+\.\d+\.\d+$/.test(version) ? 'latest' : `v${version}`
-        return `${cli.urls.jsdelivr}@${verTag}`
+        return `${cli.urls.jsdelivr.pkg}@${verTag}`
     },
 
-    commitURL(hash = 'latest') { return `${cli.urls.jsdelivr}@${hash}` }
+    getCommitURL(hash = 'latest') { return `${cli.urls.jsdelivr.pkg}@${hash}` }
 }

package/dist/cli/lib/language.js

@@ -13,13 +13,13 @@ module.exports = {
         let locales = includes.length ? includes : (() => {
 
             // Read cache if found
-            const cacheDir = path.join(__dirname, '..', '.cache'),
+            const cacheDir = path.join(__dirname, '../../.cache'),
                   localeCache = path.join(cacheDir, 'locales.json')
             if (fs.existsSync(localeCache))
                 try { return JSON.parse(fs.readFileSync(localeCache, 'utf8')) } catch (err) {}
 
             // Discover pkg _locales
-            const localesDir = path.resolve(process.cwd(), '_locales')
+            const localesDir = path.resolve(__dirname, '../../../_locales')
             if (!fs.existsSync(localesDir)) return ['en']
             const locales = fs.readdirSync(localesDir, { withFileTypes: true })
                 .filter(entry => entry.isDirectory()).map(entry => entry.name)
@@ -37,9 +37,7 @@ module.exports = {
         locales = locales.filter(locale => !excludeSet.has(locale))
 
         // Get random language
-        let randomLang = 'en'
-        if (locales.length)
-            randomLang = locales[Math.floor(Math.random() * locales.length)]
+        const randomLang = locales.length ? locales[Math.floor(Math.random() * locales.length)] : 'en'
         log.debug(`Random language: ${randomLang}`)
 
         return randomLang
@@ -47,7 +45,7 @@ module.exports = {
 
     async getDocLocales() {
         cli.version ||= require('./pkg').getVer('local') || 'none'
-        const jsdURL = `${require('./jsdelivr').pkgVerURL()}/docs/`,
+        const jsdURL = `${require('./jsdelivr').getPkgVerURL()}/docs/`,
               locales = []
         try {
             const respText = await (await data.fetch(jsdURL)).text(),
@@ -64,20 +62,29 @@ module.exports = {
         if (env.msgs && langCode == cli.lang) return env.msgs // don't re-fetch same msgs
 
         let msgs = data.flatten( // local ones
-            require(`../../${ env.modes.dev ? '../_locales/en/' : 'data/' }messages.json`))
+            require(`../../${ env.modes.dev ? '../_locales/en' : 'data' }/messages.json`))
 
         if (!langCode.startsWith('en')) { // fetch non-English msgs from jsDelivr
-            const msgHostURL = `${require('./jsdelivr').commitURL(cli.commitHashes.locales)}/_locales/`
-            let msgHref = `${msgHostURL}${langCode}/messages.json`, msgFetchesTried = 0
+            try { // check if terminal supports non-Latin scripts
+                const nonLatinLocales = await (await data.fetch(
+                    `${cli.urls.jsdelivr}@${cli.commitHashes.data}/assets/data/non-latin-locales.json`
+                )).json()
+                if (nonLatinLocales.includes(langCode.split('-')[0]) && !env.supports.unicode)
+                    return msgs // en ones
+            } catch (err) {
+                log.debug(`Failed to fetch non-Latin locales: ${err}`)
+            }
+            const msgBaseURL = `${require('./jsdelivr').getCommitURL(cli.commitHashes.locales)}/_locales`
+            let msgURL = `${msgBaseURL}/${langCode}/messages.json`, msgFetchesTried = 0
             while (msgFetchesTried < 3)
                 try { // fetch remote msgs
-                    msgs = data.flatten(await (await data.fetch(msgHref)).json())
+                    msgs = data.flatten(await (await data.fetch(msgURL)).json())
                     break
                 } catch (err) { // retry up to 2X (region-stripped + EN)
                     msgFetchesTried++ ; if (msgFetchesTried >= 3) break
-                    log.debug(msgHref = langCode.includes('-') && msgFetchesTried == 1 ?
-                        msgHref.replace(/([^_]*)_[^/]*(\/.*)/, '$1$2') // strip region before retrying
-                            : `${msgHostURL}en/messages.json` // else use EN msgs
+                    log.debug(msgURL = langCode.includes('-') && msgFetchesTried == 1 ?
+                        msgURL.replace(/([^_]*)_[^/]*(\/.*)/, '$1$2') // strip region before retrying
+                            : `${msgBaseURL}/en/messages.json` // else use EN msgs
                     )
                 }
         }

package/dist/cli/lib/log.js

@@ -1,5 +1,6 @@
 const colors = require('./color'),
     { getDownloads, getVer } = require('./pkg'),
+      settings = require('./settings'),
       string = require('./string')
 
 const nextMajVer = require('../../../package.json').version.replace(/^(\d+)\..*/, (_, major) => `${ +major +1 }.0.0`)
@@ -7,6 +8,7 @@ const nextMajVer = require('../../../package.json').version.replace(/^(\d+)\..*/
 module.exports = {
     colors,
 
+    break() { console.log() },
     configURL() { this.info(`${cli.msgs.info_exampleValidConfigFile}: ${cli.urls.config}`) },
     configURLandExit(...args) { this.error(...args); this.configURL(); process.exit(1) },
     data(msg) { console.log(`\n${colors.bw}${msg}${colors.nc}`) },
@@ -15,9 +17,8 @@ module.exports = {
     errorAndExit(...args) { this.error(...args); this.helpDocsCmdsDocsURL(); process.exit(1) },
     ifNotQuiet(msg) { if (!cli.config.quietMode) this.info(msg) },
     info(msg) { console.info(`\n${colors.schemes.default[0]}${msg}${colors.nc}`) },
-    break() { console.log() },
-    tip(msg) { console.info(`${colors.by}TIP: ${msg}${colors.nc}`) },
     success(msg) { console.log(`\n${colors.bg}${msg}${colors.nc}`) },
+    tip(msg) { console.info(`${colors.by}TIP: ${msg}${colors.nc}`) },
     warn(...args) { console.warn(`\n${colors.bo}WARNING:`, ...args, colors.nc) },
 
     argDoesNothing(arg) {
@@ -30,11 +31,10 @@ module.exports = {
             this.warn(
                 `${cli.msgs.info_configFile} ${cli.msgs.warn_option.toLowerCase()} '${oldKey}: ${oldVal}' ${
                    cli.msgs.warn_hasBeenReplacedBy} '${
-                       newKey}: ${ isNegKey(oldKey) != isNegKey(newKey) ? !oldVal : oldVal }' ${
+                       newKey}: ${ settings.isNegKey(oldKey) != settings.isNegKey(newKey) ? !oldVal : oldVal }' ${
                    cli.msgs.warn_andWillBeRemoved} @ v${nextMajVer}`
             )
             this[`${oldKey}Warned`] = true
-            function isNegKey(key) { return /^(?:no|disable|exclude)[A-Z]/.test(key) }
         }
     },
 

package/dist/cli/lib/settings.js

@@ -43,12 +43,14 @@ module.exports = {
             type: 'cmd', regex: /^--?stats?$/ }
     },
 
+    isNegKey(key) { return /^(?:no|disable|exclude)[A-Z]/.test(key) },
+
     load(ctrlKeys = Object.keys(this.controls)) {
         const inputCtrlKeys = [].concat(ctrlKeys) // force array
 
         if (!cli.defaultsSet && !arguments.length) { // init all defaults on arg-less load()
             inputCtrlKeys.forEach(key => {
-                const ctrl = this.controls[key] ; if (ctrl.mode || ctrl.type == 'legacy') return
+                const ctrl = this.controls[key] ; if (ctrl.mode || key.startsWith('legacy_')) return
                 cli.config[key] ??= ctrl.defaultVal ?? ( ctrl.type == 'param' ? '' : false )
             })
             cli.defaultsSet = true
@@ -87,8 +89,8 @@ module.exports = {
                         if (this.configFileKeyWhitelist && !this.configFileKeyWhitelist.includes(key))
                             log.invalidConfigKey(key)
                         return
-                    } else if (ctrl.type == 'legacy' && ctrl.replacedBy) {
-                        if (key.toLowerCase().includes('no') != ctrl.replacedBy.toLowerCase().includes('no'))
+                    } else if (key.startsWith('legacy_') && ctrl.replacedBy) {
+                        if (this.isNegKey(key) != this.isNegKey(ctrl.replacedBy))
                             cli.config[ctrl.replacedBy] = !val  // assign opposite val to current key
                         else // assign direct val to current key
                             cli.config[ctrl.replacedBy] = val
@@ -106,8 +108,8 @@ module.exports = {
             const ctrlKey = Object.keys(this.controls).find(key => this.controls[key]?.regex?.test(arg))
             if (!ctrlKey && cli.msgs) log.errorAndExit(`[${arg}] ${cli.msgs.error_notRecognized}.`)
             if (!inputCtrlKeys.includes(ctrlKey)) return // don't process env.args when load() specific keys
+            if (ctrlKey.startsWith('legacy_')) { log.argDoesNothing(arg) ; continue }
             const ctrl = this.controls[ctrlKey]
-            if (ctrl.type == 'legacy') { log.argDoesNothing(arg) ; continue }
             if (ctrl.mode) // set cli.config.mode to mode name
                 cli.config.mode = ctrlKey.replace(/mode$/i, '').toLowerCase()
             else { // init flag/param/cmd cli.config[ctrlKey] val

package/dist/data/package-data.json

@@ -8,11 +8,15 @@
     "config": "https://github.com/adamlui/scss-to-css/blob/main/scss-to-css.config.mjs",
     "docs": "https://github.com/adamlui/scss-to-css/tree/main/docs",
     "github": "https://github.com/adamlui/scss-to-css",
-    "jsdelivr": "https://cdn.jsdelivr.net/gh/adamlui/scss-to-css",
+    "jsdelivr": {
+      "jsutils": "https://cdn.jsdelivr.net/gh/adamlui/js-utils",
+      "pkg": "https://cdn.jsdelivr.net/gh/adamlui/scss-to-css"
+    },
     "npm": "https://www.npmjs.com/package/@adamlui/scss-to-css",
     "src": "https://github.com/adamlui/scss-to-css/tree/main/src"
   },
   "commitHashes": {
-    "locales": "0da06d6"
+    "data": "92f4d1b",
+    "locales": "fd35208"
   }
 }

package/dist/scss-to-css.js

@@ -7,7 +7,7 @@ const fs = require('fs'),
       sass = require('sass')
 
 Object.assign(globalThis.api ??= {},
-    require(`${ /[\\/]src(?:[\\/]|$)/i.test(__dirname) ? '../' : './data/' }package-data.json`))
+    require(`${ /[\\/]src(?:[\\/]|$)/i.test(__dirname) ? '..' : './data' }/package-data.json`))
 api.regex = {
     compile: /^(?:build|comp(?:ile|ress)|minify)$/i,
     findSCSS: /^(?:find|search)(?:scss)?$/i
@@ -50,9 +50,9 @@ function findSCSS(searchDir, options = {}) {
         _log.info('Searching for files...')
     dirFiles.forEach(file => {
         const filePath = path.resolve(searchDir, file)
-        const shouldIgnore = options.ignores.some(ignore => {
+        const shouldIgnore = options.ignores?.length && options.ignores.filter(Boolean).some(ignore => {
             ignore = ignore.replace(/\/$/, '')
-            return file == ignore || filePath.split(path.sep).some(part => part == ignore)
+            return file == ignore || filePath.split(path.sep).includes(ignore)
         })
         if (shouldIgnore) {
             if (options.verbose) _log.info(`** ${file} ignored`)

package/docs/README.md

@@ -29,12 +29,12 @@
 
 ### Recursively compile all SCSS files into minified CSS
 
-<a href="https://www.npmjs.com/package/@adamlui/scss-to-css">
+<a href="https://npmstar.com/compare/@adamlui%2Fscss-to-css">
     <img height=31 src="https://img.shields.io/npm/dm/%40adamlui%2Fscss-to-css?logo=npm&color=af68ff&logoColor=white&labelColor=464646&style=for-the-badge"></a>
 <a href="#%EF%B8%8F-mit-license">
     <img height=31 src="https://img.shields.io/badge/License-MIT-orange.svg?logo=internetarchive&logoColor=white&labelColor=464646&style=for-the-badge"></a>
-<a href="https://github.com/adamlui/js-utils/releases/tag/scss-to-css-2.3.0">
-    <img height=31 src="https://img.shields.io/badge/Latest_Build-2.3.0-44cc11.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
+<a href="https://github.com/adamlui/js-utils/releases/tag/scss-to-css-2.4.0">
+    <img height=31 src="https://img.shields.io/badge/Latest_Build-2.4.0-44cc11.svg?logo=icinga&logoColor=white&labelColor=464646&style=for-the-badge"></a>
 <a href="https://www.npmjs.com/package/@adamlui/scss-to-css?activeTab=code">
     <img height=31 src="https://img.shields.io/npm/unpacked-size/%40adamlui%2Fscss-to-css?style=for-the-badge&logo=ebox&logoColor=white&color=blue&labelColor=464646"></a>
 <a href="https://sonarcloud.io/component_measures?metric=new_vulnerabilities&id=adamlui_scss-to-css:src/scss-to-css.js">
@@ -80,7 +80,7 @@ $ scss-to-css
 
 Sample output:
 
-<img src="https://cdn.jsdelivr.net/gh/adamlui/scss-to-css@b74edea/node.js/media/images/screenshots/cli/scss-to-css-docs-cmd-output.png">
+<img src="https://cdn.jsdelivr.net/gh/adamlui/scss-to-css@fe2867e/assets/images/screenshots/cli/scss-to-css-docs-cmd-output.png">
 
 **📝 Note:** Source maps are also generated by default unless `-S` or `--no-source-maps` is passed.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adamlui/scss-to-css",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Recursively compile all SCSS files into minified CSS",
   "author": {
     "name": "Adam Lui",
@@ -34,8 +34,8 @@
     "!docs/*/"
   ],
   "bin": {
-    "scsstocss": "dist/cli/index.js",
-    "scss-to-css": "dist/cli/index.js"
+    "scss-to-css": "dist/cli/index.js",
+    "scsstocss": "dist/cli/index.js"
   },
   "directories": {
     "lib": "./dist",
@@ -79,6 +79,7 @@
     "url": "https://github.com/adamlui/scss-to-css/issues"
   },
   "dependencies": {
+    "is-unicode-supported": "^2.1.0",
     "node-clipboardy": "^1.0.3",
     "sass": "^1.97.3"
   },