@shaclmate/compiler 4.0.39 → 4.0.41

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";
@@ -17,24 +17,24 @@ export declare abstract class AbstractLazyObjectType<PartialTypeT extends Abstra
     readonly discriminantProperty: AbstractType["discriminantProperty"];
     readonly mutable = false;
     readonly referencesObjectType = true;
-    readonly typeofs: "object"[];
     readonly validationFunction: Maybe<Code>;
     constructor({ partialType, resolveType, ...superParameters }: {
         partialType: PartialTypeT;
         resolveType: ResolveTypeT;
     } & ConstructorParameters<typeof AbstractType>[0]);
     get equalsFunction(): Code;
+    get expression(): Code;
     get filterFunction(): Code;
     get filterType(): Code;
     get graphqlType(): AbstractType.GraphqlType;
     get hashFunction(): Code;
-    get name(): Code;
+    get jsTypes(): readonly AbstractType.JsType[];
     get recursive(): boolean;
-    protected get schemaInitializers(): readonly Code[];
     get schemaType(): Code;
     get toRdfResourceValueTypes(): AbstractType["toRdfResourceValueTypes"];
     get valueSparqlConstructTriplesFunction(): Code;
     get valueSparqlWherePatternsFunction(): 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>;
@@ -45,16 +45,16 @@ export declare abstract class AbstractLazyObjectType<PartialTypeT extends Abstra
         partialType: ObjectTypeT;
         resolveType: ObjectTypeT;
     }): Code;
