@awesomeness-js/utils 1.0.22 → 1.0.24

package/package.json

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

package/src/combineFiles.js

@@ -3,7 +3,7 @@ import { readdirSync, statSync, readFileSync } from 'fs';
 
 function combineFiles(dir, fileType, {
 	minify = false,
-	moduleToBrowser = false,
+	processContent = ({ content, path  }) => { return content; },
 } = {}) {
 
 		var returnString = "";
@@ -22,14 +22,14 @@ function combineFiles(dir, fileType, {
 
 				returnString += combineFiles(`${dir}/${stuff}`, fileType, {
 					minify,
-					moduleToBrowser,
+					processContent,
 				});  
 
 			} else {
 
 				// is file
 
-				// get file and extenstion from stuff
+				// get file and extension from stuff
 				let file = stuff.split('.');
 				let ext = file[file.length - 1];
 
@@ -38,24 +38,12 @@ function combineFiles(dir, fileType, {
 					
 					let thisData = readFileSync(`${dir}/${stuff}`, 'utf8');
 
-					if(moduleToBrowser){
+					if(typeof processContent === 'function'){
 
-						// can this file be converted to browser?
-						let browserFriendly = thisData.startsWith('export default ');
-
-						if(browserFriendly){
-							browserFriendly = thisData.includes('import') === false; // no imports allowed
-						}
-
-
-						if(browserFriendly){
-
-							// strip properly formatted file
-							thisData = thisData.replace('export default ', '');	
-
-						} else {
-							thisData = "";
-						}
+						thisData = processContent({
+							path: `${dir}/${stuff}`,
+							content: thisData,
+						});
 
 					}
 

package/test/ignoreFolder/ignoreMe.js

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

package/test/ignoreFolder/ignoreMe2.js

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

package/tests/combineFiles.test.js

@@ -2,23 +2,34 @@
 import { expect, test } from 'vitest'
 import utils from '../index.js';
 
-let combineTest = utils.combineFiles('./src', 'js');
+let combineTest = utils.combineFiles('./test', 'js');
 
-let combineTestBrowser = utils.combineFiles('./src', 'js', { 
-    moduleToBrowser: true 
+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; 
+    },
 });
 
 test('combineFiles - combine all files in src/js', () => {
     expect(combineTest).toBeDefined();
-    expect(combineTestBrowser).toBeDefined();
-    expect(combineTest.length).toBeGreaterThan(combineTestBrowser.length);
-})
-
-
-test('has import', () => {
-    expect(combineTest.includes('import')).toBe(true);
-})
-
-test('should not have import', () => {
-    expect(combineTestBrowser.includes('import')).toBe(false);
-})
+    expect(combineTest2).toBeDefined();
+    expect(combineTest).not.toEqual(combineTest2);
+    console.log({combineTest2});
+})

package/types/clean/array.d.ts

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

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 }?: {
+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/thing.d.ts

@@ -1,2 +1,2 @@
-declare function _default(thing: any, schema: any): any;
-export default _default;
+declare function _default(thing: any, schema: any): any;
+export default _default;

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/hashPassword.d.ts

@@ -1 +1 @@
-export default function hashPassword(password: any): string;
+export default function hashPassword(password: any): string;

package/types/utils/clean.d.ts

@@ -1,2 +1,19 @@
-export default cleanArray;
+declare namespace _default {
+    export { cleanArray as array };
+    export { cleanObject as object };
+    export { cleanBoolean as boolean };
+    export { cleanInteger as integer };
+    export { cleanNumber as number };
+    export { cleanString as string };
+    export { cleanTimestamp as timestamp };
+    export { cleanUUID as uuid };
+}
+export default _default;
 declare function cleanArray(arr: any, schema?: {}): any[];
+declare function cleanObject(obj: any, schema: any): {};
+import cleanBoolean from '../clean/boolean.js';
+import cleanInteger from '../clean/integer.js';
+import cleanNumber from '../clean/number.js';
+import cleanString from '../clean/string.js';
+import cleanTimestamp from '../clean/timestamp.js';
+import cleanUUID from '../clean/uuid.js';

package/types/validatePassword.d.ts

@@ -1 +1 @@
-export default function validatePassword(password: any, storedHash: any): boolean;
+export default function validatePassword(password: any, storedHash: any): boolean;