@penkov/swagger-code-gen 1.6.6 → 1.6.7
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/dist/schemas.js +33 -6
- package/package.json +2 -2
package/dist/schemas.js
CHANGED
|
@@ -20,19 +20,39 @@ export class SchemaFactory {
|
|
|
20
20
|
return SchemaEnum.fromDefinition(name, def);
|
|
21
21
|
}
|
|
22
22
|
else if (def.type === 'string') {
|
|
23
|
-
return Property.fromDefinition(name,
|
|
23
|
+
return Property.fromDefinition(name, {
|
|
24
|
+
...def,
|
|
25
|
+
required: option(def.required).filter(x => typeof x === 'boolean')
|
|
26
|
+
.map(x => x).orUndefined
|
|
27
|
+
}, schemasTypes, options);
|
|
24
28
|
}
|
|
25
29
|
else if (def.type === 'boolean') {
|
|
26
|
-
return Property.fromDefinition(name,
|
|
30
|
+
return Property.fromDefinition(name, {
|
|
31
|
+
...def,
|
|
32
|
+
required: option(def.required).filter(x => typeof x === 'boolean')
|
|
33
|
+
.map(x => x).orUndefined
|
|
34
|
+
}, schemasTypes, options);
|
|
27
35
|
}
|
|
28
36
|
else if (def.type === 'integer') {
|
|
29
|
-
return Property.fromDefinition(name,
|
|
37
|
+
return Property.fromDefinition(name, {
|
|
38
|
+
...def,
|
|
39
|
+
required: option(def.required).filter(x => typeof x === 'boolean')
|
|
40
|
+
.map(x => x).orUndefined
|
|
41
|
+
}, schemasTypes, options);
|
|
30
42
|
}
|
|
31
43
|
else if (def.type === 'array') {
|
|
32
|
-
return Property.fromDefinition(name,
|
|
44
|
+
return Property.fromDefinition(name, {
|
|
45
|
+
...def,
|
|
46
|
+
required: option(def.required).filter(x => typeof x === 'boolean')
|
|
47
|
+
.map(x => x).orUndefined
|
|
48
|
+
}, schemasTypes, options);
|
|
33
49
|
}
|
|
34
50
|
else {
|
|
35
|
-
return Property.fromDefinition(name,
|
|
51
|
+
return Property.fromDefinition(name, {
|
|
52
|
+
...def,
|
|
53
|
+
required: option(def.required).filter(x => typeof x === 'boolean')
|
|
54
|
+
.map(x => x).orUndefined
|
|
55
|
+
}, schemasTypes, options);
|
|
36
56
|
}
|
|
37
57
|
}
|
|
38
58
|
}
|
|
@@ -58,7 +78,14 @@ export class SchemaObject {
|
|
|
58
78
|
this.schemaType = 'object';
|
|
59
79
|
}
|
|
60
80
|
static fromDefinition(name, def, schemasTypes, options) {
|
|
61
|
-
const
|
|
81
|
+
const explicitlyRequired = option(def.required)
|
|
82
|
+
.map(arr => typeof arr === 'boolean' ? Nil : Collection.from(arr));
|
|
83
|
+
const properties = Collection.from(Object.keys(def.properties)).map(propName => {
|
|
84
|
+
const property = Property.fromDefinition(propName, def.properties[propName], schemasTypes, options);
|
|
85
|
+
return property.copy({
|
|
86
|
+
required: explicitlyRequired.exists(c => c.contains(propName)) ? true : property.required
|
|
87
|
+
});
|
|
88
|
+
});
|
|
62
89
|
return new SchemaObject(name, def.title, def.type, properties);
|
|
63
90
|
}
|
|
64
91
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@penkov/swagger-code-gen",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.7",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"bin": {
|
|
6
6
|
"generate-client": "./dist/cli.mjs"
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
},
|
|
23
23
|
"homepage": "https://github.com/papirosko/swagger-code-gen#readme",
|
|
24
24
|
"scripts": {
|
|
25
|
-
"test:petstore": "node --loader ts-node/esm ./src/cli.mjs --enableScats --targetNode --url
|
|
25
|
+
"test:petstore": "node --loader ts-node/esm ./src/cli.mjs --enableScats --targetNode --url http://localhost:3000/-json tmp/petstore.ts",
|
|
26
26
|
"clean": "rimraf dist",
|
|
27
27
|
"lint": "eslint \"{src,test}/**/*.ts\" --fix",
|
|
28
28
|
"prebuild": "npm run lint && npm run clean",
|