json-as 0.9.27 → 0.9.29

package/transform/src/index.ts

@@ -1,19 +1,4 @@
-import {
-  ClassDeclaration,
-  FieldDeclaration,
-  IdentifierExpression,
-  Parser,
-  Source,
-  NodeKind,
-  Expression,
-  CommonFlags,
-  StringLiteralExpression,
-  IntegerLiteralExpression,
-  FloatLiteralExpression,
-  NullExpression,
-  TrueExpression,
-  FalseExpression,
-} from "assemblyscript/dist/assemblyscript.js";
+import { ClassDeclaration, FieldDeclaration, IdentifierExpression, Parser, Source, NodeKind, Expression, CommonFlags, StringLiteralExpression, IntegerLiteralExpression, FloatLiteralExpression, NullExpression, TrueExpression, FalseExpression } from "assemblyscript/dist/assemblyscript.js";
 
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
@@ -24,7 +9,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;
 
@@ -42,20 +27,14 @@ class JSONTransform extends BaseVisitor {
     schema.node = node;
     schema.name = node.name.text;
 
-    const members = [
-      ...node.members.filter((v) => v.kind === NodeKind.FieldDeclaration),
-    ];
+    const members = [...node.members.filter((v) => v.kind === NodeKind.FieldDeclaration)];
 
     if (node.extendsType) {
-      schema.parent = this.schemasList.find(
-        (v) => v.name == node.extendsType?.name.identifier.text,
-      ) as SchemaData | null;
+      schema.parent = this.schemasList.find((v) => v.name == node.extendsType?.name.identifier.text) as SchemaData | null;
 
       if (schema.parent?.members) {
         for (let i = schema.parent.members.length - 1; i >= 0; i--) {
-          const replace = schema.members.find(
-            (v) => v.name == schema.parent?.members[i]?.name,
-          );
+          const replace = schema.members.find((v) => v.name == schema.parent?.members[i]?.name);
           if (!replace) {
             members.unshift(schema.parent?.members[i]!.node);
           }
@@ -69,8 +48,7 @@ class JSONTransform extends BaseVisitor {
 
       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}";
+      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);
@@ -79,26 +57,14 @@ class JSONTransform extends BaseVisitor {
         console.log(DESERIALIZE_EMPTY);
       }
 
-      const SERIALIZE_RAW_METHOD_EMPTY = SimpleParser.parseClassMember(
-        SERIALIZE_RAW_EMPTY,
-        node,
-      );
+      const SERIALIZE_RAW_METHOD_EMPTY = SimpleParser.parseClassMember(SERIALIZE_RAW_EMPTY, node);
       //const SERIALIZE_PRETTY_METHOD = SimpleParser.parseClassMember(SERIALIZE_PRETTY, node);
-      const INITIALIZE_METHOD_EMPTY = SimpleParser.parseClassMember(
-        INITIALIZE_EMPTY,
-        node,
-      );
-      const DESERIALIZE_METHOD_EMPTY = SimpleParser.parseClassMember(
-        DESERIALIZE_EMPTY,
-        node,
-      );
-
-      if (!node.members.find((v) => v.name.text == "__SERIALIZE"))
-        node.members.push(SERIALIZE_RAW_METHOD_EMPTY);
-      if (!node.members.find((v) => v.name.text == "__INITIALIZE"))
-        node.members.push(INITIALIZE_METHOD_EMPTY);
-      if (!node.members.find((v) => v.name.text == "__DESERIALIZE"))
-        node.members.push(DESERIALIZE_METHOD_EMPTY);
+      const INITIALIZE_METHOD_EMPTY = SimpleParser.parseClassMember(INITIALIZE_EMPTY, node);
+      const DESERIALIZE_METHOD_EMPTY = SimpleParser.parseClassMember(DESERIALIZE_EMPTY, node);
+
+      if (!node.members.find((v) => v.name.text == "__SERIALIZE")) node.members.push(SERIALIZE_RAW_METHOD_EMPTY);
+      if (!node.members.find((v) => v.name.text == "__INITIALIZE")) node.members.push(INITIALIZE_METHOD_EMPTY);
+      if (!node.members.find((v) => v.name.text == "__DESERIALIZE")) node.members.push(DESERIALIZE_METHOD_EMPTY);
 
       this.schemasList.push(schema);
     }
@@ -107,12 +73,7 @@ class JSONTransform extends BaseVisitor {
       const name = member.name;
       if (!(member instanceof FieldDeclaration)) continue;
       if (!member.type) {
-        throw new Error(
-          "Fields must be strongly typed! Found " +
-          toString(member) +
-          " at " +
-          node.range.source.normalizedPath,
-        );
+        throw new Error("Fields must be strongly typed! Found " + toString(member) + " at " + node.range.source.normalizedPath);
       }
       const type = toString(member.type!);
       if (type.startsWith("(") && type.includes("=>")) continue;
@@ -121,6 +82,7 @@ class JSONTransform extends BaseVisitor {
       if (member.flags == CommonFlags.Static) continue;
       if (member.flags === CommonFlags.Private) continue;
       if (member.flags === CommonFlags.Protected) continue;
+      if (member.decorators && node.decorators.some((v) => (v.name as IdentifierExpression).text == "omit")) continue;
 
       const mem = new Property();
       mem.name = name.text;
@@ -144,11 +106,7 @@ class JSONTransform extends BaseVisitor {
 
           switch (decoratorName) {
             case "alias": {
-              if (!args.length)
-                throw new Error(
-                  "Expected 1 argument but got zero at @alias in " +
-                  node.range.source.normalizedPath,
-                );
+              if (!args.length) throw new Error("Expected 1 argument but got zero at @alias in " + node.range.source.normalizedPath);
               mem.alias = args[0]!;
               mem.flags.set(PropertyFlags.Alias, args);
               break;
@@ -158,11 +116,7 @@ class JSONTransform extends BaseVisitor {
               break;
             }
             case "omitif": {
-              if (!decorator.args?.length)
-                throw new Error(
-                  "Expected 1 argument but got zero at @omitif in " +
-                  node.range.source.normalizedPath,
-                );
+              if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @omitif in " + node.range.source.normalizedPath);
               mem.flags.set(PropertyFlags.OmitIf, args);
               break;
             }
@@ -177,20 +131,7 @@ class JSONTransform extends BaseVisitor {
       mem.generate(false);
 
       if (this.schemasList.find((v) => v.name == type)) {
-        mem.initialize =
-          "this." +
-          name.text +
-          " = changetype<nonnull<" +
-          mem.type +
-          ">>(__new(offsetof<nonnull<" +
-          mem.type +
-          ">>(), idof<nonnull<" +
-          mem.type +
-          ">>()));\n  changetype<nonnull<" +
-          mem.type +
-          ">>(this." +
-          name.text +
-          ").__INITIALIZE()";
+        mem.initialize = "this." + name.text + " = changetype<nonnull<" + mem.type + ">>(__new(offsetof<nonnull<" + mem.type + ">>(), idof<nonnull<" + mem.type + ">>()));\n  changetype<nonnull<" + mem.type + ">>(this." + name.text + ").__INITIALIZE()";
       } else if (mem.value) {
         mem.initialize = "this." + name.text + " = " + mem.value;
       } else if (type === "Map") {
@@ -198,22 +139,12 @@ class JSONTransform extends BaseVisitor {
       } else if (type === "string") {
         mem.initialize = "this." + name.text + ' = ""';
       } else if (type === "Array") {
-        mem.initialize =
-          "this." + name.text + " = instantiate<" + mem.type + ">()";
+        mem.initialize = "this." + name.text + " = instantiate<" + mem.type + ">()";
       } else if (type === "bool" || type === "boolean") {
         mem.initialize = "this." + name.text + " = false";
       } else if (type === "JSON.Raw") {
         mem.initialize = "this." + name.text + ' = ""';
-      } else if (
-        type === "u8" ||
-        type === "u16" ||
-        type === "u32" ||
-        type === "u64" ||
-        type === "i8" ||
-        type === "i16" ||
-        type === "i32" ||
-        type === "i64"
-      ) {
+      } else if (type === "u8" || type === "u16" || type === "u32" || type === "u64" || type === "i8" || type === "i16" || type === "i32" || type === "i64") {
         mem.initialize = "this." + name.text + " = 0";
       } else if (type === "f32" || type === "f64") {
         mem.initialize = "this." + name.text + " = 0.0";
@@ -227,18 +158,14 @@ class JSONTransform extends BaseVisitor {
 
     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 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;
 
     found = false;
 
-    if (
-      schema.members[0]?.flags.has(PropertyFlags.OmitNull) ||
-      schema.members[0]?.flags.has(PropertyFlags.OmitIf)
-    ) {
+    if (schema.members[0]?.flags.has(PropertyFlags.OmitNull) || schema.members[0]?.flags.has(PropertyFlags.OmitIf)) {
       SERIALIZE_RAW += schema.members[0]?.serialize;
       SERIALIZE_PRETTY += "\\n" + schema.members[0]?.serialize;
     } else {
@@ -247,16 +174,12 @@ class JSONTransform extends BaseVisitor {
       found = true;
     }
 
-    if (schema.members[0]?.initialize)
-      INITIALIZE += "  " + schema.members[0]?.initialize + ";\n";
+    if (schema.members[0]?.initialize) INITIALIZE += "  " + schema.members[0]?.initialize + ";\n";
 
     for (let i = 1; i < schema.members.length; i++) {
       const member = schema.members[i]!;
       if (member.initialize) INITIALIZE += "  " + member.initialize + ";\n";
-      if (
-        member.flags.has(PropertyFlags.OmitNull) ||
-        member.flags.has(PropertyFlags.OmitIf)
-      ) {
+      if (member.flags.has(PropertyFlags.OmitNull) || member.flags.has(PropertyFlags.OmitIf)) {
         SERIALIZE_RAW += member.serialize;
         SERIALIZE_PRETTY += member.serialize;
       } else {
@@ -267,10 +190,8 @@ class JSONTransform extends BaseVisitor {
     }
 
     if (found) {
-      SERIALIZE_RAW +=
-        "`;\n  store<u16>(changetype<usize>(out) + ((out.length - 1) << 1), 125);\n  return out;\n}";
-      SERIALIZE_PRETTY +=
-        "`;\n  store<u32>(changetype<usize>(out) + ((out.length - 2) << 1), 8192010);\n  return out;\n}";
+      SERIALIZE_RAW += "`;\n  store<u16>(changetype<usize>(out) + ((out.length - 1) << 1), 125);\n  return out;\n}";
+      SERIALIZE_PRETTY += "`;\n  store<u32>(changetype<usize>(out) + ((out.length - 2) << 1), 8192010);\n  return out;\n}";
     } else {
       SERIALIZE_RAW += "}`;\n  return out;\n}";
       SERIALIZE_PRETTY += "}`;\n  return out;\n}";
@@ -279,9 +200,7 @@ class JSONTransform extends BaseVisitor {
     INITIALIZE += "  return this;\n}";
 
     const sortedMembers: Property[][] = [];
-    const _sorted = schema.members.sort(
-      (a, b) => (a.alias?.length! || a.name.length) - (b.alias?.length! || b.name.length),
-    );
+    const _sorted = schema.members.sort((a, b) => (a.alias?.length! || a.name.length) - (b.alias?.length! || b.name.length));
     let len = -1;
     let offset = -1;
     for (let i = 0; i < _sorted.length; i++) {
@@ -302,30 +221,24 @@ class JSONTransform extends BaseVisitor {
       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";
+          DESERIALIZE += "  if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
           first = false;
         } else {
-          DESERIALIZE +=
-            "else if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
+          DESERIALIZE += "else if (1 === len) {\n    switch (load<u16>(changetype<usize>(data) + (key_start << 1))) {\n";
         }
       } else if (_name.length === 2) {
         if (first) {
-          DESERIALIZE +=
-            "  if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
+          DESERIALIZE += "  if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
           first = false;
         } else {
-          DESERIALIZE +=
-            "else if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
+          DESERIALIZE += "else if (2 === len) {\n    switch (load<u32>(changetype<usize>(data) + (key_start << 1))) {\n";
         }
       } else if (_name.length === 4) {
         if (first) {
-          DESERIALIZE +=
-            "  if (4 === len) {\n    const code = load<u64>(changetype<usize>(data) + (key_start << 1));\n";
+          DESERIALIZE += "  if (4 === len) {\n    const code = load<u64>(changetype<usize>(data) + (key_start << 1));\n";
           first = false;
         } else {
-          DESERIALIZE +=
-            "else if (4 === len) {\n    const code = load<u64>(changetype<usize>(data) + (key_start << 1));\n";
+          DESERIALIZE += "else if (4 === len) {\n    const code = load<u64>(changetype<usize>(data) + (key_start << 1));\n";
         }
       } else {
         if (first) {
@@ -349,31 +262,23 @@ class JSONTransform extends BaseVisitor {
             f = false;
             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`;
+            DESERIALIZE = DESERIALIZE.slice(0, DESERIALIZE.length - 1) + `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})) { /* ${_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})) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
+            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})) { /* ${_name} */\n      ${member.deserialize}\n      return true;\n    }\n`;
           }
         }
       }
       if (_name.length < 3) {
         DESERIALIZE += `      default: {\n        return false;\n      }\n    }\n`;
       } else if (_name.length == 4) {
-        DESERIALIZE =
-          DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
-          ` else {\n      return false;\n    }\n`;
+        DESERIALIZE = DESERIALIZE.slice(0, DESERIALIZE.length - 1) + ` else {\n      return false;\n    }\n`;
       } else {
-        DESERIALIZE =
-          DESERIALIZE.slice(0, DESERIALIZE.length - 1) +
-          ` else {\n      return false;\n    }\n`;
+        DESERIALIZE = DESERIALIZE.slice(0, DESERIALIZE.length - 1) + ` else {\n      return false;\n    }\n`;
       }
       DESERIALIZE += "  } ";
     }
@@ -389,25 +294,18 @@ class JSONTransform extends BaseVisitor {
       console.log(DESERIALIZE);
     }
 
-    const SERIALIZE_RAW_METHOD = SimpleParser.parseClassMember(
-      SERIALIZE_RAW,
-      node,
-    );
-    
-    const DESERIALIZE_SAFE = DESERIALIZE.replaceAll("__DESERIALIZE", "__DESERIALIZE_SAFE")
+    const SERIALIZE_RAW_METHOD = SimpleParser.parseClassMember(SERIALIZE_RAW, node);
+
+    const DESERIALIZE_SAFE = DESERIALIZE.replaceAll("__DESERIALIZE", "__DESERIALIZE_SAFE");
     //const SERIALIZE_PRETTY_METHOD = SimpleParser.parseClassMember(SERIALIZE_PRETTY, node);
     const INITIALIZE_METHOD = SimpleParser.parseClassMember(INITIALIZE, node);
     const DESERIALIZE_METHOD = SimpleParser.parseClassMember(DESERIALIZE, node);
     const DESERIALIZE_SAFE_METHOD = SimpleParser.parseClassMember(DESERIALIZE_SAFE, node);
 
-    if (!node.members.find((v) => v.name.text == "__SERIALIZE"))
-      node.members.push(SERIALIZE_RAW_METHOD);
-    if (!node.members.find((v) => v.name.text == "__INITIALIZE"))
-      node.members.push(INITIALIZE_METHOD);
-    if (!node.members.find((v) => v.name.text == "__DESERIALIZE"))
-      node.members.push(DESERIALIZE_METHOD);
-    if (!node.members.find((v) => v.name.text == "__DESERIALIZE_SAFE"))
-      node.members.push(DESERIALIZE_SAFE_METHOD);
+    if (!node.members.find((v) => v.name.text == "__SERIALIZE")) node.members.push(SERIALIZE_RAW_METHOD);
+    if (!node.members.find((v) => v.name.text == "__INITIALIZE")) node.members.push(INITIALIZE_METHOD);
+    if (!node.members.find((v) => v.name.text == "__DESERIALIZE")) node.members.push(DESERIALIZE_METHOD);
+    if (!node.members.find((v) => v.name.text == "__DESERIALIZE_SAFE")) node.members.push(DESERIALIZE_SAFE_METHOD);
 
     this.schemasList.push(schema);
   }
@@ -454,10 +352,7 @@ export default class Transformer extends Transform {
     for (const schema of schemas) {
       if (schema.parent) {
         const parent = schemas.find((v) => v.name === schema.parent?.name);
-        if (!parent)
-          throw new Error(
-            `Class ${schema.name} extends its parent class ${schema.parent}, but ${schema.parent} does not include a @json or @serializable decorator! Add the decorator and rebuild.`,
-          );
+        if (!parent) throw new Error(`Class ${schema.name} extends its parent class ${schema.parent}, but ${schema.parent} does not include a @json or @serializable decorator! Add the decorator and rebuild.`);
       }
     }
   }
@@ -477,10 +372,7 @@ class Property {
   public alias: string | null = null;
   public type: string = "";
   public value: string | null = null;
-  public flags: Map<PropertyFlags, string[]> = new Map<
-    PropertyFlags,
-    string[]
-  >();
+  public flags: Map<PropertyFlags, string[]> = new Map<PropertyFlags, string[]>();
 
   public serialize: string | null = null;
   public deserialize: string | null = null;
@@ -499,7 +391,7 @@ class Property {
 
     if (this.flags.has(PropertyFlags.JSON_Raw)) {
       if (this.flags.has(PropertyFlags.Null)) {
-        this.right_s = "(this." + name + " || \"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;
@@ -507,35 +399,16 @@ class Property {
       }
     } else {
       this.right_s = "__SERIALIZE<" + type + ">(this." + name + ")";
-      this.right_d =
-        (safe ? "__DESERIALIZE_SAFE" : "__DESERIALIZE") + "<" + type + ">(data.substring(value_start, value_end))";
+      this.right_d = (safe ? "__DESERIALIZE_SAFE" : "__DESERIALIZE") + "<" + type + ">(data.substring(value_start, value_end))";
     }
 
     if (this.flags.has(PropertyFlags.OmitIf)) {
       const condition = this.flags.get(PropertyFlags.OmitIf)![0];
-      if (!condition)
-        throw new Error(
-          "Could not find condition when using decorator @omitif! Provide at least one condition",
-        );
-      this.serialize =
-        "${" +
-        condition +
-        ' ? "" : \'' +
-        escapedName +
-        ":' + " +
-        this.right_s +
-        ' + ","}';
+      if (!condition) throw new Error("Could not find condition when using decorator @omitif! Provide at least one condition");
+      this.serialize = "${" + condition + ' ? "" : \'' + escapedName + ":' + " + this.right_s + ' + ","}';
       this.deserialize = "this." + name + " = " + this.right_d + ";";
     } else if (this.flags.has(PropertyFlags.OmitNull)) {
-      this.serialize =
-        "${changetype<usize>(this." +
-        name +
-        ") == <usize>0" +
-        ' ? "" : \'' +
-        escapedName +
-        ":' + " +
-        this.right_s +
-        ' + ","}';
+      this.serialize = "${changetype<usize>(this." + name + ") == <usize>0" + ' ? "" : \'' + escapedName + ":' + " + this.right_s + ' + ","}';
       this.deserialize = "this." + name + " = " + this.right_d + ";";
     } else {
       this.serialize = escapedName + ":${" + this.right_s + "}";
@@ -557,9 +430,7 @@ function charCodeAt32(data: string, offset: number): number {
 
 function charCodeAt64(data: string, offset: number): bigint {
   if (offset + 3 >= data.length) {
-    throw new Error(
-      "The string must have at least 4 characters from the specified offset.",
-    );
+    throw new Error("The string must have at least 4 characters from the specified offset.");
   }
 
   const firstCharCode = BigInt(data.charCodeAt(offset));
@@ -567,11 +438,7 @@ function charCodeAt64(data: string, offset: number): bigint {
   const thirdCharCode = BigInt(data.charCodeAt(offset + 2));
   const fourthCharCode = BigInt(data.charCodeAt(offset + 3));
 
-  const u64Value =
-    (fourthCharCode << 48n) |
-    (thirdCharCode << 32n) |
-    (secondCharCode << 16n) |
-    firstCharCode;
+  const u64Value = (fourthCharCode << 48n) | (thirdCharCode << 32n) | (secondCharCode << 16n) | firstCharCode;
 
   return u64Value;
 }