routing-controllers-openapi - npm Package Compare versions

Comparing version 1.8.1 to 2.0.0-rc1

__tests__/index.test.ts

 // tslint:disable:no-implicit-dependencies no-submodule-imports
 import { defaultMetadataStorage } from 'class-transformer/storage'
-import { getFromContainer, MetadataStorage } from 'class-validator'
 import { validationMetadatasToSchemas } from 'class-validator-jsonschema'
@@ -33,5 +32,3 @@ import * as _ from 'lodash'
     // Include component schemas parsed with class-validator-jsonschema:
-    const metadatas = (getFromContainer(MetadataStorage) as any)
-      .validationMetadatas
-    const schemas = validationMetadatasToSchemas(metadatas, {
+    const schemas = validationMetadatasToSchemas({
       classTransformerMetadataStorage: defaultMetadataStorage,
@@ -38,0 +35,0 @@ refPointerPrefix: '#/components/schemas/'

build/decorators.js

@@ -26,3 +26,3 @@ "use strict";
         ...getOpenAPIMetadata(action.target),
-        ...getOpenAPIMetadata(action.target.prototype, action.method)
+        ...getOpenAPIMetadata(action.target.prototype, action.method),
     ];
@@ -61,3 +61,3 @@ return openAPIParams.reduce((acc, oaParam) => {
             const reference = {
-                $ref: `#/components/schemas/${responseSchemaName}`
+                $ref: `#/components/schemas/${responseSchemaName}`,
             };
@@ -71,7 +71,7 @@ const schema = isArray
                         [contentType]: {
-                            schema
-                        }
+                            schema,
+                        },
                     },
-                    description
-                }
+                    description,
+                },
             };
@@ -78,0 +78,0 @@ return _.merge({}, source, { responses });

build/generateSpec.js

@@ -24,3 +24,3 @@ "use strict";
             ...getPathParams(route),
-            ...getQueryParams(route)
+            ...getQueryParams(route),
         ],
@@ -30,3 +30,3 @@ requestBody: getRequestBody(route) || undefined,
         summary: getSummary(route),
-        tags: getTags(route)
+        tags: getTags(route),
     };
@@ -42,6 +42,6 @@ const cleanedOperation = _.omitBy(operation, _.isEmpty);
 function getPaths(routes) {
-    const routePaths = routes.map(route => ({
+    const routePaths = routes.map((route) => ({
         [getFullPath(route)]: {
-            [route.action.type]: getOperation(route)
-        }
+            [route.action.type]: getOperation(route),
+        },
     }));
@@ -54,3 +54,3 @@ return _.merge(...routePaths);
         .filter({ type: 'header' })
-        .map(headerMeta => {
+        .map((headerMeta) => {
         const schema = getParamSchema(headerMeta);
@@ -61,3 +61,3 @@ return {
             required: isRequired(headerMeta, route),
-            schema
+            schema,
         };
@@ -73,3 +73,3 @@ })
             required: isRequired(headersMeta, route),
-            schema
+            schema,
         });
@@ -91,3 +91,3 @@ }
             required: !token.optional,
-            schema: { type: 'string' }
+            schema: { type: 'string' },
         };
@@ -110,3 +110,3 @@ if (token.pattern && token.pattern !== '[^\\/]+?') {
         .filter({ type: 'query' })
-        .map(queryMeta => {
+        .map((queryMeta) => {
         const schema = getParamSchema(queryMeta);
@@ -117,3 +117,3 @@ return {
             required: isRequired(queryMeta, route),
-            schema
+            schema,
         };
@@ -129,3 +129,3 @@ })
             required: isRequired(queriesMeta, route),
-            schema
+            schema,
         });
@@ -137,3 +137,3 @@ }
 function getRequestBody(route) {
-    const bodyParamMetas = route.params.filter(d => d.type === 'body-param');
+    const bodyParamMetas = route.params.filter((d) => d.type === 'body-param');
     const bodyParamsSchema = bodyParamMetas.length > 0
@@ -144,3 +144,3 @@ ? bodyParamMetas.reduce((acc, d) => (Object.assign(Object.assign({}, acc), { properties: Object.assign(Object.assign({}, acc.properties), { [d.name]: getParamSchema(d) }), required: isRequired(d, route)
         : null;
-    const bodyMeta = route.params.find(d => d.type === 'body');
+    const bodyMeta = route.params.find((d) => d.type === 'body');
     if (bodyMeta) {
@@ -154,7 +154,7 @@ const bodySchema = getParamSchema(bodyMeta);
                         ? { allOf: [bodySchema, bodyParamsSchema] }
-                        : bodySchema
-                }
+                        : bodySchema,
+                },
             },
             description: _.last(_.split($ref, '/')),
-            required: isRequired(bodyMeta, route)
+            required: isRequired(bodyMeta, route),
         };
@@ -164,3 +164,3 @@ }
         return {
-            content: { 'application/json': { schema: bodyParamsSchema } }
+            content: { 'application/json': { schema: bodyParamsSchema } },
         };
@@ -189,4 +189,4 @@ }
             content: { [contentType]: {} },
-            description: 'Successful response'
-        }
+            description: 'Successful response',
+        },
     };
