porffor 0.2.0-9ca9aed → 0.2.0-9f8ffb2

package/compiler/codeGen.js

@@ -1,5 +1,5 @@
 import { Blocktype, Opcodes, Valtype, PageSize, ValtypeSize } from "./wasmSpec.js";
-import { ieee754_binary64, signedLEB128, unsignedLEB128 } from "./encoding.js";
+import { ieee754_binary64, signedLEB128, unsignedLEB128, encodeVector } from "./encoding.js";
 import { operatorOpcode } from "./expression.js";
 import { BuiltinFuncs, BuiltinVars, importedFuncs, NULL, UNDEFINED } from "./builtins.js";
 import { PrototypeFuncs } from "./prototype.js";
@@ -55,7 +55,7 @@ const todo = msg => {
 };
 
 const isFuncType = type => type === 'FunctionDeclaration' || type === 'FunctionExpression' || type === 'ArrowFunctionExpression';
-const generate = (scope, decl, global = false, name = undefined) => {
+const generate = (scope, decl, global = false, name = undefined, valueUnused = false) => {
   switch (decl.type) {
     case 'BinaryExpression':
       return generateBinaryExp(scope, decl, global, name);
@@ -68,7 +68,12 @@ const generate = (scope, decl, global = false, name = undefined) => {
 
     case 'ArrowFunctionExpression':
     case 'FunctionDeclaration':
-      generateFunc(scope, decl);
+      const func = generateFunc(scope, decl);
+
+      if (decl.type.endsWith('Expression')) {
+        return number(func.index);
+      }
+
       return [];
 
     case 'BlockStatement':
@@ -81,7 +86,7 @@ const generate = (scope, decl, global = false, name = undefined) => {
       return generateExp(scope, decl);
 
     case 'CallExpression':
-      return generateCall(scope, decl, global, name);
+      return generateCall(scope, decl, global, name, valueUnused);
 
     case 'NewExpression':
       return generateNew(scope, decl, global, name);
@@ -214,6 +219,11 @@ const generate = (scope, decl, global = false, name = undefined) => {
     }
 
     default:
+      if (decl.type.startsWith('TS')) {
+        // ignore typescript nodes
+        return [];
+      }
+
       return todo(`no generation for ${decl.type}!`);
   }
 };
@@ -360,12 +370,12 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
       ...right,
       // note type
       ...rightType,
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+      setLastType(scope),
       [ Opcodes.else ],
       [ Opcodes.local_get, localTmp(scope, 'logictmpi', Valtype.i32) ],
       // note type
       ...leftType,
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+      setLastType(scope),
       [ Opcodes.end ],
       Opcodes.i32_from
     ];
@@ -379,12 +389,12 @@ const performLogicOp = (scope, op, left, right, leftType, rightType) => {
     ...right,
     // note type
     ...rightType,
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+    setLastType(scope),
     [ Opcodes.else ],
     [ Opcodes.local_get, localTmp(scope, 'logictmp') ],
     // note type
     ...leftType,
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+    setLastType(scope),
     [ Opcodes.end ]
   ];
 };
@@ -675,6 +685,15 @@ const truthy = (scope, wasm, type, intIn = false, intOut = false) => {
         [ Opcodes.i32_eqz ], */
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ],
+      [TYPES._bytestring]: [ // duplicate of string
+        [ Opcodes.local_get, tmp ],
+        ...(intIn ? [] : [ Opcodes.i32_to_u ]),
+
+        // get length
+        [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
+
+        ...(intOut ? [] : [ Opcodes.i32_from_u ])
+      ],
       default: def
     }, intOut ? Valtype.i32 : valtypeBinary)
   ];
@@ -702,6 +721,17 @@ const falsy = (scope, wasm, type, intIn = false, intOut = false) => {
         [ Opcodes.i32_eqz ],
         ...(intOut ? [] : [ Opcodes.i32_from_u ])
       ],
