@shaclmate/compiler 4.0.52 → 4.0.54

package/dist/generators/ts/UnionType.d.ts

@@ -112,7 +112,7 @@ export declare namespace Discriminant {
 export declare namespace AbstractUnionType {
     interface Member<TypeT extends Type> {
         readonly discriminantValues: readonly AbstractType.DiscriminantProperty.Value[];
-        readonly jsonType: Code | string;
+        readonly jsonType: Code;
         readonly jsonTypeCheck: (instance: Code) => Code;
         readonly primaryDiscriminantValue: AbstractType.DiscriminantProperty.Value;
         readonly type: TypeT;

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

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

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

@@ -0,0 +1,4 @@
+import { code, conditionalOutput } from "../ts-poet-wrapper.js";
+export const snippets_LangStringSchema = ({ snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}LangStringSchema`, code `\
+type ${syntheticNamePrefix}LangStringSchema = Omit<${snippets.LiteralSchema}, "kind"> & { readonly kind: "LangString"; };`);
+//# sourceMappingURL=snippets_LangStringSchema.js.map

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

@@ -3,6 +3,7 @@ export const snippets_RdfVocabularies = ({ imports, syntheticNamePrefix, }) => c
 namespace ${syntheticNamePrefix}RdfVocabularies {
   export const rdf = {
     first: ${imports.dataFactory}.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#first"),
+    langString: ${imports.dataFactory}.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#langString"),
     nil: ${imports.dataFactory}.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#nil"),
     rest: ${imports.dataFactory}.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#rest"),
     subject: ${imports.dataFactory}.namedNode("http://www.w3.org/1999/02/22-rdf-syntax-ns#subject"),

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

@@ -1,6 +1,6 @@
 import { code, conditionalOutput } from "../ts-poet-wrapper.js";
 export const snippets_bigDecimalFromRdfResourceValues = ({ imports, snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}bigDecimalFromRdfResourceValues`, code `\
 function ${syntheticNamePrefix}bigDecimalFromRdfResourceValues(values: ${imports.Resource}.Values, options: Parameters<${snippets.FromRdfResourceValuesFunction}<${imports.BigDecimal}, ${snippets.NumericSchema}<${imports.BigDecimal}>>>[1]): ${imports.Either}<Error, ${imports.Resource}.Values<${imports.BigDecimal}>> {
-  return ${snippets.termLikeFromRdfResourceValues}(values, options).chain(values => values.chainMap(value => value.toLiteral().chain(${snippets.decodeBigDecimalLiteral})));
+  return ${snippets.termLikeFromRdfResourceValues}(values, options).chain(values => values.chainMap(value => value.toBigDecimal(options.schema.in)));
 }`);
 //# sourceMappingURL=snippets_bigDecimalFromRdfResourceValues.js.map

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

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

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

@@ -0,0 +1,15 @@
+import { rdf } from "@tpluscode/rdf-ns-builders";
+import { code, conditionalOutput } from "../ts-poet-wrapper.js";
+export const snippets_convertToLangString = ({ imports, rdfjsTermExpression, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}convertToLangString`, code `\
+function ${syntheticNamePrefix}convertToLangString(value: ${imports.Literal}): ${imports.Either}<Error, ${imports.Literal}> {
+  if (!value.datatype.equals(${rdfjsTermExpression(rdf.langString)})) {
+    return ${imports.Left}(new Error(\`expected Literal to have rdf:langString datatype, not \${value.datatype.value}\`));
+  }
+
+  if (value.language.length === 0) {
+    return ${imports.Left}(new Error("expected Literal to have non-empty language"));
+  }
+
+  return ${imports.Either}.of(value);
+}`);
+//# sourceMappingURL=snippets_convertToLangString.js.map

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

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

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

@@ -0,0 +1,6 @@
+import { code, conditionalOutput } from "../ts-poet-wrapper.js";
+export const snippets_langStringFromRdfResourceValues = ({ imports, snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}langStringFromRdfResourceValues`, code `\
+function ${syntheticNamePrefix}langStringFromRdfResourceValues(values: ${imports.Resource}.Values, options: Parameters<${snippets.FromRdfResourceValuesFunction}<${imports.Literal}, ${snippets.LangStringSchema}>>[1]): ${imports.Either}<Error, ${imports.Resource}.Values<${imports.Literal}>> {
+  return ${snippets.termLikeFromRdfResourceValues}(values, options).chain(values => values.chainMap(value => value.toLangString(options.schema.in)));
+}`);
+//# sourceMappingURL=snippets_langStringFromRdfResourceValues.js.map

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

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

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

@@ -0,0 +1,5 @@
+import { code, conditionalOutput } from "../ts-poet-wrapper.js";
+export const snippets_langStringSparqlWherePatterns = ({ snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}langStringSparqlWherePatterns`, code `\
+const ${syntheticNamePrefix}langStringSparqlWherePatterns: ${snippets.ValueSparqlWherePatternsFunction}<${snippets.LiteralFilter}, ${snippets.LangStringSchema}> =
+  (parameters) => ${snippets.literalSchemaSparqlPatterns}({ filterPatterns: ${snippets.termFilterSparqlPatterns}(parameters), ...parameters });`);
+//# sourceMappingURL=snippets_langStringSparqlWherePatterns.js.map

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

@@ -1,6 +1,6 @@
 import { code, conditionalOutput } from "../ts-poet-wrapper.js";
 export const snippets_literalFromRdfResourceValues = ({ imports, snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}literalFromRdfResourceValues`, code `\
 function ${syntheticNamePrefix}literalFromRdfResourceValues(values: ${imports.Resource}.Values, options: Parameters<${snippets.FromRdfResourceValuesFunction}<${imports.Literal}, ${snippets.LiteralSchema}>>[1]): ${imports.Either}<Error, ${imports.Resource}.Values<${imports.Literal}>> {
-  return ${snippets.termLikeFromRdfResourceValues}(values, options).chain(values => values.chainMap(value => value.toLiteral()));
+  return ${snippets.termLikeFromRdfResourceValues}(values, options).chain(values => values.chainMap(value => value.toLiteral(options.schema.in)));
 }`);
 //# sourceMappingURL=snippets_literalFromRdfResourceValues.js.map

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

@@ -1,5 +1,5 @@
 import { code, conditionalOutput } from "../ts-poet-wrapper.js";
 export const snippets_literalSparqlWherePatterns = ({ snippets, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}literalSparqlWherePatterns`, code `\
 const ${syntheticNamePrefix}literalSparqlWherePatterns: ${snippets.ValueSparqlWherePatternsFunction}<${snippets.LiteralFilter}, ${snippets.LiteralSchema}> =
-  (parameters) => ${syntheticNamePrefix}literalSchemaSparqlPatterns({ filterPatterns: ${snippets.termFilterSparqlPatterns}(parameters), ...parameters });`);
+  (parameters) => ${snippets.literalSchemaSparqlPatterns}({ filterPatterns: ${snippets.termFilterSparqlPatterns}(parameters), ...parameters });`);
 //# sourceMappingURL=snippets_literalSparqlWherePatterns.js.map

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

@@ -8,9 +8,12 @@ function ${syntheticNamePrefix}sparqlValueInPattern({ lift, valueIn, valueVariab
   return {
     expression: {
       args: [valueVariable, valueIn.map(inValue => {
-        if (typeof inValue !== "object" || inValue instanceof Date) {
+        if (typeof inValue !== "object") {
           return ${snippets.literalFactory}.primitive(inValue);
         }
+        if (inValue instanceof Date) {
+          return ${snippets.literalFactory}.date(inValue);
+        }
         return inValue;
       })],
       operator: "in",

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

@@ -4,11 +4,11 @@ function ${syntheticNamePrefix}termFromRdfResourceValues<TermT extends ${imports
   const { focusResource, propertyPath, schema } = options;
   return ${snippets.termLikeFromRdfResourceValues}(values, options).chain(values => values.chainMap(value => value.toTerm().chain(term => {
     if (schema.in && schema.in.length > 0 && !schema.in.some(in_ => in_.equals(term))) {
-      return ${imports.Left}(new ${imports.Resource}.MistypedTermValueError({ actualValue: term, expectedValueType: "Term in", focusResource, propertyPath }));
+      return ${imports.Left}(new ${imports.Resource}.MistypedValueError({ actualValue: term, expectedValueType: "Term in", focusResource, propertyPath }));
     }
 
     if (!schema.types.some(type => term.termType === type)) {
-      return ${imports.Left}(new ${imports.Resource}.MistypedTermValueError({ actualValue: term, expectedValueType: "Term types", focusResource, propertyPath }));
+      return ${imports.Left}(new ${imports.Resource}.MistypedValueError({ actualValue: term, expectedValueType: "BlankNode | Literal | NamedNode", focusResource, propertyPath }));
     }
 
     return ${imports.Right}(term as TermT);

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

@@ -15,7 +15,7 @@ const ${syntheticNamePrefix}termLikeFromRdfResourceValues:
       chain = chain.chain(values => values.chainMap(value => value.toLiteral().chain(literal =>
         languageIn.includes(literal.language) ?
           ${imports.Right}(value) :
-          ${imports.Left}(new ${imports.Resource}.MistypedTermValueError(${{
+          ${imports.Left}(new ${imports.Resource}.MistypedValueError(${{
     actualValue: code `literal`,
     expectedValueType: "Literal",
     focusResource: code `value.focusResource`,

package/dist/generators/ts/rdfjsTermExpression.js

@@ -17,6 +17,7 @@ export function rdfjsTermExpression(rdfjsTerm) {
                 const unqualifiedName = rdfjsTerm.value.substring(rdf[""].value.length);
                 switch (unqualifiedName) {
                     case "first":
+                    case "langString":
                     case "nil":
                     case "rest":
                     case "subject":

package/dist/input/input.shaclmate.js

@@ -314,7 +314,7 @@ function $termFromRdfResourceValues(values, options) {
         if (schema.in &&
             schema.in.length > 0 &&
             !schema.in.some((in_) => in_.equals(term))) {
-            return Left(new Resource.MistypedTermValueError({
+            return Left(new Resource.MistypedValueError({
                 actualValue: term,
                 expectedValueType: "Term in",
                 focusResource,
@@ -322,7 +322,7 @@ function $termFromRdfResourceValues(values, options) {
             }));
         }
         if (!schema.types.some((type) => term.termType === type)) {
-            return Left(new Resource.MistypedTermValueError({
+            return Left(new Resource.MistypedValueError({
                 actualValue: term,
                 expectedValueType: "Term types",
                 focusResource,
@@ -340,7 +340,7 @@ const $termLikeFromRdfResourceValues = (values, { preferredLanguages, schema: {
     if (languageIn && languageIn.length > 0) {
         chain = chain.chain((values) => values.chainMap((value) => value.toLiteral().chain((literal) => languageIn.includes(literal.language)
             ? Right(value)
-            : Left(new Resource.MistypedTermValueError({
+            : Left(new Resource.MistypedValueError({
                 actualValue: literal,
                 expectedValueType: "Literal",
                 focusResource: value.focusResource,

package/package.json

@@ -1,15 +1,15 @@
 {
   "dependencies": {
-    "@shaclmate/shacl-ast": "4.0.52",
+    "@shaclmate/shacl-ast": "4.0.54",
     "@rdfjs/dataset": "~2.0.2",
     "@rdfjs/prefix-map": "~0.1.2",
     "@rdfjs/term-map": "~2.0.2",
     "@rdfjs/term-set": "~2.0.3",
     "@rdfjs/types": "~2.0.1",
-    "@rdfx/data-factory": "0.0.19",
-    "@rdfx/literal": "0.0.19",
-    "@rdfx/resource": "0.0.19",
-    "@rdfx/string": "0.0.19",
+    "@rdfx/data-factory": "0.0.24",
+    "@rdfx/literal": "0.0.24",
+    "@rdfx/resource": "0.0.24",
+    "@rdfx/string": "0.0.24",
     "@sindresorhus/base62": "~0.1.0",
     "@tpluscode/rdf-ns-builders": "~4.3.0",
     "@types/rdfjs__dataset": "~2.0.7",
@@ -17,6 +17,7 @@
     "@types/rdfjs__term-map": "~2.0.10",
     "@types/rdfjs__term-set": "~2.0.9",
     "change-case": "~5.4.4",
+    "decimal.js": "~10.6.0",
     "plur": "~5.1.0",
     "purify-ts": "~2.1.4",
     "reserved-identifiers": "~1.0.0",
@@ -147,6 +148,8 @@
     "dist/generators/ts/AbstractTermType.js",
     "dist/generators/ts/AbstractType.d.ts",
     "dist/generators/ts/AbstractType.js",
+    "dist/generators/ts/AbstractTypedLiteralType.d.ts",
+    "dist/generators/ts/AbstractTypedLiteralType.js",
     "dist/generators/ts/BigDecimalType.d.ts",
     "dist/generators/ts/BigDecimalType.js",
     "dist/generators/ts/BigIntType.d.ts",
@@ -173,6 +176,8 @@
     "dist/generators/ts/IntType.js",
     "dist/generators/ts/IriType.d.ts",
     "dist/generators/ts/IriType.js",
+    "dist/generators/ts/LangStringType.d.ts",
+    "dist/generators/ts/LangStringType.js",
     "dist/generators/ts/LazyOptionType.d.ts",
     "dist/generators/ts/LazyOptionType.js",
     "dist/generators/ts/LazySetType.d.ts",
@@ -333,6 +338,8 @@
     "dist/generators/ts/_snippets/snippets_IriFilter.js",
     "dist/generators/ts/_snippets/snippets_IriSchema.d.ts",
     "dist/generators/ts/_snippets/snippets_IriSchema.js",
+    "dist/generators/ts/_snippets/snippets_LangStringSchema.d.ts",
+    "dist/generators/ts/_snippets/snippets_LangStringSchema.js",
     "dist/generators/ts/_snippets/snippets_Lazy.d.ts",
     "dist/generators/ts/_snippets/snippets_Lazy.js",
     "dist/generators/ts/_snippets/snippets_LazyOption.d.ts",
@@ -425,6 +432,8 @@
     "dist/generators/ts/_snippets/snippets_convertToIri.js",
     "dist/generators/ts/_snippets/snippets_convertToIriIdentifierProperty.d.ts",
     "dist/generators/ts/_snippets/snippets_convertToIriIdentifierProperty.js",
+    "dist/generators/ts/_snippets/snippets_convertToLangString.d.ts",
+    "dist/generators/ts/_snippets/snippets_convertToLangString.js",
     "dist/generators/ts/_snippets/snippets_convertToLazy.d.ts",
     "dist/generators/ts/_snippets/snippets_convertToLazy.js",
     "dist/generators/ts/_snippets/snippets_convertToLazyOption.d.ts",
@@ -449,8 +458,6 @@
     "dist/generators/ts/_snippets/snippets_dateSparqlWherePatterns.js",
     "dist/generators/ts/_snippets/snippets_dateTimeFromRdfResourceValues.d.ts",
     "dist/generators/ts/_snippets/snippets_dateTimeFromRdfResourceValues.js",
-    "dist/generators/ts/_snippets/snippets_decodeBigDecimalLiteral.d.ts",
-    "dist/generators/ts/_snippets/snippets_decodeBigDecimalLiteral.js",
     "dist/generators/ts/_snippets/snippets_deduplicateSparqlPatterns.d.ts",
     "dist/generators/ts/_snippets/snippets_deduplicateSparqlPatterns.js",
     "dist/generators/ts/_snippets/snippets_defaultValueFromRdfResourceValues.d.ts",
@@ -517,6 +524,10 @@
     "dist/generators/ts/_snippets/snippets_iriFromRdfResourceValues.js",
     "dist/generators/ts/_snippets/snippets_iriSparqlWherePatterns.d.ts",
     "dist/generators/ts/_snippets/snippets_iriSparqlWherePatterns.js",
+    "dist/generators/ts/_snippets/snippets_langStringFromRdfResourceValues.d.ts",
+    "dist/generators/ts/_snippets/snippets_langStringFromRdfResourceValues.js",
+    "dist/generators/ts/_snippets/snippets_langStringSparqlWherePatterns.d.ts",
+    "dist/generators/ts/_snippets/snippets_langStringSparqlWherePatterns.js",
     "dist/generators/ts/_snippets/snippets_liftSparqlPatterns.d.ts",
     "dist/generators/ts/_snippets/snippets_liftSparqlPatterns.js",
     "dist/generators/ts/_snippets/snippets_listFromRdfResourceValues.d.ts",
@@ -649,5 +660,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.52"
+  "version": "4.0.54"
 }

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

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

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

@@ -1,9 +0,0 @@
-import { code, conditionalOutput } from "../ts-poet-wrapper.js";
-export const snippets_decodeBigDecimalLiteral = ({ imports, syntheticNamePrefix, }) => conditionalOutput(`${syntheticNamePrefix}decodeBigDecimalLiteral`, code `\
-/**
- * Decidoe a BigDecimal from a Literal.
- */  
-function ${syntheticNamePrefix}decodeBigDecimalLiteral(literal: ${imports.Literal}): ${imports.Either}<Error, ${imports.BigDecimal}> {
-  return ${imports.Either}.encase(() => new ${imports.BigDecimal}(literal.value));
-}`);
-//# sourceMappingURL=snippets_decodeBigDecimalLiteral.js.map