@shaclmate/compiler 4.0.39 → 4.0.41

package/dist/generators/ts/{AbstractUnionType.js → UnionType.js}

@@ -8,18 +8,22 @@ import { Maybe } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
 import { AbstractType } from "./AbstractType.js";
-import { code, joinCode, literalOf } from "./ts-poet-wrapper.js";
-export class AbstractUnionType extends AbstractType {
+import { code, def, joinCode, literalOf, } from "./ts-poet-wrapper.js";
+export class UnionType extends AbstractType {
     discriminant;
+    graphqlArgs = Maybe.empty();
     identifierType;
+    kind = "Union";
     recursive;
+    synthetic;
     validationFunction = Maybe.empty();
-    constructor({ identifierType, members, recursive, ...superParameters }) {
+    constructor({ identifierType, members, recursive, synthetic, ...superParameters }) {
         super(superParameters);
         this.identifierType = identifierType;
         invariant(members.length >= 2);
         this.recursive = recursive;
         this.discriminant = Discriminant.infer(members);
+        this.synthetic = synthetic;
         this.lazyMembers = () => members.map((member, memberI) => {
             let discriminantValues;
             invariant(this.discriminant.memberValues.length === members.length);
@@ -28,32 +32,11 @@ export class AbstractUnionType extends AbstractType {
                     discriminantValues = [this.discriminant.memberValues[memberI]];
                     break;
                 case "Hybrid":
-                    discriminantValues =
-                        this.discriminant.memberValues[memberI].ownValues;
+                    discriminantValues = this.discriminant.memberValues[memberI].values;
                     break;
                 case "Intrinsic": {
-                    // A member type's combined discriminant property values are its "own" values plus any descendant values that are
-                    // not the "own" values of some other member type.
-                    // So if you have type A, type B, and B inherits A, then
-                    // A has
-                    //   own discriminant property values: ["A"]
-                    //   descendant discriminant property values: ["B"]
-                    // and B has
-                    //  own discriminant property values: ["B"]
-                    //  descendant discriminant property values ["B"]
-                    // In this case A shouldn't have "B" as a combined discriminant property value since it's "claimed" by B.
-                    const memberOwnDiscriminantPropertyValues = new Set();
-                    for (const member of members) {
-                        for (const ownDiscriminantPropertyValue of member.type.discriminantProperty.unsafeCoerce()
-                            .ownValues) {
-                            memberOwnDiscriminantPropertyValues.add(ownDiscriminantPropertyValue);
-                        }
-                    }
-                    discriminantValues = member.type.discriminantProperty
-                        .unsafeCoerce()
-                        .ownValues.concat(member.type.discriminantProperty
-                        .unsafeCoerce()
-                        .descendantValues.filter((value) => !memberOwnDiscriminantPropertyValues.has(value)));
+                    discriminantValues =
+                        member.type.discriminantProperty.unsafeCoerce().values;
                     break;
                 }
                 case "Typeof":
@@ -70,10 +53,9 @@ export class AbstractUnionType extends AbstractType {
                 }
                 if (discriminant.kind === "Intrinsic" && !json) {
                     switch (member.type.kind) {
-                        case "NamedObjectUnion":
-                        case "NamedUnion":
-                        case "NamedObjectType":
-                            return code `${member.type.name}.is${member.type.name}(${instance})`;
+                        case "Object":
+                        case "ObjectUnion":
+                            return code `${member.type.alias.unsafeCoerce()}.is${member.type.alias.unsafeCoerce()}(${instance})`;
                     }
                 }
                 const discriminantName = json
@@ -87,7 +69,7 @@ export class AbstractUnionType extends AbstractType {
                     includeDiscriminantProperty: this.discriminant.kind === "Intrinsic" ||
                         (this.discriminant.kind === "Hybrid" &&
                             this.discriminant.memberValues[memberI].kind === "Intrinsic"),
-                }).name,
+                }).expression,
                 jsonTypeCheck: typeCheck(true),
                 primaryDiscriminantValue: discriminantValues[0],
                 type: member.type,
@@ -133,40 +115,61 @@ export class AbstractUnionType extends AbstractType {
         return Maybe.of({
             code: code `${this.reusables.snippets.identityConversionFunction}`,
             sourceTypes: this.discriminant.kind === "Typeof"
-                ? this.members.map(({ primaryDiscriminantValue, type }) => ({
-                    name: type.name,
-                    typeof: primaryDiscriminantValue,
-                }))
+                ? this.members.flatMap(({ type }) => type.jsTypes.map((jsType) => ({
+                    expression: type.expression,
+                    jsType,
+                })))
                 : [
                     {
-                        name: this.name,
-                        typeof: "object",
+                        expression: this.expression,
+                        jsType: {
+                            instanceof: "Object",
+                            typeof: "object",
+                        },
                     },
                 ],
         });
     }
+    get declaration() {
+        const alias = this.alias.extract();
+        if (!alias) {
+            return Maybe.empty();
+        }
+        const declarations = [];
+        if (this.configuration.features.has("Object.type")) {
+            declarations.push(code `export type ${def(alias)} = ${this.inlineExpression};`);
+        }
+        const staticModuleDeclarations = Object.entries(this.staticModuleDeclarations);
+        if (staticModuleDeclarations.length > 0) {
+            declarations.push(code `\
+export namespace ${def(alias)} {
+${joinCode(staticModuleDeclarations
+                .sort((left, right) => left[0].localeCompare(right[0]))
+                .map((_) => _[1]), { on: "\n\n" })}
+}`);
+        }
+        return Maybe.of(joinCode(declarations, { on: "\n\n" }));
+    }
     get discriminantProperty() {
         switch (this.discriminant.kind) {
             case "Extrinsic":
                 return Maybe.of({
                     descendantValues: [],
                     jsonName: this.discriminant.jsonName,
-                    ownValues: this.discriminant.memberValues,
                     name: this.discriminant.name,
+                    values: this.discriminant.memberValues,
                 });
             case "Hybrid":
                 return Maybe.of({
-                    descendantValues: [],
                     jsonName: this.discriminant.jsonName,
-                    ownValues: this.discriminant.memberValues.flatMap((_) => _.ownValues),
                     name: "termType",
+                    values: this.discriminant.memberValues.flatMap((_) => _.values),
                 });
             case "Intrinsic":
                 return Maybe.of({
-                    descendantValues: this.discriminant.memberValues.flatMap((_) => _.descendantValues),
                     jsonName: this.discriminant.jsonName,
                     name: this.discriminant.name,
-                    ownValues: this.discriminant.memberValues.flatMap((_) => _.ownValues),
+                    values: this.discriminant.memberValues,
                 });
             case "Typeof":
                 return Maybe.empty();
@@ -174,12 +177,60 @@ export class AbstractUnionType extends AbstractType {
                 throw this.discriminant;
         }
     }
+    get equalsFunction() {
+        return this.alias
+            .map((alias) => code `${alias}.equals`)
+            .orDefault(this.inlineEqualsFunction);
+    }
+    get filterFunction() {
+        return this.alias
+            .map((alias) => code `${alias}.filter`)
+            .orDefault(this.inlineFilterFunction);
+    }
+    get filterType() {
+        return this.alias
+            .map((alias) => code `${alias}.Filter`)
+            .orDefault(this.inlineFilterType);
+    }
+    get graphqlType() {
+        const alias = this.alias.extract();
+        if (!alias ||
+            !this.members.every((member) => member.type.kind === "Object")) {
+            throw new Error("not implemented");
+        }
+        return new AbstractType.GraphqlType(code `${alias}.GraphQL`, this.reusables);
+    }
+    get hashFunction() {
+        return this.alias
+            .map((alias) => code `${alias}.hash`)
+            .orDefault(this.inlineHashFunction);
+    }
+    get jsonSchemaFunctionDeclaration() {
+        const meta = {
+        // id: this.name,
+        };
+        this.comment.ifJust((description) => {
+            meta["description"] = description;
+        });
+        this.label.ifJust((label) => {
+            meta["title"] = label;
+        });
+        return code `export const schema = () => ${this.inlineJsonSchema}.meta(${meta});`;
+    }
+    get jsonTypeAliasDeclaration() {
+        return code `export type Json = ${this.inlineJsonType.expression}`;
+    }
     get members() {
         return this.lazyMembers();
     }
     get mutable() {
         return this.members.some((member) => member.type.mutable);
     }
+    get expression() {
+        return this.alias
+            .map((alias) => code `${alias}`)
+            .orDefault(this.inlineExpression);
+    }
     get referencesObjectType() {
         return this.members.some((member) => member.type.referencesObjectType);
     }
@@ -201,14 +252,32 @@ export class AbstractUnionType extends AbstractType {
         }
         return set;
     }
-    get typeofs() {
-        return [...new Set(this.members.flatMap((member) => member.type.typeofs))];
+    get jsTypes() {
+        const jsTypes = [];
+        for (const member of this.members) {
+            for (const memberJsType of member.type.jsTypes) {
+                if (!jsTypes.some((jsType) => AbstractType.JsType.equals(jsType, memberJsType))) {
+                    jsTypes.push(memberJsType);
+                }
+            }
+        }
+        return jsTypes;
+    }
+    get valueSparqlConstructTriplesFunction() {
+        return this.alias
+            .map((alias) => code `${alias}.valueSparqlConstructTriples`)
+            .orDefault(this.inlineValueSparqlConstructTriplesFunction);
+    }
+    get valueSparqlWherePatternsFunction() {
+        return this.alias
+            .map((alias) => code `${alias}.valueSparqlWherePatterns`)
+            .orDefault(this.inlineValueSparqlWherePatternsFunction);
     }
     get inlineEqualsFunction() {
         return code `\
-((left: ${this.name}, right: ${this.name}) => {
+((left: ${this.expression}, right: ${this.expression}) => {
 ${joinCode(this.members.map(({ type, typeCheck, unwrap }) => code `if (${typeCheck(code `left`)} && ${typeCheck(code `right`)}) {
-  return ${type.equalsFunction}(${unwrap(code `left`)} as ${type.name}, ${unwrap(code `right`)} as ${type.name});
+  return ${type.equalsFunction}(${unwrap(code `left`)} as ${type.expression}, ${unwrap(code `right`)} as ${type.expression});
 }`))}
 
   return ${this.reusables.imports.Left}({ left, right, propertyName: "type", propertyValuesUnequal: { left: typeof left, right: typeof right, type: "boolean" as const }, type: "property" as const });
@@ -217,7 +286,7 @@ ${joinCode(this.members.map(({ type, typeCheck, unwrap }) => code `if (${typeChe
     get inlineFilterFunction() {
         const syntheticNamePrefix = this.configuration.syntheticNamePrefix;
         return code `\
-((filter: ${this.filterType}, value: ${this.name}) => {
+((filter: ${this.filterType}, value: ${this.expression}) => {
 ${joinCode([
             ...this.identifierType
                 .map((identifierType) => code `\
@@ -246,7 +315,7 @@ if (filter.on?.[${literalOf(primaryDiscriminantValue)}] !== undefined && ${typeC
     }
     get inlineFromJsonFunction() {
         return code `\
-((value: ${this.jsonType().name}): ${this.reusables.imports.Either}<Error, ${this.name}> => {
+((value: ${this.jsonType().expression}): ${this.reusables.imports.Either}<Error, ${this.expression}> => {
 ${joinCode(this.members.map(({ jsonType, jsonTypeCheck, type, unwrap, wrap }) => code `if (${jsonTypeCheck(code `value`)}) { return ${type.fromJsonExpression({
             variables: {
                 value: code `(${unwrap(code `value`)} as ${jsonType})`,
@@ -286,19 +355,19 @@ ${joinCode(this.members.map(({ jsonType, jsonTypeCheck, type, unwrap, wrap }) =>
             if (this.discriminant.kind === "Extrinsic" ||
                 (this.discriminant.kind === "Hybrid" &&
                     this.discriminant.memberValues[memberI].kind === "Extrinsic")) {
-                typeExpression = code `${typeExpression}.map(values => values.map(value => ({ ${this.discriminant.name}: ${literalOf(primaryDiscriminantValue)} as const, value }) as (${this.name})))`;
+                typeExpression = code `${typeExpression}.map(values => values.map(value => ({ ${this.discriminant.name}: ${literalOf(primaryDiscriminantValue)} as const, value }) as (${this.expression})))`;
             }
-            typeExpression = code `(${typeExpression} as ${this.reusables.imports.Either}<Error, ${this.reusables.imports.Resource}.Values<${this.name}>>)`;
+            typeExpression = code `(${typeExpression} as ${this.reusables.imports.Either}<Error, ${this.reusables.imports.Resource}.Values<${this.expression}>>)`;
             return expression !== null
                 ? code `${expression}.altLazy(() => ${typeExpression})`
                 : typeExpression;
         }, null)}.chain(values => values.head());
     }))
-) satisfies ${this.reusables.snippets.FromRdfResourceValuesFunction}<${this.name}>)`;
+) satisfies ${this.reusables.snippets.FromRdfResourceValuesFunction}<${this.expression}>)`;
     }
     get inlineHashFunction() {
         return code `\
-(<HasherT extends ${this.reusables.snippets.Hasher}>(hasher: HasherT, value: ${this.name}): HasherT => {
+(<HasherT extends ${this.reusables.snippets.Hasher}>(hasher: HasherT, value: ${this.expression}): HasherT => {
 ${joinCode(this.members.map(({ type, typeCheck, unwrap }) => code `if (${typeCheck(code `value`)}) { return ${type.hashFunction}(hasher, ${unwrap(code `value`)}); }`))}
   return hasher;
 })`;
@@ -356,30 +425,30 @@ ${joinCode(this.members.map(({ type, typeCheck, unwrap }) => code `if (${typeChe
                 throw discriminant;
         }
     }
-    get inlineName() {
+    get inlineExpression() {
         const discriminant = this.discriminant; // To get type narrowing to work
         switch (discriminant.kind) {
             case "Extrinsic":
-                return code `(${joinCode(this.members.map(({ type, primaryDiscriminantValue }) => code `{ ${discriminant.name}: ${literalOf(primaryDiscriminantValue)}, value: ${type.name} }`), { on: "|" })})`;
+                return code `(${joinCode(this.members.map(({ type, primaryDiscriminantValue }) => code `{ ${discriminant.name}: ${literalOf(primaryDiscriminantValue)}, value: ${type.expression} }`), { on: "|" })})`;
             case "Hybrid":
                 return code `(${joinCode(this.members.map(({ primaryDiscriminantValue, type }, memberI) => {
                     switch (discriminant.memberValues[memberI].kind) {
                         case "Extrinsic":
-                            return code `{ ${discriminant.name}: ${literalOf(primaryDiscriminantValue)}, value: ${type.name} }`;
+                            return code `{ ${discriminant.name}: ${literalOf(primaryDiscriminantValue)}, value: ${type.expression} }`;
                         case "Intrinsic":
-                            return code `${type.name}`;
+                            return code `${type.expression}`;
                         default:
                             throw new Error();
                     }
                 }), { on: "|" })})`;
             case "Intrinsic":
-                // If every type shares a discriminant (e.g., RDF/JS "termType" or generated NamedObjectType "type"),
+                // If every type shares a discriminant (e.g., RDF/JS "termType" or generated ObjectType "type"),
                 // just join their names with "|"
-                return code `(${joinCode(this.members.map(({ type }) => code `${type.name}`), { on: "|" })})`;
+                return code `(${joinCode(this.members.map(({ type }) => code `${type.expression}`), { on: "|" })})`;
             case "Typeof":
                 // The type.name may include literal values, but they should still be unambiguous with other member types since the typeofs
                 // of the different member types are known to be different.
-                return code `(${joinCode(this.members.map(({ type }) => code `${type.name}`), { on: "|" })})`;
+                return code `(${joinCode(this.members.map(({ type }) => code `${type.expression}`), { on: "|" })})`;
             default:
                 discriminant;
                 throw new Error("should never reach this point");
@@ -387,7 +456,7 @@ ${joinCode(this.members.map(({ type, typeCheck, unwrap }) => code `if (${typeChe
     }
     get inlineToJsonFunction() {
         return code `\
-((value: ${this.name}): ${this.jsonType().name} => {
+((value: ${this.expression}): ${this.jsonType().expression} => {
 ${joinCode(this.members.map(({ typeCheck, typeToJsonExpression, unwrap, wrap }) => code `if (${typeCheck(code `value`)}) { return ${wrap(typeToJsonExpression(unwrap(code `value`)))}; }`))}
 
   throw new Error("unable to serialize to JSON");
@@ -419,11 +488,11 @@ ${joinCode(this.members.map(({ type, unwrap, typeCheck }) => code `if (${typeChe
         })}; }`))}
 
   throw new Error("unable to serialize to RDF");
-}) satisfies ${this.reusables.snippets.ToRdfResourceValuesFunction}<${this.name}>)`;
+}) satisfies ${this.reusables.snippets.ToRdfResourceValuesFunction}<${this.expression}>)`;
     }
     get inlineToStringFunction() {
         return code `\
-((value: ${this.name}): string => {
+((value: ${this.expression}): string => {
 ${joinCode(this.members.map(({ type, typeCheck, unwrap }) => code `if (${typeCheck(code `value`)}) { return ${type.toStringExpression({
             variables: { value: unwrap(code `value`) },
         })}; }`))}
@@ -459,50 +528,180 @@ unionPatterns.push({ patterns: ${type.valueSparqlWherePatternsFunction}({ ...oth
             type: type.schema,
         }}`), { on: "," })} }`);
     }
+    get staticModuleDeclarations() {
+        const alias = this.alias.unsafeCoerce();
+        const staticModuleDeclarations = {};
+        if (this.configuration.features.has("Object.equals")) {
+            staticModuleDeclarations[`equals`] =
+                code `export const equals = ${this.inlineEqualsFunction};`;
+        }
+        if (this.configuration.features.has("Object.filter")) {
+            staticModuleDeclarations[`Filter`] =
+                code `export type Filter = ${this.inlineFilterType};`;
+            staticModuleDeclarations[`filter`] =
+                code `export const filter = ${this.inlineFilterFunction};`;
+        }
+        if (this.configuration.features.has("Object.hash")) {
+            staticModuleDeclarations[`hash`] =
+                code `export const hash = ${this.inlineHashFunction};`;
+        }
+        if (this.configuration.features.has("Object.JSON.type")) {
+            staticModuleDeclarations[`Json.type`] =
+                code `${this.jsonTypeAliasDeclaration}`;
+        }
+        if (this.configuration.features.has("Object.JSON.schema")) {
+            staticModuleDeclarations[`Json.namespace`] = code `\
+export namespace Json {
+  ${this.jsonSchemaFunctionDeclaration}
+
+  export function parse(json: unknown): ${this.reusables.imports.Either}<Error, Json> {
+    const jsonSafeParseResult = schema().safeParse(json);
+    if (!jsonSafeParseResult.success) { return ${this.reusables.imports.Left}(jsonSafeParseResult.error); }
+    return ${this.reusables.imports.Right}(jsonSafeParseResult.data);
+  }
+}`;
+        }
+        if (this.configuration.features.has("Object.fromJson")) {
+            staticModuleDeclarations[`fromJson`] =
+                code `export const fromJson = ${this.inlineFromJsonFunction};`;
+        }
+        if (this.configuration.features.has("Object.fromRdf")) {
+            staticModuleDeclarations[`fromRdfResourceValues`] =
+                code `export const fromRdfResourceValues: ${this.reusables.snippets.FromRdfResourceValuesFunction}<${alias}> = ${this.inlineFromRdfResourceValuesFunction};`;
+        }
+        if (this.configuration.features.has("Object.toJson")) {
+            staticModuleDeclarations[`toJson`] =
+                code `export const toJson = ${this.inlineToJsonFunction};`;
+        }
+        if (this.configuration.features.has("Object.toRdf")) {
+            staticModuleDeclarations[`toRdfResourceValues`] =
+                code `export const toRdfResourceValues = ${this.inlineToRdfResourceValuesFunction};`;
+        }
+        if (this.configuration.features.has("Object.SPARQL")) {
+            staticModuleDeclarations[`valueSparqlConstructTriples`] =
+                code `export const valueSparqlConstructTriples: ${this.reusables.snippets.ValueSparqlConstructTriplesFunction}<${this.filterType}, ${this.schemaType}> = ${this.inlineValueSparqlConstructTriplesFunction};`;
+            staticModuleDeclarations[`valueSparqlWherePatterns`] =
+                code `export const valueSparqlWherePatterns: ${this.reusables.snippets.ValueSparqlWherePatternsFunction}<${this.filterType}, ${this.schemaType}> = ${this.inlineValueSparqlWherePatternsFunction};`;
+        }
+        if (this.configuration.features.has("Object.toString")) {
+            const syntheticNamePrefix = this.configuration.syntheticNamePrefix;
+            staticModuleDeclarations[`${syntheticNamePrefix}toString`] =
+                code `export const ${syntheticNamePrefix}toString = ${this.inlineToStringFunction};`;
+        }
+        return staticModuleDeclarations;
+    }
+    fromJsonExpression({ variables, }) {
+        return code `${this.alias.map((alias) => code `${alias}.fromJson`).orDefault(this.inlineFromJsonFunction)}(${variables.value})`;
+    }
+    fromRdfResourceValuesExpression({ variables, }) {
+        const { resourceValues: resourceValuesVariable, ...fromRdfResourceValuesOptionsTemp } = variables;
+        const fromRdfResourceValuesOptions = fromRdfResourceValuesOptionsTemp;
+        if (!this.configuration.features.has("ObjectSet")) {
+            delete fromRdfResourceValuesOptions["objectSet"];
+        }
+        return code `${this.alias.map((alias) => code `${alias}.fromRdfResourceValues`).orDefault(this.inlineFromRdfResourceValuesFunction)}(${resourceValuesVariable}, ${fromRdfResourceValuesOptions})`;
+    }
+    graphqlResolveExpression({ variables, }) {
+        return variables.value;
+    }
+    jsonSchema({ context, }) {
+        const expression = this.alias
+            .map((alias) => code `${alias}.Json.schema()`)
+            .orDefault(this.inlineJsonSchema);
+        if (context === "property" && this.recursive) {
+            return code `${this.reusables.imports.z}.lazy((): ${this.reusables.imports.z}.ZodType<${this.jsonType().expression}> => ${expression})`;
+        }
+        return expression;
+    }
+    jsonType() {
+        return this.alias
+            .map((alias) => new AbstractType.JsonType(code `${alias}.Json`))
+            .orDefault(this.inlineJsonType);
+    }
     jsonUiSchemaElement() {
         return Maybe.empty();
     }
+    toJsonExpression({ variables, }) {
+        return code `${this.alias.map((alias) => code `${alias}.toJson`).orDefault(this.inlineToJsonFunction)}(${variables.value})`;
+    }
+    toRdfResourceValuesExpression({ variables, }) {
+        const { value: valueVariable, ...otherVariables } = variables;
+        return code `${this.alias.map((alias) => code `${alias}.toRdfResourceValues`).orDefault(this.inlineToRdfResourceValuesFunction)}(${valueVariable}, ${otherVariables})`;
+    }
+    toStringExpression({ variables, }) {
+        return code `${this.alias.map((alias) => code `${alias}.${this.configuration.syntheticNamePrefix}toString`).orDefault(this.inlineToStringFunction)}(${variables.value})`;
+    }
     lazyMembers;
 }
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "conversionFunction", null);
+], UnionType.prototype, "conversionFunction", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "declaration", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "discriminantProperty", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "equalsFunction", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "filterFunction", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "filterType", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "graphqlType", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "hashFunction", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "discriminantProperty", null);
+], UnionType.prototype, "members", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "members", null);
+], UnionType.prototype, "mutable", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "mutable", null);
+], UnionType.prototype, "expression", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "toRdfResourceValueTypes", null);
+], UnionType.prototype, "toRdfResourceValueTypes", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "typeofs", null);
+], UnionType.prototype, "jsTypes", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "inlineEqualsFunction", null);
+], UnionType.prototype, "valueSparqlConstructTriplesFunction", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "inlineFilterFunction", null);
+], UnionType.prototype, "valueSparqlWherePatternsFunction", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "inlineFilterType", null);
+], UnionType.prototype, "inlineEqualsFunction", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "inlineJsonType", null);
+], UnionType.prototype, "inlineFilterFunction", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "inlineName", null);
+], UnionType.prototype, "inlineFilterType", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "inlineValueSparqlConstructTriplesFunction", null);
+], UnionType.prototype, "inlineJsonType", null);
 __decorate([
     Memoize()
-], AbstractUnionType.prototype, "inlineValueSparqlWherePatternsFunction", null);
+], UnionType.prototype, "inlineExpression", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "inlineValueSparqlConstructTriplesFunction", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "inlineValueSparqlWherePatternsFunction", null);
+__decorate([
+    Memoize()
+], UnionType.prototype, "jsonType", null);
 function termTypes(type) {
     switch (type.kind) {
         case "BlankNode":
@@ -532,7 +731,7 @@ export var Discriminant;
         // intrinsic
         {
             let inlineDiscriminantProperty;
-            const memberValues = [];
+            let memberValues = [];
             for (const memberType of memberTypes) {
                 const memberTypeDiscriminantProperty = memberType.discriminantProperty.extract();
                 if (!memberTypeDiscriminantProperty) {
@@ -547,10 +746,7 @@ export var Discriminant;
                     inlineDiscriminantProperty = undefined;
                     break;
                 }
-                memberValues.push({
-                    descendantValues: memberTypeDiscriminantProperty.descendantValues,
-                    ownValues: memberTypeDiscriminantProperty.ownValues,
-                });
+                memberValues = memberValues.concat(memberTypeDiscriminantProperty.values);
             }
             if (inlineDiscriminantProperty) {
                 return {
@@ -563,15 +759,17 @@ export var Discriminant;
         }
         // typeof
         {
+            const memberTypeofs = [];
             const memberTypeofsSet = new Set();
             for (const memberType of memberTypes) {
-                for (const memberTypeof of memberType.typeofs) {
-                    memberTypeofsSet.add(memberTypeof);
+                for (const memberJsType of memberType.jsTypes) {
+                    memberTypeofs.push(memberJsType.typeof);
+                    memberTypeofsSet.add(memberJsType.typeof);
                 }
             }
             if (memberTypeofsSet.size === memberTypes.length) {
                 return {
-                    memberValues: memberTypes.flatMap((memberType) => memberType.typeofs),
+                    memberValues: memberTypeofs,
                     kind: "Typeof",
                 };
             }
@@ -579,15 +777,15 @@ export var Discriminant;
         // hybrid
         // If some member type is an RDF/JS term then reuse "termType" as the discriminant.
         if (memberTypes.some((memberType) => termTypes(memberType).size > 0)) {
-            const extrinsicMemberTypeNamesSet = new Set();
+            const extrinsicMemberTypeAliasesSet = new Set();
             let extrinsicMemberTypeCount = 0;
             for (const memberType of memberTypes) {
                 if (termTypes(memberType).size > 0) {
                     continue;
                 }
                 extrinsicMemberTypeCount++;
-                if (typeof memberType.name === "string") {
-                    extrinsicMemberTypeNamesSet.add(memberType.name);
+                if (memberType.alias.isJust()) {
+                    extrinsicMemberTypeAliasesSet.add(memberType.alias.extract());
                 }
                 else {
                     break;
@@ -601,13 +799,13 @@ export var Discriminant;
                     if (memberTermTypes.size > 0) {
                         return {
                             kind: "Intrinsic",
-                            ownValues: [...memberTermTypes],
+                            values: [...memberTermTypes],
                         };
                     }
                     return {
                         kind: "Extrinsic",
-                        ownValues: extrinsicMemberTypeNamesSet.size === extrinsicMemberTypeCount
-                            ? [memberType.name]
+                        values: extrinsicMemberTypeAliasesSet.size === extrinsicMemberTypeCount
+                            ? [memberType.alias.unsafeCoerce()]
                             : [memberTypeI.toString()],
                     };
                 }),
@@ -618,21 +816,14 @@ export var Discriminant;
         {
             let memberValues;
             {
-                const memberTypeNames = memberTypes.map((memberType) => memberType.name);
-                if (memberTypeNames.every((memberTypeName) => typeof memberTypeName === "string")) {
-                    const memberTypeNamesSet = new Set(memberTypeNames);
-                    if (memberTypeNamesSet.size === memberTypeNames.length) {
-                        memberValues = memberTypeNames;
-                    }
-                    else {
-                        // Otherwise prefix the non-unique strings with an index and use those as the discriminant values.
-                        memberValues = memberTypeNames.map((memberTypeName, memberTypeI) => `${memberTypeI}-${memberTypeName}`);
-                    }
+                const memberTypeNames = memberTypes.map((memberType) => memberType.alias.orDefault(memberType.jsTypes[0].typeof));
+                const memberTypeNamesSet = new Set(memberTypeNames);
+                if (memberTypeNamesSet.size === memberTypeNames.length) {
+                    memberValues = memberTypeNames;
                 }
                 else {
-                    // At least one member type name is Code
-                    // Use member type indices as the discriminant values.
-                    memberValues = memberTypes.map((_, memberTypeI) => memberTypeI);
+                    // Otherwise prefix the non-unique strings with an index and use those as the discriminant values.
+                    memberValues = memberTypeNames.map((memberTypeName, memberTypeI) => `${memberTypeI}-${memberTypeName}`);
                 }
             }
             invariant(memberValues.length === memberTypes.length);
@@ -640,10 +831,10 @@ export var Discriminant;
                 jsonName: "type",
                 kind: "Extrinsic",
                 name: "type",
-                memberValues: memberValues,
+                memberValues,
             };
         }
     }
     Discriminant.infer = infer;
 })(Discriminant || (Discriminant = {}));
-//# sourceMappingURL=AbstractUnionType.js.map
+//# sourceMappingURL=UnionType.js.map