@opra/cli 1.21.0 → 1.22.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opra/cli",
-  "version": "1.21.0",
+  "version": "1.22.1",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
@@ -14,27 +14,22 @@
     "tslib": "^2.8.1"
   },
   "peerDependencies": {
-    "@opra/client": "^1.21.0",
-    "@opra/common": "^1.21.0"
+    "@opra/client": "^1.22.1",
+    "@opra/common": "^1.22.1"
   },
   "type": "module",
+  "module": "./index.js",
+  "types": "./index.d.ts",
   "exports": {
     ".": {
-      "import": {
-        "types": "./types/index.d.ts",
-        "default": "./esm/index.js"
-      },
-      "require": {
-        "types": "./types/index.d.cts",
-        "default": "./cjs/index.js"
-      },
-      "default": "./esm/index.js"
+      "types": "./index.d.ts",
+      "default": "./index.js"
     },
     "./package.json": "./package.json"
   },
-  "main": "./cjs/index.js",
-  "module": "./esm/index.js",
-  "types": "./types/index.d.ts",
+  "engines": {
+    "node": ">=20.0"
+  },
   "bin": {
     "oprimp": "bin/oprimp.mjs"
   },
@@ -43,18 +38,6 @@
     "url": "git+https://github.com/panates/opra.git",
     "directory": "packages/client"
   },
