json-as 0.9.12 → 0.9.14

package/CHANGELOG

@@ -20,6 +20,8 @@ v0.9.9a - Remove extraneous logs from transform
 v0.9.10 - Fix transform type checks. switch to nodekind checks
 v0.9.11 - Remove MpZ--implement custom serializers and deserializers in the works
 v0.9.12 - Add compat with aspect
+v0.9.13 - Fix empty strings not indexing correctly
+v0.9.14 - Ignore properties of type Function
 
 [UNRELEASED] v1.0.0
  - Allow nullable primitives

package/README.md

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

package/assembly/serialize/string.ts

@@ -15,7 +15,7 @@ import { _intTo16, intTo16 } from "../custom/util";
 @inline export function serializeString(data: string): string {
     const len = data.length << 1;
     if (len === 0) {
-        bs.write_16(2228258); /* {} */
+        bs.write_32(2228258); /* "" */
         return bs.out<string>();
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "json-as",
-  "version": "0.9.12",
+  "version": "0.9.14",
   "description": "The only JSON library you'll need for AssemblyScript. SIMD enabled",
   "types": "assembly/index.ts",
   "author": "Jairus Tanaka",
@@ -15,7 +15,7 @@
   ],
   "license": "MIT",
   "scripts": {
-    "test": "ast test",
+    "test": "ast test && rm -rf ./build/",
     "pretest": "rm -rf ./build/ && ast build",
     "build:test": "rm -rf ./build/ && JSON_DEBUG=true asc assembly/test.ts --transform ./transform -o ./build/test.wasm",
     "build:bench": "asc bench/benchmark.ts -o bench/benchmark.wasm --transform ./transform --optimizeLevel 3 --shrinkLevel 0 --converge --noAssert --uncheckedBehavior always --runtime stub --enable simd",

package/transform/lib/index.js

@@ -1,3 +1,4 @@
+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";
@@ -63,10 +64,14 @@ class JSONTransform extends BaseVisitor {
         }
         for (const member of members) {
             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);
             }
             const type = toString(member.type);
+            if (type.startsWith("(") && type.includes("=>"))
+                continue;
             const value = member.initializer ? toString(member.initializer) : null;
             if (member.flags == 32 /* CommonFlags.Static */)
                 continue;
@@ -140,7 +145,7 @@ class JSONTransform extends BaseVisitor {
                 }
                 mem.name = name.text;
             }
-            const t = mem.node.type.name.identifier.text;
+            const t = mem.node.type.name?.identifier.text;
             if (this.schemasList.find(v => v.name == t)) {
                 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()";
             }

package/transform/package.json

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

package/transform/src/index.ts

@@ -88,10 +88,12 @@ class JSONTransform extends BaseVisitor {
 
     for (const member of members) {
       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);
       }
       const type = toString(member.type!);
+      if (type.startsWith("(") && type.includes("=>")) continue;
       const value = member.initializer ? toString(member.initializer!) : null;
 
       if (member.flags == CommonFlags.Static) continue;
@@ -159,7 +161,7 @@ class JSONTransform extends BaseVisitor {
         mem.name = name.text;
       }
 
-      const t = (mem.node.type as NamedTypeNode).name.identifier.text;
+      const t = (mem.node.type as NamedTypeNode).name?.identifier.text;
       if (this.schemasList.find(v => v.name == t)) {
         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) {