@shaclmate/compiler 4.0.41 → 4.0.43

package/dist/generators/ts/AbstractType.d.ts

@@ -1,3 +1,4 @@
+import type { BlankNode, NamedNode } from "@rdfjs/types";
 import type { Maybe } from "purify-ts";
 import type { Logger } from "ts-log";
 import type { Reusables } from "./Reusables.js";
@@ -11,10 +12,6 @@ export declare abstract class AbstractType {
     protected readonly configuration: TsGenerator.Configuration;
     protected readonly logger: Logger;
     protected readonly reusables: Reusables;
-    /**
-     * Alias for this type.
-     */
-    readonly alias: Maybe<string>;
     /**
      * Comment from rdfs:comment.
      */
@@ -38,7 +35,7 @@ export declare abstract class AbstractType {
      */
     abstract readonly discriminantProperty: Maybe<AbstractType.DiscriminantProperty>;
     /**
-     * A function (reference or declaration) that compares two property values of this type, returning a
+     * A function (reference or literal) that compares two property values of this type, returning a
      * $EqualsResult.
      */
     abstract readonly equalsFunction: Code;
@@ -47,7 +44,7 @@ export declare abstract class AbstractType {
      */
     abstract readonly expression: Code;
     /**
-     * A function (reference or declaration) that takes a filter of filterType (below) and a value of this type
+     * A function (reference or literal) that takes a filter of filterType (below) and a value of this type
      * and returns true if the value passes the filter.
      */
     abstract readonly filterFunction: Code;
@@ -55,6 +52,27 @@ export declare abstract class AbstractType {
      * Composite type for filtering instances of this type e.g., SomeObject.Filter with filters for each property.
      */
     abstract readonly filterType: Code;
+    /**
+     * A FromRdfResourceValuesFunction (reference or literal) that converts a Either<Error, rdfjsResource.Resource.Values> to a
+     * Either<Error, rdfjsResource.Resource.Values<this type>>.
+     *
+     * These functions are used to deserialize property values in an ObjectType, either directly (a property with this type) or indirectly (a property with a type like OptionType
+     * that has a type parameter of this type).
+     *
+     * Some types need to filter on the set of all objects/values of a (subject, predicate). For example, all sh:hasValue values must be present in the set for any values
+     * to be considered valid. Similarly, values may also need to be sorted. For example, specifying preferredLanguages should sort the values in the order of the specified languages so that the first value
+     * (if it exists) is always of the first preferred language.
+     *
+     * The function takes two parameters, a rdfjsResource.Resource.Values and a parameters object with the following parameters:
+     *   context: unanticipated properties (...) passed to Object.fromRdf
+     *   focusResource: the Resource passed to Object.fromRdf
+     *   graph: DefaultGraph | NamedNode | undefined to match (subject, predicate, object) triples in; if undefined, match triples in all graphs
+     *   ignoreRdfType: whether the RDF type of objects/object unions should be ignored
+     *   objectSet: the ObjectSet passed to Object.fromRdf
+     *   preferredLanguages: the preferred languages array (e.g., ["en"]) passed to Object.fromRdf
+     *   propertyPath: the PropertyPath of the object's property
+     */
+    abstract readonly fromRdfResourceValuesFunction: Code;
     /**
      * Declarations for GraphQL arguments to pass to this the graphqlResolveExpression.
      */
@@ -66,7 +84,7 @@ export declare abstract class AbstractType {
      */
     abstract readonly graphqlType: AbstractType.GraphqlType;
     /**
-     * A function (reference or declaration) that takes a  Hasher and a value of this type, calls hasher.update on the value, and returns the Hasher.
+     * A function (reference or literal) that takes a  Hasher and a value of this type, calls hasher.update on the value, and returns the Hasher.
      */
     abstract readonly hashFunction: Code;
     /**
@@ -85,6 +103,10 @@ export declare abstract class AbstractType {
      * Is a value of this type mutable?
      */
     abstract readonly mutable: boolean;
+    /**
+     * Name for this type.
+     */
+    readonly name: Maybe<string>;
     /**
      * Does this type directly or indirectly reference itself?
      */
@@ -92,11 +114,15 @@ export declare abstract class AbstractType {
     /**
      * Is this type an ObjectType or does it reference an object type?
      */
-    abstract readonly referencesObjectType: boolean;
+    abstract readonly referencesNamedType: boolean;
     /**
      * TypeScript type describing .schema.
      */
     abstract readonly schemaType: Code;
+    /**
+     * Identifier of the shape this type was derived from.
+     */
+    readonly shapeIdentifier: BlankNode | NamedNode;
     /**
      * The type(s) of the array elements produced by the toRdfResourceValuesExpression.
      */
@@ -114,7 +140,7 @@ export declare abstract class AbstractType {
      */
     abstract readonly validationFunction: Maybe<Code>;
     /**
-     * A ValueSparqlConstructTriplesFunction (reference or declaration) that returns an array of sparqljs.Triple's for a property value of this type.
+     * A ValueSparqlConstructTriplesFunction (reference or literal) that returns an array of sparqljs.Triple's for a property value of this type.
      *
      * The function takes a parameters object with the following parameters:
      * - filter: an instance of filterType | undefined
@@ -125,7 +151,7 @@ export declare abstract class AbstractType {
      */
     abstract readonly valueSparqlConstructTriplesFunction: Code;
     /**
-     * A ValueSparqlWherePatternsFunction (reference or declaration) that returns an array of SparqlPattern's for a property value of this type.
+     * A ValueSparqlWherePatternsFunction (reference or literal) that returns an array of SparqlPattern's for a property value of this type.
      *
      * The function takes a parameters object with the following parameters:
      * - filter: an instance of filterType | undefined
@@ -136,18 +162,20 @@ export declare abstract class AbstractType {
      * - variablePrefix: string prefix to use for new variables
      */
     abstract readonly valueSparqlWherePatternsFunction: Code;
-    constructor({ alias, comment, configuration, label, logger, reusables, }: {
-        alias: Maybe<string>;
+    constructor({ comment, configuration, label, logger, name, reusables, shapeIdentifier, }: {
+        name: Maybe<string>;
         comment: Maybe<string>;
         configuration: TsGenerator.Configuration;
         label: Maybe<string>;
         logger: Logger;
         reusables: Reusables;
+        shapeIdentifier: BlankNode | NamedNode;
     });
     /**
      * TypeScript object describing this type, for runtime use.
      */
     get schema(): Code;
+    protected get schemaExpression(): Code;
     /**
      * Helper to compose the result of schema along the type hierarchy.
      */
@@ -160,41 +188,6 @@ export declare abstract class AbstractType {
             value: Code;
         };
     }): Code;
-    /**
-     * An expression that converts a Either<Error, rdfjsResource.Resource.Values> to a
-     * Either<Error, rdfjsResource.Resource.Values<this type>>.
-     *
-     * These expressions are used to deserialize property values in an ObjectType, either directly (a property with this Type) or indirectly (a property with a Type like OptionType
-     * that has a type parameter of this Type).
-     *
-     * Some types need to filter on the set of all objects/values of a (subject, predicate). For example, all sh:hasValue values must be present in the set for any values
-     * to be considered valid. Similar
-     *
-     * Values may also need to be sorted. For example, specifying preferredLanguages should sort the values in the order of the specified languages so that the first value
-     * (if it exists) is always of the first preferred language.
-     *
-     * variables are runtime variables, most derived from the parameters of the ObjectType's fromRdf function:
-     *   context: unanticipated properties (...) passed to Object.fromRdf
-     *   graph: DefaultGraph | NamedNode | undefined to match (subject, predicate, object) triples in; if undefined, match triples in all graphs
-     *   ignoreRdfType: whether the RDF type of objects/object unions should be ignored
-     *   objectSet: the ObjectSet passed to Object.fromRdf
-     *   preferredLanguages: the preferred languages array (e.g., ["en"]) passed to Object.fromRdf
-     *   propertyPath: the PropertyPath of the object's property
-     *   resource: the Resource passed to Object.fromRdf
-     *   resourceValues: the Either<Error, rdfjsResource.Resource.Values> to be converted to values of this type
-     */
-    abstract fromRdfResourceValuesExpression(parameters: {
-        variables: {
-            context: Code;
-            graph: Code;
-            ignoreRdfType?: boolean;
-            objectSet: Code;
-            preferredLanguages: Code;
-            propertyPath: Code;
-            resource: Code;
-            resourceValues: Code;
-        };
-    }): Code;
     /**
      * An expression that resolves a value of this type in the GraphQL server.
      */

package/dist/generators/ts/AbstractType.js

@@ -14,10 +14,6 @@ export class AbstractType {
     configuration;
     logger;
     reusables;
-    /**
-     * Alias for this type.
-     */
-    alias;
     /**
      * Comment from rdfs:comment.
      */
@@ -26,23 +22,35 @@ export class AbstractType {
      * Label from rdfs:label.
      */
     label;
-    constructor({ alias, comment, configuration, label, logger, reusables, }) {
-        this.alias = alias;
+    /**
+     * Name for this type.
+     */
+    name;
+    /**
+     * Identifier of the shape this type was derived from.
+     */
+    shapeIdentifier;
+    constructor({ comment, configuration, label, logger, name, reusables, shapeIdentifier, }) {
         this.comment = comment;
         this.configuration = configuration;
         this.label = label;
         this.logger = logger;
+        this.name = name;
         this.reusables = reusables;
         this.rdfjsTermExpression = rdfjsTermExpression.bind({
             imports: this.reusables.imports,
             logger: this.logger,
             snippets: this.reusables.snippets,
         });
+        this.shapeIdentifier = shapeIdentifier;
     }
     /**
      * TypeScript object describing this type, for runtime use.
      */
     get schema() {
+        return this.schemaExpression;
+    }
+    get schemaExpression() {
         return code `{ ${joinCode(this.schemaInitializers.concat(), { on: ", " })} }`;
     }
     /**
@@ -56,6 +64,9 @@ export class AbstractType {
 __decorate([
     Memoize()
 ], AbstractType.prototype, "schema", null);
+__decorate([
+    Memoize()
+], AbstractType.prototype, "schemaExpression", null);
 (function (AbstractType) {
     class GraphqlType {
         /**

package/dist/generators/ts/BigDecimalType.d.ts

@@ -3,10 +3,11 @@ import { Maybe } from "purify-ts";
 import { AbstractLiteralType } from "./AbstractLiteralType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class BigDecimalType extends AbstractLiteralType {
+    protected readonly inlineExpression: Code;
     readonly conversionFunction: Maybe<AbstractLiteralType.ConversionFunction>;
-    readonly expression: Code;
     readonly filterFunction: Code;
     readonly filterType: Code;
+    readonly fromRdfResourceValuesFunction: Code;
     readonly hashFunction: Code;
     readonly jsTypes: readonly [{
         readonly instanceof: "Object";
@@ -20,9 +21,8 @@ export declare class BigDecimalType extends AbstractLiteralType {
     graphqlResolveExpression({ variables, }: Parameters<AbstractLiteralType["graphqlResolveExpression"]>[0]): Code;
     jsonSchema(): Code;
     jsonType(): AbstractLiteralType.JsonType;
-    literalExpression(literal: Literal): Code;
+    literalValueExpression(literal: Literal): Code;
     toJsonExpression({ variables, }: Parameters<AbstractLiteralType["toJsonExpression"]>[0]): Code;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractLiteralType["toRdfResourceValuesExpression"]>[0]): Code;
-    protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<AbstractLiteralType["fromRdfResourceValuesExpressionChain"]>[0]): ReturnType<AbstractLiteralType["fromRdfResourceValuesExpressionChain"]>;
 }
 //# sourceMappingURL=BigDecimalType.d.ts.map

package/dist/generators/ts/BigDecimalType.js

@@ -9,10 +9,11 @@ import { Memoize } from "typescript-memoize";
 import { AbstractLiteralType } from "./AbstractLiteralType.js";
 import { code, literalOf } from "./ts-poet-wrapper.js";
 export class BigDecimalType extends AbstractLiteralType {
+    inlineExpression = code `${this.reusables.imports.BigDecimal}`;
     conversionFunction = Maybe.empty();
-    expression = code `${this.reusables.imports.BigDecimal}`;
     filterFunction = code `${this.reusables.snippets.filterBigDecimal}`;
     filterType = code `${this.reusables.snippets.NumericFilter}<${this.reusables.imports.BigDecimal}>`;
+    fromRdfResourceValuesFunction = code `${this.reusables.snippets.bigDecimalFromRdfResourceValues}`;
     hashFunction = code `${this.reusables.snippets.hashBigDecimal}`;
     jsTypes = [
         { instanceof: "Object", typeof: "object" },
@@ -35,7 +36,7 @@ export class BigDecimalType extends AbstractLiteralType {
     jsonType() {
         return new AbstractLiteralType.JsonType(code `string`);
     }
-    literalExpression(literal) {
+    literalValueExpression(literal) {
         return code `new ${this.reusables.imports.BigDecimal}(${literalOf(literal.value)})`;
     }
     toJsonExpression({ variables, }) {
@@ -44,12 +45,6 @@ export class BigDecimalType extends AbstractLiteralType {
     toRdfResourceValuesExpression({ variables, }) {
         return code `[${this.reusables.snippets.bigDecimalLiteral}(${variables.value})]`;
     }
-    fromRdfResourceValuesExpressionChain({ variables, }) {
-        return {
-            ...super.fromRdfResourceValuesExpressionChain({ variables }),
-            valueTo: code `chain(values => values.chainMap(value => value.toLiteral().chain(${this.reusables.snippets.decodeBigDecimalLiteral})))`,
-        };
-    }
 }
 __decorate([
     Memoize()

package/dist/generators/ts/BigIntType.d.ts

@@ -6,12 +6,12 @@ export declare class BigIntType extends AbstractNumericType<bigint> {
         readonly typeof: "bigint";
     }[];
     readonly kind = "BigInt";
+    get fromRdfResourceValuesFunction(): Code;
     get graphqlType(): import("./AbstractType.js").AbstractType.GraphqlType;
     fromJsonExpression({ variables, }: Parameters<AbstractNumericType<bigint>["fromJsonExpression"]>[0]): Code;
     jsonSchema(_parameters: Parameters<AbstractNumericType<bigint>["jsonSchema"]>[0]): Code;
     jsonType(): AbstractNumericType.JsonType;
-    literalExpression(literal: bigint | Literal): Code;
+    literalValueExpression(literal: bigint | Literal): Code;
     toJsonExpression({ variables, }: Parameters<AbstractNumericType<bigint>["toJsonExpression"]>[0]): Code;
-    protected fromRdfResourceValueExpression({ variables, }: Parameters<AbstractNumericType<bigint>["fromRdfResourceValueExpression"]>[0]): Code;
 }
 //# sourceMappingURL=BigIntType.d.ts.map

package/dist/generators/ts/BigIntType.js

@@ -11,6 +11,9 @@ import { code, joinCode, literalOf } from "./ts-poet-wrapper.js";
 export class BigIntType extends AbstractNumericType {
     jsTypes = [{ typeof: "bigint" }];
     kind = "BigInt";
+    get fromRdfResourceValuesFunction() {
+        return code `${this.reusables.snippets.bigIntFromRdfResourceValues}<${this.expression}>`;
+    }
     get graphqlType() {
         return new AbstractNumericType.GraphqlType(code `${this.reusables.imports.GraphQLBigInt}`, this.reusables);
     }
@@ -34,16 +37,16 @@ export class BigIntType extends AbstractNumericType {
     jsonType() {
         return new AbstractNumericType.JsonType(code `string`);
     }
-    literalExpression(literal) {
+    literalValueExpression(literal) {
         return code `${typeof literal === "bigint" ? literal : LiteralDecoder.decodeBigIntLiteral(literal).unsafeCoerce()}n`;
     }
     toJsonExpression({ variables, }) {
         return code `${variables.value}.toString()`;
     }
-    fromRdfResourceValueExpression({ variables, }) {
-        return code `${variables.value}.toBigInt(${this.primitiveIn.length > 0 ? `[${this.primitiveIn.map((_) => `${_}n`).join(", ")}] as const` : ""})`;
-    }
 }
+__decorate([
+    Memoize()
+], BigIntType.prototype, "fromRdfResourceValuesFunction", null);
 __decorate([
     Memoize()
 ], BigIntType.prototype, "graphqlType", null);

package/dist/generators/ts/BlankNodeType.d.ts

@@ -3,10 +3,11 @@ import { Maybe } from "purify-ts";
 import { AbstractIdentifierType } from "./AbstractIdentifierType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class BlankNodeType extends AbstractIdentifierType<BlankNode> {
-    readonly expression: Code;
+    protected readonly inlineExpression: Code;
     readonly conversionFunction: Maybe<AbstractIdentifierType.ConversionFunction>;
     readonly filterFunction: Code;
     readonly filterType: Code;
+    readonly fromRdfResourceValuesFunction: Code;
     readonly kind = "BlankNode";
     readonly nodeKinds: ReadonlySet<"BlankNode">;
     readonly parseFunction: Code;
@@ -17,11 +18,5 @@ export declare class BlankNodeType extends AbstractIdentifierType<BlankNode> {
     jsonSchema({ includeDiscriminantProperty, }: Parameters<AbstractIdentifierType<BlankNode>["jsonSchema"]>[0]): Code;
     jsonType(parameters?: Parameters<AbstractIdentifierType<BlankNode>["jsonType"]>[0]): AbstractIdentifierType.JsonType;
     toJsonExpression({ includeDiscriminantProperty, variables, }: Parameters<AbstractIdentifierType<BlankNode>["toJsonExpression"]>[0]): Code;
-    protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<AbstractIdentifierType<BlankNode>["fromRdfResourceValuesExpressionChain"]>[0]): {
-        valueTo: Code;
-        hasValues?: Code;
-        languageIn?: Code;
-        preferredLanguages?: Code;
-    };
 }
 //# sourceMappingURL=BlankNodeType.d.ts.map

package/dist/generators/ts/BlankNodeType.js

@@ -9,7 +9,7 @@ import { Memoize } from "typescript-memoize";
 import { AbstractIdentifierType } from "./AbstractIdentifierType.js";
 import { code } from "./ts-poet-wrapper.js";
 export class BlankNodeType extends AbstractIdentifierType {
-    expression = code `${this.reusables.imports.BlankNode}`;
+    inlineExpression = code `${this.reusables.imports.BlankNode}`;
     conversionFunction = Maybe.of({
         code: code `${this.reusables.snippets.convertToBlankNode}`,
         sourceTypes: [
@@ -25,6 +25,7 @@ export class BlankNodeType extends AbstractIdentifierType {
     });
     filterFunction = code `${this.reusables.snippets.filterBlankNode}`;
     filterType = code `${this.reusables.snippets.BlankNodeFilter}`;
+    fromRdfResourceValuesFunction = code `${this.reusables.snippets.blankNodeFromRdfResourceValues}`;
     kind = "BlankNode";
     nodeKinds = nodeKinds;
     parseFunction = code `${this.reusables.snippets.parseBlankNode};`;
@@ -58,12 +59,6 @@ export class BlankNodeType extends AbstractIdentifierType {
             : "";
         return code `{ "@id": \`_:\${${variables.value}.value}\`${discriminantProperty} }`;
     }
-    fromRdfResourceValuesExpressionChain({ variables, }) {
-        return {
-            ...super.fromRdfResourceValuesExpressionChain({ variables }),
-            valueTo: code `chain(values => values.chainMap(value => value.toBlankNode()))`,
-        };
-    }
 }
 __decorate([
     Memoize()

package/dist/generators/ts/BooleanType.d.ts

@@ -11,11 +11,11 @@ export declare class BooleanType extends AbstractPrimitiveType<boolean> {
     }];
     readonly kind = "Boolean";
     readonly valueSparqlWherePatternsFunction: Code;
-    get expression(): Code;
+    get fromRdfResourceValuesFunction(): Code;
     get schemaType(): Code;
+    protected get inlineExpression(): Code;
     jsonSchema(_parameters: Parameters<AbstractPrimitiveType<number>["jsonSchema"]>[0]): Code;
-    literalExpression(literal: boolean | Literal): Code;
+    literalValueExpression(literal: boolean | Literal): Code;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractPrimitiveType<boolean>["toRdfResourceValuesExpression"]>[0]): Code;
-    protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<AbstractPrimitiveType<boolean>["fromRdfResourceValuesExpressionChain"]>[0]): ReturnType<AbstractPrimitiveType<boolean>["fromRdfResourceValuesExpressionChain"]>;
 }
 //# sourceMappingURL=BooleanType.d.ts.map

package/dist/generators/ts/BooleanType.js

@@ -16,40 +16,38 @@ export class BooleanType extends AbstractPrimitiveType {
     jsTypes = [{ typeof: "boolean" }];
     kind = "Boolean";
     valueSparqlWherePatternsFunction = code `${this.reusables.snippets.booleanSparqlWherePatterns}`;
-    get expression() {
+    get fromRdfResourceValuesFunction() {
+        return code `${this.reusables.snippets.booleanFromRdfResourceValues}<${this.expression}>`;
+    }
+    get schemaType() {
+        return code `${this.reusables.snippets.BooleanSchema}<${this.expression}>`;
+    }
+    get inlineExpression() {
         if (this.primitiveIn.length > 0) {
             return code `${this.primitiveIn.map((value) => value.toString()).join(" | ")}`;
         }
         return code `boolean`;
     }
-    get schemaType() {
-        return code `${this.reusables.snippets.BooleanSchema}<${this.expression}>`;
-    }
     jsonSchema(_parameters) {
         if (this.primitiveIn.length === 1) {
             return code `${this.reusables.imports.z}.literal(${this.primitiveIn[0]})`;
         }
         return code `${this.reusables.imports.z}.boolean()`;
     }
-    literalExpression(literal) {
+    literalValueExpression(literal) {
         return code `${typeof literal === "boolean" ? literal : LiteralDecoder.decodeBooleanLiteral(literal).unsafeCoerce()}`;
     }
     toRdfResourceValuesExpression({ variables, }) {
         return code `[${this.reusables.snippets.literalFactory}.boolean(${variables.value}, ${this.rdfjsTermExpression(this.datatype)})]`;
     }
-    fromRdfResourceValuesExpressionChain({ variables, }) {
-        return {
-            ...super.fromRdfResourceValuesExpressionChain({ variables }),
-            languageIn: undefined,
-            preferredLanguages: undefined,
-            valueTo: code `chain(values => values.chainMap(value => value.toBoolean(${this.primitiveIn.length === 1 ? `[${this.primitiveIn[0]}] as const` : ""})))`,
-        };
-    }
 }
 __decorate([
     Memoize()
-], BooleanType.prototype, "expression", null);
+], BooleanType.prototype, "fromRdfResourceValuesFunction", null);
 __decorate([
     Memoize()
 ], BooleanType.prototype, "schemaType", null);
+__decorate([
+    Memoize()
+], BooleanType.prototype, "inlineExpression", null);
 //# sourceMappingURL=BooleanType.js.map

package/dist/generators/ts/DateTimeType.d.ts

@@ -5,9 +5,9 @@ export declare class DateTimeType extends AbstractDateType {
     readonly graphqlType: import("./AbstractType.js").AbstractType.GraphqlType;
     readonly hashFunction: Code;
     readonly kind = "DateTime";
+    get fromRdfResourceValuesFunction(): Code;
     jsonSchema(_parameters: Parameters<AbstractDateType["jsonSchema"]>[0]): Code;
-    literalExpression(literal: Date | Literal): Code;
+    literalValueExpression(literal: Date | Literal): Code;
     toJsonExpression({ variables, }: Parameters<AbstractDateType["toJsonExpression"]>[0]): Code;
-    protected fromRdfResourceValueExpression({ variables, }: Parameters<AbstractDateType["fromRdfResourceValueExpression"]>[0]): Code;
 }
 //# sourceMappingURL=DateTimeType.d.ts.map

package/dist/generators/ts/DateTimeType.js

@@ -1,21 +1,31 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 import { LiteralDecoder } from "@rdfx/literal";
+import { Memoize } from "typescript-memoize";
 import { AbstractDateType } from "./AbstractDateType.js";
 import { code } from "./ts-poet-wrapper.js";
 export class DateTimeType extends AbstractDateType {
     graphqlType = new DateTimeType.GraphqlType(code `${this.reusables.imports.GraphQLDateTime}`, this.reusables);
     hashFunction = code `${this.reusables.snippets.hashDateTime}`;
     kind = "DateTime";
+    get fromRdfResourceValuesFunction() {
+        return code `${this.reusables.snippets.dateTimeFromRdfResourceValues}`;
+    }
     jsonSchema(_parameters) {
         return code `${this.reusables.imports.z}.iso.datetime()`;
     }
-    literalExpression(literal) {
+    literalValueExpression(literal) {
         return code `new Date("${(literal instanceof Date ? literal : LiteralDecoder.decodeDateTimeLiteral(literal).unsafeCoerce()).toISOString()}")`;
     }
     toJsonExpression({ variables, }) {
         return code `${variables.value}.toISOString()`;
     }
-    fromRdfResourceValueExpression({ variables, }) {
-        return code `${variables.value}.toDateTime(${this.primitiveIn.length > 0 ? `[${this.primitiveIn.map((_) => `new Date(${_.getTime()})`).join(", ")}]` : ""})`;
-    }
 }
+__decorate([
+    Memoize()
+], DateTimeType.prototype, "fromRdfResourceValuesFunction", null);
 //# sourceMappingURL=DateTimeType.js.map

package/dist/generators/ts/DateType.d.ts

@@ -6,9 +6,9 @@ export declare class DateType extends AbstractDateType {
     readonly graphqlType: import("./AbstractType.js").AbstractType.GraphqlType;
     readonly hashFunction: Code;
     readonly kind = "Date";
+    get fromRdfResourceValuesFunction(): Code;
     jsonSchema(_parameters: Parameters<DateTimeType["jsonSchema"]>[0]): Code;
-    literalExpression(literal: Date | Literal): Code;
+    literalValueExpression(literal: Date | Literal): Code;
     toJsonExpression({ variables, }: Parameters<AbstractDateType["toJsonExpression"]>[0]): Code;
-    protected fromRdfResourceValueExpression({ variables, }: Parameters<AbstractDateType["fromRdfResourceValueExpression"]>[0]): Code;
 }
 //# sourceMappingURL=DateType.d.ts.map

package/dist/generators/ts/DateType.js

@@ -1,4 +1,11 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 import { LiteralDecoder } from "@rdfx/literal";
+import { Memoize } from "typescript-memoize";
 import { AbstractDateType } from "./AbstractDateType.js";
 import { DateTimeType } from "./DateTimeType.js";
 import { code } from "./ts-poet-wrapper.js";
@@ -6,17 +13,20 @@ export class DateType extends AbstractDateType {
     graphqlType = new DateTimeType.GraphqlType(code `${this.reusables.imports.GraphQLDate}`, this.reusables);
     hashFunction = code `${this.reusables.snippets.hashDate}`;
     kind = "Date";
+    get fromRdfResourceValuesFunction() {
+        return code `${this.reusables.snippets.dateFromRdfResourceValues}`;
+    }
     jsonSchema(_parameters) {
         return code `${this.reusables.imports.z}.iso.date()`;
     }
-    literalExpression(literal) {
+    literalValueExpression(literal) {
         return code `new Date("${(literal instanceof Date ? literal : LiteralDecoder.decodeDateLiteral(literal).unsafeCoerce()).toISOString()}")`;
     }
     toJsonExpression({ variables, }) {
         return code `${this.reusables.snippets.toIsoDateString}(${variables.value})`;
     }
-    fromRdfResourceValueExpression({ variables, }) {
-        return code `${variables.value}.toDate(${this.primitiveIn.length > 0 ? `[${this.primitiveIn.map((_) => `new Date(${_.getTime()})`).join(", ")}]` : ""})`;
-    }
 }
+__decorate([
+    Memoize()
+], DateType.prototype, "fromRdfResourceValuesFunction", null);
 //# sourceMappingURL=DateType.js.map

package/dist/generators/ts/DefaultValueType.d.ts

@@ -9,10 +9,15 @@ export declare class DefaultValueType<ItemTypeT extends DefaultValueType.ItemTyp
     readonly defaultValue: Literal | NamedNode;
     readonly discriminantProperty: Maybe<AbstractType.DiscriminantProperty>;
     readonly graphqlArgs: AbstractType["graphqlArgs"];
-    readonly kind = "DefaultValue";
     readonly jsTypes: readonly AbstractType.JsType[] | readonly [{
         readonly instanceof: "Object";
         readonly typeof: "object";
+    }] | readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
+    }] | readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
     }] | {
         readonly typeof: "bigint";
     }[] | readonly [{
@@ -25,9 +30,6 @@ export declare class DefaultValueType<ItemTypeT extends DefaultValueType.ItemTyp
         readonly typeof: "object";
     }] | readonly [{
         readonly typeof: "number";
-    }] | readonly [{
-        readonly instanceof: "Object";
-        readonly typeof: "object";
     }] | readonly [{
         readonly typeof: "number";
     }] | readonly [{
@@ -36,9 +38,6 @@ export declare class DefaultValueType<ItemTypeT extends DefaultValueType.ItemTyp
     }] | readonly [{
         readonly instanceof: "Object";
         readonly typeof: "object";
-    }] | readonly [{
-        readonly instanceof: "Object";
-        readonly typeof: "object";
     }] | readonly [{
         readonly typeof: "string";
     }] | readonly [{
@@ -48,6 +47,7 @@ export declare class DefaultValueType<ItemTypeT extends DefaultValueType.ItemTyp
         readonly instanceof: "Object";
         readonly typeof: "object";
     }];
+    readonly kind = "DefaultValue";
     readonly validationFunction: Maybe<Code>;
     constructor({ defaultValue, ...superParameters }: {
         defaultValue: Literal | NamedNode;
@@ -57,6 +57,7 @@ export declare class DefaultValueType<ItemTypeT extends DefaultValueType.ItemTyp
     get expression(): Code;
     get filterFunction(): Code;
     get filterType(): Code;
+    get fromRdfResourceValuesFunction(): Code;
     get graphqlType(): AbstractContainerType.GraphqlType;
     get hashFunction(): Code;
     get mutable(): boolean;
@@ -67,7 +68,6 @@ export declare class DefaultValueType<ItemTypeT extends DefaultValueType.ItemTyp
     protected get schemaInitializers(): Code[];
     private get defaultValueExpression();
     fromJsonExpression(parameters: Parameters<AbstractType["fromJsonExpression"]>[0]): Code;
-    fromRdfResourceValuesExpression({ variables, }: Parameters<AbstractContainerType<ItemTypeT>["fromRdfResourceValuesExpression"]>[0]): Code;
     graphqlResolveExpression(parameters: Parameters<AbstractContainerType<ItemTypeT>["graphqlResolveExpression"]>[0]): Code;
     jsonSchema(parameters: Parameters<AbstractContainerType<ItemTypeT>["jsonSchema"]>[0]): Code;
     jsonType(parameters?: Parameters<AbstractContainerType<ItemTypeT>["jsonType"]>[0]): AbstractType.JsonType;