json serialization fixups

Author: dmitrii-ubskii

BUILD

@@ -67,7 +67,7 @@ filegroup(
 
 behaviour_steps_common = [
     "//test/behaviour/connection:ConnectionStepsBase.ts",
-    "//test/behaviour/concept/serialization:SerializationSteps.ts",
+    "//test/behaviour/concept/serialization/json:JSONSteps.ts",
     "//test/behaviour/concept/thing:ThingSteps.ts",
     "//test/behaviour/concept/thing/attribute:AttributeSteps.ts",
     "//test/behaviour/concept/thing/entity:EntitySteps.ts",

api/answer/ConceptMap.ts

@@ -31,7 +31,7 @@ export interface ConceptMap {
 
     readonly explainables: ConceptMap.Explainables;
 
-    JSON(): Record<string, Record<string, boolean | string | number>>;
+    toJSONRecord(): Record<string, Record<string, boolean | string | number>>;
 }
 
 export namespace ConceptMap {

api/concept/Concept.ts

@@ -80,7 +80,7 @@ export interface Concept {
 
     equals(concept: Concept): boolean;
 
-    JSON(): Record<string, boolean | string | number>;
+    toJSONRecord(): Record<string, boolean | string | number>;
 }
 
 export namespace Concept {

concept/ConceptImpl.ts

@@ -127,7 +127,7 @@ export abstract class ConceptImpl implements Concept {
 
     abstract equals(concept: Concept): boolean;
 
-    abstract JSON(): Record<string, boolean | string | number>;
+    abstract toJSONRecord(): Record<string, boolean | string | number>;
 }
 
 export namespace ConceptImpl {

concept/answer/ConceptMapImpl.ts

@@ -53,10 +53,10 @@ export class ConceptMapImpl implements ConceptMap {
         return this._explainables;
     }
 
-    JSON(): Record<string, Record<string, boolean | string | number>> {
+    toJSONRecord(): Record<string, Record<string, boolean | string | number>> {
         const object: Record<string, Record<string, boolean | string | number>> = {}
         for (const key of this._concepts.keys()) {
-            object[key] = this._concepts.get(key).JSON();
+            object[key] = this._concepts.get(key).toJSONRecord();
         }
         return object;
     }

concept/thing/AttributeImpl.ts

@@ -79,7 +79,7 @@ export abstract class AttributeImpl extends ThingImpl implements Attribute {
         return this;
     }
 
-    JSON(): Record<string, boolean | string | number> {
+    toJSONRecord(): Record<string, boolean | string | number> {
         let value;
         if (this.value instanceof Date) value = this.value.toISOString().slice(0, -1);
         else value = this.value;
@@ -191,7 +191,7 @@ export namespace AttributeImpl {
             return this;
         }
 
-        JSON(): Record<string, boolean | string | number> {
+        toJSONRecord(): Record<string, boolean | string | number> {
             let value;
             if (this.value instanceof Date) value = this.value.toISOString().slice(0, -1);
             else value = this.value;

concept/thing/ThingImpl.ts

@@ -77,7 +77,7 @@ export abstract class ThingImpl extends ConceptImpl implements Thing {
         return this;
     }
 
-    JSON(): Record<string, boolean | string | number> {
+    toJSONRecord(): Record<string, boolean | string | number> {
         return {type: this.type.label.name};
     }
 }
@@ -125,7 +125,7 @@ export namespace ThingImpl {
             return this;
         }
 
-        JSON(): Record<string, boolean | string | number> {
+        toJSONRecord(): Record<string, boolean | string | number> {
             return {type: this.type.label.name};
         }
 

concept/type/TypeImpl.ts

@@ -68,7 +68,7 @@ export abstract class TypeImpl extends ConceptImpl implements Type {
         return this;
     }
 
-    JSON(): Record<string, string> {
+    toJSONRecord(): Record<string, string> {
         return {label: this.label.scopedName};
     }
 
@@ -129,7 +129,7 @@ export namespace TypeImpl {
             return this;
         }
 
-        JSON(): Record<string, string> {
+        toJSONRecord(): Record<string, string> {
             return {label: this.label.scopedName};
         }
 

dependencies/vaticle/repositories.bzl

@@ -39,6 +39,6 @@ def vaticle_typedb_common():
 def vaticle_typedb_behaviour():
     git_repository(
         name = "vaticle_typedb_behaviour",
-        remote = "https://github.com/vaticle/typedb-behaviour",
-        commit = "46619244d5f1773505eeacf6d5bd0ae71781f8e8" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
+        remote = "https://github.com/dmitrii-ubskii/typedb-behaviour",
+        commit = "ab05f18809252674c9b75364a9815c1b264a8b5c" # sync-marker: do not remove this comment, this is used for sync-dependencies by @vaticle_typedb_behaviour
     )

test/behaviour/concept/serialization/BUILD

@@ -22,22 +22,8 @@
 load("@vaticle_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
 load("//test/behaviour:rules.bzl", "typedb_behaviour_node_test")
 
-exports_files(["SerializationSteps.ts"])
-
 checkstyle_test(
     name = "checkstyle",
     include = glob(["*"]),
     license_type = "apache-header",
 )
-
-typedb_behaviour_node_test(
-    name = "test",
-    features = ["@vaticle_typedb_behaviour//concept:serialization.feature"],
-    node_modules = "//:node_modules",
-    package_json = "//:package.json",
-    native_typedb_artifact_core = "//test:native-typedb-artifact",
-    native_typedb_artifact_cluster = "//test:native-typedb-cluster-artifact",
-    client = "//:client-nodejs-targz",
-    steps_core = "//test/behaviour:steps-core-targz",
-    steps_cluster = "//test/behaviour:steps-cluster-targz",
-)

test/behaviour/concept/serialization/json/BUILD

@@ -0,0 +1,43 @@
+#
+# Copyright (C) 2022 Vaticle
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+load("@vaticle_dependencies//tool/checkstyle:rules.bzl", "checkstyle_test")
+load("//test/behaviour:rules.bzl", "typedb_behaviour_node_test")
+
+exports_files(["JSONSteps.ts"])
+
+checkstyle_test(
+    name = "checkstyle",
+    include = glob(["*"]),
+    license_type = "apache-header",
+)
+
+typedb_behaviour_node_test(
+    name = "test",
+    features = ["@vaticle_typedb_behaviour//concept/serialization:json.feature"],
+    node_modules = "//:node_modules",
+    package_json = "//:package.json",
+    native_typedb_artifact_core = "//test:native-typedb-artifact",
+    native_typedb_artifact_cluster = "//test:native-typedb-cluster-artifact",
+    client = "//:client-nodejs-targz",
+    steps_core = "//test/behaviour:steps-core-targz",
+    steps_cluster = "//test/behaviour:steps-cluster-targz",
+)

test/behaviour/concept/serialization/SerializationSteps.ts test/behaviour/concept/serialization/json/JSONSteps.ts

@@ -20,13 +20,13 @@
  */
 
 import {Then} from "@cucumber/cucumber";
-import {answers} from "../../typeql/TypeQLSteps"
+import {answers} from "../../../typeql/TypeQLSteps"
 import assert = require("assert");
 import {isDeepStrictEqual} from "util";
 
 Then("JSON of answer concepts matches", async (expectedJSON: string) => {
     const expected = JSON.parse(expectedJSON);
-    const actual = answers.map((conceptMap) => conceptMap.JSON());
+    const actual = answers.map((conceptMap) => conceptMap.toJSONRecord());
     assertUnorderedDeepStrictEqual(actual, expected);
 });