@opra/cli 1.19.5 → 1.19.7

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 (5) hide show
  1. package/cjs/ts-generator/generators/generate-data-type.js +8 -5
  2. package/cjs/ts-generator/generators/generate-document.js +1 -1
  3. package/esm/ts-generator/generators/generate-data-type.js +8 -5
  4. package/esm/ts-generator/generators/generate-document.js +1 -1
  5. package/package.json +3 -3
package/cjs/ts-generator/generators/generate-data-type.js CHANGED
@@ -180,17 +180,20 @@ async function _generateComplexTypeCode(currentFile, dataType, intent) {
180
180
  if (field.readonly)
181
181
  out += 'readonly ';
182
182
  out += `${field.name}${field.required ? '' : '?'}: `;
183
+ let typ = '';
183
184
  if (field.fixed) {
184
185
  const t = typeof field.fixed;
185
- out += `${t === 'number' || t === 'boolean' || t === 'bigint' ? field.fixed : "'" + field.fixed + "'"}\n`;
186
+ typ = `${t === 'number' || t === 'boolean' || t === 'bigint' ? field.fixed : "'" + field.fixed + "'"}\n`;
186
187
  }
187
188
  else {
188
189
  const x = await this.generateDataType(field.type, 'typeDef', currentFile);
189
- const s = x.kind === 'embedded' ? x.code : x.typeName;
190
- if (field.isArray) {
191
- out += /[a-zA-Z]\w*/.test(s) ? s + '[]' : '(' + s + ')[]';
192
- }
190
+ typ = x.kind === 'embedded' ? x.code : x.typeName;
191
+ }
192
+ if (field.isArray) {
193
+ out += /[a-zA-Z]\w*/.test(typ) ? typ + '[];\n' : '(' + typ + ')[];\n';
193
194
  }
195
+ else
196
+ out += typ + ';\n';
194
197
  }
195
198
  if (dataType.additionalFields)
196
199
  out += '[key: string]: any;\n';
package/cjs/ts-generator/generators/generate-document.js CHANGED
@@ -43,7 +43,7 @@ async function generateDocument(document, options) {
43
43
  ? (0, putil_varhelpers_1.pascalCase)(ref.info.title)
44
44
  : `Reference${refIdGenerator++}`);
45
45
  generator._documentRoot = '/references/' + typesNamespace;
46
- generator._typesRoot = node_path_1.default.join(generator._documentRoot, 'models');
46
+ generator._typesRoot = node_path_1.default.posix.join(generator._documentRoot, 'models');
47
47
  generator._typesNamespace =
48
48
  !this.options.referenceNamespaces || ref[common_1.BUILTIN] ? '' : typesNamespace;
49
49
  await generator.generateDocument(ref, {
package/esm/ts-generator/generators/generate-data-type.js CHANGED
@@ -170,17 +170,20 @@ export async function _generateComplexTypeCode(currentFile, dataType, intent) {
170
170
  if (field.readonly)
171
171
  out += 'readonly ';
172
172
  out += `${field.name}${field.required ? '' : '?'}: `;
173
+ let typ = '';
173
174
  if (field.fixed) {
174
175
  const t = typeof field.fixed;
175
- out += `${t === 'number' || t === 'boolean' || t === 'bigint' ? field.fixed : "'" + field.fixed + "'"}\n`;
176
+ typ = `${t === 'number' || t === 'boolean' || t === 'bigint' ? field.fixed : "'" + field.fixed + "'"}\n`;
176
177
  }
177
178
  else {
178
179
  const x = await this.generateDataType(field.type, 'typeDef', currentFile);
179
- const s = x.kind === 'embedded' ? x.code : x.typeName;
180
- if (field.isArray) {
181
- out += /[a-zA-Z]\w*/.test(s) ? s + '[]' : '(' + s + ')[]';
182
- }
180
+ typ = x.kind === 'embedded' ? x.code : x.typeName;
181
+ }
182
+ if (field.isArray) {
183
+ out += /[a-zA-Z]\w*/.test(typ) ? typ + '[];\n' : '(' + typ + ')[];\n';
183
184
  }
185
+ else
186
+ out += typ + ';\n';
184
187
  }
185
188
  if (dataType.additionalFields)
186
189
  out += '[key: string]: any;\n';
package/esm/ts-generator/generators/generate-document.js CHANGED
@@ -39,7 +39,7 @@ export async function generateDocument(document, options) {
39
39
  ? pascalCase(ref.info.title)
40
40
  : `Reference${refIdGenerator++}`);
41
41
  generator._documentRoot = '/references/' + typesNamespace;
42
- generator._typesRoot = path.join(generator._documentRoot, 'models');
42
+ generator._typesRoot = path.posix.join(generator._documentRoot, 'models');
43
43
  generator._typesNamespace =
44
44
  !this.options.referenceNamespaces || ref[BUILTIN] ? '' : typesNamespace;
45
45
  await generator.generateDocument(ref, {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@opra/cli",
3
- "version": "1.19.5",
3
+ "version": "1.19.7",
4
4
  "description": "Opra CLI tools",
5
5
  "author": "Panates",
6
6
  "license": "MIT",
@@ -14,8 +14,8 @@
14
14
  "tslib": "^2.8.1"
15
15
  },
16
16
  "peerDependencies": {
17
- "@opra/client": "^1.19.5",
18
- "@opra/common": "^1.19.5"
17
+ "@opra/client": "^1.19.7",
18
+ "@opra/common": "^1.19.7"
19
19
  },
20
20
  "type": "module",
21
21
  "exports": {