@tsed/schema 7.10.0-rc.1 → 7.10.0-rc.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/lib/browser/schema.umd.min.js +3 -0
- package/lib/browser/schema.umd.min.js.LICENSE.txt +42 -0
- package/lib/browser/schema.umd.min.js.map +1 -0
- package/lib/cjs/utils/generateSpec.js +3 -1
- package/lib/cjs/utils/generateSpec.js.map +1 -1
- package/lib/esm/utils/generateSpec.js +3 -1
- package/lib/esm/utils/generateSpec.js.map +1 -1
- package/package.json +14 -8
- package/webpack.config.js +50 -0
|
@@ -31,6 +31,7 @@ const getSpecType_1 = require("./getSpecType");
|
|
|
31
31
|
const mapOpenSpec_1 = require("./mapOpenSpec");
|
|
32
32
|
const mergeSpec_1 = require("./mergeSpec");
|
|
33
33
|
const transformToOS2_1 = require("./transformToOS2");
|
|
34
|
+
/* node_env:start */
|
|
34
35
|
async function readSpec(path) {
|
|
35
36
|
const { default: fs } = await Promise.resolve().then(() => __importStar(require("fs-extra")));
|
|
36
37
|
if (fs.existsSync(path)) {
|
|
@@ -42,6 +43,7 @@ async function readSpec(path) {
|
|
|
42
43
|
/* istanbul ignore next */
|
|
43
44
|
return {};
|
|
44
45
|
}
|
|
46
|
+
/* node_env:end */
|
|
45
47
|
/**
|
|
46
48
|
* Generate OpenAPI spec from multiple sources (models, files, conf)
|
|
47
49
|
* @param tokens
|
|
@@ -49,7 +51,7 @@ async function readSpec(path) {
|
|
|
49
51
|
*/
|
|
50
52
|
async function generateSpec({ tokens, ...options }) {
|
|
51
53
|
const { version = "1.0.0", acceptMimes, specPath, specVersion } = options;
|
|
52
|
-
const fileSpec = specPath ? await readSpec(specPath) : {};
|
|
54
|
+
const fileSpec = /* node_env:start */ specPath ? await readSpec(specPath) : /* node_env:end */ {};
|
|
53
55
|
const defaultSpec = (0, mapOpenSpec_1.mapOpenSpec)((0, core_1.getValue)(options, "spec", {}), {
|
|
54
56
|
fileSpec,
|
|
55
57
|
version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateSpec.js","sourceRoot":"","sources":["../../../src/utils/generateSpec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAoC;AAEpC,mDAA8C;AAC9C,uCAA2E;AAC3E,+CAAkD;AAClD,+CAA0C;AAC1C,2CAAsC;AACtC,qDAAgD;
|
|
1
|
+
{"version":3,"file":"generateSpec.js","sourceRoot":"","sources":["../../../src/utils/generateSpec.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAoC;AAEpC,mDAA8C;AAC9C,uCAA2E;AAC3E,+CAAkD;AAClD,+CAA0C;AAC1C,2CAAsC;AACtC,qDAAgD;AAUhD,oBAAoB;AACpB,KAAK,UAAU,QAAQ,CAAC,IAAY;IAClC,MAAM,EAAC,OAAO,EAAE,EAAE,EAAC,GAAG,wDAAa,UAAU,GAAC,CAAC;IAC/C,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACvB,IAAI;YACF,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE,GAAE;KACf;IAED,0BAA0B;IAC1B,OAAO,EAAE,CAAC;AACZ,CAAC;AACD,kBAAkB;AAClB;;;;GAIG;AACI,KAAK,UAAU,YAAY,CAAC,EAAC,MAAM,EAAE,GAAG,OAAO,EAAsB;IAC1E,MAAM,EAAC,OAAO,GAAG,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAC,GAAG,OAAO,CAAC;IACxE,MAAM,QAAQ,GAAmC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAElI,MAAM,WAAW,GAAG,IAAA,yBAAW,EAAC,IAAA,eAAQ,EAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE;QAC7D,QAAQ;QACR,OAAO;QACP,WAAW;QACX,WAAW;KACZ,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,IAAA,iCAAmB,EAAC,WAAW,CAAC,CAAC;IAElD,IAAI,eAAe,GAAQ,IAAA,iBAAO,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,IAAI,GAAQ,IAAA,qBAAS,EAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAE1D,IAAI,QAAQ,KAAK,qBAAS,CAAC,OAAO,EAAE;QAClC,OAAO,IAAA,+BAAc,EAAC,IAAI,CAAQ,CAAC;KACpC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AArBD,oCAqBC","sourcesContent":["import {getValue} from \"@tsed/core\";\nimport {OpenSpec2, OpenSpec3} from \"@tsed/openspec\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {getSpec, JsonTokenOptions, SpecSerializerOptions} from \"./getSpec\";\nimport {getSpecTypeFromSpec} from \"./getSpecType\";\nimport {mapOpenSpec} from \"./mapOpenSpec\";\nimport {mergeSpec} from \"./mergeSpec\";\nimport {transformToOS2} from \"./transformToOS2\";\n\nexport interface GenerateSpecOptions extends Omit<SpecSerializerOptions, \"specType\"> {\n tokens: JsonTokenOptions;\n version?: string;\n acceptMimes?: string;\n specPath?: string;\n specVersion?: string;\n spec?: any;\n}\n/* node_env:start */\nasync function readSpec(path: string) {\n const {default: fs} = await import(\"fs-extra\");\n if (fs.existsSync(path)) {\n try {\n return await fs.readJSON(path, {encoding: \"utf8\"});\n } catch (e) {}\n }\n\n /* istanbul ignore next */\n return {};\n}\n/* node_env:end */\n/**\n * Generate OpenAPI spec from multiple sources (models, files, conf)\n * @param tokens\n * @param options\n */\nexport async function generateSpec({tokens, ...options}: GenerateSpecOptions): Promise<OpenSpec2 | OpenSpec3> {\n const {version = \"1.0.0\", acceptMimes, specPath, specVersion} = options;\n const fileSpec: Partial<OpenSpec2 | OpenSpec3> = /* node_env:start */ specPath ? await readSpec(specPath) : /* node_env:end */ {};\n\n const defaultSpec = mapOpenSpec(getValue(options, \"spec\", {}), {\n fileSpec,\n version,\n specVersion,\n acceptMimes\n });\n\n const specType = getSpecTypeFromSpec(defaultSpec);\n\n let controllersSpec: any = getSpec(tokens, options);\n const spec: any = mergeSpec(defaultSpec, controllersSpec);\n\n if (specType === SpecTypes.SWAGGER) {\n return transformToOS2(spec) as any;\n }\n\n return spec;\n}\n"]}
|
|
@@ -5,6 +5,7 @@ import { getSpecTypeFromSpec } from "./getSpecType.js";
|
|
|
5
5
|
import { mapOpenSpec } from "./mapOpenSpec.js";
|
|
6
6
|
import { mergeSpec } from "./mergeSpec.js";
|
|
7
7
|
import { transformToOS2 } from "./transformToOS2.js";
|
|
8
|
+
/* node_env:start */
|
|
8
9
|
async function readSpec(path) {
|
|
9
10
|
const { default: fs } = await import("fs-extra");
|
|
10
11
|
if (fs.existsSync(path)) {
|
|
@@ -16,6 +17,7 @@ async function readSpec(path) {
|
|
|
16
17
|
/* istanbul ignore next */
|
|
17
18
|
return {};
|
|
18
19
|
}
|
|
20
|
+
/* node_env:end */
|
|
19
21
|
/**
|
|
20
22
|
* Generate OpenAPI spec from multiple sources (models, files, conf)
|
|
21
23
|
* @param tokens
|
|
@@ -23,7 +25,7 @@ async function readSpec(path) {
|
|
|
23
25
|
*/
|
|
24
26
|
export async function generateSpec({ tokens, ...options }) {
|
|
25
27
|
const { version = "1.0.0", acceptMimes, specPath, specVersion } = options;
|
|
26
|
-
const fileSpec = specPath ? await readSpec(specPath) : {};
|
|
28
|
+
const fileSpec = /* node_env:start */ specPath ? await readSpec(specPath) : /* node_env:end */ {};
|
|
27
29
|
const defaultSpec = mapOpenSpec(getValue(options, "spec", {}), {
|
|
28
30
|
fileSpec,
|
|
29
31
|
version,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateSpec.js","sourceRoot":"","sources":["../../../src/utils/generateSpec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,OAAO,EAA0C,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"generateSpec.js","sourceRoot":"","sources":["../../../src/utils/generateSpec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,YAAY,CAAC;AAEpC,OAAO,EAAC,SAAS,EAAC,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAC,OAAO,EAA0C,MAAM,WAAW,CAAC;AAC3E,OAAO,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAC,SAAS,EAAC,MAAM,aAAa,CAAC;AACtC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAUhD,oBAAoB;AACpB,KAAK,UAAU,QAAQ,CAAC,IAAY;IAClC,MAAM,EAAC,OAAO,EAAE,EAAE,EAAC,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;IAC/C,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;QACvB,IAAI;YACF,OAAO,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAC,QAAQ,EAAE,MAAM,EAAC,CAAC,CAAC;SACpD;QAAC,OAAO,CAAC,EAAE,GAAE;KACf;IAED,0BAA0B;IAC1B,OAAO,EAAE,CAAC;AACZ,CAAC;AACD,kBAAkB;AAClB;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,EAAC,MAAM,EAAE,GAAG,OAAO,EAAsB;IAC1E,MAAM,EAAC,OAAO,GAAG,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,WAAW,EAAC,GAAG,OAAO,CAAC;IACxE,MAAM,QAAQ,GAAmC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC;IAElI,MAAM,WAAW,GAAG,WAAW,CAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE;QAC7D,QAAQ;QACR,OAAO;QACP,WAAW;QACX,WAAW;KACZ,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,CAAC,CAAC;IAElD,IAAI,eAAe,GAAQ,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpD,MAAM,IAAI,GAAQ,SAAS,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;IAE1D,IAAI,QAAQ,KAAK,SAAS,CAAC,OAAO,EAAE;QAClC,OAAO,cAAc,CAAC,IAAI,CAAQ,CAAC;KACpC;IAED,OAAO,IAAI,CAAC;AACd,CAAC","sourcesContent":["import {getValue} from \"@tsed/core\";\nimport {OpenSpec2, OpenSpec3} from \"@tsed/openspec\";\nimport {SpecTypes} from \"../domain/SpecTypes\";\nimport {getSpec, JsonTokenOptions, SpecSerializerOptions} from \"./getSpec\";\nimport {getSpecTypeFromSpec} from \"./getSpecType\";\nimport {mapOpenSpec} from \"./mapOpenSpec\";\nimport {mergeSpec} from \"./mergeSpec\";\nimport {transformToOS2} from \"./transformToOS2\";\n\nexport interface GenerateSpecOptions extends Omit<SpecSerializerOptions, \"specType\"> {\n tokens: JsonTokenOptions;\n version?: string;\n acceptMimes?: string;\n specPath?: string;\n specVersion?: string;\n spec?: any;\n}\n/* node_env:start */\nasync function readSpec(path: string) {\n const {default: fs} = await import(\"fs-extra\");\n if (fs.existsSync(path)) {\n try {\n return await fs.readJSON(path, {encoding: \"utf8\"});\n } catch (e) {}\n }\n\n /* istanbul ignore next */\n return {};\n}\n/* node_env:end */\n/**\n * Generate OpenAPI spec from multiple sources (models, files, conf)\n * @param tokens\n * @param options\n */\nexport async function generateSpec({tokens, ...options}: GenerateSpecOptions): Promise<OpenSpec2 | OpenSpec3> {\n const {version = \"1.0.0\", acceptMimes, specPath, specVersion} = options;\n const fileSpec: Partial<OpenSpec2 | OpenSpec3> = /* node_env:start */ specPath ? await readSpec(specPath) : /* node_env:end */ {};\n\n const defaultSpec = mapOpenSpec(getValue(options, \"spec\", {}), {\n fileSpec,\n version,\n specVersion,\n acceptMimes\n });\n\n const specType = getSpecTypeFromSpec(defaultSpec);\n\n let controllersSpec: any = getSpec(tokens, options);\n const spec: any = mergeSpec(defaultSpec, controllersSpec);\n\n if (specType === SpecTypes.SWAGGER) {\n return transformToOS2(spec) as any;\n }\n\n return spec;\n}\n"]}
|
package/package.json
CHANGED
|
@@ -1,23 +1,26 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tsed/schema",
|
|
3
|
-
"version": "7.10.0-rc.
|
|
3
|
+
"version": "7.10.0-rc.3",
|
|
4
4
|
"description": "JsonSchema module for Ts.ED Framework",
|
|
5
5
|
"private": false,
|
|
6
6
|
"source": "./src/index.ts",
|
|
7
7
|
"main": "./lib/cjs/index.js",
|
|
8
8
|
"module": "./lib/esm/index.js",
|
|
9
9
|
"typings": "./lib/types/index.d.ts",
|
|
10
|
+
"browser": "./lib/browser/schema.umd.min.js",
|
|
10
11
|
"exports": {
|
|
11
12
|
"types": "./lib/types/index.d.ts",
|
|
13
|
+
"browser": "./lib/browser/schema.umd.min.js",
|
|
12
14
|
"import": "./lib/esm/index.js",
|
|
13
15
|
"require": "./lib/cjs/index.js",
|
|
14
16
|
"default": "./lib/esm/index.js"
|
|
15
17
|
},
|
|
16
18
|
"scripts": {
|
|
17
19
|
"clean": "rm -rf lib",
|
|
18
|
-
"build": "yarn clean && yarn barrels && yarn run build:esm && yarn run build:cjs",
|
|
20
|
+
"build": "yarn clean && yarn barrels && yarn run build:esm && yarn run build:cjs && yarn run build:browser",
|
|
19
21
|
"build:cjs": "tsc --build tsconfig.compile.json",
|
|
20
22
|
"build:esm": "tsc --build tsconfig.compile.esm.json",
|
|
23
|
+
"build:browser": "webpack",
|
|
21
24
|
"barrels": "yarn barrelsby --delete -d ./src -e \"\\.spec\\.ts\" -e \"__mock__\" -e \".benchmark.ts\"",
|
|
22
25
|
"test": "cross-env NODE_ENV=test yarn jest --max-workers=2"
|
|
23
26
|
},
|
|
@@ -32,7 +35,7 @@
|
|
|
32
35
|
"tsed"
|
|
33
36
|
],
|
|
34
37
|
"dependencies": {
|
|
35
|
-
"@tsed/openspec": "7.10.0-rc.
|
|
38
|
+
"@tsed/openspec": "7.10.0-rc.3",
|
|
36
39
|
"change-case": "^4.1.2",
|
|
37
40
|
"fs-extra": "^10.0.1",
|
|
38
41
|
"json-schema": "0.4.0",
|
|
@@ -42,17 +45,20 @@
|
|
|
42
45
|
},
|
|
43
46
|
"devDependencies": {
|
|
44
47
|
"@apidevtools/swagger-parser": "10.0.3",
|
|
45
|
-
"@tsed/core": "7.10.0-rc.
|
|
46
|
-
"@tsed/openspec": "7.10.0-rc.
|
|
48
|
+
"@tsed/core": "7.10.0-rc.3",
|
|
49
|
+
"@tsed/openspec": "7.10.0-rc.3",
|
|
47
50
|
"@types/fs-extra": "9.0.13",
|
|
48
51
|
"@types/json-schema": "7.0.11",
|
|
49
52
|
"@types/micromatch": "4.0.2",
|
|
50
53
|
"@types/statuses": "2.0.0",
|
|
51
|
-
"
|
|
54
|
+
"ts-loader": "^9.4.2",
|
|
55
|
+
"webpack": "^5.75.0",
|
|
56
|
+
"webpack-cli": "^5.0.1",
|
|
57
|
+
"webpack-remove-code-blocks": "^0.1.5"
|
|
52
58
|
},
|
|
53
59
|
"peerDependencies": {
|
|
54
|
-
"@tsed/core": "^7.10.0-rc.
|
|
55
|
-
"@tsed/openspec": "^7.10.0-rc.
|
|
60
|
+
"@tsed/core": "^7.10.0-rc.3",
|
|
61
|
+
"@tsed/openspec": "^7.10.0-rc.3"
|
|
56
62
|
},
|
|
57
63
|
"peerDependenciesMeta": {
|
|
58
64
|
"@tsed/openspec": {
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
module.exports = {
|
|
2
|
+
mode: "production",
|
|
3
|
+
devtool: "source-map",
|
|
4
|
+
stats: {warnings: false},
|
|
5
|
+
entry: {
|
|
6
|
+
main: "./src/index.ts"
|
|
7
|
+
},
|
|
8
|
+
output: {
|
|
9
|
+
path: __dirname + "/lib/browser/",
|
|
10
|
+
filename: "schema.umd.min.js",
|
|
11
|
+
library: "schema",
|
|
12
|
+
libraryTarget: "umd"
|
|
13
|
+
},
|
|
14
|
+
resolve: {
|
|
15
|
+
extensions: [".tsx", ".ts", ".js"]
|
|
16
|
+
},
|
|
17
|
+
module: {
|
|
18
|
+
rules: [
|
|
19
|
+
{
|
|
20
|
+
test: /\.ts?$/,
|
|
21
|
+
use: [
|
|
22
|
+
{
|
|
23
|
+
loader: "webpack-remove-code-blocks",
|
|
24
|
+
options: {
|
|
25
|
+
blocks: [
|
|
26
|
+
"debug",
|
|
27
|
+
"devblock",
|
|
28
|
+
{
|
|
29
|
+
start: "node_env:start",
|
|
30
|
+
end: "node_env:end",
|
|
31
|
+
prefix: "/*",
|
|
32
|
+
suffix: "*/"
|
|
33
|
+
}
|
|
34
|
+
]
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
loader: "ts-loader",
|
|
39
|
+
options: {
|
|
40
|
+
configFile: "tsconfig.compile.esm.json"
|
|
41
|
+
}
|
|
42
|
+
}
|
|
43
|
+
],
|
|
44
|
+
exclude: /node_modules/
|
|
45
|
+
}
|
|
46
|
+
]
|
|
47
|
+
},
|
|
48
|
+
plugins: [],
|
|
49
|
+
optimization: {}
|
|
50
|
+
};
|