@shaclmate/compiler 4.0.101 → 4.0.103

package/dist/generators/ts/BigDecimalType.js

@@ -39,11 +39,14 @@ export class BigDecimalType extends AbstractTypedLiteralType {
     filterFunction = new BuiltinCallable(this.reusables.snippets.filterBigDecimal);
     filterType = code `${this.reusables.snippets.NumericFilter}<${this.reusables.imports.BigDecimal}>`;
     fromJsonObjectFunction = new BuiltinCallable(this.reusables.snippets.bigDecimalFromJsonObject);
-    fromJsonValueFunction = new BuiltinCallable(this.reusables.snippets.bigDecimalFromJsonString);
+    fromJsonValueFunction = new BuiltinCallable(this.reusables.snippets.bigDecimalFromJsonValue);
     fromRdfResourceValuesFunction = new BuiltinCallable(this.reusables.snippets.bigDecimalFromRdfResourceValues);
     graphqlType = new AbstractTypedLiteralType.GraphqlType(code `${this.reusables.imports.GraphQLString}`, this.reusables);
     hashFunction = new BuiltinCallable(this.reusables.snippets.hashBigDecimal);
-    jsonValueType = this.jsonTypeFactory.createJsonStringType();
+    jsonValueType = this.jsonTypeFactory.createJsonUnionType([
+        this.jsonTypeFactory.createJsonNumberType(),
+        this.jsonTypeFactory.createJsonStringType(),
+    ]);
     kind = "BigDecimal";
     toJsonObjectFunction = new BuiltinCallable(code `${this.reusables.snippets.bigDecimalToJsonObject}(${this.rdfjsTermExpression(this.datatype)})`);
     toJsonValueFunction = new BuiltinCallable(this.reusables.snippets.bigDecimalToJsonString);

package/dist/generators/ts/BigIntType.js

@@ -33,15 +33,20 @@ export class BigIntType extends AbstractNumericType {
             ],
         });
     graphqlType = new AbstractNumericType.GraphqlType(code `${this.reusables.imports.GraphQLBigInt}`, this.reusables);
