mlogjs 0.1.9 → 0.2.0

package/lib/memory.d.ts

@@ -0,0 +1,17 @@
+/// <reference path="./kinds.d.ts" />
+
+type MemoryCapacity = 64 | 512;
+/**
+ * A wrapper around memory cells/banks that is compatible with custom types.
+ */
+declare class Memory<S extends MemoryCapacity = 64> {
+  constructor(cell: BasicBuilding, size?: S);
+
+  [Symbol.iterator](): IterableIterator<number>;
+  [index: number]: number;
+
+  /**
+   * The practical length of the memory view.
+   */
+  readonly length: S;
+}

package/lib/traits.d.ts

@@ -0,0 +1,121 @@
+import "./globals";
+import "./custom-lib";
+
+type LogicSymbols = typeof Items & typeof Liquids & typeof LAccess;
+
+type WithSymbols<T extends Record<string, unknown>> = T & {
+  readonly [K in keyof (LogicSymbols | T) as LogicSymbols[K]]: T[K];
+};
+
+declare global {
+  type LiquidHolder = WithSymbols<
+    {
+      readonly [L in keyof typeof Liquids]: number;
+    } & {
+      readonly totalLiquids: number;
+      readonly liquidCapacity: number;
+    }
+  >;
+
+  type ItemHolder = WithSymbols<
+    {
+      readonly [I in keyof typeof Items]: number;
+    } & {
+      readonly totalItems: number;
+      readonly firstItem: ItemSymbol | null;
+      readonly itemCapacity: number;
+    }
+  >;
+
+  type PowerHolder = WithSymbols<{
+    readonly totalPower: number;
+    readonly powerCapacity: number;
+    readonly powerNetStored: number;
+    readonly powerNetCapacity: number;
+    readonly powerNetIn: number;
+    readonly powerNetOut: number;
+  }>;
+
+  type Shooting = WithSymbols<{
+    readonly shootX: number;
+    readonly shootY: number;
+    readonly ammo: number;
+    readonly ammoCapacity: number;
+  }>;
+
+  type WithHealth = WithSymbols<{
+    readonly health: number;
+    readonly maxHealth: number;
+    readonly dead: boolean;
+  }>;
+
+  type Heatable = WithSymbols<{
+    readonly heat: number;
+  }>;
+
+  type WithEffiency = WithSymbols<{
+    readonly efficiency: number;
+  }>;
+
+  type WithProgress = WithSymbols<{
+    readonly progress: number;
+  }>;
+
+  type WithTimescale = WithSymbols<{
+    readonly timescale: number;
+  }>;
+
+  type Rotatable = WithSymbols<{
+    readonly rotation: number;
+  }>;
+
+  type Spaced = WithSymbols<{
+    readonly x: number;
+    readonly y: number;
+    readonly size: number;
+  }>;
+
+  type Ranged = WithSymbols<{
+    readonly range: number;
+  }>;
+
+  type Boosted = WithSymbols<{
+    readonly boosting: number;
+  }>;
+
+  type Mining = WithSymbols<{
+    readonly mineX: number;
+    readonly mineY: number;
+    readonly mining: number;
+  }>;
+
+  type Typed<T extends symbol = symbol> = WithSymbols<{
+    readonly type: T;
+  }>;
+  type Flagged = WithSymbols<{
+    readonly flag: number;
+  }>;
+
+  type Controllable = WithSymbols<{
+    readonly controlled: 0 | ControlKind;
+    readonly controller: AnyUnit | BasicBuilding;
+  }>;
+
+  type Nameable = WithSymbols<{
+    readonly name: string | null;
+  }>;
+
+  type PayloadHolder = WithSymbols<{
+    readonly payloadCount: number;
+    readonly payloadType: symbol | null;
+  }>;
+
+  type WithEnable = WithSymbols<{
+    enabled: boolean;
+  }>;
+
+  type WithConfig<T extends symbol | number | null = symbol | null> =
+    WithSymbols<{
+      readonly config: T;
+    }>;
+}

