@trayio/tray-openapi 0.0.1-beta
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/LICENSE.txt +22 -0
- package/README.md +39 -0
- package/dist/OpenApiCodecs.d.ts +5 -0
- package/dist/OpenApiCodecs.d.ts.map +1 -0
- package/dist/OpenApiCodecs.js +8 -0
- package/dist/OpenApiSchemaImporter.d.ts +17 -0
- package/dist/OpenApiSchemaImporter.d.ts.map +1 -0
- package/dist/OpenApiSchemaImporter.js +138 -0
- package/dist/OpenApiSchemaImporter.test.d.ts +2 -0
- package/dist/OpenApiSchemaImporter.test.d.ts.map +1 -0
- package/dist/OpenApiSchemaImporter.test.js +85 -0
- package/dist/OpenApiSchemaTransformer.d.ts +9 -0
- package/dist/OpenApiSchemaTransformer.d.ts.map +1 -0
- package/dist/OpenApiSchemaTransformer.js +68 -0
- package/dist/OpenApiSchemaTransformer.test.d.ts +2 -0
- package/dist/OpenApiSchemaTransformer.test.d.ts.map +1 -0
- package/dist/OpenApiSchemaTransformer.test.js +118 -0
- package/dist/OpenApiTypeDescriptors.d.ts +109 -0
- package/dist/OpenApiTypeDescriptors.d.ts.map +1 -0
- package/dist/OpenApiTypeDescriptors.js +107 -0
- package/dist/file-generators/GenerateHandler.d.ts +15 -0
- package/dist/file-generators/GenerateHandler.d.ts.map +1 -0
- package/dist/file-generators/GenerateHandler.js +110 -0
- package/dist/file-generators/GenerateHandler.test.d.ts +2 -0
- package/dist/file-generators/GenerateHandler.test.d.ts.map +1 -0
- package/dist/file-generators/GenerateHandler.test.js +427 -0
- package/dist/file-generators/GenerateHandlerTest.d.ts +9 -0
- package/dist/file-generators/GenerateHandlerTest.d.ts.map +1 -0
- package/dist/file-generators/GenerateHandlerTest.js +88 -0
- package/dist/file-generators/GenerateHandlerTest.test.d.ts +2 -0
- package/dist/file-generators/GenerateHandlerTest.test.d.ts.map +1 -0
- package/dist/file-generators/GenerateHandlerTest.test.js +640 -0
- package/dist/file-generators/GenerateOperationJson.d.ts +4 -0
- package/dist/file-generators/GenerateOperationJson.d.ts.map +1 -0
- package/dist/file-generators/GenerateOperationJson.js +44 -0
- package/dist/file-generators/GenerateOperationJson.test.d.ts +2 -0
- package/dist/file-generators/GenerateOperationJson.test.d.ts.map +1 -0
- package/dist/file-generators/GenerateOperationJson.test.js +78 -0
- package/dist/file-generators/types/GenerateInputSchema.d.ts +4 -0
- package/dist/file-generators/types/GenerateInputSchema.d.ts.map +1 -0
- package/dist/file-generators/types/GenerateInputSchema.js +131 -0
- package/dist/file-generators/types/GenerateInputSchema.test.d.ts +2 -0
- package/dist/file-generators/types/GenerateInputSchema.test.d.ts.map +1 -0
- package/dist/file-generators/types/GenerateInputSchema.test.js +260 -0
- package/dist/file-generators/types/GenerateInputType.test.d.ts +2 -0
- package/dist/file-generators/types/GenerateInputType.test.d.ts.map +1 -0
- package/dist/file-generators/types/GenerateInputType.test.js +447 -0
- package/dist/file-generators/types/GenerateInputTypes.d.ts +4 -0
- package/dist/file-generators/types/GenerateInputTypes.d.ts.map +1 -0
- package/dist/file-generators/types/GenerateInputTypes.js +45 -0
- package/dist/file-generators/types/GenerateOutput.d.ts +8 -0
- package/dist/file-generators/types/GenerateOutput.d.ts.map +1 -0
- package/dist/file-generators/types/GenerateOutput.js +81 -0
- package/dist/file-generators/types/GenerateOutput.test.d.ts +2 -0
- package/dist/file-generators/types/GenerateOutput.test.d.ts.map +1 -0
- package/dist/file-generators/types/GenerateOutput.test.js +213 -0
- package/dist/file-generators/types/JsonSchemaToTypescriptOptions.d.ts +9 -0
- package/dist/file-generators/types/JsonSchemaToTypescriptOptions.d.ts.map +1 -0
- package/dist/file-generators/types/JsonSchemaToTypescriptOptions.js +11 -0
- package/dist/templates/connector-template.zip +0 -0
- package/dist/test-openapi-spec.json +160 -0
- package/package.json +30 -0
|
@@ -0,0 +1,213 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
18
|
+
var __importStar = (this && this.__importStar) || function (mod) {
|
|
19
|
+
if (mod && mod.__esModule) return mod;
|
|
20
|
+
var result = {};
|
|
21
|
+
if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
|
|
22
|
+
__setModuleDefault(result, mod);
|
|
23
|
+
return result;
|
|
24
|
+
};
|
|
25
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
26
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
27
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
28
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
29
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
30
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
31
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
35
|
+
const TE = __importStar(require("fp-ts/TaskEither"));
|
|
36
|
+
const E = __importStar(require("fp-ts/Either"));
|
|
37
|
+
const O = __importStar(require("fp-ts/Option"));
|
|
38
|
+
const GenerateOutput_1 = require("./GenerateOutput");
|
|
39
|
+
const generateOutputFileContents = (responses) => __awaiter(void 0, void 0, void 0, function* () {
|
|
40
|
+
const operationNameCamelCase = 'CreatePost';
|
|
41
|
+
const generatedOutputSchema = yield (0, GenerateOutput_1.generateOutputSchema)(responses)();
|
|
42
|
+
if (E.isLeft(generatedOutputSchema)) {
|
|
43
|
+
throw new Error('Should have been right');
|
|
44
|
+
}
|
|
45
|
+
const generatedOutputTypes = (0, GenerateOutput_1.generateOutputTypes)(operationNameCamelCase, generatedOutputSchema.right);
|
|
46
|
+
return TE.getOrElse((error) => {
|
|
47
|
+
throw new Error('Should have been right');
|
|
48
|
+
})(generatedOutputTypes)();
|
|
49
|
+
});
|
|
50
|
+
describe('Generate output: ', () => {
|
|
51
|
+
it('it should generate output.ts file contents for a response code 200 content json', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
52
|
+
const responses = O.some({
|
|
53
|
+
'200': {
|
|
54
|
+
description: 'A post was created',
|
|
55
|
+
content: O.some({
|
|
56
|
+
'application/json': {
|
|
57
|
+
schema: O.some({
|
|
58
|
+
title: O.some('Post'),
|
|
59
|
+
type: O.some('object'),
|
|
60
|
+
required: O.some(['id', 'userId', 'title', 'body']),
|
|
61
|
+
properties: O.some({
|
|
62
|
+
id: {
|
|
63
|
+
title: O.none,
|
|
64
|
+
type: O.some('integer'),
|
|
65
|
+
properties: O.none,
|
|
66
|
+
required: O.none,
|
|
67
|
+
additionalProperties: O.some(false),
|
|
68
|
+
allOf: O.none,
|
|
69
|
+
anyOf: O.none,
|
|
70
|
+
oneOf: O.none,
|
|
71
|
+
not: O.none,
|
|
72
|
+
in: O.none,
|
|
73
|
+
},
|
|
74
|
+
userId: {
|
|
75
|
+
title: O.none,
|
|
76
|
+
type: O.some('integer'),
|
|
77
|
+
properties: O.none,
|
|
78
|
+
required: O.none,
|
|
79
|
+
additionalProperties: O.some(false),
|
|
80
|
+
allOf: O.none,
|
|
81
|
+
anyOf: O.none,
|
|
82
|
+
oneOf: O.none,
|
|
83
|
+
not: O.none,
|
|
84
|
+
in: O.none,
|
|
85
|
+
},
|
|
86
|
+
title: {
|
|
87
|
+
title: O.none,
|
|
88
|
+
type: O.some('string'),
|
|
89
|
+
properties: O.none,
|
|
90
|
+
required: O.none,
|
|
91
|
+
additionalProperties: O.some(false),
|
|
92
|
+
allOf: O.none,
|
|
93
|
+
anyOf: O.none,
|
|
94
|
+
oneOf: O.none,
|
|
95
|
+
not: O.none,
|
|
96
|
+
in: O.none,
|
|
97
|
+
},
|
|
98
|
+
body: {
|
|
99
|
+
title: O.none,
|
|
100
|
+
type: O.some('string'),
|
|
101
|
+
properties: O.none,
|
|
102
|
+
required: O.none,
|
|
103
|
+
additionalProperties: O.some(false),
|
|
104
|
+
allOf: O.none,
|
|
105
|
+
anyOf: O.none,
|
|
106
|
+
oneOf: O.none,
|
|
107
|
+
not: O.none,
|
|
108
|
+
in: O.none,
|
|
109
|
+
},
|
|
110
|
+
}),
|
|
111
|
+
additionalProperties: O.some(false),
|
|
112
|
+
allOf: O.none,
|
|
113
|
+
anyOf: O.none,
|
|
114
|
+
oneOf: O.none,
|
|
115
|
+
not: O.none,
|
|
116
|
+
in: O.none,
|
|
117
|
+
}),
|
|
118
|
+
},
|
|
119
|
+
}),
|
|
120
|
+
},
|
|
121
|
+
});
|
|
122
|
+
const generatedOutputFileContents = yield generateOutputFileContents(responses);
|
|
123
|
+
const expectedOutputFileContents = `export interface CreatePostOutput {
|
|
124
|
+
id: number;
|
|
125
|
+
userId: number;
|
|
126
|
+
title: string;
|
|
127
|
+
body: string;
|
|
128
|
+
}
|
|
129
|
+
`;
|
|
130
|
+
expect(generatedOutputFileContents).toEqual(expectedOutputFileContents);
|
|
131
|
+
}));
|
|
132
|
+
it('it should generate output.ts file contents for a response code 201 content json', () => __awaiter(void 0, void 0, void 0, function* () {
|
|
133
|
+
const responses = O.some({
|
|
134
|
+
'201': {
|
|
135
|
+
description: 'A post was created',
|
|
136
|
+
content: O.some({
|
|
137
|
+
'application/json': {
|
|
138
|
+
schema: O.some({
|
|
139
|
+
title: O.none,
|
|
140
|
+
type: O.some('object'),
|
|
141
|
+
required: O.some(['id', 'userId', 'title', 'body']),
|
|
142
|
+
properties: O.some({
|
|
143
|
+
id: {
|
|
144
|
+
title: O.none,
|
|
145
|
+
type: O.some('integer'),
|
|
146
|
+
properties: O.none,
|
|
147
|
+
required: O.none,
|
|
148
|
+
additionalProperties: O.some(false),
|
|
149
|
+
allOf: O.none,
|
|
150
|
+
anyOf: O.none,
|
|
151
|
+
oneOf: O.none,
|
|
152
|
+
not: O.none,
|
|
153
|
+
in: O.none,
|
|
154
|
+
},
|
|
155
|
+
userId: {
|
|
156
|
+
title: O.none,
|
|
157
|
+
type: O.some('integer'),
|
|
158
|
+
properties: O.none,
|
|
159
|
+
required: O.none,
|
|
160
|
+
additionalProperties: O.some(false),
|
|
161
|
+
allOf: O.none,
|
|
162
|
+
anyOf: O.none,
|
|
163
|
+
oneOf: O.none,
|
|
164
|
+
not: O.none,
|
|
165
|
+
in: O.none,
|
|
166
|
+
},
|
|
167
|
+
title: {
|
|
168
|
+
title: O.none,
|
|
169
|
+
type: O.some('string'),
|
|
170
|
+
properties: O.none,
|
|
171
|
+
required: O.none,
|
|
172
|
+
additionalProperties: O.some(false),
|
|
173
|
+
allOf: O.none,
|
|
174
|
+
anyOf: O.none,
|
|
175
|
+
oneOf: O.none,
|
|
176
|
+
not: O.none,
|
|
177
|
+
in: O.none,
|
|
178
|
+
},
|
|
179
|
+
body: {
|
|
180
|
+
title: O.none,
|
|
181
|
+
type: O.some('string'),
|
|
182
|
+
properties: O.none,
|
|
183
|
+
required: O.none,
|
|
184
|
+
additionalProperties: O.some(false),
|
|
185
|
+
allOf: O.none,
|
|
186
|
+
anyOf: O.none,
|
|
187
|
+
oneOf: O.none,
|
|
188
|
+
not: O.none,
|
|
189
|
+
in: O.none,
|
|
190
|
+
},
|
|
191
|
+
}),
|
|
192
|
+
additionalProperties: O.some(false),
|
|
193
|
+
allOf: O.none,
|
|
194
|
+
anyOf: O.none,
|
|
195
|
+
oneOf: O.none,
|
|
196
|
+
not: O.none,
|
|
197
|
+
in: O.none,
|
|
198
|
+
}),
|
|
199
|
+
},
|
|
200
|
+
}),
|
|
201
|
+
},
|
|
202
|
+
});
|
|
203
|
+
const generatedOutputFileContents = yield generateOutputFileContents(responses);
|
|
204
|
+
const expectedOutputFileContents = `export interface CreatePostOutput {
|
|
205
|
+
id: number;
|
|
206
|
+
userId: number;
|
|
207
|
+
title: string;
|
|
208
|
+
body: string;
|
|
209
|
+
}
|
|
210
|
+
`;
|
|
211
|
+
expect(generatedOutputFileContents).toEqual(expectedOutputFileContents);
|
|
212
|
+
}));
|
|
213
|
+
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"JsonSchemaToTypescriptOptions.d.ts","sourceRoot":"","sources":["../../../src/file-generators/types/JsonSchemaToTypescriptOptions.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,6BAA6B;;;;;;;CAOzC,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.JsonSchemaToTypescriptOptions = void 0;
|
|
4
|
+
exports.JsonSchemaToTypescriptOptions = {
|
|
5
|
+
bannerComment: '',
|
|
6
|
+
format: true,
|
|
7
|
+
style: {
|
|
8
|
+
singleQuote: true,
|
|
9
|
+
useTabs: true,
|
|
10
|
+
},
|
|
11
|
+
};
|
|
Binary file
|
|
@@ -0,0 +1,160 @@
|
|
|
1
|
+
{
|
|
2
|
+
"openapi": "3.0.0",
|
|
3
|
+
"info": {
|
|
4
|
+
"version": "1.0.0",
|
|
5
|
+
"title": "JSON Placeholder API",
|
|
6
|
+
"description": "See https://jsonplaceholder.typicode.com/"
|
|
7
|
+
},
|
|
8
|
+
"servers": [
|
|
9
|
+
{
|
|
10
|
+
"url": "https://jsonplaceholder.typicode.com"
|
|
11
|
+
}
|
|
12
|
+
],
|
|
13
|
+
"paths": {
|
|
14
|
+
"/posts/{id}/{uuid}": {
|
|
15
|
+
"parameters": [
|
|
16
|
+
{
|
|
17
|
+
"name": "id",
|
|
18
|
+
"in": "path",
|
|
19
|
+
"required": true,
|
|
20
|
+
"description": "The user id.",
|
|
21
|
+
"schema": {
|
|
22
|
+
"type": "integer",
|
|
23
|
+
"format": "int64"
|
|
24
|
+
},
|
|
25
|
+
"additionalProperties": false
|
|
26
|
+
},
|
|
27
|
+
{
|
|
28
|
+
"in": "path",
|
|
29
|
+
"name": "uuid",
|
|
30
|
+
"description": "UUID.",
|
|
31
|
+
"required": true,
|
|
32
|
+
"schema": {
|
|
33
|
+
"allOf": [
|
|
34
|
+
{
|
|
35
|
+
"title": "UUID Property",
|
|
36
|
+
"description": "A string that has to be a format matching the industry standard uuid",
|
|
37
|
+
"type": "string",
|
|
38
|
+
"format": "uuid",
|
|
39
|
+
"example": "04ca6ae2-0dc3-487b-953e-86d6abbdf7d3"
|
|
40
|
+
},
|
|
41
|
+
{
|
|
42
|
+
"example": "b054dd32-efb6-444a-b4a6-a797a18315ef"
|
|
43
|
+
}
|
|
44
|
+
]
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
],
|
|
48
|
+
"put": {
|
|
49
|
+
"tags": ["post"],
|
|
50
|
+
"requestBody": {
|
|
51
|
+
"content": {
|
|
52
|
+
"application/json": {
|
|
53
|
+
"schema": {
|
|
54
|
+
"type": "object",
|
|
55
|
+
"required": ["id", "userId", "title", "body"],
|
|
56
|
+
"properties": {
|
|
57
|
+
"id": {
|
|
58
|
+
"type": "integer"
|
|
59
|
+
},
|
|
60
|
+
"userId": {
|
|
61
|
+
"type": "integer"
|
|
62
|
+
},
|
|
63
|
+
"title": {
|
|
64
|
+
"type": "string"
|
|
65
|
+
},
|
|
66
|
+
"body": {
|
|
67
|
+
"type": "string"
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
},
|
|
73
|
+
"required": true
|
|
74
|
+
},
|
|
75
|
+
"responses": {
|
|
76
|
+
"200": {
|
|
77
|
+
"description": "All went well",
|
|
78
|
+
"content": {
|
|
79
|
+
"application/json": {
|
|
80
|
+
"schema": {
|
|
81
|
+
"$ref": "#/components/schemas/Post"
|
|
82
|
+
}
|
|
83
|
+
}
|
|
84
|
+
}
|
|
85
|
+
},
|
|
86
|
+
"404": {
|
|
87
|
+
"description": "Post not found",
|
|
88
|
+
"content": {
|
|
89
|
+
"application/json": {
|
|
90
|
+
"schema": {
|
|
91
|
+
"type": "object",
|
|
92
|
+
"properties": {}
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
"get": {
|
|
100
|
+
"description": "Returns a post by id",
|
|
101
|
+
"tags": ["Posts"],
|
|
102
|
+
"operationId": "getPost",
|
|
103
|
+
"parameters": [
|
|
104
|
+
{
|
|
105
|
+
"name": "date",
|
|
106
|
+
"in": "query",
|
|
107
|
+
"description": "The post date.",
|
|
108
|
+
"schema": {
|
|
109
|
+
"type": "string"
|
|
110
|
+
},
|
|
111
|
+
"additionalProperties": false
|
|
112
|
+
}
|
|
113
|
+
],
|
|
114
|
+
"responses": {
|
|
115
|
+
"200": {
|
|
116
|
+
"description": "Successful response",
|
|
117
|
+
"content": {
|
|
118
|
+
"application/json": {
|
|
119
|
+
"schema": {
|
|
120
|
+
"$ref": "#/components/schemas/PostsList"
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
},
|
|
125
|
+
"404": {
|
|
126
|
+
"description": "Post not found"
|
|
127
|
+
}
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
}
|
|
131
|
+
},
|
|
132
|
+
"components": {
|
|
133
|
+
"schemas": {
|
|
134
|
+
"PostsList": {
|
|
135
|
+
"type": "array",
|
|
136
|
+
"items": {
|
|
137
|
+
"$ref": "#/components/schemas/Post"
|
|
138
|
+
}
|
|
139
|
+
},
|
|
140
|
+
"Post": {
|
|
141
|
+
"type": "object",
|
|
142
|
+
"required": ["id", "userId", "title", "body"],
|
|
143
|
+
"properties": {
|
|
144
|
+
"id": {
|
|
145
|
+
"type": "integer"
|
|
146
|
+
},
|
|
147
|
+
"userId": {
|
|
148
|
+
"type": "integer"
|
|
149
|
+
},
|
|
150
|
+
"title": {
|
|
151
|
+
"type": "string"
|
|
152
|
+
},
|
|
153
|
+
"body": {
|
|
154
|
+
"type": "string"
|
|
155
|
+
}
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
}
|
|
159
|
+
}
|
|
160
|
+
}
|
package/package.json
ADDED
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "@trayio/tray-openapi",
|
|
3
|
+
"version": "0.0.1-beta",
|
|
4
|
+
"description": "Creating CDK Projects from OpenAPI 3.0 Schemas",
|
|
5
|
+
"exports": {
|
|
6
|
+
"./*": "./dist/*.js"
|
|
7
|
+
},
|
|
8
|
+
"author": "Tray.io",
|
|
9
|
+
"license": "MIT",
|
|
10
|
+
"publishConfig": {
|
|
11
|
+
"access": "public"
|
|
12
|
+
},
|
|
13
|
+
"typesVersions": {
|
|
14
|
+
"*": {
|
|
15
|
+
"*": [
|
|
16
|
+
"*",
|
|
17
|
+
"dist/*"
|
|
18
|
+
]
|
|
19
|
+
}
|
|
20
|
+
},
|
|
21
|
+
"files": [
|
|
22
|
+
"/dist"
|
|
23
|
+
],
|
|
24
|
+
"dependencies": {
|
|
25
|
+
"@openapi-contrib/openapi-schema-to-json-schema": "5.1.0",
|
|
26
|
+
"@stoplight/json-ref-resolver": "3.1.6",
|
|
27
|
+
"json-schema-to-typescript": "13.1.1",
|
|
28
|
+
"json-to-typescript": "1.0.1"
|
|
29
|
+
}
|
|
30
|
+
}
|