oclang 0.3.0 → 1.2.2

package/src/cli/ocm/commands/index.ts

@@ -0,0 +1,2 @@
+export * from "./init.js"
+export * from "./run.js"

package/src/cli/ocm/commands/init.ts

@@ -0,0 +1,49 @@
+import inquirer from "inquirer";
+import chalk, { type ChalkInstance } from "chalk";
+import { chalkText } from "../../utils/chalkText.js";
+import { createProject } from "../../../project/index.js";
+import { fromCamelToDash } from "../../../shared/utils/strformat.js";
+
+interface Choice {
+	name: string;
+	color: ChalkInstance;
+}
+
+export async function init() {
+	const projectTypes: Choice[] = [{ name: "App", color: chalk.red }, { name: "Lib", color: chalk.yellow }];
+
+	const answers = await inquirer.prompt([
+		{
+			type: "input",
+			name: "name",
+			message: "How do you want to name your project?",
+			default: "myProject",
+		},
+		{
+			type: "input",
+			name: "dir",
+			message: "Where do you want to create your project?",
+			default: (answers) => answers.name,
+		},
+		{
+			type: "input",
+			name: "id",
+			message: "What is your project ID?",
+			default: (answers) => fromCamelToDash(answers.name),
+		},
+		{
+			type: "select",
+			name: "type",
+			message: "What type of project do you want to create?",
+			choices: projectTypes
+				.map((choice) => chalkText(choice.name, choice.color)),
+		}
+	]);
+
+	createProject({
+		name: answers.name,
+		dir: answers.dir,
+		type: answers.type,
+		id: answers.id,
+	})
+}

package/src/cli/ocm/commands/run.ts

@@ -0,0 +1,20 @@
+import path from "path";
+import { readJSON } from "../../../shared/io/json.js";
+import { runfile } from "../../ocat/commands/index.js";
+import * as context from "../../../shared/context/globalContext.js";
+import { defaultLoggerConfig, LoggerService } from "../../../core/services/log.service.js";
+
+export function run() {
+	const projectConfig = readJSON(path.join(".ocat", "config.json"));
+
+	context.set("isProject", true);
+	context.set("projectConfig", projectConfig);
+	context.set("services", {});
+	context.useObject("services", services => {
+		return {
+			log: new LoggerService(defaultLoggerConfig),
+		};
+	});
+
+	runfile(projectConfig.main, { force: false });
+}

package/src/cli/ocm/index.ts

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+import { Command } from "commander";
+
+import { init, run } from "./commands/index.js";
+
+const program = new Command();
+
+program.name("ocm").description("The Orange Cat manager").version("1.0.0");
+
+
+program
+	.command("initialize")
+	.alias("init")
+	.description("Initialize a new Orange Cat project")
+	.action(async () => { await init() });
+
+program
+	.command("run")
+	.description("Run the project")
+	.action(run);
+
+program.parse();

package/src/cli/utils/chalkText.ts

@@ -0,0 +1,8 @@
+import type { ChalkInstance } from "chalk";
+
+export function chalkText(text: string, color: ChalkInstance) {
+	return {
+		name: color(text),
+		value: text
+	}
+}

package/src/core/ast/astBuilder.ts

@@ -1,17 +1,7 @@
-import {
-	AlreadyDeclaredFunctionError,
-	AlreadyDeclaredVariableError,
-	CantModifyConstError,
-} from "../../shared/manager/errors/semantic/undefined/declared.js";
-import {
-	UndeclaredFunctionError,
-	UndeclaredVariableError,
-} from "../../shared/manager/errors/semantic/undefined/undeclared.js";
-import { type CoreContext } from "../context/coreContext.js";
+import { createCoreContext, type CoreContext } from "../context/coreContext.js";
 import { ValueType } from "../../shared/models/value.js";
 import { StatementKind } from "./types/base/index.js";
 import type { AnyStatement, PrintStatement } from "./types/statements/index.js";
-import { isNoSubstitutionTemplateLiteral } from "typescript";
 
 export type BuildType = AnyStatement | null;
 
