json-as 0.5.39 → 0.5.41

package/assembly/src/util.ts

@@ -114,6 +114,10 @@ export function parseSciInteger<T extends number>(str: string): T {
   // @ts-ignore
   let val: T = 0;
   let offset = 0;
+  let firstChar = load<u16>(changetype<usize>(str) + <usize>offset);
+  if (firstChar === 45) {
+    offset = 2;
+  }
   for (; offset < str.length << 1; offset += 2) {
     const char = load<u16>(changetype<usize>(str) + <usize>offset);
     if (char === 101 || char === 69) {
@@ -134,6 +138,9 @@ export function parseSciInteger<T extends number>(str: string): T {
     val = (val << 1) + (val << 3) + (char - 48);
     // We use load because in this case, there is no need to have bounds-checking
   }
+  if (firstChar === 45) {
+    val = -val;
+  }
   return val;
 }
 
@@ -141,15 +148,16 @@ export function parseSciInteger<T extends number>(str: string): T {
 @inline
 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
+    if (num > 0) {
+      for (let i: T = 0; i < num; i++) {
+        res *= 10;
+      }
+    } else {
+      for (let i: T = 0; i < num; i++) {
+        res /= 10;
+      }
     }
-  }
   // @ts-ignore
   return res;
-}
+}

package/assembly/test.ts

@@ -54,7 +54,30 @@ console.log("1230 - " + parseSciInteger<i32>("123e1").toString());
 console.log("12300 - " + parseSciInteger<i32>("123e2").toString());
 console.log("123000 - " + parseSciInteger<i32>("123e3").toString());
 console.log("32 - " + parseSciInteger<i32>("123e-1").toString());
+console.log(parseSciInteger<i32>("100").toString());
+console.log(parseSciInteger<i32>("-100").toString());
 