package/lib/util.d.ts

@@ -0,0 +1,32 @@
+export type TRadarFilter =
+  | "any"
+  | "enemy"
+  | "ally"
+  | "player"
+  | "attacker"
+  | "flying"
+  | "boss"
+  | "ground";
+
+export type TRadarFilterArray =
+  | [TRadarFilter]
+  | [TRadarFilter, TRadarFilter]
+  | [TRadarFilter, TRadarFilter, TRadarFilter];
+
+export type TRadarSort =
+  | "distance"
+  | "health"
+  | "shield"
+  | "armor"
+  | "maxHealth";
+
+export type TUnitLocateBuildingGroup =
+  | "core"
+  | "storage"
+  | "generator"
+  | "turret"
+  | "factory"
+  | "repair"
+  | "rally"
+  | "battery"
+  | "reactor";

package/package.json

@@ -1,37 +1,48 @@
 {
   "name": "mlogjs",
-  "version": "0.1.9",
+  "version": "0.2.0",
   "description": "Compiler that compiles Javascript to Mindustry Logic Code.",
   "main": "build/index.js",
-  "bin": {
-    "mlogjs": "./build/bin.js"
-  },
+  "bin": "./build/bin.js",
   "scripts": {
     "build": "tsc && webpack",
-    "start": "npm run build && npm i -g . && mlogjs"
+    "start": "npm run build && npm i -g . && mlogjs",
+    "prepublishOnly": "npm run build"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/str1z/mlogjs.git"
+    "url": "git+https://github.com/weisrc/mlogjs.git"
   },
+  "packageManager": "yarn@3.2.0",
   "keywords": [],
   "author": "str1z",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/str1z/mlogjs/issues"
+    "url": "https://github.com/weisrc/mlogjs/issues"
   },
-  "homepage": "https://github.com/str1z/mlogjs#readme",
+  "homepage": "https://github.com/weisrc/mlogjs#readme",
   "dependencies": {
     "esprima": "^4.0.1",
     "yargs": "^17.0.1"
   },
   "devDependencies": {
     "@types/esprima": "^4.0.2",
+    "@types/jest": "^27.4.1",
     "@types/node": "^15.3.0",
     "@types/yargs": "^16.0.1",
+    "jest": "^27.5.1",
+    "prettier": "^2.5.1",
+    "ts-jest": "^27.1.3",
     "ts-loader": "^9.1.2",
-    "typescript": "^4.2.4",
+    "typescript": "^4.6.2",
     "webpack": "^5.37.0",
     "webpack-cli": "^4.7.0"
-  }
+  },
+  "files": [
+    "build",
+    "dist",
+    "lib",
+    "LICENSE",
+    "README.md"
+  ]
 }

package/.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=auto

package/build/scopes/FunctionScope.d.ts

@@ -1,5 +0,0 @@
-import { IScope } from "../types";
-import { Scope } from ".";
-export declare class FunctionScope extends Scope {
-    createScope(): IScope;
-}

package/build/scopes/FunctionScope.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FunctionScope = void 0;
-const _1 = require(".");
-class FunctionScope extends _1.Scope {
-    createScope() {
-        const scope = super.createScope();
-        scope.fnScope = this;
-        return scope;
-    }
-}
-exports.FunctionScope = FunctionScope;
-//# sourceMappingURL=FunctionScope.js.map

package/build/scopes/FunctionScope.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"FunctionScope.js","sourceRoot":"","sources":["../../src/scopes/FunctionScope.ts"],"names":[],"mappings":";;;AACA,wBAA0B;AAE1B,MAAa,aAAc,SAAQ,QAAK;IACpC,WAAW;QACP,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAA;QACjC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAA;QACpB,OAAO,KAAK,CAAA;IAChB,CAAC;CACJ;AAND,sCAMC"}