@@ -200,3 +200,3 @@ }
         openapi: '3.0.0',
-        paths: getPaths(routes)
+        paths: getPaths(routes),
     };
@@ -216,3 +216,3 @@ }
     return tokens
-        .map(d => (_.isString(d) ? d : `${d.prefix}{${d.name}}`))
+        .map((d) => (_.isString(d) ? d : `${d.prefix}{${d.name}}`))
         .join('');
@@ -253,2 +253,2 @@ }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generateSpec.js","sourceRoot":"","sources":["../src/generateSpec.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"generateSpec.js","sourceRoot":"","sources":["../src/generateSpec.ts"],"names":[],"mappings":";;AACA,4BAA2B;AAE3B,+CAA8C;AAC9C,4BAAyB;AAGzB,6CAAoD;AAIpD,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAC7C,OAAO,CACL,CAAC,OAAO,CAAC,WAAW,IAAI,EAAE,CAAC;QAC3B,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE,CAAC;QACxB,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CACrB,CAAA;AACH,CAAC;AAPD,gDAOC;AAKD,SAAgB,WAAW,CAAC,KAAa;IACvC,OAAO,oBAAoB,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAAA;AACxD,CAAC;AAFD,kCAEC;AAKD,SAAgB,YAAY,CAAC,KAAa;IACxC,MAAM,SAAS,GAAuB;QACpC,WAAW,EAAE,cAAc,CAAC,KAAK,CAAC;QAClC,UAAU,EAAE;YACV,GAAG,eAAe,CAAC,KAAK,CAAC;YACzB,GAAG,aAAa,CAAC,KAAK,CAAC;YACvB,GAAG,cAAc,CAAC,KAAK,CAAC;SACzB;QACD,WAAW,EAAE,cAAc,CAAC,KAAK,CAAC,IAAI,SAAS;QAC/C,SAAS,EAAE,YAAY,CAAC,KAAK,CAAC;QAC9B,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC;QAC1B,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC;KACrB,CAAA;IAED,MAAM,gBAAgB,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC,CAAC,OAAO,CAAuB,CAAA;IAC7E,OAAO,kCAAqB,CAAC,gBAAgB,EAAE,KAAK,CAAC,CAAA;AACvD,CAAC;AAhBD,oCAgBC;AAKD,SAAgB,cAAc,CAAC,KAAa;IAC1C,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,CAAA;AAC7D,CAAC;AAFD,wCAEC;AAKD,SAAgB,QAAQ,CAAC,MAAgB;IACvC,MAAM,UAAU,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QACxC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,EAAE;YACpB,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,YAAY,CAAC,KAAK,CAAC;SACzC;KACF,CAAC,CAAC,CAAA;IAGH,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC,CAAA;AAC/B,CAAC;AATD,4BASC;AAKD,SAAgB,eAAe,CAAC,KAAa;IAC3C,MAAM,OAAO,GAAyB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;SAClD,MAAM,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC;SAC1B,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE;QAClB,MAAM,MAAM,GAAG,cAAc,CAAC,UAAU,CAAoB,CAAA;QAC5D,OAAO;YACL,EAAE,EAAE,QAAgC;YACpC,IAAI,EAAE,UAAU,CAAC,IAAI,IAAI,EAAE;YAC3B,QAAQ,EAAE,UAAU,CAAC,UAAU,EAAE,KAAK,CAAC;YACvC,MAAM;SACP,CAAA;IACH,CAAC,CAAC;SACD,KAAK,EAAE,CAAA;IAEV,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAC7D,IAAI,WAAW,EAAE;QACf,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAuB,CAAA;QAChE,OAAO,CAAC,IAAI,CAAC;YACX,EAAE,EAAE,QAAQ;YACZ,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE;YAC7C,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC;YACxC,MAAM;SACP,CAAC,CAAA;KACH;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AA1BD,0CA0BC;AAQD,SAAgB,aAAa,CAAC,KAAa;IACzC,MAAM,IAAI,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAA;IACtC,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAEvC,OAAO,MAAM;SACV,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;SAClB,GAAG,CAAC,CAAC,KAAuB,EAAE,EAAE;QAC/B,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,GAAG,EAAE,CAAA;QAC5B,MAAM,KAAK,GAAuB;YAChC,EAAE,EAAE,MAAM;YACV,IAAI;YACJ,QAAQ,EAAE,CAAC,KAAK,CAAC,QAAQ;YACzB,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;SAC3B,CAAA;QAED,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,UAAU,EAAE;YACjD,KAAK,CAAC,MAAM,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;SAC1D;QAED,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAA;QAC1D,IAAI,IAAI,EAAE;YACR,MAAM,UAAU,GAAG,cAAc,CAAC,IAAI,CAAC,CAAA;YACvC,KAAK,CAAC,MAAM;gBACV,MAAM,IAAI,UAAU,CAAC,CAAC,iCAAM,KAAK,CAAC,MAAM,GAAK,UAAU,EAAG,CAAC,CAAC,UAAU,CAAA;SACzE;QAED,OAAO,KAAK,CAAA;IACd,CAAC,CAAC,CAAA;AACN,CAAC;AA5BD,sCA4BC;AAKD,SAAgB,cAAc,CAAC,KAAa;IAC1C,MAAM,OAAO,GAAyB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC;SAClD,MAAM,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC;SACzB,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE;QACjB,MAAM,MAAM,GAAG,cAAc,CAAC,SAAS,CAAoB,CAAA;QAC3D,OAAO;YACL,EAAE,EAAE,OAA+B;YACnC,IAAI,EAAE,SAAS,CAAC,IAAI,IAAI,EAAE;YAC1B,QAAQ,EAAE,UAAU,CAAC,SAAS,EAAE,KAAK,CAAC;YACtC,MAAM;SACP,CAAA;IACH,CAAC,CAAC;SACD,KAAK,EAAE,CAAA;IAEV,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAA;IAC7D,IAAI,WAAW,EAAE;QACf,MAAM,MAAM,GAAG,cAAc,CAAC,WAAW,CAAuB,CAAA;QAChE,OAAO,CAAC,IAAI,CAAC;YACX,EAAE,EAAE,OAAO;YACX,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE;YAC7C,QAAQ,EAAE,UAAU,CAAC,WAAW,EAAE,KAAK,CAAC;YACxC,MAAM;SACP,CAAC,CAAA;KACH;IAED,OAAO,OAAO,CAAA;AAChB,CAAC;AA1BD,wCA0BC;AAKD,SAAgB,cAAc,CAAC,KAAa;IAC1C,MAAM,cAAc,GAAG,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAA;IAC1E,MAAM,gBAAgB,GACpB,cAAc,CAAC,MAAM,GAAG,CAAC;QACvB,CAAC,CAAC,cAAc,CAAC,MAAM,CACnB,CAAC,GAAoB,EAAE,CAAC,EAAE,EAAE,CAAC,iCACxB,GAAG,KACN,UAAU,kCACL,GAAG,CAAC,UAAU,KACjB,CAAC,CAAC,CAAC,IAAK,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,KAE9B,QAAQ,EAAE,UAAU,CAAC,CAAC,EAAE,KAAK,CAAC;gBAC5B,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,IAAK,CAAC;gBACpC,CAAC,CAAC,GAAG,CAAC,QAAQ,IAChB,EACF,EAAE,UAAU,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CACjD;QACH,CAAC,CAAC,IAAI,CAAA;IAEV,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;IAE5D,IAAI,QAAQ,EAAE;QACZ,MAAM,UAAU,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAA;QAC3C,MAAM,EAAE,IAAI,EAAE,GACZ,OAAO,IAAI,UAAU,IAAI,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAA;QAE3E,OAAO;YACL,OAAO,EAAE;gBACP,kBAAkB,EAAE;oBAClB,MAAM,EAAE,gBAAgB;wBACtB,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,UAAU,EAAE,gBAAgB,CAAC,EAAE;wBAC3C,CAAC,CAAC,UAAU;iBACf;aACF;YACD,WAAW,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;YACvC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,KAAK,CAAC;SACtC,CAAA;KACF;SAAM,IAAI,gBAAgB,EAAE;QAC3B,OAAO;YACL,OAAO,EAAE,EAAE,kBAAkB,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,EAAE;SAC9D,CAAA;KACF;AACH,CAAC;AA1CD,wCA0CC;AAKD,SAAgB,cAAc,CAAC,KAAa;IAC1C,MAAM,kBAAkB,GACtB,KAAK,CAAC,UAAU,CAAC,IAAI,KAAK,MAAM;QAC9B,CAAC,CAAC,kBAAkB;QACpB,CAAC,CAAC,0BAA0B,CAAA;IAChC,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;IAC5E,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,kBAAkB,CAAA;AAC7D,CAAC;AAPD,wCAOC;AAKD,SAAgB,aAAa,CAAC,KAAa;IACzC,MAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,gBAAgB,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,CAAC,CAAA;IAC5E,OAAO,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAAA;AACrD,CAAC;AAHD,sCAGC;AAKD,SAAgB,YAAY,CAAC,KAAa;IACxC,MAAM,WAAW,GAAG,cAAc,CAAC,KAAK,CAAC,CAAA;IACzC,MAAM,aAAa,GAAG,aAAa,CAAC,KAAK,CAAC,CAAA;IAE1C,OAAO;QACL,CAAC,aAAa,CAAC,EAAE;YACf,OAAO,EAAE,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE;YAC9B,WAAW,EAAE,qBAAqB;SACnC;KACF,CAAA;AACH,CAAC;AAVD,oCAUC;AAKD,SAAgB,OAAO,CAAC,MAAgB;IACtC,OAAO;QACL,UAAU,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC3B,IAAI,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE;QACrC,OAAO,EAAE,OAAO;QAChB,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC;KACxB,CAAA;AACH,CAAC;AAPD,0BAOC;AAKD,SAAgB,UAAU,CAAC,KAAa;IACtC,OAAO,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;AACvD,CAAC;AAFD,gCAEC;AAKD,SAAgB,OAAO,CAAC,KAAa;IACnC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;AAC/E,CAAC;AAFD,0BAEC;AAKD,SAAgB,oBAAoB,CAAC,WAAmB;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,KAAK,CAAC,WAAW,CAAC,CAAA;IAC9C,OAAO,MAAM;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC;SAC1D,IAAI,CAAC,EAAE,CAAC,CAAA;AACb,CAAC;AALD,oDAKC;AAMD,SAAS,UAAU,CAAC,IAA4B,EAAE,KAAa;IAC7D,MAAM,cAAc,GAAG,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,OAAO,EAAE,gCAAgC,CAAC,CAAA;IAC7E,OAAO,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAA;AACnE,CAAC;AAMD,SAAS,cAAc,CACrB,KAAwB;IAExB,MAAM,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;IAErD,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,mBAAmB,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAA;IAC5E,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE;QAC/C,MAAM,KAAK,GAAG,YAAY;YACxB,CAAC,CAAC,EAAE,IAAI,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,EAAE;YACvD,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;QACtB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,CAAA;KAChC;IACD,IAAI,YAAY,EAAE;QAChB,OAAO,EAAE,IAAI,EAAE,uBAAuB,GAAG,YAAY,CAAC,IAAI,EAAE,CAAA;KAC7D;IACD,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACtB,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YAC5D,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;SAC1B;aAAM,IAAI,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACrC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAA;SAC1B;aAAM,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE;YACtC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,CAAA;SAC3B;aAAM,IAAI,IAAI,CAAC,IAAI,KAAK,QAAQ,EAAE;YACjC,OAAO,EAAE,IAAI,EAAE,uBAAuB,GAAG,IAAI,CAAC,IAAI,EAAE,CAAA;SACrD;KACF;IAED,OAAO,EAAE,CAAA;AACX,CAAC"}

