@openaddresses/batch-schema 10.8.0 → 10.9.0
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/CHANGELOG.md +8 -0
- package/dist/lib/api.js +2 -0
- package/dist/lib/api.js.map +1 -1
- package/dist/lib/openapi.js +0 -2
- package/dist/lib/openapi.js.map +1 -1
- package/eslint.config.js +12 -0
- package/lib/api.ts +2 -0
- package/lib/openapi.ts +0 -2
- package/package.json +10 -12
- package/.eslintrc.json +0 -10
package/CHANGELOG.md
CHANGED
package/dist/lib/api.js
CHANGED
|
@@ -7,6 +7,7 @@ export default async function router(schema) {
|
|
|
7
7
|
method: Type.Optional(Type.Uppercase(Type.Enum(Doc.HttpMethods))),
|
|
8
8
|
url: Type.Optional(Type.String())
|
|
9
9
|
}),
|
|
10
|
+
res: Type.Any(),
|
|
10
11
|
description: `
|
|
11
12
|
List all JSON Schemas in use
|
|
12
13
|
With no parameters this API will return a list of all the endpoints that have a form of schema validation
|
|
@@ -32,6 +33,7 @@ export default async function router(schema) {
|
|
|
32
33
|
});
|
|
33
34
|
await schema.get('/openapi', {
|
|
34
35
|
description: 'Return a OpenAPI Schema for the API',
|
|
36
|
+
res: Type.Any(),
|
|
35
37
|
}, async (req, res) => {
|
|
36
38
|
try {
|
|
37
39
|
return res.json(schema.docs.base);
|
package/dist/lib/api.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,SAAS,IAAI,GAAG,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,MAAc;IAC/C,MAAM,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE;QACxB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;YACjE,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;SACpC,CAAC;QACF,WAAW,EAAE;;;;;;SAMZ;KACJ,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClB,IAAI,CAAC;YACD,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACpC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5D,CAAC;iBAAM,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,2CAA2C,CAAC,CAAC;YAC1E,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE;QACzB,WAAW,EAAE,qCAAqC;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAE7C,OAAO,EAAE,SAAS,IAAI,GAAG,EAAE,MAAM,eAAe,CAAA;AAChD,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AAExC,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,MAAM,CAAC,MAAc;IAC/C,MAAM,MAAM,CAAC,GAAG,CAAC,SAAS,EAAE;QACxB,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC;YACf,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;YACjE,GAAG,EAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;SACpC,CAAC;QACF,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE;QACf,WAAW,EAAE;;;;;;SAMZ;KACJ,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClB,IAAI,CAAC;YACD,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACpC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;YAC5D,CAAC;iBAAM,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,2CAA2C,CAAC,CAAC;YAC1E,CAAC;iBAAM,CAAC;gBACJ,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;YACnC,CAAC;QACL,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE;QACzB,WAAW,EAAE,qCAAqC;QAClD,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE;KAClB,EAAE,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;QAClB,IAAI,CAAC;YACD,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACtC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACX,OAAO,GAAG,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QACjC,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
|
package/dist/lib/openapi.js
CHANGED
|
@@ -29,7 +29,6 @@ export default class Docs {
|
|
|
29
29
|
path.push(sec);
|
|
30
30
|
}
|
|
31
31
|
const pathstr = path.join('/');
|
|
32
|
-
// @ts-ignore
|
|
33
32
|
if (this.base.paths[pathstr] && this.base.paths[pathstr][parsed.method])
|
|
34
33
|
throw new Error(`Duplicate Path: ${parsed.method}: ${parsed.path}`);
|
|
35
34
|
if (!schemas.private) {
|
|
@@ -96,7 +95,6 @@ export default class Docs {
|
|
|
96
95
|
}
|
|
97
96
|
};
|
|
98
97
|
}
|
|
99
|
-
// @ts-ignore
|
|
100
98
|
this.base.paths[pathstr][parsed.method] = document;
|
|
101
99
|
}
|
|
102
100
|
}
|
package/dist/lib/openapi.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../lib/openapi.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,OAAO,OAAO,IAAI;IACrB,IAAI,CAAe;IAEnB,YAAY,IAIX;QACG,IAAI,CAAC,IAAI,GAAG;YACR,OAAO,EAAE,OAAO;YAChB,IAAI,EAAE,IAAI,IAAI;gBACV,KAAK,EAAE,gBAAgB;gBACvB,OAAO,EAAE,OAAO;aACnB;YACD,KAAK,EAAE,EAAE;SACZ,CAAC;IACN,CAAC;IAED,IAAI,CACA,MAGC,EACD,OAA8C;QAE9C,MAAM,IAAI,GAAkB,EAAE,CAAC;QAE/B,KAAK,IAAI,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,KAAK,MAAM,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,mEAAmE;gBAC/F,MAAM,IAAI,GAAkB,EAAE,CAAC;gBAC/B,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC7B,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG;wBAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;;wBACjC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;gBACtB,CAAC;gBACD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;YACzB,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACnB,CAAC;QAED,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAE/B,
|
|
1
|
+
{"version":3,"file":"openapi.js","sourceRoot":"","sources":["../../lib/openapi.ts"],"names":[],"mappings":"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"}
|
package/eslint.config.js
ADDED
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import eslint from '@eslint/js';
|
|
2
|
+
import tseslint from 'typescript-eslint';
|
|
3
|
+
|
|
4
|
+
export default tseslint.config(
|
|
5
|
+
eslint.configs.recommended,
|
|
6
|
+
...tseslint.configs.recommended,
|
|
7
|
+
{
|
|
8
|
+
"rules": {
|
|
9
|
+
"@typescript-eslint/no-explicit-any": "warn"
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
);
|
package/lib/api.ts
CHANGED
|
@@ -9,6 +9,7 @@ export default async function router(schema: Schema) {
|
|
|
9
9
|
method: Type.Optional(Type.Uppercase(Type.Enum(Doc.HttpMethods))),
|
|
10
10
|
url: Type.Optional(Type.String())
|
|
11
11
|
}),
|
|
12
|
+
res: Type.Any(),
|
|
12
13
|
description: `
|
|
13
14
|
List all JSON Schemas in use
|
|
14
15
|
With no parameters this API will return a list of all the endpoints that have a form of schema validation
|
|
@@ -32,6 +33,7 @@ export default async function router(schema: Schema) {
|
|
|
32
33
|
|
|
33
34
|
await schema.get('/openapi', {
|
|
34
35
|
description: 'Return a OpenAPI Schema for the API',
|
|
36
|
+
res: Type.Any(),
|
|
35
37
|
}, async (req, res) => {
|
|
36
38
|
try {
|
|
37
39
|
return res.json(schema.docs.base);
|
package/lib/openapi.ts
CHANGED
|
@@ -46,7 +46,6 @@ export default class Docs {
|
|
|
46
46
|
|
|
47
47
|
const pathstr = path.join('/');
|
|
48
48
|
|
|
49
|
-
// @ts-ignore
|
|
50
49
|
if (this.base.paths[pathstr] && this.base.paths[pathstr][parsed.method]) throw new Error(`Duplicate Path: ${parsed.method}: ${parsed.path}`);
|
|
51
50
|
|
|
52
51
|
if (!schemas.private) {
|
|
@@ -115,7 +114,6 @@ export default class Docs {
|
|
|
115
114
|
};
|
|
116
115
|
}
|
|
117
116
|
|
|
118
|
-
// @ts-ignore
|
|
119
117
|
this.base.paths[pathstr][parsed.method] = document;
|
|
120
118
|
}
|
|
121
119
|
}
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"root": true,
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "index.ts",
|
|
7
|
-
"version": "10.
|
|
7
|
+
"version": "10.9.0",
|
|
8
8
|
"description": "Strongly Validated JSON Schema support for address",
|
|
9
9
|
"repository": "git@github.com:openaddresses/batch-schema",
|
|
10
10
|
"author": "ingalls <nick@ingalls.ca>",
|
|
@@ -15,32 +15,30 @@
|
|
|
15
15
|
},
|
|
16
16
|
"scripts": {
|
|
17
17
|
"test": "ts-node-test test/**.test.ts",
|
|
18
|
-
"lint": "eslint index.ts lib
|
|
18
|
+
"lint": "eslint index.ts lib/ test/",
|
|
19
19
|
"build": "tsc",
|
|
20
|
-
"doc": "typedoc"
|
|
20
|
+
"doc": "typedoc index.ts"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@openaddresses/batch-error": "^2.1.2",
|
|
24
|
-
"@sinclair/typebox": "^0.
|
|
24
|
+
"@sinclair/typebox": "^0.33.0",
|
|
25
25
|
"@types/body-parser": "^1.19.5",
|
|
26
26
|
"ajv": "^8.12.0",
|
|
27
|
-
"ajv-formats": "^
|
|
27
|
+
"ajv-formats": "^3.0.1",
|
|
28
28
|
"body-parser": "^1.20.0",
|
|
29
29
|
"express": "^4.17.1",
|
|
30
|
-
"glob": "^
|
|
30
|
+
"glob": "^11.0.0",
|
|
31
31
|
"morgan": "^1.10.0",
|
|
32
32
|
"openapi-types": "^12.1.3"
|
|
33
33
|
},
|
|
34
34
|
"devDependencies": {
|
|
35
35
|
"@types/express": "^4.17.21",
|
|
36
36
|
"@types/morgan": "^1.9.9",
|
|
37
|
-
"
|
|
38
|
-
"@typescript-eslint/parser": "^7.0.1",
|
|
39
|
-
"eslint": "^8.0.1",
|
|
40
|
-
"eslint-plugin-node": "^11.0.0",
|
|
37
|
+
"eslint": "^9.0.0",
|
|
41
38
|
"tape": "^5.3.1",
|
|
42
39
|
"ts-node-test": "^0.4.3",
|
|
43
|
-
"typedoc": "^0.
|
|
44
|
-
"typescript": "^5.3.3"
|
|
40
|
+
"typedoc": "^0.26.0",
|
|
41
|
+
"typescript": "^5.3.3",
|
|
42
|
+
"typescript-eslint": "^8.3.0"
|
|
45
43
|
}
|
|
46
44
|
}
|
package/.eslintrc.json
DELETED
|
@@ -1,10 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
|
|
3
|
-
"parser": "@typescript-eslint/parser",
|
|
4
|
-
"plugins": ["@typescript-eslint"],
|
|
5
|
-
"root": true,
|
|
6
|
-
"rules": {
|
|
7
|
-
"@typescript-eslint/ban-ts-comment": 1,
|
|
8
|
-
"@typescript-eslint/no-explicit-any": 1
|
|
9
|
-
}
|
|
10
|
-
}
|