@skmtc/core 0.0.26 → 0.0.27

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.
Files changed (19) hide show
  1. package/esm/context/CoreContext.d.ts +0 -7
  2. package/esm/context/CoreContext.d.ts.map +1 -1
  3. package/esm/context/CoreContext.js +15 -13
  4. package/esm/context/ParseContext.d.ts +0 -7
  5. package/esm/context/ParseContext.d.ts.map +1 -1
  6. package/esm/context/ParseContext.js +0 -4
  7. package/esm/oas/schema/toSchemasV3.d.ts +0 -6
  8. package/esm/oas/schema/toSchemasV3.d.ts.map +1 -1
  9. package/esm/oas/schema/toSchemasV3.js +48 -39
  10. package/package.json +1 -4
  11. package/script/context/CoreContext.d.ts +0 -7
  12. package/script/context/CoreContext.d.ts.map +1 -1
  13. package/script/context/CoreContext.js +15 -13
  14. package/script/context/ParseContext.d.ts +0 -7
  15. package/script/context/ParseContext.d.ts.map +1 -1
  16. package/script/context/ParseContext.js +0 -4
  17. package/script/oas/schema/toSchemasV3.d.ts +0 -6
  18. package/script/oas/schema/toSchemasV3.d.ts.map +1 -1
  19. package/script/oas/schema/toSchemasV3.js +49 -44
package/esm/context/CoreContext.d.ts CHANGED
@@ -8,8 +8,6 @@ import { RenderContext } from './RenderContext.js';
8
8
  import type { FileContents, RenderOptions } from './types.js';
9
9
  import type { OpenAPIV3 } from 'openapi-types';
10
10
  import type { SpecVersion } from '@redocly/openapi-core';
11
- import type { DiffResult } from 'json-schema-diff';
12
- import type { Trail } from './Trail.js';
13
11
  import { Settings } from '../settings/types.js';
14
12
  type SharedContext = {
15
13
  type: 'parse';
@@ -51,11 +49,6 @@ export declare class CoreContext {
51
49
  pick(args: PickArgs): import("../mod.js").Definition<import("../mod.js").Stringable> | undefined;
52
50
  render(options: RenderOptions): Promise<Record<string, string>>;
53
51
  addFile(normalisedPath: string): FileContents;
54
- addRefDiff(diff: Promise<{
55
- result: DiffResult;
56
- trail: Trail;
57
- key: string;
58
- }>): void;
59
52
  get files(): Map<string, FileContents>;
60
53
  get packageDependencies(): Map<string, string>;
61
54
  get schemaModel(): OasDocument;
package/esm/context/CoreContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAEzD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE/C,KAAK,aAAa,GACd;IACE,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,YAAY,CAAA;CACtB,GACD;IACE,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,eAAe,CAAA;CACzB,GACD;IACE,IAAI,EAAE,QAAQ,CAAA;IACd,OAAO,EAAE,aAAa,CAAA;CACvB,CAAA;AAEL,KAAK,YAAY,GAAG;IAClB,WAAW,EAAE,WAAW,CAAA;IACxB,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAA;CAC/B,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,aAAa,CAAA;IACpB,QAAQ,EAAE,QAAQ,CAAA;CACnB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IAChC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAA;CAC/B,CAAA;AAED,qBAAa,WAAW;IACtB,QAAQ,EAAE,QAAQ,CAAA;IAClB,OAAO,CAAC,KAAK,CAAe;IAE5B,OAAO;IAKP,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,eAAe,GAAG,WAAW;IAIhE,kBAAkB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE,YAAY;IAU1D,gBAAgB,CAAC,EACf,KAAK,EACL,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACT,EAAE,UAAU;IAYb,OAAO,CAAC,MAAM;IAId,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,KAAK;IAMvD,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI;IAIrD,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI;IAIrD,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE,EAAE,YAAY,GAAG,IAAI;IAc1D,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY;IAcvC,IAAI,CAAC,IAAI,EAAE,QAAQ;IAUb,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAYrE,OAAO,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY;IA8B7C,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAQrC;IAED,IAAI,mBAAmB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQ7C;IAED,IAAI,WAAW,IAAI,WAAW,CAU7B;IAED,IAAI,cAAc,IAAI,SAAS,CAAC,QAAQ,CAUvC;IAED,IAAI,WAAW,IAAI,WAAW,CAU7B;IAED,IAAI,QAAQ,IAAI,QAAQ,GAAG,SAAS,CAUnC;CACF"}
package/esm/context/CoreContext.js CHANGED
@@ -111,19 +111,21 @@ export class CoreContext {
111
111
  })
112
112
  .exhaustive();
113
113
  }
