mlogjs 0.2.1 → 0.3.0

package/package.json

@@ -1,33 +1,15 @@
 {
   "name": "mlogjs",
-  "version": "0.2.1",
+  "version": "0.3.0",
   "description": "Compiler that compiles Javascript to Mindustry Logic Code.",
-  "main": "build/index.js",
-  "bin": "./build/bin.js",
-  "scripts": {
-    "clean": "rm -rf docs dist build",
-    "build": "tsc && vite build",
-    "build:editor": "cd editor && vite build",
-    "dev": "ts-node src/bin",
-    "dev:editor": "cd editor && vite",
-    "test": "jest",
-    "coverage": "jest --coverage",
-    "docs:doc": "mkdir -p docs && cp -r doc/. docs",
-    "docs:lib": "typedoc --out docs/lib lib/*",
-    "docs:src": "typedoc --out docs/src src/index.ts",
-    "docs": "run-p docs:lib docs:src docs:doc",
-    "start": "npm run build && npm i -g . && mlogjs",
-    "prepublishOnly": "npm run build"
-  },
-  "exports": {
-    "require": "./build/index.js",
-    "import": "./dist/index.js"
-  },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "bin": "./dist/bin.cjs",
+  "types": "./dist/types",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/weisrc/mlogjs.git"
   },
-  "packageManager": "yarn@3.2.0",
   "keywords": [],
   "author": "str1z",
   "license": "MIT",
@@ -36,32 +18,31 @@
   },
   "homepage": "https://github.com/weisrc/mlogjs#readme",
   "dependencies": {
-    "acorn": "^8.7.0",
+    "@babel/parser": "^7.17.7",
+    "chalk": "^4.1.2",
     "cli-highlight": "^2.1.11",
     "yargs": "^17.0.1"
   },
   "devDependencies": {
-    "@monaco-editor/react": "^4.3.1",
+    "@babel/types": "^7.17.0",
+    "@rollup/plugin-alias": "^3.1.9",
+    "@rollup/plugin-replace": "^4.0.0",
+    "@rollup/plugin-typescript": "^8.3.1",
     "@types/estree": "^0.0.51",
     "@types/jest": "^27.4.1",
     "@types/node": "^15.3.0",
-    "@types/react": "^17.0.39",
-    "@types/react-dom": "^17.0.13",
-    "@types/react-split-pane": "^0.1.67",
     "@types/yargs": "^16.0.1",
-    "@vitejs/plugin-react": "^1.2.0",
+    "@typescript-eslint/eslint-plugin": "^5.15.0",
+    "@typescript-eslint/parser": "^5.15.0",
+    "eslint": "^8.11.0",
     "jest": "^27.5.1",
-    "monaco-editor": "^0.32.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.5.1",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-split-pane": "^0.1.92",
+    "rollup": "^2.70.1",
     "ts-jest": "^27.1.3",
     "ts-node": "^10.6.0",
+    "tslib": "^2.3.1",
     "typedoc": "^0.22.12",
-    "typescript": "^4.6.2",
-    "vite": "^2.8.6"
+    "typescript": "*"
   },
   "files": [
     "build",
@@ -69,5 +50,19 @@
     "lib",
     "LICENSE",
     "README.md"
-  ]
-}
+  ],
+  "scripts": {
+    "clean": "rm -rf ../docs dist build",
+    "build": "rollup -c",
+    "build:dev": "rollup -c --environment DEV",
+    "dev": "ts-node src/bin",
+    "test": "jest",
+    "lint": "eslint src/**/*.ts",
+    "coverage": "jest --coverage",
+    "docs:doc": "mkdir -p ../docs && cp -r doc/. ../docs",
+    "docs:lib": "typedoc --out ../docs/lib lib/*",
+    "docs:src": "typedoc --out ../docs/src src/index.ts",
+    "docs": "run-p docs:lib docs:src docs:doc",
+    "start": "npm run build && npm i -g . && mlogjs"
+  }
+}

package/build/Compiler.d.ts

@@ -1,18 +0,0 @@
-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/Scope.d.ts

