@shaclmate/compiler 4.0.97 → 4.0.99

package/dist/generators/ts/OptionType.js

@@ -8,9 +8,10 @@ import { Maybe } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
 import { AbstractContainerType } from "./AbstractContainerType.js";
+import { BuiltinCallable } from "./BuiltinCallable.js";
 import { codeEquals } from "./codeEquals.js";
 import { InlineCallable } from "./InlineCallable.js";
-import { ReferenceCallable } from "./ReferenceCallable.js";
+import { SchemaObject } from "./SchemaObject.js";
 import { code } from "./ts-poet-wrapper.js";
 export class OptionType extends AbstractContainerType {
     graphqlArgs = Maybe.empty();
@@ -47,13 +48,13 @@ export class OptionType extends AbstractContainerType {
         return code `${this.reusables.snippets.MaybeFilter}<${this.itemType.filterType}>`;
     }
     get fromJsonValueFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.maybeFromJsonValue}(${this.itemType.fromJsonValueFunction.annotatedUsage})`);
+        return new BuiltinCallable(code `${this.reusables.snippets.maybeFromJsonValue}(${this.itemType.fromJsonValueFunction.annotatedUsage})`);
     }
     get fromJsonObjectFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.maybeFromJsonObject}(${this.itemType.fromJsonObjectFunction.annotatedUsage})`);
