@shaclmate/compiler 4.0.38 → 4.0.40

package/dist/generators/ts/AbstractLazyObjectType.d.ts

@@ -1,7 +1,7 @@
 import { Maybe } from "purify-ts";
 import { AbstractType } from "./AbstractType.js";
-import type { NamedObjectType } from "./NamedObjectType.js";
-import type { NamedObjectUnionType } from "./NamedObjectUnionType.js";
+import type { ObjectType } from "./ObjectType.js";
+import type { ObjectUnionType } from "./ObjectUnionType.js";
 import type { OptionType } from "./OptionType.js";
 import type { SetType } from "./SetType.js";
 import { type Code } from "./ts-poet-wrapper.js";
@@ -16,6 +16,7 @@ export declare abstract class AbstractLazyObjectType<PartialTypeT extends Abstra
     readonly declaration: Maybe<Code>;
     readonly discriminantProperty: AbstractType["discriminantProperty"];
     readonly mutable = false;
+    readonly referencesObjectType = true;
     readonly typeofs: "object"[];
     readonly validationFunction: Maybe<Code>;
     constructor({ partialType, resolveType, ...superParameters }: {
@@ -23,41 +24,37 @@ export declare abstract class AbstractLazyObjectType<PartialTypeT extends Abstra
         resolveType: ResolveTypeT;
     } & ConstructorParameters<typeof AbstractType>[0]);
     get equalsFunction(): Code;
-    get hashFunction(): Code;
+    get expression(): Code;
     get filterFunction(): Code;
     get filterType(): Code;
     get graphqlType(): AbstractType.GraphqlType;
-    get name(): Code;
+    get hashFunction(): Code;
     get recursive(): boolean;
-    get schema(): Code;
     get schemaType(): Code;
     get toRdfResourceValueTypes(): AbstractType["toRdfResourceValueTypes"];
     get valueSparqlConstructTriplesFunction(): Code;
     get valueSparqlWherePatternsFunction(): Code;
-    protected get schemaObject(): {
-        partial: Code;
-        kind: Code;
-    };
+    protected get schemaInitializers(): readonly Code[];
     jsonSchema(parameters: Parameters<AbstractType["jsonSchema"]>[0]): Code;
     jsonType(parameters?: Parameters<AbstractType["jsonType"]>[0]): AbstractType.JsonType;
     jsonUiSchemaElement(parameters: Parameters<AbstractType["jsonUiSchemaElement"]>[0]): Maybe<Code>;
     toJsonExpression({ variables, }: Parameters<AbstractType["toJsonExpression"]>[0]): Code;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractType["toRdfResourceValuesExpression"]>[0]): Code;
     toStringExpression({ variables, }: Parameters<AbstractType["toStringExpression"]>[0]): Code;
-    protected resolvedNamedObjectUnionTypeToPartialNamedObjectUnionTypeConversion({ resolvedNamedObjectUnionType, partialNamedObjectUnionType, variables, }: {
-        resolvedNamedObjectUnionType: NamedObjectUnionType;
-        partialNamedObjectUnionType: NamedObjectUnionType;
-        variables: {
-            resolvedObjectUnion: Code;
-        };
-    }): Code;
     protected resolveToPartialFunction<ObjectTypeT extends AbstractLazyObjectType.ObjectTypeConstraint>({ partialType, resolveType, }: {
         partialType: ObjectTypeT;
         resolveType: ObjectTypeT;
     }): Code;
