@skmtc/core 0.0.417 → 0.0.419

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 (31) hide show
  1. package/esm/context/CoreContext.d.ts.map +1 -1
  2. package/esm/context/CoreContext.js +3 -5
  3. package/esm/context/GenerateContext.d.ts +0 -1
  4. package/esm/context/GenerateContext.d.ts.map +1 -1
  5. package/esm/context/GenerateContext.js +9 -22
  6. package/esm/context/RenderContext.d.ts +1 -3
  7. package/esm/context/RenderContext.d.ts.map +1 -1
  8. package/esm/context/RenderContext.js +1 -9
  9. package/esm/dsl/File.d.ts +14 -4
  10. package/esm/dsl/File.d.ts.map +1 -1
  11. package/esm/dsl/File.js +19 -28
  12. package/esm/dsl/File.test.d.ts.map +1 -0
  13. package/esm/types/Settings.d.ts +33 -5
  14. package/esm/types/Settings.d.ts.map +1 -1
  15. package/esm/types/Settings.js +6 -3
  16. package/package.json +1 -1
  17. package/script/context/CoreContext.d.ts.map +1 -1
  18. package/script/context/CoreContext.js +3 -5
  19. package/script/context/GenerateContext.d.ts +0 -1
  20. package/script/context/GenerateContext.d.ts.map +1 -1
  21. package/script/context/GenerateContext.js +9 -22
  22. package/script/context/RenderContext.d.ts +1 -3
  23. package/script/context/RenderContext.d.ts.map +1 -1
  24. package/script/context/RenderContext.js +1 -9
  25. package/script/dsl/File.d.ts +14 -4
  26. package/script/dsl/File.d.ts.map +1 -1
  27. package/script/dsl/File.js +21 -29
  28. package/script/dsl/File.test.d.ts.map +1 -0
  29. package/script/types/Settings.d.ts +33 -5
  30. package/script/types/Settings.d.ts.map +1 -1
  31. package/script/types/Settings.js +7 -4
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":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AACpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAI7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AA8BhE,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAUD,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CACnB,MAAM,EACN,gBAAgB,GAAG,mBAAmB,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,CACzF,CAAA;IACD,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,MAAM,EAAE,MAAM,GAAG,WAAW;IAMlC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IAqEtE,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAiClD,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"}
1
+ {"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AACpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAI7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AA8BhE,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AASD,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CACnB,MAAM,EACN,gBAAgB,GAAG,mBAAmB,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,CACzF,CAAA;IACD,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,MAAM,EAAE,MAAM,GAAG,WAAW;IAMlC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IAoEtE,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAiClD,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAiB/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
@@ -53,7 +53,7 @@ export class CoreContext {
53
53
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupParsePhase).call(this, schema), "f");
54
54
  return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.parse();
55
55
  });
56
- const { files, moduleImportMap } = this.trace('generate', () => {
56
+ const { files } = this.trace('generate', () => {
57
57
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupGeneratePhase).call(this, {
58
58
  generatorsMap,
59
59
  oasDocument,
@@ -66,7 +66,6 @@ export class CoreContext {
66
66
  const renderOutput = this.trace('render', () => {
67
67
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupRenderPhase).call(this, {
68
68
  files,
69
- moduleImportMap,
70
69
  pinnableGenerators: Object.values(generatorsMap)
71
70
  .map(({ id, pinnable }) => (pinnable ? id : null))
72
71
  .filter(generatorId => generatorId !== null),
@@ -160,7 +159,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
160
159
  generatorsMap
161
160
  });
162
161
  return { type: 'generate', context: generateContext };
163
- }, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ files, prettier, basePath, pinnableGenerators, moduleImportMap }) {
162
+ }, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ files, prettier, basePath, pinnableGenerators }) {
164
163
  const renderContext = new RenderContext({
165
164
  files,
166
165
  prettier,
@@ -168,8 +167,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
168
167
  pinnableGenerators,
169
168
  logger: this.logger,
170
169
  stackTrail: __classPrivateFieldGet(this, _CoreContext_stackTrail, "f"),
171
- captureCurrentResult: this.captureCurrentResult.bind(this),
172
- moduleImportMap
170
+ captureCurrentResult: this.captureCurrentResult.bind(this)
173
171
  });
174
172
  return { type: 'render', context: renderContext };
175
173
  };
package/esm/context/GenerateContext.d.ts CHANGED
@@ -90,7 +90,6 @@ type BuildModelSettingsArgs<V> = {
90
90
  };
91
91
  type GenerateResult = {
92
92
  files: Map<string, File>;
93
- moduleImportMap: Map<string, string>;
94
93
  };
95
94
  export declare class GenerateContext {
96
95
  #private;
package/esm/context/GenerateContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"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"}
package/esm/context/GenerateContext.js CHANGED
@@ -9,7 +9,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
9
9
  if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
10
10
  return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
11
11
  };
12
- var _GenerateContext_instances, _GenerateContext_files, _GenerateContext_moduleImportMap, _GenerateContext_stackTrail, _GenerateContext_runOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_getFile, _GenerateContext_setExportPath, _GenerateContext_toOperationBaseSettings, _GenerateContext_toModelBaseSettings, _GenerateContext_toGeneratorSettings, _GenerateContext_toGatewayBaseSettings, _GenerateContext_cleanBaseSettings, _GenerateContext_addFile;
12
+ var _GenerateContext_instances, _GenerateContext_files, _GenerateContext_stackTrail, _GenerateContext_runOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_getFile, _GenerateContext_setExportPath, _GenerateContext_toOperationBaseSettings, _GenerateContext_toModelBaseSettings, _GenerateContext_toGeneratorSettings, _GenerateContext_toGatewayBaseSettings, _GenerateContext_cleanBaseSettings, _GenerateContext_addFile;
13
13
  import { join, normalize } from '../deps/jsr.io/@std/path/1.0.6/mod.js';
14
14
  import { Import } from '../dsl/Import.js';
15
15
  import { Definition } from '../dsl/Definition.js';
@@ -61,11 +61,9 @@ export class GenerateContext {
61
61
  writable: true,
62
62
  value: void 0
63
63
  });
64
- _GenerateContext_moduleImportMap.set(this, void 0);
65
64
  _GenerateContext_stackTrail.set(this, void 0);
66
65
  this.logger = logger;
67
66
  __classPrivateFieldSet(this, _GenerateContext_files, new Map(), "f");
68
- __classPrivateFieldSet(this, _GenerateContext_moduleImportMap, new Map(), "f");
69
67
  this.oasDocument = oasDocument;
70
68
  this.settings = settings;
71
69
  this.callback = callback;
@@ -78,13 +76,6 @@ export class GenerateContext {
78
76
  */
79
77
  generate() {
80
78
  const generators = Object.values(this.generatorsMap);
81
- generators.forEach(generator => {
82
- const generatorSettings = __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toGeneratorSettings).call(this, generator.id);
83
- const { moduleName, exportPath } = generatorSettings?.baseSettings ?? {};
84
- if (exportPath && moduleName && !__classPrivateFieldGet(this, _GenerateContext_moduleImportMap, "f").has(exportPath)) {
85
- __classPrivateFieldGet(this, _GenerateContext_moduleImportMap, "f").set(exportPath, moduleName);
86
- }
87
- });
88
79
  Sentry.startSpan({ name: 'Generate operations' }, () => generators
89
80
  .filter(generator => generator.type === 'operation')
90
81
  .forEach(generator => {
@@ -102,8 +93,7 @@ export class GenerateContext {
102
93
  });
103
94
  });
104
95
  return {
105
- files: __classPrivateFieldGet(this, _GenerateContext_files, "f"),
106
- moduleImportMap: __classPrivateFieldGet(this, _GenerateContext_moduleImportMap, "f")
96
+ files: __classPrivateFieldGet(this, _GenerateContext_files, "f")
107
97
  };
108
98
  }
109
99
  trace(token, fn) {
@@ -364,7 +354,7 @@ export class GenerateContext {
364
354
  return __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_getFile).call(this, exportPath).definitions.get(name);
365
355
  }
366
356
  }
