Skip to content

Fix typescript-node generation when only models are generated #7127

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

Merged
macjohnny merged 13 commits into from
Aug 28, 2020
Merged

Fix typescript-node generation when only models are generated #7127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c66f811
add model/index.ts
sarumont Aug 4, 2020
936b764
update samples
sarumont Aug 4, 2020
fe55d19
Back out models/index.ts
sarumont Aug 4, 2020
08e724e
Merge remote-tracking branch 'upstream/master'
sarumont Aug 5, 2020
88419f1
for some reason, Symfony isn't up to date
sarumont Aug 5, 2020
989fd99
Merge remote-tracking branch 'upstream/master'
sarumont Aug 17, 2020
478ea53
reverts changes to php-symfony sample
sarumont Aug 18, 2020
8092906
Merge remote-tracking branch 'upstream/master'
sarumont Aug 18, 2020
9e8de1d
Merge remote-tracking branch 'upstream/master'
sarumont Aug 25, 2020
ac4b68c
moves comment to mustache comment rather than TS comment
sarumont Aug 28, 2020
2f2cd68
Merge remote-tracking branch 'upstream/master'
sarumont Aug 28, 2020
aa9b11c
removes stale files from samples (no longer generated)
sarumont Aug 28, 2020
043b744
updates samples
sarumont Aug 28, 2020
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
11 changes: 1 addition & 10 deletions modules/openapi-generator/src/main/resources/typescript-node/api-all.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { {{ classname }} } from './{{ classFilename }}';
export * from './{{ classFilename }}Interface'
{{/withInterfaces}}
{{/apis}}
import * as fs from 'fs';
import * as http from 'http';

export class HttpError extends Error {
Expand All @@ -18,15 +17,7 @@ export class HttpError extends Error {
}
}

export interface RequestDetailedFile {
value: Buffer;
options?: {
filename?: string;
contentType?: string;
}
}

export type RequestFile = string | Buffer | fs.ReadStream | RequestDetailedFile;
export { RequestFile } from '../model/models';

export const APIS = [{{#apis}}{{#operations}}{{ classname }}{{/operations}}{{^-last}}, {{/-last}}{{/apis}}];
{{/apiInfo}}
4 changes: 2 additions & 2 deletions modules/openapi-generator/src/main/resources/typescript-node/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{{>licenseInfo}}
{{#models}}
{{#model}}
import { RequestFile } from '../api';
import { RequestFile } from './models';
{{#tsImports}}
import { {{classname}} } from '{{filename}}';
{{/tsImports}}
Expand Down Expand Up @@ -78,4 +78,4 @@ export enum {{classname}} {
}
{{/isEnum}}
{{/model}}
{{/models}}
{{/models}}
20 changes: 19 additions & 1 deletion modules/openapi-generator/src/main/resources/typescript-node/models.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,27 @@
{{#generateApis}}
import localVarRequest from 'request';
{{/generateApis}}

{{#models}}
{{#model}}
export * from '{{{ classFilename }}}';
{{/model}}
{{/models}}

import localVarRequest from 'request';
import * as fs from 'fs';

export interface RequestDetailedFile {
value: Buffer;
options?: {
filename?: string;
contentType?: string;
}
}

export type RequestFile = string | Buffer | fs.ReadStream | RequestDetailedFile;

{{! Object serialization only relevant if generating APIs, too }}
{{#generateApis}}

{{#models}}
{{#model}}
Expand Down Expand Up @@ -235,3 +252,4 @@ export class VoidAuth implements Authentication {
}

export type Interceptor = (requestOptions: localVarRequest.Options) => (Promise<void> | void);
{{/generateApis}}
11 changes: 1 addition & 10 deletions samples/client/petstore/typescript-node/default/api/apis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export * from './storeApi';
import { StoreApi } from './storeApi';
export * from './userApi';
import { UserApi } from './userApi';
import * as fs from 'fs';
import * as http from 'http';

export class HttpError extends Error {
Expand All @@ -14,14 +13,6 @@ export class HttpError extends Error {
}
}

export interface RequestDetailedFile {
value: Buffer;
options?: {
filename?: string;
contentType?: string;
}
}

export type RequestFile = string | Buffer | fs.ReadStream | RequestDetailedFile;
export { RequestFile } from '../model/models';

export const APIS = [PetApi, StoreApi, UserApi];
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/default/model/apiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* Describes the result of uploading an image resource
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/default/model/category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* A category for a pet
Expand Down
15 changes: 14 additions & 1 deletion samples/client/petstore/typescript-node/default/model/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
import localVarRequest from 'request';

export * from './apiResponse';
export * from './category';
export * from './order';
export * from './pet';
export * from './tag';
export * from './user';

import localVarRequest from 'request';
import * as fs from 'fs';

export interface RequestDetailedFile {
value: Buffer;
options?: {
filename?: string;
contentType?: string;
}
}

export type RequestFile = string | Buffer | fs.ReadStream | RequestDetailedFile;


import { ApiResponse } from './apiResponse';
import { Category } from './category';
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/default/model/order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* An order for a pets from the pet store
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/default/model/pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';
import { Category } from './category';
import { Tag } from './tag';

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/default/model/tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* A tag for a pet
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/default/model/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* A User who is purchasing from the pet store
Expand Down
11 changes: 1 addition & 10 deletions samples/client/petstore/typescript-node/npm/api/apis.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ export * from './storeApi';
import { StoreApi } from './storeApi';
export * from './userApi';
import { UserApi } from './userApi';
import * as fs from 'fs';
import * as http from 'http';

export class HttpError extends Error {
Expand All @@ -14,14 +13,6 @@ export class HttpError extends Error {
}
}

export interface RequestDetailedFile {
value: Buffer;
options?: {
filename?: string;
contentType?: string;
}
}

export type RequestFile = string | Buffer | fs.ReadStream | RequestDetailedFile;
export { RequestFile } from '../model/models';

export const APIS = [PetApi, StoreApi, UserApi];
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/npm/model/apiResponse.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* Describes the result of uploading an image resource
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/npm/model/category.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* A category for a pet
Expand Down
15 changes: 14 additions & 1 deletion samples/client/petstore/typescript-node/npm/model/models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,24 @@
import localVarRequest from 'request';

export * from './apiResponse';
export * from './category';
export * from './order';
export * from './pet';
export * from './tag';
export * from './user';

import localVarRequest from 'request';
import * as fs from 'fs';

export interface RequestDetailedFile {
value: Buffer;
options?: {
filename?: string;
contentType?: string;
}
}

export type RequestFile = string | Buffer | fs.ReadStream | RequestDetailedFile;


import { ApiResponse } from './apiResponse';
import { Category } from './category';
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/npm/model/order.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* An order for a pets from the pet store
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/npm/model/pet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';
import { Category } from './category';
import { Tag } from './tag';

Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/npm/model/tag.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* A tag for a pet
Expand Down
2 changes: 1 addition & 1 deletion samples/client/petstore/typescript-node/npm/model/user.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* Do not edit the class manually.
*/

import { RequestFile } from '../api';
import { RequestFile } from './models';

/**
* A User who is purchasing from the pet store
Expand Down