@@ -1,26 +0,0 @@
-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/bin.d.ts

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

package/build/handlers/BlockStatement.d.ts

@@ -1,2 +0,0 @@
-import { THandler } from "../types";
-export declare const BlockStatement: THandler;

package/build/handlers/CallExpression.d.ts

@@ -1,3 +0,0 @@
-import { THandler } from "../types";
-export declare const CallExpression: THandler;
-export declare const NewExpression: THandler;

package/build/handlers/ForStatement.d.ts

@@ -1,2 +0,0 @@
-import { THandler } from "../types";
-export declare const ForStatement: THandler;

package/build/handlers/IfStatement.d.ts

@@ -1,2 +0,0 @@
-import { THandler } from "../types";
-export declare const IfStatement: THandler;

package/build/handlers/Literal.d.ts

@@ -1,2 +0,0 @@
-import { THandler } from "../types";
-export declare const Literal: THandler;

package/build/handlers/Program.d.ts

@@ -1,2 +0,0 @@
-import { THandler } from "../types";
-export declare const Program: THandler;

package/build/handlers/Statements.d.ts

@@ -1,5 +0,0 @@
-import { THandler } from "../types";
-export declare const ExpressionStatement: THandler;
-export declare const BreakStatement: THandler;
-export declare const ContinueStatement: THandler;
-export declare const ReturnStatement: THandler;

package/build/handlers/TemplateExpression.d.ts

@@ -1,2 +0,0 @@
-import { THandler } from "../types";
-export declare const TemplateLiteral: THandler;

package/build/handlers/VariableDeclaration.d.ts

@@ -1,3 +0,0 @@
-import { THandler } from "../types";
-export declare const VariableDeclaration: THandler;
-export declare const VariableDeclarator: THandler;

package/build/handlers/WhileStatement.d.ts

@@ -1,2 +0,0 @@
-import { THandler } from "../types";
-export declare const WhileStatement: THandler;

package/build/index.d.ts

@@ -1 +0,0 @@
-export declare const compile: (script: string) => [string, Error, import("estree").Node[]];

package/build/macros/Function.d.ts

@@ -1,12 +0,0 @@
-import { IScope, IValue, TValueInstructions } from "../types";
-import { VoidValue } from "../values";
-declare type TFunction = (...args: IValue[]) => TValueInstructions;
-export declare class MacroFunction extends VoidValue {
-    macro: boolean;
-    constant: boolean;
-    fn: TFunction;
-    constructor(scope: IScope, fn: TFunction);
-    call(scope: IScope, args: IValue[]): TValueInstructions;
-    eval(scope: IScope): TValueInstructions;
-}
-export {};

package/build/macros/commands/UnitControl.d.ts

@@ -1,5 +0,0 @@
-import { MacroFunction } from "..";
-import { IScope } from "../../types";
-export declare class UnitControl extends MacroFunction {
-    constructor(scope: IScope);
-}

package/build/types.d.ts

@@ -1,49 +0,0 @@
-export * as es from "estree";
-import { Compiler } from "./Compiler";
-import { AddressResolver } from "./instructions";
-import { LeftRightOperator, UnaryOperator, UpdateOperator } from "./operators";
-export interface IInstruction {
-    hidden: boolean;
-    resolve(i: number): void;
-}
-export declare type THandler = (compiler: Compiler, scope: IScope, node: any, arg: any) => TValueInstructions;
-export interface IScope {
-    parent: IScope;
-    data: {};
-    name: string;
-    inst: IInstruction[];
-    break: AddressResolver;
-    continue: AddressResolver;
-    function: IFunctionValue;
-    ntemp: number;
-    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;
-    copy(): IScope;
-}
-export declare type IValue = {
-    [k in UnaryOperator]?: (scope: IScope) => TValueInstructions;
-} & {
-    [k in UpdateOperator]?: (scope: IScope, prefix: boolean) => TValueInstructions;
-} & {
-    [k in LeftRightOperator]?: (scope: IScope, value: IValue) => TValueInstructions;
-} & {
-    scope: IScope;
-    constant: boolean;
-    macro: boolean;
-    eval(scope: IScope): TValueInstructions;
-    call(scope: IScope, args: IValue[]): TValueInstructions;
-    get(scope: IScope, name: IValue): TValueInstructions;
-};
-export declare type TLiteral = string | number;
-export interface IBindableValue extends IValue {
-    data: TLiteral;
-}
-export interface IFunctionValue extends IValue {
-    return(scope: IScope, argument: IValue): TValueInstructions;
-}
-export declare type TValueInstructions = [IValue, IInstruction[]];

