@shaclmate/compiler 4.0.19 → 4.0.21

package/dist/generators/ts/graphqlSchemaVariableStatement.js

@@ -16,7 +16,7 @@ function graphqlQueryObjectType({ namedObjectTypes, namedObjectUnionTypes, }) {
             resolve: code `\
 async (_source, args: { identifier: string }, { objectSet }): Promise<${namedObjectType.name}> => 
   (await ${imports.EitherAsync}<Error, ${namedObjectType.name}>(async ({ liftEither }) => 
-    liftEither(await objectSet.${namedObjectType.objectSetMethodNames.object}(await liftEither(${namedObjectType.identifierTypeAlias}.fromString(args.identifier))))
+    liftEither(await objectSet.${namedObjectType.objectSetMethodNames.object}(await liftEither(${namedObjectType.identifierTypeAlias}.parse(args.identifier))))
   )).unsafeCoerce()`,
             type: namedObjectType.graphqlType.name,
         };
@@ -31,7 +31,7 @@ async (_source, args: { identifier: string }, { objectSet }): Promise<${namedObj
             },
             resolve: code `\
  async (_source, args: { limit: number | null; offset: number | null; }, { objectSet }): Promise<readonly string[]> =>
-  (await objectSet.${namedObjectType.objectSetMethodNames.objectIdentifiers}({ limit: args.limit !== null ? args.limit : undefined, offset: args.offset !== null ? args.offset : undefined })).unsafeCoerce().map(${namedObjectType.identifierTypeAlias}.toString)`,
+  (await objectSet.${namedObjectType.objectSetMethodNames.objectIdentifiers}({ limit: args.limit !== null ? args.limit : undefined, offset: args.offset !== null ? args.offset : undefined })).unsafeCoerce().map(${namedObjectType.identifierTypeAlias}.stringify)`,
             type: code `new ${imports.GraphQLNonNull}(new ${imports.GraphQLList}(${imports.GraphQLString}))`,
         };
         fields[namedObjectType.objectSetMethodNames.objects] = {
@@ -53,7 +53,7 @@ async (_source, args: { identifiers: readonly string[] | null; limit: number | n
   if (args.identifiers) {
     const identifiers: ${namedObjectType.identifierTypeAlias}[] = [];
     for (const identifierArg of args.identifiers) {
-      identifiers.push(await liftEither(${namedObjectType.identifierTypeAlias}.fromString(identifierArg)));
+      identifiers.push(await liftEither(${namedObjectType.identifierTypeAlias}.parse(identifierArg)));
     }
     filter = { ${syntheticNamePrefix}identifier: { in: identifiers } };
   }

package/dist/generators/ts/imports.d.ts

@@ -25,6 +25,8 @@ export declare const imports: {
     readonly Maybe: import("ts-poet/build/Import.js").Import;
     readonly NamedNode: import("ts-poet/build/Import.js").Import;
     readonly NonEmptyList: import("ts-poet/build/Import.js").Import;
+    readonly NTriplesIdentifier: import("ts-poet/build/Import.js").Import;
+    readonly NTriplesTerm: import("ts-poet/build/Import.js").Import;
     readonly Quad: import("ts-poet/build/Import.js").Import;
     readonly Quad_Graph: import("ts-poet/build/Import.js").Import;
     readonly RdfjsResourcePropertyPath: import("ts-poet/build/Import.js").Import;

package/dist/generators/ts/imports.js

@@ -2,7 +2,7 @@ import { imp } from "./ts-poet-wrapper.js";
 export const imports = {
     BigDecimal: imp("Decimal:BigDecimal@decimal.js"),
     BlankNode: imp("BlankNode@@rdfjs/types"),
-    dataFactory: imp("dataFactory=@rdfjs/data-model"),
+    dataFactory: imp("dataFactory=@rdfx/data-factory"),
     DatasetCore: imp("DatasetCore@@rdfjs/types"),
     datasetFactory: imp("datasetFactory=@rdfjs/dataset"),
     Either: imp("Either@purify-ts"),
@@ -26,6 +26,8 @@ export const imports = {
     Maybe: imp("Maybe@purify-ts"),
     NamedNode: imp("NamedNode@@rdfjs/types"),
     NonEmptyList: imp("NonEmptyList@purify-ts"),
+    NTriplesIdentifier: imp("NTriplesIdentifier@@rdfx/string"),
+    NTriplesTerm: imp("NTriplesTerm@@rdfx/string"),
     Quad: imp("Quad@@rdfjs/types"),
     Quad_Graph: imp("Quad_Graph@@rdfjs/types"),
     RdfjsResourcePropertyPath: imp("PropertyPath:RdfjsResourcePropertyPath@@rdfx/resource"),

package/dist/generators/ts/rdfjsTermExpression.d.ts

@@ -1,4 +1,7 @@
 import type { BlankNode, Literal, NamedNode, Variable } from "@rdfjs/types";
+import type { Logger } from "ts-log";
 import { type Code } from "./ts-poet-wrapper.js";
-export declare function rdfjsTermExpression(rdfjsTerm: Omit<BlankNode, "equals"> | Omit<Literal, "equals"> | Omit<NamedNode, "equals"> | Omit<Variable, "equals">): Code;
+export declare function rdfjsTermExpression(rdfjsTerm: Omit<BlankNode, "equals"> | Omit<Literal, "equals"> | Omit<NamedNode, "equals"> | Omit<Variable, "equals">, { logger }: {
+    logger: Logger;
+}): Code;
 //# sourceMappingURL=rdfjsTermExpression.d.ts.map

package/dist/generators/ts/rdfjsTermExpression.js

@@ -1,9 +1,8 @@
 import { rdf, rdfs, xsd } from "@tpluscode/rdf-ns-builders";
-import { logger } from "../../logger.js";
 import { snippets_RdfVocabularies } from "./_snippets/snippets_RdfVocabularies.js";
 import { imports } from "./imports.js";
 import { code, literalOf } from "./ts-poet-wrapper.js";
-export function rdfjsTermExpression(rdfjsTerm) {
+export function rdfjsTermExpression(rdfjsTerm, { logger }) {
     switch (rdfjsTerm.termType) {
         case "BlankNode":
             return code `${imports.dataFactory}.blankNode(${literalOf(rdfjsTerm.value)})`;
@@ -14,7 +13,7 @@ export function rdfjsTermExpression(rdfjsTerm) {
                 }
                 return code `${imports.dataFactory}.literal(${literalOf(rdfjsTerm.value)}, ${literalOf(rdfjsTerm.language)})`;
             }
-            return code `${imports.dataFactory}.literal(${literalOf(rdfjsTerm.value)}, ${rdfjsTermExpression(rdfjsTerm.datatype)})`;
+            return code `${imports.dataFactory}.literal(${literalOf(rdfjsTerm.value)}, ${rdfjsTermExpression(rdfjsTerm.datatype, { logger })})`;
         case "NamedNode": {
             if (rdfjsTerm.value.startsWith(rdf[""].value)) {
                 const unqualifiedName = rdfjsTerm.value.substring(rdf[""].value.length);

package/dist/generators/ts/snippets.d.ts

@@ -5,7 +5,6 @@ export declare const snippets: {
     bigDecimalSparqlWherePatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     BlankNodeFilter: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     BlankNodeSchema: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
-    blankNodeFromString: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     blankNodeSparqlWherePatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     booleanEquals: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     BooleanFilter: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
@@ -42,7 +41,6 @@ export declare const snippets: {
     FromRdfResourceValuesFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     Hasher: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     IdentifierFilter: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
-    identifierFromString: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     IdentifierSchema: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     IdentifierSet: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     identifierSparqlWherePatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
@@ -74,6 +72,9 @@ export declare const snippets: {
     NumericFilter: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     NumericSchema: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     numericSparqlWherePatterns: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    parseBlankNode: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    parseIdentifier: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
+    parseIri: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     PropertiesFromRdfResourceFunction: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     PropertyPath: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;
     RdfVocabularies: import("ts-poet/build/ConditionalOutput.js").ConditionalOutput;

package/dist/generators/ts/snippets.js

@@ -1,3 +1,4 @@
+import { snippets_parseIri } from "./_snippets/parseIri.js";
 import { snippets_arrayEquals } from "./_snippets/snippets_arrayEquals.js";
 import { snippets_arrayIntersection } from "./_snippets/snippets_arrayIntersection.js";
 import { snippets_BlankNodeFilter } from "./_snippets/snippets_BlankNodeFilter.js";
@@ -6,7 +7,6 @@ import { snippets_BooleanFilter } from "./_snippets/snippets_BooleanFilter.js";
 import { snippets_BooleanSchema } from "./_snippets/snippets_BooleanSchema.js";
 import { snippets_bigDecimalLiteral } from "./_snippets/snippets_bigDecimalLiteral.js";
 import { snippets_bigDecimalSparqlWherePatterns } from "./_snippets/snippets_bigDecimalSparqlWherePatterns.js";
-import { snippets_blankNodeFromString } from "./_snippets/snippets_blankNodeFromString.js";
 import { snippets_blankNodeSparqlWherePatterns } from "./_snippets/snippets_blankNodeSparqlWherePatterns.js";
 import { snippets_booleanEquals } from "./_snippets/snippets_booleanEquals.js";
 import { snippets_booleanSparqlWherePatterns } from "./_snippets/snippets_booleanSparqlWherePatterns.js";
@@ -45,7 +45,6 @@ import { snippets_IdentifierSchema } from "./_snippets/snippets_IdentifierSchema
 import { snippets_IdentifierSet } from "./_snippets/snippets_IdentifierSet.js";
 import { snippets_IriFilter } from "./_snippets/snippets_IriFilter.js";
 import { snippets_IriSchema } from "./_snippets/snippets_IriSchema.js";
-import { snippets_identifierFromString } from "./_snippets/snippets_identifierFromString.js";
 import { snippets_identifierSparqlWherePatterns } from "./_snippets/snippets_identifierSparqlWherePatterns.js";
 import { snippets_iriSparqlWherePatterns } from "./_snippets/snippets_iriSparqlWherePatterns.js";
 import { snippets_isReadonlyBigIntArray } from "./_snippets/snippets_isReadonlyBigIntArray.js";
@@ -75,6 +74,8 @@ import { snippets_normalizeSparqlWherePatterns } from "./_snippets/snippets_norm
 import { snippets_numericSparqlWherePatterns } from "./_snippets/snippets_numericSparqlWherePatterns.js";
 import { snippets_PropertiesFromRdfResourceFunction } from "./_snippets/snippets_PropertiesFromRdfResourceFunction.js";
 import { snippets_PropertyPath } from "./_snippets/snippets_PropertyPath.js";
+import { snippets_parseBlankNode } from "./_snippets/snippets_parseBlankNode.js";
+import { snippets_parseIdentifier } from "./_snippets/snippets_parseIdentifier.js";
 import { snippets_RdfVocabularies } from "./_snippets/snippets_RdfVocabularies.js";
 import { snippets_ShaclPropertySchema } from "./_snippets/snippets_ShaclPropertySchema.js";
 import { snippets_SparqlFilterPattern } from "./_snippets/snippets_SparqlFilterPattern.js";
@@ -110,7 +111,6 @@ export const snippets = {
     bigDecimalSparqlWherePatterns: snippets_bigDecimalSparqlWherePatterns,
     BlankNodeFilter: snippets_BlankNodeFilter,
     BlankNodeSchema: snippets_BlankNodeSchema,
-    blankNodeFromString: snippets_blankNodeFromString,
     blankNodeSparqlWherePatterns: snippets_blankNodeSparqlWherePatterns,
     booleanEquals: snippets_booleanEquals,
     BooleanFilter: snippets_BooleanFilter,
@@ -147,7 +147,6 @@ export const snippets = {
     FromRdfResourceValuesFunction: snippets_FromRdfResourceValuesFunction,
     Hasher: snippets_Hasher,
     IdentifierFilter: snippets_IdentifierFilter,
-    identifierFromString: snippets_identifierFromString,
     IdentifierSchema: snippets_IdentifierSchema,
     IdentifierSet: snippets_IdentifierSet,
     identifierSparqlWherePatterns: snippets_identifierSparqlWherePatterns,
@@ -179,6 +178,9 @@ export const snippets = {
     NumericFilter: snippets_NumericFilter,
     NumericSchema: snippets_NumericSchema,
     numericSparqlWherePatterns: snippets_numericSparqlWherePatterns,
+    parseBlankNode: snippets_parseBlankNode,
+    parseIdentifier: snippets_parseIdentifier,
+    parseIri: snippets_parseIri,
     PropertiesFromRdfResourceFunction: snippets_PropertiesFromRdfResourceFunction,
     PropertyPath: snippets_PropertyPath,
     RdfVocabularies: snippets_RdfVocabularies,

package/dist/generators/ts/synthesizeUberObjectUnionType.d.ts

@@ -1,9 +1,11 @@
+import type { Logger } from "ts-log";
 import type { NamedObjectType } from "./NamedObjectType.js";
 import { NamedObjectUnionType } from "./NamedObjectUnionType.js";
 /**
  * Synthesize the $Object union.
  */
 export declare function synthesizeUberObjectUnionType(parameters: {
+    logger: Logger;
     namedObjectTypes: readonly NamedObjectType[];
 }): NamedObjectUnionType;
 //# sourceMappingURL=synthesizeUberObjectUnionType.d.ts.map

package/dist/generators/ts/synthesizeUberObjectUnionType.js

@@ -22,6 +22,7 @@ export function synthesizeUberObjectUnionType(parameters) {
         identifierType = new IdentifierType({
             comment: Maybe.empty(),
             label: Maybe.empty(),
+            logger: parameters.logger,
         });
     }
     else {
@@ -30,6 +31,7 @@ export function synthesizeUberObjectUnionType(parameters) {
                 identifierType = new BlankNodeType({
                     comment: Maybe.empty(),
                     label: Maybe.empty(),
+                    logger: parameters.logger,
                 });
                 break;
             case "IRI":
@@ -38,6 +40,7 @@ export function synthesizeUberObjectUnionType(parameters) {
                     hasValues: [],
                     in_: [],
                     label: Maybe.empty(),
+                    logger: parameters.logger,
                 });
                 break;
         }
@@ -53,6 +56,7 @@ export function synthesizeUberObjectUnionType(parameters) {
         }, new Set()),
         identifierType,
         label: Maybe.empty(),
+        logger: parameters.logger,
         members: namedObjectTypes.map((namedObjectType) => ({
             discriminantValue: Maybe.empty(),
             type: namedObjectType,

package/dist/input/ShapesGraph.d.ts

@@ -1,5 +1,6 @@
 import { AbstractShapesGraph } from "@shaclmate/shacl-ast";
 import type { Either } from "purify-ts";
+import type { Logger } from "ts-log";
 import type { Ast } from "../ast/Ast.js";
 import type { TsFeature } from "../enums/TsFeature.js";
 import type { Generator } from "../generators/Generator.js";
@@ -16,13 +17,15 @@ export declare class ShapesGraph extends AbstractShapesGraph<generated.NodeShape
      */
     compile(parameters: {
         generator: Generator;
+        logger: Logger;
         tsFeaturesDefault?: ReadonlySet<TsFeature>;
     }): Either<Error, string>;
     static builder(): ShapesGraph.Builder;
     /**
      * Transform the shapes graph to an AST.
      */
-    toAst(options?: {
+    toAst({ logger, tsFeaturesDefault, }: {
+        logger: Logger;
         tsFeaturesDefault?: ReadonlySet<TsFeature>;
     }): Either<Error, Ast>;
 }

package/dist/input/ShapesGraph.js

@@ -22,10 +22,11 @@ export class ShapesGraph extends AbstractShapesGraph {
     /**
      * Transform the shapes graph to an AST.
      */
-    toAst(options) {
+    toAst({ logger, tsFeaturesDefault, }) {
         return new ShapesGraphToAstTransformer({
-            ...options,
+            logger,
             shapesGraph: this,
+            tsFeaturesDefault,
         }).transform();
     }
 }