+        return new BuiltinCallable(code `${this.reusables.snippets.maybeFromJsonObject}(${this.itemType.fromJsonObjectFunction.annotatedUsage})`);
     }
     get fromRdfResourceValuesFunction() {
-        return new InlineCallable(code `${this.reusables.snippets.maybeFromRdfResourceValues}<${this.itemType.expression}, ${this.itemType.schemaType}>(${this.itemType.fromRdfResourceValuesFunction.unannotatedUsage})`);
+        return new InlineCallable(code `${this.reusables.snippets.maybeFromRdfResourceValues}<${this.itemType.expression}, ${this.itemType.schema.type.expression}>(${this.itemType.fromRdfResourceValuesFunction.unannotatedUsage})`);
     }
     get graphqlType() {
         invariant(!this.itemType.graphqlType.nullable);
@@ -67,14 +68,18 @@ export class OptionType extends AbstractContainerType {
     get mutable() {
         return this.itemType.mutable;
     }
-    get schemaType() {
-        return code `${this.reusables.snippets.MaybeSchema}<${this.itemType.schemaType}>`;
+    get schema() {
+        return new SchemaObject({
+            properties: super.schema.properties,
+            type: new SchemaObject.BuiltinType(code `${this.reusables.snippets.MaybeSchema}<${this.itemType.schema.type.expression}>`),
+            variable: super.schema.variable,
+        });
     }
     get toJsonValueFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.maybeToJsonValue}(${this.itemType.toJsonValueFunction.annotatedUsage})`);
+        return new BuiltinCallable(code `${this.reusables.snippets.maybeToJsonValue}(${this.itemType.toJsonValueFunction.annotatedUsage})`);
     }
     get toJsonObjectFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.maybeToJsonObject}(${this.itemType.toJsonObjectFunction.annotatedUsage})`);
+        return new BuiltinCallable(code `${this.reusables.snippets.maybeToJsonObject}(${this.itemType.toJsonObjectFunction.annotatedUsage})`);
     }
     get toRdfResourceValueTypes() {
         return this.itemType.toRdfResourceValueTypes;
@@ -85,10 +90,10 @@ export class OptionType extends AbstractContainerType {
             .orDefault(this.itemValidationFunctionDefault.annotatedUsage)})`));
     }
     get valueSparqlConstructTriplesFunction() {
-        return new InlineCallable(code `${this.reusables.snippets.maybeSparqlConstructTriples}<${this.itemType.filterType}, ${this.itemType.schemaType}>(${this.itemType.valueSparqlConstructTriplesFunction.unannotatedUsage})`);
+        return new InlineCallable(code `${this.reusables.snippets.maybeSparqlConstructTriples}<${this.itemType.filterType}, ${this.itemType.schema.type.expression}>(${this.itemType.valueSparqlConstructTriplesFunction.unannotatedUsage})`);
     }
     get valueSparqlWherePatternsFunction() {
-        return new InlineCallable(code `${this.reusables.snippets.maybeSparqlWherePatterns}<${this.itemType.filterType}, ${this.itemType.schemaType}>(${this.itemType.valueSparqlWherePatternsFunction.unannotatedUsage})`);
+        return new InlineCallable(code `${this.reusables.snippets.maybeSparqlWherePatterns}<${this.itemType.filterType}, ${this.itemType.schema.type.expression}>(${this.itemType.valueSparqlWherePatternsFunction.unannotatedUsage})`);
     }
     get inlineExpression() {
         return code `${this.reusables.imports.Maybe}<${this.itemType.expression}>`;
@@ -142,7 +147,7 @@ __decorate([
 ], OptionType.prototype, "hashFunction", null);
 __decorate([
     Memoize()
-], OptionType.prototype, "schemaType", null);
+], OptionType.prototype, "schema", null);
 __decorate([
     Memoize()
 ], OptionType.prototype, "toJsonValueFunction", null);

package/dist/generators/ts/SetType.d.ts

@@ -1,6 +1,7 @@
 import { Maybe } from "purify-ts";
 import { AbstractCollectionType } from "./AbstractCollectionType.js";
 import type { Callable } from "./Callable.js";
+import { SchemaObject } from "./SchemaObject.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class SetType<ItemTypeT extends SetType.ItemType> extends AbstractCollectionType<ItemTypeT> {
     readonly graphqlArgs: AbstractCollectionType<ItemTypeT>["graphqlArgs"];
@@ -24,7 +25,7 @@ export declare class SetType<ItemTypeT extends SetType.ItemType> extends Abstrac
     get toRdfResourceValueTypes(): AbstractCollectionType<ItemTypeT>["toRdfResourceValueTypes"];
     get valueSparqlConstructTriplesFunction(): Callable;
     get valueSparqlWherePatternsFunction(): Callable;
-    protected get schemaInitializers(): readonly Code[];
+    get schema(): SchemaObject<SchemaObject.BuiltinType>;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractCollectionType<ItemTypeT>["toRdfResourceValuesExpression"]>[0]): Code;
     toStringExpression({ variables, }: Parameters<AbstractCollectionType<ItemTypeT>["toStringExpression"]>[0]): Code;
 }

package/dist/generators/ts/SetType.js

@@ -8,8 +8,9 @@ import { Maybe } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
 import { AbstractCollectionType } from "./AbstractCollectionType.js";
+import { BuiltinCallable } from "./BuiltinCallable.js";
 import { InlineCallable } from "./InlineCallable.js";
-import { ReferenceCallable } from "./ReferenceCallable.js";
+import { SchemaObject } from "./SchemaObject.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
 export class SetType extends AbstractCollectionType {
     graphqlArgs = Maybe.empty();
@@ -70,16 +71,16 @@ export class SetType extends AbstractCollectionType {
         throw new Error("should never be called");
     }
     get fromJsonValueFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.arrayFromJsonArray}(${this.itemType.fromJsonValueFunction.annotatedUsage})`);
