@intellegens/cornerstone-cli 0.0.9999-alpha-7 → 0.0.9999-alpha-10

package/README.md

@@ -7,7 +7,7 @@ A command-line interface (CLI) with various utilities. The CLI is built using ya
 1. Install dependencies:
 
 ```bash
-npm install
+pnpm install
 ```
 
 ### Available scripts
@@ -15,19 +15,19 @@ npm install
 2. `build`: Compiles the TypeScript code
 
 ```bash
-npm run build
+pnpm run build
 ```
 
 3. `cli`: Runs the CLI in development mode using tsx
 
 ```bash
-npm run cli <command> [options]
+pnpm run cli <command> [options]
 ```
 
 ### Install and run
 
 ```sh
-npm install -g @intellegens/cornerstone-cli
+pnpm install -g @intellegens/cornerstone-cli
 cornerstone-ts <command> [options]
 ```
 
@@ -39,7 +39,7 @@ Generates Zod schemas from JSON schema files, preserving namespace structure.
 
 ```bash
 # Development
-npm run cli zod-gen --input <input-dir> --output <output-dir>
+pnpm run cli zod-gen --input <input-dir> --output <output-dir>
 
 # After building
 ./dist/utils/cli/index.js zod-gen --input <input-dir> --output <output-dir>
@@ -68,7 +68,7 @@ Generates client code from OpenAPI schema files using Orval.
 
 ```bash
 # Development
-npm run cli openapi-gen --input <input-file> --output <output-dir> [options]
+pnpm run cli openapi-gen --input <input-file> --output <output-dir> [options]
 
 # After building
 ./dist/utils/cli/index.js openapi-gen --input <input-file> --output <output-dir> [options]

package/{index.js → dist/index.js}

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 import yargs from 'yargs';
 import { hideBin } from 'yargs/helpers';
-import { zodSchemaGeneratorCommand } from './commands/zod-schema-generator';
-import { openApiGeneratorCommand } from './commands/openapi-generator';
+import { zodSchemaGeneratorCommand } from './commands/zod-schema-generator.js';
+import { openApiGeneratorCommand } from './commands/openapi-generator.js';
 yargs(hideBin(process.argv))
     .scriptName('cornerstone-ts')
     .command(zodSchemaGeneratorCommand)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intellegens/cornerstone-cli",
-  "version": "0.0.9999-alpha-7",
+  "version": "0.0.9999-alpha-10",
   "private": false,
   "publishable": true,
   "main": "./index.js",
@@ -16,27 +16,28 @@
   "bin": {
     "cornerstone-ts": "./index.js"
   },
-  "scripts": {
-    "clean": "npx --yes rimraf '{dist}'",
-    "test": "echo 'TBD'",
-    "coverage": "echo 'TBD'",
-    "build": "npm run clean && tsc && tsc-alias",
-    "start": "tsx ./src/index.ts"
-  },
   "dependencies": {
+    "@orval/core": "^7.16.0",
     "fs-extra": "^11.3.0",
     "json-refs": "^3.0.15",
     "json-schema-to-zod": "^2.6.0",
     "orval": "^7.10.0",
-    "typescript": "^5.7.3",
+    "typescript": "~5.9.3",
     "yargs": "^17.7.2",
     "zod": "^3.24.2"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^22.13.4",
+    "@types/node": "^22.13.9",
     "@types/yargs": "^17.0.33",
     "tsc-alias": "^1.8.11",
     "tsx": "^4.19.2"
+  },
+  "scripts": {
+    "clean": "pnpx rimraf '{dist}'",
+    "test": "echo 'TBD'",
+    "coverage": "echo 'TBD'",
+    "build": "pnpm run clean && tsc && tsc-alias",
+    "start": "tsx ./src/index.ts"
   }
-}
+}

package/src/commands/openapi-generator.ts