-    protected resolvedNamedObjectUnionTypeToPartialNamedObjectUnionTypeConversion({ resolvedNamedObjectUnionType, partialNamedObjectUnionType, variables, }: {
-        resolvedNamedObjectUnionType: NamedObjectUnionType;
-        partialNamedObjectUnionType: NamedObjectUnionType;
+    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

@@ -16,7 +16,6 @@ export class AbstractLazyObjectType extends AbstractType {
     discriminantProperty = Maybe.empty();
     mutable = false;
     referencesObjectType = true;
-    typeofs = ["object"];
     validationFunction = Maybe.empty();
     constructor({ partialType, resolveType, ...superParameters }) {
         super(superParameters);
@@ -26,8 +25,11 @@ export class AbstractLazyObjectType extends AbstractType {
     get equalsFunction() {
         return code `((left, right) => ${this.partialType.equalsFunction}(left.${this.runtimeClass.partialPropertyName}, right.${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,15 +40,18 @@ export class AbstractLazyObjectType extends AbstractType {
     get hashFunction() {
         return code `((hasher, value) => ${this.partialType.hashFunction}(hasher, value.${this.runtimeClass.partialPropertyName}))`;
     }
-    get name() {
-        return this.runtimeClass.name;
+    get jsTypes() {
+        return [
+            {
+                className: this.runtimeClass.rawName,
+                instanceof: "class",
+                typeof: "object",
+            },
+        ];
     }
     get recursive() {
         return this.partialType.recursive;
     }
-    get schemaInitializers() {
-        return super.schemaInitializers.concat(code `get partialType() { return ${this.partialType.schema}; }`);
-    }
     get schemaType() {
         return code `${{
             kind: this.kind,
@@ -62,6 +67,9 @@ export class AbstractLazyObjectType extends AbstractType {
     get valueSparqlWherePatternsFunction() {
         return code `(({ schema, ...otherParameters }) => ${this.partialType.valueSparqlWherePatternsFunction}({ ...otherParameters, schema: schema.partialType }))`;
     }
+    get schemaInitializers() {
+        return super.schemaInitializers.concat(code `get partialType() { return ${this.partialType.schema}; }`);
+    }
     jsonSchema(parameters) {
         return this.partialType.jsonSchema(parameters);
     }
@@ -94,26 +102,26 @@ export class AbstractLazyObjectType extends AbstractType {
         });
     }
     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 === "NamedObjectUnion");
-        invariant(resolveType.kind === "NamedObjectUnion");
+        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)} } })`;
     }
-    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});`;
+    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}.${resolvedNamedObjectUnionType.discriminantProperty.unsafeCoerce().name}) { ${joinCode(caseBlocks)} }`;
+        return code `switch (${variables.resolvedObjectUnion}.${resolvedObjectUnionType.discriminantProperty.unsafeCoerce().name}) { ${joinCode(caseBlocks)} }`;
     }
 }
 __decorate([
@@ -125,6 +133,9 @@ __decorate([
 __decorate([
     Memoize()
 ], AbstractLazyObjectType.prototype, "hashFunction", null);
+__decorate([
+    Memoize()
+], AbstractLazyObjectType.prototype, "jsTypes", null);
 __decorate([
     Memoize()
 ], AbstractLazyObjectType.prototype, "schemaType", null);

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

@@ -22,6 +22,7 @@ export declare namespace AbstractLiteralType {
     type DiscriminantProperty = AbstractTermType.DiscriminantProperty;
     const GraphqlType: typeof import("./AbstractType.js").AbstractType.GraphqlType;
     type GraphqlType = AbstractTermType.GraphqlType;
+    type JsType = AbstractTermType.JsType;
     const JsonType: typeof import("./AbstractType.js").AbstractType.JsonType;
     type JsonType = AbstractTermType.JsonType;
 }

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

@@ -8,7 +8,7 @@ export declare abstract class AbstractNumericType<ValueT extends bigint | number
     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

@@ -13,27 +13,27 @@ import { code, joinCode } from "./ts-poet-wrapper.js";
 export class AbstractNumericType extends AbstractPrimitiveType {
     hashFunction = code `${this.reusables.snippets.hashNumeric}`;
     get filterFunction() {
-        return code `${this.reusables.snippets.filterNumeric}<${this.typeofs[0]}>`;
+        return code `${this.reusables.snippets.filterNumeric}<${this.jsTypes[0].typeof}>`;
     }
     get filterType() {
-        return code `${this.reusables.snippets.NumericFilter}<${this.typeofs[0]}>`;
+        return code `${this.reusables.snippets.NumericFilter}<${this.jsTypes[0].typeof}>`;
     }
-    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.jsTypes[0].typeof}`;
     }
     get schemaType() {
-        return code `${this.reusables.snippets.NumericSchema}<${this.typeofs[0]}>`;
+        return code `${this.reusables.snippets.NumericSchema}<${this.jsTypes[0].typeof}>`;
     }
     get valueSparqlWherePatternsFunction() {
-        return code `${this.reusables.snippets.numericSparqlWherePatterns}<${this.typeofs[0]}>`;
+        return code `${this.reusables.snippets.numericSparqlWherePatterns}<${this.jsTypes[0].typeof}>`;
     }
     jsonSchema(_parameters) {
         switch (this.primitiveIn.length) {
             case 0:
-                return code `${this.reusables.imports.z}.${this.typeofs[0]}()`;
+                return code `${this.reusables.imports.z}.${this.jsTypes[0].typeof}()`;
             case 1:
                 return code `${this.reusables.imports.z}.literal(${this.literalExpression(this.primitiveIn[0])})`;
             default:
@@ -41,7 +41,7 @@ export class AbstractNumericType extends AbstractPrimitiveType {
         }
     }
     toRdfResourceValuesExpression({ variables, }) {
-        return code `[${this.reusables.snippets.literalFactory}.${this.typeofs[0]}(${variables.value}, ${this.rdfjsTermExpression(this.datatype)})]`;
+        return code `[${this.reusables.snippets.literalFactory}.${this.jsTypes[0].typeof}(${variables.value}, ${this.rdfjsTermExpression(this.datatype)})]`;
     }
     fromRdfResourceValuesExpressionChain({ variables, }) {
         return {
@@ -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

@@ -23,6 +23,7 @@ export declare abstract class AbstractPrimitiveType<ValueT extends bigint | bool
 export declare namespace AbstractPrimitiveType {
     type ConversionFunction = AbstractLiteralType.ConversionFunction;
     type DiscriminantProperty = AbstractLiteralType.DiscriminantProperty;
+    type JsType = AbstractLiteralType.JsType;
     const GraphqlType: typeof import("./AbstractType.js").AbstractType.GraphqlType;
     type GraphqlType = AbstractLiteralType.GraphqlType;
     const JsonType: typeof import("./AbstractType.js").AbstractType.JsonType;

package/dist/generators/ts/AbstractPrimitiveType.js

@@ -29,13 +29,13 @@ export class AbstractPrimitiveType extends AbstractLiteralType {
         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

@@ -3,7 +3,6 @@ import { NodeKind } from "@shaclmate/shacl-ast";
 import { Maybe } from "purify-ts";
 import { AbstractType } from "./AbstractType.js";
 import type { Type } from "./Type.js";
-import type { Typeof } from "./Typeof.js";
 import { type Code } from "./ts-poet-wrapper.js";
 /**
  * Abstract base class for IdentifierType and LiteralType.
@@ -24,7 +23,6 @@ export declare abstract class AbstractTermType<ConstantTermT extends Literal | N
     abstract readonly nodeKinds: ReadonlySet<NodeKind>;
     readonly recursive = false;
     readonly referencesObjectType = false;
-    readonly typeofs: readonly Typeof[];
     readonly validationFunction: Maybe<Code>;
     constructor({ hasValues, in_, ...superParameters }: {
         hasValues: readonly ConstantTermT[];
@@ -60,6 +58,7 @@ export declare namespace AbstractTermType {
     type DiscriminantProperty = AbstractType.DiscriminantProperty;
     const GraphqlType: typeof AbstractType.GraphqlType;
     type GraphqlType = AbstractType.GraphqlType;
+    type JsType = AbstractType.JsType;
     const JsonType: typeof AbstractType.JsonType;
     type JsonType = AbstractType.JsonType;
 }

package/dist/generators/ts/AbstractTermType.js

@@ -27,7 +27,6 @@ export class AbstractTermType extends AbstractType {
     mutable = false;
     recursive = false;
     referencesObjectType = false;
-    typeofs = ["object"];
     validationFunction = Maybe.empty();
     constructor({ hasValues, in_, ...superParameters }) {
         super(superParameters);
@@ -39,10 +38,9 @@ export class AbstractTermType extends AbstractType {
     }
     get discriminantProperty() {
         return Maybe.of({
-            descendantValues: [],
             jsonName: "termType",
             name: "termType",
-            ownValues: [...this.nodeKinds].map(NodeKind.toTermType),
+            values: [...this.nodeKinds].map(NodeKind.toTermType),
             type: "string",
         });
     }
@@ -95,11 +93,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 {

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

@@ -3,7 +3,6 @@ import type { Logger } from "ts-log";
 import type { Reusables } from "./Reusables.js";
 import { rdfjsTermExpression } from "./rdfjsTermExpression.js";
 import type { TsGenerator } from "./TsGenerator.js";
-import type { Typeof } from "./Typeof.js";
 import { type Code } from "./ts-poet-wrapper.js";
 /**
  * Abstract base class all types.
@@ -12,6 +11,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 +42,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.
@@ -62,6 +69,10 @@ export declare abstract class AbstractType {
      * A function (reference or declaration) that takes a  Hasher and a value of this type, calls hasher.update on the value, and returns the Hasher.
      */
     abstract readonly hashFunction: Code;
+    /**
+     * JavaScript type(s) the type.
+     */
+    abstract readonly jsTypes: readonly AbstractType.JsType[];
     /**
      * Type discriminant.
      */
@@ -74,10 +85,6 @@ 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?
      */
@@ -94,10 +101,6 @@ export declare abstract class AbstractType {
      * The type(s) of the array elements produced by the toRdfResourceValuesExpression.
      */
     abstract readonly toRdfResourceValueTypes: ReadonlySet<"BlankNode" | "NamedNode" | "Literal">;
-    /**
-     * JavaScript typeof(s) the type.
-     */
-    abstract readonly typeofs: readonly Typeof[];
     /**
      * Function that takes
      * - a schema of this.schemaType
@@ -133,7 +136,8 @@ 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>;
@@ -160,7 +164,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
@@ -169,7 +173,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
@@ -204,7 +208,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".
@@ -241,7 +245,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
@@ -271,15 +275,14 @@ export declare namespace AbstractType {
     interface ConversionFunction {
         readonly code: Code;
         readonly sourceTypes: {
-            readonly name: Code | string;
-            readonly typeof: Typeof;
+            readonly expression: Code;
+            readonly jsType: JsType;
         }[];
     }
     interface DiscriminantProperty {
-        readonly descendantValues: readonly DiscriminantProperty.Value[];
         readonly jsonName: string;
         readonly name: string;
-        readonly ownValues: readonly DiscriminantProperty.Value[];
+        readonly values: readonly DiscriminantProperty.Value[];
     }
     namespace DiscriminantProperty {
         type Value = number | string;
@@ -290,14 +293,46 @@ export declare namespace AbstractType {
          */
         readonly nullable: boolean;
         /**
-         * The name of the type when it's nullable -- so it should never include "new graphql.GraphQLNonNull(...)" around it.
+         * The expression of the type when it's nullable -- so it should never include "new graphql.GraphQLNonNull(...)" around it.
          */
-        readonly nullableName: Code;
+        readonly nullableExpression: Code;
         private readonly reusables;
-        constructor(nullableName: Code, reusables: Reusables, options?: {
+        constructor(nullableExpression: Code, reusables: Reusables, options?: {
             nullable: boolean;
         });
-        get name(): Code;
+        get expression(): Code;
+    }
+    type JsType = {
+        typeof: "bigint";
+    } | {
+        typeof: "boolean";
+    } | {
+        typeof: "function";
+    } | {
+        typeof: "number";
+    } | {
+        instanceof: "Array";
+        typeof: "object";
+    } | {
+        className: Code;
+        instanceof: "class";
+        typeof: "object";
+    } | {
+        instanceof: "Date";
+        typeof: "object";
+    } | {
+        instanceof: "Maybe";
+        typeof: "object";
+    } | {
+        instanceof: "Object";
+        typeof: "object";
+    } | {
+        typeof: "string";
+    } | {
+        typeof: "undefined";
+    };
+    namespace JsType {
+        function equals(left: JsType, right: JsType): boolean;
     }
     class JsonType {
         /**
@@ -305,13 +340,13 @@ export declare namespace AbstractType {
          */
         readonly optional: boolean;
         /**
-         * The name of the type when it's required i.e. -- so it should never include "| undefined".
+         * The expression of the type when it's required i.e. -- so it should never include "| undefined".
          */
-        readonly requiredName: Code | string;
-        constructor(requiredName: Code | string, parameters?: {
+        readonly requiredExpression: Code;
+        constructor(requiredExpression: Code, parameters?: {
             optional: boolean;
         });
-        get name(): Code | string;
+        get expression(): Code;
     }
 }
 //# sourceMappingURL=AbstractType.d.ts.map