@shaclmate/cli 4.0.18 → 4.0.20

package/dist/cli.js

@@ -1,10 +1,12 @@
 #!/usr/bin/env node
-import { AstJsonGenerator, TsGenerator, ZodGenerator, } from "@shaclmate/compiler";
+import fs from "node:fs";
+import { AstJsonGenerator, Cx2Generator, TsGenerator, ZodGenerator, } from "@shaclmate/compiler";
 import { command, option, restPositionals, run, string, subcommands, } from "cmd-ts";
 import { ExistingPath } from "cmd-ts/dist/cjs/batteries/fs.js";
 import { generate } from "./commands/generate.js";
 import { merge } from "./commands/merge.js";
 import { validate } from "./commands/validate.js";
+import { logger } from "./logger.js";
 const inputPaths = restPositionals({
     displayName: "inputPaths",
     description: "paths to RDF files or directories of RDF files containing SHACL shapes",
@@ -37,6 +39,30 @@ run(subcommands({
                         })).unsafeCoerce();
                     },
                 }),
+                cx2: command({
+                    name: "cx2",
+                    description: "generate Cytoscape Exchange Format Specification (Version 2)",
+                    args: {
+                        inputPaths,
+                        outputFilePath,
+                        visualPropertiesJsonFilePath: option({
+                            description: "path to a file containing the visualProperties JSON object to include in the CX2 file",
+                            long: "visual-properties-json-file-path",
+                            type: ExistingPath,
+                        }),
+                    },
+                    handler: async ({ inputPaths, outputFilePath, visualPropertiesJsonFilePath, }) => {
+                        let visualProperties;
+                        if (visualPropertiesJsonFilePath) {
+                            visualProperties = JSON.parse((await fs.promises.readFile(visualPropertiesJsonFilePath)).toString("utf-8"));
+                        }
+                        (await generate({
+                            generator: new Cx2Generator({ visualProperties }),
+                            inputPaths,
+                            outputFilePath,
+                        })).unsafeCoerce();
+                    },
+                }),
                 ts: command({
                     name: "ts",
                     description: "generate TypeScript for the SHACL shapes graph",
@@ -46,7 +72,7 @@ run(subcommands({
                     },
                     handler: async ({ inputPaths, outputFilePath }) => {
                         (await generate({
-                            generator: new TsGenerator(),
+                            generator: new TsGenerator({ logger }),
                             inputPaths,
                             outputFilePath,
                         })).unsafeCoerce();
@@ -61,7 +87,7 @@ run(subcommands({
                     },
                     handler: async ({ inputPaths, outputFilePath }) => {
                         (await generate({
-                            generator: new ZodGenerator(),
+                            generator: new ZodGenerator({ logger }),
                             inputPaths,
                             outputFilePath,
                         })).unsafeCoerce();

package/dist/commands/generate.js

@@ -3,6 +3,7 @@ import Serializer from "@rdfjs/serializer-turtle";
 import { Compiler, ShapesGraph } from "@shaclmate/compiler";
 import { EitherAsync } from "purify-ts";
 import SHACLValidator from "rdf-validate-shacl";
+import { logger } from "../logger.js";
 import { parseInputs } from "./parseInputs.js";
 import { shaclShaclDataset } from "./shaclShaclDataset.js";
 export async function generate({ generator, inputPaths, outputFilePath, }) {
@@ -24,7 +25,7 @@ export async function generate({ generator, inputPaths, outputFilePath, }) {
         const output = await liftEither(ShapesGraph.builder()
             .parseDataset(dataset, { prefixMap })
             .map((_) => _.build())
-            .chain((shapesGraph) => new Compiler({ generator }).compile(shapesGraph)));
+            .chain((shapesGraph) => new Compiler({ generator, logger }).compile(shapesGraph)));
         if (outputFilePath.length === 0) {
             process.stdout.write(output);
         }

package/dist/commands/parseInputs.js

@@ -1,12 +1,12 @@
-import DataFactory from "@rdfjs/data-model";
-import DatasetFactory from "@rdfjs/dataset";
+import datasetFactory from "@rdfjs/dataset";
 import PrefixMap from "@rdfjs/prefix-map/PrefixMap.js";
+import dataFactory from "@rdfx/data-factory";
 import { RdfDirectory, RdfFileSystemEntry } from "@rdfx/fs";
 import { Either, EitherAsync, Left } from "purify-ts";
 import { logger } from "../logger.js";
 export async function parseInputs(inputPaths) {
     return EitherAsync(async ({ liftEither }) => {
-        const dataset = DatasetFactory.dataset();
+        const dataset = datasetFactory.dataset();
         const prefixMapInit = [];
         for (const inputPath of inputPaths) {
             const parseInputFileSystemEntry = async (inputFileSystemEntry) => {
@@ -42,7 +42,7 @@ export async function parseInputs(inputPaths) {
         }
         return {
             dataset,
-            prefixMap: new PrefixMap(prefixMapInit, { factory: DataFactory }),
+            prefixMap: new PrefixMap(prefixMapInit, { factory: dataFactory }),
         };
     });
 }

package/dist/logger.js

@@ -7,8 +7,9 @@ export const logger = pino({
     transport: {
         target: "pino-pretty",
         options: {
+            destination: 2,
             colorize: true,
         },
     },
-}, pino["destination"] ? pino.destination(2) : undefined);
+});
 //# sourceMappingURL=logger.js.map

package/package.json

@@ -3,12 +3,12 @@
     "shaclmate": "dist/cli.js"
   },
   "dependencies": {
-    "@shaclmate/compiler": "4.0.18",
-    "@rdfjs/data-model": "~2.1.1",
+    "@shaclmate/compiler": "4.0.20",
     "@rdfjs/dataset": "~2.0.2",
     "@rdfjs/prefix-map": "~0.1.2",
     "@rdfjs/serializer-turtle": "~1.1.5",
-    "@rdfx/fs": "0.0.7",
+    "@rdfx/data-factory": "0.0.11",
+    "@rdfx/fs": "0.0.11",
     "cmd-ts": "~0.15.0",
     "pino": "~9.1.0",
     "pino-pretty": "~13.1.2",
@@ -20,7 +20,6 @@
   "description": "Command line program to generate TypeScript code from SHACL shapes",
   "devDependencies": {
     "@rdfjs/types": "~2.0.1",
-    "@types/rdfjs__data-model": "~2.0.9",
     "@types/rdfjs__dataset": "~2.0.7",
     "@types/rdfjs__prefix-map": "~0.1.5",
     "@types/which": "~3.0.4"
@@ -56,5 +55,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.18"
+  "version": "4.0.20"
 }