assert-json-body 1.6.2 → 1.7.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/README.md +219 -95
- package/dist/assertion/diff-recordings-vs-spec.js +7 -3
- package/dist/assertion/diff-recordings-vs-spec.js.map +1 -1
- package/dist/assertion/playwright-type.d.ts.map +1 -1
- package/dist/assertion/summarize-recordings.js.map +1 -1
- package/dist/cli/index.js +35 -7
- package/dist/cli/index.js.map +1 -1
- package/dist/extractor/src/lib/child-expansion.d.ts.map +1 -1
- package/dist/extractor/src/lib/child-expansion.js.map +1 -1
- package/dist/extractor/src/lib/git.d.ts.map +1 -1
- package/dist/extractor/src/lib/git.js.map +1 -1
- package/dist/extractor/src/lib/ref-resolver.d.ts.map +1 -1
- package/dist/extractor/src/lib/ref-resolver.js.map +1 -1
- package/dist/extractor/src/lib/schema-flatten.d.ts.map +1 -1
- package/dist/extractor/src/lib/schema-flatten.js +19 -9
- package/dist/extractor/src/lib/schema-flatten.js.map +1 -1
- package/dist/extractor/src/lib/type-utils.d.ts.map +1 -1
- package/dist/extractor/src/lib/type-utils.js +3 -1
- package/dist/extractor/src/lib/type-utils.js.map +1 -1
- package/dist/lib/assert.d.ts.map +1 -1
- package/dist/lib/assert.js +6 -1
- package/dist/lib/assert.js.map +1 -1
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +27 -3
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/extractor.d.ts.map +1 -1
- package/dist/lib/extractor.js +67 -23
- package/dist/lib/extractor.js.map +1 -1
- package/dist/lib/recorder.d.ts.map +1 -1
- package/dist/lib/recorder.js +12 -5
- package/dist/lib/recorder.js.map +1 -1
- package/dist/lib/responses.d.ts.map +1 -1
- package/dist/lib/responses.js +26 -9
- package/dist/lib/responses.js.map +1 -1
- package/dist/lib/schema-flatten.d.ts +1 -1
- package/dist/lib/schema-flatten.d.ts.map +1 -1
- package/dist/lib/schema-flatten.js +1 -1
- package/dist/lib/schema-flatten.js.map +1 -1
- package/dist/lib/validator.d.ts.map +1 -1
- package/dist/lib/validator.js +50 -18
- package/dist/lib/validator.js.map +1 -1
- package/dist/types/index.d.ts +2 -0
- package/dist/types/index.d.ts.map +1 -1
- package/dist-cjs/assertion/diff-recordings-vs-spec.js +7 -3
- package/dist-cjs/assertion/diff-recordings-vs-spec.js.map +1 -1
- package/dist-cjs/assertion/playwright-type.d.ts.map +1 -1
- package/dist-cjs/assertion/summarize-recordings.js.map +1 -1
- package/dist-cjs/cli/index.js +35 -7
- package/dist-cjs/cli/index.js.map +1 -1
- package/dist-cjs/extractor/src/lib/child-expansion.d.ts.map +1 -1
- package/dist-cjs/extractor/src/lib/child-expansion.js.map +1 -1
- package/dist-cjs/extractor/src/lib/git.d.ts.map +1 -1
- package/dist-cjs/extractor/src/lib/git.js.map +1 -1
- package/dist-cjs/extractor/src/lib/ref-resolver.d.ts.map +1 -1
- package/dist-cjs/extractor/src/lib/ref-resolver.js.map +1 -1
- package/dist-cjs/extractor/src/lib/schema-flatten.d.ts.map +1 -1
- package/dist-cjs/extractor/src/lib/schema-flatten.js +19 -9
- package/dist-cjs/extractor/src/lib/schema-flatten.js.map +1 -1
- package/dist-cjs/extractor/src/lib/type-utils.d.ts.map +1 -1
- package/dist-cjs/extractor/src/lib/type-utils.js +3 -1
- package/dist-cjs/extractor/src/lib/type-utils.js.map +1 -1
- package/dist-cjs/lib/assert.d.ts.map +1 -1
- package/dist-cjs/lib/assert.js +6 -1
- package/dist-cjs/lib/assert.js.map +1 -1
- package/dist-cjs/lib/config.d.ts.map +1 -1
- package/dist-cjs/lib/config.js +27 -3
- package/dist-cjs/lib/config.js.map +1 -1
- package/dist-cjs/lib/extractor.d.ts.map +1 -1
- package/dist-cjs/lib/extractor.js +67 -23
- package/dist-cjs/lib/extractor.js.map +1 -1
- package/dist-cjs/lib/recorder.d.ts.map +1 -1
- package/dist-cjs/lib/recorder.js +12 -5
- package/dist-cjs/lib/recorder.js.map +1 -1
- package/dist-cjs/lib/responses.d.ts.map +1 -1
- package/dist-cjs/lib/responses.js +26 -9
- package/dist-cjs/lib/responses.js.map +1 -1
- package/dist-cjs/lib/schema-flatten.d.ts +1 -1
- package/dist-cjs/lib/schema-flatten.d.ts.map +1 -1
- package/dist-cjs/lib/schema-flatten.js.map +1 -1
- package/dist-cjs/lib/validator.d.ts.map +1 -1
- package/dist-cjs/lib/validator.js +50 -18
- package/dist-cjs/lib/validator.js.map +1 -1
- package/dist-cjs/types/index.d.ts +2 -0
- package/dist-cjs/types/index.d.ts.map +1 -1
- package/package.json +15 -4
package/dist/cli/index.js
CHANGED
|
@@ -2,13 +2,41 @@
|
|
|
2
2
|
import { generate } from '../lib/extractor.js';
|
|
3
3
|
import { parseCliArgs, cliConfigSubset } from '../lib/config.js';
|
|
4
4
|
import { writeFileSync, existsSync, readFileSync } from 'node:fs';
|
|
5
|
+
import { dirname, join } from 'node:path';
|
|
5
6
|
function printVersion() {
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
try {
|
|
8
|
+
// Walk up from this file to find package.json.
|
|
9
|
+
// Works from dist/, dist-cjs/, or Deno entry points.
|
|
10
|
+
// Use __dirname in CJS, createRequire in ESM, or process.argv[1] as last resort.
|
|
11
|
+
let dir;
|
|
12
|
+
try {
|
|
13
|
+
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
|
14
|
+
dir = typeof __dirname !== 'undefined' ? __dirname : dirname(process.argv[1]);
|
|
15
|
+
}
|
|
16
|
+
catch {
|
|
17
|
+
dir = process.cwd();
|
|
18
|
+
}
|
|
19
|
+
let cur = dir;
|
|
20
|
+
let pkg;
|
|
21
|
+
for (let i = 0; i < 5; i++) {
|
|
22
|
+
const candidate = join(cur, 'package.json');
|
|
23
|
+
try {
|
|
24
|
+
pkg = JSON.parse(readFileSync(candidate, 'utf8'));
|
|
25
|
+
break;
|
|
26
|
+
}
|
|
27
|
+
catch {
|
|
28
|
+
/* next */
|
|
29
|
+
}
|
|
30
|
+
cur = dirname(cur);
|
|
31
|
+
}
|
|
32
|
+
console.log(pkg?.version ?? 'unknown');
|
|
33
|
+
}
|
|
34
|
+
catch {
|
|
35
|
+
console.log('unknown');
|
|
36
|
+
}
|
|
9
37
|
}
|
|
10
38
|
function printHelp() {
|
|
11
|
-
console.log(`assert-json-body <command> [options]\n\nCommands:\n extract Run extraction (default)\n init-config Create example assert-json-body.config.json\n help Show this help\n version Print version\n\nExtraction Options (CLI/env override config.extract):\n --repo=URL\n --specPath=PATH\n --ref=REF (branch/tag/sha)\n --outputDir=DIR (default: json-body-assertions)\n --responsesFile=FILE (override output file path)\n --preserveCheckout (do not delete temp git checkout)\n --dryRun (simulate, no filesystem writes)\n --failIfExists (error if responses file exists)\n --logLevel=VAL (silent|error|warn|info|debug)\n --config=FILE (explicit config file path)\n\nValidation (env overrides only for now):\n AJB_RECORD / TEST_RESPONSE_BODY_RECORD (enable global recording)\n AJB_THROW_ON_FAIL (default throw behaviour)\n\nSchema file resolution precedence:\n explicit option > env (AJB_RESPONSES_FILE / ROUTE_TEST_RESPONSES_FILE) > config.extract.responsesFile or <outputDir>/responses.json > default ./json-body-assertions/responses.json\n`);
|
|
39
|
+
console.log(`assert-json-body <command> [options]\n\nCommands:\n extract Run extraction (default)\n init-config Create example assert-json-body.config.json\n help Show this help\n version Print version\n\nExtraction Options (CLI/env override config.extract):\n --repo=URL\n --specPath=PATH\n --ref=REF (branch/tag/sha)\n --specFile=FILE (local spec file; skips git checkout)\n --outputDir=DIR (default: json-body-assertions)\n --responsesFile=FILE (override output file path)\n --preserveCheckout (do not delete temp git checkout)\n --dryRun (simulate, no filesystem writes)\n --failIfExists (error if responses file exists)\n --logLevel=VAL (silent|error|warn|info|debug)\n --config=FILE (explicit config file path)\n\nValidation (env overrides only for now):\n AJB_RECORD / TEST_RESPONSE_BODY_RECORD (enable global recording)\n AJB_THROW_ON_FAIL (default throw behaviour)\n\nSchema file resolution precedence:\n explicit option > env (AJB_RESPONSES_FILE / ROUTE_TEST_RESPONSES_FILE) > config.extract.responsesFile or <outputDir>/responses.json > default ./json-body-assertions/responses.json\n`);
|
|
12
40
|
}
|
|
13
41
|
function initConfig() {
|
|
14
42
|
const path = 'assert-json-body.config.json';
|
|
@@ -25,12 +53,12 @@ function initConfig() {
|
|
|
25
53
|
preserveCheckout: false,
|
|
26
54
|
dryRun: false,
|
|
27
55
|
logLevel: 'info',
|
|
28
|
-
failIfExists: false
|
|
56
|
+
failIfExists: false,
|
|
29
57
|
},
|
|
30
58
|
validate: {
|
|
31
59
|
recordResponses: false,
|
|
32
|
-
throwOnValidationFail: true
|
|
33
|
-
}
|
|
60
|
+
throwOnValidationFail: true,
|
|
61
|
+
},
|
|
34
62
|
};
|
|
35
63
|
writeFileSync(path, JSON.stringify(example, null, 2));
|
|
36
64
|
console.log(`Wrote example config to ${path}`);
|
package/dist/cli/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/cli/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-expansion.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/child-expansion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAW,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,wBAAgB,eAAe,
|
|
1
|
+
{"version":3,"file":"child-expansion.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/child-expansion.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAW,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAE3D,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE1C,wBAAgB,eAAe,CAC7B,MAAM,EAAE,WAAW,EACnB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACvC,IAAI,cAAoB,EACxB,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GACvB,YAAY,CAqBd;AAED,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,MAAM,EACjB,YAAY,EAAE,WAAW,EACzB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACvC,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAyD/C"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-expansion.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/child-expansion.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAe,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAG/C,MAAM,UAAU,eAAe,
|
|
1
|
+
{"version":3,"file":"child-expansion.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/child-expansion.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/git.ts"],"names":[],"mappings":"AAKA,wBAAgB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,
|
|
1
|
+
{"version":3,"file":"git.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/git.ts"],"names":[],"mappings":"AAKA,wBAAgB,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,IAAI,GAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAO,UAOhF;AAED,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,GAAG,SAAS,GACX;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAY1D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,OAA8B,EAAE;IAC/E,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACjG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"git.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/git.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACtD,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAE1C,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,IAAc,EAAE,OAA8B,EAAE;IAC/E,OAAO,CAAC,IAAI,CAAC,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAC3C,MAAM,GAAG,GAAG,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACjG,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,GAAG,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAClF,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IACzB,OAAO,GAAG,CAAC,MAAM,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,IAAY,EACZ,QAAgB,EAChB,GAAG,GAAG,MAAM;IAEZ,MAAM,OAAO,GAAG,IAAI,CAAC,MAAM,EAAE,EAAE,iBAAiB,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC9D,GAAG,CAAC,KAAK,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAC9B,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7D,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,qBAAqB,EAAE,MAAM,CAAC,CAAC,CAAC;IACrE,MAAM,OAAO,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAC;IAClC,MAAM,OAAO,GAAG,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,CAAC;IACtD,aAAa,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,OAAO,GAAG,IAAI,CAAC,CAAC;IAChF,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IACtF,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IACvE,MAAM,WAAW,GAAG,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,EAAE,MAAM,CAAC,CAAC;IAClE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AAC1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ref-resolver.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/ref-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,wBAAgB,UAAU,
|
|
1
|
+
{"version":3,"file":"ref-resolver.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/ref-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,wBAAgB,UAAU,CACxB,GAAG,EAAE,MAAM,EACX,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACvC,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GACvB,WAAW,GAAG,SAAS,CAmBzB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ref-resolver.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/ref-resolver.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,UAAU,
|
|
1
|
+
{"version":3,"file":"ref-resolver.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/ref-resolver.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,UAAU,CACxB,GAAW,EACX,UAAuC,EACvC,GAAwB;IAExB,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAChC,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,8DAA8D;QAC9D,IAAI,OAAO,GAAQ,GAAG,CAAC;QACvB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC9C,MAAM;YACR,CAAC;YACD,MAAM,OAAO,GAAG,kBAAkB,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;YAChF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;YAC9B,OAAO,GAAG,IAAI,CAAC;QACjB,CAAC;QACD,IAAI,OAAO;YAAE,OAAO,OAAsB,CAAC;IAC7C,CAAC;IACD,iDAAiD;IACjD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAC;IACnC,OAAO,UAAU,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-flatten.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/schema-flatten.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEhG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,MAAM,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"schema-flatten.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/schema-flatten.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,WAAW,IAAI,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEhG,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,MAAM,MAAM,WAAW,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAC,eAAe,CAAC;AAW7E,UAAU,OAAO;IACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACxC,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC;CAC1B;AAED,wBAAgB,OAAO,CACrB,MAAM,EAAE,WAAW,EACnB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EACvC,IAAI,cAAoB,EACxB,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GACvB,YAAY,CAGd;AAED,wBAAgB,eAAe,CAC7B,MAAM,EAAE,WAAW,EACnB,GAAG,EAAE,OAAO,EACZ,IAAI,cAAoB,GACvB,aAAa,CA6Df;AAED,wBAAgB,YAAY,CAC1B,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,GAAE,MAAM,EAAO,GACnB,MAAM,CAgDR;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CAmDzF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAIvE;AAED,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,WAAW,GAAG,SAAS,EAC/B,GAAG,EAAE,OAAO,EACZ,KAAK,EAAE,MAAM,EAAE,GACd,MAAM,GAAG,IAAI,CAkCf"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { normalizeType, dedupeFields } from './type-utils.js';
|
|
2
|
-
function isRef(s) {
|
|
3
|
-
|
|
2
|
+
function isRef(s) {
|
|
3
|
+
return !!s && '$ref' in s;
|
|
4
|
+
}
|
|
5
|
+
function isSchemaObject(s) {
|
|
6
|
+
return !!s && !('$ref' in s);
|
|
7
|
+
}
|
|
4
8
|
import { resolveRef } from './ref-resolver.js';
|
|
5
9
|
export function flatten(schema, components, seen = new Set(), doc) {
|
|
6
10
|
const { required, optional } = flattenInternal(schema, { components, doc }, seen);
|
|
@@ -46,7 +50,7 @@ export function flattenInternal(schema, ctx, seen = new Set()) {
|
|
|
46
50
|
const collectedRequired = new Set();
|
|
47
51
|
const collectedProps = {};
|
|
48
52
|
for (const s of directSchemas) {
|
|
49
|
-
for (const r of
|
|
53
|
+
for (const r of s.required || [])
|
|
50
54
|
collectedRequired.add(r);
|
|
51
55
|
if (s.properties)
|
|
52
56
|
Object.assign(collectedProps, s.properties);
|
|
@@ -65,7 +69,7 @@ export function flattenInternal(schema, ctx, seen = new Set()) {
|
|
|
65
69
|
optFields.push(spec);
|
|
66
70
|
}
|
|
67
71
|
reqFields = dedupeFields(reqFields);
|
|
68
|
-
optFields = dedupeFields(optFields.filter(f => !reqFields.some(r => r.name === f.name)));
|
|
72
|
+
optFields = dedupeFields(optFields.filter((f) => !reqFields.some((r) => r.name === f.name)));
|
|
69
73
|
return { required: reqFields, optional: optFields };
|
|
70
74
|
}
|
|
71
75
|
export function describeType(schema, ctx, stack = []) {
|
|
@@ -143,7 +147,8 @@ export function deriveFieldMetadata(schema, ctx) {
|
|
|
143
147
|
return {};
|
|
144
148
|
const enumValues = collectEnum(target);
|
|
145
149
|
const underlyingPrim = primitiveFromSchema(target, ctx, [refKey]);
|
|
146
|
-
const isPrimitiveLike = !!underlyingPrim &&
|
|
150
|
+
const isPrimitiveLike = !!underlyingPrim &&
|
|
151
|
+
!(isSchemaObject(target) && (target.properties || target.type === 'object'));
|
|
147
152
|
return {
|
|
148
153
|
underlying: underlyingPrim ? normalizeType(underlyingPrim) : undefined,
|
|
149
154
|
wrapper: !!underlyingPrim && isPrimitiveLike,
|
|
@@ -198,20 +203,25 @@ export function primitiveFromSchema(schema, ctx, stack) {
|
|
|
198
203
|
return rec ?? refKey.split('/').pop();
|
|
199
204
|
}
|
|
200
205
|
if (schema.allOf) {
|
|
201
|
-
const parts = schema.allOf
|
|
206
|
+
const parts = schema.allOf
|
|
207
|
+
.map((p) => primitiveFromSchema(p, ctx, stack))
|
|
208
|
+
.filter(Boolean);
|
|
202
209
|
const uniq = [...new Set(parts)];
|
|
203
210
|
if (uniq.length === 1)
|
|
204
211
|
return uniq[0];
|
|
205
|
-
const bases = [...new Set(uniq.map(u => u.split('(')[0]))];
|
|
212
|
+
const bases = [...new Set(uniq.map((u) => u.split('(')[0]))];
|
|
206
213
|
if (bases.length === 1) {
|
|
207
|
-
const withFormat = uniq.filter(u => u.includes('('));
|
|
214
|
+
const withFormat = uniq.filter((u) => u.includes('('));
|
|
208
215
|
if (withFormat.length === 1)
|
|
209
216
|
return withFormat[0];
|
|
210
217
|
return uniq.sort((a, b) => b.length - a.length)[0];
|
|
211
218
|
}
|
|
212
219
|
return null;
|
|
213
220
|
}
|
|
214
|
-
if (schema.type &&
|
|
221
|
+
if (schema.type &&
|
|
222
|
+
schema.type !== 'object' &&
|
|
223
|
+
!schema.properties &&
|
|
224
|
+
schema.items === undefined) {
|
|
215
225
|
if (schema.type === 'string')
|
|
216
226
|
return 'string';
|
|
217
227
|
return schema.format ? `${schema.type}(${schema.format})` : schema.type;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-flatten.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/schema-flatten.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAK9D,SAAS,KAAK,CAAC,CAAiC,
|
|
1
|
+
{"version":3,"file":"schema-flatten.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/schema-flatten.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-utils.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/type-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAW/C;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"type-utils.d.ts","sourceRoot":"","sources":["../../../../src/extractor/src/lib/type-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AAEpD,wBAAgB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAW/C;AAED,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE3C;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAS1D"}
|
|
@@ -13,7 +13,9 @@ export function normalizeType(t) {
|
|
|
13
13
|
t = t.replace(/array<number\([^>]*\)>/g, 'array<number>');
|
|
14
14
|
return t;
|
|
15
15
|
}
|
|
16
|
-
export function refNameOf(t) {
|
|
16
|
+
export function refNameOf(t) {
|
|
17
|
+
return t.split('<').pop().replace(/>.*/, '');
|
|
18
|
+
}
|
|
17
19
|
export function dedupeFields(arr) {
|
|
18
20
|
const seen = new Set();
|
|
19
21
|
const out = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-utils.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/type-utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,CAAS;IACrC,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC7C,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,CAAC,GAAG,QAAQ,CAAC;IAC1D,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,+BAA+B,EAAE,eAAe,CAAC,CAAC;IAChE,0FAA0F;IAC1F,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;IAC1D,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAS,
|
|
1
|
+
{"version":3,"file":"type-utils.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/type-utils.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,aAAa,CAAC,CAAS;IACrC,IAAI,CAAC,CAAC;QAAE,OAAO,CAAC,CAAC;IACjB,IAAI,CAAC,CAAC,UAAU,CAAC,SAAS,CAAC;QAAE,OAAO,QAAQ,CAAC;IAC7C,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;IAC1D,IAAI,CAAC,KAAK,SAAS,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;QAAE,CAAC,GAAG,QAAQ,CAAC;IAC1D,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,4BAA4B,EAAE,QAAQ,CAAC,CAAC;IACtD,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,+BAA+B,EAAE,eAAe,CAAC,CAAC;IAChE,0FAA0F;IAC1F,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IAChD,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,yBAAyB,EAAE,eAAe,CAAC,CAAC;IAC1D,OAAO,CAAC,CAAC;AACX,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,CAAS;IACjC,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,GAAgB;IAC3C,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,MAAM,GAAG,GAAgB,EAAE,CAAC;IAC5B,KAAK,MAAM,CAAC,IAAI,GAAG;QACjB,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC;YACtB,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACZ,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACnB,CAAC;IACH,OAAO,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;AAC1D,CAAC"}
|
package/dist/lib/assert.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../src/lib/assert.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,aAAa;
|
|
1
|
+
{"version":3,"file":"assert.d.ts","sourceRoot":"","sources":["../../src/lib/assert.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,gBAAgB;IAC/B,kEAAkE;IAClE,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,8FAA8F;IAC9F,MAAM,CAAC,EAAE,OAAO,GAAG;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtC,uEAAuE;IACvE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iFAAiF;IACjF,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,EAAE,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,aAAa,EACnB,IAAI,EAAE,OAAO,EACb,OAAO,GAAE,gBAAqB,GAC7B,eAAe,GAAG,IAAI,CA0BxB"}
|
package/dist/lib/assert.js
CHANGED
|
@@ -6,7 +6,12 @@ import { _validateRouteContext } from './validator.js';
|
|
|
6
6
|
* Throws by default on mismatch; pass { throw:false } to receive a structured result instead.
|
|
7
7
|
*/
|
|
8
8
|
export function assertResponseShape(spec, body, options = {}) {
|
|
9
|
-
const routeCtx = pickRoute(spec.path, {
|
|
9
|
+
const routeCtx = pickRoute(spec.path, {
|
|
10
|
+
method: spec.method,
|
|
11
|
+
status: spec.status,
|
|
12
|
+
responsesFilePath: options.responsesFilePath,
|
|
13
|
+
configPath: options.configPath,
|
|
14
|
+
});
|
|
10
15
|
const wantRecord = !!options.record;
|
|
11
16
|
if (wantRecord) {
|
|
12
17
|
let label;
|
package/dist/lib/assert.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../src/lib/assert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"assert.js","sourceRoot":"","sources":["../../src/lib/assert.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAwBvD;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CACjC,IAAmB,EACnB,IAAa,EACb,UAA4B,EAAE;IAE9B,MAAM,QAAQ,GAAiB,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE;QAClD,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,iBAAiB,EAAE,OAAO,CAAC,iBAAiB;QAC5C,UAAU,EAAE,OAAO,CAAC,UAAU;KAC/B,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC;IACpC,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,KAAyB,CAAC;QAC9B,IAAI,OAAO,OAAO,CAAC,MAAM,KAAK,QAAQ,IAAI,OAAO,CAAC,MAAM;YAAE,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC;QACvF,MAAM,SAAS,GAAG,sBAAsB,CAAC,EAAE,UAAU,EAAE,OAAO,CAAC,UAAU,EAAE,CAAC,CAAC;QAC7E,UAAU,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAC9D,CAAC;IACD,IAAI,CAAC;QACH,qBAAqB,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACtC,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK;YAAE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;IACnD,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,OAAO,CAAC,KAAK,KAAK,KAAK,EAAE,CAAC;YAC5B,MAAM,GAAG,GAAI,GAAa,CAAC,OAAO,IAAI,EAAE,CAAC;YACzC,4EAA4E;YAC5E,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC/D,CAAC;QACD,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC"}
|
package/dist/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,aAAa,EACb,cAAc,EACd,UAAU,EAGV,gBAAgB,EAChB,cAAc,EACf,MAAM,mBAAmB,CAAC;AAqB3B,wBAAgB,cAAc,CAC5B,GAAG,GAAE,MAAsB,EAC3B,YAAY,CAAC,EAAE,MAAM,GACpB;IAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAAC,KAAK,CAAC,EAAE,KAAK,CAAA;CAAE,CAUzD;AAED,wBAAgB,YAAY,CAAC,IAAI,GAAE,MAAM,EAA0B,GAAG;IACpE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC;IACvC,WAAW,EAAE,MAAM,EAAE,CAAC;CACvB,CAqBA;AAQD,wBAAgB,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,aAAa,CAapF;AAED,wBAAgB,eAAe,CAAC,GAAG,GAAE,MAAM,CAAC,UAAwB,GAAG;IACrE,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,EAAE,cAAc,CAAC;CAC1B,CAqCA;AAeD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IACnC,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,GAAG,EAAE,aAAa,CAAC;IACnB,GAAG,EAAE;QAAE,OAAO,EAAE,aAAa,CAAC;QAAC,QAAQ,EAAE,cAAc,CAAA;KAAE,CAAC;IAC1D,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB,GAAG,cAAc,CA+BjB;AAED,wBAAgB,WAAW,CAAC,kBAAkB,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAUzE"}
|
package/dist/lib/config.js
CHANGED
|
@@ -65,7 +65,18 @@ function pick(obj, keys) {
|
|
|
65
65
|
return out;
|
|
66
66
|
}
|
|
67
67
|
export function cliConfigSubset(raw) {
|
|
68
|
-
return pick(raw, [
|
|
68
|
+
return pick(raw, [
|
|
69
|
+
'repo',
|
|
70
|
+
'specPath',
|
|
71
|
+
'ref',
|
|
72
|
+
'outputDir',
|
|
73
|
+
'preserveCheckout',
|
|
74
|
+
'dryRun',
|
|
75
|
+
'responsesFile',
|
|
76
|
+
'logLevel',
|
|
77
|
+
'failIfExists',
|
|
78
|
+
'specFile',
|
|
79
|
+
]);
|
|
69
80
|
}
|
|
70
81
|
export function envConfigSubset(env = process.env) {
|
|
71
82
|
const map = {};
|
|
@@ -103,6 +114,9 @@ export function envConfigSubset(env = process.env) {
|
|
|
103
114
|
const failIfExists = getBool('AJB_FAIL_IF_EXISTS');
|
|
104
115
|
if (failIfExists !== undefined)
|
|
105
116
|
extract.failIfExists = failIfExists;
|
|
117
|
+
const specFile = map.AJB_SPEC_FILE;
|
|
118
|
+
if (specFile !== undefined)
|
|
119
|
+
extract.specFile = specFile;
|
|
106
120
|
const validate = {};
|
|
107
121
|
const record = getBool('AJB_RECORD');
|
|
108
122
|
const recordFallback = getBool('TEST_RESPONSE_BODY_RECORD');
|
|
@@ -128,8 +142,17 @@ function coerceExtract(config, warnings) {
|
|
|
128
142
|
return config;
|
|
129
143
|
}
|
|
130
144
|
export function resolveConfig(parts) {
|
|
131
|
-
const mergedExtract = {
|
|
132
|
-
|
|
145
|
+
const mergedExtract = {
|
|
146
|
+
...DEFAULT_EXTRACT,
|
|
147
|
+
...(parts.file?.extract || {}),
|
|
148
|
+
...parts.cli,
|
|
149
|
+
...parts.env.extract,
|
|
150
|
+
};
|
|
151
|
+
const mergedValidate = {
|
|
152
|
+
...DEFAULT_VALIDATE,
|
|
153
|
+
...(parts.file?.validate || {}),
|
|
154
|
+
...parts.env.validate,
|
|
155
|
+
};
|
|
133
156
|
coerceExtract(mergedExtract, parts.warnings);
|
|
134
157
|
const extract = {
|
|
135
158
|
repo: mergedExtract.repo || DEFAULT_EXTRACT.repo,
|
|
@@ -141,6 +164,7 @@ export function resolveConfig(parts) {
|
|
|
141
164
|
logLevel: mergedExtract.logLevel || DEFAULT_EXTRACT.logLevel,
|
|
142
165
|
failIfExists: mergedExtract.failIfExists ?? DEFAULT_EXTRACT.failIfExists,
|
|
143
166
|
responsesFile: mergedExtract.responsesFile,
|
|
167
|
+
specFile: mergedExtract.specFile,
|
|
144
168
|
};
|
|
145
169
|
const validate = {
|
|
146
170
|
recordResponses: mergedValidate.recordResponses ?? DEFAULT_VALIDATE.recordResponses,
|
package/dist/lib/config.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../src/lib/extractor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,OAAO,
|
|
1
|
+
{"version":3,"file":"extractor.d.ts","sourceRoot":"","sources":["../../src/lib/extractor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,OAAO,EAEL,aAAa,EACb,WAAW,EACX,aAAa,EAEd,MAAM,mBAAmB,CAAC;AAoC3B,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,GAAG,aAAa,EAAE,CAsCzE;AAED,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,QAc9C;AAED,wBAAsB,QAAQ,CAAC,GAAG,CAAC,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,CAAA;CAAE,iBAoIpF"}
|
package/dist/lib/extractor.js
CHANGED
|
@@ -38,7 +38,12 @@ export function extractResponses(doc) {
|
|
|
38
38
|
if (!schema)
|
|
39
39
|
continue;
|
|
40
40
|
const flattened = buildSchemaTree(schema, (doc.components?.schemas || {}), undefined, doc);
|
|
41
|
-
entries.push({
|
|
41
|
+
entries.push({
|
|
42
|
+
path,
|
|
43
|
+
method: method.toUpperCase(),
|
|
44
|
+
status,
|
|
45
|
+
schema: { required: flattened.required, optional: flattened.optional },
|
|
46
|
+
});
|
|
42
47
|
}
|
|
43
48
|
}
|
|
44
49
|
}
|
|
@@ -73,23 +78,54 @@ export async function generate(cfg, options) {
|
|
|
73
78
|
logLevel: cfg?.logLevel || base.logLevel,
|
|
74
79
|
failIfExists: cfg?.failIfExists ?? base.failIfExists,
|
|
75
80
|
responsesFile: cfg?.responsesFile || base.responsesFile,
|
|
81
|
+
specFile: cfg?.specFile || base.specFile,
|
|
76
82
|
};
|
|
77
83
|
const REPO = effective.repo;
|
|
78
84
|
const SPEC_PATH = effective.specPath;
|
|
79
85
|
if (effective.logLevel == 'info') {
|
|
80
86
|
console.info(effective);
|
|
81
87
|
}
|
|
82
|
-
|
|
88
|
+
// When specFile is provided, use the local file directly (skip git checkout)
|
|
89
|
+
const useLocalSpec = !!effective.specFile;
|
|
90
|
+
let workdir;
|
|
91
|
+
let commit;
|
|
92
|
+
let fullPath;
|
|
93
|
+
if (useLocalSpec) {
|
|
94
|
+
fullPath = resolve(effective.specFile);
|
|
95
|
+
if (!existsSync(fullPath)) {
|
|
96
|
+
throw new Error(`Local spec file not found: ${fullPath}`);
|
|
97
|
+
}
|
|
98
|
+
commit = 'local';
|
|
99
|
+
if (effective.logLevel !== 'silent') {
|
|
100
|
+
console.log(`Using local spec file: ${fullPath}`);
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
const checkout = sparseCheckout(REPO, SPEC_PATH, effective.ref);
|
|
105
|
+
workdir = checkout.workdir;
|
|
106
|
+
commit = checkout.commit;
|
|
107
|
+
fullPath = join(workdir, SPEC_PATH);
|
|
108
|
+
}
|
|
83
109
|
try {
|
|
84
|
-
const
|
|
85
|
-
const doc = await SwaggerParser.bundle(fullPath);
|
|
110
|
+
const doc = (await SwaggerParser.bundle(fullPath));
|
|
86
111
|
const responses = extractResponses(doc);
|
|
87
112
|
for (const entry of responses)
|
|
88
113
|
pruneSchema(entry.schema);
|
|
89
114
|
const sha256 = crypto.createHash('sha256').update(JSON.stringify(doc)).digest('hex');
|
|
90
|
-
const out = {
|
|
115
|
+
const out = {
|
|
116
|
+
metadata: {
|
|
117
|
+
sourceRepo: REPO,
|
|
118
|
+
commit,
|
|
119
|
+
generatedAt: new Date().toISOString(),
|
|
120
|
+
specPath: SPEC_PATH,
|
|
121
|
+
specSha256: sha256,
|
|
122
|
+
},
|
|
123
|
+
responses,
|
|
124
|
+
};
|
|
91
125
|
const outDir = effective.outputDir;
|
|
92
|
-
const targetFile = effective.responsesFile
|
|
126
|
+
const targetFile = effective.responsesFile
|
|
127
|
+
? resolve(effective.responsesFile)
|
|
128
|
+
: join(outDir, 'responses.json');
|
|
93
129
|
if (effective.failIfExists && existsSync(targetFile)) {
|
|
94
130
|
throw new Error(`Target file already exists: ${targetFile}`);
|
|
95
131
|
}
|
|
@@ -114,7 +150,8 @@ export async function generate(cfg, options) {
|
|
|
114
150
|
`export type MethodFor<P extends RoutePath> = Extract<keyof typeof RESPONSE_INDEX[P], string>;\n` +
|
|
115
151
|
`export type StatusFor<P extends RoutePath, M extends MethodFor<P>> = Extract<keyof typeof RESPONSE_INDEX[P][M], string>;\n\n` +
|
|
116
152
|
`export interface TypedRouteSpec<P extends RoutePath = RoutePath, M extends MethodFor<P> = MethodFor<P>, S extends StatusFor<P, M> = StatusFor<P, M>> {\n` +
|
|
117
|
-
` path: P;\n method: M;\n status: S;\n}` +
|
|
153
|
+
` path: P;\n method: M;\n status: S;\n}` +
|
|
154
|
+
'\n\n' +
|
|
118
155
|
`export function validateResponseShape<P extends RoutePath, M extends MethodFor<P>, S extends StatusFor<P,M>>(spec: { path: P; method: M; status: S }, body: unknown, options?: { responsesFilePath?: string; configPath?: string; throw?: boolean; record?: boolean | { label?: string } }) {\n` +
|
|
119
156
|
` // Cast to base signature (method/status widened to string) for internal call.\n` +
|
|
120
157
|
` const baseFn = _baseValidateResponseShape;\n` +
|
|
@@ -123,7 +160,8 @@ export async function generate(cfg, options) {
|
|
|
123
160
|
"Typed validator resolved to itself. Avoid aliasing the package name to the generated typed file. Use a relative import to the generated ./json-body-assertions/index or import from 'assert-json-body/base' for the core API."
|
|
124
161
|
);\n` +
|
|
125
162
|
` }\n` +
|
|
126
|
-
` return baseFn(spec as unknown as { path: string; method?: string; status?: string }, body, options);\n}` +
|
|
163
|
+
` return baseFn(spec as unknown as { path: string; method?: string; status?: string }, body, options);\n}` +
|
|
164
|
+
'\n' +
|
|
127
165
|
`export function validateResponse<P extends RoutePath, M extends MethodFor<P>, S extends StatusFor<P,M>>(spec: { path: P; method: M; status: S }, response: PlaywrightAPIResponse, options?: { responsesFilePath?: string; configPath?: string; throw?: boolean; record?: boolean | { label?: string } }) {\n` +
|
|
128
166
|
` return _baseValidateResponse(spec, response, options)\n}`;
|
|
129
167
|
writeFileSync(join(outDir, 'index.ts'), indexSource);
|
|
@@ -134,7 +172,8 @@ export async function generate(cfg, options) {
|
|
|
134
172
|
}
|
|
135
173
|
}
|
|
136
174
|
if (effective.logLevel !== 'silent') {
|
|
137
|
-
console.log(`Extracted ${responses.length} response schemas from commit ${commit}` +
|
|
175
|
+
console.log(`Extracted ${responses.length} response schemas from commit ${commit}` +
|
|
176
|
+
(effective.dryRun ? ' (dry-run: no files written)' : ''));
|
|
138
177
|
if (effective.responsesFile && effective.logLevel === 'debug') {
|
|
139
178
|
console.log(`Responses file explicit: ${targetFile}`);
|
|
140
179
|
}
|
|
@@ -145,24 +184,27 @@ export async function generate(cfg, options) {
|
|
|
145
184
|
}
|
|
146
185
|
}
|
|
147
186
|
finally {
|
|
148
|
-
if (
|
|
149
|
-
if (effective.
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
187
|
+
if (workdir) {
|
|
188
|
+
if (effective.preserveCheckout) {
|
|
189
|
+
if (effective.logLevel === 'debug')
|
|
190
|
+
console.log('Preserving temporary spec checkout.');
|
|
191
|
+
}
|
|
192
|
+
else {
|
|
193
|
+
try {
|
|
194
|
+
rmSync(workdir, { recursive: true, force: true });
|
|
195
|
+
}
|
|
196
|
+
catch {
|
|
197
|
+
/* ignore cleanup error */
|
|
198
|
+
}
|
|
155
199
|
}
|
|
156
|
-
catch { /* ignore cleanup error */ }
|
|
157
200
|
}
|
|
158
201
|
}
|
|
159
202
|
}
|
|
160
|
-
// Runtime main guard (ESM safe). For CJS compiled output we skip auto-exec
|
|
203
|
+
// Runtime main guard (ESM safe). For CJS compiled output we skip auto-exec
|
|
204
|
+
// by hiding import.meta behind eval() so tsc --module CommonJS doesn't error.
|
|
161
205
|
try {
|
|
162
|
-
//
|
|
163
|
-
|
|
164
|
-
// @ts-ignore
|
|
165
|
-
const thisUrl = typeof import.meta !== 'undefined' ? import.meta.url : undefined;
|
|
206
|
+
// eslint-disable-next-line no-eval
|
|
207
|
+
const thisUrl = eval('typeof import.meta !== "undefined" ? import.meta.url : undefined');
|
|
166
208
|
if (thisUrl) {
|
|
167
209
|
const isMain = process.argv[1] && fileURLToPath(thisUrl) === process.argv[1];
|
|
168
210
|
if (isMain) {
|
|
@@ -170,5 +212,7 @@ try {
|
|
|
170
212
|
}
|
|
171
213
|
}
|
|
172
214
|
}
|
|
173
|
-
catch {
|
|
215
|
+
catch {
|
|
216
|
+
/* ignore — CJS or bundled environment */
|
|
217
|
+
}
|
|
174
218
|
//# sourceMappingURL=extractor.js.map
|