json-as 0.9.6 → 0.9.8-a

package/assembly/__tests__/serialize.spec.ts

@@ -1,395 +0,0 @@
-import { JSON } from "..";
-import {
-  describe,
-  expect
-} from "as-test/assembly";
-
-@json
-class BaseObject {
-  a: string;
-  constructor(a: string) {
-    this.a = a;
-  }
-}
-
-@json
-class DerivedObject extends BaseObject {
-  b: string;
-  constructor(a: string, b: string) {
-    super(a);
-    this.b = b;
-  }
-}
-
-@json
-class Map4 {
-  a: string;
-  b: string;
-  c: string;
-  d: string;
-}
-
-@json
-class Vec3 {
-  x: f64;
-  y: f64;
-  z: f64;
-
-  static shouldIgnore: string = "should not be serialized";
-}
-
-@json
-class Player {
-  firstName: string;
-  lastName: string;
-  lastActive: i32[];
-  age: i32;
-  pos: Vec3 | null;
-  isVerified: boolean;
-}
-
-@json
-class OmitIf {
-  x: i32 = 1;
-  @omitif("this.y == -1")
-  y: i32 = -1;
-  z: i32 = 1;
-  @omitnull()
-  foo: string | null = null
-}
-
-class Nullable { }
-type Null = Nullable | null;
-
-describe("Should serialize strings", () => {
-
-  expect(
-    JSON.stringify("abcdefg")
-  ).toBe("\"abcdefg\"");
-
-  expect(
-    JSON.stringify('st"ring" w""ith quotes"')
-  ).toBe('"st\\"ring\\" w\\"\\"ith quotes\\""');
-
-  expect(
-    JSON.stringify('string \"with random spa\nces and \nnewlines\n\n\n')
-  ).toBe('"string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"');
-
-  expect(
-    JSON.stringify('string with colon : comma , brace [ ] bracket { } and quote " and other quote \\"')
-  ).toBe('"string with colon : comma , brace [ ] bracket { } and quote \\" and other quote \\\\\\""')
-
-});
-
-describe("Should serialize integers", () => {
-
-  expect(
-    JSON.stringify(0)
-  ).toBe("0");
-
-  expect(
-    JSON.stringify<u32>(100)
-  ).toBe("100");
-
-  expect(
-    JSON.stringify<u64>(101)
-  ).toBe("101");
-
-  expect(
-    JSON.stringify<i32>(-100)
-  ).toBe("-100");
-
-  expect(
-    JSON.stringify<i64>(-101)
-  ).toBe("-101");
-
-});
-
-describe("Should serialize floats", () => {
-
-  expect(
-    JSON.stringify<f64>(7.23)
-  ).toBe("7.23");
-
-  expect(
-    JSON.stringify<f64>(10e2)
-  ).toBe("1000.0");
-
-  expect(
-    JSON.stringify<f64>(123456e-5)
-  ).toBe("1.23456");
-
-  expect(
-    JSON.stringify<f64>(0.0)
-  ).toBe("0.0");
-
-  expect(
-    JSON.stringify<f64>(-7.23)
-  ).toBe("-7.23");
-
-  expect(
-    JSON.stringify<f64>(1e-6)
-  ).toBe("0.000001");
-
-  expect(
-    JSON.stringify<f64>(1e-7)
-  ).toBe("1e-7");
-
-  expect(
-    JSON.parse<f64>("1E-7")
-  ).toBe(1e-7);
-
-  expect(
-    JSON.stringify<f64>(1e20)
-  ).toBe("100000000000000000000.0");
-
-  expect(
-    JSON.stringify<f64>(1e21)
-  ).toBe("1e+21");
-
-  expect(
-    JSON.parse<f64>("1E+21")
-  ).toBe(1e21);
-
-  expect(
-    JSON.parse<f64>("1e21")
-  ).toBe(1e21);
-
-  expect(
-    JSON.parse<f64>("1E21")
-  ).toBe(1e21);
-
-});
-
-describe("Should serialize booleans", () => {
-
-  expect(
-    JSON.stringify<bool>(true)
-  ).toBe("true");
-
-  expect(
-    JSON.stringify<bool>(false)
-  ).toBe("false");
-
-  expect(
-    JSON.stringify<boolean>(true)
-  ).toBe("true");
-
-  expect(
-    JSON.stringify<boolean>(false)
-  ).toBe("false");
-
-});
-
-describe("Should serialize class inheritance", () => {
-
-  const obj = new DerivedObject("1", "2");
-
-  expect(
-    JSON.stringify(obj)
-  ).toBe("{\"a\":\"1\",\"b\":\"2\"}");
-
-});
-
-describe("Should serialize nulls", () => {
-
-  expect(
-    JSON.stringify<Null>(null)
-  ).toBe("null");
-
-});
-
-
-describe("Should serialize integer arrays", () => {
-
-  expect(
-    JSON.stringify<u32[]>([0, 100, 101])
-  ).toBe("[0,100,101]");
-
-  expect(
-    JSON.stringify<u64[]>([0, 100, 101])
-  ).toBe("[0,100,101]");
-
-  expect(
-    JSON.stringify<i32[]>([0, 100, 101, -100, -101])
-  ).toBe("[0,100,101,-100,-101]");
-
-  expect(
-    JSON.stringify<i64[]>([0, 100, 101, -100, -101])
-  ).toBe("[0,100,101,-100,-101]");
-
-});
-
-describe("Should serialize float arrays", () => {
-
-  expect(
-    JSON.stringify<f64[]>([7.23, 10e2, 10e2, 123456e-5, 123456e-5, 0.0, 7.23])
-  ).toBe("[7.23,1000.0,1000.0,1.23456,1.23456,0.0,7.23]");
-
-  expect(
-    JSON.stringify<f64[]>([1e21, 1e22, 1e-7, 1e-8, 1e-9])
-  ).toBe("[1e+21,1e+22,1e-7,1e-8,1e-9]");
-
-});
-
-describe("Should serialize boolean arrays", () => {
-
-  expect(
-    JSON.stringify<bool[]>([true, false])
-  ).toBe("[true,false]");
-
-  expect(
-    JSON.stringify<boolean[]>([true, false])
-  ).toBe("[true,false]");
-
-});
-
-describe("Should serialize string arrays", () => {
-
-  expect(
-    JSON.stringify<string[]>(['string \"with random spa\nces and \nnewlines\n\n\n'])
-  ).toBe('["string \\"with random spa\\nces and \\nnewlines\\n\\n\\n"]');
-
-});
-
-describe("Should serialize nested integer arrays", () => {
-
-  expect(
-    JSON.stringify<i64[][]>([[100, 101], [-100, -101], [0]])
-  ).toBe("[[100,101],[-100,-101],[0]]");
-
-});
-
-describe("Should serialize nested float arrays", () => {
-
-  expect(
-    JSON.stringify<f64[][]>([
-      [7.23],
-      [10e2],
-      [10e2],
-      [123456e-5],
-      [123456e-5],
-      [0.0],
-      [7.23],
-    ])
-  ).toBe("[[7.23],[1000.0],[1000.0],[1.23456],[1.23456],[0.0],[7.23]]");
-
-});
-
-describe("Should serialize nested boolean arrays", () => {
-
-  expect(
-    JSON.stringify<bool[][]>([[true], [false]])
-  ).toBe("[[true],[false]]");
-
-  expect(
-    JSON.stringify<boolean[][]>([[true], [false]])
-  ).toBe("[[true],[false]]");
-
-});
-
-describe("Should serialize object arrays", () => {
-
-  expect(
-    JSON.stringify<Vec3[]>([
-      {
-        x: 3.4,
-        y: 1.2,
-        z: 8.3,
-      },
-      {
-        x: 3.4,
-        y: -2.1,
-        z: 9.3,
-      },
-    ])
-  ).toBe('[{"x":3.4,"y":1.2,"z":8.3},{"x":3.4,"y":-2.1,"z":9.3}]');
-
-});
-
-describe("Should serialize objects", () => {
-
-  expect(
-    JSON.stringify<Vec3>({
-      x: 3.4,
-      y: 1.2,
-      z: 8.3,
-    })
-  ).toBe('{"x":3.4,"y":1.2,"z":8.3}');
-
-  expect(
-    JSON.stringify<Player>({
-      firstName: "Emmet",
-      lastName: "West",
-      lastActive: [8, 27, 2022],
-      age: 23,
-      pos: {
-        x: 3.4,
-        y: 1.2,
-        z: 8.3,
-      },
-      isVerified: true,
-    })
-  ).toBe('{"firstName":"Emmet","lastName":"West","lastActive":[8,27,2022],"age":23,"pos":{"x":3.4,"y":1.2,"z":8.3},"isVerified":true}');
-
-  expect(
-    JSON.stringify<ObjectWithFloat>({ f: 7.23 })
-  ).toBe('{"f":7.23}');
-
-  expect(
-    JSON.stringify<ObjectWithFloat>({ f: 0.000001 })
-  ).toBe('{"f":0.000001}');
-
-  expect(
-    JSON.stringify<ObjectWithFloat>({ f: 1e-7 })
-  ).toBe('{"f":1e-7}');
-
-  expect(
-    JSON.stringify<ObjectWithFloat>({ f: 1e20 })
-  ).toBe('{"f":100000000000000000000.0}');
-
-  expect(
-    JSON.stringify<ObjectWithFloat>({ f: 1e21 })
-  ).toBe('{"f":1e+21}');
-
-  expect(
-    JSON.stringify<ObjWithStrangeKey<string>>({ data: "foo" })
-  ).toBe('{"a\\\\\\t\\"\\u0002b`c":"foo"}');
-
-});
-
-describe("Should serialize @omit'ed objects", () => {
-
-  expect(
-    JSON.stringify(<OmitIf>{
-      y: 1
-    })
-  ).toBe('{"x":1,"y":1,"z":1}');
-
-});
-
-@json
-class ObjWithString {
-  s!: string;
-}
-
-@json
-class ObjectWithStringArray {
-  sa!: string[];
-}
-
-@json
-class ObjectWithFloat {
-  f!: f64;
-}
-
-@json
-class ObjectWithFloatArray {
-  fa!: f64[];
-}
-
-@json
-class ObjWithStrangeKey<T> {
-  @alias('a\\\t"\x02b`c')
-  data!: T;
-}

