json-as 0.4.7 → 0.4.9

package/assembly/index.ts

@@ -1,7 +1,6 @@
 import { StringSink } from "as-string-sink/assembly";
 import { Variant } from "as-variant/assembly";
-import { isSpace } from "assemblyscript/std/assembly/util/string";
-import { stringify } from "as-console/assembly";
+import { isSpace } from "util/string";
 import {
   backSlashCode,
   colonCode,
@@ -80,11 +79,11 @@ export class JSON {
       // @ts-ignore
       for (let i = 0; i < data.length - 1; i++) {
         // @ts-ignore
-        result.write(stringify(unchecked(data[i])));
+        result.write(JSON.stringify(unchecked(data[i])));
         result.write(",");
       }
       // @ts-ignore
-      result.write(stringify(unchecked(data[data.length - 1])));
+      result.write(JSON.stringify(unchecked(data[data.length - 1])));
       result.write("]");
       return result.toString();
     }
@@ -128,13 +127,13 @@ export class JSON {
 
 // @ts-ignore
 @inline
-function parseString(data: string): string {
+  function parseString(data: string): string {
   return data.slice(1, data.length - 1).replaceAll('\\"', '"');
 }
 
 // @ts-ignore
 @inline
-function parseBoolean<T extends boolean>(data: string): T {
+  function parseBoolean<T extends boolean>(data: string): T {
   if (data.length > 3 && data.startsWith("true")) return <T>true;
   else if (data.length > 4 && data.startsWith("false")) return <T>false;
   else throw new Error(`JSON: Cannot parse "${data}" as boolean`);
@@ -142,14 +141,14 @@ function parseBoolean<T extends boolean>(data: string): T {
 
 // @ts-ignore
 @inline
-function parseNumber<T>(data: string): T {
+  function parseNumber<T>(data: string): T {
   let type: T;
   // @ts-ignore
   if (type instanceof f64) return F64.parseFloat(data);
   // @ts-ignore
   else if (type instanceof f32) return F32.parseFloat(data);
   // @ts-ignore
-  else if (type instanceof i32) return I32.parseInt(data);
+  else if (type instanceof u64) return U64.parseInt(data);
   // @ts-ignore
   else if (type instanceof u32) return U32.parseInt(data);
   // @ts-ignore
@@ -157,6 +156,10 @@ function parseNumber<T>(data: string): T {
   // @ts-ignore
   else if (type instanceof u16) return U16.parseInt(data);
   // @ts-ignore
+  else if (type instanceof i64) return I64.parseInt(data);
+  // @ts-ignore
+  else if (type instanceof i32) return I32.parseInt(data);
+  // @ts-ignore
   else if (type instanceof i16) return I16.parseInt(data);
   // @ts-ignore
   else if (type instanceof i8) return I8.parseInt(data);
@@ -168,7 +171,7 @@ function parseNumber<T>(data: string): T {
 
 // @ts-ignore
 @inline
-export function parseObject<T>(data: string): T {
+  export function parseObject<T>(data: string): T {
   let schema!: T;
   const result = new Map<string, string>();
   let key = "";
@@ -269,7 +272,7 @@ export function parseObject<T>(data: string): T {
     ) {
       result.set(key, "false");
       isKey = false;
-    } else if (char >= 48 && char <= 57) {
+    } else if ((char >= 48 && char <= 57) || char === 45) {
       let numberValueIndex = ++outerLoopIndex;
       for (; numberValueIndex < data.length - 1; numberValueIndex++) {
         char = unsafeCharCodeAt(data, numberValueIndex);
@@ -295,18 +298,18 @@ export function parseObject<T>(data: string): T {
 
 // @ts-ignore
 @inline
-// @ts-ignore
-export function parseArray<T extends unknown[]>(data: string): T {
+  // @ts-ignore
+  export function parseArray<T extends unknown[]>(data: string): T {
   // TODO: Replace with opt
   let type!: valueof<T>;
   if (type instanceof String) {
     return <T>parseStringArray(data);
-  } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
-    // @ts-ignore
-    return parseNumberArray<T>(data);
   } else if (isBoolean<valueof<T>>()) {
     // @ts-ignore
     return parseBooleanArray<T>(data);
+  } else if (isFloat<valueof<T>>() || isInteger<valueof<T>>()) {
+    // @ts-ignore
+    return parseNumberArray<T>(data);
   } else if (isArrayLike<valueof<T>>()) {
     // @ts-ignore
     return parseArrayArray<T>(data);
@@ -319,7 +322,7 @@ export function parseArray<T extends unknown[]>(data: string): T {
 
 // @ts-ignore
 @inline
-export function parseStringArray(data: string): string[] {
+  export function parseStringArray(data: string): string[] {
   const result: string[] = [];
   let lastPos = 0;
   let instr = false;
@@ -339,7 +342,7 @@ export function parseStringArray(data: string): string[] {
 
 // @ts-ignore
 @inline
-export function parseBooleanArray<T extends boolean[]>(data: string): T {
+  export function parseBooleanArray<T extends boolean[]>(data: string): T {
   const result = instantiate<T>();
   let lastPos = 1;
   let char = 0;
@@ -367,21 +370,21 @@ export function parseBooleanArray<T extends boolean[]>(data: string): T {
 
 // @ts-ignore
 @inline
-export function parseNumberArray<T extends number[]>(data: string): T {
+  export function parseNumberArray<T extends number[]>(data: string): T {
   const result = instantiate<T>();
   let lastPos = 0;
   let char = 0;
   let i = 1;
   for (; i < data.length - 1; i++) {
     char = unsafeCharCodeAt(data, i);
-    if (lastPos === 0 && char >= 48 && char <= 57) {
+    if (lastPos === 0 && (char >= 48 && char <= 57) || char === 45) {
       lastPos = i;
     } else if ((isSpace(char) || char == commaCode) && lastPos > 0) {
       result.push(parseNumber<valueof<T>>(data.slice(lastPos, i)));
       lastPos = 0;
     }
   }
-  for (; i > lastPos; i--) {
+  for (; i > lastPos - 1; i--) {
     char = unsafeCharCodeAt(data, i);
     if (char !== rightBracketCode) {
       result.push(parseNumber<valueof<T>>(data.slice(lastPos, i + 1)));
@@ -393,7 +396,7 @@ export function parseNumberArray<T extends number[]>(data: string): T {
 
 // @ts-ignore
 @inline
-export function parseArrayArray<T extends unknown[][]>(data: string): T {
+  export function parseArrayArray<T extends unknown[][]>(data: string): T {
   const result = instantiate<T>();
   let char = 0;
   let lastPos = 0;
@@ -423,7 +426,7 @@ export function parseArrayArray<T extends unknown[][]>(data: string): T {
 
 // @ts-ignore
 @inline
-export function parseObjectArray<T extends unknown[][]>(data: string): T {
+  export function parseObjectArray<T extends unknown[][]>(data: string): T {
   const result = instantiate<T>();
   let char = 0;
   let lastPos = 1;
@@ -451,4 +454,4 @@ export function parseObjectArray<T extends unknown[][]>(data: string): T {
   return result;
 }
 
-class Nullable {}
+class Nullable { }

package/assembly/test.ts

@@ -46,4 +46,4 @@ const serializedVec2 = JSON.stringify<Vec2>(vec);
 console.log("Serialized Vec2: " + serializedVec2);
 const deserializedVec2 = JSON.parse<Vec2>(serializedVec2);
 
-console.log("Deserialized: " + JSON.stringify(deserializedVec2));
+console.log("Deserialized Vec2: " + JSON.stringify(deserializedVec2));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -20,7 +20,9 @@
   "devDependencies": {
     "@as-pect/cli": "^7.0.7",
     "@as-tral/cli": "^1.1.1",
+    "@serial-as/json": "^1.0.2",
     "as-console": "^6.0.2",
+    "as-rainbow": "^0.1.0",
     "assemblyscript": "^0.20.7",
     "assemblyscript-prettier": "^1.0.2",
     "typescript": "^4.7.2"

package/transform/package.json

@@ -1,6 +1,6 @@
-7{
+{
     "name": "@json-as/transform",
-    "version": "0.4.7",
+    "version": "0.4.9",
     "description": "JSON encoder/decoder for AssemblyScript",
     "main": "./lib/index.js",
     "author": "Jairus Tanaka",
@@ -21,7 +21,7 @@
         "json",
         "serialize",
         "deserialize",
-        "dynamic"
+        "serde"
     ],
     "bugs": {
         "url": "https://github.com/JairusSW/as-json/issues"