@shaclmate/compiler 4.0.96 → 4.0.98

package/dist/generators/ts/AbstractLazyType.js

@@ -37,13 +37,13 @@ export class AbstractLazyType extends AbstractType {
     get fromJsonObjectFunction() {
         return new InlineCallable(code `(jsonObject, fromJsonObjectOptions) => ${this.partialType.fromJsonObjectFunction.annotatedUsage}(jsonObject, { ...fromJsonObjectOptions, schema: fromJsonObjectOptions.schema.partialType })
         .map(${this.runtimeClass.partialPropertyName} => new ${this.runtimeClass.name}({ ${this.runtimeClass.partialPropertyName}, resolver: ${this.resolverFunctionExpression({ variables: { factoryFunctionOptions: code `fromJsonObjectOptions` } })} }))`, {
-            type: code `${this.reusables.snippets.FromJsonObjectFunction}<${this.jsonObjectType.expression}, ${this.expression}, ${this.schema}>`,
+            type: code `${this.reusables.snippets.FromJsonFunction}<${this.jsonObjectType.expression}, ${this.expression}, ${this.schema}>`,
         });
     }
     get fromJsonValueFunction() {
         return new InlineCallable(code `(jsonValue, fromJsonValueOptions) => ${this.partialType.fromJsonValueFunction.annotatedUsage}(jsonValue, { ...fromJsonValueOptions, schema: fromJsonValueOptions.schema.partialType })
         .map(${this.runtimeClass.partialPropertyName} => new ${this.runtimeClass.name}({ ${this.runtimeClass.partialPropertyName}, resolver: ${this.resolverFunctionExpression({ variables: { factoryFunctionOptions: code `fromJsonValueOptions` } })} }))`, {
-            type: code `${this.reusables.snippets.FromJsonValueFunction}<${this.jsonValueType.expression}, ${this.expression}, ${this.schema}>`,
+            type: code `${this.reusables.snippets.FromJsonFunction}<${this.jsonValueType.expression}, ${this.expression}, ${this.schema}>`,
         });
     }
     get fromRdfResourceValuesFunction() {
@@ -92,12 +92,12 @@ export class AbstractLazyType extends AbstractType {
     }
     get toJsonObjectFunction() {
         return new InlineCallable(code `(value) => ${this.partialType.toJsonObjectFunction.unannotatedUsage}(value.${this.runtimeClass.partialPropertyName})`, {
-            type: code `${this.reusables.snippets.ToJsonObjectFunction}<${this.expression}, ${this.jsonValueType.expression}>`,
+            type: code `${this.reusables.snippets.ToJsonFunction}<${this.expression}, ${this.jsonValueType.expression}>`,
         });
     }
     get toJsonValueFunction() {
         return new InlineCallable(code `(value) => ${this.partialType.toJsonValueFunction.unannotatedUsage}(value.${this.runtimeClass.partialPropertyName})`, {
-            type: code `${this.reusables.snippets.ToJsonValueFunction}<${this.expression}, ${this.jsonValueType.expression}>`,
+            type: code `${this.reusables.snippets.ToJsonFunction}<${this.expression}, ${this.jsonValueType.expression}>`,
         });
     }
     get toRdfResourceValueTypes() {

package/dist/generators/ts/AbstractStructuredType.js

@@ -151,7 +151,7 @@ export class AbstractStructuredType extends AbstractType {
         return code `${this.reusables.snippets.FilterFunction}<${this.filterType}, ${this.expression}>`;
     }
     fromJsonObjectFunctionType() {
-        return code `${this.reusables.snippets.FromJsonObjectFunction}<${this.jsonObjectType.expression}, ${this.expression}, undefined>`;
+        return code `${this.reusables.snippets.FromJsonFunction}<${this.jsonObjectType.expression}, ${this.expression}, undefined>`;
     }
     fromRdfResourceValuesFunctionType() {
         return code `${this.reusables.snippets.FromRdfResourceValuesFunction}<${this.expression}, ${this.schemaType}>`;
@@ -210,7 +210,7 @@ export class AbstractStructuredType extends AbstractType {
         return staticModuleDeclarations;
     }
     toJsonObjectFunctionType() {
-        return code `${this.reusables.snippets.ToJsonObjectFunction}<${this.expression}, ${this.jsonObjectType.expression}>`;
+        return code `${this.reusables.snippets.ToJsonFunction}<${this.expression}, ${this.jsonObjectType.expression}>`;
     }
     toLoggableFunctionType() {
         return code `${this.reusables.snippets.ToLoggableFunction}<${this.expression}>`;

package/dist/generators/ts/Imports.d.ts

@@ -36,6 +36,7 @@ export declare class Imports {
     readonly NTriplesTerm: import("ts-poet/build/Import.js").Import;
     readonly Quad: import("ts-poet/build/Import.js").Import;
     readonly Quad_Graph: import("ts-poet/build/Import.js").Import;
+    readonly PrefixMap: import("ts-poet/build/Import.js").Import;
     readonly RdfxResourcePropertyPath: import("ts-poet/build/Import.js").Import;
     readonly Resource: import("ts-poet/build/Import.js").Import;
     readonly ResourceSet: import("ts-poet/build/Import.js").Import;

package/dist/generators/ts/Imports.js

@@ -37,6 +37,7 @@ export class Imports {
     NTriplesTerm = imp("NTriplesTerm@@rdfx/string");
     Quad = imp("t:Quad@@rdfjs/types");
     Quad_Graph = imp("t:Quad_Graph@@rdfjs/types");
+    PrefixMap = imp("t:PrefixMap@@rdfx/collection");
     RdfxResourcePropertyPath = imp("PropertyPath:RdfxResourcePropertyPath@@rdfx/resource");
     Resource = imp("Resource@@rdfx/resource");
     ResourceSet = imp("ResourceSet@@rdfx/resource");

package/dist/generators/ts/IriType.js

@@ -19,10 +19,20 @@ export class IriType extends AbstractIdentifierType {
     schemaType = code `${this.reusables.snippets.IriSchema}<${this.valueTypeExpression}>`;
     valueSparqlWherePatternsFunction = new ReferenceCallable(this.reusables.snippets.iriSparqlWherePatterns);
     get fromJsonValueFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.iriFromJsonString}<${this.valueTypeExpression}>`);
+        if (this.in_.length > 0) {
+            return new ReferenceCallable(code `${this.reusables.snippets.iriLiteralFromJsonString}<${this.valueTypeExpression}>`);
+        }
+        else {
+            return new ReferenceCallable(this.reusables.snippets.iriFromJsonString);
+        }
     }
     get fromJsonObjectFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.iriFromJsonObject}<${this.valueTypeExpression}>`);
+        if (this.in_.length > 0) {
+            return new ReferenceCallable(code `${this.reusables.snippets.iriLiteralFromJsonObject}<${this.valueTypeExpression}>`);
+        }
+        else {
+            return new ReferenceCallable(this.reusables.snippets.iriFromJsonObject);
+        }
     }
     get toJsonValueFunction() {
         return new ReferenceCallable(code `${this.reusables.snippets.iriToJsonString}<${this.valueTypeExpression}>`);
@@ -53,7 +63,7 @@ export class IriType extends AbstractIdentifierType {
         invariant(this.jsTypes.length === 1);
         return Maybe.of({
             code: this.in_.length > 0
-                ? code `${this.reusables.snippets.convertToInIri}<${this.valueTypeExpression}>`
+                ? code `${this.reusables.snippets.convertToIriLiteral}<${this.valueTypeExpression}>`
                 : code `${this.reusables.snippets.convertToIri}`,
             sourceTypes: [
                 {

package/dist/generators/ts/ObjectDiscriminatedUnionType.d.ts

@@ -1,22 +1,22 @@
 import type { Maybe } from "purify-ts";
-import { ObjectDiscriminatedUnionType_schemaExpression } from "./_ObjectDiscriminatedUnionType/ObjectDiscriminatedUnionType_schemaExpression.js";
 import { AbstractDiscriminatedUnionType } from "./AbstractDiscriminatedUnionType.js";
 import type { BlankNodeType } from "./BlankNodeType.js";
 import type { Callable } from "./Callable.js";
 import type { IdentifierType } from "./IdentifierType.js";
 import type { IriType } from "./IriType.js";
+import type { ObjectIntersectionType } from "./ObjectIntersectionType.js";
 import type { ObjectType } from "./ObjectType.js";
 import { type Code } from "./ts-poet-wrapper.js";
-export declare class ObjectDiscriminatedUnionType extends AbstractDiscriminatedUnionType<ObjectType> {
-    protected schemaExpression: typeof ObjectDiscriminatedUnionType_schemaExpression;
+export declare class ObjectDiscriminatedUnionType extends AbstractDiscriminatedUnionType<ObjectDiscriminatedUnionType.MemberType> {
     readonly identifierType: BlankNodeType | IdentifierType | IriType;
     readonly kind = "ObjectDiscriminatedUnion";
     constructor({ identifierType, ...superParameters }: {
         identifierType: BlankNodeType | IdentifierType | IriType;
-    } & ConstructorParameters<typeof AbstractDiscriminatedUnionType<ObjectType>>[0]);
+    } & ConstructorParameters<typeof AbstractDiscriminatedUnionType<ObjectDiscriminatedUnionType.MemberType>>[0]);
     get focusSparqlConstructTriplesFunction(): Callable;
     get focusSparqlWherePatternsFunction(): Callable;
     get fromRdfResourceFunction(): Callable;
+    get fromRdfTypeVariables(): readonly Code[];
     get identifierTypeAlias(): Code;
     get objectSetMethodNames(): ObjectType.ObjectSetMethodNames;
     get sparqlConstructQueryFunction(): Callable;
@@ -26,4 +26,7 @@ export declare class ObjectDiscriminatedUnionType extends AbstractDiscriminatedU
     protected get inlineExpression(): Code;
     protected staticModuleDeclarations(name: string): Record<string, Code>;
 }
+export declare namespace ObjectDiscriminatedUnionType {
+    type MemberType = ObjectDiscriminatedUnionType | ObjectIntersectionType | ObjectType;
+}
 //# sourceMappingURL=ObjectDiscriminatedUnionType.d.ts.map

package/dist/generators/ts/ObjectDiscriminatedUnionType.js

@@ -10,7 +10,6 @@ import { ObjectDiscriminatedUnionType_focusSparqlConstructTriplesFunction } from
 import { ObjectDiscriminatedUnionType_focusSparqlWherePatternsFunction } from "./_ObjectDiscriminatedUnionType/ObjectDiscriminatedUnionType_focusSparqlWherePatternsFunction.js";
 import { ObjectDiscriminatedUnionType_fromRdfResourceFunction } from "./_ObjectDiscriminatedUnionType/ObjectDiscriminatedUnionType_fromRdfResourceFunction.js";
 import { ObjectDiscriminatedUnionType_graphqlTypeExpression } from "./_ObjectDiscriminatedUnionType/ObjectDiscriminatedUnionType_graphqlTypeExpression.js";
-import { ObjectDiscriminatedUnionType_schemaExpression } from "./_ObjectDiscriminatedUnionType/ObjectDiscriminatedUnionType_schemaExpression.js";
 import { ObjectDiscriminatedUnionType_toRdfResourceFunction } from "./_ObjectDiscriminatedUnionType/ObjectDiscriminatedUnionType_toRdfResourceFunction.js";
 import { ObjectDiscriminatedUnionType_typeGuardFunction } from "./_ObjectDiscriminatedUnionType/ObjectDiscriminatedUnionType_typeGuardFunction.js";
 import { ObjectType_identifierTypeDeclarations } from "./_ObjectType/ObjectType_identifierTypeDeclarations.js";
@@ -21,7 +20,6 @@ import { AbstractDiscriminatedUnionType } from "./AbstractDiscriminatedUnionType
 import { DeclaredCallable } from "./DeclaredCallable.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
 export class ObjectDiscriminatedUnionType extends AbstractDiscriminatedUnionType {
-    schemaExpression = ObjectDiscriminatedUnionType_schemaExpression;
     identifierType;
     kind = "ObjectDiscriminatedUnion";
     constructor({ identifierType, ...superParameters }) {
@@ -37,6 +35,21 @@ export class ObjectDiscriminatedUnionType extends AbstractDiscriminatedUnionType
     get fromRdfResourceFunction() {
         return ObjectDiscriminatedUnionType_fromRdfResourceFunction.call(this);
     }
+    get fromRdfTypeVariables() {
+        return this.members.flatMap((member) => {
+            switch (member.type.kind) {
+                case "Object":
+                    return member.type.fromRdfTypeVariable.toList();
+                case "ObjectDiscriminatedUnion":
+                    return member.type.fromRdfTypeVariables;
+                case "ObjectIntersection":
+                    return [];
+                default:
+                    member.type;
+                    throw new RangeError("should never reach this point");
+            }
+        });
+    }
     get identifierTypeAlias() {
         return this.name.map((name) => code `${name}.Identifier`).unsafeCoerce();
     }
@@ -121,6 +134,9 @@ __decorate([
 __decorate([
     Memoize()
 ], ObjectDiscriminatedUnionType.prototype, "fromRdfResourceFunction", null);
+__decorate([
+    Memoize()
+], ObjectDiscriminatedUnionType.prototype, "fromRdfTypeVariables", null);
 __decorate([
     Memoize()
 ], ObjectDiscriminatedUnionType.prototype, "identifierTypeAlias", null);

package/dist/generators/ts/ObjectIntersectionType.d.ts

@@ -10,7 +10,7 @@ import type { IdentifierType } from "./IdentifierType.js";
 import type { IriType } from "./IriType.js";
 import type { ObjectType } from "./ObjectType.js";
 import { type Code } from "./ts-poet-wrapper.js";
-export declare class ObjectIntersectionType extends AbstractIntersectionType<ObjectType> {
+export declare class ObjectIntersectionType extends AbstractIntersectionType<ObjectIntersectionType.MemberType> {
     protected fromJsonObjectFunctionExpression: typeof ObjectIntersectionType_fromJsonObjectFunctionExpression;
     protected fromJsonObjectFunctionType: typeof ObjectIntersectionType_fromJsonObjectFunctionType;
     protected fromRdfResourceValuesFunctionExpression: typeof ObjectIntersectionType_fromRdfResourceValuesFunctionExpression;
@@ -22,7 +22,7 @@ export declare class ObjectIntersectionType extends AbstractIntersectionType<Obj
     readonly kind = "ObjectIntersection";
     constructor({ identifierType, ...superParameters }: {
         identifierType: BlankNodeType | IdentifierType | IriType;
-    } & ConstructorParameters<typeof AbstractIntersectionType<ObjectType>>[0]);
+    } & ConstructorParameters<typeof AbstractIntersectionType<ObjectIntersectionType.MemberType>>[0]);
     get _fromRdfResourceFunction(): Callable;
     get _toRdfResourceFunction(): Callable;
     get createFunction(): Callable;
@@ -31,8 +31,8 @@ export declare class ObjectIntersectionType extends AbstractIntersectionType<Obj
     get focusSparqlWherePatternsFunction(): Callable;
     get fromRdfResourceFunction(): Callable;
     get identifierTypeAlias(): Code;
-    get jsonObjectType(): AbstractIntersectionType<ObjectType>["jsonObjectType"];
-    get jsonValueType(): AbstractIntersectionType<ObjectType>["jsonValueType"];
+    get jsonObjectType(): AbstractIntersectionType<ObjectIntersectionType.MemberType>["jsonObjectType"];
+    get jsonValueType(): AbstractIntersectionType<ObjectIntersectionType.MemberType>["jsonValueType"];
     get objectSetMethodNames(): ObjectType.ObjectSetMethodNames;
     get sparqlConstructQueryFunction(): Callable;
     get sparqlConstructQueryStringFunction(): Callable;
@@ -41,4 +41,7 @@ export declare class ObjectIntersectionType extends AbstractIntersectionType<Obj
     protected get createUnsafeFunction(): Callable;
     protected staticModuleDeclarations(name: string): Record<string, Code>;
 }
+export declare namespace ObjectIntersectionType {
+    type MemberType = ObjectIntersectionType | ObjectType;
+}
 //# sourceMappingURL=ObjectIntersectionType.d.ts.map

package/dist/generators/ts/RdfjsDatasetObjectSetType.js

@@ -4,10 +4,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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 { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
 import { AbstractObjectSetType } from "./AbstractObjectSetType.js";
-import { code, joinCode } from "./ts-poet-wrapper.js";
+import { arrayOf, code, joinCode } from "./ts-poet-wrapper.js";
 export class RdfjsDatasetObjectSetType extends AbstractObjectSetType {
     get declaration() {
         const syntheticNamePrefix = this.configuration.syntheticNamePrefix;
@@ -87,30 +86,42 @@ async ${methodSignatures.objects.name}(${methodSignatures.objects.parameters}):
 }`,
                     // objectsSync has per-object type logic, not just forwarding
                 ];
-                const runtimeObjectType = (filterFunction, namedObjectType) => {
-                    return code `{ filter: ${filterFunction.annotatedUsage}, fromRdfResource: ${namedObjectType.expression}.fromRdfResource, fromRdfTypes: ${namedObjectType.fromRdfTypeVariable.map((fromRdfTypeVariable) => code `[${fromRdfTypeVariable}]`).orDefault(code `[]`)} }`;
+                const runtimeObjectType = (namedObjectType, options) => {
+                    let fromRdfTypeVariables;
+                    switch (namedObjectType.kind) {
+                        case "Object":
+                            fromRdfTypeVariables =
+                                namedObjectType.fromRdfTypeVariable.toList();
+                            break;
+                        case "ObjectDiscriminatedUnion":
+                            fromRdfTypeVariables = namedObjectType.fromRdfTypeVariables;
+                            break;
+                        case "ObjectIntersection":
+                            fromRdfTypeVariables = [];
+                            break;
+                    }
+                    return code `{ filter: ${(options?.filterFunction ?? namedObjectType.filterFunction).annotatedUsage}, fromRdfResource: ${namedObjectType.expression}.fromRdfResource, fromRdfTypes: ${arrayOf(...fromRdfTypeVariables)} }`;
                 };
                 switch (namedObjectType.kind) {
                     case "Object": {
                         return delegatingMethods.concat(code `\
 ${methodSignatures.objects.name}Sync(${methodSignatures.objects.parameters}): ${this.reusables.imports.Either}<Error, readonly ${namedObjectType.expression}[]> {
-  return this.#objectsSync<${namedObjectType.expression}, ${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType(namedObjectType.filterFunction, namedObjectType)}, query);
+  return this.#objectsSync<${namedObjectType.expression}, ${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType(namedObjectType)}, query);
 }`);
                     }
                     case "ObjectDiscriminatedUnion":
                         return delegatingMethods.concat(code `\
 ${methodSignatures.objects.name}Sync(${methodSignatures.objects.parameters}): ${this.reusables.imports.Either}<Error, readonly ${namedObjectType.expression}[]> {
   return this.#objectDiscriminatedUnionsSync<${namedObjectType.expression}, ${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>([
-    ${joinCode(namedObjectType.members.map((member) => runtimeObjectType(namedObjectType.filterFunction, member.type)), { on: ", " })}
+    ${joinCode(namedObjectType.members.map((member) => runtimeObjectType(member.type, {
+                            filterFunction: namedObjectType.filterFunction,
+                        })), { on: ", " })}
   ], query);
 }`);
                     case "ObjectIntersection":
                         return delegatingMethods.concat(code `\
 ${methodSignatures.objects.name}Sync(${methodSignatures.objects.parameters}): ${this.reusables.imports.Either}<Error, readonly ${namedObjectType.expression}[]> {
-  return this.#objectsSync<${namedObjectType.expression}, ${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType(namedObjectType.filterFunction, {
-                            expression: namedObjectType.expression,
-                            fromRdfTypeVariable: Maybe.empty(),
-                        })}, query);
+  return this.#objectsSync<${namedObjectType.expression}, ${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>(${runtimeObjectType(namedObjectType)}, query);
 }`);
                     default:
                         namedObjectType;

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

@@ -30,8 +30,7 @@ export declare class Snippets {
     get FilterFunction(): Snippet;
     get FocusSparqlConstructTriplesFunction(): Snippet;
     get FocusSparqlWherePatternsFunction(): Snippet;
-    get FromJsonObjectFunction(): Snippet;
-    get FromJsonValueFunction(): Snippet;
+    get FromJsonFunction(): Snippet;
     get FromRdfResourceFunction(): Snippet;
     get FromRdfResourceValuesFunction(): Snippet;
     get HashFunction(): Snippet;
@@ -70,8 +69,7 @@ export declare class Snippets {
     get TermFilter(): Snippet;
     get TermJsonObject(): Snippet;
     get TermSchema(): Snippet;
-    get ToJsonObjectFunction(): Snippet;
-    get ToJsonValueFunction(): Snippet;
+    get ToJsonFunction(): Snippet;
     get ToLoggableFunction(): Snippet;
     get ToRdfResourceFunction(): Snippet;
     get ToRdfResourceValuesFunction(): Snippet;
@@ -120,10 +118,10 @@ export declare class Snippets {
     get convertToBlankNodeIdentifierProperty(): Snippet;
     get convertToIdentifier(): Snippet;
     get convertToIdentifierProperty(): Snippet;
-    get convertToInIri(): Snippet;
-    get convertToInIriIdentifierProperty(): Snippet;
     get convertToIri(): Snippet;
     get convertToIriIdentifierProperty(): Snippet;
+    get convertToIriLiteral(): Snippet;
+    get convertToIriLiteralIdentifierProperty(): Snippet;
     get convertToLangString(): Snippet;
     get convertToLazy(): Snippet;
     get convertToLazyOption(): Snippet;
@@ -191,6 +189,9 @@ export declare class Snippets {
     get iriFromJsonObject(): Snippet;
     get iriFromJsonString(): Snippet;
     get iriFromRdfResourceValues(): Snippet;
+    get iriFromString(): Snippet;
+    get iriLiteralFromJsonObject(): Snippet;
+    get iriLiteralFromJsonString(): Snippet;
     get iriSparqlWherePatterns(): Snippet;
     get iriToJsonObject(): Snippet;
     get iriToJsonString(): Snippet;

package/dist/generators/ts/Snippets.js

@@ -24,8 +24,7 @@ import { snippets_EqualsResult } from "./_snippets/snippets_EqualsResult.js";
 import { snippets_FilterFunction } from "./_snippets/snippets_FilterFunction.js";
 import { snippets_FocusSparqlConstructTriplesFunction } from "./_snippets/snippets_FocusSparqlConstructTriplesFunction.js";
 import { snippets_FocusSparqlWherePatternsFunction } from "./_snippets/snippets_FocusSparqlWherePatternsFunction.js";
-import { snippets_FromJsonObjectFunction } from "./_snippets/snippets_FromJsonObjectFunction.js";
-import { snippets_FromJsonValueFunction } from "./_snippets/snippets_FromJsonValueFunction.js";
+import { snippets_FromJsonFunction } from "./_snippets/snippets_FromJsonFunction.js";
 import { snippets_FromRdfResourceFunction } from "./_snippets/snippets_FromRdfResourceFunction.js";
 import { snippets_FromRdfResourceValuesFunction } from "./_snippets/snippets_FromRdfResourceValuesFunction.js";
 import { snippets_HashFunction } from "./_snippets/snippets_HashFunction.js";
@@ -64,8 +63,7 @@ import { snippets_StringSchema } from "./_snippets/snippets_StringSchema.js";
 import { snippets_TermFilter } from "./_snippets/snippets_TermFilter.js";
 import { snippets_TermJsonObject } from "./_snippets/snippets_TermJsonObject.js";
 import { snippets_TermSchema } from "./_snippets/snippets_TermSchema.js";
-import { snippets_ToJsonObjectFunction } from "./_snippets/snippets_ToJsonObjectFunction.js";
-import { snippets_ToJsonValueFunction } from "./_snippets/snippets_ToJsonValueFunction.js";
+import { snippets_ToJsonFunction } from "./_snippets/snippets_ToJsonFunction.js";
 import { snippets_ToLoggableFunction } from "./_snippets/snippets_ToLoggableFunction.js";
 import { snippets_ToRdfResourceFunction } from "./_snippets/snippets_ToRdfResourceFunction.js";
 import { snippets_ToRdfResourceValuesFunction } from "./_snippets/snippets_ToRdfResourceValuesFunction.js";
@@ -114,10 +112,10 @@ import { snippets_convertToBlankNode } from "./_snippets/snippets_convertToBlank
 import { snippets_convertToBlankNodeIdentifierProperty } from "./_snippets/snippets_convertToBlankNodeIdentifierProperty.js";
 import { snippets_convertToIdentifier } from "./_snippets/snippets_convertToIdentifier.js";
 import { snippets_convertToIdentifierProperty } from "./_snippets/snippets_convertToIdentifierProperty.js";
-import { snippets_convertToInIri } from "./_snippets/snippets_convertToInIri.js";
-import { snippets_convertToInIriIdentifierProperty } from "./_snippets/snippets_convertToInIriIdentifierProperty.js";
 import { snippets_convertToIri } from "./_snippets/snippets_convertToIri.js";
 import { snippets_convertToIriIdentifierProperty } from "./_snippets/snippets_convertToIriIdentifierProperty.js";
+import { snippets_convertToIriLiteral } from "./_snippets/snippets_convertToIriLiteral.js";
+import { snippets_convertToIriLiteralIdentifierProperty } from "./_snippets/snippets_convertToIriLiteralIdentifierProperty.js";
 import { snippets_convertToLangString } from "./_snippets/snippets_convertToLangString.js";
 import { snippets_convertToLazy } from "./_snippets/snippets_convertToLazy.js";
 import { snippets_convertToLazyOption } from "./_snippets/snippets_convertToLazyOption.js";
@@ -185,6 +183,9 @@ import { snippets_intFromRdfResourceValues } from "./_snippets/snippets_intFromR
 import { snippets_iriFromJsonObject } from "./_snippets/snippets_iriFromJsonObject.js";
 import { snippets_iriFromJsonString } from "./_snippets/snippets_iriFromJsonString.js";
 import { snippets_iriFromRdfResourceValues } from "./_snippets/snippets_iriFromRdfResourceValues.js";
+import { snippets_iriFromString } from "./_snippets/snippets_iriFromString.js";
+import { snippets_iriLiteralFromJsonObject } from "./_snippets/snippets_iriLiteralFromJsonObject.js";
+import { snippets_iriLiteralFromJsonString } from "./_snippets/snippets_iriLiteralFromJsonString.js";
 import { snippets_iriSparqlWherePatterns } from "./_snippets/snippets_iriSparqlWherePatterns.js";
 import { snippets_iriToJsonObject } from "./_snippets/snippets_iriToJsonObject.js";
 import { snippets_iriToJsonString } from "./_snippets/snippets_iriToJsonString.js";
@@ -313,11 +314,8 @@ export class Snippets {
     get FocusSparqlWherePatternsFunction() {
         return this.snippet(snippets_FocusSparqlWherePatternsFunction);
     }
-    get FromJsonObjectFunction() {
-        return this.snippet(snippets_FromJsonObjectFunction);
-    }
-    get FromJsonValueFunction() {
-        return this.snippet(snippets_FromJsonValueFunction);
+    get FromJsonFunction() {
+        return this.snippet(snippets_FromJsonFunction);
     }
     get FromRdfResourceFunction() {
         return this.snippet(snippets_FromRdfResourceFunction);
@@ -433,11 +431,8 @@ export class Snippets {
     get TermSchema() {
         return this.snippet(snippets_TermSchema);
     }
-    get ToJsonObjectFunction() {
-        return this.snippet(snippets_ToJsonObjectFunction);
-    }
-    get ToJsonValueFunction() {
-        return this.snippet(snippets_ToJsonValueFunction);
+    get ToJsonFunction() {
+        return this.snippet(snippets_ToJsonFunction);
     }
     get ToLoggableFunction() {
         return this.snippet(snippets_ToLoggableFunction);
@@ -583,18 +578,18 @@ export class Snippets {
     get convertToIdentifierProperty() {
         return this.snippet(snippets_convertToIdentifierProperty);
     }
-    get convertToInIri() {
-        return this.snippet(snippets_convertToInIri);
-    }
-    get convertToInIriIdentifierProperty() {
-        return this.snippet(snippets_convertToInIriIdentifierProperty);
-    }
     get convertToIri() {
         return this.snippet(snippets_convertToIri);
     }
     get convertToIriIdentifierProperty() {
         return this.snippet(snippets_convertToIriIdentifierProperty);
     }
+    get convertToIriLiteral() {
+        return this.snippet(snippets_convertToIriLiteral);
+    }
+    get convertToIriLiteralIdentifierProperty() {
+        return this.snippet(snippets_convertToIriLiteralIdentifierProperty);
+    }
     get convertToLangString() {
         return this.snippet(snippets_convertToLangString);
     }
@@ -796,6 +791,15 @@ export class Snippets {
     get iriFromRdfResourceValues() {
         return this.snippet(snippets_iriFromRdfResourceValues);
     }
+    get iriFromString() {
+        return this.snippet(snippets_iriFromString);
+    }
+    get iriLiteralFromJsonObject() {
+        return this.snippet(snippets_iriLiteralFromJsonObject);
+    }
+    get iriLiteralFromJsonString() {
+        return this.snippet(snippets_iriLiteralFromJsonString);
+    }
     get iriSparqlWherePatterns() {
         return this.snippet(snippets_iriSparqlWherePatterns);
     }
@@ -1119,10 +1123,7 @@ __decorate([
 ], Snippets.prototype, "FocusSparqlWherePatternsFunction", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "FromJsonObjectFunction", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "FromJsonValueFunction", null);
+], Snippets.prototype, "FromJsonFunction", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "FromRdfResourceFunction", null);
@@ -1239,10 +1240,7 @@ __decorate([
 ], Snippets.prototype, "TermSchema", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "ToJsonObjectFunction", null);
-__decorate([
-    Memoize()
-], Snippets.prototype, "ToJsonValueFunction", null);
+], Snippets.prototype, "ToJsonFunction", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "ToLoggableFunction", null);
@@ -1389,16 +1387,16 @@ __decorate([
 ], Snippets.prototype, "convertToIdentifierProperty", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "convertToInIri", null);
+], Snippets.prototype, "convertToIri", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "convertToInIriIdentifierProperty", null);
+], Snippets.prototype, "convertToIriIdentifierProperty", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "convertToIri", null);
+], Snippets.prototype, "convertToIriLiteral", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "convertToIriIdentifierProperty", null);
+], Snippets.prototype, "convertToIriLiteralIdentifierProperty", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "convertToLangString", null);
@@ -1600,6 +1598,15 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "iriFromRdfResourceValues", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "iriFromString", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "iriLiteralFromJsonObject", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "iriLiteralFromJsonString", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "iriSparqlWherePatterns", null);

package/dist/generators/ts/TypeFactory.js

@@ -86,23 +86,12 @@ export class TypeFactory {
                 return cachedType;
             }
         }
-        const objectDiscriminatedUnionIdentifierType = this.createIdentifierType(ast.StructCompoundType.identifierType(astType));
+        const objectDiscriminatedUnionIdentifierType = this.createIdentifierType(ast.StructCompoundType.identifierType(astType).unsafeCoerce());
         const objectDiscriminatedUnionTypeName = astType.name.map((name) => this.tsName(name));
         const objectDiscriminatedUnionType = new ObjectDiscriminatedUnionType({
             ...this.constructorParameters,
             comment: astType.comment,
-            identifierProperty: astType.isStructDiscriminatedUnionType() &&
-                astType.members.every((member) => {
-                    switch (member.type.kind) {
-                        case "DiscriminatedUnion":
-                            return member.type.members.every((member) => member.type.identifierField.isJust());
-                        case "Struct":
-                            return member.type.identifierField.isJust();
-                        default:
-                            member.type;
-                            throw new Error("should never reach this point");
-                    }
-                })
+            identifierProperty: ast.StructCompoundType.hasIdentifierField(astType)
                 ? Maybe.of(new ObjectType.IdentifierProperty({
                     ...this.constructorParameters,
                     name: `${this.configuration.syntheticNamePrefix}identifier`,
@@ -112,10 +101,16 @@ export class TypeFactory {
                 : Maybe.empty(),
             identifierType: objectDiscriminatedUnionIdentifierType,
             label: astType.label,
-            members: ast.StructCompoundType.memberStructTypes(astType).map((astStructType) => ({
-                discriminantValue: Maybe.empty(),
-                type: this.createObjectType(astStructType),
-            })),
+            members: astType.members.map((member) => {
+                const type = this.createType(member.type);
+                invariant(type.kind === "ObjectDiscriminatedUnion" ||
+                    type.kind === "ObjectIntersection" ||
+                    type.kind === "Object", type.kind);
+                return {
+                    discriminantValue: Maybe.empty(),
+                    type: type,
+                };
+            }),
             name: objectDiscriminatedUnionTypeName,
             recursive: astType.recursive,
             shapeIdentifier: astType.shapeIdentifier,
@@ -132,23 +127,12 @@ export class TypeFactory {
                 return cachedType;
             }
         }
-        const objectIntersectionIdentifierType = this.createIdentifierType(ast.StructCompoundType.identifierType(astType));
+        const objectIntersectionIdentifierType = this.createIdentifierType(ast.StructCompoundType.identifierType(astType).unsafeCoerce());
         const objectIntersectionTypeName = astType.name.map((name) => this.tsName(name));
         const objectIntersectionType = new ObjectIntersectionType({
             ...this.constructorParameters,
             comment: astType.comment,
-            identifierProperty: astType.isStructIntersectionType() &&
-                astType.members.every((member) => {
-                    switch (member.type.kind) {
-                        case "Intersection":
-                            return member.type.members.every((member) => member.type.identifierField.isJust());
-                        case "Struct":
-                            return member.type.identifierField.isJust();
-                        default:
-                            member.type;
-                            throw new Error("should never reach this point");
-                    }
-                })
+            identifierProperty: ast.StructCompoundType.hasIdentifierField(astType)
                 ? Maybe.of(new ObjectType.IdentifierProperty({
                     ...this.constructorParameters,
                     name: `${this.configuration.syntheticNamePrefix}identifier`,
@@ -158,9 +142,11 @@ export class TypeFactory {
                 : Maybe.empty(),
             identifierType: objectIntersectionIdentifierType,
             label: astType.label,
-            members: ast.StructCompoundType.memberStructTypes(astType).map((astStructType) => ({
-                type: this.createObjectType(astStructType),
-            })),
+            members: astType.members.map((member) => {
+                const type = this.createType(member.type);
+                invariant(type.kind === "ObjectIntersection" || type.kind === "Object", type.kind);
+                return { type };
+            }),
             name: objectIntersectionTypeName,
             recursive: astType.recursive,
             shapeIdentifier: astType.shapeIdentifier,

package/dist/generators/ts/_ObjectIntersectionType/ObjectIntersectionType_fromJsonObjectFunction.js

@@ -10,6 +10,6 @@ ${member.type.fromJsonObjectFunction.unannotatedUsage}(jsonObject).${memberI + 1
         .toList()), { on: "," })} }) ${")".repeat(this.members.length)}`;
 }
 export function ObjectIntersectionType_fromJsonObjectFunctionType() {
-    return code `${this.reusables.snippets.FromJsonObjectFunction}<${this.jsonObjectType.expression}, ${this.discriminatedType.map((discriminatedType) => discriminatedType.expression).orDefault(this.expression)}, undefined>`;
+    return code `${this.reusables.snippets.FromJsonFunction}<${this.jsonObjectType.expression}, ${this.discriminatedType.map((discriminatedType) => discriminatedType.expression).orDefault(this.expression)}, undefined>`;
 }
 //# sourceMappingURL=ObjectIntersectionType_fromJsonObjectFunction.js.map

package/dist/generators/ts/_ObjectType/ObjectType_IdentifierProperty.js

@@ -108,7 +108,7 @@ export class ObjectType_IdentifierProperty extends ObjectType_AbstractProperty {
                 conversionFunction = code `${this.reusables.snippets.convertToBlankNodeIdentifierProperty}`;
             }
             else if (this.type.in_.length > 0) {
-                conversionFunction = code `${this.reusables.snippets.convertToInIriIdentifierProperty}<${joinCode(this.type.in_.map((in_) => code `${literalOf(in_.value)}`), { on: " | " })}>`;
+                conversionFunction = code `${this.reusables.snippets.convertToIriLiteralIdentifierProperty}<${joinCode(this.type.in_.map((in_) => code `${literalOf(in_.value)}`), { on: " | " })}>`;
             }
             else {
                 conversionFunction = code `${this.reusables.snippets.convertToIriIdentifierProperty}`;

package/dist/generators/ts/_ObjectType/ObjectType_fromJsonObjectFunction.js

@@ -10,10 +10,15 @@ export function ObjectType_fromJsonObjectFunctionExpression() {
     };
     const propertyInitializers = this.properties.flatMap((property) => property.fromJsonObjectInitializer({ variables }).toList());
     invariant(propertyInitializers.length > 0);
+    let optionsParameter = optionsVariable;
+    this.name.ifNothing(() => {
+        optionsParameter = code `${optionsParameter}: Parameters<${ObjectType_fromJsonObjectFunctionType.call(this)}>[1]`;
+    });
+    optionsParameter = code `${optionsParameter} = {}`;
     return code `\
-(${variables.jsonObject}, ${variables.options} = {}) => ${this.reusables.snippets.sequenceRecord}({ ${joinCode(propertyInitializers, { on: "," })} }).chain(${this.createFunction.annotatedUsage})`;
+(${variables.jsonObject}, ${optionsParameter}) => ${this.reusables.snippets.sequenceRecord}({ ${joinCode(propertyInitializers, { on: "," })} }).chain(${this.createFunction.annotatedUsage})`;
 }
 export function ObjectType_fromJsonObjectFunctionType() {
-    return code `${this.reusables.snippets.FromJsonObjectFunction}<${this.jsonObjectType.expression}, ${this.discriminatedType.map((discriminatedType) => discriminatedType.expression).orDefault(this.expression)}, undefined>`;
+    return code `${this.reusables.snippets.FromJsonFunction}<${this.jsonObjectType.expression}, ${this.discriminatedType.map((discriminatedType) => discriminatedType.expression).orDefault(this.expression)}, undefined>`;
 }
 //# sourceMappingURL=ObjectType_fromJsonObjectFunction.js.map

package/dist/generators/ts/_ObjectType/ObjectType_toJsonObjectFunction.js

@@ -11,6 +11,6 @@ export function ObjectType_toJsonObjectFunctionExpression() {
         .toList()), { on: "," })} }))`;
 }
 export function ObjectType_toJsonObjectFunctionType() {
-    return code `${this.reusables.snippets.ToJsonObjectFunction}<${this.expression}, ${this.jsonObjectType.expression}>`;
+    return code `${this.reusables.snippets.ToJsonFunction}<${this.expression}, ${this.jsonObjectType.expression}>`;
 }
 //# sourceMappingURL=ObjectType_toJsonObjectFunction.js.map