milkio 0.4.2 → 0.5.0

package/.co.toml

@@ -0,0 +1,2 @@
+["general"]
+includes = ["co:bun"]

package/api-test/index.ts

@@ -1,8 +1,11 @@
 import schema from "../../../generated/api-schema";
-import { useLogger, type MilkioApp } from "..";
+import { ExecuteResultFail, type MilkioApp } from "..";
+import { cwd } from "node:process";
+import chalk from "chalk";
+import { handleCatchError } from "../utils/handle-catch-error.ts";
 
 export const executeApiTests = async <Path extends Array<keyof (typeof schema)["apiTestsSchema"]>>(app: MilkioApp, path: Path | string | true | 1 | undefined) => {
-	console.log(`🥛 Milkio Api Testing..\n`);
+	console.log(`${chalk.hex("#81C7D4")(`🧊 test running on`)} ${chalk.hex("#999A9E").underline(cwd())}`);
 
 	let pathArr = [] as Array<string>;
 	if (!path || path === "1" || path === 1 || path === true) {
@@ -11,61 +14,63 @@ export const executeApiTests = async <Path extends Array<keyof (typeof schema)["
 		pathArr = [path] as Path;
 	}
 
-	const tests = [];
 	const startedAt = new Date().getTime();
-
 	const apiTestHooks = await import("../../../src/api-test.ts");
 	await apiTestHooks.default.onBootstrap();
+	const results: Array<{ path: string, case: number, fail: boolean, failMessage?: string }> = [];
+	console.log(chalk.hex("#0B346E")(`₋₋₋₋₋₋₋₋`));
 
 	for (const pathRaw of pathArr) {
 		let path = pathRaw.replaceAll("\\", "/");
 		if (path.startsWith("/")) path = path.slice(1) as Path[number];
 
-		tests.push(
-			// @ts-ignore
-			(async () => {
-				// @ts-ignore
-				const module = await schema.apiTestsSchema[path]().module;
-				const cases = module.test.getCases();
-				let i = 0;
-				for (const cs of cases) {
-					++i;
-					const csStartedAt = new Date().getTime();
-					const clear = setTimeout(() => {
-						console.error(`------`);
-						console.error(`❌ TIMEOUT -- More than ${cs.timeout ?? 8192}ms`);
-						console.error(`   ${cs.name} | Path: src/apps/${path as string}.ts | Case: ${i}`);
-						console.error(`------`);
-						throw new Error("");
-					}, cs.timeout ?? 8192);
-					await cs.handler({
-						...((await apiTestHooks.default.onBefore()) ?? {}),
-						log: (...args: Array<unknown>) => console.log(...args),
-						// @ts-ignore
-						execute: async (options?: any) => app.execute((path as any), options),
-						executeOther: async (path: any, options?: any) => app.execute((path as any), options),
-						executeStream: async (options?: any) => app.executeStream((path as any), options),
-						randParams: () => app.randParams(path as any),
-						randOtherParams: (path: any) => app.randParams(path),
-						reject: (message?: string) => {
-							console.error(`------`);
-							console.error(`❌ REJECT -- ${message ?? "Test not satisfied"}`);
-							console.error(`   ${cs.name} | Path: src/apps/${path as string}.ts | Case: ${i} | Time: ${new Date().getTime() - csStartedAt}ms`);
-							console.error(`------`);
-							throw new Error("");
-						},
-					} as any);
-					clearTimeout(clear);
-					console.log(`✅ DIRECT --  ${cs.name} | Path: src/apps/${path as string}.ts | Case: ${i} | Time: ${new Date().getTime() - csStartedAt}ms`);
-				}
-			})(),
-		);
+		// @ts-ignore
+		const module = await schema.apiTestsSchema[path]().module;
+		const cases = module.test.getCases();
+		let i = 0;
+		for (const cs of cases) {
+			++i;
+			const csStartedAt = new Date().getTime();
+			let fail = false;
+			let failMessage: string | undefined = undefined;
+			try {
+				await cs.handler({
+					...((await apiTestHooks.default.onBefore()) ?? {}),
+					log: (...args: Array<unknown>) => console.log(...args),
+					// @ts-ignore
+					execute: async (options?: any) => app.execute((path as any), options),
+					executeOther: async (path: any, options?: any) => app.execute((path as any), options),
+					executeStream: async (options?: any) => app.executeStream((path as any), options),
+					randParams: () => app.randParams(path as any),
+					randOtherParams: (path: any) => app.randParams(path),
+					reject: (message?: string) => {
+						fail = true;
+						failMessage = message;
+					},
+				});
+			} catch (e: any) {
+				const response = handleCatchError(e, 'no-execute-id') as ExecuteResultFail;
+				fail = true;
+				failMessage = response.fail.message;
+			}
+			if (fail) {
+				console.log(`${chalk.hex("#D75455")(`\nrejected`)}${chalk.hex("#999A9E")(` · ${cs.name} | path: src/apps/${path as string}.ts | case: ${i} | time: ${new Date().getTime() - csStartedAt}ms`)}`);
+				console.log(chalk.hex("#999A9E")(failMessage ?? "Test not satisfied"));
+			} else {
+				console.log(`${chalk.hex("#1B813E")(`directed`)}${chalk.hex("#999A9E")(` · ${cs.name} | path: src/apps/${path as string}.ts | case: ${i} | time: ${new Date().getTime() - csStartedAt}ms`)}`);
+			}
+			results.push({ path, case: i, fail, failMessage });
+			console.log(chalk.hex("#0B346E")(`₋₋₋₋₋₋₋₋`));
+			await new Promise(resolve => setTimeout(resolve, 64));
+		}
 	}
 
-	await Promise.all(tests);
-
 	const endedAt = new Date().getTime();
 
-	console.log(`\n✅ All tests passed.`);
-	console.log(`🥛 Milkio Api Testing took ${((endedAt - startedAt) / 1000).toFixed(2)}s\n`);
+	const failTotal = results.filter(r => r.fail).length;
+	const passTotal = results.length - failTotal;
+
+	console.log("");
+	if (failTotal === 0) console.log(chalk.hex("#1B813E")(`🥳 all tests ${chalk.hex("#1B813E")(`passed`)} ${chalk.hex("#999A9E")(`🌟 milkio testing took ${((endedAt - startedAt) / 1000).toFixed(2)}s\n`)}`));
+	else console.log(chalk.hex("#999A9E")(`🤗️️ ${failTotal} test${failTotal > 1 ? "s" : ""} ${chalk.hex("#D75455")(`failed`)}${passTotal > 0 ? `, and ${results.length - failTotal} ${chalk.hex("#1B813E")(`passed`)}` : ''} ${chalk.hex("#999A9E")(`🌟 milkio testing took ${((endedAt - startedAt) / 1000).toFixed(2)}s`)}`));
 };

package/c.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 
 import { argv, exit } from "node:process";
-import { $ } from "bun";
+import { $, env } from "bun";
 
 const method = argv[2] as keyof typeof commands;
 const params = argv.slice(3) as Parameters<(typeof commands)[keyof typeof commands]>;
@@ -26,14 +26,14 @@ const commands = {
 	async EAR(commandBase64ed: string) {
 		try {
 			console.clear();
-		} catch (e) {}
+		} catch (e) { }
 		const command = Buffer.from(commandBase64ed, "base64").toString("utf-8");
 		console.log("\x1B[2m%s\x1B[0m", `$ ${command}`);
 		console.log(``);
 		try {
-			await $`${{ raw: command }}`;
-		} catch (e) {}
-		process.on("SIGINT", () => {}); // prevent users from exiting by pressing ctrl + c
+			await $`${{ raw: command }}`.env({ ...env, FORCE_COLOR: "3" });
+		} catch (e) { }
+		process.on("SIGINT", () => { }); // prevent users from exiting by pressing ctrl + c
 		while (true) await new Promise((resolve) => process.stdin.on("keypress", resolve));
 	},
 };

