@opra/cli 0.15.0 → 0.16.1

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

@@ -1,18 +1,22 @@
-import chalk from 'chalk';
-import fs from 'node:fs';
-import path from 'node:path';
-import process from 'node:process';
-import { OpraHttpClient } from '@opra/node-client';
-import { FileWriter } from './file-writer.js';
-import { processResources } from './process-resources.js';
-import { generateComplexTypeDefinition, generateEnumTypeDefinition, generateMappedTypeDefinition, generateSimpleTypeDefinition, generateTypeFile, generateUnionTypeDefinition, processTypes, resolveTypeNameOrDef } from './process-types.js';
-import { TsFile } from './ts-file.js';
-export class ApiExporter {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApiExporter = void 0;
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
+const node_path_1 = tslib_1.__importDefault(require("node:path"));
+const node_process_1 = tslib_1.__importDefault(require("node:process"));
+const node_client_1 = require("@opra/node-client");
+const file_writer_js_1 = require("./file-writer.js");
+const process_resources_js_1 = require("./process-resources.js");
+const process_types_js_1 = require("./process-types.js");
+const ts_file_js_1 = require("./ts-file.js");
+class ApiExporter {
     constructor(config) {
         this.files = {};
-        this.client = new OpraHttpClient(config.serviceUrl);
-        this.cwd = config.cwd || process.cwd();
-        this.outDir = path.resolve(this.cwd, config.outDir);
+        this.client = new node_client_1.OpraHttpClient(config.serviceUrl);
+        this.cwd = config.cwd || node_process_1.default.cwd();
+        this.outDir = node_path_1.default.resolve(this.cwd, config.outDir);
         this.logger = config.logger || {
             log: () => void 0,
             error: () => void 0,
@@ -22,13 +26,13 @@ export class ApiExporter {
         };
         this.fileHeader = config.fileHeader || '';
         this.importExt = config.importExt || '';
-        this.writer = config.writer || new FileWriter();
+        this.writer = config.writer || new file_writer_js_1.FileWriter();
         // this.nsMap = nsMap || new ResponsiveMap(); // implement references later
     }
     async execute() {
-        this.logger.log(chalk.yellow('Fetching service metadata from'), chalk.whiteBright(this.client.serviceUrl));
+        this.logger.log(chalk_1.default.yellow('Fetching service metadata from'), chalk_1.default.whiteBright(this.client.serviceUrl));
         this.document = await this.client.getMetadata();
-        this.logger.log(chalk.yellow('Retrieved service info:\n'), chalk.white('Title:'), chalk.magenta(this.document.info.title), '\n', chalk.white('Version:'), chalk.magenta(this.document.info.version), '\n', chalk.white('Resources:'), chalk.magenta(this.document.resources.size), 'resources found\n', chalk.white('Types:'), chalk.magenta(this.document.types.size), 'types found\n');
+        this.logger.log(chalk_1.default.yellow('Retrieved service info:\n'), chalk_1.default.white('Title:'), chalk_1.default.magenta(this.document.info.title), '\n', chalk_1.default.white('Version:'), chalk_1.default.magenta(this.document.info.version), '\n', chalk_1.default.white('Resources:'), chalk_1.default.magenta(this.document.resources.size), 'resources found\n', chalk_1.default.white('Types:'), chalk_1.default.magenta(this.document.types.size), 'types found\n');
         this.name = (this.name || this.document.info.title || 'Service1').replace(/[^\w_$]*/g, '');
         this.name = this.name.charAt(0).toUpperCase() + this.name.substring(1);
         this.fileHeader += `/* 
@@ -36,21 +40,21 @@ export class ApiExporter {
  * Version ${this.document.info.version}
  * ${this.client.serviceUrl}
 */`;
-        this.logger.log(chalk.yellow('Removing old files..'));
+        this.logger.log(chalk_1.default.yellow('Removing old files..'));
         this.cleanDirectory(this.outDir);
-        this.logger.log(chalk.yellow(`Generating service interface ( ${chalk.whiteBright(this.name)} )`));
-        fs.mkdirSync(this.outDir, { recursive: true });
+        this.logger.log(chalk_1.default.yellow(`Generating service interface ( ${chalk_1.default.whiteBright(this.name)} )`));
+        node_fs_1.default.mkdirSync(this.outDir, { recursive: true });
         await this.processTypes();
         await this.processResources();
         // Write files
         for (const file of Object.values(this.files)) {
-            const targetDir = path.dirname(file.filename);
-            fs.mkdirSync(targetDir, { recursive: true });
+            const targetDir = node_path_1.default.dirname(file.filename);
+            node_fs_1.default.mkdirSync(targetDir, { recursive: true });
             await this.writer.writeFile(file.filename, file.generate({ importExt: this.importExt }));
         }
     }
     getFile(filePath) {
-        return this.files[path.resolve(path.join(this.outDir, filePath))];
+        return this.files[node_path_1.default.resolve(node_path_1.default.join(this.outDir, filePath))];
     }
     addFile(filePath, returnExists) {
         let file = this.getFile(filePath);
@@ -59,27 +63,27 @@ export class ApiExporter {
                 return file;
             throw new Error(`File "${filePath}" already exists`);
         }
-        file = new TsFile(path.resolve(path.join(this.outDir, filePath)));
+        file = new ts_file_js_1.TsFile(node_path_1.default.resolve(node_path_1.default.join(this.outDir, filePath)));
         file.header = this.fileHeader;
         this.files[file.filename] = file;
         return file;
     }
     cleanDirectory(dirname) {
-        if (!fs.existsSync(dirname))
+        if (!node_fs_1.default.existsSync(dirname))
             return;
-        const files = fs.readdirSync(dirname);
+        const files = node_fs_1.default.readdirSync(dirname);
         for (const f of files) {
-            const absolutePath = path.join(dirname, f);
-            if (fs.statSync(absolutePath).isDirectory()) {
+            const absolutePath = node_path_1.default.join(dirname, f);
+            if (node_fs_1.default.statSync(absolutePath).isDirectory()) {
                 this.cleanDirectory(absolutePath);
-                if (!fs.readdirSync(absolutePath).length)
-                    fs.rmdirSync(absolutePath);
+                if (!node_fs_1.default.readdirSync(absolutePath).length)
+                    node_fs_1.default.rmdirSync(absolutePath);
                 continue;
             }
-            if (path.extname(f) === '.ts') {
-                const contents = fs.readFileSync(absolutePath, 'utf-8');
+            if (node_path_1.default.extname(f) === '.ts') {
+                const contents = node_fs_1.default.readFileSync(absolutePath, 'utf-8');
                 if (contents.includes('#!oprimp_auto_generated!#')) {
-                    fs.unlinkSync(absolutePath);
+                    node_fs_1.default.unlinkSync(absolutePath);
                 }
             }
         }
@@ -89,14 +93,15 @@ export class ApiExporter {
         await exporter.execute();
     }
 }
+exports.ApiExporter = ApiExporter;
 (() => {
-    ApiExporter.prototype.processResources = processResources;
-    ApiExporter.prototype.processTypes = processTypes;
-    ApiExporter.prototype.generateTypeFile = generateTypeFile;
-    ApiExporter.prototype.generateComplexTypeDefinition = generateComplexTypeDefinition;
-    ApiExporter.prototype.generateSimpleTypeDefinition = generateSimpleTypeDefinition;
-    ApiExporter.prototype.resolveTypeNameOrDef = resolveTypeNameOrDef;
-    ApiExporter.prototype.generateEnumTypeDefinition = generateEnumTypeDefinition;
-    ApiExporter.prototype.generateUnionTypeDefinition = generateUnionTypeDefinition;
-    ApiExporter.prototype.generateMappedTypeDefinition = generateMappedTypeDefinition;
+    ApiExporter.prototype.processResources = process_resources_js_1.processResources;
+    ApiExporter.prototype.processTypes = process_types_js_1.processTypes;
+    ApiExporter.prototype.generateTypeFile = process_types_js_1.generateTypeFile;
+    ApiExporter.prototype.generateComplexTypeDefinition = process_types_js_1.generateComplexTypeDefinition;
+    ApiExporter.prototype.generateSimpleTypeDefinition = process_types_js_1.generateSimpleTypeDefinition;
+    ApiExporter.prototype.resolveTypeNameOrDef = process_types_js_1.resolveTypeNameOrDef;
+    ApiExporter.prototype.generateEnumTypeDefinition = process_types_js_1.generateEnumTypeDefinition;
+    ApiExporter.prototype.generateUnionTypeDefinition = process_types_js_1.generateUnionTypeDefinition;
+    ApiExporter.prototype.generateMappedTypeDefinition = process_types_js_1.generateMappedTypeDefinition;
 })();

package/esm/api-exporter/file-writer.js

@@ -1,6 +1,11 @@
-import fs from 'fs';
-export class FileWriter {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FileWriter = void 0;
+const tslib_1 = require("tslib");
+const fs_1 = tslib_1.__importDefault(require("fs"));
+class FileWriter {
     writeFile(filename, contents) {
-        fs.writeFileSync(filename, contents, 'utf-8');
+        fs_1.default.writeFileSync(filename, contents, 'utf-8');
     }
 }
+exports.FileWriter = FileWriter;

package/esm/api-exporter/index.js

@@ -1 +1,4 @@
-export * from './api-exporter.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./api-exporter.js"), exports);

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

@@ -1,24 +1,28 @@
-import chalk from 'chalk';
-import path from 'node:path';
-import { Collection, joinPath, Singleton } from '@opra/common';
-import { wrapJSDocString } from '../utils/string-utils.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processResources = void 0;
+const tslib_1 = require("tslib");
+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");
 /**
  *
  * @param targetDir
  */
-export async function processResources(targetDir = '') {
-    this.logger.log(chalk.yellow('Processing resources'));
+async function processResources(targetDir = '') {
+    this.logger.log(chalk_1.default.yellow('Processing resources'));
     const { document } = this;
-    const serviceTs = this.addFile(path.join(targetDir, this.name + '.ts'));
+    const serviceTs = this.addFile(node_path_1.default.join(targetDir, this.name + '.ts'));
     serviceTs.addImportPackage('@opra/client', ['HttpServiceBase']);
     const indexTs = this.addFile('/index.ts', true);
     indexTs.addExportFile(serviceTs.filename);
     serviceTs.content = `\nexport class ${this.name} extends HttpServiceBase {\n`;
     for (const resource of document.resources.values()) {
-        serviceTs.content += `\n/**\n * ${wrapJSDocString(resource.description || resource.name)}
- * @url ${joinPath(this.client.serviceUrl, '$metadata#resources/' + resource.name)}
+        serviceTs.content += `\n/**\n * ${(0, string_utils_js_1.wrapJSDocString)(resource.description || resource.name)}
+ * @url ${(0, common_1.joinPath)(this.client.serviceUrl, '$metadata#resources/' + resource.name)}
  */`;
-        if (resource instanceof Collection) {
+        if (resource instanceof common_1.Collection) {
             const typeName = resource.type.name || '';
             serviceTs.addImportPackage('@opra/client', ['HttpCollectionNode']);
             serviceTs.addImportFile('types/' + typeName, [typeName]);
@@ -29,7 +33,7 @@ export async function processResources(targetDir = '') {
     return this.$client.collection('${resource.name}');
   }\n`;
         }
-        else if (resource instanceof Singleton) {
+        else if (resource instanceof common_1.Singleton) {
             const typeName = resource.type.name || '';
             serviceTs.addImportPackage('@opra/client', ['HttpSingletonNode']);
             serviceTs.addImportFile('types/' + typeName, [typeName]);
@@ -43,3 +47,4 @@ export async function processResources(targetDir = '') {
     }
     serviceTs.content += '}';
 }
+exports.processResources = processResources;

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

@@ -1,58 +1,63 @@
-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';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateMappedTypeDefinition = exports.generateUnionTypeDefinition = exports.generateEnumTypeDefinition = exports.generateSimpleTypeDefinition = exports.generateComplexTypeDefinition = exports.resolveTypeNameOrDef = exports.generateTypeFile = exports.processTypes = void 0;
+const tslib_1 = require("tslib");
+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'];
 /**
  *
  * @param targetDir
  */
-export async function processTypes(targetDir = '') {
-    this.logger.log(chalk.yellow('Processing types'));
+async function processTypes(targetDir = '') {
+    this.logger.log(chalk_1.default.yellow('Processing types'));
     const { document } = this;
-    const typesTs = this.addFile(path.join(targetDir, 'types.ts'));
+    const typesTs = this.addFile(node_path_1.default.join(targetDir, 'types.ts'));
     for (const dataType of document.types.values()) {
         const expFile = await this.generateTypeFile(dataType, targetDir);
         typesTs.addExportFile(expFile.filename);
     }
 }
+exports.processTypes = processTypes;
 /**
  *
  * @param dataType
  * @param targetDir
  */
-export async function generateTypeFile(dataType, targetDir = '') {
+async function generateTypeFile(dataType, targetDir = '') {
     const typeName = dataType.name;
     if (!typeName)
         throw new TypeError(`DataType has no name`);
     let filePath;
-    if (dataType instanceof SimpleType)
+    if (dataType instanceof common_1.SimpleType)
         filePath = '/simple-types.ts';
-    else if (dataType instanceof ComplexType)
+    else if (dataType instanceof common_1.ComplexType)
         filePath = `/types/${typeName}.ts`;
-    else if (dataType instanceof EnumType) {
+    else if (dataType instanceof common_1.EnumType) {
         filePath = `/enums/${typeName}.ts`;
     }
     else
         throw new TypeError(`Unimplemented DataType (${dataType.kind})`);
-    const file = this.addFile(path.join(targetDir, filePath), true);
+    const file = this.addFile(node_path_1.default.join(targetDir, filePath), true);
     if (file.exportTypes.includes(typeName))
         return file;
     file.exportTypes.push(typeName);
     const indexTs = this.addFile('/index.ts', true);
     indexTs.addExportFile(file.filename);
-    file.content += `\n/**\n * ${wrapJSDocString(dataType.description || typeName)}
+    file.content += `\n/**\n * ${(0, string_utils_js_1.wrapJSDocString)(dataType.description || typeName)}
  * @type ${typeName}
  * @kind ${dataType.kind}
- * @url ${joinPath(this.client.serviceUrl, '$metadata#types/' + typeName)}
+ * @url ${(0, common_1.joinPath)(this.client.serviceUrl, '$metadata#types/' + typeName)}
  */\n`;
-    if (dataType instanceof SimpleType) {
+    if (dataType instanceof common_1.SimpleType) {
         file.content += `export type ${typeName} = ` + await this.generateSimpleTypeDefinition(file, dataType);
     }
-    else if (dataType instanceof EnumType) {
+    else if (dataType instanceof common_1.EnumType) {
         file.content += `export enum ${typeName} ` + await this.generateEnumTypeDefinition(file, dataType);
     }
-    else if (dataType instanceof ComplexType) {
+    else if (dataType instanceof common_1.ComplexType) {
         file.content += `export class ${typeName} {
   constructor(init?: Partial<I${typeName}>) {
     if (init)
@@ -68,13 +73,14 @@ interface I${typeName} ${await this.generateComplexTypeDefinition(file, dataType
     }
     return file;
 }
+exports.generateTypeFile = generateTypeFile;
 /**
  *
  * @param file
  * @param dataType
  * @param forInterface
  */
-export async function resolveTypeNameOrDef(file, dataType, forInterface) {
+async function resolveTypeNameOrDef(file, dataType, forInterface) {
     if (dataType.name) {
         if (internalTypeNames.includes(dataType.name))
             return dataType.name;
@@ -82,25 +88,26 @@ export async function resolveTypeNameOrDef(file, dataType, forInterface) {
         file.addImportFile(f.filename, [dataType.name]);
         return dataType.name;
     }
-    if (dataType instanceof ComplexType)
+    if (dataType instanceof common_1.ComplexType)
         return this.generateComplexTypeDefinition(file, dataType, forInterface);
-    if (dataType instanceof SimpleType)
+    if (dataType instanceof common_1.SimpleType)
         return this.generateSimpleTypeDefinition(file, dataType);
-    if (dataType instanceof EnumType)
+    if (dataType instanceof common_1.EnumType)
         return this.generateEnumTypeDefinition(file, dataType);
-    if (dataType instanceof UnionType)
+    if (dataType instanceof common_1.UnionType)
         return this.generateUnionTypeDefinition(file, dataType, forInterface);
-    if (dataType instanceof MappedType)
+    if (dataType instanceof common_1.MappedType)
         return this.generateMappedTypeDefinition(file, dataType, forInterface);
     return 'xxx';
 }
+exports.resolveTypeNameOrDef = resolveTypeNameOrDef;
 /**
  *
  * @param file
  * @param dataType
  * @param forInterface
  */
-export async function generateComplexTypeDefinition(file, dataType, forInterface) {
+async function generateComplexTypeDefinition(file, dataType, forInterface) {
     let out = '';
     if (dataType.base) {
         const base = await this.resolveTypeNameOrDef(file, dataType.base, forInterface);
@@ -135,12 +142,13 @@ export async function generateComplexTypeDefinition(file, dataType, forInterface
         out += '[key: string]: any;\n';
     return out + '\b}';
 }
+exports.generateComplexTypeDefinition = generateComplexTypeDefinition;
 /**
  *
  * @param file
  * @param dataType
  */
-export async function generateSimpleTypeDefinition(file, dataType) {
+async function generateSimpleTypeDefinition(file, dataType) {
     if (dataType.ctor === Boolean)
         return 'boolean';
     if (dataType.ctor === String)
@@ -155,12 +163,13 @@ export async function generateSimpleTypeDefinition(file, dataType) {
         return 'object';
     return 'any';
 }
+exports.generateSimpleTypeDefinition = generateSimpleTypeDefinition;
 /**
  *
  * @param file
  * @param dataType
  */
-export async function generateEnumTypeDefinition(file, dataType) {
+async function generateEnumTypeDefinition(file, dataType) {
     let out = '{\n\t';
     for (const [k, v] of Object.entries(dataType.values)) {
         // Print JSDoc
@@ -176,24 +185,26 @@ export async function generateEnumTypeDefinition(file, dataType) {
     }
     return out + '\b}';
 }
+exports.generateEnumTypeDefinition = generateEnumTypeDefinition;
 /**
  *
  * @param file
  * @param dataType
  * @param forInterface
  */
-export async function generateUnionTypeDefinition(file, dataType, forInterface) {
+async function generateUnionTypeDefinition(file, dataType, forInterface) {
     // let out = '';
     return (await Promise.all(dataType.types
         .map(t => this.resolveTypeNameOrDef(file, t, forInterface)))).join(forInterface ? ', ' : ' & ');
 }
+exports.generateUnionTypeDefinition = generateUnionTypeDefinition;
 /**
  *
  * @param file
  * @param dataType
  * @param forInterface
  */
-export async function generateMappedTypeDefinition(file, dataType, forInterface) {
+async function generateMappedTypeDefinition(file, dataType, forInterface) {
     return (dataType.pick ? 'Pick<' : 'Omit<') +
         (await this.resolveTypeNameOrDef(file, dataType.type, forInterface)) +
         ', ' +
@@ -201,3 +212,4 @@ export async function generateMappedTypeDefinition(file, dataType, forInterface)
             .map(x => `'${x}'`).join(' | ') +
         '>';
 }
+exports.generateMappedTypeDefinition = generateMappedTypeDefinition;

package/esm/api-exporter/ts-file.js

@@ -1,6 +1,10 @@
-import path from 'path';
-import flattenText from 'putil-flattentext';
-export class TsFile {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.setExt = exports.relativePath = exports.TsFile = void 0;
+const tslib_1 = require("tslib");
+const path_1 = tslib_1.__importDefault(require("path"));
+const putil_flattentext_1 = tslib_1.__importDefault(require("putil-flattentext"));
+class TsFile {
     constructor(filename) {
         this.filename = filename;
         this.importFiles = {};
@@ -16,7 +20,7 @@ export class TsFile {
             });
         };
         this.addImportFile = (filename, types) => {
-            filename = path.resolve(this.dirname, filename);
+            filename = path_1.default.resolve(this.dirname, filename);
             this.importFiles[filename] = this.importFiles[filename] || [];
             types?.forEach(x => {
                 if (!this.importFiles[filename].includes(x))
@@ -24,7 +28,7 @@ export class TsFile {
             });
         };
         this.addExportFile = (filename, types) => {
-            filename = path.resolve(this.dirname, filename);
+            filename = path_1.default.resolve(this.dirname, filename);
             if (filename.endsWith('.ts') || filename.endsWith('.js'))
                 filename = setExt(filename, '');
             this.exportFiles[filename] = this.exportFiles[filename] || [];
@@ -33,18 +37,18 @@ export class TsFile {
                     this.exportFiles[filename].push(x);
             });
         };
-        this.dirname = path.dirname(filename);
+        this.dirname = path_1.default.dirname(filename);
     }
     generate(options) {
-        const dirname = path.dirname(this.filename);
+        const dirname = path_1.default.dirname(this.filename);
         let output = '/* #!oprimp_auto_generated!# !! Do NOT remove this line */\n' +
-            (this.header ? flattenText(this.header) + '\n\n' : '\n');
+            (this.header ? (0, putil_flattentext_1.default)(this.header) + '\n\n' : '\n');
         const importStr = Object.keys(this.importFiles)
             .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
             .map(filename => {
             const types = this.importFiles[filename];
             let relFile = filename;
-            if (path.isAbsolute(filename)) {
+            if (path_1.default.isAbsolute(filename)) {
                 relFile = relativePath(dirname, filename);
                 if (options?.importExt)
                     relFile = setExt(relFile, options.importExt);
@@ -53,14 +57,14 @@ export class TsFile {
         })
             .join('\n');
         if (importStr)
-            output += flattenText(importStr) + '\n';
-        output += flattenText(this.content);
+            output += (0, putil_flattentext_1.default)(importStr) + '\n';
+        output += (0, putil_flattentext_1.default)(this.content);
         const exportStr = Object.keys(this.exportFiles)
             .sort((a, b) => a.toLowerCase().localeCompare(b.toLowerCase()))
             .map(filename => {
             const types = this.exportFiles[filename];
             let relFile = filename;
-            if (path.isAbsolute(filename)) {
+            if (path_1.default.isAbsolute(filename)) {
                 relFile = relativePath(dirname, filename);
                 if (options?.importExt)
                     relFile = setExt(relFile, options.importExt);
@@ -69,15 +73,18 @@ export class TsFile {
         })
             .join('\n');
         if (exportStr)
-            output += flattenText(exportStr) + '\n';
+            output += (0, putil_flattentext_1.default)(exportStr) + '\n';
         return output;
     }
 }
-export function relativePath(from, to) {
-    const s = path.relative(from, to);
+exports.TsFile = TsFile;
+function relativePath(from, to) {
+    const s = path_1.default.relative(from, to);
     return s.startsWith('.') ? s : ('./' + s);
 }
-export function setExt(filename, ext) {
-    const e = path.extname(filename);
+exports.relativePath = relativePath;
+function setExt(filename, ext) {
+    const e = path_1.default.extname(filename);
     return filename.substring(0, filename.length - e.length) + (ext ? '.' + ext : '');
 }
+exports.setExt = setExt;

package/esm/index.js

@@ -1 +1,4 @@
-export * from './api-exporter/index.js';
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./api-exporter/index.js"), exports);

package/esm/interfaces/file-writer.interface.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/esm/interfaces/logger.interface.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/esm/interfaces/service-generation-context.interface.js

@@ -1 +1,2 @@
-export {};
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/esm/oprimp-cli.js

@@ -1,14 +1,17 @@
-import chalk from 'chalk';
-import { program } from 'commander';
-import * as console from 'console';
-import * as fs from 'fs';
-import path from 'path';
-import * as process from 'process';
-import { ApiExporter } from './api-exporter/api-exporter.js';
-import { getCallerFile } from './utils/get-caller-file.util.js';
-const dirname = path.dirname(getCallerFile());
-const pkgJson = JSON.parse(fs.readFileSync(path.resolve(dirname, '../package.json'), 'utf-8'));
-program
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const commander_1 = require("commander");
+const console = tslib_1.__importStar(require("console"));
+const fs = tslib_1.__importStar(require("fs"));
+const path_1 = tslib_1.__importDefault(require("path"));
+const process = tslib_1.__importStar(require("process"));
+const api_exporter_js_1 = require("./api-exporter/api-exporter.js");
+const get_caller_file_util_js_1 = require("./utils/get-caller-file.util.js");
+const dirname = path_1.default.dirname((0, get_caller_file_util_js_1.getCallerFile)());
+const pkgJson = JSON.parse(fs.readFileSync(path_1.default.resolve(dirname, '../package.json'), 'utf-8'));
+commander_1.program
     .version(pkgJson.version)
     .argument('<serviceUrl>', 'OPRA service url')
     .argument('<outDir>', 'Output directory')
@@ -17,8 +20,8 @@ program
     .option('--no-color', 'Disables colors in logs messages')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
-        chalk.level = 0;
-    await ApiExporter.execute({
+        chalk_1.default.level = 0;
+    await api_exporter_js_1.ApiExporter.execute({
         serviceUrl,
         logger: console,
         outDir,
@@ -27,6 +30,6 @@ program
         fileHeader: '/* Generated by OPRA Service Generator, Version ' + pkgJson.version + '*/\n' +
             '/* eslint-disable import/extensions,simple-import-sort/imports */\n'
     });
-    console.log(chalk.greenBright('Completed'));
+    console.log(chalk_1.default.greenBright('Completed'));
 });
-program.parse(process.argv);
+commander_1.program.parse(process.argv);

package/esm/utils/get-caller-file.util.js

@@ -1,5 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCallerFile = void 0;
 const PATH_PATTERN = /^(?:file:\/\/)?(.+)$/;
-export function getCallerFile(position = 1) {
+function getCallerFile(position = 1) {
     if (position >= Error.stackTraceLimit) {
         throw new TypeError('getCallerFile(position) requires position be less then Error.stackTraceLimit but position was: `' +
             position + '` and Error.stackTraceLimit was: `' + Error.stackTraceLimit + '`');
@@ -18,3 +21,4 @@ export function getCallerFile(position = 1) {
     }
     return '';
 }
+exports.getCallerFile = getCallerFile;

package/esm/utils/string-utils.js

@@ -1,5 +1,9 @@
-import jsStringEscape from 'js-string-escape';
-export function wrapJSDocString(s, indent, currentColumn) {
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.wrapTypeArray = exports.wrapStringArray = exports.wrapQuotedString = exports.wrapJSDocString = void 0;
+const tslib_1 = require("tslib");
+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);
@@ -10,8 +14,9 @@ export function wrapJSDocString(s, indent, currentColumn) {
         lineEnd: ''
     });
 }
-export function wrapQuotedString(s, indent, currentColumn) {
-    const arr = jsStringEscape(s || '')
+exports.wrapJSDocString = wrapJSDocString;
+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);
     return '\'' + _printLines(arr, {
@@ -21,16 +26,19 @@ export function wrapQuotedString(s, indent, currentColumn) {
         lineEnd: '\' +',
     }) + '\'';
 }
-export function wrapStringArray(arr, indent, currentColumn) {
+exports.wrapQuotedString = wrapQuotedString;
+function wrapStringArray(arr, indent, currentColumn) {
     const ar1 = arr
         .map((x, i, a) => ('\'' + x + '\'') + (i < a.length - 1 ? ', ' : ''));
     return '[' + _printLines(ar1, { indent, currentColumn }) + ']';
 }
-export function wrapTypeArray(arr, indent, currentColumn) {
+exports.wrapStringArray = wrapStringArray;
+function wrapTypeArray(arr, indent, currentColumn) {
     const ar1 = arr
         .map((x, i, a) => x + (i < a.length - 1 ? ' | ' : ''));
     return _printLines(ar1, { indent, currentColumn });
 }
+exports.wrapTypeArray = wrapTypeArray;
 function _printLines(arr, opts = {}) {
     let s = '';
     let line = '';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "0.15.0",
+  "version": "0.16.1",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -28,7 +28,7 @@
     "clean:cover": "rimraf ../../coverage/client"
   },
   "dependencies": {
-    "@opra/node-client": "^0.15.0",
+    "@opra/node-client": "^0.16.1",
     "chalk": "^5.2.0",
     "commander": "^10.0.1",
     "js-string-escape": "^1.0.1",
@@ -36,7 +36,7 @@
     "putil-varhelpers": "^1.6.5"
   },
   "type": "module",
-  "types": "esm/index.d.ts",
+  "types": "types/index.d.ts",
   "exports": {
     ".": {
       "require": "./cjs/index.js",
@@ -54,6 +54,7 @@
     "bin/",
     "cjs/",
     "esm/",
+    "types/",
     "LICENSE",
     "README.md"
   ],