json-as 0.9.5 → 0.9.7

package/.github/workflows/release-package.yml

@@ -1,4 +1,4 @@
-name: json-as
+name: Node.js Package
 
 on:
   release:
@@ -11,9 +11,23 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
-      - run: npm ci
-      - run: npm test
+          node-version: 16      
+
+      - name: Install Wasmtime
+        uses: jcbhmr/setup-wasmtime@v2
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v2
+
+      - name: Install dependencies
+        if: steps.node-cache.outputs.cache-hit != 'true'
+        run: yarn
+      
+      - name: Build tests
+        run: yarn run tests:build
+
+      - name: Perform tests
+        run: yarn run test
 
   publish-gpr:
     needs: build
@@ -25,7 +39,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 22
           registry-url: https://npm.pkg.github.com/
       - run: npm ci
       - run: npm publish

package/CHANGELOG

@@ -10,5 +10,7 @@ v0.9.2 - Fix #75 + Build sizes significantly reduced
 v0.9.3 - Fix #76
 v0.9.4 - Fix #77
 v0.9.5 - Fix #46
+v0.9.6 - Fix bugs
+v0.9.7 - Update testing framework and readme logo
 
 [UNRELEASED] v0.9.x - Port JSON.Value from the `develop` branch to allow for union types, parsing of arbitrary data, and whatever the hell you want.

package/README.md

@@ -1,15 +1,13 @@
-<h3 align="center">
-<pre>
- █████╗ ███████╗           ██╗███████╗ ██████╗ ███╗   ██╗
-██╔══██╗██╔════╝           ██║██╔════╝██╔═══██╗████╗  ██║
-███████║███████╗█████╗     ██║███████╗██║   ██║██╔██╗ ██║
-██╔══██║╚════██║╚════╝██   ██║╚════██║██║   ██║██║╚██╗██║
-██║  ██║███████║      ╚█████╔╝███████║╚██████╔╝██║ ╚████║
-╚═╝  ╚═╝╚══════╝       ╚════╝ ╚══════╝ ╚═════╝ ╚═╝  ╚═══╝
-
-v0.9.5
+<h5 align="center">
+<pre>                                 
+ _____ _____        __ _____ _____ _____ 
+|  _  |   __|___ __|  |   __|     |   | |
+|     |__   |___|  |  |__   |  |  | | | |
+|__|__|_____|   |_____|_____|_____|_|___|
+                                         
+v0.9.7
 </pre>
-</h3>
+</h5>
 
 ## Installation
 

package/assembly/__tests__/deserialize.spec.ts

@@ -1,7 +1,8 @@
 import { JSON } from "..";
 import {
   describe,
-  expect
+  expect,
+  run
 } from "as-test/assembly";
 
 @json
@@ -271,6 +272,8 @@ describe("Should deserialize Objects", () => {
 
 });
 
