@opra/cli 0.12.0 → 0.13.0

package/bin/oprimp.mjs

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-import '../esm/opraimp.mjs';
+import '../esm/oprimp.js';

package/cjs/oprimp/delete-files.js

@@ -5,6 +5,8 @@ const tslib_1 = require("tslib");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 function deleteFiles(dirname) {
+    if (!fs_1.default.existsSync(dirname))
+        return;
     const files = fs_1.default.readdirSync(dirname);
     for (const f of files) {
         const filename = path_1.default.join(dirname, f);

package/cjs/oprimp/generate-resoruces.js

@@ -0,0 +1,72 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateResources = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const fs_1 = tslib_1.__importDefault(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const common_1 = require("@opra/common");
+const string_utils_js_1 = require("../utils/string-utils.js");
+const ts_file_js_1 = require("../utils/ts-file.js");
+async function generateResources(ctx) {
+    const targetDir = path_1.default.join(ctx.absoluteDir, 'resources');
+    ctx.logger.log(chalk_1.default.yellow('Generating resources'));
+    const resourcesTs = new ts_file_js_1.TsFile();
+    resourcesTs.header = ctx.fileHeader;
+    let i = 0;
+    fs_1.default.mkdirSync(targetDir, { recursive: true });
+    const resourceNames = Array.from(ctx.document.resources.keys()).sort();
+    for (const resourceName of resourceNames) {
+        const resource = ctx.document.getResource(resourceName);
+        const tsFile = new ts_file_js_1.TsFile();
+        tsFile.header = ctx.fileHeader;
+        tsFile.content = `\n/**\n * ${(0, string_utils_js_1.wrapJSDocString)(resource.description || resource.name)}
+ * @type ${resource.name}
+ * @kind ${resource.kind}
+ * @url ${(0, common_1.joinPath)(ctx.serviceUrl, '$metadata/resources/' + resource.name)}
+ */\n`;
+        const filename = `./resources/${resource.name}`;
+        if (resource instanceof common_1.CollectionResourceInfo) {
+            await generateCollectionResource(ctx, resource, tsFile);
+            await tsFile.writeFile(ctx, path_1.default.join(targetDir, resource.name + '.ts'));
+            resourcesTs.addExport(`${filename}` + ctx.extension);
+            i++;
+        }
+        else if (resource instanceof common_1.SingletonResourceInfo) {
+            await generateSingletonResource(ctx, resource, tsFile);
+            await tsFile.writeFile(ctx, path_1.default.join(targetDir, resource.name + '.ts'));
+            resourcesTs.addExport(`${filename}${ctx.extension}`);
+            i++;
+        }
+    }
+    if (i) {
+        await resourcesTs.writeFile(ctx, path_1.default.join(ctx.absoluteDir, 'resources.ts'));
+    }
+}
+exports.generateResources = generateResources;
+async function generateCollectionResource(ctx, resource, tsFile) {
+    tsFile.header = ctx.fileHeader;
+    tsFile.addImport('@opra/client', 'OpraHttpClient', 'HttpCollectionService');
+    tsFile.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
+    const methods = resource.getHandlerNames()
+        .filter(x => x !== 'count')
+        .map(x => `'${x}'`).join(' | ');
+    tsFile.content = `
+export function ${resource.name}(
+    client: OpraHttpClient
+): Pick<HttpCollectionService<${resource.dataType.name}, never>, ${methods}> {
+  return client.collection('${resource.name}');
+}
+`;
+}
+async function generateSingletonResource(ctx, resource, tsFile) {
+    tsFile.header = ctx.fileHeader;
+    tsFile.addImport('@opra/client', 'OpraHttpClient', 'HttpSingletonService');
+    tsFile.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
+    const methods = resource.getHandlerNames().map(x => `'${x}'`).join(' | ');
+    tsFile.content = `
+export function ${resource.name}(client: OpraHttpClient): Pick<HttpSingletonService<${resource.dataType.name}, never>, ${methods}> {
+  return client.singleton('${resource.name}');
+}
+`;
+}

package/cjs/oprimp/generate-service.js

@@ -5,15 +5,9 @@ const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const process = tslib_1.__importStar(require("process"));
-const ts_file_js_1 = require("../utils/ts-file.js");
 const file_writer_js_1 = require("./file-writer.js");
+const generate_resoruces_js_1 = require("./generate-resoruces.js");
 const generate_types_js_1 = require("./generate-types.js");
-const builtinsMap = {
-    base64Binary: 'Buffer',
-    dateString: 'string',
-    guid: 'string',
-    integer: 'number'
-};
 async function generateService(config) {
     const cwd = config.cwd || process.cwd();
     const logger = config.logger || console;
@@ -25,22 +19,11 @@ async function generateService(config) {
         relativeDir: config.outDir,
         absoluteDir: path_1.default.resolve(cwd, config.outDir),
         fileHeader: config.fileHeader || '',
-        writer: config.writer || new file_writer_js_1.FileWriter(),
-        indexTs: new ts_file_js_1.TsFile(),
-        builtins: {},
+        extension: config.extension,
+        writer: config.writer || new file_writer_js_1.FileWriter()
     };
     fs.mkdirSync(ctx.absoluteDir, { recursive: true });
     await (0, generate_types_js_1.generateTypes)(ctx);
-    const builtinsTs = new ts_file_js_1.TsFile();
-    builtinsTs.header = ctx.fileHeader;
-    builtinsTs.content = Object.keys(ctx.builtins)
-        .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
-        .map(s => `export type ${s} = ${builtinsMap[s] || 'any'};`)
-        .join('\n');
-    if (builtinsTs.content) {
-        await builtinsTs.writeFile(ctx, path_1.default.join(ctx.absoluteDir, 'builtins.ts'));
-        ctx.indexTs.addExport('./builtins.js');
-    }
-    await ctx.indexTs.writeFile(ctx, path_1.default.join(ctx.absoluteDir, 'index.ts'));
+    await (0, generate_resoruces_js_1.generateResources)(ctx);
 }
 exports.generateService = generateService;

package/cjs/oprimp/generate-types.js

@@ -8,15 +8,32 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const common_1 = require("@opra/common");
 const string_utils_js_1 = require("../utils/string-utils.js");
 const ts_file_js_1 = require("../utils/ts-file.js");
+const builtinsMap = {
+    base64Binary: 'Buffer',
+    dateString: 'string',
+    guid: 'string',
+    integer: 'number',
+    date: 'Date'
+};
 async function generateTypes(ctx) {
     const targetDir = path_1.default.join(ctx.absoluteDir, 'types');
     ctx.logger.log(chalk_1.default.yellow('Generating types'));
+    const typesTs = new ts_file_js_1.TsFile();
+    typesTs.header = ctx.fileHeader;
+    let i = 0;
+    const builtinsTs = new ts_file_js_1.TsFile();
+    typesTs.header = ctx.fileHeader;
     fs_1.default.mkdirSync(targetDir, { recursive: true });
     const typeNames = Array.from(ctx.document.types.keys()).sort();
     for (const typeName of typeNames) {
         const dataType = ctx.document.getDataType(typeName);
-        if (dataType.isBuiltin)
+        if (dataType.isBuiltin) {
+            if (!builtinsMap[dataType.name])
+                continue;
+            typesTs.addExport('./types/builtins.js');
+            builtinsTs.content += `export type ${dataType.name} = ${builtinsMap[dataType.name]};\n`;
             continue;
+        }
         const tsFile = new ts_file_js_1.TsFile();
         tsFile.header = ctx.fileHeader;
         tsFile.content = `\n/**\n * ${(0, string_utils_js_1.wrapJSDocString)(dataType.description || dataType.name)}
@@ -24,16 +41,21 @@ async function generateTypes(ctx) {
  * @kind ${dataType.kind}
  * @url ${(0, common_1.joinPath)(ctx.serviceUrl, '$metadata/types/' + dataType.name)}
  */\n`;
+        const filename = `./types/${dataType.name}`;
         if (dataType instanceof common_1.ComplexType) {
             await generateComplexType(ctx, dataType, tsFile);
             await tsFile.writeFile(ctx, path_1.default.join(targetDir, dataType.name + '.ts'));
+            typesTs.addExport(`${filename}` + ctx.extension);
+            i++;
         }
     }
+    await builtinsTs.writeFile(ctx, path_1.default.join(targetDir, 'builtins.ts'));
+    if (i) {
+        await typesTs.writeFile(ctx, path_1.default.join(ctx.absoluteDir, 'types.ts'));
+    }
 }
 exports.generateTypes = generateTypes;
 async function generateComplexType(ctx, dataType, tsFile) {
-    const filename = `./types/${dataType.name}`;
-    ctx.indexTs.addExport(`${filename}.js`);
     tsFile.header = ctx.fileHeader;
     tsFile.content = `
 export class ${dataType.name} {
@@ -50,7 +72,7 @@ interface I${dataType.name}`;
     if (dataType.extends) {
         tsFile.content += ' extends ' +
             dataType.extends.map(ex => {
-                tsFile.addImport('./' + ex.type + '.js', ex.type);
+                tsFile.addImport('./' + ex.type + ctx.extension, ex.type);
                 let s = '';
                 if (ex.omit)
                     s += 'Omit<';
@@ -66,16 +88,12 @@ interface I${dataType.name}`;
     }
     const getTypeName = (dt) => {
         if (dt.isBuiltin) {
-            if (dt.name === 'any' || dt.name === 'string' || dt.name === 'number' ||
-                dt.name === 'boolean' || dt.name === 'object')
+            if (!builtinsMap[dt.name])
                 return dt.name;
-            if (dt.name === 'date')
-                return 'Date';
-            tsFile.addImport('../builtins.js', dt.name);
-            ctx.builtins[dt.name] = true;
+            tsFile.addImport('./builtins' + ctx.extension, dt.name);
             return dt.name;
         }
-        tsFile.addImport('./' + dt.name + '.js', dt.name);
+        tsFile.addImport('./' + dt.name + ctx.extension, dt.name);
         return dt.name;
     };
     tsFile.content += ' {\n\t';

package/cjs/oprimp.js

@@ -17,6 +17,7 @@ commander_1.program
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
     .option('--no-color', 'Disables colors in logs messages')
+    .option('-e, --extension <extension>', 'File extensions of imports')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
         chalk_1.default.level = 0;
@@ -30,6 +31,7 @@ commander_1.program
         serviceUrl,
         document: metadata,
         outDir,
+        extension: (options.extension ? '.' + options.extension : ''),
         fileHeader: '/*\n' +
             ' * Generated by OPRA Service Generator \n' +
             ' * Version: ' + pkgJson.version + '\n' +

package/cjs/utils/ts-file.js

@@ -11,15 +11,19 @@ class TsFile {
         this.exports = {};
         this.header = '';
         this.content = '';
-        this.addImport = (filename, imported) => {
+        this.addImport = (filename, ...imported) => {
             this.imports[filename] = this.imports[filename] || [];
-            if (!this.imports[filename].includes(imported))
-                this.imports[filename].push(imported);
+            imported.forEach(x => {
+                if (!this.imports[filename].includes(x))
+                    this.imports[filename].push(x);
+            });
         };
-        this.addExport = (filename, exported) => {
+        this.addExport = (filename, ...exported) => {
             this.exports[filename] = this.exports[filename] || [];
-            if (exported && !this.exports[filename].includes(exported))
-                this.exports[filename].push(exported);
+            exported.forEach(x => {
+                if (!this.exports[filename].includes(x))
+                    this.exports[filename].push(x);
+            });
         };
     }
     generate() {

package/esm/interfaces/service-generation-context.interface.d.ts

@@ -1,5 +1,4 @@
 import { OpraDocument } from '@opra/common';
-import { TsFile } from '../utils/ts-file.js';
 import { IFileWriter } from './file-writer.interface.js';
 import { ILogger } from './logger.interface.js';
 export interface ServiceGenerationContext {
@@ -10,7 +9,6 @@ export interface ServiceGenerationContext {
     relativeDir: string;
     absoluteDir: string;
     fileHeader: string;
+    extension?: string;
     writer: IFileWriter;
-    indexTs: TsFile;
-    builtins: any;
 }

package/esm/oprimp/delete-files.js

@@ -1,6 +1,8 @@
 import fs from 'fs';
 import path from 'path';
 export function deleteFiles(dirname) {
+    if (!fs.existsSync(dirname))
+        return;
     const files = fs.readdirSync(dirname);
     for (const f of files) {
         const filename = path.join(dirname, f);

package/esm/oprimp/generate-resoruces.d.ts

@@ -0,0 +1,2 @@
+import { ServiceGenerationContext } from '../interfaces/service-generation-context.interface.js';
+export declare function generateResources(ctx: ServiceGenerationContext): Promise<void>;

package/esm/oprimp/generate-resoruces.js

@@ -0,0 +1,67 @@
+import chalk from 'chalk';
+import fs from 'fs';
+import path from 'path';
+import { CollectionResourceInfo, joinPath, SingletonResourceInfo } from '@opra/common';
+import { wrapJSDocString } from '../utils/string-utils.js';
+import { TsFile } from '../utils/ts-file.js';
+export async function generateResources(ctx) {
+    const targetDir = path.join(ctx.absoluteDir, 'resources');
+    ctx.logger.log(chalk.yellow('Generating resources'));
+    const resourcesTs = new TsFile();
+    resourcesTs.header = ctx.fileHeader;
+    let i = 0;
+    fs.mkdirSync(targetDir, { recursive: true });
+    const resourceNames = Array.from(ctx.document.resources.keys()).sort();
+    for (const resourceName of resourceNames) {
+        const resource = ctx.document.getResource(resourceName);
+        const tsFile = new TsFile();
+        tsFile.header = ctx.fileHeader;
+        tsFile.content = `\n/**\n * ${wrapJSDocString(resource.description || resource.name)}
+ * @type ${resource.name}
+ * @kind ${resource.kind}
+ * @url ${joinPath(ctx.serviceUrl, '$metadata/resources/' + resource.name)}
+ */\n`;
+        const filename = `./resources/${resource.name}`;
+        if (resource instanceof CollectionResourceInfo) {
+            await generateCollectionResource(ctx, resource, tsFile);
+            await tsFile.writeFile(ctx, path.join(targetDir, resource.name + '.ts'));
+            resourcesTs.addExport(`${filename}` + ctx.extension);
+            i++;
+        }
+        else if (resource instanceof SingletonResourceInfo) {
+            await generateSingletonResource(ctx, resource, tsFile);
+            await tsFile.writeFile(ctx, path.join(targetDir, resource.name + '.ts'));
+            resourcesTs.addExport(`${filename}${ctx.extension}`);
+            i++;
+        }
+    }
+    if (i) {
+        await resourcesTs.writeFile(ctx, path.join(ctx.absoluteDir, 'resources.ts'));
+    }
+}
+async function generateCollectionResource(ctx, resource, tsFile) {
+    tsFile.header = ctx.fileHeader;
+    tsFile.addImport('@opra/client', 'OpraHttpClient', 'HttpCollectionService');
+    tsFile.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
+    const methods = resource.getHandlerNames()
+        .filter(x => x !== 'count')
+        .map(x => `'${x}'`).join(' | ');
+    tsFile.content = `
+export function ${resource.name}(
+    client: OpraHttpClient
+): Pick<HttpCollectionService<${resource.dataType.name}, never>, ${methods}> {
+  return client.collection('${resource.name}');
+}
+`;
+}
+async function generateSingletonResource(ctx, resource, tsFile) {
+    tsFile.header = ctx.fileHeader;
+    tsFile.addImport('@opra/client', 'OpraHttpClient', 'HttpSingletonService');
+    tsFile.addImport('../types/' + resource.dataType.name + ctx.extension, resource.dataType.name);
+    const methods = resource.getHandlerNames().map(x => `'${x}'`).join(' | ');
+    tsFile.content = `
+export function ${resource.name}(client: OpraHttpClient): Pick<HttpSingletonService<${resource.dataType.name}, never>, ${methods}> {
+  return client.singleton('${resource.name}');
+}
+`;
+}

package/esm/oprimp/generate-service.d.ts

@@ -9,5 +9,6 @@ export interface ServiceGenerateConfig {
     logger?: ILogger;
     writer?: IFileWriter;
     fileHeader?: string;
+    extension?: string;
 }
 export declare function generateService(config: ServiceGenerateConfig): Promise<void>;

package/esm/oprimp/generate-service.js

@@ -1,15 +1,9 @@
 import * as fs from 'fs';
 import path from 'path';
 import * as process from 'process';
-import { TsFile } from '../utils/ts-file.js';
 import { FileWriter } from './file-writer.js';
+import { generateResources } from './generate-resoruces.js';
 import { generateTypes } from './generate-types.js';
-const builtinsMap = {
-    base64Binary: 'Buffer',
-    dateString: 'string',
-    guid: 'string',
-    integer: 'number'
-};
 export async function generateService(config) {
     const cwd = config.cwd || process.cwd();
     const logger = config.logger || console;
@@ -21,21 +15,10 @@ export async function generateService(config) {
         relativeDir: config.outDir,
         absoluteDir: path.resolve(cwd, config.outDir),
         fileHeader: config.fileHeader || '',
-        writer: config.writer || new FileWriter(),
-        indexTs: new TsFile(),
-        builtins: {},
+        extension: config.extension,
+        writer: config.writer || new FileWriter()
     };
     fs.mkdirSync(ctx.absoluteDir, { recursive: true });
     await generateTypes(ctx);
-    const builtinsTs = new TsFile();
-    builtinsTs.header = ctx.fileHeader;
-    builtinsTs.content = Object.keys(ctx.builtins)
-        .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
-        .map(s => `export type ${s} = ${builtinsMap[s] || 'any'};`)
-        .join('\n');
-    if (builtinsTs.content) {
-        await builtinsTs.writeFile(ctx, path.join(ctx.absoluteDir, 'builtins.ts'));
-        ctx.indexTs.addExport('./builtins.js');
-    }
-    await ctx.indexTs.writeFile(ctx, path.join(ctx.absoluteDir, 'index.ts'));
+    await generateResources(ctx);
 }

package/esm/oprimp/generate-types.js

@@ -4,15 +4,32 @@ import path from 'path';
 import { ComplexType, joinPath, UnionType } from '@opra/common';
 import { wrapJSDocString } from '../utils/string-utils.js';
 import { TsFile } from '../utils/ts-file.js';
+const builtinsMap = {
+    base64Binary: 'Buffer',
+    dateString: 'string',
+    guid: 'string',
+    integer: 'number',
+    date: 'Date'
+};
 export async function generateTypes(ctx) {
     const targetDir = path.join(ctx.absoluteDir, 'types');
     ctx.logger.log(chalk.yellow('Generating types'));
+    const typesTs = new TsFile();
+    typesTs.header = ctx.fileHeader;
+    let i = 0;
+    const builtinsTs = new TsFile();
+    typesTs.header = ctx.fileHeader;
     fs.mkdirSync(targetDir, { recursive: true });
     const typeNames = Array.from(ctx.document.types.keys()).sort();
     for (const typeName of typeNames) {
         const dataType = ctx.document.getDataType(typeName);
-        if (dataType.isBuiltin)
+        if (dataType.isBuiltin) {
+            if (!builtinsMap[dataType.name])
+                continue;
+            typesTs.addExport('./types/builtins.js');
+            builtinsTs.content += `export type ${dataType.name} = ${builtinsMap[dataType.name]};\n`;
             continue;
+        }
         const tsFile = new TsFile();
         tsFile.header = ctx.fileHeader;
         tsFile.content = `\n/**\n * ${wrapJSDocString(dataType.description || dataType.name)}
@@ -20,15 +37,20 @@ export async function generateTypes(ctx) {
  * @kind ${dataType.kind}
  * @url ${joinPath(ctx.serviceUrl, '$metadata/types/' + dataType.name)}
  */\n`;
+        const filename = `./types/${dataType.name}`;
         if (dataType instanceof ComplexType) {
             await generateComplexType(ctx, dataType, tsFile);
             await tsFile.writeFile(ctx, path.join(targetDir, dataType.name + '.ts'));
+            typesTs.addExport(`${filename}` + ctx.extension);
+            i++;
         }
     }
+    await builtinsTs.writeFile(ctx, path.join(targetDir, 'builtins.ts'));
+    if (i) {
+        await typesTs.writeFile(ctx, path.join(ctx.absoluteDir, 'types.ts'));
+    }
 }
 async function generateComplexType(ctx, dataType, tsFile) {
-    const filename = `./types/${dataType.name}`;
-    ctx.indexTs.addExport(`${filename}.js`);
     tsFile.header = ctx.fileHeader;
     tsFile.content = `
 export class ${dataType.name} {
@@ -45,7 +67,7 @@ interface I${dataType.name}`;
     if (dataType.extends) {
         tsFile.content += ' extends ' +
             dataType.extends.map(ex => {
-                tsFile.addImport('./' + ex.type + '.js', ex.type);
+                tsFile.addImport('./' + ex.type + ctx.extension, ex.type);
                 let s = '';
                 if (ex.omit)
                     s += 'Omit<';
@@ -61,16 +83,12 @@ interface I${dataType.name}`;
     }
     const getTypeName = (dt) => {
         if (dt.isBuiltin) {
-            if (dt.name === 'any' || dt.name === 'string' || dt.name === 'number' ||
-                dt.name === 'boolean' || dt.name === 'object')
+            if (!builtinsMap[dt.name])
                 return dt.name;
-            if (dt.name === 'date')
-                return 'Date';
-            tsFile.addImport('../builtins.js', dt.name);
-            ctx.builtins[dt.name] = true;
+            tsFile.addImport('./builtins' + ctx.extension, dt.name);
             return dt.name;
         }
-        tsFile.addImport('./' + dt.name + '.js', dt.name);
+        tsFile.addImport('./' + dt.name + ctx.extension, dt.name);
         return dt.name;
     };
     tsFile.content += ' {\n\t';

package/esm/oprimp.js

@@ -14,6 +14,7 @@ program
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
     .option('--no-color', 'Disables colors in logs messages')
+    .option('-e, --extension <extension>', 'File extensions of imports')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
         chalk.level = 0;
@@ -27,6 +28,7 @@ program
         serviceUrl,
         document: metadata,
         outDir,
+        extension: (options.extension ? '.' + options.extension : ''),
         fileHeader: '/*\n' +
             ' * Generated by OPRA Service Generator \n' +
             ' * Version: ' + pkgJson.version + '\n' +

package/esm/utils/ts-file.d.ts

@@ -4,8 +4,8 @@ export declare class TsFile {
     exports: Record<string, string[]>;
     header: string;
     content: string;
-    addImport: (filename: string, imported: string) => void;
-    addExport: (filename: string, exported?: string) => void;
+    addImport: (filename: string, ...imported: string[]) => void;
+    addExport: (filename: string, ...exported: string[]) => void;
     generate(): string;
     writeFile(ctx: ServiceGenerationContext, filename: string): Promise<void>;
 }

package/esm/utils/ts-file.js

@@ -7,15 +7,19 @@ export class TsFile {
         this.exports = {};
         this.header = '';
         this.content = '';
-        this.addImport = (filename, imported) => {
+        this.addImport = (filename, ...imported) => {
             this.imports[filename] = this.imports[filename] || [];
-            if (!this.imports[filename].includes(imported))
-                this.imports[filename].push(imported);
+            imported.forEach(x => {
+                if (!this.imports[filename].includes(x))
+                    this.imports[filename].push(x);
+            });
         };
-        this.addExport = (filename, exported) => {
+        this.addExport = (filename, ...exported) => {
             this.exports[filename] = this.exports[filename] || [];
-            if (exported && !this.exports[filename].includes(exported))
-                this.exports[filename].push(exported);
+            exported.forEach(x => {
+                if (!this.exports[filename].includes(x))
+                    this.exports[filename].push(x);
+            });
         };
     }
     generate() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -28,14 +28,13 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/node-client": "^0.12.0",
+    "@opra/node-client": "^0.13.0",
     "chalk": "^5.2.0",
     "commander": "^10.0.0",
     "putil-flattentext": "^2.1.1",
     "js-string-escape": "^1.0.1"
   },
-  "devDependencies": {
-  },
+  "devDependencies": {},
   "type": "module",
   "types": "esm/index.d.ts",
   "exports": {
@@ -64,4 +63,4 @@
     "tool",
     "oprimp"
   ]
-}
+}