Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 32cb3d476f | |||
| 79ea7dfc7e | |||
| b54a94c6d3 | |||
| 77e3cbc0e9 | |||
| 16d4c8e0bb | |||
| e28443ce45 | |||
| 5707abf6bb | |||
|
|
d47afb6ff1 | ||
|
|
463626da0c | ||
| 05a58c4254 |
@@ -64,10 +64,12 @@ jobs:
|
||||
|
||||
- name: Configure Gitea registry auth
|
||||
run: |
|
||||
echo "//git.blassanto.me/api/packages/blas/npm/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.bunfig.toml
|
||||
echo '[install.scopes]' >> ~/.bunfig.toml
|
||||
echo '"@blas" = { registry = "https://git.blassanto.me/api/packages/blas/npm/", token = "${NODE_AUTH_TOKEN}" }' >> ~/.bunfig.toml
|
||||
echo "@blas:registry=https://git.blassanto.me/api/packages/blas/npm/" >> ~/.npmrc
|
||||
echo "//git.blassanto.me/api/packages/blas/npm/:_authToken=${NODE_AUTH_TOKEN}" >> ~/.npmrc
|
||||
cat >> ~/.bunfig.toml << EOF
|
||||
[install.scopes]
|
||||
"@blas" = { registry = "https://git.blassanto.me/api/packages/blas/npm/", token = "${NODE_AUTH_TOKEN}" }
|
||||
EOF
|
||||
env:
|
||||
NODE_AUTH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
|
||||
|
||||
|
||||
41
main.ts
41
main.ts
@@ -5,7 +5,15 @@ import mustache from 'mustache';
|
||||
import path from 'path';
|
||||
import { program } from 'commander';
|
||||
|
||||
import { log, logSuccess, logInfo, logWarning, logError, colors } from './src/utils/logger';
|
||||
import {
|
||||
log,
|
||||
logSuccess,
|
||||
logWarning,
|
||||
logError,
|
||||
logDetail,
|
||||
initGenerationLog,
|
||||
colors
|
||||
} from './src/utils/logger';
|
||||
import { checkOpenApiGenerator, installOpenApiGenerator } from './src/utils/openapi-generator';
|
||||
import { createDirectoryStructure, cleanup } from './src/utils/filesystem';
|
||||
import { analyzeSwagger } from './src/swagger/analyzer';
|
||||
@@ -18,7 +26,7 @@ import { generateReport } from './src/generators/report.generator';
|
||||
import { lintGeneratedFiles } from './src/generators/lint.generator';
|
||||
import { findEnvironmentFile, parseApiKeys } from './src/utils/environment-finder';
|
||||
import { askApiKeysForTags, askSelectionFilter } from './src/utils/prompt';
|
||||
import type { SelectionFilter } from './src/types';
|
||||
import type { SelectionFilter, LintResult } from './src/types';
|
||||
import type { CliOptions } from './src/types';
|
||||
import packageJson from './package.json';
|
||||
|
||||
@@ -52,15 +60,17 @@ async function main(): Promise<void> {
|
||||
log(' Angular + Clean Architecture Code Generator', 'cyan');
|
||||
console.log('='.repeat(60) + '\n');
|
||||
|
||||
const logPath = path.join(process.cwd(), 'generation.log');
|
||||
initGenerationLog(logPath);
|
||||
logDetail('config', `Input: ${options.input}`);
|
||||
logDetail('config', `Output: ${options.output}`);
|
||||
logDetail('config', `Templates: ${options.templates}`);
|
||||
|
||||
if (!fs.existsSync(options.input)) {
|
||||
logError(`File not found: ${options.input}`);
|
||||
process.exit(1);
|
||||
}
|
||||
|
||||
logInfo(`Input file: ${options.input}`);
|
||||
logInfo(`Output directory: ${options.output}`);
|
||||
logInfo(`Templates: ${options.templates}`);
|
||||
|
||||
if (options.dryRun) {
|
||||
logWarning('DRY RUN mode — no files will be generated');
|
||||
}
|
||||
@@ -82,7 +92,7 @@ async function main(): Promise<void> {
|
||||
const analysis = analyzeSwagger(options.input);
|
||||
|
||||
if (options.dryRun) {
|
||||
logInfo('Finishing in DRY RUN mode');
|
||||
logWarning('Finishing in DRY RUN mode');
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -110,9 +120,7 @@ async function main(): Promise<void> {
|
||||
logSuccess(
|
||||
`environment.ts found: ${colors.cyan}${path.relative(process.cwd(), envFile)}${colors.reset}`
|
||||
);
|
||||
if (apiKeys.length > 0) {
|
||||
logInfo(`Detected API keys: ${apiKeys.map((k) => k.key).join(', ')}`);
|
||||
} else {
|
||||
if (apiKeys.length === 0) {
|
||||
logWarning('No keys containing "api" found in environment.ts. Will be requested manually.');
|
||||
}
|
||||
} else {
|
||||
@@ -120,6 +128,9 @@ async function main(): Promise<void> {
|
||||
}
|
||||
|
||||
const tagApiKeyMap = await askApiKeysForTags(selectedTags, apiKeys);
|
||||
Object.entries(tagApiKeyMap).forEach(([tag, key]) => {
|
||||
logDetail('config', `API key for "${tag}": environment.${key}.url`);
|
||||
});
|
||||
// ──────────────────────────────────────────────────────────────────────────
|
||||
|
||||
const tempDir = generateCode(options.input, options.templates);
|
||||
@@ -134,11 +145,13 @@ async function main(): Promise<void> {
|
||||
);
|
||||
cleanup(tempDir);
|
||||
|
||||
if (!options.skipLint) {
|
||||
lintGeneratedFiles(options.output);
|
||||
}
|
||||
const noLintResult: LintResult = {
|
||||
prettier: { ran: false, filesFormatted: 0 },
|
||||
eslint: { ran: false, filesFixed: 0 }
|
||||
};
|
||||
const lintResult = options.skipLint ? noLintResult : lintGeneratedFiles(options.output);
|
||||
|
||||
const report = generateReport(options.output, analysis);
|
||||
const report = generateReport(options.output, analysis, lintResult);
|
||||
|
||||
console.log('\n' + '='.repeat(60));
|
||||
log(' ✨ Generation completed successfully', 'green');
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@blas/openapi-clean-arch-generator",
|
||||
"version": "1.0.1",
|
||||
"version": "1.3.0",
|
||||
"description": "Angular Clean Architecture generator from OpenAPI/Swagger",
|
||||
"main": "dist/main.js",
|
||||
"bin": {
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import fs from 'fs-extra';
|
||||
import path from 'path';
|
||||
import mustache from 'mustache';
|
||||
import { logStep, logSuccess, logInfo } from '../utils/logger';
|
||||
import { logStep, logSuccess, logDetail } from '../utils/logger';
|
||||
import { mapSwaggerTypeToTs } from '../utils/type-mapper';
|
||||
import { toCamelCase } from '../utils/name-formatter';
|
||||
import { resolveMockValue } from '../utils/mock-value-resolver';
|
||||
@@ -74,7 +74,8 @@ export function generateCleanArchitecture(
|
||||
mappers: 0,
|
||||
useCases: 0,
|
||||
providers: 0,
|
||||
mocks: 0
|
||||
mocks: 0,
|
||||
specs: 0
|
||||
};
|
||||
|
||||
const schemas =
|
||||
@@ -156,7 +157,7 @@ export function generateCleanArchitecture(
|
||||
const destPath = path.join(outputDir, 'entities/models', `${toCamelCase(baseName)}.model.ts`);
|
||||
fs.writeFileSync(destPath, output);
|
||||
generatedCount.models++;
|
||||
logInfo(` ${toCamelCase(baseName)}.model.ts → ${path.relative(process.cwd(), destPath)}`);
|
||||
logDetail('generate', `model-entity → ${path.relative(process.cwd(), destPath)}`);
|
||||
}
|
||||
|
||||
// Mapper
|
||||
@@ -210,6 +211,26 @@ export function generateCleanArchitecture(
|
||||
generatedCount,
|
||||
'mocks'
|
||||
);
|
||||
|
||||
// Model spec
|
||||
renderTemplate(
|
||||
templatesDir,
|
||||
'model-entity.spec.mustache',
|
||||
modelViewData,
|
||||
path.join(outputDir, 'entities/models', `${toCamelCase(baseName)}.model.spec.ts`),
|
||||
generatedCount,
|
||||
'specs'
|
||||
);
|
||||
|
||||
// Mapper spec
|
||||
renderTemplate(
|
||||
templatesDir,
|
||||
'mapper.spec.mustache',
|
||||
mapperViewData,
|
||||
path.join(outputDir, 'data/mappers', `${toCamelCase(baseName)}.mapper.spec.ts`),
|
||||
generatedCount,
|
||||
'specs'
|
||||
);
|
||||
});
|
||||
|
||||
// 2. Generate Use Cases and Repositories from Paths/Tags
|
||||
@@ -227,7 +248,8 @@ export function generateCleanArchitecture(
|
||||
paramName: p.name,
|
||||
dataType: mapSwaggerTypeToTs(p.schema?.type || ''),
|
||||
description: p.description || '',
|
||||
required: p.required
|
||||
required: p.required,
|
||||
testValue: resolveTestParamValue(mapSwaggerTypeToTs(p.schema?.type || ''))
|
||||
}));
|
||||
|
||||
if (op.requestBody) {
|
||||
@@ -241,14 +263,19 @@ export function generateCleanArchitecture(
|
||||
paramName: 'body',
|
||||
dataType: bodyType,
|
||||
description: op.requestBody.description || '',
|
||||
required: true
|
||||
required: true,
|
||||
testValue: resolveTestParamValue(bodyType)
|
||||
});
|
||||
}
|
||||
|
||||
let returnType = 'void';
|
||||
let returnBaseType = 'void';
|
||||
let isListContainer = false;
|
||||
const responseSchema = op.responses?.['200']?.content?.['application/json']?.schema;
|
||||
const successCode = ['200', '201', '202', '203'].find((code) => op.responses?.[code]);
|
||||
const responseSchema =
|
||||
successCode !== undefined
|
||||
? op.responses?.[successCode]?.content?.['application/json']?.schema
|
||||
: undefined;
|
||||
if (responseSchema) {
|
||||
if (responseSchema.$ref) {
|
||||
returnType = responseSchema.$ref.split('/').pop() || 'unknown';
|
||||
@@ -260,25 +287,31 @@ export function generateCleanArchitecture(
|
||||
}
|
||||
}
|
||||
|
||||
const hasQueryParams = (op.parameters || []).some((p) => p.in === 'query');
|
||||
const hasBodyParam = !!op.requestBody;
|
||||
|
||||
tagsMap[tag].push({
|
||||
nickname: op.operationId || `${method}${pathKey.replace(/\//g, '_')}`,
|
||||
summary: op.summary || '',
|
||||
notes: op.description || '',
|
||||
httpMethod: method.toLowerCase(),
|
||||
uppercaseHttpMethod: method.toUpperCase(),
|
||||
path: pathKey,
|
||||
allParams: allParams.map((p, i: number) => ({
|
||||
...p,
|
||||
'-last': i === allParams.length - 1
|
||||
})),
|
||||
hasQueryParams: (op.parameters || []).some((p) => p.in === 'query'),
|
||||
hasQueryParams,
|
||||
queryParams: (op.parameters || [])
|
||||
.filter((p) => p.in === 'query')
|
||||
.map((p, i: number, arr: unknown[]) => ({
|
||||
paramName: p.name,
|
||||
'-last': i === arr.length - 1
|
||||
})),
|
||||
hasBodyParam: !!op.requestBody,
|
||||
hasBodyParam,
|
||||
bodyParam: 'body',
|
||||
hasOptions: hasQueryParams || hasBodyParam,
|
||||
hasBothParamsAndBody: hasQueryParams && hasBodyParam,
|
||||
returnType: returnType !== 'void' ? returnType : false,
|
||||
returnBaseType: returnBaseType !== 'void' ? returnBaseType : false,
|
||||
returnTypeVarName: returnType !== 'void' ? toCamelCase(returnType) : false,
|
||||
@@ -438,10 +471,30 @@ export function generateCleanArchitecture(
|
||||
generatedCount,
|
||||
'mocks'
|
||||
);
|
||||
|
||||
// Repository impl spec
|
||||
renderTemplate(
|
||||
templatesDir,
|
||||
'api.repository.impl.spec.mustache',
|
||||
apiViewData,
|
||||
path.join(outputDir, 'data/repositories', `${toCamelCase(tag)}.repository.impl.spec.ts`),
|
||||
generatedCount,
|
||||
'specs'
|
||||
);
|
||||
|
||||
// Use-cases impl spec
|
||||
renderTemplate(
|
||||
templatesDir,
|
||||
'api.use-cases.impl.spec.mustache',
|
||||
apiViewData,
|
||||
path.join(outputDir, 'domain/use-cases', `${toCamelCase(tag)}.use-cases.impl.spec.ts`),
|
||||
generatedCount,
|
||||
'specs'
|
||||
);
|
||||
});
|
||||
|
||||
logSuccess(
|
||||
`${generatedCount.models} Models, ${generatedCount.repositories} Repos, ${generatedCount.useCases} Use Cases, ${generatedCount.mappers} Mappers, ${generatedCount.providers} Providers, ${generatedCount.mocks} Mocks generated`
|
||||
`${generatedCount.models} Models, ${generatedCount.repositories} Repos, ${generatedCount.useCases} Use Cases, ${generatedCount.mappers} Mappers, ${generatedCount.providers} Providers, ${generatedCount.mocks} Mocks, ${generatedCount.specs} Specs generated`
|
||||
);
|
||||
return generatedCount;
|
||||
}
|
||||
@@ -461,5 +514,24 @@ function renderTemplate(
|
||||
const output = mustache.render(template, viewData);
|
||||
fs.writeFileSync(destPath, output);
|
||||
counter[key]++;
|
||||
logDetail(
|
||||
'generate',
|
||||
`${templateName.replace('.mustache', '')} → ${path.relative(process.cwd(), destPath)}`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
/** Resolves a simple test value literal for a given TypeScript type. */
|
||||
function resolveTestParamValue(dataType: string): string {
|
||||
switch (dataType) {
|
||||
case 'string':
|
||||
return "'test'";
|
||||
case 'number':
|
||||
return '1';
|
||||
case 'boolean':
|
||||
return 'true';
|
||||
default:
|
||||
if (dataType.endsWith('[]')) return '[]';
|
||||
return '{} as any';
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import { execSync } from 'child_process';
|
||||
import fs from 'fs-extra';
|
||||
import path from 'path';
|
||||
import { logStep, logSuccess, logError, logInfo } from '../utils/logger';
|
||||
import { logStep, logSuccess, logError, logDetail } from '../utils/logger';
|
||||
|
||||
/** Invokes `openapi-generator-cli` to generate DTOs into a temporary directory. */
|
||||
export function generateCode(swaggerFile: string, templatesDir: string): string {
|
||||
@@ -22,7 +22,7 @@ export function generateCode(swaggerFile: string, templatesDir: string): string
|
||||
-o "${tempDir}" \
|
||||
--additional-properties=ngVersion=17.0.0,modelFileSuffix=.dto,modelNameSuffix=Dto`;
|
||||
|
||||
execSync(command, { stdio: 'inherit' });
|
||||
execSync(command, { stdio: 'pipe' });
|
||||
logSuccess('Code generated successfully');
|
||||
|
||||
return tempDir;
|
||||
@@ -51,10 +51,9 @@ export function organizeFiles(tempDir: string, outputDir: string): void {
|
||||
files.forEach((file) => {
|
||||
const sourcePath = path.join(sourceDir, file);
|
||||
const destPath = path.join(destDir, file);
|
||||
|
||||
fs.copySync(sourcePath, destPath);
|
||||
filesMoved++;
|
||||
logInfo(` ${file} → ${path.relative(process.cwd(), destPath)}`);
|
||||
logDetail('dto', `${file} → ${path.relative(process.cwd(), destPath)}`);
|
||||
});
|
||||
}
|
||||
|
||||
@@ -119,7 +118,7 @@ export function addDtoImports(outputDir: string): void {
|
||||
if (content !== originalContent) {
|
||||
fs.writeFileSync(filePath, content);
|
||||
filesProcessed++;
|
||||
logInfo(` Procesado ${file}`);
|
||||
logDetail('dto', `Post-processed ${file} (added ${imports.length} import(s))`);
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import fs from 'fs-extra';
|
||||
import path from 'path';
|
||||
import { spawnSync } from 'child_process';
|
||||
import { logStep, logSuccess, logWarning, logInfo } from '../utils/logger';
|
||||
import { logStep, logSuccess, logWarning, logDetail } from '../utils/logger';
|
||||
import type { LintResult } from '../types';
|
||||
|
||||
/**
|
||||
* Walks up the directory tree from `startDir` to find the nearest
|
||||
@@ -36,17 +37,19 @@ function collectTsFiles(dir: string): string[] {
|
||||
}
|
||||
|
||||
/**
|
||||
* Runs a command synchronously and returns whether it succeeded.
|
||||
* Prints stdout/stderr to the console only on failure.
|
||||
* Runs a command synchronously. Only prints to console on fatal failure (exit >= 2).
|
||||
* Exit code 1 from ESLint means "warnings remain after --fix" — not a fatal error.
|
||||
* Returns captured output for logging to file.
|
||||
*/
|
||||
function run(cmd: string, args: string[], cwd: string): boolean {
|
||||
function run(cmd: string, args: string[], cwd: string): { success: boolean; output: string } {
|
||||
const result = spawnSync(cmd, args, { cwd, encoding: 'utf8', shell: true });
|
||||
if (result.status !== 0) {
|
||||
const output = [result.stdout, result.stderr].filter(Boolean).join('\n').trim();
|
||||
const fatalError = result.status === null || result.status >= 2;
|
||||
if (fatalError) {
|
||||
if (result.stderr) process.stderr.write(result.stderr);
|
||||
if (result.stdout) process.stdout.write(result.stdout);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
return { success: !fatalError, output };
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -56,28 +59,39 @@ function run(cmd: string, args: string[], cwd: string): boolean {
|
||||
*
|
||||
* - Prettier: always attempted; logs a warning if not found.
|
||||
* - ESLint: optional; silently skipped if no config is found in the project root.
|
||||
*
|
||||
* Returns a `LintResult` with the outcome of each tool for inclusion in the report.
|
||||
*/
|
||||
export function lintGeneratedFiles(outputDir: string): void {
|
||||
export function lintGeneratedFiles(outputDir: string): LintResult {
|
||||
logStep('Linting generated files...');
|
||||
|
||||
const result: LintResult = {
|
||||
prettier: { ran: false, filesFormatted: 0 },
|
||||
eslint: { ran: false, filesFixed: 0 }
|
||||
};
|
||||
|
||||
const projectRoot = findProjectRoot(outputDir);
|
||||
if (!projectRoot) {
|
||||
logWarning('Could not locate a project root (package.json). Skipping lint.');
|
||||
return;
|
||||
return result;
|
||||
}
|
||||
logInfo(` Project root: ${projectRoot}`);
|
||||
|
||||
const files = collectTsFiles(outputDir);
|
||||
if (files.length === 0) {
|
||||
logWarning('No TypeScript files found in output directory. Skipping lint.');
|
||||
return;
|
||||
return result;
|
||||
}
|
||||
|
||||
logDetail('lint', `Project root: ${projectRoot}`);
|
||||
logDetail('lint', `Files to process: ${files.length}`);
|
||||
|
||||
const relativePaths = files.map((f) => path.relative(projectRoot, f));
|
||||
|
||||
// --- Prettier ---
|
||||
const prettierOk = run('npx', ['prettier', '--write', ...relativePaths], projectRoot);
|
||||
if (prettierOk) {
|
||||
const prettier = run('npx', ['prettier', '--write', ...relativePaths], projectRoot);
|
||||
if (prettier.output) logDetail('prettier', prettier.output);
|
||||
if (prettier.success) {
|
||||
result.prettier = { ran: true, filesFormatted: files.length };
|
||||
logSuccess(`Prettier formatted ${files.length} files`);
|
||||
} else {
|
||||
logWarning('Prettier not available or encountered errors. Skipping formatting.');
|
||||
@@ -94,13 +108,17 @@ export function lintGeneratedFiles(outputDir: string): void {
|
||||
|
||||
if (!hasEslintConfig) {
|
||||
logWarning('No ESLint config found in project root. Skipping ESLint fix.');
|
||||
return;
|
||||
return result;
|
||||
}
|
||||
|
||||
const eslintOk = run('npx', ['eslint', '--fix', ...relativePaths], projectRoot);
|
||||
if (eslintOk) {
|
||||
const eslint = run('npx', ['eslint', '--fix', ...relativePaths], projectRoot);
|
||||
if (eslint.output) logDetail('eslint', eslint.output);
|
||||
if (eslint.success) {
|
||||
result.eslint = { ran: true, filesFixed: files.length };
|
||||
logSuccess(`ESLint fixed ${files.length} files`);
|
||||
} else {
|
||||
logWarning('ESLint reported errors that could not be auto-fixed. Review the output above.');
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import fs from 'fs-extra';
|
||||
import path from 'path';
|
||||
import { logStep, logSuccess } from '../utils/logger';
|
||||
import type { SwaggerAnalysis, GenerationReport } from '../types';
|
||||
import type { SwaggerAnalysis, GenerationReport, LintResult } from '../types';
|
||||
|
||||
/** Counts files ending with `.mock.ts` in a directory (returns 0 if directory does not exist). */
|
||||
function countMockFiles(dir: string): number {
|
||||
@@ -12,15 +12,42 @@ function countMockFiles(dir: string): number {
|
||||
}
|
||||
}
|
||||
|
||||
/** Counts files ending with `.spec.ts` in a directory (returns 0 if directory does not exist). */
|
||||
function countSpecFiles(dir: string): number {
|
||||
try {
|
||||
return fs.readdirSync(dir).filter((f) => f.endsWith('.spec.ts')).length;
|
||||
} catch {
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
/** Generates and persists the `generation-report.json` file with process statistics. */
|
||||
export function generateReport(outputDir: string, analysis: SwaggerAnalysis): GenerationReport {
|
||||
export function generateReport(
|
||||
outputDir: string,
|
||||
analysis: SwaggerAnalysis,
|
||||
lintResult: LintResult
|
||||
): GenerationReport {
|
||||
logStep('Generating report...');
|
||||
|
||||
const tags = Array.isArray(analysis.tags) ? analysis.tags : [];
|
||||
const tagDetails = tags.map((tag: unknown) => {
|
||||
const t = tag as { name: string; description?: string };
|
||||
const endpointCount = Object.values(analysis.paths).filter((pathObj) =>
|
||||
Object.values(pathObj as Record<string, unknown>).some((op) => {
|
||||
const operation = op as { tags?: string[] };
|
||||
return operation.tags?.includes(t.name);
|
||||
})
|
||||
).length;
|
||||
return { name: t.name, description: t.description || '', endpoints: endpointCount };
|
||||
});
|
||||
|
||||
const report: GenerationReport = {
|
||||
timestamp: new Date().toISOString(),
|
||||
tags: analysis.tags.length,
|
||||
endpoints: Object.keys(analysis.paths).length,
|
||||
tagDetails,
|
||||
outputDirectory: outputDir,
|
||||
linting: lintResult,
|
||||
structure: {
|
||||
dtos: fs.readdirSync(path.join(outputDir, 'data/dtos')).length,
|
||||
repositories: fs.readdirSync(path.join(outputDir, 'data/repositories')).length,
|
||||
@@ -35,7 +62,12 @@ export function generateReport(outputDir: string, analysis: SwaggerAnalysis): Ge
|
||||
countMockFiles(path.join(outputDir, 'di/repositories')) +
|
||||
countMockFiles(path.join(outputDir, 'di/use-cases')) +
|
||||
countMockFiles(path.join(outputDir, 'domain/use-cases')) +
|
||||
countMockFiles(path.join(outputDir, 'entities/models'))
|
||||
countMockFiles(path.join(outputDir, 'entities/models')),
|
||||
specs:
|
||||
countSpecFiles(path.join(outputDir, 'entities/models')) +
|
||||
countSpecFiles(path.join(outputDir, 'data/mappers')) +
|
||||
countSpecFiles(path.join(outputDir, 'data/repositories')) +
|
||||
countSpecFiles(path.join(outputDir, 'domain/use-cases'))
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import fs from 'fs-extra';
|
||||
import yaml from 'js-yaml';
|
||||
import { logStep, logInfo, logError } from '../utils/logger';
|
||||
import { logStep, logSuccess, logError, logDetail } from '../utils/logger';
|
||||
import type { SwaggerAnalysis } from '../types';
|
||||
|
||||
/** Parses an OpenAPI/Swagger file and extracts tags, paths and the full document. */
|
||||
@@ -14,14 +14,15 @@ export function analyzeSwagger(swaggerFile: string): SwaggerAnalysis {
|
||||
const tags = Array.isArray(swagger.tags) ? swagger.tags : [];
|
||||
const paths = (swagger.paths as Record<string, unknown>) || {};
|
||||
|
||||
logInfo(`Found ${tags.length} tags in the API`);
|
||||
logInfo(`Found ${Object.keys(paths).length} endpoints`);
|
||||
|
||||
logDetail('analyze', `Input: ${swaggerFile}`);
|
||||
logDetail('analyze', `Found ${tags.length} tags, ${Object.keys(paths).length} endpoints`);
|
||||
tags.forEach((tag: unknown) => {
|
||||
const t = tag as { name: string; description?: string };
|
||||
logInfo(` - ${t.name}: ${t.description || 'No description'}`);
|
||||
logDetail('analyze', ` - ${t.name}: ${t.description || 'No description'}`);
|
||||
});
|
||||
|
||||
logSuccess(`${tags.length} tags, ${Object.keys(paths).length} endpoints found`);
|
||||
|
||||
return { tags, paths, swagger };
|
||||
} catch (error: unknown) {
|
||||
const err = error as Error;
|
||||
|
||||
@@ -8,6 +8,24 @@ export interface GeneratedCount {
|
||||
useCases: number;
|
||||
providers: number;
|
||||
mocks: number;
|
||||
specs: number;
|
||||
}
|
||||
|
||||
/**
|
||||
* Result returned by the lint/format step.
|
||||
*/
|
||||
export interface LintResult {
|
||||
prettier: { ran: boolean; filesFormatted: number };
|
||||
eslint: { ran: boolean; filesFixed: number };
|
||||
}
|
||||
|
||||
/**
|
||||
* Per-tag summary included in the generation report.
|
||||
*/
|
||||
export interface TagDetail {
|
||||
name: string;
|
||||
description: string;
|
||||
endpoints: number;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -17,7 +35,9 @@ export interface GenerationReport {
|
||||
timestamp: string;
|
||||
tags: number;
|
||||
endpoints: number;
|
||||
tagDetails: TagDetail[];
|
||||
outputDirectory: string;
|
||||
linting: LintResult;
|
||||
structure: {
|
||||
dtos: number;
|
||||
repositories: number;
|
||||
@@ -25,5 +45,6 @@ export interface GenerationReport {
|
||||
useCases: number;
|
||||
providers: number;
|
||||
mocks: number;
|
||||
specs: number;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -96,6 +96,7 @@ export interface TagOperationParam {
|
||||
description: string;
|
||||
required: boolean;
|
||||
'-last': boolean;
|
||||
testValue?: string;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -107,12 +108,15 @@ export interface TagOperation {
|
||||
summary: string;
|
||||
notes: string;
|
||||
httpMethod: string;
|
||||
uppercaseHttpMethod: string;
|
||||
path: string;
|
||||
allParams: TagOperationParam[];
|
||||
hasQueryParams: boolean;
|
||||
queryParams: unknown[];
|
||||
hasBodyParam: boolean;
|
||||
bodyParam: string;
|
||||
hasOptions: boolean;
|
||||
hasBothParamsAndBody: boolean;
|
||||
returnType: string | boolean;
|
||||
returnBaseType: string | boolean;
|
||||
returnTypeVarName: string | boolean;
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
import fs from 'fs-extra';
|
||||
|
||||
const colors = {
|
||||
reset: '\x1b[0m',
|
||||
bright: '\x1b[1m',
|
||||
@@ -10,6 +12,21 @@ const colors = {
|
||||
|
||||
type Color = keyof typeof colors;
|
||||
|
||||
let _logFilePath: string | null = null;
|
||||
|
||||
/** Initialises the generation log file, overwriting any previous run. */
|
||||
export function initGenerationLog(filePath: string): void {
|
||||
_logFilePath = filePath;
|
||||
fs.writeFileSync(filePath, `Generation log — ${new Date().toISOString()}\n${'='.repeat(60)}\n`);
|
||||
}
|
||||
|
||||
/** Writes a detailed entry to the generation log file (not to console). */
|
||||
export function logDetail(category: string, message: string): void {
|
||||
if (!_logFilePath) return;
|
||||
const line = `[${new Date().toISOString()}] [${category.toUpperCase().padEnd(8)}] ${message}\n`;
|
||||
fs.appendFileSync(_logFilePath, line);
|
||||
}
|
||||
|
||||
/** Prints a console message with the given ANSI colour. */
|
||||
export function log(message: string, color: Color = 'reset'): void {
|
||||
console.log(`${colors[color]}${message}${colors.reset}`);
|
||||
|
||||
@@ -32,26 +32,20 @@ export class {{classname}}RepositoryImpl extends MRepository implements {{classn
|
||||
{{#operation}}
|
||||
{{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{{dataType}}}{{^-last}}, {{/-last}}{{/allParams}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
|
||||
{{#isListContainer}}
|
||||
return this.{{httpMethod}}<{{{returnBaseType}}}Dto>('{{path}}'{{#hasQueryParams}}, {
|
||||
params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }
|
||||
}{{/hasQueryParams}}{{#hasBodyParam}}, {{bodyParam}}{{/hasBodyParam}})
|
||||
return this.{{httpMethod}}<{{{returnBaseType}}}Dto>('{{path}}'{{#hasOptions}}, { {{#hasQueryParams}}params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }{{/hasQueryParams}}{{#hasBothParamsAndBody}}, {{/hasBothParamsAndBody}}{{#hasBodyParam}}body{{/hasBodyParam}} }{{/hasOptions}})
|
||||
.pipe(
|
||||
map((response) => response.{{#vendorExtensions}}{{x-response-property}}{{/vendorExtensions}}{{^vendorExtensions}}items{{/vendorExtensions}}.map({{{returnBaseTypeVarName}}}Mapper))
|
||||
);
|
||||
{{/isListContainer}}
|
||||
{{^isListContainer}}
|
||||
{{#returnType}}
|
||||
return this.{{httpMethod}}<{{{returnType}}}Dto>('{{path}}'{{#hasQueryParams}}, {
|
||||
params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }
|
||||
}{{/hasQueryParams}}{{#hasBodyParam}}, {{bodyParam}}{{/hasBodyParam}})
|
||||
return this.{{httpMethod}}<{{{returnType}}}Dto>('{{path}}'{{#hasOptions}}, { {{#hasQueryParams}}params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }{{/hasQueryParams}}{{#hasBothParamsAndBody}}, {{/hasBothParamsAndBody}}{{#hasBodyParam}}body{{/hasBodyParam}} }{{/hasOptions}})
|
||||
.pipe(
|
||||
map({{{returnTypeVarName}}}Mapper)
|
||||
);
|
||||
{{/returnType}}
|
||||
{{^returnType}}
|
||||
return this.{{httpMethod}}<void>('{{path}}'{{#hasQueryParams}}, {
|
||||
params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }
|
||||
}{{/hasQueryParams}}{{#hasBodyParam}}, {{bodyParam}}{{/hasBodyParam}});
|
||||
return this.{{httpMethod}}<void>('{{path}}'{{#hasOptions}}, { {{#hasQueryParams}}params: { {{#queryParams}}{{paramName}}{{^-last}}, {{/-last}}{{/queryParams}} }{{/hasQueryParams}}{{#hasBothParamsAndBody}}, {{/hasBothParamsAndBody}}{{#hasBodyParam}}body{{/hasBodyParam}} }{{/hasOptions}});
|
||||
{{/returnType}}
|
||||
{{/isListContainer}}
|
||||
}
|
||||
|
||||
97
templates/api.repository.impl.spec.mustache
Normal file
97
templates/api.repository.impl.spec.mustache
Normal file
@@ -0,0 +1,97 @@
|
||||
{{#apiInfo}}
|
||||
{{#apis}}
|
||||
{{#operations}}
|
||||
import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
|
||||
import { {{classname}}RepositoryImpl } from './{{classFilename}}.repository.impl';
|
||||
{{#returnImports}}
|
||||
import { mock{{classname}}Dto } from '@/dtos/{{classFilename}}.dto.mock';
|
||||
import { mock{{classname}}Model } from '@/entities/models/{{classFilename}}.model.mock';
|
||||
{{/returnImports}}
|
||||
|
||||
describe('{{classname}}RepositoryImpl', () => {
|
||||
let repository: {{classname}}RepositoryImpl;
|
||||
let httpMock: HttpTestingController;
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [HttpClientTestingModule],
|
||||
providers: [{{classname}}RepositoryImpl]
|
||||
});
|
||||
|
||||
repository = TestBed.inject({{classname}}RepositoryImpl);
|
||||
httpMock = TestBed.inject(HttpTestingController);
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
httpMock.verify();
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
expect(repository).toBeTruthy();
|
||||
});
|
||||
|
||||
{{#operation}}
|
||||
describe('{{nickname}}', () => {
|
||||
it('should perform a {{uppercaseHttpMethod}} request', () => {
|
||||
repository.{{nickname}}({{#allParams}}{{{testValue}}}{{^-last}}, {{/-last}}{{/allParams}}).subscribe();
|
||||
|
||||
const req = httpMock.expectOne((r) => r.method === '{{uppercaseHttpMethod}}');
|
||||
expect(req.request.method).toBe('{{uppercaseHttpMethod}}');
|
||||
{{#isListContainer}}
|
||||
req.flush({ items: [mock{{returnBaseType}}Dto()] });
|
||||
{{/isListContainer}}
|
||||
{{^isListContainer}}
|
||||
{{#returnType}}
|
||||
req.flush(mock{{returnBaseType}}Dto());
|
||||
{{/returnType}}
|
||||
{{^returnType}}
|
||||
req.flush(null);
|
||||
{{/returnType}}
|
||||
{{/isListContainer}}
|
||||
});
|
||||
|
||||
{{#returnType}}
|
||||
it('should map the response to the domain model', () => {
|
||||
const dto = mock{{returnBaseType}}Dto();
|
||||
const expectedModel = mock{{returnBaseType}}Model();
|
||||
|
||||
{{#isListContainer}}
|
||||
repository.{{nickname}}({{#allParams}}{{{testValue}}}{{^-last}}, {{/-last}}{{/allParams}}).subscribe((result) => {
|
||||
expect(result).toBeTruthy();
|
||||
expect(result.length).toBeGreaterThan(0);
|
||||
});
|
||||
|
||||
httpMock.expectOne((r) => r.method === '{{uppercaseHttpMethod}}').flush({ items: [dto] });
|
||||
{{/isListContainer}}
|
||||
{{^isListContainer}}
|
||||
repository.{{nickname}}({{#allParams}}{{{testValue}}}{{^-last}}, {{/-last}}{{/allParams}}).subscribe((result) => {
|
||||
expect(result).toEqual(expectedModel);
|
||||
});
|
||||
|
||||
httpMock.expectOne((r) => r.method === '{{uppercaseHttpMethod}}').flush(dto);
|
||||
{{/isListContainer}}
|
||||
});
|
||||
|
||||
{{/returnType}}
|
||||
it('should propagate HTTP errors', (done) => {
|
||||
repository.{{nickname}}({{#allParams}}{{{testValue}}}{{^-last}}, {{/-last}}{{/allParams}}).subscribe({
|
||||
error: (err) => {
|
||||
expect(err.status).toBe(500);
|
||||
done();
|
||||
}
|
||||
});
|
||||
|
||||
httpMock
|
||||
.expectOne((r) => r.method === '{{uppercaseHttpMethod}}')
|
||||
.flush('Internal Server Error', { status: 500, statusText: 'Internal Server Error' });
|
||||
});
|
||||
});
|
||||
|
||||
{{/operation}}
|
||||
});
|
||||
|
||||
{{/operations}}
|
||||
{{/apis}}
|
||||
{{/apiInfo}}
|
||||
91
templates/api.use-cases.impl.spec.mustache
Normal file
91
templates/api.use-cases.impl.spec.mustache
Normal file
@@ -0,0 +1,91 @@
|
||||
{{#apiInfo}}
|
||||
{{#apis}}
|
||||
{{#operations}}
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { of } from 'rxjs';
|
||||
|
||||
import { {{classname}}UseCasesImpl } from './{{classFilename}}.use-cases.impl';
|
||||
|
||||
import { {{constantName}}_REPOSITORY, {{classname}}Repository } from '@/domain/repositories/{{classFilename}}.repository.contract';
|
||||
{{#returnImports}}
|
||||
import { mock{{classname}}Model } from '@/entities/models/{{classFilename}}.model.mock';
|
||||
{{/returnImports}}
|
||||
|
||||
describe('{{classname}}UseCasesImpl', () => {
|
||||
let useCase: {{classname}}UseCasesImpl;
|
||||
let mockRepository: jasmine.SpyObj<{{classname}}Repository>;
|
||||
|
||||
beforeEach(() => {
|
||||
mockRepository = jasmine.createSpyObj('{{classname}}Repository', [{{#operation}}'{{nickname}}', {{/operation}}]);
|
||||
|
||||
TestBed.configureTestingModule({
|
||||
providers: [
|
||||
{{classname}}UseCasesImpl,
|
||||
{ provide: {{constantName}}_REPOSITORY, useValue: mockRepository }
|
||||
]
|
||||
});
|
||||
|
||||
useCase = TestBed.inject({{classname}}UseCasesImpl);
|
||||
});
|
||||
|
||||
it('should be created', () => {
|
||||
expect(useCase).toBeTruthy();
|
||||
});
|
||||
|
||||
{{#operation}}
|
||||
describe('{{nickname}}', () => {
|
||||
it('should delegate to the repository', () => {
|
||||
{{#isListContainer}}
|
||||
mockRepository.{{nickname}}.and.returnValue(of([mock{{returnBaseType}}Model()]));
|
||||
{{/isListContainer}}
|
||||
{{^isListContainer}}
|
||||
{{#returnBaseType}}
|
||||
mockRepository.{{nickname}}.and.returnValue(of(mock{{returnBaseType}}Model()));
|
||||
{{/returnBaseType}}
|
||||
{{^returnBaseType}}
|
||||
mockRepository.{{nickname}}.and.returnValue(of(undefined));
|
||||
{{/returnBaseType}}
|
||||
{{/isListContainer}}
|
||||
|
||||
useCase.{{nickname}}({{#allParams}}{{{testValue}}}{{^-last}}, {{/-last}}{{/allParams}});
|
||||
|
||||
expect(mockRepository.{{nickname}}).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('should return the observable from the repository', (done) => {
|
||||
{{#isListContainer}}
|
||||
const expected = [mock{{returnBaseType}}Model()];
|
||||
mockRepository.{{nickname}}.and.returnValue(of(expected));
|
||||
|
||||
useCase.{{nickname}}({{#allParams}}{{{testValue}}}{{^-last}}, {{/-last}}{{/allParams}}).subscribe((result) => {
|
||||
expect(result).toEqual(expected);
|
||||
done();
|
||||
});
|
||||
{{/isListContainer}}
|
||||
{{^isListContainer}}
|
||||
{{#returnBaseType}}
|
||||
const expected = mock{{returnBaseType}}Model();
|
||||
mockRepository.{{nickname}}.and.returnValue(of(expected));
|
||||
|
||||
useCase.{{nickname}}({{#allParams}}{{{testValue}}}{{^-last}}, {{/-last}}{{/allParams}}).subscribe((result) => {
|
||||
expect(result).toEqual(expected);
|
||||
done();
|
||||
});
|
||||
{{/returnBaseType}}
|
||||
{{^returnBaseType}}
|
||||
mockRepository.{{nickname}}.and.returnValue(of(undefined));
|
||||
|
||||
useCase.{{nickname}}({{#allParams}}{{{testValue}}}{{^-last}}, {{/-last}}{{/allParams}}).subscribe({
|
||||
complete: () => done()
|
||||
});
|
||||
{{/returnBaseType}}
|
||||
{{/isListContainer}}
|
||||
});
|
||||
});
|
||||
|
||||
{{/operation}}
|
||||
});
|
||||
|
||||
{{/operations}}
|
||||
{{/apis}}
|
||||
{{/apiInfo}}
|
||||
39
templates/mapper.spec.mustache
Normal file
39
templates/mapper.spec.mustache
Normal file
@@ -0,0 +1,39 @@
|
||||
{{#models}}
|
||||
{{#model}}
|
||||
import { {{classVarName}}Mapper } from './{{classFilename}}.mapper';
|
||||
|
||||
import { mock{{classname}}Dto } from '@/dtos/{{classFilename}}.dto.mock';
|
||||
import { {{classname}} } from '@/entities/models/{{classFilename}}.model';
|
||||
|
||||
describe('{{classVarName}}Mapper', () => {
|
||||
{{#vars}}
|
||||
it('should map {{name}} from DTO to model', () => {
|
||||
const dto = mock{{classname}}Dto();
|
||||
|
||||
const result = {{classVarName}}Mapper(dto);
|
||||
|
||||
expect(result.{{name}}).toBe(dto.{{name}});
|
||||
});
|
||||
|
||||
{{/vars}}
|
||||
it('should return an instance of {{classname}}', () => {
|
||||
const dto = mock{{classname}}Dto();
|
||||
|
||||
const result = {{classVarName}}Mapper(dto);
|
||||
|
||||
expect(result).toBeInstanceOf({{classname}});
|
||||
});
|
||||
|
||||
it('should map all fields correctly from a complete DTO', () => {
|
||||
const dto = mock{{classname}}Dto();
|
||||
|
||||
const result = {{classVarName}}Mapper(dto);
|
||||
|
||||
{{#vars}}
|
||||
expect(result.{{name}}).toBe(dto.{{name}});
|
||||
{{/vars}}
|
||||
});
|
||||
});
|
||||
|
||||
{{/model}}
|
||||
{{/models}}
|
||||
34
templates/model-entity.spec.mustache
Normal file
34
templates/model-entity.spec.mustache
Normal file
@@ -0,0 +1,34 @@
|
||||
{{#models}}
|
||||
{{#model}}
|
||||
import { {{classname}} } from './{{classFilename}}.model';
|
||||
import { mock{{classname}}Model } from './{{classFilename}}.model.mock';
|
||||
|
||||
describe('{{classname}}', () => {
|
||||
it('should create an instance', () => {
|
||||
const model = new {{classname}}();
|
||||
|
||||
expect(model).toBeInstanceOf({{classname}});
|
||||
});
|
||||
|
||||
{{#vars}}
|
||||
it('should allow setting {{name}}', () => {
|
||||
const model = new {{classname}}();
|
||||
const expected = mock{{classname}}Model();
|
||||
model.{{name}} = expected.{{name}};
|
||||
|
||||
expect(model.{{name}}).toBe(expected.{{name}});
|
||||
});
|
||||
|
||||
{{/vars}}
|
||||
it('should build a valid model from mock', () => {
|
||||
const model = mock{{classname}}Model();
|
||||
|
||||
expect(model).toBeInstanceOf({{classname}});
|
||||
{{#vars}}
|
||||
expect(model.{{name}}).toBeDefined();
|
||||
{{/vars}}
|
||||
});
|
||||
});
|
||||
|
||||
{{/model}}
|
||||
{{/models}}
|
||||
Reference in New Issue
Block a user