oclang 1.2.2 → 1.3.2

package/src/core/services/log.service.ts

@@ -10,7 +10,7 @@ export interface Log {
 	level: LogLevel;
 }
 
-export interface LoggerConfig { 
+export interface LoggerConfig {
 	interceptors: {
 		onLog: (message: string) => string;
 		level: LogLevel;
@@ -26,52 +26,60 @@ export class LoggerService {
 		this.config = config;
 	}
 
-	log (message: string, level: LogLevel = LogLevel.Info) {
+	log(message: string, level: LogLevel = LogLevel.Info, printMsg: string = message) {
 		this.logs.push({ message, level });
-		this.config.interceptors.forEach(interceptor => {
+		this.config.interceptors.forEach((interceptor) => {
 			if (interceptor.level === level) {
 				message = interceptor.onLog(message);
 			}
 		});
-		if (this.config.logs.includes(level)) {
-			console.log(message);
-		}
+		console.log(printMsg);
 	}
 
-	debug (message: string) {
+	debug(message: string) {
 		this.log(message, LogLevel.Debug);
 	}
 
-	info (message: string) {
+	info(message: string) {
 		this.log(message, LogLevel.Info);
 	}
 
-	warning (message: string) {
+	warning(message: string) {
 		this.log(message, LogLevel.Warning);
 	}
 
-	error (message: string) {
+	error(message: string) {
 		this.log(message, LogLevel.Error);
 	}
 
-	getLogs () {
+	getLogs() {
 		return this.logs;
 	}
 
-	pushInterceptor (interceptor: { onLog: (message: string) => string, level: LogLevel }) {
+	pushInterceptor(interceptor: {
+		onLog: (message: string) => string;
+		level: LogLevel;
+	}) {
 		this.config.interceptors.push(interceptor);
 	}
 
-	removeInterceptor (interceptor: { onLog: (message: string) => string, level: LogLevel }) {
-		this.config.interceptors = this.config.interceptors.filter(i => i !== interceptor);
+	removeInterceptor(interceptor: {
+		onLog: (message: string) => string;
+		level: LogLevel;
+	}) {
+		this.config.interceptors = this.config.interceptors.filter(
+			(i) => i !== interceptor,
+		);
 	}
 
 	toString() {
-		return this.logs.map(log => `[${log.level}] ${log.message}`).join("\n");
+		return this.logs
+			.map((log) => `[${log.level}] ${log.message}`)
+			.join("\n");
 	}
 }
 
 export const defaultLoggerConfig: LoggerConfig = {
 	interceptors: [],
 	logs: [LogLevel.Debug, LogLevel.Info],
-};
+};

package/src/shared/context/globalContext.ts

@@ -1,8 +1,19 @@
+import type { LoggerService } from "../../core/services/log.service.js";
+
 export interface Context {
 	[key: string]: any;
+	services: Map<string, any>;
 }
 
-let globalContext: Context = {};
+let globalContext: Context = { services: new Map() };
+
+export function pushService(service: any, name: string) {
+	globalContext.services.set(name, service);
+}
+
+export function getService(name: string) {
+	return globalContext.services.get(name);
+}
 
 export function get(key: string) {
 	return globalContext[key];

package/src/shared/manager/baseManager.ts

@@ -7,12 +7,14 @@ export class OcatManager {
 	public message: string;
 	public color: ChalkInstance;
 	public level: LogLevel;
+	public printFn: (message: string) => void;
 
 	constructor(name: string, color: ChalkInstance, level: LogLevel) {
 		this.name = name;
 		this.message = "";
 		this.color = color;
 		this.level = level;
+		this.printFn = console.log;
 	}
 
 	toString(line: number | undefined = undefined): string {
@@ -31,9 +33,9 @@ export class OcatManager {
 	}
 
 	throw(line: number | undefined = undefined): never {
-		console.log(this.toString(line));
-		const log = ctx.get("services").log;
-		log.log(this.build(line), this.level);
+		const log = ctx.get("services")?.log;
+		const message = this.build(line);
+		log?.log(message, this.level, this.toString(line));
 		process.exit(1);
 	}
 }

package/src/shared/manager/warn/coreWarnings.ts

@@ -1,6 +1,6 @@
 import chalk from "chalk";
-import { OcatManager } from "../baseManager";
-import { LogLevel } from "../../../core/services/log.service";
+import { OcatManager } from "../baseManager.js";
+import { LogLevel } from "../../../core/services/log.service.js";
 
 export class OcatWarning extends OcatManager {
 	constructor(name: string) {

package/src/shared/models/func.ts

@@ -11,4 +11,4 @@ export interface Param {
 export interface Function {
 	body: AnyStatement[];
 	scope: CoreContext;
-}
+}

package/tsconfig.json

@@ -3,13 +3,13 @@
 		// Enable latest features
 		"lib": ["ESNext", "DOM"],
 		"target": "ESNext",
-		"module": "ESNext",
+
+		"module": "nodenext",
+		"moduleResolution": "nodenext",
 		"moduleDetection": "force",
 		"jsx": "react-jsx",
 		"allowJs": true,
 
-		// Bundler mode
-		"moduleResolution": "bundler",
 		"verbatimModuleSyntax": true,
 
 		// Best practices