@shaclmate/compiler 4.0.98 → 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

@@ -45,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;

package/dist/generators/ts/Snippets.js

@@ -39,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";
@@ -359,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);
     }
@@ -1166,6 +1170,9 @@ __decorate([
 __decorate([
     Memoize()
 ], Snippets.prototype, "LazyOption", null);
+__decorate([
+    Memoize()
+], Snippets.prototype, "LazySchema", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "LazySet", 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

package/dist/generators/ts/_AbstractDiscriminatedUnionType/AbstractDiscriminatedUnionType_fromJsonObjectFunction.js

@@ -9,7 +9,7 @@ ${joinCode(this.members.map(({ primaryDiscriminantValue, type, wrap }) => {
         const mapAndWrapValue = codeEquals(wrappedValue, valueVariable)
             ? ""
             : code `.map(${valueVariable} => (${wrappedValue}))`;
-        return code `if (value.${this.configuration.objectDiscriminantProperty.jsonName} === ${literalOf(primaryDiscriminantValue)}) { return ${type.fromJsonObjectFunction.unannotatedUsage}(value, { ...options, schema: ${this.schema}.members[${literalOf(primaryDiscriminantValue)}].type })${mapAndWrapValue} as ${this.reusables.imports.Either}<Error, ${this.expression}>; }`;
+        return code `if (value.${this.configuration.objectDiscriminantProperty.jsonName} === ${literalOf(primaryDiscriminantValue)}) { return ${type.fromJsonObjectFunction.unannotatedUsage}(value, { ...options, schema: ${this.schema.variable.map((variable) => code `${variable}.members[${literalOf(primaryDiscriminantValue)}].type`).orDefault(type.schema.expression)} })${mapAndWrapValue} as ${this.reusables.imports.Either}<Error, ${this.expression}>; }`;
     }))}
 
   throw new Error("unable to deserialize JSON");

package/dist/generators/ts/_AbstractType/AbstractType_JsonType.d.ts

@@ -1,4 +1,5 @@
 import { Maybe } from "purify-ts";
+import type { Callable } from "../Callable.js";
 import type { Reusables } from "../Reusables.js";
 import type { Snippet } from "../Snippet.js";
 import type { TsGenerator } from "../TsGenerator.js";
@@ -17,9 +18,6 @@ declare abstract class AbstractJsonType {
         snippet: Maybe<Snippet>;
         reusables: Reusables;
     });
-    protected moduleDeclarations({ unqualifiedName, }: {
-        unqualifiedName: string;
-    }): Code[];
     get declaration(): Maybe<Code>;
     get expression(): Code;
     get schema(): Code;
@@ -28,11 +26,17 @@ declare abstract class AbstractJsonType {
             scopePrefix: Code;
         };
     }): Maybe<Code>;
