@shaclmate/compiler 4.0.41 → 4.0.42

package/dist/generators/ts/{AbstractLazyObjectType.d.ts → AbstractLazyType.d.ts}

@@ -5,7 +5,7 @@ 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";
-export declare abstract class AbstractLazyObjectType<PartialTypeT extends AbstractLazyObjectType.PartialTypeConstraint, ResolveTypeT extends AbstractLazyObjectType.ResolveTypeConstraint> extends AbstractType {
+export declare abstract class AbstractLazyType<PartialTypeT extends AbstractLazyType.PartialTypeConstraint, ResolveTypeT extends AbstractLazyType.ResolveTypeConstraint> extends AbstractType {
     protected readonly partialType: PartialTypeT;
     protected readonly resolveType: ResolveTypeT;
     protected abstract readonly runtimeClass: {
@@ -16,7 +16,6 @@ export declare abstract class AbstractLazyObjectType<PartialTypeT extends Abstra
     readonly declaration: Maybe<Code>;
     readonly discriminantProperty: AbstractType["discriminantProperty"];
     readonly mutable = false;
-    readonly referencesObjectType = true;
     readonly validationFunction: Maybe<Code>;
     constructor({ partialType, resolveType, ...superParameters }: {
         partialType: PartialTypeT;
@@ -30,6 +29,7 @@ export declare abstract class AbstractLazyObjectType<PartialTypeT extends Abstra
     get hashFunction(): Code;
     get jsTypes(): readonly AbstractType.JsType[];
     get recursive(): boolean;
+    get referencesNamedType(): boolean;
     get schemaType(): Code;
     get toRdfResourceValueTypes(): AbstractType["toRdfResourceValueTypes"];
     get valueSparqlConstructTriplesFunction(): Code;
@@ -41,7 +41,7 @@ export declare abstract class AbstractLazyObjectType<PartialTypeT extends Abstra
     toJsonExpression({ variables, }: Parameters<AbstractType["toJsonExpression"]>[0]): Code;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractType["toRdfResourceValuesExpression"]>[0]): Code;
     toStringExpression({ variables, }: Parameters<AbstractType["toStringExpression"]>[0]): Code;
-    protected resolveToPartialFunction<ObjectTypeT extends AbstractLazyObjectType.ObjectTypeConstraint>({ partialType, resolveType, }: {
+    protected resolveToPartialFunction<ObjectTypeT extends AbstractLazyType.ItemTypeConstraint>({ partialType, resolveType, }: {
         partialType: ObjectTypeT;
         resolveType: ObjectTypeT;
     }): Code;
@@ -53,9 +53,9 @@ export declare abstract class AbstractLazyObjectType<PartialTypeT extends Abstra
         };
     }): Code;
 }
-export declare namespace AbstractLazyObjectType {
-    type ObjectTypeConstraint = ObjectType | ObjectUnionType;
-    type PartialTypeConstraint = ObjectTypeConstraint | OptionType<ObjectTypeConstraint> | SetType<ObjectTypeConstraint>;
+export declare namespace AbstractLazyType {
+    type ItemTypeConstraint = ObjectType | ObjectUnionType;
+    type PartialTypeConstraint = ItemTypeConstraint | OptionType<ItemTypeConstraint> | SetType<ItemTypeConstraint>;
     type ResolveTypeConstraint = PartialTypeConstraint;
     type ConversionFunction = AbstractType.ConversionFunction;
     type DiscriminantProperty = AbstractType.DiscriminantProperty;
@@ -64,4 +64,4 @@ export declare namespace AbstractLazyObjectType {
     const JsonType: typeof AbstractType.JsonType;
     type JsonType = AbstractType.JsonType;
 }
-//# sourceMappingURL=AbstractLazyObjectType.d.ts.map
+//# sourceMappingURL=AbstractLazyType.d.ts.map

package/dist/generators/ts/{AbstractLazyObjectType.js → AbstractLazyType.js}

@@ -9,13 +9,12 @@ import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
 import { AbstractType } from "./AbstractType.js";
 import { code, joinCode } from "./ts-poet-wrapper.js";
-export class AbstractLazyObjectType extends AbstractType {
+export class AbstractLazyType extends AbstractType {
     partialType;
     resolveType;
     declaration = Maybe.empty();
     discriminantProperty = Maybe.empty();
     mutable = false;
-    referencesObjectType = true;
     validationFunction = Maybe.empty();
     constructor({ partialType, resolveType, ...superParameters }) {
         super(superParameters);
@@ -52,6 +51,9 @@ export class AbstractLazyObjectType extends AbstractType {
     get recursive() {
         return this.partialType.recursive;
     }
+    get referencesNamedType() {
+        return this.partialType.referencesNamedType;
+    }
     get schemaType() {
         return code `${{
             kind: this.kind,
@@ -103,13 +105,13 @@ export class AbstractLazyObjectType extends AbstractType {
     }
     resolveToPartialFunction({ partialType, resolveType, }) {
         if (partialType.kind === "Object") {
-            return code `${partialType.alias.unsafeCoerce()}.createUnsafe`;
+            return code `${partialType.name.unsafeCoerce()}.createUnsafe`;
         }
         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.alias.unsafeCoerce()}.createUnsafe(resolved);`;
+            return code `${discriminantValues.map((discriminantPropertyValue) => `case "${discriminantPropertyValue}":`).join("\n")} return ${partialType.members[memberI].type.name.unsafeCoerce()}.createUnsafe(resolved);`;
         });
         caseBlocks.push(code `default: resolved satisfies never; throw new Error("unrecognized type");`);
         return code `((resolved: ${resolveType.expression}) => { switch (resolved.${resolveType.discriminantProperty.unsafeCoerce().name}) { ${joinCode(caseBlocks)} } })`;
@@ -118,7 +120,7 @@ export class AbstractLazyObjectType extends AbstractType {
         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});`;
+            return code `${discriminantValues.map((discriminantPropertyValue) => `case "${discriminantPropertyValue}":`).join("\n")} return ${partialObjectUnionType.members[memberI].type.name.unsafeCoerce()}.create(${variables.resolvedObjectUnion});`;
         });
         caseBlocks.push(code `default: ${variables.resolvedObjectUnion} satisfies never; throw new Error("unrecognized type");`);
         return code `switch (${variables.resolvedObjectUnion}.${resolvedObjectUnionType.discriminantProperty.unsafeCoerce().name}) { ${joinCode(caseBlocks)} }`;
@@ -126,27 +128,27 @@ export class AbstractLazyObjectType extends AbstractType {
 }
 __decorate([
     Memoize()
-], AbstractLazyObjectType.prototype, "equalsFunction", null);
+], AbstractLazyType.prototype, "equalsFunction", null);
 __decorate([
     Memoize()
-], AbstractLazyObjectType.prototype, "filterFunction", null);
+], AbstractLazyType.prototype, "filterFunction", null);
 __decorate([
     Memoize()
-], AbstractLazyObjectType.prototype, "hashFunction", null);
+], AbstractLazyType.prototype, "hashFunction", null);
 __decorate([
     Memoize()
-], AbstractLazyObjectType.prototype, "jsTypes", null);
+], AbstractLazyType.prototype, "jsTypes", null);
 __decorate([
     Memoize()
-], AbstractLazyObjectType.prototype, "schemaType", null);
+], AbstractLazyType.prototype, "schemaType", null);
 __decorate([
     Memoize()
-], AbstractLazyObjectType.prototype, "valueSparqlConstructTriplesFunction", null);
+], AbstractLazyType.prototype, "valueSparqlConstructTriplesFunction", null);
 __decorate([
     Memoize()
-], AbstractLazyObjectType.prototype, "valueSparqlWherePatternsFunction", null);
-(function (AbstractLazyObjectType) {
-    AbstractLazyObjectType.GraphqlType = AbstractType.GraphqlType;
-    AbstractLazyObjectType.JsonType = AbstractType.JsonType;
-})(AbstractLazyObjectType || (AbstractLazyObjectType = {}));
-//# sourceMappingURL=AbstractLazyObjectType.js.map
+], AbstractLazyType.prototype, "valueSparqlWherePatternsFunction", null);
+(function (AbstractLazyType) {
+    AbstractLazyType.GraphqlType = AbstractType.GraphqlType;
+    AbstractLazyType.JsonType = AbstractType.JsonType;
+})(AbstractLazyType || (AbstractLazyType = {}));
+//# sourceMappingURL=AbstractLazyType.js.map

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

@@ -1,21 +1,18 @@
 import type { Literal } from "@rdfjs/types";
 import { AbstractTermType } from "./AbstractTermType.js";
-import { type Code } from "./ts-poet-wrapper.js";
+import type { Code } from "./ts-poet-wrapper.js";
 export declare abstract class AbstractLiteralType extends AbstractTermType<Literal, Literal> {
     protected readonly languageIn: readonly string[];
     readonly nodeKinds: ReadonlySet<"Literal">;
     constructor({ languageIn, ...superParameters }: {
         languageIn: readonly string[];
     } & ConstructorParameters<typeof AbstractTermType<Literal, Literal>>[0]);
-    get constrained(): boolean;
-    protected get schemaInitializers(): readonly Code[];
     /**
      * An expression that converts a compile-time RDF/JS Literal into a runtime TypeScript literal.
      *
      * For example, a string would be converted to "thestring".
      */
-    abstract literalExpression(literal: Literal): Code;
-    protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<AbstractTermType<Literal, Literal>["fromRdfResourceValuesExpressionChain"]>[0]): ReturnType<AbstractTermType<Literal, Literal>["fromRdfResourceValuesExpressionChain"]>;
+    abstract literalValueExpression(literal: Literal): Code;
 }
 export declare namespace AbstractLiteralType {
     type ConversionFunction = AbstractTermType.ConversionFunction;

package/dist/generators/ts/AbstractLiteralType.js

@@ -1,5 +1,4 @@
 import { AbstractTermType } from "./AbstractTermType.js";
-import { arrayOf, code } from "./ts-poet-wrapper.js";
 export class AbstractLiteralType extends AbstractTermType {
     languageIn;
     nodeKinds = nodeKinds;
@@ -7,26 +6,6 @@ export class AbstractLiteralType extends AbstractTermType {
         super(superParameters);
         this.languageIn = languageIn;
     }
-    get constrained() {
-        return super.constrained || this.languageIn.length > 0;
-    }
-    get schemaInitializers() {
-        let initializers = super.schemaInitializers;
-        if (this.languageIn.length > 0) {
-            initializers = initializers.concat(code `languageIn: ${arrayOf(...this.languageIn)}`);
-        }
-        return initializers;
-    }
-    fromRdfResourceValuesExpressionChain({ variables, }) {
-        return {
-            ...super.fromRdfResourceValuesExpressionChain({ variables }),
-            languageIn: this.languageIn.length > 0
-                ? code `chain(values => ${this.reusables.snippets.fromRdfLanguageIn}(values, ${JSON.stringify(this.languageIn)}))`
-                : undefined,
-            preferredLanguages: code `chain(values => ${this.reusables.snippets.fromRdfPreferredLanguages}(values, ${variables.preferredLanguages}))`,
-            valueTo: code `chain(values => values.chainMap(value => value.toLiteral()))`,
-        };
-    }
 }
 (function (AbstractLiteralType) {
     AbstractLiteralType.GraphqlType = AbstractTermType.GraphqlType;

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

@@ -8,17 +8,11 @@ export declare abstract class AbstractNumericType<ValueT extends bigint | number
     abstract readonly kind: "BigInt" | "Float" | "Int";
     get filterFunction(): Code;
     get filterType(): Code;
-    get expression(): Code;
     get schemaType(): Code;
     get valueSparqlWherePatternsFunction(): Code;
+    protected get inlineExpression(): Code;
     jsonSchema(_parameters: Parameters<AbstractPrimitiveType<ValueT>["jsonSchema"]>[0]): Code;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractPrimitiveType<string>["toRdfResourceValuesExpression"]>[0]): Code;
-    protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<AbstractPrimitiveType<ValueT>["fromRdfResourceValuesExpressionChain"]>[0]): ReturnType<AbstractPrimitiveType<ValueT>["fromRdfResourceValuesExpressionChain"]>;
-    protected abstract fromRdfResourceValueExpression(variables: {
-        variables: {
-            value: Code;
-        };
-    }): Code;
 }
 export declare namespace AbstractNumericType {
     const JsonType: typeof import("./AbstractType.js").AbstractType.JsonType;

package/dist/generators/ts/AbstractNumericType.js

@@ -13,46 +13,36 @@ 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.jsTypes[0].typeof}>`;
+        return code `${this.reusables.snippets.filterNumeric}<${this.expression}>`;
     }
     get filterType() {
-        return code `${this.reusables.snippets.NumericFilter}<${this.jsTypes[0].typeof}>`;
-    }
-    get expression() {
-        if (this.primitiveIn.length > 0) {
-            return code `${joinCode(this.primitiveIn.map((value) => this.literalExpression(value)), { on: " | " })}`;
-        }
-        return code `${this.jsTypes[0].typeof}`;
+        return code `${this.reusables.snippets.NumericFilter}<${this.expression}>`;
     }
     get schemaType() {
-        return code `${this.reusables.snippets.NumericSchema}<${this.jsTypes[0].typeof}>`;
+        return code `${this.reusables.snippets.NumericSchema}<${this.expression}>`;
     }
     get valueSparqlWherePatternsFunction() {
-        return code `${this.reusables.snippets.numericSparqlWherePatterns}<${this.jsTypes[0].typeof}>`;
+        return code `${this.reusables.snippets.numericSparqlWherePatterns}<${this.expression}>`;
+    }
+    get inlineExpression() {
+        if (this.primitiveIn.length > 0) {
+            return code `${joinCode(this.primitiveIn.map((value) => this.literalValueExpression(value)), { on: " | " })}`;
+        }
+        return code `${this.jsTypes[0].typeof}`;
     }
     jsonSchema(_parameters) {
         switch (this.primitiveIn.length) {
             case 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])})`;
+                return code `${this.reusables.imports.z}.literal(${this.literalValueExpression(this.primitiveIn[0])})`;
             default:
-                return code `${this.reusables.imports.z}.union([${joinCode(this.primitiveIn.map((value) => code `${this.reusables.imports.z}.literal(${this.literalExpression(value)})`), { on: "," })}])`;
+                return code `${this.reusables.imports.z}.union([${joinCode(this.primitiveIn.map((value) => code `${this.reusables.imports.z}.literal(${this.literalValueExpression(value)})`), { on: "," })}])`;
         }
     }
     toRdfResourceValuesExpression({ variables, }) {
         return code `[${this.reusables.snippets.literalFactory}.${this.jsTypes[0].typeof}(${variables.value}, ${this.rdfjsTermExpression(this.datatype)})]`;
     }
-    fromRdfResourceValuesExpressionChain({ variables, }) {
-        return {
-            ...super.fromRdfResourceValuesExpressionChain({ variables }),
-            languageIn: undefined,
-            preferredLanguages: undefined,
-            valueTo: code `chain(values => values.chainMap(value => ${this.fromRdfResourceValueExpression({
-                variables: { value: code `value` },
-            })}))`,
-        };
-    }
 }
 __decorate([
     Memoize()
@@ -60,15 +50,15 @@ __decorate([
 __decorate([
     Memoize()
 ], AbstractNumericType.prototype, "filterType", null);
-__decorate([
-    Memoize()
-], AbstractNumericType.prototype, "expression", null);
 __decorate([
     Memoize()
 ], AbstractNumericType.prototype, "schemaType", null);
 __decorate([
     Memoize()
 ], AbstractNumericType.prototype, "valueSparqlWherePatternsFunction", null);
+__decorate([
+    Memoize()
+], AbstractNumericType.prototype, "inlineExpression", null);
 (function (AbstractNumericType) {
     AbstractNumericType.JsonType = AbstractPrimitiveType.JsonType;
 })(AbstractNumericType || (AbstractNumericType = {}));

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

@@ -20,9 +20,9 @@ export declare abstract class AbstractObjectSetType {
     });
     abstract readonly declaration: Code;
     protected methodSignatures(namedObjectType: {
-        readonly alias: Maybe<string>;
         readonly filterType: Code;
         readonly identifierTypeAlias: Code;
+        readonly name: Maybe<string>;
         readonly objectSetMethodNames: ObjectType.ObjectSetMethodNames;
     }, options?: {
         parameterNamePrefix?: string;

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.alias.unsafeCoerce()}>>`,
+                returnType: code `Promise<${this.reusables.imports.Either}<Error, ${namedObjectType.name.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.alias.unsafeCoerce()}[]>>`,
+                returnType: code `Promise<${this.reusables.imports.Either}<Error, readonly ${namedObjectType.name.unsafeCoerce()}[]>>`,
             },
         };
     }

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

