@opra/cli 1.22.9 → 1.23.2

package/package.json

@@ -1,21 +1,22 @@
 {
   "name": "@opra/cli",
-  "version": "1.22.9",
+  "version": "1.23.2",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@browsery/type-is": "^2.0.1",
+    "@jsopen/objects": "^2.1.1",
     "ansi-colors": "^4.1.3",
-    "commander": "^14.0.2",
+    "commander": "^14.0.3",
     "js-string-escape": "^1.0.1",
     "putil-flattentext": "^2.1.1",
     "putil-varhelpers": "^1.7.0",
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@opra/client": "^1.22.9",
-    "@opra/common": "^1.22.9"
+    "@opra/client": "^1.23.2",
+    "@opra/common": "^1.23.2"
   },
   "type": "module",
   "module": "./index.js",

package/ts-generator/generators/generate-data-type.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { updateErrorMessage } from '@jsopen/objects';
 import { ArrayType, ComplexType, EnumType, MappedType, MixinType, OperationResult, SimpleType, UnionType, } from '@opra/common';
 import { CodeBlock } from '../../code-block.js';
 import { wrapJSDocString } from '../utils/string-utils.js';
@@ -71,7 +72,7 @@ export async function generateDataType(dataType, intent, currentFile) {
         return { kind: 'embedded', code: codeBlock.toString() };
     }
     catch (e) {
-        e.message = `(${dataType.name}) ` + e.message;
+        updateErrorMessage(e, `(${dataType.name}) ` + e.message);
         throw e;
     }
 }

package/ts-generator/generators/generate-http-controller.js

@@ -1,6 +1,6 @@
 import path from 'node:path';
 import typeIs from '@browsery/type-is';
-import { ComplexType, HttpController, MimeTypes, } from '@opra/common';
+import { ComplexType, HttpController, MimeTypes, OperationResult, } from '@opra/common';
 import { camelCase, pascalCase } from 'putil-varhelpers';
 import { CodeBlock } from '../../code-block.js';
 import { locateNamedType } from '../utils/locate-named-type.js';
@@ -270,6 +270,9 @@ constructor(client: OpraHttpClient) {`;
             }
             if (typeDef) {
                 if (typeDef !== 'OperationResult') {
+                    const isArray = typeDef.endsWith('[]');
+                    if (isArray)
+                        typeDef = typeDef.substring(0, typeDef.length - 2);
                     if (resp.partial) {
                         file.addImport('ts-gems', ['PartialDTO']);
                         typeDef = `PartialDTO<${typeDef}>`;
@@ -278,12 +281,16 @@ constructor(client: OpraHttpClient) {`;
                         file.addImport('ts-gems', ['DTO']);
                         typeDef = `DTO<${typeDef}>`;
                     }
+                    if (isArray)
+                        typeDef += '[]';
                 }
             }
             if (typeDef && resp.isArray)
                 typeDef += '[]';
             if (resp.contentType &&
-                typeIs.is(String(resp.contentType), [MimeTypes.opra_response_json])) {
+                typeIs.is(String(resp.contentType), [MimeTypes.opra_response_json]) &&
+                !(resp.type instanceof ComplexType &&
+                    resp.type.base?.ctor === OperationResult)) {
                 file.addImport('@opra/common', ['OperationResult']);
                 typeDef = typeDef ? `OperationResult<${typeDef}>` : 'OperationResult';
             }