+      [TYPES._bytestring]: [ // duplicate of string
+        [ Opcodes.local_get, tmp ],
+        ...(intIn ? [] : [ Opcodes.i32_to_u ]),
+
+        // get length
+        [ Opcodes.i32_load, Math.log2(ValtypeSize.i32) - 1, 0 ],
+
+        // if length == 0
+        [ Opcodes.i32_eqz ],
+        ...(intOut ? [] : [ Opcodes.i32_from_u ])
+      ],
       default: [
         // if value == 0
         [ Opcodes.local_get, tmp ],
@@ -852,7 +882,16 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
 
   let tmpLeft, tmpRight;
   // if equal op, check if strings for compareStrings
-  if (op === '===' || op === '==' || op === '!==' || op === '!=') {
+  if (op === '===' || op === '==' || op === '!==' || op === '!=') (() => {
+    const knownLeft = knownType(scope, leftType);
+    const knownRight = knownType(scope, rightType);
+
+    // todo: intelligent partial skip later
+    // if neither known are string, stop this madness
+    if ((knownLeft != null && knownLeft !== TYPES.string) && (knownRight != null && knownRight !== TYPES.string)) {
+      return;
+    }
+
     tmpLeft = localTmp(scope, '__tmpop_left');
     tmpRight = localTmp(scope, '__tmpop_right');
 
@@ -902,7 +941,7 @@ const performOp = (scope, op, left, right, leftType, rightType, _global = false,
       // endOut.push(stringOnly([ Opcodes.end ]));
       endOut.unshift(stringOnly([ Opcodes.end ]));
     // }
-  }
+  })();
 
   return finalise([
     ...left,
@@ -933,6 +972,18 @@ const asmFunc = (name, { wasm, params, locals: localTypes, globals: globalTypes
     locals[nameParam(i)] = { idx: i, type: allLocals[i] };
   }
 
+  if (typeof wasm === 'function') {
+    const scope = {
+      name,
+      params,
+      locals,
+      returns,
+      localInd: allLocals.length,
+    };
+
+    wasm = wasm(scope, { TYPES, typeSwitch, makeArray });
+  }
+
   let baseGlobalIdx, i = 0;
   for (const type of globalTypes) {
     if (baseGlobalIdx === undefined) baseGlobalIdx = globalInd;
@@ -1014,17 +1065,7 @@ const TYPES = {
   // these are not "typeof" types but tracked internally
   _array: 0x10,
   _regexp: 0x11,
-
-  // typed arrays
-  _int8array: 0x20,
-  _uint8array: 0x21,
-  _uint8clampedarray: 0x22,
-  _int16array: 0x23,
-  _uint16array: 0x24,
-  _int32array: 0x25,
-  _uint32array: 0x26,
-  _float32array: 0x27,
-  _float64array: 0x28,
+  _bytestring: 0x12
 };
 
 const TYPE_NAMES = {
@@ -1038,7 +1079,8 @@ const TYPE_NAMES = {
   [TYPES.bigint]: 'BigInt',
 
   [TYPES._array]: 'Array',
-  [TYPES._regexp]: 'RegExp'
+  [TYPES._regexp]: 'RegExp',
+  [TYPES._bytestring]: 'ByteString'
 };
 
 const getType = (scope, _name) => {
@@ -1062,11 +1104,13 @@ const setType = (scope, _name, type) => {
 
   const out = typeof type === 'number' ? number(type, Valtype.i32) : type;
 
+  if (typedInput && scope.locals[name]?.metadata?.type != null) return [];
   if (scope.locals[name]) return [
     ...out,
     [ Opcodes.local_set, scope.locals[name + '#type'].idx ]
   ];
 
+  if (typedInput && globals[name]?.metadata?.type != null) return [];
   if (globals[name]) return [
     ...out,
     [ Opcodes.global_set, globals[name + '#type'].idx ]
@@ -1075,11 +1119,22 @@ const setType = (scope, _name, type) => {
   // throw new Error('could not find var');
 };
 
+const getLastType = scope => {
+  scope.gotLastType = true;
+  return [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ];
+};
+
+const setLastType = scope => {
+  return [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ];
+};
+
 const getNodeType = (scope, node) => {
   const inner = () => {
     if (node.type === 'Literal') {
       if (node.regex) return TYPES._regexp;
 
+      if (typeof node.value === 'string' && byteStringable(node.value)) return TYPES._bytestring;
+
       return TYPES[typeof node.value];
     }
 
@@ -1093,6 +1148,15 @@ const getNodeType = (scope, node) => {
 
     if (node.type === 'CallExpression' || node.type === 'NewExpression') {
       const name = node.callee.name;
+      if (!name) {
+        // iife
+        if (scope.locals['#last_type']) return [ getLastType(scope) ];
+
+        // presume
+        // todo: warn here?
+        return TYPES.number;
+      }
+
       const func = funcs.find(x => x.name === name);
 
       if (func) {
@@ -1103,7 +1167,19 @@ const getNodeType = (scope, node) => {
       if (builtinFuncs[name]) return TYPES[builtinFuncs[name].returnType ?? 'number'];
       if (internalConstrs[name]) return internalConstrs[name].type;
 
-      if (scope.locals['#last_type']) return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
+      // check if this is a prototype function
+      // if so and there is only one impl (eg charCodeAt)
+      // use that return type as that is the only possibility
+      // (if non-matching type it would error out)
+      if (name.startsWith('__')) {
+        const spl = name.slice(2).split('_');
+
+        const func = spl[spl.length - 1];
+        const protoFuncs = Object.keys(prototypeFuncs).filter(x => x != TYPES._bytestring && prototypeFuncs[x][func] != null);
+        if (protoFuncs.length === 1) return protoFuncs[0].returnType ?? TYPES.number;
+      }
+
+      if (scope.locals['#last_type']) return [ getLastType(scope) ];
 
       // presume
       // todo: warn here?
@@ -1175,7 +1251,7 @@ const getNodeType = (scope, node) => {
       if (node.operator === '!') return TYPES.boolean;
       if (node.operator === 'void') return TYPES.undefined;
       if (node.operator === 'delete') return TYPES.boolean;
-      if (node.operator === 'typeof') return TYPES.string;
+      if (node.operator === 'typeof') return process.argv.includes('-bytestring') ? TYPES._bytestring : TYPES.string;
 
       return TYPES.number;
     }
@@ -1184,11 +1260,17 @@ const getNodeType = (scope, node) => {
       // hack: if something.length, number type
       if (node.property.name === 'length') return TYPES.number;
 
-      // we cannot guess
+      // ts hack
+      if (scope.locals[node.object.name]?.metadata?.type === TYPES.string) return TYPES.string;
+      if (scope.locals[node.object.name]?.metadata?.type === TYPES._array) return TYPES.number;
+
+      if (scope.locals['#last_type']) return [ getLastType(scope) ];
+
+      // presume
       return TYPES.number;
     }
 
-    if (scope.locals['#last_type']) return [ [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ] ];
+    if (scope.locals['#last_type']) return [ getLastType(scope) ];
 
     // presume
     // todo: warn here?
@@ -1204,8 +1286,8 @@ const getNodeType = (scope, node) => {
 const generateLiteral = (scope, decl, global, name) => {
   if (decl.value === null) return number(NULL);
 
+  // hack: just return 1 for regex literals
   if (decl.regex) {
-    scope.regex[name] = decl.regex;
     return number(1);
   }
 
@@ -1218,16 +1300,7 @@ const generateLiteral = (scope, decl, global, name) => {
       return number(decl.value ? 1 : 0);
 
     case 'string':
-      const str = decl.value;
-      const rawElements = new Array(str.length);
-      let j = 0;
-      for (let i = 0; i < str.length; i++) {
-        rawElements[i] = str.charCodeAt(i);
-      }
-
-      return makeArray(scope, {
-        rawElements
-      }, global, name, false, 'i16')[0];
+      return makeString(scope, decl.value, global, name);
 
     default:
       return todo(`cannot generate literal of type ${typeof decl.value}`);
@@ -1248,9 +1321,9 @@ const countLeftover = wasm => {
 
     if (depth === 0)
       if ([Opcodes.throw,Opcodes.drop, Opcodes.local_set, Opcodes.global_set].includes(inst[0])) count--;
-        else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
+        else if ([null, Opcodes.i32_eqz, Opcodes.i64_eqz, Opcodes.f64_ceil, Opcodes.f64_floor, Opcodes.f64_trunc, Opcodes.f64_nearest, Opcodes.f64_sqrt, Opcodes.local_tee, Opcodes.i32_wrap_i64, Opcodes.i64_extend_i32_s, Opcodes.i64_extend_i32_u, Opcodes.f32_demote_f64, Opcodes.f64_promote_f32, Opcodes.f64_convert_i32_s, Opcodes.f64_convert_i32_u, Opcodes.i32_clz, Opcodes.i32_ctz, Opcodes.i32_popcnt, Opcodes.f64_neg, Opcodes.end, Opcodes.i32_trunc_sat_f64_s[0], Opcodes.i32x4_extract_lane, Opcodes.i16x8_extract_lane, Opcodes.i32_load, Opcodes.i64_load, Opcodes.f64_load, Opcodes.v128_load, Opcodes.i32_load16_u, Opcodes.i32_load16_s, Opcodes.i32_load8_u, Opcodes.i32_load8_s, Opcodes.memory_grow].includes(inst[0]) && (inst[0] !== 0xfc || inst[1] < 0x0a)) {}
         else if ([Opcodes.local_get, Opcodes.global_get, Opcodes.f64_const, Opcodes.i32_const, Opcodes.i64_const, Opcodes.v128_const].includes(inst[0])) count++;
-        else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16].includes(inst[0])) count -= 2;
+        else if ([Opcodes.i32_store, Opcodes.i64_store, Opcodes.f64_store, Opcodes.i32_store16, Opcodes.i32_store8].includes(inst[0])) count -= 2;
         else if (Opcodes.memory_copy[0] === inst[0] && Opcodes.memory_copy[1] === inst[1]) count -= 3;
         else if (inst[0] === Opcodes.return) count = 0;
         else if (inst[0] === Opcodes.call) {
@@ -1276,7 +1349,7 @@ const disposeLeftover = wasm => {
 const generateExp = (scope, decl) => {
   const expression = decl.expression;
 
-  const out = generate(scope, expression);
+  const out = generate(scope, expression, undefined, undefined, true);
   disposeLeftover(out);
 
   return out;
@@ -1334,7 +1407,7 @@ const RTArrayUtil = {
   ]
 };
 
-const generateCall = (scope, decl, _global, _name) => {
+const generateCall = (scope, decl, _global, _name, unusedValue = false) => {
   /* const callee = decl.callee;
   const args = decl.arguments;
 
@@ -1367,13 +1440,13 @@ const generateCall = (scope, decl, _global, _name) => {
       const finalStatement = parsed.body[parsed.body.length - 1];
       out.push(
         ...getNodeType(scope, finalStatement),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        setLastType(scope)
       );
     } else if (countLeftover(out) === 0) {
       out.push(...number(UNDEFINED));
       out.push(
         ...number(TYPES.undefined, Valtype.i32),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        setLastType(scope)
       );
     }
 
@@ -1391,8 +1464,7 @@ const generateCall = (scope, decl, _global, _name) => {
   if (name && name.startsWith('__')) {
     const spl = name.slice(2).split('_');
 
-    const func = spl[spl.length - 1];
-    protoName = func;
+    protoName = spl[spl.length - 1];
 
     target = { ...decl.callee };
     target.name = spl.slice(0, -1).join('_');
@@ -1401,8 +1473,8 @@ const generateCall = (scope, decl, _global, _name) => {
   // literal.func()
   if (!name && decl.callee.type === 'MemberExpression') {
     // megahack for /regex/.func()
-    if (decl.callee.object.regex) {
-      const funcName = decl.callee.property.name;
+    const funcName = decl.callee.property.name;
+    if (decl.callee.object.regex && Object.hasOwn(Rhemyn, funcName)) {
       const func = Rhemyn[funcName](decl.callee.object.regex.pattern, currentFuncIndex++);
 
       funcIndex[func.name] = func.index;
@@ -1418,12 +1490,11 @@ const generateCall = (scope, decl, _global, _name) => {
         Opcodes.i32_from_u,
 
         ...number(TYPES.boolean, Valtype.i32),
-        [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+        setLastType(scope)
       ];
     }
 
-    const func = decl.callee.property.name;
-    protoName = func;
+    protoName = decl.callee.property.name;
 
     target = decl.callee.object;
   }
@@ -1445,8 +1516,7 @@ const generateCall = (scope, decl, _global, _name) => {
 
   if (protoName) {
     const protoCands = Object.keys(prototypeFuncs).reduce((acc, x) => {
-      const f = prototypeFuncs[x][protoName];
-      if (f) acc[x] = f;
+      if (Object.hasOwn(prototypeFuncs[x], protoName)) acc[x] = prototypeFuncs[x][protoName];
       return acc;
     }, {});
 
@@ -1455,10 +1525,18 @@ const generateCall = (scope, decl, _global, _name) => {
       // use local for cached i32 length as commonly used
       const lengthLocal = localTmp(scope, '__proto_length_cache', Valtype.i32);
       const pointerLocal = localTmp(scope, '__proto_pointer_cache', Valtype.i32);
-      const getPointer = [ [ Opcodes.local_get, pointerLocal ] ];
 
       // TODO: long-term, prototypes should be their individual separate funcs
 
+      const rawPointer = [
+        ...generate(scope, target),
+        Opcodes.i32_to_u
+      ];
+
+      const usePointerCache = !Object.values(protoCands).every(x => x.noPointerCache === true);
+      const getPointer = usePointerCache ? [ [ Opcodes.local_get, pointerLocal ] ] : rawPointer;
+
+      let allOptUnused = true;
       let lengthI32CacheUsed = false;
       const protoBC = {};
       for (const x in protoCands) {
@@ -1468,7 +1546,7 @@ const generateCall = (scope, decl, _global, _name) => {
             ...RTArrayUtil.getLength(getPointer),
 
             ...number(TYPES.number, Valtype.i32),
-            [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+            setLastType(scope)
           ];
           continue;
         }
@@ -1478,6 +1556,7 @@ const generateCall = (scope, decl, _global, _name) => {
         const protoLocal = protoFunc.local ? localTmp(scope, `__${protoName}_tmp`, protoFunc.local) : -1;
         const protoLocal2 = protoFunc.local2 ? localTmp(scope, `__${protoName}_tmp2`, protoFunc.local2) : -1;
 
+        let optUnused = false;
         const protoOut = protoFunc(getPointer, {
           getCachedI32: () => {
             lengthI32CacheUsed = true;
@@ -1492,23 +1571,30 @@ const generateCall = (scope, decl, _global, _name) => {
           return makeArray(scope, {
             rawElements: new Array(length)
           }, _global, _name, true, itemType);
+        }, () => {
+          optUnused = true;
+          return unusedValue;
         });
 
+        if (!optUnused) allOptUnused = false;
+
         protoBC[x] = [
-          [ Opcodes.block, valtypeBinary ],
+          [ Opcodes.block, unusedValue && optUnused ? Blocktype.void : valtypeBinary ],
           ...protoOut,
 
           ...number(protoFunc.returnType ?? TYPES.number, Valtype.i32),
-          [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ],
+          setLastType(scope),
           [ Opcodes.end ]
         ];
       }
 
-      return [
-        ...generate(scope, target),
+      // todo: if some cands use optUnused and some don't, we will probably crash
 
-        Opcodes.i32_to_u,
-        [ Opcodes.local_set, pointerLocal ],
+      return [
+        ...(usePointerCache ? [
+          ...rawPointer,
+          [ Opcodes.local_set, pointerLocal ],
+        ] : []),
 
         ...(!lengthI32CacheUsed ? [] : [
           ...RTArrayUtil.getLengthI32(getPointer),
@@ -1520,7 +1606,7 @@ const generateCall = (scope, decl, _global, _name) => {
 
           // TODO: error better
           default: internalThrow(scope, 'TypeError', `'${protoName}' proto func tried to be called on a type without an impl`)
-        }, valtypeBinary),
+        }, allOptUnused && unusedValue ? Blocktype.void : valtypeBinary),
       ];
     }
   }
@@ -1567,7 +1653,9 @@ const generateCall = (scope, decl, _global, _name) => {
   const func = funcs.find(x => x.index === idx);
 
   const userFunc = (funcIndex[name] && !importedFuncs[name] && !builtinFuncs[name] && !internalConstrs[name]) || idx === -1;
-  const paramCount = func && (userFunc ? func.params.length / 2 : func.params.length);
+  const typedParams = userFunc || builtinFuncs[name]?.typedParams;
+  const typedReturn = userFunc || builtinFuncs[name]?.typedReturn;
+  const paramCount = func && (typedParams ? func.params.length / 2 : func.params.length);
 
   let args = decl.arguments;
   if (func && args.length < paramCount) {
@@ -1585,12 +1673,12 @@ const generateCall = (scope, decl, _global, _name) => {
   let out = [];
   for (const arg of args) {
     out = out.concat(generate(scope, arg));
-    if (userFunc) out = out.concat(getNodeType(scope, arg));
+    if (typedParams) out = out.concat(getNodeType(scope, arg));
   }
 
   out.push([ Opcodes.call, idx ]);
 
-  if (!userFunc) {
+  if (!typedReturn) {
     // let type;
     // if (builtinFuncs[name]) type = TYPES[builtinFuncs[name].returnType ?? 'number'];
     // if (internalConstrs[name]) type = internalConstrs[name].type;
@@ -1600,7 +1688,7 @@ const generateCall = (scope, decl, _global, _name) => {
     //   ...number(type, Valtype.i32),
     //   [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
     // );
-  } else out.push([ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]);
+  } else out.push(setLastType(scope));
 
   return out;
 };
@@ -1625,9 +1713,118 @@ const unhackName = name => {
   return name;
 };
 
+const knownType = (scope, type) => {
+  if (type.length === 1 && type[0][0] === Opcodes.i32_const) {
+    return type[0][1];
+  }
+
+  if (typedInput && type.length === 1 && type[0][0] === Opcodes.local_get) {
+    const idx = type[0][1];
+
+    // type idx = var idx + 1
+    const v = Object.values(scope.locals).find(x => x.idx === idx - 1);
+    if (v.metadata?.type != null) return v.metadata.type;
+  }
+
+  return null;
+};
+
+const brTable = (input, bc, returns) => {
+  const out = [];
+  const keys = Object.keys(bc);
+  const count = keys.length;
+
+  if (count === 1) {
+    // return [
+    //   ...input,
+    //   ...bc[keys[0]]
+    // ];
+    return bc[keys[0]];
+  }
+
+  if (count === 2) {
+    // just use if else
+    const other = keys.find(x => x !== 'default');
+    return [
+      ...input,
+      ...number(other, Valtype.i32),
+      [ Opcodes.i32_eq ],
+      [ Opcodes.if, returns ],
+      ...bc[other],
+      [ Opcodes.else ],
+      ...bc.default,
+      [ Opcodes.end ]
+    ];
+  }
+
+  for (let i = 0; i < count; i++) {
+    if (i === 0) out.push([ Opcodes.block, returns, 'br table start' ]);
+      else out.push([ Opcodes.block, Blocktype.void ]);
+  }
+
+  const nums = keys.filter(x => +x);
+  const offset = Math.min(...nums);
+  const max = Math.max(...nums);
+
+  const table = [];
+  let br = 1;
+
+  for (let i = offset; i <= max; i++) {
+    // if branch for this num, go to that block
+    if (bc[i]) {
+      table.push(br);
+      br++;
+      continue;
+    }
+
+    // else default
+    table.push(0);
+  }
+
+  out.push(
+    [ Opcodes.block, Blocktype.void ],
+    ...input,
+    ...(offset > 0 ? [
+      ...number(offset, Valtype.i32),
+      [ Opcodes.i32_sub ]
+    ] : []),
+    [ Opcodes.br_table, ...encodeVector(table), 0 ]
+  );
+
+  // if you can guess why we sort the wrong way and then reverse
+  // (instead of just sorting the correct way)
+  // dm me and if you are correct and the first person
+  // I will somehow shout you out or something
+  const orderedBc = keys.sort((a, b) => b - a).reverse();
+
+  br = count - 1;
+  for (const x of orderedBc) {
+    out.push(
+      [ Opcodes.end ],
+      ...bc[x],
+      ...(br === 0 ? [] : [ [ Opcodes.br, br ] ])
+    );
+    br--;
+  }
+
+  return [
+    ...out,
+    [ Opcodes.end, 'br table end' ]
+  ];
+};
+
 const typeSwitch = (scope, type, bc, returns = valtypeBinary) => {
-  const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
+  if (!process.argv.includes('-bytestring')) delete bc[TYPES._bytestring];
 
+  const known = knownType(scope, type);
+  if (known != null) {
+    return bc[known] ?? bc.default;
+  }
+
+  if (process.argv.includes('-typeswitch-use-brtable'))
+    return brTable(type, bc, returns);
+
+  const tmp = localTmp(scope, '#typeswitch_tmp', Valtype.i32);
   const out = [
     ...type,
     [ Opcodes.local_set, tmp ],
@@ -1679,6 +1876,51 @@ const allocVar = (scope, name, global = false) => {
   return idx;
 };
 
+const addVarMetadata = (scope, name, global = false, metadata = {}) => {
+  const target = global ? globals : scope.locals;
+
+  target[name].metadata ??= {};
+  for (const x in metadata) {
+    if (metadata[x] != null) target[name].metadata[x] = metadata[x];
+  }
+};
+
+const typeAnnoToPorfType = x => {
+  if (TYPES[x]) return TYPES[x];
+  if (TYPES['_' + x]) return TYPES['_' + x];
+
+  switch (x) {
+    case 'i32':
+      return TYPES.number;
+  }
+
+  return null;
+};
+
+const extractTypeAnnotation = decl => {
+  let a = decl;
+  while (a.typeAnnotation) a = a.typeAnnotation;
+
+  let type, elementType;
+  if (a.typeName) {
+    type = a.typeName.name;
+  } else if (a.type.endsWith('Keyword')) {
+    type = a.type.slice(2, -7).toLowerCase();
+  } else if (a.type === 'TSArrayType') {
+    type = 'array';
+    elementType = extractTypeAnnotation(a.elementType).type;
+  }
+
+  const typeName = type;
+  type = typeAnnoToPorfType(type);
+
+  if (type === TYPES._bytestring && !process.argv.includes('-bytestring')) type = TYPES.string;
+
+  // if (decl.name) console.log(decl.name, { type, elementType });
+
+  return { type, typeName, elementType };
+};
+
 const generateVar = (scope, decl) => {
   let out = [];
 
@@ -1690,6 +1932,8 @@ const generateVar = (scope, decl) => {
   for (const x of decl.declarations) {
     const name = mapName(x.id.name);
 
+    if (!name) return todo('destructuring is not supported yet');
+
     if (x.init && isFuncType(x.init.type)) {
       // hack for let a = function () { ... }
       x.init.id = { name };
@@ -1706,6 +1950,11 @@ const generateVar = (scope, decl) => {
     }
 
     let idx = allocVar(scope, name, global);
+
+    if (typedInput && x.id.typeAnnotation) {
+      addVarMetadata(scope, name, global, extractTypeAnnotation(x.id));
+    }
+
     if (x.init) {
       out = out.concat(generate(scope, x.init, global, name));
 
@@ -1823,6 +2072,8 @@ const generateAssign = (scope, decl) => {
     ];
   }
 
+  if (!name) return todo('destructuring is not supported yet');
+
   const [ local, isGlobal ] = lookupName(scope, name);
 
   if (local === undefined) {
@@ -1869,7 +2120,7 @@ const generateAssign = (scope, decl) => {
       ], getType(scope, name), getNodeType(scope, decl.right), isGlobal, name, true),
       [ isGlobal ? Opcodes.global_get : Opcodes.local_get, local.idx ],
 
-      [ Opcodes.local_get, localTmp(scope, '#last_type', Valtype.i32) ],
+      getLastType(scope),
       // hack: type is idx+1
       [ isGlobal ? Opcodes.global_set : Opcodes.local_set, local.idx + 1 ],
     ];
@@ -1961,6 +2212,8 @@ const generateUnary = (scope, decl) => {
         [TYPES.undefined]: makeString(scope, 'undefined', false, '#typeof_result'),
         [TYPES.function]: makeString(scope, 'function', false, '#typeof_result'),
 
+        [TYPES._bytestring]: makeString(scope, 'string', false, '#typeof_result'),
+
         // object and internal types
         default: makeString(scope, 'object', false, '#typeof_result'),
       });
@@ -2036,7 +2289,7 @@ const generateConditional = (scope, decl) => {
   // note type
   out.push(
     ...getNodeType(scope, decl.consequent),
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+    setLastType(scope)
   );
 
   out.push([ Opcodes.else ]);
@@ -2045,7 +2298,7 @@ const generateConditional = (scope, decl) => {
   // note type
   out.push(
     ...getNodeType(scope, decl.alternate),
-    [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+    setLastType(scope)
   );
 
   out.push([ Opcodes.end ]);
@@ -2066,8 +2319,10 @@ const generateFor = (scope, decl) => {
   out.push([ Opcodes.loop, Blocktype.void ]);
   depth.push('for');
 
-  out.push(...generate(scope, decl.test));
-  out.push(Opcodes.i32_to, [ Opcodes.if, Blocktype.void ]);
+  if (decl.test) out.push(...generate(scope, decl.test), Opcodes.i32_to);
+    else out.push(...number(1, Valtype.i32));
+
+  out.push([ Opcodes.if, Blocktype.void ]);
   depth.push('if');
 
   out.push([ Opcodes.block, Blocktype.void ]);
@@ -2075,8 +2330,7 @@ const generateFor = (scope, decl) => {
   out.push(...generate(scope, decl.body));
   out.push([ Opcodes.end ]);
 
-  out.push(...generate(scope, decl.update));
-  depth.pop();
+  if (decl.update) out.push(...generate(scope, decl.update));
 
   out.push([ Opcodes.br, 1 ]);
   out.push([ Opcodes.end ], [ Opcodes.end ]);
@@ -2142,13 +2396,14 @@ const generateForOf = (scope, decl) => {
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
   let newOut = number(0, Valtype.f64), newPointer = -1;
-  if (pages.hasString) {
+  if (pages.hasAnyString) {
     0, [ newOut, newPointer ] = makeArray(scope, {
       rawElements: new Array(1)
     }, isGlobal, leftName, true, 'i16');
   }
 
   // set type for local
+  // todo: optimize away counter and use end pointer
   out.push(...typeSwitch(scope, getNodeType(scope, decl.right), {
     [TYPES._array]: [
       ...setType(scope, leftName, TYPES.number),
@@ -2273,7 +2528,7 @@ const generateThrow = (scope, decl) => {
   // hack: throw new X("...") -> throw "..."
   if (!message && (decl.argument.type === 'NewExpression' || decl.argument.type === 'CallExpression')) {
     constructor = decl.argument.callee.name;
-    message = decl.argument.arguments[0].value;
+    message = decl.argument.arguments[0]?.value ?? '';
   }
 
   if (tags.length === 0) tags.push({
@@ -2334,6 +2589,8 @@ const allocPage = (reason, type) => {
 
   if (reason.startsWith('array:')) pages.hasArray = true;
   if (reason.startsWith('string:')) pages.hasString = true;
+  if (reason.startsWith('bytestring:')) pages.hasByteString = true;
+  if (reason.includes('string:')) pages.hasAnyString = true;
 
   const ind = pages.size;
   pages.set(reason, { ind, type });
@@ -2367,7 +2624,8 @@ const StoreOps = {
   f64: Opcodes.f64_store,
 
   // expects i32 input!
-  i16: Opcodes.i32_store16
+  i8: Opcodes.i32_store8,
+  i16: Opcodes.i32_store16,
 };
 
 let data = [];
@@ -2386,6 +2644,15 @@ const compileBytes = (val, itemType, signed = true) => {
   }
 };
 
+const getAllocType = itemType => {
+  switch (itemType) {
+    case 'i8': return 'bytestring';
+    case 'i16': return 'string';
+
+    default: return 'array';
+  }
+};
+
 const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty = false, itemType = valtype) => {
   const out = [];
 
@@ -2395,7 +2662,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
 
     // todo: can we just have 1 undeclared array? probably not? but this is not really memory efficient
     const uniqueName = name === '$undeclared' ? name + Math.random().toString().slice(2) : name;
-    arrays.set(name, allocPage(`${itemType === 'i16' ? 'string' : 'array'}: ${uniqueName}`, itemType) * pageSize);
+    arrays.set(name, allocPage(`${getAllocType(itemType)}: ${uniqueName}`, itemType) * pageSize);
   }
 
   const pointer = arrays.get(name);
@@ -2441,7 +2708,7 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
     out.push(
       ...number(0, Valtype.i32),
       ...(useRawElements ? number(elements[i], Valtype[valtype]) : generate(scope, elements[i])),
-      [ storeOp, Math.log2(ValtypeSize[itemType]) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
+      [ storeOp, (Math.log2(ValtypeSize[itemType]) || 1) - 1, ...unsignedLEB128(pointer + ValtypeSize.i32 + i * ValtypeSize[itemType]) ]
     );
   }
 
@@ -2451,15 +2718,29 @@ const makeArray = (scope, decl, global = false, name = '$undeclared', initEmpty
   return [ out, pointer ];
 };
 
+const byteStringable = str => {
+  if (!process.argv.includes('-bytestring')) return false;
+
+  for (let i = 0; i < str.length; i++) {
+    if (str.charCodeAt(i) > 0xFF) return false;
+  }
+
+  return true;
+};
+
 const makeString = (scope, str, global = false, name = '$undeclared') => {
   const rawElements = new Array(str.length);
+  let byteStringable = process.argv.includes('-bytestring');
   for (let i = 0; i < str.length; i++) {
-    rawElements[i] = str.charCodeAt(i);
+    const c = str.charCodeAt(i);
+    rawElements[i] = c;
+
+    if (byteStringable && c > 0xFF) byteStringable = false;
   }
 
   return makeArray(scope, {
     rawElements
-  }, global, name, false, 'i16')[0];
+  }, global, name, false, byteStringable ? 'i8' : 'i16')[0];
 };
 
 let arrays = new Map();
@@ -2487,10 +2768,13 @@ export const generateMember = (scope, decl, _global, _name) => {
     ];
   }
 
+  const object = generate(scope, decl.object);
+  const property = generate(scope, decl.property);
+
   // // todo: we should only do this for strings but we don't know at compile-time :(
   // hack: this is naughty and will break things!
-  let newOut = number(0, Valtype.f64), newPointer = -1;
-  if (pages.hasString) {
+  let newOut = number(0, valtypeBinary), newPointer = -1;
+  if (pages.hasAnyString) {
     0, [ newOut, newPointer ] = makeArray(scope, {
       rawElements: new Array(1)
     }, _global, _name, true, 'i16');
@@ -2499,7 +2783,7 @@ export const generateMember = (scope, decl, _global, _name) => {
   return typeSwitch(scope, getNodeType(scope, decl.object), {
     [TYPES._array]: [
       // get index as valtype
-      ...generate(scope, decl.property),
+      ...property,
 
       // convert to i32 and turn into byte offset by * valtypeSize (4 for i32, 8 for i64/f64)
       Opcodes.i32_to_u,
@@ -2507,7 +2791,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.i32_mul ],
 
       ...(aotPointer ? [] : [
-        ...generate(scope, decl.object),
+        ...object,
         Opcodes.i32_to_u,
         [ Opcodes.i32_add ]
       ]),
@@ -2516,7 +2800,7 @@ export const generateMember = (scope, decl, _global, _name) => {
       [ Opcodes.load, Math.log2(ValtypeSize[valtype]) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
 
       ...number(TYPES.number, Valtype.i32),
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+      setLastType(scope)
     ],
 
     [TYPES.string]: [
@@ -2526,14 +2810,14 @@ export const generateMember = (scope, decl, _global, _name) => {
 
       ...number(0, Valtype.i32), // base 0 for store later
 
-      ...generate(scope, decl.property),
-
+      ...property,
       Opcodes.i32_to_u,
+
       ...number(ValtypeSize.i16, Valtype.i32),
       [ Opcodes.i32_mul ],
 
       ...(aotPointer ? [] : [
-        ...generate(scope, decl.object),
+        ...object,
         Opcodes.i32_to_u,
         [ Opcodes.i32_add ]
       ]),
@@ -2548,7 +2832,35 @@ export const generateMember = (scope, decl, _global, _name) => {
       ...number(newPointer),
 
       ...number(TYPES.string, Valtype.i32),
-      [ Opcodes.local_set, localTmp(scope, '#last_type', Valtype.i32) ]
+      setLastType(scope)
+    ],
+    [TYPES._bytestring]: [
+      // setup new/out array
+      ...newOut,
+      [ Opcodes.drop ],
+
+      ...number(0, Valtype.i32), // base 0 for store later
+
+      ...property,
+      Opcodes.i32_to_u,
+
+      ...(aotPointer ? [] : [
+        ...object,
+        Opcodes.i32_to_u,
+        [ Opcodes.i32_add ]
+      ]),
+
+      // load current string ind {arg}
+      [ Opcodes.i32_load8_u, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128((aotPointer ? pointer : 0) + ValtypeSize.i32) ],
+
+      // store to new string ind 0
+      [ Opcodes.i32_store8, Math.log2(ValtypeSize.i16) - 1, ...unsignedLEB128(newPointer + ValtypeSize.i32) ],
+
+      // return new string (page)
+      ...number(newPointer),
+
+      ...number(TYPES._bytestring, Valtype.i32),
+      setLastType(scope)
     ],
 
     default: [ [ Opcodes.unreachable ] ]
@@ -2568,11 +2880,14 @@ const objectHack = node => {
     // if object is not identifier or another member exp, give up
     if (node.object.type !== 'Identifier' && node.object.type !== 'MemberExpression') return node;
 
-    if (!objectName) objectName = objectHack(node.object).name.slice(2);
+    if (!objectName) objectName = objectHack(node.object)?.name?.slice?.(2);
 
     // if .length, give up (hack within a hack!)
     if (node.property.name === 'length') return node;
 
+    // no object name, give up
+    if (!objectName) return node;
+
     const name = '__' + objectName + '_' + node.property.name;
     if (codeLog) log('codegen', `object hack! ${node.object.name}.${node.property.name} -> ${name}`);
 
@@ -2597,7 +2912,7 @@ const generateFunc = (scope, decl) => {
   if (decl.generator) return todo('generator functions are not supported');
 
   const name = decl.id ? decl.id.name : `anonymous_${randId()}`;
-  const params = decl.params?.map(x => x.name) ?? [];
+  const params = decl.params ?? [];
 
   // const innerScope = { ...scope };
   // TODO: share scope/locals between !!!
@@ -2611,7 +2926,11 @@ const generateFunc = (scope, decl) => {
   };
 
   for (let i = 0; i < params.length; i++) {
-    allocVar(innerScope, params[i], false);
+    allocVar(innerScope, params[i].name, false);
+
+    if (typedInput && params[i].typeAnnotation) {
+      addVarMetadata(innerScope, params[i].name, false, extractTypeAnnotation(params[i]));
+    }
   }
 
   let body = objectHack(decl.body);
@@ -2627,10 +2946,8 @@ const generateFunc = (scope, decl) => {
   const func = {
     name,
     params: Object.values(innerScope.locals).slice(0, params.length * 2).map(x => x.type),
-    returns: innerScope.returns,
-    locals: innerScope.locals,
-    throws: innerScope.throws,
-    index: currentFuncIndex++
+    index: currentFuncIndex++,
+    ...innerScope
   };
   funcIndex[name] = func.index;
 
@@ -2650,117 +2967,6 @@ const generateFunc = (scope, decl) => {
     );
   }
 
-  // change v128 params into many <type> (i32x4 -> i32/etc) instead as unsupported param valtype
-  let offset = 0, vecParams = 0;
-  for (let i = 0; i < params.length; i++) {
-    const name = params[i];
-    const local = func.locals[name];
-    if (local.type === Valtype.v128) {
-      vecParams++;
-
-      /* wasm.unshift( // add v128 load for param
-        [ Opcodes.i32_const, 0 ],
-        [ ...Opcodes.v128_load, 0, i * 16 ],
-        [ Opcodes.local_set, local.idx ]
-      ); */
-
-      // using params and replace_lane is noticably faster than just loading from memory (above) somehow
-
-      // extract valtype and lane count from vec type (i32x4 = i32 4, i8x16 = i8 16, etc)
-      const { vecType } = local;
-      let [ type, lanes ] = vecType.split('x');
-      if (!type || !lanes) throw new Error('bad metadata from vec params'); // sanity check
-
-      lanes = parseInt(lanes);
-      type = Valtype[type];
-
-      const name = params[i]; // get original param name
-
-      func.params.splice(offset, 1, ...new Array(lanes).fill(type)); // add new params of {type}, {lanes} times
-
-      // update index of original local
-      // delete func.locals[name];
-
-      // add new locals for params
-      for (let j = 0; j < lanes; j++) {
-        func.locals[name + j] = { idx: offset + j, type, vecParamAutogen: true };
-      }
-
-      // prepend wasm to generate expected v128 locals
-      wasm.splice(i * 2 + offset * 2, 0,
-        ...i32x4(0, 0, 0, 0),
-        ...new Array(lanes).fill(0).flatMap((_, j) => [
-          [ Opcodes.local_get, offset + j ],
-          [ ...Opcodes[vecType + '_replace_lane'], j ]
-        ]),
-        [ Opcodes.local_set, i ]
-      );
-
-      offset += lanes;
-
-      // note: wrapping is disabled for now due to perf/dx concerns (so this will never run)
-      /* if (!func.name.startsWith('#')) func.name = '##' + func.name;
-
-      // add vec type index to hash name prefix for wrapper to know how to wrap
-      const vecTypeIdx = [ 'i8x16', 'i16x8', 'i32x4', 'i64x2', 'f32x4', 'f64x2' ].indexOf(local.vecType);
-      const secondHash = func.name.slice(1).indexOf('#');
-      func.name = '#' + func.name.slice(1, secondHash) + vecTypeIdx + func.name.slice(secondHash); */
-    }
-  }
-
-  if (offset !== 0) {
-    // bump local indexes for all other locals after
-    for (const x in func.locals) {
-      const local = func.locals[x];
-      if (!local.vecParamAutogen) local.idx += offset;
-    }
-
-    // bump local indexes in wasm local.get/set
-    for (let j = 0; j < wasm.length; j++) {
-      const inst = wasm[j];
-      if (j < offset * 2 + vecParams * 2) {
-        if (inst[0] === Opcodes.local_set) inst[1] += offset;
-        continue;
-      }
-
-      if (inst[0] === Opcodes.local_get || inst[0] === Opcodes.local_set) inst[1] += offset;
-    }
-  }
-
-  // change v128 return into many <type> instead as unsupported return valtype
-  const lastReturnLocal = wasm.length > 2 && wasm[wasm.length - 1][0] === Opcodes.return && Object.values(func.locals).find(x => x.idx === wasm[wasm.length - 2][1]);
-  if (lastReturnLocal && lastReturnLocal.type === Valtype.v128) {
-    const name = Object.keys(func.locals)[Object.values(func.locals).indexOf(lastReturnLocal)];
-    // extract valtype and lane count from vec type (i32x4 = i32 4, i8x16 = i8 16, etc)
-    const { vecType } = lastReturnLocal;
-    let [ type, lanes ] = vecType.split('x');
-    if (!type || !lanes) throw new Error('bad metadata from vec params'); // sanity check
-
-    lanes = parseInt(lanes);
-    type = Valtype[type];
-
-    const vecIdx = lastReturnLocal.idx;
-
-    const lastIdx = Math.max(0, ...Object.values(func.locals).map(x => x.idx));
-    const tmpIdx = [];
-    for (let i = 0; i < lanes; i++) {
-      const idx = lastIdx + i + 1;
-      tmpIdx.push(idx);
-      func.locals[name + i] = { idx, type, vecReturnAutogen: true };
-    }
-
-    wasm.splice(wasm.length - 1, 1,
-      ...new Array(lanes).fill(0).flatMap((_, i) => [
-        i === 0 ? null : [ Opcodes.local_get, vecIdx ],
-        [ ...Opcodes[vecType + '_extract_lane'], i ],
-        [ Opcodes.local_set, tmpIdx[i] ],
-      ].filter(x => x !== null)),
-      ...new Array(lanes).fill(0).map((_, i) => [ Opcodes.local_get, tmpIdx[i]])
-    );
-
-    func.returns = new Array(lanes).fill(type);
-  }
-
   func.wasm = wasm;
 
   funcs.push(func);