json-as 0.5.35 → 0.5.36

package/asconfig.json

@@ -12,9 +12,6 @@
   "options": {
     "transform": [
       "./transform"
-    ],
-    "bindings": "esm",
-    "exportStart": "_start"
-  },
-  "extends": "./node_modules/@assemblyscript/wasi-shim/asconfig.json"
+    ]
+  }
 }

package/assembly/__benches__/as-json.ts

@@ -1,6 +1,6 @@
 import { JSON } from "..";
 import { backSlashCode, quoteCode } from "../src/chars";
-import { atoi_fast, unsafeCharCodeAt } from "../src/util";
+import { parseJSONInt, unsafeCharCodeAt } from "../src/util";
 import { HASH } from "util/hash";
 
 @json
@@ -24,11 +24,11 @@ class Vec3 {
       if (inStr === false && char === quoteCode) {
         if (key != null) {
           if (unsafeCharCodeAt(key, 0) == 120) {
-            to.x = atoi_fast<i32>(data.substring(last, pos - 1))
+            to.x = parseJSONInt<i32>(data.substring(last, pos - 1))
           } else if (unsafeCharCodeAt(key, 0) == 121) {
-            to.y = atoi_fast<i32>(data.substring(last, pos - 1))
+            to.y = parseJSONInt<i32>(data.substring(last, pos - 1))
           } else if (unsafeCharCodeAt(key, 0) == 122) {
-            to.z = atoi_fast<i32>(data.substring(last, pos - 1))
+            to.z = parseJSONInt<i32>(data.substring(last, pos - 1))
           }
         }
         last = ++pos;
@@ -41,11 +41,11 @@ class Vec3 {
     }
     if (key != null) {
       if (unsafeCharCodeAt(key, 0) == 120) {
-        to.x = atoi_fast<i32>(data.substring(last, pos - 1))
+        to.x = parseJSONInt<i32>(data.substring(last, pos - 1))
       } else if (unsafeCharCodeAt(key, 0) == 121) {
-        to.y = atoi_fast<i32>(data.substring(last, pos - 1))
+        to.y = parseJSONInt<i32>(data.substring(last, pos - 1))
       } else if (unsafeCharCodeAt(key, 0) == 122) {
-        to.z = atoi_fast<i32>(data.substring(last, pos - 1))
+        to.z = parseJSONInt<i32>(data.substring(last, pos - 1))
       }
     }
     return to;

package/assembly/src/json.ts

@@ -23,7 +23,7 @@ import {
     uCode,
     emptyArrayWord
 } from "./chars";
-import { atoi_fast, escapeChar, isBigNum, unsafeCharCodeAt } from "./util";
+import { parseJSONInt, escapeChar, isBigNum, unsafeCharCodeAt } from "./util";
 
 /**
  * JSON Encoder/Decoder for AssemblyScript
@@ -384,7 +384,7 @@ function parseBoolean<T extends boolean>(data: string): T {
 export function parseNumber<T>(data: string): T {
     if (isInteger<T>()) {
         // @ts-ignore
-        return atoi_fast<T>(data);
+        return parseJSONInt<T>(data);
     }
     // @ts-ignore
     const type: T = 0;

package/assembly/src/util.ts

@@ -1,6 +1,6 @@
 import { StringSink } from "as-string-sink/assembly";
 import { CharCode, isSpace } from "util/string";
-import { backSlashCode, quoteCode } from "./chars";
+import { backSlashCode, quoteCode, rCode } from "./chars";
 import { u128, u128Safe, u256, u256Safe, i128, i128Safe, i256Safe } from "as-bignum/assembly";
 
 // @ts-ignore
@@ -85,17 +85,74 @@ export function getArrayDepth<T>(depth: i32 = 1): i32 {
 */
 @unsafe
 @inline
-export function atoi_fast<T extends number>(str: string): T {
+export function atoi_fast<T extends number>(str: string, offset: i32 = 0): T {
   // @ts-ignore
   let val: T = 0;
-  for (let pos = 0; pos < (str.length << 1); pos += 2) {
+  for (; offset < (str.length << 1); offset += 2) {
     // @ts-ignore
-    val = (val << 1) + (val << 3) + (load<u16>(changetype<usize>(str) + <usize>pos) - 48);
+    val = (val << 1) + (val << 3) + (load<u16>(changetype<usize>(str) + <usize>offset) - 48);
     // We use load because in this case, there is no need to have bounds-checking
   }
   return val;
 }
 
 /**
- * 
- */
+ * Implementation of ATOI. Can be much much faster with SIMD.
+ * Its pretty fast. (173m ops (atoi_fast) vs 89 ops (parseInt))
+*/
+@unsafe
+@inline
+export function parseJSONInt<T extends number>(str: string): T {
+  // @ts-ignore
+  let val: T = 0;
+  let char: u16 = load<u16>(changetype<usize>(str));
+  let pos = 2;
+  let neg = char === 45;
+  // @ts-ignore
+  val = (val << 1) + (val << 3) + (char - 48);
+  for (; pos < (str.length << 1); pos += 2) {
+    char = load<u16>(changetype<usize>(str) + <usize>pos);
+    if (char === 101 || char === 69) {
+      char = load<u16>(changetype<usize>(str) + <usize>(pos += 2));
+      if (char === 45) {
+        // @ts-ignore
+        val /= sciNote<T>(atoi_fast<T>(str, pos += 2));
+        if (neg === true) {
+          // @ts-ignore
+          return ~val + 1;
+        }
+        return val;
+      } else {
+        // @ts-ignore
+        val *= sciNote<T>(atoi_fast<T>(str, pos += 2));
+        if (neg === true) {
+          // @ts-ignore
+          return ~val + 1;
+        }
+        return val;
+      }
+    }
+    // @ts-ignore
+    val = (val << 1) + (val << 3) + (char - 48);
+  }
+  if (neg === true) {
+    // @ts-ignore
+    val = ~val + 1;
+  }
+  return val;
+}
+
+function sciNote<T extends number>(num: T): T {
+  let res = 1;
+  if (num > 0) {
+    for (let i = 0; i < num; i++) {
+      res *= 10;
+    }
+  } else {
+    for (let i = 0; i < num; i++) {
+      res /= 10;
+    }
+  }
+  // @ts-ignore
+  return res;
+}

package/assembly/test.ts

@@ -1,6 +1,6 @@
 import { backSlashCode, quoteCode } from "./src/chars";
 import { JSON } from "./src/json";
-import { atoi_fast, unsafeCharCodeAt } from "./src/util";
+import { atoi_fast, parseJSONInt, unsafeCharCodeAt } from "./src/util";
 
 @json
 class Vec3 {
@@ -51,4 +51,10 @@ console.log(JSON.stringify(parsedVec3));
 
 console.log(`atoi_fast("429496729"): ${atoi_fast<i32>("429496729")}`);
 
-console.log(`strtol("429496729"): ${i32.parse("429496729")}`);
+console.log(`strtol("429496729"): ${i32.parse("429496729")}`);
+
+console.log(parseJSONInt<i32>("321").toString());
+console.log(parseJSONInt<i32>("321e1").toString());
+console.log(parseJSONInt<i32>("321e2").toString());
+console.log(parseJSONInt<i32>("321e3").toString());
+console.log(parseJSONInt<i32>("321e-1").toString());

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "json-as",
-  "version": "0.5.35",
+  "version": "0.5.36",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
   "contributors": [
     "DogWhich",
-    "Joshua Tenner",
-    "Rom"
+    "Romdotdog",
+    "Derek Barrera",
+    "Frankk Taylor",
+    "lekiano"
   ],
   "license": "MIT",
   "scripts": {
@@ -23,7 +25,6 @@
   "devDependencies": {
     "@as-pect/cli": "^8.0.1",
     "@as-tral/cli": "^2.0.0",
-    "@assemblyscript/loader": "^0.27.1",
     "@assemblyscript/wasi-shim": "^0.1.0",
     "assemblyscript": "^0.27.1",
     "assemblyscript-prettier": "^1.0.7",

package/transform/package.json

@@ -1,13 +1,15 @@
 {
     "name": "@json-as/transform",
-    "version": "0.5.35",
+    "version": "0.5.36",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",
     "contributors": [
         "DogWhich",
-        "Joshua Tenner",
-        "Rom"
+        "Romdotdog",
+        "Derek Barrera",
+        "Frankk Taylor",
+        "lekiano"
     ],
     "license": "MIT",
     "devDependencies": {
@@ -31,4 +33,4 @@
     "homepage": "https://github.com/JairusSW/as-json#readme",
     "type": "module",
     "exports": "./lib/index.js"
-}
+}

package/transform/src/index.ts

@@ -61,7 +61,7 @@ class AsJSONTransform extends BaseVisitor {
     }
 
     const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
-    const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])]
+    const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])];
 
     for (const mem of members) {
       if (mem.type && mem.type.name && mem.type.name.identifier.text) {
@@ -129,7 +129,7 @@ class AsJSONTransform extends BaseVisitor {
       this.currentClass.setDataStmts.join("")
       }
       }
-    `
+    `;
 
     const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
     node.members.push(serializeMethod);
@@ -164,7 +164,7 @@ export default class Transformer extends Transform {
       } else {
         return 0;
       }
-    })
+    });
 
     // Loop over every source
     for (const source of sources) {