@shaclmate/compiler 4.0.38 → 4.0.40

package/dist/generators/ts/ZodGenerator.js

@@ -1,7 +1,6 @@
-import { invariant } from "ts-invariant";
 import * as ast from "../../ast/index.js";
-import { NamedObjectType_jsonSchemaFunctionDeclaration } from "./_NamedObjectType/NamedObjectType_jsonSchemaFunctionDeclaration.js";
-import { NamedObjectType_jsonTypeAliasDeclaration } from "./_NamedObjectType/NamedObjectType_jsonTypeAliasDeclaration.js";
+import { ObjectType_jsonSchemaFunctionDeclaration } from "./_ObjectType/ObjectType_jsonSchemaFunctionDeclaration.js";
+import { ObjectType_jsonTypeAliasDeclaration } from "./_ObjectType/ObjectType_jsonTypeAliasDeclaration.js";
 import { Reusables } from "./Reusables.js";
 import { TsGenerator } from "./TsGenerator.js";
 import { TypeFactory } from "./TypeFactory.js";
@@ -20,20 +19,19 @@ export class ZodGenerator {
             reusables,
         });
         const declarations = [];
-        for (const namedObjectType of ast.ObjectType.toposort(ast_.namedObjectTypes).map((astObjectType) => typeFactory.createNamedObjectType(astObjectType))) {
+        for (const namedObjectType of ast.ObjectType.toposort(ast_.namedObjectTypes).map((astObjectType) => typeFactory.createObjectType(astObjectType))) {
             declarations.push(code `\
-export namespace ${namedObjectType.name} {
-  ${joinCode(NamedObjectType_jsonTypeAliasDeclaration.call(namedObjectType).toList())}
+export namespace ${namedObjectType.alias.unsafeCoerce()} {
+  ${joinCode(ObjectType_jsonTypeAliasDeclaration.call(namedObjectType).toList())}
 
   export namespace Json {
-    ${joinCode(NamedObjectType_jsonSchemaFunctionDeclaration.call(namedObjectType).toList())}
+    ${joinCode(ObjectType_jsonSchemaFunctionDeclaration.call(namedObjectType).toList())}
   }
 }`);
         }
         for (const astNamedUnionType of ast_.namedUnionTypes.map((astNamedUnionType) => typeFactory.createUnionType(astNamedUnionType))) {
-            invariant(astNamedUnionType.kind !== "AnonymousUnionType");
             declarations.push(code `\
-export namespace ${astNamedUnionType.name} {
+export namespace ${astNamedUnionType.alias.unsafeCoerce()} {
   ${astNamedUnionType.jsonTypeAliasDeclaration}
   export namespace Json {
     ${astNamedUnionType.jsonSchemaFunctionDeclaration}

package/dist/generators/ts/{_NamedObjectType → _ObjectType}/AbstractProperty.d.ts

@@ -1,15 +1,15 @@
-import type { Maybe } from "purify-ts";
+import { Maybe } from "purify-ts";
 import type { Logger } from "ts-log";
-import type { NamedObjectType } from "../NamedObjectType.js";
+import type { ObjectType } from "../ObjectType.js";
 import type { Reusables } from "../Reusables.js";
 import { rdfjsTermExpression } from "../rdfjsTermExpression.js";
 import type { TsGenerator } from "../TsGenerator.js";
 import type { Type } from "../Type.js";
 import { type Code } from "../ts-poet-wrapper.js";
-export declare abstract class AbstractProperty<TypeT extends Pick<Type, "filterFunction" | "mutable" | "name" | "schema">> {
+export declare abstract class AbstractProperty<TypeT extends Pick<Type, "expression" | "filterFunction" | "mutable" | "schema">> {
     protected readonly configuration: TsGenerator.Configuration;
     protected readonly logger: Logger;
-    protected readonly namedObjectType: NamedObjectType;
+    protected readonly objectType: ObjectType;
     protected readonly reusables: Reusables;
     /**
      * Optional parameter to include in the parameters object of constructor function.
@@ -50,7 +50,7 @@ export declare abstract class AbstractProperty<TypeT extends Pick<Type, "filterF
      */
     abstract readonly jsonSignature: Maybe<Code>;
     /**
-     * Property type discriminant e.g., "ShaclProperty".
+     * Property type discriminant e.g., "Shacl".
      */
     abstract readonly kind: string;
     /**
@@ -62,29 +62,29 @@ export declare abstract class AbstractProperty<TypeT extends Pick<Type, "filterF
      */
     readonly name: string;
     /**
-     * Is the property's type the NamedObjectType or does its type indirectly reference the NamedObjectType?
+     * Is the property's type the ObjectType or does its type indirectly reference the ObjectType?
      */
     abstract readonly recursive: boolean;
     /**
      * Property type
   .   */
     readonly type: TypeT;
-    constructor({ configuration, logger, name, namedObjectType, reusables, type, }: {
+    constructor({ configuration, logger, name, objectType, reusables, type, }: {
         configuration: TsGenerator.Configuration;
         logger: Logger;
         name: string;
-        namedObjectType: NamedObjectType;
+        objectType: ObjectType;
         reusables: Reusables;
         type: TypeT;
     });
     /**
      * TypeScript object describing this type, for runtime use.
      */
-    get schema(): Code;
-    protected get schemaObject(): {
-        kind: Code;
-        type: Code;
-    };
+    get schema(): Maybe<Code>;
+    /**
+     * Helper to compose the result of schema along the type hierarchy.
+     */
+    protected get schemaInitializers(): readonly Code[];
     /**
      * Expression to access the value of this property on an object instance. May evaluate a thunk.
      */

package/dist/generators/ts/{_NamedObjectType → _ObjectType}/AbstractProperty.js

@@ -4,15 +4,14 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-import { invariant } from "ts-invariant";
+import { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
 import { rdfjsTermExpression } from "../rdfjsTermExpression.js";
-import { removeUndefined } from "../removeUndefined.js";
-import { code, literalOf } from "../ts-poet-wrapper.js";
+import { code, joinCode, literalOf } from "../ts-poet-wrapper.js";
 export class AbstractProperty {
     configuration;
     logger;
-    namedObjectType;
+    objectType;
     reusables;
     /**
      * TypeScript identifier-safe name of the property.
@@ -22,11 +21,11 @@ export class AbstractProperty {
      * Property type
   .   */
     type;
-    constructor({ configuration, logger, name, namedObjectType, reusables, type, }) {
+    constructor({ configuration, logger, name, objectType, reusables, type, }) {
         this.configuration = configuration;
         this.logger = logger;
         this.name = name;
-        this.namedObjectType = namedObjectType;
+        this.objectType = objectType;
         this.reusables = reusables;
         this.type = type;
         this.rdfjsTermExpression = rdfjsTermExpression.bind({
@@ -39,15 +38,13 @@ export class AbstractProperty {
      * TypeScript object describing this type, for runtime use.
      */
     get schema() {
-        return code `${removeUndefined(this.schemaObject)}`;
+        return Maybe.of(code `{ ${joinCode(this.schemaInitializers.concat(), { on: ", " })} }`);
     }
-    get schemaObject() {
-        invariant(this.kind.endsWith("Property"));
-        return {
-            kind: code `${literalOf(this.kind.substring(0, this.kind.length - "Property".length))} as const`,
-            // name: literalOf(this.name),
-            type: code `() => (${this.type.schema})`,
-        };
+    /**
+     * Helper to compose the result of schema along the type hierarchy.
+     */
+    get schemaInitializers() {
+        return [code `kind: ${literalOf(this.kind)}`];
     }
     /**
      * Expression to access the value of this property on an object instance. May evaluate a thunk.

package/dist/generators/ts/{_NamedObjectType → _ObjectType}/DiscriminantProperty.d.ts

@@ -5,7 +5,7 @@ export declare class DiscriminantProperty extends AbstractProperty<DiscriminantP
     readonly constructorParameter: Maybe<Code>;
     readonly filterProperty: AbstractProperty<DiscriminantProperty.Type>["filterProperty"];
     readonly graphqlField: AbstractProperty<DiscriminantProperty.Type>["graphqlField"];
-    readonly kind = "DiscriminantProperty";
+    readonly kind = "Discriminant";
     readonly mutable = false;
     readonly recursive = false;
     constructor({ type, ...superParameters }: {
@@ -15,6 +15,7 @@ export declare class DiscriminantProperty extends AbstractProperty<DiscriminantP
     get jsonName(): string;
     get jsonSchema(): AbstractProperty<DiscriminantProperty.Type>["jsonSchema"];
     get jsonSignature(): Maybe<Code>;
+    get schema(): Maybe<Code>;
     private get constValue();
     constructorInitializer(): Maybe<Code>;
     fromJsonInitializer(): Maybe<Code>;
@@ -38,7 +39,7 @@ export declare namespace DiscriminantProperty {
             mutable: boolean;
             ownValues: readonly string[];
         });
-        get name(): string;
+        get expression(): Code;
         get schema(): Code;
         get values(): string[];
     }

package/dist/generators/ts/{_NamedObjectType → _ObjectType}/DiscriminantProperty.js

@@ -6,21 +6,20 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
-import { removeUndefined } from "../removeUndefined.js";
 import { arrayOf, code, literalOf } from "../ts-poet-wrapper.js";
 import { AbstractProperty } from "./AbstractProperty.js";
 export class DiscriminantProperty extends AbstractProperty {
     constructorParameter = Maybe.empty();
     filterProperty = Maybe.empty();
     graphqlField = Maybe.empty();
-    kind = "DiscriminantProperty";
+    kind = "Discriminant";
     mutable = false;
     recursive = false;
     constructor({ type, ...superParameters }) {
         super({ ...superParameters, type });
     }
     get declaration() {
-        return code `readonly ${this.name}: ${this.type.name};`;
+        return code `readonly ${this.name}: ${this.type.expression};`;
     }
     get jsonName() {
         return "@type";
@@ -34,10 +33,16 @@ export class DiscriminantProperty extends AbstractProperty {
         });
     }
     get jsonSignature() {
-        return Maybe.of(code `readonly "${this.jsonName}": ${this.type.name}`);
+        return Maybe.of(code `readonly "${this.jsonName}": ${this.type.expression}`);
     }
+    get schema() {
+        return Maybe.empty();
+    }
+    // protected override get schemaInitializers(): readonly Code[] {
+    //   return super.schemaInitializers.concat(code`type: ${this.type.schema}`);
+    // }
     get constValue() {
-        return code `${literalOf(this.namedObjectType.discriminantValue)} as const`;
+        return code `${literalOf(this.objectType.discriminantValue)} as const`;
     }
     constructorInitializer() {
         return Maybe.empty();
@@ -49,13 +54,13 @@ export class DiscriminantProperty extends AbstractProperty {
         return Maybe.empty();
     }
     hashStatements({ variables, }) {
-        if (this.namedObjectType.parentObjectTypes.length > 0) {
+        if (this.objectType.parentObjectTypes.length > 0) {
             return [];
         }
         return [code `${variables.hasher}.update(${variables.value});`];
     }
     jsonUiSchemaElement({ variables, }) {
-        if (this.namedObjectType.parentObjectTypes.length > 0) {
+        if (this.objectType.parentObjectTypes.length > 0) {
             return Maybe.empty();
         }
         const scope = code `\`\${${variables.scopePrefix}}/properties/${this.jsonName}\``;
@@ -97,15 +102,19 @@ __decorate([
             this.mutable = mutable;
             this.ownValues = ownValues;
         }
-        get name() {
-            return `${this.values.map((name) => `"${name}"`).join(" | ")}`;
+        get expression() {
+            return code `${this.values.map((name) => `"${name}"`).join(" | ")}`;
         }
         get schema() {
-            return code `${removeUndefined({
-                descendantValues: this.descendantValues.length > 0 ? this.descendantValues : undefined,
-                kind: code `${literalOf("TypeDiscriminant")} as const`,
-                ownValues: this.ownValues.length > 0 ? this.ownValues : undefined,
-            })}`;
+            throw new Error("should never be called");
+            // const initializers: Record<string, unknown> = {};
+            // if (this.descendantValues.length > 0) {
+            //   initializers["descendantValues"] = this.descendantValues;
+            // }
+            // if (this.ownValues.length > 0) {
+            //   initializers["ownValues"] = this.ownValues;
+            // }
+            // return code`${initializers}`;
         }
         get values() {
             return this.ownValues.concat(this.descendantValues);
@@ -113,7 +122,7 @@ __decorate([
     }
     __decorate([
         Memoize()
-    ], Type.prototype, "name", null);
+    ], Type.prototype, "expression", null);
     __decorate([
         Memoize()
     ], Type.prototype, "schema", null);

package/dist/generators/ts/{_NamedObjectType → _ObjectType}/IdentifierProperty.d.ts

@@ -5,14 +5,9 @@ import type { IriType } from "../IriType.js";
 import { type Code } from "../ts-poet-wrapper.js";
 import { AbstractProperty } from "./AbstractProperty.js";
 export declare class IdentifierProperty extends AbstractProperty<BlankNodeType | IdentifierType | IriType> {
-    private readonly typeAlias;
-    readonly kind = "IdentifierProperty";
+    readonly kind = "Identifier";
     readonly mutable = false;
     readonly recursive = false;
-    constructor({ typeAlias, ...superParameters }: {
-        type: BlankNodeType | IdentifierType | IriType;
-        typeAlias: Code;
-    } & ConstructorParameters<typeof AbstractProperty>[0]);
     get constructorParameter(): Maybe<Code>;
     get declaration(): Code;
     get filterProperty(): Maybe<{
@@ -22,6 +17,8 @@ export declare class IdentifierProperty extends AbstractProperty<BlankNodeType |
     get graphqlField(): AbstractProperty<IdentifierType>["graphqlField"];
     get jsonSchema(): AbstractProperty<IdentifierType>["jsonSchema"];
     get jsonSignature(): Maybe<Code>;
+    protected get schemaInitializers(): readonly Code[];
+    private get typeExpression();
     accessExpression({ variables, }: Parameters<AbstractProperty<BlankNodeType | IdentifierType | IriType>["accessExpression"]>[0]): Code;
     constructorInitializer({ variables, }: Parameters<AbstractProperty<IdentifierType>["constructorInitializer"]>[0]): Maybe<Code>;
     fromJsonInitializer({ variables, }: Parameters<AbstractProperty<IdentifierType>["fromJsonInitializer"]>[0]): Maybe<Code>;

package/dist/generators/ts/{_NamedObjectType → _ObjectType}/IdentifierProperty.js

@@ -12,30 +12,25 @@ import { Memoize } from "typescript-memoize";
 import { arrayOf, code, joinCode, literalOf, } from "../ts-poet-wrapper.js";
 import { AbstractProperty } from "./AbstractProperty.js";
 export class IdentifierProperty extends AbstractProperty {
-    typeAlias;
-    kind = "IdentifierProperty";
+    kind = "Identifier";
     mutable = false;
     recursive = false;
-    constructor({ typeAlias, ...superParameters }) {
-        super(superParameters);
-        this.typeAlias = typeAlias;
-    }
     get constructorParameter() {
         let hasQuestionToken = false;
-        const typeNames = [code `(() => ${this.typeAlias})`];
+        const typeNames = [code `(() => ${this.typeExpression})`];
         for (const type of this.type.conversionFunction.unsafeCoerce()
             .sourceTypes) {
             if (type.typeof === "undefined") {
                 hasQuestionToken = true;
             }
             else {
-                typeNames.push(code `${type.name}`);
+                typeNames.push(code `${type.expression}`);
             }
         }
         return Maybe.of(code `readonly ${this.name}${hasQuestionToken ? "?" : ""}: ${joinCode(typeNames, { on: "|" })};`);
     }
     get declaration() {
-        return code `readonly ${this.name}: () => ${this.typeAlias};`;
+        return code `readonly ${this.name}: () => ${this.typeExpression};`;
     }
     get filterProperty() {
         return Maybe.of({
@@ -50,13 +45,13 @@ export class IdentifierProperty extends AbstractProperty {
             args: Maybe.empty(),
             description: Maybe.empty(),
             name: `_${this.name.substring(syntheticNamePrefix.length)}`,
-            resolve: code `(source) => ${this.typeAlias}.stringify(${this.accessExpression({ variables: { object: code `source` } })})`,
+            resolve: code `(source) => ${this.typeExpression}.stringify(${this.accessExpression({ variables: { object: code `source` } })})`,
             type: this.type.graphqlType.name,
         });
     }
     get jsonSchema() {
         let schema;
-        if (this.type.in_.length > 0 && this.type.kind === "IriType") {
+        if (this.type.in_.length > 0 && this.type.kind === "Iri") {
             // Treat sh:in as a union of the IRIs
             // rdfjs.NamedNode<"http://example.com/1" | "http://example.com/2">
             schema = code `${this.reusables.imports.z}.enum(${arrayOf(...this.type.in_.map((iri) => iri.value))})`;
@@ -75,6 +70,14 @@ export class IdentifierProperty extends AbstractProperty {
         }
         return Maybe.of(code `readonly "@id": string`);
     }
+    get schemaInitializers() {
+        return super.schemaInitializers.concat(code `type: ${this.type.schema}`);
+    }
+    get typeExpression() {
+        return this.objectType.alias
+            .map((objectTypeAlias) => code `${objectTypeAlias}.Identifier`)
+            .orDefault(this.type.expression);
+    }
     accessExpression({ variables, }) {
         return code `${variables.object}.${this.name}()`;
     }
@@ -128,7 +131,9 @@ export class IdentifierProperty extends AbstractProperty {
                 ignoreRdfType: true, // Unused
                 preferredLanguages: variables.preferredLanguages,
                 propertyPatterns: code `[]`,
-                schema: code `${this.namedObjectType.name}.schema.properties.${this.name}.type()`,
+                schema: this.objectType.alias
+                    .map((objectTypeAlias) => code `${objectTypeAlias}.schema.properties.${this.name}.type`)
+                    .orDefault(this.type.schema),
                 valueVariable: variables.focusIdentifier,
                 variablePrefix: variables.variablePrefix, // Unused
             }})`,
@@ -177,4 +182,7 @@ __decorate([
 __decorate([
     Memoize()
 ], IdentifierProperty.prototype, "jsonSignature", null);
+__decorate([
+    Memoize()
+], IdentifierProperty.prototype, "typeExpression", null);
 //# sourceMappingURL=IdentifierProperty.js.map

package/dist/generators/ts/_ObjectType/ObjectType_createFunctionDeclaration.d.ts

@@ -0,0 +1,5 @@
+import { Maybe } from "purify-ts";
+import type { ObjectType } from "../ObjectType.js";
+import { type Code } from "../ts-poet-wrapper.js";
+export declare function ObjectType_createFunctionDeclaration(this: ObjectType): Maybe<Code>;
+//# sourceMappingURL=ObjectType_createFunctionDeclaration.d.ts.map

package/dist/generators/ts/{_NamedObjectType/NamedObjectType_createFunctionDeclaration.js → _ObjectType/ObjectType_createFunctionDeclaration.js}

@@ -1,7 +1,7 @@
 import { Maybe } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { code, joinCode, literalOf } from "../ts-poet-wrapper.js";
-export function NamedObjectType_createFunctionDeclaration() {
+export function ObjectType_createFunctionDeclaration() {
     if (!this.configuration.features.has("Object.create")) {
         return Maybe.empty();
     }
@@ -11,7 +11,7 @@ export function NamedObjectType_createFunctionDeclaration() {
         parametersType.push(code `{ ${joinCode(parametersPropertySignatures)} }`);
     }
     for (const parentObjectType of this.parentObjectTypes) {
-        parametersType.push(code `Parameters<typeof ${parentObjectType.name}.create>[0]`);
+        parametersType.push(code `Parameters<typeof ${parentObjectType.alias.unsafeCoerce()}.create>[0]`);
     }
     if (parametersType.length === 0) {
         parametersType.push(code `object`);
@@ -23,7 +23,7 @@ export function NamedObjectType_createFunctionDeclaration() {
     const chains = [];
     this.parentObjectTypes.forEach((parentObjectType, parentObjectTypeI) => {
         chains.push({
-            expression: code `${parentObjectType.name}.create(parameters)`,
+            expression: code `${parentObjectType.alias.unsafeCoerce()}.create(parameters)`,
             variable: `super${parentObjectTypeI}`,
         });
     });
@@ -54,12 +54,12 @@ export function NamedObjectType_createFunctionDeclaration() {
         .toReversed()
         .reduce((acc, { expression, variable }, chainI) => code `(${expression}).${chainI === 0 ? "map" : "chain"}(${variable} => ${acc})`, returnExpression);
     return Maybe.of(code `\
-export function create(${parametersSignature}): ${this.reusables.imports.Either}<Error, ${this.name}> {
+export function create(${parametersSignature}): ${this.reusables.imports.Either}<Error, ${this.expression}> {
   return ${returnExpression};
 }
   
-export function createUnsafe(${parametersSignature}): ${this.name} {
+export function createUnsafe(${parametersSignature}): ${this.expression} {
   return create(parameters).unsafeCoerce();
 }`);
 }
-//# sourceMappingURL=NamedObjectType_createFunctionDeclaration.js.map
+//# sourceMappingURL=ObjectType_createFunctionDeclaration.js.map

package/dist/generators/ts/_ObjectType/ObjectType_equalsFunctionDeclaration.d.ts

@@ -0,0 +1,5 @@
+import { Maybe } from "purify-ts";
+import type { ObjectType } from "../ObjectType.js";
+import { type Code } from "../ts-poet-wrapper.js";
+export declare function ObjectType_equalsFunctionDeclaration(this: ObjectType): Maybe<Code>;
+//# sourceMappingURL=ObjectType_equalsFunctionDeclaration.d.ts.map

package/dist/generators/ts/{_NamedObjectType/NamedObjectType_equalsFunctionDeclaration.js → _ObjectType/ObjectType_equalsFunctionDeclaration.js}

@@ -1,23 +1,23 @@
 import { Maybe } from "purify-ts";
 import { code, joinCode } from "../ts-poet-wrapper.js";
-export function NamedObjectType_equalsFunctionDeclaration() {
+export function ObjectType_equalsFunctionDeclaration() {
     if (!this.configuration.features.has("Object.equals")) {
         return Maybe.empty();
     }
     const chain = [];
     // For every parent, find the nearest equals implementation
     for (const parentObjectType of this.parentObjectTypes) {
-        chain.push(code `${parentObjectType.name}.equals(left, right)`);
+        chain.push(code `${parentObjectType.equalsFunction}(left, right)`);
     }
     for (const property of this.properties) {
-        if (property.kind === "DiscriminantProperty") {
+        if (property.kind === "Discriminant") {
             continue;
         }
         chain.push(code `(${property.type.equalsFunction})(${property.accessExpression({ variables: { object: code `left` } })}, ${property.accessExpression({ variables: { object: code `right` } })}).mapLeft(propertyValuesUnequal => ({ left, right, propertyName: "${property.name}", propertyValuesUnequal, type: "property" as const }))`);
     }
     return Maybe.of(code `\
-export function equals(left: ${this.name}, right: ${this.name}): ${this.reusables.snippets.EqualsResult} {
+export function equals(left: ${this.expression}, right: ${this.expression}): ${this.reusables.snippets.EqualsResult} {
   return ${joinCode(chain.map((chainPart, chainPartI) => chainPartI === 0 ? chainPart : code `chain(() => ${chainPart})`), { on: "." })}
 }`);
 }
-//# sourceMappingURL=NamedObjectType_equalsFunctionDeclaration.js.map
+//# sourceMappingURL=ObjectType_equalsFunctionDeclaration.js.map

package/dist/generators/ts/_ObjectType/ObjectType_filterFunctionDeclaration.d.ts

@@ -0,0 +1,5 @@
+import { Maybe } from "purify-ts";
+import type { ObjectType } from "../ObjectType.js";
+import { type Code } from "../ts-poet-wrapper.js";
+export declare function ObjectType_filterFunctionDeclaration(this: ObjectType): Maybe<Code>;
+//# sourceMappingURL=ObjectType_filterFunctionDeclaration.d.ts.map

package/dist/generators/ts/{_NamedObjectType/NamedObjectType_filterFunctionDeclaration.js → _ObjectType/ObjectType_filterFunctionDeclaration.js}

@@ -1,6 +1,6 @@
 import { Maybe } from "purify-ts";
 import { code, joinCode } from "../ts-poet-wrapper.js";
-export function NamedObjectType_filterFunctionDeclaration() {
+export function ObjectType_filterFunctionDeclaration() {
     if (!this.configuration.features.has("Object.filter")) {
         return Maybe.empty();
     }
@@ -17,8 +17,8 @@ export function NamedObjectType_filterFunctionDeclaration() {
     }
     statements.push(code `return true;`);
     return Maybe.of(code `\
-export function filter(filter: ${this.filterType}, value: ${this.name}): boolean {
+export function filter(filter: ${this.filterType}, value: ${this.expression}): boolean {
   ${joinCode(statements)}
 }`);
 }
-//# sourceMappingURL=NamedObjectType_filterFunctionDeclaration.js.map
+//# sourceMappingURL=ObjectType_filterFunctionDeclaration.js.map

package/dist/generators/ts/_ObjectType/ObjectType_filterTypeDeclaration.d.ts

@@ -0,0 +1,5 @@
+import { Maybe } from "purify-ts";
+import type { ObjectType } from "../ObjectType.js";
+import { type Code } from "../ts-poet-wrapper.js";
+export declare function ObjectType_filterTypeDeclaration(this: ObjectType): Maybe<Code>;
+//# sourceMappingURL=ObjectType_filterTypeDeclaration.d.ts.map

package/dist/generators/ts/{_NamedObjectType/NamedObjectType_filterTypeDeclaration.js → _ObjectType/ObjectType_filterTypeDeclaration.js}

@@ -1,6 +1,6 @@
 import { Maybe } from "purify-ts";
 import { code, joinCode } from "../ts-poet-wrapper.js";
-export function NamedObjectType_filterTypeDeclaration() {
+export function ObjectType_filterTypeDeclaration() {
     if (!this.configuration.features.has("Object.filter")) {
         return Maybe.empty();
     }
@@ -17,9 +17,9 @@ export function NamedObjectType_filterTypeDeclaration() {
         }
     }
     for (const parentObjectType of this.parentObjectTypes) {
-        members.push(code `${parentObjectType.name}.Filter`);
+        members.push(code `${parentObjectType.alias.unsafeCoerce()}.Filter`);
     }
     return Maybe.of(code `\
 export type Filter = ${members.length > 0 ? joinCode(members, { on: " & " }) : "object"};`);
 }
-//# sourceMappingURL=NamedObjectType_filterTypeDeclaration.js.map
+//# sourceMappingURL=ObjectType_filterTypeDeclaration.js.map

package/dist/generators/ts/_ObjectType/ObjectType_focusSparqlConstructTriplesFunctionDeclaration.d.ts

@@ -0,0 +1,5 @@
+import { Maybe } from "purify-ts";
+import type { ObjectType } from "../ObjectType.js";
+import { type Code } from "../ts-poet-wrapper.js";
+export declare function ObjectType_focusSparqlConstructTriplesFunctionDeclaration(this: ObjectType): Maybe<Code>;
+//# sourceMappingURL=ObjectType_focusSparqlConstructTriplesFunctionDeclaration.d.ts.map

package/dist/generators/ts/{_NamedObjectType/NamedObjectType_focusSparqlConstructTriplesFunctionDeclaration.js → _ObjectType/ObjectType_focusSparqlConstructTriplesFunctionDeclaration.js}

@@ -6,7 +6,7 @@ const variables = {
     focusIdentifier: code `parameters.focusIdentifier`,
     variablePrefix: code `parameters.variablePrefix`,
 };
-export function NamedObjectType_focusSparqlConstructTriplesFunctionDeclaration() {
+export function ObjectType_focusSparqlConstructTriplesFunctionDeclaration() {
     if (!this.configuration.features.has("Object.SPARQL")) {
         return Maybe.empty();
     }
@@ -15,7 +15,7 @@ export function NamedObjectType_focusSparqlConstructTriplesFunctionDeclaration()
     let triplesVariableDeclarationKeyword = "const";
     const statements = [];
     for (const parentObjectType of this.parentObjectTypes) {
-        statements.push(code `triples = triples.concat(${parentObjectType.name}.focusSparqlConstructTriples(${{ filter: variables.filter, focusIdentifier: variables.focusIdentifier, ignoreRdfType: true, variablePrefix: variables.variablePrefix }}));`);
+        statements.push(code `triples = triples.concat(${parentObjectType.alias.unsafeCoerce()}.focusSparqlConstructTriples(${{ filter: variables.filter, focusIdentifier: variables.focusIdentifier, ignoreRdfType: true, variablePrefix: variables.variablePrefix }}));`);
         triplesVariableDeclarationKeyword = "let";
     }
     if (this.fromRdfType.isJust()) {
@@ -51,4 +51,4 @@ ${statements.length > 0
         : "return [];"}
 };`);
 }
-//# sourceMappingURL=NamedObjectType_focusSparqlConstructTriplesFunctionDeclaration.js.map
+//# sourceMappingURL=ObjectType_focusSparqlConstructTriplesFunctionDeclaration.js.map

package/dist/generators/ts/_ObjectType/ObjectType_focusSparqlWherePatternsFunctionDeclaration.d.ts

@@ -0,0 +1,5 @@
+import { Maybe } from "purify-ts";
+import type { ObjectType } from "../ObjectType.js";
+import { type Code } from "../ts-poet-wrapper.js";
+export declare function ObjectType_focusSparqlWherePatternsFunctionDeclaration(this: ObjectType): Maybe<Code>;
+//# sourceMappingURL=ObjectType_focusSparqlWherePatternsFunctionDeclaration.d.ts.map

package/dist/generators/ts/{_NamedObjectType/NamedObjectType_focusSparqlWherePatternsFunctionDeclaration.js → _ObjectType/ObjectType_focusSparqlWherePatternsFunctionDeclaration.js}

@@ -7,7 +7,7 @@ const variables = {
     focusIdentifier: code `parameters.focusIdentifier`,
     variablePrefix: code `parameters.variablePrefix`,
 };
-export function NamedObjectType_focusSparqlWherePatternsFunctionDeclaration() {
+export function ObjectType_focusSparqlWherePatternsFunctionDeclaration() {
     if (!this.configuration.features.has("Object.SPARQL")) {
         return Maybe.empty();
     }
@@ -17,7 +17,7 @@ export function NamedObjectType_focusSparqlWherePatternsFunctionDeclaration() {
     const statements = [];
     for (const parentObjectType of this.parentObjectTypes) {
         statements.push(code `\
-patterns = patterns.concat(${parentObjectType.name}.focusSparqlWherePatterns(${{ filter: variables.filter, focusIdentifier: variables.focusIdentifier, ignoreRdfType: true, preferredLanguages: variables.preferredLanguages, variablePrefix: variables.variablePrefix }}));`);
+patterns = patterns.concat(${parentObjectType.alias.unsafeCoerce()}.focusSparqlWherePatterns(${{ filter: variables.filter, focusIdentifier: variables.focusIdentifier, ignoreRdfType: true, preferredLanguages: variables.preferredLanguages, variablePrefix: variables.variablePrefix }}));`);
         patternsVariableDeclarationKeyword = "let";
     }
     if (this.fromRdfType.isJust()) {
@@ -99,4 +99,4 @@ ${statements.length > 0
         : "return [];"}
 };`);
 }
-//# sourceMappingURL=NamedObjectType_focusSparqlWherePatternsFunctionDeclaration.js.map
+//# sourceMappingURL=ObjectType_focusSparqlWherePatternsFunctionDeclaration.js.map

package/dist/generators/ts/_ObjectType/ObjectType_fromJsonFunctionDeclaration.d.ts

@@ -0,0 +1,5 @@
+import { Maybe } from "purify-ts";
+import type { ObjectType } from "../ObjectType.js";
+import { type Code } from "../ts-poet-wrapper.js";
+export declare function ObjectType_fromJsonFunctionDeclaration(this: ObjectType): Maybe<Code>;
+//# sourceMappingURL=ObjectType_fromJsonFunctionDeclaration.d.ts.map

package/dist/generators/ts/{_NamedObjectType/NamedObjectType_fromJsonFunctionDeclaration.js → _ObjectType/ObjectType_fromJsonFunctionDeclaration.js}

@@ -1,6 +1,6 @@
 import { Maybe } from "purify-ts";
 import { code, joinCode } from "../ts-poet-wrapper.js";
-export function NamedObjectType_fromJsonFunctionDeclaration() {
+export function ObjectType_fromJsonFunctionDeclaration() {
     if (!this.configuration.features.has("Object.fromJson")) {
         return Maybe.empty();
     }
@@ -10,7 +10,7 @@ export function NamedObjectType_fromJsonFunctionDeclaration() {
     const chains = [];
     this.parentObjectTypes.forEach((parentObjectType, parentObjectTypeI) => {
         chains.push({
-            expression: code `${parentObjectType.name}.fromJson(${variables.jsonObject})`,
+            expression: code `${parentObjectType.alias.unsafeCoerce()}.fromJson(${variables.jsonObject})`,
             variable: `super${parentObjectTypeI}`,
         });
     });
@@ -36,8 +36,8 @@ export function NamedObjectType_fromJsonFunctionDeclaration() {
             break;
     }
     return Maybe.of(code `\
-export function fromJson(${variables.jsonObject}: ${this.jsonType().name}): ${this.reusables.imports.Either}<Error, ${this.name}> {
+export function fromJson(${variables.jsonObject}: ${this.jsonType().name}): ${this.reusables.imports.Either}<Error, ${this.expression}> {
   return ${returnExpression};
 }`);
 }
-//# sourceMappingURL=NamedObjectType_fromJsonFunctionDeclaration.js.map
+//# sourceMappingURL=ObjectType_fromJsonFunctionDeclaration.js.map

package/dist/generators/ts/_ObjectType/ObjectType_fromRdfResourceFunctionDeclaration.d.ts

@@ -0,0 +1,5 @@
+import { Maybe } from "purify-ts";
+import type { ObjectType } from "../ObjectType.js";
+import { type Code } from "../ts-poet-wrapper.js";
+export declare function ObjectType_fromRdfResourceFunctionDeclaration(this: ObjectType): Maybe<Code>;
+//# sourceMappingURL=ObjectType_fromRdfResourceFunctionDeclaration.d.ts.map