@skmtc/core 0.0.293 → 0.0.295

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 (23) hide show
  1. package/esm/context/CoreContext.d.ts +1 -0
  2. package/esm/context/CoreContext.d.ts.map +1 -1
  3. package/esm/context/CoreContext.js +14 -3
  4. package/esm/context/ResultsHandler.d.ts.map +1 -1
  5. package/esm/context/ResultsHandler.js +3 -1
  6. package/esm/generate/generate.d.ts.map +1 -1
  7. package/esm/generate/generate.js +1 -0
  8. package/esm/generate/generateModels.d.ts.map +1 -1
  9. package/esm/generate/generateModels.js +3 -2
  10. package/esm/generate/generateOperations.d.ts.map +1 -1
  11. package/esm/generate/generateOperations.js +3 -2
  12. package/package.json +1 -1
  13. package/script/context/CoreContext.d.ts +1 -0
  14. package/script/context/CoreContext.d.ts.map +1 -1
  15. package/script/context/CoreContext.js +14 -3
  16. package/script/context/ResultsHandler.d.ts.map +1 -1
  17. package/script/context/ResultsHandler.js +3 -1
  18. package/script/generate/generate.d.ts.map +1 -1
  19. package/script/generate/generate.js +1 -0
  20. package/script/generate/generateModels.d.ts.map +1 -1
  21. package/script/generate/generateModels.js +3 -2
  22. package/script/generate/generateOperations.d.ts.map +1 -1
  23. package/script/generate/generateOperations.js +3 -2