+    protected moduleDeclarations({ unqualifiedName, }: {
+        unqualifiedName: string;
+    }): Code[];
+    protected schemaTypeExpression({ unqualifiedName, }: {
+        unqualifiedName: string;
+    }): Code;
 }
 declare abstract class AbstractJsonPrimitiveType<PrimitiveT extends boolean | number | string> extends AbstractJsonType {
+    protected abstract readonly typeof: "boolean" | "number" | "string";
     readonly inReference: Maybe<Code>;
     readonly in_: readonly PrimitiveT[];
-    protected abstract readonly typeof: "boolean" | "number" | "string";
     constructor({ in_, inReference, ...superParameters }: {
         in_: readonly PrimitiveT[];
         inReference: Maybe<Code>;
@@ -52,8 +56,8 @@ declare class JsonArrayType extends AbstractJsonType {
     protected get schemaExpression(): Code;
 }
 declare class JsonBooleanType extends AbstractJsonPrimitiveType<boolean> {
-    readonly kind = "JsonBoolean";
     protected readonly typeof = "boolean";
+    readonly kind = "JsonBoolean";
 }
 declare class JsonDiscriminatedUnionType extends AbstractJsonType {
     readonly kind = "JsonDiscriminatedUnion";
@@ -65,12 +69,6 @@ declare class JsonDiscriminatedUnionType extends AbstractJsonType {
     protected get inlineExpression(): Code;
     protected get schemaExpression(): Code;
 }
-declare namespace JsonDiscriminatedUnionType {
-    interface Member {
-        readonly discriminantValue: number | string;
-        readonly type: JsonIntersectionType | JsonObjectType;
-    }
-}
 declare class JsonIntersectionType extends AbstractJsonType {
     readonly kind = "JsonIntersection";
     readonly memberTypes: readonly JsonType[];
@@ -82,24 +80,29 @@ declare class JsonIntersectionType extends AbstractJsonType {
     protected get schemaExpression(): Code;
 }
 declare class JsonNumberType extends AbstractJsonPrimitiveType<number> {
-    readonly kind = "JsonNumber";
     protected readonly typeof = "number";
+    readonly kind = "JsonNumber";
 }
 declare class JsonObjectType extends AbstractJsonType {
+    private readonly cachedMemberTypes;
+    private readonly shorthand;
     readonly kind = "JsonObject";
     readonly members: readonly JsonObjectType.Member[];
-    private readonly memberTypes;
-    constructor({ members, ...superParameters }: {
+    constructor({ members, shorthand, ...superParameters }: {
         members: readonly JsonObjectType.Member[];
+        shorthand: Maybe<JsonObjectType.Shorthand>;
     } & ConstructorParameters<typeof AbstractJsonType>[0]);
     protected get inlineExpression(): Code;
     protected get schemaExpression(): Code;
+    protected schemaTypeExpression({ unqualifiedName, }: {
+        unqualifiedName: string;
+    }): Code;
     private get uiSchemaFunctionExpression();
-    private memberType;
+    uiSchemaElement({ variables, }: Parameters<AbstractJsonType["uiSchemaElement"]>[0]): Maybe<Code>;
     protected moduleDeclarations(parameters: {
         unqualifiedName: string;
     }): Code[];
-    uiSchemaElement({ variables, }: Parameters<AbstractJsonType["uiSchemaElement"]>[0]): Maybe<Code>;
+    private memberType;
 }
 declare class JsonStringType extends AbstractJsonPrimitiveType<string> {
     private readonly format;
@@ -149,6 +152,7 @@ declare class JsonTypeFactory {
     }): JsonNumberType;
     createJsonObjectType(partialMembers: readonly JsonObjectType.PartialMember[] | Record<string, Omit<JsonObjectType.PartialMember, "name">>, options?: {
         name?: AbstractJsonType.Name;
+        shorthand?: JsonObjectType.Shorthand;
         snippet?: Snippet;
     }): JsonObjectType;
     createJsonStringType(options?: {
@@ -163,6 +167,12 @@ declare class JsonTypeFactory {
 type JsonType = JsonArrayType | JsonBooleanType | JsonDiscriminatedUnionType | JsonIntersectionType | JsonNumberType | JsonObjectType | JsonStringType;
 export type AbstractType_JsonType = JsonType;
 export type AbstractType_JsonTypeFactory = JsonTypeFactory;
+declare namespace JsonDiscriminatedUnionType {
+    interface Member {
+        readonly discriminantValue: number | string;
+        readonly type: JsonIntersectionType | JsonObjectType;
+    }
+}
 export declare namespace AbstractJsonType {
     type Name = readonly string[];
 }
@@ -192,6 +202,19 @@ declare namespace JsonObjectType {
         recursive?: boolean;
         uiSchemaElement?: Maybe<MemberUiSchemaElementFunction> | MemberUiSchemaElementFunction;
     };
+    /**
+     * Shorthand for the object type, such as a string that can be transformed into the object.
+     */
+    export interface Shorthand {
+        /**
+         * Zod-compatible transformer that takes an instance of the shorthand type and transforms it to an instance of the object type.
+         */
+        readonly transformer: Callable;
+        /**
+         * Shorthand type, such as a JSON string.
+         */
+        readonly type: JsonType;
+    }
     export {};
 }
 declare namespace JsonStringType {