@awesomeness-js/utils 1.0.23 → 1.0.25

package/tests/clean/timestamp.test.js

@@ -1,13 +1,20 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../../index.js';
 
 test('good timestamp', () => {
-    const x = utils.clean.timestamp('2024-12-30');
-    expect(x).toBe('2024-12-30T00:00:00.000Z');
+
+	const x = utils.clean.timestamp('2024-12-30');
+
+	expect(x).toBe('2024-12-30T00:00:00.000Z');
+
 });
 
 test('bad timestamp', () => {
-    expect(utils.clean.timestamp('2024-12-32')).toBe(null);
-    expect(()=>utils.clean.timestamp('2024-12-32', { required: true })).toThrow();
+
+	expect(utils.clean.timestamp('2024-12-32')).toBe(null);
+	expect(()=>utils.clean.timestamp('2024-12-32', { required: true })).toThrow();
+
 });

package/tests/clean/uuid.test.js

@@ -1,14 +1,21 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../../index.js';
 
 test('good uuid', () => {
-    const id = utils.uuid();
-    const x = utils.clean.uuid(id);
-    expect(x).toBe(id);
+
+	const id = utils.uuid();
+	const x = utils.clean.uuid(id);
+
+	expect(x).toBe(id);
+
 });
 
 test('bad uuid', () => {
-    expect(utils.clean.uuid('2024-12-32')).toBe(null);
-    expect(()=>utils.clean.uuid('2024-12-32', { required: true })).toThrow();
+
+	expect(utils.clean.uuid('2024-12-32')).toBe(null);
+	expect(()=>utils.clean.uuid('2024-12-32', { required: true })).toThrow();
+
 });

package/tests/collectImports.test.js

@@ -0,0 +1,66 @@
+import utils from '../index.js';
+import {
+	expect, test 
+} from 'vitest';
+
+test('collectImports', () => {
+   
+	const imports = utils.collectImports('./test/collectImports.js');
+
+	const names = imports.map((i) => i.name).sort();
+
+	expect(names).toStrictEqual([
+		'test.collectImports', 
+		'test.js.some',
+		'test_css_some', 
+	]);
+
+	expect(imports.length).toBe(3);
+
+	expect(Object.keys(imports[0]).sort()).toStrictEqual([
+		'code', 
+		'fullPath', 
+		'hash',
+		'name',
+		'rootPath',
+		'type',
+	]);
+
+});
+
+
+test('collectImports - collect all imports in collectImports.js', () => {
+   
+	const imports = utils.collectImports('./test/collectImports.js',{
+		returnCode: false,
+		jsMaps: {
+			'test.js': 'app.print',
+			'test': 'app.fn',
+		},
+		cssMaps: {
+			'test': 'awesomeness',
+		},
+	});
+
+	const names = imports.map((i) => i.name).sort();
+
+
+	expect(names).toStrictEqual([
+		'app.fn.collectImports', // test.collectImports
+		'app.print.some', // test.js.some
+		'awesomeness_css_some', // test_css_some
+	]);
+
+	expect(imports.length).toBe(3);
+
+	expect(Object.keys(imports[0]).sort()).toStrictEqual([
+		//'code', 
+		'fullPath', 
+		'hash',
+		'name',
+		'rootPath',
+		'type',
+	]);
+
+});
+

package/tests/combineFiles.test.js

@@ -1,35 +1,37 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../index.js';
 
 let combineTest = utils.combineFiles('./test', 'js');
 
 let combineTest2 = utils.combineFiles('./test', 'js', { 
-	processContent: ({ content, path  }) => { 
-
-        const fnName = path.split('/')
-        .filter(x => x !== '') // remove empty strings
-        .join('.') // join with dots
-        .replaceAll('..', '.') // remove double dots
-        .replaceAll('.js', '') // remove .js
-        .replace(/^\./, '');
-
-        console.log({content, path});
-        content = content.replaceAll('export default function', `${fnName} = function`);
-        content = content.replaceAll('export default async function', `${fnName} = async function`);
-        content = content.replaceAll('export default async', `${fnName} = async`);
-        content = content.replaceAll('export default', `${fnName} =`);
-        console.log(content);
-        console.log('');
-        console.log('');
-        console.log('');
-        return content; 
-    },
+	processContent: ({
+		content, path  
+	}) => { 
+
+		const fnName = path.split('/')
+			.filter((x) => x !== '') // remove empty strings
+			.join('.') // join with dots
+			.replaceAll('..', '.') // remove double dots
+			.replaceAll('.js', '') // remove .js
+			.replace(/^\./, '');
+
+		content = content.replaceAll('export default function', `${fnName} = function`);
+		content = content.replaceAll('export default async function', `${fnName} = async function`);
+		content = content.replaceAll('export default async', `${fnName} = async`);
+		content = content.replaceAll('export default', `${fnName} =`);
+
+		return content; 
+	
+	},
 });
 
 test('combineFiles - combine all files in src/js', () => {
-    expect(combineTest).toBeDefined();
-    expect(combineTest2).toBeDefined();
-    expect(combineTest).not.toEqual(combineTest2);
-    console.log({combineTest2});
-})
+
+	expect(combineTest).toBeDefined();
+	expect(combineTest2).toBeDefined();
+	expect(combineTest).not.toEqual(combineTest2);
+
+});

