common/src/main/java/me/topchetoeu/j2s/common/Instruction.java

@@ -51,7 +51,8 @@ public class Instruction {
 		STORE_MEMBER_INT(0x4A),
 		STORE_MEMBER_STR(0x4B),
 
-		OPERATION(0x50),
+		TYPEOF(0x53),
+		OPERATION(0x54),
 
 		GLOB_GET(0x60),
 		GLOB_SET(0x61),
@@ -332,6 +333,13 @@ public class Instruction {
 		return new Instruction(Type.DISCARD);
 	}
 
+	public static Instruction typeof() {
+		return new Instruction(Type.TYPEOF);
+	}
+	public static Instruction typeof(String varName) {
+		return new Instruction(Type.TYPEOF, varName);
+	}
+
 	public static Instruction operation(Operation op) {
 		return new Instruction(Type.OPERATION, op);
 	}

common/src/main/java/me/topchetoeu/j2s/common/Operation.java

@@ -3,37 +3,36 @@ package me.topchetoeu.j2s.common;
 import java.util.HashMap;
 
 public enum Operation {
-	TYPEOF(0x10, 1),
-	INSTANCEOF(0x11, 2),
-	IN(0x12, 2),
+	INSTANCEOF(1, 2),
+	IN(2, 2),
 
-	MULTIPLY(0x20, 2),
-	DIVIDE(0x21, 2),
-	MODULO(0x22, 2),
-	ADD(0x23, 2),
-	SUBTRACT(0x24, 2),
+	MULTIPLY(3, 2),
+	DIVIDE(4, 2),
+	MODULO(5, 2),
+	ADD(6, 2),
+	SUBTRACT(7, 2),
 
-	USHIFT_RIGHT(0x30, 2),
-	SHIFT_RIGHT(0x31, 2),
-	SHIFT_LEFT(0x32, 2),
+	USHIFT_RIGHT(8, 2),
+	SHIFT_RIGHT(9, 2),
+	SHIFT_LEFT(10, 2),
 
-	GREATER(0x40, 2),
-	LESS(0x41, 2),
-	GREATER_EQUALS(0x42, 2),
-	LESS_EQUALS(0x43, 2),
-	LOOSE_EQUALS(0x44, 2),
-	LOOSE_NOT_EQUALS(0x45, 2),
-	EQUALS(0x46, 2),
-	NOT_EQUALS(0x47, 2),
+	GREATER(11, 2),
+	LESS(12, 2),
+	GREATER_EQUALS(13, 2),
+	LESS_EQUALS(14, 2),
+	LOOSE_EQUALS(15, 2),
+	LOOSE_NOT_EQUALS(16, 2),
+	EQUALS(17, 2),
+	NOT_EQUALS(18, 2),
 
-	AND(0x50, 2),
-	OR(0x51, 2),
-	XOR(0x52, 2),
+	AND(19, 2),
+	OR(20, 2),
+	XOR(21, 2),
 
-	NEG(0x60, 1),
-	POS(0x61, 1),
-	NOT(0x62, 1),
-	INVERSE(0x63, 1);
+	NEG(23, 1),
+	POS(24, 1),
+	NOT(25, 1),
+	INVERSE(26, 1);
 
 	private static final HashMap<Integer, Operation> operations = new HashMap<>();
 

compilation/src/main/java/me/topchetoeu/j2s/compilation/values/operations/TypeofNode.java

@@ -2,7 +2,6 @@ package me.topchetoeu.j2s.compilation.values.operations;
 
 import me.topchetoeu.j2s.common.Instruction;
 import me.topchetoeu.j2s.common.Location;
-import me.topchetoeu.j2s.common.Operation;
 import me.topchetoeu.j2s.compilation.CompileResult;
 import me.topchetoeu.j2s.compilation.JavaScript;
 import me.topchetoeu.j2s.compilation.Node;
@@ -21,14 +20,14 @@ public class TypeofNode extends Node {
 	@Override public void compile(CompileResult target, boolean pollute) {
 		if (value instanceof VariableNode varNode) {
 			target.add(VariableNode.toGet(target, varNode.loc(), varNode.name, true, true));
-			if (pollute) target.add(Instruction.operation(Operation.TYPEOF));
+			if (pollute) target.add(Instruction.typeof());
 			else target.add(Instruction.discard());
 
 			return;
 		}
 
 		value.compile(target, pollute);
-		if (pollute) target.add(Instruction.operation(Operation.TYPEOF));
+		if (pollute) target.add(Instruction.typeof());
 	}
 
 	public TypeofNode(Location loc, Node value) {

compilation/src/test/java/me/topchetoeu/j2s/compilation/parsing/TestParseString.java

@@ -4,6 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
+import me.topchetoeu.j2s.compilation.parsing.Parsing;
+import me.topchetoeu.j2s.compilation.parsing.Source;
+
 public class TestParseString {
 	@Test public void notAString() {
 		var res = Parsing.parseString(new Source("var a = 10"), 0);

compilation/src/test/java/me/topchetoeu/j2s/compilation/parsing/TestSkipWhite.java

@@ -4,6 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import org.junit.jupiter.api.Test;
 
+import me.topchetoeu.j2s.compilation.parsing.Parsing;
+import me.topchetoeu.j2s.compilation.parsing.Source;
+
 public class TestSkipWhite {
 	@Test public void shBang() {
 		var res1 = Parsing.skipEmpty(new Source("#!my-shbang\n10"), 0);

lib/src/lib/values/string.d.ts

@@ -10,8 +10,6 @@ declare interface String {
 	charCodeAt(i: number): number;
 	codePointAt(i: number): number;
 
-	startsWith(search: string): boolean;
-	endsWith(search: string): boolean;
 	includes(search: string, offset?: number): number;
 	indexOf(search: string, offset?: number): number;
 	lastIndexOf(search: string, offset?: number): number;

lib/src/stdlib/primordials.ts

@@ -105,7 +105,7 @@ export interface Primordials {
 		exec(target: string, offset: number, indices: boolean): { matches: RegExpMatchArray, end: number } | null;
 		groupCount(): number;
 	};
-	compile(src: string, filename?: string): Function;
+	compile(src: string): Function;
 	setGlobalPrototypes(prototype: Record<string, any>): void;
 	now(): number;
 	next(func: () => void): void;

lib/src/stdlib/values/function.ts

@@ -55,8 +55,23 @@ export const Function = (() => {
 			return res;
 		}
 
-		public static compile(src: string, filename?: string) {
-			return compile(String(src), filename);
+		public static compile(src = "", { globals = [], wrap = false }: { globals?: string[], wrap?: boolean } = {}) {
+			const parts = [];
+
+			if (wrap) parts[parts.length] = "return (function() {\n";
+			if (globals.length > 0) {
+				parts[parts.length] = "let {";
+				for (let i = 0; i < globals.length; i++) {
+					if (i > 0) parts[parts.length] = ",";
+					parts[parts.length] = globals[i];
+				}
+				parts[parts.length] = "} = arguments[0];";
+			}
+			parts[parts.length] = src;
+			if (wrap) parts[parts.length] = "\n})(arguments[0])";
+
+			const res = compile(string.stringBuild(parts));
+			return res;
 		}
 	}
 

lib/src/transpiler/babel.ts

@@ -1,5 +1,5 @@
 import { SourceMap } from "./map.ts";
-import { transform, availablePlugins } from "@babel/standalone";
+import { transform, availablePresets } from "@babel/standalone";
 
 export default function babel(next: Compiler): Compiler {
 	print("Loaded babel!");
@@ -8,63 +8,7 @@ export default function babel(next: Compiler): Compiler {
 		const res = transform(code, {
 			filename,
 			sourceMaps: true,
-			assumptions: {
-				arrayLikeIsIterable: true,
-				constantSuper: true,
-				ignoreFunctionLength: true,
-				ignoreToPrimitiveHint: true,
-				mutableTemplateObject: true,
-				noDocumentAll: true,
-				noNewArrows: true,
-				noUninitializedPrivateFieldAccess: true,
-				privateFieldsAsSymbols: true,
-			},
-			plugins: [
-				// ES2022
-				availablePlugins["transform-class-properties"],
-				availablePlugins["transform-class-static-block"],
-				availablePlugins["transform-private-methods"],
-				availablePlugins["transform-private-property-in-object"],
-				// "syntax-top-level-await",
-			
-				// ES2021
-				availablePlugins["transform-logical-assignment-operators"],
-				availablePlugins["transform-numeric-separator"],
-			
-				// ES2020
-				availablePlugins["transform-optional-chaining"],
-				availablePlugins["transform-nullish-coalescing-operator"],
-			
-				// ES2018
-				availablePlugins["transform-async-generator-functions"],
-				availablePlugins["transform-object-rest-spread"],
-				availablePlugins["transform-unicode-property-regex"],
-			
-				// ES2017
-				availablePlugins["transform-async-to-generator"],
-			
-				// ES2016
-				availablePlugins["transform-exponentiation-operator"],
-			
-				// ES2015
-				availablePlugins["transform-block-scoping"],
-				availablePlugins["transform-classes"],
-				availablePlugins["transform-computed-properties"],
-				availablePlugins["transform-destructuring"],
-				availablePlugins["transform-duplicate-keys"],
-				availablePlugins["transform-for-of"],
-				availablePlugins["transform-function-name"],
-				availablePlugins["transform-literals"],
-				availablePlugins["transform-new-target"],
-				availablePlugins["transform-object-super"],
-				availablePlugins["transform-parameters"],
-				availablePlugins["transform-shorthand-properties"],
-				availablePlugins["transform-spread"],
-				availablePlugins["transform-sticky-regex"],
-				availablePlugins["transform-template-literals"],
-				availablePlugins["transform-unicode-escapes"],
-				availablePlugins["transform-unicode-regex"],
-			],
+			presets: [availablePresets.env],
 		});
 
 		const map = SourceMap.parse({
@@ -74,9 +18,7 @@ export default function babel(next: Compiler): Compiler {
 		});
 
 		registerSource(filename, code);
-		const func = next("babel-internal://" + filename, res.code!, SourceMap.chain(map, prevMap));
-		func.name = filename;
-		return func;
+		return next("babel-internal://" + filename, res.code!, SourceMap.chain(map, prevMap));
 	};
 }
 

lib/src/transpiler/coffeescript.ts

@@ -21,9 +21,7 @@ export default function coffee(next: Compiler): Compiler {
 		});
 
 		registerSource(filename, code);
-		const func = next("coffee-internal://" + filename, result, SourceMap.chain(map, prevMap));
-		func.name = filename;
-		return func;
+		return next("coffee-internal://" + filename, result, SourceMap.chain(map, prevMap));
 	};
 }
 

lib/src/transpiler/typescript.ts

@@ -109,12 +109,10 @@ export default function typescript(next: Compiler): Compiler {
 		registerSource(filename, code);
 		const compiled = next("ts-internal://" + filename, result, SourceMap.chain(map, prevMap));
 
-		const func = function (this: any) {
+		return function (this: any) {
 			const res = compiled.apply(this, arguments);
 			if (declaration !== '') files["/src." + declI++ + ".d.ts"] = ScriptSnapshot.fromString(declaration);
 			return res;
 		};
-		func.name = filename;
-		return func;
 	};
 }

lib/tsconfig.json

@@ -1,17 +1,17 @@
 {
-	"include": ["**/*.ts"],
-	"compilerOptions": {
-		"strict": true,
-		"esModuleInterop": true,
-		"skipLibCheck": true,
-		"moduleResolution": "Bundler",
-		"module": "ESNext",
-		"target": "ESNext",
-		"noLib": true,
-		"forceConsistentCasingInFileNames": true,
-		"emitDecoratorMetadata": true,
-		"experimentalDecorators": true,
-		"allowImportingTsExtensions": true,
-		"noEmit": true
-	}
+    "include": ["**/*.ts"],
+    "compilerOptions": {
+        "strict": true,
+        "esModuleInterop": true,
+        "skipLibCheck": true,
+        "moduleResolution": "Bundler",
+        "module": "ESNext",
+        "target": "ESNext",
+        "noLib": true,
+        "forceConsistentCasingInFileNames": true,
+        "emitDecoratorMetadata": true,
+        "experimentalDecorators": true,
+        "allowImportingTsExtensions": true,
+        "noEmit": true
+    }
 }

repl/src/main/java/me/topchetoeu/j2s/repl/SimpleRepl.java

@@ -786,12 +786,7 @@ public class SimpleRepl {
 			return Value.UNDEFINED;
 		}));
 		res.defineOwnField(env, "compile", new NativeFunction(args -> {
-			var nameVal = args.get(1);
-			var name = nameVal instanceof VoidValue ?
-				new Filename(Metadata.name(), "func" + i[0]++ + ".js") :
-				Filename.parse(nameVal.toString(args.env));
-
-			return Compiler.compileFunc(env, name, args.get(0).toString(env));
+			return Compiler.compileFunc(env, new Filename(Metadata.name(), "func" + i[0]++ + ".js"), args.get(0).toString(env));
 		}));
 		res.defineOwnField(env, "now", new NativeFunction(args -> {
 			return NumberValue.of(System.currentTimeMillis());

runtime/src/main/java/me/topchetoeu/j2s/runtime/InstructionRunner.java

@@ -235,6 +235,18 @@ public class InstructionRunner {
 		return null;
 	}
 
+	private static Value execTypeof(Environment env, Instruction instr, Frame frame) {
+		String name = instr.get(0);
+		Value obj;
+
+		if (name != null) obj = Value.global(env).getMember(env, name);
+		else obj = frame.pop();
+
+		frame.push(obj.type());
+
+		frame.codePtr++;
+		return null;
+	}
 	private static Value execNop(Environment env, Instruction instr, Frame frame) {
 		frame.codePtr++;
 		return null;
@@ -343,10 +355,6 @@ public class InstructionRunner {
 			case INSTANCEOF:
 				res = BoolValue.of(stack[ptr - 1].isInstanceOf(env, stack[ptr].getMember(env, StringValue.of("prototype"))));
 				break;
-			case TYPEOF:
-				res = stack[ptr++].type();
-				frame.stackPtr++;
-				break;
 
 			default: return null;
 		}
@@ -473,6 +481,7 @@ public class InstructionRunner {
 			case STORE_MEMBER_INT: return execStoreMemberInt(env, instr, frame);
 			case STORE_VAR: return execStoreVar(env, instr, frame);
 
+			case TYPEOF: return execTypeof(env, instr, frame);
 			case DELETE: return execDelete(env, instr, frame);
 
 			case JMP: return execJmp(env, instr, frame);