package/defines/define-http-handler.ts

@@ -148,13 +148,6 @@ export function defineHttpHandler(app: MilkioApp, options: ExecuteHttpServerOpti
 
 			const resultsRaw = await app._call(mode, pathstr, params, headers, { executeId, logger, detail });
 
-			if (resultsRaw.$result.success === false) {
-				if (resultsRaw.$result.fail.code === "TYPE_SAFE_ERROR") {
-					if (((resultsRaw.$result.fail.data as any).value) === undefined) (resultsRaw.$result.fail.data as any).value === "undefined";
-					if (((resultsRaw.$result.fail.data as any).value) === null) (resultsRaw.$result.fail.data as any).value === "null";
-				}
-			}
-
 			let fn: any;
 			try {
 				fn = await schema.apiValidator.validate[pathstr]();

package/kernel/validate.ts

@@ -5,6 +5,9 @@ export function _validate(validator: IValidation.IFailure | IValidation.ISuccess
 	if (validator.success) return validator.data;
 	const error = validator.errors[0];
 
+	if ((error.value) === undefined) error.value === "undefined";
+	if ((error.value) === null) error.value === "null";
+
 	throw reject("TYPE_SAFE_ERROR", {
 		path: error.path,
 		expected: error.expected,

package/package.json

@@ -2,7 +2,7 @@
   "name": "milkio",
   "type": "module",
   "module": "index.ts",
-  "version": "0.4.2",
+  "version": "0.5.0",
   "peerDependencies": {
     "typescript": "^5.4.2"
   },
@@ -12,12 +12,14 @@
   "dependencies": {
     "@poech/camel-hump-under": "^1.1.0",
     "@southern-aurora/tson": "2.0.2",
-    "ulidx": "^2.3.0",
+    "chalk": "^5.3.0",
+    "ejs": "^3.1.9",
     "typia": "5.5.5",
-    "ejs": "^3.1.9"
+    "ulidx": "^2.3.0"
   },
   "devDependencies": {
     "@types/bun": "latest",
+    "@types/node": "latest",
     "@types/ejs": "^3.1.5",
     "@types/js-beautify": "^1.14.3",
     "ts-patch": "^3.1.2",

package/utils/handle-catch-error.ts

@@ -7,9 +7,9 @@ export function handleCatchError(error: any, executeId: ExecuteId): ExecuteResul
 	const logger = useLogger(executeId);
 
 	if (configMilkio.debug === true) {
-		logger.error(`\nError Data: ${JSON.stringify(error)}`);
-		if (error.stack) logger.error("\nError Stack: ", error.stack);
-		else logger.error("\nError Stack: ", error);
+		logger.error(`Error Data: ${JSON.stringify(error)}`);
+		if (error.stack) logger.error("Error Stack: ", error.stack);
+		else logger.error("Error Stack: ", error);
 	}
 
 	if (error.name !== "MilkioReject") {