@@ -130,7 +120,8 @@ const functionStatement: FBuilder = (statement: any) => {
 		if (!idToken) return null;
 		const id = idToken.image;
 
-		const body = funcStmt.children.statement ?? [];
+		const body = buildAst(funcStmt) ;
+
 		return {
 			kind: StatementKind.FunctionStatement,
 			sourceInfo: {
@@ -142,7 +133,10 @@ const functionStatement: FBuilder = (statement: any) => {
 				endColumn: funcStmt.endColumn,
 			},
 			id,
-			body,
+			func: {
+				body,
+				scope: createCoreContext(),
+			}
 		}
 	}
 	return null
@@ -165,8 +159,8 @@ const callStatement: FBuilder = (statement: any) => {
 				startColumn: callStmt.startColumn,
 				endColumn: callStmt.endColumn,
 			},
-			id
-		}
+			id,
+		};
 	}
-	return null
-}
+	return null;
+};

package/src/core/ast/types/base/index.ts

@@ -1,2 +1,2 @@
-export * from "./statement";
-export * from "./source";
+export * from "./statement.js";
+export * from "./source.js";

package/src/core/ast/types/statements/callStatement.ts

@@ -1,3 +1,4 @@
+import type { Value } from "../../../../shared/models/value";
 import type { Statement, StatementKind } from "../base";
 
 export interface CallStatement extends Statement {

package/src/core/ast/types/statements/functionStatement.ts

@@ -1,16 +1,8 @@
 import type { Statement, StatementKind } from "../base";
-import type { CallStatement } from "./callStatement";
-import type { PrintStatement } from "./printStatement";
-import type { VariableStatement } from "./variableStatement";
-
-export type AnyStatement =
-	| PrintStatement
-	| VariableStatement
-	| FunctionStatement
-	| CallStatement;
+import type { Function } from "../../../../shared/models/func";
 
 export interface FunctionStatement extends Statement {
 	kind: StatementKind.FunctionStatement;
 	id: string;
-	body: AnyStatement[];
+	func: Function;
 }

package/src/core/ast/types/statements/index.ts

@@ -1,4 +1,16 @@
+import type { FunctionStatement } from "./functionStatement";
+import type { PrintStatement } from "./printStatement";
+import type { VariableStatement } from "./variableStatement";
+import type { CallStatement } from "./callStatement";
+
 export * from "./printStatement";
 export * from "./variableStatement";
 export * from "./functionStatement";
-export * from "./callStatement";
+export * from "./callStatement";
+
+
+export type AnyStatement =
+	| PrintStatement
+	| VariableStatement
+	| FunctionStatement
+	| CallStatement;

package/src/core/index.ts

@@ -1,8 +1,10 @@
-import { ocatLexer } from "./lexer/tokens";
-import { OcatParser } from "./parser/parser";
-import { run } from "./runner/runner";
-import { createCoreContext } from "./context/coreContext";
-import { buildAst } from "./ast/astBuilder";
+import { ocatLexer } from "./lexer/tokens.js";
+import { OcatParser } from "./parser/parser.js";
+import { run } from "./runner/runner.js";
+import { createCoreContext } from "./context/coreContext.js";
+import { buildAst } from "./ast/astBuilder.js";
+import * as ctx from "../shared/context/globalContext.js";
+import fs from "fs";
 
 export function execute(code: string) {
 	const lexingResult = ocatLexer.tokenize(code);
@@ -10,7 +12,14 @@ export function execute(code: string) {
 	const parser = new OcatParser();
 	parser.input = lexingResult.tokens;
 	const cst = parser.program();
-	const ast = buildAst(cst, );
+	const ast = buildAst(cst);
+
+	process.on("exit", () => {
+		if (ctx.get("isProject")) {
+			const logs = ctx.get("services").log.toString();
+			fs.writeFileSync(".ocat/logs.txt", logs);
+		}
+	});
 
 	const context = createCoreContext();
 	run(ast, context);

package/src/core/lexer/tokens/delimiters.ts

@@ -12,4 +12,6 @@ export const RightBracket = createToken({ name: "RightBracket", pattern: /\]/ })
 export const LeftTag = createToken({ name: "LeftTag", pattern: /</ });
 export const RightTag = createToken({ name: "RightTag", pattern: />/ });
 
-export const delimiters = [LeftParen, RightParen, LeftBrace, RightBrace, LeftBracket, RightBracket, LeftTag, RightTag];
+export const Comma = createToken({ name: "Comma", pattern: /,/ });
+
+export const delimiters = [LeftParen, RightParen, LeftBrace, RightBrace, LeftBracket, RightBracket, LeftTag, RightTag, Comma];

package/src/core/runner/runner.ts

@@ -7,11 +7,12 @@ import {
 	UndeclaredFunctionError,
 	UndeclaredVariableError,
 } from "../../shared/manager/errors/semantic/undefined/undeclared.js";
-import { type CoreContext } from "../context/coreContext.js";
+import { createCoreContext, type CoreContext } from "../context/coreContext.js";
 import { ValueType } from "../../shared/models/value.js";
 import { solveString } from "./utils/string.js";
 import type { AnyStatement, CallStatement, FunctionStatement, PrintStatement, VariableStatement } from "../ast/types/statements/index.js";
 import { StatementKind } from "../ast/types/base/statement.js";
+import * as ctx from "../../shared/context/globalContext.js";
 
 export function run(ast: AnyStatement[], context: CoreContext) {
 
@@ -56,11 +57,13 @@ function printStatement(statement: PrintStatement, context: CoreContext) {
 			val = statement.value.value;
 			break;
 	}
-	console.log(val);
+	const info = ctx.get("services").log;
+	info.info(val);
 }
 
 function variableStatement(statement: VariableStatement, context: CoreContext) {
 	const varId = statement.id;
+
 	if (statement.set) {
 		if (!context.variables[varId]) {
 			new UndeclaredVariableError(varId).throw(
@@ -110,9 +113,11 @@ function functionStatement(statement: FunctionStatement, context: CoreContext) {
 		new AlreadyDeclaredFunctionError(idToken).throw(statement.sourceInfo.startLine);
 	}
 
-	const body = statement.body ?? [];
+	const body = statement.func.body ?? [];
+	const scope = statement.func.scope;
 	context.functions[idToken] = {
 		body,
+		scope,
 	};
 }
 
@@ -124,5 +129,5 @@ function callStatement(statement: CallStatement, context: CoreContext) {
 	if (!funcData) {
 		new UndeclaredFunctionError(funcId).throw(statement.sourceInfo.startLine);
 	}
-	run(funcData.body, context);
+	run(funcData.body, context.functions[funcId].scope);
 }

package/src/core/runner/utils/string.ts

@@ -1,6 +1,6 @@
-import { OcatError } from "../../../shared/manager/errors/coreErrors";
-import { UndeclaredVariableError } from "../../../shared/manager/errors/semantic/undefined/undeclared";
-import type { CoreContext } from "../../context/coreContext";
+import { OcatError } from "../../../shared/manager/errors/coreErrors.js";
+import { UndeclaredVariableError } from "../../../shared/manager/errors/semantic/undefined/undeclared.js";
+import type { CoreContext } from "../../context/coreContext.js";
 
 export function solveString(input: string, context: CoreContext, err: (err: OcatError) => void): string {
 	let str: string = input;

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

@@ -0,0 +1,77 @@
+export enum LogLevel {
+	Debug = "DEBUG",
+	Info = "INFO",
+	Warning = "WARNING",
+	Error = "ERROR",
+}
+
+export interface Log {
+	message: string;
+	level: LogLevel;
+}
+
+export interface LoggerConfig { 
+	interceptors: {
+		onLog: (message: string) => string;
+		level: LogLevel;
+	}[];
+	logs: LogLevel[];
+}
+
+export class LoggerService {
+	private logs: Log[] = [];
+	private config: LoggerConfig;
+
+	constructor(config: LoggerConfig) {
+		this.config = config;
+	}
+
+	log (message: string, level: LogLevel = LogLevel.Info) {
+		this.logs.push({ message, level });
+		this.config.interceptors.forEach(interceptor => {
+			if (interceptor.level === level) {
+				message = interceptor.onLog(message);
+			}
+		});
+		if (this.config.logs.includes(level)) {
+			console.log(message);
+		}
+	}
+
+	debug (message: string) {
+		this.log(message, LogLevel.Debug);
+	}
+
+	info (message: string) {
+		this.log(message, LogLevel.Info);
+	}
+
+	warning (message: string) {
+		this.log(message, LogLevel.Warning);
+	}
+
+	error (message: string) {
+		this.log(message, LogLevel.Error);
+	}
+
+	getLogs () {
+		return this.logs;
+	}
+
+	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);
+	}
+
+	toString() {
+		return this.logs.map(log => `[${log.level}] ${log.message}`).join("\n");
+	}
+}
+
+export const defaultLoggerConfig: LoggerConfig = {
+	interceptors: [],
+	logs: [LogLevel.Debug, LogLevel.Info],
+};

package/src/project/index.ts

@@ -0,0 +1,37 @@
+import fs from 'fs';
+import path from 'path';
+
+import { ProjectType, type ProjectSettings } from "./models/project.js";
+import { addIf } from '../shared/utils/objects.js';
+
+export function createProject(ps: ProjectSettings) {
+	const projectPath = path.resolve(ps.dir);
+	
+	fs.mkdirSync(path.join(projectPath, "src"), { recursive: true });
+	fs.mkdirSync(path.join(projectPath, "connection"), { recursive: true });
+	fs.mkdirSync(path.join(projectPath, ".ocat"), { recursive: true });
+
+	const mainFile = path.join(projectPath, "src", "main.ocat");
+	if (ps.type !== ProjectType.Lib) {
+		fs.writeFileSync(
+			mainFile,
+			'print("Hello World!")'
+		);
+	}
+
+	fs.writeFileSync(
+		path.join(projectPath, ".ocat", "config.json"),
+		JSON.stringify(
+			{
+				name: ps.name,
+				version: "1.0.0",
+				description: "",
+				id: ps.id,
+				...addIf(ps.type !== ProjectType.Lib, { main: path.join("src", "main.ocat") }),
+				type: ps.type.toLowerCase(),
+			},
+			null,
+			4
+		)
+	);
+}

package/src/project/models/project.ts

@@ -0,0 +1,11 @@
+export enum ProjectType {
+	App = "App",
+	Lib = "Lib",
+}
+
+export interface ProjectSettings {
+	name: string;
+	dir: string;
+	id: string;
+	type: ProjectType;
+}

package/src/project/utils/project.ts

@@ -0,0 +1,12 @@
+import { ProjectType } from "../models/project.js";
+
+export function toProjectType(type: string): ProjectType {
+	switch (type) {
+		case "App":
+			return ProjectType.App;
+		case "Lib":
+			return ProjectType.Lib;
+		default:
+			return ProjectType.App;
+	}
+}

package/src/shared/context/globalContext.ts

@@ -0,0 +1,25 @@
+export interface Context {
+	[key: string]: any;
+}
+
+let globalContext: Context = {};
+
+export function get(key: string) {
+	return globalContext[key];
+}
+
+export function set(key: string, value: any) {
+	globalContext[key] = value;
+}
+
+export function useArray(key: string, modify: (array: any[]) => any[]) {
+	set(key, modify(get(key)));
+}
+
+export function useObject(key: string, modify: (object: any) => any) {
+	set(key, modify(get(key)));
+}
+
+export function useContext(modify: (context: Context) => Context) {
+	globalContext = modify(globalContext);
+}

package/src/shared/io/json.ts

@@ -0,0 +1,9 @@
+import fs from "fs"
+
+export function readJSON(file: string) {
+	return JSON.parse(fs.readFileSync(file, "utf8"));
+}
+
+export function writeJSON(path: string, data: any) {
+	fs.writeFileSync(path, JSON.stringify(data, null, 4));
+}

package/src/shared/manager/baseManager.ts

@@ -1,24 +1,39 @@
 import chalk, { type ChalkInstance } from "chalk";
+import * as ctx from "../context/globalContext.js";
+import type { LogLevel } from "../../core/services/log.service.js";
 
 export class OcatManager {
 	public name: string;
 	public message: string;
 	public color: ChalkInstance;
+	public level: LogLevel;
 
-	constructor(name: string, color: ChalkInstance) {
+	constructor(name: string, color: ChalkInstance, level: LogLevel) {
 		this.name = name;
 		this.message = "";
 		this.color = color;
+		this.level = level;
 	}
 
 	toString(line: number | undefined = undefined): string {
-		return `${this.color.bold(this.name)} ${
-			line && chalk.gray(`at line ${line}`)
+		return `${this.color.bold(this.name)}${
+			line ? chalk.gray(` at line ${line}`) : ""
 		}: ${this.color.italic(this.message)}`;
 	}
 
-	throw(line: number) {
+	build(line: number | undefined = undefined): string {
+		return `${this.name}${line ?? ""}: ${this.message}`;
+	}
+
+	setMessage(message: string): this {
+		this.message = message;
+		return this;
+	}
+
+	throw(line: number | undefined = undefined): never {
 		console.log(this.toString(line));
+		const log = ctx.get("services").log;
+		log.log(this.build(line), this.level);
 		process.exit(1);
 	}
 }

package/src/shared/manager/errors/coreErrors.ts

@@ -1,10 +1,9 @@
 import chalk from "chalk";
-import { OcatManager } from "../baseManager";
+import { OcatManager } from "../baseManager.js";
+import { LogLevel } from "../../../core/services/log.service.js";
 
 export class OcatError extends OcatManager {
 	constructor(name: string) {
-		super(name, chalk.red);
+		super(name, chalk.red, LogLevel.Error);
 	}
 }
-
-export * from "./api";

package/src/shared/manager/errors/io/extension.ts

@@ -0,0 +1,8 @@
+import { OcatError } from "../coreErrors.js";
+
+export class ExtensionError extends OcatError {
+	constructor(message: string) {
+		super("ExtensionError");
+		this.setMessage(message);
+	}
+}

package/src/shared/manager/errors/io/file.ts

@@ -0,0 +1,8 @@
+import { OcatError } from "../coreErrors.js";
+
+export class FileDoesntExistError extends OcatError {
+	constructor(message: string) {
+		super("FileDoesn'tExistError");
+		this.setMessage(message);
+	}
+}

package/src/shared/manager/errors/semantic/undefined/declared.ts

@@ -1,10 +1,10 @@
-import { ContextType } from "../../../../../core/context/contextType";
-import { OcatError } from "../../coreErrors";
+import { ContextType } from "../../../../../core/context/contextType.js";
+import { OcatError } from "../../coreErrors.js";
 
 export class AlreadyDeclaredError extends OcatError {
 	constructor(varName: string, type: ContextType) {
 		super(`Already declared ${type.toLowerCase()}`);
-		this.message = `${type} ${varName} is already declared`;
+		this.setMessage(`${type} ${varName} is already declared`);
 	}
 }
 
@@ -23,6 +23,6 @@ export class AlreadyDeclaredFunctionError extends AlreadyDeclaredError {
 export class CantModifyConstError extends OcatError {
 	constructor(varName: string) {
 		super(`Can't modify const variable`);
-		this.message = `Variable ${varName} is const and can't be modified`;
+		this.setMessage(`Variable ${varName} is const and can't be modified`);
 	}
 }

package/src/shared/manager/errors/semantic/undefined/undeclared.ts

@@ -1,10 +1,10 @@
-import { ContextType } from "../../../../../core/context/contextType";
-import { OcatError } from "../../coreErrors";
+import { ContextType } from "../../../../../core/context/contextType.js";
+import { OcatError } from "../../coreErrors.js";
 
 export class UndeclaredError extends OcatError {
 	constructor(varName: string, type: ContextType) {
 		super(`Undeclared ${type.toLowerCase()}`);
-		this.message = `${type} ${varName} is not declared`;
+		this.setMessage(`${type} ${varName} is not declared`);
 	}
 }
 

package/src/shared/manager/errors/syntax/syntaxErrors.ts

@@ -3,6 +3,6 @@ import { OcatError } from "../coreErrors.js";
 export class SyntaxError extends OcatError {
 	constructor(message: string) {
 		super("SyntaxError");
-		this.message = message;
+		this.setMessage(message);
 	}
 }

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

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

package/src/shared/models/func.ts

@@ -1,5 +1,14 @@
 import type { AnyStatement } from "../../core/ast/types/statements/index.js";
+import type { CoreContext } from "../../core/context/coreContext.js";
+import type { ValueType } from "./value.js";
+import type { Variable } from "./var.js";
+
+export interface Param {
+	type: ValueType;
+	name: string;
+}
 
 export interface Function {
 	body: AnyStatement[];
+	scope: CoreContext;
 }

package/src/shared/utils/objects.ts

@@ -0,0 +1,7 @@
+export function addIf<T>(cond: boolean, value: T) {
+	return cond ? value : undefined;
+}
+
+export function addIfElse<T>(cond: boolean, value: T, elseValue: T) {
+	return cond ? value : elseValue;
+}