@shaclmate/compiler 4.0.98 → 4.0.99

package/dist/generators/ts/_AbstractType/AbstractType_JsonType.js

@@ -19,21 +19,6 @@ class AbstractJsonType {
         this.reusables = reusables;
         this.snippet = snippet;
     }
-    moduleDeclarations({ unqualifiedName, }) {
-        const moduleDeclarations = [];
-        if (this.configuration.features.has("Object.JSON.parse")) {
-            moduleDeclarations.push(code `\
-export function parse(json: unknown): ${this.reusables.imports.Either}<Error, ${unqualifiedName}> {
-  const jsonSafeParseResult = schema().safeParse(json);
-  if (!jsonSafeParseResult.success) { return ${this.reusables.imports.Left}(jsonSafeParseResult.error); }
-  return ${this.reusables.imports.Right}(jsonSafeParseResult.data);
-}`);
-        }
-        if (this.configuration.features.has("Object.JSON.schema")) {
-            moduleDeclarations.push(code `export function schema() { return ${this.schemaExpression} satisfies ${this.reusables.imports.z}.ZodType<Json>; }`);
-        }
-        return moduleDeclarations;
-    }
     get declaration() {
         if (this.name.isNothing() || this.snippet.isJust()) {
             return Maybe.empty();
@@ -67,6 +52,24 @@ export function parse(json: unknown): ${this.reusables.imports.Either}<Error, ${
     uiSchemaElement(_parameters) {
         return Maybe.empty();
     }
+    moduleDeclarations({ unqualifiedName, }) {
+        const moduleDeclarations = [];
+        if (this.configuration.features.has("Object.JSON.parse")) {
+            moduleDeclarations.push(code `\
+export function parse(json: unknown): ${this.reusables.imports.Either}<Error, ${unqualifiedName}> {
+  const jsonSafeParseResult = schema().safeParse(json);
+  if (!jsonSafeParseResult.success) { return ${this.reusables.imports.Left}(jsonSafeParseResult.error); }
+  return ${this.reusables.imports.Right}(jsonSafeParseResult.data);
+}`);
+        }
+        if (this.configuration.features.has("Object.JSON.schema")) {
+            moduleDeclarations.push(code `export function schema() { return ${this.schemaExpression} satisfies ${this.schemaTypeExpression({ unqualifiedName })}; }`);
+        }
+        return moduleDeclarations;
+    }
+    schemaTypeExpression({ unqualifiedName, }) {
+        return code `${this.reusables.imports.z}.ZodType<${unqualifiedName}>`;
+    }
 }
 __decorate([
     Memoize()
@@ -136,8 +139,8 @@ __decorate([
     Memoize()
 ], JsonArrayType.prototype, "schemaExpression", null);
 class JsonBooleanType extends AbstractJsonPrimitiveType {
-    kind = "JsonBoolean";
     typeof = "boolean";
+    kind = "JsonBoolean";
 }
 class JsonDiscriminatedUnionType extends AbstractJsonType {
     kind = "JsonDiscriminatedUnion";
@@ -200,17 +203,19 @@ __decorate([
     Memoize()
 ], JsonIntersectionType.prototype, "schemaExpression", null);
 class JsonNumberType extends AbstractJsonPrimitiveType {
-    kind = "JsonNumber";
     typeof = "number";
+    kind = "JsonNumber";
 }
 class JsonObjectType extends AbstractJsonType {
+    cachedMemberTypes;
+    shorthand;
     kind = "JsonObject";
     members;
-    memberTypes;
-    constructor({ members, ...superParameters }) {
+    constructor({ members, shorthand, ...superParameters }) {
         super(superParameters);
+        this.cachedMemberTypes = Array.from({ length: members.length }).map(() => null);
         this.members = members;
-        this.memberTypes = Array.from({ length: members.length }).map(() => null);
+        this.shorthand = shorthand;
     }
     get inlineExpression() {
         return code `{ ${joinCode(this.members.map((member, memberI) => {
@@ -218,7 +223,7 @@ class JsonObjectType extends AbstractJsonType {
         }), { on: ", " })} }`;
     }
     get schemaExpression() {
-        return code `${this.reusables.imports.z}.object({ ${joinCode(this.members.map((member, memberI) => {
+        const objectSchema = code `${this.reusables.imports.z}.object({ ${joinCode(this.members.map((member, memberI) => {
             const memberType = this.memberType(memberI);
             let schema = memberType.schema;
             if (member.recursive) {
@@ -241,6 +246,16 @@ class JsonObjectType extends AbstractJsonType {
             }
             return code `${literalOf(member.name)}: ${schema}`;
         }), { on: ", " })} })`;
+        return this.shorthand
+            .map((shorthand) => {
+            return code `${this.reusables.imports.z}.union([${objectSchema}, ${shorthand.type.schema}.transform(${shorthand.transformer.unannotatedUsage})])`;
+        })
+            .orDefault(objectSchema);
+    }
+    schemaTypeExpression({ unqualifiedName, }) {
+        return this.shorthand
+            .map((shorthand) => code `${this.reusables.imports.z}.ZodType<${unqualifiedName}, ${unqualifiedName} | ${shorthand.type.expression}>`)
+            .orDefault(super.schemaTypeExpression({ unqualifiedName }));
     }
     get uiSchemaFunctionExpression() {
         const variables = { scopePrefix: code `(_options?.scopePrefix ?? "#")` };
@@ -256,14 +271,10 @@ class JsonObjectType extends AbstractJsonType {
   return ${uiSchema};
 })`;
     }
-    memberType(memberI) {
-        if (this.memberTypes[memberI] === null) {
-            this.memberTypes[memberI] =
-                typeof this.members[memberI].type === "function"
-                    ? this.members[memberI].type()
-                    : this.members[memberI].type;
-        }
-        return this.memberTypes[memberI];
+    uiSchemaElement({ variables, }) {
+        return Maybe.of(code `${this.name
+            .map((name) => code `${name.join(".")}.uiSchema`)
+            .orDefaultLazy(() => this.uiSchemaFunctionExpression)}({ scopePrefix: ${variables.scopePrefix} })`);
     }
     moduleDeclarations(parameters) {
         const moduleDeclarations = super.moduleDeclarations(parameters);
@@ -272,10 +283,14 @@ class JsonObjectType extends AbstractJsonType {
         }
         return moduleDeclarations;
     }
-    uiSchemaElement({ variables, }) {
-        return Maybe.of(code `${this.name
-            .map((name) => code `${name.join(".")}.uiSchema`)
-            .orDefaultLazy(() => this.uiSchemaFunctionExpression)}({ scopePrefix: ${variables.scopePrefix} })`);
+    memberType(memberI) {
+        if (this.cachedMemberTypes[memberI] === null) {
+            this.cachedMemberTypes[memberI] =
+                typeof this.members[memberI].type === "function"
+                    ? this.members[memberI].type()
+                    : this.members[memberI].type;
+        }
+        return this.cachedMemberTypes[memberI];
     }
 }
 __decorate([
@@ -406,6 +421,7 @@ class JsonTypeFactory {
                     : Maybe.fromNullable(member.uiSchemaElement),
             })),
             name: Maybe.fromNullable(options?.name),
+            shorthand: Maybe.fromNullable(options?.shorthand),
             snippet: Maybe.fromNullable(options?.snippet),
         });
     }

package/dist/generators/ts/_ObjectDiscriminatedUnionType/ObjectDiscriminatedUnionType_focusSparqlWherePatternsFunction.js

@@ -14,7 +14,7 @@ if (focusIdentifier.termType === "Variable") {
       ignoreRdfType: false,
       preferredLanguages,
       propertyPatterns: [],
-      schema: ${this.identifierType.schema},
+      schema: ${this.identifierType.schema.expression},
       valueVariable: focusIdentifier,
       variablePrefix,
   }));

package/dist/generators/ts/_ObjectIntersectionType/ObjectIntersectionType_fromRdfResourceValuesFunction.js

@@ -3,6 +3,6 @@ export function ObjectIntersectionType_fromRdfResourceValuesFunctionExpression()
     return code `(values, options) => values.chainMap(value => value.toResource().chain(resource => ${this.fromRdfResourceFunction.annotatedUsage}(resource, options)))`;
 }
 export function ObjectIntersectionType_fromRdfResourceValuesFunctionType() {
-    return code `${this.reusables.snippets.FromRdfResourceValuesFunction}<${this.discriminatedType.map((discriminatedType) => discriminatedType.expression).orDefault(this.expression)}, ${this.schemaType}>`;
+    return code `${this.reusables.snippets.FromRdfResourceValuesFunction}<${this.discriminatedType.map((discriminatedType) => discriminatedType.expression).orDefault(this.expression)}, ${this.schema.type.expression}>`;
 }
 //# sourceMappingURL=ObjectIntersectionType_fromRdfResourceValuesFunction.js.map

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

@@ -3,6 +3,7 @@ import type { Maybe } from "purify-ts";
 import type { AbstractType } from "../AbstractType.js";
 import type { Reusables } from "../Reusables.js";
 import { rdfjsTermExpression } from "../rdfjsTermExpression.js";
+import type { SchemaObject } from "../SchemaObject.js";
 import type { TsGenerator } from "../TsGenerator.js";
 import type { Type } from "../Type.js";
 import { type Code } from "../ts-poet-wrapper.js";
@@ -83,13 +84,9 @@ export declare abstract class ObjectType_AbstractProperty {
      */
     abstract readonly recursive: boolean;
     /**
-     * TypeScript object describing this type, for runtime use.
+     * TypeScript object describing this property, for runtime use.
      */
-    abstract readonly schema: Maybe<Code>;
-    /**
-     * TypeScript type describing .schema.
-     */
-    abstract readonly schemaType: Maybe<Code>;
+    abstract readonly schema: Maybe<SchemaObject<SchemaObject.UserDefinedType>>;
     constructor({ configuration, jsonTypeFactory, logger, name, objectType, reusables, }: {
         configuration: TsGenerator.Configuration;
         jsonTypeFactory: AbstractType.JsonTypeFactory;
@@ -244,6 +241,6 @@ export declare abstract class ObjectType_AbstractProperty {
         };
     }): Maybe<Code>;
     protected readonly rdfjsTermExpression: (parameters: Parameters<typeof rdfjsTermExpression>[0]) => Code;
-    protected get schemaVariable(): Code;
+    protected get schemaVariable(): Maybe<Code>;
 }
 //# sourceMappingURL=ObjectType_AbstractProperty.d.ts.map

package/dist/generators/ts/_ObjectType/ObjectType_AbstractProperty.js

@@ -32,9 +32,7 @@ export class ObjectType_AbstractProperty {
     }
     rdfjsTermExpression;
     get schemaVariable() {
-        return this.objectType.name
-            .map((name) => code `${name}.schema.properties.${this.name}`)
-            .orDefaultLazy(() => this.schema.unsafeCoerce());
+        return this.objectType.name.map((name) => code `${name}.schema.properties.${this.name}`);
     }
 }
 __decorate([

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

@@ -15,7 +15,6 @@ export declare class ObjectType_DiscriminantProperty extends ObjectType_Abstract
     readonly mutable = false;
     readonly recursive = false;
     readonly schema: ObjectType_AbstractProperty["schema"];
-    readonly schemaType: ObjectType_AbstractProperty["schemaType"];
     readonly value: string;
     constructor({ configuration, value, ...superParameters }: {
         value: string;

package/dist/generators/ts/_ObjectType/ObjectType_DiscriminantProperty.js

@@ -22,7 +22,6 @@ export class ObjectType_DiscriminantProperty extends ObjectType_AbstractProperty
     mutable = false;
     recursive = false;
     schema = Maybe.empty();
-    schemaType = Maybe.empty();
     value;
     constructor({ configuration, value, ...superParameters }) {
         super({

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

@@ -2,6 +2,7 @@ import { Maybe } from "purify-ts";
 import type { BlankNodeType } from "../BlankNodeType.js";
 import type { IdentifierType } from "../IdentifierType.js";
 import type { IriType } from "../IriType.js";
+import { SchemaObject } from "../SchemaObject.js";
 import { type Code } from "../ts-poet-wrapper.js";
 import { ObjectType_AbstractProperty } from "./ObjectType_AbstractProperty.js";
 export declare class ObjectType_IdentifierProperty extends ObjectType_AbstractProperty {
@@ -24,8 +25,8 @@ export declare class ObjectType_IdentifierProperty extends ObjectType_AbstractPr
     get graphqlField(): ObjectType_AbstractProperty["graphqlField"];
     get hashFunctionParameter(): Maybe<Code>;
     get jsonObjectMember(): ObjectType_AbstractProperty["jsonObjectMember"];
-    get schema(): Maybe<Code>;
-    get schemaType(): Maybe<Code>;
+    get schema(): Maybe<SchemaObject<SchemaObject.UserDefinedType>>;
+    private get _schema();
     private get typeExpression();
     private get typeSchemaVariable();
     createInitializer({ variables, }: Parameters<ObjectType_AbstractProperty["createInitializer"]>[0]): Maybe<Code>;

package/dist/generators/ts/_ObjectType/ObjectType_IdentifierProperty.js

@@ -9,6 +9,7 @@ import { rdf } from "@tpluscode/rdf-ns-builders";
 import { Maybe } from "purify-ts";
 import { invariant } from "ts-invariant";
 import { Memoize } from "typescript-memoize";
+import { SchemaObject } from "../SchemaObject.js";
 import { code, joinCode, literalOf } from "../ts-poet-wrapper.js";
 import { ObjectType_AbstractProperty } from "./ObjectType_AbstractProperty.js";
 export class ObjectType_IdentifierProperty extends ObjectType_AbstractProperty {
@@ -78,13 +79,23 @@ export class ObjectType_IdentifierProperty extends ObjectType_AbstractProperty {
         });
     }
     get schema() {
-        return Maybe.of(code `{ ${joinCode([code `kind: ${literalOf(this.kind)}`, code `type: ${this.type.schema}`], { on: ", " })} }`);
-    }
-    get schemaType() {
-        return Maybe.of(code `{ ${joinCode([
-            code `readonly kind: ${literalOf(this.kind)}`,
-            code `readonly type: ${this.type.schemaType}`,
-        ], { on: ", " })} }`);
+        return Maybe.of(this._schema);
+    }
+    get _schema() {
+        return new SchemaObject({
+            properties: {
+                kind: code `kind: ${literalOf(this.kind)}`,
+                type: code `type: ${this.type.schema.expression}`,
+            },
+            type: new SchemaObject.UserDefinedType({
+                members: {
+                    kind: code `readonly kind: ${literalOf(this.kind)}`,
+                    type: code `readonly type: ${this.type.schema.type.expression}`,
+                },
+                name: Maybe.empty(),
+            }),
+            variable: this.schemaVariable,
+        });
     }
     get typeExpression() {
         return this.objectType.name
@@ -92,9 +103,9 @@ export class ObjectType_IdentifierProperty extends ObjectType_AbstractProperty {
             .orDefault(this.type.expression);
     }
     get typeSchemaVariable() {
-        return this.objectType.name
-            .map((name) => code `${name}.schema.properties.${this.name}.type`)
-            .orDefaultLazy(() => this.type.schema);
+        return this.schemaVariable
+            .map((schemaVariable) => code `${schemaVariable}.type`)
+            .orDefault(this.type.schema.expression);
     }
     createInitializer({ variables, }) {
         const nodeKinds = this.type.nodeKinds;
@@ -203,7 +214,16 @@ __decorate([
 __decorate([
     Memoize()
 ], ObjectType_IdentifierProperty.prototype, "jsonObjectMember", null);
+__decorate([
+    Memoize()
+], ObjectType_IdentifierProperty.prototype, "schema", null);
+__decorate([
+    Memoize()
+], ObjectType_IdentifierProperty.prototype, "_schema", null);
 __decorate([
     Memoize()
 ], ObjectType_IdentifierProperty.prototype, "typeExpression", null);
+__decorate([
+    Memoize()
+], ObjectType_IdentifierProperty.prototype, "typeSchemaVariable", null);
 //# sourceMappingURL=ObjectType_IdentifierProperty.js.map

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

@@ -1,5 +1,6 @@
 import type { NamedNode } from "@rdfjs/types";
 import { Maybe } from "purify-ts";
+import { SchemaObject } from "../SchemaObject.js";
 import { type Code } from "../ts-poet-wrapper.js";
 import { ObjectType_AbstractProperty } from "./ObjectType_AbstractProperty.js";
 export declare class ObjectType_RdfTypeProperty extends ObjectType_AbstractProperty {
@@ -17,9 +18,9 @@ export declare class ObjectType_RdfTypeProperty extends ObjectType_AbstractPrope
         fromRdfType: NamedNode;
         toRdfTypes: readonly NamedNode[];
     } & Omit<ConstructorParameters<typeof ObjectType_AbstractProperty>[0], "name">);
-    get schema(): Maybe<Code>;
     get jsonObjectMember(): ObjectType_AbstractProperty["jsonObjectMember"];
-    get schemaType(): Maybe<Code>;
+    get schema(): Maybe<SchemaObject<SchemaObject.UserDefinedType>>;
+    private get _schema();
     createInitializer(): Maybe<Code>;
     equalsExpression(): Maybe<Code>;
     filterExpression(): Maybe<Code>;

package/dist/generators/ts/_ObjectType/ObjectType_RdfTypeProperty.js

@@ -7,6 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 import { rdf, rdfs } from "@tpluscode/rdf-ns-builders";
 import { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
+import { SchemaObject } from "../SchemaObject.js";
 import { arrayOf, code, joinCode, literalOf, } from "../ts-poet-wrapper.js";
 import { ObjectType_AbstractProperty } from "./ObjectType_AbstractProperty.js";
 export class ObjectType_RdfTypeProperty extends ObjectType_AbstractProperty {
@@ -29,9 +30,6 @@ export class ObjectType_RdfTypeProperty extends ObjectType_AbstractProperty {
         this.fromRdfType = fromRdfType;
         this.toRdfTypes = toRdfTypes;
     }
-    get schema() {
-        return Maybe.of(code `${{ fromRdfType: this.rdfjsTermExpression(this.fromRdfType), kind: this.kind, toRdfTypes: this.toRdfTypes.map((toRdfType) => this.rdfjsTermExpression(toRdfType)) }}`);
-    }
     get jsonObjectMember() {
         return Maybe.of({
             description: Maybe.empty(),
@@ -47,8 +45,26 @@ export class ObjectType_RdfTypeProperty extends ObjectType_AbstractProperty {
             uiSchemaElement: Maybe.empty(),
         });
     }
-    get schemaType() {
-        return Maybe.of(code `${{ fromRdfType: code `${this.reusables.imports.NamedNode}`, kind: this.kind, toRdfTypes: code `readonly ${this.reusables.imports.NamedNode}[]` }}`);
+    get schema() {
+        return Maybe.of(this._schema);
+    }
+    get _schema() {
+        return new SchemaObject({
+            properties: {
+                fromRdfType: code `fromRdfType: ${this.rdfjsTermExpression(this.fromRdfType)}`,
+                kind: code `kind: ${literalOf(this.kind)}`,
+                toRdfTypes: code `toRdfTypes: ${arrayOf(...this.toRdfTypes.map((toRdfType) => this.rdfjsTermExpression(toRdfType)))}`,
+            },
+            type: new SchemaObject.UserDefinedType({
+                members: {
+                    fromRdfType: code `fromRdfType: ${this.reusables.imports.NamedNode}`,
+                    kind: code `kind: ${literalOf(this.kind)}`,
+                    toRdfTypes: code `toRdfTypes: readonly ${this.reusables.imports.NamedNode}[]`,
+                },
+                name: Maybe.empty(),
+            }),
+            variable: this.schemaVariable,
+        });
     }
     createInitializer() {
         return Maybe.empty();
@@ -63,7 +79,7 @@ export class ObjectType_RdfTypeProperty extends ObjectType_AbstractProperty {
         return Maybe.empty();
     }
     fromRdfResourceValuesInitializer({ variables, }) {
-        return Maybe.of(code `${this.name}: !${variables.ignoreRdfType} ? ${this.reusables.snippets.ensureRdfResourceType}(${variables.focusResource}, ${arrayOf(code `(${this.schemaVariable}).fromRdfType`)}, ${{ graph: variables.graph }}) : ${this.reusables.imports.Right}(true as const)`);
+        return Maybe.of(code `${this.name}: !${variables.ignoreRdfType} ? ${this.reusables.snippets.ensureRdfResourceType}(${variables.focusResource}, ${arrayOf(code `(${this._schema.expression}).fromRdfType`)}, ${{ graph: variables.graph }}) : ${this.reusables.imports.Right}(true as const)`);
     }
     hashStatements() {
         return [];
@@ -122,7 +138,7 @@ type: "optional" as const
         return [
             code `\
 if (!${variables.ignoreRdfType}) {
-  ${variables.resource}.add(${this.rdfjsTermExpression(rdf.type)}, ${this.schemaVariable}.toRdfTypes, ${variables.graph});
+  ${variables.resource}.add(${this.rdfjsTermExpression(rdf.type)}, ${this._schema.expression}.toRdfTypes, ${variables.graph});
 }`,
         ];
     }
@@ -132,13 +148,13 @@ if (!${variables.ignoreRdfType}) {
 }
 __decorate([
     Memoize()
-], ObjectType_RdfTypeProperty.prototype, "schema", null);
+], ObjectType_RdfTypeProperty.prototype, "jsonObjectMember", null);
 __decorate([
     Memoize()
-], ObjectType_RdfTypeProperty.prototype, "jsonObjectMember", null);
+], ObjectType_RdfTypeProperty.prototype, "schema", null);
 __decorate([
     Memoize()
-], ObjectType_RdfTypeProperty.prototype, "schemaType", null);
+], ObjectType_RdfTypeProperty.prototype, "_schema", null);
 __decorate([
     Memoize()
 ], ObjectType_RdfTypeProperty.prototype, "equalsExpression", null);

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

@@ -1,5 +1,6 @@
 import type { PropertyPath } from "@rdfx/resource";
 import { Maybe } from "purify-ts";
+import { SchemaObject } from "../SchemaObject.js";
 import type { Type } from "../Type.js";
 import { type Code } from "../ts-poet-wrapper.js";
 import { ObjectType_AbstractProperty } from "./ObjectType_AbstractProperty.js";
@@ -37,8 +38,8 @@ export declare class ObjectType_ShaclProperty<TypeT extends Type> extends Object
     get graphqlField(): ObjectType_AbstractProperty["graphqlField"];
     get hashFunctionParameter(): Maybe<Code>;
     get jsonObjectMember(): ObjectType_AbstractProperty["jsonObjectMember"];
-    get schema(): Maybe<Code>;
-    get schemaType(): Maybe<Code>;
+    get schema(): Maybe<SchemaObject<SchemaObject.UserDefinedType>>;
+    private get _schema();
     private get typeSchemaVariable();
     createInitializer({ variables, }: Parameters<ObjectType_AbstractProperty["createInitializer"]>[0]): Maybe<Code>;
     equalsExpression({ variables, }: Parameters<ObjectType_AbstractProperty["equalsExpression"]>[0]): Maybe<Code>;

package/dist/generators/ts/_ObjectType/ObjectType_ShaclProperty.js

@@ -6,6 +6,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { Maybe } from "purify-ts";
 import { Memoize } from "typescript-memoize";
+import { SchemaObject } from "../SchemaObject.js";
 import { code, joinCode, literalOf } from "../ts-poet-wrapper.js";
 import { tsComment } from "../tsComment.js";
 import { ObjectType_AbstractProperty } from "./ObjectType_AbstractProperty.js";
@@ -106,33 +107,50 @@ export class ObjectType_ShaclProperty extends ObjectType_AbstractProperty {
         });
     }
     get schema() {
-        const initializers = [code `kind: ${literalOf(this.kind)}`];
+        return Maybe.of(this._schema);
+    }
+    get _schema() {
+        // if (
+        //   this.objectType.name.extract() === "DirectRecursiveStruct" ||
+        //   this.objectType.name.extract() === "IndirectRecursiveStruct"
+        // ) {
+        //   console.log("test");
+        // }
+        const properties = {
+            kind: code `kind: ${literalOf(this.kind)}`,
+        };
+        const typeMembers = {
+            kind: code `readonly kind: ${literalOf(this.kind)}`,
+        };
         if (this.configuration.features.has("Object.fromRdf") ||
             this.configuration.features.has("Object.toRdf")) {
-            initializers.push(code `path: ${this.propertyPathToCode(this.path)}`);
+            properties["path"] = code `path: ${this.propertyPathToCode(this.path)}`;
+            typeMembers["path"] =
+                code `readonly path: ${this.reusables.snippets.PropertyPath}`;
         }
         // Use a getter if the type is recursive or the type is an object type, which may have forward references in the file
         if (this.recursive || this.type.referencesNamedType) {
-            initializers.push(code `get type() { return ${this.type.schema}; }`);
+            properties["type"] = () => code `get type() { return ${this.type.schema.expression}; }`;
+            typeMembers["type"] = () => code `readonly type: ${this.type.schema.type.expression}`;
         }
         else {
-            initializers.push(code `type: ${this.type.schema}`);
-        }
-        return Maybe.of(code `{ ${joinCode(initializers, { on: ", " })} }`);
-    }
-    get schemaType() {
-        const initializers = [code `readonly kind: ${literalOf(this.kind)}`];
-        if (this.configuration.features.has("Object.fromRdf") ||
-            this.configuration.features.has("Object.toRdf")) {
-            initializers.push(code `readonly path: ${this.reusables.snippets.PropertyPath}`);
+            properties["type"] = code `type: ${this.type.schema.expression}`;
+            typeMembers["type"] =
+                code `readonly type: ${this.type.schema.type.expression}`;
         }
-        initializers.push(code `readonly type: ${this.type.schemaType}`);
-        return Maybe.of(code `{ ${joinCode(initializers, { on: ", " })} }`);
+        return new SchemaObject({
+            properties,
+            type: new SchemaObject.UserDefinedType({
+                members: typeMembers,
+                name: Maybe.empty(),
+            }),
+            variable: this.schemaVariable,
+        });
     }
     get typeSchemaVariable() {
-        return this.objectType.name
-            .map((name) => code `${name}.schema.properties.${this.name}.type`)
-            .orDefaultLazy(() => this.type.schema);
+        return this.schemaVariable
+            .map((schemaVariable) => code `${schemaVariable}.type`)
+            .orDefaultLazy(() => this.type.schema.expression);
     }
     createInitializer({ variables, }) {
         const parameterVariable = code `${variables.parameters}.${this.name}`;
@@ -169,11 +187,11 @@ export class ObjectType_ShaclProperty extends ObjectType_AbstractProperty {
     }
     fromRdfResourceValuesInitializer({ variables, }) {
         return Maybe.of(code `${this.name}:
-        ${this.reusables.snippets.shaclPropertyFromRdf}<${this.type.expression}, ${this.type.schemaType}>({
+        ${this.reusables.snippets.shaclPropertyFromRdf}<${this.type.expression}, ${this.type.schema.type.expression}>({
           ...${variables.options},
           focusResource: ${variables.focusResource},
           ignoreRdfType: true,
-          propertySchema: ${this.schemaVariable},
+          propertySchema: ${this._schema.expression},
           typeFromRdfResourceValues: ${this.type.fromRdfResourceValuesFunction.unannotatedUsage} 
         })`);
     }
@@ -190,7 +208,7 @@ export class ObjectType_ShaclProperty extends ObjectType_AbstractProperty {
             focusIdentifier: variables.focusIdentifier,
             ignoreRdfType: true,
             propertyName: this.name,
-            propertySchema: this.schemaVariable,
+            propertySchema: this._schema.expression,
             typeSparqlConstructTriples: this.type.valueSparqlConstructTriplesFunction.unannotatedUsage,
             variablePrefix: variables.variablePrefix,
         }})`);
@@ -205,7 +223,7 @@ export class ObjectType_ShaclProperty extends ObjectType_AbstractProperty {
                 ignoreRdfType: true,
                 preferredLanguages: variables.preferredLanguages,
                 propertyName: this.name,
-                propertySchema: this.schemaVariable,
+                propertySchema: this._schema.expression,
                 typeSparqlWherePatterns: this.type.valueSparqlWherePatternsFunction.unannotatedUsage,
                 variablePrefix: variables.variablePrefix,
             }})`,
@@ -231,7 +249,7 @@ export class ObjectType_ShaclProperty extends ObjectType_AbstractProperty {
                 return [];
         }
         const propertyPath = this.objectType.name
-            .map(() => code `${this.schemaVariable}.path`)
+            .map(() => code `${this._schema.expression}.path`)
             .orDefault(this.propertyPathToCode(this.path));
         const { object: objectVariable, ...otherVariables } = variables;
         return [
@@ -281,6 +299,12 @@ __decorate([
 __decorate([
     Memoize()
 ], ObjectType_ShaclProperty.prototype, "jsonObjectMember", null);
+__decorate([
+    Memoize()
+], ObjectType_ShaclProperty.prototype, "schema", null);
+__decorate([
+    Memoize()
+], ObjectType_ShaclProperty.prototype, "_schema", null);
 __decorate([
     Memoize()
 ], ObjectType_ShaclProperty.prototype, "typeSchemaVariable", null);

package/dist/generators/ts/_ObjectType/ObjectType_fromRdfResourceValuesFunction.js

@@ -3,6 +3,6 @@ export function ObjectType_fromRdfResourceValuesFunctionExpression() {
     return code `(values, options) => values.chainMap(value => value.toResource().chain(resource => ${this.fromRdfResourceFunction.annotatedUsage}(resource, options)))`;
 }
 export function ObjectType_fromRdfResourceValuesFunctionType() {
-    return code `${this.reusables.snippets.FromRdfResourceValuesFunction}<${this.discriminatedType.map((discriminatedType) => discriminatedType.expression).orDefault(this.expression)}, ${this.schemaType}>`;
+    return code `${this.reusables.snippets.FromRdfResourceValuesFunction}<${this.discriminatedType.map((discriminatedType) => discriminatedType.expression).orDefault(this.expression)}, ${this.schema.type.expression}>`;
 }
 //# sourceMappingURL=ObjectType_fromRdfResourceValuesFunction.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "@shaclmate/shacl-ast": "4.0.98",
+    "@shaclmate/shacl-ast": "4.0.99",
     "@rdfjs/types": "~2.0.1",
     "@rdfx/collection": "0.0.59",
     "@rdfx/curie": "0.0.59",
@@ -976,5 +976,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.98"
+  "version": "4.0.99"
 }