build/parseMetadata.js

@@ -5,13 +5,13 @@ "use strict";
 function parseRoutes(storage, options = {}) {
-    return storage.actions.map(action => ({
+    return storage.actions.map((action) => ({
         action,
         controller: _.find(storage.controllers, {
-            target: action.target
+            target: action.target,
         }),
         options,
         params: _.sortBy(storage.filterParamsWithTargetAndMethod(action.target, action.method), 'index'),
-        responseHandlers: storage.filterResponseHandlersWithTargetAndMethod(action.target, action.method)
+        responseHandlers: storage.filterResponseHandlersWithTargetAndMethod(action.target, action.method),
     }));
 }
 exports.parseRoutes = parseRoutes;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2VNZXRhZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wYXJzZU1ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTJCO0FBd0IzQixTQUFnQixXQUFXLENBQ3pCLE9BQTRCLEVBQzVCLFVBQXFDLEVBQUU7SUFFdkMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUM7UUFDcEMsTUFBTTtRQUNOLFVBQVUsRUFBRSxDQUFDLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxXQUFXLEVBQUU7WUFDdEMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNO1NBQ3RCLENBQTJCO1FBQzVCLE9BQU87UUFDUCxNQUFNLEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FDZCxPQUFPLENBQUMsK0JBQStCLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQ3JFLE9BQU8sQ0FDUjtRQUNELGdCQUFnQixFQUFFLE9BQU8sQ0FBQyx5Q0FBeUMsQ0FDakUsTUFBTSxDQUFDLE1BQU0sRUFDYixNQUFNLENBQUMsTUFBTSxDQUNkO0tBQ0YsQ0FBQyxDQUFDLENBQUE7QUFDTCxDQUFDO0FBbkJELGtDQW1CQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicGFyc2VNZXRhZGF0YS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3NyYy9wYXJzZU1ldGFkYXRhLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQ0EsNEJBQTJCO0FBd0IzQixTQUFnQixXQUFXLENBQ3pCLE9BQTRCLEVBQzVCLFVBQXFDLEVBQUU7SUFFdkMsT0FBTyxPQUFPLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFLENBQUMsQ0FBQztRQUN0QyxNQUFNO1FBQ04sVUFBVSxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFdBQVcsRUFBRTtZQUN0QyxNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07U0FDdEIsQ0FBMkI7UUFDNUIsT0FBTztRQUNQLE1BQU0sRUFBRSxDQUFDLENBQUMsTUFBTSxDQUNkLE9BQU8sQ0FBQywrQkFBK0IsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFDckUsT0FBTyxDQUNSO1FBQ0QsZ0JBQWdCLEVBQUUsT0FBTyxDQUFDLHlDQUF5QyxDQUNqRSxNQUFNLENBQUMsTUFBTSxFQUNiLE1BQU0sQ0FBQyxNQUFNLENBQ2Q7S0FDRixDQUFDLENBQUMsQ0FBQTtBQUNMLENBQUM7QUFuQkQsa0NBbUJDIn0=

CHANGELOG.md

@@ -7,2 +7,6 @@ # Changelog
 
+## [2.0.0-rc1] - 2020-05-01
+### Changed
+- Bump `class-validator` peer dependency to `^0.12.0` - meaning we're no longer compatible with pre-0.12 versions of `class-validator`!
+
 ## [1.8.1] - 2020-04-10
@@ -9,0 +13,0 @@ ### Fixed

package.json

 {
   "name": "routing-controllers-openapi",
-  "version": "1.8.1",
+  "version": "2.0.0-rc1",
   "description": "Runtime OpenAPI v3 spec generation for routing-controllers",
@@ -20,4 +20,5 @@ "keywords": [
     "format": "prettier --write {src,test}/**/*.ts",
+    "test:format": "prettier --check {src,test}/**/*.ts",
     "lint": "tslint --project . src/**/*.ts",
-    "prepare": "install-self-peers -- --ignore-scripts && yarn build",
+    "prepare": "install-self-peers -- --frozen-lockfile --ignore-scripts && yarn build",
     "send-coverage": "codecov -f coverage/*.json",
@@ -40,20 +41,20 @@ "test": "jest --coverage",
     "@team-griffin/install-self-peers": "^1.1.1",
-    "@types/jest": "^24.0.23",
-    "@types/lodash": "^4.14.149",
-    "@types/node": "^12.12.14",
-    "@types/prettier": "^1.19.0",
+    "@types/jest": "^25.2.1",
+    "@types/lodash": "^4.14.150",
+    "@types/node": "^13.13.4",
+    "@types/prettier": "^2.0.0",
     "@types/reflect-metadata": "^0.1.0",
-    "@types/rimraf": "^2.0.3",
+    "@types/rimraf": "^3.0.0",
     "class-transformer": "^0.2.3",
-    "class-validator": "^0.11.0",
-    "class-validator-jsonschema": "^1.3.0",
+    "class-validator": "^0.12.2",
+    "class-validator-jsonschema": "^2.0.0-rc1",
     "codecov": "^3.6.1",
-    "jest": "^24.9.0",
-    "prettier": "^1.19.1",
-    "rimraf": "^3.0.0",
-    "ts-jest": "^24.2.0",
-    "tslint": "^5.20.1",
+    "jest": "^25.5.3",
+    "prettier": "^2.0.5",
+    "rimraf": "^3.0.2",
+    "ts-jest": "^25.4.0",
+    "tslint": "^6.1.2",
     "tslint-config-prettier": "^1.18.0",
     "tslint-config-standard": "^9.0.0",
-    "typescript": "^3.7.2"
+    "typescript": "^3.8.3"
   },
@@ -60,0 +61,0 @@ "peerDependencies": {

README.md

@@ -138,3 +138,3 @@ # routing-controllers-openapi
 
-const schemas = validationMetadatasToSchemas(metadatas, {
+const schemas = validationMetadatasToSchemas({
   refPointerPrefix: '#/components/schemas/'
@@ -141,0 +141,0 @@ })

sample/01-basic/app.ts

 import 'reflect-metadata'
-import { getFromContainer, MetadataStorage } from 'class-validator' // tslint:disable-line
 import { validationMetadatasToSchemas } from 'class-validator-jsonschema'
@@ -20,4 +19,3 @@ import { Express } from 'express'
 // Parse class-validator classes into JSON Schema:
-const metadatas = (getFromContainer(MetadataStorage) as any).validationMetadatas
-const schemas = validationMetadatasToSchemas(metadatas, {
+const schemas = validationMetadatasToSchemas({
   refPointerPrefix: '#/components/schemas/'
@@ -24,0 +22,0 @@ })

sample/01-basic/package.json

@@ -16,7 +16,7 @@ {
     "body-parser": "^1.18.3",
-    "class-validator": "^0.11.0",
-    "class-validator-jsonschema": "^1.3.0",
+    "class-validator": "^0.12.2",
+    "class-validator-jsonschema": "^2.0.0-rc1",
     "express": "^4.16.3",
     "reflect-metadata": "^0.1.13",
-    "routing-controllers": "^0.8.0",
+    "routing-controllers": "^0.8.1",
     "routing-controllers-openapi": "../.."
@@ -23,0 +23,0 @@ },

src/decorators.ts

@@ -6,3 +6,3 @@ import * as _ from 'lodash'
   ResponsesObject,
-  SchemaObject
+  SchemaObject,
 } from 'openapi3-ts'
@@ -53,3 +53,3 @@ import 'reflect-metadata'
     ...getOpenAPIMetadata(action.target),
-    ...getOpenAPIMetadata(action.target.prototype, action.method)
+    ...getOpenAPIMetadata(action.target.prototype, action.method),
   ]
@@ -115,3 +115,3 @@
       const reference: ReferenceObject = {
-        $ref: `#/components/schemas/${responseSchemaName}`
+        $ref: `#/components/schemas/${responseSchemaName}`,
       }
@@ -125,7 +125,7 @@ const schema: SchemaObject = isArray
             [contentType]: {
-              schema
-            }
+              schema,
+            },
           },
-          description
-        }
+          description,
+        },
       }
@@ -132,0 +132,0 @@

src/generateSpec.ts

@@ -37,3 +37,3 @@ // tslint:disable:no-submodule-imports
       ...getPathParams(route),
-      ...getQueryParams(route)
+      ...getQueryParams(route),
     ],
@@ -43,3 +43,3 @@ requestBody: getRequestBody(route) || undefined,
     summary: getSummary(route),
-    tags: getTags(route)
+    tags: getTags(route),
   }