367
- _GenerateContext_files = new WeakMap(), _GenerateContext_moduleImportMap = new WeakMap(), _GenerateContext_stackTrail = new WeakMap(), _GenerateContext_instances = new WeakSet(), _GenerateContext_runOperationGenerator = function _GenerateContext_runOperationGenerator({ oasDocument, generator }) {
357
+ _GenerateContext_files = new WeakMap(), _GenerateContext_stackTrail = new WeakMap(), _GenerateContext_instances = new WeakSet(), _GenerateContext_runOperationGenerator = function _GenerateContext_runOperationGenerator({ oasDocument, generator }) {
368
358
  if (generator._class === 'OperationGateway') {
369
359
  const gatewaySettings = this.toGatewayContentSetting(generator);
370
360
  const gatewayInstance = new generator({
@@ -475,22 +465,20 @@ _GenerateContext_files = new WeakMap(), _GenerateContext_moduleImportMap = new W
475
465
  const operationSettings = generatorSettings && 'operations' in generatorSettings
476
466
  ? generatorSettings.operations[path]?.[method]
477
467
  : undefined;
478
- const { exportPath, moduleName } = generatorSettings?.baseSettings ?? {};
468
+ const { exportPath } = generatorSettings?.baseSettings ?? {};
479
469
  return __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_cleanBaseSettings).call(this, {
480
470
  ...operationSettings,
481
- parentExportPath: exportPath,
482
- moduleName
471
+ parentExportPath: exportPath
483
472
  });
484
473
  }, _GenerateContext_toModelBaseSettings = function _GenerateContext_toModelBaseSettings({ generatorId, refName }) {
485
474
  const generatorSettings = __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toGeneratorSettings).call(this, generatorId);
486
475
  const modelSettings = generatorSettings && 'models' in generatorSettings
487
476
  ? generatorSettings.models[refName]
488
477
  : undefined;
489
- const { exportPath, moduleName } = generatorSettings?.baseSettings ?? {};
478
+ const { exportPath } = generatorSettings?.baseSettings ?? {};
490
479
  return __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_cleanBaseSettings).call(this, {
491
480
  ...modelSettings,
492
- parentExportPath: exportPath,
493
- moduleName
481
+ parentExportPath: exportPath
494
482
  });
495
483
  }, _GenerateContext_toGeneratorSettings = function _GenerateContext_toGeneratorSettings(generatorId) {
496
484
  return this.settings?.generators?.find(({ id }) => id === generatorId);
@@ -503,14 +491,13 @@ _GenerateContext_files = new WeakMap(), _GenerateContext_moduleImportMap = new W
503
491
  selected: Boolean(baseSettings?.selected),
504
492
  name: baseSettings?.name,
505
493
  importFrom: baseSettings?.importFrom,
506
- parentExportPath: baseSettings?.parentExportPath,
507
- moduleName: baseSettings?.moduleName
494
+ parentExportPath: baseSettings?.parentExportPath
508
495
  };
509
496
  }, _GenerateContext_addFile = function _GenerateContext_addFile(normalisedPath) {
510
497
  if (__classPrivateFieldGet(this, _GenerateContext_files, "f").has(normalisedPath)) {
511
498
  throw new Error(`File already exists: ${normalisedPath}`);
512
499
  }
513
- const newFile = new File(normalisedPath, this.settings);
500
+ const newFile = new File({ path: normalisedPath, settings: this.settings });
514
501
  __classPrivateFieldGet(this, _GenerateContext_files, "f").set(normalisedPath, newFile);
515
502
  return newFile;
516
503
  };
package/esm/context/RenderContext.d.ts CHANGED
@@ -8,7 +8,6 @@ import type * as log from '../deps/jsr.io/@std/log/0.224.8/mod.js';
8
8
  import type { File } from '../dsl/File.js';