package/build/utils.d.ts

@@ -1,3 +0,0 @@
-import { es } from "./types";
-export declare function nodeName(node: es.Node): string;
-export declare function camelToDashCase(name: string): string;

package/build/values/BaseValue.d.ts

@@ -1,5 +0,0 @@
-import { IScope, IValue, TValueInstructions } from "../types";
-import { VoidValue } from ".";
-export declare class BaseValue extends VoidValue implements IValue {
-    "u-"(scope: IScope): TValueInstructions;
-}

package/build/values/FunctionValue.d.ts

@@ -1,34 +0,0 @@
-import { Compiler } from "../Compiler";
-import { es, IFunctionValue, IScope, IValue, TValueInstructions } from "../types";
-import { StoreValue } from "./StoreValue";
-import { VoidValue } from "./VoidValue";
-export declare class FunctionValue extends VoidValue implements IFunctionValue {
-    constant: boolean;
-    macro: boolean;
-    private paramStores;
-    private paramNames;
-    private inst;
-    private addr;
-    private temp;
-    private ret;
-    private inline;
-    private tryingInline;
-    private body;
-    private name;
-    private c;
-    private callSize;
-    private inlineTemp;
-    private inlineEnd;
-    private bundled;
-    private createValues;
-    typeof(scope: IScope): TValueInstructions;
-    private createInst;
-    constructor(scope: IScope, name: string, paramNames: string[], paramStores: StoreValue[], body: es.BlockStatement, c: Compiler);
-    private normalReturn;
-    private normalCall;
-    private inlineReturn;
-    private inlineCall;
-    call(scope: IScope, args: IValue[]): TValueInstructions;
-    return(scope: IScope, arg: IValue): TValueInstructions;
-    eval(scope: IScope): TValueInstructions;
-}

package/build/values/ObjectValue.d.ts

@@ -1,17 +0,0 @@
-import { IScope, IValue, TValueInstructions } from "../types";
-import { LiteralValue } from "./LiteralValue";
-import { VoidValue } from "./VoidValue";
-export declare class ObjectValue extends VoidValue {
-    constant: boolean;
-    macro: boolean;
-    data: {
-        [k: string]: IValue;
-    };
-    constructor(scope: IScope, data?: {
-        [k: string]: IValue;
-    });
-    typeof(scope: IScope): TValueInstructions;
-    get(scope: IScope, key: LiteralValue): TValueInstructions;
-    eval(scope: IScope): TValueInstructions;
-    call(scope: IScope, args: IValue[]): TValueInstructions;
-}

package/build/values/StoreValue.d.ts

@@ -1,11 +0,0 @@
-import { BaseValue } from ".";
-import { IScope, IValue, TValueInstructions } from "../types";
-export declare class StoreValue extends BaseValue implements IValue {
-    name: string;
-    constant: boolean;
-    constructor(scope: IScope, name: string);
-    typeof(scope: IScope): TValueInstructions;
-    "="(scope: IScope, value: IValue): TValueInstructions;
-    eval(scope: IScope): TValueInstructions;
-    toString(): string;
-}

package/build/values/VoidValue.d.ts

@@ -1,11 +0,0 @@
-import { IScope, IValue, TValueInstructions } from "../types";
-export declare class VoidValue implements IValue {
-    scope: IScope;
-    constant: boolean;
-    macro: boolean;
-    constructor(scope: IScope);
-    eval(scope: IScope): TValueInstructions;
-    call(scope: IScope, args: IValue[]): TValueInstructions;
-    get(scope: IScope, name: IValue): TValueInstructions;
-    toString(): string;
-}