+    protected resolvedObjectUnionTypeToPartialObjectUnionTypeConversion({ resolvedObjectUnionType, partialObjectUnionType, variables, }: {
+        resolvedObjectUnionType: ObjectUnionType;
+        partialObjectUnionType: ObjectUnionType;
+        variables: {
+            resolvedObjectUnion: Code;
+        };
+    }): Code;
 }
 export declare namespace AbstractLazyObjectType {
-    type ObjectTypeConstraint = NamedObjectType | NamedObjectUnionType;
+    type ObjectTypeConstraint = ObjectType | ObjectUnionType;
     type PartialTypeConstraint = ObjectTypeConstraint | OptionType<ObjectTypeConstraint> | SetType<ObjectTypeConstraint>;
     type ResolveTypeConstraint = PartialTypeConstraint;
     type ConversionFunction = AbstractType.ConversionFunction;

package/dist/generators/ts/AbstractLazyObjectType.js

@@ -8,7 +8,6 @@ import { Maybe } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
 import { AbstractType } from "./AbstractType.js";
-import { removeUndefined } from "./removeUndefined.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
 export class AbstractLazyObjectType extends AbstractType {
     partialType;
@@ -16,6 +15,7 @@ export class AbstractLazyObjectType extends AbstractType {
     declaration = Maybe.empty();
     discriminantProperty = Maybe.empty();
     mutable = false;
+    referencesObjectType = true;
     typeofs = ["object"];
     validationFunction = Maybe.empty();
     constructor({ partialType, resolveType, ...superParameters }) {
@@ -26,11 +26,11 @@ export class AbstractLazyObjectType extends AbstractType {
     get equalsFunction() {
         return code `((left, right) => ${this.partialType.equalsFunction}(left.${this.runtimeClass.partialPropertyName}, right.${this.runtimeClass.partialPropertyName}))`;
     }
-    get hashFunction() {
-        return code `((hasher, value) => ${this.partialType.hashFunction}(hasher, value.${this.runtimeClass.partialPropertyName}))`;
+    get expression() {
+        return this.runtimeClass.name;
     }
     get filterFunction() {
-        return code `((filter: ${this.filterType}, value: ${this.name}) => ${this.partialType.filterFunction}(filter, value.${this.runtimeClass.partialPropertyName}))`;
+        return code `((filter: ${this.filterType}, value: ${this.expression}) => ${this.partialType.filterFunction}(filter, value.${this.runtimeClass.partialPropertyName}))`;
     }
     get filterType() {
         return this.partialType.filterType;
@@ -38,38 +38,29 @@ export class AbstractLazyObjectType extends AbstractType {
     get graphqlType() {
         return this.resolveType.graphqlType;
     }
-    get name() {
-        return this.runtimeClass.name;
+    get hashFunction() {
+        return code `((hasher, value) => ${this.partialType.hashFunction}(hasher, value.${this.runtimeClass.partialPropertyName}))`;
     }
     get recursive() {
         return this.partialType.recursive;
     }
-    get schema() {
-        return code `${removeUndefined(this.schemaObject)}`;
-    }
     get schemaType() {
         return code `${{
             kind: this.kind,
             partialType: this.partialType.schemaType,
-            resolveType: this.resolveType.schemaType,
         }}`;
     }
     get toRdfResourceValueTypes() {
         return this.partialType.toRdfResourceValueTypes;
     }
     get valueSparqlConstructTriplesFunction() {
-        return code `(({ schema, ...otherParameters }) => ${this.partialType.valueSparqlConstructTriplesFunction}({ ...otherParameters, schema: schema.partial() }))`;
+        return code `(({ schema, ...otherParameters }) => ${this.partialType.valueSparqlConstructTriplesFunction}({ ...otherParameters, schema: schema.partialType }))`;
     }
     get valueSparqlWherePatternsFunction() {
-        return code `(({ schema, ...otherParameters }) => ${this.partialType.valueSparqlWherePatternsFunction}({ ...otherParameters, schema: schema.partial() }))`;
+        return code `(({ schema, ...otherParameters }) => ${this.partialType.valueSparqlWherePatternsFunction}({ ...otherParameters, schema: schema.partialType }))`;
     }
-    get schemaObject() {
-        return {
-            ...super.schemaObject,
-            partial: code `() => (${this.partialType.schema})`,
-            // Commenting out to reduce schema size
-            // resolved: code`() => (${this.resolveType.schema})`,
-        };
+    get schemaInitializers() {
+        return super.schemaInitializers.concat(code `get partialType() { return ${this.partialType.schema}; }`);
     }
     jsonSchema(parameters) {
         return this.partialType.jsonSchema(parameters);
@@ -102,41 +93,38 @@ export class AbstractLazyObjectType extends AbstractType {
             },
         });
     }
-    resolvedNamedObjectUnionTypeToPartialNamedObjectUnionTypeConversion({ resolvedNamedObjectUnionType, partialNamedObjectUnionType, variables, }) {
-        invariant(resolvedNamedObjectUnionType.members.length ===
-            partialNamedObjectUnionType.members.length);
-        const caseBlocks = resolvedNamedObjectUnionType.members.map(({ discriminantValues }, memberI) => {
-            return code `${discriminantValues.map((discriminantPropertyValue) => `case "${discriminantPropertyValue}":`).join("\n")} return ${partialNamedObjectUnionType.members[memberI].type.name}.create(${variables.resolvedObjectUnion});`;
-        });
-        caseBlocks.push(code `default: ${variables.resolvedObjectUnion} satisfies never; throw new Error("unrecognized type");`);
-        return code `switch (${variables.resolvedObjectUnion}.${resolvedNamedObjectUnionType.discriminantProperty.unsafeCoerce().name}) { ${joinCode(caseBlocks)} }`;
-    }
     resolveToPartialFunction({ partialType, resolveType, }) {
-        if (partialType.kind === "NamedObjectType") {
-            return code `${partialType.name}.createUnsafe`;
+        if (partialType.kind === "Object") {
+            return code `${partialType.alias.unsafeCoerce()}.createUnsafe`;
         }
-        invariant(partialType.kind === "NamedObjectUnionType");
-        invariant(resolveType.kind === "NamedObjectUnionType");
+        invariant(partialType.kind === "ObjectUnion");
+        invariant(resolveType.kind === "ObjectUnion");
         invariant(partialType.members.length === resolveType.members.length);
         const caseBlocks = resolveType.members.map(({ discriminantValues }, memberI) => {
-            return code `${discriminantValues.map((discriminantPropertyValue) => `case "${discriminantPropertyValue}":`).join("\n")} return ${partialType.members[memberI].type.name}.createUnsafe(resolved);`;
+            return code `${discriminantValues.map((discriminantPropertyValue) => `case "${discriminantPropertyValue}":`).join("\n")} return ${partialType.members[memberI].type.alias.unsafeCoerce()}.createUnsafe(resolved);`;
         });
         caseBlocks.push(code `default: resolved satisfies never; throw new Error("unrecognized type");`);
-        return code `((resolved: ${resolveType.name}) => { switch (resolved.${resolveType.discriminantProperty.unsafeCoerce().name}) { ${joinCode(caseBlocks)} } })`;
+        return code `((resolved: ${resolveType.expression}) => { switch (resolved.${resolveType.discriminantProperty.unsafeCoerce().name}) { ${joinCode(caseBlocks)} } })`;
+    }
+    resolvedObjectUnionTypeToPartialObjectUnionTypeConversion({ resolvedObjectUnionType, partialObjectUnionType, variables, }) {
+        invariant(resolvedObjectUnionType.members.length ===
+            partialObjectUnionType.members.length);
+        const caseBlocks = resolvedObjectUnionType.members.map(({ discriminantValues }, memberI) => {
+            return code `${discriminantValues.map((discriminantPropertyValue) => `case "${discriminantPropertyValue}":`).join("\n")} return ${partialObjectUnionType.members[memberI].type.alias.unsafeCoerce()}.create(${variables.resolvedObjectUnion});`;
+        });
+        caseBlocks.push(code `default: ${variables.resolvedObjectUnion} satisfies never; throw new Error("unrecognized type");`);
+        return code `switch (${variables.resolvedObjectUnion}.${resolvedObjectUnionType.discriminantProperty.unsafeCoerce().name}) { ${joinCode(caseBlocks)} }`;
     }
 }
 __decorate([
     Memoize()
 ], AbstractLazyObjectType.prototype, "equalsFunction", null);
-__decorate([
-    Memoize()
-], AbstractLazyObjectType.prototype, "hashFunction", null);
 __decorate([
     Memoize()
 ], AbstractLazyObjectType.prototype, "filterFunction", null);
 __decorate([
     Memoize()
-], AbstractLazyObjectType.prototype, "schema", null);
+], AbstractLazyObjectType.prototype, "hashFunction", null);
 __decorate([
     Memoize()
 ], AbstractLazyObjectType.prototype, "schemaType", null);

package/dist/generators/ts/AbstractLiteralType.d.ts

@@ -8,11 +8,7 @@ export declare abstract class AbstractLiteralType extends AbstractTermType<Liter
         languageIn: readonly string[];
     } & ConstructorParameters<typeof AbstractTermType<Literal, Literal>>[0]);
     get constrained(): boolean;
-    protected get schemaObject(): {
-        languageIn: import("ts-poet/build/Node.js").Node[] | undefined;
-        in: Code | undefined;
-        kind: Code;
-    };
+    protected get schemaInitializers(): readonly Code[];
     /**
      * An expression that converts a compile-time RDF/JS Literal into a runtime TypeScript literal.
      *

package/dist/generators/ts/AbstractLiteralType.js

@@ -1,5 +1,5 @@
 import { AbstractTermType } from "./AbstractTermType.js";
-import { code, literalOf } from "./ts-poet-wrapper.js";
+import { arrayOf, code } from "./ts-poet-wrapper.js";
 export class AbstractLiteralType extends AbstractTermType {
     languageIn;
     nodeKinds = nodeKinds;
@@ -10,11 +10,12 @@ export class AbstractLiteralType extends AbstractTermType {
     get constrained() {
         return super.constrained || this.languageIn.length > 0;
     }
-    get schemaObject() {
-        return {
-            ...super.schemaObject,
-            languageIn: this.languageIn.length > 0 ? this.languageIn.map(literalOf) : undefined,
-        };
+    get schemaInitializers() {
+        let initializers = super.schemaInitializers;
+        if (this.languageIn.length > 0) {
+            initializers = initializers.concat(code `languageIn: ${arrayOf(...this.languageIn)}`);
+        }
+        return initializers;
     }
     fromRdfResourceValuesExpressionChain({ variables, }) {
         return {

package/dist/generators/ts/AbstractNumericType.d.ts

@@ -5,10 +5,10 @@ import { type Code } from "./ts-poet-wrapper.js";
  */
 export declare abstract class AbstractNumericType<ValueT extends bigint | number> extends AbstractPrimitiveType<ValueT> {
     readonly hashFunction: Code;
-    abstract readonly kind: "BigIntType" | "FloatType" | "IntType";
+    abstract readonly kind: "BigInt" | "Float" | "Int";
     get filterFunction(): Code;
     get filterType(): Code;
-    get name(): Code | string;
+    get expression(): Code;
     get schemaType(): Code;
     get valueSparqlWherePatternsFunction(): Code;
     jsonSchema(_parameters: Parameters<AbstractPrimitiveType<ValueT>["jsonSchema"]>[0]): Code;

package/dist/generators/ts/AbstractNumericType.js

@@ -18,11 +18,11 @@ export class AbstractNumericType extends AbstractPrimitiveType {
     get filterType() {
         return code `${this.reusables.snippets.NumericFilter}<${this.typeofs[0]}>`;
     }
-    get name() {
+    get expression() {
         if (this.primitiveIn.length > 0) {
             return code `${joinCode(this.primitiveIn.map((value) => this.literalExpression(value)), { on: " | " })}`;
         }
-        return this.typeofs[0];
+        return code `${this.typeofs[0]}`;
     }
     get schemaType() {
         return code `${this.reusables.snippets.NumericSchema}<${this.typeofs[0]}>`;
@@ -62,7 +62,7 @@ __decorate([
 ], AbstractNumericType.prototype, "filterType", null);
 __decorate([
     Memoize()
-], AbstractNumericType.prototype, "name", null);
+], AbstractNumericType.prototype, "expression", null);
 __decorate([
     Memoize()
 ], AbstractNumericType.prototype, "schemaType", null);

package/dist/generators/ts/AbstractObjectSetType.d.ts

@@ -1,6 +1,7 @@
+import type { Maybe } from "purify-ts";
 import type { Logger } from "ts-log";
-import type { NamedObjectType } from "./NamedObjectType.js";
-import type { NamedObjectUnionType } from "./NamedObjectUnionType.js";
+import type { ObjectType } from "./ObjectType.js";
+import type { ObjectUnionType } from "./ObjectUnionType.js";
 import type { Reusables } from "./Reusables.js";
 import type { TsGenerator } from "./TsGenerator.js";
 import { type Code } from "./ts-poet-wrapper.js";
@@ -8,25 +9,25 @@ export declare abstract class AbstractObjectSetType {
     protected readonly configuration: TsGenerator.Configuration;
     protected readonly logger: Logger;
     protected readonly reusables: Reusables;
-    protected readonly namedObjectTypes: readonly NamedObjectType[];
-    protected readonly namedObjectUnionTypes: readonly NamedObjectUnionType[];
+    protected readonly namedObjectTypes: readonly ObjectType[];
+    protected readonly namedObjectUnionTypes: readonly ObjectUnionType[];
     constructor({ configuration, logger, namedObjectTypes, namedObjectUnionTypes, reusables, }: {
         configuration: TsGenerator.Configuration;
         logger: Logger;
-        namedObjectTypes: readonly NamedObjectType[];
-        namedObjectUnionTypes: readonly NamedObjectUnionType[];
+        namedObjectTypes: readonly ObjectType[];
+        namedObjectUnionTypes: readonly ObjectUnionType[];
         reusables: Reusables;
     });
     abstract readonly declaration: Code;
     protected methodSignatures(namedObjectType: {
+        readonly alias: Maybe<string>;
         readonly filterType: Code;
         readonly identifierTypeAlias: Code;
-        readonly objectSetMethodNames: NamedObjectType.ObjectSetMethodNames;
-        readonly name: string;
+        readonly objectSetMethodNames: ObjectType.ObjectSetMethodNames;
     }, options?: {
         parameterNamePrefix?: string;
         queryT?: string;
-    }): Readonly<Record<keyof NamedObjectType.ObjectSetMethodNames, {
+    }): Readonly<Record<keyof ObjectType.ObjectSetMethodNames, {
         readonly name: string;
         readonly parameters: Code;
         readonly returnType: Code;

package/dist/generators/ts/AbstractObjectSetType.js

@@ -21,7 +21,7 @@ export class AbstractObjectSetType {
             object: {
                 name: methodNames.object,
                 parameters: code `${parameterNamePrefix}identifier: ${namedObjectType.identifierTypeAlias}, options?: { preferredLanguages?: readonly string[]; }`,
-                returnType: code `Promise<${this.reusables.imports.Either}<Error, ${namedObjectType.name}>>`,
+                returnType: code `Promise<${this.reusables.imports.Either}<Error, ${namedObjectType.alias.unsafeCoerce()}>>`,
             },
             objectCount: {
                 name: methodNames.objectCount,
@@ -36,7 +36,7 @@ export class AbstractObjectSetType {
             objects: {
                 name: methodNames.objects,
                 parameters: code `${parameterNamePrefix}query?: ${queryT}<${namedObjectType.filterType}, ${namedObjectType.identifierTypeAlias}>`,
-                returnType: code `Promise<${this.reusables.imports.Either}<Error, readonly ${namedObjectType.name}[]>>`,
+                returnType: code `Promise<${this.reusables.imports.Either}<Error, readonly ${namedObjectType.alias.unsafeCoerce()}[]>>`,
             },
         };
     }

package/dist/generators/ts/AbstractPrimitiveType.d.ts

@@ -6,18 +6,14 @@ export declare abstract class AbstractPrimitiveType<ValueT extends bigint | bool
     protected readonly datatype: NamedNode;
     readonly conversionFunction: Maybe<AbstractLiteralType.ConversionFunction>;
     readonly equalsFunction: Code;
-    abstract readonly kind: "BigIntType" | "BooleanType" | "DateTimeType" | "DateType" | "FloatType" | "IntType" | "NumberType" | "StringType";
+    abstract readonly kind: "BigInt" | "Boolean" | "DateTime" | "Date" | "Float" | "Int" | "NumberType" | "String";
     readonly primitiveIn: readonly ValueT[];
     constructor({ datatype, primitiveIn, ...superParameters }: {
         datatype: NamedNode;
         primitiveIn: readonly ValueT[];
     } & ConstructorParameters<typeof AbstractLiteralType>[0]);
     get discriminantProperty(): Maybe<AbstractLiteralType.DiscriminantProperty>;
-    protected get schemaObject(): {
-        in: Code | undefined;
-        languageIn: import("ts-poet/build/Node.js").Node[] | undefined;
-        kind: Code;
-    };
+    protected get schemaInitializers(): readonly Code[];
     fromJsonExpression({ variables, }: Parameters<AbstractLiteralType["fromJsonExpression"]>[0]): Code;
     graphqlResolveExpression({ variables, }: Parameters<AbstractLiteralType["graphqlResolveExpression"]>[0]): Code;
     jsonType(): AbstractLiteralType.JsonType;

package/dist/generators/ts/AbstractPrimitiveType.js

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
 import { AbstractLiteralType } from "./AbstractLiteralType.js";
-import { code, joinCode } from "./ts-poet-wrapper.js";
+import { arrayOf, code } from "./ts-poet-wrapper.js";
 export class AbstractPrimitiveType extends AbstractLiteralType {
     datatype;
     conversionFunction = Maybe.empty();
@@ -21,22 +21,21 @@ export class AbstractPrimitiveType extends AbstractLiteralType {
     get discriminantProperty() {
         return Maybe.empty();
     }
-    get schemaObject() {
-        return {
-            ...super.schemaObject,
-            in: this.primitiveIn.length > 0
-                ? code `[${joinCode(this.primitiveIn.map((in_) => this.literalExpression(in_)), { on: ", " })}] as const`
-                : undefined,
-        };
+    get schemaInitializers() {
+        let initializers = super.schemaInitializers;
+        if (this.primitiveIn.length > 0) {
+            initializers = initializers.concat(code `in: ${arrayOf(...this.primitiveIn.map((in_) => this.literalExpression(in_)))}`);
+        }
+        return initializers;
     }
     fromJsonExpression({ variables, }) {
-        return code `${this.reusables.imports.Either}.of<Error, ${this.name}>(${variables.value})`;
+        return code `${this.reusables.imports.Either}.of<Error, ${this.expression}>(${variables.value})`;
     }
     graphqlResolveExpression({ variables, }) {
         return variables.value;
     }
     jsonType() {
-        return new AbstractLiteralType.JsonType(this.name);
+        return new AbstractLiteralType.JsonType(this.expression);
     }
     toJsonExpression({ variables, }) {
         return variables.value;

package/dist/generators/ts/AbstractTermType.d.ts

@@ -23,6 +23,7 @@ export declare abstract class AbstractTermType<ConstantTermT extends Literal | N
     readonly mutable: boolean;
     abstract readonly nodeKinds: ReadonlySet<NodeKind>;
     readonly recursive = false;
+    readonly referencesObjectType = false;
     readonly typeofs: readonly Typeof[];
     readonly validationFunction: Maybe<Code>;
     constructor({ hasValues, in_, ...superParameters }: {
@@ -31,11 +32,6 @@ export declare abstract class AbstractTermType<ConstantTermT extends Literal | N
     } & ConstructorParameters<typeof AbstractType>[0]);
     get constrained(): boolean;
     get discriminantProperty(): Maybe<AbstractType.DiscriminantProperty>;
-    get schema(): Code;
-    protected get schemaObject(): {
-        in: Code | undefined;
-        kind: Code;
-    };
     get termTypes(): ReadonlySet<"BlankNode" | "Literal" | "NamedNode">;
     get toRdfResourceValueTypes(): Set<"BlankNode" | "Literal" | "NamedNode">;
     get valueSparqlConstructTriplesFunction(): Code;

package/dist/generators/ts/AbstractTermType.js

@@ -8,7 +8,6 @@ import { NodeKind } from "@shaclmate/shacl-ast";
 import { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
 import { AbstractType } from "./AbstractType.js";
-import { removeUndefined } from "./removeUndefined.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
 /**
  * Abstract base class for IdentifierType and LiteralType.
@@ -27,6 +26,7 @@ export class AbstractTermType extends AbstractType {
     in_;
     mutable = false;
     recursive = false;
+    referencesObjectType = false;
     typeofs = ["object"];
     validationFunction = Maybe.empty();
     constructor({ hasValues, in_, ...superParameters }) {
@@ -46,17 +46,6 @@ export class AbstractTermType extends AbstractType {
             type: "string",
         });
     }
-    get schema() {
-        return code `${removeUndefined(this.schemaObject)}`;
-    }
-    get schemaObject() {
-        return {
-            ...super.schemaObject,
-            in: this.in_.length > 0
-                ? code `[${joinCode(this.in_.map((in_) => this.rdfjsTermExpression(in_)), { on: ", " })}] as const`
-                : undefined,
-        };
-    }
     get termTypes() {
         return new Set([...this.nodeKinds].map(NodeKind.toTermType));
     }
@@ -106,11 +95,11 @@ export class AbstractTermType extends AbstractType {
             valueToExpression = code `value.toTerm([${joinCode(this.in_.map((in_) => this.rdfjsTermExpression(in_)), { on: ", " })}])`;
         }
         else if (this.nodeKinds.size < 3) {
-            const eitherTypeParameters = code `<Error, ${this.name}>`;
+            const eitherTypeParameters = code `<Error, ${this.expression}>`;
             valueToExpression = code `value.toTerm().chain(term => {
   switch (term.termType) {
   ${[...this.nodeKinds].map((nodeKind) => `case "${NodeKind.toTermType(nodeKind)}":`).join("\n")} return ${this.reusables.imports.Either}.of${eitherTypeParameters}(term);
-  default: return ${this.reusables.imports.Left}${eitherTypeParameters}(new ${this.reusables.imports.Resource}.MistypedTermValueError(${{ actualValue: code `term`, expectedValueType: code `${this.name}`.toCodeString([]), focusResource: variables.resource, propertyPath: variables.propertyPath }}));
+  default: return ${this.reusables.imports.Left}${eitherTypeParameters}(new ${this.reusables.imports.Resource}.MistypedTermValueError(${{ actualValue: code `term`, expectedValueType: code `${this.expression}`.toCodeString([]), focusResource: variables.resource, propertyPath: variables.propertyPath }}));
   }})`;
         }
         else {
@@ -128,9 +117,6 @@ chain(values => ${this.reusables.imports.Either}.sequence([${joinCode(this.hasVa
 __decorate([
     Memoize()
 ], AbstractTermType.prototype, "discriminantProperty", null);
-__decorate([
-    Memoize()
-], AbstractTermType.prototype, "schema", null);
 __decorate([
     Memoize()
 ], AbstractTermType.prototype, "termTypes", null);

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

@@ -12,6 +12,10 @@ export declare abstract class AbstractType {
     protected readonly configuration: TsGenerator.Configuration;
     protected readonly logger: Logger;
     protected readonly reusables: Reusables;
+    /**
+     * Alias for this type.
+     */
+    readonly alias: Maybe<string>;
     /**
      * Comment from rdfs:comment.
      */
@@ -39,6 +43,10 @@ export declare abstract class AbstractType {
      * $EqualsResult.
      */
     abstract readonly equalsFunction: Code;
+    /**
+     * TypeScript type expression.
+     */
+    abstract readonly expression: Code;
     /**
      * A function (reference or declaration) that takes a filter of filterType (below) and a value of this type
      * and returns true if the value passes the filter.
@@ -74,18 +82,14 @@ export declare abstract class AbstractType {
      * Is a value of this type mutable?
      */
     abstract readonly mutable: boolean;
-    /**
-     * TypeScript name of the type.
-     */
-    abstract readonly name: Code | string;
     /**
      * Does this type directly or indirectly reference itself?
      */
     abstract readonly recursive: boolean;
     /**
-     * TypeScript object describing this type, for runtime use.
+     * Is this type an ObjectType or does it reference an object type?
      */
-    abstract readonly schema: Code;
+    abstract readonly referencesObjectType: boolean;
     /**
      * TypeScript type describing .schema.
      */
@@ -133,19 +137,22 @@ export declare abstract class AbstractType {
      * - variablePrefix: string prefix to use for new variables
      */
     abstract readonly valueSparqlWherePatternsFunction: Code;
-    constructor({ comment, configuration, label, logger, reusables, }: {
+    constructor({ alias, comment, configuration, label, logger, reusables, }: {
+        alias: Maybe<string>;
         comment: Maybe<string>;
         configuration: TsGenerator.Configuration;
         label: Maybe<string>;
         logger: Logger;
         reusables: Reusables;
     });
+    /**
+     * TypeScript object describing this type, for runtime use.
+     */
+    get schema(): Code;
     /**
      * Helper to compose the result of schema along the type hierarchy.
      */
-    protected get schemaObject(): {
-        kind: Code;
-    };
+    protected get schemaInitializers(): readonly Code[];
     /**
      * An expression that converts this type's JSON type to an Either<Error, ThisType>.
      */
@@ -158,7 +165,7 @@ export declare abstract class AbstractType {
      * An expression that converts a Either<Error, rdfjsResource.Resource.Values> to a
      * Either<Error, rdfjsResource.Resource.Values<this type>>.
      *
-     * These expressions are used to deserialize property values in an NamedObjectType, either directly (a property with this Type) or indirectly (a property with a Type like OptionType
+     * These expressions are used to deserialize property values in an ObjectType, either directly (a property with this Type) or indirectly (a property with a Type like OptionType
      * that has a type parameter of this Type).
      *
      * Some types need to filter on the set of all objects/values of a (subject, predicate). For example, all sh:hasValue values must be present in the set for any values
@@ -167,7 +174,7 @@ export declare abstract class AbstractType {
      * Values may also need to be sorted. For example, specifying preferredLanguages should sort the values in the order of the specified languages so that the first value
      * (if it exists) is always of the first preferred language.
      *
-     * variables are runtime variables, most derived from the parameters of the NamedObjectType's fromRdf function:
+     * variables are runtime variables, most derived from the parameters of the ObjectType's fromRdf function:
      *   context: unanticipated properties (...) passed to Object.fromRdf
      *   graph: DefaultGraph | NamedNode | undefined to match (subject, predicate, object) triples in; if undefined, match triples in all graphs
      *   ignoreRdfType: whether the RDF type of objects/object unions should be ignored
@@ -202,7 +209,7 @@ export declare abstract class AbstractType {
      * Zod schema for the JSON type of this type.
      *
      * This method is called in two contexts:
-     * "property": from a ShaclProperty, while generating the z.object properties of an NamedObjectType
+     * "property": from a ShaclProperty, while generating the z.object properties of an ObjectType
      * "type": from another Type e.g., an OptionType or UnionType
      *
      * z.lazy() should only be returned for "property".
@@ -239,7 +246,7 @@ export declare abstract class AbstractType {
      * An expression that converts a property value of this type to a value or an array of values that can be .add'd to a Resource with
      *   resource.add(predicate, convertedValue, graph)
      *
-     * variables are runtime variables, most derived from the parameters of the NamedObjectType's fromRdf function:
+     * variables are runtime variables, most derived from the parameters of the ObjectType's fromRdf function:
      *   graph: DefaultGraph | NamedNode | undefined to .add to; if undefined, add to the default graph
      *   propertyPath: predicate path (NamedNode) or InversePath on a predicate path
      *   resource: the Resource to .add to
@@ -269,7 +276,7 @@ export declare namespace AbstractType {
     interface ConversionFunction {
         readonly code: Code;
         readonly sourceTypes: {
-            readonly name: Code | string;
+            readonly expression: Code;
             readonly typeof: Typeof;
         }[];
     }