json-as 0.9.19 → 0.9.21

package/transform/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@json-as/transform",
-  "version": "0.9.19",
+  "version": "0.9.21",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "main": "./lib/index.js",
   "author": "Jairus Tanaka",

package/transform/src/index.ts

@@ -7,6 +7,12 @@ import {
   NodeKind,
   Expression,
   CommonFlags,
+  StringLiteralExpression,
+  IntegerLiteralExpression,
+  FloatLiteralExpression,
+  NullExpression,
+  TrueExpression,
+  FalseExpression,
 } from "assemblyscript/dist/assemblyscript.js";
 
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
@@ -18,7 +24,7 @@ class JSONTransform extends BaseVisitor {
   public currentClass!: SchemaData;
   public sources = new Set<Source>();
 
-  visitMethodDeclaration(): void {}
+  visitMethodDeclaration(): void { }
   visitClassDeclaration(node: ClassDeclaration): void {
     if (!node.decorators?.length) return;
 
@@ -103,9 +109,9 @@ class JSONTransform extends BaseVisitor {
       if (!member.type) {
         throw new Error(
           "Fields must be strongly typed! Found " +
-            toString(member) +
-            " at " +
-            node.range.source.normalizedPath,
+          toString(member) +
+          " at " +
+          node.range.source.normalizedPath,
         );
       }
       const type = toString(member.type!);
@@ -122,10 +128,14 @@ class JSONTransform extends BaseVisitor {
       mem.value = value;
       mem.node = member;
 
-      if (type == "JSON.Raw") {
+      if (type.includes("JSON.Raw")) {
         mem.flags.set(PropertyFlags.JSON_Raw, []);
       }
 
+      if (member.type.isNullable) {
+        mem.flags.set(PropertyFlags.Null, []);
+      }
+
       if (member.decorators) {
         for (const decorator of member.decorators) {
           const decoratorName = (decorator.name as IdentifierExpression).text;
@@ -137,7 +147,7 @@ class JSONTransform extends BaseVisitor {
               if (!args.length)
                 throw new Error(
                   "Expected 1 argument but got zero at @alias in " +
-                    node.range.source.normalizedPath,
+                  node.range.source.normalizedPath,
                 );
               mem.alias = args[0]!;
               mem.flags.set(PropertyFlags.Alias, args);
@@ -151,7 +161,7 @@ class JSONTransform extends BaseVisitor {
               if (!decorator.args?.length)
                 throw new Error(
                   "Expected 1 argument but got zero at @omitif in " +
-                    node.range.source.normalizedPath,
+                  node.range.source.normalizedPath,
                 );
               mem.flags.set(PropertyFlags.OmitIf, args);
               break;
@@ -262,36 +272,35 @@ class JSONTransform extends BaseVisitor {
       SERIALIZE_PRETTY +=
         "`;\n  store<u32>(changetype<usize>(out) + ((out.length - 2) << 1), 8192010);\n  return out;\n}";
     } else {
-      SERIALIZE_RAW += "`;\n};";
-      SERIALIZE_PRETTY += "`;\n};";
+      SERIALIZE_RAW += "}`;\n  return out;\n}";
+      SERIALIZE_PRETTY += "}`;\n  return out;\n}";
     }
 
     INITIALIZE += "  return this;\n}";
 
     const sortedMembers: Property[][] = [];
     const _sorted = schema.members.sort(
-      (a, b) => a.name.length - b.name.length,
+      (a, b) => (a.alias?.length! || a.name.length) - (b.alias?.length! || b.name.length),
     );
-    let len = 0;
-    let offset = 0;
-    sortedMembers.push([_sorted[0]!]);
-    len = _sorted[0]?.name.length!;
-    for (let i = 1; i < _sorted.length; i++) {
+    let len = -1;
+    let offset = -1;
+    for (let i = 0; i < _sorted.length; i++) {
       const member = _sorted[i]!;
-      if (member.alias?.length || member.name.length > len) {
+      const _name = member.alias || member.name;
+      if (_name.length === len) {
+        sortedMembers[offset]?.push(member);
+      } else {
         sortedMembers.push([member]);
-        len = member.alias?.length || member.name.length;
+        len = _name.length;
         offset++;
-      } else {
-        sortedMembers[offset]!.push(member);
       }
     }
 
     let first = true;
     for (const memberSet of sortedMembers) {
       const firstMember = memberSet[0]!;
-      const name = encodeKey(firstMember.alias || firstMember.name);
-      if (name.length === 1) {
+      const _name = encodeKey(firstMember.alias || firstMember.name);
+      if (_name.length === 1) {
         if (first) {
           DESERIALIZE +=
             "  if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
@@ -300,7 +309,7 @@ class JSONTransform extends BaseVisitor {
           DESERIALIZE +=
             "else if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
         }
-      } else if (name.length === 2) {
+      } else if (_name.length === 2) {
         if (first) {
           DESERIALIZE +=
             "  if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
@@ -309,7 +318,7 @@ class JSONTransform extends BaseVisitor {
           DESERIALIZE +=
             "else if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
         }
-      } else if (name.length === 4) {
+      } else if (_name.length === 4) {
         if (first) {
           DESERIALIZE +=
             "  if (4 === len) {\n    const code = load<u64>(changetype<usize>(data) + (key_start << 1));\n";
@@ -320,44 +329,44 @@ class JSONTransform extends BaseVisitor {
         }
       } else {
         if (first) {
-          DESERIALIZE += "  if (" + name.length + " === len) {\n";
+          DESERIALIZE += "  if (" + _name.length + " === len) {\n";
           first = false;
         } else {
-          DESERIALIZE += "else if (" + name.length + " === len) {\n";
+          DESERIALIZE += "else if (" + _name.length + " === len) {\n";
         }
       }
       let f = true;
       for (let i = 0; i < memberSet.length; i++) {
         const member = memberSet[i]!;
         if (!member.deserialize) continue;
-        const name = encodeKey(member.alias || member.name);
-        if (name.length === 1) {
-          DESERIALIZE += `      case ${name.charCodeAt(0)}: {\n        ${member.deserialize}\n        return true;\n      }\n`;
-        } else if (name.length === 2) {
-          DESERIALIZE += `      case ${charCodeAt32(name, 0)}: {\n        ${member.deserialize}\n        return true;\n      }\n`;
-        } else if (name.length === 4) {
+        const _name = encodeKey(member.alias || member.name);
+        if (_name.length === 1) {
+          DESERIALIZE += `      case ${_name.charCodeAt(0)}: { /* ${_name} */\n        ${member.deserialize}\n        return true;\n      }\n`;
+        } else if (_name.length === 2) {
+          DESERIALIZE += `      case ${charCodeAt32(_name, 0)}: { /* ${_name} */\n        ${member.deserialize}\n        return true;\n      }\n`;
+        } else if (_name.length === 4) {
           if (f) {
             f = false;
-            DESERIALIZE += `    if (${charCodeAt64(name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+            DESERIALIZE += `    if (${charCodeAt64(_name, 0)} === code) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
           } else {
             DESERIALIZE =
               DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
-              `else if (${charCodeAt64(name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+              `else if (${charCodeAt64(_name, 0)} === code) {\n      ${member.deserialize}\n      return true;\n    }\n`;
           }
         } else {
           if (f) {
             f = false;
-            DESERIALIZE += `    if (0 == memory.compare(changetype<usize>("${escapeQuote(escapeSlash(name))}"), changetype<usize>(data) + (key_start << 1), ${name.length << 1})) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+            DESERIALIZE += `    if (0 === memory.compare(changetype<usize>("${escapeQuote(escapeSlash(_name))}"), changetype<usize>(data) + (key_start << 1), ${_name.length << 1})) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
           } else {
             DESERIALIZE =
               DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
-              ` else if (0 == memory.compare(changetype<usize>("${escapeQuote(escapeSlash(name))}"), changetype<usize>(data) + (key_start << 1), ${name.length << 1})) {\n      ${member.deserialize}\n      return true;\n    }\n`;
+              ` else if (0 === memory.compare(changetype<usize>("${escapeQuote(escapeSlash(_name))}"), changetype<usize>(data) + (key_start << 1), ${_name.length << 1})) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
           }
         }
       }
-      if (name.length < 3) {
+      if (_name.length < 3) {
         DESERIALIZE += `      default: {\n        return false;\n      }\n    }\n`;
-      } else if (name.length == 4) {
+      } else if (_name.length == 4) {
         DESERIALIZE =
           DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
           ` else {\n      return false;\n    }\n`;
@@ -450,6 +459,7 @@ export default class Transformer extends Transform {
 }
 
 enum PropertyFlags {
+  Null,
   Omit,
   OmitNull,
   OmitIf,
@@ -483,8 +493,13 @@ class Property {
     if (this.flags.has(PropertyFlags.Omit)) return;
 
     if (this.flags.has(PropertyFlags.JSON_Raw)) {
-      this.right_s = "this." + name;
-      this.right_d = "data.substring(value_start, value_end);";
+      if (this.flags.has(PropertyFlags.Null)) {
+        this.right_s = "(this." + name + " || \"null\")";
+        this.right_d = "value_start === value_end - 4 && 30399761348886638 === load<u64>(changetype<usize>(data) + (value_start << 1)) ? null : data.substring(value_start, value_end)";
+      } else {
+        this.right_s = "this." + name;
+        this.right_d = "data.substring(value_start, value_end);";
+      }
     } else {
       this.right_s = "__SERIALIZE<" + type + ">(this." + name + ")";
       this.right_d =
@@ -577,7 +592,21 @@ function getArgs(args: Expression[] | null): string[] {
   if (!args) return [];
   let out: string[] = [];
   for (const arg of args) {
-    out.push(toString(arg));
+    if (arg instanceof StringLiteralExpression) {
+      out.push(arg.value);
+    } else if (arg instanceof IntegerLiteralExpression) {
+      out.push(i64_to_string(arg.value));
+    } else if (arg instanceof FloatLiteralExpression) {
+      out.push(arg.value.toString());
+    } else if (arg instanceof NullExpression) {
+      out.push(arg.text);
+    } else if (arg instanceof TrueExpression) {
+      out.push(arg.text);
+    } else if (arg instanceof FalseExpression) {
+      out.push(arg.text);
+    } else if (arg instanceof IdentifierExpression) {
+      out.push(arg.text);
+    }
   }
   return out;
 }