@redocly/openapi-core 2.71.2 → 2.72.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/lib/config/builtIn.d.ts.map +1 -1
- package/lib/config/builtIn.js +10 -0
- package/lib/config/builtIn.js.map +1 -1
- package/lib/config/config-resolvers.d.ts.map +1 -1
- package/lib/config/config-resolvers.js +12 -0
- package/lib/config/config-resolvers.js.map +1 -1
- package/lib/config/config.d.ts +7 -0
- package/lib/config/config.d.ts.map +1 -1
- package/lib/config/config.js +28 -0
- package/lib/config/config.js.map +1 -1
- package/lib/config/constants.d.ts.map +1 -1
- package/lib/config/constants.js +1 -1
- package/lib/config/constants.js.map +1 -1
- package/lib/config/diff-recommended.d.ts +4 -0
- package/lib/config/diff-recommended.d.ts.map +1 -0
- package/lib/config/diff-recommended.js +48 -0
- package/lib/config/diff-recommended.js.map +1 -0
- package/lib/config/rules.d.ts +7 -0
- package/lib/config/rules.d.ts.map +1 -1
- package/lib/config/rules.js +9 -0
- package/lib/config/rules.js.map +1 -1
- package/lib/config/types.d.ts +12 -1
- package/lib/config/types.d.ts.map +1 -1
- package/lib/config/utils.d.ts.map +1 -1
- package/lib/config/utils.js +14 -0
- package/lib/config/utils.js.map +1 -1
- package/lib/diff/changes.d.ts +4 -0
- package/lib/diff/changes.d.ts.map +1 -0
- package/lib/diff/changes.js +57 -0
- package/lib/diff/changes.js.map +1 -0
- package/lib/diff/diff-node.d.ts +9 -0
- package/lib/diff/diff-node.d.ts.map +1 -0
- package/lib/diff/diff-node.js +40 -0
- package/lib/diff/diff-node.js.map +1 -0
- package/lib/diff/diff-tree.d.ts +5 -0
- package/lib/diff/diff-tree.d.ts.map +1 -0
- package/lib/diff/diff-tree.js +53 -0
- package/lib/diff/diff-tree.js.map +1 -0
- package/lib/diff/direction.d.ts +4 -0
- package/lib/diff/direction.d.ts.map +1 -0
- package/lib/diff/direction.js +68 -0
- package/lib/diff/direction.js.map +1 -0
- package/lib/diff/impact.d.ts +7 -0
- package/lib/diff/impact.d.ts.map +1 -0
- package/lib/diff/impact.js +21 -0
- package/lib/diff/impact.js.map +1 -0
- package/lib/diff/index.d.ts +10 -0
- package/lib/diff/index.d.ts.map +1 -0
- package/lib/diff/index.js +104 -0
- package/lib/diff/index.js.map +1 -0
- package/lib/diff/judge.d.ts +11 -0
- package/lib/diff/judge.d.ts.map +1 -0
- package/lib/diff/judge.js +66 -0
- package/lib/diff/judge.js.map +1 -0
- package/lib/diff/pair-children.d.ts +8 -0
- package/lib/diff/pair-children.d.ts.map +1 -0
- package/lib/diff/pair-children.js +88 -0
- package/lib/diff/pair-children.js.map +1 -0
- package/lib/diff/rules/channel-address-changed.d.ts +3 -0
- package/lib/diff/rules/channel-address-changed.d.ts.map +1 -0
- package/lib/diff/rules/channel-address-changed.js +17 -0
- package/lib/diff/rules/channel-address-changed.js.map +1 -0
- package/lib/diff/rules/channel-removed.d.ts +3 -0
- package/lib/diff/rules/channel-removed.d.ts.map +1 -0
- package/lib/diff/rules/channel-removed.js +15 -0
- package/lib/diff/rules/channel-removed.js.map +1 -0
- package/lib/diff/rules/enum-values-added.d.ts +3 -0
- package/lib/diff/rules/enum-values-added.d.ts.map +1 -0
- package/lib/diff/rules/enum-values-added.js +24 -0
- package/lib/diff/rules/enum-values-added.js.map +1 -0
- package/lib/diff/rules/enum-values-removed.d.ts +3 -0
- package/lib/diff/rules/enum-values-removed.d.ts.map +1 -0
- package/lib/diff/rules/enum-values-removed.js +26 -0
- package/lib/diff/rules/enum-values-removed.js.map +1 -0
- package/lib/diff/rules/index.d.ts +91 -0
- package/lib/diff/rules/index.d.ts.map +1 -0
- package/lib/diff/rules/index.js +78 -0
- package/lib/diff/rules/index.js.map +1 -0
- package/lib/diff/rules/media-type-removed.d.ts +3 -0
- package/lib/diff/rules/media-type-removed.d.ts.map +1 -0
- package/lib/diff/rules/media-type-removed.js +22 -0
- package/lib/diff/rules/media-type-removed.js.map +1 -0
- package/lib/diff/rules/message-content-type-changed.d.ts +3 -0
- package/lib/diff/rules/message-content-type-changed.d.ts.map +1 -0
- package/lib/diff/rules/message-content-type-changed.js +17 -0
- package/lib/diff/rules/message-content-type-changed.js.map +1 -0
- package/lib/diff/rules/message-removed.d.ts +3 -0
- package/lib/diff/rules/message-removed.d.ts.map +1 -0
- package/lib/diff/rules/message-removed.js +18 -0
- package/lib/diff/rules/message-removed.js.map +1 -0
- package/lib/diff/rules/operation-action-changed.d.ts +3 -0
- package/lib/diff/rules/operation-action-changed.d.ts.map +1 -0
- package/lib/diff/rules/operation-action-changed.js +19 -0
- package/lib/diff/rules/operation-action-changed.js.map +1 -0
- package/lib/diff/rules/operation-id-changed.d.ts +3 -0
- package/lib/diff/rules/operation-id-changed.d.ts.map +1 -0
- package/lib/diff/rules/operation-id-changed.js +23 -0
- package/lib/diff/rules/operation-id-changed.js.map +1 -0
- package/lib/diff/rules/operation-removed.d.ts +3 -0
- package/lib/diff/rules/operation-removed.d.ts.map +1 -0
- package/lib/diff/rules/operation-removed.js +29 -0
- package/lib/diff/rules/operation-removed.js.map +1 -0
- package/lib/diff/rules/parameter-became-required.d.ts +3 -0
- package/lib/diff/rules/parameter-became-required.d.ts.map +1 -0
- package/lib/diff/rules/parameter-became-required.js +35 -0
- package/lib/diff/rules/parameter-became-required.js.map +1 -0
- package/lib/diff/rules/parameter-removed.d.ts +3 -0
- package/lib/diff/rules/parameter-removed.d.ts.map +1 -0
- package/lib/diff/rules/parameter-removed.js +35 -0
- package/lib/diff/rules/parameter-removed.js.map +1 -0
- package/lib/diff/rules/parameter-serialization-changed.d.ts +3 -0
- package/lib/diff/rules/parameter-serialization-changed.d.ts.map +1 -0
- package/lib/diff/rules/parameter-serialization-changed.js +25 -0
- package/lib/diff/rules/parameter-serialization-changed.js.map +1 -0
- package/lib/diff/rules/path-removed.d.ts +3 -0
- package/lib/diff/rules/path-removed.d.ts.map +1 -0
- package/lib/diff/rules/path-removed.js +61 -0
- package/lib/diff/rules/path-removed.js.map +1 -0
- package/lib/diff/rules/property-removed.d.ts +3 -0
- package/lib/diff/rules/property-removed.d.ts.map +1 -0
- package/lib/diff/rules/property-removed.js +40 -0
- package/lib/diff/rules/property-removed.js.map +1 -0
- package/lib/diff/rules/request-body-became-required.d.ts +3 -0
- package/lib/diff/rules/request-body-became-required.d.ts.map +1 -0
- package/lib/diff/rules/request-body-became-required.js +10 -0
- package/lib/diff/rules/request-body-became-required.js.map +1 -0
- package/lib/diff/rules/request-body-removed.d.ts +3 -0
- package/lib/diff/rules/request-body-removed.d.ts.map +1 -0
- package/lib/diff/rules/request-body-removed.js +8 -0
- package/lib/diff/rules/request-body-removed.js.map +1 -0
- package/lib/diff/rules/required-properties-added.d.ts +3 -0
- package/lib/diff/rules/required-properties-added.d.ts.map +1 -0
- package/lib/diff/rules/required-properties-added.js +18 -0
- package/lib/diff/rules/required-properties-added.js.map +1 -0
- package/lib/diff/rules/required-properties-removed.d.ts +3 -0
- package/lib/diff/rules/required-properties-removed.d.ts.map +1 -0
- package/lib/diff/rules/required-properties-removed.js +20 -0
- package/lib/diff/rules/required-properties-removed.js.map +1 -0
- package/lib/diff/rules/response-header-removed.d.ts +3 -0
- package/lib/diff/rules/response-header-removed.d.ts.map +1 -0
- package/lib/diff/rules/response-header-removed.js +28 -0
- package/lib/diff/rules/response-header-removed.js.map +1 -0
- package/lib/diff/rules/response-removed.d.ts +3 -0
- package/lib/diff/rules/response-removed.d.ts.map +1 -0
- package/lib/diff/rules/response-removed.js +17 -0
- package/lib/diff/rules/response-removed.js.map +1 -0
- package/lib/diff/rules/schema-combinator-changed.d.ts +3 -0
- package/lib/diff/rules/schema-combinator-changed.d.ts.map +1 -0
- package/lib/diff/rules/schema-combinator-changed.js +35 -0
- package/lib/diff/rules/schema-combinator-changed.js.map +1 -0
- package/lib/diff/rules/schema-constraint-changed.d.ts +3 -0
- package/lib/diff/rules/schema-constraint-changed.d.ts.map +1 -0
- package/lib/diff/rules/schema-constraint-changed.js +185 -0
- package/lib/diff/rules/schema-constraint-changed.js.map +1 -0
- package/lib/diff/rules/schema-type-changed.d.ts +3 -0
- package/lib/diff/rules/schema-type-changed.d.ts.map +1 -0
- package/lib/diff/rules/schema-type-changed.js +48 -0
- package/lib/diff/rules/schema-type-changed.js.map +1 -0
- package/lib/diff/rules/security-requirement-changed.d.ts +3 -0
- package/lib/diff/rules/security-requirement-changed.d.ts.map +1 -0
- package/lib/diff/rules/security-requirement-changed.js +58 -0
- package/lib/diff/rules/security-requirement-changed.js.map +1 -0
- package/lib/diff/rules/security-scheme-changed.d.ts +3 -0
- package/lib/diff/rules/security-scheme-changed.d.ts.map +1 -0
- package/lib/diff/rules/security-scheme-changed.js +34 -0
- package/lib/diff/rules/security-scheme-changed.js.map +1 -0
- package/lib/diff/rules/server-removed.d.ts +3 -0
- package/lib/diff/rules/server-removed.d.ts.map +1 -0
- package/lib/diff/rules/server-removed.js +41 -0
- package/lib/diff/rules/server-removed.js.map +1 -0
- package/lib/diff/rules/utils.d.ts +6 -0
- package/lib/diff/rules/utils.d.ts.map +1 -0
- package/lib/diff/rules/utils.js +26 -0
- package/lib/diff/rules/utils.js.map +1 -0
- package/lib/diff/types.d.ts +81 -0
- package/lib/diff/types.d.ts.map +1 -0
- package/lib/diff/types.js +2 -0
- package/lib/diff/types.js.map +1 -0
- package/lib/format/format.d.ts +1 -1
- package/lib/format/format.d.ts.map +1 -1
- package/lib/format/format.js +4 -1
- package/lib/format/format.js.map +1 -1
- package/lib/index.d.ts +6 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +5 -1
- package/lib/index.js.map +1 -1
- package/lib/node-tree/access.d.ts +9 -0
- package/lib/node-tree/access.d.ts.map +1 -0
- package/lib/node-tree/access.js +32 -0
- package/lib/node-tree/access.js.map +1 -0
- package/lib/node-tree/index.d.ts +11 -0
- package/lib/node-tree/index.d.ts.map +1 -0
- package/lib/node-tree/index.js +80 -0
- package/lib/node-tree/index.js.map +1 -0
- package/lib/node-tree/types.d.ts +17 -0
- package/lib/node-tree/types.d.ts.map +1 -0
- package/lib/node-tree/types.js +2 -0
- package/lib/node-tree/types.js.map +1 -0
- package/lib/rules/utils.js +1 -1
- package/lib/rules/utils.js.map +1 -1
- package/lib/types/redocly-yaml.d.ts.map +1 -1
- package/lib/types/redocly-yaml.js +22 -1
- package/lib/types/redocly-yaml.js.map +1 -1
- package/lib/utils/is-scalar.d.ts +3 -0
- package/lib/utils/is-scalar.d.ts.map +1 -0
- package/lib/utils/is-scalar.js +10 -0
- package/lib/utils/is-scalar.js.map +1 -0
- package/lib/utils/items-not-in.d.ts +3 -0
- package/lib/utils/items-not-in.d.ts.map +1 -0
- package/lib/utils/items-not-in.js +8 -0
- package/lib/utils/items-not-in.js.map +1 -0
- package/package.json +3 -4
package/lib/config/utils.js
CHANGED
|
@@ -57,6 +57,11 @@ export function mergeExtends(rulesConfList) {
|
|
|
57
57
|
overlay1Decorators: {},
|
|
58
58
|
openrpc1Decorators: {},
|
|
59
59
|
recheck,
|
|
60
|
+
diff: {},
|
|
61
|
+
oas3_0Diff: {},
|
|
62
|
+
oas3_1Diff: {},
|
|
63
|
+
oas3_2Diff: {},
|
|
64
|
+
async3Diff: {},
|
|
60
65
|
};
|
|
61
66
|
for (const rulesConf of rulesConfList) {
|
|
62
67
|
if (isPlainObject(rulesConf) && 'extends' in rulesConf && rulesConf.extends !== undefined) {
|
|
@@ -128,6 +133,15 @@ export function mergeExtends(rulesConfList) {
|
|
|
128
133
|
assignConfig(result.openrpc1Decorators, rulesConf.openrpc1Decorators);
|
|
129
134
|
assignOnlyExistingConfig(result.openrpc1Decorators, rulesConf.decorators);
|
|
130
135
|
recheck = mergeRecheckBlocks(recheck, rulesConf.recheck);
|
|
136
|
+
assignConfig(result.diff, rulesConf.diff);
|
|
137
|
+
assignConfig(result.oas3_0Diff, rulesConf.oas3_0Diff);
|
|
138
|
+
assignOnlyExistingConfig(result.oas3_0Diff, rulesConf.diff);
|
|
139
|
+
assignConfig(result.oas3_1Diff, rulesConf.oas3_1Diff);
|
|
140
|
+
assignOnlyExistingConfig(result.oas3_1Diff, rulesConf.diff);
|
|
141
|
+
assignConfig(result.oas3_2Diff, rulesConf.oas3_2Diff);
|
|
142
|
+
assignOnlyExistingConfig(result.oas3_2Diff, rulesConf.diff);
|
|
143
|
+
assignConfig(result.async3Diff, rulesConf.async3Diff);
|
|
144
|
+
assignOnlyExistingConfig(result.async3Diff, rulesConf.diff);
|
|
131
145
|
}
|
|
132
146
|
result.recheck = recheck;
|
|
133
147
|
return result;
|
package/lib/config/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/config/utils.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGlD,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IAClD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAUzB,KAAQ,EAAE,MAAc;IACxB,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE1B,MAAM,GAAG,GAAG,EAAO,CAAC;IACpB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,GAAG,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,aAAyC;IACpE,IAAI,OAAO,GAAkB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAuC;QACjD,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,cAAc,EAAE,EAAE;QAClB,aAAa,EAAE,EAAE;QACjB,aAAa,EAAE,EAAE;QACjB,YAAY,EAAE,EAAE;QAEhB,aAAa,EAAE,EAAE;QACjB,iBAAiB,EAAE,EAAE;QACrB,mBAAmB,EAAE,EAAE;QACvB,mBAAmB,EAAE,EAAE;QACvB,mBAAmB,EAAE,EAAE;QACvB,mBAAmB,EAAE,EAAE;QACvB,mBAAmB,EAAE,EAAE;QACvB,oBAAoB,EAAE,EAAE;QACxB,sBAAsB,EAAE,EAAE;QAC1B,qBAAqB,EAAE,EAAE;QACzB,qBAAqB,EAAE,EAAE;QAEzB,UAAU,EAAE,EAAE;QACd,cAAc,EAAE,EAAE;QAClB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,iBAAiB,EAAE,EAAE;QACrB,mBAAmB,EAAE,EAAE;QACvB,kBAAkB,EAAE,EAAE;QACtB,kBAAkB,EAAE,EAAE;QAEtB,OAAO;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/config/utils.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,wBAAwB,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAGlD,MAAM,UAAU,eAAe,CAAC,UAAkB;IAChD,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACjC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrD,OAAO,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC;IAClD,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAUzB,KAAQ,EAAE,MAAc;IACxB,IAAI,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAE1B,MAAM,GAAG,GAAG,EAAO,CAAC;IACpB,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACtC,GAAG,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IACzC,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,aAAyC;IACpE,IAAI,OAAO,GAAkB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC3C,MAAM,MAAM,GAAuC;QACjD,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,EAAE;QACb,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,EAAE;QACf,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,cAAc,EAAE,EAAE;QAClB,aAAa,EAAE,EAAE;QACjB,aAAa,EAAE,EAAE;QACjB,YAAY,EAAE,EAAE;QAEhB,aAAa,EAAE,EAAE;QACjB,iBAAiB,EAAE,EAAE;QACrB,mBAAmB,EAAE,EAAE;QACvB,mBAAmB,EAAE,EAAE;QACvB,mBAAmB,EAAE,EAAE;QACvB,mBAAmB,EAAE,EAAE;QACvB,mBAAmB,EAAE,EAAE;QACvB,oBAAoB,EAAE,EAAE;QACxB,sBAAsB,EAAE,EAAE;QAC1B,qBAAqB,EAAE,EAAE;QACzB,qBAAqB,EAAE,EAAE;QAEzB,UAAU,EAAE,EAAE;QACd,cAAc,EAAE,EAAE;QAClB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,gBAAgB,EAAE,EAAE;QACpB,iBAAiB,EAAE,EAAE;QACrB,mBAAmB,EAAE,EAAE;QACvB,kBAAkB,EAAE,EAAE;QACtB,kBAAkB,EAAE,EAAE;QAEtB,OAAO;QACP,IAAI,EAAE,EAAE;QACR,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,EAAE;QACd,UAAU,EAAE,EAAE;KACf,CAAC;IAEF,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE,CAAC;QACtC,IAAI,aAAa,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,SAAS,IAAI,SAAS,CAAC,OAAO,KAAK,SAAS,EAAE,CAAC;YAC1F,MAAM,IAAI,KAAK,CACb,sDAAsD,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAC3F,CAAC;QACJ,CAAC;QAED,YAAY,CAAC,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5C,YAAY,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;QACpD,wBAAwB,CAAC,MAAM,CAAC,SAAS,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC5D,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACxD,wBAAwB,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9D,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACxD,wBAAwB,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9D,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACxD,wBAAwB,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9D,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACxD,wBAAwB,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9D,YAAY,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,WAAW,CAAC,CAAC;QACxD,wBAAwB,CAAC,MAAM,CAAC,WAAW,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC9D,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1D,wBAAwB,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAC/D,YAAY,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;QAC9D,wBAAwB,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QACjE,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC5D,wBAAwB,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAChE,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC5D,wBAAwB,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAChE,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,YAAY,CAAC,CAAC;QAC1D,wBAAwB,CAAC,MAAM,CAAC,YAAY,EAAE,SAAS,CAAC,KAAK,CAAC,CAAC;QAE/D,YAAY,CAAC,MAAM,CAAC,aAAa,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC5D,YAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;QACpE,wBAAwB,CAAC,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC5E,YAAY,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACxE,wBAAwB,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC9E,YAAY,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACxE,wBAAwB,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC9E,YAAY,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACxE,wBAAwB,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC9E,YAAY,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACxE,wBAAwB,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC9E,YAAY,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACxE,wBAAwB,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC9E,YAAY,CAAC,MAAM,CAAC,oBAAoB,EAAE,SAAS,CAAC,oBAAoB,CAAC,CAAC;QAC1E,wBAAwB,CAAC,MAAM,CAAC,oBAAoB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAC/E,YAAY,CAAC,MAAM,CAAC,sBAAsB,EAAE,SAAS,CAAC,sBAAsB,CAAC,CAAC;QAC9E,wBAAwB,CAAC,MAAM,CAAC,sBAAsB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QACjF,YAAY,CAAC,MAAM,CAAC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC5E,wBAAwB,CAAC,MAAM,CAAC,qBAAqB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAChF,YAAY,CAAC,MAAM,CAAC,qBAAqB,EAAE,SAAS,CAAC,qBAAqB,CAAC,CAAC;QAC5E,wBAAwB,CAAC,MAAM,CAAC,qBAAqB,EAAE,SAAS,CAAC,aAAa,CAAC,CAAC;QAEhF,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,YAAY,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,cAAc,CAAC,CAAC;QAC9D,wBAAwB,CAAC,MAAM,CAAC,cAAc,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACtE,YAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClE,wBAAwB,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACxE,YAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClE,wBAAwB,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACxE,YAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClE,wBAAwB,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACxE,YAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClE,wBAAwB,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACxE,YAAY,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAClE,wBAAwB,CAAC,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACxE,YAAY,CAAC,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,iBAAiB,CAAC,CAAC;QACpE,wBAAwB,CAAC,MAAM,CAAC,iBAAiB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACzE,YAAY,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,mBAAmB,CAAC,CAAC;QACxE,wBAAwB,CAAC,MAAM,CAAC,mBAAmB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QAC3E,YAAY,CAAC,MAAM,CAAC,kBAAkB,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACtE,wBAAwB,CAAC,MAAM,CAAC,kBAAkB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QAC1E,YAAY,CAAC,MAAM,CAAC,kBAAkB,EAAE,SAAS,CAAC,kBAAkB,CAAC,CAAC;QACtE,wBAAwB,CAAC,MAAM,CAAC,kBAAkB,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QAE1E,OAAO,GAAG,kBAAkB,CAAC,OAAO,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC;QACzD,YAAY,CAAC,MAAM,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAC1C,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,wBAAwB,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5D,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,wBAAwB,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5D,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,wBAAwB,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QAC5D,YAAY,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QACtD,wBAAwB,CAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IACD,MAAM,CAAC,OAAO,GAAG,OAAO,CAAC;IAEzB,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,OAAO,qBAAsB,SAAQ,KAAK;CAAG;AAEnD,MAAM,UAAU,oBAAoB,CAAO,WAAsB;IAC/D,OAAO,IAAI,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;AAC/D,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,MAAkC;IACzE,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,MAAM,CAAC;AACjD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,MAAkC;IACjE,OAAO,OAAO,MAAM,KAAK,UAAU,CAAC;AACtC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"changes.d.ts","sourceRoot":"","sources":["../../src/diff/changes.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEhE,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,GAAG,WAAW,CAEvD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,EAAE,CA+BlD"}
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
import { valueOf } from '../node-tree/access.js';
|
|
2
|
+
import { dequal } from '../utils/dequal.js';
|
|
3
|
+
import { isPlainObject } from '../utils/is-plain-object.js';
|
|
4
|
+
import { isScalar, isScalarArray } from '../utils/is-scalar.js';
|
|
5
|
+
import { comparedSidesOf, latestOf, pointerOf } from './diff-node.js';
|
|
6
|
+
export function displaySide(change) {
|
|
7
|
+
return change.kind === 'removed' ? change.base : change.revision;
|
|
8
|
+
}
|
|
9
|
+
export function changesOf(node) {
|
|
10
|
+
const { base, revision } = comparedSidesOf(node);
|
|
11
|
+
if (!base) {
|
|
12
|
+
return [{ path: pointerOf(node), node, kind: 'added', revision: located(latestOf(node)) }];
|
|
13
|
+
}
|
|
14
|
+
if (!revision) {
|
|
15
|
+
return [{ path: pointerOf(node), node, kind: 'removed', base: located(base) }];
|
|
16
|
+
}
|
|
17
|
+
const changes = [];
|
|
18
|
+
let path;
|
|
19
|
+
const before = comparableValues(base);
|
|
20
|
+
const after = comparableValues(revision);
|
|
21
|
+
for (const property of Object.keys({ ...before, ...after })) {
|
|
22
|
+
if (dequal(before[property], after[property]))
|
|
23
|
+
continue;
|
|
24
|
+
path ??= pointerOf(node);
|
|
25
|
+
changes.push({
|
|
26
|
+
path,
|
|
27
|
+
node,
|
|
28
|
+
kind: 'modified',
|
|
29
|
+
property,
|
|
30
|
+
base: locatedProperty(base, property, before[property]),
|
|
31
|
+
revision: locatedProperty(revision, property, after[property]),
|
|
32
|
+
});
|
|
33
|
+
}
|
|
34
|
+
return changes;
|
|
35
|
+
}
|
|
36
|
+
function comparableValues(side) {
|
|
37
|
+
const values = {};
|
|
38
|
+
const childKeys = new Set(side.children.map((child) => child.key));
|
|
39
|
+
if (isPlainObject(side.value)) {
|
|
40
|
+
for (const [name, item] of Object.entries(side.value)) {
|
|
41
|
+
// Children and the targets of `$ref`s are compared as pairs of their own.
|
|
42
|
+
if (childKeys.has(name) || (name === '$ref' && side.resolved))
|
|
43
|
+
continue;
|
|
44
|
+
if (isScalar(item) || isScalarArray(item))
|
|
45
|
+
values[name] = item;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
return values;
|
|
49
|
+
}
|
|
50
|
+
function located(side) {
|
|
51
|
+
return { location: side.location, value: valueOf(side) };
|
|
52
|
+
}
|
|
53
|
+
function locatedProperty(side, property, value) {
|
|
54
|
+
const isOwnProperty = isPlainObject(side.value) && property in side.value;
|
|
55
|
+
return { location: isOwnProperty ? side.location.child([property]) : side.location, value };
|
|
56
|
+
}
|
|
57
|
+
//# sourceMappingURL=changes.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"changes.js","sourceRoot":"","sources":["../../src/diff/changes.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { NodeEntry } from '../node-tree/types.js';
|
|
2
|
+
import type { DiffNode, Pair } from './types.js';
|
|
3
|
+
export declare function latestOf(node: Pair): NodeEntry;
|
|
4
|
+
export declare function typeOf(node: DiffNode): string;
|
|
5
|
+
export declare function nameOf(node: DiffNode): string;
|
|
6
|
+
export declare function hasKeysNextToRefs(sides: Pair): boolean;
|
|
7
|
+
export declare function comparedSidesOf(node: DiffNode): Pair;
|
|
8
|
+
export declare function pointerOf(node: DiffNode): string;
|
|
9
|
+
//# sourceMappingURL=diff-node.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff-node.d.ts","sourceRoot":"","sources":["../../src/diff/diff-node.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGjD,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,GAAG,SAAS,CAE9C;AAED,wBAAgB,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAE7C;AAID,wBAAgB,MAAM,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAK7C;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,IAAI,GAAG,OAAO,CAGtD;AAID,wBAAgB,eAAe,CAAC,IAAI,EAAE,QAAQ,GAAG,IAAI,CAOpD;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,QAAQ,GAAG,MAAM,CAQhD"}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { keyKindOf } from '../node-tree/access.js';
|
|
2
|
+
import { escapePointerFragment, isRefWithSiblings, joinPointer } from '../ref-utils.js';
|
|
3
|
+
// A pair has at least one side.
|
|
4
|
+
export function latestOf(node) {
|
|
5
|
+
return (node.revision ?? node.base);
|
|
6
|
+
}
|
|
7
|
+
export function typeOf(node) {
|
|
8
|
+
return latestOf(node).type.name;
|
|
9
|
+
}
|
|
10
|
+
// A field or a list item written as a `$ref` is named after its target: `schema` or `0` says less
|
|
11
|
+
// than `Order`. A map entry keeps its own key.
|
|
12
|
+
export function nameOf(node) {
|
|
13
|
+
const written = latestOf(node);
|
|
14
|
+
const name = keyKindOf(written) === 'entry' ? written.key : (written.resolved?.key ?? written.key);
|
|
15
|
+
return String(name);
|
|
16
|
+
}
|
|
17
|
+
export function hasKeysNextToRefs(sides) {
|
|
18
|
+
if (!sides.base?.resolved || !sides.revision?.resolved)
|
|
19
|
+
return false;
|
|
20
|
+
return isRefWithSiblings(sides.base.value) || isRefWithSiblings(sides.revision.value);
|
|
21
|
+
}
|
|
22
|
+
// A `$ref` stands for its target, unless both sides are `$ref`s and either has keys next to its
|
|
23
|
+
// `$ref` (OpenAPI 3.1): then the written keys are compared here, and the targets one level down.
|
|
24
|
+
export function comparedSidesOf(node) {
|
|
25
|
+
if (!node.base || !node.revision || hasKeysNextToRefs(node))
|
|
26
|
+
return node;
|
|
27
|
+
return {
|
|
28
|
+
base: node.base.resolved ?? node.base,
|
|
29
|
+
revision: node.revision.resolved ?? node.revision,
|
|
30
|
+
};
|
|
31
|
+
}
|
|
32
|
+
export function pointerOf(node) {
|
|
33
|
+
if (!node.parent)
|
|
34
|
+
return '#/';
|
|
35
|
+
const written = latestOf(node);
|
|
36
|
+
const isRefTarget = written === latestOf(comparedSidesOf(node.parent)).resolved;
|
|
37
|
+
const segment = isRefTarget ? '$ref' : escapePointerFragment(String(written.key));
|
|
38
|
+
return joinPointer(pointerOf(node.parent), segment);
|
|
39
|
+
}
|
|
40
|
+
//# sourceMappingURL=diff-node.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff-node.js","sourceRoot":"","sources":["../../src/diff/diff-node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAGxF,gCAAgC;AAChC,MAAM,UAAU,QAAQ,CAAC,IAAU;IACjC,OAAO,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI,CAAE,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,IAAc;IACnC,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;AAClC,CAAC;AAED,kGAAkG;AAClG,+CAA+C;AAC/C,MAAM,UAAU,MAAM,CAAC,IAAc;IACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,IAAI,GACR,SAAS,CAAC,OAAO,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,CAAC;IACxF,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,KAAW;IAC3C,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ;QAAE,OAAO,KAAK,CAAC;IACrE,OAAO,iBAAiB,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,iBAAiB,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;AACxF,CAAC;AAED,gGAAgG;AAChG,iGAAiG;AACjG,MAAM,UAAU,eAAe,CAAC,IAAc;IAC5C,IAAI,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,iBAAiB,CAAC,IAAI,CAAC;QAAE,OAAO,IAAI,CAAC;IAEzE,OAAO;QACL,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,IAAI;QACrC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ;KAClD,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,IAAc;IACtC,IAAI,CAAC,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAE9B,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC/B,MAAM,WAAW,GAAG,OAAO,KAAK,QAAQ,CAAC,eAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC;IAChF,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,qBAAqB,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;IAElF,OAAO,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;AACtD,CAAC"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { NodeEntry } from '../node-tree/types.js';
|
|
2
|
+
import type { Change } from './types.js';
|
|
3
|
+
/** A node that one side does not have is one change: nothing below it is compared. */
|
|
4
|
+
export declare function compareTrees(base: NodeEntry, revision: NodeEntry): Change[];
|
|
5
|
+
//# sourceMappingURL=diff-tree.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff-tree.d.ts","sourceRoot":"","sources":["../../src/diff/diff-tree.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAIvD,OAAO,KAAK,EAAE,MAAM,EAAY,MAAM,YAAY,CAAC;AAEnD,sFAAsF;AACtF,wBAAgB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,GAAG,MAAM,EAAE,CA4D3E"}
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import { changesOf } from './changes.js';
|
|
2
|
+
import { comparedSidesOf, hasKeysNextToRefs, pointerOf } from './diff-node.js';
|
|
3
|
+
import { pairChildren } from './pair-children.js';
|
|
4
|
+
/** A node that one side does not have is one change: nothing below it is compared. */
|
|
5
|
+
export function compareTrees(base, revision) {
|
|
6
|
+
const changes = [];
|
|
7
|
+
const compared = new Map();
|
|
8
|
+
function compare(node) {
|
|
9
|
+
const sides = comparedSidesOf(node);
|
|
10
|
+
if (sides.base && sides.revision) {
|
|
11
|
+
// A pair reached again, or through itself, was compared where it was reached first.
|
|
12
|
+
const id = `${sides.base.location.absolutePointer}|${sides.revision.location.absolutePointer}`;
|
|
13
|
+
const first = compared.get(id);
|
|
14
|
+
if (first) {
|
|
15
|
+
first.referencedBy.push(node);
|
|
16
|
+
return;
|
|
17
|
+
}
|
|
18
|
+
compared.set(id, node);
|
|
19
|
+
}
|
|
20
|
+
changes.push(...changesOf(node));
|
|
21
|
+
if (!sides.base || !sides.revision)
|
|
22
|
+
return;
|
|
23
|
+
for (const pair of pairChildren(sides.base.children, sides.revision.children)) {
|
|
24
|
+
const child = { ...pair, parent: node, referencedBy: [] };
|
|
25
|
+
// A renamed map entry, such as a path or a property.
|
|
26
|
+
if (pair.base &&
|
|
27
|
+
pair.revision &&
|
|
28
|
+
typeof pair.base.key === 'string' &&
|
|
29
|
+
pair.base.key !== pair.revision.key) {
|
|
30
|
+
changes.push({
|
|
31
|
+
path: pointerOf(child),
|
|
32
|
+
node: child,
|
|
33
|
+
kind: 'modified',
|
|
34
|
+
property: 'key',
|
|
35
|
+
base: { location: pair.base.location, value: pair.base.key },
|
|
36
|
+
revision: { location: pair.revision.location, value: pair.revision.key },
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
compare(child);
|
|
40
|
+
}
|
|
41
|
+
if (hasKeysNextToRefs(sides)) {
|
|
42
|
+
compare({
|
|
43
|
+
base: sides.base.resolved,
|
|
44
|
+
revision: sides.revision.resolved,
|
|
45
|
+
parent: node,
|
|
46
|
+
referencedBy: [],
|
|
47
|
+
});
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
compare({ base, revision, parent: null, referencedBy: [] });
|
|
51
|
+
return changes;
|
|
52
|
+
}
|
|
53
|
+
//# sourceMappingURL=diff-tree.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"diff-tree.js","sourceRoot":"","sources":["../../src/diff/diff-tree.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAGlD,sFAAsF;AACtF,MAAM,UAAU,YAAY,CAAC,IAAe,EAAE,QAAmB;IAC/D,MAAM,OAAO,GAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAoB,CAAC;IAE7C,SAAS,OAAO,CAAC,IAAc;QAC7B,MAAM,KAAK,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAEpC,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC;YACjC,oFAAoF;YACpF,MAAM,EAAE,GAAG,GAAG,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,IAAI,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;YAC/F,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAE/B,IAAI,KAAK,EAAE,CAAC;gBACV,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9B,OAAO;YACT,CAAC;YAED,QAAQ,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACzB,CAAC;QAED,OAAO,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC;QAEjC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ;YAAE,OAAO;QAE3C,KAAK,MAAM,IAAI,IAAI,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC9E,MAAM,KAAK,GAAa,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;YAEpE,qDAAqD;YACrD,IACE,IAAI,CAAC,IAAI;gBACT,IAAI,CAAC,QAAQ;gBACb,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,QAAQ;gBACjC,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,IAAI,CAAC,QAAQ,CAAC,GAAG,EACnC,CAAC;gBACD,OAAO,CAAC,IAAI,CAAC;oBACX,IAAI,EAAE,SAAS,CAAC,KAAK,CAAC;oBACtB,IAAI,EAAE,KAAK;oBACX,IAAI,EAAE,UAAU;oBAChB,QAAQ,EAAE,KAAK;oBACf,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE;oBAC5D,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,KAAK,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE;iBACzE,CAAC,CAAC;YACL,CAAC;YAED,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC;QAED,IAAI,iBAAiB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC;gBACN,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ;gBACzB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,QAAQ;gBACjC,MAAM,EAAE,IAAI;gBACZ,YAAY,EAAE,EAAE;aACjB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC,CAAC;IAE5D,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"direction.d.ts","sourceRoot":"","sources":["../../src/diff/direction.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAItD,iGAAiG;AACjG,wBAAgB,YAAY,CAAC,IAAI,EAAE,QAAQ,GAAG,SAAS,EAAE,CAIxD"}
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import { enclosing, fieldOf } from '../node-tree/access.js';
|
|
2
|
+
import { comparedSidesOf } from './diff-node.js';
|
|
3
|
+
const bothDirections = ['request', 'response'];
|
|
4
|
+
/** Empty for data that travels neither way, such as `info` or a component nothing references. */
|
|
5
|
+
export function directionsOf(node) {
|
|
6
|
+
const directions = directionsIn(node.revision ? 'revision' : 'base', node, new Set());
|
|
7
|
+
return bothDirections.filter((direction) => directions.includes(direction));
|
|
8
|
+
}
|
|
9
|
+
function directionsIn(side, node, visited) {
|
|
10
|
+
// Each place is asked once, which also ends the climb through a component that references itself.
|
|
11
|
+
if (visited.has(node))
|
|
12
|
+
return [];
|
|
13
|
+
visited.add(node);
|
|
14
|
+
// Only pairs have children or other places that reach them, so every place climbed has `side`.
|
|
15
|
+
const own = ownDirection(comparedSidesOf(node)[side]) ?? ownDirection(node[side]);
|
|
16
|
+
if (own)
|
|
17
|
+
return [own];
|
|
18
|
+
return [node.parent, ...node.referencedBy].flatMap((place) => place ? directionsIn(side, place, visited) : []);
|
|
19
|
+
}
|
|
20
|
+
function ownDirection(node) {
|
|
21
|
+
switch (node.type.name) {
|
|
22
|
+
case 'RequestBody':
|
|
23
|
+
case 'ParameterList':
|
|
24
|
+
return directionAt(node, 'request');
|
|
25
|
+
case 'Responses':
|
|
26
|
+
return directionAt(node, 'response');
|
|
27
|
+
// "readOnly" data only comes from the API and "writeOnly" data only goes to it (OpenAPI,
|
|
28
|
+
// Schema Object), wherever the schema is used.
|
|
29
|
+
case 'Schema':
|
|
30
|
+
if (fieldOf(node, 'readOnly') === true)
|
|
31
|
+
return 'response';
|
|
32
|
+
if (fieldOf(node, 'writeOnly') === true)
|
|
33
|
+
return 'request';
|
|
34
|
+
return undefined;
|
|
35
|
+
// AsyncAPI 3: `receive` means another application produces the message, so its payload is
|
|
36
|
+
// judged the way a request body is; `send` means this application produces it. An OpenAPI
|
|
37
|
+
// operation has no `action`, so it says nothing.
|
|
38
|
+
case 'Operation':
|
|
39
|
+
return actionDirection(fieldOf(node, 'action'));
|
|
40
|
+
// A reply answers the operation, so it travels back the other way.
|
|
41
|
+
case 'OperationReply': {
|
|
42
|
+
const direction = actionDirection(fieldOf(enclosing(node, 'Operation'), 'action'));
|
|
43
|
+
return direction && opposite(direction);
|
|
44
|
+
}
|
|
45
|
+
default:
|
|
46
|
+
return undefined;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
// Outside `components`, every `Parameter` sits under a `ParameterList` and every `Response`
|
|
50
|
+
// under `Responses`, so the lists carry the direction. Under a callback or a webhook the API
|
|
51
|
+
// sends the request itself, so it is the other way round.
|
|
52
|
+
function directionAt(node, direction) {
|
|
53
|
+
if (enclosing(node, 'Components'))
|
|
54
|
+
return undefined;
|
|
55
|
+
const sentByApi = enclosing(node, 'CallbacksMap') ?? enclosing(node, 'WebhooksMap');
|
|
56
|
+
return sentByApi ? opposite(direction) : direction;
|
|
57
|
+
}
|
|
58
|
+
function actionDirection(action) {
|
|
59
|
+
if (action === 'receive')
|
|
60
|
+
return 'request';
|
|
61
|
+
if (action === 'send')
|
|
62
|
+
return 'response';
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
65
|
+
function opposite(direction) {
|
|
66
|
+
return direction === 'request' ? 'response' : 'request';
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=direction.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"direction.js","sourceRoot":"","sources":["../../src/diff/direction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAGjD,MAAM,cAAc,GAAgB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;AAE5D,iGAAiG;AACjG,MAAM,UAAU,YAAY,CAAC,IAAc;IACzC,MAAM,UAAU,GAAG,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IAEtF,OAAO,cAAc,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;AAC9E,CAAC;AAED,SAAS,YAAY,CACnB,IAAyB,EACzB,IAAc,EACd,OAAsB;IAEtB,kGAAkG;IAClG,IAAI,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC;QAAE,OAAO,EAAE,CAAC;IACjC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAElB,+FAA+F;IAC/F,MAAM,GAAG,GAAG,YAAY,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,IAAI,CAAE,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC,CAAC;IACpF,IAAI,GAAG;QAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAEtB,OAAO,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAC3D,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAChD,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,IAAe;IACnC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACvB,KAAK,aAAa,CAAC;QACnB,KAAK,eAAe;YAClB,OAAO,WAAW,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;QACtC,KAAK,WAAW;YACd,OAAO,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QACvC,yFAAyF;QACzF,+CAA+C;QAC/C,KAAK,QAAQ;YACX,IAAI,OAAO,CAAC,IAAI,EAAE,UAAU,CAAC,KAAK,IAAI;gBAAE,OAAO,UAAU,CAAC;YAC1D,IAAI,OAAO,CAAC,IAAI,EAAE,WAAW,CAAC,KAAK,IAAI;gBAAE,OAAO,SAAS,CAAC;YAC1D,OAAO,SAAS,CAAC;QACnB,0FAA0F;QAC1F,0FAA0F;QAC1F,iDAAiD;QACjD,KAAK,WAAW;YACd,OAAO,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,CAAC;QAClD,mEAAmE;QACnE,KAAK,gBAAgB,CAAC,CAAC,CAAC;YACtB,MAAM,SAAS,GAAG,eAAe,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC;YACnF,OAAO,SAAS,IAAI,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;QACD;YACE,OAAO,SAAS,CAAC;IACrB,CAAC;AACH,CAAC;AAED,4FAA4F;AAC5F,6FAA6F;AAC7F,0DAA0D;AAC1D,SAAS,WAAW,CAAC,IAAe,EAAE,SAAoB;IACxD,IAAI,SAAS,CAAC,IAAI,EAAE,YAAY,CAAC;QAAE,OAAO,SAAS,CAAC;IACpD,MAAM,SAAS,GAAG,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,IAAI,SAAS,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACpF,OAAO,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;AACrD,CAAC;AAED,SAAS,eAAe,CAAC,MAAe;IACtC,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,SAAS,CAAC;IAC3C,IAAI,MAAM,KAAK,MAAM;QAAE,OAAO,UAAU,CAAC;IACzC,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,SAAS,QAAQ,CAAC,SAAoB;IACpC,OAAO,SAAS,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC;AAC1D,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { Change, Impact } from './types.js';
|
|
2
|
+
/** Lowest first. */
|
|
3
|
+
export declare const impacts: readonly ["patch", "minor", "major"];
|
|
4
|
+
export declare function impactRank(impact: Impact): number;
|
|
5
|
+
export declare function highestImpact(candidates: Impact[]): Impact | undefined;
|
|
6
|
+
export declare function defaultImpact(change: Change): Impact;
|
|
7
|
+
//# sourceMappingURL=impact.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"impact.d.ts","sourceRoot":"","sources":["../../src/diff/impact.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAY,MAAM,EAAE,MAAM,YAAY,CAAC;AAE3D,oBAAoB;AACpB,eAAO,MAAM,OAAO,sCAAuC,CAAC;AAE5D,wBAAgB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEjD;AAED,wBAAgB,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAEtE;AAKD,wBAAgB,aAAa,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAEpD"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
import { typeOf } from './diff-node.js';
|
|
2
|
+
/** Lowest first. */
|
|
3
|
+
export const impacts = ['patch', 'minor', 'major'];
|
|
4
|
+
export function impactRank(impact) {
|
|
5
|
+
return impacts.indexOf(impact);
|
|
6
|
+
}
|
|
7
|
+
export function highestImpact(candidates) {
|
|
8
|
+
return impacts.findLast((impact) => candidates.includes(impact));
|
|
9
|
+
}
|
|
10
|
+
// What a change means when no rule spoke: something new is a minor, everything else a patch.
|
|
11
|
+
// A new component adds nothing to the API until a place uses it, and that place is a change of
|
|
12
|
+
// its own.
|
|
13
|
+
export function defaultImpact(change) {
|
|
14
|
+
return change.kind === 'added' && !isComponentOrContainer(change.node) ? 'minor' : 'patch';
|
|
15
|
+
}
|
|
16
|
+
// `components` itself, a map in it such as `schemas`, or a component in that map.
|
|
17
|
+
function isComponentOrContainer(node) {
|
|
18
|
+
const map = node.parent;
|
|
19
|
+
return [node, map, map?.parent].some((level) => !!level && typeOf(level) === 'Components');
|
|
20
|
+
}
|
|
21
|
+
//# sourceMappingURL=impact.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"impact.js","sourceRoot":"","sources":["../../src/diff/impact.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAGxC,oBAAoB;AACpB,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,OAAO,CAAU,CAAC;AAE5D,MAAM,UAAU,UAAU,CAAC,MAAc;IACvC,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;AACjC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,UAAoB;IAChD,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,6FAA6F;AAC7F,+FAA+F;AAC/F,WAAW;AACX,MAAM,UAAU,aAAa,CAAC,MAAc;IAC1C,OAAO,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC;AAC7F,CAAC;AAED,kFAAkF;AAClF,SAAS,sBAAsB,CAAC,IAAc;IAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,YAAY,CAAC,CAAC;AAC7F,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { Config } from '../config/index.js';
|
|
2
|
+
import { BaseResolver, type Document } from '../resolve.js';
|
|
3
|
+
import type { DiffResult } from './types.js';
|
|
4
|
+
export declare function diffDocuments(opts: {
|
|
5
|
+
base: Document;
|
|
6
|
+
revision: Document;
|
|
7
|
+
config: Config;
|
|
8
|
+
externalRefResolver?: BaseResolver;
|
|
9
|
+
}): Promise<DiffResult>;
|
|
10
|
+
//# sourceMappingURL=index.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/diff/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAKjD,OAAO,EAAE,YAAY,EAAmB,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAU7E,OAAO,KAAK,EAAE,UAAU,EAAqC,MAAM,YAAY,CAAC;AAEhF,wBAAsB,aAAa,CAAC,IAAI,EAAE;IACxC,IAAI,EAAE,QAAQ,CAAC;IACf,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,YAAY,CAAC;CACpC,GAAG,OAAO,CAAC,UAAU,CAAC,CA4CtB"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
import { initDiffRules, initRules } from '../config/rules.js';
|
|
2
|
+
import { detectSpec, getMajorSpecVersion } from '../detect-spec.js';
|
|
3
|
+
import { buildNodeTree } from '../node-tree/index.js';
|
|
4
|
+
import { getTypes } from '../oas-types.js';
|
|
5
|
+
import { BaseResolver, resolveDocument } from '../resolve.js';
|
|
6
|
+
import { normalizeTypes } from '../types/index.js';
|
|
7
|
+
import { HandledError } from '../utils/error.js';
|
|
8
|
+
import { isPlainObject } from '../utils/is-plain-object.js';
|
|
9
|
+
import { normalizeVisitors } from '../visitors.js';
|
|
10
|
+
import { walkDocument } from '../walk.js';
|
|
11
|
+
import { typeOf } from './diff-node.js';
|
|
12
|
+
import { compareTrees } from './diff-tree.js';
|
|
13
|
+
import { highestImpact } from './impact.js';
|
|
14
|
+
import { judgeChanges } from './judge.js';
|
|
15
|
+
export async function diffDocuments(opts) {
|
|
16
|
+
const { base, revision, config, externalRefResolver = new BaseResolver(config.resolve) } = opts;
|
|
17
|
+
const baseVersion = detectSpec(base.parsed);
|
|
18
|
+
const revisionVersion = detectSpec(revision.parsed);
|
|
19
|
+
const family = getMajorSpecVersion(revisionVersion);
|
|
20
|
+
if (getMajorSpecVersion(baseVersion) !== family) {
|
|
21
|
+
throw new HandledError(`Cannot compare ${baseVersion} with ${revisionVersion}.`);
|
|
22
|
+
}
|
|
23
|
+
const [baseTree, revisionTree] = await Promise.all([
|
|
24
|
+
preparedNodeTree(base, baseVersion, config, externalRefResolver),
|
|
25
|
+
preparedNodeTree(revision, revisionVersion, config, externalRefResolver),
|
|
26
|
+
]);
|
|
27
|
+
const rules = initDiffRules(config.getDiffRulesForSpecVersion(family), config, revisionVersion);
|
|
28
|
+
const changes = judgeChanges(compareTrees(baseTree.root, revisionTree.root), rules, revisionVersion);
|
|
29
|
+
return {
|
|
30
|
+
files: {
|
|
31
|
+
base: base.source.absoluteRef,
|
|
32
|
+
revision: revision.source.absoluteRef,
|
|
33
|
+
},
|
|
34
|
+
specVersions: {
|
|
35
|
+
base: baseVersion,
|
|
36
|
+
revision: revisionVersion,
|
|
37
|
+
},
|
|
38
|
+
infoVersions: { base: infoVersionOf(base), revision: infoVersionOf(revision) },
|
|
39
|
+
summary: countByImpact(changes),
|
|
40
|
+
bump: requiredBump(changes),
|
|
41
|
+
changes,
|
|
42
|
+
// The base is not the author's to fix, so its problems only warn.
|
|
43
|
+
problems: [
|
|
44
|
+
...baseTree.problems.map((problem) => ({ ...problem, severity: 'warn' })),
|
|
45
|
+
...revisionTree.problems,
|
|
46
|
+
],
|
|
47
|
+
};
|
|
48
|
+
}
|
|
49
|
+
async function preparedNodeTree(document, specVersion, config, externalRefResolver) {
|
|
50
|
+
const rules = config.getRulesForSpecVersion(getMajorSpecVersion(specVersion));
|
|
51
|
+
const types = normalizeTypes(config.extendTypes(getTypes(specVersion), specVersion), config);
|
|
52
|
+
const ctx = {
|
|
53
|
+
problems: [],
|
|
54
|
+
specVersion,
|
|
55
|
+
config,
|
|
56
|
+
visitorsData: {},
|
|
57
|
+
};
|
|
58
|
+
const decorators = initRules(rules, config, 'decorators', specVersion);
|
|
59
|
+
let resolvedRefMap = await resolveDocument({
|
|
60
|
+
rootDocument: document,
|
|
61
|
+
rootType: types.Root,
|
|
62
|
+
externalRefResolver,
|
|
63
|
+
});
|
|
64
|
+
// Decorators change the document the way `bundle` publishes it, so the diff compares the
|
|
65
|
+
// descriptions that clients get.
|
|
66
|
+
if (decorators.length > 0) {
|
|
67
|
+
walkDocument({
|
|
68
|
+
document,
|
|
69
|
+
rootType: types.Root,
|
|
70
|
+
normalizedVisitors: normalizeVisitors(decorators, types),
|
|
71
|
+
resolvedRefMap,
|
|
72
|
+
ctx,
|
|
73
|
+
});
|
|
74
|
+
// Decorators can add or move `$ref`s.
|
|
75
|
+
resolvedRefMap = await resolveDocument({
|
|
76
|
+
rootDocument: document,
|
|
77
|
+
rootType: types.Root,
|
|
78
|
+
externalRefResolver,
|
|
79
|
+
});
|
|
80
|
+
}
|
|
81
|
+
return {
|
|
82
|
+
root: buildNodeTree({ document, types, resolvedRefMap, ctx }),
|
|
83
|
+
problems: ctx.problems.map((problem) => config.addProblemToIgnore(problem)),
|
|
84
|
+
};
|
|
85
|
+
}
|
|
86
|
+
function infoVersionOf({ parsed }) {
|
|
87
|
+
const version = isPlainObject(parsed) && isPlainObject(parsed.info) ? parsed.info.version : undefined;
|
|
88
|
+
return typeof version === 'string' ? version : undefined;
|
|
89
|
+
}
|
|
90
|
+
function countByImpact(changes) {
|
|
91
|
+
const summary = { major: 0, minor: 0, patch: 0 };
|
|
92
|
+
for (const change of changes)
|
|
93
|
+
summary[change.impact]++;
|
|
94
|
+
return summary;
|
|
95
|
+
}
|
|
96
|
+
function requiredBump(changes) {
|
|
97
|
+
return highestImpact(changes.flatMap((change) => {
|
|
98
|
+
const isVersionChange = change.kind === 'modified' &&
|
|
99
|
+
change.property === 'version' &&
|
|
100
|
+
typeOf(change.node) === 'Info';
|
|
101
|
+
return !isVersionChange ? [change.impact] : [];
|
|
102
|
+
}));
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/diff/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
import type { InitializedDiffRule } from '../config/rules.js';
|
|
2
|
+
import type { SpecVersion } from '../oas-types.js';
|
|
3
|
+
import type { Change, DiffNode, JudgedChange } from './types.js';
|
|
4
|
+
/**
|
|
5
|
+
* Lint's nesting: `SchemaProperties › Schema` applies to a schema whose nearest enclosing
|
|
6
|
+
* `SchemaProperties` or `Schema` is a `SchemaProperties` — a property, not a schema further down
|
|
7
|
+
* inside one.
|
|
8
|
+
*/
|
|
9
|
+
export declare function appliesTo(typePath: string[], node: DiffNode): boolean;
|
|
10
|
+
export declare function judgeChanges(changes: Change[], rules: InitializedDiffRule[], specVersion: SpecVersion): JudgedChange[];
|
|
11
|
+
//# sourceMappingURL=judge.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"judge.d.ts","sourceRoot":"","sources":["../../src/diff/judge.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAKnD,OAAO,KAAK,EACV,MAAM,EACN,QAAQ,EAMR,YAAY,EAEb,MAAM,YAAY,CAAC;AA2BpB;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,GAAG,OAAO,CAQrE;AASD,wBAAgB,YAAY,CAC1B,OAAO,EAAE,MAAM,EAAE,EACjB,KAAK,EAAE,mBAAmB,EAAE,EAC5B,WAAW,EAAE,WAAW,GACvB,YAAY,EAAE,CAMhB"}
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { displaySide } from './changes.js';
|
|
2
|
+
import { typeOf } from './diff-node.js';
|
|
3
|
+
import { directionsOf } from './direction.js';
|
|
4
|
+
import { defaultImpact, highestImpact } from './impact.js';
|
|
5
|
+
// A diff visitor sees whole changes, not a walk, so lint's hooks have nothing to run on.
|
|
6
|
+
const HOOKS = new Set(['enter', 'leave', 'skip']);
|
|
7
|
+
// Each handler with the types it is nested under, so matching a change needs no walk.
|
|
8
|
+
function flattenVisitor(visitor, ruleId, outerTypes = []) {
|
|
9
|
+
return Object.entries(visitor).flatMap(([type, value]) => {
|
|
10
|
+
if (HOOKS.has(type) || (type === 'any' && outerTypes.length > 0)) {
|
|
11
|
+
throw new Error(`Diff rule '${ruleId}' uses '${type}' where diff visitors do not have it.`);
|
|
12
|
+
}
|
|
13
|
+
if (typeof value !== 'function')
|
|
14
|
+
return flattenVisitor(value, ruleId, [...outerTypes, type]);
|
|
15
|
+
return [{ typePath: type === 'any' ? [] : [...outerTypes, type], visit: value }];
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
* Lint's nesting: `SchemaProperties › Schema` applies to a schema whose nearest enclosing
|
|
20
|
+
* `SchemaProperties` or `Schema` is a `SchemaProperties` — a property, not a schema further down
|
|
21
|
+
* inside one.
|
|
22
|
+
*/
|
|
23
|
+
export function appliesTo(typePath, node) {
|
|
24
|
+
let current = node;
|
|
25
|
+
for (let index = typePath.length - 1; index >= 0; index--) {
|
|
26
|
+
if (current === undefined || typeOf(current) !== typePath[index])
|
|
27
|
+
return false;
|
|
28
|
+
if (index > 0)
|
|
29
|
+
current = nearest(current.parent, [typePath[index - 1], typePath[index]]);
|
|
30
|
+
}
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
function nearest(node, types) {
|
|
34
|
+
for (let current = node; current; current = current.parent) {
|
|
35
|
+
if (types.includes(typeOf(current)))
|
|
36
|
+
return current;
|
|
37
|
+
}
|
|
38
|
+
return undefined;
|
|
39
|
+
}
|
|
40
|
+
export function judgeChanges(changes, rules, specVersion) {
|
|
41
|
+
const handlers = rules.flatMap(({ ruleId, impact, visitor }) => flattenVisitor(visitor, ruleId).map((handler) => ({ ruleId, impact, ...handler })));
|
|
42
|
+
return changes.map((change) => judgeChange(change, handlers, specVersion));
|
|
43
|
+
}
|
|
44
|
+
function judgeChange(change, handlers, specVersion) {
|
|
45
|
+
// Computed once per change, and only when a rule asks.
|
|
46
|
+
let directions;
|
|
47
|
+
const getDirections = () => (directions ??= directionsOf(change.node));
|
|
48
|
+
const location = displaySide(change).location;
|
|
49
|
+
const verdicts = [];
|
|
50
|
+
for (const { ruleId, impact, typePath, visit } of handlers) {
|
|
51
|
+
if (!appliesTo(typePath, change.node))
|
|
52
|
+
continue;
|
|
53
|
+
const report = (verdict) => {
|
|
54
|
+
verdicts.push({
|
|
55
|
+
ruleId,
|
|
56
|
+
impact,
|
|
57
|
+
message: verdict.message,
|
|
58
|
+
location: verdict.location ?? location,
|
|
59
|
+
});
|
|
60
|
+
};
|
|
61
|
+
visit(change, { report, location, getDirections, specVersion });
|
|
62
|
+
}
|
|
63
|
+
const impact = highestImpact(verdicts.map((verdict) => verdict.impact));
|
|
64
|
+
return { ...change, verdicts, impact: impact ?? defaultImpact(change) };
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=judge.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"judge.js","sourceRoot":"","sources":["../../src/diff/judge.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import type { NodeEntry } from '../node-tree/types.js';
|
|
2
|
+
import type { Pair } from './types.js';
|
|
3
|
+
/**
|
|
4
|
+
* Pairs each child with the same one on the other side, or else the most alike of its type. The
|
|
5
|
+
* same ones pair first, so a changed child never takes the place of an unchanged one.
|
|
6
|
+
*/
|
|
7
|
+
export declare function pairChildren(base: NodeEntry[], revision: NodeEntry[]): Pair[];
|
|
8
|
+
//# sourceMappingURL=pair-children.d.ts.map
|