@opra/cli 1.4.3 → 1.5.0

package/bin/oprimp.mjs

@@ -1,3 +1,3 @@
 #!/usr/bin/env node
-/* eslint-disable import-x/no-unresolved */
+
 import '../esm/oprimp-cli.js';

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

@@ -12,7 +12,15 @@ const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@opra/common");
 const code_block_js_1 = require("../../code-block.js");
 const string_utils_js_1 = require("../utils/string-utils.js");
-const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string', 'object'];
+const internalTypeNames = [
+    'any',
+    'boolean',
+    'bigint',
+    'number',
+    'null',
+    'string',
+    'object',
+];
 async function generateDataType(dataType, intent, currentFile) {
     const doc = dataType.node.getDocument();
     if (doc.id !== this._document?.id) {
@@ -53,7 +61,8 @@ async function generateDataType(dataType, intent, currentFile) {
  * @url ${node_path_1.default.posix.join(doc.url || this.serviceUrl, '$schema', '#types/' + typeName)}
  */
 export `;
-            codeBlock.typeDef = (await this._generateTypeCode(file, dataType, 'root')) + '\n\n';
+            codeBlock.typeDef =
+                (await this._generateTypeCode(file, dataType, 'root')) + '\n\n';
             typesIndexTs.addExport(file.filename);
             if (currentFile)
                 currentFile.addImport(file.filename, [typeName]);
@@ -109,7 +118,9 @@ async function _generateEnumTypeCode(currentFile, dataType, intent) {
                 out += `/**\n${jsDoc} */\n`;
             out +=
                 `${info.alias || value} = ` +
-                    (typeof value === 'number' ? value : "'" + String(value).replace("'", "\\'") + "'");
+                    (typeof value === 'number'
+                        ? value
+                        : "'" + String(value).replace("'", "\\'") + "'");
             out += ',\n\n';
         }
         return out + '\b}';
@@ -159,7 +170,10 @@ async function _generateComplexTypeCode(currentFile, dataType, intent) {
         if (field.writeonly)
             out += ` * @writeonly\n`;
         if (field.deprecated) {
-            out += ` * @deprecated ` + (typeof field.deprecated === 'string' ? field.deprecated : '') + '\n';
+            out +=
+                ` * @deprecated ` +
+                    (typeof field.deprecated === 'string' ? field.deprecated : '') +
+                    '\n';
         }
         out += ' */\n';
         // Print field name
@@ -172,7 +186,9 @@ async function _generateComplexTypeCode(currentFile, dataType, intent) {
         }
         else {
             const x = await this.generateDataType(field.type, 'typeDef', currentFile);
-            out += (x.kind === 'embedded' ? x.code : x.typeName) + `${field.isArray ? '[]' : ''};\n`;
+            out +=
+                (x.kind === 'embedded' ? x.code : x.typeName) +
+                    `${field.isArray ? '[]' : ''};\n`;
         }
     }
     if (dataType.additionalFields)
@@ -215,10 +231,12 @@ async function _generateMappedTypeCode(currentFile, dataType, intent) {
     const typeDef = base.kind === 'embedded' ? base.code : base.typeName;
     const pick = dataType.pick?.length ? dataType.pick : undefined;
     const omit = !pick && dataType.omit?.length ? dataType.omit : undefined;
-    const partial = dataType.partial === true || (Array.isArray(dataType.partial) && dataType.partial.length > 0)
+    const partial = dataType.partial === true ||
+        (Array.isArray(dataType.partial) && dataType.partial.length > 0)
         ? dataType.partial
         : undefined;
-    const required = dataType.required === true || (Array.isArray(dataType.required) && dataType.required.length > 0)
+    const required = dataType.required === true ||
+        (Array.isArray(dataType.required) && dataType.required.length > 0)
         ? dataType.required
         : undefined;
     if (!(pick || omit || partial || required))

package/cjs/ts-generator/generators/generate-document.js

@@ -14,7 +14,8 @@ async function generateDocument(document, options) {
             if (out)
                 return out;
         }
-        this.emit('log', ansi_colors_1.default.cyan('Fetching document schema from ') + ansi_colors_1.default.blueBright(this.serviceUrl));
+        this.emit('log', ansi_colors_1.default.cyan('Fetching document schema from ') +
+            ansi_colors_1.default.blueBright(this.serviceUrl));
         const client = new client_1.OpraHttpClient(this.serviceUrl);
         document = await client.fetchDocument({ documentId: document });
     }
@@ -32,15 +33,23 @@ async function generateDocument(document, options) {
         ansi_colors_1.default.magenta(document.info.title || ''));
     if (document.references.size) {
         let refIdGenerator = options?.refIdGenerator || 1;
-        this.emit('log', ansi_colors_1.default.white('[' + document.id + '] ') + ansi_colors_1.default.cyan(`Processing references`));
+        this.emit('log', ansi_colors_1.default.white('[' + document.id + '] ') +
+            ansi_colors_1.default.cyan(`Processing references`));
         for (const ref of document.references.values()) {
             const generator = this.extend();
             generator._document = ref;
-            const typesNamespace = ref.api?.name || (ref.info.title ? (0, putil_varhelpers_1.pascalCase)(ref.info.title) : `Reference${refIdGenerator++}`);
+            const typesNamespace = ref.api?.name ||
+                (ref.info.title
+                    ? (0, putil_varhelpers_1.pascalCase)(ref.info.title)
+                    : `Reference${refIdGenerator++}`);
             generator._documentRoot = '/references/' + typesNamespace;
             generator._typesRoot = node_path_1.default.join(generator._documentRoot, 'models');
-            generator._typesNamespace = !this.options.referenceNamespaces || ref[common_1.BUILTIN] ? '' : typesNamespace;
-            await generator.generateDocument(ref, { typesOnly: true, refIdGenerator });
+            generator._typesNamespace =
+                !this.options.referenceNamespaces || ref[common_1.BUILTIN] ? '' : typesNamespace;
+            await generator.generateDocument(ref, {
+                typesOnly: true,
+                refIdGenerator,
+            });
         }
     }
     this._fileHeaderDocInfo = `/*

package/cjs/ts-generator/generators/generate-http-api.js

@@ -35,7 +35,9 @@ async function generateHttpApi(api) {
         const f = await generator.generateHttpController(controller);
         const childClassName = (0, putil_varhelpers_1.pascalCase)(controller.name) + 'Controller';
         file.addImport('.' + f.filename, [childClassName]);
-        const property = '$' + controller.name.charAt(0).toLowerCase() + (0, putil_varhelpers_1.camelCase)(controller.name.substring(1));
+        const property = '$' +
+            controller.name.charAt(0).toLowerCase() +
+            (0, putil_varhelpers_1.camelCase)(controller.name.substring(1));
         classBlock.properties += `\nreadonly ${property}: ${childClassName};`;
         classConstBlock.body += `\nthis.${property} = new ${childClassName}(client);`;
     }

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

@@ -35,8 +35,14 @@ async function generateHttpController(controller) {
     };
     const className = (0, putil_varhelpers_1.pascalCase)(controller.name) + 'Controller';
     file = this.addFile(node_path_1.default.join(this._apiPath, className + '.ts'));
-    file.addImport('@opra/client', ['HttpRequestObservable', 'kClient', 'OpraHttpClient']);
-    file.addImport(node_path_1.default.relative(file.dirname, '/http-controller-node.ts'), ['HttpControllerNode']);
+    file.addImport('@opra/client', [
+        'HttpRequestObservable',
+        'kClient',
+        'OpraHttpClient',
+    ]);
+    file.addImport(node_path_1.default.relative(file.dirname, '/http-controller-node.ts'), [
+        'HttpControllerNode',
+    ]);
     const classBlock = (file.code[className] = new code_block_js_1.CodeBlock());
     classBlock.doc = `/** 
  * ${(0, string_utils_js_1.wrapJSDocString)(controller.description || '')}
@@ -60,7 +66,9 @@ constructor(client: OpraHttpClient) {`;
             const f = await generator.generateHttpController(child);
             const childClassName = (0, putil_varhelpers_1.pascalCase)(child.name) + 'Controller';
             file.addImport(f.filename, [childClassName]);
-            const property = '$' + child.name.charAt(0).toLowerCase() + (0, putil_varhelpers_1.camelCase)(child.name.substring(1));
+            const property = '$' +
+                child.name.charAt(0).toLowerCase() +
+                (0, putil_varhelpers_1.camelCase)(child.name.substring(1));
             classBlock.properties += `\nreadonly ${property}: ${childClassName};`;
             classConstBlock.body += `\nthis.${property} = new ${childClassName}(client);`;
         }
@@ -70,11 +78,12 @@ constructor(client: OpraHttpClient) {`;
     let _base = controller;
     while (_base.owner instanceof common_1.HttpController) {
         _base = _base.owner;
-        mergedControllerParams.unshift(..._base?.parameters);
+        mergedControllerParams.unshift(..._base.parameters);
     }
     for (const operation of controller.operations.values()) {
         const mergedParams = [...mergedControllerParams, ...operation.parameters];
-        const operationBlock = (classBlock['operation_' + operation.name] = new code_block_js_1.CodeBlock());
+        const operationBlock = (classBlock['operation_' + operation.name] =
+            new code_block_js_1.CodeBlock());
         operationBlock.doc = new code_block_js_1.CodeBlock();
         operationBlock.doc.header = `
 /** 
@@ -181,7 +190,8 @@ constructor(client: OpraHttpClient) {`;
                         typeArr.push(typeDef);
                     continue;
                 }
-                else if (content.contentType && type_is_1.default.is(String(content.contentType), ['multipart/*'])) {
+                else if (content.contentType &&
+                    type_is_1.default.is(String(content.contentType), ['multipart/*'])) {
                     const typeDef = 'FormData';
                     if (!typeArr.includes(typeDef))
                         typeArr.push(typeDef);
@@ -201,8 +211,12 @@ constructor(client: OpraHttpClient) {`;
         if (queryParams.length) {
             if (argIndex++ > 0)
                 operationBlock.head += ', ';
-            operationBlock.head += '\n\t$params' + (isHeadersRequired || isQueryRequired ? '' : '?') + ': {\n\t';
-            operationBlock.doc.parameters += '\n * @param {object} $params - Available parameters for the operation';
+            operationBlock.head +=
+                '\n\t$params' +
+                    (isHeadersRequired || isQueryRequired ? '' : '?') +
+                    ': {\n\t';
+            operationBlock.doc.parameters +=
+                '\n * @param {object} $params - Available parameters for the operation';
             let hasAdditionalFields = false;
             for (const prm of queryParams) {
                 if (typeof prm.name !== 'string') {
@@ -230,7 +244,8 @@ constructor(client: OpraHttpClient) {`;
         if (headerParams.length) {
             if (argIndex++ > 0)
                 operationBlock.head += ', \n';
-            operationBlock.head += '\t$headers' + (isHeadersRequired ? '' : '?') + ': {\n\t';
+            operationBlock.head +=
+                '\t$headers' + (isHeadersRequired ? '' : '?') + ': {\n\t';
             for (const prm of headerParams) {
                 operationBlock.head += `/**\n * ${prm.description || ''}\n */\n`;
                 operationBlock.head += `${prm.name}${prm.required ? '' : '?'}: `;
@@ -271,7 +286,8 @@ constructor(client: OpraHttpClient) {`;
             }
             if (typeDef && resp.isArray)
                 typeDef += '[]';
-            if (resp.contentType && type_is_1.default.is(String(resp.contentType), [common_1.MimeTypes.opra_response_json])) {
+            if (resp.contentType &&
+                type_is_1.default.is(String(resp.contentType), [common_1.MimeTypes.opra_response_json])) {
                 file.addImport('@opra/common', ['OperationResult']);
                 typeDef = typeDef ? `OperationResult<${typeDef}>` : 'OperationResult';
             }
@@ -282,7 +298,9 @@ constructor(client: OpraHttpClient) {`;
         operationBlock.head += `\n): HttpRequestObservable<${returnTypes.join(' | ') || 'any'}>{`;
         operationBlock.body = `\n\t`;
         operationBlock.body +=
-            `const url = this._prepareUrl('${operation.getFullUrl()}', {` + pathParams.map(p => p.name).join(', ') + '});';
+            `const url = this._prepareUrl('${operation.getFullUrl()}', {` +
+                pathParams.map(p => p.name).join(', ') +
+                '});';
         operationBlock.body +=
             `\nreturn this[kClient].request(url, { method: '${operation.method}'` +
                 (hasBody ? ', body: $body' : '') +

package/cjs/ts-generator/ts-file.js

@@ -27,7 +27,10 @@ class TsFile {
             filename = filename.substring(0, filename.length - 5);
         if (filename.endsWith('.ts') || filename.endsWith('.js'))
             filename = filename.substring(0, filename.length - 3);
-        const imp = (this.imports[filename] = this.imports[filename] || { items: [], typeImport });
+        const imp = (this.imports[filename] = this.imports[filename] || {
+            items: [],
+            typeImport,
+        });
         if (!typeImport)
             imp.typeImport = false;
         items?.forEach(x => {
@@ -46,7 +49,11 @@ class TsFile {
         if (filename.endsWith('.ts') || filename.endsWith('.js'))
             filename = filename.substring(0, filename.length - 3);
         const key = (namespace ? namespace + ':' : '') + filename;
-        this.exportFiles[key] = this.exportFiles[key] || { filename, items: [], namespace };
+        this.exportFiles[key] = this.exportFiles[key] || {
+            filename,
+            items: [],
+            namespace,
+        };
         types?.forEach(x => {
             if (!this.exportFiles[filename].items.includes(x))
                 this.exportFiles[filename].items.push(x);

package/cjs/ts-generator/ts-generator.js

@@ -31,7 +31,10 @@ class TsGenerator extends node_events_1.EventEmitter {
         this.outDir = init.outDir ? node_path_1.default.resolve(this.cwd, init.outDir) : this.cwd;
         this.fileHeader = init.fileHeader || '';
         this.writer = init.writer || new file_writer_js_1.FileWriter();
-        this.options = { importExt: !!init.importExt, referenceNamespaces: init.referenceNamespaces };
+        this.options = {
+            importExt: !!init.importExt,
+            referenceNamespaces: init.referenceNamespaces,
+        };
         this._documentsMap = new Map();
         this._filesMap = new WeakMap();
         this.on('log', (message, ...args) => init.logger?.log?.(message, ...args));
@@ -81,7 +84,10 @@ class TsGenerator extends node_events_1.EventEmitter {
             throw new Error(`File "${filePath}" already exists`);
         }
         file = new ts_file_js_1.TsFile(filePath);
-        file.code.header = this.fileHeader + (this._fileHeaderDocInfo ? '\n' + this._fileHeaderDocInfo : '') + '\n\n';
+        file.code.header =
+            this.fileHeader +
+                (this._fileHeaderDocInfo ? '\n' + this._fileHeaderDocInfo : '') +
+                '\n\n';
         this._files[file.filename] = file;
         return file;
     }

package/cjs/ts-generator/utils/string-utils.js

@@ -9,7 +9,7 @@ const js_string_escape_1 = tslib_1.__importDefault(require("js-string-escape"));
 function wrapJSDocString(s, indent, currentColumn) {
     const arr = (s || '')
         .split(/[ \n\r]/)
-        .map((x, i, a) => (i < a.length - 1 ? x + ' ' : x));
+        .map((x, i, a) => i < a.length - 1 ? x + ' ' : x);
     return _printLines(arr, {
         indent,
         currentColumn,
@@ -20,7 +20,7 @@ function wrapJSDocString(s, indent, currentColumn) {
 function wrapQuotedString(s, indent, currentColumn) {
     const arr = (0, js_string_escape_1.default)(s || '')
         .split(' ')
-        .map((x, i, a) => (i < a.length - 1 ? x + ' ' : x));
+        .map((x, i, a) => i < a.length - 1 ? x + ' ' : x);
     return ("'" +
         _printLines(arr, {
             indent,
@@ -46,7 +46,11 @@ function _printLines(arr, opts = {}) {
     const l = arr.length;
     const printLine = (eof) => {
         s +=
-            (s ? '\n' + ' '.repeat(indent || 0) + (opts.lineStart ? opts.lineStart : '') : '') +
+            (s
+                ? '\n' +
+                    ' '.repeat(indent || 0) +
+                    (opts.lineStart ? opts.lineStart : '')
+                : '') +
                 line +
                 (!eof ? (opts.lineEnd ? opts.lineEnd : '') : '');
         line = '';

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

@@ -1,8 +1,16 @@
 import path from 'node:path';
-import { ComplexType, EnumType, MappedType, MixinType, SimpleType } from '@opra/common';
+import { ComplexType, EnumType, MappedType, MixinType, SimpleType, } from '@opra/common';
 import { CodeBlock } from '../../code-block.js';
 import { wrapJSDocString } from '../utils/string-utils.js';
-const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string', 'object'];
+const internalTypeNames = [
+    'any',
+    'boolean',
+    'bigint',
+    'number',
+    'null',
+    'string',
+    'object',
+];
 export async function generateDataType(dataType, intent, currentFile) {
     const doc = dataType.node.getDocument();
     if (doc.id !== this._document?.id) {
@@ -43,7 +51,8 @@ export async function generateDataType(dataType, intent, currentFile) {
  * @url ${path.posix.join(doc.url || this.serviceUrl, '$schema', '#types/' + typeName)}
  */
 export `;
-            codeBlock.typeDef = (await this._generateTypeCode(file, dataType, 'root')) + '\n\n';
+            codeBlock.typeDef =
+                (await this._generateTypeCode(file, dataType, 'root')) + '\n\n';
             typesIndexTs.addExport(file.filename);
             if (currentFile)
                 currentFile.addImport(file.filename, [typeName]);
@@ -99,7 +108,9 @@ export async function _generateEnumTypeCode(currentFile, dataType, intent) {
                 out += `/**\n${jsDoc} */\n`;
             out +=
                 `${info.alias || value} = ` +
-                    (typeof value === 'number' ? value : "'" + String(value).replace("'", "\\'") + "'");
+                    (typeof value === 'number'
+                        ? value
+                        : "'" + String(value).replace("'", "\\'") + "'");
             out += ',\n\n';
         }
         return out + '\b}';
@@ -149,7 +160,10 @@ export async function _generateComplexTypeCode(currentFile, dataType, intent) {
         if (field.writeonly)
             out += ` * @writeonly\n`;
         if (field.deprecated) {
-            out += ` * @deprecated ` + (typeof field.deprecated === 'string' ? field.deprecated : '') + '\n';
+            out +=
+                ` * @deprecated ` +
+                    (typeof field.deprecated === 'string' ? field.deprecated : '') +
+                    '\n';
         }
         out += ' */\n';
         // Print field name
@@ -162,7 +176,9 @@ export async function _generateComplexTypeCode(currentFile, dataType, intent) {
         }
         else {
             const x = await this.generateDataType(field.type, 'typeDef', currentFile);
-            out += (x.kind === 'embedded' ? x.code : x.typeName) + `${field.isArray ? '[]' : ''};\n`;
+            out +=
+                (x.kind === 'embedded' ? x.code : x.typeName) +
+                    `${field.isArray ? '[]' : ''};\n`;
         }
     }
     if (dataType.additionalFields)
@@ -205,10 +221,12 @@ export async function _generateMappedTypeCode(currentFile, dataType, intent) {
     const typeDef = base.kind === 'embedded' ? base.code : base.typeName;
     const pick = dataType.pick?.length ? dataType.pick : undefined;
     const omit = !pick && dataType.omit?.length ? dataType.omit : undefined;
-    const partial = dataType.partial === true || (Array.isArray(dataType.partial) && dataType.partial.length > 0)
+    const partial = dataType.partial === true ||
+        (Array.isArray(dataType.partial) && dataType.partial.length > 0)
         ? dataType.partial
         : undefined;
-    const required = dataType.required === true || (Array.isArray(dataType.required) && dataType.required.length > 0)
+    const required = dataType.required === true ||
+        (Array.isArray(dataType.required) && dataType.required.length > 0)
         ? dataType.required
         : undefined;
     if (!(pick || omit || partial || required))

package/esm/ts-generator/generators/generate-document.js

@@ -10,7 +10,8 @@ export async function generateDocument(document, options) {
             if (out)
                 return out;
         }
-        this.emit('log', colors.cyan('Fetching document schema from ') + colors.blueBright(this.serviceUrl));
+        this.emit('log', colors.cyan('Fetching document schema from ') +
+            colors.blueBright(this.serviceUrl));
         const client = new OpraHttpClient(this.serviceUrl);
         document = await client.fetchDocument({ documentId: document });
     }
@@ -28,15 +29,23 @@ export async function generateDocument(document, options) {
         colors.magenta(document.info.title || ''));
     if (document.references.size) {
         let refIdGenerator = options?.refIdGenerator || 1;
-        this.emit('log', colors.white('[' + document.id + '] ') + colors.cyan(`Processing references`));
+        this.emit('log', colors.white('[' + document.id + '] ') +
+            colors.cyan(`Processing references`));
         for (const ref of document.references.values()) {
             const generator = this.extend();
             generator._document = ref;
-            const typesNamespace = ref.api?.name || (ref.info.title ? pascalCase(ref.info.title) : `Reference${refIdGenerator++}`);
+            const typesNamespace = ref.api?.name ||
+                (ref.info.title
+                    ? pascalCase(ref.info.title)
+                    : `Reference${refIdGenerator++}`);
             generator._documentRoot = '/references/' + typesNamespace;
             generator._typesRoot = path.join(generator._documentRoot, 'models');
-            generator._typesNamespace = !this.options.referenceNamespaces || ref[BUILTIN] ? '' : typesNamespace;
-            await generator.generateDocument(ref, { typesOnly: true, refIdGenerator });
+            generator._typesNamespace =
+                !this.options.referenceNamespaces || ref[BUILTIN] ? '' : typesNamespace;
+            await generator.generateDocument(ref, {
+                typesOnly: true,
+                refIdGenerator,
+            });
         }
     }
     this._fileHeaderDocInfo = `/*

package/esm/ts-generator/generators/generate-http-api.js

@@ -31,7 +31,9 @@ export async function generateHttpApi(api) {
         const f = await generator.generateHttpController(controller);
         const childClassName = pascalCase(controller.name) + 'Controller';
         file.addImport('.' + f.filename, [childClassName]);
-        const property = '$' + controller.name.charAt(0).toLowerCase() + camelCase(controller.name.substring(1));
+        const property = '$' +
+            controller.name.charAt(0).toLowerCase() +
+            camelCase(controller.name.substring(1));
         classBlock.properties += `\nreadonly ${property}: ${childClassName};`;
         classConstBlock.body += `\nthis.${property} = new ${childClassName}(client);`;
     }

package/esm/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, } from '@opra/common';
 import { camelCase, pascalCase } from 'putil-varhelpers';
 import { CodeBlock } from '../../code-block.js';
 import { locateNamedType } from '../utils/locate-named-type.js';
@@ -31,8 +31,14 @@ export async function generateHttpController(controller) {
     };
     const className = pascalCase(controller.name) + 'Controller';
     file = this.addFile(path.join(this._apiPath, className + '.ts'));
-    file.addImport('@opra/client', ['HttpRequestObservable', 'kClient', 'OpraHttpClient']);
-    file.addImport(path.relative(file.dirname, '/http-controller-node.ts'), ['HttpControllerNode']);
+    file.addImport('@opra/client', [
+        'HttpRequestObservable',
+        'kClient',
+        'OpraHttpClient',
+    ]);
+    file.addImport(path.relative(file.dirname, '/http-controller-node.ts'), [
+        'HttpControllerNode',
+    ]);
     const classBlock = (file.code[className] = new CodeBlock());
     classBlock.doc = `/** 
  * ${wrapJSDocString(controller.description || '')}
@@ -56,7 +62,9 @@ constructor(client: OpraHttpClient) {`;
             const f = await generator.generateHttpController(child);
             const childClassName = pascalCase(child.name) + 'Controller';
             file.addImport(f.filename, [childClassName]);
-            const property = '$' + child.name.charAt(0).toLowerCase() + camelCase(child.name.substring(1));
+            const property = '$' +
+                child.name.charAt(0).toLowerCase() +
+                camelCase(child.name.substring(1));
             classBlock.properties += `\nreadonly ${property}: ${childClassName};`;
             classConstBlock.body += `\nthis.${property} = new ${childClassName}(client);`;
         }
@@ -66,11 +74,12 @@ constructor(client: OpraHttpClient) {`;
     let _base = controller;
     while (_base.owner instanceof HttpController) {
         _base = _base.owner;
-        mergedControllerParams.unshift(..._base?.parameters);
+        mergedControllerParams.unshift(..._base.parameters);
     }
     for (const operation of controller.operations.values()) {
         const mergedParams = [...mergedControllerParams, ...operation.parameters];
-        const operationBlock = (classBlock['operation_' + operation.name] = new CodeBlock());
+        const operationBlock = (classBlock['operation_' + operation.name] =
+            new CodeBlock());
         operationBlock.doc = new CodeBlock();
         operationBlock.doc.header = `
 /** 
@@ -177,7 +186,8 @@ constructor(client: OpraHttpClient) {`;
                         typeArr.push(typeDef);
                     continue;
                 }
-                else if (content.contentType && typeIs.is(String(content.contentType), ['multipart/*'])) {
+                else if (content.contentType &&
+                    typeIs.is(String(content.contentType), ['multipart/*'])) {
                     const typeDef = 'FormData';
                     if (!typeArr.includes(typeDef))
                         typeArr.push(typeDef);
@@ -197,8 +207,12 @@ constructor(client: OpraHttpClient) {`;
         if (queryParams.length) {
             if (argIndex++ > 0)
                 operationBlock.head += ', ';
-            operationBlock.head += '\n\t$params' + (isHeadersRequired || isQueryRequired ? '' : '?') + ': {\n\t';
-            operationBlock.doc.parameters += '\n * @param {object} $params - Available parameters for the operation';
+            operationBlock.head +=
+                '\n\t$params' +
+                    (isHeadersRequired || isQueryRequired ? '' : '?') +
+                    ': {\n\t';
+            operationBlock.doc.parameters +=
+                '\n * @param {object} $params - Available parameters for the operation';
             let hasAdditionalFields = false;
             for (const prm of queryParams) {
                 if (typeof prm.name !== 'string') {
@@ -226,7 +240,8 @@ constructor(client: OpraHttpClient) {`;
         if (headerParams.length) {
             if (argIndex++ > 0)
                 operationBlock.head += ', \n';
-            operationBlock.head += '\t$headers' + (isHeadersRequired ? '' : '?') + ': {\n\t';
+            operationBlock.head +=
+                '\t$headers' + (isHeadersRequired ? '' : '?') + ': {\n\t';
             for (const prm of headerParams) {
                 operationBlock.head += `/**\n * ${prm.description || ''}\n */\n`;
                 operationBlock.head += `${prm.name}${prm.required ? '' : '?'}: `;
@@ -267,7 +282,8 @@ constructor(client: OpraHttpClient) {`;
             }
             if (typeDef && resp.isArray)
                 typeDef += '[]';
-            if (resp.contentType && typeIs.is(String(resp.contentType), [MimeTypes.opra_response_json])) {
+            if (resp.contentType &&
+                typeIs.is(String(resp.contentType), [MimeTypes.opra_response_json])) {
                 file.addImport('@opra/common', ['OperationResult']);
                 typeDef = typeDef ? `OperationResult<${typeDef}>` : 'OperationResult';
             }
@@ -278,7 +294,9 @@ constructor(client: OpraHttpClient) {`;
         operationBlock.head += `\n): HttpRequestObservable<${returnTypes.join(' | ') || 'any'}>{`;
         operationBlock.body = `\n\t`;
         operationBlock.body +=
-            `const url = this._prepareUrl('${operation.getFullUrl()}', {` + pathParams.map(p => p.name).join(', ') + '});';
+            `const url = this._prepareUrl('${operation.getFullUrl()}', {` +
+                pathParams.map(p => p.name).join(', ') +
+                '});';
         operationBlock.body +=
             `\nreturn this[kClient].request(url, { method: '${operation.method}'` +
                 (hasBody ? ', body: $body' : '') +

package/esm/ts-generator/ts-file.js

@@ -23,7 +23,10 @@ export class TsFile {
             filename = filename.substring(0, filename.length - 5);
         if (filename.endsWith('.ts') || filename.endsWith('.js'))
             filename = filename.substring(0, filename.length - 3);
-        const imp = (this.imports[filename] = this.imports[filename] || { items: [], typeImport });
+        const imp = (this.imports[filename] = this.imports[filename] || {
+            items: [],
+            typeImport,
+        });
         if (!typeImport)
             imp.typeImport = false;
         items?.forEach(x => {
@@ -42,7 +45,11 @@ export class TsFile {
         if (filename.endsWith('.ts') || filename.endsWith('.js'))
             filename = filename.substring(0, filename.length - 3);
         const key = (namespace ? namespace + ':' : '') + filename;
-        this.exportFiles[key] = this.exportFiles[key] || { filename, items: [], namespace };
+        this.exportFiles[key] = this.exportFiles[key] || {
+            filename,
+            items: [],
+            namespace,
+        };
         types?.forEach(x => {
             if (!this.exportFiles[filename].items.includes(x))
                 this.exportFiles[filename].items.push(x);

package/esm/ts-generator/ts-generator.js

@@ -27,7 +27,10 @@ export class TsGenerator extends EventEmitter {
         this.outDir = init.outDir ? path.resolve(this.cwd, init.outDir) : this.cwd;
         this.fileHeader = init.fileHeader || '';
         this.writer = init.writer || new FileWriter();
-        this.options = { importExt: !!init.importExt, referenceNamespaces: init.referenceNamespaces };
+        this.options = {
+            importExt: !!init.importExt,
+            referenceNamespaces: init.referenceNamespaces,
+        };
         this._documentsMap = new Map();
         this._filesMap = new WeakMap();
         this.on('log', (message, ...args) => init.logger?.log?.(message, ...args));
@@ -77,7 +80,10 @@ export class TsGenerator extends EventEmitter {
             throw new Error(`File "${filePath}" already exists`);
         }
         file = new TsFile(filePath);
-        file.code.header = this.fileHeader + (this._fileHeaderDocInfo ? '\n' + this._fileHeaderDocInfo : '') + '\n\n';
+        file.code.header =
+            this.fileHeader +
+                (this._fileHeaderDocInfo ? '\n' + this._fileHeaderDocInfo : '') +
+                '\n\n';
         this._files[file.filename] = file;
         return file;
     }

package/esm/ts-generator/utils/locate-named-type.js

@@ -1,4 +1,4 @@
-import { ComplexType, EnumType, MappedType, SimpleType } from '@opra/common';
+import { ComplexType, EnumType, MappedType, SimpleType, } from '@opra/common';
 export function locateNamedType(type) {
     if (!type)
         return;

package/esm/ts-generator/utils/string-utils.js

@@ -2,7 +2,7 @@ import jsStringEscape from 'js-string-escape';
 export function wrapJSDocString(s, indent, currentColumn) {
     const arr = (s || '')
         .split(/[ \n\r]/)
-        .map((x, i, a) => (i < a.length - 1 ? x + ' ' : x));
+        .map((x, i, a) => i < a.length - 1 ? x + ' ' : x);
     return _printLines(arr, {
         indent,
         currentColumn,
@@ -13,7 +13,7 @@ export function wrapJSDocString(s, indent, currentColumn) {
 export function wrapQuotedString(s, indent, currentColumn) {
     const arr = jsStringEscape(s || '')
         .split(' ')
-        .map((x, i, a) => (i < a.length - 1 ? x + ' ' : x));
+        .map((x, i, a) => i < a.length - 1 ? x + ' ' : x);
     return ("'" +
         _printLines(arr, {
             indent,
@@ -39,7 +39,11 @@ function _printLines(arr, opts = {}) {
     const l = arr.length;
     const printLine = (eof) => {
         s +=
-            (s ? '\n' + ' '.repeat(indent || 0) + (opts.lineStart ? opts.lineStart : '') : '') +
+            (s
+                ? '\n' +
+                    ' '.repeat(indent || 0) +
+                    (opts.lineStart ? opts.lineStart : '')
+                : '') +
                 line +
                 (!eof ? (opts.lineEnd ? opts.lineEnd : '') : '');
         line = '';

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@opra/cli",
-  "version": "1.4.3",
+  "version": "1.5.0",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
   "dependencies": {
     "@browsery/type-is": "^1.6.18-r5",
-    "@opra/client": "^1.4.3",
-    "@opra/common": "^1.4.3",
+    "@opra/client": "^1.5.0",
+    "@opra/common": "^1.5.0",
     "ansi-colors": "^4.1.3",
     "commander": "^12.0.0",
     "js-string-escape": "^1.0.1",