-    jsonValueType = this.jsonTypeFactory.createJsonStringType({
-        in_: this.decodedIn.map((in_) => in_.toString()),
-    });
+    jsonValueType = this.jsonTypeFactory.createJsonUnionType([
+        this.jsonTypeFactory.createJsonNumberType({
+            in_: this.decodedIn.map((in_) => Number(in_)),
+        }),
+        this.jsonTypeFactory.createJsonStringType({
+            in_: this.decodedIn.map((in_) => in_.toString()),
+        }),
+    ]);
     kind = "BigInt";
     get fromJsonObjectFunction() {
         return new BuiltinCallable(code `${this.reusables.snippets.bigIntFromJsonObject}<${this.expression}>`);
     }
     get fromJsonValueFunction() {
-        return new BuiltinCallable(code `${this.reusables.snippets.bigIntFromJsonString}<${this.jsonValueType.expression}, ${this.expression}>`);
+        return new BuiltinCallable(code `${this.reusables.snippets.bigIntFromJsonValue}<${this.jsonValueType.expression}, ${this.expression}>`);
     }
     get fromRdfResourceValuesFunction() {
         return new BuiltinCallable(code `${this.reusables.snippets.bigIntFromRdfResourceValues}<${this.expression}>`);

package/dist/generators/ts/Snippets.d.ts

@@ -88,14 +88,14 @@ export declare class Snippets {
     get arrayIntersection(): Snippet;
     get arrayToJsonArray(): Snippet;
     get bigDecimalFromJsonObject(): Snippet;
-    get bigDecimalFromJsonString(): Snippet;
+    get bigDecimalFromJsonValue(): Snippet;
     get bigDecimalFromRdfResourceValues(): Snippet;
     get bigDecimalLiteral(): Snippet;
     get bigDecimalSparqlWherePatterns(): Snippet;
     get bigDecimalToJsonObject(): Snippet;
     get bigDecimalToJsonString(): Snippet;
     get bigIntFromJsonObject(): Snippet;
-    get bigIntFromJsonString(): Snippet;
+    get bigIntFromJsonValue(): Snippet;
     get bigIntFromRdfResourceValues(): Snippet;
     get bigIntToJsonObject(): Snippet;
     get bigIntToJsonString(): Snippet;

package/dist/generators/ts/Snippets.js

@@ -82,14 +82,14 @@ import { snippets_arrayFromJsonArray } from "./_snippets/snippets_arrayFromJsonA
 import { snippets_arrayIntersection } from "./_snippets/snippets_arrayIntersection.js";
 import { snippets_arrayToJsonArray } from "./_snippets/snippets_arrayToJsonArray.js";
 import { snippets_bigDecimalFromJsonObject } from "./_snippets/snippets_bigDecimalFromJsonObject.js";
-import { snippets_bigDecimalFromJsonString } from "./_snippets/snippets_bigDecimalFromJsonString.js";
+import { snippets_bigDecimalFromJsonValue } from "./_snippets/snippets_bigDecimalFromJsonValue.js";
 import { snippets_bigDecimalFromRdfResourceValues } from "./_snippets/snippets_bigDecimalFromRdfResourceValues.js";
 import { snippets_bigDecimalLiteral } from "./_snippets/snippets_bigDecimalLiteral.js";
 import { snippets_bigDecimalSparqlWherePatterns } from "./_snippets/snippets_bigDecimalSparqlWherePatterns.js";
 import { snippets_bigDecimalToJsonObject } from "./_snippets/snippets_bigDecimalToJsonObject.js";
 import { snippets_bigDecimalToJsonString } from "./_snippets/snippets_bigDecimalToJsonString.js";
 import { snippets_bigIntFromJsonObject } from "./_snippets/snippets_bigIntFromJsonObject.js";
-import { snippets_bigIntFromJsonString } from "./_snippets/snippets_bigIntFromJsonString.js";
+import { snippets_bigIntFromJsonValue } from "./_snippets/snippets_bigIntFromJsonValue.js";
 import { snippets_bigIntFromRdfResourceValues } from "./_snippets/snippets_bigIntFromRdfResourceValues.js";
 import { snippets_bigIntToJsonObject } from "./_snippets/snippets_bigIntToJsonObject.js";
 import { snippets_bigIntToJsonString } from "./_snippets/snippets_bigIntToJsonString.js";
@@ -488,8 +488,8 @@ export class Snippets {
     get bigDecimalFromJsonObject() {
         return this.snippet(snippets_bigDecimalFromJsonObject);
     }
-    get bigDecimalFromJsonString() {
-        return this.snippet(snippets_bigDecimalFromJsonString);
+    get bigDecimalFromJsonValue() {
+        return this.snippet(snippets_bigDecimalFromJsonValue);
     }
     get bigDecimalFromRdfResourceValues() {
         return this.snippet(snippets_bigDecimalFromRdfResourceValues);
@@ -509,8 +509,8 @@ export class Snippets {
     get bigIntFromJsonObject() {
         return this.snippet(snippets_bigIntFromJsonObject);
     }
-    get bigIntFromJsonString() {
-        return this.snippet(snippets_bigIntFromJsonString);
+    get bigIntFromJsonValue() {
+        return this.snippet(snippets_bigIntFromJsonValue);
     }
     get bigIntFromRdfResourceValues() {
         return this.snippet(snippets_bigIntFromRdfResourceValues);
@@ -1297,7 +1297,7 @@ __decorate([
 ], Snippets.prototype, "bigDecimalFromJsonObject", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "bigDecimalFromJsonString", null);
+], Snippets.prototype, "bigDecimalFromJsonValue", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "bigDecimalFromRdfResourceValues", null);
@@ -1318,7 +1318,7 @@ __decorate([
 ], Snippets.prototype, "bigIntFromJsonObject", null);
 __decorate([
     Memoize()
-], Snippets.prototype, "bigIntFromJsonString", null);
+], Snippets.prototype, "bigIntFromJsonValue", null);
 __decorate([
     Memoize()
 ], Snippets.prototype, "bigIntFromRdfResourceValues", null);

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

@@ -94,14 +94,14 @@ declare class JsonObjectType extends AbstractJsonType {
     } & ConstructorParameters<typeof AbstractJsonType>[0]);
     protected get inlineExpression(): Code;
     protected get schemaExpression(): Code;
-    protected schemaTypeExpression({ unqualifiedName, }: {
-        unqualifiedName: string;
-    }): Code;
     private get uiSchemaFunctionExpression();
     uiSchemaElement({ variables, }: Parameters<AbstractJsonType["uiSchemaElement"]>[0]): Maybe<Code>;
     protected moduleDeclarations(parameters: {
         unqualifiedName: string;
     }): Code[];
+    protected schemaTypeExpression({ unqualifiedName, }: {
+        unqualifiedName: string;
+    }): Code;
     private memberType;
 }
 declare class JsonStringType extends AbstractJsonPrimitiveType<string> {
@@ -163,8 +163,23 @@ declare class JsonTypeFactory {
         name?: AbstractJsonType.Name;
         snippet?: Snippet;
     }): JsonStringType;
+    createJsonUnionType(memberTypes: readonly JsonType[], options?: {
+        name?: AbstractJsonType.Name;
+        recursive?: boolean;
+        snippet?: Snippet;
+    }): JsonUnionType;
+}
+declare class JsonUnionType extends AbstractJsonType {
+    readonly kind = "JsonUnion";
+    readonly memberTypes: readonly JsonType[];
+    constructor({ memberTypes, ...superParameters }: {
+        memberTypes: readonly JsonType[];
+        recursive: boolean;
+    } & ConstructorParameters<typeof AbstractJsonType>[0]);
+    protected get inlineExpression(): Code;
+    protected get schemaExpression(): Code;
 }
-type JsonType = JsonArrayType | JsonBooleanType | JsonDiscriminatedUnionType | JsonIntersectionType | JsonNumberType | JsonObjectType | JsonStringType;
+type JsonType = JsonArrayType | JsonBooleanType | JsonDiscriminatedUnionType | JsonIntersectionType | JsonNumberType | JsonObjectType | JsonStringType | JsonUnionType;
 export type AbstractType_JsonType = JsonType;
 export type AbstractType_JsonTypeFactory = JsonTypeFactory;
 declare namespace JsonDiscriminatedUnionType {

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

@@ -252,11 +252,6 @@ class JsonObjectType extends AbstractJsonType {
         })
             .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 ?? "#")` };
         const uiSchema = {
@@ -283,6 +278,11 @@ class JsonObjectType extends AbstractJsonType {
         }
         return moduleDeclarations;
     }
+    schemaTypeExpression({ unqualifiedName, }) {
+        return this.shorthand
+            .map((shorthand) => code `${this.reusables.imports.z}.ZodType<${unqualifiedName}, ${unqualifiedName} | ${shorthand.type.expression}>`)
+            .orDefault(super.schemaTypeExpression({ unqualifiedName }));
+    }
     memberType(memberI) {
         if (this.cachedMemberTypes[memberI] === null) {
             this.cachedMemberTypes[memberI] =
@@ -436,6 +436,35 @@ class JsonTypeFactory {
             snippet: Maybe.fromNullable(options?.snippet),
         });
     }
+    createJsonUnionType(memberTypes, options) {
+        return new JsonUnionType({
+            ...this.constructorParameters,
+            memberTypes,
+            name: Maybe.fromNullable(options?.name),
+            recursive: !!options?.recursive,
+            snippet: Maybe.fromNullable(options?.snippet),
+        });
+    }
 }
+class JsonUnionType extends AbstractJsonType {
+    kind = "JsonUnion";
+    memberTypes;
+    constructor({ memberTypes, ...superParameters }) {
+        super(superParameters);
+        this.memberTypes = memberTypes;
+    }
+    get inlineExpression() {
+        return code `(${joinCode(this.memberTypes.map((memberType) => memberType.expression), { on: " | " })})`;
+    }
+    get schemaExpression() {
+        return joinCode(this.memberTypes.map((memberType, memberI) => memberI === 0 ? memberType.schema : code `.or(${memberType.schema})`));
+    }
+}
+__decorate([
+    Memoize()
+], JsonUnionType.prototype, "inlineExpression", null);
+__decorate([
+    Memoize()
+], JsonUnionType.prototype, "schemaExpression", null);
 export const AbstractType_JsonTypeFactory = JsonTypeFactory;
 //# sourceMappingURL=AbstractType_JsonType.js.map

package/dist/generators/ts/_snippets/snippets_bigDecimalFromJsonValue.d.ts

@@ -0,0 +1,3 @@
+import type { SnippetFactory } from "../SnippetFactory.js";
+export declare const snippets_bigDecimalFromJsonValue: SnippetFactory;
+//# sourceMappingURL=snippets_bigDecimalFromJsonValue.d.ts.map

package/dist/generators/ts/_snippets/snippets_bigDecimalFromJsonValue.js

@@ -0,0 +1,5 @@
+import { code, conditionalOutput } from "../ts-poet-wrapper.js";
+export const snippets_bigDecimalFromJsonValue = ({ imports, snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}bigDecimalFromJsonValue`, code `\
+const ${syntheticNamePrefix}bigDecimalFromJsonValue: ${snippets.FromJsonFunction}<number | string, ${imports.BigDecimal}, ${snippets.NumericSchema}<${imports.BigDecimal}>> = 
+  (jsonValue) => ${imports.Either}.encase(() => new ${imports.BigDecimal}(jsonValue));`);
+//# sourceMappingURL=snippets_bigDecimalFromJsonValue.js.map

