oclang 1.2.3 → 1.3.2

package/.gitattributes

@@ -0,0 +1,7 @@
+# Default
+* text=auto eol=lf
+
+# Windows scripts
+*.ps1 text eol=crlf
+*.bat text eol=crlf
+*.cmd text eol=crlf

package/BUG_REGISTRY.md

@@ -7,9 +7,14 @@ BUG-\<BUG-NUMBER>\<BUG-PART>-\<VERSION>-\<VERSION-FORMAT>
 ## 1.X.X bugs
 
 - BUG-002A-100-MmP: CLI always uses force mode
-- BUG-002B-101-MmP: The errors in the CLI shows 'undefined'
+- BUG-002B-100-MmP: The errors in the CLI shows 'undefined'
 - BUG-002C-100-MmP: Dist folder is not created
 
+### 1.3.0 bugs
+
+- BUG-003A-130-MmP: Variables don't work and prints don't work
+- BUG-003B-130-MmP: GitAttributes file is not loaded
+
 ## 0.3.0 bugs
 
 - BUG-001A-030-MmP: Functions don't work

package/CHANGELOG.md

@@ -12,6 +12,20 @@ PATCH version when you make backwards-compatible bug fixes.
 
 ## 1.X.X - Beta and CLI
 
+### 1.3.0 - Imports and migration
+
+- Migration to Nodenext in TSconfig
+- Runner structure updated
+- Log system added
+
+#### 1.3.2 - BUG-003B-130-MmP
+
+- BUG-003B-130-MmP: GitAttributes file is not loaded
+
+#### 1.3.1 - BUG-003A-130-MmP
+
+- BUG-003A-130-MmP: Variables and prints don't work
+
 ### 1.2.0 - OCM
 
 - OCM mode added
@@ -32,7 +46,7 @@ PATCH version when you make backwards-compatible bug fixes.
 
 - BUG-002C-100-MmP: Dist folder is not created
 
-#### 1.1.1 - BUG-002B-101-MmP
+#### 1.1.1 - BUG-002B-100-MmP
 
 - BUG-002B-100-MmP: The errors in the CLI shows 'undefined'
 - FileDoesntExistError and ExtensionError added

package/README.md

