json-as 0.9.1 → 0.9.2

package/assembly/src/chars.ts

@@ -1,74 +1,76 @@
 // Characters
 // @ts-ignore = Decorator is valid here
-@inline export const commaCode = 44;
+export const COMMA = 44;
 // @ts-ignore = Decorator is valid here
-@inline export const quoteCode = 34;
+export const QUOTE = 34;
 // @ts-ignore = Decorator is valid here
-@inline export const backSlashCode = 92;
+export const BACK_SLASH = 92;
 // @ts-ignore: Decorator is valid here
-@inline export const forwardSlashCode = 47;
+export const FWD_SLASH = 47;
 // @ts-ignore: Decorator is valid here
-@inline export const leftBraceCode = 123;
+export const BRACE_LEFT = 123;
 // @ts-ignore: Decorator is valid here
-@inline export const rightBraceCode = 125;
+export const BRACE_RIGHT = 125;
 // @ts-ignore: Decorator is valid here
-@inline export const leftBracketCode = 91;
+export const BRACKET_LEFT = 91;
 // @ts-ignore: Decorator is valid here
-@inline export const rightBracketCode = 93;
+export const BRACKET_RIGHT = 93;
 // @ts-ignore: Decorator is valid here
-@inline export const colonCode = 58;
+export const COLON = 58;
 // @ts-ignore: Decorator is valid here
-@inline export const tCode = 116;
+export const CHAR_T = 116;
 // @ts-ignore: Decorator is valid here
-@inline export const rCode = 114;
+export const CHAR_R = 114;
 // @ts-ignore: Decorator is valid here
-@inline export const uCode = 117;
+export const CHAR_U = 117;
 // @ts-ignore: Decorator is valid here
-@inline export const eCode = 101;
+export const CHAR_E = 101;
 // @ts-ignore: Decorator is valid here
-@inline export const fCode = 102;
+export const CHAR_F = 102;
 // @ts-ignore: Decorator is valid here
-@inline export const aCode = 97;
+export const CHAR_A = 97;
 // @ts-ignore: Decorator is valid here
-@inline export const lCode = 108;
+export const CHAR_L = 108;
 // @ts-ignore: Decorator is valid here
-@inline export const sCode = 115;
+export const CHAR_S = 115;
 // @ts-ignore = Decorator is valid here
-@inline export const nCode = 110;
+export const CHAR_N = 110;
 // @ts-ignore = Decorator is valid here
-@inline export const bCode = 98;
+export const CHAR_B = 98;
 // Strings
 // @ts-ignore: Decorator is valid here
-@inline export const trueWord = "true";
+export const TRUE_WORD = "true";
 // @ts-ignore: Decorator is valid here
-@inline export const falseWord = "false";
+export const FALSE_WORD = "false";
 // @ts-ignore: Decorator is valid here
-@inline export const nullWord = "null";
+export const NULL_WORD = "null";
 // @ts-ignore: Decorator is valid here
-@inline export const leftBraceWord = "{";
+export const BRACE_LEFT_WORD = "{";
 // @ts-ignore: Decorator is valid here
-@inline export const leftBracketWord = "[";
+export const BRACKET_LEFT_WORD = "[";
 // @ts-ignore: Decorator is valid here
-@inline export const emptyArrayWord = "[]";
+export const EMPTY_BRACKET_WORD = "[]";
 // @ts-ignore: Decorator is valid here
-@inline export const colonWord = ":";
+export const COLON_WORD = ":";
 // @ts-ignore: Decorator is valid here
-@inline export const commaWord = ",";
+export const COMMA_WORD = ",";
 // @ts-ignore: Decorator is valid here
-@inline export const rightBraceWord = "}";
+export const BRACE_RIGHT_WORD = "}";
 // @ts-ignore: Decorator is valid here
-@inline export const rightBracketWord = "]";
+export const BRACKET_RIGHT_WORD = "]";
 // @ts-ignore: Decorator is valid here