package/dist/generators/ts/_snippets/snippets_bigIntFromJsonValue.d.ts

@@ -0,0 +1,3 @@
+import type { SnippetFactory } from "../SnippetFactory.js";
+export declare const snippets_bigIntFromJsonValue: SnippetFactory;
+//# sourceMappingURL=snippets_bigIntFromJsonValue.d.ts.map

package/dist/generators/ts/_snippets/snippets_bigIntFromJsonValue.js

@@ -0,0 +1,8 @@
+import { code, conditionalOutput } from "../ts-poet-wrapper.js";
+export const snippets_bigIntFromJsonValue = ({ imports, snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}bigIntFromJsonString`, code `\
+function ${syntheticNamePrefix}bigIntFromJsonString<JsonValueT extends number | string, BigIntT extends bigint>(jsonValue: JsonValueT, options: Parameters<${snippets.FromJsonFunction}<string, BigIntT, ${snippets.NumericSchema}<BigIntT>>>[1]): ${imports.Either}<Error, BigIntT> {
+  const { schema } = options;
+  return ${imports.Either}.encase(() => BigInt(jsonValue) as BigIntT)
+    .chain(value => ${snippets.constrainPrimitive}<BigIntT, bigint>(value, schema.in)) as ${imports.Either}<Error, BigIntT>;
+}`);
+//# sourceMappingURL=snippets_bigIntFromJsonValue.js.map

package/package.json

@@ -1,14 +1,14 @@
 {
   "dependencies": {
-    "@shaclmate/shacl-ast": "4.0.101",
+    "@shaclmate/shacl-ast": "4.0.103",
     "@rdfjs/types": "~2.0.1",
-    "@rdfx/collection": "0.0.62",
-    "@rdfx/curie": "0.0.62",
-    "@rdfx/data-factory": "0.0.62",
-    "@rdfx/literal": "0.0.62",
-    "@rdfx/logger": "0.0.62",
-    "@rdfx/resource": "0.0.62",
-    "@rdfx/string": "0.0.62",
+    "@rdfx/collection": "0.0.63",
+    "@rdfx/curie": "0.0.63",
+    "@rdfx/data-factory": "0.0.63",
+    "@rdfx/literal": "0.0.63",
+    "@rdfx/logger": "0.0.63",
+    "@rdfx/resource": "0.0.63",
+    "@rdfx/string": "0.0.63",
     "@sindresorhus/base62": "~0.1.0",
     "@tpluscode/rdf-ns-builders": "~4.3.0",
     "change-case": "~5.4.4",
@@ -22,7 +22,7 @@
     "uri-template": "~2.0.0"
   },
   "devDependencies": {
-    "@rdfx/fs": "0.0.62",
+    "@rdfx/fs": "0.0.63",
     "typescript": "6.0.3"
   },
   "files": [
@@ -586,8 +586,8 @@
     "dist/generators/ts/_snippets/snippets_arrayToJsonArray.js",
     "dist/generators/ts/_snippets/snippets_bigDecimalFromJsonObject.d.ts",
     "dist/generators/ts/_snippets/snippets_bigDecimalFromJsonObject.js",
-    "dist/generators/ts/_snippets/snippets_bigDecimalFromJsonString.d.ts",
-    "dist/generators/ts/_snippets/snippets_bigDecimalFromJsonString.js",
+    "dist/generators/ts/_snippets/snippets_bigDecimalFromJsonValue.d.ts",
+    "dist/generators/ts/_snippets/snippets_bigDecimalFromJsonValue.js",
     "dist/generators/ts/_snippets/snippets_bigDecimalFromRdfResourceValues.d.ts",
     "dist/generators/ts/_snippets/snippets_bigDecimalFromRdfResourceValues.js",
     "dist/generators/ts/_snippets/snippets_bigDecimalLiteral.d.ts",
@@ -600,8 +600,8 @@
     "dist/generators/ts/_snippets/snippets_bigDecimalToJsonString.js",
     "dist/generators/ts/_snippets/snippets_bigIntFromJsonObject.d.ts",
     "dist/generators/ts/_snippets/snippets_bigIntFromJsonObject.js",
-    "dist/generators/ts/_snippets/snippets_bigIntFromJsonString.d.ts",
-    "dist/generators/ts/_snippets/snippets_bigIntFromJsonString.js",
+    "dist/generators/ts/_snippets/snippets_bigIntFromJsonValue.d.ts",
+    "dist/generators/ts/_snippets/snippets_bigIntFromJsonValue.js",
     "dist/generators/ts/_snippets/snippets_bigIntFromRdfResourceValues.d.ts",
     "dist/generators/ts/_snippets/snippets_bigIntFromRdfResourceValues.js",
     "dist/generators/ts/_snippets/snippets_bigIntToJsonObject.d.ts",
@@ -976,5 +976,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.101"
+  "version": "4.0.103"
 }

package/dist/generators/ts/_snippets/snippets_bigDecimalFromJsonString.d.ts

@@ -1,3 +0,0 @@
-import type { SnippetFactory } from "../SnippetFactory.js";
-export declare const snippets_bigDecimalFromJsonString: SnippetFactory;
-//# sourceMappingURL=snippets_bigDecimalFromJsonString.d.ts.map

package/dist/generators/ts/_snippets/snippets_bigDecimalFromJsonString.js

@@ -1,5 +0,0 @@
-import { code, conditionalOutput } from "../ts-poet-wrapper.js";
-export const snippets_bigDecimalFromJsonString = ({ imports, snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}bigDecimalFromJsonString`, code `\
-const ${syntheticNamePrefix}bigDecimalFromJsonString: ${snippets.FromJsonFunction}<string, ${imports.BigDecimal}, ${snippets.NumericSchema}<${imports.BigDecimal}>> = 
-  (jsonValue) => ${imports.Either}.encase(() => new ${imports.BigDecimal}(jsonValue));`);
-//# sourceMappingURL=snippets_bigDecimalFromJsonString.js.map

