@shaclmate/cli 4.0.15 → 4.0.17

package/dist/cli.js

@@ -1,16 +1,18 @@
 #!/usr/bin/env node
 import * as fs from "node:fs";
 import PrefixMap from "@rdfjs/prefix-map/PrefixMap.js";
+import { RdfDirectory, RdfFileSystemEntry } from "@rdfx/fs";
 import { AstJsonGenerator, Compiler, ShapesGraph, 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 { DataFactory, Parser, Store, Writer } from "n3";
 import { pino } from "pino";
+import { EitherAsync } from "purify-ts";
 import SHACLValidator from "rdf-validate-shacl";
 import { shaclShaclDataset } from "./shaclShaclDataset.js";
-const inputFilePaths = restPositionals({
-    displayName: "inputFilePaths",
-    description: "paths to RDF files containing SHACL shapes",
+const inputPaths = restPositionals({
+    displayName: "inputPaths",
+    description: "paths to RDF files or directories of RDF files containing SHACL shapes",
     type: ExistingPath,
 });
 const logger = pino({
@@ -26,15 +28,15 @@ const outputFilePath = option({
     short: "o",
     type: string,
 });
-function generate({ generator, inputFilePaths, outputFilePath, }) {
-    if (inputFilePaths.length === 0) {
+function generate({ generator, inputFiles, outputFilePath, }) {
+    if (inputFiles.length === 0) {
         throw new Error("must specify at least one input shapes graph file path");
     }
     const inputParser = new Parser();
     const dataset = new Store();
     const iriPrefixes = [];
-    for (const inputFilePath of inputFilePaths) {
-        dataset.addQuads(inputParser.parse(fs.readFileSync(inputFilePath).toString(), null, (prefix, prefixNode) => {
+    for (const inputFile of inputFiles) {
+        dataset.addQuads(inputParser.parse(fs.readFileSync(inputFile.path).toString(), null, (prefix, prefixNode) => {
             const existingIriPrefix = iriPrefixes.find((iriPrefix) => iriPrefix[0] === prefix || iriPrefix[1].equals(prefixNode));
             if (existingIriPrefix) {
                 if (existingIriPrefix[0] !== prefix ||
@@ -82,6 +84,25 @@ function generate({ generator, inputFilePaths, outputFilePath, }) {
         }
     });
 }
+async function resolveInputPaths(inputPaths) {
+    return EitherAsync(async ({ liftEither }) => {
+        const inputFiles = [];
+        for (const inputPath of inputPaths) {
+            const fileSystemEntry = await liftEither(await RdfFileSystemEntry.fromPath(inputPath));
+            if (fileSystemEntry instanceof RdfDirectory) {
+                for await (const inputFile of fileSystemEntry.files({
+                    recursive: true,
+                })) {
+                    inputFiles.push(inputFile);
+                }
+            }
+            else {
+                inputFiles.push(fileSystemEntry);
+            }
+        }
+        return inputFiles;
+    });
+}
 run(subcommands({
     cmds: {
         generate: subcommands({
@@ -90,13 +111,13 @@ run(subcommands({
                     name: "ast-json",
                     description: "generate AST JSON for the SHACL shapes graph",
                     args: {
-                        inputFilePaths,
+                        inputPaths,
                         outputFilePath,
                     },
-                    handler: async ({ inputFilePaths, outputFilePath }) => {
+                    handler: async ({ inputPaths, outputFilePath }) => {
                         generate({
                             generator: new AstJsonGenerator(),
-                            inputFilePaths,
+                            inputFiles: (await resolveInputPaths(inputPaths)).unsafeCoerce(),
                             outputFilePath,
                         });
                     },
@@ -105,13 +126,13 @@ run(subcommands({
                     name: "ts",
                     description: "generate TypeScript for the SHACL shapes graph",
                     args: {
-                        inputFilePaths,
+                        inputPaths,
                         outputFilePath,
                     },
-                    handler: async ({ inputFilePaths, outputFilePath }) => {
+                    handler: async ({ inputPaths, outputFilePath }) => {
                         generate({
                             generator: new TsGenerator(),
-                            inputFilePaths,
+                            inputFiles: (await resolveInputPaths(inputPaths)).unsafeCoerce(),
                             outputFilePath,
                         });
                     },
@@ -120,13 +141,13 @@ run(subcommands({
                     name: "zod",
                     description: "generate Zod schemas for the SHACL shapes graph",
                     args: {
-                        inputFilePaths,
+                        inputPaths,
                         outputFilePath,
                     },
-                    handler: async ({ inputFilePaths, outputFilePath }) => {
+                    handler: async ({ inputPaths, outputFilePath }) => {
                         generate({
                             generator: new ZodGenerator(),
-                            inputFilePaths,
+                            inputFiles: (await resolveInputPaths(inputPaths)).unsafeCoerce(),
                             outputFilePath,
                         });
                     },

package/package.json

@@ -3,25 +3,20 @@
     "shaclmate": "dist/cli.js"
   },
   "dependencies": {
-    "@shaclmate/compiler": "4.0.15",
+    "@shaclmate/compiler": "4.0.17",
     "@rdfjs/prefix-map": "~0.1.2",
     "@rdfjs/types": "~2.0.1",
+    "@rdfx/fs": "0.0.7",
     "@types/n3": "~1.26.0",
     "@types/rdfjs__prefix-map": "~0.1.5",
     "cmd-ts": "~0.13.0",
     "n3": "~1.26.0",
     "pino": "~9.1.0",
+    "purify-ts": "~2.1.4",
     "rdf-validate-shacl": "0.5.8"
   },
   "description": "Command line program to generate TypeScript code from SHACL shapes",
-  "devDependencies": {
-    "@tsconfig/node18": "~18.2.4",
-    "@tsconfig/strictest": "~2.0.8",
-    "@types/node": "~18",
-    "depcheck": "~1.4.7",
-    "rimraf": "~6.0.1",
-    "typescript": "5.9.3"
-  },
+  "devDependencies": {},
   "files": [
     "README.md",
     "dist/*.d.ts",
@@ -51,5 +46,5 @@
   },
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "4.0.15"
+  "version": "4.0.17"
 }