assert-json-body 1.5.0 → 1.5.1
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/dist/extractor/src/lib/child-expansion.d.ts +3 -2
- package/dist/extractor/src/lib/child-expansion.d.ts.map +1 -1
- package/dist/extractor/src/lib/child-expansion.js +31 -21
- package/dist/extractor/src/lib/child-expansion.js.map +1 -1
- package/dist/extractor/src/lib/ref-resolver.d.ts +4 -0
- package/dist/extractor/src/lib/ref-resolver.d.ts.map +1 -0
- package/dist/extractor/src/lib/ref-resolver.js +22 -0
- package/dist/extractor/src/lib/ref-resolver.js.map +1 -0
- package/dist/extractor/src/lib/schema-flatten.d.ts +10 -5
- package/dist/extractor/src/lib/schema-flatten.d.ts.map +1 -1
- package/dist/extractor/src/lib/schema-flatten.js +52 -48
- package/dist/extractor/src/lib/schema-flatten.js.map +1 -1
- package/dist/lib/extractor.d.ts.map +1 -1
- package/dist/lib/extractor.js +1 -1
- package/dist/lib/extractor.js.map +1 -1
- package/dist-cjs/extractor/src/lib/child-expansion.d.ts +3 -2
- package/dist-cjs/extractor/src/lib/child-expansion.d.ts.map +1 -1
- package/dist-cjs/extractor/src/lib/child-expansion.js +31 -21
- package/dist-cjs/extractor/src/lib/child-expansion.js.map +1 -1
- package/dist-cjs/extractor/src/lib/ref-resolver.d.ts +4 -0
- package/dist-cjs/extractor/src/lib/ref-resolver.d.ts.map +1 -0
- package/dist-cjs/extractor/src/lib/ref-resolver.js +25 -0
- package/dist-cjs/extractor/src/lib/ref-resolver.js.map +1 -0
- package/dist-cjs/extractor/src/lib/schema-flatten.d.ts +10 -5
- package/dist-cjs/extractor/src/lib/schema-flatten.d.ts.map +1 -1
- package/dist-cjs/extractor/src/lib/schema-flatten.js +52 -48
- package/dist-cjs/extractor/src/lib/schema-flatten.js.map +1 -1
- package/dist-cjs/lib/extractor.d.ts.map +1 -1
- package/dist-cjs/lib/extractor.js +1 -1
- package/dist-cjs/lib/extractor.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { SchemaGroup as OutputSchema } from '../../../types/index.js';
|
|
2
2
|
import { SchemaOrRef } from './schema-flatten.js';
|
|
3
|
-
|
|
4
|
-
export declare function
|
|
3
|
+
import { OpenAPIV3 } from 'openapi-types';
|
|
4
|
+
export declare function buildSchemaTree(schema: SchemaOrRef, components: Record<string, SchemaOrRef>, seen?: Set<string>, doc?: OpenAPIV3.Document): OutputSchema;
|
|
5
|
+
export declare function resolveFieldSchema(fieldName: string, parentSchema: SchemaOrRef, components: Record<string, SchemaOrRef>, doc?: OpenAPIV3.Document): {
|
|
5
6
|
kind: string;
|
|
6
7
|
target?: SchemaOrRef;
|
|
7
8
|
} | null;
|
|
@@ -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;
|
|
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,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,cAAoB,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG,YAAY,CAgB9J;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAsDjM"}
|
|
@@ -1,37 +1,53 @@
|
|
|
1
1
|
import { refNameOf } from './type-utils.js';
|
|
2
2
|
import { flatten } from './schema-flatten.js';
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import { resolveRef } from './ref-resolver.js';
|
|
4
|
+
export function buildSchemaTree(schema, components, seen = new Set(), doc) {
|
|
5
|
+
const flat = flatten(schema, components, seen, doc);
|
|
5
6
|
for (const group of [flat.required, flat.optional]) {
|
|
6
7
|
for (const field of group) {
|
|
7
|
-
const resolved = resolveFieldSchema(field.name, schema, components);
|
|
8
|
+
const resolved = resolveFieldSchema(field.name, schema, components, doc);
|
|
8
9
|
if (resolved) {
|
|
9
10
|
const { kind, target } = resolved;
|
|
10
11
|
if ((kind === 'object' || kind === 'array-object') && target) {
|
|
11
|
-
field.children = buildSchemaTree(target, components, new Set(seen));
|
|
12
|
+
field.children = buildSchemaTree(target, components, new Set(seen), doc);
|
|
12
13
|
}
|
|
13
14
|
else if (kind === 'ref-object' && target) {
|
|
14
|
-
field.children = buildSchemaTree(target, components, new Set(seen.add(refNameOf(field.type))));
|
|
15
|
+
field.children = buildSchemaTree(target, components, new Set(seen.add(refNameOf(field.type))), doc);
|
|
15
16
|
}
|
|
16
17
|
}
|
|
17
18
|
}
|
|
18
19
|
}
|
|
19
20
|
return flat;
|
|
20
21
|
}
|
|
21
|
-
export function resolveFieldSchema(fieldName, parentSchema, components) {
|
|
22
|
+
export function resolveFieldSchema(fieldName, parentSchema, components, doc) {
|
|
22
23
|
const isRef = (s) => '$ref' in s;
|
|
23
24
|
const isSchemaObject = (s) => !('$ref' in s);
|
|
25
|
+
const resolveTarget = (s) => {
|
|
26
|
+
let curr = s;
|
|
27
|
+
const seen = new Set();
|
|
28
|
+
while (isRef(curr)) {
|
|
29
|
+
const refKey = curr.$ref;
|
|
30
|
+
if (seen.has(refKey))
|
|
31
|
+
return null;
|
|
32
|
+
seen.add(refKey);
|
|
33
|
+
const next = resolveRef(refKey, components, doc);
|
|
34
|
+
if (!next)
|
|
35
|
+
return null;
|
|
36
|
+
curr = next;
|
|
37
|
+
}
|
|
38
|
+
return curr;
|
|
39
|
+
};
|
|
24
40
|
const visited = new Set();
|
|
25
41
|
const propertyDefs = {};
|
|
26
42
|
const collect = (sch) => {
|
|
27
43
|
if (!sch)
|
|
28
44
|
return;
|
|
29
45
|
if (isRef(sch)) {
|
|
30
|
-
const
|
|
31
|
-
if (visited.has(
|
|
46
|
+
const refKey = sch.$ref;
|
|
47
|
+
if (visited.has(refKey))
|
|
32
48
|
return;
|
|
33
|
-
visited.add(
|
|
34
|
-
const target = components
|
|
49
|
+
visited.add(refKey);
|
|
50
|
+
const target = resolveRef(refKey, components, doc);
|
|
35
51
|
if (target)
|
|
36
52
|
collect(target);
|
|
37
53
|
return;
|
|
@@ -47,9 +63,8 @@ export function resolveFieldSchema(fieldName, parentSchema, components) {
|
|
|
47
63
|
if (!propSchema)
|
|
48
64
|
return null;
|
|
49
65
|
if (isRef(propSchema)) {
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
if (target && isSchemaObject(target) && (target.type === 'object' || target.properties || target.allOf))
|
|
66
|
+
const target = resolveTarget(propSchema);
|
|
67
|
+
if (target && (target.type === 'object' || target.properties || target.allOf))
|
|
53
68
|
return { kind: 'ref-object', target };
|
|
54
69
|
return { kind: 'ref' };
|
|
55
70
|
}
|
|
@@ -57,14 +72,9 @@ export function resolveFieldSchema(fieldName, parentSchema, components) {
|
|
|
57
72
|
return { kind: 'object', target: propSchema };
|
|
58
73
|
if (propSchema.type === 'array' && propSchema.items) {
|
|
59
74
|
const it = propSchema.items;
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
if (target && isSchemaObject(target) && (target.type === 'object' || target.properties || target.allOf))
|
|
64
|
-
return { kind: 'array-object', target };
|
|
65
|
-
}
|
|
66
|
-
else if (it.type === 'object' || it.properties || it.allOf) {
|
|
67
|
-
return { kind: 'array-object', target: it };
|
|
75
|
+
const target = resolveTarget(it);
|
|
76
|
+
if (target && (target.type === 'object' || target.properties || target.allOf)) {
|
|
77
|
+
return { kind: 'array-object', target };
|
|
68
78
|
}
|
|
69
79
|
}
|
|
70
80
|
return null;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"child-expansion.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/child-expansion.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { OpenAPIV3 } from 'openapi-types';
|
|
2
|
+
import { SchemaOrRef } from './schema-flatten.js';
|
|
3
|
+
export declare function resolveRef(ref: string, components: Record<string, SchemaOrRef>, doc?: OpenAPIV3.Document): SchemaOrRef | undefined;
|
|
4
|
+
//# sourceMappingURL=ref-resolver.d.ts.map
|
|
@@ -0,0 +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,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG,WAAW,GAAG,SAAS,CAmBlI"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
export function resolveRef(ref, components, doc) {
|
|
2
|
+
if (doc && ref.startsWith('#/')) {
|
|
3
|
+
const path = ref.substring(2).split('/');
|
|
4
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
5
|
+
let current = doc;
|
|
6
|
+
for (let i = 0; i < path.length; i++) {
|
|
7
|
+
const seg = path[i];
|
|
8
|
+
if (current === undefined || current === null) {
|
|
9
|
+
break;
|
|
10
|
+
}
|
|
11
|
+
const decoded = decodeURIComponent(seg.replace(/~1/g, '/').replace(/~0/g, '~'));
|
|
12
|
+
const next = current[decoded];
|
|
13
|
+
current = next;
|
|
14
|
+
}
|
|
15
|
+
if (current)
|
|
16
|
+
return current;
|
|
17
|
+
}
|
|
18
|
+
// Fallback to naive lookup (legacy/test support)
|
|
19
|
+
const name = ref.split('/').pop();
|
|
20
|
+
return components[name];
|
|
21
|
+
}
|
|
22
|
+
//# sourceMappingURL=ref-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ref-resolver.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/ref-resolver.ts"],"names":[],"mappings":"AAGA,MAAM,UAAU,UAAU,CAAC,GAAW,EAAE,UAAuC,EAAE,GAAwB;IACvG,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,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;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC5C,MAAM;YACV,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;QAClB,CAAC;QACD,IAAI,OAAO;YAAE,OAAO,OAAsB,CAAC;IAC9C,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,10 +1,15 @@
|
|
|
1
1
|
import { FieldSpec, FlattenResult, SchemaGroup as OutputSchema } from '../../../types/index.js';
|
|
2
2
|
import { OpenAPIV3 } from 'openapi-types';
|
|
3
3
|
export type SchemaOrRef = OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
interface Context {
|
|
5
|
+
components: Record<string, SchemaOrRef>;
|
|
6
|
+
doc?: OpenAPIV3.Document;
|
|
7
|
+
}
|
|
8
|
+
export declare function flatten(schema: SchemaOrRef, components: Record<string, SchemaOrRef>, seen?: Set<string>, doc?: OpenAPIV3.Document): OutputSchema;
|
|
9
|
+
export declare function flattenInternal(schema: SchemaOrRef, ctx: Context, seen?: Set<string>): FlattenResult;
|
|
10
|
+
export declare function describeType(schema: SchemaOrRef | undefined, ctx: Context, stack?: string[]): string;
|
|
11
|
+
export declare function deriveFieldMetadata(schema: SchemaOrRef, ctx: Context): Partial<FieldSpec>;
|
|
8
12
|
export declare function isObjectLike(s: SchemaOrRef | undefined | null): boolean;
|
|
9
|
-
export declare function primitiveFromSchema(schema: SchemaOrRef | undefined,
|
|
13
|
+
export declare function primitiveFromSchema(schema: SchemaOrRef | undefined, ctx: Context, stack: string[]): string | null;
|
|
14
|
+
export {};
|
|
10
15
|
//# sourceMappingURL=schema-flatten.d.ts.map
|
|
@@ -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;AAO7E,UAAU,OAAO;IACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACxC,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC;CAC1B;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,cAAoB,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG,YAAY,CAGtJ;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,cAAoB,GAAG,aAAa,CAwD1G;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,MAAM,CA4CxG;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CA2CzF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAIvE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CA2BjH"}
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
import { normalizeType, dedupeFields } from './type-utils.js';
|
|
2
2
|
function isRef(s) { return !!s && '$ref' in s; }
|
|
3
3
|
function isSchemaObject(s) { return !!s && !('$ref' in s); }
|
|
4
|
-
|
|
5
|
-
export function flatten(schema, components, seen = new Set()) {
|
|
6
|
-
const { required, optional } = flattenInternal(schema, components, seen);
|
|
4
|
+
import { resolveRef } from './ref-resolver.js';
|
|
5
|
+
export function flatten(schema, components, seen = new Set(), doc) {
|
|
6
|
+
const { required, optional } = flattenInternal(schema, { components, doc }, seen);
|
|
7
7
|
return { required, optional };
|
|
8
8
|
}
|
|
9
|
-
export function flattenInternal(schema,
|
|
9
|
+
export function flattenInternal(schema, ctx, seen = new Set()) {
|
|
10
10
|
if (isRef(schema)) {
|
|
11
|
-
const
|
|
12
|
-
if (seen.has(
|
|
11
|
+
const refKey = schema.$ref;
|
|
12
|
+
if (seen.has(refKey))
|
|
13
13
|
return { required: [], optional: [] };
|
|
14
|
-
seen.add(
|
|
15
|
-
const target = components
|
|
14
|
+
seen.add(refKey);
|
|
15
|
+
const target = resolveRef(refKey, ctx.components, ctx.doc);
|
|
16
16
|
if (!target)
|
|
17
17
|
return { required: [], optional: [] };
|
|
18
|
-
return flattenInternal(target,
|
|
18
|
+
return flattenInternal(target, ctx, seen);
|
|
19
19
|
}
|
|
20
20
|
let reqFields = [];
|
|
21
21
|
let optFields = [];
|
|
@@ -23,18 +23,21 @@ export function flattenInternal(schema, components, seen = new Set()) {
|
|
|
23
23
|
if (!sch)
|
|
24
24
|
return;
|
|
25
25
|
if (isRef(sch)) {
|
|
26
|
-
const
|
|
27
|
-
if (refSeen.has(
|
|
26
|
+
const refKey = sch.$ref;
|
|
27
|
+
if (refSeen.has(refKey))
|
|
28
28
|
return;
|
|
29
|
-
refSeen.add(
|
|
30
|
-
const target = components
|
|
31
|
-
if (target)
|
|
29
|
+
refSeen.add(refKey);
|
|
30
|
+
const target = resolveRef(refKey, ctx.components, ctx.doc);
|
|
31
|
+
if (target) {
|
|
32
32
|
expand(target, acc, refSeen);
|
|
33
|
+
}
|
|
33
34
|
return;
|
|
34
35
|
}
|
|
35
|
-
if (sch.allOf)
|
|
36
|
-
for (const part of sch.allOf)
|
|
36
|
+
if (sch.allOf) {
|
|
37
|
+
for (const part of sch.allOf) {
|
|
37
38
|
expand(part, acc, refSeen);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
38
41
|
if (isSchemaObject(sch))
|
|
39
42
|
acc.push(sch);
|
|
40
43
|
};
|
|
@@ -49,8 +52,8 @@ export function flattenInternal(schema, components, seen = new Set()) {
|
|
|
49
52
|
Object.assign(collectedProps, s.properties);
|
|
50
53
|
}
|
|
51
54
|
for (const [prop, propSchema] of Object.entries(collectedProps)) {
|
|
52
|
-
const metadata = deriveFieldMetadata(propSchema,
|
|
53
|
-
const rawType = describeType(propSchema,
|
|
55
|
+
const metadata = deriveFieldMetadata(propSchema, ctx);
|
|
56
|
+
const rawType = describeType(propSchema, ctx);
|
|
54
57
|
const spec = {
|
|
55
58
|
name: prop,
|
|
56
59
|
type: normalizeType(rawType),
|
|
@@ -65,34 +68,35 @@ export function flattenInternal(schema, components, seen = new Set()) {
|
|
|
65
68
|
optFields = dedupeFields(optFields.filter(f => !reqFields.some(r => r.name === f.name)));
|
|
66
69
|
return { required: reqFields, optional: optFields };
|
|
67
70
|
}
|
|
68
|
-
export function describeType(schema,
|
|
71
|
+
export function describeType(schema, ctx, stack = []) {
|
|
69
72
|
if (!schema)
|
|
70
73
|
return 'unknown';
|
|
71
74
|
if (isRef(schema)) {
|
|
72
|
-
const
|
|
73
|
-
const target = components
|
|
75
|
+
const refKey = schema.$ref;
|
|
76
|
+
const target = resolveRef(refKey, ctx.components, ctx.doc);
|
|
77
|
+
const simpleName = refKey.split('/').pop();
|
|
74
78
|
if (!target)
|
|
75
|
-
return
|
|
76
|
-
if (stack.includes(
|
|
77
|
-
return
|
|
78
|
-
const nextStack = [...stack,
|
|
79
|
-
const prim = primitiveFromSchema(target,
|
|
79
|
+
return simpleName;
|
|
80
|
+
if (stack.includes(refKey))
|
|
81
|
+
return simpleName;
|
|
82
|
+
const nextStack = [...stack, refKey];
|
|
83
|
+
const prim = primitiveFromSchema(target, ctx, nextStack);
|
|
80
84
|
if (prim)
|
|
81
85
|
return prim;
|
|
82
86
|
if (isSchemaObject(target)) {
|
|
83
|
-
const derived = describeType(target,
|
|
87
|
+
const derived = describeType(target, ctx, nextStack);
|
|
84
88
|
if (derived !== 'object')
|
|
85
89
|
return derived;
|
|
86
90
|
}
|
|
87
|
-
return
|
|
91
|
+
return simpleName;
|
|
88
92
|
}
|
|
89
93
|
if (schema.type === 'array') {
|
|
90
94
|
const items = schema.items;
|
|
91
|
-
return `array<${normalizeType(describeType(items,
|
|
95
|
+
return `array<${normalizeType(describeType(items, ctx, stack))}>`;
|
|
92
96
|
}
|
|
93
97
|
if (schema.allOf) {
|
|
94
98
|
const primCandidates = schema.allOf
|
|
95
|
-
.map((s) => primitiveFromSchema(s,
|
|
99
|
+
.map((s) => primitiveFromSchema(s, ctx, stack))
|
|
96
100
|
.filter((t) => !!t && t !== 'object');
|
|
97
101
|
const unique = [...new Set(primCandidates)];
|
|
98
102
|
if (unique.length === 1)
|
|
@@ -109,16 +113,16 @@ export function describeType(schema, components, stack = []) {
|
|
|
109
113
|
return schema.format ? `${schema.type}(${schema.format})` : schema.type;
|
|
110
114
|
}
|
|
111
115
|
if (schema.oneOf) {
|
|
112
|
-
const branches = schema.oneOf.map((s) => normalizeType(describeType(s,
|
|
116
|
+
const branches = schema.oneOf.map((s) => normalizeType(describeType(s, ctx, stack)));
|
|
113
117
|
return branches.join('|');
|
|
114
118
|
}
|
|
115
119
|
if (schema.anyOf) {
|
|
116
|
-
const branches = schema.anyOf.map((s) => normalizeType(describeType(s,
|
|
120
|
+
const branches = schema.anyOf.map((s) => normalizeType(describeType(s, ctx, stack)));
|
|
117
121
|
return branches.join('|');
|
|
118
122
|
}
|
|
119
123
|
return 'unknown';
|
|
120
124
|
}
|
|
121
|
-
export function deriveFieldMetadata(schema,
|
|
125
|
+
export function deriveFieldMetadata(schema, ctx) {
|
|
122
126
|
const meta = {};
|
|
123
127
|
const collectEnum = (sch) => {
|
|
124
128
|
if (!sch)
|
|
@@ -134,11 +138,11 @@ export function deriveFieldMetadata(schema, components) {
|
|
|
134
138
|
}
|
|
135
139
|
return undefined;
|
|
136
140
|
};
|
|
137
|
-
const detectWrapper = (
|
|
141
|
+
const detectWrapper = (refKey, target) => {
|
|
138
142
|
if (!target)
|
|
139
143
|
return {};
|
|
140
144
|
const enumValues = collectEnum(target);
|
|
141
|
-
const underlyingPrim = primitiveFromSchema(target,
|
|
145
|
+
const underlyingPrim = primitiveFromSchema(target, ctx, [refKey]);
|
|
142
146
|
const isPrimitiveLike = !!underlyingPrim && !(isSchemaObject(target) && (target.properties || target.type === 'object'));
|
|
143
147
|
return {
|
|
144
148
|
underlying: underlyingPrim ? normalizeType(underlyingPrim) : undefined,
|
|
@@ -147,14 +151,14 @@ export function deriveFieldMetadata(schema, components) {
|
|
|
147
151
|
};
|
|
148
152
|
};
|
|
149
153
|
if (isRef(schema)) {
|
|
150
|
-
const
|
|
151
|
-
const target = components
|
|
152
|
-
const { underlying, wrapper, enumValues } = detectWrapper(
|
|
154
|
+
const refKey = schema.$ref;
|
|
155
|
+
const target = resolveRef(refKey, ctx.components, ctx.doc);
|
|
156
|
+
const { underlying, wrapper, enumValues } = detectWrapper(refKey, target);
|
|
153
157
|
if (enumValues?.length)
|
|
154
158
|
meta.enumValues = enumValues;
|
|
155
159
|
if (wrapper && underlying)
|
|
156
160
|
meta.underlyingPrimitive = underlying;
|
|
157
|
-
meta.rawRefName =
|
|
161
|
+
meta.rawRefName = refKey.split('/').pop();
|
|
158
162
|
if (wrapper)
|
|
159
163
|
meta.wrapper = true;
|
|
160
164
|
return meta;
|
|
@@ -176,21 +180,21 @@ export function isObjectLike(s) {
|
|
|
176
180
|
return false; // handled elsewhere
|
|
177
181
|
return !!(s.type === 'object' || s.properties || s.allOf);
|
|
178
182
|
}
|
|
179
|
-
export function primitiveFromSchema(schema,
|
|
183
|
+
export function primitiveFromSchema(schema, ctx, stack) {
|
|
180
184
|
if (!schema)
|
|
181
185
|
return null;
|
|
182
186
|
if (isRef(schema)) {
|
|
183
|
-
const
|
|
184
|
-
if (stack.includes(
|
|
185
|
-
return
|
|
186
|
-
const target = components
|
|
187
|
+
const refKey = schema.$ref;
|
|
188
|
+
if (stack.includes(refKey))
|
|
189
|
+
return refKey.split('/').pop();
|
|
190
|
+
const target = resolveRef(refKey, ctx.components, ctx.doc);
|
|
187
191
|
if (!target)
|
|
188
|
-
return
|
|
189
|
-
const rec = primitiveFromSchema(target,
|
|
190
|
-
return rec ??
|
|
192
|
+
return refKey.split('/').pop();
|
|
193
|
+
const rec = primitiveFromSchema(target, ctx, [...stack, refKey]);
|
|
194
|
+
return rec ?? refKey.split('/').pop();
|
|
191
195
|
}
|
|
192
196
|
if (schema.allOf) {
|
|
193
|
-
const parts = schema.allOf.map((p) => primitiveFromSchema(p,
|
|
197
|
+
const parts = schema.allOf.map((p) => primitiveFromSchema(p, ctx, stack)).filter(Boolean);
|
|
194
198
|
const uniq = [...new Set(parts)];
|
|
195
199
|
if (uniq.length === 1)
|
|
196
200
|
return uniq[0];
|
|
@@ -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,IAAoC,OAAO,CAAC,CAAC,CAAC,IAAI,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC;AAChH,SAAS,cAAc,CAAC,CAAiC,IAAiC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AAEzH,
|
|
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":"extractor.d.ts","sourceRoot":"","sources":["../../src/lib/extractor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,OAAO,EAAiB,aAAa,EAAE,WAAW,EAAE,aAAa,EAAyB,MAAM,mBAAmB,CAAC;AAyBpH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,GAAG,aAAa,EAAE,
|
|
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,EAAiB,aAAa,EAAE,WAAW,EAAE,aAAa,EAAyB,MAAM,mBAAmB,CAAC;AAyBpH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,GAAG,aAAa,EAAE,CAyBzE;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,iBAkFpF"}
|
package/dist/lib/extractor.js
CHANGED
|
@@ -37,7 +37,7 @@ export function extractResponses(doc) {
|
|
|
37
37
|
const schema = appJson?.schema;
|
|
38
38
|
if (!schema)
|
|
39
39
|
continue;
|
|
40
|
-
const flattened = buildSchemaTree(schema, (doc.components?.schemas || {}));
|
|
40
|
+
const flattened = buildSchemaTree(schema, (doc.components?.schemas || {}), undefined, doc);
|
|
41
41
|
entries.push({ path, method: method.toUpperCase(), status, schema: { required: flattened.required, optional: flattened.optional } });
|
|
42
42
|
}
|
|
43
43
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../src/lib/extractor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACvE,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,MAAM,MAAM,aAAa,CAAC;AACjC,OAAO,aAAa,MAAM,6BAA6B,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC,OAAO,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAS1C,SAAS,gBAAgB,CAAC,UAA6D;IACrF,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IACjD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC1C,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;AACpC,CAAC;AAED,SAAS,KAAK,CAAC,GAAY;IACzB,OAAO,CAAC,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,MAAM,IAAK,GAA+B,CAAC;AACxF,CAAC;AAED,SAAS,eAAe,CAAC,IAA0D,EAAE,GAAmB;IACtG,IAAI,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;QAAC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC;QAAC,OAAO,GAAG,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,OAAQ,CAAC,IAAI,IAAI,CAAC;IAAC,CAAC;IACtH,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,GAAuB;IACtD,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,MAAM,KAAK,GAAiC,CAAC,GAAG,CAAC,KAAK,IAAI,EAAE,CAAiC,CAAC;IAC9F,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACrD,KAAK,MAAM,MAAM,IAAI,CAAC,KAAK,EAAC,MAAM,EAAC,KAAK,EAAC,OAAO,EAAC,QAAQ,CAAU,EAAE,CAAC;YACpE,MAAM,EAAE,GAA+B,QAAoC,CAAC,MAAM,CAA8B,CAAC;YACjH,IAAI,CAAC,EAAE;gBAAE,SAAS;YAClB,MAAM,SAAS,GAAiB,CAAC,EAAE,CAAC,SAAS,IAAI,EAAE,CAAiB,CAAC;YACrE,KAAK,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC3D,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;gBAChD,MAAM,OAAO,GAAI,QAAqC,CAAC,OAAO,CAAC;gBAC/D,MAAM,OAAO,GAAG,OAAO,EAAE,CAAC,kBAAkB,CAAC,CAAC;gBAC9C,MAAM,MAAM,GAAG,OAAO,EAAE,MAA0E,CAAC;gBACnG,IAAI,CAAC,MAAM;oBAAE,SAAS;gBACtB,MAAM,SAAS,GAAG,eAAe,
|
|
1
|
+
{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../src/lib/extractor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { SchemaGroup as OutputSchema } from '../../../types/index.js';
|
|
2
2
|
import { SchemaOrRef } from './schema-flatten.js';
|
|
3
|
-
|
|
4
|
-
export declare function
|
|
3
|
+
import { OpenAPIV3 } from 'openapi-types';
|
|
4
|
+
export declare function buildSchemaTree(schema: SchemaOrRef, components: Record<string, SchemaOrRef>, seen?: Set<string>, doc?: OpenAPIV3.Document): OutputSchema;
|
|
5
|
+
export declare function resolveFieldSchema(fieldName: string, parentSchema: SchemaOrRef, components: Record<string, SchemaOrRef>, doc?: OpenAPIV3.Document): {
|
|
5
6
|
kind: string;
|
|
6
7
|
target?: SchemaOrRef;
|
|
7
8
|
} | null;
|
|
@@ -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;
|
|
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,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,cAAoB,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG,YAAY,CAgB9J;AAED,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAsDjM"}
|
|
@@ -4,38 +4,54 @@ exports.buildSchemaTree = buildSchemaTree;
|
|
|
4
4
|
exports.resolveFieldSchema = resolveFieldSchema;
|
|
5
5
|
const type_utils_js_1 = require("./type-utils.js");
|
|
6
6
|
const schema_flatten_js_1 = require("./schema-flatten.js");
|
|
7
|
-
|
|
8
|
-
|
|
7
|
+
const ref_resolver_js_1 = require("./ref-resolver.js");
|
|
8
|
+
function buildSchemaTree(schema, components, seen = new Set(), doc) {
|
|
9
|
+
const flat = (0, schema_flatten_js_1.flatten)(schema, components, seen, doc);
|
|
9
10
|
for (const group of [flat.required, flat.optional]) {
|
|
10
11
|
for (const field of group) {
|
|
11
|
-
const resolved = resolveFieldSchema(field.name, schema, components);
|
|
12
|
+
const resolved = resolveFieldSchema(field.name, schema, components, doc);
|
|
12
13
|
if (resolved) {
|
|
13
14
|
const { kind, target } = resolved;
|
|
14
15
|
if ((kind === 'object' || kind === 'array-object') && target) {
|
|
15
|
-
field.children = buildSchemaTree(target, components, new Set(seen));
|
|
16
|
+
field.children = buildSchemaTree(target, components, new Set(seen), doc);
|
|
16
17
|
}
|
|
17
18
|
else if (kind === 'ref-object' && target) {
|
|
18
|
-
field.children = buildSchemaTree(target, components, new Set(seen.add((0, type_utils_js_1.refNameOf)(field.type))));
|
|
19
|
+
field.children = buildSchemaTree(target, components, new Set(seen.add((0, type_utils_js_1.refNameOf)(field.type))), doc);
|
|
19
20
|
}
|
|
20
21
|
}
|
|
21
22
|
}
|
|
22
23
|
}
|
|
23
24
|
return flat;
|
|
24
25
|
}
|
|
25
|
-
function resolveFieldSchema(fieldName, parentSchema, components) {
|
|
26
|
+
function resolveFieldSchema(fieldName, parentSchema, components, doc) {
|
|
26
27
|
const isRef = (s) => '$ref' in s;
|
|
27
28
|
const isSchemaObject = (s) => !('$ref' in s);
|
|
29
|
+
const resolveTarget = (s) => {
|
|
30
|
+
let curr = s;
|
|
31
|
+
const seen = new Set();
|
|
32
|
+
while (isRef(curr)) {
|
|
33
|
+
const refKey = curr.$ref;
|
|
34
|
+
if (seen.has(refKey))
|
|
35
|
+
return null;
|
|
36
|
+
seen.add(refKey);
|
|
37
|
+
const next = (0, ref_resolver_js_1.resolveRef)(refKey, components, doc);
|
|
38
|
+
if (!next)
|
|
39
|
+
return null;
|
|
40
|
+
curr = next;
|
|
41
|
+
}
|
|
42
|
+
return curr;
|
|
43
|
+
};
|
|
28
44
|
const visited = new Set();
|
|
29
45
|
const propertyDefs = {};
|
|
30
46
|
const collect = (sch) => {
|
|
31
47
|
if (!sch)
|
|
32
48
|
return;
|
|
33
49
|
if (isRef(sch)) {
|
|
34
|
-
const
|
|
35
|
-
if (visited.has(
|
|
50
|
+
const refKey = sch.$ref;
|
|
51
|
+
if (visited.has(refKey))
|
|
36
52
|
return;
|
|
37
|
-
visited.add(
|
|
38
|
-
const target = components
|
|
53
|
+
visited.add(refKey);
|
|
54
|
+
const target = (0, ref_resolver_js_1.resolveRef)(refKey, components, doc);
|
|
39
55
|
if (target)
|
|
40
56
|
collect(target);
|
|
41
57
|
return;
|
|
@@ -51,9 +67,8 @@ function resolveFieldSchema(fieldName, parentSchema, components) {
|
|
|
51
67
|
if (!propSchema)
|
|
52
68
|
return null;
|
|
53
69
|
if (isRef(propSchema)) {
|
|
54
|
-
const
|
|
55
|
-
|
|
56
|
-
if (target && isSchemaObject(target) && (target.type === 'object' || target.properties || target.allOf))
|
|
70
|
+
const target = resolveTarget(propSchema);
|
|
71
|
+
if (target && (target.type === 'object' || target.properties || target.allOf))
|
|
57
72
|
return { kind: 'ref-object', target };
|
|
58
73
|
return { kind: 'ref' };
|
|
59
74
|
}
|
|
@@ -61,14 +76,9 @@ function resolveFieldSchema(fieldName, parentSchema, components) {
|
|
|
61
76
|
return { kind: 'object', target: propSchema };
|
|
62
77
|
if (propSchema.type === 'array' && propSchema.items) {
|
|
63
78
|
const it = propSchema.items;
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
if (target && isSchemaObject(target) && (target.type === 'object' || target.properties || target.allOf))
|
|
68
|
-
return { kind: 'array-object', target };
|
|
69
|
-
}
|
|
70
|
-
else if (it.type === 'object' || it.properties || it.allOf) {
|
|
71
|
-
return { kind: 'array-object', target: it };
|
|
79
|
+
const target = resolveTarget(it);
|
|
80
|
+
if (target && (target.type === 'object' || target.properties || target.allOf)) {
|
|
81
|
+
return { kind: 'array-object', target };
|
|
72
82
|
}
|
|
73
83
|
}
|
|
74
84
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"child-expansion.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/child-expansion.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"child-expansion.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/child-expansion.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { OpenAPIV3 } from 'openapi-types';
|
|
2
|
+
import { SchemaOrRef } from './schema-flatten.js';
|
|
3
|
+
export declare function resolveRef(ref: string, components: Record<string, SchemaOrRef>, doc?: OpenAPIV3.Document): SchemaOrRef | undefined;
|
|
4
|
+
//# sourceMappingURL=ref-resolver.d.ts.map
|
|
@@ -0,0 +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,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG,WAAW,GAAG,SAAS,CAmBlI"}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.resolveRef = resolveRef;
|
|
4
|
+
function resolveRef(ref, components, doc) {
|
|
5
|
+
if (doc && ref.startsWith('#/')) {
|
|
6
|
+
const path = ref.substring(2).split('/');
|
|
7
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
8
|
+
let current = doc;
|
|
9
|
+
for (let i = 0; i < path.length; i++) {
|
|
10
|
+
const seg = path[i];
|
|
11
|
+
if (current === undefined || current === null) {
|
|
12
|
+
break;
|
|
13
|
+
}
|
|
14
|
+
const decoded = decodeURIComponent(seg.replace(/~1/g, '/').replace(/~0/g, '~'));
|
|
15
|
+
const next = current[decoded];
|
|
16
|
+
current = next;
|
|
17
|
+
}
|
|
18
|
+
if (current)
|
|
19
|
+
return current;
|
|
20
|
+
}
|
|
21
|
+
// Fallback to naive lookup (legacy/test support)
|
|
22
|
+
const name = ref.split('/').pop();
|
|
23
|
+
return components[name];
|
|
24
|
+
}
|
|
25
|
+
//# sourceMappingURL=ref-resolver.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ref-resolver.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/ref-resolver.ts"],"names":[],"mappings":";;AAGA,gCAmBC;AAnBD,SAAgB,UAAU,CAAC,GAAW,EAAE,UAAuC,EAAE,GAAwB;IACvG,IAAI,GAAG,IAAI,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;QAC/B,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;YACpC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;YACpB,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;gBAC5C,MAAM;YACV,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;QAClB,CAAC;QACD,IAAI,OAAO;YAAE,OAAO,OAAsB,CAAC;IAC9C,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,10 +1,15 @@
|
|
|
1
1
|
import { FieldSpec, FlattenResult, SchemaGroup as OutputSchema } from '../../../types/index.js';
|
|
2
2
|
import { OpenAPIV3 } from 'openapi-types';
|
|
3
3
|
export type SchemaOrRef = OpenAPIV3.SchemaObject | OpenAPIV3.ReferenceObject;
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
4
|
+
interface Context {
|
|
5
|
+
components: Record<string, SchemaOrRef>;
|
|
6
|
+
doc?: OpenAPIV3.Document;
|
|
7
|
+
}
|
|
8
|
+
export declare function flatten(schema: SchemaOrRef, components: Record<string, SchemaOrRef>, seen?: Set<string>, doc?: OpenAPIV3.Document): OutputSchema;
|
|
9
|
+
export declare function flattenInternal(schema: SchemaOrRef, ctx: Context, seen?: Set<string>): FlattenResult;
|
|
10
|
+
export declare function describeType(schema: SchemaOrRef | undefined, ctx: Context, stack?: string[]): string;
|
|
11
|
+
export declare function deriveFieldMetadata(schema: SchemaOrRef, ctx: Context): Partial<FieldSpec>;
|
|
8
12
|
export declare function isObjectLike(s: SchemaOrRef | undefined | null): boolean;
|
|
9
|
-
export declare function primitiveFromSchema(schema: SchemaOrRef | undefined,
|
|
13
|
+
export declare function primitiveFromSchema(schema: SchemaOrRef | undefined, ctx: Context, stack: string[]): string | null;
|
|
14
|
+
export {};
|
|
10
15
|
//# sourceMappingURL=schema-flatten.d.ts.map
|
|
@@ -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;AAO7E,UAAU,OAAO;IACf,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACxC,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,CAAC;CAC1B;AAED,wBAAgB,OAAO,CAAC,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,EAAE,IAAI,cAAoB,EAAE,GAAG,CAAC,EAAE,SAAS,CAAC,QAAQ,GAAG,YAAY,CAGtJ;AAED,wBAAgB,eAAe,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,cAAoB,GAAG,aAAa,CAwD1G;AAED,wBAAgB,YAAY,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,GAAE,MAAM,EAAO,GAAG,MAAM,CA4CxG;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC,SAAS,CAAC,CA2CzF;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,WAAW,GAAG,SAAS,GAAG,IAAI,GAAG,OAAO,CAIvE;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,WAAW,GAAG,SAAS,EAAE,GAAG,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,IAAI,CA2BjH"}
|
|
@@ -9,21 +9,21 @@ exports.primitiveFromSchema = primitiveFromSchema;
|
|
|
9
9
|
const type_utils_js_1 = require("./type-utils.js");
|
|
10
10
|
function isRef(s) { return !!s && '$ref' in s; }
|
|
11
11
|
function isSchemaObject(s) { return !!s && !('$ref' in s); }
|
|
12
|
-
|
|
13
|
-
function flatten(schema, components, seen = new Set()) {
|
|
14
|
-
const { required, optional } = flattenInternal(schema, components, seen);
|
|
12
|
+
const ref_resolver_js_1 = require("./ref-resolver.js");
|
|
13
|
+
function flatten(schema, components, seen = new Set(), doc) {
|
|
14
|
+
const { required, optional } = flattenInternal(schema, { components, doc }, seen);
|
|
15
15
|
return { required, optional };
|
|
16
16
|
}
|
|
17
|
-
function flattenInternal(schema,
|
|
17
|
+
function flattenInternal(schema, ctx, seen = new Set()) {
|
|
18
18
|
if (isRef(schema)) {
|
|
19
|
-
const
|
|
20
|
-
if (seen.has(
|
|
19
|
+
const refKey = schema.$ref;
|
|
20
|
+
if (seen.has(refKey))
|
|
21
21
|
return { required: [], optional: [] };
|
|
22
|
-
seen.add(
|
|
23
|
-
const target = components
|
|
22
|
+
seen.add(refKey);
|
|
23
|
+
const target = (0, ref_resolver_js_1.resolveRef)(refKey, ctx.components, ctx.doc);
|
|
24
24
|
if (!target)
|
|
25
25
|
return { required: [], optional: [] };
|
|
26
|
-
return flattenInternal(target,
|
|
26
|
+
return flattenInternal(target, ctx, seen);
|
|
27
27
|
}
|
|
28
28
|
let reqFields = [];
|
|
29
29
|
let optFields = [];
|
|
@@ -31,18 +31,21 @@ function flattenInternal(schema, components, seen = new Set()) {
|
|
|
31
31
|
if (!sch)
|
|
32
32
|
return;
|
|
33
33
|
if (isRef(sch)) {
|
|
34
|
-
const
|
|
35
|
-
if (refSeen.has(
|
|
34
|
+
const refKey = sch.$ref;
|
|
35
|
+
if (refSeen.has(refKey))
|
|
36
36
|
return;
|
|
37
|
-
refSeen.add(
|
|
38
|
-
const target = components
|
|
39
|
-
if (target)
|
|
37
|
+
refSeen.add(refKey);
|
|
38
|
+
const target = (0, ref_resolver_js_1.resolveRef)(refKey, ctx.components, ctx.doc);
|
|
39
|
+
if (target) {
|
|
40
40
|
expand(target, acc, refSeen);
|
|
41
|
+
}
|
|
41
42
|
return;
|
|
42
43
|
}
|
|
43
|
-
if (sch.allOf)
|
|
44
|
-
for (const part of sch.allOf)
|
|
44
|
+
if (sch.allOf) {
|
|
45
|
+
for (const part of sch.allOf) {
|
|
45
46
|
expand(part, acc, refSeen);
|
|
47
|
+
}
|
|
48
|
+
}
|
|
46
49
|
if (isSchemaObject(sch))
|
|
47
50
|
acc.push(sch);
|
|
48
51
|
};
|
|
@@ -57,8 +60,8 @@ function flattenInternal(schema, components, seen = new Set()) {
|
|
|
57
60
|
Object.assign(collectedProps, s.properties);
|
|
58
61
|
}
|
|
59
62
|
for (const [prop, propSchema] of Object.entries(collectedProps)) {
|
|
60
|
-
const metadata = deriveFieldMetadata(propSchema,
|
|
61
|
-
const rawType = describeType(propSchema,
|
|
63
|
+
const metadata = deriveFieldMetadata(propSchema, ctx);
|
|
64
|
+
const rawType = describeType(propSchema, ctx);
|
|
62
65
|
const spec = {
|
|
63
66
|
name: prop,
|
|
64
67
|
type: (0, type_utils_js_1.normalizeType)(rawType),
|
|
@@ -73,34 +76,35 @@ function flattenInternal(schema, components, seen = new Set()) {
|
|
|
73
76
|
optFields = (0, type_utils_js_1.dedupeFields)(optFields.filter(f => !reqFields.some(r => r.name === f.name)));
|
|
74
77
|
return { required: reqFields, optional: optFields };
|
|
75
78
|
}
|
|
76
|
-
function describeType(schema,
|
|
79
|
+
function describeType(schema, ctx, stack = []) {
|
|
77
80
|
if (!schema)
|
|
78
81
|
return 'unknown';
|
|
79
82
|
if (isRef(schema)) {
|
|
80
|
-
const
|
|
81
|
-
const target = components
|
|
83
|
+
const refKey = schema.$ref;
|
|
84
|
+
const target = (0, ref_resolver_js_1.resolveRef)(refKey, ctx.components, ctx.doc);
|
|
85
|
+
const simpleName = refKey.split('/').pop();
|
|
82
86
|
if (!target)
|
|
83
|
-
return
|
|
84
|
-
if (stack.includes(
|
|
85
|
-
return
|
|
86
|
-
const nextStack = [...stack,
|
|
87
|
-
const prim = primitiveFromSchema(target,
|
|
87
|
+
return simpleName;
|
|
88
|
+
if (stack.includes(refKey))
|
|
89
|
+
return simpleName;
|
|
90
|
+
const nextStack = [...stack, refKey];
|
|
91
|
+
const prim = primitiveFromSchema(target, ctx, nextStack);
|
|
88
92
|
if (prim)
|
|
89
93
|
return prim;
|
|
90
94
|
if (isSchemaObject(target)) {
|
|
91
|
-
const derived = describeType(target,
|
|
95
|
+
const derived = describeType(target, ctx, nextStack);
|
|
92
96
|
if (derived !== 'object')
|
|
93
97
|
return derived;
|
|
94
98
|
}
|
|
95
|
-
return
|
|
99
|
+
return simpleName;
|
|
96
100
|
}
|
|
97
101
|
if (schema.type === 'array') {
|
|
98
102
|
const items = schema.items;
|
|
99
|
-
return `array<${(0, type_utils_js_1.normalizeType)(describeType(items,
|
|
103
|
+
return `array<${(0, type_utils_js_1.normalizeType)(describeType(items, ctx, stack))}>`;
|
|
100
104
|
}
|
|
101
105
|
if (schema.allOf) {
|
|
102
106
|
const primCandidates = schema.allOf
|
|
103
|
-
.map((s) => primitiveFromSchema(s,
|
|
107
|
+
.map((s) => primitiveFromSchema(s, ctx, stack))
|
|
104
108
|
.filter((t) => !!t && t !== 'object');
|
|
105
109
|
const unique = [...new Set(primCandidates)];
|
|
106
110
|
if (unique.length === 1)
|
|
@@ -117,16 +121,16 @@ function describeType(schema, components, stack = []) {
|
|
|
117
121
|
return schema.format ? `${schema.type}(${schema.format})` : schema.type;
|
|
118
122
|
}
|
|
119
123
|
if (schema.oneOf) {
|
|
120
|
-
const branches = schema.oneOf.map((s) => (0, type_utils_js_1.normalizeType)(describeType(s,
|
|
124
|
+
const branches = schema.oneOf.map((s) => (0, type_utils_js_1.normalizeType)(describeType(s, ctx, stack)));
|
|
121
125
|
return branches.join('|');
|
|
122
126
|
}
|
|
123
127
|
if (schema.anyOf) {
|
|
124
|
-
const branches = schema.anyOf.map((s) => (0, type_utils_js_1.normalizeType)(describeType(s,
|
|
128
|
+
const branches = schema.anyOf.map((s) => (0, type_utils_js_1.normalizeType)(describeType(s, ctx, stack)));
|
|
125
129
|
return branches.join('|');
|
|
126
130
|
}
|
|
127
131
|
return 'unknown';
|
|
128
132
|
}
|
|
129
|
-
function deriveFieldMetadata(schema,
|
|
133
|
+
function deriveFieldMetadata(schema, ctx) {
|
|
130
134
|
const meta = {};
|
|
131
135
|
const collectEnum = (sch) => {
|
|
132
136
|
if (!sch)
|
|
@@ -142,11 +146,11 @@ function deriveFieldMetadata(schema, components) {
|
|
|
142
146
|
}
|
|
143
147
|
return undefined;
|
|
144
148
|
};
|
|
145
|
-
const detectWrapper = (
|
|
149
|
+
const detectWrapper = (refKey, target) => {
|
|
146
150
|
if (!target)
|
|
147
151
|
return {};
|
|
148
152
|
const enumValues = collectEnum(target);
|
|
149
|
-
const underlyingPrim = primitiveFromSchema(target,
|
|
153
|
+
const underlyingPrim = primitiveFromSchema(target, ctx, [refKey]);
|
|
150
154
|
const isPrimitiveLike = !!underlyingPrim && !(isSchemaObject(target) && (target.properties || target.type === 'object'));
|
|
151
155
|
return {
|
|
152
156
|
underlying: underlyingPrim ? (0, type_utils_js_1.normalizeType)(underlyingPrim) : undefined,
|
|
@@ -155,14 +159,14 @@ function deriveFieldMetadata(schema, components) {
|
|
|
155
159
|
};
|
|
156
160
|
};
|
|
157
161
|
if (isRef(schema)) {
|
|
158
|
-
const
|
|
159
|
-
const target = components
|
|
160
|
-
const { underlying, wrapper, enumValues } = detectWrapper(
|
|
162
|
+
const refKey = schema.$ref;
|
|
163
|
+
const target = (0, ref_resolver_js_1.resolveRef)(refKey, ctx.components, ctx.doc);
|
|
164
|
+
const { underlying, wrapper, enumValues } = detectWrapper(refKey, target);
|
|
161
165
|
if (enumValues?.length)
|
|
162
166
|
meta.enumValues = enumValues;
|
|
163
167
|
if (wrapper && underlying)
|
|
164
168
|
meta.underlyingPrimitive = underlying;
|
|
165
|
-
meta.rawRefName =
|
|
169
|
+
meta.rawRefName = refKey.split('/').pop();
|
|
166
170
|
if (wrapper)
|
|
167
171
|
meta.wrapper = true;
|
|
168
172
|
return meta;
|
|
@@ -184,21 +188,21 @@ function isObjectLike(s) {
|
|
|
184
188
|
return false; // handled elsewhere
|
|
185
189
|
return !!(s.type === 'object' || s.properties || s.allOf);
|
|
186
190
|
}
|
|
187
|
-
function primitiveFromSchema(schema,
|
|
191
|
+
function primitiveFromSchema(schema, ctx, stack) {
|
|
188
192
|
if (!schema)
|
|
189
193
|
return null;
|
|
190
194
|
if (isRef(schema)) {
|
|
191
|
-
const
|
|
192
|
-
if (stack.includes(
|
|
193
|
-
return
|
|
194
|
-
const target = components
|
|
195
|
+
const refKey = schema.$ref;
|
|
196
|
+
if (stack.includes(refKey))
|
|
197
|
+
return refKey.split('/').pop();
|
|
198
|
+
const target = (0, ref_resolver_js_1.resolveRef)(refKey, ctx.components, ctx.doc);
|
|
195
199
|
if (!target)
|
|
196
|
-
return
|
|
197
|
-
const rec = primitiveFromSchema(target,
|
|
198
|
-
return rec ??
|
|
200
|
+
return refKey.split('/').pop();
|
|
201
|
+
const rec = primitiveFromSchema(target, ctx, [...stack, refKey]);
|
|
202
|
+
return rec ?? refKey.split('/').pop();
|
|
199
203
|
}
|
|
200
204
|
if (schema.allOf) {
|
|
201
|
-
const parts = schema.allOf.map((p) => primitiveFromSchema(p,
|
|
205
|
+
const parts = schema.allOf.map((p) => primitiveFromSchema(p, ctx, stack)).filter(Boolean);
|
|
202
206
|
const uniq = [...new Set(parts)];
|
|
203
207
|
if (uniq.length === 1)
|
|
204
208
|
return uniq[0];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-flatten.js","sourceRoot":"","sources":["../../../../src/extractor/src/lib/schema-flatten.ts"],"names":[],"mappings":";;
|
|
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":"extractor.d.ts","sourceRoot":"","sources":["../../src/lib/extractor.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAG1C,OAAO,EAAiB,aAAa,EAAE,WAAW,EAAE,aAAa,EAAyB,MAAM,mBAAmB,CAAC;AAyBpH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,GAAG,aAAa,EAAE,
|
|
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,EAAiB,aAAa,EAAE,WAAW,EAAE,aAAa,EAAyB,MAAM,mBAAmB,CAAC;AAyBpH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,SAAS,CAAC,QAAQ,GAAG,aAAa,EAAE,CAyBzE;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,iBAkFpF"}
|
|
@@ -45,7 +45,7 @@ function extractResponses(doc) {
|
|
|
45
45
|
const schema = appJson?.schema;
|
|
46
46
|
if (!schema)
|
|
47
47
|
continue;
|
|
48
|
-
const flattened = (0, child_expansion_js_1.buildSchemaTree)(schema, (doc.components?.schemas || {}));
|
|
48
|
+
const flattened = (0, child_expansion_js_1.buildSchemaTree)(schema, (doc.components?.schemas || {}), undefined, doc);
|
|
49
49
|
entries.push({ path, method: method.toUpperCase(), status, schema: { required: flattened.required, optional: flattened.optional } });
|
|
50
50
|
}
|
|
51
51
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../src/lib/extractor.ts"],"names":[],"mappings":";;;;;AAiCA,
|
|
1
|
+
{"version":3,"file":"extractor.js","sourceRoot":"","sources":["../../src/lib/extractor.ts"],"names":[],"mappings":"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"}
|