114
- addRefDiff(diff) {
115
- match(this.phase)
116
- .with({ type: 'parse' }, ({ context }) => {
117
- context.addRefDiff(diff);
118
- })
119
- .with({ type: 'group' }, () => {
120
- throw new Error('Cannot add ref diff during group phase');
121
- })
122
- .with({ type: 'render' }, () => {
123
- throw new Error('Cannot add ref diff during render phase');
124
- })
125
- .exhaustive();
126
- }
114
+ // addRefDiff(
115
+ // diff: Promise<{ result: DiffResult; trail: Trail; key: string }>
116
+ // ): void {
117
+ // match(this.phase)
118
+ // .with({ type: 'parse' }, ({ context }) => {
119
+ // context.addRefDiff(diff)
120
+ // })
121
+ // .with({ type: 'group' }, () => {
122
+ // throw new Error('Cannot add ref diff during group phase')
123
+ // })
124
+ // .with({ type: 'render' }, () => {
125
+ // throw new Error('Cannot add ref diff during render phase')
126
+ // })
127
+ // .exhaustive()
128
+ // }
127
129
  get files() {
128
130
  return match(this.phase)
129
131
  .with({ type: 'group' }, ({ context }) => context.files)
package/esm/context/ParseContext.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import type { ReportArgs, Reporter } from './Reporter.js';
2
2
  import type { SpecVersion } from '@redocly/openapi-core';
3
3
  import type { OpenAPIV3 } from 'openapi-types';
4
- import type { DiffResult } from 'json-schema-diff';
5
4
  import type { Trail } from './Trail.js';
6
5
  type ParseContextArgs = {
7
6
  specVersion: SpecVersion;
@@ -13,18 +12,12 @@ export declare class ParseContext {
13
12
  specVersion: SpecVersion;
14
13
  parsedDocument: OpenAPIV3.Document;
15
14
  refDiffs: Promise<{
16
- result: DiffResult;
17
15
  trail: Trail;
18
16
  key: string;
19
17
  }>[];
20
18
  private constructor();
21
19
  static create({ parsedDocument, specVersion, reporter }: ParseContextArgs): ParseContext;
22
20
  report({ level, phase, trail, message }: ReportArgs): void;
23
- addRefDiff(diff: Promise<{
24
- result: DiffResult;
25
- trail: Trail;
26
- key: string;
27
- }>): void;
28
21
  }
29
22
  export {};
30
23
  //# sourceMappingURL=ParseContext.d.ts.map
package/esm/context/ParseContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ParseContext.d.ts","sourceRoot":"","sources":["../../src/context/ParseContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,KAAK,gBAAgB,GAAG;IACtB,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;CAChC,CAAA;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAsB;IACtC,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAA;IAEtE,OAAO;IAWP,MAAM,CAAC,MAAM,CAAC,EACZ,cAAc,EACd,WAAW,EACX,QAAQ,EACT,EAAE,gBAAgB,GAAG,YAAY;IAIlC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU;IAInD,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CAI5E"}
1
+ {"version":3,"file":"ParseContext.d.ts","sourceRoot":"","sources":["../../src/context/ParseContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,KAAK,gBAAgB,GAAG;IACtB,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;CAChC,CAAA;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAsB;IACtC,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,OAAO,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAA;IAElD,OAAO;IAWP,MAAM,CAAC,MAAM,CAAC,EACZ,cAAc,EACd,WAAW,EACX,QAAQ,EACT,EAAE,gBAAgB,GAAG,YAAY;IAIlC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU;CAQpD"}
package/esm/context/ParseContext.js CHANGED
@@ -35,8 +35,4 @@ export class ParseContext {
35
35
  report({ level, phase, trail, message }) {
36
36
  this.reporter?.report({ level, phase, trail, message });
37
37
  }
38
- addRefDiff(diff) {
39
- console.log(this.refDiffs.length);
40
- this.refDiffs.push(diff);
41
- }
42
38
  }
package/esm/oas/schema/toSchemasV3.d.ts CHANGED
@@ -27,11 +27,5 @@ type ToOptionalSchemaV3Args = {
27
27
  context: CoreContext;
28
28
  };
29
29
  export declare const toOptionalSchemaV3: ({ schema, trail, context }: ToOptionalSchemaV3Args) => OasSchema | OasRef<'schema'> | undefined;
30
- type FindRefArgs = {
31
- schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;
32
- trail: Trail;
33
- context: CoreContext;
34
- };
35
- export declare const findRef: ({ schema, trail, context }: FindRefArgs) => void;
36
30
  export {};
37
31
  //# sourceMappingURL=toSchemasV3.d.ts.map
package/esm/oas/schema/toSchemasV3.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAc3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,WAAW,gCAIrB,eAAe,KAAG,OAAO,MAAM,EAAE,SAAS,GAAG,OAAO,QAAQ,CAAC,CAS/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAClE,SAAS,CAAA;IACb,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,gCAI7B,uBAAuB,KACtB,OAAO,MAAM,EAAE,SAAS,GAAG,OAAO,QAAQ,CAAC,CAAC,GAC5C,SAMH,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,UAAU,+BAIpB,cAAc,KAAG,SAAS,GAAG,OAAO,QAAQ,CA+B9C,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,kBAAkB,+BAI5B,sBAAsB,KAAG,SAAS,GAAG,OAAO,QAAQ,CAAC,GAAG,SAM1D,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,OAAO,+BAAgC,WAAW,SAkD9D,CAAA"}
1
+ {"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAW3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,WAAW,gCAIrB,eAAe,KAAG,OAAO,MAAM,EAAE,SAAS,GAAG,OAAO,QAAQ,CAAC,CAS/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAClE,SAAS,CAAA;IACb,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,gCAI7B,uBAAuB,KACtB,OAAO,MAAM,EAAE,SAAS,GAAG,OAAO,QAAQ,CAAC,CAAC,GAC5C,SAMH,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,UAAU,+BAIpB,cAAc,KAAG,SAAS,GAAG,OAAO,QAAQ,CA+B9C,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,kBAAkB,+BAI5B,sBAAsB,KAAG,SAAS,GAAG,OAAO,QAAQ,CAAC,GAAG,SAM1D,CAAA"}
package/esm/oas/schema/toSchemasV3.js CHANGED
@@ -10,8 +10,6 @@ import { toString } from '../string/toString.js';
10
10
  import { toUnknown } from '../unknown/toUnknown.js';
11
11
  import { toUnion } from '../union/toUnion.js';
12
12
  import { toIntersection } from '../intersection/toIntersection.js';
13
- import jsonSchemaDiff from 'json-schema-diff';
14
- import { dequal } from 'dequal';
15
13
  export const toSchemasV3 = ({ schemas, trail, context }) => {
16
14
  return Object.fromEntries(Object.entries(schemas).map(([key, schema]) => {
17
15
  return [
@@ -60,40 +58,51 @@ export const toOptionalSchemaV3 = ({ schema, trail, context }) => {
60
58
  }
61
59
  return toSchemaV3({ schema, trail, context });
62
60
  };
63
- export const findRef = ({ schema, trail, context }) => {
64
- if (isRef(schema)) {
65
- return;
66
- }
67
- const schemaEntries = Object.entries(context.parsedDocument.components?.schemas ?? {});
68
- for (const [key, componentsSchema] of schemaEntries) {
69
- if (key === trail.path[2]) {
70
- return;
71
- }
72
- if (!('type' in componentsSchema) ||
73
- schema.type !== componentsSchema.type) {
74
- // console.log('EXITING')
75
- continue;
76
- }
77
- if (!('properties' in schema) || !('properties' in componentsSchema)) {
78
- // console.log('EXITING')
79
- }
80
- for (const key of Object.keys(schema.properties ?? {})) {
81
- if (!componentsSchema?.properties?.[key]) {
82
- continue;
83
- }
84
- }
85
- if (!dequal(schema, componentsSchema)) {
86
- // console.log('EXITING')
87
- continue;
88
- }
89
- const diffResult = jsonSchemaDiff.diffSchemas({
90
- sourceSchema: schema,
91
- destinationSchema: componentsSchema
92
- });
93
- context.addRefDiff(diffResult.then(result => ({
94
- result,
95
- key,
96
- trail
97
- })));
98
- }
99
- };
61
+ // type FindRefArgs = {
62
+ // schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject
63
+ // trail: Trail
64
+ // context: CoreContext
65
+ // }
66
+ // const findRef = ({ schema, trail, context }: FindRefArgs) => {
67
+ // if (isRef(schema)) {
68
+ // return
69
+ // }
70
+ // const schemaEntries = Object.entries(
71
+ // context.parsedDocument.components?.schemas ?? {}
72
+ // )
73
+ // for (const [key, componentsSchema] of schemaEntries) {
74
+ // if (key === trail.path[2]) {
75
+ // return
76
+ // }
77
+ // if (
78
+ // !('type' in componentsSchema) ||
79
+ // schema.type !== componentsSchema.type
80
+ // ) {
81
+ // // console.log('EXITING')
82
+ // continue
83
+ // }
84
+ // if (!('properties' in schema) || !('properties' in componentsSchema)) {
85
+ // // console.log('EXITING')
86
+ // }
87
+ // for (const key of Object.keys(schema.properties ?? {})) {
88
+ // if (!componentsSchema?.properties?.[key]) {
89
+ // continue
90
+ // }
91
+ // }
92
+ // if (!dequal(schema, componentsSchema)) {
93
+ // // console.log('EXITING')
94
+ // continue
95
+ // }
96
+ // const diffResult = jsonSchemaDiff.diffSchemas({
97
+ // sourceSchema: schema as JsonSchema,
98
+ // destinationSchema: componentsSchema as JsonSchema
99
+ // })
100
+ // context.addRefDiff(
101
+ // diffResult.then(result => ({
102
+ // result,
103
+ // key,
104
+ // trail
105
+ // }))
106
+ // )
107
+ // }
108
+ // }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skmtc/core",
3
- "version": "0.0.26",
3
+ "version": "0.0.27",
4
4
  "main": "./script/mod.js",
5
5
  "module": "./esm/mod.js",
6
6
  "exports": {
@@ -223,9 +223,6 @@
223
223
  "dependencies": {
224
224
  "@babel/helper-validator-identifier": "7.22.20",
225
225
  "@redocly/openapi-core": "1.11.0",
226
- "dequal": "2.0.3",
227
- "json-schema-diff": "0.18.1",
228
- "json-schema-spec-types": "0.1.2",
229
226
  "lodash-es": "4.17.21",
230
227
  "openapi-types": "12.1.3",
231
228
  "prettier": "3.2.5",
package/script/context/CoreContext.d.ts CHANGED
@@ -8,8 +8,6 @@ import { RenderContext } from './RenderContext.js';
8
8
  import type { FileContents, RenderOptions } from './types.js';
9
9
  import type { OpenAPIV3 } from 'openapi-types';
10
10
  import type { SpecVersion } from '@redocly/openapi-core';
11
- import type { DiffResult } from 'json-schema-diff';
12
- import type { Trail } from './Trail.js';
13
11
  import { Settings } from '../settings/types.js';
14
12
  type SharedContext = {
15
13
  type: 'parse';
@@ -51,11 +49,6 @@ export declare class CoreContext {
51
49
  pick(args: PickArgs): import("../mod.js").Definition<import("../mod.js").Stringable> | undefined;
52
50
  render(options: RenderOptions): Promise<Record<string, string>>;
53
51
  addFile(normalisedPath: string): FileContents;
54
- addRefDiff(diff: Promise<{
55
- result: DiffResult;
56
- trail: Trail;
57
- key: string;
58
- }>): void;
59
52
  get files(): Map<string, FileContents>;
60
53
  get packageDependencies(): Map<string, string>;
61
54
  get schemaModel(): OasDocument;
package/script/context/CoreContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"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"}
package/script/context/CoreContext.js CHANGED
@@ -114,19 +114,21 @@ class CoreContext {
114
114
  })
115
115
  .exhaustive();
116
116
  }
117
- addRefDiff(diff) {
118
- (0, ts_pattern_1.match)(this.phase)
119
- .with({ type: 'parse' }, ({ context }) => {
120
- context.addRefDiff(diff);
121
- })
122
- .with({ type: 'group' }, () => {
123
- throw new Error('Cannot add ref diff during group phase');
124
- })
125
- .with({ type: 'render' }, () => {
126
- throw new Error('Cannot add ref diff during render phase');
127
- })
128
- .exhaustive();
129
- }
117
+ // addRefDiff(
118
+ // diff: Promise<{ result: DiffResult; trail: Trail; key: string }>
119
+ // ): void {
120
+ // match(this.phase)
121
+ // .with({ type: 'parse' }, ({ context }) => {
122
+ // context.addRefDiff(diff)
123
+ // })
124
+ // .with({ type: 'group' }, () => {
125
+ // throw new Error('Cannot add ref diff during group phase')
126
+ // })
127
+ // .with({ type: 'render' }, () => {
128
+ // throw new Error('Cannot add ref diff during render phase')
129
+ // })
130
+ // .exhaustive()
131
+ // }
130
132
  get files() {
131
133
  return (0, ts_pattern_1.match)(this.phase)
132
134
  .with({ type: 'group' }, ({ context }) => context.files)
package/script/context/ParseContext.d.ts CHANGED
@@ -1,7 +1,6 @@
1
1
  import type { ReportArgs, Reporter } from './Reporter.js';
2
2
  import type { SpecVersion } from '@redocly/openapi-core';
3
3
  import type { OpenAPIV3 } from 'openapi-types';
4
- import type { DiffResult } from 'json-schema-diff';
5
4
  import type { Trail } from './Trail.js';
6
5
  type ParseContextArgs = {
7
6
  specVersion: SpecVersion;
@@ -13,18 +12,12 @@ export declare class ParseContext {
13
12
  specVersion: SpecVersion;
14
13
  parsedDocument: OpenAPIV3.Document;
15
14
  refDiffs: Promise<{
16
- result: DiffResult;
17
15
  trail: Trail;
18
16
  key: string;
19
17
  }>[];
20
18
  private constructor();
21
19
  static create({ parsedDocument, specVersion, reporter }: ParseContextArgs): ParseContext;
22
20
  report({ level, phase, trail, message }: ReportArgs): void;
23
- addRefDiff(diff: Promise<{
24
- result: DiffResult;
25
- trail: Trail;
26
- key: string;
27
- }>): void;
28
21
  }
29
22
  export {};
30
23
  //# sourceMappingURL=ParseContext.d.ts.map
package/script/context/ParseContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ParseContext.d.ts","sourceRoot":"","sources":["../../src/context/ParseContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAClD,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,KAAK,gBAAgB,GAAG;IACtB,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;CAChC,CAAA;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAsB;IACtC,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAA;IAEtE,OAAO;IAWP,MAAM,CAAC,MAAM,CAAC,EACZ,cAAc,EACd,WAAW,EACX,QAAQ,EACT,EAAE,gBAAgB,GAAG,YAAY;IAIlC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU;IAInD,UAAU,CAAC,IAAI,EAAE,OAAO,CAAC;QAAE,MAAM,EAAE,UAAU,CAAC;QAAC,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;CAI5E"}
1
+ {"version":3,"file":"ParseContext.d.ts","sourceRoot":"","sources":["../../src/context/ParseContext.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACxD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,KAAK,gBAAgB,GAAG;IACtB,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,CAAC,EAAE,QAAQ,GAAG,SAAS,CAAA;CAChC,CAAA;AAED,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAsB;IACtC,WAAW,EAAE,WAAW,CAAA;IACxB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,OAAO,CAAC;QAAE,KAAK,EAAE,KAAK,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAA;IAElD,OAAO;IAWP,MAAM,CAAC,MAAM,CAAC,EACZ,cAAc,EACd,WAAW,EACX,QAAQ,EACT,EAAE,gBAAgB,GAAG,YAAY;IAIlC,MAAM,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,UAAU;CAQpD"}
package/script/context/ParseContext.js CHANGED
@@ -38,9 +38,5 @@ class ParseContext {
38
38
  report({ level, phase, trail, message }) {
39
39
  this.reporter?.report({ level, phase, trail, message });
40
40
  }
41
- addRefDiff(diff) {
42
- console.log(this.refDiffs.length);
43
- this.refDiffs.push(diff);
44
- }
45
41
  }
46
42
  exports.ParseContext = ParseContext;
package/script/oas/schema/toSchemasV3.d.ts CHANGED
@@ -27,11 +27,5 @@ type ToOptionalSchemaV3Args = {
27
27
  context: CoreContext;
28
28
  };
29
29
  export declare const toOptionalSchemaV3: ({ schema, trail, context }: ToOptionalSchemaV3Args) => OasSchema | OasRef<'schema'> | undefined;
30
- type FindRefArgs = {
31
- schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;
32
- trail: Trail;
33
- context: CoreContext;
34
- };
35
- export declare const findRef: ({ schema, trail, context }: FindRefArgs) => void;
36
30
  export {};
37
31
  //# sourceMappingURL=toSchemasV3.d.ts.map
package/script/oas/schema/toSchemasV3.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAc3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,WAAW,gCAIrB,eAAe,KAAG,OAAO,MAAM,EAAE,SAAS,GAAG,OAAO,QAAQ,CAAC,CAS/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAClE,SAAS,CAAA;IACb,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,gCAI7B,uBAAuB,KACtB,OAAO,MAAM,EAAE,SAAS,GAAG,OAAO,QAAQ,CAAC,CAAC,GAC5C,SAMH,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,UAAU,+BAIpB,cAAc,KAAG,SAAS,GAAG,OAAO,QAAQ,CA+B9C,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,kBAAkB,+BAI5B,sBAAsB,KAAG,SAAS,GAAG,OAAO,QAAQ,CAAC,GAAG,SAM1D,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,OAAO,+BAAgC,WAAW,SAkD9D,CAAA"}
1
+ {"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAE/D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AACnD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAW3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,WAAW,gCAIrB,eAAe,KAAG,OAAO,MAAM,EAAE,SAAS,GAAG,OAAO,QAAQ,CAAC,CAS/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EACH,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAClE,SAAS,CAAA;IACb,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,mBAAmB,gCAI7B,uBAAuB,KACtB,OAAO,MAAM,EAAE,SAAS,GAAG,OAAO,QAAQ,CAAC,CAAC,GAC5C,SAMH,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,UAAU,+BAIpB,cAAc,KAAG,SAAS,GAAG,OAAO,QAAQ,CA+B9C,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,eAAO,MAAM,kBAAkB,+BAI5B,sBAAsB,KAAG,SAAS,GAAG,OAAO,QAAQ,CAAC,GAAG,SAM1D,CAAA"}
package/script/oas/schema/toSchemasV3.js CHANGED
@@ -1,9 +1,6 @@
1
1
  "use strict";
2
- var __importDefault = (this && this.__importDefault) || function (mod) {
3
- return (mod && mod.__esModule) ? mod : { "default": mod };
4
- };
5
2
  Object.defineProperty(exports, "__esModule", { value: true });
6
- exports.findRef = exports.toOptionalSchemaV3 = exports.toSchemaV3 = exports.toOptionalSchemasV3 = exports.toSchemasV3 = void 0;
3
+ exports.toOptionalSchemaV3 = exports.toSchemaV3 = exports.toOptionalSchemasV3 = exports.toSchemasV3 = void 0;
7
4
  const toRefV31_js_1 = require("../ref/toRefV31.js");
8
5
  const refFns_js_1 = require("../../helpers/refFns.js");
9
6
  const ts_pattern_1 = require("ts-pattern");
@@ -16,8 +13,6 @@ const toString_js_1 = require("../string/toString.js");
16
13
  const toUnknown_js_1 = require("../unknown/toUnknown.js");
17
14
  const toUnion_js_1 = require("../union/toUnion.js");
18
15
  const toIntersection_js_1 = require("../intersection/toIntersection.js");
19
- const json_schema_diff_1 = __importDefault(require("json-schema-diff"));
20
- const dequal_1 = require("dequal");
21
16
  const toSchemasV3 = ({ schemas, trail, context }) => {
22
17
  return Object.fromEntries(Object.entries(schemas).map(([key, schema]) => {
23
18
  return [
@@ -70,41 +65,51 @@ const toOptionalSchemaV3 = ({ schema, trail, context }) => {
70
65
  return (0, exports.toSchemaV3)({ schema, trail, context });
71
66
  };
72
67
  exports.toOptionalSchemaV3 = toOptionalSchemaV3;
73
- const findRef = ({ schema, trail, context }) => {
74
- if ((0, refFns_js_1.isRef)(schema)) {
75
- return;
76
- }
77
- const schemaEntries = Object.entries(context.parsedDocument.components?.schemas ?? {});
78
- for (const [key, componentsSchema] of schemaEntries) {
79
- if (key === trail.path[2]) {
80
- return;
81
- }
82
- if (!('type' in componentsSchema) ||
83
- schema.type !== componentsSchema.type) {
84
- // console.log('EXITING')
85
- continue;
86
- }
87
- if (!('properties' in schema) || !('properties' in componentsSchema)) {
88
- // console.log('EXITING')
89
- }
90
- for (const key of Object.keys(schema.properties ?? {})) {
91
- if (!componentsSchema?.properties?.[key]) {
92
- continue;
93
- }
94
- }
95
- if (!(0, dequal_1.dequal)(schema, componentsSchema)) {
96
- // console.log('EXITING')
97
- continue;
98
- }
99
- const diffResult = json_schema_diff_1.default.diffSchemas({
100
- sourceSchema: schema,
101
- destinationSchema: componentsSchema
102
- });
103
- context.addRefDiff(diffResult.then(result => ({
104
- result,
105
- key,
106
- trail
107
- })));
108
- }
109
- };
110
- exports.findRef = findRef;
68
+ // type FindRefArgs = {
69
+ // schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject
70
+ // trail: Trail
71
+ // context: CoreContext
72
+ // }
73
+ // const findRef = ({ schema, trail, context }: FindRefArgs) => {
74
+ // if (isRef(schema)) {
75
+ // return
76
+ // }
77
+ // const schemaEntries = Object.entries(
78
+ // context.parsedDocument.components?.schemas ?? {}
79
+ // )
80
+ // for (const [key, componentsSchema] of schemaEntries) {
81
+ // if (key === trail.path[2]) {
82
+ // return
83
+ // }
84
+ // if (
85
+ // !('type' in componentsSchema) ||
86
+ // schema.type !== componentsSchema.type
87
+ // ) {
88
+ // // console.log('EXITING')
89
+ // continue
90
+ // }
91
+ // if (!('properties' in schema) || !('properties' in componentsSchema)) {
92
+ // // console.log('EXITING')
93
+ // }
94
+ // for (const key of Object.keys(schema.properties ?? {})) {
95
+ // if (!componentsSchema?.properties?.[key]) {
96
+ // continue
97
+ // }
98
+ // }
99
+ // if (!dequal(schema, componentsSchema)) {
100
+ // // console.log('EXITING')
101
+ // continue
102
+ // }
103
+ // const diffResult = jsonSchemaDiff.diffSchemas({
104
+ // sourceSchema: schema as JsonSchema,
105
+ // destinationSchema: componentsSchema as JsonSchema
106
+ // })
107
+ // context.addRefDiff(
108
+ // diffResult.then(result => ({
109
+ // result,
110
+ // key,
111
+ // trail
112
+ // }))
113
+ // )
114
+ // }
115
+ // }