Introduce Values to support expressions

.factory/automation.yml

@@ -112,6 +112,7 @@ build:
         bazel run @vaticle_dependencies//distribution/artifact:create-netrc
         .factory/test-core.sh //test/behaviour/typeql/language/match/... --test_output=errors --jobs=1
         .factory/test-core.sh //test/behaviour/typeql/language/get/... --test_output=errors --jobs=1
+        .factory/test-core.sh //test/behaviour/typeql/language/expression/... --test_output=errors --jobs=1
     test-behaviour-match-cluster:
       image: vaticle-ubuntu-22.04
       command: |
@@ -120,6 +121,7 @@ build:
         bazel run @vaticle_dependencies//distribution/artifact:create-netrc
         .factory/test-cluster.sh //test/behaviour/typeql/language/match/... --test_output=errors --jobs=1
         .factory/test-cluster.sh //test/behaviour/typeql/language/get/... --test_output=errors --jobs=1
+        .factory/test-cluster.sh //test/behaviour/typeql/language/expression/... --test_output=errors --jobs=1
     test-behaviour-writable-core:
       image: vaticle-ubuntu-22.04
       command: |

BUILD

@@ -227,7 +227,6 @@ checkstyle_test(
 filegroup(
     name = "ci",
     data = [
-        "@vaticle_dependencies//tool/bazelrun:rbe",
         "@vaticle_dependencies//distribution/artifact:create-netrc",
         "@vaticle_dependencies//tool/release/notes:create",
     ],

api/concept/Concept.ts

@@ -31,6 +31,8 @@ import { RelationType } from "./type/RelationType";
 import { RoleType } from "./type/RoleType";
 import { ThingType } from "./type/ThingType";
 import { Type } from "./type/Type";
+import {ValueType as ValueTypeProto} from "typedb-protocol/common/concept_pb";
+import {Value} from "./value/Value";
 
 export interface Concept {
 
@@ -58,6 +60,8 @@ export interface Concept {
 
     isRelation(): boolean;
 
+    isValue(): boolean;
+
     asType(): Type;
 
     asThingType(): ThingType;
@@ -78,6 +82,8 @@ export interface Concept {
 
     asRelation(): Relation;
 
+    asValue(): Value;
+
     equals(concept: Concept): boolean;
 
     toJSONRecord(): Record<string, boolean | string | number>;
@@ -111,4 +117,45 @@ export namespace Concept {
 
         asRelation(): Relation.Remote;
     }
+
+
+    export interface ValueType {
+
+        proto(): ValueTypeProto;
+
+        name(): string;
+    }
+
+    export namespace ValueType {
+
+        class Impl implements ValueType {
+
+            private readonly _proto: ValueTypeProto;
+            private readonly _name: string;
+
+            constructor(type: ValueTypeProto, name: string) {
+                this._proto = type;
+                this._name = name;
+            }
+
+            proto(): ValueTypeProto {
+                return this._proto;
+            }
+
+            name(): string {
+                return this._name.toLowerCase();
+            }
+
+            toString() {
+                return "ValueType[" + this._name + "]";
+            }
+        }
+
+        export const OBJECT = new Impl(ValueTypeProto.OBJECT, "OBJECT");
+        export const BOOLEAN = new Impl(ValueTypeProto.BOOLEAN, "BOOLEAN");
+        export const LONG = new Impl(ValueTypeProto.LONG, "LONG");
+        export const DOUBLE = new Impl(ValueTypeProto.DOUBLE, "DOUBLE");
+        export const STRING = new Impl(ValueTypeProto.STRING, "STRING");
+        export const DATETIME = new Impl(ValueTypeProto.DATETIME, "DATETIME");
+    }
 }

api/concept/ConceptManager.ts

@@ -19,11 +19,12 @@
  * under the License.
  */
 
-import { Thing } from "./thing/Thing";
-import { AttributeType } from "./type/AttributeType";
-import { EntityType } from "./type/EntityType";
-import { RelationType } from "./type/RelationType";
-import { ThingType } from "./type/ThingType";
+import {Thing} from "./thing/Thing";
+import {AttributeType} from "./type/AttributeType";
+import {EntityType} from "./type/EntityType";
+import {RelationType} from "./type/RelationType";
+import {ThingType} from "./type/ThingType";
+import {Concept} from "./Concept";
 
 export interface ConceptManager {
 
@@ -49,5 +50,5 @@ export interface ConceptManager {
 
     getAttributeType(label: string): Promise<AttributeType>;
 
-    putAttributeType(label: string, valueType: AttributeType.ValueType): Promise<AttributeType>;
+    putAttributeType(label: string, valueType: Concept.ValueType): Promise<AttributeType>;
 }

api/concept/type/AttributeType.ts

@@ -19,22 +19,23 @@
  * under the License.
  */
 
-import { AttributeType as AttributeTypeProto } from "typedb-protocol/common/concept_pb";
-import { Stream } from "../../../common/util/Stream";
-import { TypeDBTransaction } from "../../connection/TypeDBTransaction";
-import { Attribute } from "../thing/Attribute";
-import { Entity } from "../thing/Entity";
-import { Relation } from "../thing/Relation";
-import { Thing } from "../thing/Thing";
-import { EntityType } from "./EntityType";
-import { RelationType } from "./RelationType";
-import { RoleType } from "./RoleType";
-import { ThingType } from "./ThingType";
-import { Type } from "./Type";
+import {Stream} from "../../../common/util/Stream";
+import {TypeDBTransaction} from "../../connection/TypeDBTransaction";
+import {Attribute} from "../thing/Attribute";
+import {Entity} from "../thing/Entity";
+import {Relation} from "../thing/Relation";
+import {Thing} from "../thing/Thing";
+import {EntityType} from "./EntityType";
+import {RelationType} from "./RelationType";
+import {RoleType} from "./RoleType";
+import {ThingType} from "./ThingType";
+import {Type} from "./Type";
+import {Concept} from "../Concept";
+import Annotation = ThingType.Annotation;
 
 export interface AttributeType extends ThingType {
 
-    readonly valueType: AttributeType.ValueType;
+    readonly valueType: Concept.ValueType;
 
     isBoolean(): boolean;
 
@@ -62,8 +63,6 @@ export interface AttributeType extends ThingType {
 /* eslint @typescript-eslint/ban-types: "off" */
 export namespace AttributeType {
 
-    import Annotation = ThingType.Annotation;
-
     export interface Remote extends AttributeType, ThingType.Remote {
 
         setSupertype(type: AttributeType): Promise<void>;
@@ -381,56 +380,4 @@ export namespace AttributeType {
             get(value: Date): Promise<Attribute.DateTime>;
         }
     }
-
-    export interface ValueType {
-
-        isKeyable(): boolean;
-
-        isWritable(): boolean;
-
-        proto(): AttributeTypeProto.ValueType;
-
-        name(): string;
-    }
-
-    export namespace ValueType {
-
-        class Impl implements ValueType {
-
-            private readonly _attrTypeProto: AttributeTypeProto.ValueType;
-            private readonly _name: string;
-
-            constructor(type: AttributeTypeProto.ValueType, name: string) {
-                this._attrTypeProto = type;
-                this._name = name;
-            }
-
-            proto(): AttributeTypeProto.ValueType {
-                return this._attrTypeProto;
-            }
-
-            name(): string {
-                return this._name.toLowerCase();
-            }
-
-            isKeyable(): boolean {
-                return [AttributeTypeProto.ValueType.LONG, AttributeTypeProto.ValueType.STRING, AttributeTypeProto.ValueType.DATETIME].includes(this._attrTypeProto);
-            }
-
-            isWritable(): boolean {
-                return this._attrTypeProto !== AttributeTypeProto.ValueType.OBJECT;
-            }
-
-            toString() {
-                return "ValueType[" + this._name + "]";
-            }
-        }
-
-        export const OBJECT = new Impl(AttributeTypeProto.ValueType.OBJECT, "OBJECT");
-        export const BOOLEAN = new Impl(AttributeTypeProto.ValueType.BOOLEAN, "BOOLEAN");
-        export const LONG = new Impl(AttributeTypeProto.ValueType.LONG, "LONG");
-        export const DOUBLE = new Impl(AttributeTypeProto.ValueType.DOUBLE, "DOUBLE");
-        export const STRING = new Impl(AttributeTypeProto.ValueType.STRING, "STRING");
-        export const DATETIME = new Impl(AttributeTypeProto.ValueType.DATETIME, "DATETIME");
-    }
 }

api/concept/type/ThingType.ts

@@ -23,6 +23,7 @@
 import {RequestBuilder} from "../../../common/rpc/RequestBuilder";
 import {Stream} from "../../../common/util/Stream";
 import {TypeDBTransaction} from "../../connection/TypeDBTransaction";
+import {Concept} from "../Concept";
 import {Attribute} from "../thing/Attribute";
 import {Entity} from "../thing/Entity";
 import {Relation} from "../thing/Relation";
@@ -136,19 +137,19 @@ export namespace ThingType {
 
         getOwns(): Stream<AttributeType>;
 
-        getOwns(valueType: AttributeType.ValueType): Stream<AttributeType>;
+        getOwns(valueType: Concept.ValueType): Stream<AttributeType>;
 
         getOwns(annotations: Annotation[]): Stream<AttributeType>;
 
-        getOwns(valueType: AttributeType.ValueType, annotations: Annotation[]): Stream<AttributeType>;
+        getOwns(valueType: Concept.ValueType, annotations: Annotation[]): Stream<AttributeType>;
 
         getOwnsExplicit(): Stream<AttributeType>;
 
-        getOwnsExplicit(valueType: AttributeType.ValueType): Stream<AttributeType>;
+        getOwnsExplicit(valueType: Concept.ValueType): Stream<AttributeType>;
 
         getOwnsExplicit(annotations: Annotation[]): Stream<AttributeType>;
 
-        getOwnsExplicit(valueType: AttributeType.ValueType, annotations: Annotation[]): Stream<AttributeType>;
+        getOwnsExplicit(valueType: Concept.ValueType, annotations: Annotation[]): Stream<AttributeType>;
 
         getOwnsOverridden(attributeType: AttributeType): Promise<AttributeType>;
 

api/concept/type/Type.ts

@@ -20,22 +20,22 @@
  */
 
 
-import { Type as TypeProto } from "typedb-protocol/common/concept_pb";
-import { ErrorMessage } from "../../../common/errors/ErrorMessage";
-import { TypeDBClientError } from "../../../common/errors/TypeDBClientError";
-import { Label } from "../../../common/Label";
-import { Stream } from "../../../common/util/Stream";
-import { TypeDBTransaction } from "../../connection/TypeDBTransaction";
-import { Concept } from "../Concept";
-import { Attribute } from "../thing/Attribute";
-import { Entity } from "../thing/Entity";
-import { Relation } from "../thing/Relation";
-import { Thing } from "../thing/Thing";
-import { AttributeType } from "./AttributeType";
-import { EntityType } from "./EntityType";
-import { RelationType } from "./RelationType";
-import { RoleType } from "./RoleType";
-import { ThingType } from "./ThingType";
+import {Type as TypeProto} from "typedb-protocol/common/concept_pb";
+import {ErrorMessage} from "../../../common/errors/ErrorMessage";
+import {TypeDBClientError} from "../../../common/errors/TypeDBClientError";
+import {Label} from "../../../common/Label";
+import {Stream} from "../../../common/util/Stream";
+import {TypeDBTransaction} from "../../connection/TypeDBTransaction";
+import {Concept} from "../Concept";
+import {Attribute} from "../thing/Attribute";
+import {Entity} from "../thing/Entity";
+import {Relation} from "../thing/Relation";
+import {Thing} from "../thing/Thing";
+import {AttributeType} from "./AttributeType";
+import {EntityType} from "./EntityType";
+import {RelationType} from "./RelationType";
+import {RoleType} from "./RoleType";
+import {ThingType} from "./ThingType";
 import BAD_ENCODING = ErrorMessage.Concept.BAD_ENCODING;
 
 export interface Type extends Concept {

api/concept/value/Value.ts

@@ -0,0 +1,83 @@
+/*
+ * 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.
+ */
+
+
+import {Concept} from "../Concept";
+
+export interface Value extends Concept {
+
+    readonly valueType: Concept.ValueType;
+
+    readonly value: boolean | string | number | Date;
+
+    isBoolean(): boolean;
+
+    isLong(): boolean;
+
+    isDouble(): boolean;
+
+    isString(): boolean;
+
+    isDateTime(): boolean;
+
+    asBoolean(): Value.Boolean;
+
+    asLong(): Value.Long;
+
+    asDouble(): Value.Double;
+
+    asString(): Value.String;
+
+    asDateTime(): Value.DateTime;
+}
+
+export namespace Value {
+
+    export interface Boolean extends Value {
+
+        readonly value: boolean;
+
+    }
+
+    export interface Long extends Value {
+
+        readonly value: number;
+
+    }
+
+    export interface Double extends Value {
+
+        readonly value: number;
+
+    }
+
+    export interface String extends Value {
+
+        readonly value: string;
+
+    }
+
+    export interface DateTime extends Value {
+
+        readonly value: Date;
+
+    }
+}

common/errors/ErrorMessage.ts

@@ -109,6 +109,7 @@ export namespace ErrorMessage {
         export const BAD_VALUE_TYPE = new Concept(6, (args: Stringable[]) => `The value type '${args[0]}' was not recognised.`);
         export const BAD_ANNOTATION = new Concept(7, (args: Stringable[]) => `The annotation '${args[0]}' was not recognised.`);
         export const BAD_ATTRIBUTE_VALUE = new Concept(8, (args: Stringable[]) => `The attribute value '${args[0]}' was not recognised.`);
+        export const VALUE_HAS_NO_REMOTE = new Concept(9, (args: Stringable[]) => `A 'value' has no remote concept.`);
     }
 
     export class Query extends ErrorMessage {