Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(cli:sta): bump swagger-typescript-api to 3.x #1620

Closed
wants to merge 1 commit into from
Closed

feat(cli:sta): bump swagger-typescript-api to 3.x #1620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
"eslint-plugin-deprecation": "~1.4.1",
"lint-staged": "^13.2.3",
"raw-loader": "^4.0.2",
"swagger-typescript-api": "^12.0.4",
"swagger-typescript-api": "^13.0.0",
"sitemap": "^7.1.1"
},
"lint-staged": {
Expand Down
28 changes: 18 additions & 10 deletions schematics/sta/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { normalize } from '@angular-devkit/core';
import { ProjectDefinition } from '@angular-devkit/core/src/workspace';
import { Rule, SchematicsException, Tree, chain, SchematicContext } from '@angular-devkit/schematics';
import * as colors from 'ansi-colors';
import { rmdirSync, mkdirSync, existsSync, readFileSync } from 'fs';
import { rmSync, mkdirSync, existsSync, readFileSync } from 'fs';
import { parse } from 'jsonc-parser';
import { resolve, join } from 'path';
import { generateApi, GenerateApiOutput, GenerateApiParams } from 'swagger-typescript-api';
Expand Down Expand Up @@ -42,7 +42,7 @@ function addPathInTsConfig(name: string): Rule {

function cleanOutput(p: string): void {
try {
rmdirSync(p, { recursive: true });
rmSync(p, { recursive: true });
mkdirSync(p);
} catch (e) {}
}
Expand All @@ -61,28 +61,34 @@ function tagsMapping(res: GenerateApiOutput, config: STAConfig): void {
});
}

function fix(output: string, res: GenerateApiOutput, tree: Tree, context: SchematicContext, config: STAConfig): void {
async function fix(
output: string,
res: GenerateApiOutput,
tree: Tree,
context: SchematicContext,
config: STAConfig
): Promise<void> {
tagsMapping(res, config);
const indexList = [`models`, `_base.service`];
const basePath = normalize(join(project.root, output.replace(process.cwd(), '')));
try {
// definitions
const dataTpl = res.getTemplate({ name: 'dataContracts', fileName: 'data-contracts.eta' });
const dataContent = res.renderTemplate(dataTpl, { ...res.configuration });
tree.create(`${basePath}/models.ts`, filePrefix + res.formatTSContent(dataContent));
tree.create(`${basePath}/models.ts`, filePrefix + (await res.formatTSContent(dataContent)));

// Base Service
const baseServiceTpl = res.getTemplate({ name: 'baseService', fileName: 'base.service.eta' });
const baseServiceContent = res.renderTemplate(baseServiceTpl, { ...res.configuration });
tree.create(`${basePath}/_base.service.ts`, filePrefix + res.formatTSContent(baseServiceContent));
tree.create(`${basePath}/_base.service.ts`, filePrefix + (await res.formatTSContent(baseServiceContent)));

// Tag Service
const dtoTypeTpl = res.getTemplate({ name: 'dto-type', fileName: 'dto-type.eta' });
const serviceTpl = res.getTemplate({ name: 'service', fileName: 'service.eta' });
res.configuration.routes.combined.forEach(route => {
res.configuration.routes.combined.forEach(async route => {
const routeIndex: string[] = [];
// dto
const dtoContent = res.formatTSContent(
const dtoContent = await res.formatTSContent(
res.renderTemplate(dtoTypeTpl, {
...res.configuration,
route
Expand All @@ -98,7 +104,10 @@ function fix(output: string, res: GenerateApiOutput, tree: Tree, context: Schema
...res.configuration,
route
});
tree.create(`${basePath}/${route.moduleName}/service.ts`, filePrefix + res.formatTSContent(serviceContent));
tree.create(
`${basePath}/${route.moduleName}/service.ts`,
filePrefix + (await res.formatTSContent(serviceContent))
);
routeIndex.push(`service`);

// index.ts
Expand Down Expand Up @@ -200,8 +209,7 @@ function genProxy(config: STAConfig): Rule {
generateApi(options)
.then((res: GenerateApiOutput) => {
cleanOutput(output);
fix(output, res, tree, context, config);
resolve();
return fix(output, res, tree, context, config);
})
.catch(ex => {
throw new SchematicsException(`Generate error: ${ex}`);
Expand Down
Loading