package/assembly/deserialize/box.ts

@@ -1,17 +0,0 @@
-import { JSON } from "..";
-
-// @ts-ignore: Decorator
-export function deserializeBox<T extends Box<any>>(data: string): T {
-    if (isNullable<T>() && data == "null") {
-        return null;
-    }
-    const instance = changetype<nonnull<T>>(__new(offsetof<nonnull<T>>(), idof<nonnull<T>>()))// as Box<usize>;
-    const val = instance._val;
-    instance._val = parseDirectInference(val, data);
-    // @ts-ignore
-    return changetype<T>(instance);
-}
-
-function parseDirectInference<T>(type: T, data: string, initializeDefaultValues: boolean = false): T {
-    return JSON.parse<T>(data, initializeDefaultValues)
-}

package/assembly/serialize/box.ts

@@ -1,11 +0,0 @@
-import { NULL_WORD } from "../src/chars";
-import { JSON } from "..";
-import { Box } from "as-container";
-
-// @ts-ignore
-export function serializeBox<T extends Box<any>>(data: T): string {
-  if (isNullable<T>() && changetype<usize>(data) == <usize>0) {
-    return NULL_WORD;
-  }
-  return JSON.stringify(data.unwrap());
-}

package/transform/lib/index.old.js

@@ -1,257 +0,0 @@
-import { Parser, Source, Tokenizer, } 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";
-class SchemaData {
-    constructor() {
-        this.keys = [];
-        this.values = [];
-        this.types = [];
-        this.name = "";
-        this.parent = "";
-        this.encodeStmts = [];
-        this.setDataStmts = [];
-        this.initializeStmts = [];
-    }
-}
-class AsJSONTransform extends BaseVisitor {
-    constructor() {
-        super(...arguments);
-        this.schemasList = [];
-        this.sources = new Set();
-    }
-    visitMethodDeclaration() { }
-    visitClassDeclaration(node) {
-        const className = node.name.text;
-        if (!node.decorators?.length)
-            return;
-        let foundDecorator = false;
-        for (const decorator of node.decorators) {
-            if (
-            // @ts-ignore
-            decorator.name.text.toLowerCase() == "json" ||
-                // @ts-ignore
-                decorator.name.text.toLowerCase() == "serializable")
-                foundDecorator = true;
-        }
-        if (!foundDecorator)
-            return;
-        // Prevent from being triggered twice.
-        for (const member of node.members) {
-            if (member.name.text == "__SERIALIZE")
-                return;
-        }
-        this.currentClass = {
-            name: className,
-            keys: [],
-            values: [],
-            types: [],
-            parent: node.extendsType ? toString(node.extendsType) : "",
-            node: node,
-            encodeStmts: [],
-            setDataStmts: [],
-            initializeStmts: []
-        };
-        if (this.currentClass.parent.length) {
-            const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
-            if (parentSchema?.encodeStmts) {
-                parentSchema?.encodeStmts.push(parentSchema?.encodeStmts.pop() + ",");
-                for (let i = 0; i < parentSchema.keys.length; i++) {
-                    const key = parentSchema.keys[i];
-                    if (node.members.filter(v => v.name.text == key) == undefined)
-                        this.currentClass.encodeStmts.unshift(parentSchema.encodeStmts[i]);
-                }
-            }
-        }
-        const parentSchema = this.schemasList.find((v) => v.name == this.currentClass.parent);
-        const members = [
-            ...node.members
-        ];
-        if (parentSchema) {
-            for (const mem of parentSchema.node.members) {
-                if (members.find(v => v.name === mem.name) == undefined)
-                    members.unshift(mem);
-            }
-        }
-        for (const mem of members) {
-            // @ts-ignore
-            if (mem.type && mem.type.name && mem.type.name.identifier.text) {
-                const member = mem;
-                const lineText = toString(member);
-                //console.log("Member: " + lineText)
-                if (!lineText.startsWith("private ") && !lineText.startsWith("static ")) {
-                    // @ts-ignore
-                    let type = toString(member.type);
-                    const name = member.name.text;
-                    let aliasName = name;
-                    // @ts-ignore
-                    if (member.decorators && member.decorators[0]?.name.text === "alias") {
-                        if (member.decorators[0] && member.decorators[0].args[0]) {
-                            // @ts-ignore
-                            aliasName = member.decorators[0].args[0].value;
-                        }
-                    }
-                    this.currentClass.keys.push(name);
-                    // @ts-ignore
-                    this.currentClass.types.push(type);
-                    // @ts-ignore
-                    if ([
-                        "u8",
-                        "i8",
-                        "u16",
-                        "i16",
-                        "u32",
-                        "i32",
-                        "u64",
-                        "i64",
-                    ].includes(type.toLowerCase())) {
-                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${this.${name}},`);
-                        // @ts-ignore
-                        this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
-          this.${name} = __atoi_fast<${type}>(data, val_start << 1, val_end << 1);
-          return;
-        }`);
-                        if (member.initializer) {
-                            this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
-                        }
-                    }
-                    else // @ts-ignore
-                     if ([
-                        "f32",
-                        "f64",
-                    ].includes(type.toLowerCase())) {
-                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${this.${name}},`);
-                        // @ts-ignore
-                        this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
-            this.${name} = __parseObjectValue<${type}>(data.slice(val_start, val_end), initializeDefaultValues);
-            return;
-          }`);
-                        if (member.initializer) {
-                            this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
-                        }
-                    }
-                    else {
-                        this.currentClass.encodeStmts.push(`${encodeKey(aliasName)}:\${__JSON_Stringify<${type}>(this.${name})},`);
-                        // @ts-ignore
-                        this.currentClass.setDataStmts.push(`if (key.equals(${JSON.stringify(aliasName)})) {
-            this.${name} = __parseObjectValue<${type}>(val_start ? data.slice(val_start, val_end) : data, initializeDefaultValues);
-            return;
-          }`);
-                        if (member.initializer) {
-                            this.currentClass.initializeStmts.push(`this.${name} = ${toString(member.initializer)}`);
-                        }
-                    }
-                }
-            }
-        }
-        let serializeFunc = "";
-        if (this.currentClass.encodeStmts.length > 0) {
-            const stmt = this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1];
-            this.currentClass.encodeStmts[this.currentClass.encodeStmts.length - 1] =
-                stmt.slice(0, stmt.length - 1);
-            serializeFunc = `
-      __SERIALIZE(): string {
-        return \`{${this.currentClass.encodeStmts.join("")}}\`;
-      }`;
-        }
-        else {
-            serializeFunc = `
-      __SERIALIZE(): string {
-        return "{}";
-      }`;
-        }
-        const setKeyFunc = `
-      __JSON_Set_Key(key: __Virtual<string>, data: string, val_start: i32, val_end: i32, initializeDefaultValues: boolean): void {
-        ${this.currentClass.setDataStmts.join("\n        ")}
-      }
-    `;
-        let initializeFunc = "";
-        if (this.currentClass.initializeStmts.length > 0) {
-            initializeFunc = `
-      __JSON_Initialize(): void {
-      ${this.currentClass.initializeStmts.join(";\n")};
-      }
-      `;
-        }
-        else {
-            initializeFunc = `
-      __JSON_Initialize(): void {}
-      `;
-        }
-        const serializeMethod = SimpleParser.parseClassMember(serializeFunc, node);
-        node.members.push(serializeMethod);
-        const setDataMethod = SimpleParser.parseClassMember(setKeyFunc, node);
-        node.members.push(setDataMethod);
-        const initializeMethod = SimpleParser.parseClassMember(initializeFunc, node);
-        node.members.push(initializeMethod);
-        this.schemasList.push(this.currentClass);
-        this.sources.add(node.name.range.source);
-        // Uncomment to see the generated code for debugging.
-        //console.log(serializeFunc);
-        //console.log(setKeyFunc);
-        //console.log(initializeFunc);
-    }
-    visitSource(node) {
-        super.visitSource(node);
-        // Only add the import statement to sources that have JSON decorated classes.
-        if (!this.sources.has(node)) {
-            return;
-        }
-        // Note, the following one liner would be easier, but it fails with an assertion error
-        // because as-virtual's SimpleParser doesn't set the parser.currentSource correctly.
-        //
-        // const stmt = SimpleParser.parseTopLevelStatement('import { Virtual as __Virtual } from "as-virtual/assembly";');
-        // ... So we have to do it the long way:
-        const txt = 'import { Virtual as __Virtual } from "as-virtual/assembly";';
-        const tokenizer = new Tokenizer(new Source(0 /* SourceKind.User */, node.normalizedPath, txt));
-        const parser = new Parser();
-        parser.currentSource = tokenizer.source;
-        const stmt = parser.parseTopLevelStatement(tokenizer);
-        // Add the import statement to the top of the source.
-        node.statements.unshift(stmt);
-    }
-}
-function encodeKey(aliasName) {
-    return JSON.stringify(aliasName)
-        .replace(/\\/g, "\\\\")
-        .replace(/\`/g, '\\`');
-}
-export default class Transformer extends Transform {
-    // Trigger the transform after parse.
-    afterParse(parser) {
-        // Create new transform
-        const transformer = new AsJSONTransform();
-        // Sort the sources so that user scripts are visited last
-        const sources = parser.sources
-            .filter((source) => !isStdlib(source))
-            .sort((_a, _b) => {
-            const a = _a.internalPath;
-            const b = _b.internalPath;
-            if (a[0] === "~" && b[0] !== "~") {
-                return -1;
-            }
-            else if (a[0] !== "~" && b[0] === "~") {
-                return 1;
-            }
-            else {
-                return 0;
-            }
-        });
-        // Loop over every source
-        for (const source of sources) {
-            // Ignore all lib and std. Visit everything else.
-            if (!isStdlib(source)) {
-                transformer.visit(source);
-            }
-        }
-        // Check that every parent and child class is hooked up correctly
-        const schemas = transformer.schemasList;
-        for (const schema of schemas) {
-            if (schema.parent) {
-                const parent = schemas.find((v) => v.name === schema.parent);
-                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.`);
-            }
-        }
-    }
-}

package/transform/lib/types.js

@@ -1,17 +0,0 @@
-export class SchemaMember {
-    constructor() {
-        this.key = "";
-        this.type = "";
-        this.value = null;
-        this.serialize = null;
-        this.deserialize = null;
-        this.initialize = null;
-    }
-}
-export class SchemaData {
-    constructor() {
-        this.name = "";
-        this.members = [];
-        this.parent = null;
-    }
-}