@shaclmate/compiler 4.0.34 → 4.0.35

package/dist/generators/ts/OptionType.js

@@ -16,8 +16,8 @@ export class OptionType extends AbstractContainerType {
     kind = "OptionType";
     typeofs = ["object"];
     get conversionFunction() {
-        const itemConversionFunction = this.itemType.conversionFunction;
-        return {
+        const itemConversionFunction = this.itemType.conversionFunction.orDefault(this.itemConversionFunctionDefault);
+        return Maybe.of({
             code: code `${this.reusables.snippets.convertToMaybe}(${itemConversionFunction.code})`,
             sourceTypes: itemConversionFunction.sourceTypes.concat({
                 name: this.name,
@@ -26,7 +26,7 @@ export class OptionType extends AbstractContainerType {
                 name: code `undefined`,
                 typeof: "undefined",
             }),
-        };
+        });
     }
     get equalsFunction() {
         return code `((left, right) => ${this.reusables.snippets.maybeEquals}(left, right, ${this.itemType.equalsFunction}))`;
@@ -34,9 +34,6 @@ export class OptionType extends AbstractContainerType {
     get filterFunction() {
         return code `${this.reusables.snippets.filterMaybe}<${this.itemType.name}, ${this.itemType.filterType}>(${this.itemType.filterFunction})`;
     }
-    get hashFunction() {
-        return code `${this.reusables.snippets.hashMaybe}(${this.itemType.hashFunction})`;
-    }
     get filterType() {
         return code `${this.reusables.snippets.MaybeFilter}<${this.itemType.filterType}>`;
     }
@@ -46,6 +43,9 @@ export class OptionType extends AbstractContainerType {
             nullable: true,
         });
     }
+    get hashFunction() {
+        return code `${this.reusables.snippets.hashMaybe}(${this.itemType.hashFunction})`;
+    }
     get mutable() {
         return this.itemType.mutable;
     }
@@ -55,6 +55,9 @@ export class OptionType extends AbstractContainerType {
     get schemaType() {
         return code `${this.reusables.snippets.MaybeSchema}<${this.itemType.schemaType}>`;
     }
+    get validationFunction() {
+        return Maybe.of(code `${this.reusables.snippets.validateMaybe}(${this.itemType.validationFunction.orDefault(this.itemValidationFunctionDefault)})`);
+    }
     get valueSparqlConstructTriplesFunction() {
         return code `${this.reusables.snippets.maybeSparqlConstructTriples}<${this.itemType.filterType}, ${this.itemType.schemaType}>(${this.itemType.valueSparqlConstructTriplesFunction})`;
     }
@@ -69,13 +72,10 @@ export class OptionType extends AbstractContainerType {
     }
     fromJsonExpression({ variables, }) {
         const expression = code `${this.reusables.imports.Maybe}.fromNullable(${variables.value})`;
-        const valueVariable = code `item`;
         const itemFromJsonExpression = this.itemType.fromJsonExpression({
-            variables: { value: valueVariable },
+            variables: { value: code `item` },
         });
-        return codeEquals(itemFromJsonExpression, valueVariable)
-            ? expression
-            : code `${expression}.map(item => (${itemFromJsonExpression}))`;
+        return code `${expression}.map(item => (${itemFromJsonExpression}).map(${this.reusables.imports.Maybe}.of)).orDefault(${this.reusables.imports.Either}.of(${this.reusables.imports.Maybe}.empty()))`;
     }
     fromRdfResourceValuesExpression(parameters) {
         const { variables } = parameters;
@@ -84,6 +84,9 @@ export class OptionType extends AbstractContainerType {
     graphqlResolveExpression(parameters) {
         return code `${this.itemType.graphqlResolveExpression(parameters)}.extractNullable()`;
     }
+    jsonSchema(parameters) {
+        return code `${this.itemType.jsonSchema(parameters)}.optional()`;
+    }
     jsonType(parameters) {
         const itemTypeJsonType = this.itemType.jsonType(parameters);
         invariant(!itemTypeJsonType.optional);
@@ -94,9 +97,6 @@ export class OptionType extends AbstractContainerType {
     jsonUiSchemaElement(parameters) {
         return this.itemType.jsonUiSchemaElement(parameters);
     }
-    jsonSchema(parameters) {
-        return code `${this.itemType.jsonSchema(parameters)}.optional()`;
-    }
     toJsonExpression({ variables, }) {
         return code `${variables.value}.map(item => (${this.itemType.toJsonExpression({ variables: { value: code `item` } })})).extract()`;
     }
@@ -123,21 +123,24 @@ __decorate([
 __decorate([
     Memoize()
 ], OptionType.prototype, "filterFunction", null);
-__decorate([
-    Memoize()
-], OptionType.prototype, "hashFunction", null);
 __decorate([
     Memoize()
 ], OptionType.prototype, "filterType", null);
 __decorate([
     Memoize()
 ], OptionType.prototype, "graphqlType", null);
+__decorate([
+    Memoize()
+], OptionType.prototype, "hashFunction", null);
 __decorate([
     Memoize()
 ], OptionType.prototype, "name", null);
 __decorate([
     Memoize()
 ], OptionType.prototype, "schemaType", null);
+__decorate([
+    Memoize()
+], OptionType.prototype, "validationFunction", null);
 __decorate([
     Memoize()
 ], OptionType.prototype, "valueSparqlConstructTriplesFunction", null);

package/dist/generators/ts/Snippets.d.ts

@@ -18,6 +18,7 @@ export declare class Snippets {
     get BooleanSchema(): Snippet;
     get CollectionFilter(): Snippet;
     get CollectionSchema(): Snippet;
+    get ConversionFunction(): Snippet;
     get DateFilter(): Snippet;
     get DateSchema(): Snippet;
     get DefaultValueSchema(): Snippet;
@@ -55,6 +56,7 @@ export declare class Snippets {
     get ToRdfResourceFunction(): Snippet;
     get ToRdfResourceValuesFunction(): Snippet;
     get UnwrapR(): Snippet;
+    get ValidationFunction(): Snippet;
     get ValueSparqlConstructTriplesFunction(): Snippet;
     get ValueSparqlWherePatternsFunction(): Snippet;
     get _FromRdfResourceFunction(): Snippet;
@@ -67,12 +69,9 @@ export declare class Snippets {
     get booleanEquals(): Snippet;
     get booleanSparqlWherePatterns(): Snippet;
     get compactRecord(): Snippet;
-    get convertToBigDecimal(): Snippet;
+    get convertToArray(): Snippet;
     get convertToBlankNode(): Snippet;
     get convertToBlankNodeIdentifierProperty(): Snippet;
-    get convertToBoolean(): Snippet;
-    get convertToDate(): Snippet;
-    get convertToDateTime(): Snippet;
     get convertToIdentifier(): Snippet;
     get convertToIdentifierProperty(): Snippet;
     get convertToIri(): Snippet;
@@ -82,13 +81,6 @@ export declare class Snippets {
     get convertToLazyObjectSet(): Snippet;
     get convertToLiteral(): Snippet;
     get convertToMaybe(): Snippet;
-    get convertToMutableArray(): Snippet;
-    get convertToNumeric(): Snippet;
-    get convertToObject(): Snippet;
-    get convertToReadonlyArray(): Snippet;
-    get convertToString(): Snippet;
-    get convertToTerm(): Snippet;
-    get convertToUnion(): Snippet;
     get convertWithDefaultValue(): Snippet;
     get dateEquals(): Snippet;
     get dateSparqlWherePatterns(): Snippet;
@@ -119,6 +111,8 @@ export declare class Snippets {
     get hashString(): Snippet;
     get hashTerm(): Snippet;
     get identifierSparqlWherePatterns(): Snippet;
+    get identityConversionFunction(): Snippet;
+    get identityValidationFunction(): Snippet;
     get ifUsed(): Code[];
     get iriSparqlWherePatterns(): Snippet;
     get liftSparqlPatterns(): Snippet;
@@ -151,6 +145,8 @@ export declare class Snippets {
     get termSchemaSparqlPatterns(): Snippet;
     get termSparqlWherePatterns(): Snippet;
     get toIsoDateString(): Snippet;
+    get validateArray(): Snippet;
+    get validateMaybe(): Snippet;
     get wrap_FromRdfResourceFunction(): Snippet;
     get wrap_ToRdfResourceFunction(): Snippet;
     protected get snippets(): Snippets;

package/dist/generators/ts/Snippets.js

@@ -21,13 +21,11 @@ import { snippets_booleanEquals } from "./_snippets/snippets_booleanEquals.js";
 import { snippets_booleanSparqlWherePatterns } from "./_snippets/snippets_booleanSparqlWherePatterns.js";
 import { snippets_CollectionFilter } from "./_snippets/snippets_CollectionFilter.js";
 import { snippets_CollectionSchema } from "./_snippets/snippets_CollectionSchema.js";
+import { snippets_ConversionFunction } from "./_snippets/snippets_ConversionFunction.js";
 import { snippets_compactRecord } from "./_snippets/snippets_compactRecord.js";
-import { snippets_convertToBigDecimal } from "./_snippets/snippets_convertToBigDecimal.js";
+import { snippets_convertToArray } from "./_snippets/snippets_convertToArray.js";
 import { snippets_convertToBlankNode } from "./_snippets/snippets_convertToBlankNode.js";
 import { snippets_convertToBlankNodeIdentifierProperty } from "./_snippets/snippets_convertToBlankNodeIdentifierProperty.js";
-import { snippets_convertToBoolean } from "./_snippets/snippets_convertToBoolean.js";
-import { snippets_convertToDate } from "./_snippets/snippets_convertToDate.js";
-import { snippets_convertToDateTime } from "./_snippets/snippets_convertToDateTime.js";
 import { snippets_convertToIdentifier } from "./_snippets/snippets_convertToIdentifier.js";
 import { snippets_convertToIdentifierProperty } from "./_snippets/snippets_convertToIdentifierProperty.js";
 import { snippets_convertToIri } from "./_snippets/snippets_convertToIri.js";
@@ -37,13 +35,6 @@ import { snippets_convertToLazyObjectOption } from "./_snippets/snippets_convert
 import { snippets_convertToLazyObjectSet } from "./_snippets/snippets_convertToLazyObjectSet.js";
 import { snippets_convertToLiteral } from "./_snippets/snippets_convertToLiteral.js";
 import { snippets_convertToMaybe } from "./_snippets/snippets_convertToMaybe.js";
-import { snippets_convertToMutableArray } from "./_snippets/snippets_convertToMutableArray.js";
-import { snippets_convertToNumeric } from "./_snippets/snippets_convertToNumeric.js";
-import { snippets_convertToObject } from "./_snippets/snippets_convertToObject.js";
-import { snippets_convertToReadonlyArray } from "./_snippets/snippets_convertToReadonlyArray.js";
-import { snippets_convertToString } from "./_snippets/snippets_convertToString.js";
-import { snippets_convertToTerm } from "./_snippets/snippets_convertToTerm.js";
-import { snippets_convertToUnion } from "./_snippets/snippets_convertToUnion.js";
 import { snippets_convertWithDefaultValue } from "./_snippets/snippets_convertWithDefaultValue.js";
 import { snippets_DateFilter } from "./_snippets/snippets_DateFilter.js";
 import { snippets_DateSchema } from "./_snippets/snippets_DateSchema.js";
@@ -89,6 +80,8 @@ import { snippets_IdentifierSet } from "./_snippets/snippets_IdentifierSet.js";
 import { snippets_IriFilter } from "./_snippets/snippets_IriFilter.js";
 import { snippets_IriSchema } from "./_snippets/snippets_IriSchema.js";
 import { snippets_identifierSparqlWherePatterns } from "./_snippets/snippets_identifierSparqlWherePatterns.js";
+import { snippets_identityConversionFunction } from "./_snippets/snippets_identityConversionFunction.js";
+import { snippets_identityValidationFunction } from "./_snippets/snippets_identityValidationFunction.js";
 import { snippets_iriSparqlWherePatterns } from "./_snippets/snippets_iriSparqlWherePatterns.js";
 import { snippets_LazyObject } from "./_snippets/snippets_LazyObject.js";
 import { snippets_LazyObjectOption } from "./_snippets/snippets_LazyObjectOption.js";
@@ -142,8 +135,11 @@ import { snippets_termSchemaSparqlPatterns } from "./_snippets/snippets_termSche
 import { snippets_termSparqlWherePatterns } from "./_snippets/snippets_termSparqlWherePatterns.js";
 import { snippets_toIsoDateString } from "./_snippets/snippets_toIsoDateString.js";
 import { snippets_UnwrapR } from "./_snippets/snippets_UnwrapR.js";
+import { snippets_ValidationFunction } from "./_snippets/snippets_ValidationFunction.js";
 import { snippets_ValueSparqlConstructTriplesFunction } from "./_snippets/snippets_ValueSparqlConstructTriplesFunction.js";
 import { snippets_ValueSparqlWherePatternsFunction } from "./_snippets/snippets_ValueSparqlWherePatternsFunction.js";
+import { snippets_validateArray } from "./_snippets/snippets_validateArray.js";
+import { snippets_validateMaybe } from "./_snippets/snippets_validateMaybe.js";
 import { snippets_wrap_FromRdfResourceFunction } from "./_snippets/snippets_wrap_FromRdfResourceFunction.js";
 import { snippets_wrap_ToRdfResourceFunction } from "./_snippets/snippets_wrap_ToRdfResourceFunction.js";
 import { rdfjsTermExpression } from "./rdfjsTermExpression.js";
@@ -175,6 +171,9 @@ export class Snippets {
     get CollectionSchema() {
         return this.snippet(snippets_CollectionSchema);
     }
+    get ConversionFunction() {
+        return this.snippet(snippets_ConversionFunction);
+    }
     get DateFilter() {
         return this.snippet(snippets_DateFilter);
     }
@@ -286,6 +285,9 @@ export class Snippets {
     get UnwrapR() {
         return this.snippet(snippets_UnwrapR);
     }
+    get ValidationFunction() {
+        return this.snippet(snippets_ValidationFunction);
+    }
     get ValueSparqlConstructTriplesFunction() {
         return this.snippet(snippets_ValueSparqlConstructTriplesFunction);
     }
@@ -322,8 +324,8 @@ export class Snippets {
     get compactRecord() {
         return this.snippet(snippets_compactRecord);
     }
-    get convertToBigDecimal() {
-        return this.snippet(snippets_convertToBigDecimal);
+    get convertToArray() {
+        return this.snippet(snippets_convertToArray);
     }
     get convertToBlankNode() {
         return this.snippet(snippets_convertToBlankNode);
@@ -331,15 +333,6 @@ export class Snippets {
     get convertToBlankNodeIdentifierProperty() {
         return this.snippet(snippets_convertToBlankNodeIdentifierProperty);
     }
-    get convertToBoolean() {
-        return this.snippet(snippets_convertToBoolean);
-    }
-    get convertToDate() {
-        return this.snippet(snippets_convertToDate);
-    }
-    get convertToDateTime() {
-        return this.snippet(snippets_convertToDateTime);
-    }
     get convertToIdentifier() {
         return this.snippet(snippets_convertToIdentifier);
     }
@@ -367,27 +360,6 @@ export class Snippets {
     get convertToMaybe() {
         return this.snippet(snippets_convertToMaybe);
     }
-    get convertToMutableArray() {
-        return this.snippet(snippets_convertToMutableArray);
-    }
-    get convertToNumeric() {
-        return this.snippet(snippets_convertToNumeric);
-    }
-    get convertToObject() {
-        return this.snippet(snippets_convertToObject);
-    }
-    get convertToReadonlyArray() {
-        return this.snippet(snippets_convertToReadonlyArray);
-    }
-    get convertToString() {
-        return this.snippet(snippets_convertToString);
-    }
-    get convertToTerm() {
-        return this.snippet(snippets_convertToTerm);
-    }
-    get convertToUnion() {
-        return this.snippet(snippets_convertToUnion);
-    }
     get convertWithDefaultValue() {
         return this.snippet(snippets_convertWithDefaultValue);
     }
@@ -478,6 +450,12 @@ export class Snippets {
     get identifierSparqlWherePatterns() {
         return this.snippet(snippets_identifierSparqlWherePatterns);
     }
+    get identityConversionFunction() {
+        return this.snippet(snippets_identityConversionFunction);
+    }
+    get identityValidationFunction() {
+        return this.snippet(snippets_identityValidationFunction);
+    }
     get ifUsed() {
         return Object.entries(Object.getOwnPropertyDescriptors(Object.getPrototypeOf(this)))
             .flatMap(([key, descriptor]) => {
@@ -590,6 +568,12 @@ export class Snippets {
     get toIsoDateString() {
         return this.snippet(snippets_toIsoDateString);
     }
+    get validateArray() {
+        return this.snippet(snippets_validateArray);
+    }
+    get validateMaybe() {
+        return this.snippet(snippets_validateMaybe);
+    }
     get wrap_FromRdfResourceFunction() {
         return this.snippet(snippets_wrap_FromRdfResourceFunction);
     }
@@ -632,6 +616,9 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "CollectionSchema", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "ConversionFunction", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "DateFilter", null);
@@ -743,6 +730,9 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "UnwrapR", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "ValidationFunction", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "ValueSparqlConstructTriplesFunction", null);
@@ -781,22 +771,13 @@ __decorate([
 ], Snippets.prototype, "compactRecord", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "convertToBigDecimal", null);
+], Snippets.prototype, "convertToArray", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "convertToBlankNode", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "convertToBlankNodeIdentifierProperty", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToBoolean", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToDate", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToDateTime", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "convertToIdentifier", null);
@@ -824,27 +805,6 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "convertToMaybe", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToMutableArray", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToNumeric", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToObject", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToReadonlyArray", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToString", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToTerm", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "convertToUnion", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "convertWithDefaultValue", null);
@@ -935,6 +895,12 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "identifierSparqlWherePatterns", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "identityConversionFunction", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "identityValidationFunction", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "iriSparqlWherePatterns", null);
@@ -1028,6 +994,12 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "toIsoDateString", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "validateArray", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "validateMaybe", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "wrap_FromRdfResourceFunction", null);

package/dist/generators/ts/StringType.d.ts

@@ -10,11 +10,10 @@ export declare class StringType extends AbstractPrimitiveType<string> {
     readonly schemaType: Code;
     readonly typeofs: "string"[];
     readonly valueSparqlWherePatternsFunction: Code;
-    get conversionFunction(): AbstractPrimitiveType.ConversionFunction;
     get name(): string;
     jsonSchema(_parameters: Parameters<AbstractPrimitiveType<string>["jsonSchema"]>[0]): Code;
     literalExpression(literal: Literal | string): Code;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractPrimitiveType<string>["toRdfResourceValuesExpression"]>[0]): Code;
-    protected fromRdfExpressionChain({ variables, }: Parameters<AbstractPrimitiveType<string>["fromRdfExpressionChain"]>[0]): ReturnType<AbstractPrimitiveType<string>["fromRdfExpressionChain"]>;
+    protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<AbstractPrimitiveType<string>["fromRdfResourceValuesExpressionChain"]>[0]): ReturnType<AbstractPrimitiveType<string>["fromRdfResourceValuesExpressionChain"]>;
 }
 //# sourceMappingURL=StringType.d.ts.map

package/dist/generators/ts/StringType.js

@@ -17,17 +17,6 @@ export class StringType extends AbstractPrimitiveType {
     schemaType = code `${this.reusables.snippets.StringSchema}`;
     typeofs = ["string"];
     valueSparqlWherePatternsFunction = code `${this.reusables.snippets.stringSparqlWherePatterns}`;
-    get conversionFunction() {
-        return {
-            code: code `${this.reusables.snippets.convertToString}<${this.name}>`,
-            sourceTypes: [
-                {
-                    name: this.name,
-                    typeof: "string",
-                },
-            ],
-        };
-    }
     get name() {
         if (this.primitiveIn.length > 0) {
             return `${this.primitiveIn.map((value) => `"${value}"`).join(" | ")}`;
@@ -50,16 +39,13 @@ export class StringType extends AbstractPrimitiveType {
     toRdfResourceValuesExpression({ variables, }) {
         return code `[${this.reusables.snippets.literalFactory}.string(${variables.value}${!this.datatype.equals(xsd.string) ? `, ${this.rdfjsTermExpression(this.datatype)}` : ""})]`;
     }
-    fromRdfExpressionChain({ variables, }) {
+    fromRdfResourceValuesExpressionChain({ variables, }) {
         return {
-            ...super.fromRdfExpressionChain({ variables }),
+            ...super.fromRdfResourceValuesExpressionChain({ variables }),
             valueTo: code `chain(values => values.chainMap(value => value.toString(${this.primitiveIn.length > 0 ? `${JSON.stringify(this.primitiveIn)} as const` : ""})))`,
         };
     }
 }
-__decorate([
-    Memoize()
-], StringType.prototype, "conversionFunction", null);
 __decorate([
     Memoize()
 ], StringType.prototype, "name", null);

package/dist/generators/ts/TermType.d.ts

@@ -1,8 +1,10 @@
 import type { BlankNode, Literal, NamedNode } from "@rdfjs/types";
 import { NodeKind } from "@shaclmate/shacl-ast";
+import { Maybe } from "purify-ts";
 import { AbstractTermType } from "./AbstractTermType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class TermType<ConstantTermT extends Literal | NamedNode = Literal | NamedNode, RuntimeTermT extends BlankNode | Literal | NamedNode = BlankNode | Literal | NamedNode> extends AbstractTermType {
+    readonly conversionFunction: Maybe<AbstractTermType.ConversionFunction>;
     readonly filterFunction: Code;
     readonly filterType: Code;
     readonly kind = "TermType";
@@ -12,7 +14,6 @@ export declare class TermType<ConstantTermT extends Literal | NamedNode = Litera
     constructor({ nodeKinds, ...superParameters }: ConstructorParameters<typeof AbstractTermType<ConstantTermT, RuntimeTermT>>[0] & {
         nodeKinds: ReadonlySet<NodeKind>;
     });
-    get conversionFunction(): AbstractTermType.ConversionFunction;
     get graphqlType(): AbstractTermType.GraphqlType;
     get name(): Code;
     fromJsonExpression({ variables, }: Parameters<AbstractTermType["fromJsonExpression"]>[0]): Code;

package/dist/generators/ts/TermType.js

@@ -6,11 +6,13 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { NodeKind } from "@shaclmate/shacl-ast";
 import { xsd } from "@tpluscode/rdf-ns-builders";
+import { Maybe } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
 import { AbstractTermType } from "./AbstractTermType.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
 export class TermType extends AbstractTermType {
+    conversionFunction = Maybe.empty();
     filterFunction = code `${this.reusables.snippets.filterTerm}`;
     filterType = code `${this.reusables.snippets.TermFilter}`;
     kind = "TermType";
@@ -23,17 +25,6 @@ export class TermType extends AbstractTermType {
         invariant(this.nodeKinds.has("Literal") &&
             (this.nodeKinds.has("BlankNode") || this.nodeKinds.has("IRI")), "should be IdentifierType or LiteralType");
     }
-    get conversionFunction() {
-        return {
-            code: code `${this.reusables.snippets.convertToTerm}<${this.name}>`,
-            sourceTypes: [
-                {
-                    name: this.name,
-                    typeof: "object",
-                },
-            ],
-        };
-    }
     get graphqlType() {
         throw new Error("not implemented");
     }
@@ -55,7 +46,9 @@ export class TermType extends AbstractTermType {
             .map((import_) => code `${import_}`), { on: " | " })})`;
     }
     fromJsonExpression({ variables, }) {
-        return [...this.nodeKinds].reduce((expression, nodeKind) => {
+        return code `${this.reusables.imports.Either}.of<Error, ${this.name}>(${[
+            ...this.nodeKinds,
+        ].reduce((expression, nodeKind) => {
             let valueToNodeKind;
             switch (nodeKind) {
                 case "BlankNode":
@@ -73,7 +66,7 @@ export class TermType extends AbstractTermType {
             return expression == null
                 ? valueToNodeKind
                 : code `((${variables.value}.termType === "${NodeKind.toTermType(nodeKind)}") ? (${valueToNodeKind}) : (${expression}))`;
-        }, null);
+        }, null)})`;
     }
     graphqlResolveExpression(_parameters) {
         throw new Error("not implemented");
@@ -119,9 +112,6 @@ export class TermType extends AbstractTermType {
         }, null);
     }
 }
-__decorate([
-    Memoize()
-], TermType.prototype, "conversionFunction", null);
 __decorate([
     Memoize()
 ], TermType.prototype, "name", null);

package/dist/generators/ts/_NamedObjectType/IdentifierProperty.js

@@ -23,7 +23,8 @@ export class IdentifierProperty extends AbstractProperty {
     get constructorParameter() {
         let hasQuestionToken = false;
         const typeNames = [code `(() => ${this.typeAlias})`];
-        for (const type of this.type.conversionFunction.sourceTypes) {
+        for (const type of this.type.conversionFunction.unsafeCoerce()
+            .sourceTypes) {
             if (type.typeof === "undefined") {
                 hasQuestionToken = true;
             }

package/dist/generators/ts/_NamedObjectType/NamedObjectType_fromJsonFunctionDeclaration.js

@@ -4,19 +4,40 @@ export function NamedObjectType_fromJsonFunctionDeclaration() {
     if (!this.configuration.features.has("json")) {
         return Maybe.empty();
     }
-    let initializers = [];
-    const statements = [];
     const variables = {
         jsonObject: code `${this.configuration.syntheticNamePrefix}json`,
     };
-    this.parentObjectTypes.forEach((parentObjectType) => {
-        initializers.push(code `...${parentObjectType.name}.fromJson(${variables.jsonObject})`);
+    const chains = [];
+    this.parentObjectTypes.forEach((parentObjectType, parentObjectTypeI) => {
+        chains.push({
+            expression: code `${parentObjectType.name}.fromJson(${variables.jsonObject})`,
+            variable: `super${parentObjectTypeI}`,
+        });
     });
-    initializers = initializers.concat(this.properties.flatMap((property) => property.fromJsonInitializer({ variables }).toList()));
-    statements.push(code `return createUnsafe({ ${joinCode(initializers, { on: ", " })} });`);
+    const propertyInitializers = this.properties.flatMap((property) => property.fromJsonInitializer({ variables }).toList());
+    if (propertyInitializers.length > 0) {
+        chains.push({
+            expression: code `${this.reusables.snippets.sequenceRecord}({ ${joinCode(propertyInitializers, { on: "," })} })`,
+            variable: "properties",
+        });
+    }
+    let returnExpression;
+    switch (chains.length) {
+        case 0:
+            returnExpression = code `create({})`;
+            break;
+        case 1:
+            returnExpression = code `(${chains[0].expression}).chain(create)`;
+            break;
+        default:
+            returnExpression = code `${chains
+                .reverse()
+                .reduce((acc, { expression, variable }) => code `(${expression}).chain(${variable} => ${acc})`, code `(create({ ${chains.map((chain) => `...${chain.variable}`).join(", ")} }))`)}`;
+            break;
+    }
     return Maybe.of(code `\
-export function fromJson(${variables.jsonObject}: ${this.jsonType().name}): ${this.name} {
-${joinCode(statements, { on: "\n" })}
+export function fromJson(${variables.jsonObject}: ${this.jsonType().name}): ${this.reusables.imports.Either}<Error, ${this.name}> {
+  return ${returnExpression};
 }`);
 }
 //# sourceMappingURL=NamedObjectType_fromJsonFunctionDeclaration.js.map

package/dist/generators/ts/_NamedObjectType/NamedObjectType_fromRdfResourceFunctionDeclaration.js

@@ -84,19 +84,19 @@ export function NamedObjectType_fromRdfResourceFunctionDeclaration() {
             partialsJoined = code `{ ${partials.map((partial) => `...${partial}`).join(", ")} }`;
             break;
     }
-    const statements = [];
+    let returnExpression;
     const resultExpression = code `create(${partialsJoined})`;
     if (chains.length === 0) {
-        statements.push(code `return ${this.reusables.imports.Right}(${resultExpression});`);
+        returnExpression = code `${this.reusables.imports.Right}(${resultExpression})`;
     }
     else {
-        statements.push(code `return ${chains
+        returnExpression = code `${chains
             .reverse()
-            .reduce((acc, { expression, variable }) => code `(${expression}).chain(${variable} => ${acc})`, code `(${resultExpression})`)}`);
+            .reduce((acc, { expression, variable }) => code `(${expression}).chain(${variable} => ${acc})`, code `(${resultExpression})`)}`;
     }
     return Maybe.of(code `\
 export const _fromRdfResource: ${this.reusables.snippets._FromRdfResourceFunction}<${this.name}> = (${variables.resource}, ${optionsVariable}) => {
-${joinCode(statements)}
+  return ${returnExpression};
 }
 
 export const fromRdfResource = ${this.reusables.snippets.wrap_FromRdfResourceFunction}(_fromRdfResource);`);