@@ -0,0 +1,185 @@
+import { generate } from 'orval';
+import { CommandModule } from 'yargs';
+import fs from 'fs';
+import path from 'path';
+import { OptionsExport } from '@orval/core';
+
+interface OpenApiGeneratorArgs {
+  input: string;
+  output: string;
+  prettier: boolean;
+  zod: boolean;
+  fetchClient: boolean;
+  angularClient: boolean;
+  mock: boolean;
+  project: string;
+  baseUrl: string;
+  clean: boolean;
+}
+
+export const openApiGeneratorCommand: CommandModule<{}, OpenApiGeneratorArgs> = {
+  command: 'openapi-gen',
+  describe: 'Generate Zod schemas from JSON schemas',
+
+  builder: {
+    input: {
+      alias: 'i',
+      type: 'string',
+      describe: 'Path to the OPENAPI schema .json file',
+      demandOption: true,
+    },
+    output: {
+      alias: 'o',
+      type: 'string',
+      describe: 'Path to the folder where client will be saved',
+      demandOption: true,
+    },
+    prettier: {
+      alias: 'p',
+      type: 'boolean',
+      describe: 'Format generated code with Prettier',
+      default: false,
+    },
+    fetchClient: {
+      alias: 'f',
+      type: 'boolean',
+      describe: 'Generate fetch client',
+      default: false,
+    },
+    angularClient: {
+      alias: 'a',
+      type: 'boolean',
+      describe: 'Generate Angular client',
+      default: false,
+    },
+    zod: {
+      alias: 'z',
+      type: 'boolean',
+      describe: 'Generate Zod schemas',
+      default: false,
+    },
+    mock: {
+      alias: 'm',
+      type: 'boolean',
+      describe: 'Generate mock client',
+      default: false,
+    },
+    clean: {
+      alias: 'c',
+      type: 'boolean',
+      describe: 'Clean output folder',
+      default: true,
+    },
+    project: {
+      alias: 'pr',
+      type: 'string',
+      describe: 'Project name',
+      default: 'my-project',
+    },
+    baseUrl: {
+      alias: 'b',
+      type: 'string',
+      describe: 'Base URL for the API',
+      default: '',
+    },
+  },
+
+  async handler(args: OpenApiGeneratorArgs) {
+    try {
+      const absoluteInputPath = path.resolve(args.input);
+      const absoluteOutputPath = path.resolve(args.output);
+      // Check if input file exists
+      if (!fs.existsSync(absoluteInputPath)) {
+        console.error('🔴 OpenAPI schema file not found:', absoluteInputPath);
+        process.exit(1);
+      }
+
+      let configs: OptionsExport[] = [];
+
+      // Add configurations based on selected options
+      if ((!args.fetchClient && !args.angularClient) || args.zod) {
+        configs.push({
+          input: absoluteInputPath,
+          output: {
+            mode: 'tags-split',
+            target: './zod',
+            schemas: './models',
+            client: 'zod',
+            mock: args.mock,
+            prettier: args.prettier,
+            clean: args.clean,
+            override: {
+              useTypeOverInterfaces: true,
+              zod: {
+                generate: {
+                  param: false,
+                  body: args.zod,
+                  response: false,
+                  query: false,
+                  header: false,
+                },
+              },
+            },
+          },
+        });
+      }
+
+      if (args.fetchClient) {
+        configs.push({
+          input: absoluteInputPath,
+          output: {
+            mode: 'tags-split',
+            target: './endpoints',
+            schemas: './models',
+            client: 'fetch',
+            httpClient: 'fetch',
+            mock: args.mock,
+            prettier: args.prettier,
+            clean: args.clean,
+            override: {
+              useTypeOverInterfaces: true,
+            },
+          },
+        });
+      }
+
+      if (args.angularClient) {
+        configs.push({
+          input: absoluteInputPath,
+          output: {
+            mode: 'tags-split',
+            target: './endpoints',
+            schemas: './models',
+            client: 'angular',
+            mock: args.mock,
+            prettier: args.prettier,
+            clean: args.clean,
+            baseUrl: args.baseUrl,
+            override: {
+              useTypeOverInterfaces: true,
+            },
+          },
+        });
+      }
+
+      if (configs.length === 0) {
+        console.error('🔴 No options selected. Please select at least one option.');
+        process.exit(1);
+      }
+
+      // Generate
+      for (const config of configs) {
+        await generate(config, absoluteOutputPath, { projectName: args.project });
+      }
+
+      console.log('🟢 Schemas generated successfully!');
+    } catch (error) {
+      console.error('🔴 Error generating schemas:', error);
+      if (error instanceof Error) {
+        console.error('🔴 Error message:', error.message);
+        console.error('🔴 Error stack:', error.stack);
+      }
+      process.exit(1);
+    }
+  },
+};

package/src/commands/zod-schema-generator.ts