package/build/scopes/LoopScope.d.ts

@@ -1,5 +0,0 @@
-import { IScope } from "../types";
-import { Scope } from ".";
-export declare class LoopScope extends Scope {
-    createScope(): IScope;
-}

package/build/scopes/LoopScope.js

@@ -1,13 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.LoopScope = void 0;
-const _1 = require(".");
-class LoopScope extends _1.Scope {
-    createScope() {
-        const scope = super.createScope();
-        scope.loopScope = this;
-        return scope;
-    }
-}
-exports.LoopScope = LoopScope;
-//# sourceMappingURL=LoopScope.js.map

package/build/scopes/LoopScope.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LoopScope.js","sourceRoot":"","sources":["../../src/scopes/LoopScope.ts"],"names":[],"mappings":";;;AACA,wBAA0B;AAE1B,MAAa,SAAU,SAAQ,QAAK;IAChC,WAAW;QACP,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAA;QACjC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAA;QACtB,OAAO,KAAK,CAAA;IAChB,CAAC;CACJ;AAND,8BAMC"}

package/build/scopes/Scope.d.ts

@@ -1,36 +0,0 @@
-import { AddressResolver } from "../instructions";
-import { IFunctionValue, IInstruction, IScope, IValue } from "../types";
-export declare class Scope implements IScope {
-    fnScope: IScope;
-    loopScope: IScope;
-    private _fnEnded;
-    private _loopEnded;
-    parent: IScope;
-    name: string;
-    data: {
-        [k: string]: IValue;
-    };
-    stacked: boolean;
-    ntemp: number;
-    inst: IInstruction[];
-    break: AddressResolver;
-    continue: AddressResolver;
-    function: IFunctionValue;
-    get fnEnded(): boolean;
-    set fnEnded(value: boolean);
-    get loopEnded(): boolean;
-    set loopEnded(value: boolean);
-    get ended(): boolean;
-    constructor(values: {
-        [k: string]: IValue;
-    }, parent?: IScope, stacked?: boolean, ntemp?: number, name?: string, inst?: any[]);
-    copy(): IScope;
-    createScope(): IScope;
-    createLoop(): 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/scopes/Scope.js

@@ -1,93 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Scope = void 0;
-const values_1 = require("../values");
-const _1 = require(".");
-class Scope {
-    constructor(values, parent = null, stacked = false, ntemp = 0, name = "", inst = []) {
-        this._fnEnded = false;
-        this._loopEnded = false;
-        this.stacked = false;
-        this.ntemp = 0;
-        this.data = values;
-        this.parent = parent;
-        this.stacked = stacked;
-        this.ntemp = ntemp;
-        this.name = name;
-        this.inst = inst;
-    }
-    get fnEnded() {
-        var _a, _b;
-        return (_b = (_a = this.fnScope) === null || _a === void 0 ? void 0 : _a.fnEnded) !== null && _b !== void 0 ? _b : this._fnEnded;
-    }
-    set fnEnded(value) {
-        if (this.fnScope)
-            this.fnScope.fnEnded = value;
-        else
-            this._fnEnded = value;
-    }
-    get loopEnded() {
-        var _a, _b;
-        return (_b = (_a = this.loopScope) === null || _a === void 0 ? void 0 : _a.loopEnded) !== null && _b !== void 0 ? _b : this._loopEnded;
-    }
-    set loopEnded(value) {
-        if (this.loopScope)
-            this.loopScope.loopEnded = value;
-        else
-            this._loopEnded = value;
-    }
-    get ended() {
-        console.log(this);
-        return this.fnEnded || this.loopEnded;
-    }
-    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;
-        scope.fnScope = this.fnScope;
-        scope.loopScope = this.loopScope;
-        return scope;
-    }
-    createScope() {
-        const scope = this.copy();
-        scope.data = {};
-        scope.parent = this;
-        return scope;
-    }
-    createLoop() {
-        return new _1.LoopScope({}, this, this.stacked, this.ntemp, this.name, this.inst);
-    }
-    createFunction(name, stacked) {
-        return new _1.FunctionScope({}, 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;
-//# sourceMappingURL=Scope.js.map

package/build/scopes/Scope.js.map

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

package/build/scopes/index.d.ts

@@ -1,3 +0,0 @@
-export * from "./Scope";
-export * from "./FunctionScope";
-export * from "./LoopScope";

package/build/scopes/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/scopes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,0CAAuB;AACvB,kDAA+B;AAC/B,8CAA2B"}

package/mlogjs.d.ts

@@ -1,72 +0,0 @@
-declare type TTarget =
-	| "any"
-	| "enemy"
-	| "ally"
-	| "player"
-	| "attacker"
-	| "flying"
-	| "boss"
-	| "ground";
-
-declare class Block {
-	constructor(name: string);
-	write(i: number, value: number): number;
-	read(i: number): number;
-	printFlush(): void;
-	drawFlush(): void;
-	puts(...values: (number | string)[]): void;
-	sensor(attr: string): number | boolean;
-	control(attr: "enabled" | "shoot" | "shootp" | "configure" | "color", ...args: number[]): void;
-	radar(
-		target0: TTarget,
-		target1: TTarget,
-		target2: TTarget,
-		sort: "distance" | "health" | "shield" | "armor" | "maxHealth",
-		distance: number
-	): any;
-}
-
-declare class Store {
-	constructor(name: string);
-}
-
-declare class Temp {}
-
-// @ts-ignore
-declare const Math = {
-	max: (a: number, b: number) => Math.max(a, b),
-	min: (a: number, b: number) => Math.min(a, b),
-	angle: (a: number, b: number) => Math.atan2(a, b),
-	len: (a: number, b: number) => Math.sqrt(a ** 2 + b ** 2),
-	noise: (x: any, y: any) => x + y,
-	abs: (a: number) => Math.abs(a),
-	log: (a: number) => Math.log(a),
-	log10: (a: number) => Math.log(a) / Math.log(10),
-	sin: (a: number) => Math.sin(a),
-	cos: (a: number) => Math.cos(a),
-	tan: (a: number) => Math.tan(a),
-	floor: (a: number) => Math.floor(a),
-	ceil: (a: number) => Math.ceil(a),
-	sqrt: (a: number) => Math.ceil(a),
-	rand: (range: number) => Math.random() * range,
-};
-
-declare function draw(
-	kind:
-		| "clear"
-		| "color"
-		| "stroke"
-		| "line"
-		| "rect"
-		| "lineRect"
-		| "poly"
-		| "linePoly"
-		| "triangle"
-		| "image",
-	...args: any
-): void;
-
-declare function print(...values: any): void;
-declare function concat(...values: string[]): string;
-
-declare class Entity extends Block {}

package/tsconfig.json

@@ -1,22 +0,0 @@
-{
-    "compilerOptions": {
-        "module": "commonjs",
-        "declaration": true,
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "target": "es6",
-        "moduleResolution": "node",
-        "sourceMap": true,
-        "outDir": "build",
-        "baseUrl": ".",
-        "paths": {
-            "*": [
-                "node_modules/*",
-                "src/types/*"
-            ]
-        }
-    },
-    "include": [
-        "src/**/*"
-    ]
-}

package/webpack.config.js

@@ -1,22 +0,0 @@
-const path = require('path');
-
-module.exports = {
-  entry: './src/index.ts',
-  module: {
-    rules: [
-      {
-        test: /\.tsx?$/,
-        use: 'ts-loader',
-        exclude: /node_modules/,
-      },
-    ],
-  },
-  output: {
-    path: path.resolve(__dirname, 'dist'),
-    filename: 'bundle.js',
-    library: "mlogcc"
-  },
-  resolve: {
-    extensions: ['.ts', '.js'],
-  },
-};