@@ -62,6 +62,6 @@
 export function getPaths(routes: IRoute[]): oa.PathObject {
-  const routePaths = routes.map(route => ({
+  const routePaths = routes.map((route) => ({
     [getFullPath(route)]: {
-      [route.action.type]: getOperation(route)
-    }
+      [route.action.type]: getOperation(route),
+    },
   }))
@@ -79,3 +79,3 @@
     .filter({ type: 'header' })
-    .map(headerMeta => {
+    .map((headerMeta) => {
       const schema = getParamSchema(headerMeta) as oa.SchemaObject
@@ -86,3 +86,3 @@ return {
         required: isRequired(headerMeta, route),
-        schema
+        schema,
       }
@@ -99,3 +99,3 @@ })
       required: isRequired(headersMeta, route),
-      schema
+      schema,
     })
@@ -125,3 +125,3 @@ }
         required: !token.optional,
-        schema: { type: 'string' }
+        schema: { type: 'string' },
       }
@@ -150,3 +150,3 @@
     .filter({ type: 'query' })
-    .map(queryMeta => {
+    .map((queryMeta) => {
       const schema = getParamSchema(queryMeta) as oa.SchemaObject
@@ -157,3 +157,3 @@ return {
         required: isRequired(queryMeta, route),
-        schema
+        schema,
       }
@@ -170,3 +170,3 @@ })
       required: isRequired(queriesMeta, route),
-      schema
+      schema,
     })
@@ -182,3 +182,3 @@ }
 export function getRequestBody(route: IRoute): oa.RequestBodyObject | void {
-  const bodyParamMetas = route.params.filter(d => d.type === 'body-param')
+  const bodyParamMetas = route.params.filter((d) => d.type === 'body-param')
   const bodyParamsSchema: oa.SchemaObject | null =
@@ -191,7 +191,7 @@ bodyParamMetas.length > 0
               ...acc.properties,
-              [d.name!]: getParamSchema(d)
+              [d.name!]: getParamSchema(d),
             },
             required: isRequired(d, route)
               ? [...(acc.required || []), d.name!]