+console.log(
+  JSON.stringify([
+    "abcdefg",
+    'st"ring" w""ith quotes"',
+    'string \t\r"with ran\tdom spa\nces and \nnewlines\n\n\n',
+    'string with colon : comma , brace [ ] bracket { } and quote " and other quote "',
+  ])
+);/*
+console.log(
+  JSON.stringify(
+    JSON.parse<string[]>(
+      JSON.stringify([
+        "abcdefg",
+        'st"ring" w""ith quotes"',
+        'string \t\r"with ran\tdom spa\nces and \nnewlines\n\n\n',
+        'string with colon : comma , brace [ ] bracket { } and quote " and other quote "',
+      ])
+    )
+  )
+);
+/*
 const str = changetype<string>(new ArrayBuffer(6));
 console.log("istr:");
 console.log("123 - " + istr8(123));
@@ -244,3 +267,4 @@ export function istr64<T extends number>(int: T): string {
 // 9 = 57
 
 console.log(JSON.stringify("h\\i from gray\bson"));
+*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.5.39",
+  "version": "0.5.41",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",

package/transform/lib/index.js

@@ -1,4 +1,4 @@
-import { toString, isStdlib } from "visitor-as/dist/utils.js";
+import { getName, toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
 class SchemaData {
@@ -19,23 +19,48 @@ class AsJSONTransform extends BaseVisitor {
         this.sources = [];
     }
     visitMethodDeclaration() { }
+    visitFieldDeclaration(node) {
+        if (toString(node).startsWith("static"))
+            return;
+        const lineText = toString(node);
+        if (lineText.startsWith("private"))
+            return;
+        const name = getName(node);
+        if (!node.type) {
+            throw new Error(`Field ${name} is missing a type declaration`);
+        }
+        let type = getName(node.type);
+        // @ts-ignore
+        this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
+        // @ts-ignore
+        //this.decodeStmts.push(
+        //   `${name}: JSON.parseObjectValue<${type}>(values.get("${name}")),\n`
+        //);
+        // @ts-ignore
+        this.currentClass.setDataStmts.push(`if (key.length === ${name.length} && (memory.compare(changetype<usize>("${name}"), changetype<usize>(key), ${name.length}) == 0)) {
+        this.${name} = JSON.parseObjectValue<${type}>(value);
+        return;
+      }
+      `);
+        // @ts-ignore
+        //this.checkDecodeStmts.push(
+        //  ' if (!values.has("${name}")) throw new Error("Key "${name}" was not found. Cannot instantiate object.");\n'
+        //);
+    }
     visitClassDeclaration(node) {
-        var _c;
+        var _a;
         const className = node.name.text;
-        if (!((_c = node.decorators) === null || _c === void 0 ? void 0 : _c.length))
+        if (!((_a = node.decorators) === null || _a === void 0 ? void 0 : _a.length))
             return;
         let foundDecorator = false;
         for (const decorator of node.decorators) {
-            if (
             // @ts-ignore
-            decorator.name.text.toLowerCase() == "json" ||
-                // @ts-ignore
-                decorator.name.text.toLowerCase() == "serializable")
+            if (decorator.name.text.toLowerCase() == "json" || decorator.name.text.toLowerCase() == "serializable")
                 foundDecorator = true;
         }
         if (!foundDecorator)
             return;
-        // Prevent from being triggered twice.
+        // Prevent from being triggered twice
         for (const member of node.members) {
             if (member.name.text == "__JSON_Serialize")
                 return;
@@ -48,7 +73,7 @@ class AsJSONTransform extends BaseVisitor {
             parent: node.extendsType ? toString(node.extendsType) : "",
             node: node,
             encodeStmts: [],
-            setDataStmts: [],
+            setDataStmts: []
         };
         if (this.currentClass.parent.length > 0) {
             const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
@@ -57,64 +82,17 @@ class AsJSONTransform extends BaseVisitor {
                 this.currentClass.encodeStmts.push(...parentSchema === null || parentSchema === void 0 ? void 0 : parentSchema.encodeStmts);
             }
             else {
-                console.error("Class extends " +
-                    this.currentClass.parent +
-                    ", but parent class not found. Maybe add the @json decorator over parent class?");
+                console.error("Class extends " + this.currentClass.parent + ", but parent class not found. Maybe add the @json decorator over parent class?");
             }
         }
         const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
-        const members = [
-            ...node.members,
-            ...(parentSchema ? parentSchema.node.members : []),
-        ];
-        for (const mem of members) {
-            // @ts-ignore
-            if (mem.type && mem.type.name && mem.type.name.identifier.text) {
-                const member = mem;
-                if (toString(member).startsWith("static"))
-                    return;
-                const lineText = toString(member);
-                if (lineText.startsWith("private"))
-                    return;
-                // @ts-ignore
-                let type = toString(member.type);
-                const name = member.name.text;
-                this.currentClass.keys.push(name);
-                // @ts-ignore
-                this.currentClass.types.push(type);
-                // @ts-ignore
-                if ([
-                    "u8",
-                    "i8",
-                    "u16",
-                    "i16",
-                    "u32",
-                    "i32",
-                    "f32",
-                    "u64",
-                    "i64",
-                    "f64",
-                ].includes(type.toLowerCase())) {
-                    this.currentClass.encodeStmts.push(`"${name}":\${this.${name}.toString()},`);
-                }
-                else {
-                    this.currentClass.encodeStmts.push(`"${name}":\${JSON.stringify<${type}>(this.${name})},`);
-                }
-                // @ts-ignore
-                this.currentClass.setDataStmts.push(`if (key == "${name}") {
-        this.${name} = JSON.parseObjectValue<${type}>(value);
-        return;
-      }
-      `);
-            }
-        }
+        const members = [...node.members, ...(parentSchema ? parentSchema.node.members : [])];
+        this.visit(members);
         let serializeFunc = "";
         if (this.currentClass.encodeStmts.length > 0) {
             const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];
-            this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
-                stmt.slice(0, stmt.length - 1);
+            this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] = stmt.slice(0, stmt.length - 1);
             serializeFunc = `
-      @inline
       __JSON_Serialize(): string {
         return \`{${this.currentClass.encodeStmts.join("")}}\`;
       }
@@ -122,18 +100,16 @@ class AsJSONTransform extends BaseVisitor {
         }
         else {
             serializeFunc = `
-      @inline
       __JSON_Serialize(): string {
         return "{}";
       }
       `;
         }
         const setKeyFunc = `
-      @inline
       __JSON_Set_Key(key: string, value: string): void {
         ${
-        // @ts-ignore
-        this.currentClass.setDataStmts.join("")}
+            // @ts-ignore
+            this.currentClass.setDataStmts.join("")}
       }
     `;
         const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
@@ -151,23 +127,18 @@ export default class Transformer extends Transform {
     afterParse(parser) {
         // Create new transform
         const transformer = new AsJSONTransform();
-        // Sort the sources so that user scripts are visited last
-        const sources = parser.sources
-            .filter((source) => !isStdlib(source))
-            .sort((_a, _b) => {
-            const a = _a.internalPath;
-            const b = _b.internalPath;
+        // Loop over every source
+        const sources = parser.sources.filter(source => !isStdlib(source)).sort((_a, _b) => {
+            const a = _a.internalPath
+            const b = _b.internalPath
             if (a[0] === "~" && b[0] !== "~") {
                 return -1;
-            }
-            else if (a[0] !== "~" && b[0] === "~") {
+            } else if (a[0] !== "~" && b[0] === "~") {
                 return 1;
-            }
-            else {
+            } else {
                 return 0;
             }
-        });
-        // Loop over every source
+        })
         for (const source of sources) {
             // Ignore all lib and std. Visit everything else.
             if (!isStdlib(source)) {
@@ -175,4 +146,4 @@ export default class Transformer extends Transform {
             }
         }
     }
-}
+}

package/transform/package.json

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