package/tests/convertBytes.test.js

@@ -1,9 +1,14 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../index.js';
 
 let convertBytesTest = utils.convertBytes(1024);
+
 test('convertBytes 1024 => 1.00 KB', () => {
-    expect(convertBytesTest).toBeDefined();
-    expect(convertBytesTest).toEqual('1.00 KB');
+
+	expect(convertBytesTest).toBeDefined();
+	expect(convertBytesTest).toEqual('1.00 KB');
+
 });

package/tests/env.test.js

@@ -1,5 +1,7 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../index.js';
 
 await utils.setLocalEnvs('./secrets/local.env');
@@ -7,11 +9,15 @@ await utils.setLocalEnvs('./secrets/local.env');
 const env1 = process.env.JUST_A_TEST;
 
 test('localEnv - should be testValue', () => {
-    expect(env1).toBe('Local just a test');
+
+	expect(env1).toBe('Local just a test');
+
 });
 
 await utils.setLocalEnvs('./secrets/dev.env');
 
 test('localEnv - should be testValue', () => {
-    expect(process.env.JUST_A_TEST).toBe('Dev just a test');
+
+	expect(process.env.JUST_A_TEST).toBe('Dev just a test');
+
 });

package/tests/example.test.js

@@ -1,6 +1,10 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 
 test('adds 2 + 3 to equal 5', () => {
-  expect(2 + 3).toBe(5)
-})
+
+	expect(2 + 3).toBe(5);
+
+});

package/tests/fileList.test.js

@@ -1,21 +1,25 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../index.js';
 
 
 let fileList2 = utils.getAllFiles('./test', {
-   // fileTypes: ['.css'],
-   // fileTypes: ['.js'],
-   ignore: [
-        "/ignoreFolder", 
-        "/ignoreFolder2/", 
-        "*.env",
-        "*.test.js",
-        "/css/*.js",
-        "/js/*.css"
-    ]
+	// fileTypes: ['.css'],
+	// fileTypes: ['.js'],
+	ignore: [
+		"/ignoreFolder", 
+		"/ignoreFolder2/", 
+		"*.env",
+		"*.test.js",
+		"/css/*.js",
+		"/js/*.css"
+	]
 });
 
 test('file list of 3', () => {
-    expect(fileList2.length).toBe(3); // Adjust this number based on your test folder contents
+
+	expect(fileList2.length).toBe(4); // Adjust this number based on your test folder contents
+
 });

package/tests/hash-and-encrypt.test.js

@@ -1,5 +1,7 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../index.js';
 
 // set AWESOMENESS_ENCRYPTION_KEY
@@ -8,11 +10,15 @@ await utils.setLocalEnvs('./secrets/dev.env');
 const storedHash = utils.password.hash('mySecret123');
 
 test('correct password check', () => {
-    expect(utils.password.check('mySecret123', storedHash)).toBe(true)
+
+	expect(utils.password.check('mySecret123', storedHash)).toBe(true);
+
 });
 
 test('incorrect password check', () => {
-    expect(utils.password.check('wrongPassword', storedHash)).toBe(false)
+
+	expect(utils.password.check('wrongPassword', storedHash)).toBe(false);
+
 });
 
 // Example 256-bit key for AES-256