@@ -17,7 +17,7 @@ export declare abstract class AbstractPrimitiveType<ValueT extends bigint | bool
     fromJsonExpression({ variables, }: Parameters<AbstractLiteralType["fromJsonExpression"]>[0]): Code;
     graphqlResolveExpression({ variables, }: Parameters<AbstractLiteralType["graphqlResolveExpression"]>[0]): Code;
     jsonType(): AbstractLiteralType.JsonType;
-    abstract literalExpression(literal: Literal | ValueT): Code;
+    abstract literalValueExpression(literal: Literal | ValueT): Code;
     toJsonExpression({ variables, }: Parameters<AbstractLiteralType["toJsonExpression"]>[0]): Code;
 }
 export declare namespace AbstractPrimitiveType {

package/dist/generators/ts/AbstractPrimitiveType.js

@@ -24,7 +24,7 @@ export class AbstractPrimitiveType extends AbstractLiteralType {
     get schemaInitializers() {
         let initializers = super.schemaInitializers;
         if (this.primitiveIn.length > 0) {
-            initializers = initializers.concat(code `in: ${arrayOf(...this.primitiveIn.map((in_) => this.literalExpression(in_)))}`);
+            initializers = initializers.concat(code `in: ${arrayOf(...this.primitiveIn.map((in_) => this.literalValueExpression(in_)))} as const`);
         }
         return initializers;
     }

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

@@ -2,10 +2,9 @@ import type { BlankNode, Literal, NamedNode } from "@rdfjs/types";
 import { NodeKind } from "@shaclmate/shacl-ast";
 import { Maybe } from "purify-ts";
 import { AbstractType } from "./AbstractType.js";
-import type { Type } from "./Type.js";
 import { type Code } from "./ts-poet-wrapper.js";
 /**
- * Abstract base class for IdentifierType and LiteralType.
+ * Abstract base class for all types that are terms in RDF (i.e., identifiers, literals).
  *
  * ConstantTermT is the type of sh:hasValue and sh:in.
  * RuntimeTermT is the type of values at runtime.
@@ -13,7 +12,7 @@ import { type Code } from "./ts-poet-wrapper.js";
  * The two are differentiated because identifiers can have BlankNode or NamedNode values at runtime but only NamedNode values for sh:hasValue and sh:in.
  */
 export declare abstract class AbstractTermType<ConstantTermT extends Literal | NamedNode = Literal | NamedNode, _RuntimeTermT extends BlankNode | Literal | NamedNode = BlankNode | Literal | NamedNode> extends AbstractType {
-    readonly declaration: Maybe<Code>;
+    protected abstract readonly inlineExpression: Code;
     readonly equalsFunction: Code;
     readonly graphqlArgs: AbstractType["graphqlArgs"];
     readonly hasValues: readonly ConstantTermT[];
@@ -22,36 +21,22 @@ export declare abstract class AbstractTermType<ConstantTermT extends Literal | N
     readonly mutable: boolean;
     abstract readonly nodeKinds: ReadonlySet<NodeKind>;
     readonly recursive = false;
-    readonly referencesObjectType = false;
     readonly validationFunction: Maybe<Code>;
     constructor({ hasValues, in_, ...superParameters }: {
         hasValues: readonly ConstantTermT[];
         in_: readonly ConstantTermT[];
     } & ConstructorParameters<typeof AbstractType>[0]);
-    get constrained(): boolean;
+    get declaration(): Maybe<Code>;
     get discriminantProperty(): Maybe<AbstractType.DiscriminantProperty>;
+    get expression(): Code;
+    get referencesNamedType(): boolean;
     get termTypes(): ReadonlySet<"BlankNode" | "Literal" | "NamedNode">;
     get toRdfResourceValueTypes(): Set<"BlankNode" | "Literal" | "NamedNode">;
     get valueSparqlConstructTriplesFunction(): Code;
-    fromRdfResourceValuesExpression(parameters: Parameters<AbstractType["fromRdfResourceValuesExpression"]>[0]): Code;
+    protected get schemaInitializers(): readonly Code[];
     jsonUiSchemaElement(): Maybe<Code>;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractType["toRdfResourceValuesExpression"]>[0]): Code;
     toStringExpression({ variables, }: Parameters<AbstractType["toStringExpression"]>[0]): Code;
-    /**
-     * The fromRdfExpression for a term type can be decomposed into multiple sub-expressions with different purposes:
-     *
-     * hasValues: test whether the values sequence has sh:hasValue values
-     * languageIn: filter the values sequence to literals with the right sh:languageIn (or runtime languageIn)
-     * valueTo: convert values in the values sequence to the appropriate term type/sub-type (literal, string, etc.)
-     *
-     * Considering the sub-expressions as a record instead of an array allows them to be selectively overridden by subclasses.
-     */
-    protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<Type["fromRdfResourceValuesExpression"]>[0]): {
-        hasValues?: Code;
-        languageIn?: Code;
-        preferredLanguages?: Code;
-        valueTo: Code;
-    };
 }
 export declare namespace AbstractTermType {
     type ConversionFunction = AbstractType.ConversionFunction;

package/dist/generators/ts/AbstractTermType.js

@@ -8,9 +8,9 @@ import { NodeKind } from "@shaclmate/shacl-ast";
 import { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
 import { AbstractType } from "./AbstractType.js";
-import { code, joinCode } from "./ts-poet-wrapper.js";
+import { arrayOf, code } from "./ts-poet-wrapper.js";
 /**
- * Abstract base class for IdentifierType and LiteralType.
+ * Abstract base class for all types that are terms in RDF (i.e., identifiers, literals).
  *
  * ConstantTermT is the type of sh:hasValue and sh:in.
  * RuntimeTermT is the type of values at runtime.
@@ -18,7 +18,6 @@ import { code, joinCode } from "./ts-poet-wrapper.js";
  * The two are differentiated because identifiers can have BlankNode or NamedNode values at runtime but only NamedNode values for sh:hasValue and sh:in.
  */
 export class AbstractTermType extends AbstractType {
-    declaration = Maybe.empty();
     equalsFunction = code `${this.reusables.snippets.booleanEquals}`;
     graphqlArgs = Maybe.empty();
     hasValues;
@@ -26,24 +25,32 @@ export class AbstractTermType extends AbstractType {
     in_;
     mutable = false;
     recursive = false;
-    referencesObjectType = false;
     validationFunction = Maybe.empty();
     constructor({ hasValues, in_, ...superParameters }) {
         super(superParameters);
         this.hasValues = hasValues;
         this.in_ = in_;
     }
-    get constrained() {
-        return this.hasValues.length > 0 || this.in_.length > 0;
+    get declaration() {
+        return this.name.map((name) => code `export type ${name} = ${this.inlineExpression};`);
     }
     get discriminantProperty() {
         return Maybe.of({
             jsonName: "termType",
             name: "termType",
             values: [...this.nodeKinds].map(NodeKind.toTermType),
-            type: "string",
         });
     }
+    get expression() {
+        const name = this.name.extract();
+        if (name) {
+            return code `${name}`;
+        }
+        return this.inlineExpression;
+    }
+    get referencesNamedType() {
+        return this.name.isJust();
+    }
     get termTypes() {
         return new Set([...this.nodeKinds].map(NodeKind.toTermType));
     }
@@ -53,21 +60,12 @@ export class AbstractTermType extends AbstractType {
     get valueSparqlConstructTriplesFunction() {
         return code `((_: object) => [])`;
     }
-    fromRdfResourceValuesExpression(parameters) {
-        // invariant(
-        //   this.nodeKinds.has("Literal") &&
-        //     (this.nodeKinds.has("BlankNode") || this.nodeKinds.has("NamedNode")),
-        //   "IdentifierType and LiteralType should override",
-        // );
-        const chain = this.fromRdfResourceValuesExpressionChain(parameters);
-        const { variables } = parameters;
-        return joinCode([
-            variables.resourceValues,
-            chain.hasValues,
-            chain.languageIn,
-            chain.preferredLanguages,
-            chain.valueTo,
-        ].filter((_) => _ !== undefined), { on: "." });
+    get schemaInitializers() {
+        let initializers = super.schemaInitializers;
+        if (this.hasValues.length > 0) {
+            initializers = initializers.concat(code `hasValues: ${arrayOf(...this.hasValues.map((hasValue) => this.rdfjsTermExpression(hasValue)))}`);
+        }
+        return initializers;
     }
     jsonUiSchemaElement() {
         return Maybe.empty();
@@ -78,43 +76,16 @@ export class AbstractTermType extends AbstractType {
     toStringExpression({ variables, }) {
         return code `${variables.value}.toString()`;
     }
-    /**
-     * The fromRdfExpression for a term type can be decomposed into multiple sub-expressions with different purposes:
-     *
-     * hasValues: test whether the values sequence has sh:hasValue values
-     * languageIn: filter the values sequence to literals with the right sh:languageIn (or runtime languageIn)
-     * valueTo: convert values in the values sequence to the appropriate term type/sub-type (literal, string, etc.)
-     *
-     * Considering the sub-expressions as a record instead of an array allows them to be selectively overridden by subclasses.
-     */
-    fromRdfResourceValuesExpressionChain({ variables, }) {
-        let valueToExpression;
-        if (this.in_.length > 0) {
-            valueToExpression = code `value.toTerm([${joinCode(this.in_.map((in_) => this.rdfjsTermExpression(in_)), { on: ", " })}])`;
-        }
-        else if (this.nodeKinds.size < 3) {
-            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.expression}`.toCodeString([]), focusResource: variables.resource, propertyPath: variables.propertyPath }}));
-  }})`;
-        }
-        else {
-            valueToExpression = code `value.toTerm()`;
-        }
-        return {
-            hasValues: this.hasValues.length > 0
-                ? code `\
-chain(values => ${this.reusables.imports.Either}.sequence([${joinCode(this.hasValues.map((hasValue) => this.rdfjsTermExpression(hasValue)), { on: ", " })}].map(hasValue => values.find(value => value.term.equals(hasValue)))).map(() => values))`
-                : undefined,
-            valueTo: code `chain(values => values.chainMap(value => ${valueToExpression}))`,
-        };
-    }
 }
+__decorate([
+    Memoize()
+], AbstractTermType.prototype, "declaration", null);
 __decorate([
     Memoize()
 ], AbstractTermType.prototype, "discriminantProperty", null);
+__decorate([
+    Memoize()
+], AbstractTermType.prototype, "expression", null);
 __decorate([
     Memoize()
 ], AbstractTermType.prototype, "termTypes", null);