@awesomeness-js/utils 1.2.5 → 1.2.7

package/eslint.config.js

@@ -1,22 +1,33 @@
 export default [
-	// Here is where we fix "padding-line-between-statements"
 	{
 		rules: {
+			// Ignore ALL line-break rules around import statements ONLY
 			'padding-line-between-statements': [
 				'error',
-				// Insert a blank line **before** any block-like statement
+
+				// imports are exempt
+				{
+					blankLine: 'any',
+					prev: 'import',
+					next: '*' 
+				},
+				{
+					blankLine: 'any',
+					prev: '*',
+					next: 'import' 
+				},
+
+				// everything else still padded like before
 				{
 					blankLine: 'always',
 					prev: '*',
 					next: 'block-like' 
 				},
-				// Insert a blank line **after** any block-like statement
 				{
 					blankLine: 'always',
 					prev: 'block-like',
 					next: '*' 
 				},
-				// Keep the rest of your rules here as needed...
 				{
 					blankLine: 'always',
 					prev: '*',
@@ -33,6 +44,9 @@ export default [
 					next: 'throw' 
 				}
 			],
+
+			// ✅ This enforces ONE blank line at top + bottom of function bodies
+			// (and other normal blocks), matching your "inside curly braces" requirement.
 			'padded-blocks': [
 				'error',
 				{
@@ -42,24 +56,28 @@ export default [
 				}
 			],
 
-			"object-curly-newline": [
-				"error",
+			// Keep brace-newline rules, BUT disable them for imports only
+			'object-curly-newline': [
+				'error',
 				{
 					ObjectExpression: {
-						minProperties: 2,     // If object has 2+ props, break into multiple lines
+						minProperties: 2,
 						multiline: true,
 						consistent: true
 					},
-					// You can also configure ImportDeclaration, ExportDeclaration, etc.
 					ObjectPattern: {
-						multiline: true,
 						minProperties: 2,
+						multiline: true,
 						consistent: true
 					},
+
+					// imports ignore curly newline formatting
 					ImportDeclaration: {
-						multiline: true,
-						minProperties: 2
+						multiline: false,
+						minProperties: 99999,
+						consistent: false
 					},
+
 					ExportDeclaration: {
 						multiline: true,
 						minProperties: 2
@@ -67,19 +85,12 @@ export default [
 				}
 			],
 
-			// 2) If the object is multiline, put each property on its own line
-			"object-property-newline": [
-				"error",
-				{
-					allowAllPropertiesOnSameLine: false
-				}
-			],
-
-			indent: [ "error", "tab", { "SwitchCase": 1 } ],
-			semi: [ "error", "always" ],
-			"arrow-parens": [ "error", "always" ],
-			"object-curly-spacing": [ "error", "always" ],
-			"array-bracket-spacing": [ "error", "always" ],
+			'object-property-newline': [ 'error', { allowAllPropertiesOnSameLine: false } ],
+			indent: [ 'error', 'tab', { SwitchCase: 1 } ],
+			semi: [ 'error', 'always' ],
+			'arrow-parens': [ 'error', 'always' ],
+			'object-curly-spacing': [ 'error', 'always' ],
+			'array-bracket-spacing': [ 'error', 'always' ],
 			'lines-between-class-members': [ 'error', 'always' ],
 			'newline-after-var': [ 'error', 'always' ],
 			'newline-before-return': 'error',

package/package.json

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

package/src/getAllFiles.js

@@ -1,56 +1,58 @@
-import {
-	readdirSync, statSync 
-} from 'fs';
-import { join } from 'path';
-import shouldIgnore from './shouldIgnore.js';
+import { readdirSync, statSync } from "fs";
+import path from "path";
+import shouldIgnore from "./shouldIgnore.js";
 
 export default function getAllFiles(base, {
-	dir = '.',
-	files = [], 
+	dir = ".",
+	files = [],
 	ignore = [],
-	fileTypes = []
+	fileTypes = [],
+	root,
 } = {}) {
 
-	const directory = join(base, dir);
+	const isAbsDir = path.isAbsolute(dir);
+
+	// If scanning absolute paths, keep a stable root for relative paths
+	const scanRoot = root ?? (isAbsDir ? dir : path.join(base, dir));
+
+	// Resolve the directory we are currently reading
+	const directory = isAbsDir ? dir : path.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, '/');
+		const fullPath = path.join(directory, file);
 
-		// 2) Prepend a slash so patterns like "/css/*.js" will match "/css/some.js"
-		const pathForIgnore = '/' + relativePath.replace(/^\/*/, '');
+		// Always store relative to scanRoot when working with absolute paths
+		const relativePath = (
+			isAbsDir
+				? path.relative(scanRoot, fullPath)
+				: path.join(dir, file)
+		).replace(/\\/g, "/");
 
-		// 3) Check with the leading slash path
-		if (shouldIgnore(pathForIgnore, ignore)) {
+		const pathForIgnore = "/" + relativePath.replace(/^\/*/, "");
 
-			return;
-		
-		}
+		if (shouldIgnore(pathForIgnore, ignore)) return;
 
-		// Recurse if it's a directory
 		if (statSync(fullPath).isDirectory()) {
 
 			getAllFiles(base, {
-				dir: join(dir, file),
+				dir: isAbsDir ? fullPath : path.join(dir, file),
 				files,
 				ignore,
-				fileTypes
+				fileTypes,
+				root: scanRoot, // PASS ROOT DOWN
 			});
 		
 		} 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);
 		
 		}