@@ -21,6 +27,9 @@ test('incorrect password check', () => {
 const secretMessage = 'This is top secret!';
 const encrypted = utils.encrypt(secretMessage);
 const decrypted = utils.decrypt(encrypted);
+
 test('encryption and decryption', () => {
-    expect(decrypted).toBe(secretMessage)
+
+	expect(decrypted).toBe(secretMessage);
+
 });

package/tests/md5.test.js

@@ -1,7 +1,12 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../index.js';
 let md5Test = utils.md5('test');
+
 test('md5 test', () => {
-    expect(md5Test).toBe('098f6bcd4621d373cade4e832627b4f6');
+
+	expect(md5Test).toBe('098f6bcd4621d373cade4e832627b4f6');
+
 });

package/tests/uuid.test.js

@@ -1,15 +1,21 @@
 // example.test.js
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../index.js';
 
 let uuid = utils.uuid();
 let isValid = utils.isUUID(uuid);
 
 test('uuid create', () => {
-    expect(uuid).toBeDefined();
-    expect(uuid.length).toBe(36);
+
+	expect(uuid).toBeDefined();
+	expect(uuid.length).toBe(36);
+
 });
 
 test('uuid isValid', () => {
-    expect(isValid).toBe(true);
+
+	expect(isValid).toBe(true);
+
 });

package/tests/validateSchema.test.js

@@ -1,4 +1,6 @@
-import { expect, test } from 'vitest'
+import {
+	expect, test 
+} from 'vitest';
 import utils from '../index.js';
 import schemas from '../schemas.js';
 
@@ -7,24 +9,34 @@ let schema2 = utils.validateSchema(schemas.schema2);
 
 
 test('schema1 is valid', () => {
-    expect(schema1).toBe(true);
+
+	expect(schema1).toBe(true);
+
 });
 
 test('schema2 is valid', () => {
-    expect(schema2).toBe(true);
+
+	expect(schema2).toBe(true);
+
 });
 
 let expectedError;
 
 try {
-    utils.validateSchema({
-        notReal: true
-    });
-    expectedError = false; // should not reach here
+
+	utils.validateSchema({
+		notReal: true
+	});
+	expectedError = false; // should not reach here
+
 } catch(e){
-    expectedError = true;
+
+	expectedError = true;
+
 }
 
 test('invalid schema throws error', () => {
-    expect(expectedError).toBe(true);
+
+	expect(expectedError).toBe(true);
+
 });

package/tsconfig.json

@@ -1,17 +1,21 @@
 {
-  "compilerOptions": {
-    "declaration": true,        // Generates .d.ts files
-    "emitDeclarationOnly": true, // Only output .d.ts files
-    "allowJs": true,            // Allows JS files
-    "outDir": "types",          // Output directory for type files
-    "moduleResolution": "node",
-    "skipLibCheck": true,
-    "esModuleInterop": true,
-    "types": ["vitest/globals"]
-  },
-  "include": ["src/**/*"],
-  "exclude": [
-    "./src/ignoreFolder/**/*", 
-    "./src/ignoreMe.js"
-  ]
-}
+	"compilerOptions": {
+		"declaration": true, // Generates .d.ts files
+		"emitDeclarationOnly": true, // Only output .d.ts files
+		"allowJs": true, // Allows JS files
+		"outDir": "types", // Output directory for type files
+		"moduleResolution": "node",
+		"skipLibCheck": true,
+		"esModuleInterop": true,
+		"types": [
+			"vitest/globals"
+		]
+	},
+	"include": [
+		"src/**/*"
+	],
+	"exclude": [
+		"./src/ignoreFolder/**/*",
+		"./src/ignoreMe.js"
+	]
+}

package/types/clean/array.d.ts

@@ -1 +1,2 @@
-export {};
+declare const _default: (arr: any, schema?: {}) => any[];
+export default _default;

package/types/clean/boolean.d.ts

@@ -1,3 +1,3 @@
-export default function cleanBoolean(x: any, { required }?: {
-    required?: boolean;
-}): any;
+export default function cleanBoolean(x: any, { required }?: {
+    required?: boolean;
+}): any;

package/types/clean/integer.d.ts

@@ -1,6 +1,6 @@
-export default function cleanInt(x: any, { required, convertString, min, max, }?: {
-    required?: boolean;
-    convertString?: boolean;
-    min?: boolean;
-    max?: boolean;
-}): any;
+export default function cleanInt(x: any, { required, convertString, min, max, }?: {
+    required?: boolean;
+    convertString?: boolean;
+    min?: boolean;
+    max?: boolean;
+}): any;

package/types/clean/number.d.ts

@@ -1,8 +1,8 @@
-export default function cleanNumber(x: any, { required, convertString, min, max, maxDecimal, minDecimal, }?: {
-    required?: boolean;
-    convertString?: boolean;
-    min?: boolean;
-    max?: boolean;
-    maxDecimal?: boolean;
-    minDecimal?: boolean;
-}): any;
+export default function cleanNumber(x: any, { required, convertString, min, max, maxDecimal, minDecimal, }?: {
+    required?: boolean;
+    convertString?: boolean;
+    min?: boolean;
+    max?: boolean;
+    maxDecimal?: boolean;
+    minDecimal?: boolean;
+}): any;

package/types/clean/object.d.ts

@@ -1 +1,2 @@
-export {};
+declare const _default: (obj: any, schema: any) => {};
+export default _default;

package/types/clean/string.d.ts

@@ -1,7 +1,8 @@
-export default function cleanString(x: any, { required, minLength, maxLength, allowHtml, allowScripts }?: {
-    required?: boolean;
-    minLength?: boolean;
-    maxLength?: boolean;
-    allowHtml?: boolean;
-    allowScripts?: boolean;
-}): string;
+export default function cleanString(x: any, { required, minLength, maxLength, allowHtml, allowScripts, validValues }?: {
+    required?: boolean;
+    minLength?: boolean;
+    maxLength?: boolean;
+    allowHtml?: boolean;
+    allowScripts?: boolean;
+    validValues?: boolean;
+}): string;

package/types/clean/timestamp.d.ts

@@ -1,5 +1,5 @@
-export default function cleanTimestamp(isoDateTimeString: any, { required, maxDaysInFuture, maxDaysInFPast, }?: {
-    required?: boolean;
-    maxDaysInFuture?: boolean;
-    maxDaysInFPast?: boolean;
-}): string;
+export default function cleanTimestamp(isoDateTimeString: any, { required, maxDaysInFuture, maxDaysInFPast, }?: {
+    required?: boolean;
+    maxDaysInFuture?: boolean;
+    maxDaysInFPast?: boolean;
+}): string;

package/types/clean/uuid.d.ts

@@ -1,3 +1,3 @@
-export default function cleanUUID(uuid: any, { required, }?: {
-    required?: boolean;
-}): string;
+export default function cleanUUID(uuid: any, { required, }?: {
+    required?: boolean;
+}): string;

package/types/collectImports.d.ts

@@ -0,0 +1,6 @@
+export default run;
+declare function run(filePath: any, { returnCode, jsMaps, cssMaps }?: {
+    returnCode?: boolean;
+    jsMaps?: {};
+    cssMaps?: {};
+}): any[];

package/types/combineFiles.d.ts

@@ -1,5 +1,8 @@
 export default combineFiles;
-declare function combineFiles(dir: any, fileType: any, { minify, moduleToBrowser, }?: {
+declare function combineFiles(dir: any, fileType: any, { minify, processContent, }?: {
     minify?: boolean;
-    moduleToBrowser?: boolean;
+    processContent?: ({ content, path }: {
+        content: any;
+        path: any;
+    }) => any;
 }): string;

package/types/each.d.ts

@@ -1,10 +1,10 @@
-/**
- * Iterates over elements of an array or properties of an object, invoking a callback for each element/property.
- * The iteration stops if the callback returns `false`.
- *
- * @example each({ a: 1, b: 2 }, (value, key) => { console.log(value, key); });
- * @param {Object|Array} objectOrArray - The object or array to iterate over.
- * @param {Function} callback - The function to invoke per iteration. It is invoked with two arguments: (value, key/index).
- * @returns {void}
- */
-export default function each(objectOrArray: any | any[], callback: Function): void;
+/**
+ * Iterates over elements of an array or properties of an object, invoking a callback for each element/property.
+ * The iteration stops if the callback returns `false`.
+ *
+ * @example each({ a: 1, b: 2 }, (value, key) => { console.log(value, key); });
+ * @param {Object|Array} objectOrArray - The object or array to iterate over.
+ * @param {Function} callback - The function to invoke per iteration. It is invoked with two arguments: (value, key/index).
+ * @returns {void}
+ */
+export default function each(objectOrArray: any | any[], callback: Function): void;