+        return new BuiltinCallable(code `${this.reusables.snippets.arrayFromJsonArray}(${this.itemType.fromJsonValueFunction.annotatedUsage})`);
     }
     get fromJsonObjectFunction() {
         throw new Error("should never be called");
     }
     get fromRdfResourceValuesFunction() {
-        return new InlineCallable(code `${this._mutable ? this.reusables.snippets.mutableSetFromRdfResourceValues : this.reusables.snippets.setFromRdfResourceValues}<${this.itemType.expression}, ${this.itemType.schemaType}>(${this.itemType.fromRdfResourceValuesFunction.unannotatedUsage})`);
+        return new InlineCallable(code `${this._mutable ? this.reusables.snippets.mutableSetFromRdfResourceValues : this.reusables.snippets.setFromRdfResourceValues}<${this.itemType.expression}, ${this.itemType.schema.type.expression}>(${this.itemType.fromRdfResourceValuesFunction.unannotatedUsage})`);
     }
     get toJsonValueFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.arrayToJsonArray}(${this.itemType.toJsonValueFunction.annotatedUsage})`);
+        return new BuiltinCallable(code `${this.reusables.snippets.arrayToJsonArray}(${this.itemType.toJsonValueFunction.annotatedUsage})`);
     }
     get toJsonObjectFunction() {
         throw new Error("should never be called");
@@ -88,17 +89,25 @@ export class SetType extends AbstractCollectionType {
         return this.itemType.toRdfResourceValueTypes;
     }
     get valueSparqlConstructTriplesFunction() {
-        return new InlineCallable(code `${this.reusables.snippets.setSparqlConstructTriples}<${this.itemType.filterType}, ${this.itemType.schemaType}>(${this.itemType.valueSparqlConstructTriplesFunction.unannotatedUsage})`);
+        return new InlineCallable(code `${this.reusables.snippets.setSparqlConstructTriples}<${this.itemType.filterType}, ${this.itemType.schema.type.expression}>(${this.itemType.valueSparqlConstructTriplesFunction.unannotatedUsage})`);
     }
     get valueSparqlWherePatternsFunction() {
-        return new InlineCallable(code `${this.reusables.snippets.setSparqlWherePatterns}<${this.itemType.filterType}, ${this.itemType.schemaType}>(${this.itemType.valueSparqlWherePatternsFunction.unannotatedUsage})`);
+        return new InlineCallable(code `${this.reusables.snippets.setSparqlWherePatterns}<${this.itemType.filterType}, ${this.itemType.schema.type.expression}>(${this.itemType.valueSparqlWherePatternsFunction.unannotatedUsage})`);
     }
-    get schemaInitializers() {
-        let schemaInitializers = super.schemaInitializers;
+    get schema() {
         if (this.minCount > 0n) {
-            schemaInitializers = schemaInitializers.concat(code `minCount: ${Number(this.minCount)}`);
+            return new SchemaObject({
+                properties: {
+                    ...super.schema.properties,
+                    minCount: code `minCount: ${Number(this.minCount)}`,
+                },
+                type: super.schema.type,
+                variable: super.schema.variable,
+            });
+        }
+        else {
+            return super.schema;
         }
-        return schemaInitializers;
     }
     toRdfResourceValuesExpression({ variables, }) {
         return code `${variables.value}.flatMap((item) => ${this.itemType.toRdfResourceValuesExpression({
@@ -130,6 +139,9 @@ __decorate([
 __decorate([
     Memoize()
 ], SetType.prototype, "valueSparqlWherePatternsFunction", null);
+__decorate([
+    Memoize()
+], SetType.prototype, "schema", null);
 (function (SetType) {
     SetType.isItemType = AbstractCollectionType.isItemType;
 })(SetType || (SetType = {}));

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;
@@ -46,6 +45,7 @@ export declare class Snippets {
     get LangStringSchema(): Snippet;
     get Lazy(): Snippet;
     get LazyOption(): Snippet;
+    get LazySchema(): Snippet;
     get LazySet(): Snippet;
     get LiteralFilter(): Snippet;
     get LiteralJsonObject(): Snippet;
@@ -70,8 +70,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 +119,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 +190,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";
@@ -40,6 +39,7 @@ import { snippets_LangStringJsonObject } from "./_snippets/snippets_LangStringJs
 import { snippets_LangStringSchema } from "./_snippets/snippets_LangStringSchema.js";
 import { snippets_Lazy } from "./_snippets/snippets_Lazy.js";
 import { snippets_LazyOption } from "./_snippets/snippets_LazyOption.js";
+import { snippets_LazySchema } from "./_snippets/snippets_LazySchema.js";
 import { snippets_LazySet } from "./_snippets/snippets_LazySet.js";
 import { snippets_LiteralFilter } from "./_snippets/snippets_LiteralFilter.js";
 import { snippets_LiteralJsonObject } from "./_snippets/snippets_LiteralJsonObject.js";
@@ -64,8 +64,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 +113,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 +184,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 +315,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);
@@ -361,6 +360,9 @@ export class Snippets {
     get LazyOption() {
         return this.snippet(snippets_LazyOption);
     }
+    get LazySchema() {
+        return this.snippet(snippets_LazySchema);
+    }
     get LazySet() {
         return this.snippet(snippets_LazySet);
     }
@@ -433,11 +435,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 +582,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 +795,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 +1127,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);
@@ -1165,6 +1170,9 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "LazyOption", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "LazySchema", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "LazySet", null);
@@ -1239,10 +1247,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 +1394,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 +1605,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/StringType.d.ts

@@ -1,31 +1,31 @@
 import type { Literal } from "@rdfjs/types";
 import { Maybe } from "purify-ts";
 import { AbstractPrimitiveType } from "./AbstractPrimitiveType.js";
+import { BuiltinCallable } from "./BuiltinCallable.js";
 import type { Callable } from "./Callable.js";
-import { ReferenceCallable } from "./ReferenceCallable.js";
+import { SchemaObject } from "./SchemaObject.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class StringType extends AbstractPrimitiveType<string> {
     private readonly languageIn;
     protected readonly decodedIn: string[];
     readonly conversionFunction: Maybe<AbstractPrimitiveType.ConversionFunction>;
-    readonly filterFunction: ReferenceCallable;
+    readonly filterFunction: BuiltinCallable;
     readonly filterType: Code;
     readonly graphqlType: import("./_AbstractType/AbstractType_GraphqlType.js").AbstractType_GraphqlType;
-    readonly hashFunction: ReferenceCallable;
+    readonly hashFunction: BuiltinCallable;
     readonly jsTypes: readonly [{
         readonly typeof: "string";
     }];
     readonly jsonValueType: AbstractPrimitiveType.JsonType;
     readonly kind = "String";
-    readonly valueSparqlWherePatternsFunction: ReferenceCallable;
+    readonly valueSparqlWherePatternsFunction: BuiltinCallable;
     constructor({ languageIn, ...superParameters }: {
         languageIn: readonly string[];
     } & ConstructorParameters<typeof AbstractPrimitiveType<string>>[0]);
     get fromJsonObjectFunction(): Callable;
     get fromJsonValueFunction(): Callable;
     get fromRdfResourceValuesFunction(): Callable;
-    get schemaType(): Code;
-    protected get schemaInitializers(): readonly Code[];
+    get schema(): SchemaObject<SchemaObject.BuiltinType>;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractPrimitiveType<string>["toRdfResourceValuesExpression"]>[0]): Code;
     valueExpression(literal: Literal | string): Code;
 }

package/dist/generators/ts/StringType.js

@@ -9,16 +9,17 @@ import { xsd } from "@tpluscode/rdf-ns-builders";
 import { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
 import { AbstractPrimitiveType } from "./AbstractPrimitiveType.js";
-import { ReferenceCallable } from "./ReferenceCallable.js";
+import { BuiltinCallable } from "./BuiltinCallable.js";
+import { SchemaObject } from "./SchemaObject.js";
 import { arrayOf, code, literalOf } from "./ts-poet-wrapper.js";
 export class StringType extends AbstractPrimitiveType {
     languageIn;
     decodedIn = this.in_.map((in_) => LiteralDecoder.decodeStringLiteral(in_).unsafeCoerce());
     conversionFunction = Maybe.empty();
-    filterFunction = new ReferenceCallable(this.reusables.snippets.filterString);
+    filterFunction = new BuiltinCallable(this.reusables.snippets.filterString);
     filterType = code `${this.reusables.snippets.StringFilter}`;
     graphqlType = new AbstractPrimitiveType.GraphqlType(code `${this.reusables.imports.GraphQLString}`, this.reusables);
-    hashFunction = new ReferenceCallable(this.reusables.snippets.hashString);
+    hashFunction = new BuiltinCallable(this.reusables.snippets.hashString);
     jsTypes = [
         {
             typeof: "string",
@@ -31,29 +32,31 @@ export class StringType extends AbstractPrimitiveType {
             : undefined,
     });
     kind = "String";
-    valueSparqlWherePatternsFunction = new ReferenceCallable(this.reusables.snippets.stringSparqlWherePatterns);
+    valueSparqlWherePatternsFunction = new BuiltinCallable(this.reusables.snippets.stringSparqlWherePatterns);
     constructor({ languageIn, ...superParameters }) {
         super(superParameters);
         this.languageIn = languageIn;
     }
     get fromJsonObjectFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.stringFromJsonObject}<${this.expression}>`);
+        return new BuiltinCallable(code `${this.reusables.snippets.stringFromJsonObject}<${this.expression}>`);
     }
     get fromJsonValueFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.stringFromJsonString}<${this.expression}>`);
+        return new BuiltinCallable(code `${this.reusables.snippets.stringFromJsonString}<${this.expression}>`);
     }
     get fromRdfResourceValuesFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.stringFromRdfResourceValues}<${this.expression}>`);
+        return new BuiltinCallable(code `${this.reusables.snippets.stringFromRdfResourceValues}<${this.expression}>`);
     }
-    get schemaType() {
-        return code `${this.reusables.snippets.StringSchema}<${this.expression}>`;
-    }
-    get schemaInitializers() {
-        let initializers = super.schemaInitializers;
-        if (this.languageIn.length > 0) {
-            initializers = initializers.concat(code `languageIn: ${arrayOf(...this.languageIn)}`);
-        }
-        return initializers;
+    get schema() {
+        return new SchemaObject({
+            properties: this.languageIn.length > 0
+                ? {
+                    ...super.schema.properties,
+                    languageIn: code `languageIn: ${arrayOf(...this.languageIn)}`,
+                }
+                : super.schema.properties,
+            type: new SchemaObject.BuiltinType(code `${this.reusables.snippets.StringSchema}<${this.expression}>`),
+            variable: super.schema.variable,
+        });
     }
     toRdfResourceValuesExpression({ variables, }) {
         return code `[${this.reusables.snippets.literalFactory}.string(${variables.value}${!this.datatype.equals(xsd.string) ? `, ${this.rdfjsTermExpression(this.datatype)}` : ""})]`;
@@ -73,5 +76,5 @@ __decorate([
 ], StringType.prototype, "fromRdfResourceValuesFunction", null);
 __decorate([
     Memoize()
-], StringType.prototype, "schemaType", null);
+], StringType.prototype, "schema", null);
 //# sourceMappingURL=StringType.js.map

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

@@ -2,21 +2,22 @@ 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 { BuiltinCallable } from "./BuiltinCallable.js";
 import type { Callable } from "./Callable.js";
-import { ReferenceCallable } from "./ReferenceCallable.js";
+import { SchemaObject } from "./SchemaObject.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: ReferenceCallable;
+    readonly filterFunction: BuiltinCallable;
     readonly jsTypes: readonly [{
         readonly instanceof: "Object";
         readonly typeof: "object";
     }];
     readonly kind = "Term";
     readonly nodeKinds: ReadonlySet<NodeKind>;
-    readonly toJsonObjectFunction: ReferenceCallable;
-    readonly toJsonValueFunction: ReferenceCallable;
-    readonly valueSparqlWherePatternsFunction: ReferenceCallable;
+    readonly toJsonObjectFunction: BuiltinCallable;
+    readonly toJsonValueFunction: BuiltinCallable;
+    readonly valueSparqlWherePatternsFunction: BuiltinCallable;
     constructor({ nodeKinds, ...superParameters }: ConstructorParameters<typeof AbstractTermType<ConstantTermT, RuntimeTermT>>[0] & {
         nodeKinds: ReadonlySet<NodeKind>;
     });
@@ -28,9 +29,8 @@ export declare class TermType<ConstantTermT extends Literal | NamedNode = Litera
     get graphqlType(): AbstractTermType.GraphqlType;
     get jsonObjectType(): AbstractTermType["jsonObjectType"];
     get jsonValueType(): AbstractTermType["jsonValueType"];
-    get schemaType(): Code;
     protected get inlineExpression(): Code;
-    protected get schemaInitializers(): Code[];
+    get schema(): SchemaObject<SchemaObject.BuiltinType>;
     graphqlResolveExpression(_parameters: Parameters<AbstractTermType["graphqlResolveExpression"]>[0]): Code;
     toLoggableExpression({ variables, }: Parameters<AbstractTermType["toLoggableExpression"]>[0]): Code;
 }

package/dist/generators/ts/TermType.js

@@ -9,19 +9,20 @@ import { Maybe } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
 import { AbstractTermType } from "./AbstractTermType.js";
-import { ReferenceCallable } from "./ReferenceCallable.js";
+import { BuiltinCallable } from "./BuiltinCallable.js";
+import { SchemaObject } from "./SchemaObject.js";
 import { arrayOf, code, joinCode } from "./ts-poet-wrapper.js";
 export class TermType extends AbstractTermType {
     conversionFunction = Maybe.empty();
-    filterFunction = new ReferenceCallable(this.reusables.snippets.filterTerm);
+    filterFunction = new BuiltinCallable(this.reusables.snippets.filterTerm);
     jsTypes = [
         { instanceof: "Object", typeof: "object" },
     ];
     kind = "Term";
     nodeKinds;
-    toJsonObjectFunction = new ReferenceCallable(this.reusables.snippets.termToJsonObject);
+    toJsonObjectFunction = new BuiltinCallable(this.reusables.snippets.termToJsonObject);
     toJsonValueFunction = this.toJsonObjectFunction;
-    valueSparqlWherePatternsFunction = new ReferenceCallable(this.reusables.snippets.termSparqlWherePatterns);
+    valueSparqlWherePatternsFunction = new BuiltinCallable(this.reusables.snippets.termSparqlWherePatterns);
     constructor({ nodeKinds, ...superParameters }) {
         super(superParameters);
         this.nodeKinds = nodeKinds;
@@ -42,13 +43,13 @@ export class TermType extends AbstractTermType {
         return code `${this.reusables.snippets.TermFilter}<${this.expression}>`;
     }
     get fromJsonObjectFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.termFromJsonObject}<${this.expression}>`);
+        return new BuiltinCallable(code `${this.reusables.snippets.termFromJsonObject}<${this.expression}>`);
     }
     get fromJsonValueFunction() {
         return this.fromJsonObjectFunction;
     }
     get fromRdfResourceValuesFunction() {
-        return new ReferenceCallable(code `${this.reusables.snippets.termFromRdfResourceValues}<${this.expression}>`);
+        return new BuiltinCallable(code `${this.reusables.snippets.termFromRdfResourceValues}<${this.expression}>`);
     }
     get graphqlType() {
         throw new Error("not implemented");
@@ -79,9 +80,6 @@ export class TermType extends AbstractTermType {
     get jsonValueType() {
         return this.jsonObjectType;
     }
-    get schemaType() {
-        return code `${this.reusables.snippets.TermSchema}<${this.expression}>`;
-    }
     get inlineExpression() {
         return code `(${joinCode([...this.nodeKinds]
             .map((nodeKind) => {
@@ -99,8 +97,15 @@ export class TermType extends AbstractTermType {
         })
             .map((import_) => code `${import_}`), { on: " | " })})`;
     }
-    get schemaInitializers() {
-        return super.schemaInitializers.concat(code `types: ${arrayOf(...[...this.nodeKinds].map(NodeKind.toTermType))}`);
+    get schema() {
+        return new SchemaObject({
+            properties: {
+                ...super.schema.properties,
+                types: code `types: ${arrayOf(...[...this.nodeKinds].map(NodeKind.toTermType))}`,
+            },
+            type: new SchemaObject.BuiltinType(code `${this.reusables.snippets.TermSchema}<${this.expression}>`),
+            variable: super.schema.variable,
+        });
     }
     graphqlResolveExpression(_parameters) {
         throw new Error("not implemented");
@@ -126,8 +131,8 @@ __decorate([
 ], TermType.prototype, "jsonObjectType", null);
 __decorate([
     Memoize()
-], TermType.prototype, "schemaType", null);
+], TermType.prototype, "inlineExpression", null);
 __decorate([
     Memoize()
-], TermType.prototype, "inlineExpression", null);
+], TermType.prototype, "schema", null);
 //# sourceMappingURL=TermType.js.map