-  "engines": {
-    "node": ">=18.0",
-    "npm": ">=7.0.0"
-  },
-  "files": [
-    "bin/",
-    "cjs/",
-    "esm/",
-    "types/",
-    "LICENSE",
-    "README.md"
-  ],
   "keywords": [
     "opra",
     "cli",

package/{esm/ts-generator → ts-generator}/ts-file.js

@@ -2,12 +2,14 @@ import path from 'node:path';
 import flattenText from 'putil-flattentext';
 import { CodeBlock } from '../code-block.js';
 export class TsFile {
+    filename;
+    dirname;
+    imports = {};
+    exportFiles = {};
+    exportTypes = [];
+    code = new CodeBlock();
     constructor(filename) {
         this.filename = filename;
-        this.imports = {};
-        this.exportFiles = {};
-        this.exportTypes = [];
-        this.code = new CodeBlock();
         this.dirname = path.dirname(filename);
         this.code.header = '';
         this.code.imports = '';

package/{esm/ts-generator → ts-generator}/ts-generator.js

@@ -14,14 +14,23 @@ import { TsFile } from './ts-file.js';
  * @class TsGenerator
  */
 export class TsGenerator extends EventEmitter {
+    _files = {};
+    _started = false;
+    _document;
+    _documentsMap;
+    _filesMap;
+    serviceUrl;
+    outDir;
+    cwd;
+    writer;
+    options;
+    fileHeader;
     /**
      *
      * @constructor
      */
     constructor(init) {
         super();
-        this._files = {};
-        this._started = false;
         this.serviceUrl = init.serviceUrl;
         this.cwd = init.cwd || process.cwd();
         this.outDir = init.outDir ? path.resolve(this.cwd, init.outDir) : this.cwd;
@@ -94,19 +103,19 @@ export class TsGenerator extends EventEmitter {
         Object.setPrototypeOf(instance, this);
         return instance;
     }
+    static {
+        TsGenerator.prototype.cleanDirectory = cleanDirectory;
+        TsGenerator.prototype.generateDocument = generateDocument;
+        TsGenerator.prototype.generateDataType = generateDataType;
+        TsGenerator.prototype._generateTypeCode = _generateTypeCode;
+        TsGenerator.prototype._generateArrayTypeCode = _generateArrayTypeCode;
+        TsGenerator.prototype._generateComplexTypeCode = _generateComplexTypeCode;
+        TsGenerator.prototype._generateEnumTypeCode = _generateEnumTypeCode;
+        TsGenerator.prototype._generateMappedTypeCode = _generateMappedTypeCode;
+        TsGenerator.prototype._generateMixinTypeCode = _generateMixinTypeCode;
+        TsGenerator.prototype._generateSimpleTypeCode = _generateSimpleTypeCode;
+        TsGenerator.prototype._generateUnionTypeCode = _generateUnionTypeCode;
+        TsGenerator.prototype.generateHttpApi = generateHttpApi;
+        TsGenerator.prototype.generateHttpController = generateHttpController;
+    }
 }
-(() => {
-    TsGenerator.prototype.cleanDirectory = cleanDirectory;
-    TsGenerator.prototype.generateDocument = generateDocument;
-    TsGenerator.prototype.generateDataType = generateDataType;
-    TsGenerator.prototype._generateTypeCode = _generateTypeCode;
-    TsGenerator.prototype._generateArrayTypeCode = _generateArrayTypeCode;
-    TsGenerator.prototype._generateComplexTypeCode = _generateComplexTypeCode;
-    TsGenerator.prototype._generateEnumTypeCode = _generateEnumTypeCode;
-    TsGenerator.prototype._generateMappedTypeCode = _generateMappedTypeCode;
-    TsGenerator.prototype._generateMixinTypeCode = _generateMixinTypeCode;
-    TsGenerator.prototype._generateSimpleTypeCode = _generateSimpleTypeCode;
-    TsGenerator.prototype._generateUnionTypeCode = _generateUnionTypeCode;
-    TsGenerator.prototype.generateHttpApi = generateHttpApi;
-    TsGenerator.prototype.generateHttpController = generateHttpController;
-})();

package/cjs/code-block.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodeBlock = void 0;
-class CodeBlock {
-    toString() {
-        // if (this.content) return this.content;
-        let out = '';
-        for (const x of Object.values(this)) {
-            out += String(x);
-        }
-        return out;
-    }
-    [Symbol.toStringTag]() {
-        return this.toString();
-    }
-}
-exports.CodeBlock = CodeBlock;

package/cjs/file-writer.js

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

package/cjs/generator/code-generator.js

@@ -1,7 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.CodeGenerator = void 0;
-const node_events_1 = require("node:events");
-class CodeGenerator extends node_events_1.EventEmitter {
-}
-exports.CodeGenerator = CodeGenerator;

package/cjs/index.js

@@ -1,4 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./ts-generator/index.js"), exports);

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

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

package/cjs/interfaces/logger.interface.js

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

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

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

package/cjs/oprimp-cli.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const console = tslib_1.__importStar(require("node:console"));
-const fs = tslib_1.__importStar(require("node:fs"));
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const process = tslib_1.__importStar(require("node:process"));
-const common_1 = require("@opra/common");
-const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
-const commander_1 = require("commander");
-const ts_generator_js_1 = require("./ts-generator/ts-generator.js");
-const dirname = node_path_1.default.dirname((0, common_1.getStackFileName)());
-const pkgJson = JSON.parse(fs.readFileSync(node_path_1.default.resolve(dirname, '../package.json'), 'utf-8'));
-commander_1.program
-    .version(pkgJson.version)
-    .argument('<serviceUrl>', 'OPRA service url')
-    .argument('<outDir>', 'Output directory')
-    .option('--ext', 'Adds js extension to imports')
-    .option('--refns', 'Exports references with namespaces')
-    .option('--no-color', 'Disables colors in logs messages')
-    .action(async (serviceUrl, outDir, options) => {
-    if (!options.color)
-        ansi_colors_1.default.enabled = false;
-    const generator = new ts_generator_js_1.TsGenerator({
-        serviceUrl,
-        logger: console,
-        outDir,
-        importExt: options.ext,
-        referenceNamespaces: options.refns,
-        fileHeader: `/* Generated by OPRA Code Generator, Version ${pkgJson.version} */`,
-    });
-    await generator
-        .generate()
-        .then(() => console.log(ansi_colors_1.default.greenBright('Completed')))
-        .catch(e => console.error(e.message));
-});
-if (process.argv.length < 3)
-    commander_1.program.help();
-else
-    commander_1.program.parse(process.argv);

package/cjs/package.json

@@ -1,3 +0,0 @@
-{
-  "type": "commonjs"
-}

package/cjs/ts-generator/generators/clean-directory.js

@@ -1,34 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.cleanDirectory = cleanDirectory;
-const tslib_1 = require("tslib");
-const node_fs_1 = tslib_1.__importDefault(require("node:fs"));
-const node_path_1 = tslib_1.__importDefault(require("node:path"));
-const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
-function cleanDirectory(dirname) {
-    const rootDir = dirname;
-    const _cleanDirectory = (targetDir) => {
-        if (!node_fs_1.default.existsSync(targetDir))
-            return;
-        const files = node_fs_1.default.readdirSync(targetDir);
-        for (const f of files) {
-            const absolutePath = node_path_1.default.join(targetDir, f);
-            if (node_fs_1.default.statSync(absolutePath).isDirectory()) {
-                _cleanDirectory(absolutePath);
-                if (!node_fs_1.default.readdirSync(absolutePath).length) {
-                    this.emit('verbose', ansi_colors_1.default.cyan(`Removing directory ${node_path_1.default.relative(absolutePath, rootDir)}`));
-                    node_fs_1.default.rmdirSync(absolutePath);
-                }
-                continue;
-            }
-            if (node_path_1.default.extname(f) === '.ts') {
-                const contents = node_fs_1.default.readFileSync(absolutePath, 'utf-8');
-                if (contents.includes('#!oprimp_auto_generated!#')) {
-                    this.emit('verbose', ansi_colors_1.default.cyan(`Removing file ${node_path_1.default.relative(absolutePath, rootDir)}`));
-                    node_fs_1.default.unlinkSync(absolutePath);
-                }
-            }
-        }
-    };
-    _cleanDirectory(dirname);
-}

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

@@ -1,338 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDataType = generateDataType;
-exports._generateTypeCode = _generateTypeCode;
-exports._generateArrayTypeCode = _generateArrayTypeCode;
-exports._generateComplexTypeCode = _generateComplexTypeCode;
-exports._generateEnumTypeCode = _generateEnumTypeCode;
-exports._generateMappedTypeCode = _generateMappedTypeCode;
-exports._generateMixinTypeCode = _generateMixinTypeCode;
-exports._generateSimpleTypeCode = _generateSimpleTypeCode;
-exports._generateUnionTypeCode = _generateUnionTypeCode;
-const tslib_1 = require("tslib");
-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',
-];
-async function generateDataType(dataType, intent, currentFile) {
-    const doc = dataType.node.getDocument();
-    if (doc.id !== this._document?.id) {
-        const { generator } = await this.generateDocument(doc);
-        return await generator.generateDataType(dataType, intent, currentFile);
-    }
-    try {
-        const typeName = dataType.name;
-        if (typeName) {
-            if (internalTypeNames.includes(typeName))
-                return { kind: 'internal', typeName: dataType.name };
-            let file = this._filesMap.get(dataType);
-            if (file) {
-                if (currentFile)
-                    currentFile.addImport(file.filename, [typeName]);
-                return { kind: 'named', file, typeName: dataType.name };
-            }
-            if (dataType instanceof common_1.SimpleType)
-                file = this.addFile(node_path_1.default.join(this._documentRoot, '/simple-types.ts'), true);
-            else if (dataType instanceof common_1.EnumType) {
-                file = this.addFile(node_path_1.default.join(this._typesRoot, 'enums', typeName + '.ts'), true);
-            }
-            else
-                file = this.addFile(node_path_1.default.join(this._typesRoot, 'types', typeName + '.ts'), true);
-            this._filesMap.set(dataType, file);
-            if (file.exportTypes.includes(typeName)) {
-                if (currentFile)
-                    currentFile.addImport(file.filename, [typeName]);
-                return { kind: 'named', file, typeName: dataType.name };
-            }
-            file.exportTypes.push(typeName);
-            const typesIndexTs = this.addFile(node_path_1.default.join(this._typesRoot, 'index.ts'), true);
-            const indexTs = this.addFile('/index.ts', true);
-            indexTs.addExport(typesIndexTs.filename, undefined, this._typesNamespace);
-            const codeBlock = (file.code['type_' + typeName] = new code_block_js_1.CodeBlock());
-            codeBlock.head = `/**\n * ${(0, string_utils_js_1.wrapJSDocString)(dataType.description || '')}\n *`;
-            codeBlock.head += `
- * @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';
-            typesIndexTs.addExport(file.filename);
-            if (currentFile)
-                currentFile.addImport(file.filename, [typeName]);
-            return { kind: 'named', file, typeName };
-        }
-        if (!currentFile)
-            throw new TypeError(`You must provide currentFile to generate data type`);
-        const code = await this._generateTypeCode(currentFile, dataType, intent);
-        return { kind: 'embedded', code };
-    }
-    catch (e) {
-        e.message = `(${dataType.name}) ` + e.message;
-        throw e;
-    }
-}
-/**
- *
- */
-async function _generateTypeCode(currentFile, dataType, intent) {
-    if (intent === 'root' && !dataType.name) {
-        throw new TypeError(`Name required to generate data type code to root intent`);
-    }
-    if (dataType instanceof common_1.ArrayType) {
-        return await this._generateArrayTypeCode(currentFile, dataType, intent);
-    }
-    if (dataType instanceof common_1.ComplexType) {
-        return await this._generateComplexTypeCode(currentFile, dataType, intent);
-    }
-    if (dataType instanceof common_1.EnumType) {
-        return await this._generateEnumTypeCode(currentFile, dataType, intent);
-    }
-    if (dataType instanceof common_1.MappedType) {
-        return await this._generateMappedTypeCode(currentFile, dataType, intent);
-    }
-    if (dataType instanceof common_1.MixinType) {
-        return await this._generateMixinTypeCode(currentFile, dataType, intent);
-    }
-    if (dataType instanceof common_1.SimpleType) {
-        return await this._generateSimpleTypeCode(currentFile, dataType, intent);
-    }
-    if (dataType instanceof common_1.UnionType) {
-        return await this._generateUnionTypeCode(currentFile, dataType, intent);
-    }
-    /* istanbul ignore next */
-    throw new TypeError(`${dataType.kind} data types can not be directly exported`);
-}
-/**
- *
- */
-async function _generateArrayTypeCode(currentFile, dataType, intent) {
-    if (intent === 'extends')
-        throw new TypeError('Array types can not be extended');
-    let out = '';
-    const x = await this.generateDataType(dataType.type, 'typeDef', currentFile);
-    if (x.kind === 'embedded') {
-        out =
-            x.code.includes('|') || x.code.includes('&')
-                ? '(' + x.code + ')'
-                : x.code;
-    }
-    else
-        out = x.typeName;
-    if (intent === 'root')
-        return `type ${dataType.name} = ${out}[]`;
-    return `${out}[]`;
-}
-/**
- *
- */
-async function _generateComplexTypeCode(currentFile, dataType, intent) {
-    let out = intent === 'root' ? `interface ${dataType.name} ` : '';
-    const ownFields = [...dataType.fields('*')].filter(f => f.origin === dataType);
-    if (dataType.base) {
-        const base = await this.generateDataType(dataType.base, 'extends', currentFile);
-        let baseDef = base.kind === 'embedded' ? base.code : base.typeName;
-        const omitBaseFields = ownFields.filter(f => dataType.base.findField(f.name));
-        if (omitBaseFields.length)
-            baseDef = `Omit<${baseDef}, ${omitBaseFields.map(x => "'" + x.name + "'").join(' | ')}>`;
-        if (intent === 'root')
-            out += `extends ${baseDef} `;
-        else {
-            out += baseDef;
-            if (!ownFields.length)
-                return out;
-            out += ' & ';
-        }
-    }
-    out += '{\n\t';
-    let i = 0;
-    for (const field of ownFields) {
-        if (i++)
-            out += '\n';
-        // Print JSDoc
-        out += `/**\n * ${field.description || ''}\n`;
-        if (field.default)
-            out += ` * @default ` + field.default + '\n';
-        // if (field.format)
-        //   jsDoc += ` * @format ` + field.format + '\n';
-        if (field.exclusive)
-            out += ` * @exclusive\n`;
-        if (field.readonly)
-            out += ` * @readonly\n`;
-        if (field.writeonly)
-            out += ` * @writeonly\n`;
-        if (field.deprecated) {
-            out +=
-                ` * @deprecated ` +
-                    (typeof field.deprecated === 'string' ? field.deprecated : '') +
-                    '\n';
-        }
-        out += ' */\n';
-        // Print field name
-        if (field.readonly)
-            out += 'readonly ';
-        out += `${field.name}${field.required ? '' : '?'}: `;
-        let typ = '';
-        if (field.fixed) {
-            const t = typeof field.fixed;
-            typ = `${t === 'number' || t === 'boolean' || t === 'bigint' ? field.fixed : "'" + field.fixed + "'"}\n`;
-        }
-        else {
-            const x = await this.generateDataType(field.type, 'typeDef', currentFile);
-            typ = x.kind === 'embedded' ? x.code : x.typeName;
-        }
-        if (field.isArray && !(field.type instanceof common_1.ArrayType)) {
-            out += /[a-zA-Z]\w*/.test(typ) ? typ + '[];\n' : '(' + typ + ')[];\n';
-        }
-        else
-            out += typ + ';\n';
-    }
-    if (dataType.additionalFields)
-        out += '[key: string]: any;\n';
-    return out + '\b}';
-}
-/**
- *
- */
-async function _generateEnumTypeCode(currentFile, dataType, intent) {
-    if (intent === 'root') {
-        let out = `enum ${dataType.name} {\n\t`;
-        for (const [value, info] of Object.entries(dataType.attributes)) {
-            // Print JSDoc
-            let jsDoc = '';
-            if (dataType.attributes[value].description)
-                jsDoc += ` * ${dataType.attributes[value].description}\n`;
-            if (jsDoc)
-                out += `/**\n${jsDoc} */\n`;
-            out +=
-                `${info.alias || value} = ` +
-                    (typeof value === 'number'
-                        ? value
-                        : "'" + String(value).replace("'", "\\'") + "'");
-            out += ',\n\n';
-        }
-        return out + '\b}';
-    }
-    return ('(' +
-        Object.keys(dataType.attributes)
-            .map(t => `'${t}'`)
-            .join(' | ') +
-        ')');
-}
-/**
- *
- */
-async function _generateMappedTypeCode(currentFile, dataType, intent) {
-    let out = intent === 'root' ? `type ${dataType.name} = ` : '';
-    const base = await this.generateDataType(dataType.base, 'typeDef', currentFile);
-    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)
-        ? dataType.partial
-        : undefined;
-    const required = dataType.required === true ||
-        (Array.isArray(dataType.required) && dataType.required.length > 0)
-        ? dataType.required
-        : undefined;
-    if (!(pick || omit || partial || required))
-        return typeDef;
-    if (partial === true)
-        out += 'Partial<';
-    else if (partial) {
-        out += 'PartialSome<';
-        currentFile.addExport('ts-gems', ['PartialSome']);
-    }
-    if (required === true)
-        out += 'Partial<';
-    else if (required) {
-        out += 'RequiredSome<';
-        currentFile.addExport('ts-gems', ['RequiredSome']);
-    }
-    if (pick)
-        out += 'Pick<';
-    else if (omit)
-        out += 'Omit<';
-    out += typeDef;
-    if (omit || pick) {
-        out +=
-            ', ' +
-                (omit || pick)
-                    .filter(x => !!x)
-                    .map(x => `'${x}'`)
-                    .join(' | ') +
-                '>';
-    }
-    if (partial) {
-        if (Array.isArray(partial)) {
-            out +=
-                ', ' +
-                    partial
-                        .filter(x => !!x)
-                        .map(x => `'${x}'`)
-                        .join(' | ');
-        }
-        out += '>';
-    }
-    return out;
-}
-/**
- *
- */
-async function _generateMixinTypeCode(currentFile, dataType, intent) {
-    const outArray = [];
-    for (const t of dataType.types) {
-        const x = await this.generateDataType(t, 'typeDef', currentFile);
-        if (x.kind === 'embedded') {
-            outArray.push(x.code.includes('|') || x.code.includes('&')
-                ? '(' + x.code + ')'
-                : x.code);
-        }
-        else
-            outArray.push(x.typeName);
-    }
-    if (intent === 'root')
-        return `type ${dataType.name} = ${outArray.join(' & ')}`;
-    if (intent === 'extends')
-        return outArray.join(', ');
-    return outArray.join(' & ');
-}
-/**
- *
- */
-async function _generateSimpleTypeCode(currentFile, dataType, intent) {
-    let out = intent === 'root' ? `type ${dataType.name} = ` : '';
-    const nameMapping = dataType.nameMappings.js || 'any';
-    out += nameMapping === 'Date' ? 'string' : nameMapping;
-    return intent === 'root' ? out + ';' : out;
-}
-/**
- *
- */
-async function _generateUnionTypeCode(currentFile, dataType, intent) {
-    if (intent === 'extends')
-        throw new TypeError('Union types can not be extended');
-    const outArray = [];
-    for (const t of dataType.types) {
-        const x = await this.generateDataType(t, 'typeDef', currentFile);
-        if (x.kind === 'embedded') {
-            outArray.push(x.code.includes('|') || x.code.includes('&')
-                ? '(' + x.code + ')'
-                : x.code);
-        }
-        else
-            outArray.push(x.typeName);
-    }
-    if (intent === 'root')
-        return `type ${dataType.name} = ${outArray.join(' | ')}`;
-    return outArray.join(' | ');
-}