@@ -13,3 +13,5 @@ bun run src/index.ts
 ```
 
 This project was created using `bun init` in bun v1.1.33. [Bun](https://bun.sh) is a fast all-in-one JavaScript runtime.
+
+XX

package/dist/cli/ocm/commands/run.js

@@ -8,10 +8,5 @@ export function run() {
     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/dist/core/ast/astBuilder.js

@@ -1,150 +1,26 @@
-import { createCoreContext } from "../context/coreContext.js";
-import { ValueType } from "../../shared/models/value.js";
-import { StatementKind } from "./types/base/index.js";
+import { ioStatements } from "./statements/io.js";
+import { variableStatements } from "./statements/vars.js";
+import { functionStatements } from "./statements/function.js";
+import { importStatements } from "./statements/import.js";
+const possibleStatements = [
+    ...ioStatements,
+    ...variableStatements,
+    ...functionStatements,
+    ...importStatements,
+];
 export function buildAst(cst) {
     const statements = cst.children.statement ?? [];
     const ast = [];
-    for (const statement of statements) {
-        let __tmp = null;
-        const __$tmp = () => { if (__tmp)
-            ast.push(__tmp); };
-        __tmp = printStatement(statement);
-        __$tmp();
-        __tmp = variableStatement(statement);
-        __$tmp();
-        __tmp = functionStatement(statement);
-        __$tmp();
-        __tmp = callStatement(statement);
-        __$tmp();
-    }
-    return ast;
-}
-const printStatement = (statement) => {
-    const printStmt = statement.children.printStatement?.[0];
-    if (printStmt) {
-        const strToken = printStmt.children.StringLiteral?.[0];
-        if (strToken) {
-            return {
-                kind: StatementKind.PrintStatement,
-                sourceInfo: {
-                    tokens: printStmt.children,
-                    cstNode: printStmt,
-                    startLine: printStmt.startLine,
-                    endLine: printStmt.endLine,
-                    startColumn: printStmt.startColumn,
-                    endColumn: printStmt.endColumn,
-                },
-                value: {
-                    value: strToken.image,
-                    type: ValueType.String,
-                }
-            };
+    for (const node of statements) {
+        let built = null;
+        for (const builder of possibleStatements) {
+            built = builder(node);
+            if (built)
+                break;
         }
-        const idToken = printStmt.children.Identifier?.[0];
-        if (idToken) {
-            return {
-                kind: StatementKind.PrintStatement,
-                sourceInfo: {
-                    tokens: printStmt.children,
-                    cstNode: printStmt,
-                    startLine: printStmt.startLine,
-                    endLine: printStmt.endLine,
-                    startColumn: printStmt.startColumn,
-                    endColumn: printStmt.endColumn,
-                },
-                value: {
-                    value: idToken.image,
-                    type: ValueType.Identifier,
-                }
-            };
+        if (built) {
+            ast.push(built);
         }
     }
-    return null;
-};
-const variableStatement = (statement) => {
-    const varStmt = statement.children.variableStatement?.[0];
-    if (varStmt) {
-        const typeToken = varStmt.children.VarType?.[0];
-        const idToken = varStmt.children.Identifier?.[0];
-        const valueToken = varStmt.children.StringLiteral?.[0] ??
-            varStmt.children.NumberLiteral?.[0] ??
-            varStmt.children.BooleanLiteral?.[0];
-        if (!typeToken || !idToken || !valueToken)
-            return null;
-        const setToken = varStmt.children.Set?.[0];
-        const constToken = varStmt.children.Const?.[0];
-        const type = typeToken.image;
-        const id = idToken.image;
-        const value = valueToken.image;
-        return {
-            kind: StatementKind.VariableStatement,
-            sourceInfo: {
-                tokens: varStmt.children,
-                cstNode: varStmt,
-                startLine: varStmt.startLine,
-                endLine: varStmt.endLine,
-                startColumn: varStmt.startColumn,
-                endColumn: varStmt.endColumn,
-            },
-            id,
-            var: {
-                type,
-                value,
-                props: {
-                    isConst: !!constToken,
-                }
-            },
-            set: !!setToken,
-        };
-    }
-    return null;
-};
-const functionStatement = (statement) => {
-    const funcStmt = statement.children.functionStatement?.[0];
-    if (funcStmt) {
-        const idToken = funcStmt.children.Identifier?.[0];
-        if (!idToken)
-            return null;
-        const id = idToken.image;
-        const body = buildAst(funcStmt);
-        return {
-            kind: StatementKind.FunctionStatement,
-            sourceInfo: {
-                tokens: funcStmt.children,
-                cstNode: funcStmt,
-                startLine: funcStmt.startLine,
-                endLine: funcStmt.endLine,
-                startColumn: funcStmt.startColumn,
-                endColumn: funcStmt.endColumn,
-            },
-            id,
-            func: {
-                body,
-                scope: createCoreContext(),
-            }
-        };
-    }
-    return null;
-};
-const callStatement = (statement) => {
-    const callStmt = statement.children.callStatement?.[0];
-    if (callStmt) {
-        const idToken = callStmt.children.Identifier?.[0];
-        if (!idToken)
-            return null;
-        const id = idToken.image;
-        return {
-            kind: StatementKind.CallStatement,
-            sourceInfo: {
-                tokens: callStmt.children,
-                cstNode: callStmt,
-                startLine: callStmt.startLine,
-                endLine: callStmt.endLine,
-                startColumn: callStmt.startColumn,
-                endColumn: callStmt.endColumn,
-            },
-            id,
-        };
-    }
-    return null;
-};
+    return ast;
+}

package/dist/core/ast/statements/_base.js

@@ -0,0 +1 @@
+export {};

package/dist/core/ast/statements/function.js

@@ -0,0 +1,53 @@
+import { createCoreContext } from "../../context/coreContext.js";
+import { buildAst } from "../astBuilder.js";
+import { StatementKind } from "../types/base/index.js";
+const functionStatement = (statement) => {
+    const funcStmt = statement.children.functionStatement?.[0];
+    if (funcStmt) {
+        const idToken = funcStmt.children.Identifier?.[0];
+        if (!idToken)
+            return null;
+        const id = idToken.image;
+        const body = buildAst(funcStmt);
+        return {
+            kind: StatementKind.FunctionStatement,
+            sourceInfo: {
+                tokens: funcStmt.children,
+                cstNode: funcStmt,
+                startLine: funcStmt.startLine,
+                endLine: funcStmt.endLine,
+                startColumn: funcStmt.startColumn,
+                endColumn: funcStmt.endColumn,
+            },
+            id,
+            func: {
+                body,
+                scope: createCoreContext(),
+            },
+        };
+    }
+    return null;
+};
+const callStatement = (statement) => {
+    const callStmt = statement.children.callStatement?.[0];
+    if (callStmt) {
+        const idToken = callStmt.children.Identifier?.[0];
+        if (!idToken)
+            return null;
+        const id = idToken.image;
+        return {
+            kind: StatementKind.CallStatement,
+            sourceInfo: {
+                tokens: callStmt.children,
+                cstNode: callStmt,
+                startLine: callStmt.startLine,
+                endLine: callStmt.endLine,
+                startColumn: callStmt.startColumn,
+                endColumn: callStmt.endColumn,
+            },
+            id,
+        };
+    }
+    return null;
+};
+export const functionStatements = [functionStatement, callStatement];

package/dist/core/ast/statements/import.js

@@ -0,0 +1,16 @@
+import { StatementKind } from "../types/base/index.js";
+const importStatement = (statement) => {
+    const node = statement.children.importStatement?.[0];
+    if (!node)
+        return null;
+    const stringToken = node.children.StringLiteral?.[0];
+    if (!stringToken)
+        return null;
+    const rawValue = stringToken.image;
+    const path = rawValue.slice(1, -1);
+    return {
+        kind: StatementKind.ImportStatement,
+        path,
+    };
+};
+export const importStatements = [importStatement];

package/dist/core/ast/statements/io.js

@@ -0,0 +1,45 @@
+import { ValueType } from "../../../shared/models/value.js";
+import { StatementKind } from "../types/base/index.js";
+const printStatement = (statement) => {
+    const printStmt = statement.children.printStatement?.[0];
+    if (printStmt) {
+        const strToken = printStmt.children.StringLiteral?.[0];
+        if (strToken) {
+            return {
+                kind: StatementKind.PrintStatement,
+                sourceInfo: {
+                    tokens: printStmt.children,
+                    cstNode: printStmt,
+                    startLine: printStmt.startLine,
+                    endLine: printStmt.endLine,
+                    startColumn: printStmt.startColumn,
+                    endColumn: printStmt.endColumn,
+                },
+                value: {
+                    value: strToken.image,
+                    type: ValueType.String,
+                },
+            };
+        }
+        const idToken = printStmt.children.Identifier?.[0];
+        if (idToken) {
+            return {
+                kind: StatementKind.PrintStatement,
+                sourceInfo: {
+                    tokens: printStmt.children,
+                    cstNode: printStmt,
+                    startLine: printStmt.startLine,
+                    endLine: printStmt.endLine,
+                    startColumn: printStmt.startColumn,
+                    endColumn: printStmt.endColumn,
+                },
+                value: {
+                    value: idToken.image,
+                    type: ValueType.Identifier,
+                },
+            };
+        }
+    }
+    return null;
+};
+export const ioStatements = [printStatement];

package/dist/core/ast/statements/vars.js

@@ -0,0 +1,37 @@
+import { StatementKind } from "../types/base/index.js";
+const variableStatement = (statement) => {
+    const varStmt = statement.children.variableStatement?.[0];
+    if (!varStmt)
+        return null;
+    const typeToken = varStmt.children.VarType?.[0];
+    const idToken = varStmt.children.Identifier?.[0];
+    const valueToken = varStmt.children.StringLiteral?.[0] ??
+        varStmt.children.NumberLiteral?.[0] ??
+        varStmt.children.BooleanLiteral?.[0];
+    if (!typeToken || !idToken || !valueToken)
+        return null;
+    const type = typeToken.image;
+    const id = idToken.image;
+    const value = valueToken.image;
+    return {
+        kind: StatementKind.VariableStatement,
+        sourceInfo: {
+            tokens: varStmt.children,
+            cstNode: varStmt,
+            startLine: varStmt.startLine,
+            endLine: varStmt.endLine,
+            startColumn: varStmt.startColumn,
+            endColumn: varStmt.endColumn,
+        },
+        id,
+        var: {
+            type,
+            value,
+            props: {
+                isConst: false,
+            },
+        },
+        set: false,
+    };
+};
+export const variableStatements = [variableStatement];

package/dist/core/ast/types/base/statement.js

@@ -4,4 +4,5 @@ export var StatementKind;
     StatementKind[StatementKind["VariableStatement"] = 1] = "VariableStatement";
     StatementKind[StatementKind["FunctionStatement"] = 2] = "FunctionStatement";
     StatementKind[StatementKind["CallStatement"] = 3] = "CallStatement";
+    StatementKind[StatementKind["ImportStatement"] = 4] = "ImportStatement";
 })(StatementKind || (StatementKind = {}));

package/dist/core/ast/types/statements/importStatement.js

@@ -0,0 +1 @@
+export {};

package/dist/core/ast/types/statements/index.js

@@ -1,4 +1,5 @@
-export * from "./printStatement";
-export * from "./variableStatement";
-export * from "./functionStatement";
-export * from "./callStatement";
+export * from "./printStatement.js";
+export * from "./variableStatement.js";
+export * from "./functionStatement.js";
+export * from "./callStatement.js";
+export * from "./importStatement.js";

package/dist/core/index.js

@@ -3,8 +3,9 @@ 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 * as gctx from "../shared/context/globalContext.js";
 import fs from "fs";
+import { defaultLoggerConfig, LoggerService } from "./services/log.service.js";
 export function execute(code) {
     const lexingResult = ocatLexer.tokenize(code);
     const parser = new OcatParser();
@@ -12,11 +13,12 @@ export function execute(code) {
     const cst = parser.program();
     const ast = buildAst(cst);
     process.on("exit", () => {
-        if (ctx.get("isProject")) {
-            const logs = ctx.get("services").log.toString();
+        if (gctx.get("isProject")) {
+            const logs = gctx.get("services").log.toString();
             fs.writeFileSync(".ocat/logs.txt", logs);
         }
     });
-    const context = createCoreContext();
-    run(ast, context);
+    gctx.pushService(new LoggerService(defaultLoggerConfig), "log");
+    const ctx = run(ast, createCoreContext());
+    return ctx;
 }

package/dist/core/lexer/tokens/keywords.js

@@ -1,3 +1,4 @@
 import { createToken } from "chevrotain";
 export const Output = createToken({ name: "Output", pattern: /print/ });
-export const keywords = [Output];
+export const Import = createToken({ name: "Import", pattern: /import/ });
+export const keywords = [Output, Import];

package/dist/core/parser/parser.js

@@ -3,9 +3,7 @@ import { ValueType } from "../../shared/models/value.js";
 import * as token from "../lexer/tokens/index.js";
 export class OcatParser extends CstParser {
     constructor() {
-        super(token.allTokens, {
-            recoveryEnabled: true,
-        });
+        super(token.allTokens, { recoveryEnabled: true });
         this.performSelfAnalysis();
     }
     program = this.RULE("program", () => {
@@ -13,6 +11,11 @@ export class OcatParser extends CstParser {
     });
     statement = this.RULE("statement", () => {
         this.OR([
+            {
+                ALT: () => this.SUBRULE(this.importStatement, {
+                    LABEL: "importStatement",
+                }),
+            },
             {
                 ALT: () => this.SUBRULE(this.printStatement, {
                     LABEL: "printStatement",
@@ -35,8 +38,13 @@ export class OcatParser extends CstParser {
             },
         ]);
     });
+    importStatement = this.RULE("importStatement", () => {
+        const imp = this.CONSUME(token.Import);
+        const path = this.CONSUME(token.StringLiteral);
+        // opcional: guardar tokens para el AST
+    });
     printStatement = this.RULE("printStatement", () => {
-        this.CONSUME(token.Output);
+        const output = this.CONSUME(token.Output);
         this.CONSUME(token.LeftParen);
         this.OR([
             ...token.literals.map((lit) => ({
@@ -49,16 +57,10 @@ export class OcatParser extends CstParser {
         this.CONSUME(token.RightParen);
     });
     variableStatement = this.RULE("variableStatement", () => {
-        this.OPTION(() => {
-            this.OR([
-                { ALT: () => this.CONSUME(token.Set, { LABEL: "Set" }) },
-                { ALT: () => this.CONSUME(token.Const, { LABEL: "Const" }) },
-            ]);
-        });
-        const type = this.CONSUME(token.VarType).image;
-        this.CONSUME(token.Identifier);
+        const typeToken = this.CONSUME(token.VarType);
+        const idToken = this.CONSUME(token.Identifier);
         this.CONSUME(token.Assign);
-        switch (type) {
+        switch (typeToken.image) {
             case ValueType.String:
                 this.CONSUME(token.StringLiteral);
                 break;
@@ -69,10 +71,22 @@ export class OcatParser extends CstParser {
                 this.CONSUME(token.BooleanLiteral);
                 break;
         }
+        return {
+            typeToken, idToken
+        };
     });
     functionStatement = this.RULE("functionStatement", () => {
-        this.CONSUME(token.Function);
-        this.CONSUME(token.Identifier);
+        const funcKeyword = this.CONSUME(token.Function);
+        const idToken = this.CONSUME(token.Identifier);
+        this.CONSUME(token.LeftParen);
+        this.MANY_SEP({
+            SEP: token.Comma,
+            DEF: () => {
+                this.CONSUME(token.VarType);
+                this.CONSUME2(token.Identifier);
+            },
+        });
+        this.CONSUME(token.RightParen);
         this.CONSUME(token.LeftBrace);
         this.MANY(() => this.SUBRULE(this.statement));
         this.CONSUME(token.RightBrace);
@@ -80,5 +94,18 @@ export class OcatParser extends CstParser {
     callStatement = this.RULE("callStatement", () => {
         this.CONSUME(token.Call);
         this.CONSUME(token.Identifier);
+        this.CONSUME(token.LeftParen);
+        this.MANY_SEP({
+            SEP: token.Comma,
+            DEF: () => {
+                this.OR([
+                    ...token.literals.map((lit) => ({
+                        ALT: () => this.CONSUME(lit),
+                    })),
+                    { ALT: () => this.CONSUME2(token.Identifier) },
+                ]);
+            },
+        });
+        this.CONSUME(token.RightParen);
     });
 }

package/dist/core/runner/funcs/_base.js

@@ -0,0 +1 @@
+export {};

package/dist/core/runner/funcs/functions.js

@@ -0,0 +1,28 @@
+import { AlreadyDeclaredFunctionError } from "../../../shared/manager/errors/semantic/undefined/declared.js";
+import { UndeclaredFunctionError } from "../../../shared/manager/errors/semantic/undefined/undeclared.js";
+import { run } from "../runner.js";
+export const functionStatement = (statement, context) => {
+    const idToken = statement.id;
+    if (!idToken)
+        return;
+    const funcData = context.functions[idToken];
+    if (funcData) {
+        new AlreadyDeclaredFunctionError(idToken).throw(statement.sourceInfo.startLine);
+    }
+    const body = statement.func.body ?? [];
+    const scope = statement.func.scope;
+    context.functions[idToken] = {
+        body,
+        scope,
+    };
+};
+export const callStatement = (statement, context) => {
+    const funcId = statement.id;
+    if (!funcId)
+        return;
+    const funcData = context.functions[funcId];
+    if (!funcData) {
+        new UndeclaredFunctionError(funcId).throw(statement.sourceInfo.startLine);
+    }
+    run(funcData.body, funcData.scope);
+};

package/dist/core/runner/funcs/io.js

@@ -0,0 +1,29 @@
+import { UndeclaredVariableError } from "../../../shared/manager/errors/semantic/undefined/undeclared.js";
+import { ValueType } from "../../../shared/models/value.js";
+import { solveString } from "../utils/string.js";
+import * as ctx from "../../../shared/context/globalContext.js";
+export const printStatement = (statement, context) => {
+    let val;
+    switch (statement.value.type) {
+        case ValueType.Identifier:
+            const id = statement.value.value;
+            const varData = context.variables[id];
+            if (varData !== undefined) {
+                val = varData.value;
+            }
+            else {
+                new UndeclaredVariableError(id).throw(statement.sourceInfo.startLine);
+            }
+            break;
+        case ValueType.String:
+            val = solveString(statement.value.value, context, (err) => {
+                err.throw(statement.sourceInfo.startLine);
+            });
+            break;
+        default:
+            val = statement.value.value;
+            break;
+    }
+    const info = ctx.getService("log");
+    info?.info(val);
+};

package/dist/core/runner/funcs/modules.js

@@ -0,0 +1,11 @@
+import { execute } from "../../index.js";
+import fs from "fs";
+export const importStatement = (statement, context) => {
+    const fctx = execute(fs.readFileSync(statement.path).toString());
+    for (const [key, value] of Object.entries(fctx.variables)) {
+        context.variables[key] = value;
+    }
+    for (const [key, value] of Object.entries(fctx.functions)) {
+        context.functions[key] = value;
+    }
+};