@opra/cli 0.19.0 → 0.20.0

package/cjs/api-exporter/process-types.js

@@ -6,7 +6,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const node_path_1 = tslib_1.__importDefault(require("node:path"));
 const common_1 = require("@opra/common");
 const string_utils_js_1 = require("../utils/string-utils.js");
-const internalTypeNames = ['boolean', 'bigint', 'number', 'null', 'string'];
+const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string'];
 /**
  *
  * @param targetDir
@@ -199,11 +199,10 @@ exports.generateUnionTypeDefinition = generateUnionTypeDefinition;
  * @param forInterface
  */
 async function generateMappedTypeDefinition(file, dataType, forInterface) {
-    return (dataType.pick ? 'Pick<' : 'Omit<') +
-        (await this.resolveTypeNameOrDef(file, dataType.type, forInterface)) +
-        ', ' +
-        (dataType.pick || dataType.omit || [])
-            .map(x => `'${x}'`).join(' | ') +
-        '>';
+    const typeName = await this.resolveTypeNameOrDef(file, dataType.type, forInterface);
+    const keys = (dataType.pick || dataType.omit || []);
+    if (!keys.length)
+        return typeName;
+    return `${dataType.pick ? 'Pick<' : 'Omit<'}${typeName}, ${keys.map(x => `'${x}'`).join(' | ')}>`;
 }
 exports.generateMappedTypeDefinition = generateMappedTypeDefinition;

package/cjs/oprimp-cli.js

@@ -28,7 +28,7 @@ commander_1.program
         name: options.name,
         importExt: options.ext,
         fileHeader: '/* Generated by OPRA Service Generator, Version ' + pkgJson.version + '*/\n' +
-            '/* eslint-disable import/extensions,simple-import-sort/imports */\n'
+            '/* eslint-disable */\n'
     });
     console.log(chalk_1.default.greenBright('Completed'));
 });

package/esm/api-exporter/process-types.js

@@ -2,7 +2,7 @@ import chalk from 'chalk';
 import path from 'node:path';
 import { ComplexType, EnumType, joinPath, MappedType, SimpleType, UnionType } from '@opra/common';
 import { wrapJSDocString } from '../utils/string-utils.js';
-const internalTypeNames = ['boolean', 'bigint', 'number', 'null', 'string'];
+const internalTypeNames = ['any', 'boolean', 'bigint', 'number', 'null', 'string'];
 /**
  *
  * @param targetDir
@@ -188,10 +188,9 @@ export async function generateUnionTypeDefinition(file, dataType, forInterface)
  * @param forInterface
  */
 export async function generateMappedTypeDefinition(file, dataType, forInterface) {
-    return (dataType.pick ? 'Pick<' : 'Omit<') +
-        (await this.resolveTypeNameOrDef(file, dataType.type, forInterface)) +
-        ', ' +
-        (dataType.pick || dataType.omit || [])
-            .map(x => `'${x}'`).join(' | ') +
-        '>';
+    const typeName = await this.resolveTypeNameOrDef(file, dataType.type, forInterface);
+    const keys = (dataType.pick || dataType.omit || []);
+    if (!keys.length)
+        return typeName;
+    return `${dataType.pick ? 'Pick<' : 'Omit<'}${typeName}, ${keys.map(x => `'${x}'`).join(' | ')}>`;
 }

package/esm/oprimp-cli.js

@@ -25,7 +25,7 @@ program
         name: options.name,
         importExt: options.ext,
         fileHeader: '/* Generated by OPRA Service Generator, Version ' + pkgJson.version + '*/\n' +
-            '/* eslint-disable import/extensions,simple-import-sort/imports */\n'
+            '/* eslint-disable */\n'
     });
     console.log(chalk.greenBright('Completed'));
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -28,8 +28,8 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/client": "^0.19.0",
-    "chalk": "^5.2.0",
+    "@opra/client": "^0.20.0",
+    "chalk": "^5.3.0",
     "commander": "^11.0.0",
     "js-string-escape": "^1.0.1",
     "putil-flattentext": "^2.1.1",