mlogjs 0.2.0 → 0.2.1

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2021 STR1Z
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+MIT License
+
+Copyright (c) 2021 Wei
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1,18 +1,68 @@
-# MlogJS
-
-MlogJS is a compiler that allows users to compile complex JavaScript programs into Mindustry Logic Code.
-
-## Discord
-
-You can join the Discord server for more information and help.
-
-https://discord.gg/SvgjCtZnR5
-
-## Getting started!
-
-```
-npm i mlogjs -g
-```
-
-After installing the package from NPM, please visit the docs.
-https://weisrc.github.io/mlogjs/
+<div markdown="1" align="center">
+
+[![mlogjs](https://weisrc.github.io/mlogjs/logo.png)][docs]
+
+# **JavaScript [MLog](https://mindustrygame.github.io/wiki/logic/0-introduction/) Compiler**
+
+[![ci](https://github.com/weisrc/mlogjs/actions/workflows/ci.yml/badge.svg)][ci]
+[![npm](https://img.shields.io/npm/v/mlogjs?color=cb3837&logo=npm)][npm]
+[![docs](https://img.shields.io/badge/docs-mlogjs-41B883?logo=readthedocs)][docs]
+
+</div>
+
+## Features
+
+- Optimzing compiler
+- Easy to use
+- Fully Typed API
+- Macros
+- All Instructions and Variables
+
+## Installation
+
+#### In the terminal
+
+```sh
+npm i -g mlogjs
+```
+
+## Usage
+
+#### Creating `hello.js`
+
+```js
+const message1 = getBuilding("message1")
+print("Hello world")
+printFlush(message1)
+```
+
+#### Compile
+
+```sh
+mlogjs hello.js hello.mlog
+```
+
+## Resources
+
+- [Discord](https://discord.gg/SvgjCtZnR5)
+- [Documentation][docs]
+- [NPM package][npm]
+- [GitHub Action CI][ci]
+
+## Maintainers
+
+Massive thanks to [@JeanJPNM](https://github.com/JeanJPNM) for adding new features!
+
+## Contribute
+
+Help and suggestions are welcomed!
+
+## License
+
+MIT
+
+<!-- url -->
+
+[npm]: https://www.npmjs.com/package/mlogjs
+[ci]: https://github.com/weisrc/mlogjs/actions/workflows/ci.yml
+[docs]: https://weisrc.github.io/mlogjs

package/build/Compiler.d.ts

@@ -1,18 +1,18 @@
-import { es, IScope, THandler, TValueInstructions } from "./types";
-declare type THandlerMap = {
-    [k in es.Node["type"]]?: THandler;
-};
-export declare class Compiler {
-    protected stackName?: string;
-    protected usingStack: boolean;
-    protected handlers: THandlerMap;
-    constructor(stackName?: string);
-    compile(script: string): string;
-    protected resolve(valueInst: TValueInstructions): void;
-    protected serialize(resLines: TValueInstructions): string;
-    protected parse(script: string): import("esprima").Program;
-    handle(scope: IScope, node: es.Node): TValueInstructions;
-    handleEval(scope: IScope, node: es.Node): TValueInstructions;
-    handleMany(scope: IScope, nodes: es.Node[], handler?: typeof Compiler.prototype.handle): TValueInstructions;
-}
-export {};
+import { es, IScope, THandler, TValueInstructions } from "./types";
+declare type THandlerMap = {
+    [k in es.Node["type"]]?: THandler;
+};
+export declare class Compiler {
+    protected stackName?: string;
+    protected usingStack: boolean;
+    protected handlers: THandlerMap;
+    constructor(stackName?: string);
+    compile(script: string): [string, Error, es.Node[]];
+    protected resolve(valueInst: TValueInstructions): void;
+    protected serialize(resLines: TValueInstructions): string;
+    protected parse(script: string): es.Node;
+    handle(scope: IScope, node: es.Node): TValueInstructions;
+    handleEval(scope: IScope, node: es.Node): TValueInstructions;
+    handleMany(scope: IScope, nodes: es.Node[], handler?: typeof Compiler.prototype.handle): TValueInstructions;
+}
+export {};

package/build/Compiler.js

@@ -1,120 +1,100 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Compiler = void 0;
-const handlers = __importStar(require("./handlers"));
-const esprima_1 = require("esprima");
-const instructions_1 = require("./instructions");
-const Scope_1 = require("./Scope");
-const macros_1 = require("./macros");
-const utils_1 = require("./utils");
-const Namespace_1 = require("./macros/Namespace");
-const RawValue_1 = require("./macros/RawValue");
-class Compiler {
-    constructor(stackName) {
-        this.handlers = handlers;
-        this.usingStack = !!stackName;
-        this.stackName = stackName;
-    }
-    compile(script) {
-        const program = this.parse(script);
-        const scope = new Scope_1.Scope({});
-        // namespaces
-        scope.hardSet("ControlKind", new Namespace_1.NamespaceMacro(scope));
-        scope.hardSet("Vars", new Namespace_1.VarsNamespace(scope));
-        scope.hardSet("Items", new Namespace_1.NamespaceMacro(scope, { changeCasing: true }));
-        scope.hardSet("Liquids", new Namespace_1.NamespaceMacro(scope));
-        scope.hardSet("Units", new Namespace_1.NamespaceMacro(scope));
-        scope.hardSet("LAccess", new Namespace_1.NamespaceMacro(scope));
-        scope.hardSet("UnitCommands", new Namespace_1.UCommandsNamespace(scope));
-        scope.hardSet("Blocks", new Namespace_1.NamespaceMacro(scope, { changeCasing: true }));
-        // helper methods
-        scope.hardSet("getBuilding", new macros_1.BuildingBuilder(scope));
-        scope.hardSet("getVar", new RawValue_1.RawValueMacro(scope));
-        scope.hardSet("concat", new macros_1.Concat(scope));
-        scope.hardSet("Math", new macros_1.MlogMath(scope));
-        scope.hardSet("Memory", new macros_1.MemoryBuilder(scope));
-        // commands
-        scope.hardSet("draw", new macros_1.commands.Draw(scope));
-        scope.hardSet("print", new macros_1.commands.Print(scope));
-        scope.hardSet("printFlush", new macros_1.commands.PrintFlush(scope));
-        scope.hardSet("drawFlush", new macros_1.commands.DrawFlush(scope));
-        scope.hardSet("getLink", new macros_1.commands.GetLink(scope));
-        scope.hardSet("control", new macros_1.commands.Control(scope));
-        scope.hardSet("radar", new macros_1.commands.Radar(scope));
-        scope.hardSet("sensor", new macros_1.commands.Sensor(scope));
-        scope.hardSet("wait", new macros_1.commands.Wait(scope));
-        scope.hardSet("lookup", new macros_1.commands.Lookup(scope));
-        scope.hardSet("unitBind", new macros_1.commands.UnitBind(scope));
-        scope.hardSet("unitControl", new macros_1.commands.UnitControl(scope));
-        scope.hardSet("unitRadar", new macros_1.commands.UnitRadar(scope));
-        scope.hardSet("unitLocate", new macros_1.commands.UnitLocate(scope));
-        const valueInst = this.handle(scope, program);
-        valueInst[1].push(new instructions_1.EndInstruction(), ...scope.inst);
-        this.resolve(valueInst);
-        return this.serialize(valueInst) + "\n";
-    }
-    resolve(valueInst) {
-        let i = 0;
-        for (const inst of valueInst[1]) {
-            inst.resolve(i);
-            if (!inst.hidden)
-                i++;
-        }
-    }
-    serialize(resLines) {
-        const [_, inst] = resLines;
-        return inst.filter(l => !l.hidden).join("\n");
-    }
-    parse(script) {
-        return (0, esprima_1.parseScript)(script, { loc: true });
-    }
-    handle(scope, node) {
-        try {
-            const handler = this.handlers[node.type];
-            if (!handler)
-                throw Error("Missing handler for " + node.type);
-            return handler(this, scope, node, null);
-        }
-        catch (error) {
-            throw new Error(`${node.type} ${(0, utils_1.nodeName)(node)} > ${error.message}`);
-        }
-    }
-    handleEval(scope, node) {
-        const [res, inst] = this.handle(scope, node);
-        const [evaluated, evaluatedLines] = res.eval(scope);
-        return [evaluated, [...inst, ...evaluatedLines]];
-    }
-    handleMany(scope, nodes, handler = this.handle.bind(this)) {
-        const lines = [];
-        for (const node of nodes) {
-            const [_, nodeLines] = handler(scope, node);
-            lines.push(...nodeLines);
-        }
-        return [null, lines];
-    }
-}
-exports.Compiler = Compiler;
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Compiler = void 0;
+const acorn_1 = require("acorn");
+const handlers = __importStar(require("./handlers"));
+const initScope_1 = require("./initScope");
+const instructions_1 = require("./instructions");
+const Scope_1 = require("./Scope");
+class Compiler {
+    constructor(stackName) {
+        this.handlers = handlers;
+        this.usingStack = !!stackName;
+        this.stackName = stackName;
+    }
+    compile(script) {
+        let output;
+        try {
+            const program = this.parse(script);
+            const scope = new Scope_1.Scope({});
+            (0, initScope_1.initScope)(scope);
+            const valueInst = this.handle(scope, program);
+            valueInst[1].push(new instructions_1.EndInstruction(), ...scope.inst);
+            this.resolve(valueInst);
+            output = this.serialize(valueInst) + "\n";
+        }
+        catch (error) {
+            return [null, error, error?.nodeStack ?? []];
+        }
+        return [output, null, []];
+    }
+    resolve(valueInst) {
+        let i = 0;
+        for (const inst of valueInst[1]) {
+            inst.resolve(i);
+            if (!inst.hidden)
+                i++;
+        }
+    }
+    serialize(resLines) {
+        const [_, inst] = resLines;
+        return inst.filter(l => !l.hidden).join("\n");
+    }
+    parse(script) {
+        return (0, acorn_1.parse)(script, {
+            locations: true,
+            ecmaVersion: "latest",
+        });
+    }
+    handle(scope, node) {
+        try {
+            const handler = this.handlers[node.type];
+            if (!handler)
+                throw Error("Missing handler for " + node.type);
+            return handler(this, scope, node, null);
+        }
+        catch (error) {
+            error.nodeStack ??= [];
+            error.nodeStack.push(node);
+            throw error;
+        }
+    }
+    handleEval(scope, node) {
+        const [res, inst] = this.handle(scope, node);
+        const [evaluated, evaluatedLines] = res.eval(scope);
+        return [evaluated, [...inst, ...evaluatedLines]];
+    }
+    handleMany(scope, nodes, handler = this.handle.bind(this)) {
+        const lines = [];
+        for (const node of nodes) {
+            const [_, nodeLines] = handler(scope, node);
+            lines.push(...nodeLines);
+        }
+        return [null, lines];
+    }
+}
+exports.Compiler = Compiler;
 //# sourceMappingURL=Compiler.js.map

package/build/Compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"Compiler.js","sourceRoot":"","sources":["../src/Compiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Compiler.js","sourceRoot":"","sources":["../src/Compiler.ts"],"names":[],"mappings":"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"}

package/build/Scope.d.ts

@@ -1,26 +1,26 @@
-import { AddressResolver } from "./instructions";
-import { IFunctionValue, IInstruction, IScope, IValue } from "./types";
-export declare class Scope implements IScope {
-    parent: IScope;
-    name: string;
-    data: {
-        [k: string]: IValue;
-    };
-    stacked: boolean;
-    ntemp: number;
-    inst: IInstruction[];
-    break: AddressResolver;
-    continue: AddressResolver;
-    function: IFunctionValue;
-    constructor(values: {
-        [k: string]: IValue;
-    }, parent?: IScope, stacked?: boolean, ntemp?: number, name?: string, inst?: any[]);
-    copy(): IScope;
-    createScope(): IScope;
-    createFunction(name: string, stacked?: boolean): IScope;
-    has(name: string): boolean;
-    get(name: string): IValue;
-    set(name: string, value: IValue): IValue;
-    hardSet(name: string, value: IValue): IValue;
-    make(name: string, storeName: string): IValue;
-}
+import { AddressResolver } from "./instructions";
+import { IFunctionValue, IInstruction, IScope, IValue } from "./types";
+export declare class Scope implements IScope {
+    parent: IScope;
+    name: string;
+    data: {
+        [k: string]: IValue;
+    };
+    stacked: boolean;
+    ntemp: number;
+    inst: IInstruction[];
+    break: AddressResolver;
+    continue: AddressResolver;
+    function: IFunctionValue;
+    constructor(values: {
+        [k: string]: IValue;
+    }, parent?: IScope, stacked?: boolean, ntemp?: number, name?: string, inst?: any[]);
+    copy(): IScope;
+    createScope(): IScope;
+    createFunction(name: string, stacked?: boolean): IScope;
+    has(name: string): boolean;
+    get(name: string): IValue;
+    set(name: string, value: IValue): IValue;
+    hardSet(name: string, value: IValue): IValue;
+    make(name: string, storeName: string): IValue;
+}

package/build/Scope.js

@@ -1,61 +1,61 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Scope = void 0;
-const values_1 = require("./values");
-class Scope {
-    constructor(values, parent = null, stacked = false, ntemp = 0, name = "", inst = []) {
-        this.stacked = false;
-        this.ntemp = 0;
-        this.data = values;
-        this.parent = parent;
-        this.stacked = stacked;
-        this.ntemp = ntemp;
-        this.name = name;
-        this.inst = inst;
-    }
-    copy() {
-        const scope = new Scope(Object.assign({}, this.data), this.parent, this.stacked, this.ntemp, this.name, this.inst);
-        scope.break = this.break;
-        scope.continue = this.continue;
-        scope.function = this.function;
-        return scope;
-    }
-    createScope() {
-        const scope = this.copy();
-        scope.data = {};
-        scope.parent = this;
-        return scope;
-    }
-    createFunction(name, stacked) {
-        return new Scope({}, this, stacked !== null && stacked !== void 0 ? stacked : this.stacked, 0, name, this.inst);
-    }
-    has(name) {
-        if (name in this.data)
-            return true;
-        if (this.parent)
-            return this.parent.has(name);
-        return false;
-    }
-    get(name) {
-        const value = this.data[name];
-        if (value)
-            return value;
-        if (this.parent)
-            return this.parent.get(name);
-        throw Error(`${name} is not declared.`);
-    }
-    set(name, value) {
-        if (name in this.data)
-            throw Error(`${name} is already declared.`);
-        return this.hardSet(name, value);
-    }
-    hardSet(name, value) {
-        this.data[name] = value;
-        return value;
-    }
-    make(name, storeName) {
-        return this.set(name, this.stacked ? null : new values_1.StoreValue(this, storeName));
-    }
-}
-exports.Scope = Scope;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Scope = void 0;
+const values_1 = require("./values");
+class Scope {
+    constructor(values, parent = null, stacked = false, ntemp = 0, name = "", inst = []) {
+        this.stacked = false;
+        this.ntemp = 0;
+        this.data = values;
+        this.parent = parent;
+        this.stacked = stacked;
+        this.ntemp = ntemp;
+        this.name = name;
+        this.inst = inst;
+    }
+    copy() {
+        const scope = new Scope({ ...this.data }, this.parent, this.stacked, this.ntemp, this.name, this.inst);
+        scope.break = this.break;
+        scope.continue = this.continue;
+        scope.function = this.function;
+        return scope;
+    }
+    createScope() {
+        const scope = this.copy();
+        scope.data = {};
+        scope.parent = this;
+        return scope;
+    }
+    createFunction(name, stacked) {
+        return new Scope({}, this, stacked ?? this.stacked, 0, name, this.inst);
+    }
+    has(name) {
+        if (name in this.data)
+            return true;
+        if (this.parent)
+            return this.parent.has(name);
+        return false;
+    }
+    get(name) {
+        const value = this.data[name];
+        if (value)
+            return value;
+        if (this.parent)
+            return this.parent.get(name);
+        throw Error(`${name} is not declared.`);
+    }
+    set(name, value) {
+        if (name in this.data)
+            throw Error(`${name} is already declared.`);
+        return this.hardSet(name, value);
+    }
+    hardSet(name, value) {
+        this.data[name] = value;
+        return value;
+    }
+    make(name, storeName) {
+        return this.set(name, this.stacked ? null : new values_1.StoreValue(this, storeName));
+    }
+}
+exports.Scope = Scope;
 //# sourceMappingURL=Scope.js.map

package/build/Scope.js.map

@@ -1 +1 @@
-{"version":3,"file":"Scope.js","sourceRoot":"","sources":["../src/Scope.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Scope.js","sourceRoot":"","sources":["../src/Scope.ts"],"names":[],"mappings":"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"}

package/build/bin.d.ts

@@ -1,2 +1,2 @@
-#!/usr/bin/env node
-export {};
+#!/usr/bin/env node
+export {};