typoa 1.0.0-alpha.61 → 1.0.0-alpha.63
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/build/index.d.ts +9 -0
- package/build/index.js +8 -10
- package/build/runtime/validator.d.ts +3 -2
- package/build/runtime/validator.js +47 -29
- package/build/template/express.ts.hbs +8 -2
- package/package.json +21 -21
package/build/index.d.ts
CHANGED
|
@@ -1,4 +1,12 @@
|
|
|
1
1
|
import { OpenAPIV3 } from 'openapi-types';
|
|
2
|
+
export type InternalFeatures = {
|
|
3
|
+
/**
|
|
4
|
+
* By default, validation accept any additional data even if it's not allowed by OpenAPI schema.
|
|
5
|
+
* Enable this feature will throw if a property is not declared in the schema.
|
|
6
|
+
* MIGHT BREAK YOUR API! Check before enabling it
|
|
7
|
+
*/
|
|
8
|
+
enableThrowOnUnexpectedAdditionalData: boolean;
|
|
9
|
+
};
|
|
2
10
|
export type OpenAPIConfiguration = {
|
|
3
11
|
tsconfigFilePath: string;
|
|
4
12
|
/**
|
|
@@ -95,6 +103,7 @@ export type OpenAPIConfiguration = {
|
|
|
95
103
|
*/
|
|
96
104
|
runtimeImport?: string;
|
|
97
105
|
};
|
|
106
|
+
features?: InternalFeatures;
|
|
98
107
|
};
|
|
99
108
|
export declare function getConfig(): OpenAPIConfiguration | undefined;
|
|
100
109
|
export declare function generate(config: OpenAPIConfiguration): Promise<void>;
|
package/build/index.js
CHANGED
|
@@ -43,9 +43,7 @@ exports.Validator = exports.RuntimeResponse = void 0;
|
|
|
43
43
|
exports.getConfig = getConfig;
|
|
44
44
|
exports.generate = generate;
|
|
45
45
|
const ts_morph_1 = require("ts-morph");
|
|
46
|
-
// @ts-expect-error Glob package probably needs to be updated
|
|
47
46
|
const glob_1 = require("glob");
|
|
48
|
-
const util_1 = require("util");
|
|
49
47
|
const path_1 = __importDefault(require("path"));
|
|
50
48
|
const controller_1 = require("./controller");
|
|
51
49
|
const openapi_1 = require("./openapi");
|
|
@@ -58,7 +56,6 @@ let configStore = undefined;
|
|
|
58
56
|
function getConfig() {
|
|
59
57
|
return configStore;
|
|
60
58
|
}
|
|
61
|
-
const promiseGlob = (0, util_1.promisify)(glob_1.glob);
|
|
62
59
|
async function generate(config) {
|
|
63
60
|
configStore = config;
|
|
64
61
|
const root = config.root ?? path_1.default.dirname(path_1.default.resolve(config.tsconfigFilePath));
|
|
@@ -81,10 +78,8 @@ async function generate(config) {
|
|
|
81
78
|
const controllersPathByName = {};
|
|
82
79
|
// Iterate over controllers and patch spec
|
|
83
80
|
await Promise.all(config.controllers.map(async (controller) => {
|
|
84
|
-
const files = await
|
|
85
|
-
await Promise.all(
|
|
86
|
-
// @ts-expect-error Glob package probably needs to be updated
|
|
87
|
-
files.map(async (file) => {
|
|
81
|
+
const files = await (0, glob_1.glob)(controller);
|
|
82
|
+
await Promise.all(files.map(async (file) => {
|
|
88
83
|
const filePath = path_1.default.resolve(root, file);
|
|
89
84
|
const sourceFile = project.getSourceFileOrThrow(filePath);
|
|
90
85
|
const controllers = sourceFile.getClasses();
|
|
@@ -140,7 +135,7 @@ async function generate(config) {
|
|
|
140
135
|
];
|
|
141
136
|
const responses = Object.values(spec.paths)
|
|
142
137
|
.map(path => {
|
|
143
|
-
return methods.map(method => path[method]?.responses ?? {});
|
|
138
|
+
return methods.map(method => path?.[method]?.responses ?? {});
|
|
144
139
|
})
|
|
145
140
|
.flat()
|
|
146
141
|
.reduce((list, responses) => {
|
|
@@ -261,7 +256,10 @@ async function generate(config) {
|
|
|
261
256
|
schemas: spec.components.schemas,
|
|
262
257
|
middlewares: Object.values(codegenControllers)
|
|
263
258
|
.flatMap(controller => controller.flatMap(method => method.middlewares || []))
|
|
264
|
-
.filter((middleware, index, self) => self.findIndex(m => m.name === middleware.name) === index)
|
|
259
|
+
.filter((middleware, index, self) => self.findIndex(m => m.name === middleware.name) === index),
|
|
260
|
+
features: {
|
|
261
|
+
enableThrowOnUnexpectedAdditionalData: config.features?.enableThrowOnUnexpectedAdditionalData ?? false // Must be false by default because it was the original behaviour
|
|
262
|
+
},
|
|
265
263
|
});
|
|
266
264
|
await fs_1.default.promises.writeFile(routerFilePath, routerFileContent);
|
|
267
265
|
}
|
|
@@ -269,4 +267,4 @@ __exportStar(require("./runtime/decorators"), exports);
|
|
|
269
267
|
__exportStar(require("./runtime/interfaces"), exports);
|
|
270
268
|
exports.RuntimeResponse = __importStar(require("./runtime/response"));
|
|
271
269
|
exports.Validator = __importStar(require("./runtime/validator"));
|
|
272
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAgIA,8BAEC;AAGD,4BAyRC;AA9ZD,uCAOiB;AACjB,6DAA6D;AAC7D,+BAA2B;AAC3B,+BAAgC;AAChC,gDAAuB;AACvB,6CAA4C;AAC5C,uCAAsC;AAEtC,oDAAyB;AACzB,4CAAmB;AAEnB,4DAAmC;AACnC,mCAA8D;AAC9D,uCAAmC;AA2GnC,IAAI,WAAW,GAAqC,SAAS,CAAA;AAC7D,SAAgB,SAAS;IACvB,OAAO,WAAW,CAAA;AACpB,CAAC;AAED,MAAM,WAAW,GAAG,IAAA,gBAAS,EAAC,WAAI,CAAC,CAAA;AAC5B,KAAK,UAAU,QAAQ,CAAC,MAA4B;IACzD,WAAW,GAAG,MAAM,CAAA;IAEpB,MAAM,IAAI,GACR,MAAM,CAAC,IAAI,IAAI,cAAI,CAAC,OAAO,CAAC,cAAI,CAAC,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,CAAA;IACpE,aAAa;IACb,MAAM,OAAO,GAAG,IAAI,kBAAO,CAAC;QAC1B,eAAe,EAAE,IAAA,yCAA8B,EAAC,MAAM,CAAC,gBAAgB,CAAC;aACrE,OAAO;KACX,CAAC,CAAA;IACF,OAAO,CAAC,0BAA0B,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAA;IAE3D,YAAY;IACZ,MAAM,IAAI,GAAG,IAAA,oBAAU,EAAC;QACtB,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;QACjC,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO;KACxC,CAAC,CAAA;IACF,IAAI,OAAO,MAAM,CAAC,OAAO,CAAC,eAAe,KAAK,WAAW,EAAE,CAAC;QAC1D,IAAI,CAAC,UAAW,CAAC,eAAe,GAAG,MAAM,CAAC,OAAO,CAAC,eAAe,CAAA;IACnE,CAAC;IAED,iBAAiB;IACjB,MAAM,kBAAkB,GAAuB,EAAE,CAAA;IACjD,MAAM,qBAAqB,GAA2B,EAAE,CAAA;IAExD,0CAA0C;IAC1C,MAAM,OAAO,CAAC,GAAG,CACf,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,KAAK,EAAC,UAAU,EAAC,EAAE;QACxC,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,UAAU,CAAC,CAAA;QAC3C,MAAM,OAAO,CAAC,GAAG;QACf,6DAA6D;QAC7D,KAAK,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE;YACrB,MAAM,QAAQ,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACzC,MAAM,UAAU,GAAG,OAAO,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAA;YACzD,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,EAAE,CAAA;YAC3C,KAAK,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;gBACrC,MAAM,cAAc,GAAG,UAAU,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;gBACvD,IAAI,cAAc,KAAK,SAAS;oBAAE,SAAQ,CAAC,OAAO;gBAClD,IAAA,0BAAa,EAAC,UAAU,EAAE,IAAI,EAAE,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAA;gBAClE,qBAAqB,CAAC,UAAU,CAAC,OAAO,EAAG,CAAC,GAAG,QAAQ,CAAA;YACzD,CAAC;QACH,CAAC,CAAC,CACH,CAAA;IACH,CAAC,CAAC,CACH,CAAA;IAED,iCAAiC;IACjC,KAAK,MAAM,QAAQ,IAAI,MAAM,CAAC,OAAO,CAAC,2BAA2B,IAAI,EAAE,EAAE,CAAC;QACxE,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAA;QAC5C,MAAM,YAAY,GAAG,WAAW;aAC7B,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YACZ,IAAI,EAAE,IAAI,CAAC,WAAW,EAAE;YACxB,WAAW,EAAE,IAAI,CAAC,uBAAuB,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;SAC/D,CAAC,CAAC;aACF,MAAM,CAAC,CAAC,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC,OAAO,WAAW,KAAK,WAAW,CAG9D,CAAA;QACH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CACb,sDAAsD,QAAQ,GAAG,CAClE,CAAA;QACH,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,wEAAwE,QAAQ,QAAQ,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAC1I,CAAA;QACH,CAAC;QACD,MAAM,WAAW,GAAG,YAAY,CAAC,CAAC,CAAC,CAAC,WAGZ,CAAA;QACxB,cAAc;QACd,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,EAAG,CAAA;QACnC,MAAM,IAAI,GAAG,WAAW,CAAC,OAAO,EAAE,CAAA;QAClC,MAAM,QAAQ,GAAG,IAAA,iBAAO,EACtB,IAAI,CAAC,KAAK,EAAE;YACV,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,EAAE,EAAE,eAAe,EAAE,IAAI,IAAI,CAAC;YACtD,CAAC,CAAC,IAAI,EACR,IAAI,CACL,CAAA;QACD,IACE,CAAC,CAAC,MAAM,IAAI,QAAQ,CAAC;YACrB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,uBAAuB,CAAC,MAAM,CAAC,KAAK,IAAI,EAC7D,CAAC;YACD,IAAI,CAAC,UAAW,CAAC,OAAQ,CAAC,IAAI,CAAC,GAAG,QAAQ,CAAA;QAC5C,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,IACE,OAAO,MAAM,CAAC,OAAO,CAAC,yBAAyB,KAAK,WAAW;QAC/D,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAC,OAAO,KAAK,IAAI,EACzD,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,yBAAyB,CAAA;QAC7D,MAAM,YAAY,GAAG,YAAY,CAAC,YAAY,CAAA;QAC9C,MAAM,OAAO,GAAG;YACd,KAAK;YACL,OAAO;YACP,KAAK;YACL,QAAQ;YACR,MAAM;YACN,MAAM;YACN,SAAS;SACD,CAAA;QACV,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC;aACxC,GAAG,CAAC,IAAI,CAAC,EAAE;YACV,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,SAAS,IAAI,EAAE,CAAC,CAAA;QAC7D,CAAC,CAAC;aACD,IAAI,EAAE;aACN,MAAM,CAKL,CAAC,IAAI,EAAE,SAAS,EAAE,EAAE;YACpB,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;gBAC7B,iEAAiE;gBACjE,IAAI,CAAC,IAAI,CAAC;oBACR,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;oBACxB,QAAQ,EAAE,SAAS,CAAC,IAAI,CAA6B;iBACtD,CAAC,CAAA;YACJ,CAAC;YACD,OAAO,IAAI,CAAA;QACb,CAAC,EAAE,EAAE,CAAC,CAAA;QACR,IAAI,IAAI,GAAG,SAAS;aACjB,MAAM,CACL,QAAQ,CAAC,EAAE,CACT,QAAQ,CAAC,IAAI,GAAG,GAAG;YACnB,OAAO,QAAQ,CAAC,QAAQ,CAAC,OAAO,KAAK,WAAW,CACnD;aACA,GAAG,CAAC,QAAQ,CAAC,EAAE;YACd,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,CAAC,OAAQ,CAAC,kBAAkB,CAAC,CAAC,MAAM,CAAA;YACrE,IAAI,OAAO,OAAO,KAAK,WAAW,EAAE,CAAC;gBACnC,OAAO,SAAS,CAAA;YAClB,CAAC;YACD,MAAM,QAAQ,GAAG,CACf,OAGkC,EAClC,EAAE,CACF,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE;gBAC7B,QAAQ,KAAK,CAAC,IAAI,EAAE,CAAC;oBACnB,KAAK,MAAM;wBACT,gDAAgD;wBAChD,MAAM,QAAQ,GAAG,IAAA,uBAAe,EAC9B,OAAO,EACP,IAAI,CAAC,UAAW,EAChB,KAAK,CAAC,KAAK,CACZ,CAAA;wBACD,IAAI,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;4BAC3B,OAAO,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,KAAK,CAAA;wBAC/C,CAAC;wBACD,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAA;oBAC/B,KAAK,aAAa;wBAChB,OAAO,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAA;oBAC9C,KAAK,YAAY;wBACf,OAAO,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;gBAChC,CAAC;YACH,CAAC,CAAC,CAAA;YACJ,IAAI,OAAO,IAAI,OAAO,IAAI,OAAO,OAAO,CAAC,KAAK,KAAK,WAAW,EAAE,CAAC;gBAC/D,OAAO,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;YACxD,CAAC;YACD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAA;QAC5B,CAAC,CAAC;aACD,IAAI,CAAC,CAAC,CAAC;aACP,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,OAAO,KAAK,WAAW,CAAC,CAAA;QACpD,IAAI,OAAO,YAAY,CAAC,UAAU,KAAK,QAAQ,EAAE,CAAC;YAChD,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,CACxC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,UAAU,CAClD,CAAA;YACD,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;gBACxB,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,CAAA;gBAC7B,MAAM,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,CAAA;gBAC7B,IACE,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,MAAM;oBACrC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,KAAK,MAAM,EACrC,CAAC;oBACD,OAAO,UAAU,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAA;gBAChD,CAAC;gBACD,OAAO,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;YACrC,CAAC,CAAC,CAAA;QACJ,CAAC;QACD,IAAI,OAAO,YAAY,CAAC,YAAY,KAAK,QAAQ,EAAE,CAAC;YAClD,MAAM,WAAW,GAAG,YAAY,CAAC,SAAS,CACxC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,YAAY,CAAC,YAAY,CACpD,CAAA;YACD,IAAI,GAAG,IAAI,CAAC,MAAM,CAChB,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,CACT,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,GAAG,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CACjE,CAAA;QACH,CAAC;QACD,MAAM,OAAO,GAAG,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QACvD,MAAM,QAAQ,GACZ,KAAK,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;YAC9B,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM;YAC7D,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QACtD,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,aAAa,QAAQ,EAAE,CAAA;IACjD,CAAC;IAED,wBAAwB;IACxB,MAAM,WAAW,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAEpD,mDAAmD;IACnD,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC;QACtD,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ;QACzB,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAA;IAE7B,yBAAyB;IACzB,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE,CAAC;QACjC,MAAM,YAAY,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QAEjD,2CAA2C;QAC3C,IACE,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC;YACxC,QAAQ,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EACvC,CAAC;YACD,MAAM,WAAW,GAAG,gBAAI,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,EAAE,CAAC,CAAA,CAAC,sCAAsC;YACtG,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QACxD,CAAC;aAAM,CAAC;YACN,0DAA0D;YAC1D,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,YAAY,EAAE,WAAW,CAAC,CAAA;QACxD,CAAC;IACH,CAAC;IAED,UAAU;IACV,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB;QACrD,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC;QACpD,CAAC,CAAC,cAAI,CAAC,OAAO,CAAC,SAAS,EAAE,2BAA2B,CAAC,CAAA;IACxD,oBAAU,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,OAAY,EAAE,EAAE;QACjD,OAAO,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;IAChC,CAAC,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAA;IACpE,MAAM,gBAAgB,GAAG,oBAAU,CAAC,OAAO,CAAC,eAAe,CAAC,QAAQ,EAAE,EAAE;QACtE,QAAQ,EAAE,IAAI;KACf,CAAC,CAAA,CAAC,4BAA4B;IAC/B,MAAM,cAAc,GAAG,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;IACjE,MAAM,iBAAiB,GAAG,gBAAgB,CAAC;QACzC,kBAAkB,EAAE,MAAM,CAAC,MAAM,CAAC,sBAAsB;YACtD,CAAC,CAAC,IAAA,2BAAmB,EACjB,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAC5B,cAAI,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CACzD;YACH,CAAC,CAAC,SAAS;QACb,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,gBAAgB;QAChD,aAAa,EACX,MAAM,CAAC,MAAM,CAAC,aAAa;YAC3B,OAAO,CAAC,GAAG,CAAC,oBAAoB;YAChC,OAAO;QACT,WAAW,EAAE,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE;YAChE,OAAO;gBACL,IAAI,EAAE,cAAc;gBACpB,IAAI,EAAE,IAAA,2BAAmB,EACvB,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAC5B,qBAAqB,CAAC,cAAc,CAAC,CACtC;gBACD,OAAO,EAAE,kBAAkB,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;oBACvD,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;wBAC7B,cAAc;wBACd,MAAM,CAAC,iBAAiB,CAAC,IAAI,GAAG,IAAA,2BAAmB,EACjD,cAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAC5B,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAC9B,CAAA;oBACH,CAAC;oBACD,OAAO,MAAM,CAAA;gBACf,CAAC,CAAC;aACH,CAAA;QACH,CAAC,CAAC;QACF,OAAO,EAAE,IAAI,CAAC,UAAW,CAAC,OAAO;QACjC,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC;aAC3C,OAAO,CAAC,UAAU,CAAC,EAAE,CACpB,UAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,WAAW,IAAI,EAAE,CAAC,CACvD;aACA,MAAM,CACL,CAAC,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAC1B,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CAAC,IAAI,CAAC,KAAK,KAAK,CAC5D;KACJ,CAAC,CAAA;IAEF,MAAM,YAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAA;AAChE,CAAC;AAED,uDAAoC;AACpC,uDAAoC;AACpC,sEAAqD;AACrD,iEAAgD"}
|
|
270
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import express from 'express';
|
|
2
2
|
import { OpenAPIV3 } from 'openapi-types';
|
|
3
3
|
import { BodyDiscriminatorFunction } from './decorators';
|
|
4
|
+
import { InternalFeatures } from '..';
|
|
4
5
|
export declare class ValidateError extends Error {
|
|
5
6
|
fields: Record<string, {
|
|
6
7
|
message: string;
|
|
@@ -18,5 +19,5 @@ export declare function validateAndParse(req: express.Request, schemas: OpenAPIV
|
|
|
18
19
|
params: OpenAPIV3.ParameterObject[];
|
|
19
20
|
body?: OpenAPIV3.RequestBodyObject;
|
|
20
21
|
bodyDiscriminatorFn?: BodyDiscriminatorFunction;
|
|
21
|
-
}): Promise<any[]>;
|
|
22
|
-
export declare function validateAndParseResponse(data: unknown, schemas: OpenAPIV3.ComponentsObject['schemas'], rules: Record<string, OpenAPIV3.ResponseObject>, statusCode: string, contentType: string): unknown;
|
|
22
|
+
}, features: InternalFeatures): Promise<any[]>;
|
|
23
|
+
export declare function validateAndParseResponse(data: unknown, schemas: OpenAPIV3.ComponentsObject['schemas'], rules: Record<string, OpenAPIV3.ResponseObject>, statusCode: string, contentType: string, features: InternalFeatures): unknown;
|
|
@@ -21,7 +21,7 @@ class ValidateError extends Error {
|
|
|
21
21
|
}
|
|
22
22
|
}
|
|
23
23
|
exports.ValidateError = ValidateError;
|
|
24
|
-
async function validateAndParse(req, schemas, rules) {
|
|
24
|
+
async function validateAndParse(req, schemas, rules, features) {
|
|
25
25
|
const args = [];
|
|
26
26
|
for (const param of rules.params || []) {
|
|
27
27
|
// Handling @Request()
|
|
@@ -31,7 +31,7 @@ async function validateAndParse(req, schemas, rules) {
|
|
|
31
31
|
}
|
|
32
32
|
// Handling body
|
|
33
33
|
if (param.in === 'body') {
|
|
34
|
-
args.push(await validateBody(req, rules.body, rules.bodyDiscriminatorFn, schemas));
|
|
34
|
+
args.push(await validateBody(req, rules.body, rules.bodyDiscriminatorFn, schemas, features));
|
|
35
35
|
continue;
|
|
36
36
|
}
|
|
37
37
|
// Handling other params: header, query and path
|
|
@@ -73,7 +73,7 @@ async function validateAndParse(req, schemas, rules) {
|
|
|
73
73
|
args.push(undefined);
|
|
74
74
|
continue;
|
|
75
75
|
}
|
|
76
|
-
const ValidationResponse = validateAndParseValueAgainstSchema(param.name, value, param.schema, schemas);
|
|
76
|
+
const ValidationResponse = validateAndParseValueAgainstSchema(param.name, value, param.schema, schemas, features, "unknown");
|
|
77
77
|
if (!ValidationResponse.succeed) {
|
|
78
78
|
throw new ValidateError({
|
|
79
79
|
[param.name]: { message: ValidationResponse.errorMessage, value }
|
|
@@ -83,7 +83,7 @@ async function validateAndParse(req, schemas, rules) {
|
|
|
83
83
|
}
|
|
84
84
|
return args;
|
|
85
85
|
}
|
|
86
|
-
function validateAndParseResponse(data, schemas, rules, statusCode, contentType) {
|
|
86
|
+
function validateAndParseResponse(data, schemas, rules, statusCode, contentType, features) {
|
|
87
87
|
try {
|
|
88
88
|
const rule = rules[statusCode] ?? rules.default;
|
|
89
89
|
if (!rule)
|
|
@@ -100,7 +100,7 @@ function validateAndParseResponse(data, schemas, rules, statusCode, contentType)
|
|
|
100
100
|
log(`Schema is not found for '${contentType}', throwing error`);
|
|
101
101
|
throw new ValidateError({}, 'This content-type is not allowed');
|
|
102
102
|
}
|
|
103
|
-
const ValidationResponse = validateAndParseValueAgainstSchema('response', data, expectedSchema, schemas);
|
|
103
|
+
const ValidationResponse = validateAndParseValueAgainstSchema('response', data, expectedSchema, schemas, features, "unknown");
|
|
104
104
|
if (!ValidationResponse.succeed) {
|
|
105
105
|
throw new ValidateError({ response: { message: ValidationResponse.errorMessage } }, 'Invalid response');
|
|
106
106
|
}
|
|
@@ -114,7 +114,7 @@ function validateAndParseResponse(data, schemas, rules, statusCode, contentType)
|
|
|
114
114
|
throw e;
|
|
115
115
|
}
|
|
116
116
|
}
|
|
117
|
-
async function validateBody(req, rule, discriminatorFn, schemas) {
|
|
117
|
+
async function validateBody(req, rule, discriminatorFn, schemas, features) {
|
|
118
118
|
const body = req.body;
|
|
119
119
|
const contentType = (req.headers['content-type'] ?? 'application/json').split(';')[0];
|
|
120
120
|
const expectedSchema = rule.content[contentType]?.schema;
|
|
@@ -128,7 +128,7 @@ async function validateBody(req, rule, discriminatorFn, schemas) {
|
|
|
128
128
|
}
|
|
129
129
|
if (discriminatorFn) {
|
|
130
130
|
const schemaName = await discriminatorFn(req);
|
|
131
|
-
const validationResult = validateAndParseValueAgainstSchema('body', body, { $ref: (0, resolve_1.buildRef)(schemaName) }, schemas);
|
|
131
|
+
const validationResult = validateAndParseValueAgainstSchema('body', body, { $ref: (0, resolve_1.buildRef)(schemaName) }, schemas, features, "unknown");
|
|
132
132
|
if (validationResult.succeed) {
|
|
133
133
|
return validationResult.value;
|
|
134
134
|
}
|
|
@@ -143,7 +143,7 @@ async function validateBody(req, rule, discriminatorFn, schemas) {
|
|
|
143
143
|
[fieldPath]: errorField
|
|
144
144
|
}, validationResult.errorMessage);
|
|
145
145
|
}
|
|
146
|
-
const validationResult = validateAndParseValueAgainstSchema('body', body, expectedSchema, schemas);
|
|
146
|
+
const validationResult = validateAndParseValueAgainstSchema('body', body, expectedSchema, schemas, features, "unknown");
|
|
147
147
|
if (validationResult.succeed) {
|
|
148
148
|
return validationResult.value;
|
|
149
149
|
}
|
|
@@ -185,7 +185,7 @@ function getNestedValue(obj, path) {
|
|
|
185
185
|
}
|
|
186
186
|
return current;
|
|
187
187
|
}
|
|
188
|
-
function validateAndParseValueAgainstSchema(name, value, schema, schemas) {
|
|
188
|
+
function validateAndParseValueAgainstSchema(name, value, schema, schemas, features, parentType) {
|
|
189
189
|
const currentSchema = getFromRef(schema, schemas);
|
|
190
190
|
// Nullable
|
|
191
191
|
if (value === null) {
|
|
@@ -274,7 +274,7 @@ function validateAndParseValueAgainstSchema(name, value, schema, schemas) {
|
|
|
274
274
|
if (typeof currentSchema.maxItems !== 'undefined' && value.length > currentSchema.maxItems) {
|
|
275
275
|
return { succeed: false, errorMessage: `This property can have ${currentSchema.maxItems} items maximum`, fieldName: name };
|
|
276
276
|
}
|
|
277
|
-
const values = value.map((item, i) => validateAndParseValueAgainstSchema(`${name}.${i}`, item, currentSchema.items, schemas));
|
|
277
|
+
const values = value.map((item, i) => validateAndParseValueAgainstSchema(`${name}.${i}`, item, currentSchema.items, schemas, features, "array"));
|
|
278
278
|
const everyItemIsGood = values.every(value => value.succeed);
|
|
279
279
|
const firstFailure = values.find(value => value.succeed === false);
|
|
280
280
|
return everyItemIsGood ? { succeed: true, value: values.map(({ value }) => value) } : { succeed: false, errorMessage: firstFailure?.errorMessage ?? '', fieldName: firstFailure?.fieldName ?? name };
|
|
@@ -299,7 +299,7 @@ function validateAndParseValueAgainstSchema(name, value, schema, schemas) {
|
|
|
299
299
|
return { succeed: false, errorMessage: `Property ${propName} is required`, fieldName: `${name}.${propName}` };
|
|
300
300
|
}
|
|
301
301
|
if (isNotDefined === false) {
|
|
302
|
-
const validationResult = validateAndParseValueAgainstSchema(`${name}.${propName}`, propValue, currentSchema.properties[propName], schemas);
|
|
302
|
+
const validationResult = validateAndParseValueAgainstSchema(`${name}.${propName}`, propValue, currentSchema.properties[propName], schemas, features, "unknown");
|
|
303
303
|
if (!validationResult.succeed) {
|
|
304
304
|
return validationResult;
|
|
305
305
|
}
|
|
@@ -312,37 +312,55 @@ function validateAndParseValueAgainstSchema(name, value, schema, schemas) {
|
|
|
312
312
|
}
|
|
313
313
|
}
|
|
314
314
|
}
|
|
315
|
-
//
|
|
316
|
-
|
|
315
|
+
// Check for additional properties
|
|
316
|
+
// Compare against schema property names (excluding readOnly) to identify additional keys
|
|
317
|
+
const additionalKeys = Object.keys(value).filter(key => propertyNames.includes(key) === false);
|
|
318
|
+
if (features.enableThrowOnUnexpectedAdditionalData && currentSchema.additionalProperties === false) {
|
|
319
|
+
if (additionalKeys.length > 0) {
|
|
320
|
+
return {
|
|
321
|
+
succeed: false,
|
|
322
|
+
errorMessage: `Additional properties are not allowed. Found: ${additionalKeys.join(', ')}`,
|
|
323
|
+
fieldName: name
|
|
324
|
+
};
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
else if (features.enableThrowOnUnexpectedAdditionalData && currentSchema.additionalProperties === true) {
|
|
328
|
+
for (const propName of additionalKeys) {
|
|
329
|
+
const propValue = value[propName];
|
|
330
|
+
if (typeof propValue !== 'undefined') {
|
|
331
|
+
filteredProperties[propName] = propValue;
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
}
|
|
335
|
+
else if (currentSchema.additionalProperties &&
|
|
317
336
|
typeof currentSchema.additionalProperties !== 'boolean') {
|
|
318
|
-
|
|
319
|
-
const
|
|
320
|
-
for (const propName of keys) {
|
|
337
|
+
// additionalProperties is a schema object - validate against it
|
|
338
|
+
for (const propName of additionalKeys) {
|
|
321
339
|
const propValue = value[propName];
|
|
322
340
|
if (typeof propValue !== 'undefined') {
|
|
323
|
-
const validationResult = validateAndParseValueAgainstSchema(`${name}.${propName}`, propValue, currentSchema.additionalProperties, schemas);
|
|
341
|
+
const validationResult = validateAndParseValueAgainstSchema(`${name}.${propName}`, propValue, currentSchema.additionalProperties, schemas, features, "unknown");
|
|
324
342
|
if (!validationResult.succeed) {
|
|
325
343
|
return validationResult;
|
|
326
344
|
}
|
|
327
345
|
filteredProperties[propName] = validationResult.value;
|
|
328
346
|
}
|
|
329
347
|
}
|
|
330
|
-
|
|
348
|
+
}
|
|
349
|
+
else {
|
|
350
|
+
if (parentType !== "allOf" && features.enableThrowOnUnexpectedAdditionalData && additionalKeys.length > 0) {
|
|
351
|
+
return {
|
|
352
|
+
succeed: false,
|
|
353
|
+
errorMessage: `Additional properties are not allowed. Found: ${additionalKeys.join(', ')}`,
|
|
354
|
+
fieldName: name
|
|
355
|
+
};
|
|
356
|
+
}
|
|
331
357
|
}
|
|
332
358
|
return { succeed: true, value: filteredProperties };
|
|
333
359
|
}
|
|
334
360
|
// AllOf
|
|
335
361
|
if (currentSchema.allOf) {
|
|
336
362
|
// try to validate every allOf and merge their results
|
|
337
|
-
const schemasValues = currentSchema.allOf.map((schema, i) => validateAndParseValueAgainstSchema(`${name}.${i}`, value, schema, schemas));
|
|
338
|
-
if (schemasValues.length === 1) {
|
|
339
|
-
return schemasValues[0].succeed ? schemasValues[0] : {
|
|
340
|
-
...schemasValues[0],
|
|
341
|
-
// When the body is { field: myKey }, it returns { fieldName: field.0.myKey }.
|
|
342
|
-
// In this case, we clean it
|
|
343
|
-
fieldName: schemasValues[0].fieldName.replace('.0.', '.')
|
|
344
|
-
};
|
|
345
|
-
}
|
|
363
|
+
const schemasValues = currentSchema.allOf.map((schema, i) => validateAndParseValueAgainstSchema(`${name}.${i}`, value, schema, schemas, features, "allOf"));
|
|
346
364
|
// Check for any failures first
|
|
347
365
|
const firstFailure = schemasValues.find(v => !v.succeed);
|
|
348
366
|
if (firstFailure) {
|
|
@@ -356,7 +374,7 @@ function validateAndParseValueAgainstSchema(name, value, schema, schemas) {
|
|
|
356
374
|
if (currentSchema.oneOf) {
|
|
357
375
|
let matchingValue;
|
|
358
376
|
currentSchema.oneOf.forEach((schema, i) => {
|
|
359
|
-
const { succeed, value: parsedValue } = validateAndParseValueAgainstSchema(`${name}.${i}`, value, schema, schemas);
|
|
377
|
+
const { succeed, value: parsedValue } = validateAndParseValueAgainstSchema(`${name}.${i}`, value, schema, schemas, features, "oneOf");
|
|
360
378
|
if (succeed) {
|
|
361
379
|
// set as matching value if we haven't found one
|
|
362
380
|
if (typeof matchingValue === 'undefined') {
|
|
@@ -397,4 +415,4 @@ function validateAndParsePattern(name, value, pattern) {
|
|
|
397
415
|
}
|
|
398
416
|
return { succeed: true, value };
|
|
399
417
|
}
|
|
400
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/runtime/validator.ts"],"names":[],"mappings":"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"}
|
|
418
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"validator.js","sourceRoot":"","sources":["../../src/runtime/validator.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,6 +22,10 @@ import { {{name}} } from '{{relativePath}}'
|
|
|
22
22
|
|
|
23
23
|
const schemas = {{json schemas}}
|
|
24
24
|
|
|
25
|
+
const features = {
|
|
26
|
+
enableThrowOnUnexpectedAdditionalData: {{features.enableThrowOnUnexpectedAdditionalData}}
|
|
27
|
+
}
|
|
28
|
+
|
|
25
29
|
export function bindToRouter (router: express.Router) {
|
|
26
30
|
{{#each controllers}}
|
|
27
31
|
{{#each methods}}
|
|
@@ -37,7 +41,8 @@ export function bindToRouter (router: express.Router) {
|
|
|
37
41
|
params: {{json params}},
|
|
38
42
|
body: {{#if body}}{{json body}}{{else}}undefined{{/if}},
|
|
39
43
|
bodyDiscriminatorFn: {{#if bodyDiscriminator}}{{bodyDiscriminator.name}}{{else}}undefined{{/if}}
|
|
40
|
-
}
|
|
44
|
+
},
|
|
45
|
+
features
|
|
41
46
|
) as any
|
|
42
47
|
)
|
|
43
48
|
{{#if validateResponse}}
|
|
@@ -46,7 +51,8 @@ export function bindToRouter (router: express.Router) {
|
|
|
46
51
|
schemas as any,
|
|
47
52
|
{{json responses}},
|
|
48
53
|
('getStatus' in controller ? (controller as any).getStatus()?.toString() : undefined) ?? (typeof data !== 'undefined' && data !== null ? '200' : '204'),
|
|
49
|
-
((('getHeaders' in controller ? (controller as any).getHeaders()?.['content-type'] : undefined) ?? '{{contentType}}')).split(';')[0]
|
|
54
|
+
((('getHeaders' in controller ? (controller as any).getHeaders()?.['content-type'] : undefined) ?? '{{contentType}}')).split(';')[0],
|
|
55
|
+
features
|
|
50
56
|
)
|
|
51
57
|
RuntimeResponse.send(controller, validatedData, res, '{{contentType}}')
|
|
52
58
|
{{else}}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "typoa",
|
|
3
|
-
"version": "1.0.0-alpha.
|
|
3
|
+
"version": "1.0.0-alpha.63",
|
|
4
4
|
"author": "Eywek <contact@eywek.fr>",
|
|
5
5
|
"description": "Help you generate OpenAPI definitions via Typescript",
|
|
6
6
|
"homepage": "https://github.com/Eywek/typoa#readme",
|
|
@@ -21,31 +21,31 @@
|
|
|
21
21
|
"node": ">=18.15.0"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@types/debug": "
|
|
25
|
-
"@types/express": "
|
|
26
|
-
"@types/node": "
|
|
27
|
-
"@types/supertest": "
|
|
28
|
-
"@types/yamljs": "
|
|
29
|
-
"@typescript-eslint/eslint-plugin": "
|
|
30
|
-
"@typescript-eslint/parser": "
|
|
31
|
-
"body-parser": "
|
|
24
|
+
"@types/debug": "4.1.12",
|
|
25
|
+
"@types/express": "5.0.6",
|
|
26
|
+
"@types/node": "25.0.9",
|
|
27
|
+
"@types/supertest": "6.0.3",
|
|
28
|
+
"@types/yamljs": "0.2.34",
|
|
29
|
+
"@typescript-eslint/eslint-plugin": "8.53.0",
|
|
30
|
+
"@typescript-eslint/parser": "8.53.0",
|
|
31
|
+
"body-parser": "1.19.0",
|
|
32
32
|
"eslint": "9.39.2",
|
|
33
33
|
"eslint-config-standard": "17.1.0",
|
|
34
|
-
"eslint-plugin-prettier": "5.5.
|
|
34
|
+
"eslint-plugin-prettier": "5.5.5",
|
|
35
35
|
"eslint-plugin-unicorn": "62.0.0",
|
|
36
|
-
"express": "
|
|
37
|
-
"openapi-types": "
|
|
38
|
-
"prettier": "3.
|
|
39
|
-
"supertest": "
|
|
40
|
-
"typescript": "
|
|
41
|
-
"typescript-eslint": "8.
|
|
36
|
+
"express": "4.17.1",
|
|
37
|
+
"openapi-types": "12.1.3",
|
|
38
|
+
"prettier": "3.8.0",
|
|
39
|
+
"supertest": "7.2.2",
|
|
40
|
+
"typescript": "5.9.3",
|
|
41
|
+
"typescript-eslint": "8.53.0"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"debug": "
|
|
45
|
-
"glob": "
|
|
46
|
-
"handlebars": "
|
|
47
|
-
"ts-morph": "
|
|
48
|
-
"yamljs": "
|
|
44
|
+
"debug": "4.4.3",
|
|
45
|
+
"glob": "13.0.0",
|
|
46
|
+
"handlebars": "4.7.8",
|
|
47
|
+
"ts-morph": "27.0.2",
|
|
48
|
+
"yamljs": "0.3.0"
|
|
49
49
|
},
|
|
50
50
|
"packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e"
|
|
51
51
|
}
|