+run();
+
 @json
 class ObjWithString {
   s!: string;

package/assembly/__tests__/serialize.spec.ts

@@ -1,7 +1,8 @@
 import { JSON } from "..";
 import {
   describe,
-  expect
+  expect,
+  run
 } from "as-test/assembly";
 
 @json
@@ -368,6 +369,8 @@ describe("Should serialize @omit'ed objects", () => {
 
 });
 
+run();
+
 @json
 class ObjWithString {
   s!: string;

package/assembly/test.ts

@@ -15,7 +15,8 @@ class Box<T> {
 @json
 class Player {
   @alias("first name")
-  firstName!: string;
+  @omitnull()
+  firstName: string | null;
   lastName!: string;
   lastActive!: i32[];
   // Drop in a code block, function, or expression that evaluates to a boolean
@@ -29,7 +30,7 @@ class Player {
 }
 
 const player: Player = {
-  firstName: "Emmet",
+  firstName: null,
   lastName: "West",
   lastActive: [8, 27, 2022],
   age: 23,

package/develop/assembly/serialize/unknown.ts

@@ -0,0 +1,46 @@
+import { JSON } from "..";
+import { Sink } from "../src/sink";
+import { __atoi_fast } from "../src/util";
+import { serializeUnknownArray } from "./array/unknown";
+import { serializeBool } from "./bool";
+import { serializeFloat } from "./float";
+import { serializeInteger } from "./integer";
+import { serializeString } from "./string";
+
+/**
+ * Serializes unknown values into their correct serializer and returns the data.
+ *
+ * @param data - The JSON.Value to be serialized.
+ * @returns The serialized result.
+ */
+export function serializeUnknown(data: JSON.Value, out: Sink | null = null): Sink {
+    const type = data.type;
+    switch (type) {
+        case JSON.Types.String: {
+            return serializeString(data.get<string>(), out);
+        }
+        case JSON.Types.Boolean: {
+            return serializeBool(data.get<bool>(), out);
+        }
+        case JSON.Types.U8: {
+            return serializeInteger(data.get<u8>(), out);
+        }
+        case JSON.Types.U16: {
+            return serializeInteger(data.get<u16>(), out);
+        }
+        case JSON.Types.U32: {
+            return serializeInteger(data.get<u32>(), out);
+        }
+        case JSON.Types.U64: {
+            return serializeInteger(data.get<u64>(), out);
+        }
+        case JSON.Types.F32: {
+            return serializeFloat(data.get<f32>(), out);
+        }
+        case JSON.Types.F64: {
+            return serializeFloat(data.get<f64>(), out);
+        }
+    }
+    return serializeUnknownArray(data.get<JSON.Value[]>(), out);
+    
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.5",
+  "version": "0.9.7",
   "description": "JSON encoder/decoder for AssemblyScript",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -15,7 +15,9 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "wasmtime build/serialize.spec.wasm && wasmtime build/deserialize.spec.wasm",
+    "test": "npm run test:serialize && npm run test:deserialize",
+    "test:serialize": "wasmtime build/serialize.spec.wasm",
+    "test:deserialize": "wasmtime build/deserialize.spec.wasm",
     "tests:build": "asc assembly/__tests__/serialize.spec.ts -o build/serialize.spec.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always & asc assembly/__tests__/deserialize.spec.ts -o build/deserialize.spec.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
     "build:test": "JSON_DEBUG=true asc assembly/test.ts -o build/test.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 0 --shrinkLevel 0 --noAssert --uncheckedBehavior always",
     "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --config ./node_modules/@assemblyscript/wasi-shim/asconfig.json --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub",
@@ -31,7 +33,6 @@
   "devDependencies": {
     "@assemblyscript/wasi-shim": "^0.1.0",
     "as-bench": "^0.0.0-alpha",
-    "as-test": "JairusSW/as-test",
     "assemblyscript": "^0.27.22",
     "assemblyscript-prettier": "^3.0.1",
     "benchmark": "^2.1.4",
@@ -44,6 +45,7 @@
   "dependencies": {
     "as-container": "^0.8.0",
     "as-string-sink": "^0.5.3",
+    "as-test": "^0.0.2",
     "as-variant": "^0.4.1",
     "as-virtual": "^0.2.0"
   },

package/transform/lib/index.js

@@ -85,59 +85,60 @@ class JSONTransform extends BaseVisitor {
             mem.value = value;
             mem.node = member;
             if (member.decorators) {
-                for (let i = 0; i < (member.decorators).length; i++) {
-                    const decorator = member.decorators[i];
+                let decorator = null;
+                if (decorator = member.decorators.find(v => v.name.text == "alias")) {
                     if (decorator.name.text == "alias") {
                         if (!decorator.args?.length)
                             throw new Error("Expected 1 argument but got zero at @alias in " + node.range.source.normalizedPath);
-                        mem.flag = PropertyFlags.Alias;
+                        mem.flags.push(PropertyFlags.Alias);
                         mem.alias = decorator.args[0].value;
                     }
-                    else if (decorator.name.text == "omitnull") {
-                        mem.flag = PropertyFlags.OmitNull;
+                }
+                for (let i = 0; i < (member.decorators).length; i++) {
+                    const decorator = member.decorators[i];
+                    if (decorator.name.text == "omitnull") {
+                        mem.flags.push(PropertyFlags.OmitNull);
                     }
                     else if (decorator.name.text == "omitif") {
                         if (!decorator.args?.length)
                             throw new Error("Expected 1 argument but got zero at @omitif in " + node.range.source.normalizedPath);
                         mem.args?.push(decorator.args[0].value);
-                        mem.flag = PropertyFlags.OmitIf;
+                        mem.flags.push(PropertyFlags.OmitIf);
                     }
                     else if (decorator.name.text == "flatten") {
                         if (!decorator.args?.length)
                             throw new Error("Expected 1 argument but got zero at @flatten in " + node.range.source.normalizedPath);
-                        mem.flag = PropertyFlags.Flatten;
+                        mem.flags.push(PropertyFlags.Flatten);
                         mem.args = [decorator.args[0].value];
                     }
                 }
             }
-            if (mem.flag === PropertyFlags.Alias) {
-                mem.name = mem.alias;
-            }
-            else if (mem.flag === PropertyFlags.None) {
-                mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
+            if (!mem.flags.length) {
+                mem.flags = [PropertyFlags.None];
+                mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
                 mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
             }
-            if (mem.flag == PropertyFlags.OmitNull) {
-                mem.serialize = "${changetype<usize>(this." + mem.name + ") == <usize>0" + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
+            if (mem.flags.includes(PropertyFlags.OmitNull)) {
+                mem.serialize = "${changetype<usize>(this." + mem.name + ") == <usize>0" + " ? \"\" : '" + escapeString(JSON.stringify(mem.alias || mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
                 mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
             }
-            else if (mem.flag == PropertyFlags.OmitIf) {
-                mem.serialize = "${" + mem.args[0] + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
+            else if (mem.flags.includes(PropertyFlags.OmitIf)) {
+                mem.serialize = "${" + mem.args[0] + " ? \"\" : '" + escapeString(JSON.stringify(mem.alias || mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
                 mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
             }
-            else if (mem.flag == PropertyFlags.Alias) {
-                mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
+            else if (mem.flags.includes(PropertyFlags.Alias)) {
+                mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
                 mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));";
                 mem.name = name.text;
             }
-            else if (mem.flag == PropertyFlags.Flatten) {
+            else if (mem.flags.includes(PropertyFlags.Flatten)) {
                 const nullable = mem.node.type.isNullable;
                 if (nullable) {
-                    mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${this." + name.text + " ? __SERIALIZE(changetype<nonnull<" + type + ">>(this." + name.text + ")" + (mem.args?.length ? '.' + mem.args[0] : '') + ") : \"null\"}";
+                    mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${this." + name.text + " ? __SERIALIZE(changetype<nonnull<" + type + ">>(this." + name.text + ")" + (mem.args?.length ? '.' + mem.args[0] : '') + ") : \"null\"}";
                     mem.deserialize = "if (value_end - value_start == 4 && load<u64>(changetype<usize>(data) + <usize>(value_start << 1)) == " + charCodeAt64("null", 0) + ") {\n        this." + name.text + " = null;\n      } else {\n        this." + name.text + " = " + "__DESERIALIZE<" + type + ">('{\"" + mem.args[0] + "\":' + data.substring(value_start, value_end) + \"}\");\n      }";
                 }
                 else {
-                    mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${this." + name.text + " ? __SERIALIZE(this." + name.text + (mem.args?.length ? '.' + mem.args[0] : '') + ") : \"null\"}";
+                    mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${this." + name.text + " ? __SERIALIZE(this." + name.text + (mem.args?.length ? '.' + mem.args[0] : '') + ") : \"null\"}";
                     mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">('{\"" + mem.args[0] + "\":' + data.substring(value_start, value_end) + \"}\");";
                 }
                 mem.name = name.text;
@@ -159,8 +160,8 @@ class JSONTransform extends BaseVisitor {
         if (!schema.members.length)
             return;
         found = false;
-        if (schema.members[0]?.flag === PropertyFlags.OmitNull
-            || schema.members[0]?.flag === PropertyFlags.OmitIf) {
+        if (schema.members[0]?.flags.includes(PropertyFlags.OmitNull)
+            || schema.members[0]?.flags.includes(PropertyFlags.OmitIf)) {
             SERIALIZE_RAW += schema.members[0]?.serialize;
             SERIALIZE_PRETTY += "\\n" + schema.members[0]?.serialize;
         }
@@ -175,8 +176,8 @@ class JSONTransform extends BaseVisitor {
             const member = schema.members[i];
             if (member.initialize)
                 INITIALIZE += "  " + member.initialize + ";\n";
-            if (member.flag === PropertyFlags.OmitNull
-                || member.flag === PropertyFlags.OmitIf) {
+            if (member.flags.includes(PropertyFlags.OmitNull)
+                || member.flags.includes(PropertyFlags.OmitIf)) {
                 SERIALIZE_RAW += member.serialize;
                 SERIALIZE_PRETTY += member.serialize;
             }
@@ -374,7 +375,7 @@ class Property {
         this.alias = null;
         this.type = "";
         this.value = null;
-        this.flag = PropertyFlags.None;
+        this.flags = [];
         this.args = [];
         this.serialize = null;
         this.deserialize = null;

package/transform/package.json

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

package/transform/src/index.ts

@@ -12,6 +12,7 @@ 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";
 import { CommonFlags } from "types:assemblyscript/src/common";
+import { DecoratorNode } from "types:assemblyscript/src/ast";
 
 class JSONTransform extends BaseVisitor {
   public schemasList: SchemaData[] = [];
@@ -105,50 +106,54 @@ class JSONTransform extends BaseVisitor {
       mem.node = member;
 
       if (member.decorators) {
-        for (let i = 0; i < (member.decorators).length; i++) {
-          const decorator = member.decorators[i]!;
+        let decorator: DecoratorNode | null = null;
+        if (decorator = member.decorators.find(v => (<IdentifierExpression>v.name).text == "alias") as DecoratorNode | null) {
           if ((<IdentifierExpression>decorator.name).text == "alias") {
             if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @alias in " + node.range.source.normalizedPath);
-            mem.flag = PropertyFlags.Alias;
+            mem.flags.push(PropertyFlags.Alias);
             mem.alias = (decorator.args[0] as StringLiteralExpression).value;
-          } else if ((<IdentifierExpression>decorator.name).text == "omitnull") {
-            mem.flag = PropertyFlags.OmitNull;
+          }
+        }
+
+        for (let i = 0; i < (member.decorators).length; i++) {
+          const decorator = member.decorators[i]!;
+          if ((<IdentifierExpression>decorator.name).text == "omitnull") {
+            mem.flags.push(PropertyFlags.OmitNull);
           } else if ((<IdentifierExpression>decorator.name).text == "omitif") {
             if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @omitif in " + node.range.source.normalizedPath);
             mem.args?.push((decorator.args[0] as StringLiteralExpression).value);
-            mem.flag = PropertyFlags.OmitIf;
+            mem.flags.push(PropertyFlags.OmitIf);
           } else if ((<IdentifierExpression>decorator.name).text == "flatten") {
             if (!decorator.args?.length) throw new Error("Expected 1 argument but got zero at @flatten in " + node.range.source.normalizedPath);
-            mem.flag = PropertyFlags.Flatten;
+            mem.flags.push(PropertyFlags.Flatten);
             mem.args = [(decorator.args[0] as StringLiteralExpression).value];
           }
         }
       }
 
-      if (mem.flag === PropertyFlags.Alias) {
-        mem.name = mem.alias!;
-      } else if (mem.flag === PropertyFlags.None) {
-        mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
+      if (!mem.flags.length) {
+        mem.flags = [PropertyFlags.None];
+        mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
         mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));"
       }
 
-      if (mem.flag == PropertyFlags.OmitNull) {
-        mem.serialize = "${changetype<usize>(this." + mem.name + ") == <usize>0" + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
+      if (mem.flags.includes(PropertyFlags.OmitNull)) {
+        mem.serialize = "${changetype<usize>(this." + mem.name + ") == <usize>0" + " ? \"\" : '" + escapeString(JSON.stringify(mem.alias || mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
         mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));"
-      } else if (mem.flag == PropertyFlags.OmitIf) {
-        mem.serialize = "${" + mem.args![0]! + " ? \"\" : '" + escapeString(JSON.stringify(mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
+      } else if (mem.flags.includes(PropertyFlags.OmitIf)) {
+        mem.serialize = "${" + mem.args![0]! + " ? \"\" : '" + escapeString(JSON.stringify(mem.alias || mem.name)) + ":' + __SERIALIZE<" + type + ">(this." + name.text + ") + \",\"}";
         mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));"
-      } else if (mem.flag == PropertyFlags.Alias) {
-        mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
+      } else if (mem.flags.includes(PropertyFlags.Alias)) {
+        mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${__SERIALIZE<" + type + ">(this." + name.text + ")}";
         mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">(data.substring(value_start, value_end));"
         mem.name = name.text;
-      } else if (mem.flag == PropertyFlags.Flatten) {
+      } else if (mem.flags.includes(PropertyFlags.Flatten)) {
         const nullable = (mem.node.type as NamedTypeNode).isNullable;
         if (nullable) {
-          mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${this." + name.text + " ? __SERIALIZE(changetype<nonnull<" + type + ">>(this." + name.text + ")" + (mem.args?.length ? '.' + mem.args[0]! : '') + ") : \"null\"}";
+          mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${this." + name.text + " ? __SERIALIZE(changetype<nonnull<" + type + ">>(this." + name.text + ")" + (mem.args?.length ? '.' + mem.args[0]! : '') + ") : \"null\"}";
           mem.deserialize = "if (value_end - value_start == 4 && load<u64>(changetype<usize>(data) + <usize>(value_start << 1)) == " + charCodeAt64("null", 0) + ") {\n        this." + name.text + " = null;\n      } else {\n        this." + name.text + " = " + "__DESERIALIZE<" + type + ">('{\"" + mem.args![0]! + "\":' + data.substring(value_start, value_end) + \"}\");\n      }";
         } else {
-          mem.serialize = escapeString(JSON.stringify(mem.name)) + ":${this." + name.text + " ? __SERIALIZE(this." + name.text + (mem.args?.length ? '.' + mem.args[0]! : '') + ") : \"null\"}";
+          mem.serialize = escapeString(JSON.stringify(mem.alias || mem.name)) + ":${this." + name.text + " ? __SERIALIZE(this." + name.text + (mem.args?.length ? '.' + mem.args[0]! : '') + ") : \"null\"}";
           mem.deserialize = "this." + name.text + " = " + "__DESERIALIZE<" + type + ">('{\"" + mem.args![0]! + "\":' + data.substring(value_start, value_end) + \"}\");";
         }
         mem.name = name.text;
@@ -177,8 +182,8 @@ class JSONTransform extends BaseVisitor {
     found = false;
 
     if (
-      schema.members[0]?.flag === PropertyFlags.OmitNull
-      || schema.members[0]?.flag === PropertyFlags.OmitIf
+      schema.members[0]?.flags.includes(PropertyFlags.OmitNull)
+      || schema.members[0]?.flags.includes(PropertyFlags.OmitIf)
     ) {
       SERIALIZE_RAW += schema.members[0]?.serialize;
       SERIALIZE_PRETTY += "\\n" + schema.members[0]?.serialize;
@@ -194,8 +199,8 @@ class JSONTransform extends BaseVisitor {
       const member = schema.members[i]!;
       if (member.initialize) INITIALIZE += "  " + member.initialize + ";\n";
       if (
-        member.flag === PropertyFlags.OmitNull
-        || member.flag === PropertyFlags.OmitIf
+        member.flags.includes(PropertyFlags.OmitNull)
+        || member.flags.includes(PropertyFlags.OmitIf)
       ) {
         SERIALIZE_RAW += member.serialize;
         SERIALIZE_PRETTY += member.serialize;
@@ -385,7 +390,7 @@ class Property {
   public alias: string | null = null;
   public type: string = "";
   public value: string | null = null;
-  public flag: PropertyFlags = PropertyFlags.None;
+  public flags: PropertyFlags[] = [];
   public args: string[] | null = [];
 
   public serialize: string | null = null;