@jamesblanksby/toolkit 1.2.0 → 1.4.0

package/build/sass.js

@@ -1,76 +1,69 @@
 import fs from 'fs/promises';
 import path from 'path';
+import url from 'url';
 
 import * as sass from 'sass';
 
 import { MemoryFile } from './../src/file.js';
 
-let sassPath = null;
+async function findMainPaths(source) {
+    const partialDir = path.dirname(source);
 
-async function findMainPath(partialPath) {
-    const partialDir = path.dirname(partialPath);
-
-    async function findMainPathRec(directory) {
+    async function findMainPathsRec(directory, matches = []) {
         const files = await fs.readdir(directory);
 
-        const mainPath = files.find((file) => !file.startsWith('_') && file.endsWith('.scss'));
-        if (mainPath) {
-            return path.join(directory, mainPath);
-        }
+        const matchedFiles = files.filter((file) => !file.startsWith('_') && file.endsWith('.scss'));
+        const fullPaths = matchedFiles.map((file) => path.join(directory, file));
+
+        matches.push(...fullPaths);
 
         const parentDir = path.dirname(directory);
         if (parentDir !== directory) {
-            return findMainPathRec(parentDir);
+            return findMainPathsRec(parentDir, matches);
         }
 
-        return null;
+        return matches;
     }
 
-    return findMainPathRec(partialDir);
+    return findMainPathsRec(partialDir);
 }
 
-function createCssFile(css, target) {
-    return new MemoryFile(target, css);
-}
+async function createCssAndMapFile(css, map, source) {
+    const cssPath = source.replace(/sass|scss/g, 'css');
+    const mapPath = `${cssPath}.map`;
+    const mapName = path.basename(mapPath);
 
-async function createMapFile(map, target) {
-    const sassDir = path.resolve(sassPath, './../..');
+    const file = new MemoryFile(cssPath, [
+        css,
+        `/*# sourceMappingURL=${mapName} */`,
+    ].join('\n'));
 
+    const sassDir = path.resolve(source, './../..');
     map.sources = map.sources.map((source) => source.replace(`file://${sassDir}`, '..'));
 
-    await fs.writeFile(target, JSON.stringify(map));
-}
-
-async function createCssFileWithMap(file, source) {
-    const mapName = path.basename(source);
-
-    file = await file.read();
-
-    file = new MemoryFile(file.path, [
-        file.contents,
-        `/*# sourceMappingURL=${mapName} */`,
-    ].join('\n'));
+    await fs.writeFile(mapPath, JSON.stringify(map));
 
     return file;
 }
 
 export default async function* sassCompile(files) {
     for await (const file of files) {
-        sassPath = await findMainPath(file.path);
-
-        let result;
-        try {
-            result = sass.compile(sassPath, { sourceMap: true, });
-        } catch (error) {
-            throw error.message;
+        const sassPaths = await findMainPaths(file.path);
+
+        const modulesDir = path.resolve(path.dirname(url.fileURLToPath(import.meta.url)), './../../..');
+
+        for (const sassPath of sassPaths) {
+            let result;
+            try {
+                result = sass.compile(sassPath, {
+                    loadPaths: [modulesDir,],
+                    sourceMap: true,
+                });
+            } catch (error) {
+                throw new Error(error.message);
+            }
+
+            yield await createCssAndMapFile(result.css, result.sourceMap, sassPath);
         }
-
-        const cssPath = sassPath.replace(/sass|scss/g, 'css');
-        let cssFile = createCssFile(result.css, cssPath);
-
-        const mapPath = `${cssPath}.map`;
-        await createMapFile(result.sourceMap, mapPath);
-
-        yield await createCssFileWithMap(cssFile, mapPath);
     }
 }

package/build/script.js

@@ -6,11 +6,14 @@ import uglifyjs from 'uglify-js';
 
 import { MemoryFile } from './../src/file.js';
 
+const { PWD, } = process.env;
+
 async function scriptLint(files) {
     const configDir = path.dirname(url.fileURLToPath(import.meta.url));
 
     const eslint = new ESLint({
-        overrideConfigFile: `${configDir}/../.eslintrc.json`,
+        cwd: PWD,
+        overrideConfigFile: `${configDir}/../eslint.config.mjs`,
     });
 
     let results = [];
@@ -19,7 +22,7 @@ async function scriptLint(files) {
         file = await file.read();
 
         const fileResult = await eslint.lintText(file.contents, { filePath: file.path, });
-        results = results.concat(fileResult);
+        results.push(...fileResult);
     }
 
     const formatter = await eslint.loadFormatter();

package/eslint.config.mjs

@@ -0,0 +1,36 @@
+import globals from 'globals';
+import path from 'node:path';
+import { fileURLToPath } from 'node:url';
+import js from '@eslint/js';
+import { FlatCompat } from '@eslint/eslintrc';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+    baseDirectory: __dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [...compat.extends('eslint:recommended'), {
+    ignores: [
+        'node_modules/*',
+    ],
+    
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.jquery,
+            ...globals.node,
+        },
+
+        ecmaVersion: 'latest',
+        sourceType: 'module',
+    },
+
+    rules: {
+        'no-async-promise-executor': 'off',
+        'no-empty': 'off',
+        'no-unused-vars': 'warn',
+    },
+}];

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jamesblanksby/toolkit",
-    "version": "1.2.0",
+    "version": "1.4.0",
     "main": "index.js",
     "repository": {
         "type": "git",

package/toolkit.config.js

@@ -13,8 +13,8 @@ const { PWD, } = process.env;
 const pattern = {
     html: `${PWD}/**/*.{html,php}`,
     sass: `${PWD}/**/{sass,scss}/**/*.{sass,scss}`,
-    css: `${PWD}/**/css/*.css`,
-    script: `${PWD}/**/script/*.js`,
+    css: `${PWD}/**/css/**/*.css`,
+    script: `${PWD}/**/script/**/*.js`,
 };
 
 function sync() {

package/.eslintrc.json

@@ -1,18 +0,0 @@
-{
-    "env": {
-        "browser": true,
-        "es2021": true,
-        "jquery": true,
-        "node": true
-    },
-    "extends": "eslint:recommended",
-    "parserOptions": {
-        "ecmaVersion": "latest",
-        "sourceType": "module"
-    },
-    "rules": {
-        "no-async-promise-executor": "off",
-        "no-empty": "off",
-        "no-unused-vars": "warn"
-    }
-}