json-as 0.9.18 → 0.9.19

package/CHANGELOG

@@ -26,6 +26,7 @@ v0.9.15 - Support JSON.Raw blocks
 v0.9.16 - JSON.Raw should be completely untouched
 v0.9.17 - A schema's parent's fields should be included properly
 v0.9.18 - Should be able to use @alias and @omit*** or JSON.Raw
+v0.9.19 - Fix arguments in @omitif declarations not working properly
 
 [UNRELEASED] v1.0.0
  - Allow nullable primitives

package/README.md

@@ -3,7 +3,7 @@
  __|  ||   __||     ||   | | ___ |  _  ||   __|
 |  |  ||__   ||  |  || | | ||___||     ||__   |
 |_____||_____||_____||_|___|     |__|__||_____|
-v0.9.18
+v0.9.19
 </pre>
 </h5>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.18",
+  "version": "0.9.19",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -30,6 +30,7 @@
   },
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
+    "@types/node": "^20.14.12",
     "as-bench": "^0.0.0-alpha",
     "as-console": "^7.0.0",
     "as-test": "0.3.1",

package/transform/lib/index.js

@@ -1,7 +1,4 @@
-import {
-  FieldDeclaration,
-  StringLiteralExpression,
-} from "assemblyscript/dist/assemblyscript.js";
+import { FieldDeclaration } from "assemblyscript/dist/assemblyscript.js";
 import { toString, isStdlib } from "visitor-as/dist/utils.js";
 import { BaseVisitor, SimpleParser } from "visitor-as/dist/index.js";
 import { Transform } from "assemblyscript/dist/transform.js";
@@ -414,7 +411,6 @@ class Property {
     this.type = "";
     this.value = null;
     this.flags = new Map();
-    this.args = [];
     this.serialize = null;
     this.deserialize = null;
     this.initialize = null;
@@ -435,7 +431,11 @@ class Property {
         "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end))";
     }
     if (this.flags.has(PropertyFlags.OmitIf)) {
-      const condition = this.args[0];
+      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 +
@@ -506,9 +506,7 @@ function getArgs(args) {
   if (!args) return [];
   let out = [];
   for (const arg of args) {
-    if (arg instanceof StringLiteralExpression) {
-      out.push(arg.value);
-    }
+    out.push(toString(arg));
   }
   return out;
 }

package/transform/package.json

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

package/transform/src/index.ts

@@ -2,7 +2,6 @@ import {
   ClassDeclaration,
   FieldDeclaration,
   IdentifierExpression,
-  StringLiteralExpression,
   Parser,
   Source,
   NodeKind,
@@ -467,7 +466,6 @@ class Property {
     PropertyFlags,
     string[]
   >();
-  public args: string[] | null = [];
 
   public serialize: string | null = null;
   public deserialize: string | null = null;
@@ -494,7 +492,11 @@ class Property {
     }
 
     if (this.flags.has(PropertyFlags.OmitIf)) {
-      const condition = this.args![0];
+      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 +
@@ -575,9 +577,7 @@ function getArgs(args: Expression[] | null): string[] {
   if (!args) return [];
   let out: string[] = [];
   for (const arg of args) {
-    if (arg instanceof StringLiteralExpression) {
-      out.push(arg.value);
-    }
+    out.push(toString(arg));
   }
   return out;
 }