-@inline export const quoteWord = "\"";
+export const QUOTE_WORD = "\"";
+// @ts-ignore: Decorator is valid here
+export const EMPTY_QUOTE_WORD = "\"\"";
 
 // Escape Codes
 // @ts-ignore: Decorator is valid here
-@inline export const backspaceCode = 8; // \b
+export const BACKSPACE = 8; // \b
 // @ts-ignore: Decorator is valid here
-@inline export const tabCode = 9; // \t
+export const TAB = 9; // \t
 // @ts-ignore: Decorator is valid here
-@inline export const newLineCode = 10; // \n
+export const NEW_LINE = 10; // \n
 // @ts-ignore: Decorator is valid here
-@inline export const formFeedCode = 12; // \f
+export const FORM_FEED = 12; // \f
 // @ts-ignore: Decorator is valid here
-@inline export const carriageReturnCode = 13; // \r
+export const CARRIAGE_RETURN = 13; // \r

package/assembly/src/sink.ts

@@ -6,7 +6,7 @@ const MIN_BUFFER_SIZE: u32 = MIN_BUFFER_LEN << 1;
 const NEW_LINE_CHAR: u16 = 0x0A; // \n
 
 // @ts-ignore: decorator
-@inline function nextPowerOf2(n: u32): u32 {
+function nextPowerOf2(n: u32): u32 {
     return 1 << 32 - clz(n - 1);
 }
 
@@ -79,17 +79,17 @@ export class Sink {
 
     constructor() { }
 
-    @inline get length(): i32 {
+    get length(): i32 {
         return this.offset >> 1;
     }
 
-    @inline get capacity(): i32 {
+    get capacity(): i32 {
         return this.buffer.byteLength >>> 1;
     }
-    @inline reset(): void {
+    reset(): void {
         this.offset = 0;
     }
-    @inline write(src: string, start: i32 = 0, end: i32 = i32.MAX_VALUE): Sink | null {
+    write(src: string, start: i32 = 0, end: i32 = i32.MAX_VALUE): Sink | null {
         let len = src.length as u32;
 
         if (start != 0 || end != i32.MAX_VALUE) {
@@ -116,7 +116,7 @@ export class Sink {
         return this;
     }
 
-    @inline writeLn(src: string = "", start: i32 = 0, end: i32 = i32.MAX_VALUE): Sink {
+    writeLn(src: string = "", start: i32 = 0, end: i32 = i32.MAX_VALUE): Sink {
         let len = src.length as u32;
         if (start != 0 || end != i32.MAX_VALUE) {
             let from: i32;
@@ -137,7 +137,7 @@ export class Sink {
         return this;
     }
 
-    @inline writeCodePoint(code: i32): Sink {
+    writeCodePoint(code: i32): Sink {
         let hasSur = <u32>code > 0xFFFF;
         this.ensureCapacity(2 << i32(hasSur));
 
@@ -158,7 +158,7 @@ export class Sink {
         return this;
     }
 
-    @inline writeCodePoint16(code: i32): Sink {
+    writeCodePoint16(code: i32): Sink {
         this.ensureCapacity(2);
 
         let offset = this.offset;
@@ -170,7 +170,7 @@ export class Sink {
         return this;
     }
 
-    @inline writeCodePointUnsafe(code: i32): Sink {
+    writeCodePointUnsafe(code: i32): Sink {
         this.ensureCapacity(2);
 
         let offset = this.offset;
@@ -184,7 +184,7 @@ export class Sink {
         return this;
     }
 
-    @inline writeNumber<T extends number>(value: T): Sink {
+    writeNumber<T extends number>(value: T): Sink {
         let offset = this.offset;
         if (isInteger<T>()) {
             let maxCapacity = 0;
@@ -213,7 +213,7 @@ export class Sink {
         this.offset = offset;
         return this;
     }
-    @inline writeNumberUnsafe<T extends number>(value: T): Sink {
+    writeNumberUnsafe<T extends number>(value: T): Sink {
         let offset = this.offset;
         if (isInteger<T>()) {
             offset += itoa_buffered(
@@ -229,7 +229,7 @@ export class Sink {
         this.offset = offset;
         return this;
     }
-    @inline writeIntegerUnsafe<T extends number>(value: T): Sink {
+    writeIntegerUnsafe<T extends number>(value: T): Sink {
         let offset = this.offset;
         if (isInteger<T>()) {
             offset += itoa_buffered(
@@ -246,7 +246,7 @@ export class Sink {
         return this;
     }
 
-    @inline reserve(capacity: i32, clear: bool = false): void {
+    reserve(capacity: i32, clear: bool = false): void {
         if (clear) this.offset = 0;
         this.buffer = changetype<ArrayBuffer>(__renew(
             changetype<usize>(this.buffer),
@@ -254,18 +254,18 @@ export class Sink {
         ));
     }
 
-    @inline shrink(): void {
+    shrink(): void {
         this.buffer = changetype<ArrayBuffer>(__renew(
             changetype<usize>(this.buffer),
             max<u32>(this.offset, MIN_BUFFER_SIZE)
         ));
     }
 
-    @inline clear(): void {
+    clear(): void {
         this.reserve(0, true);
     }
 
-    @inline toString(): string {
+    toString(): string {
         let size = this.offset;
         if (!size) return "";
         let out = changetype<string>(__new(size, idof<string>()));
@@ -273,7 +273,7 @@ export class Sink {
         return out;
     }
 
-    @inline ensureCapacity(deltaBytes: u32): void {
+    ensureCapacity(deltaBytes: u32): void {
         let buffer = this.buffer;
         let newSize = this.offset + deltaBytes;
         if (newSize > <u32>buffer.byteLength) {

package/assembly/src/util.ts

@@ -1,28 +1,28 @@
 import { StringSink } from "as-string-sink/assembly";
 import { isSpace } from "util/string";
-import { backSlashCode, quoteCode } from "./chars";
+import { BACK_SLASH, QUOTE } from "./chars";
 
 // @ts-ignore: Decorator
-@inline export function isMap<T>(): bool {
+export function isMap<T>(): bool {
   let type = changetype<T>(0);
   return type instanceof Map;
 }
 
 // @ts-ignore: Decorator
-@inline export function unsafeCharCodeAt(data: string, pos: i32): i32 {
+export function unsafeCharCodeAt(data: string, pos: i32): i32 {
   return load<u16>(changetype<usize>(data) + ((<usize>pos) << 1));
 }
 
 // @ts-ignore: Decorator
-@inline export function removeWhitespace(data: string): string {
+export function removeWhitespace(data: string): string {
   const result = new StringSink();
   let instr = false;
   for (let i = 0; i < data.length; i++) {
     const char = unsafeCharCodeAt(data, i);
-    if (instr === false && char === quoteCode) instr = true;
+    if (instr === false && char === QUOTE) instr = true;
     else if (
-      instr === true && char === quoteCode
-      && unsafeCharCodeAt(data, i - 1) !== backSlashCode
+      instr === true && char === QUOTE
+      && unsafeCharCodeAt(data, i - 1) !== BACK_SLASH
     ) instr = false;
 
     if (instr === false) {
@@ -35,7 +35,7 @@ import { backSlashCode, quoteCode } from "./chars";
 }
 
 // @ts-ignore: Decorator
-@inline export function escapeChar(char: string): string {
+export function escapeChar(char: string): string {
   switch (unsafeCharCodeAt(char, 0)) {
     case 0x22:
       return '\\"';
@@ -65,7 +65,7 @@ import { backSlashCode, quoteCode } from "./chars";
  */
 
 // @ts-ignore: Decorator
-@inline export function getArrayDepth<T extends ArrayLike>(depth: i32 = 1): i32 {
+export function getArrayDepth<T extends ArrayLike>(depth: i32 = 1): i32 {
   if (!isArray<T>()) {
     return 0;
   } else if (isArray<valueof<T>>()) {
@@ -93,7 +93,7 @@ import { backSlashCode, quoteCode } from "./chars";
  * @param str - Any number. Can include scientific notation.
 */
 // @ts-ignore: Decorator
-@inline export function snip_fast<T extends number>(str: string, len: u32 = 0, offset: u32 = 0): T {
+export function snip_fast<T extends number>(str: string, len: u32 = 0, offset: u32 = 0): T {
   if (isSigned<T>()) {
     const firstChar: u32 = load<u16>(changetype<usize>(str));
     if (firstChar === 48) return 0 as T;
@@ -258,7 +258,7 @@ import { backSlashCode, quoteCode } from "./chars";
  */
 
 // @ts-ignore
-@global @inline export function __atoi_fast<T extends number>(str: string, start: u32 = 0, end: u32 = 0): T {
+@global export function __atoi_fast<T extends number>(str: string, start: u32 = 0, end: u32 = 0): T {
   // @ts-ignore
   let val: T = 0;
   if (!end) end = start + u32(str.length << 1);
@@ -293,7 +293,7 @@ import { backSlashCode, quoteCode } from "./chars";
  */
 
 // @ts-ignore
-@inline export function parseSciInteger<T extends number>(str: string): T {
+export function parseSciInteger<T extends number>(str: string): T {
   // @ts-ignore
   let val: T = 0;
   let offset = 0;
@@ -328,7 +328,7 @@ import { backSlashCode, quoteCode } from "./chars";
 }
 
 // @ts-ignore
-@inline function sciNote<T extends number>(num: T): T {
+function sciNote<T extends number>(num: T): T {
   let res = 1;
   // @ts-ignore
   if (num > 0) {
@@ -345,7 +345,7 @@ import { backSlashCode, quoteCode } from "./chars";
 }
 
 // @ts-ignore
-@inline function equalsSlice(p1_data: string, p1_start: i32, p1_end: i32, p2_data: string, p2_start: i32, p2_end: i32): boolean {
+function equalsSlice(p1_data: string, p1_start: i32, p1_end: i32, p2_data: string, p2_start: i32, p2_end: i32): boolean {
   const p1_len = p1_end - p1_start;
   const p2_len = p2_end - p2_start;
   if (p1_len != p2_len) return false;
@@ -356,7 +356,7 @@ import { backSlashCode, quoteCode } from "./chars";
 }
 
 // @ts-ignore
-@inline export function containsCodePoint(str: string, code: u32, start: i32, end: i32): bool {
+export function containsCodePoint(str: string, code: u32, start: i32, end: i32): bool {
   for (let i = start; i <= end; i++) {
     if (unsafeCharCodeAt(str, i) == code) return true;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -20,7 +20,7 @@
     "build:test": "asc assembly/test.ts -o build/test.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
     "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",
     "bench:wasmtime": "wasmtime ./bench/benchmark.wasm",
-    "bench:wazmer": "wasmer --llvm ./bench/benchmark.wasm",
+    "bench:wasmer": "wasmer --llvm ./bench/benchmark.wasm",
     "build:transform": "tsc -p ./transform",
     "test:wasmtime": "wasmtime ./build/test.wasm",
     "test:wavm": "wavm run ./build/test.wasm",

package/transform/lib/index.js

@@ -39,10 +39,10 @@ class JSONTransform extends BaseVisitor {
             }
         }
         if (!members.length) {
-            let SERIALIZE_RAW_EMPTY = "@inline __SERIALIZE(): string {\n  return \"{}\";\n}";
-            //let SERIALIZE_PRETTY_EMPTY = "@inline __SERIALIZE_PRETTY(): string {\n  return \"{}\";\n}";
-            let INITIALIZE_EMPTY = "@inline __INITIALIZE(): this {\n  return this;\n}";
-            let DESERIALIZE_EMPTY = "@inline __DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  return false;\n}";
+            let SERIALIZE_RAW_EMPTY = "__SERIALIZE(): string {\n  return \"{}\";\n}";
+            //let SERIALIZE_PRETTY_EMPTY = "__SERIALIZE_PRETTY(): string {\n  return \"{}\";\n}";
+            let INITIALIZE_EMPTY = "__INITIALIZE(): this {\n  return this;\n}";
+            let DESERIALIZE_EMPTY = "__DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  return false;\n}";
             if (process.env["JSON_DEBUG"]) {
                 console.log(SERIALIZE_RAW_EMPTY);
                 //console.log(SERIALIZE_PRETTY_EMPTY);
@@ -130,10 +130,10 @@ class JSONTransform extends BaseVisitor {
             }
             schema.members.push(mem);
         }
-        let SERIALIZE_RAW = "@inline __SERIALIZE(): string {\n  let out = `{";
-        let SERIALIZE_PRETTY = "@inline __SERIALIZE_PRETTY(): string {\n  let out = `{";
-        let INITIALIZE = "@inline __INITIALIZE(): this {\n";
-        let DESERIALIZE = "@inline __DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  const len = key_end - key_start;\n";
+        let SERIALIZE_RAW = "__SERIALIZE(): string {\n  let out = `{";
+        let SERIALIZE_PRETTY = "__SERIALIZE_PRETTY(): string {\n  let out = `{";
+        let INITIALIZE = "__INITIALIZE(): this {\n";
+        let DESERIALIZE = "__DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  const len = key_end - key_start;\n";
         let indent = "  ";
         if (!schema.members.length)
             return;

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.9.1",
+  "version": "0.9.2",
   "description": "JSON encoder/decoder for AssemblyScript",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",

package/transform/src/index.ts

@@ -56,12 +56,12 @@ class JSONTransform extends BaseVisitor {
     }
 
     if (!members.length) {
-      let SERIALIZE_RAW_EMPTY = "@inline __SERIALIZE(): string {\n  return \"{}\";\n}";
-      //let SERIALIZE_PRETTY_EMPTY = "@inline __SERIALIZE_PRETTY(): string {\n  return \"{}\";\n}";
+      let SERIALIZE_RAW_EMPTY = "__SERIALIZE(): string {\n  return \"{}\";\n}";
+      //let SERIALIZE_PRETTY_EMPTY = "__SERIALIZE_PRETTY(): string {\n  return \"{}\";\n}";
 
-      let INITIALIZE_EMPTY = "@inline __INITIALIZE(): this {\n  return this;\n}";
+      let INITIALIZE_EMPTY = "__INITIALIZE(): this {\n  return this;\n}";
 
-      let DESERIALIZE_EMPTY = "@inline __DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  return false;\n}";
+      let DESERIALIZE_EMPTY = "__DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  return false;\n}";
 
       if (process.env["JSON_DEBUG"]) {
         console.log(SERIALIZE_RAW_EMPTY);
@@ -146,12 +146,12 @@ class JSONTransform extends BaseVisitor {
       schema.members.push(mem);
     }
 
-    let SERIALIZE_RAW = "@inline __SERIALIZE(): string {\n  let out = `{";
-    let SERIALIZE_PRETTY = "@inline __SERIALIZE_PRETTY(): string {\n  let out = `{";
+    let SERIALIZE_RAW = "__SERIALIZE(): string {\n  let out = `{";
+    let SERIALIZE_PRETTY = "__SERIALIZE_PRETTY(): string {\n  let out = `{";
 
-    let INITIALIZE = "@inline __INITIALIZE(): this {\n";
+    let INITIALIZE = "__INITIALIZE(): this {\n";
 
-    let DESERIALIZE = "@inline __DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  const len = key_end - key_start;\n"
+    let DESERIALIZE = "__DESERIALIZE(data: string, key_start: i32, key_end: i32, value_start: i32, value_end: i32): boolean {\n  const len = key_end - key_start;\n"
     let indent = "  ";
 
     if (!schema.members.length) return;