@opra/cli 1.0.0-alpha.32 → 1.0.0-alpha.34

package/cjs/oprimp-cli.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const common_1 = require("@opra/common");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
 const commander_1 = require("commander");
 const console = tslib_1.__importStar(require("console"));
 const fs = tslib_1.__importStar(require("fs"));
@@ -20,7 +20,7 @@ commander_1.program
     .option('--no-color', 'Disables colors in logs messages')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
-        chalk_1.default.level = 0;
+        ansi_colors_1.default.enabled = false;
     const generator = new ts_generator_js_1.TsGenerator({
         serviceUrl,
         logger: console,
@@ -31,7 +31,7 @@ commander_1.program
     });
     await generator
         .generate()
-        .then(() => console.log(chalk_1.default.greenBright('Completed')))
+        .then(() => console.log(ansi_colors_1.default.greenBright('Completed')))
         .catch(e => console.error(e.message));
 });
 if (process.argv.length < 3)

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

@@ -4,7 +4,7 @@ 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 chalk_1 = tslib_1.__importDefault(require("chalk"));
+const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
 function cleanDirectory(dirname) {
     const rootDir = dirname;
     const _cleanDirectory = (targetDir) => {
@@ -16,7 +16,7 @@ function cleanDirectory(dirname) {
             if (node_fs_1.default.statSync(absolutePath).isDirectory()) {
                 _cleanDirectory(absolutePath);
                 if (!node_fs_1.default.readdirSync(absolutePath).length) {
-                    this.emit('verbose', chalk_1.default.cyan(`Removing directory ${node_path_1.default.relative(absolutePath, rootDir)}`));
+                    this.emit('verbose', ansi_colors_1.default.cyan(`Removing directory ${node_path_1.default.relative(absolutePath, rootDir)}`));
                     node_fs_1.default.rmdirSync(absolutePath);
                 }
                 continue;
@@ -24,7 +24,7 @@ function cleanDirectory(dirname) {
             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', chalk_1.default.cyan(`Removing file ${node_path_1.default.relative(absolutePath, rootDir)}`));
+                    this.emit('verbose', ansi_colors_1.default.cyan(`Removing file ${node_path_1.default.relative(absolutePath, rootDir)}`));
                     node_fs_1.default.unlinkSync(absolutePath);
                 }
             }

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

@@ -4,7 +4,7 @@ exports.generateDocument = generateDocument;
 const tslib_1 = require("tslib");
 const client_1 = require("@opra/client");
 const common_1 = require("@opra/common");
-const chalk_1 = tslib_1.__importDefault(require("chalk"));
+const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
 const path_1 = tslib_1.__importDefault(require("path"));
 const putil_varhelpers_1 = require("putil-varhelpers");
 async function generateDocument(document, options) {
@@ -14,7 +14,7 @@ async function generateDocument(document, options) {
             if (out)
                 return out;
         }
-        this.emit('log', chalk_1.default.cyan('Fetching document schema from ') + chalk_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 });
     }
@@ -27,10 +27,12 @@ async function generateDocument(document, options) {
         generator: this,
     };
     this._documentsMap.set(document.id, out);
-    this.emit('log', chalk_1.default.white('[' + document.id + '] ') + chalk_1.default.cyan('Processing document ') + chalk_1.default.magenta(document.info.title));
+    this.emit('log', ansi_colors_1.default.white('[' + document.id + '] ') +
+        ansi_colors_1.default.cyan('Processing document ') +
+        ansi_colors_1.default.magenta(document.info.title || ''));
     if (document.references.size) {
         let refIdGenerator = options?.refIdGenerator || 1;
-        this.emit('log', chalk_1.default.white('[' + document.id + '] ') + chalk_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;
@@ -48,7 +50,7 @@ async function generateDocument(document, options) {
  * ${this.serviceUrl}
  */`;
     if (document.types.size) {
-        this.emit('log', chalk_1.default.white('[' + document.id + ']'), chalk_1.default.cyan(`Processing data types`));
+        this.emit('log', ansi_colors_1.default.white('[' + document.id + ']'), ansi_colors_1.default.cyan(`Processing data types`));
         for (const t of document.types.values()) {
             await this.generateDataType(t, 'root');
         }

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

@@ -6,7 +6,7 @@ const node_events_1 = require("node:events");
 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 chalk_1 = tslib_1.__importDefault(require("chalk"));
+const ansi_colors_1 = tslib_1.__importDefault(require("ansi-colors"));
 const file_writer_js_1 = require("../file-writer.js");
 const clean_directory_js_1 = require("./generators/clean-directory.js");
 const generate_data_type_js_1 = require("./generators/generate-data-type.js");
@@ -46,7 +46,7 @@ class TsGenerator extends node_events_1.EventEmitter {
         this.emit('start');
         try {
             this._started = true;
-            this.emit('log', chalk_1.default.cyan('Removing old files..'));
+            this.emit('log', ansi_colors_1.default.cyan('Removing old files..'));
             this.cleanDirectory(this.outDir);
             this._apiPath = '/api';
             await this.generateDocument();

package/esm/oprimp-cli.js

@@ -1,5 +1,5 @@
 import { getStackFileName } from '@opra/common';
-import chalk from 'chalk';
+import colors from 'ansi-colors';
 import { program } from 'commander';
 import * as console from 'console';
 import * as fs from 'fs';
@@ -17,7 +17,7 @@ program
     .option('--no-color', 'Disables colors in logs messages')
     .action(async (serviceUrl, outDir, options) => {
     if (!options.color)
-        chalk.level = 0;
+        colors.enabled = false;
     const generator = new TsGenerator({
         serviceUrl,
         logger: console,
@@ -28,7 +28,7 @@ program
     });
     await generator
         .generate()
-        .then(() => console.log(chalk.greenBright('Completed')))
+        .then(() => console.log(colors.greenBright('Completed')))
         .catch(e => console.error(e.message));
 });
 if (process.argv.length < 3)

package/esm/package.json

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

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

@@ -1,6 +1,6 @@
 import fs from 'node:fs';
 import path from 'node:path';
-import chalk from 'chalk';
+import colors from 'ansi-colors';
 export function cleanDirectory(dirname) {
     const rootDir = dirname;
     const _cleanDirectory = (targetDir) => {
@@ -12,7 +12,7 @@ export function cleanDirectory(dirname) {
             if (fs.statSync(absolutePath).isDirectory()) {
                 _cleanDirectory(absolutePath);
                 if (!fs.readdirSync(absolutePath).length) {
-                    this.emit('verbose', chalk.cyan(`Removing directory ${path.relative(absolutePath, rootDir)}`));
+                    this.emit('verbose', colors.cyan(`Removing directory ${path.relative(absolutePath, rootDir)}`));
                     fs.rmdirSync(absolutePath);
                 }
                 continue;
@@ -20,7 +20,7 @@ export function cleanDirectory(dirname) {
             if (path.extname(f) === '.ts') {
                 const contents = fs.readFileSync(absolutePath, 'utf-8');
                 if (contents.includes('#!oprimp_auto_generated!#')) {
-                    this.emit('verbose', chalk.cyan(`Removing file ${path.relative(absolutePath, rootDir)}`));
+                    this.emit('verbose', colors.cyan(`Removing file ${path.relative(absolutePath, rootDir)}`));
                     fs.unlinkSync(absolutePath);
                 }
             }

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

@@ -1,6 +1,6 @@
 import { OpraHttpClient } from '@opra/client';
 import { BUILTIN, HttpApi } from '@opra/common';
-import chalk from 'chalk';
+import colors from 'ansi-colors';
 import path from 'path';
 import { pascalCase } from 'putil-varhelpers';
 export async function generateDocument(document, options) {
@@ -10,7 +10,7 @@ export async function generateDocument(document, options) {
             if (out)
                 return out;
         }
-        this.emit('log', chalk.cyan('Fetching document schema from ') + chalk.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 });
     }
@@ -23,10 +23,12 @@ export async function generateDocument(document, options) {
         generator: this,
     };
     this._documentsMap.set(document.id, out);
-    this.emit('log', chalk.white('[' + document.id + '] ') + chalk.cyan('Processing document ') + chalk.magenta(document.info.title));
+    this.emit('log', colors.white('[' + document.id + '] ') +
+        colors.cyan('Processing document ') +
+        colors.magenta(document.info.title || ''));
     if (document.references.size) {
         let refIdGenerator = options?.refIdGenerator || 1;
-        this.emit('log', chalk.white('[' + document.id + '] ') + chalk.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;
@@ -44,7 +46,7 @@ export async function generateDocument(document, options) {
  * ${this.serviceUrl}
  */`;
     if (document.types.size) {
-        this.emit('log', chalk.white('[' + document.id + ']'), chalk.cyan(`Processing data types`));
+        this.emit('log', colors.white('[' + document.id + ']'), colors.cyan(`Processing data types`));
         for (const t of document.types.values()) {
             await this.generateDataType(t, 'root');
         }

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

@@ -2,7 +2,7 @@ import { EventEmitter } from 'node:events';
 import fs from 'node:fs';
 import path from 'node:path';
 import process from 'node:process';
-import chalk from 'chalk';
+import colors from 'ansi-colors';
 import { FileWriter } from '../file-writer.js';
 import { cleanDirectory } from './generators/clean-directory.js';
 import { _generateComplexTypeCode, _generateEnumTypeCode, _generateMappedTypeCode, _generateMixinTypeCode, _generateSimpleTypeCode, _generateTypeCode, generateDataType, } from './generators/generate-data-type.js';
@@ -42,7 +42,7 @@ export class TsGenerator extends EventEmitter {
         this.emit('start');
         try {
             this._started = true;
-            this.emit('log', chalk.cyan('Removing old files..'));
+            this.emit('log', colors.cyan('Removing old files..'));
             this.cleanDirectory(this.outDir);
             this._apiPath = '/api';
             await this.generateDocument();

package/package.json

@@ -1,40 +1,14 @@
 {
   "name": "@opra/cli",
-  "version": "1.0.0-alpha.32",
+  "version": "1.0.0-alpha.34",
   "description": "Opra CLI tools",
   "author": "Panates",
   "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/panates/opra.git",
-    "directory": "packages/client"
-  },
-  "scripts": {
-    "compile": "tsc",
-    "prebuild": "npm run check && npm run lint && npm run clean",
-    "build": "npm run build:cjs && npm run build:esm",
-    "build:cjs": "tsc -b tsconfig-build-cjs.json",
-    "build:esm": "tsc -b tsconfig-build-esm.json",
-    "postbuild": "npm run copy:files && npm run copy:bin",
-    "copy:files": "cp README.md package.json ../../LICENSE ../../build/cli && cp ../../package.cjs.json ../../build/cli/cjs/package.json",
-    "copy:bin": "cp -R bin ../../build/cli/bin",
-    "lint": "eslint . --max-warnings=0",
-    "lint:fix": "eslint . --max-warnings=0 --fix",
-    "format": "prettier . --write --log-level=warn",
-    "check": "madge --circular src/**",
-    "test": "jest --passWithNoTests",
-    "cover": "jest --passWithNoTests --collect-coverage",
-    "clean": "npm run clean:src && npm run clean:test && npm run clean:dist && npm run clean:cover",
-    "clean:src": "ts-cleanup -s src --all",
-    "clean:test": "ts-cleanup -s test --all",
-    "clean:dist": "rimraf ../../build/client",
-    "clean:cover": "rimraf ../../coverage/client"
-  },
   "dependencies": {
-    "@browsery/type-is": "^1.6.18-r3",
-    "@opra/client": "^1.0.0-alpha.32",
-    "@opra/common": "^1.0.0-alpha.32",
-    "chalk": "^5.3.0",
+    "@browsery/type-is": "^1.6.18-r5",
+    "@opra/client": "^1.0.0-alpha.34",
+    "@opra/common": "^1.0.0-alpha.34",
+    "ansi-colors": "^4.1.3",
     "commander": "^12.0.0",
     "js-string-escape": "^1.0.1",
     "putil-flattentext": "^2.1.1",
@@ -42,12 +16,31 @@
     "tslib": "^2.6.3"
   },
   "type": "module",
-  "module": "./esm/index.js",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./types/index.d.ts",
+        "default": "./esm/index.js"
+      },
+      "require": {
+        "types": "./types/index.d.ts",
+        "default": "./cjs/index.js"
+      },
+      "default": "./esm/index.js"
+    },
+    "./package.json": "./package.json"
+  },
   "main": "./cjs/index.js",
+  "module": "./esm/index.js",
   "types": "./types/index.d.ts",
   "bin": {
     "oprimp": "bin/oprimp.mjs"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/panates/opra.git",
+    "directory": "packages/client"
+  },
   "engines": {
     "node": ">=18.0",
     "npm": ">=7.0.0"
@@ -66,4 +59,4 @@
     "tool",
     "oprimp"
   ]
-}
+}

package/bin/bin/oprimp.mjs

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