package/dist/generators/ts/_snippets/snippets_bigIntFromJsonString.d.ts

@@ -1,3 +0,0 @@
-import type { SnippetFactory } from "../SnippetFactory.js";
-export declare const snippets_bigIntFromJsonString: SnippetFactory;
-//# sourceMappingURL=snippets_bigIntFromJsonString.d.ts.map

package/dist/generators/ts/_snippets/snippets_bigIntFromJsonString.js

@@ -1,8 +0,0 @@
-import { code, conditionalOutput } from "../ts-poet-wrapper.js";
-export const snippets_bigIntFromJsonString = ({ imports, snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}bigIntFromJsonString`, code `\
-function ${syntheticNamePrefix}bigIntFromJsonString<JsonValueT extends string, BigIntT extends bigint>(jsonValue: JsonValueT, options: Parameters<${snippets.FromJsonFunction}<string, BigIntT, ${snippets.NumericSchema}<BigIntT>>>[1]): ${imports.Either}<Error, BigIntT> {
-  const { schema } = options;
-  return ${imports.Either}.encase(() => BigInt(jsonValue) as BigIntT)
-    .chain(value => ${snippets.constrainPrimitive}<BigIntT, bigint>(value, schema.in)) as ${imports.Either}<Error, BigIntT>;
-}`);
-//# sourceMappingURL=snippets_bigIntFromJsonString.js.map