@irrelon/emitter 6.0.0 → 6.0.1

package/tests/Emitter.test.ts

@@ -4,20 +4,20 @@ import { Emitter, EmitterEventsInterface, EventListenerCallback, ListenerReturnF
 let expectedAssertions = 0;
 let actualAssertions = 0;
 
-function expect (val: number) {
+function expect(val: number) {
 	expectedAssertions = val;
 }
 
-function reset () {
+function reset() {
 	expectedAssertions = 0;
 	actualAssertions = 0;
 }
 
-function countAssertion () {
+function countAssertion() {
 	actualAssertions++;
 }
 
-function check () {
+function check() {
 	if (expectedAssertions === undefined || expectedAssertions === actualAssertions) {
 		return;
 	}
@@ -53,13 +53,13 @@ describe("Emitter", () => {
 
 			// Test extending Emitter and modifying base functionality
 			class MyClass extends Emitter {
-				testFunc () {
+				testFunc() {
 					testFuncCount++;
 				}
 
 				on(eventName: string, id: string, listener: EventListenerCallback): this;
 				on(eventName: string, listener: EventListenerCallback): this;
-				on (eventName: string, ...rest: any[]): this {
+				on(eventName: string, ...rest: any[]): this {
 					const restTypes = rest.map((arg) => typeof arg);
 
 					if (restTypes[0] === "function") {
@@ -73,14 +73,14 @@ describe("Emitter", () => {
 				}
 
 				// @ts-ignore
-				emit (eventName: string, ...rest: any[]) {
+				emit(eventName: string, ...rest: any[]) {
 					return super.emitId(eventName, "^^noId", ...rest);
 				}
 
 				off(eventName: string, id: string, listener?: EventListenerCallback): this;
 				off(eventName: string, listener?: EventListenerCallback): this;
 				off(eventName: string): this;
-				off (eventName: string, ...rest: any[]) {
+				off(eventName: string, ...rest: any[]) {
 					let id = rest[0];
 					let func = rest[1];
 
@@ -263,6 +263,39 @@ describe("Emitter", () => {
 			assert.strictEqual(results[1], "Foo2 Return Value", "Return data for foo2 was not correct");
 		});
 
+		it("Supports awaiting async and non-async rpc listener return data", async () => {
+			interface MyTestEvents {
+				foo1: () => string | Promise<string>;
+				foo2: () => string;
+			}
+
+			const emitter = new Emitter<EmitterEventsInterface<MyTestEvents>>();
+			let listenerFiredCount = 0;
+
+			emitter.on("foo1", () => {
+				return new Promise<string>((resolve) => {
+					setTimeout(() => {
+						listenerFiredCount++;
+						resolve("Foo1 Return Value");
+					}, 1000);
+				});
+			});
+
+			emitter.on("foo2", () => {
+				return "Foo2 Return Value";
+			});
+
+			const time = new Date().getTime();
+			const result1 = await emitter.rpc("foo1");
+			const result2 = emitter.rpc("foo2");
+			const delta = new Date().getTime() - time;
+
+			assert.ok(delta > 900, "Delta was not correct, await may not have paused?");
+			assert.ok(listenerFiredCount === 1, "listenerFiredCount was not correct, await may not have been used?");
+			assert.strictEqual(result1, "Foo1 Return Value", "Return data for foo1 was not correct");
+			assert.strictEqual(result2, "Foo2 Return Value", "Return data for foo2 was not correct");
+		});
+
 		it("Supports responding with a cancellation signal", async () => {
 			interface MyTestEvents {
 				foo: () => string | ListenerReturnFlag;
@@ -566,4 +599,4 @@ describe("Emitter", () => {
 			);
 		});
 	});
-});
+});

package/fixPaths.cjs

@@ -1,183 +0,0 @@
-/**
- * A very basic search and replace function to find import and export statements
- * in .js files where the path of the file being specified does not have a .js
- * extension and replace those paths with one that has a .js extension.
- *
- * This would be much better written using abstract source trees to do the
- * re-writing which would be "safer", however this is a fully working function
- * and doesn't seem to mess anything up at present.
- */
-const chokidar = require("chokidar");
-const fs = require("fs");
-const { readFile, writeFile, readdir } = require("fs").promises;
-const { resolve } = require("path");
-const { minimatch } = require("minimatch");
-
-const matchPattern = ["**/*.js", "**/*.jsx"];
-const excludePattern = ["node_modules", "react", ".git"];
-
-const expressions = [{
-	exp: /import(.*)?["']([.]+)(((?!\.js).)*?)["'];/g,
-	update: (match, isIndex) => {
-		if (isIndex) {
-			return `import${match[1]}"${match[2]}${match[3]}/index.js";`;
-		}
-
-		return `import${match[1]}"${match[2]}${match[3]}.js";`;
-	}
-}, {
-	exp: /export\s(.*)?\sfrom\s["']([.]+)(((?!\.js).)*?)["'];/g,
-	update: (match, isIndex) => {
-		if (isIndex) {
-			return `export ${match[1]} from "${match[2]}${match[3]}/index.js";`;
-		}
-
-		return `export ${match[1]} from "${match[2]}${match[3]}.js";`;
-	}
-}];
-
-let tsPaths = {};
-let tsResolvedPaths = {};
-
-const readTsConfig = () => {
-	const config = require("./tsconfig.json");
-	tsPaths = config.compilerOptions.paths;
-
-	Object.entries(tsPaths).forEach(([key, replacementArr]) => {
-		tsResolvedPaths[key] = replacementArr.map((dir) => {
-			return resolve(__dirname, dir);
-		});
-	});
-};
-
-async function getFiles (dir, gitIgnoreArr) {
-	const dirArr = await readdir(dir, { withFileTypes: true });
-
-	const finalList = dirArr.filter((filePath) => {
-		return excludePattern.every((glob) => !minimatch(filePath.name, glob));
-	});
-
-	const files = await Promise.all(finalList.map((tmpDir) => {
-		const res = resolve(dir, tmpDir.name);
-		return tmpDir.isDirectory() ? getFiles(res) : [res];
-	})).then((results) => {
-		return results.reduce((arr, item) => {
-			arr.push(...item);
-			return arr;
-		}, []);
-	});
-
-	const finalFiles = files.filter((file) => {
-		if (!file || !file.trim()) return false;
-		return matchPattern.some((glob) => minimatch(file, glob));
-	});
-
-	return Array.prototype.concat(...finalFiles);
-}
-
-const processMatches = (regExp, fileFolder, content, updateFunc) => {
-	let match;
-	while (match = regExp.exec(content)) {
-		const pathToItemFile = resolve(fileFolder, match[2] + match[3] + ".js");
-		const pathToItemFolderIndexFile = resolve(fileFolder, match[2] + match[3] + "/index.js");
-		let pathStatFile;
-		let pathStatFolderIndexFile;
-
-		try {
-			pathStatFile = fs.lstatSync(pathToItemFile);
-		} catch (err) {
-			pathStatFolderIndexFile = undefined;
-		}
-
-		try {
-			pathStatFolderIndexFile = fs.lstatSync(pathToItemFolderIndexFile);
-		} catch (err) {
-			pathStatFolderIndexFile = undefined;
-		}
-
-		if (pathStatFile) {
-			// Just add .js to the end of the path
-			content = content.replace(match[0], updateFunc(match, false));
-		} else if (pathStatFolderIndexFile) {
-			content = content.replace(match[0], updateFunc(match, true));
-		}
-	}
-
-	return content;
-};
-
-const processFile = (file) => {
-	if (!file) return;
-
-	//console.log(`Processing ${file}...`);
-
-	readFile(file).then((fileContentsBuffer) => {
-		const fileFolderArr = file.split("/");
-		fileFolderArr.pop();
-
-		const fileFolder = fileFolderArr.join("/");
-
-		const fileContent = fileContentsBuffer.toString();
-		let updatedContent = fileContent;
-
-		Object.entries(tsPaths).forEach(([key, replacementArr]) => {
-			const find = key.replace("*", "");
-			const replace = replacementArr[0].replace("*", "");
-
-			const relativeSteps = new Array(file.replace(__dirname, "").split("/").length - 2).fill("../").join("");
-			const replacementPath = relativeSteps + replace;
-
-			updatedContent = updatedContent.replaceAll(find, replacementPath);
-		});
-
-		expressions.forEach((expression) => {
-			updatedContent = processMatches(expression.exp, fileFolder, updatedContent, expression.update);
-			expression.exp.lastIndex = 0;
-		})
-
-		if (fileContent === updatedContent) {
-			//console.log(`No change ${file}`);
-			return;
-		}
-
-		writeFile(file, updatedContent).then(() => {
-			console.log(`Updated ${file}`);
-		});
-	});
-};
-
-const runSearchReplace = () => {
-	// Scan all folders
-	readFile(resolve(__dirname, ".gitignore")).then((result) => {
-		return result.toString().split("\n").filter((line) => {
-			return !line.startsWith("#");
-		}).filter((line) => {
-			return Boolean(line.trim());
-		});
-	}).then((gitIgnoreArr) => {
-		return getFiles(__dirname, gitIgnoreArr);
-	}).then((files) => {
-		// Now scan the files for matching regular expressions
-		// of imports without extensions
-		files.forEach((file) => {
-			processFile(file);
-		});
-
-		console.log(`Processed ${files.length} files`);
-	});
-};
-
-readTsConfig();
-runSearchReplace();
-
-const watcher = chokidar.watch(__dirname, { persistent: true });
-
-watcher.on("change", (filename) => {
-	if (filename.indexOf("tsconfig.json") > -1) {
-		console.log("Updating tsconfig.json data");
-		readTsConfig();
-	}
-	if (!matchPattern.some((glob) => minimatch(filename, glob))) return;
-	//console.log("Changed", filename);
-	processFile(filename);
-});