9
9
  type ConstructorArgs = {
10
10
  files: Map<string, File>;
11
- moduleImportMap: Map<string, string>;
12
11
  prettier?: PrettierConfigType;
13
12
  basePath: string | undefined;
14
13
  pinnableGenerators: string[];
@@ -25,8 +24,7 @@ export declare class RenderContext {
25
24
  pinnableGenerators: string[];
26
25
  logger: log.Logger;
27
26
  captureCurrentResult: (result: ResultType) => void;
28
- moduleImportMap: Map<string, string>;
29
- constructor({ files, prettier, basePath, pinnableGenerators, logger, stackTrail, captureCurrentResult, moduleImportMap }: ConstructorArgs);
27
+ constructor({ files, prettier, basePath, pinnableGenerators, logger, stackTrail, captureCurrentResult }: ConstructorArgs);
30
28
  render(): Omit<RenderResult, 'results'>;
31
29
  private collate;
32
30
  trace<T>(token: string | string[], fn: () => T): T;
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,EAAE,mBAAmB,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAGpD,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;AAE1C,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,kBAAkB,EAAE,MAAM,EAAE,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;AAYD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,OAAO,CAAC,QAAQ,CAAC,CAAoB;IACrC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,sBAAsB,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAAA;IAC7D,kBAAkB,EAAE,MAAM,EAAE,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;IAClD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;gBACxB,EACV,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,eAAe,EAChB,EAAE,eAAe;IAYlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAuBvC,OAAO,CAAC,OAAO;IAsDf,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,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,mBAAmB;IAarD,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,mBAAmB,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAGpD,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;AAE1C,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,kBAAkB,EAAE,MAAM,EAAE,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;AAYD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,OAAO,CAAC,QAAQ,CAAC,CAAoB;IACrC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,sBAAsB,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAAA;IAC7D,kBAAkB,EAAE,MAAM,EAAE,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAuBvC,OAAO,CAAC,OAAO;IAoDf,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,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,mBAAmB;IAarD,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
package/esm/context/RenderContext.js CHANGED
@@ -16,7 +16,7 @@ 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
18
  export class RenderContext {
19
- constructor({ files, prettier, basePath, pinnableGenerators, logger, stackTrail, captureCurrentResult, moduleImportMap }) {
19
+ constructor({ files, prettier, basePath, pinnableGenerators, logger, stackTrail, captureCurrentResult }) {
20
20
  Object.defineProperty(this, "files", {
21
21
  enumerable: true,
22
22
  configurable: true,
@@ -60,12 +60,6 @@ export class RenderContext {
60
60
  writable: true,
61
61
  value: void 0
62
62
  });
63
- Object.defineProperty(this, "moduleImportMap", {
64
- enumerable: true,
65
- configurable: true,
66
- writable: true,
67
- value: void 0
68
- });
69
63
  this.currentDestinationPath = 'PRE_RENDER';
70
64
  this.files = files;
71
65
  this.prettier = prettier;
@@ -74,7 +68,6 @@ export class RenderContext {
74
68
  this.logger = logger;
75
69
  __classPrivateFieldSet(this, _RenderContext_stackTrail, stackTrail, "f");
76
70
  this.captureCurrentResult = captureCurrentResult;
77
- this.moduleImportMap = moduleImportMap;
78
71
  }
79
72
  render() {
80
73
  return Sentry.startSpan({ name: 'Render artifacts' }, () => {
@@ -105,7 +98,6 @@ export class RenderContext {
105
98
  // to Correct file
106
99
  // @TODO: Could this be combined with the tracer call above?
107
100
  this.currentDestinationPath = destinationPath;
108
- file.moduleImportMap = this.moduleImportMap;
109
101
  const renderedFile = renderFile({
110
102
  content: file.toString(),
111
103
  generatorKeys: Array.from(file.generatorKeys).filter(Boolean),
package/esm/dsl/File.d.ts CHANGED
@@ -1,16 +1,26 @@
1
1
  import type { Definition } from './Definition.js';
2
2
  import type { GeneratorKey } from '../types/GeneratorKeys.js';
3
- import type { ClientSettings } from '../types/Settings.js';
3
+ import type { ClientSettings, ModulePackage } from '../types/Settings.js';
4
+ type FileArgs = {
5
+ path: string;
6
+ settings: ClientSettings | undefined;
7
+ };
4
8
  export declare class File {
5
9
  #private;
6
10
  path: string;
7
11
  reExports: Map<string, Record<string, Set<string>>>;
8
12
  imports: Map<string, Set<string>>;
9
13
  definitions: Map<string, Definition>;
10
- moduleImportMap: Map<string, string>;
11
- settings: ClientSettings | undefined;
12
- constructor(path: string, settings: ClientSettings | undefined);
14
+ packages: ModulePackage[] | undefined;
15
+ constructor({ path, settings }: FileArgs);
13
16
  get generatorKeys(): Set<GeneratorKey>;
14
17
  toString(): string;
15
18
  }
19
+ export type NormaliseModuleNameArgs = {
20
+ destinationPath: string;
21
+ exportPath: string;
22
+ packages: ModulePackage[] | undefined;
23
+ };
24
+ export declare const normaliseModuleName: ({ destinationPath, exportPath, packages }: NormaliseModuleNameArgs) => string;
25
+ export {};
16
26
  //# sourceMappingURL=File.d.ts.map
package/esm/dsl/File.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"File.d.ts","sourceRoot":"","sources":["../../src/dsl/File.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,qBAAa,IAAI;;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACnD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IACjC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACpC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEpC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;gBAExB,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,GAAG,SAAS;IAU9D,IAAI,aAAa,sBAEhB;IAED,QAAQ;CAkCT"}
1
+ {"version":3,"file":"File.d.ts","sourceRoot":"","sources":["../../src/dsl/File.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEzE,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;CACrC,CAAA;AAED,qBAAa,IAAI;;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACnD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IACjC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAEpC,QAAQ,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;gBAEzB,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,QAAQ;IASxC,IAAI,aAAa,sBAEhB;IAED,QAAQ;CAkCT;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;CACtC,CAAA;AAED,eAAO,MAAM,mBAAmB,8CAI7B,uBAAuB,WAYzB,CAAA"}
package/esm/dsl/File.js CHANGED
@@ -12,7 +12,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
12
12
  var _File_generatorKeys;
13
13
  import { Import } from './Import.js';
14
14
  export class File {
15
- constructor(path, settings) {
15
+ constructor({ path, settings }) {
16
16
  Object.defineProperty(this, "path", {
17
17
  enumerable: true,
18
18
  configurable: true,
@@ -37,14 +37,8 @@ export class File {
37
37
  writable: true,
38
38
  value: void 0
39
39
  });
40
- Object.defineProperty(this, "moduleImportMap", {
41
- enumerable: true,
42
- configurable: true,
43
- writable: true,
44
- value: void 0
45
- });
46
40
  _File_generatorKeys.set(this, void 0);
47
- Object.defineProperty(this, "settings", {
41
+ Object.defineProperty(this, "packages", {
48
42
  enumerable: true,
49
43
  configurable: true,
50
44
  writable: true,
@@ -55,19 +49,17 @@ export class File {
55
49
  this.imports = new Map();
56
50
  this.definitions = new Map();
57
51
  __classPrivateFieldSet(this, _File_generatorKeys, new Set(), "f");
58
- this.moduleImportMap = new Map();
59
- this.settings = settings;
52
+ this.packages = settings?.packages;
60
53
  }
61
54
  get generatorKeys() {
62
55
  return __classPrivateFieldGet(this, _File_generatorKeys, "f");
63
56
  }
64
57
  toString() {
65
58
  const reExports = Array.from(this.reExports.entries()).flatMap(([module, entityTypes]) => {
66
- const updatedModuleName = updateModuleName({
59
+ const updatedModuleName = normaliseModuleName({
67
60
  destinationPath: this.path,
68
- moduleImportMap: this.moduleImportMap,
69
61
  exportPath: module,
70
- settings: this.settings
62
+ packages: this.packages
71
63
  });
72
64
  return Object.entries(entityTypes).map(([entityType, names]) => {
73
65
  const prefix = entityType === 'type' ? 'type' : '';
@@ -75,12 +67,13 @@ export class File {
75
67
  });
76
68
  });
77
69
  const imports = Array.from(this.imports.entries()).map(([module, importItems]) => {
78
- const updatedModuleName = updateModuleName({
79
- destinationPath: this.path,
80
- moduleImportMap: this.moduleImportMap,
81
- exportPath: module,
82
- settings: this.settings
83
- });
70
+ const updatedModuleName = this.packages
71
+ ? normaliseModuleName({
72
+ destinationPath: this.path,
73
+ exportPath: module,
74
+ packages: this.packages
75
+ })
76
+ : module;
84
77
  return new Import({ module: updatedModuleName, importNames: Array.from(importItems) });
85
78
  });
86
79
  const definitions = Array.from(this.definitions.values());
@@ -91,15 +84,13 @@ export class File {
91
84
  }
92
85
  }
93
86
  _File_generatorKeys = new WeakMap();
94
- const updateModuleName = ({ destinationPath, moduleImportMap, exportPath, settings }) => {
95
- const matchedModuleImport = [...moduleImportMap.entries()].find(([key]) => exportPath.startsWith(key));
96
- // If exportPath does not match any module imports, return the original exportPath
97
- if (!matchedModuleImport) {
87
+ export const normaliseModuleName = ({ destinationPath, exportPath, packages = [] }) => {
88
+ const matchingModule = packages.find(packageModule => {
89
+ return exportPath.startsWith(packageModule.rootPath);
90
+ });
91
+ if (!matchingModule) {
98
92
  return exportPath;
99
93
  }
100
- const [matchedPath, moduleName] = matchedModuleImport;
101
- const matchedRoot = settings?.appRoots?.find(root => matchedPath.startsWith(root)) ?? matchedPath;
102
- // If module import is imported from inside module, turn into a local absolute path starting with '@/'
103
- // Otherwise, if module import is imported from outside module, use module name
104
- return destinationPath.startsWith(matchedPath) ? exportPath.replace(matchedRoot, '@') : moduleName;
94
+ const { rootPath, moduleName } = matchingModule;
95
+ return destinationPath.startsWith(rootPath) ? exportPath.replace(rootPath, '@') : moduleName;
105
96
  };
package/esm/dsl/File.test.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"File.test.d.ts","sourceRoot":"","sources":["../../src/dsl/File.test.ts"],"names":[],"mappings":""}
package/esm/types/Settings.d.ts CHANGED
@@ -3,7 +3,6 @@ import { type Method } from './Method.js';
3
3
  import { z } from 'zod';
4
4
  export declare const baseSettings: z.ZodType<BaseSettings>;
5
5
  export type BaseSettings = {
6
- moduleName?: string;
7
6
  parentExportPath?: string;
8
7
  exportPath?: string;
9
8
  selected: boolean;
@@ -94,9 +93,32 @@ export declare const clientGeneratorSettings: z.ZodUnion<[z.ZodObject<{
94
93
  exportPath?: string | undefined;
95
94
  }>]>;
96
95
  export type ClientGeneratorSettings = OperationsGeneratorSettings | ModelsGeneratorSettings;
96
+ export declare const modulePackage: z.ZodObject<{
97
+ rootPath: z.ZodString;
98
+ moduleName: z.ZodString;
99
+ }, "strip", z.ZodTypeAny, {
100
+ rootPath: string;
101
+ moduleName: string;
102
+ }, {
103
+ rootPath: string;
104
+ moduleName: string;
105
+ }>;
106
+ export type ModulePackage = {
107
+ rootPath: string;
108
+ moduleName: string;
109
+ };
97
110
  export declare const clientSettings: z.ZodObject<{
98
111
  basePath: z.ZodOptional<z.ZodString>;
99
- appRoots: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
112
+ packages: z.ZodOptional<z.ZodArray<z.ZodObject<{
113
+ rootPath: z.ZodString;
114
+ moduleName: z.ZodString;
115
+ }, "strip", z.ZodTypeAny, {
116
+ rootPath: string;
117
+ moduleName: string;
118
+ }, {
119
+ rootPath: string;
120
+ moduleName: string;
121
+ }>, "many">>;
100
122
  generators: z.ZodArray<z.ZodUnion<[z.ZodObject<{
101
123
  id: z.ZodString;
102
124
  description: z.ZodOptional<z.ZodString>;
@@ -145,7 +167,10 @@ export declare const clientSettings: z.ZodObject<{
145
167
  exportPath?: string | undefined;
146
168
  })[];
147
169
  basePath?: string | undefined;
148
- appRoots?: string[] | undefined;
170
+ packages?: {
171
+ rootPath: string;
172
+ moduleName: string;
173
+ }[] | undefined;
149
174
  }, {
150
175
  generators: ({
151
176
  id: string;
@@ -160,11 +185,14 @@ export declare const clientSettings: z.ZodObject<{
160
185
  exportPath?: string | undefined;
161
186
  })[];
162
187
  basePath?: string | undefined;
163
- appRoots?: string[] | undefined;
188
+ packages?: {
189
+ rootPath: string;
190
+ moduleName: string;
191
+ }[] | undefined;
164
192
  }>;
165
193
  export type ClientSettings = {
166
194
  basePath?: string;
167
- appRoots?: string[];
195
+ packages?: ModulePackage[];
168
196
  generators: ClientGeneratorSettings[];
169
197
  };
170
198
  export type SkmtcClientConfig = {
package/esm/types/Settings.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Settings.d.ts","sourceRoot":"","sources":["../../src/types/Settings.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,MAAM,EAAU,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAO/C,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,CAAA;AAEnF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;EAKtC,CAAA;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;IACjE,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;EAMlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACpC,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG,2BAA2B,GAAG,uBAAuB,CAAA;AAE3F,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIzB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,UAAU,EAAE,uBAAuB,EAAE,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAKzD,CAAA;AAEF,eAAO,MAAM,aAAa,mCAAiC,CAAA;AAE3D,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,OAAO,CAAA;AAEjD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;EAI3B,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA"}
1
+ {"version":3,"file":"Settings.d.ts","sourceRoot":"","sources":["../../src/types/Settings.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,MAAM,EAAU,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAM/C,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,CAAA;AAEnF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;EAKtC,CAAA;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;IACjE,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;EAMlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACpC,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG,2BAA2B,GAAG,uBAAuB,CAAA;AAE3F,eAAO,MAAM,aAAa;;;;;;;;;EAGxB,CAAA;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIzB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAA;IAC1B,UAAU,EAAE,uBAAuB,EAAE,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAKzD,CAAA;AAEF,eAAO,MAAM,aAAa,mCAAiC,CAAA;AAE3D,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,OAAO,CAAA;AAEjD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;EAI3B,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA"}
package/esm/types/Settings.js CHANGED
@@ -6,8 +6,7 @@ export const baseSettings = z.object({
6
6
  name: z.string().optional(),
7
7
  importFrom: z.string().optional(),
8
8
  exportPath: z.string().optional(),
9
- parentExportPath: z.string().optional(),
10
- moduleName: z.string().optional()
9
+ parentExportPath: z.string().optional()
11
10
  });
12
11
  export const operationsGeneratorSettings = z.object({
13
12
  id: z.string(),
@@ -26,9 +25,13 @@ export const clientGeneratorSettings = z.union([
26
25
  operationsGeneratorSettings,
27
26
  modelsGeneratorSettings
28
27
  ]);
28
+ export const modulePackage = z.object({
29
+ rootPath: z.string(),
30
+ moduleName: z.string()
31
+ });
29
32
  export const clientSettings = z.object({
30
33
  basePath: z.string().optional(),
31
- appRoots: z.array(z.string()).optional(),
34
+ packages: z.array(modulePackage).optional(),
32
35
  generators: z.array(clientGeneratorSettings)
33
36
  });
34
37
  export const skmtcClientConfig = z.object({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skmtc/core",
3
- "version": "0.0.417",
3
+ "version": "0.0.419",
4
4
  "main": "./script/mod.js",
5
5
  "module": "./esm/mod.js",
6
6
  "exports": {
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":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AACpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAI7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AA8BhE,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AAUD,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CACnB,MAAM,EACN,gBAAgB,GAAG,mBAAmB,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,CACzF,CAAA;IACD,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,MAAM,EAAE,MAAM,GAAG,WAAW;IAMlC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IAqEtE,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAiClD,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"}
1
+ {"version":3,"file":"CoreContext.d.ts","sourceRoot":"","sources":["../../src/context/CoreContext.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAA;AACpE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,yCAAyC,CAAA;AACpG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACtE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAG7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAI7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AA8BhE,KAAK,eAAe,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA;AASD,KAAK,aAAa,GAAG;IACnB,MAAM,EAAE,MAAM,CAAA;IACd,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,aAAa,EAAE,MAAM,CACnB,MAAM,EACN,gBAAgB,GAAG,mBAAmB,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,CACzF,CAAA;IACD,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,MAAM,EAAE,MAAM,GAAG,WAAW;IAMlC,SAAS,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,EAAE,aAAa;;;;;;IAoEtE,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAiClD,oBAAoB,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;CAiB/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/script/context/CoreContext.js CHANGED
@@ -80,7 +80,7 @@ class CoreContext {
80
80
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupParsePhase).call(this, schema), "f");
81
81
  return __classPrivateFieldGet(this, _CoreContext_phase, "f").context.parse();
82
82
  });
83
- const { files, moduleImportMap } = this.trace('generate', () => {
83
+ const { files } = this.trace('generate', () => {
84
84
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupGeneratePhase).call(this, {
85
85
  generatorsMap,
86
86
  oasDocument,
@@ -93,7 +93,6 @@ class CoreContext {
93
93
  const renderOutput = this.trace('render', () => {
94
94
  __classPrivateFieldSet(this, _CoreContext_phase, __classPrivateFieldGet(this, _CoreContext_instances, "m", _CoreContext_setupRenderPhase).call(this, {
95
95
  files,
96
- moduleImportMap,
97
96
  pinnableGenerators: Object.values(generatorsMap)
98
97
  .map(({ id, pinnable }) => (pinnable ? id : null))
99
98
  .filter(generatorId => generatorId !== null),
@@ -188,7 +187,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
188
187
  generatorsMap
189
188
  });
190
189
  return { type: 'generate', context: generateContext };
191
- }, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ files, prettier, basePath, pinnableGenerators, moduleImportMap }) {
190
+ }, _CoreContext_setupRenderPhase = function _CoreContext_setupRenderPhase({ files, prettier, basePath, pinnableGenerators }) {
192
191
  const renderContext = new RenderContext_js_1.RenderContext({
193
192
  files,
194
193
  prettier,
@@ -196,8 +195,7 @@ _CoreContext_phase = new WeakMap(), _CoreContext_results = new WeakMap(), _CoreC
196
195
  pinnableGenerators,
197
196
  logger: this.logger,
198
197
  stackTrail: __classPrivateFieldGet(this, _CoreContext_stackTrail, "f"),
199
- captureCurrentResult: this.captureCurrentResult.bind(this),
200
- moduleImportMap
198
+ captureCurrentResult: this.captureCurrentResult.bind(this)
201
199
  });
202
200
  return { type: 'render', context: renderContext };
203
201
  };
package/script/context/GenerateContext.d.ts CHANGED
@@ -90,7 +90,6 @@ type BuildModelSettingsArgs<V> = {
90
90
  };
91
91
  type GenerateResult = {
92
92
  files: Map<string, File>;
93
- moduleImportMap: Map<string, string>;
94
93
  };
95
94
  export declare class GenerateContext {
96
95
  #private;
package/script/context/GenerateContext.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GenerateContext.d.ts","sourceRoot":"","sources":["../../src/context/GenerateContext.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAErD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAC9D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAA;AACxD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,KAAK,EAAyC,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACjG,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAChD,OAAO,KAAK,EAAE,mBAAmB,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAA;AACpG,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAGtE,OAAO,KAAK,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAChF,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAElD,OAAO,KAAK,KAAK,GAAG,MAAM,wCAAwC,CAAA;AAClE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,eAAe,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAC3F,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAC7C,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAA;AAGrC,KAAK,eAAe,GAAG;IACrB,WAAW,EAAE,WAAW,CAAA;IACxB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI,CAAA;IAC9C,UAAU,EAAE,UAAU,CAAA;IACtB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;IAClD,aAAa,EAAE,MAAM,CACnB,MAAM,EACN,gBAAgB,GAAG,mBAAmB,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,CACzF,CAAA;CACF,CAAA;AAED,MAAM,MAAM,QAAQ,GAAG;IACrB,IAAI,EAAE,MAAM,CAAA;IACZ,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,EAAE,CAAC,CAAA;IACzC,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,CAAC,CAAA;IACxC,WAAW,CAAC,EAAE,CAAC,UAAU,GAAG,SAAS,CAAC,EAAE,CAAA;IACxC,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,2BAA2B,CAAC,MAAM,SAAS,UAAU,IAAI;IACnE,MAAM,EAAE,MAAM,CAAA;IACd,UAAU,EAAE,UAAU,CAAA;IACtB,eAAe,EAAE,MAAM,CAAA;IACvB,eAAe,EAAE,eAAe,CAAA;CACjC,CAAA;AAED,MAAM,MAAM,qBAAqB,CAAC,CAAC,SAAS,cAAc,IAAI;IAC5D,UAAU,EAAE,UAAU,CAAA;IACtB,KAAK,EAAE,CAAC,CAAA;IACR,eAAe,EAAE,MAAM,CAAA;CACxB,CAAA;AAED,MAAM,MAAM,wBAAwB,GAAG;IACrC,WAAW,EAAE,MAAM,CAAA;IACnB,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,MAAM,CAAA;CACf,CAAA;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,YAAY,CAAA;IACvB,YAAY,EAAE,MAAM,EAAE,CAAA;CACvB,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,WAAW,EAAE,MAAM,CAAA;IACnB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,mBAAmB,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IACpF,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;IAClC,SAAS,EAAE,YAAY,CAAA;IACvB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI;IAChF,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;IAC9B,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,MAAM,MAAM,YAAY,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,IAAI,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;AAY7F,KAAK,uBAAuB,CAAC,CAAC,IAAI;IAChC,SAAS,EAAE,YAAY,CAAA;IACvB,UAAU,EAAE,mBAAmB,CAAC,CAAC,CAAC,CAAA;CACnC,CAAA;AAED,KAAK,sBAAsB,CAAC,CAAC,IAAI;IAC/B,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,EAAE,eAAe,CAAC,CAAC,CAAC,CAAA;CAC/B,CAAA;AAOD,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;CACzB,CAAA;AAED,qBAAa,eAAe;;IAE1B,WAAW,EAAE,WAAW,CAAA;IACxB,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;IACpC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAClB,QAAQ,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,IAAI,CAAA;IAC9C,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;IAClD,aAAa,EAAE,MAAM,CACnB,MAAM,EACN,gBAAgB,GAAG,mBAAmB,CAAC,cAAc,CAAC,GAAG,eAAe,CAAC,cAAc,CAAC,CACzF,CAAA;gBAIW,EACV,WAAW,EACX,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,oBAAoB,EACpB,UAAU,EACV,aAAa,EACd,EAAE,eAAe;IAWlB;;OAEG;IACH,QAAQ,IAAI,cAAc;IA0I1B,KAAK,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,MAAM,CAAC,GAAG,CAAC;IAoBlD;;;;;;;;;;;;;;OAcG;IACH,2BAA2B,CAAC,MAAM,SAAS,UAAU,EAAE,EACrD,MAAM,EACN,UAAU,EACV,eAAe,EACf,eAAe,EAChB,EAAE,2BAA2B,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;IA0BrF;;;;OAIG;IACH,iBAAiB,CAAC,CAAC,SAAS,cAAc,EAAE,EAC1C,UAAU,EACV,KAAK,EACL,eAAe,EAChB,EAAE,qBAAqB,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC;IA6B3C;;;;;;;;;;OAUG;IACH,QAAQ,CAAC,EAAE,OAAY,EAAE,WAAW,EAAE,eAAe,EAAE,SAAS,EAAE,EAAE,YAAY;IAiDhF;;;;;;;;;;;;;OAaG;IACH,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,EAClE,UAAU,EACV,SAAS,EACT,UAAU,EACV,eAAe,EAChB,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IAY7C;;;;;;;;;;;;;OAaG;IAEH,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,EAC9D,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EAChB,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC;IAYzC;;;;;;;;;OASG;IACH,0BAA0B,CAAC,CAAC,EAAE,EAC5B,SAAS,EACT,UAAU,EACX,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,eAAe;IAoB/C;;;;;;;;OAQG;IACH,sBAAsB,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,sBAAsB,CAAC,CAAC,CAAC,GAAG,eAAe;IAmC9F;;;;;;;OAOG;IACH,uBAAuB,CAAC,OAAO,EAAE,gBAAgB,GAAG,eAAe;IAkFnE;;;;;OAKG;IACH,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC;IAUpE;;;;;;OAMG;IACH,cAAc,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAGvE"}
package/script/context/GenerateContext.js CHANGED
@@ -36,7 +36,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
36
36
  var __importDefault = (this && this.__importDefault) || function (mod) {
37
37
  return (mod && mod.__esModule) ? mod : { "default": mod };
38
38
  };
39
- var _GenerateContext_instances, _GenerateContext_files, _GenerateContext_moduleImportMap, _GenerateContext_stackTrail, _GenerateContext_runOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_getFile, _GenerateContext_setExportPath, _GenerateContext_toOperationBaseSettings, _GenerateContext_toModelBaseSettings, _GenerateContext_toGeneratorSettings, _GenerateContext_toGatewayBaseSettings, _GenerateContext_cleanBaseSettings, _GenerateContext_addFile;
39
+ var _GenerateContext_instances, _GenerateContext_files, _GenerateContext_stackTrail, _GenerateContext_runOperationGenerator, _GenerateContext_runModelGenerator, _GenerateContext_getFile, _GenerateContext_setExportPath, _GenerateContext_toOperationBaseSettings, _GenerateContext_toModelBaseSettings, _GenerateContext_toGeneratorSettings, _GenerateContext_toGatewayBaseSettings, _GenerateContext_cleanBaseSettings, _GenerateContext_addFile;
40
40
  Object.defineProperty(exports, "__esModule", { value: true });
41
41
  exports.GenerateContext = void 0;
42
42
  const mod_js_1 = require("../deps/jsr.io/@std/path/1.0.6/mod.js");
@@ -90,11 +90,9 @@ class GenerateContext {
90
90
  writable: true,
91
91
  value: void 0
92
92
  });
93
- _GenerateContext_moduleImportMap.set(this, void 0);
94
93
  _GenerateContext_stackTrail.set(this, void 0);
95
94
  this.logger = logger;
96
95
  __classPrivateFieldSet(this, _GenerateContext_files, new Map(), "f");
97
- __classPrivateFieldSet(this, _GenerateContext_moduleImportMap, new Map(), "f");
98
96
  this.oasDocument = oasDocument;
99
97
  this.settings = settings;
100
98
  this.callback = callback;
@@ -107,13 +105,6 @@ class GenerateContext {
107
105
  */
108
106
  generate() {
109
107
  const generators = Object.values(this.generatorsMap);
110
- generators.forEach(generator => {
111
- const generatorSettings = __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toGeneratorSettings).call(this, generator.id);
112
- const { moduleName, exportPath } = generatorSettings?.baseSettings ?? {};
113
- if (exportPath && moduleName && !__classPrivateFieldGet(this, _GenerateContext_moduleImportMap, "f").has(exportPath)) {
114
- __classPrivateFieldGet(this, _GenerateContext_moduleImportMap, "f").set(exportPath, moduleName);
115
- }
116
- });
117
108
  Sentry.startSpan({ name: 'Generate operations' }, () => generators
118
109
  .filter(generator => generator.type === 'operation')
119
110
  .forEach(generator => {
@@ -131,8 +122,7 @@ class GenerateContext {
131
122
  });
132
123
  });
133
124
  return {
134
- files: __classPrivateFieldGet(this, _GenerateContext_files, "f"),
135
- moduleImportMap: __classPrivateFieldGet(this, _GenerateContext_moduleImportMap, "f")
125
+ files: __classPrivateFieldGet(this, _GenerateContext_files, "f")
136
126
  };
137
127
  }
138
128
  trace(token, fn) {
@@ -394,7 +384,7 @@ class GenerateContext {
394
384
  }
395
385
  }
396
386
  exports.GenerateContext = GenerateContext;
397
- _GenerateContext_files = new WeakMap(), _GenerateContext_moduleImportMap = new WeakMap(), _GenerateContext_stackTrail = new WeakMap(), _GenerateContext_instances = new WeakSet(), _GenerateContext_runOperationGenerator = function _GenerateContext_runOperationGenerator({ oasDocument, generator }) {
387
+ _GenerateContext_files = new WeakMap(), _GenerateContext_stackTrail = new WeakMap(), _GenerateContext_instances = new WeakSet(), _GenerateContext_runOperationGenerator = function _GenerateContext_runOperationGenerator({ oasDocument, generator }) {
398
388
  if (generator._class === 'OperationGateway') {
399
389
  const gatewaySettings = this.toGatewayContentSetting(generator);
400
390
  const gatewayInstance = new generator({
@@ -505,22 +495,20 @@ _GenerateContext_files = new WeakMap(), _GenerateContext_moduleImportMap = new W
505
495
  const operationSettings = generatorSettings && 'operations' in generatorSettings
506
496
  ? generatorSettings.operations[path]?.[method]
507
497
  : undefined;
508
- const { exportPath, moduleName } = generatorSettings?.baseSettings ?? {};
498
+ const { exportPath } = generatorSettings?.baseSettings ?? {};
509
499
  return __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_cleanBaseSettings).call(this, {
510
500
  ...operationSettings,
511
- parentExportPath: exportPath,
512
- moduleName
501
+ parentExportPath: exportPath
513
502
  });
514
503
  }, _GenerateContext_toModelBaseSettings = function _GenerateContext_toModelBaseSettings({ generatorId, refName }) {
515
504
  const generatorSettings = __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_toGeneratorSettings).call(this, generatorId);
516
505
  const modelSettings = generatorSettings && 'models' in generatorSettings
517
506
  ? generatorSettings.models[refName]
518
507
  : undefined;
519
- const { exportPath, moduleName } = generatorSettings?.baseSettings ?? {};
508
+ const { exportPath } = generatorSettings?.baseSettings ?? {};
520
509
  return __classPrivateFieldGet(this, _GenerateContext_instances, "m", _GenerateContext_cleanBaseSettings).call(this, {
521
510
  ...modelSettings,
522
- parentExportPath: exportPath,
523
- moduleName
511
+ parentExportPath: exportPath
524
512
  });
525
513
  }, _GenerateContext_toGeneratorSettings = function _GenerateContext_toGeneratorSettings(generatorId) {
526
514
  return this.settings?.generators?.find(({ id }) => id === generatorId);
@@ -533,14 +521,13 @@ _GenerateContext_files = new WeakMap(), _GenerateContext_moduleImportMap = new W
533
521
  selected: Boolean(baseSettings?.selected),
534
522
  name: baseSettings?.name,
535
523
  importFrom: baseSettings?.importFrom,
536
- parentExportPath: baseSettings?.parentExportPath,
537
- moduleName: baseSettings?.moduleName
524
+ parentExportPath: baseSettings?.parentExportPath
538
525
  };
539
526
  }, _GenerateContext_addFile = function _GenerateContext_addFile(normalisedPath) {
540
527
  if (__classPrivateFieldGet(this, _GenerateContext_files, "f").has(normalisedPath)) {
541
528
  throw new Error(`File already exists: ${normalisedPath}`);
542
529
  }
543
- const newFile = new File_js_1.File(normalisedPath, this.settings);
530
+ const newFile = new File_js_1.File({ path: normalisedPath, settings: this.settings });
544
531
  __classPrivateFieldGet(this, _GenerateContext_files, "f").set(normalisedPath, newFile);
545
532
  return newFile;
546
533
  };
package/script/context/RenderContext.d.ts CHANGED
@@ -8,7 +8,6 @@ import type * as log from '../deps/jsr.io/@std/log/0.224.8/mod.js';
8
8
  import type { File } from '../dsl/File.js';
9
9
  type ConstructorArgs = {
10
10
  files: Map<string, File>;
11
- moduleImportMap: Map<string, string>;
12
11
  prettier?: PrettierConfigType;
13
12
  basePath: string | undefined;
14
13
  pinnableGenerators: string[];
@@ -25,8 +24,7 @@ export declare class RenderContext {
25
24
  pinnableGenerators: string[];
26
25
  logger: log.Logger;
27
26
  captureCurrentResult: (result: ResultType) => void;
28
- moduleImportMap: Map<string, string>;
29
- constructor({ files, prettier, basePath, pinnableGenerators, logger, stackTrail, captureCurrentResult, moduleImportMap }: ConstructorArgs);
27
+ constructor({ files, prettier, basePath, pinnableGenerators, logger, stackTrail, captureCurrentResult }: ConstructorArgs);
30
28
  render(): Omit<RenderResult, 'results'>;
31
29
  private collate;
32
30
  trace<T>(token: string | string[], fn: () => T): T;
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,EAAE,mBAAmB,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAGpD,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;AAE1C,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IACpC,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,kBAAkB,EAAE,MAAM,EAAE,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;AAYD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,OAAO,CAAC,QAAQ,CAAC,CAAoB;IACrC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,sBAAsB,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAAA;IAC7D,kBAAkB,EAAE,MAAM,EAAE,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;IAClD,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;gBACxB,EACV,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,MAAM,EACN,UAAU,EACV,oBAAoB,EACpB,eAAe,EAChB,EAAE,eAAe;IAYlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAuBvC,OAAO,CAAC,OAAO;IAsDf,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,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,mBAAmB;IAarD,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,mBAAmB,EAAqB,YAAY,EAAE,MAAM,YAAY,CAAA;AAEtF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAGpD,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;AAE1C,KAAK,eAAe,GAAG;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,QAAQ,CAAC,EAAE,kBAAkB,CAAA;IAC7B,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,kBAAkB,EAAE,MAAM,EAAE,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;AAYD,qBAAa,aAAa;;IACxB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;IACxB,OAAO,CAAC,QAAQ,CAAC,CAAoB;IACrC,QAAQ,EAAE,MAAM,GAAG,SAAS,CAAA;IAC5B,sBAAsB,EAAE,MAAM,GAAG,YAAY,GAAG,aAAa,CAAA;IAC7D,kBAAkB,EAAE,MAAM,EAAE,CAAA;IAC5B,MAAM,EAAE,GAAG,CAAC,MAAM,CAAA;IAElB,oBAAoB,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAA;gBACtC,EACV,KAAK,EACL,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAClB,MAAM,EACN,UAAU,EACV,oBAAoB,EACrB,EAAE,eAAe;IAWlB,MAAM,IAAI,IAAI,CAAC,YAAY,EAAE,SAAS,CAAC;IAuBvC,OAAO,CAAC,OAAO;IAoDf,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,eAAe,CAAC,EAAE,YAAY,EAAE,EAAE,mBAAmB;IAarD,IAAI,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,QAAQ,GAAG,UAAU,GAAG,SAAS;CAG7D"}
package/script/context/RenderContext.js CHANGED
@@ -45,7 +45,7 @@ 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
47
  class RenderContext {
48
- constructor({ files, prettier, basePath, pinnableGenerators, logger, stackTrail, captureCurrentResult, moduleImportMap }) {
48
+ constructor({ files, prettier, basePath, pinnableGenerators, logger, stackTrail, captureCurrentResult }) {
49
49
  Object.defineProperty(this, "files", {
50
50
  enumerable: true,
51
51
  configurable: true,
@@ -89,12 +89,6 @@ class RenderContext {
89
89
  writable: true,
90
90
  value: void 0
91
91
  });
92
- Object.defineProperty(this, "moduleImportMap", {
93
- enumerable: true,
94
- configurable: true,
95
- writable: true,
96
- value: void 0
97
- });
98
92
  this.currentDestinationPath = 'PRE_RENDER';
99
93
  this.files = files;
100
94
  this.prettier = prettier;
@@ -103,7 +97,6 @@ class RenderContext {
103
97
  this.logger = logger;
104
98
  __classPrivateFieldSet(this, _RenderContext_stackTrail, stackTrail, "f");
105
99
  this.captureCurrentResult = captureCurrentResult;
106
- this.moduleImportMap = moduleImportMap;
107
100
  }
108
101
  render() {
109
102
  return Sentry.startSpan({ name: 'Render artifacts' }, () => {
@@ -134,7 +127,6 @@ class RenderContext {
134
127
  // to Correct file
135
128
  // @TODO: Could this be combined with the tracer call above?
136
129
  this.currentDestinationPath = destinationPath;
137
- file.moduleImportMap = this.moduleImportMap;
138
130
  const renderedFile = renderFile({
139
131
  content: file.toString(),
140
132
  generatorKeys: Array.from(file.generatorKeys).filter(Boolean),
package/script/dsl/File.d.ts CHANGED
@@ -1,16 +1,26 @@
1
1
  import type { Definition } from './Definition.js';
2
2
  import type { GeneratorKey } from '../types/GeneratorKeys.js';
3
- import type { ClientSettings } from '../types/Settings.js';
3
+ import type { ClientSettings, ModulePackage } from '../types/Settings.js';
4
+ type FileArgs = {
5
+ path: string;
6
+ settings: ClientSettings | undefined;
7
+ };
4
8
  export declare class File {
5
9
  #private;
6
10
  path: string;
7
11
  reExports: Map<string, Record<string, Set<string>>>;
8
12
  imports: Map<string, Set<string>>;
9
13
  definitions: Map<string, Definition>;
10
- moduleImportMap: Map<string, string>;
11
- settings: ClientSettings | undefined;
12
- constructor(path: string, settings: ClientSettings | undefined);
14
+ packages: ModulePackage[] | undefined;
15
+ constructor({ path, settings }: FileArgs);
13
16
  get generatorKeys(): Set<GeneratorKey>;
14
17
  toString(): string;
15
18
  }
19
+ export type NormaliseModuleNameArgs = {
20
+ destinationPath: string;
21
+ exportPath: string;
22
+ packages: ModulePackage[] | undefined;
23
+ };
24
+ export declare const normaliseModuleName: ({ destinationPath, exportPath, packages }: NormaliseModuleNameArgs) => string;
25
+ export {};
16
26
  //# sourceMappingURL=File.d.ts.map
package/script/dsl/File.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"File.d.ts","sourceRoot":"","sources":["../../src/dsl/File.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AAE1D,qBAAa,IAAI;;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACnD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IACjC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IACpC,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAEpC,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;gBAExB,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,cAAc,GAAG,SAAS;IAU9D,IAAI,aAAa,sBAEhB;IAED,QAAQ;CAkCT"}
1
+ {"version":3,"file":"File.d.ts","sourceRoot":"","sources":["../../src/dsl/File.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAA;AACjD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAA;AAC7D,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAA;AAEzE,KAAK,QAAQ,GAAG;IACd,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,cAAc,GAAG,SAAS,CAAA;CACrC,CAAA;AAED,qBAAa,IAAI;;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;IACnD,OAAO,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAA;IACjC,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;IAEpC,QAAQ,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;gBAEzB,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,QAAQ;IASxC,IAAI,aAAa,sBAEhB;IAED,QAAQ;CAkCT;AAED,MAAM,MAAM,uBAAuB,GAAG;IACpC,eAAe,EAAE,MAAM,CAAA;IACvB,UAAU,EAAE,MAAM,CAAA;IAClB,QAAQ,EAAE,aAAa,EAAE,GAAG,SAAS,CAAA;CACtC,CAAA;AAED,eAAO,MAAM,mBAAmB,8CAI7B,uBAAuB,WAYzB,CAAA"}
package/script/dsl/File.js CHANGED
@@ -12,10 +12,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
12
12
  };
13
13
  var _File_generatorKeys;
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.File = void 0;
15
+ exports.normaliseModuleName = exports.File = void 0;
16
16
  const Import_js_1 = require("./Import.js");
17
17
  class File {
18
- constructor(path, settings) {
18
+ constructor({ path, settings }) {
19
19
  Object.defineProperty(this, "path", {
20
20
  enumerable: true,
21
21
  configurable: true,
@@ -40,14 +40,8 @@ class File {
40
40
  writable: true,
41
41
  value: void 0
42
42
  });
43
- Object.defineProperty(this, "moduleImportMap", {
44
- enumerable: true,
45
- configurable: true,
46
- writable: true,
47
- value: void 0
48
- });
49
43
  _File_generatorKeys.set(this, void 0);
50
- Object.defineProperty(this, "settings", {
44
+ Object.defineProperty(this, "packages", {
51
45
  enumerable: true,
52
46
  configurable: true,
53
47
  writable: true,
@@ -58,19 +52,17 @@ class File {
58
52
  this.imports = new Map();
59
53
  this.definitions = new Map();
60
54
  __classPrivateFieldSet(this, _File_generatorKeys, new Set(), "f");
61
- this.moduleImportMap = new Map();
62
- this.settings = settings;
55
+ this.packages = settings?.packages;
63
56
  }
64
57
  get generatorKeys() {
65
58
  return __classPrivateFieldGet(this, _File_generatorKeys, "f");
66
59
  }
67
60
  toString() {
68
61
  const reExports = Array.from(this.reExports.entries()).flatMap(([module, entityTypes]) => {
69
- const updatedModuleName = updateModuleName({
62
+ const updatedModuleName = (0, exports.normaliseModuleName)({
70
63
  destinationPath: this.path,
71
- moduleImportMap: this.moduleImportMap,
72
64
  exportPath: module,
73
- settings: this.settings
65
+ packages: this.packages
74
66
  });
75
67
  return Object.entries(entityTypes).map(([entityType, names]) => {
76
68
  const prefix = entityType === 'type' ? 'type' : '';
@@ -78,12 +70,13 @@ class File {
78
70
  });
79
71
  });
80
72
  const imports = Array.from(this.imports.entries()).map(([module, importItems]) => {
81
- const updatedModuleName = updateModuleName({
82
- destinationPath: this.path,
83
- moduleImportMap: this.moduleImportMap,
84
- exportPath: module,
85
- settings: this.settings
86
- });
73
+ const updatedModuleName = this.packages
74
+ ? (0, exports.normaliseModuleName)({
75
+ destinationPath: this.path,
76
+ exportPath: module,
77
+ packages: this.packages
78
+ })
79
+ : module;
87
80
  return new Import_js_1.Import({ module: updatedModuleName, importNames: Array.from(importItems) });
88
81
  });
89
82
  const definitions = Array.from(this.definitions.values());
@@ -95,15 +88,14 @@ class File {
95
88
  }
96
89
  exports.File = File;
97
90
  _File_generatorKeys = new WeakMap();
98
- const updateModuleName = ({ destinationPath, moduleImportMap, exportPath, settings }) => {
99
- const matchedModuleImport = [...moduleImportMap.entries()].find(([key]) => exportPath.startsWith(key));
100
- // If exportPath does not match any module imports, return the original exportPath
101
- if (!matchedModuleImport) {
91
+ const normaliseModuleName = ({ destinationPath, exportPath, packages = [] }) => {
92
+ const matchingModule = packages.find(packageModule => {
93
+ return exportPath.startsWith(packageModule.rootPath);
94
+ });
95
+ if (!matchingModule) {
102
96
  return exportPath;
103
97
  }
104
- const [matchedPath, moduleName] = matchedModuleImport;
105
- const matchedRoot = settings?.appRoots?.find(root => matchedPath.startsWith(root)) ?? matchedPath;
106
- // If module import is imported from inside module, turn into a local absolute path starting with '@/'
107
- // Otherwise, if module import is imported from outside module, use module name
108
- return destinationPath.startsWith(matchedPath) ? exportPath.replace(matchedRoot, '@') : moduleName;
98
+ const { rootPath, moduleName } = matchingModule;
99
+ return destinationPath.startsWith(rootPath) ? exportPath.replace(rootPath, '@') : moduleName;
109
100
  };
101
+ exports.normaliseModuleName = normaliseModuleName;
package/script/dsl/File.test.d.ts.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"File.test.d.ts","sourceRoot":"","sources":["../../src/dsl/File.test.ts"],"names":[],"mappings":""}
package/script/types/Settings.d.ts CHANGED
@@ -3,7 +3,6 @@ import { type Method } from './Method.js';
3
3
  import { z } from 'zod';
4
4
  export declare const baseSettings: z.ZodType<BaseSettings>;
5
5
  export type BaseSettings = {
6
- moduleName?: string;
7
6
  parentExportPath?: string;
8
7
  exportPath?: string;
9
8
  selected: boolean;
@@ -94,9 +93,32 @@ export declare const clientGeneratorSettings: z.ZodUnion<[z.ZodObject<{
94
93
  exportPath?: string | undefined;
95
94
  }>]>;
96
95
  export type ClientGeneratorSettings = OperationsGeneratorSettings | ModelsGeneratorSettings;
96
+ export declare const modulePackage: z.ZodObject<{
97
+ rootPath: z.ZodString;
98
+ moduleName: z.ZodString;
99
+ }, "strip", z.ZodTypeAny, {
100
+ rootPath: string;
101
+ moduleName: string;
102
+ }, {
103
+ rootPath: string;
104
+ moduleName: string;
105
+ }>;
106
+ export type ModulePackage = {
107
+ rootPath: string;
108
+ moduleName: string;
109
+ };
97
110
  export declare const clientSettings: z.ZodObject<{
98
111
  basePath: z.ZodOptional<z.ZodString>;
99
- appRoots: z.ZodOptional<z.ZodArray<z.ZodString, "many">>;
112
+ packages: z.ZodOptional<z.ZodArray<z.ZodObject<{
113
+ rootPath: z.ZodString;
114
+ moduleName: z.ZodString;
115
+ }, "strip", z.ZodTypeAny, {
116
+ rootPath: string;
117
+ moduleName: string;
118
+ }, {
119
+ rootPath: string;
120
+ moduleName: string;
121
+ }>, "many">>;
100
122
  generators: z.ZodArray<z.ZodUnion<[z.ZodObject<{
101
123
  id: z.ZodString;
102
124
  description: z.ZodOptional<z.ZodString>;
@@ -145,7 +167,10 @@ export declare const clientSettings: z.ZodObject<{
145
167
  exportPath?: string | undefined;
146
168
  })[];
147
169
  basePath?: string | undefined;
148
- appRoots?: string[] | undefined;
170
+ packages?: {
171
+ rootPath: string;
172
+ moduleName: string;
173
+ }[] | undefined;
149
174
  }, {
150
175
  generators: ({
151
176
  id: string;
@@ -160,11 +185,14 @@ export declare const clientSettings: z.ZodObject<{
160
185
  exportPath?: string | undefined;
161
186
  })[];
162
187
  basePath?: string | undefined;
163
- appRoots?: string[] | undefined;
188
+ packages?: {
189
+ rootPath: string;
190
+ moduleName: string;
191
+ }[] | undefined;
164
192
  }>;
165
193
  export type ClientSettings = {
166
194
  basePath?: string;
167
- appRoots?: string[];
195
+ packages?: ModulePackage[];
168
196
  generators: ClientGeneratorSettings[];
169
197
  };
170
198
  export type SkmtcClientConfig = {
package/script/types/Settings.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Settings.d.ts","sourceRoot":"","sources":["../../src/types/Settings.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,MAAM,EAAU,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAO/C,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,CAAA;AAEnF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;EAKtC,CAAA;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;IACjE,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;EAMlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACpC,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG,2BAA2B,GAAG,uBAAuB,CAAA;AAE3F,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIzB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAA;IACnB,UAAU,EAAE,uBAAuB,EAAE,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAKzD,CAAA;AAEF,eAAO,MAAM,aAAa,mCAAiC,CAAA;AAE3D,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,OAAO,CAAA;AAEjD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;EAI3B,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA"}
1
+ {"version":3,"file":"Settings.d.ts","sourceRoot":"","sources":["../../src/types/Settings.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,MAAM,EAAU,MAAM,aAAa,CAAA;AACjD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAEvB,eAAO,MAAM,YAAY,EAAE,CAAC,CAAC,OAAO,CAAC,YAAY,CAM/C,CAAA;AAEF,MAAM,MAAM,YAAY,GAAG;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,OAAO,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,UAAU,CAAC,EAAE,MAAM,CAAA;CACpB,CAAA;AAED,MAAM,MAAM,mBAAmB,GAAG,UAAU,GAAG,MAAM,GAAG,YAAY,GAAG,YAAY,CAAA;AAEnF,eAAO,MAAM,2BAA2B;;;;;;;;;;;;;;;EAKtC,CAAA;AAEF,MAAM,MAAM,2BAA2B,GAAG;IACxC,EAAE,EAAE,MAAM,CAAA;IACV,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,CAAA;IACjE,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;EAMlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,YAAY,CAAC,CAAA;IACpC,YAAY,EAAE,YAAY,CAAA;CAC3B,CAAA;AAED,eAAO,MAAM,uBAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlC,CAAA;AAEF,MAAM,MAAM,uBAAuB,GAAG,2BAA2B,GAAG,uBAAuB,CAAA;AAE3F,eAAO,MAAM,aAAa;;;;;;;;;EAGxB,CAAA;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB,CAAA;AAED,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIzB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,QAAQ,CAAC,EAAE,aAAa,EAAE,CAAA;IAC1B,UAAU,EAAE,uBAAuB,EAAE,CAAA;CACtC,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,EAAE,cAAc,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,iBAAiB,EAAE,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAKzD,CAAA;AAEF,eAAO,MAAM,aAAa,mCAAiC,CAAA;AAE3D,MAAM,MAAM,aAAa,GAAG,WAAW,GAAG,OAAO,CAAA;AAEjD,eAAO,MAAM,gBAAgB;;;;;;;;;;;;EAI3B,CAAA;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,EAAE,CAAA;CACrB,CAAA"}
package/script/types/Settings.js CHANGED
@@ -1,6 +1,6 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
- exports.skmtcStackConfig = exports.generatorType = exports.skmtcClientConfig = exports.clientSettings = exports.clientGeneratorSettings = exports.modelsGeneratorSettings = exports.operationsGeneratorSettings = exports.baseSettings = void 0;
3
+ exports.skmtcStackConfig = exports.generatorType = exports.skmtcClientConfig = exports.clientSettings = exports.modulePackage = exports.clientGeneratorSettings = exports.modelsGeneratorSettings = exports.operationsGeneratorSettings = exports.baseSettings = void 0;
4
4
  require("../_dnt.polyfills.js");
5
5
  const Method_js_1 = require("./Method.js");
6
6
  const zod_1 = require("zod");
@@ -9,8 +9,7 @@ exports.baseSettings = zod_1.z.object({
9
9
  name: zod_1.z.string().optional(),
10
10
  importFrom: zod_1.z.string().optional(),
11
11
  exportPath: zod_1.z.string().optional(),
12
- parentExportPath: zod_1.z.string().optional(),
13
- moduleName: zod_1.z.string().optional()
12
+ parentExportPath: zod_1.z.string().optional()
14
13
  });
15
14
  exports.operationsGeneratorSettings = zod_1.z.object({
16
15
  id: zod_1.z.string(),
@@ -29,9 +28,13 @@ exports.clientGeneratorSettings = zod_1.z.union([
29
28
  exports.operationsGeneratorSettings,
30
29
  exports.modelsGeneratorSettings
31
30
  ]);
31
+ exports.modulePackage = zod_1.z.object({
32
+ rootPath: zod_1.z.string(),
33
+ moduleName: zod_1.z.string()
34
+ });
32
35
  exports.clientSettings = zod_1.z.object({
33
36
  basePath: zod_1.z.string().optional(),
34
- appRoots: zod_1.z.array(zod_1.z.string()).optional(),
37
+ packages: zod_1.z.array(exports.modulePackage).optional(),
35
38
  generators: zod_1.z.array(exports.clientGeneratorSettings)
36
39
  });
37
40
  exports.skmtcClientConfig = zod_1.z.object({