@skmtc/core 0.0.640 → 0.0.642

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 +2 -2
  2. package/esm/context/CoreContext.d.ts.map +1 -1
  3. package/esm/context/CoreContext.js +3 -3
  4. package/esm/context/RenderContext.d.ts +3 -3
  5. package/esm/context/RenderContext.d.ts.map +1 -1
  6. package/esm/context/RenderContext.js +10 -20
  7. package/esm/run/toArtifacts.d.ts +2 -2
  8. package/esm/run/toArtifacts.d.ts.map +1 -1
  9. package/esm/run/toArtifacts.js +2 -2
  10. package/package.json +2 -2
  11. package/script/context/CoreContext.d.ts +2 -2
  12. package/script/context/CoreContext.d.ts.map +1 -1
  13. package/script/context/CoreContext.js +3 -3
  14. package/script/context/RenderContext.d.ts +3 -3
  15. package/script/context/RenderContext.d.ts.map +1 -1
  16. package/script/context/RenderContext.js +10 -20
  17. package/script/run/toArtifacts.d.ts +2 -2
  18. package/script/run/toArtifacts.d.ts.map +1 -1
  19. package/script/run/toArtifacts.js +2 -2
package/esm/context/CoreContext.d.ts CHANGED
@@ -47,13 +47,13 @@ export declare class CoreContext {
47
47
  oasDocument: OasDocument;
48
48
  };
49
49
  generateSettings({ documentObject, clientSettings, toGeneratorConfigMap, defaultSelected }: GenerateSettingsArgs): ClientGeneratorSettings[] | undefined;
50
- toArtifacts({ documentObject, settings, toGeneratorConfigMap, prettier }: ToArtifactsArgs): {
50
+ toArtifacts({ documentObject, settings, toGeneratorConfigMap, prettier }: ToArtifactsArgs): Promise<{
51
51
  results: import("../types/Results.js").ResultsItem;
52
52
  files: Record<string, import("../types/Manifest.js").ManifestEntry>;
53
53
  previews: Record<string, Record<string, Preview>>;
54
54
  schemaOptions: SchemaOption[];
55
55
  artifacts: Record<string, string>;
56
- };
56
+ }>;
57
57
  trace<T>(token: string | string[], fn: () => T): T;
58
58
  captureCurrentResult(result: ResultType): void;
59
59
  }
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,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAChD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAA;AACnF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAQ7D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,eAAe,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,EAAE,QAAQ,CAAA;IACd,OAAO,EAAE,aAAa,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,aAAa,GAAG,WAAW,CAAA;AAQrE,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAUD,KAAK,oBAAoB,GAAG;IAC1B,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,cAAc,EAAE,cAAc,GAAG,SAAS,CAAA;IAC1C,oBAAoB,EAAE,CAAC,cAAc,GAAG,SAAS,OAAO,sBAAsB,CAAC,cAAc,CAAC,CAAA;IAC9F,eAAe,EAAE,OAAO,CAAA;CACzB,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,oBAAoB,EAAE,CAAC,cAAc,GAAG,SAAS,OAAO,sBAAsB,CAAC,cAAc,CAAC,CAAA;IAC9F,QAAQ,CAAC,EAAE,kBAAkB,CAAA;CAC9B,CAAA;AAOD,qBAAa,WAAW;;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;gBAKN,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,eAAe;IAiDjD,KAAK,CAAC,cAAc,EAAE,SAAS,CAAC,QAAQ;;;IAUxC,gBAAgB,CAAC,EACf,cAAc,EACd,cAAc,EACd,oBAAoB,EACpB,eAAe,EAChB,EAAE,oBAAoB,GAAG,uBAAuB,EAAE,GAAG,SAAS;IA4BzD,WAAW,CAAC,EAAE,cAAc,EAAE,QAAQ,EAAE,oBAAoB,EAAE,QAAQ,EAAE,EAAE,eAAe;;;;;;;IA2D/F,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IA+BlD,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAwB/C;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,GAAG,CAAC,SAAS,CAAA;IACxB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,wBAAgB,cAAc,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,iBAAiB,GAAG,MAAM,CAQnF"}
package/esm/context/CoreContext.js CHANGED
@@ -65,7 +65,7 @@ export class CoreContext {
65
65
  return undefined;
66
66
  }
