@openapi-qraft/plugin 2.6.3 → 2.7.0

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.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,9 @@
1
1
  # @openapi-qraft/plugin
2
2
 
3
+ ## 2.7.0
4
+
5
+ ## 2.6.4
6
+
3
7
  ## 2.6.3
4
8
 
5
9
  ## 2.6.2
@@ -1 +1 @@
1
- {"version":3,"file":"RedoclyConfigCommand.d.ts","sourceRoot":"","sources":["../../src/lib/RedoclyConfigCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,GAAG,EAAE,MAAM,UAAU,CAAC;AAG7D,OAAO,EAAE,OAAO,EAAkB,MAAM,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAO1E,eAAO,MAAM,aAAa,QAqBtB,CAAC;AACL;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,OAAO;IAC/C,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAM;gBAEhC,IAAI,CAAC,EAAE,MAAM;IAkFnB,WAAW,CAAC,CAAC,EACjB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EACzB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC;WAWd,sBAAsB,CAAC,CAAC,EACnC,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;CAoE5B;AAED,KAAK,UAAU,CAAC,CAAC,IAAI,CACnB,WAAW,EAAE,MAAM,EAAE,EACrB,uBAAuB,CAAC,EAAE,YAAY,KACnC,CAAC,CAAC;AAEP,KAAK,gBAAgB,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC7B,CAAC"}
1
+ {"version":3,"file":"RedoclyConfigCommand.d.ts","sourceRoot":"","sources":["../../src/lib/RedoclyConfigCommand.ts"],"names":[],"mappings":"AACA,OAAO,EAAgC,GAAG,EAAE,MAAM,UAAU,CAAC;AAG7D,OAAO,EAAE,OAAO,EAAkB,MAAM,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAO1E,eAAO,MAAM,aAAa,QAqBtB,CAAC;AACL;;GAEG;AACH,qBAAa,oBAAqB,SAAQ,OAAO;IAC/C,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,UAAU,EAAE,gBAAgB,CAAM;gBAEhC,IAAI,CAAC,EAAE,MAAM;IA6FnB,WAAW,CAAC,CAAC,EACjB,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC,EACzB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,CAAC,EAAE,YAAY,GACrB,OAAO,CAAC,CAAC,EAAE,GAAG,SAAS,CAAC;WAWd,sBAAsB,CAAC,CAAC,EACnC,WAAW,EAAE,gBAAgB,EAC7B,UAAU,EAAE,UAAU,CAAC,CAAC,CAAC;CAoE5B;AAED,KAAK,UAAU,CAAC,CAAC,IAAI,CACnB,WAAW,EAAE,MAAM,EAAE,EACrB,uBAAuB,CAAC,EAAE,YAAY,KACnC,CAAC,CAAC;AAEP,KAAK,gBAAgB,GAAG;IACtB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC7B,CAAC"}
@@ -63,14 +63,20 @@ export class RedoclyConfigCommand extends Command {
63
63
  }
64
64
  }
65
65
  redocAPIsToQraftEntries.forEach(([apiName, api]) => {
66
- const { ['x-openapi-qraft']: { ['output-dir']: outputDir, ...qraftConfig }, } = api;
66
+ const globalQraftConfig = 'x-openapi-qraft' in redoc.rawConfig
67
+ ? redoc.rawConfig['x-openapi-qraft']
68
+ : undefined;
69
+ const { ['x-openapi-qraft']: { ['output-dir']: outputDir, ...apiQraftConfig }, } = api;
67
70
  const cwd = fileURLToPath(this.cwd);
68
71
  this.parsedAPIs[apiName] = [
69
72
  apiName,
70
73
  ...parseConfigToArgs({
71
74
  redocly: relative(cwd, redocConfigFile),
72
75
  'output-dir': relative(cwd, outputDir),
73
- ...qraftConfig,
76
+ ...(globalQraftConfig && typeof globalQraftConfig === 'object'
77
+ ? globalQraftConfig
78
+ : undefined),
79
+ ...apiQraftConfig,
74
80
  }),
75
81
  ];
76
82
  });
@@ -90,7 +96,7 @@ export class RedoclyConfigCommand extends Command {
90
96
  const { errors, results } = await Promise.allSettled(redoclyAPIsEntries.map(async ([apiName, [openAPIDocument, ...apiProcessArgv]]) => {
91
97
  spinner.info(`Generating API client for ${c.magenta(apiName)} with the following parameters:\n` +
92
98
  c.gray.italic('bin ') +
93
- `${c.green.italic(openAPIDocument)}` +
99
+ `${c.green.italic(openAPIDocument)} ` +
94
100
  apiProcessArgv
95
101
  .map((arg) => arg.startsWith('--')
96
102
  ? c.yellow.italic(arg)
@@ -1 +1 @@
1
- {"version":3,"file":"RedoclyConfigCommand.js","sourceRoot":"","sources":["../../src/lib/RedoclyConfigCommand.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"RedoclyConfigCommand.js","sourceRoot":"","sources":["../../src/lib/RedoclyConfigCommand.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,2 @@
1
- export declare const packageVersion = "2.6.3";
1
+ export declare const packageVersion = "2.7.0";
2
2
  //# sourceMappingURL=packageVersion.d.ts.map
@@ -1,3 +1,3 @@
1
1
  // This file was generated automatically
2
- export const packageVersion = '2.6.3';
2
+ export const packageVersion = '2.7.0';
3
3
  //# sourceMappingURL=packageVersion.js.map
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openapi-qraft/plugin",
3
- "version": "2.6.3",
3
+ "version": "2.7.0",
4
4
  "packageManager": "yarn@4.0.2",
5
5
  "type": "module",
6
6
  "scripts": {
@@ -104,8 +104,16 @@ export class RedoclyConfigCommand extends Command {
104
104
  }
105
105
 
106
106
  redocAPIsToQraftEntries.forEach(([apiName, api]) => {
107
+ const globalQraftConfig =
108
+ 'x-openapi-qraft' in redoc.rawConfig
109
+ ? redoc.rawConfig['x-openapi-qraft']
110
+ : undefined;
111
+
107
112
  const {
108
- ['x-openapi-qraft']: { ['output-dir']: outputDir, ...qraftConfig },
113
+ ['x-openapi-qraft']: {
114
+ ['output-dir']: outputDir,
115
+ ...apiQraftConfig
116
+ },
109
117
  } = api;
110
118
 
111
119
  const cwd = fileURLToPath(this.cwd);
@@ -115,7 +123,10 @@ export class RedoclyConfigCommand extends Command {
115
123
  ...parseConfigToArgs({
116
124
  redocly: relative(cwd, redocConfigFile),
117
125
  'output-dir': relative(cwd, outputDir),
118
- ...qraftConfig,
126
+ ...(globalQraftConfig && typeof globalQraftConfig === 'object'
127
+ ? globalQraftConfig
128
+ : undefined),
129
+ ...apiQraftConfig,
119
130
  }),
120
131
  ];
121
132
  });
@@ -155,7 +166,7 @@ export class RedoclyConfigCommand extends Command {
155
166
  spinner.info(
156
167
  `Generating API client for ${c.magenta(apiName)} with the following parameters:\n` +
157
168
  c.gray.italic('bin ') +
158
- `${c.green.italic(openAPIDocument)}` +
169
+ `${c.green.italic(openAPIDocument)} ` +
159
170
  apiProcessArgv
160
171
  .map((arg) =>
161
172
  arg.startsWith('--')
@@ -1,2 +1,2 @@
1
1
  // This file was generated automatically
2
- export const packageVersion = '2.6.3';
2
+ export const packageVersion = '2.7.0';