@skmtc/core 0.0.632 → 0.0.634

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 (9) hide show
  1. package/esm/context/GenerateContext.js +1 -1
  2. package/esm/context/RenderContext.js +1 -4
  3. package/esm/dsl/model/ModelDriver.d.ts.map +1 -1
  4. package/esm/dsl/model/ModelDriver.js +2 -1
  5. package/package.json +1 -1
  6. package/script/context/GenerateContext.js +1 -1
  7. package/script/context/RenderContext.js +1 -4
  8. package/script/dsl/model/ModelDriver.d.ts.map +1 -1
  9. package/script/dsl/model/ModelDriver.js +2 -1
package/esm/context/GenerateContext.js CHANGED
@@ -422,7 +422,7 @@ export class GenerateContext {
422
422
  * @throws if schema is not found
423
423
  */
424
424
  resolveSchemaRefOnce(refName, generatorId) {
425
- this.modelDepth[generatorId]++;
425
+ this.modelDepth[`${generatorId}:${refName}`]++;
426
426
  const schema = this.oasDocument.components?.schemas?.[refName]?.resolveOnce();
427
427
  if (!schema) {
428
428
  throw new Error(`Schema not found: ${refName}`);
package/esm/context/RenderContext.js CHANGED
@@ -134,19 +134,16 @@ export class RenderContext {
134
134
  }
135
135
  _RenderContext_stackTrail = new WeakMap();
136
136
  const renderFile = ({ content, destinationPath, basePath, prettier }) => {
137
- const path = toResolvedArtifactPath({ basePath, destinationPath });
138
- console.log('CONTENT', content);
139
137
  const formatted = prettier
140
138
  ? synchronizedPrettier.format(content, {
141
139
  parser: 'estree',
142
- filepath: path,
143
140
  plugins: [estree, typescript],
144
141
  ...prettier
145
142
  })
146
143
  : content;
147
144
  return {
148
145
  content: formatted,
149
- path: path,
146
+ path: toResolvedArtifactPath({ basePath, destinationPath }),
150
147
  destinationPath,
151
148
  lines: formatted.split('\n').length,
152
149
  characters: formatted.length
package/esm/dsl/model/ModelDriver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGrD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,cAAc,IAAI;IACzF,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAC9C,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAWD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,cAAc;IACzF,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAC9C,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAC,cAAc,CAAC,CAAA;IACzC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;gBACJ,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EACf,OAAO,EACR,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC;IAaxC,OAAO,CAAC,KAAK;IAsBb,OAAO,CAAC,aAAa;IA0CrB,OAAO,CAAC,gBAAgB;CAqBzB"}
1
+ {"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGrD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,cAAc,IAAI;IACzF,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAC9C,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAWD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,cAAc;IACzF,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAC9C,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAC,cAAc,CAAC,CAAA;IACzC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;gBACJ,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EACf,OAAO,EACR,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC;IAexC,OAAO,CAAC,KAAK;IAsBb,OAAO,CAAC,aAAa;IA0CrB,OAAO,CAAC,gBAAgB;CAqBzB"}
package/esm/dsl/model/ModelDriver.js CHANGED
@@ -50,9 +50,10 @@ export class ModelDriver {
50
50
  this.refName = refName;
51
51
  this.destinationPath = destinationPath;
52
52
  this.rootRef = rootRef;
53
- this.context.modelDepth[insertable.id] = 0;
53
+ this.context.modelDepth[`${insertable.id}:${refName}`] = 0;
54
54
  this.settings = this.context.toModelContentSettings({ refName, insertable });
55
55
  this.definition = this.apply({ generation, destinationPath });
56
+ this.context.modelDepth[`${insertable.id}:${refName}`] = 0;
56
57
  }
57
58
  apply({ generation, destinationPath } = {}) {
58
59
  const { identifier, exportPath, selected } = this.settings;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@skmtc/core",
3
- "version": "0.0.632",
3
+ "version": "0.0.634",
4
4
  "main": "./script/mod.js",
5
5
  "module": "./esm/mod.js",
6
6
  "exports": {
package/script/context/GenerateContext.js CHANGED
@@ -451,7 +451,7 @@ class GenerateContext {
451
451
  * @throws if schema is not found
452
452
  */
453
453
  resolveSchemaRefOnce(refName, generatorId) {
454
- this.modelDepth[generatorId]++;
454
+ this.modelDepth[`${generatorId}:${refName}`]++;
455
455
  const schema = this.oasDocument.components?.schemas?.[refName]?.resolveOnce();
456
456
  if (!schema) {
457
457
  throw new Error(`Schema not found: ${refName}`);
package/script/context/RenderContext.js CHANGED
@@ -164,19 +164,16 @@ class RenderContext {
164
164
  exports.RenderContext = RenderContext;
165
165
  _RenderContext_stackTrail = new WeakMap();
166
166
  const renderFile = ({ content, destinationPath, basePath, prettier }) => {
167
- const path = (0, toResolvedArtifactPath_js_1.toResolvedArtifactPath)({ basePath, destinationPath });
168
- console.log('CONTENT', content);
169
167
  const formatted = prettier
170
168
  ? sync_1.default.format(content, {
171
169
  parser: 'estree',
172
- filepath: path,
173
170
  plugins: [estree_1.default, typescript_1.default],
174
171
  ...prettier
175
172
  })
176
173
  : content;
177
174
  return {
178
175
  content: formatted,
179
- path: path,
176
+ path: (0, toResolvedArtifactPath_js_1.toResolvedArtifactPath)({ basePath, destinationPath }),
180
177
  destinationPath,
181
178
  lines: formatted.split('\n').length,
182
179
  characters: formatted.length
package/script/dsl/model/ModelDriver.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGrD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,cAAc,IAAI;IACzF,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAC9C,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAWD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,cAAc;IACzF,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAC9C,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAC,cAAc,CAAC,CAAA;IACzC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;gBACJ,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EACf,OAAO,EACR,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC;IAaxC,OAAO,CAAC,KAAK;IAsBb,OAAO,CAAC,aAAa;IA0CrB,OAAO,CAAC,gBAAgB;CAqBzB"}
1
+ {"version":3,"file":"ModelDriver.d.ts","sourceRoot":"","sources":["../../../src/dsl/model/ModelDriver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAA;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAI5D,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACxF,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAA;AACnE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAA;AAGrD,KAAK,eAAe,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,cAAc,IAAI;IACzF,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAC9C,OAAO,EAAE,OAAO,CAAA;IAChB,UAAU,CAAC,EAAE,CAAC,CAAA;IACd,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAWD,qBAAa,WAAW,CAAC,CAAC,SAAS,cAAc,EAAE,CAAC,SAAS,cAAc,EAAE,cAAc;IACzF,OAAO,EAAE,eAAe,CAAA;IACxB,UAAU,EAAE,eAAe,CAAC,CAAC,EAAE,cAAc,CAAC,CAAA;IAC9C,OAAO,EAAE,OAAO,CAAA;IAChB,QAAQ,EAAE,eAAe,CAAC,cAAc,CAAC,CAAA;IACzC,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,UAAU,EAAE,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IACrC,OAAO,EAAE,OAAO,CAAA;gBACJ,EACV,OAAO,EACP,UAAU,EACV,OAAO,EACP,UAAU,EACV,eAAe,EACf,OAAO,EACR,EAAE,eAAe,CAAC,CAAC,EAAE,CAAC,EAAE,cAAc,CAAC;IAexC,OAAO,CAAC,KAAK;IAsBb,OAAO,CAAC,aAAa;IA0CrB,OAAO,CAAC,gBAAgB;CAqBzB"}
package/script/dsl/model/ModelDriver.js CHANGED
@@ -53,9 +53,10 @@ class ModelDriver {
53
53
  this.refName = refName;
54
54
  this.destinationPath = destinationPath;
55
55
  this.rootRef = rootRef;
56
- this.context.modelDepth[insertable.id] = 0;
56
+ this.context.modelDepth[`${insertable.id}:${refName}`] = 0;
57
57
  this.settings = this.context.toModelContentSettings({ refName, insertable });
58
58
  this.definition = this.apply({ generation, destinationPath });
59
+ this.context.modelDepth[`${insertable.id}:${refName}`] = 0;
59
60
  }
60
61
  apply({ generation, destinationPath } = {}) {
61
62
  const { identifier, exportPath, selected } = this.settings;