@@ -0,0 +1,116 @@
+import fs from 'fs-extra';
+import path from 'path';
+import { jsonSchemaToZod } from 'json-schema-to-zod';
+import { resolveRefs } from 'json-refs';
+import { CommandModule } from 'yargs';
+
+interface ZodSchemaGeneratorArgs {
+  input: string;
+  output: string;
+}
+
+export const zodSchemaGeneratorCommand: CommandModule<
+  {},
+  ZodSchemaGeneratorArgs
+> = {
+  command: 'zod-gen',
+  describe: 'Generate Zod schemas from JSON schemas',
+
+  builder: {
+    input: {
+      alias: 'i',
+      type: 'string',
+      describe: 'Path to the folder containing JSON schemas',
+      demandOption: true,
+    },
+    output: {
+      alias: 'o',
+      type: 'string',
+      describe: 'Path to the folder where Zod schemas will be saved',
+      demandOption: true,
+    },
+  },
+
+  async handler(args: ZodSchemaGeneratorArgs) {
+    try {
+      const { input: inputPath, output: outputPath } = args;
+
+      if (!fs.existsSync(inputPath)) {
+        console.warn('🟡 Input directory not found.');
+        process.exit(0);
+      }
+
+      const files = fs
+        .readdirSync(inputPath)
+        .filter((file) => file.endsWith('.json'));
+
+      if (files.length === 0) {
+        console.warn('🟡 No JSON schema files found in the input directory.');
+        process.exit(0);
+      }
+
+      if (!fs.existsSync(outputPath)) {
+        fs.emptyDirSync(outputPath);
+      } else {
+        fs.mkdirSync(outputPath, { recursive: true });
+      }
+
+      var exports: Record<string, string> = {};
+      for (const file of files) {
+        const filePath = path.join(inputPath, file);
+        const schemaContent = fs.readFileSync(filePath, 'utf-8');
+        const schema = JSON.parse(schemaContent);
+
+        const fullName = path.basename(file, '.json');
+        const parts = fullName.split('.');
+
+        // Last part is the type name, everything before is namespace
+        const typeName = parts[parts.length - 1];
+        const namespaceParts = parts.slice(0, -1);
+
+        // Create the namespace folder structure
+        const namespaceDir = path.join(outputPath, ...namespaceParts);
+        fs.mkdirSync(namespaceDir, { recursive: true });
+
+        const { resolved } = await resolveRefs(schema);
+        // Convert JSON Schema to Zod
+        const zodSchema = jsonSchemaToZod(resolved, {
+          withJsdocs: true,
+          module: 'esm',
+          type: true,
+          name: typeName,
+          depth: 5,
+        });
+
+        // Generate TypeScript file
+        const fileName = `${typeName}.ts`;
+        const outputFilePath = path.join(namespaceDir, fileName);
+        const outputTypePath = path.join(namespaceDir, typeName);
+
+        fs.writeFileSync(outputFilePath, zodSchema, 'utf-8');
+        console.log(`- Generated Zod schema: ${outputFilePath}`);
+
+        // Register for (re)export
+        exports[typeName] = path.relative(outputPath, outputTypePath);
+      }
+
+      // Write (re)export file
+      let exportFileContent = '';
+      for (const typeName in exports) {
+        const typePath = `./${exports[typeName]}`.replace(/\\/g, '/');
+        exportFileContent += `export * from '${typePath}'; // .NET ${typeName} class\n`;
+      }
+      fs.writeFileSync(
+        path.join(outputPath, './index.ts'),
+        exportFileContent,
+        'utf-8',
+      );
+
+      // Prompt done
+      console.log('🟢 Zod schemas generated successfully!');
+    } catch (error) {
+      console.error('🔴 Error generating Zod schemas:', error);
+      process.exit(1);
+    }
+  },
+};

package/src/index.ts

@@ -0,0 +1,14 @@
+#!/usr/bin/env node
+import yargs from 'yargs';
+import { hideBin } from 'yargs/helpers';
+import { zodSchemaGeneratorCommand } from './commands/zod-schema-generator.js';
+import { openApiGeneratorCommand } from './commands/openapi-generator.js';
+
+yargs(hideBin(process.argv))
+  .scriptName('cornerstone-ts')
+  .command(zodSchemaGeneratorCommand)
+  .command(openApiGeneratorCommand)
+  .demandCommand(1, 'You need to specify a command')
+  .strict()
+  .alias('h', 'help')
+  .parse();

package/tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "outDir": "./dist"
+  },
+  "include": ["src/**/*.ts"]
+}

package/LICENSE.md

@@ -1,7 +0,0 @@
-Copyright (c) 2025 Intellegens
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.