@awesomeness-js/utils 1.0.17 → 1.0.18

package/index.js

@@ -9,6 +9,8 @@ import _convertBytes from './src/convertBytes.js';
 import _each from './src/each.js';
 import _eachAsync from './src/eachAsync.js';
 import _getAllFiles from './src/getAllFiles.js';
+import _ignoreFolder_ignoreMe from './src/ignoreFolder/ignoreMe.js';
+import _ignoreMe from './src/ignoreMe.js';
 import _isUUID from './src/isUUID.js';
 import _md5 from './src/md5.js';
 import _setLocalEnvs from './src/setLocalEnvs.js';
@@ -31,6 +33,7 @@ export { _convertBytes as convertBytes };
 export { _each as each };
 export { _eachAsync as eachAsync };
 export { _getAllFiles as getAllFiles };
+export { _ignoreMe as ignoreMe };
 export { _isUUID as isUUID };
 export { _md5 as md5 };
 export { _setLocalEnvs as setLocalEnvs };
@@ -63,11 +66,15 @@ export default {
     each: _each,
     eachAsync: _eachAsync,
     getAllFiles: _getAllFiles,
+    ignoreMe: _ignoreMe,
     isUUID: _isUUID,
     md5: _md5,
     setLocalEnvs: _setLocalEnvs,
     toPennies: _toPennies,
     uuid: _uuid,
+    ignoreFolder: {
+        ignoreMe: _ignoreFolder_ignoreMe,
+    },
     utils: {
         buildExportsTree: _utils_buildExportsTree,
         buildFileDataList: _utils_buildFileDataList,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@awesomeness-js/utils",
-    "version": "1.0.17",
+    "version": "1.0.18",
     "description": "Awesomeness - Utils",
     "repository": {
       "type": "git",

package/src/getAllFiles.js

@@ -3,50 +3,46 @@ import { join } from 'path';
 import shouldIgnore from './utils/shouldIgnore.js';
 
 export default function getAllFiles(base, {
-	dir = '.',
-	files = [], 
-	ignore = [],
-	fileTypes = []
+    dir = '.',
+    files = [], 
+    ignore = [],
+    fileTypes = []
 } = {}) {
 
-	const directory = join(base, dir);
-	const normalizedDir = dir.replace(/\\/g, '/');
-
-	if (ignore.some(pattern => normalizedDir.startsWith(pattern.replace(/\/\*$/, '')))) {
-		return files;
-	}
-
-	const sortedFiles = readdirSync(directory).sort();
-
-	sortedFiles.forEach(file => {
-		
-		const fullPath = join(directory, file);
-		const relativePath = join(dir, file).replace(/\\/g, '/');
-		
-		if (shouldIgnore(relativePath, ignore)) {
-			return;
-		}
-
-		if (statSync(fullPath).isDirectory()) {
-
-			getAllFiles(base, {
-				dir: join(dir, file),
-				files, 
-				ignore
-			});
-
-		} else {
-
-			if(fileTypes.length > 0) {
-				if (!fileTypes.some(ext => file.endsWith(ext))) return;
-			}
-
-			files.push(relativePath);
-
-		}
-
-	});
-
-	return files;
-
-}
+    const directory = join(base, dir);
+
+    const sortedFiles = readdirSync(directory).sort();
+
+    sortedFiles.forEach(file => {
+        const fullPath = join(directory, file);
+        // 1) Generate the original "relative path"
+        const relativePath = join(dir, file).replace(/\\/g, '/');
+
+        // 2) Prepend a slash so patterns like "/css/*.js" will match "/css/some.js"
+        const pathForIgnore = '/' + relativePath.replace(/^\/*/, '');
+
+        // 3) Check with the leading slash path
+        if (shouldIgnore(pathForIgnore, ignore)) {
+            return;
+        }
+
+        // Recurse if it's a directory
+        if (statSync(fullPath).isDirectory()) {
+            getAllFiles(base, {
+                dir: join(dir, file),
+                files,
+                ignore,
+                fileTypes
+            });
+        } else {
+            // Filter by file types if specified
+            if (fileTypes.length > 0 && !fileTypes.some(ext => file.endsWith(ext))) {
+                return;
+            }
+            // 4) Store the original relative path (without leading slash) in `files` if you prefer
+            files.push(relativePath);
+        }
+    });
+
+    return files;
+}

package/src/utils/shouldIgnore.js

@@ -1,17 +1,43 @@
 export default function shouldIgnore(filePath, ignorePatterns) {
-    const ignore = ignorePatterns.some(pattern => {
-        const normalizedPath = filePath.replace(/\\/g, '/');
-        const normalizedPattern = pattern.replace(/\\/g, '/');
-        if (normalizedPath === normalizedPattern) return true;
+    // filePath is already something like "/css/some.js" 
+    return ignorePatterns.some(pattern => {
+        // pattern might be "/css/*.js" or "/ignoreFolder", etc.
+        let normalizedPattern = pattern.replace(/\\/g, '/');
+
+        // 1) Full directory ignore: "/ignoreFolder" => ignore "/ignoreFolder" + subdirectories
+        //    If the pattern ends with "/", treat it as a directory path.
+        if (!normalizedPattern.includes('*')) {
+            // e.g. "/ignoreFolder/"
+            if (normalizedPattern.endsWith('/')) {
+                normalizedPattern = normalizedPattern.slice(0, -1); // remove trailing slash
+            }
+            return filePath === normalizedPattern || filePath.startsWith(normalizedPattern + '/');
+        }
+
+        // 2) folder/* => Ignore all immediate children in that folder (no subfolders)
         if (normalizedPattern.endsWith('/*')) {
-            const baseDir = normalizedPattern.slice(0, -2);
-            return normalizedPath.startsWith(baseDir + '/');
+            const baseFolder = normalizedPattern.slice(0, -2); // e.g. "/css"
+            // e.g. filePath === "/css/some.js" => startsWith("/css/")
+            // But also ensure there's no further subfolder.
+            return filePath.startsWith(baseFolder + '/') &&
+                   !filePath.slice(baseFolder.length + 1).includes('/');
+        }
+
+        // 3) *.ext => extension-based ignore (any folder)
+        if (normalizedPattern.startsWith('*.')) {
+            const ext = normalizedPattern.slice(1); // remove '*'
+            return filePath.endsWith(ext);
         }
-        if (normalizedPattern.endsWith('/')) {
-            return normalizedPath === normalizedPattern.slice(0, -1) ||
-                   normalizedPath.startsWith(normalizedPattern);
+
+        // 4) folder/*.ext => only files with that extension in that folder (no subfolders)
+        if (normalizedPattern.includes('/*')) {
+            const [baseFolder, ext] = normalizedPattern.split('/*');
+            return filePath.startsWith(baseFolder + '/') &&
+                   filePath.endsWith(ext) &&
+                   !filePath.slice(baseFolder.length + 1).includes('/');
         }
-        return false;
+
+        // 5) Exact match
+        return filePath === normalizedPattern;
     });
-    return ignore;
-}
+}

package/test/ignoreFolder/ignoreMe.js

@@ -0,0 +1,3 @@
+export default function ignoreMeTest() {
+    console.log('I should not be in the build!');
+};

package/test/ignoreFolder2/ignoreMe.js

@@ -0,0 +1,3 @@
+export default function ignoreMeTest() {
+    console.log('I should not be in the build!');
+};

package/test/secret.test.js

@@ -0,0 +1 @@
+// just a test file to ignore

package/test.js

@@ -1,10 +1,17 @@
 import utils from './index.js';
 
-
-let fileList2 = utils.getAllFiles('./secrets', {
-    fileTypes: ['.env'],
-    ignore: ['dev.env']
-});
+let fileList2 = utils.getAllFiles('./test', {
+   // fileTypes: ['.css'],
+   // fileTypes: ['.js'],
+   ignore: [
+        "/ignoreFolder", 
+        "/ignoreFolder2/", 
+        "*.env",
+        "*.test.js",
+        "/css/*.js",
+        "/js/*.css"
+    ]
+})
 
 console.log({fileList2});
 

package/types/index.d.ts

@@ -9,6 +9,8 @@ import type _convertBytes from './convertBytes';
 import type _each from './each';
 import type _eachAsync from './eachAsync';
 import type _getAllFiles from './getAllFiles';
+import type _ignoreFolder_ignoreMe from './ignoreFolder/ignoreMe';
+import type _ignoreMe from './ignoreMe';
 import type _isUUID from './isUUID';
 import type _md5 from './md5';
 import type _setLocalEnvs from './setLocalEnvs';
@@ -31,6 +33,7 @@ export declare const convertBytes: typeof _convertBytes;
 export declare const each: typeof _each;
 export declare const eachAsync: typeof _eachAsync;
 export declare const getAllFiles: typeof _getAllFiles;
+export declare const ignoreMe: typeof _ignoreMe;
 export declare const isUUID: typeof _isUUID;
 export declare const md5: typeof _md5;
 export declare const setLocalEnvs: typeof _setLocalEnvs;
@@ -63,11 +66,15 @@ declare const _default: {
     each: typeof _each;
     eachAsync: typeof _eachAsync;
     getAllFiles: typeof _getAllFiles;
+    ignoreMe: typeof _ignoreMe;
     isUUID: typeof _isUUID;
     md5: typeof _md5;
     setLocalEnvs: typeof _setLocalEnvs;
     toPennies: typeof _toPennies;
     uuid: typeof _uuid;
+    ignoreFolder: {
+        ignoreMe: typeof _ignoreFolder_ignoreMe,
+    },
     utils: {
         buildExportsTree: typeof _utils_buildExportsTree,
         buildFileDataList: typeof _utils_buildFileDataList,