@redocly/openapi-core 2.73.0 → 2.75.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/bundle/bundle-visitor.d.ts +1 -1
- package/lib/bundle/bundle-visitor.d.ts.map +1 -1
- package/lib/bundle/bundle-visitor.js +0 -2
- package/lib/bundle/bundle-visitor.js.map +1 -1
- package/lib/decorators/oas3/remove-unused-components.js +2 -2
- package/lib/decorators/oas3/remove-unused-components.js.map +1 -1
- package/lib/format/codeframes.d.ts.map +1 -1
- package/lib/format/codeframes.js +15 -16
- package/lib/format/codeframes.js.map +1 -1
- package/lib/format/format.d.ts +0 -1
- package/lib/format/format.d.ts.map +1 -1
- package/lib/format/format.js +4 -5
- package/lib/format/format.js.map +1 -1
- package/lib/graphql/assertions.d.ts.map +1 -1
- package/lib/graphql/assertions.js +1 -2
- package/lib/graphql/assertions.js.map +1 -1
- package/lib/lint.d.ts.map +1 -1
- package/lib/lint.js +6 -0
- package/lib/lint.js.map +1 -1
- package/lib/logger.d.ts +3 -4
- package/lib/logger.d.ts.map +1 -1
- package/lib/logger.js +4 -13
- package/lib/logger.js.map +1 -1
- package/lib/rules/common/assertions/utils.d.ts.map +1 -1
- package/lib/rules/common/assertions/utils.js +1 -2
- package/lib/rules/common/assertions/utils.js.map +1 -1
- package/lib/rules/common/deprecated-config-properties.d.ts +3 -0
- package/lib/rules/common/deprecated-config-properties.d.ts.map +1 -0
- package/lib/rules/common/deprecated-config-properties.js +21 -0
- package/lib/rules/common/deprecated-config-properties.js.map +1 -0
- package/lib/rules/common/spec-strict-refs.d.ts.map +1 -1
- package/lib/rules/common/spec-strict-refs.js +4 -3
- package/lib/rules/common/spec-strict-refs.js.map +1 -1
- package/lib/rules/oas3/no-unused-components.js +2 -2
- package/lib/rules/oas3/no-unused-components.js.map +1 -1
- package/lib/rules/oas3/spec-no-invalid-encoding-combinations.d.ts.map +1 -1
- package/lib/rules/oas3/spec-no-invalid-encoding-combinations.js +12 -12
- package/lib/rules/oas3/spec-no-invalid-encoding-combinations.js.map +1 -1
- package/lib/types/index.d.ts +6 -0
- package/lib/types/index.d.ts.map +1 -1
- package/lib/types/index.js.map +1 -1
- package/lib/types/json-schema-adapter.d.ts +2 -0
- package/lib/types/json-schema-adapter.d.ts.map +1 -1
- package/lib/types/json-schema-adapter.js +6 -0
- package/lib/types/json-schema-adapter.js.map +1 -1
- package/lib/types/oas3_2.d.ts +1 -1
- package/lib/types/oas3_2.d.ts.map +1 -1
- package/lib/types/oas3_2.js +14 -2
- package/lib/types/oas3_2.js.map +1 -1
- package/lib/typings/openapi.d.ts +3 -0
- package/lib/typings/openapi.d.ts.map +1 -1
- package/package.json +3 -3
- package/lib/utils/identity.d.ts +0 -2
- package/lib/utils/identity.d.ts.map +0 -1
- package/lib/utils/identity.js +0 -4
- package/lib/utils/identity.js.map +0 -1
|
@@ -3,7 +3,7 @@ import { type SpecMajorVersion } from '../oas-types.js';
|
|
|
3
3
|
import { type ResolvedRefMap, type Document } from '../resolve.js';
|
|
4
4
|
import { type Oas3Visitor, type Oas2Visitor } from '../visitors.js';
|
|
5
5
|
import { type ComponentNamesStrategy } from './bundle-document.js';
|
|
6
|
-
export declare function mapTypeToComponent(typeName: string, version: SpecMajorVersion): "definitions" | "responses" | "headers" | "examples" | "parameters" | "schemas" | "requestBodies" | "
|
|
6
|
+
export declare function mapTypeToComponent(typeName: string, version: SpecMajorVersion): "definitions" | "responses" | "headers" | "examples" | "parameters" | "schemas" | "requestBodies" | "securitySchemes" | "tags" | "links" | "callbacks" | "contentDescriptors" | "errors" | "examplePairingObjects" | null;
|
|
7
7
|
export declare function makeBundleVisitor({ version, dereference, rootDocument, resolvedRefMap, keepUrlRefs, componentRenamingConflicts, componentNamesStrategy, }: {
|
|
8
8
|
version: SpecMajorVersion;
|
|
9
9
|
dereference: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-visitor.d.ts","sourceRoot":"","sources":["../../src/bundle/bundle-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAaxD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAOnE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAKnE,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,
|
|
1
|
+
{"version":3,"file":"bundle-visitor.d.ts","sourceRoot":"","sources":["../../src/bundle/bundle-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EAAE,KAAK,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AAaxD,OAAO,EAAE,KAAK,cAAc,EAAE,KAAK,QAAQ,EAAE,MAAM,eAAe,CAAC;AAOnE,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAEpE,OAAO,EAAE,KAAK,sBAAsB,EAAE,MAAM,sBAAsB,CAAC;AAKnE,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,6NA0F7E;AAED,wBAAgB,iBAAiB,CAAC,EAChC,OAAO,EACP,WAAW,EACX,YAAY,EACZ,cAAc,EACd,WAAW,EACX,0BAAmC,EACnC,sBAAmC,GACpC,EAAE;IACD,OAAO,EAAE,gBAAgB,CAAC;IAC1B,WAAW,EAAE,OAAO,CAAC;IACrB,YAAY,EAAE,QAAQ,CAAC;IACvB,cAAc,EAAE,cAAc,CAAC;IAC/B,WAAW,EAAE,OAAO,CAAC;IACrB,0BAA0B,CAAC,EAAE,YAAY,CAAC;IAC1C,sBAAsB,CAAC,EAAE,sBAAsB,CAAC;CACjD,6BAuQA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundle-visitor.js","sourceRoot":"","sources":["../../src/bundle/bundle-visitor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"bundle-visitor.js","sourceRoot":"","sources":["../../src/bundle/bundle-visitor.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ export const RemoveUnusedComponents = () => {
|
|
|
52
52
|
'Response',
|
|
53
53
|
'Example',
|
|
54
54
|
'RequestBody',
|
|
55
|
-
'
|
|
55
|
+
'MediaType',
|
|
56
56
|
'SecurityScheme',
|
|
57
57
|
].includes(type.name)) {
|
|
58
58
|
const targetPointer = getComponentKey(ref.$ref);
|
|
@@ -113,7 +113,7 @@ export const RemoveUnusedComponents = () => {
|
|
|
113
113
|
},
|
|
114
114
|
},
|
|
115
115
|
NamedMediaTypes: {
|
|
116
|
-
|
|
116
|
+
MediaType(_mediaType, { key }) {
|
|
117
117
|
registerComponent('mediaTypes', key.toString());
|
|
118
118
|
},
|
|
119
119
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remove-unused-components.js","sourceRoot":"","sources":["../../../src/decorators/oas3/remove-unused-components.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAWrD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAYhE,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;QAAE,OAAO;IACjD,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IAC3D,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO;IAC3B,OAAO,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAkB,GAAG,EAAE;IACxD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAyB,CAAC;IAEpD,SAAS,iBAAiB,CACxB,aAAmC,EACnC,IAAY,EACZ,0BAAmC,KAAK;QAExC,MAAM,GAAG,GAAG,GAAG,aAAa,IAAI,IAAI,EAAE,CAAC;QACvC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;YAClB,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,EAAE;YACzC,aAAa;YACb,IAAI;YACJ,uBAAuB;SACxB,CAAC,CAAC;IACL,CAAC;IAED,SAAS,sBAAsB,CAC7B,IAAuB,EACvB,cAA2B,IAAI,GAAG,EAAE;QAEpC,MAAM,kBAAkB,GAAG,WAAW,CAAC,IAAI,CAAC;QAE5C,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,uBAAuB,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;YACzF,MAAM,IAAI,GACR,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC5E,uBAAuB,CAAC;YAE1B,IACE,CAAC,IAAI;gBACL,aAAa;gBACb,IAAI,CAAC,UAAU;gBACf,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAC5C,CAAC;gBACD,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrB,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;gBACtD,OAAO,cAAe,CAAC,IAAI,CAAC,CAAC;gBAC7B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACvB,IAAI,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC;oBAClC,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC,IAAI,GAAG,kBAAkB;YAC1C,CAAC,CAAC,sBAAsB,CAAC,IAAI,EAAE,WAAW,CAAC;YAC3C,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,OAAO;QACL,GAAG,EAAE;YACH,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE;gBAChC,IACE;oBACE,QAAQ;oBACR,QAAQ;oBACR,WAAW;oBACX,UAAU;oBACV,SAAS;oBACT,aAAa;oBACb,
|
|
1
|
+
{"version":3,"file":"remove-unused-components.js","sourceRoot":"","sources":["../../../src/decorators/oas3/remove-unused-components.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAWrD,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAYhE,SAAS,eAAe,CAAC,OAAe;IACtC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC;QAAE,OAAO;IACjD,MAAM,CAAC,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC;IAC3D,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI;QAAE,OAAO;IAC3B,OAAO,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;AAC3B,CAAC;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAkB,GAAG,EAAE;IACxD,MAAM,UAAU,GAAG,IAAI,GAAG,EAAyB,CAAC;IAEpD,SAAS,iBAAiB,CACxB,aAAmC,EACnC,IAAY,EACZ,0BAAmC,KAAK;QAExC,MAAM,GAAG,GAAG,GAAG,aAAa,IAAI,IAAI,EAAE,CAAC;QACvC,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;YAClB,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,MAAM,IAAI,EAAE;YACzC,aAAa;YACb,IAAI;YACJ,uBAAuB;SACxB,CAAC,CAAC;IACL,CAAC;IAED,SAAS,sBAAsB,CAC7B,IAAuB,EACvB,cAA2B,IAAI,GAAG,EAAE;QAEpC,MAAM,kBAAkB,GAAG,WAAW,CAAC,IAAI,CAAC;QAE5C,KAAK,MAAM,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,uBAAuB,EAAE,CAAC,IAAI,UAAU,EAAE,CAAC;YACzF,MAAM,IAAI,GACR,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;gBAC5E,uBAAuB,CAAC;YAE1B,IACE,CAAC,IAAI;gBACL,aAAa;gBACb,IAAI,CAAC,UAAU;gBACf,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,aAAa,CAAC,EAC5C,CAAC;gBACD,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACrB,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;gBACtD,OAAO,cAAe,CAAC,IAAI,CAAC,CAAC;gBAC7B,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBACvB,IAAI,aAAa,CAAC,cAAc,CAAC,EAAE,CAAC;oBAClC,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC;gBACxC,CAAC;YACH,CAAC;QACH,CAAC;QAED,OAAO,WAAW,CAAC,IAAI,GAAG,kBAAkB;YAC1C,CAAC,CAAC,sBAAsB,CAAC,IAAI,EAAE,WAAW,CAAC;YAC3C,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC;IACvB,CAAC;IAED,OAAO;QACL,GAAG,EAAE;YACH,KAAK,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE;gBAChC,IACE;oBACE,QAAQ;oBACR,QAAQ;oBACR,WAAW;oBACX,UAAU;oBACV,SAAS;oBACT,aAAa;oBACb,WAAW;oBACX,gBAAgB;iBACjB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EACrB,CAAC;oBACD,MAAM,aAAa,GAAG,eAAe,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAChD,IAAI,CAAC,aAAa;wBAAE,OAAO;oBAE3B,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC;oBAC5E,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;oBAEjD,IAAI,UAAU,EAAE,CAAC;wBACf,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;oBACxC,CAAC;yBAAM,CAAC;wBACN,UAAU,CAAC,GAAG,CAAC,aAAa,EAAE;4BAC5B,MAAM,EAAE,CAAC,aAAa,CAAC;4BACvB,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE;yBACrB,CAAC,CAAC;oBACL,CAAC;gBACH,CAAC;YACH,CAAC;SACF;QACD,IAAI,EAAE;YACJ,KAAK,CAAC,IAAI,EAAE,GAAG;gBACb,MAAM,IAAI,GAAG,GAAG,CAAC,cAAc,EAA8B,CAAC;gBAC9D,IAAI,CAAC,YAAY,GAAG,sBAAsB,CAAC,IAAI,CAAC,CAAC;gBAEjD,IAAI,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;oBACnC,OAAO,IAAI,CAAC,UAAU,CAAC;gBACzB,CAAC;YACH,CAAC;SACF;QACD,YAAY,EAAE;YACZ,MAAM,CAAC,MAAM,EAAE,GAAG;gBAChB,MAAM,uBAAuB,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,CAChD,CAAC,GAAG,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,OAAO,CAA4B,GAAG,CAAC,EAAE,IAAI,EAAE,aAAa,CACxF,CAAC;gBACF,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAE,uBAAuB,CAAC,CAAC;YAC5E,CAAC;SACF;QACD,eAAe,EAAE;YACf,SAAS,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE;gBAC3B,iBAAiB,CAAC,YAAY,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClD,CAAC;SACF;QACD,cAAc,EAAE;YACd,QAAQ,CAAC,SAAS,EAAE,EAAE,GAAG,EAAE;gBACzB,iBAAiB,CAAC,WAAW,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACjD,CAAC;SACF;QACD,aAAa,EAAE;YACb,OAAO,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE;gBACvB,iBAAiB,CAAC,UAAU,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAChD,CAAC;SACF;QACD,kBAAkB,EAAE;YAClB,WAAW,CAAC,YAAY,EAAE,EAAE,GAAG,EAAE;gBAC/B,iBAAiB,CAAC,eAAe,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACrD,CAAC;SACF;QACD,YAAY,EAAE;YACZ,MAAM,CAAC,OAAO,EAAE,EAAE,GAAG,EAAE;gBACrB,iBAAiB,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAC/C,CAAC;SACF;QACD,eAAe,EAAE;YACf,SAAS,CAAC,UAAU,EAAE,EAAE,GAAG,EAAE;gBAC3B,iBAAiB,CAAC,YAAY,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YAClD,CAAC;SACF;QACD,oBAAoB,EAAE;YACpB,cAAc,CAAC,eAAe,EAAE,EAAE,GAAG,EAAE;gBACrC,iBAAiB,CAAC,iBAAiB,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;YACvD,CAAC;SACF;QACD,mBAAmB,CAAC,YAAY;YAC9B,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;gBACnD,mIAAmI;gBACnI,MAAM,GAAG,GAAG,mBAAmB,UAAU,EAAE,CAAC;gBAC5C,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACvC,IAAI,UAAU,EAAE,CAAC;oBACf,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;wBAClB,MAAM,EAAE,CAAC,qBAAqB,CAAC;wBAC/B,IAAI,EAAE,UAAU;qBACjB,CAAC,CAAC;gBACL,CAAC;YACH,CAAC;QACH,CAAC;KACF,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeframes.d.ts","sourceRoot":"","sources":["../../src/format/codeframes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codeframes.d.ts","sourceRoot":"","sources":["../../src/format/codeframes.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,OAAO,MAAM,iBAAiB,CAAC;AAK3C,OAAO,KAAK,EAAE,qBAAqB,EAAO,cAAc,EAAE,MAAM,YAAY,CAAC;AAE7E,KAAK,WAAW,GAAG,OAAO,CAAC,WAAW,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,OAAO,CAAA;CAAE,CAAC;AACxE,KAAK,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA;CAAE,CAAC;AAC5D,KAAK,mBAAmB,GAAG,OAAO,CAAC,mBAAmB,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,UAAU,CAAA;CAAE,CAAC;AAC3F,KAAK,YAAY,GAAG,OAAO,CAAC,YAAY,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,CAAA;CAAE,CAAC;AACtE,KAAK,UAAU,GAAG,OAAO,CAAC,UAAU,GAAG;IAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,MAAM,CAAA;CAAE,CAAC;AACrE,KAAK,QAAQ,GAAG,WAAW,GAAG,OAAO,GAAG,mBAAmB,GAAG,YAAY,GAAG,UAAU,CAAC;AAKxF,wBAAgB,YAAY,CAAC,QAAQ,EAAE,qBAAqB,EAAE,KAAK,EAAE,OAAO,UAoE3E;AAqDD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,GAAG,qBAAqB,CAWlF;AAqDD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,+FAmCxF"}
|
package/lib/format/codeframes.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import * as yamlAst from 'yaml-ast-parser';
|
|
2
|
-
import { colorize,
|
|
2
|
+
import { colorize, isColorEnabled, noColors } from '../logger.js';
|
|
3
3
|
import { parsePointer } from '../ref-utils.js';
|
|
4
4
|
const MAX_LINE_LENGTH = 150;
|
|
5
5
|
const MAX_CODEFRAME_LINES = 3;
|
|
6
6
|
export function getCodeframe(location, color) {
|
|
7
|
-
|
|
7
|
+
const isColored = color && isColorEnabled;
|
|
8
|
+
const colors = isColored ? colorize : noColors;
|
|
8
9
|
const { start, end = { line: start.line, col: start.col + 1 }, source } = location;
|
|
9
10
|
const lines = source.getLines();
|
|
10
11
|
const startLineNum = start.line;
|
|
@@ -23,21 +24,21 @@ export function getCodeframe(location, color) {
|
|
|
23
24
|
currentPad = padSize(line);
|
|
24
25
|
const startIdx = i === startLineNum ? start.col - 1 : currentPad;
|
|
25
26
|
const endIdx = i === endLineNum ? end.col - 1 : line.length;
|
|
26
|
-
prefixedLines.push([`${i}`, markLine(line, startIdx, endIdx,
|
|
27
|
-
if (!
|
|
27
|
+
prefixedLines.push([`${i}`, markLine(line, startIdx, endIdx, colors.red)]);
|
|
28
|
+
if (!isColored)
|
|
28
29
|
prefixedLines.push(['', underlineLine(line, startIdx, endIdx)]);
|
|
29
30
|
}
|
|
30
31
|
if (skipLines > 0) {
|
|
31
32
|
prefixedLines.push([
|
|
32
33
|
`…`,
|
|
33
|
-
`${whitespace(currentPad)}${
|
|
34
|
+
`${whitespace(currentPad)}${colors.gray(`< ${skipLines} more lines >`)}`,
|
|
34
35
|
]);
|
|
35
36
|
// print last line
|
|
36
37
|
prefixedLines.push([
|
|
37
38
|
`${endLineNum}`,
|
|
38
|
-
markLine(lines[endLineNum - 1], -1, end.col - 1,
|
|
39
|
+
markLine(lines[endLineNum - 1], -1, end.col - 1, colors.red),
|
|
39
40
|
]);
|
|
40
|
-
if (!
|
|
41
|
+
if (!isColored)
|
|
41
42
|
prefixedLines.push(['', underlineLine(lines[endLineNum - 1], -1, end.col - 1)]);
|
|
42
43
|
}
|
|
43
44
|
return printPrefixedLines([
|
|
@@ -46,10 +47,8 @@ export function getCodeframe(location, color) {
|
|
|
46
47
|
...prefixedLines,
|
|
47
48
|
[`${endLineNum + 1}`, markLine(lines[endLineNum - 1 + 1])],
|
|
48
49
|
[`${endLineNum + 2}`, markLine(lines[endLineNum - 1 + 2])],
|
|
49
|
-
]);
|
|
50
|
-
function markLine(line, startIdx = -1, endIdx = +Infinity, variant =
|
|
51
|
-
if (!color)
|
|
52
|
-
return line;
|
|
50
|
+
], colors);
|
|
51
|
+
function markLine(line, startIdx = -1, endIdx = +Infinity, variant = colors.gray) {
|
|
53
52
|
if (!line)
|
|
54
53
|
return line;
|
|
55
54
|
if (startIdx === -1) {
|
|
@@ -59,19 +58,19 @@ export function getCodeframe(location, color) {
|
|
|
59
58
|
return (line.substr(0, startIdx) + variant(line.substring(startIdx, endIdx)) + line.substr(endIdx));
|
|
60
59
|
}
|
|
61
60
|
}
|
|
62
|
-
function printPrefixedLines(lines) {
|
|
61
|
+
function printPrefixedLines(lines, colors) {
|
|
63
62
|
const existingLines = lines.filter(([_, line]) => line !== undefined);
|
|
64
63
|
const padLen = Math.max(...existingLines.map(([prefix]) => prefix.length));
|
|
65
64
|
const dedentLen = Math.min(...existingLines.map(([_, line]) => (line === '' ? Infinity : padSize(line))));
|
|
66
65
|
return existingLines
|
|
67
|
-
.map(([prefix, line]) =>
|
|
68
|
-
(line ? ' ' + limitLineLength(line.substring(dedentLen)) : ''))
|
|
66
|
+
.map(([prefix, line]) => colors.gray(leftPad(padLen, prefix) + ' |') +
|
|
67
|
+
(line ? ' ' + limitLineLength(line.substring(dedentLen), colors) : ''))
|
|
69
68
|
.join('\n');
|
|
70
69
|
}
|
|
71
|
-
function limitLineLength(line, maxLen = MAX_LINE_LENGTH) {
|
|
70
|
+
function limitLineLength(line, colors, maxLen = MAX_LINE_LENGTH) {
|
|
72
71
|
const overflowLen = line.length - maxLen;
|
|
73
72
|
if (overflowLen > 0) {
|
|
74
|
-
const charsMoreText =
|
|
73
|
+
const charsMoreText = colors.gray(`...<${overflowLen} chars>`);
|
|
75
74
|
return line.substring(0, maxLen - charsMoreText.length) + charsMoreText;
|
|
76
75
|
}
|
|
77
76
|
else {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeframes.js","sourceRoot":"","sources":["../../src/format/codeframes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"codeframes.js","sourceRoot":"","sources":["../../src/format/codeframes.ts"],"names":[],"mappings":"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"}
|
package/lib/format/format.d.ts
CHANGED
|
@@ -14,7 +14,6 @@ export declare function formatProblems(problems: (NormalizedProblem & {
|
|
|
14
14
|
maxProblems?: number;
|
|
15
15
|
cwd?: string;
|
|
16
16
|
format?: OutputFormat;
|
|
17
|
-
color?: boolean;
|
|
18
17
|
totals: Totals;
|
|
19
18
|
version?: string;
|
|
20
19
|
command?: 'bundle' | 'lint' | 'join' | 'check-config' | 'split' | 'diff';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/format/format.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAgCF,MAAM,MAAM,YAAY,GACpB,WAAW,GACX,SAAS,GACT,MAAM,GACN,YAAY,GACZ,aAAa,GACb,SAAS,GACT,gBAAgB,GAChB,UAAU,GACV,OAAO,CAAC;AAEZ,wBAAgB,SAAS,CAAC,QAAQ,EAAE,CAAC,iBAAiB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,GAAG,MAAM,CAmBzF;AAGD,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,CAAC,iBAAiB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,EACvD,IAAI,EAAE;IACJ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../src/format/format.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,YAAY,CAAC;AAGpB,MAAM,MAAM,MAAM,GAAG;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAgCF,MAAM,MAAM,YAAY,GACpB,WAAW,GACX,SAAS,GACT,MAAM,GACN,YAAY,GACZ,aAAa,GACb,SAAS,GACT,gBAAgB,GAChB,UAAU,GACV,OAAO,CAAC;AAEZ,wBAAgB,SAAS,CAAC,QAAQ,EAAE,CAAC,iBAAiB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,GAAG,MAAM,CAmBzF;AAGD,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,CAAC,iBAAiB,GAAG;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,EAAE,EACvD,IAAI,EAAE;IACJ,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,MAAM,GAAG,cAAc,GAAG,OAAO,GAAG,MAAM,CAAC;CAC1E,QAwTF;AA+ED,wBAAgB,SAAS,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAkB3C"}
|
package/lib/format/format.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import * as path from 'node:path';
|
|
2
2
|
import { env, isBrowser } from '../env.js';
|
|
3
|
-
import {
|
|
3
|
+
import { colorize, logger } from '../logger.js';
|
|
4
4
|
import { isAbsoluteUrl } from '../ref-utils.js';
|
|
5
5
|
import { getCodeframe, getLineColLocation } from './codeframes.js';
|
|
6
6
|
const ERROR_MESSAGE = {
|
|
@@ -48,8 +48,7 @@ export function getTotals(problems) {
|
|
|
48
48
|
}
|
|
49
49
|
// oxlint-disable-next-line sonarjs/cognitive-complexity
|
|
50
50
|
export function formatProblems(problems, opts) {
|
|
51
|
-
const { maxProblems = 100, cwd = isBrowser ? '' : process.cwd(), format = 'codeframe',
|
|
52
|
-
colorOptions.enabled = color; // force colors if specified
|
|
51
|
+
const { maxProblems = 100, cwd = isBrowser ? '' : process.cwd(), format = 'codeframe', totals = getTotals(problems), version = '2.0', command, } = opts;
|
|
53
52
|
const totalProblems = problems.length;
|
|
54
53
|
problems = problems.filter((m) => !m.ignored);
|
|
55
54
|
const ignoredProblems = totalProblems - problems.length;
|
|
@@ -214,7 +213,7 @@ export function formatProblems(problems, opts) {
|
|
|
214
213
|
if (env.FORMAT_JSON_WITH_CODEFRAMES) {
|
|
215
214
|
const location = p.location[0]; // TODO: support multiple locations
|
|
216
215
|
const loc = getLineColLocation(location);
|
|
217
|
-
problem.codeframe = getCodeframe(loc,
|
|
216
|
+
problem.codeframe = getCodeframe(loc, false);
|
|
218
217
|
}
|
|
219
218
|
return problem;
|
|
220
219
|
}),
|
|
@@ -240,7 +239,7 @@ export function formatProblems(problems, opts) {
|
|
|
240
239
|
return (`[${idx + 1}] ${bgColor(fileWithLoc)} ${atPointer}\n\n` +
|
|
241
240
|
`${problem.message}\n\n` +
|
|
242
241
|
formatDidYouMean(problem) +
|
|
243
|
-
getCodeframe(loc,
|
|
242
|
+
getCodeframe(loc, true) +
|
|
244
243
|
'\n\n' +
|
|
245
244
|
formatFrom(cwd, problem.from) +
|
|
246
245
|
`${SEVERITY_NAMES[problem.severity]} was generated by the ${colorize.blue(problem.ruleId)} rule.\n\n` +
|
package/lib/format/format.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/format/format.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../src/format/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertions.d.ts","sourceRoot":"","sources":["../../src/graphql/assertions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assertions.d.ts","sourceRoot":"","sources":["../../src/graphql/assertions.ts"],"names":[],"mappings":"AAmBA,OAAO,KAAK,EAAE,WAAW,EAAsC,MAAM,cAAc,CAAC;AAqBpF,eAAO,MAAM,iBAAiB,EAAE,WA4B/B,CAAC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { colorize } from '../logger.js';
|
|
2
1
|
import { Location } from '../ref-utils.js';
|
|
3
2
|
import { asserts, runOnKeysSet, runOnValuesSet, } from '../rules/common/assertions/asserts.js';
|
|
4
3
|
import { getFilenameFromPath, getProblemsMessage, interpolateMessagePlaceholders, } from '../rules/common/assertions/utils.js';
|
|
@@ -101,7 +100,7 @@ function runGraphqlAssertion(node, ctx, assertion, assertsToApply) {
|
|
|
101
100
|
if (!problems.length)
|
|
102
101
|
return;
|
|
103
102
|
// {{pointer}} and {{key}} stay empty - SDL has no JSON pointers or parent keys.
|
|
104
|
-
const defaultMessage = `${
|
|
103
|
+
const defaultMessage = `${assertion.assertionId} failed because the ${assertion.subject.type} ${property ?? ''} didn't meet the assertions: {{problems}}`.replace(/ +/g, ' ');
|
|
105
104
|
ctx.report({
|
|
106
105
|
message: interpolateMessagePlaceholders(assertion.message ?? defaultMessage, {
|
|
107
106
|
problems: getProblemsMessage(problems),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../src/graphql/assertions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"assertions.js","sourceRoot":"","sources":["../../src/graphql/assertions.ts"],"names":[],"mappings":"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"}
|
package/lib/lint.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAKhD,OAAO,EAAE,YAAY,EAA2C,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAKhD,OAAO,EAAE,YAAY,EAA2C,KAAK,QAAQ,EAAE,MAAM,cAAc,CAAC;AAIpG,OAAO,EAAkB,KAAK,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAEjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAaxD,OAAO,EAAgB,KAAK,eAAe,EAAoB,MAAM,WAAW,CAAC;AASjF,wBAAsB,IAAI,CAAC,IAAI,EAAE;IAC/B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,eAAe,CAAC,EAAE,eAAe,CAAC;CACnC,oDAUA;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,mBAAmB,CAAC,EAAE,YAAY,CAAC;CACpC,oDASA;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE;IACvC,QAAQ,EAAE,QAAQ,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACvC,mBAAmB,EAAE,YAAY,CAAC;CACnC,oDA0DA;AAED,wBAAsB,UAAU,CAAC,IAAI,EAAE;IACrC,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,eAAe,CAAC;IAC3B,mBAAmB,CAAC,EAAE,YAAY,CAAC;IACnC,mBAAmB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;CAChD,oDAqEA"}
|
package/lib/lint.js
CHANGED
|
@@ -4,6 +4,7 @@ import { detectSpec, getMajorSpecVersion } from './detect-spec.js';
|
|
|
4
4
|
import { isGraphqlRef } from './graphql/detect-graphql.js';
|
|
5
5
|
import { getTypes } from './oas-types.js';
|
|
6
6
|
import { BaseResolver, resolveDocument, makeDocumentFromString } from './resolve.js';
|
|
7
|
+
import { DeprecatedConfigProperties } from './rules/common/deprecated-config-properties.js';
|
|
7
8
|
import { NoUnresolvedRefs } from './rules/common/no-unresolved-refs.js';
|
|
8
9
|
import { Struct } from './rules/common/struct.js';
|
|
9
10
|
import { normalizeTypes } from './types/index.js';
|
|
@@ -106,6 +107,11 @@ export async function lintConfig(opts) {
|
|
|
106
107
|
ruleId: 'configuration no-unresolved-refs',
|
|
107
108
|
visitor: NoUnresolvedRefs({ severity: 'error' }),
|
|
108
109
|
},
|
|
110
|
+
{
|
|
111
|
+
severity: 'warn',
|
|
112
|
+
ruleId: 'configuration deprecated-properties',
|
|
113
|
+
visitor: DeprecatedConfigProperties({}),
|
|
114
|
+
},
|
|
109
115
|
];
|
|
110
116
|
const normalizedVisitors = normalizeVisitors(rules, types);
|
|
111
117
|
const resolvedRefMap = config.resolvedRefMap ||
|
package/lib/lint.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAG1D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,sBAAsB,EAAiB,MAAM,cAAc,CAAC;AACpG,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,MAAM,EAAE,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,cAAc,EAAiB,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,yBAAyB,CAAC;AAE5D,OAAO,EACL,iBAAiB,GAUlB,MAAM,eAAe,CAAC;AACvB,OAAO,EAAE,YAAY,EAA0C,MAAM,WAAW,CAAC;AAEjF,4DAA4D;AAC5D,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,sBAAsB,EAAE,GAAG,uBAAuB,CAAC,UAAU,CAAC;AACnF,MAAM,+BAA+B,GAAG;IACtC,GAAG,uBAAuB;IAC1B,UAAU,EAAE,sBAAsB;CACnC,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,IAAI,CAAC,IAK1B;IACC,MAAM,EAAE,GAAG,EAAE,mBAAmB,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;IAClF,MAAM,QAAQ,GAAG,CAAC,MAAM,mBAAmB,CAAC,eAAe,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,CAAa,CAAC;IAC1F,IAAI,CAAC,eAAe,EAAE,CAAC,QAAQ,CAAC,CAAC;IAEjC,OAAO,YAAY,CAAC;QAClB,QAAQ;QACR,GAAG,IAAI;QACP,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAKpC;IACC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,mBAAmB,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,GAAG,IAAI,CAAC;IAClG,MAAM,QAAQ,GAAG,sBAAsB,CAAC,MAAM,EAAE,WAAW,IAAI,GAAG,CAAC,CAAC;IAEpE,OAAO,YAAY,CAAC;QAClB,QAAQ;QACR,GAAG,IAAI;QACP,mBAAmB;KACpB,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAKlC;IACC,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,mBAAmB,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAEpE,6EAA6E;IAC7E,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC;QAC9C,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,2BAA2B,CAAC,CAAC;QAC1E,OAAO,mBAAmB,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,WAAW,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,MAAM,CAAC,sBAAsB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC;IAC9E,MAAM,KAAK,GAAG,cAAc,CAC1B,MAAM,CAAC,WAAW,CAAC,WAAW,IAAI,QAAQ,CAAC,WAAW,CAAC,EAAE,WAAW,CAAC,EACrE,MAAM,CACP,CAAC;IAEF,MAAM,GAAG,GAAgB;QACvB,QAAQ,EAAE,EAAE;QACZ,WAAW;QACX,MAAM;QACN,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,aAAa,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,WAAW,CAAC,CAAC;IAC7E,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;IAEpE,IAAI,cAAc,GAAG,MAAM,eAAe,CAAC;QACzC,YAAY,EAAE,QAAQ;QACtB,QAAQ,EAAE,KAAK,CAAC,IAAI;QACpB,mBAAmB;KACpB,CAAC,CAAC;IAEH,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC7B,iEAAiE;QACjE,YAAY,CAAC;YACX,QAAQ;YACR,QAAQ,EAAE,KAAK,CAAC,IAAI;YACpB,kBAAkB,EAAE,iBAAiB,CAAC,aAAa,EAAE,KAAK,CAAC;YAC3D,cAAc;YACd,GAAG;SACJ,CAAC,CAAC;QACH,cAAc,GAAG,MAAM,eAAe,CAAC;YACrC,YAAY,EAAE,QAAQ;YACtB,QAAQ,EAAE,KAAK,CAAC,IAAI;YACpB,mBAAmB;SACpB,CAAC,CAAC;IACL,CAAC;IAED,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,YAAY,EAAE,KAAK,CAAC,CAAC;IAElE,YAAY,CAAC;QACX,QAAQ;QACR,QAAQ,EAAE,KAAK,CAAC,IAAI;QACpB,kBAAkB;QAClB,cAAc;QACd,GAAG;KACJ,CAAC,CAAC;IACH,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,MAAM,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAKhC;IACC,MAAM,EAAE,QAAQ,EAAE,mBAAmB,GAAG,IAAI,YAAY,EAAE,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAC5E,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,GAAG,GAAgB;QACvB,QAAQ,EAAE,EAAE;QACZ,WAAW,EAAE,QAAQ;QACrB,MAAM;QACN,YAAY,EAAE,EAAE;KACjB,CAAC;IAEF,MAAM,KAAK,GAAG,cAAc,CAC1B,IAAI,CAAC,mBAAmB,IAAI,iBAAiB,CAAC,+BAA+B,EAAE,MAAM,CAAC,CACvF,CAAC;IAEF,MAAM,KAAK,GAkBJ;QACL;YACE,QAAQ,EAAE,QAAQ,IAAI,OAAO;YAC7B,MAAM,EAAE,sBAAsB;YAC9B,OAAO,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;SACvC;QACD;YACE,QAAQ,EAAE,QAAQ,IAAI,OAAO;YAC7B,MAAM,EAAE,kCAAkC;YAC1C,OAAO,EAAE,gBAAgB,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;SACjD;KACF,CAAC;IACF,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAC3D,MAAM,cAAc,GAClB,MAAM,CAAC,cAAc;QACrB,CAAC,MAAM,eAAe,CAAC;YACrB,YAAY,EAAE,MAAM,CAAC,QAAQ;YAC7B,QAAQ,EAAE,KAAK,CAAC,UAAU;YAC1B,mBAAmB;SACpB,CAAC,CAAC,CAAC;IACN,YAAY,CAAC;QACX,QAAQ,EAAE,MAAM,CAAC,QAAQ;QACzB,QAAQ,EAAE,KAAK,CAAC,UAAU;QAC1B,kBAAkB;QAClB,cAAc;QACd,GAAG;KACJ,CAAC,CAAC;IAEH,OAAO,GAAG,CAAC,QAAQ,CAAC;AACtB,CAAC"}
|
|
1
|
+
{"version":3,"file":"lint.js","sourceRoot":"","sources":["../src/lint.ts"],"names":[],"mappings":"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"}
|
package/lib/logger.d.ts
CHANGED
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import * as colorette from 'colorette';
|
|
2
|
-
export declare const
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
export declare const colorize: typeof colorette;
|
|
2
|
+
export declare const isColorEnabled: boolean;
|
|
3
|
+
export declare const noColors: colorette.Colorette;
|
|
4
|
+
export declare const colorize: colorette.Colorette;
|
|
6
5
|
export interface LoggerInterface {
|
|
7
6
|
info(message: string): void;
|
|
8
7
|
warn(message: string): void;
|
package/lib/logger.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.d.ts","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAKvC,eAAO,MAAM,cAAc,SAA2C,CAAC;AAEvE,eAAO,MAAM,QAAQ,qBAA8D,CAAC;AAEpF,eAAO,MAAM,QAAQ,EAAE,SAAS,CAAC,SAAiD,CAAC;AAEnF,MAAM,WAAW,eAAe;IAC9B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,MAAM,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,YAAY,IAAI,IAAI,CAAC;IACrB,cAAc,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;CAC5C;AAED,cAAM,MAAO,YAAW,eAAe;IACrC,IAAI,CAAC,GAAG,EAAE,MAAM;IAIhB,IAAI,CAAC,GAAG,EAAE,MAAM;IAIhB,KAAK,CAAC,GAAG,EAAE,MAAM;IAIjB,MAAM,CAAC,GAAG,EAAE,MAAM;IAIlB,YAAY;IASZ,cAAc,CAAC,SAAS,EAAE,MAAM;IAYhC,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM;CAOlC;AAED,eAAO,MAAM,MAAM,QAAe,CAAC"}
|
package/lib/logger.js
CHANGED
|
@@ -1,18 +1,9 @@
|
|
|
1
1
|
import * as colorette from 'colorette';
|
|
2
2
|
import { isBrowser } from './env.js';
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
export const
|
|
7
|
-
export const colorize = new Proxy(colorette, {
|
|
8
|
-
get(target, prop) {
|
|
9
|
-
if (isBrowser) {
|
|
10
|
-
return identity;
|
|
11
|
-
}
|
|
12
|
-
// oxlint-disable-next-line typescript/no-explicit-any
|
|
13
|
-
return target[prop];
|
|
14
|
-
},
|
|
15
|
-
});
|
|
3
|
+
// Browser bundles replace `colorette` with an empty module.
|
|
4
|
+
export const isColorEnabled = !isBrowser && colorette.isColorSupported;
|
|
5
|
+
export const noColors = new Proxy({}, { get: () => String });
|
|
6
|
+
export const colorize = isColorEnabled ? colorette : noColors;
|
|
16
7
|
class Logger {
|
|
17
8
|
info(str) {
|
|
18
9
|
return isBrowser ? console.info(str) : process.stderr.write(str);
|
package/lib/logger.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,4DAA4D;AAC5D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,SAAS,IAAI,SAAS,CAAC,gBAAgB,CAAC;AAEvE,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,KAAK,CAAC,EAAyB,EAAE,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;AAEpF,MAAM,CAAC,MAAM,QAAQ,GAAwB,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC;AAYnF,MAAM,MAAM;IACV,IAAI,CAAC,GAAW;QACd,OAAO,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,IAAI,CAAC,GAAW;QACd,OAAO,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;IACpF,CAAC;IAED,KAAK,CAAC,GAAW;QACf,OAAO,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,MAAM,CAAC,GAAW;QAChB,OAAO,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAClE,CAAC;IAED,YAAY;QACV,IAAI,SAAS,EAAE,CAAC;YACd,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;aAAM,CAAC;YACN,qGAAqG;YACrG,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,cAAc,CAAC,SAAiB;QAC9B,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC,OAAO,IAAI,EAAE,CAAC;QACjD,MAAM,aAAa,GAAG,SAAS;aAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;aACjD,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC;QACzB,MAAM,oBAAoB,GAAG,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEtF,OAAO,SAAS;YACd,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC;YACnC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,CAAC,CAAC;IACjD,CAAC;IAED,MAAM,CAAC,GAAW,EAAE,KAAa;QAC/B,MAAM,UAAU,GAAG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC;QAC7C,OAAO,GAAG;aACP,KAAK,CAAC,IAAI,CAAC;aACX,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC;aAC9C,IAAI,CAAC,IAAI,CAAC,CAAC;IAChB,CAAC;CACF;AAED,MAAM,CAAC,MAAM,MAAM,GAAG,IAAI,MAAM,EAAE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/rules/common/assertions/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/rules/common/assertions/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAO/E,OAAO,KAAK,EACV,WAAW,EACX,WAAW,EAEX,aAAa,EACd,MAAM,sBAAsB,CAAC;AAE9B,OAAO,EAAyC,KAAK,OAAO,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,KAAK,EAAE,SAAS,EAAE,mBAAmB,EAAqB,MAAM,YAAY,CAAC;AAEpF,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,MAAM,OAAO,CAAC;IACpB,UAAU,EAAE,GAAG,CAAC;IAChB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;CACvB,CAAC;AAEF,KAAK,kBAAkB,GAAG;IACxB,GAAG,EAAE,gBAAgB,CAAC;IACtB,MAAM,EAAE,aAAa,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,QAAA,MAAM,yBAAyB;;;;;;;;CAQrB,CAAC;AAEX,KAAK,eAAe,GAAG,MAAM,OAAO,yBAAyB,CAAC;AAsB9D,wBAAgB,iBAAiB,CAAC,SAAS,EAAE,mBAAmB,GAAG,aAAa,EAAE,CAgCjF;AAwCD,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,SAAS,EACpB,cAAc,EAAE,aAAa,CAAC,GAAG,CAAC,GACjC,WAAW,GAAG,WAAW,CAwE3B;AAED,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,GAAG,aAAa,CAAC,GAAG,CAAC,CAwC9F;AAiBD,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,YAAY,EAAE,UAI1D;AAED,wBAAgB,mBAAmB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAO/D;AAED,wBAAgB,8BAA8B,CAC5C,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,CAAC,eAAe,EAAE,MAAM,CAAC,GAC5C,MAAM,CAaR;AAED,wBAAgB,YAAY,CAAC,EAC3B,MAAM,EACN,GAAG,EACH,iBAAiB,GAClB,EAAE,kBAAkB,GAAG,YAAY,EAAE,CAyBrC"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { colorize } from '../../../logger.js';
|
|
2
1
|
import { isRef, isAbsoluteUrl } from '../../../ref-utils.js';
|
|
3
2
|
import { isPlainObject } from '../../../utils/is-plain-object.js';
|
|
4
3
|
import { isString } from '../../../utils/is-string.js';
|
|
@@ -126,7 +125,7 @@ export function buildVisitorObject(assertion, subjectVisitor) {
|
|
|
126
125
|
export function buildSubjectVisitor(assertId, assertion) {
|
|
127
126
|
return (node, ctx) => {
|
|
128
127
|
const properties = getAssertionProperties(assertion);
|
|
129
|
-
const defaultMessage = `${
|
|
128
|
+
const defaultMessage = `${assertId} failed because the ${assertion.subject.type} ${properties.join(', ')} didn't meet the assertions: ${assertionMessageTemplates.problems}`.replace(/ +/g, ' ');
|
|
130
129
|
const problems = applyAssertions(assertion, getAssertsToApply(assertion), {
|
|
131
130
|
...ctx,
|
|
132
131
|
node,
|