package/esm/context/CoreContext.d.ts CHANGED
@@ -66,6 +66,7 @@ export declare class CoreContext {
66
66
  captureResult(args: CaptureResultArgs): void;
67
67
  setupRenderPhase({ prettier, packageDependencies, settings, renderDependencies, pinnableGenerators }: RenderArgs): void;
68
68
  get phaseType(): 'parse' | 'generate' | 'render';
69
+ setCurrentLocation(location: OperationGeneratorKey | ModelGeneratorKey): void;
69
70
  getLogFields(): Record<string, string>;
70
71
  register({ destinationPath, ...args }: RegisterArgs): void;
71
72
  addGeneratorKey({ generatorKey }: AddGeneratorKeyArgs): void;
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":"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"}
package/esm/context/CoreContext.js CHANGED
@@ -39,7 +39,6 @@ export class CoreContext {
39
39
  __classPrivateFieldSet(this, _CoreContext_phase, phase, "f");
40
40
  this.traceId = traceId;
41
41
  this.spanId = spanId;
42
- console.log('Setting up logger for ', spanId);
43
42
  log.setup({
44
43
  handlers: {
45
44
  [`${spanId}-logs`]: new log.ConsoleHandler('DEBUG', {
@@ -60,7 +59,6 @@ export class CoreContext {
60
59
  });
61
60
  }
62
61
  get logger() {
63
- console.log('Getting logger for ', this.spanId);
64
62
  return log.getLogger(this.spanId);
65
63
  }
66
64
  setupGeneratePhase({ schemaModel, settings, generatorsMap }) {
@@ -110,6 +108,20 @@ export class CoreContext {
110
108
  get phaseType() {
111
109
  return __classPrivateFieldGet(this, _CoreContext_phase, "f").type;
112
110
  }
111
+ // @TODO This feels like it belongs in GenerateContext
112
+ setCurrentLocation(location) {
113
+ match(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
114
+ .with({ type: 'generate' }, ({ context }) => {
115
+ context.setCurrentLocation(location);
116
+ })
117
+ .with({ type: 'parse' }, () => {
118
+ throw new Error(`Cannot set current location during parse phase`);
119
+ })
120
+ .with({ type: 'render' }, () => {
121
+ throw new Error(`Cannot set current location during render phase`);
122
+ })
123
+ .exhaustive();
124
+ }
113
125
  getLogFields() {
114
126
  const logFields = {
115
127
  phase: __classPrivateFieldGet(this, _CoreContext_phase, "f").type,
@@ -344,7 +356,6 @@ const applyResult = ({ current, incoming }) => {
344
356
  (current === 'warning' && incoming === 'error'));
345
357
  };
346
358
  export function skmtcFormatter({ logRecord, context }) {
347
- console.log('Formatting log record for ', context.spanId);
348
359
  return JSON.stringify({
349
360
  ...context.getLogFields(),
350
361
  level: logRecord.levelName,
package/esm/context/ResultsHandler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ResultsHandler.d.ts","sourceRoot":"","sources":["../../src/context/ResultsHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2CAA2C,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAA;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,OAAO,EAAE,WAAW,CAAA;gBAMR,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB;IAMvD,KAAK;IAML,MAAM,CAAC,SAAS,EAAE,SAAS;IASpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAiBf,KAAK;IAMI,OAAO;CAKjB"}
1
+ {"version":3,"file":"ResultsHandler.d.ts","sourceRoot":"","sources":["../../src/context/ResultsHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2CAA2C,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAA;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,OAAO,EAAE,WAAW,CAAA;gBAMR,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB;IAMvD,KAAK;IAML,MAAM,CAAC,SAAS,EAAE,SAAS;IASpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAmBf,KAAK;IAMI,OAAO;CAKjB"}
package/esm/context/ResultsHandler.js CHANGED
@@ -35,8 +35,10 @@ export class ResultsHandler extends BaseHandler {
35
35
  }
36
36
  }
37
37
  log(msg) {
38
- console.log('JSON MSG', msg);
39
38
  const { phase, level, generatorKey } = JSON.parse(msg);
39
+ if (phase === 'generate' && !generatorKey) {
40
+ console.log('NO GENERATOR KEY', msg);
41
+ }
40
42
  this.context.captureResult({
41
43
  phase,
42
44
  generatorKey,
package/esm/generate/generate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK/D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,QAAQ,4EAQlB,YAAY,4DAoDd,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,MAAM,2BAMzC,CAAA"}
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK/D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,QAAQ,4EAQlB,YAAY,4DAqDd,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,MAAM,2BAMzC,CAAA"}
package/esm/generate/generate.js CHANGED
@@ -24,6 +24,7 @@ export const generate = ({ traceId, spanId, schema, settings, prettier, generato
24
24
  generatorsMap,
25
25
  settings
26
26
  });
27
+ // @TODO This feels like it belongs in GenerateContext
27
28
  Sentry.startSpan({ name: 'Generate operations' }, () => generateOperations(context));
28
29
  Sentry.startSpan({ name: 'Generate models' }, () => generateModels(context));
29
30
  context.setupRenderPhase({
package/esm/generate/generateModels.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateModels.d.ts","sourceRoot":"","sources":["../../src/generate/generateModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAK5D,eAAO,MAAM,cAAc,YAAa,WAAW,SAgDlD,CAAA"}
1
+ {"version":3,"file":"generateModels.d.ts","sourceRoot":"","sources":["../../src/generate/generateModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAK5D,eAAO,MAAM,cAAc,YAAa,WAAW,SAkDlD,CAAA"}
package/esm/generate/generateModels.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { toModelGeneratorKey } from '../types/GeneratorKeys.js';
2
2
  import * as Sentry from '@sentry/deno';
3
3
  export const generateModels = (context) => {
4
- const { schemaModel, generatorsMap, logger } = context;
4
+ const { schemaModel, generatorsMap } = context;
5
5
  Object.values(generatorsMap)
6
6
  .filter(generator => generator.type === 'model')
7
7
  .forEach(generator => {
@@ -13,6 +13,7 @@ export const generateModels = (context) => {
13
13
  refName,
14
14
  generatorId: generator.id
15
15
  });
16
+ context.setCurrentLocation(generatorKey);
16
17
  Sentry.addBreadcrumb({
17
18
  level: 'info',
18
19
  message: `Transforming model`,
@@ -30,7 +31,7 @@ export const generateModels = (context) => {
30
31
  });
31
32
  }
32
33
  catch (error) {
33
- logger.error(error);
34
+ context.logger.error(error);
34
35
  context.captureResult({
35
36
  phase: 'generate',
36
37
  generatorKey,
package/esm/generate/generateOperations.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateOperations.d.ts","sourceRoot":"","sources":["../../src/generate/generateOperations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAI5D,eAAO,MAAM,kBAAkB,YAAa,WAAW,SAwDtD,CAAA"}
1
+ {"version":3,"file":"generateOperations.d.ts","sourceRoot":"","sources":["../../src/generate/generateOperations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAI5D,eAAO,MAAM,kBAAkB,YAAa,WAAW,SA0DtD,CAAA"}
package/esm/generate/generateOperations.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import * as Sentry from '@sentry/deno';
2
2
  import { toOperationGeneratorKey } from '../types/GeneratorKeys.js';
3
3
  export const generateOperations = (context) => {
4
- const { schemaModel, generatorsMap, logger } = context;
4
+ const { schemaModel, generatorsMap } = context;
5
5
  Object.values(generatorsMap)
6
6
  .filter(generator => generator.type === 'operation')
7
7
  .forEach(generator => {
@@ -21,6 +21,7 @@ export const generateOperations = (context) => {
21
21
  generatorId: generator.id,
22
22
  operation
23
23
  });
24
+ context.setCurrentLocation(generatorKey);
24
25
  Sentry.addBreadcrumb({
25
26
  level: 'info',
26
27
  message: `Transforming operation`,
@@ -39,7 +40,7 @@ export const generateOperations = (context) => {
39
40
  });
40
41
  }
41
42
  catch (error) {
42
- logger.error(error);
43
+ context.logger.error(error);
43
44
  context.captureResult({
44
45
  phase: 'generate',
45
46
  generatorKey,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skmtc/core",
3
- "version": "0.0.293",
3
+ "version": "0.0.295",
4
4
  "main": "./script/mod.js",
5
5
  "module": "./esm/mod.js",
6
6
  "exports": {
package/script/context/CoreContext.d.ts CHANGED
@@ -66,6 +66,7 @@ export declare class CoreContext {
66
66
  captureResult(args: CaptureResultArgs): void;
67
67
  setupRenderPhase({ prettier, packageDependencies, settings, renderDependencies, pinnableGenerators }: RenderArgs): void;
68
68
  get phaseType(): 'parse' | 'generate' | 'render';
69
+ setCurrentLocation(location: OperationGeneratorKey | ModelGeneratorKey): void;
69
70
  getLogFields(): Record<string, string>;
70
71
  register({ destinationPath, ...args }: RegisterArgs): void;
71
72
  addGeneratorKey({ generatorKey }: AddGeneratorKeyArgs): void;
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":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EACV,uBAAuB,EACvB,oBAAoB,EACpB,wBAAwB,EACxB,QAAQ,EACR,YAAY,EACZ,YAAY,EACZ,UAAU,EACX,MAAM,sBAAsB,CAAA;AAE7B,OAAO,EAAE,aAAa,EAAE,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAC1E,OAAO,KAAK,EACV,mBAAmB,EACnB,YAAY,EACZ,kBAAkB,EAClB,aAAa,EACd,MAAM,YAAY,CAAA;AACnB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,YAAY,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACxE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAC/D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,KAAK,EACV,qBAAqB,EACrB,iBAAiB,EAClB,MAAM,2BAA2B,CAAA;AAClC,OAAO,KAAK,EACV,OAAO,EACP,mBAAmB,EACnB,YAAY,EACb,MAAM,sBAAsB,CAAA;AAC7B,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,KAAK,aAAa,GACd;IACE,IAAI,EAAE,OAAO,CAAA;IACb,OAAO,EAAE,YAAY,CAAA;CACtB,GACD;IACE,IAAI,EAAE,UAAU,CAAA;IAChB,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,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;CACrC,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,aAAa,CAAA;CACrB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,kBAAkB,EAAE,kBAAkB,CAAA;IACtC,mBAAmB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACxC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,kBAAkB,EAAE,MAAM,EAAE,CAAA;CAC7B,CAAA;AAED,KAAK,iBAAiB,GAClB;IACE,KAAK,EAAE,OAAO,CAAA;IACd,MAAM,EAAE,YAAY,CAAA;CACrB,GACD;IACE,KAAK,EAAE,UAAU,CAAA;IACjB,YAAY,EAAE,qBAAqB,GAAG,iBAAiB,CAAA;IACvD,MAAM,EAAE,mBAAmB,CAAA;CAC5B,GACD;IACE,KAAK,EAAE,QAAQ,CAAA;IACf,MAAM,EAAE,YAAY,CAAA;CACrB,CAAA;AAEL,qBAAa,WAAW;;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;gBAIF,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,eAAe;IAiCvD,IAAI,MAAM,IAAI,GAAG,CAAC,MAAM,CAIvB;IAED,kBAAkB,CAAC,EAAE,WAAW,EAAE,QAAQ,EAAE,aAAa,EAAE,EAAE,YAAY;IAUzE,aAAa,CAAC,IAAI,EAAE,iBAAiB,GAAG,IAAI;IAyB5C,gBAAgB,CAAC,EACf,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,kBAAkB,EAClB,kBAAkB,EACnB,EAAE,UAAU;IAgBb,IAAI,SAAS,IAAI,OAAO,GAAG,UAAU,GAAG,QAAQ,CAE/C;IAED,YAAY,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC;IAiBtC,QAAQ,CAAC,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE,EAAE,YAAY,GAAG,IAAI;IAc1D,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,IAAI;IAc5D,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;IAcpE,mBAAmB,CAAC,IAAI,EAAE,uBAAuB,GAAG,IAAI;IAcxD,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY;IAcvC,cAAc,CAAC,IAAI,EAAE,QAAQ,GAAG,UAAU,CAAC,cAAc,CAAC,GAAG,SAAS;IAUtE,MAAM,CAAC,OAAO,EAAE,aAAa,GAAG,iBAAiB;IAYjD,OAAO,CAAC,cAAc,EAAE,MAAM,GAAG,YAAY;IAc7C,wBAAwB,CAAC,IAAI,EAAE,wBAAwB,GAAG,YAAY;IActE,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EACvD,IAAI,EAAE,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,GACrB,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;IAcrB,oBAAoB,CAAC,IAAI,EAAE,oBAAoB,GAAG,YAAY;IAc9D,IAAI,OAAO,IAAI,OAAO,CAErB;IAED,IAAI,KAAK,IAAI,GAAG,CAAC,MAAM,EAAE,YAAY,CAAC,CAQrC;IAED,IAAI,kBAAkB,IAAI,kBAAkB,CAQ3C;IAED,IAAI,mBAAmB,IAAI,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAQ7C;IAED,IAAI,WAAW,IAAI,WAAW,CAU7B;IAED,IAAI,aAAa,IAAI,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAUvE;IAED,IAAI,cAAc,IAAI,SAAS,CAAC,QAAQ,CAUvC;IAED,IAAI,QAAQ,IAAI,cAAc,GAAG,SAAS,CAUzC;CACF;AAeD,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,GAAG,CAAC,SAAS,CAAA;IACxB,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,wBAAgB,cAAc,CAAC,EAC7B,SAAS,EACT,OAAO,EACR,EAAE,iBAAiB,GAAG,MAAM,CAU5B;AAUD,wBAAgB,eAAe,CAAC,EAC9B,SAAS,EACT,OAAO,EACR,EAAE,iBAAiB,GAAG,MAAM,CAY5B"}
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
@@ -67,7 +67,6 @@ class CoreContext {
67
67
  __classPrivateFieldSet(this, _CoreContext_phase, phase, "f");
68
68
  this.traceId = traceId;
69
69
  this.spanId = spanId;
70
- console.log('Setting up logger for ', spanId);
71
70
  log.setup({
72
71
  handlers: {
73
72
  [`${spanId}-logs`]: new log.ConsoleHandler('DEBUG', {
@@ -88,7 +87,6 @@ class CoreContext {
88
87
  });
89
88
  }
90
89
  get logger() {
91
- console.log('Getting logger for ', this.spanId);
92
90
  return log.getLogger(this.spanId);
93
91
  }
94
92
  setupGeneratePhase({ schemaModel, settings, generatorsMap }) {
@@ -138,6 +136,20 @@ class CoreContext {
138
136
  get phaseType() {
139
137
  return __classPrivateFieldGet(this, _CoreContext_phase, "f").type;
140
138
  }
139
+ // @TODO This feels like it belongs in GenerateContext
140
+ setCurrentLocation(location) {
141
+ (0, ts_pattern_1.match)(__classPrivateFieldGet(this, _CoreContext_phase, "f"))
142
+ .with({ type: 'generate' }, ({ context }) => {
143
+ context.setCurrentLocation(location);
144
+ })
145
+ .with({ type: 'parse' }, () => {
146
+ throw new Error(`Cannot set current location during parse phase`);
147
+ })
148
+ .with({ type: 'render' }, () => {
149
+ throw new Error(`Cannot set current location during render phase`);
150
+ })
151
+ .exhaustive();
152
+ }
141
153
  getLogFields() {
142
154
  const logFields = {
143
155
  phase: __classPrivateFieldGet(this, _CoreContext_phase, "f").type,
@@ -373,7 +385,6 @@ const applyResult = ({ current, incoming }) => {
373
385
  (current === 'warning' && incoming === 'error'));
374
386
  };
375
387
  function skmtcFormatter({ logRecord, context }) {
376
- console.log('Formatting log record for ', context.spanId);
377
388
  return JSON.stringify({
378
389
  ...context.getLogFields(),
379
390
  level: logRecord.levelName,
package/script/context/ResultsHandler.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ResultsHandler.d.ts","sourceRoot":"","sources":["../../src/context/ResultsHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2CAA2C,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAA;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,OAAO,EAAE,WAAW,CAAA;gBAMR,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB;IAMvD,KAAK;IAML,MAAM,CAAC,SAAS,EAAE,SAAS;IASpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAiBf,KAAK;IAMI,OAAO;CAKjB"}
1
+ {"version":3,"file":"ResultsHandler.d.ts","sourceRoot":"","sources":["../../src/context/ResultsHandler.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,SAAS,EAAa,MAAM,2CAA2C,CAAA;AACrF,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAA;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iDAAiD,CAAA;AAC7E,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,iDAAiD,CAAA;AACzF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAGnD,MAAM,WAAW,qBAAsB,SAAQ,kBAAkB;IAC/D,OAAO,EAAE,WAAW,CAAA;CACrB;AAED,qBAAa,cAAe,SAAQ,WAAW;;IAC7C,OAAO,EAAE,WAAW,CAAA;gBAMR,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,qBAAqB;IAMvD,KAAK;IAML,MAAM,CAAC,SAAS,EAAE,SAAS;IASpC,GAAG,CAAC,GAAG,EAAE,MAAM;IAmBf,KAAK;IAMI,OAAO;CAKjB"}
package/script/context/ResultsHandler.js CHANGED
@@ -38,8 +38,10 @@ class ResultsHandler extends base_handler_js_1.BaseHandler {
38
38
  }
39
39
  }
40
40
  log(msg) {
41
- console.log('JSON MSG', msg);
42
41
  const { phase, level, generatorKey } = JSON.parse(msg);
42
+ if (phase === 'generate' && !generatorKey) {
43
+ console.log('NO GENERATOR KEY', msg);
44
+ }
43
45
  this.context.captureResult({
44
46
  phase,
45
47
  generatorKey,
package/script/generate/generate.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK/D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,QAAQ,4EAQlB,YAAY,4DAoDd,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,MAAM,2BAMzC,CAAA"}
1
+ {"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../src/generate/generate.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AAGpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAA;AACvE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAK/D,KAAK,YAAY,GAAG;IAClB,OAAO,EAAE,MAAM,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,cAAc,CAAA;IACzB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,kBAAkB,GAAG,cAAc,CAAC,CAAA;IAClE,OAAO,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,eAAO,MAAM,QAAQ,4EAQlB,YAAY,4DAqDd,CAAA;AAED,eAAO,MAAM,WAAW,WAAY,MAAM,2BAMzC,CAAA"}
package/script/generate/generate.js CHANGED
@@ -50,6 +50,7 @@ const generate = ({ traceId, spanId, schema, settings, prettier, generatorsMap,
50
50
  generatorsMap,
51
51
  settings
52
52
  });
53
+ // @TODO This feels like it belongs in GenerateContext
53
54
  Sentry.startSpan({ name: 'Generate operations' }, () => (0, generateOperations_js_1.generateOperations)(context));
54
55
  Sentry.startSpan({ name: 'Generate models' }, () => (0, generateModels_js_1.generateModels)(context));
55
56
  context.setupRenderPhase({
package/script/generate/generateModels.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateModels.d.ts","sourceRoot":"","sources":["../../src/generate/generateModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAK5D,eAAO,MAAM,cAAc,YAAa,WAAW,SAgDlD,CAAA"}
1
+ {"version":3,"file":"generateModels.d.ts","sourceRoot":"","sources":["../../src/generate/generateModels.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAK5D,eAAO,MAAM,cAAc,YAAa,WAAW,SAkDlD,CAAA"}
package/script/generate/generateModels.js CHANGED
@@ -27,7 +27,7 @@ exports.generateModels = void 0;
27
27
  const GeneratorKeys_js_1 = require("../types/GeneratorKeys.js");
28
28
  const Sentry = __importStar(require("@sentry/deno"));
29
29
  const generateModels = (context) => {
30
- const { schemaModel, generatorsMap, logger } = context;
30
+ const { schemaModel, generatorsMap } = context;
31
31
  Object.values(generatorsMap)
32
32
  .filter(generator => generator.type === 'model')
33
33
  .forEach(generator => {
@@ -39,6 +39,7 @@ const generateModels = (context) => {
39
39
  refName,
40
40
  generatorId: generator.id
41
41
  });
42
+ context.setCurrentLocation(generatorKey);
42
43
  Sentry.addBreadcrumb({
43
44
  level: 'info',
44
45
  message: `Transforming model`,
@@ -56,7 +57,7 @@ const generateModels = (context) => {
56
57
  });
57
58
  }
58
59
  catch (error) {
59
- logger.error(error);
60
+ context.logger.error(error);
60
61
  context.captureResult({
61
62
  phase: 'generate',
62
63
  generatorKey,
package/script/generate/generateOperations.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"generateOperations.d.ts","sourceRoot":"","sources":["../../src/generate/generateOperations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAI5D,eAAO,MAAM,kBAAkB,YAAa,WAAW,SAwDtD,CAAA"}
1
+ {"version":3,"file":"generateOperations.d.ts","sourceRoot":"","sources":["../../src/generate/generateOperations.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAI5D,eAAO,MAAM,kBAAkB,YAAa,WAAW,SA0DtD,CAAA"}
package/script/generate/generateOperations.js CHANGED
@@ -27,7 +27,7 @@ exports.generateOperations = void 0;
27
27
  const Sentry = __importStar(require("@sentry/deno"));
28
28
  const GeneratorKeys_js_1 = require("../types/GeneratorKeys.js");
29
29
  const generateOperations = (context) => {
30
- const { schemaModel, generatorsMap, logger } = context;
30
+ const { schemaModel, generatorsMap } = context;
31
31
  Object.values(generatorsMap)
32
32
  .filter(generator => generator.type === 'operation')
33
33
  .forEach(generator => {
@@ -47,6 +47,7 @@ const generateOperations = (context) => {
47
47
  generatorId: generator.id,
48
48
  operation
49
49
  });
50
+ context.setCurrentLocation(generatorKey);
50
51
  Sentry.addBreadcrumb({
51
52
  level: 'info',
52
53
  message: `Transforming operation`,
@@ -65,7 +66,7 @@ const generateOperations = (context) => {
65
66
  });
66
67
  }
67
68
  catch (error) {
68
- logger.error(error);
69
+ context.logger.error(error);
69
70
  context.captureResult({
70
71
  phase: 'generate',
71
72
  generatorKey,