-              : acc.required
+              : acc.required,
           }),
@@ -202,3 +202,3 @@ { properties: {}, required: [], type: 'object' }
 
-  const bodyMeta = route.params.find(d => d.type === 'body')
+  const bodyMeta = route.params.find((d) => d.type === 'body')
 
@@ -215,11 +215,11 @@ if (bodyMeta) {
             ? { allOf: [bodySchema, bodyParamsSchema] }
-            : bodySchema
-        }
+            : bodySchema,
+        },
       },
       description: _.last(_.split($ref, '/')),
-      required: isRequired(bodyMeta, route)
+      required: isRequired(bodyMeta, route),
     }
   } else if (bodyParamsSchema) {
     return {
-      content: { 'application/json': { schema: bodyParamsSchema } }
+      content: { 'application/json': { schema: bodyParamsSchema } },
     }
@@ -259,4 +259,4 @@ }
       content: { [contentType]: {} },
-      description: 'Successful response'
-    }
+      description: 'Successful response',
+    },
   }
@@ -273,3 +273,3 @@ }
     openapi: '3.0.0',
-    paths: getPaths(routes)
+    paths: getPaths(routes),
   }
@@ -298,3 +298,3 @@ }
   return tokens
-    .map(d => (_.isString(d) ? d : `${d.prefix}{${d.name}}`))
+    .map((d) => (_.isString(d) ? d : `${d.prefix}{${d.name}}`))
     .join('')
@@ -301,0 +301,0 @@ }

src/index.ts

@@ -5,3 +5,3 @@ import * as _ from 'lodash'
   MetadataArgsStorage,
-  RoutingControllersOptions
+  RoutingControllersOptions,
 } from 'routing-controllers'
@@ -8,0 +8,0 @@

src/parseMetadata.ts

@@ -5,3 +5,3 @@ // tslint:disable:no-submodule-imports
   MetadataArgsStorage,
-  RoutingControllersOptions
+  RoutingControllersOptions,
 } from 'routing-controllers'
@@ -31,6 +31,6 @@ import { ActionMetadataArgs } from 'routing-controllers/metadata/args/ActionMetadataArgs'
 ): IRoute[] {
-  return storage.actions.map(action => ({
+  return storage.actions.map((action) => ({
     action,
     controller: _.find(storage.controllers, {
-      target: action.target
+      target: action.target,
     }) as ControllerMetadataArgs,
@@ -45,4 +45,4 @@ options,
       action.method
-    )
+    ),
   }))
 }

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

185639

0.3%

Worsened metrics

Lines of code

2946

-0.17%

Number of low quality alerts

2

100%

No dependency changes