@nmshd/typescript-rest 3.2.2 → 3.2.3
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/.ci/runChecks.sh +1 -1
- package/.github/dependabot.yml +0 -4
- package/dist/server/server.js +5 -3
- package/dist/server/server.js.map +1 -1
- package/package.json +5 -6
- package/src/server/server.ts +7 -3
package/.ci/runChecks.sh
CHANGED
package/.github/dependabot.yml
CHANGED
|
@@ -8,8 +8,6 @@ updates:
|
|
|
8
8
|
update-github-actions-dependencies:
|
|
9
9
|
patterns:
|
|
10
10
|
- '*'
|
|
11
|
-
reviewers:
|
|
12
|
-
- 'jkoenig134'
|
|
13
11
|
labels:
|
|
14
12
|
- 'dependencies'
|
|
15
13
|
|
|
@@ -21,7 +19,5 @@ updates:
|
|
|
21
19
|
update-npm-dependencies:
|
|
22
20
|
patterns:
|
|
23
21
|
- '*'
|
|
24
|
-
reviewers:
|
|
25
|
-
- 'jkoenig134'
|
|
26
22
|
labels:
|
|
27
23
|
- 'dependencies'
|
package/dist/server/server.js
CHANGED
|
@@ -6,7 +6,7 @@ const fs = require("fs-extra");
|
|
|
6
6
|
const _ = require("lodash");
|
|
7
7
|
require("multer");
|
|
8
8
|
const path = require("path");
|
|
9
|
-
const YAML = require("
|
|
9
|
+
const YAML = require("yaml");
|
|
10
10
|
const server_container_1 = require("./server-container");
|
|
11
11
|
const serverDebugger = debug('typescript-rest:server:build');
|
|
12
12
|
/**
|
|
@@ -246,7 +246,9 @@ class Server {
|
|
|
246
246
|
});
|
|
247
247
|
router.get(path.posix.join('/', options.endpoint, 'yaml'), (req, res) => {
|
|
248
248
|
res.set('Content-Type', 'text/vnd.yaml');
|
|
249
|
-
res.send(YAML.stringify(swaggerDocument,
|
|
249
|
+
res.send(YAML.stringify(swaggerDocument, {
|
|
250
|
+
indent: 4
|
|
251
|
+
}));
|
|
250
252
|
});
|
|
251
253
|
router.use(path.posix.join('/', options.endpoint), swaggerUi.serve, swaggerUi.setup(swaggerDocument, options.swaggerUiOptions));
|
|
252
254
|
}
|
|
@@ -254,7 +256,7 @@ class Server {
|
|
|
254
256
|
static loadSwaggerDocument(options) {
|
|
255
257
|
let swaggerDocument;
|
|
256
258
|
if (_.endsWith(options.filePath, '.yml') || _.endsWith(options.filePath, '.yaml')) {
|
|
257
|
-
swaggerDocument = YAML.
|
|
259
|
+
swaggerDocument = YAML.parse(fs.readFileSync(options.filePath, 'utf8'));
|
|
258
260
|
}
|
|
259
261
|
else {
|
|
260
262
|
swaggerDocument = fs.readJSONSync(options.filePath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,+BAA+B;AAE/B,+BAA+B;AAC/B,4BAA4B;AAC5B,kBAAgB;AAChB,6BAA6B;AAC7B
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../src/server/server.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;;;AAEb,+BAA+B;AAE/B,+BAA+B;AAC/B,4BAA4B;AAC5B,kBAAgB;AAChB,6BAA6B;AAC7B,6BAA6B;AAE7B,yDAAqD;AAErD,MAAM,cAAc,GAAG,KAAK,CAAC,8BAA8B,CAAC,CAAC;AAE7D;;GAEG;AACH,MAAa,MAAM;IACf;;OAEG;IACI,MAAM,CAAC,aAAa,CAAC,MAAsB,EAAE,GAAG,KAAiB;QACpE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,4CAA4C,CAAC,CAAC;YAC7D,MAAM,eAAe,GAAG,kCAAe,CAAC,GAAG,EAAE,CAAC;YAC9C,eAAe,CAAC,MAAM,GAAG,MAAM,CAAC;YAChC,eAAe,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;IACL,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,eAAe,CAAC,MAAsB,EAAE,QAAgC,EAAE,OAAgB;QACpG,MAAM,CAAC,YAAY,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,YAAY,CAAC,MAAsB,EAAE,QAAgC,EAAE,OAAgB;QACjG,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,kDAAkD,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC;YACtF,MAAM,aAAa,GAAoB,EAAE,CAAC;YAC1C,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;YAC5C,OAAO,GAAG,OAAO,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;YACnC,MAAM,aAAa,GAAe,WAAW,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACzD,GAAG,EAAE,OAAO;aACf,CAAC,CAAC;YAEH,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,EAAE;gBAC9C,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC;qBAClB,MAAM,CAAC,CAAC,OAAiB,EAAE,EAAE,CAAC,OAAO,OAAO,KAAK,UAAU,CAAC;qBAC5D,OAAO,CAAC,CAAC,OAAiB,EAAE,EAAE;oBAC3B,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAChC,CAAC,CAAC,CAAC;YACX,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC;gBACD,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,GAAG,aAAa,CAAC,CAAC;YACnD,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACT,cAAc,CAAC,mDAAmD,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;gBACjF,cAAc,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;gBACnD,MAAM,IAAI,SAAS,CACf,uCAAuC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,OAAO,EAAE,CACzF,CAAC;YACN,CAAC;QACL,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,SAAS,CAAC,KAAc;QAClC,MAAM,CAAC,MAAM,GAAG,KAAK,CAAC;IAC1B,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,WAAW;QACrB,OAAO,MAAM,CAAC,MAAM,CAAC;IACzB,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,MAAM;QAChB,OAAO,kCAAe,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC;IACxC,CAAC;IAED;;OAEG;IACI,MAAM,CAAC,QAAQ;QAClB,MAAM,MAAM,GAAG,IAAI,KAAK,EAAU,CAAC;QACnC,kCAAe,CAAC,GAAG,EAAE;aAChB,QAAQ,EAAE;aACV,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEP,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,sBAAsB,CAAC,cAAuC;QACxE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,IAAI,OAAuB,CAAC;YAC5B,IAAI,OAAO,cAAc,KAAK,QAAQ,EAAE,CAAC;gBACrC,MAAM,GAAG,GAAG,OAAO,CAAC,cAAc,CAAC,CAAC;gBACpC,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9C,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,cAAc,CAAC;YAC7B,CAAC;YAED,cAAc,CAAC,kCAAkC,CAAC,CAAC;YACnD,kCAAe,CAAC,GAAG,EAAE,CAAC,cAAc,GAAG,OAAO,CAAC;QACnD,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,qBAAqB,CAAC,aAAmC,EAAE,OAAe,SAAS;QAC7F,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,8CAA8C,EAAE,IAAI,CAAC,CAAC;YACrE,kCAAe,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;QACjE,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,cAAc,CAAC,WAAmB;QAC5C,MAAM,MAAM,GAAG,IAAI,KAAK,EAAc,CAAC;QACvC,kCAAe,CAAC,GAAG,EAAE;aAChB,cAAc,CAAC,WAAW,CAAC;aAC3B,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YACf,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;QAEP,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,gBAAgB,CAAC,MAAc;QACzC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,sCAAsC,EAAE,MAAM,CAAC,CAAC;YAC/D,kCAAe,CAAC,GAAG,EAAE,CAAC,aAAa,GAAG,MAAM,CAAC;QACjD,CAAC;IACL,CAAC;IAED;;;;;;;;;;OAUG;IACI,MAAM,CAAC,iBAAiB,CAAC,OAAgC;QAC5D,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,8BAA8B,CAAC,CAAC;YAC/C,kCAAe,CAAC,GAAG,EAAE,CAAC,cAAc,GAAG,OAAO,CAAC;QACnD,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,WAAW,CAAC,IAAY;QAClC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,yCAAyC,EAAE,IAAI,CAAC,CAAC;YAChE,kCAAe,CAAC,GAAG,EAAE,CAAC,QAAQ,GAAG,IAAI,CAAC;QAC1C,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,aAAa,CACvB,MAIS;QAET,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,gCAAgC,CAAC,CAAC;YACjD,kCAAe,CAAC,GAAG,EAAE,CAAC,UAAU,GAAG,MAAM,CAAC;QAC9C,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,aAAa,CAAC,KAAiB;QACzC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,8BAA8B,EAAE,KAAK,CAAC,CAAC;YACtD,kCAAe,CAAC,GAAG,EAAE,CAAC,UAAU,GAAG,KAAK,CAAC;QAC7C,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,qBAAqB,CAAC,SAA6B,EAAE,IAAc;QAC7E,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,kCAAkC,CAAC,CAAC;YACnD,kCAAe,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QAC/D,CAAC;IACL,CAAC;IAED;;;OAGG;IACI,MAAM,CAAC,wBAAwB,CAAC,IAAc;QACjD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,gCAAgC,CAAC,CAAC;YACjD,kCAAe,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACvD,CAAC;IACL,CAAC;IAED;;;;;OAKG;IACI,MAAM,CAAC,qBAAqB,CAAC,KAAc;QAC9C,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,cAAc,CAAC,+BAA+B,EAAE,KAAK,CAAC,CAAC;YACvD,kCAAe,CAAC,GAAG,EAAE,CAAC,qBAAqB,GAAG,KAAK,CAAC;QACxD,CAAC;IACL,CAAC;IAED;;;;OAIG;IACI,MAAM,CAAC,OAAO,CAAC,MAAsB,EAAE,OAAwB;QAClE,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACjB,MAAM,SAAS,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAC;YAChD,OAAO,GAAG,MAAM,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;YACrC,cAAc,CAAC,8DAA8D,EAAE,OAAO,CAAC,CAAC;YAExF,MAAM,eAAe,GAAQ,MAAM,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAEjE,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACf,eAAe,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;YACxC,CAAC;YACD,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;gBAClB,eAAe,CAAC,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC;YAC9C,CAAC;YAED,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACpE,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;gBACpE,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,eAAe,CAAC,CAAC;gBACzC,GAAG,CAAC,IAAI,CACJ,IAAI,CAAC,SAAS,CAAC,eAAe,EAAE;oBAC5B,MAAM,EAAE,CAAC;iBACZ,CAAC,CACL,CAAC;YACN,CAAC,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,CACN,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC,EACtC,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,KAAK,CAAC,eAAe,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAC7D,CAAC;QACN,CAAC;IACL,CAAC;IAIO,MAAM,CAAC,mBAAmB,CAAC,OAAuB;QACtD,IAAI,eAAoB,CAAC;QACzB,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YAChF,eAAe,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAC5E,CAAC;aAAM,CAAC;YACJ,eAAe,GAAG,EAAE,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;QACxD,CAAC;QACD,cAAc,CAAC,mCAAmC,EAAE,eAAe,CAAC,CAAC;QACrE,OAAO,eAAe,CAAC;IAC3B,CAAC;IAEO,MAAM,CAAC,UAAU,CAAC,OAAuB;QAC7C,OAAO,GAAG,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC1B,QAAQ,EAAE,UAAU;YACpB,QAAQ,EAAE,gBAAgB;SAC7B,CAAC,CAAC;QACH,IAAI,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE,CAAC;YACtC,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,OAAO,CAAC;IACnB,CAAC;;AA9SL,wBA+SC;AAvBkB,aAAM,GAAG,KAAK,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nmshd/typescript-rest",
|
|
3
|
-
"version": "3.2.
|
|
3
|
+
"version": "3.2.3",
|
|
4
4
|
"description": "A Library to create RESTFul APIs with Typescript",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"API",
|
|
@@ -64,16 +64,16 @@
|
|
|
64
64
|
"@types/cookie-parser": "^1.4.9",
|
|
65
65
|
"@types/express": "^5.0.3",
|
|
66
66
|
"@types/multer": "^2.0.0",
|
|
67
|
-
"body-parser": "^2.2.
|
|
67
|
+
"body-parser": "^2.2.2",
|
|
68
68
|
"cookie-parser": "^1.4.7",
|
|
69
|
-
"express": "^5.1
|
|
69
|
+
"express": "^5.2.1",
|
|
70
70
|
"fs-extra": "^11.3.2",
|
|
71
|
-
"lodash": "^4.17.
|
|
71
|
+
"lodash": "^4.17.23",
|
|
72
72
|
"multer": "^2.0.2",
|
|
73
73
|
"reflect-metadata": "^0.2.2",
|
|
74
74
|
"require-glob": "^4.1.0",
|
|
75
75
|
"swagger-ui-express": "^5.0.1",
|
|
76
|
-
"
|
|
76
|
+
"yaml": "^2.8.2"
|
|
77
77
|
},
|
|
78
78
|
"devDependencies": {
|
|
79
79
|
"@js-soft/license-check": "^1.0.10",
|
|
@@ -84,7 +84,6 @@
|
|
|
84
84
|
"@types/lodash": "^4.17.20",
|
|
85
85
|
"@types/node": "^24.7.2",
|
|
86
86
|
"@types/request": "^2.48.13",
|
|
87
|
-
"@types/yamljs": "^0.2.34",
|
|
88
87
|
"@typescript-eslint/eslint-plugin": "^6.20.0",
|
|
89
88
|
"@typescript-eslint/parser": "^6.20.0",
|
|
90
89
|
"cross-env": "^10.1.0",
|
package/src/server/server.ts
CHANGED
|
@@ -6,7 +6,7 @@ import * as fs from 'fs-extra';
|
|
|
6
6
|
import * as _ from 'lodash';
|
|
7
7
|
import 'multer';
|
|
8
8
|
import * as path from 'path';
|
|
9
|
-
import * as YAML from '
|
|
9
|
+
import * as YAML from 'yaml';
|
|
10
10
|
import { FileLimits, HttpMethod, ParameterConverter, ServiceAuthenticator, ServiceFactory } from './model/server-types';
|
|
11
11
|
import { ServerContainer } from './server-container';
|
|
12
12
|
|
|
@@ -281,7 +281,11 @@ export class Server {
|
|
|
281
281
|
});
|
|
282
282
|
router.get(path.posix.join('/', options.endpoint, 'yaml'), (req, res) => {
|
|
283
283
|
res.set('Content-Type', 'text/vnd.yaml');
|
|
284
|
-
res.send(
|
|
284
|
+
res.send(
|
|
285
|
+
YAML.stringify(swaggerDocument, {
|
|
286
|
+
indent: 4
|
|
287
|
+
})
|
|
288
|
+
);
|
|
285
289
|
});
|
|
286
290
|
router.use(
|
|
287
291
|
path.posix.join('/', options.endpoint),
|
|
@@ -296,7 +300,7 @@ export class Server {
|
|
|
296
300
|
private static loadSwaggerDocument(options: SwaggerOptions) {
|
|
297
301
|
let swaggerDocument: any;
|
|
298
302
|
if (_.endsWith(options.filePath, '.yml') || _.endsWith(options.filePath, '.yaml')) {
|
|
299
|
-
swaggerDocument = YAML.
|
|
303
|
+
swaggerDocument = YAML.parse(fs.readFileSync(options.filePath, 'utf8'));
|
|
300
304
|
} else {
|
|
301
305
|
swaggerDocument = fs.readJSONSync(options.filePath);
|
|
302
306
|
}
|