@shaclmate/compiler 4.0.39 → 4.0.41

package/dist/generators/ts/AbstractType.js

@@ -14,6 +14,10 @@ export class AbstractType {
     configuration;
     logger;
     reusables;
+    /**
+     * Alias for this type.
+     */
+    alias;
     /**
      * Comment from rdfs:comment.
      */
@@ -22,7 +26,8 @@ export class AbstractType {
      * Label from rdfs:label.
      */
     label;
-    constructor({ comment, configuration, label, logger, reusables, }) {
+    constructor({ alias, comment, configuration, label, logger, reusables, }) {
+        this.alias = alias;
         this.comment = comment;
         this.configuration = configuration;
         this.label = label;
@@ -58,47 +63,62 @@ __decorate([
          */
         nullable;
         /**
-         * The name of the type when it's nullable -- so it should never include "new graphql.GraphQLNonNull(...)" around it.
+         * The expression of the type when it's nullable -- so it should never include "new graphql.GraphQLNonNull(...)" around it.
          */
-        nullableName;
+        nullableExpression;
         reusables;
-        constructor(nullableName, reusables, options) {
+        constructor(nullableExpression, reusables, options) {
             this.nullable = !!options?.nullable;
-            this.nullableName = nullableName;
+            this.nullableExpression = nullableExpression;
             this.reusables = reusables;
         }
-        get name() {
+        get expression() {
             return this.nullable
-                ? this.nullableName
-                : code `new ${this.reusables.imports.GraphQLNonNull}(${this.nullableName})`;
+                ? this.nullableExpression
+                : code `new ${this.reusables.imports.GraphQLNonNull}(${this.nullableExpression})`;
         }
     }
     __decorate([
         Memoize()
-    ], GraphqlType.prototype, "name", null);
+    ], GraphqlType.prototype, "expression", null);
     AbstractType.GraphqlType = GraphqlType;
+    let JsType;
+    (function (JsType) {
+        function equals(left, right) {
+            if (left.typeof !== right.typeof) {
+                return false;
+            }
+            if (left.typeof === "object" &&
+                right.typeof === "object" &&
+                left.instanceof !== right.instanceof) {
+                return false;
+            }
+            return true;
+        }
+        JsType.equals = equals;
+    })(JsType = AbstractType.JsType || (AbstractType.JsType = {}));
     class JsonType {
         /**
          * Is the type optional in JSON? Equivalent to ? in TypeScript or | undefined.
          */
         optional;
         /**
-         * The name of the type when it's required i.e. -- so it should never include "| undefined".
+         * The expression of the type when it's required i.e. -- so it should never include "| undefined".
          */
-        requiredName;
-        constructor(requiredName, parameters) {
+        requiredExpression;
+        constructor(requiredExpression, parameters) {
             this.optional = !!parameters?.optional;
-            this.requiredName = requiredName;
+            this.requiredExpression = requiredExpression;
         }
-        get name() {
+        get expression() {
             return this.optional
-                ? code `(${this.requiredName}) | undefined`
-                : this.requiredName;
+                ? code `(${this.requiredExpression}) | undefined`
+                : this.requiredExpression;
         }
     }
     __decorate([
         Memoize()
-    ], JsonType.prototype, "name", null);
+    ], JsonType.prototype, "expression", null);
     AbstractType.JsonType = JsonType;
 })(AbstractType || (AbstractType = {}));
 //# sourceMappingURL=AbstractType.js.map

package/dist/generators/ts/BigDecimalType.d.ts

@@ -3,11 +3,15 @@ import { Maybe } from "purify-ts";
 import { AbstractLiteralType } from "./AbstractLiteralType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class BigDecimalType extends AbstractLiteralType {
-    readonly name: Code;
     readonly conversionFunction: Maybe<AbstractLiteralType.ConversionFunction>;
+    readonly expression: Code;
     readonly filterFunction: Code;
     readonly filterType: Code;
     readonly hashFunction: Code;
+    readonly jsTypes: readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
+    }];
     readonly kind = "BigDecimal";
     readonly schemaType: Code;
     readonly valueSparqlWherePatternsFunction: Code;

package/dist/generators/ts/BigDecimalType.js

@@ -9,11 +9,14 @@ import { Memoize } from "typescript-memoize";
 import { AbstractLiteralType } from "./AbstractLiteralType.js";
 import { code, literalOf } from "./ts-poet-wrapper.js";
 export class BigDecimalType extends AbstractLiteralType {
-    name = code `${this.reusables.imports.BigDecimal}`;
     conversionFunction = Maybe.empty();
+    expression = code `${this.reusables.imports.BigDecimal}`;
     filterFunction = code `${this.reusables.snippets.filterBigDecimal}`;
     filterType = code `${this.reusables.snippets.NumericFilter}<${this.reusables.imports.BigDecimal}>`;
     hashFunction = code `${this.reusables.snippets.hashBigDecimal}`;
+    jsTypes = [
+        { instanceof: "Object", typeof: "object" },
+    ];
     kind = "BigDecimal";
     schemaType = code `${this.reusables.snippets.NumericSchema}<${this.reusables.imports.BigDecimal}>`;
     valueSparqlWherePatternsFunction = code `${this.reusables.snippets.bigDecimalSparqlWherePatterns}`;
@@ -21,7 +24,7 @@ export class BigDecimalType extends AbstractLiteralType {
         return new AbstractLiteralType.GraphqlType(code `${this.reusables.imports.GraphQLString}`, this.reusables);
     }
     fromJsonExpression({ variables, }) {
-        return code `${this.reusables.imports.Either}.encase<Error, ${this.name}>(() => new ${this.name}(${variables.value}))`;
+        return code `${this.reusables.imports.Either}.encase<Error, ${this.expression}>(() => new ${this.expression}(${variables.value}))`;
     }
     graphqlResolveExpression({ variables, }) {
         return code `${variables.value}.toFixed()`;
@@ -30,7 +33,7 @@ export class BigDecimalType extends AbstractLiteralType {
         return code `${this.reusables.imports.z}.string()`;
     }
     jsonType() {
-        return new AbstractLiteralType.JsonType("string");
+        return new AbstractLiteralType.JsonType(code `string`);
     }
     literalExpression(literal) {
         return code `new ${this.reusables.imports.BigDecimal}(${literalOf(literal.value)})`;

package/dist/generators/ts/BigIntType.d.ts

@@ -2,8 +2,10 @@ import type { Literal } from "@rdfjs/types";
 import { AbstractNumericType } from "./AbstractNumericType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class BigIntType extends AbstractNumericType<bigint> {
+    readonly jsTypes: {
+        readonly typeof: "bigint";
+    }[];
     readonly kind = "BigInt";
-    readonly typeofs: "bigint"[];
     get graphqlType(): import("./AbstractType.js").AbstractType.GraphqlType;
     fromJsonExpression({ variables, }: Parameters<AbstractNumericType<bigint>["fromJsonExpression"]>[0]): Code;
     jsonSchema(_parameters: Parameters<AbstractNumericType<bigint>["jsonSchema"]>[0]): Code;

package/dist/generators/ts/BigIntType.js

@@ -9,17 +9,17 @@ import { Memoize } from "typescript-memoize";
 import { AbstractNumericType } from "./AbstractNumericType.js";
 import { code, joinCode, literalOf } from "./ts-poet-wrapper.js";
 export class BigIntType extends AbstractNumericType {
+    jsTypes = [{ typeof: "bigint" }];
     kind = "BigInt";
-    typeofs = ["bigint"];
     get graphqlType() {
         return new AbstractNumericType.GraphqlType(code `${this.reusables.imports.GraphQLBigInt}`, this.reusables);
     }
     fromJsonExpression({ variables, }) {
         let expression = code `BigInt(${variables.value})`;
         if (this.primitiveIn.length > 0) {
-            expression = code `${expression} as ${this.name}`;
+            expression = code `${expression} as ${this.expression}`;
         }
-        return code `${this.reusables.imports.Either}.encase<Error, ${this.name}>(() => ${expression})`;
+        return code `${this.reusables.imports.Either}.encase<Error, ${this.expression}>(() => ${expression})`;
     }
     jsonSchema(_parameters) {
         switch (this.primitiveIn.length) {

package/dist/generators/ts/BlankNodeType.d.ts

@@ -3,19 +3,19 @@ import { Maybe } from "purify-ts";
 import { AbstractIdentifierType } from "./AbstractIdentifierType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class BlankNodeType extends AbstractIdentifierType<BlankNode> {
+    readonly expression: Code;
     readonly conversionFunction: Maybe<AbstractIdentifierType.ConversionFunction>;
     readonly filterFunction: Code;
     readonly filterType: Code;
-    readonly parseFunction: Code;
     readonly kind = "BlankNode";
-    readonly name: Code;
     readonly nodeKinds: ReadonlySet<"BlankNode">;
+    readonly parseFunction: Code;
     readonly schemaType: Code;
     readonly valueSparqlWherePatternsFunction: Code;
     constructor(superParameters: Omit<ConstructorParameters<typeof AbstractIdentifierType<BlankNode>>[0], "hasValues" | "in_">);
     fromJsonExpression({ variables, }: Parameters<AbstractIdentifierType<BlankNode>["fromJsonExpression"]>[0]): Code;
-    jsonType(parameters?: Parameters<AbstractIdentifierType<BlankNode>["jsonType"]>[0]): AbstractIdentifierType.JsonType;
     jsonSchema({ includeDiscriminantProperty, }: Parameters<AbstractIdentifierType<BlankNode>["jsonSchema"]>[0]): Code;
+    jsonType(parameters?: Parameters<AbstractIdentifierType<BlankNode>["jsonType"]>[0]): AbstractIdentifierType.JsonType;
     toJsonExpression({ includeDiscriminantProperty, variables, }: Parameters<AbstractIdentifierType<BlankNode>["toJsonExpression"]>[0]): Code;
     protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<AbstractIdentifierType<BlankNode>["fromRdfResourceValuesExpressionChain"]>[0]): {
         valueTo: Code;

package/dist/generators/ts/BlankNodeType.js

@@ -9,25 +9,25 @@ import { Memoize } from "typescript-memoize";
 import { AbstractIdentifierType } from "./AbstractIdentifierType.js";
 import { code } from "./ts-poet-wrapper.js";
 export class BlankNodeType extends AbstractIdentifierType {
+    expression = code `${this.reusables.imports.BlankNode}`;
     conversionFunction = Maybe.of({
         code: code `${this.reusables.snippets.convertToBlankNode}`,
         sourceTypes: [
             {
-                name: code `${this.reusables.imports.BlankNode}`,
-                typeof: "object",
+                expression: code `${this.reusables.imports.BlankNode}`,
+                jsType: this.jsTypes[0],
             },
             {
-                name: "undefined",
-                typeof: "undefined",
+                expression: code `undefined`,
+                jsType: { typeof: "undefined" },
             },
         ],
     });
     filterFunction = code `${this.reusables.snippets.filterBlankNode}`;
     filterType = code `${this.reusables.snippets.BlankNodeFilter}`;
-    parseFunction = code `${this.reusables.snippets.parseBlankNode};`;
     kind = "BlankNode";
-    name = code `${this.reusables.imports.BlankNode}`;
     nodeKinds = nodeKinds;
+    parseFunction = code `${this.reusables.snippets.parseBlankNode};`;
     schemaType = code `${this.reusables.snippets.BlankNodeSchema}`;
     valueSparqlWherePatternsFunction = code `${this.reusables.snippets.blankNodeSparqlWherePatterns}`;
     constructor(superParameters) {
@@ -38,13 +38,7 @@ export class BlankNodeType extends AbstractIdentifierType {
         });
     }
     fromJsonExpression({ variables, }) {
-        return code `${this.reusables.imports.Either}.of<Error, ${this.name}>(${this.reusables.imports.dataFactory}.blankNode(${variables.value}["@id"].substring(2)))`;
-    }
-    jsonType(parameters) {
-        const discriminantProperty = parameters?.includeDiscriminantProperty
-            ? `, readonly termType: "BlankNode"`
-            : "";
-        return new AbstractIdentifierType.JsonType(code `{ readonly "@id": string${discriminantProperty} }`);
+        return code `${this.reusables.imports.Either}.of<Error, ${this.expression}>(${this.reusables.imports.dataFactory}.blankNode(${variables.value}["@id"].substring(2)))`;
     }
     jsonSchema({ includeDiscriminantProperty, }) {
         const discriminantProperty = includeDiscriminantProperty
@@ -52,6 +46,12 @@ export class BlankNodeType extends AbstractIdentifierType {
             : "";
         return code `${this.reusables.imports.z}.object({ "@id": ${this.reusables.imports.z}.string().min(1)${discriminantProperty} })`;
     }
+    jsonType(parameters) {
+        const discriminantProperty = parameters?.includeDiscriminantProperty
+            ? `, readonly termType: "BlankNode"`
+            : "";
+        return new AbstractIdentifierType.JsonType(code `{ readonly "@id": string${discriminantProperty} }`);
+    }
     toJsonExpression({ includeDiscriminantProperty, variables, }) {
         const discriminantProperty = includeDiscriminantProperty
             ? code `, termType: ${variables.value}.termType`

package/dist/generators/ts/BooleanType.d.ts

@@ -6,11 +6,13 @@ export declare class BooleanType extends AbstractPrimitiveType<boolean> {
     readonly filterType: Code;
     readonly graphqlType: import("./AbstractType.js").AbstractType.GraphqlType;
     readonly hashFunction: Code;
+    readonly jsTypes: readonly [{
+        readonly typeof: "boolean";
+    }];
     readonly kind = "Boolean";
-    readonly schemaType: Code;
-    readonly typeofs: "boolean"[];
     readonly valueSparqlWherePatternsFunction: Code;
-    get name(): string;
+    get expression(): Code;
+    get schemaType(): Code;
     jsonSchema(_parameters: Parameters<AbstractPrimitiveType<number>["jsonSchema"]>[0]): Code;
     literalExpression(literal: boolean | Literal): Code;
     toRdfResourceValuesExpression({ variables, }: Parameters<AbstractPrimitiveType<boolean>["toRdfResourceValuesExpression"]>[0]): Code;

package/dist/generators/ts/BooleanType.js

@@ -13,15 +13,17 @@ export class BooleanType extends AbstractPrimitiveType {
     filterType = code `${this.reusables.snippets.BooleanFilter}`;
     graphqlType = new AbstractPrimitiveType.GraphqlType(code `${this.reusables.imports.GraphQLBoolean}`, this.reusables);
     hashFunction = code `${this.reusables.snippets.hashBoolean}`;
+    jsTypes = [{ typeof: "boolean" }];
     kind = "Boolean";
-    schemaType = code `${this.reusables.snippets.BooleanSchema}<${this.name}>`;
-    typeofs = ["boolean"];
     valueSparqlWherePatternsFunction = code `${this.reusables.snippets.booleanSparqlWherePatterns}`;
-    get name() {
+    get expression() {
         if (this.primitiveIn.length > 0) {
-            return `${this.primitiveIn.map((value) => value.toString()).join(" | ")}`;
+            return code `${this.primitiveIn.map((value) => value.toString()).join(" | ")}`;
         }
-        return `boolean`;
+        return code `boolean`;
+    }
+    get schemaType() {
+        return code `${this.reusables.snippets.BooleanSchema}<${this.expression}>`;
     }
     jsonSchema(_parameters) {
         if (this.primitiveIn.length === 1) {
@@ -46,5 +48,8 @@ export class BooleanType extends AbstractPrimitiveType {
 }
 __decorate([
     Memoize()
-], BooleanType.prototype, "name", null);
+], BooleanType.prototype, "expression", null);
+__decorate([
+    Memoize()
+], BooleanType.prototype, "schemaType", null);
 //# sourceMappingURL=BooleanType.js.map

package/dist/generators/ts/DefaultValueType.d.ts

@@ -10,20 +10,58 @@ export declare class DefaultValueType<ItemTypeT extends DefaultValueType.ItemTyp
     readonly discriminantProperty: Maybe<AbstractType.DiscriminantProperty>;
     readonly graphqlArgs: AbstractType["graphqlArgs"];
     readonly kind = "DefaultValue";
-    readonly typeofs: "object"[];
+    readonly jsTypes: readonly AbstractType.JsType[] | readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
+    }] | {
+        readonly typeof: "bigint";
+    }[] | readonly [{
+        readonly typeof: "boolean";
+    }] | readonly [{
+        readonly instanceof: "Date";
+        readonly typeof: "object";
+    }] | readonly [{
+        readonly instanceof: "Date";
+        readonly typeof: "object";
+    }] | readonly [{
+        readonly typeof: "number";
+    }] | readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
+    }] | readonly [{
+        readonly typeof: "number";
+    }] | readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
+    }] | readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
+    }] | readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
+    }] | readonly [{
+        readonly typeof: "string";
+    }] | readonly [{
+        readonly instanceof: "Array";
+        readonly typeof: "object";
+    }] | readonly [{
+        readonly instanceof: "Object";
+        readonly typeof: "object";
+    }];
     readonly validationFunction: Maybe<Code>;
     constructor({ defaultValue, ...superParameters }: {
         defaultValue: Literal | NamedNode;
     } & ConstructorParameters<typeof AbstractContainerType<ItemTypeT>>[0]);
     get conversionFunction(): Maybe<AbstractContainerType.ConversionFunction>;
     get equalsFunction(): Code;
+    get expression(): Code;
     get filterFunction(): Code;
     get filterType(): Code;
     get graphqlType(): AbstractContainerType.GraphqlType;
     get hashFunction(): Code;
     get mutable(): boolean;
-    get name(): Code | string;
     get schemaType(): Code;
+    get toRdfResourceValueTypes(): AbstractContainerType<ItemTypeT>["toRdfResourceValueTypes"];
     get valueSparqlConstructTriplesFunction(): Code;
     get valueSparqlWherePatternsFunction(): Code;
     protected get schemaInitializers(): Code[];

package/dist/generators/ts/DefaultValueType.js

@@ -14,7 +14,7 @@ export class DefaultValueType extends AbstractContainerType {
     discriminantProperty = Maybe.empty();
     graphqlArgs = Maybe.empty();
     kind = "DefaultValue";
-    typeofs = ["object"];
+    jsTypes = this.itemType.jsTypes;
     validationFunction = this.itemType.validationFunction;
     constructor({ defaultValue, ...superParameters }) {
         super(superParameters);
@@ -25,16 +25,19 @@ export class DefaultValueType extends AbstractContainerType {
         return Maybe.of({
             code: code `${this.reusables.snippets.convertWithDefaultValue}(${itemConversionFunction.code}, ${this.defaultValueExpression})`,
             sourceTypes: itemConversionFunction.sourceTypes
-                .filter((sourceType) => sourceType.typeof !== "undefined")
+                .filter((sourceType) => sourceType.jsType.typeof !== "undefined")
                 .concat({
-                name: "undefined",
-                typeof: "undefined",
+                expression: code `undefined`,
+                jsType: { typeof: "undefined" },
             }),
         });
     }
     get equalsFunction() {
         return this.itemType.equalsFunction;
     }
+    get expression() {
+        return this.itemType.expression;
+    }
     get filterFunction() {
         return this.itemType.filterFunction;
     }
@@ -50,11 +53,11 @@ export class DefaultValueType extends AbstractContainerType {
     get mutable() {
         return this.itemType.mutable;
     }
-    get name() {
-        return this.itemType.name;
-    }
     get schemaType() {
-        return code `${this.reusables.snippets.DefaultValueSchema}<${this.itemType.name}, ${this.itemType.schemaType}>`;
+        return code `${this.reusables.snippets.DefaultValueSchema}<${this.itemType.expression}, ${this.itemType.schemaType}>`;
+    }
+    get toRdfResourceValueTypes() {
+        return this.itemType.toRdfResourceValueTypes;
     }
     get valueSparqlConstructTriplesFunction() {
         return this.itemType.valueSparqlConstructTriplesFunction;
@@ -72,11 +75,10 @@ export class DefaultValueType extends AbstractContainerType {
             case "Literal":
             case "Term":
                 return this.rdfjsTermExpression(this.defaultValue);
-            case "AnonymousUnion":
             case "List":
-            case "NamedObjectType":
-            case "NamedObjectUnion":
-            case "NamedUnion":
+            case "Object":
+            case "ObjectUnion":
+            case "Union":
                 throw new RangeError(`not implemented ${this.itemType.kind}`);
         }
         invariant(this.defaultValue.termType === "Literal");

package/dist/generators/ts/FloatType.d.ts

@@ -2,8 +2,10 @@ import type { Literal } from "@rdfjs/types";
 import { AbstractNumericType } from "./AbstractNumericType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class FloatType extends AbstractNumericType<number> {
+    readonly jsTypes: readonly [{
+        readonly typeof: "number";
+    }];
     readonly kind = "Float";
-    readonly typeofs: "number"[];
     get graphqlType(): import("./AbstractType.js").AbstractType.GraphqlType;
     literalExpression(literal: Literal | number): Code;
     protected fromRdfResourceValueExpression({ variables, }: Parameters<AbstractNumericType<number>["fromRdfResourceValueExpression"]>[0]): Code;

package/dist/generators/ts/FloatType.js

@@ -9,8 +9,8 @@ import { Memoize } from "typescript-memoize";
 import { AbstractNumericType } from "./AbstractNumericType.js";
 import { code } from "./ts-poet-wrapper.js";
 export class FloatType extends AbstractNumericType {
+    jsTypes = [{ typeof: "number" }];
     kind = "Float";
-    typeofs = ["number"];
     get graphqlType() {
         return new AbstractNumericType.GraphqlType(code `${this.reusables.imports.GraphQLFloat}`, this.reusables);
     }

package/dist/generators/ts/GraphqlSchema.d.ts

@@ -1,6 +1,6 @@
 import type { Logger } from "ts-log";
-import type { NamedObjectType } from "./NamedObjectType.js";
-import type { NamedObjectUnionType } from "./NamedObjectUnionType.js";
+import type { ObjectType } from "./ObjectType.js";
+import type { ObjectUnionType } from "./ObjectUnionType.js";
 import type { Reusables } from "./Reusables.js";
 import type { TsGenerator } from "./TsGenerator.js";
 import { type Code } from "./ts-poet-wrapper.js";
@@ -12,8 +12,8 @@ export declare class GraphqlSchema {
     constructor({ configuration, namedObjectTypes, namedObjectUnionTypes, reusables, }: {
         configuration: TsGenerator.Configuration;
         logger: Logger;
-        namedObjectTypes: readonly NamedObjectType[];
-        namedObjectUnionTypes: readonly NamedObjectUnionType[];
+        namedObjectTypes: readonly ObjectType[];
+        namedObjectUnionTypes: readonly ObjectUnionType[];
         reusables: Reusables;
     });
     get declaration(): Code;

package/dist/generators/ts/GraphqlSchema.js

@@ -28,11 +28,11 @@ export const graphqlSchema = new ${this.reusables.imports.GraphQLSchema}({ query
                     },
                 },
                 resolve: code `\
-  async (_source, args: { identifier: string }, { objectSet }): Promise<${namedObjectType.name}> => 
-    (await ${this.reusables.imports.EitherAsync}<Error, ${namedObjectType.name}>(async ({ liftEither }) => 
+  async (_source, args: { identifier: string }, { objectSet }): Promise<${namedObjectType.expression}> => 
+    (await ${this.reusables.imports.EitherAsync}<Error, ${namedObjectType.expression}>(async ({ liftEither }) => 
       liftEither(await objectSet.${namedObjectType.objectSetMethodNames.object}(await liftEither(${namedObjectType.identifierTypeAlias}.parse(args.identifier))))
     )).unsafeCoerce()`,
-                type: namedObjectType.graphqlType.name,
+                type: namedObjectType.graphqlType.expression,
             };
             fields[namedObjectType.objectSetMethodNames.objectIdentifiers] = {
                 args: {
@@ -61,8 +61,8 @@ export const graphqlSchema = new ${this.reusables.imports.GraphQLSchema}({ query
                     },
                 },
                 resolve: code `\
-  async (_source, args: { identifiers: readonly string[] | null; limit: number | null; offset: number | null; }, { objectSet }): Promise<readonly ${namedObjectType.name}[]> =>
-  (await ${this.reusables.imports.EitherAsync}<Error, readonly ${namedObjectType.name}[]>(async ({ liftEither }) => {
+  async (_source, args: { identifiers: readonly string[] | null; limit: number | null; offset: number | null; }, { objectSet }): Promise<readonly ${namedObjectType.expression}[]> =>
+  (await ${this.reusables.imports.EitherAsync}<Error, readonly ${namedObjectType.expression}[]>(async ({ liftEither }) => {
     let filter: ${namedObjectType.filterType} | undefined;
     if (args.identifiers) {
       const identifiers: ${namedObjectType.identifierTypeAlias}[] = [];
@@ -73,7 +73,7 @@ export const graphqlSchema = new ${this.reusables.imports.GraphQLSchema}({ query
     }
     return await liftEither(await objectSet.${namedObjectType.objectSetMethodNames.objects}({ filter, limit: args.limit !== null ? args.limit : undefined, offset: args.offset !== null ? args.offset : undefined }));
   })).unsafeCoerce()`,
-                type: code `new ${this.reusables.imports.GraphQLNonNull}(new ${this.reusables.imports.GraphQLList}(${namedObjectType.graphqlType.name}))`,
+                type: code `new ${this.reusables.imports.GraphQLNonNull}(new ${this.reusables.imports.GraphQLList}(${namedObjectType.graphqlType.expression}))`,
             };
             fields[namedObjectType.objectSetMethodNames.objectCount] = {
                 resolve: code `\

package/dist/generators/ts/IdentifierType.d.ts

@@ -4,19 +4,19 @@ import { Maybe } from "purify-ts";
 import { AbstractIdentifierType } from "./AbstractIdentifierType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class IdentifierType extends AbstractIdentifierType<BlankNode | NamedNode> {
+    readonly expression: Code;
     readonly conversionFunction: Maybe<AbstractIdentifierType.ConversionFunction>;
     readonly filterFunction: Code;
     readonly filterType: Code;
-    readonly parseFunction: Code;
     readonly kind = "Identifier";
-    readonly name: Code;
     readonly nodeKinds: ReadonlySet<IdentifierNodeKind>;
+    readonly parseFunction: Code;
     readonly schemaType: Code;
     readonly valueSparqlWherePatternsFunction: Code;
     constructor(parameters: Omit<ConstructorParameters<typeof AbstractIdentifierType<BlankNode | NamedNode>>[0], "hasValues" | "in_">);
     fromJsonExpression({ variables, }: Parameters<AbstractIdentifierType<BlankNode | NamedNode>["fromJsonExpression"]>[0]): Code;
-    jsonType(parameters?: Parameters<AbstractIdentifierType<BlankNode | NamedNode>["jsonType"]>[0]): AbstractIdentifierType.JsonType;
     jsonSchema({ includeDiscriminantProperty, }: Parameters<AbstractIdentifierType<BlankNode | NamedNode>["jsonSchema"]>[0]): Code;
+    jsonType(parameters?: Parameters<AbstractIdentifierType<BlankNode | NamedNode>["jsonType"]>[0]): AbstractIdentifierType.JsonType;
     toJsonExpression({ includeDiscriminantProperty, variables, }: Parameters<AbstractIdentifierType<BlankNode | NamedNode>["toJsonExpression"]>[0]): Code;
     protected fromRdfResourceValuesExpressionChain({ variables, }: Parameters<AbstractIdentifierType<BlankNode | NamedNode>["fromRdfResourceValuesExpressionChain"]>[0]): ReturnType<AbstractIdentifierType<BlankNode | NamedNode>["fromRdfResourceValuesExpressionChain"]>;
 }

package/dist/generators/ts/IdentifierType.js

@@ -10,33 +10,35 @@ import { Memoize } from "typescript-memoize";
 import { AbstractIdentifierType } from "./AbstractIdentifierType.js";
 import { arrayOf, code } from "./ts-poet-wrapper.js";
 export class IdentifierType extends AbstractIdentifierType {
+    expression = code `(${this.reusables.imports.BlankNode} | ${this.reusables.imports.NamedNode})`;
     conversionFunction = Maybe.of({
         code: code `${this.reusables.snippets.convertToIdentifier}`,
         sourceTypes: [
             {
-                name: code `${this.reusables.imports.BlankNode}`,
-                typeof: "object",
+                expression: code `${this.reusables.imports.BlankNode}`,
+                jsType: this.jsTypes[0],
             },
             {
-                name: code `${this.reusables.imports.NamedNode}`,
-                typeof: "object",
+                expression: code `${this.reusables.imports.NamedNode}`,
+                jsType: this.jsTypes[0],
             },
             {
-                name: "string",
-                typeof: "string",
+                // To NamedNode
+                expression: code `string`,
+                jsType: { typeof: "string" },
             },
             {
-                name: "undefined",
-                typeof: "undefined",
+                // To BlankNode
+                expression: code `undefined`,
+                jsType: { typeof: "undefined" },
             },
         ],
     });
     filterFunction = code `${this.reusables.snippets.filterIdentifier}`;
     filterType = code `${this.reusables.snippets.IdentifierFilter}`;
-    parseFunction = code `${this.reusables.snippets.parseIdentifier};`;
     kind = "Identifier";
-    name = code `(${this.reusables.imports.BlankNode} | ${this.reusables.imports.NamedNode})`;
     nodeKinds = nodeKinds;
+    parseFunction = code `${this.reusables.snippets.parseIdentifier};`;
     schemaType = code `${this.reusables.snippets.IdentifierSchema}`;
     valueSparqlWherePatternsFunction = code `${this.reusables.snippets.identifierSparqlWherePatterns}`;
     constructor(parameters) {
@@ -47,13 +49,7 @@ export class IdentifierType extends AbstractIdentifierType {
         });
     }
     fromJsonExpression({ variables, }) {
-        return code `${this.reusables.imports.Either}.of<Error, ${this.name}>((${variables.value}["@id"].startsWith("_:") ? ${this.reusables.imports.dataFactory}.blankNode(${variables.value}["@id"].substring(2)) : ${this.reusables.imports.dataFactory}.namedNode(${variables.value}["@id"])))`;
-    }
-    jsonType(parameters) {
-        const discriminantProperty = parameters?.includeDiscriminantProperty
-            ? `, readonly termType: "BlankNode" | "NamedNode"`
-            : "";
-        return new AbstractIdentifierType.JsonType(code `{ readonly "@id": string${discriminantProperty} }`);
+        return code `${this.reusables.imports.Either}.of<Error, ${this.expression}>((${variables.value}["@id"].startsWith("_:") ? ${this.reusables.imports.dataFactory}.blankNode(${variables.value}["@id"].substring(2)) : ${this.reusables.imports.dataFactory}.namedNode(${variables.value}["@id"])))`;
     }
     jsonSchema({ includeDiscriminantProperty, }) {
         const discriminantProperty = includeDiscriminantProperty
@@ -61,6 +57,12 @@ export class IdentifierType extends AbstractIdentifierType {
             : "";
         return code `${this.reusables.imports.z}.object({ "@id": ${this.reusables.imports.z}.string().min(1)${discriminantProperty} })`;
     }
+    jsonType(parameters) {
+        const discriminantProperty = parameters?.includeDiscriminantProperty
+            ? `, readonly termType: "BlankNode" | "NamedNode"`
+            : "";
+        return new AbstractIdentifierType.JsonType(code `{ readonly "@id": string${discriminantProperty} }`);
+    }
     toJsonExpression({ includeDiscriminantProperty, variables, }) {
         const discriminantProperty = includeDiscriminantProperty
             ? code `, termType: ${variables.value}.termType as ${[...this.nodeKinds].map((nodeKind) => `"${NodeKind.toTermType(nodeKind)}"`).join(" | ")}`

package/dist/generators/ts/IntType.d.ts

@@ -2,8 +2,10 @@ import type { Literal } from "@rdfjs/types";
 import { AbstractNumericType } from "./AbstractNumericType.js";
 import { type Code } from "./ts-poet-wrapper.js";
 export declare class IntType extends AbstractNumericType<number> {
+    readonly jsTypes: readonly [{
+        readonly typeof: "number";
+    }];
     readonly kind = "Int";
-    readonly typeofs: "number"[];
     get graphqlType(): import("./AbstractType.js").AbstractType.GraphqlType;
     literalExpression(literal: Literal | number): Code;
     protected fromRdfResourceValueExpression({ variables, }: Parameters<AbstractNumericType<number>["fromRdfResourceValueExpression"]>[0]): Code;