67
67
  }
68
- toArtifacts({ documentObject, settings, toGeneratorConfigMap, prettier }) {
68
+ async toArtifacts({ documentObject, settings, toGeneratorConfigMap, prettier }) {
69
69
  try {
70
70
  const oasDocument = this.trace('parse', () => {
71
71
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupParsePhase).call(this, documentObject), "f");
@@ -80,7 +80,7 @@ export class CoreContext {
80
80
  return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.toArtifacts();
81
81
  });
82
82
  this.logger.debug(`${files.size} files generated`);
83
- const renderOutput = this.trace('render', () => {
83
+ const renderOutput = await this.trace('render', async () => {
84
84
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupRenderPhase).call(this, {
85
85
  files,
86
86
  previews,
@@ -88,7 +88,7 @@ export class CoreContext {
88
88
  prettier,
89
89
  basePath: settings?.basePath
90
90
  }), "f");
91
- return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render();
91
+ return await __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render();
92
92
  });
93
93
  return {
94
94
  ...renderOutput,
package/esm/context/RenderContext.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { PrettierConfigType } from '../types/prettierConfig.js';
2
- import type { RenderResult } from './types.js';
2
+ import type { FilesRenderResult, RenderResult } from './types.js';
3
3
  import type { Definition } from '../dsl/Definition.js';
4
4
  import type { PickArgs } from './GenerateContext.js';
5
5
  import type { ResultType } from '../types/Results.js';
@@ -27,8 +27,8 @@ export declare class RenderContext {
27
27
  logger: log.Logger;
28
28
  captureCurrentResult: (result: ResultType) => void;
29
29
  constructor({ files, previews, schemaOptions, prettierConfig, basePath, logger, stackTrail, captureCurrentResult }: ConstructorArgs);
30
- render(): Omit<RenderResult, 'results'>;
31
- private collate;
30
+ render(): Promise<Omit<RenderResult, 'results'>>;
31
+ collate(): Promise<FilesRenderResult>;
32
32
  trace<T>(token: string | string[], fn: () => T): T;
33
33
  getFile(filePath: string): File;
34
34
  pick({ name, exportPath }: PickArgs): Definition | undefined;
package/esm/context/RenderContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACnD,CAAA;AA4BD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAiBvC,OAAO,CAAC,OAAO;IAyCf,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU/B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
1
+ {"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACnD,CAAA;AAUD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWZ,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAiBhD,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC;IA2C3C,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU/B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
package/esm/context/RenderContext.js CHANGED
@@ -15,18 +15,7 @@ import invariant from 'tiny-invariant';
15
15
  import { normalize } from '../deps/jsr.io/@std/path/1.0.6/mod.js';
16
16
  import { toResolvedArtifactPath } from '../helpers/toResolvedArtifactPath.js';
17
17
  import { tracer } from '../helpers/tracer.js';
18
- import synchronizedPrettier from '@prettier/sync';
19
- // const formatSync = makeSynchronized(
20
- // import.meta,
21
- // ({ content, prettierConfig, path }: FormatSyncArgs) => {
22
- // return format(content, {
23
- // ...prettierConfig,
24
- // parser: 'estree',
25
- // plugins: [estree, typescript],
26
- // filepath: path
27
- // })
28
- // }
29
- // )
18
+ import * as prettier from 'prettier';
30
19
  export class RenderContext {
31
20
  constructor({ files, previews, schemaOptions, prettierConfig, basePath, logger, stackTrail, captureCurrentResult }) {
32
21
  Object.defineProperty(this, "files", {
@@ -76,10 +65,10 @@ export class RenderContext {
76
65
  __classPrivateFieldSet(this, _RenderContext_stackTrail, stackTrail, "f");
77
66
  this.captureCurrentResult = captureCurrentResult;
78
67
  }
79
- render() {
80
- return Sentry.startSpan({ name: 'Render artifacts' }, () => {
81
- const result = Sentry.startSpan({ name: 'Collate content' }, () => {
82
- return this.collate();
68
+ async render() {
69
+ return await Sentry.startSpan({ name: 'Render artifacts' }, async () => {
70
+ const result = await Sentry.startSpan({ name: 'Collate content' }, async () => {
71
+ return await this.collate();
83
72
  });
84
73
  const rendered = {
85
74
  artifacts: result.artifacts,
@@ -90,9 +79,9 @@ export class RenderContext {
90
79
  return rendered;
91
80
  });
92
81
  }
93
- collate() {
82
+ async collate() {
94
83
  const fileEntries = Array.from(this.files.entries());
95
- const fileObjects = fileEntries
84
+ const fileObjectPromises = fileEntries
96
85
  .map(([destinationPath, file]) => {
97
86
  return this.trace(destinationPath, () => {
98
87
  const renderedFile = renderFile({
@@ -106,6 +95,7 @@ export class RenderContext {
106
95
  });
107
96
  })
108
97
  .filter(fileObject => fileObject !== undefined);
98
+ const fileObjects = await Promise.all(fileObjectPromises);
109
99
  return fileObjects.reduce((acc, { content, path, ...fileMeta }) => ({
110
100
  ...acc,
111
101
  artifacts: {
@@ -137,10 +127,10 @@ export class RenderContext {
137
127
  }
138
128
  }
139
129
  _RenderContext_prettierConfig = new WeakMap(), _RenderContext_stackTrail = new WeakMap();
140
- const renderFile = ({ content, destinationPath, basePath, prettierConfig }) => {
130
+ const renderFile = async ({ content, destinationPath, basePath, prettierConfig }) => {
141
131
  const path = toResolvedArtifactPath({ basePath, destinationPath });
142
132
  const formatted = prettierConfig
143
- ? synchronizedPrettier.format(content, { ...prettierConfig, parser: 'espree' })
133
+ ? await prettier.format(content, { ...prettierConfig, parser: 'typescript' })
144
134
  : content;
145
135
  return {
146
136
  content: formatted,
package/esm/run/toArtifacts.d.ts CHANGED
@@ -13,9 +13,9 @@ type TransformArgs = {
13
13
  toGeneratorConfigMap: <EnrichmentType = undefined>() => GeneratorsMapContainer<EnrichmentType>;
14
14
  startAt: number;
15
15
  };
16
- export declare const toArtifacts: ({ traceId, spanId, documentObject, settings, prettier, toGeneratorConfigMap, logsPath, startAt }: TransformArgs) => {
16
+ export declare const toArtifacts: ({ traceId, spanId, documentObject, settings, prettier, toGeneratorConfigMap, logsPath, startAt }: TransformArgs) => Promise<{
17
17
  artifacts: Record<string, string>;
18
18
  manifest: ManifestContent;
19
- };
19
+ }>;
20
20
  export {};
21
21
  //# sourceMappingURL=toArtifacts.d.ts.map
package/esm/run/toArtifacts.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toArtifacts.d.ts","sourceRoot":"","sources":["../../src/run/toArtifacts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,CAAC,cAAc,GAAG,SAAS,OAAO,sBAAsB,CAAC,cAAc,CAAC,CAAA;IAC9F,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,WAAW,qGASrB,aAAa;;;CA8Bf,CAAA"}
1
+ {"version":3,"file":"toArtifacts.d.ts","sourceRoot":"","sources":["../../src/run/toArtifacts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,CAAC,cAAc,GAAG,SAAS,OAAO,sBAAsB,CAAC,cAAc,CAAC,CAAA;IAC9F,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,WAAW,qGASrB,aAAa;;;EA8Bf,CAAA"}
package/esm/run/toArtifacts.js CHANGED
@@ -1,8 +1,8 @@
1
1
  import * as dntShim from "../_dnt.shims.js";
2
2
  import { CoreContext } from '../context/CoreContext.js';
3
- export const toArtifacts = ({ traceId, spanId, documentObject, settings, prettier, toGeneratorConfigMap, logsPath, startAt }) => {
3
+ export const toArtifacts = async ({ traceId, spanId, documentObject, settings, prettier, toGeneratorConfigMap, logsPath, startAt }) => {
4
4
  const context = new CoreContext({ spanId, logsPath });
5
- const { artifacts, files, previews, schemaOptions, results } = context.toArtifacts({
5
+ const { artifacts, files, previews, schemaOptions, results } = await context.toArtifacts({
6
6
  settings,
7
7
  toGeneratorConfigMap,
8
8
  prettier,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skmtc/core",
3
- "version": "0.0.640",
3
+ "version": "0.0.642",
4
4
  "main": "./script/mod.js",
5
5
  "module": "./esm/mod.js",
6
6
  "exports": {
@@ -133,13 +133,13 @@
133
133
  "@apiture/openapi-down-convert": "0.14.0",
134
134
  "@babel/helper-validator-identifier": "7.22.20",
135
135
  "@deno/shim-deno": "~0.18.0",
136
- "@prettier/sync": "^0.5.5",
137
136
  "@sentry/deno": "8.47.0",
138
137
  "@types/babel__helper-validator-identifier": "7.15.2",
139
138
  "@types/lodash-es": "4.17.12",
140
139
  "@types/swagger2openapi": "7.0.4",
141
140
  "lodash-es": "4.17.21",
142
141
  "openapi-types": "12.1.3",
142
+ "prettier": "^3.5.3",
143
143
  "swagger2openapi": "7.0.8",
144
144
  "tiny-invariant": "1.3.3",
145
145
  "ts-pattern": "5.6.0"
package/script/context/CoreContext.d.ts CHANGED
@@ -47,13 +47,13 @@ export declare class CoreContext {
47
47
  oasDocument: OasDocument;
48
48
  };
49
49
  generateSettings({ documentObject, clientSettings, toGeneratorConfigMap, defaultSelected }: GenerateSettingsArgs): ClientGeneratorSettings[] | undefined;
50
- toArtifacts({ documentObject, settings, toGeneratorConfigMap, prettier }: ToArtifactsArgs): {
50
+ toArtifacts({ documentObject, settings, toGeneratorConfigMap, prettier }: ToArtifactsArgs): Promise<{
51
51
  results: import("../types/Results.js").ResultsItem;
52
52
  files: Record<string, import("../types/Manifest.js").ManifestEntry>;
53
53
  previews: Record<string, Record<string, Preview>>;
54
54
  schemaOptions: SchemaOption[];
55
55
  artifacts: Record<string, string>;
56
- };
56
+ }>;
57
57
  trace<T>(token: string | string[], fn: () => T): T;
58
58
  captureCurrentResult(result: ResultType): void;
59
59
  }
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
@@ -92,7 +92,7 @@ class CoreContext {
92
92
  return undefined;
93
93
  }
94
94
  }
95
- toArtifacts({ documentObject, settings, toGeneratorConfigMap, prettier }) {
95
+ async toArtifacts({ documentObject, settings, toGeneratorConfigMap, prettier }) {
96
96
  try {
97
97
  const oasDocument = this.trace('parse', () => {
98
98
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupParsePhase).call(this, documentObject), "f");
@@ -107,7 +107,7 @@ class CoreContext {
107
107
  return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.toArtifacts();
108
108
  });
109
109
  this.logger.debug(`${files.size} files generated`);
110
- const renderOutput = this.trace('render', () => {
110
+ const renderOutput = await this.trace('render', async () => {
111
111
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupRenderPhase).call(this, {
112
112
  files,
113
113
  previews,
@@ -115,7 +115,7 @@ class CoreContext {
115
115
  prettier,
116
116
  basePath: settings?.basePath
117
117
  }), "f");
118
- return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render();
118
+ return await __classPrivateFieldGet(this, _CoreContext_phase, "f").context.render();
119
119
  });
120
120
  return {
121
121
  ...renderOutput,
package/script/context/RenderContext.d.ts CHANGED
@@ -1,5 +1,5 @@
1
1
  import type { PrettierConfigType } from '../types/prettierConfig.js';
2
- import type { RenderResult } from './types.js';
2
+ import type { FilesRenderResult, RenderResult } from './types.js';
3
3
  import type { Definition } from '../dsl/Definition.js';
4
4
  import type { PickArgs } from './GenerateContext.js';
5
5
  import type { ResultType } from '../types/Results.js';
@@ -27,8 +27,8 @@ export declare class RenderContext {
27
27
  logger: log.Logger;
28
28
  captureCurrentResult: (result: ResultType) => void;
29
29
  constructor({ files, previews, schemaOptions, prettierConfig, basePath, logger, stackTrail, captureCurrentResult }: ConstructorArgs);
30
- render(): Omit<RenderResult, 'results'>;
31
- private collate;
30
+ render(): Promise<Omit<RenderResult, 'results'>>;
31
+ collate(): Promise<FilesRenderResult>;
32
32
  trace<T>(token: string | string[], fn: () => T): T;
33
33
  getFile(filePath: string): File;
34
34
  pick({ name, exportPath }: PickArgs): Definition | undefined;
package/script/context/RenderContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACnD,CAAA;AA4BD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAiBvC,OAAO,CAAC,OAAO;IAyCf,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU/B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
1
+ {"version":3,"file":"RenderContext.d.ts","sourceRoot":"","sources":["../../src/context/RenderContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAEjE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AAGrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAC1C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAG7D,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAC7B,cAAc,CAAC,EAAE,kBAAkB,CAAA;IACnC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;CACnD,CAAA;AAUD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAA;IACjD,aAAa,EAAE,YAAY,EAAE,CAAA;IAE7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,aAAa,EACb,cAAc,EACd,QAAQ,EACR,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWZ,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAiBhD,OAAO,IAAI,OAAO,CAAC,iBAAiB,CAAC;IA2C3C,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAIlD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAU/B,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
package/script/context/RenderContext.js CHANGED
@@ -44,18 +44,7 @@ const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
44
44
  const mod_js_1 = require("../deps/jsr.io/@std/path/1.0.6/mod.js");
45
45
  const toResolvedArtifactPath_js_1 = require("../helpers/toResolvedArtifactPath.js");
46
46
  const tracer_js_1 = require("../helpers/tracer.js");
47
- const sync_1 = __importDefault(require("@prettier/sync"));
48
- // const formatSync = makeSynchronized(
49
- // import.meta,
50
- // ({ content, prettierConfig, path }: FormatSyncArgs) => {
51
- // return format(content, {
52
- // ...prettierConfig,
53
- // parser: 'estree',
54
- // plugins: [estree, typescript],
55
- // filepath: path
56
- // })
57
- // }
58
- // )
47
+ const prettier = __importStar(require("prettier"));
59
48
  class RenderContext {
60
49
  constructor({ files, previews, schemaOptions, prettierConfig, basePath, logger, stackTrail, captureCurrentResult }) {
61
50
  Object.defineProperty(this, "files", {
@@ -105,10 +94,10 @@ class RenderContext {
105
94
  __classPrivateFieldSet(this, _RenderContext_stackTrail, stackTrail, "f");
106
95
  this.captureCurrentResult = captureCurrentResult;
107
96
  }
108
- render() {
109
- return Sentry.startSpan({ name: 'Render artifacts' }, () => {
110
- const result = Sentry.startSpan({ name: 'Collate content' }, () => {
111
- return this.collate();
97
+ async render() {
98
+ return await Sentry.startSpan({ name: 'Render artifacts' }, async () => {
99
+ const result = await Sentry.startSpan({ name: 'Collate content' }, async () => {
100
+ return await this.collate();
112
101
  });
113
102
  const rendered = {
114
103
  artifacts: result.artifacts,
@@ -119,9 +108,9 @@ class RenderContext {
119
108
  return rendered;
120
109
  });
121
110
  }
122
- collate() {
111
+ async collate() {
123
112
  const fileEntries = Array.from(this.files.entries());
124
- const fileObjects = fileEntries
113
+ const fileObjectPromises = fileEntries
125
114
  .map(([destinationPath, file]) => {
126
115
  return this.trace(destinationPath, () => {
127
116
  const renderedFile = renderFile({
@@ -135,6 +124,7 @@ class RenderContext {
135
124
  });
136
125
  })
137
126
  .filter(fileObject => fileObject !== undefined);
127
+ const fileObjects = await Promise.all(fileObjectPromises);
138
128
  return fileObjects.reduce((acc, { content, path, ...fileMeta }) => ({
139
129
  ...acc,
140
130
  artifacts: {
@@ -167,10 +157,10 @@ class RenderContext {
167
157
  }
168
158
  exports.RenderContext = RenderContext;
169
159
  _RenderContext_prettierConfig = new WeakMap(), _RenderContext_stackTrail = new WeakMap();
170
- const renderFile = ({ content, destinationPath, basePath, prettierConfig }) => {
160
+ const renderFile = async ({ content, destinationPath, basePath, prettierConfig }) => {
171
161
  const path = (0, toResolvedArtifactPath_js_1.toResolvedArtifactPath)({ basePath, destinationPath });
172
162
  const formatted = prettierConfig
173
- ? sync_1.default.format(content, { ...prettierConfig, parser: 'espree' })
163
+ ? await prettier.format(content, { ...prettierConfig, parser: 'typescript' })
174
164
  : content;
175
165
  return {
176
166
  content: formatted,
package/script/run/toArtifacts.d.ts CHANGED
@@ -13,9 +13,9 @@ type TransformArgs = {
13
13
  toGeneratorConfigMap: <EnrichmentType = undefined>() => GeneratorsMapContainer<EnrichmentType>;
14
14
  startAt: number;
15
15
  };
16
- export declare const toArtifacts: ({ traceId, spanId, documentObject, settings, prettier, toGeneratorConfigMap, logsPath, startAt }: TransformArgs) => {
16
+ export declare const toArtifacts: ({ traceId, spanId, documentObject, settings, prettier, toGeneratorConfigMap, logsPath, startAt }: TransformArgs) => Promise<{
17
17
  artifacts: Record<string, string>;
18
18
  manifest: ManifestContent;
19
- };
19
+ }>;
20
20
  export {};
21
21
  //# sourceMappingURL=toArtifacts.d.ts.map
package/script/run/toArtifacts.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"toArtifacts.d.ts","sourceRoot":"","sources":["../../src/run/toArtifacts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,CAAC,cAAc,GAAG,SAAS,OAAO,sBAAsB,CAAC,cAAc,CAAC,CAAA;IAC9F,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,WAAW,qGASrB,aAAa;;;CA8Bf,CAAA"}
1
+ {"version":3,"file":"toArtifacts.d.ts","sourceRoot":"","sources":["../../src/run/toArtifacts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAEpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAC3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,KAAK,aAAa,GAAG;IACnB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,cAAc,EAAE,SAAS,CAAC,QAAQ,CAAA;IAClC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,oBAAoB,EAAE,CAAC,cAAc,GAAG,SAAS,OAAO,sBAAsB,CAAC,cAAc,CAAC,CAAA;IAC9F,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,WAAW,qGASrB,aAAa;;;EA8Bf,CAAA"}
package/script/run/toArtifacts.js CHANGED
@@ -26,9 +26,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
26
26
  exports.toArtifacts = void 0;
27
27
  const dntShim = __importStar(require("../_dnt.shims.js"));
28
28
  const CoreContext_js_1 = require("../context/CoreContext.js");
29
- const toArtifacts = ({ traceId, spanId, documentObject, settings, prettier, toGeneratorConfigMap, logsPath, startAt }) => {
29
+ const toArtifacts = async ({ traceId, spanId, documentObject, settings, prettier, toGeneratorConfigMap, logsPath, startAt }) => {
30
30
  const context = new CoreContext_js_1.CoreContext({ spanId, logsPath });
31
- const { artifacts, files, previews, schemaOptions, results } = context.toArtifacts({
31
+ const { artifacts, files, previews, schemaOptions, results } = await context.toArtifacts({
32
32
  settings,
33
33
  toGeneratorConfigMap,
34
34
  prettier,