@rsdk/cli 4.3.0 → 4.3.1-next.1

package/CHANGELOG.md

@@ -3,6 +3,16 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [4.3.1-next.1](https://github.com/R-Vision/rsdk/compare/v4.3.1-next.0...v4.3.1-next.1) (2024-03-25)
+
+**Note:** Version bump only for package @rsdk/cli
+
+## [4.3.1-next.0](https://github.com/R-Vision/rsdk/compare/v4.3.0...v4.3.1-next.0) (2024-03-25)
+
+### Bug Fixes
+
+* fix deps ([#218](https://github.com/R-Vision/rsdk/issues/218)) ([774172c](https://github.com/R-Vision/rsdk/commit/774172cc21dae3bb0e5a62800ea10218f3db5e51))
+
 ## [4.3.0](https://github.com/R-Vision/rsdk/compare/v4.3.0-next.1...v4.3.0) (2024-03-21)
 
 **Note:** Version bump only for package @rsdk/cli

package/bin.js

@@ -3,7 +3,7 @@
 /**
   entrypoint для автоматической линковки в монорепе до сборки cli
  */
-const { execute } = require('./dist/index');
+const { execute } = require('@rsdk/cli.core');
 
 if (require.main === module) {
   execute();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/cli",
-  "version": "4.3.0",
+  "version": "4.3.1-next.1",
   "description": "entry package to cli functions",
   "main": "dist/index.js",
   "bin": {
@@ -15,6 +15,7 @@
   ],
   "license": "Apache License 2.0",
   "dependencies": {
+    "@parcel/core": "^2.11.0",
     "@parcel/fs": "^2.11.0",
     "@parcel/package-manager": "^2.11.0",
     "@sinclair/typebox": "^0.32.13",
@@ -26,9 +27,10 @@
     "yaml": "^2.3.1"
   },
   "peerDependencies": {
-    "@rsdk/cli.cmd.kafka": "^4.3.0",
-    "@rsdk/cli.common": "^4.3.0",
-    "@rsdk/logging": "^4.3.0"
+    "@rsdk/cli.cmd.kafka": "^4.3.1-next.1",
+    "@rsdk/cli.common": "^4.3.1-next.1",
+    "@rsdk/cli.core": "^4.3.1-next.1",
+    "@rsdk/logging": "^4.3.1-next.1"
   },
-  "gitHead": "279985a0cc8a6f98d75df20a7a3995c9fcc2e419"
+  "gitHead": "79ad5e9c5f25719390d866add5ef49c5f513485c"
 }

package/dist/exception.d.ts

@@ -1,4 +0,0 @@
-export declare class FailedToInstall extends Error {
-    constructor(packageName: string, rsdkCommand: string, cause?: any);
-    static assertError(error: Error, packageName: string, rsdkCommand: string): void;
-}

package/dist/exception.js

@@ -1,23 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FailedToInstall = void 0;
-class FailedToInstall extends Error {
-    constructor(packageName, rsdkCommand, cause) {
-        super('Failed to install ' + packageName, {
-            cause: {
-                packageName,
-                rsdkCommand,
-                cause,
-            },
-        });
-        this.name = this.constructor.name;
-    }
-    static assertError(error, packageName, rsdkCommand) {
-        const isFailedToInstall = error.message.startsWith('Failed to install');
-        if (isFailedToInstall) {
-            throw new FailedToInstall(packageName, rsdkCommand, error);
-        }
-    }
-}
-exports.FailedToInstall = FailedToInstall;
-//# sourceMappingURL=exception.js.map

package/dist/exception.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"exception.js","sourceRoot":"","sources":["../src/exception.ts"],"names":[],"mappings":";;;AAAA,MAAa,eAAgB,SAAQ,KAAK;IACxC,YAAY,WAAmB,EAAE,WAAmB,EAAE,KAAW;QAC/D,KAAK,CAAC,oBAAoB,GAAG,WAAW,EAAE;YACxC,KAAK,EAAE;gBACL,WAAW;gBACX,WAAW;gBACX,KAAK;aACN;SACF,CAAC,CAAC;QACH,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC;IACpC,CAAC;IAED,MAAM,CAAC,WAAW,CAChB,KAAY,EACZ,WAAmB,EACnB,WAAmB;QAEnB,MAAM,iBAAiB,GAAI,KAAK,CAAC,OAAkB,CAAC,UAAU,CAC5D,mBAAmB,CACpB,CAAC;QACF,IAAI,iBAAiB,EAAE,CAAC;YACtB,MAAM,IAAI,eAAe,CAAC,WAAW,EAAE,WAAW,EAAE,KAAK,CAAC,CAAC;QAC7D,CAAC;IACH,CAAC;CACF;AAxBD,0CAwBC"}

package/dist/index.d.ts

@@ -1,2 +0,0 @@
-import './reconfigure-logger';
-export declare const execute: () => Promise<void>;

package/dist/index.js

@@ -1,62 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = void 0;
-const fs_1 = require("@parcel/fs");
-const package_manager_1 = require("@parcel/package-manager");
-const commander_1 = require("commander");
-const enquirer_1 = require("enquirer");
-const node_path_1 = require("node:path");
-require("./reconfigure-logger");
-const exception_1 = require("./exception");
-const package_loader_1 = require("./package.loader");
-// TODO: сделать более понятным, переиспользуемым, консистентным и контролируем
-process.env.RSDK_CLI_MODE = 'true';
-process.title = 'rsdk';
-const execute = async () => {
-    const rsdkCommand = process.argv.slice(2)[0];
-    if (!rsdkCommand || rsdkCommand.startsWith('-')) {
-        commander_1.program.parse();
-        return;
-    }
-    const cmd = rsdkCommand.split(':')[0];
-    const cmdPackage = '@rsdk/cli.cmd.' + cmd;
-    const packageManager = new package_manager_1.NodePackageManager(new fs_1.NodeFS(), (0, node_path_1.resolve)());
-    const resolveResult = await packageManager
-        .resolve(cmdPackage, (0, node_path_1.resolve)(), null)
-        .catch((error) => error);
-    try {
-        const isNotResolved = resolveResult instanceof Error;
-        if (isNotResolved) {
-            console.log(`Unable to resolve ${cmdPackage} cause:`, resolveResult.message);
-            const response = await (0, enquirer_1.prompt)({
-                type: 'confirm',
-                name: 'isInstall',
-                message: 'Install ' + cmdPackage + ' package?',
-                initial: true,
-            });
-            if (!response.isInstall) {
-                console.log('Install was aborted');
-                return;
-            }
-            await package_loader_1.PackageLoader.installPackage(packageManager, cmdPackage);
-        }
-        const resolvedPackage = isNotResolved
-            ? await packageManager.resolve(cmdPackage, (0, node_path_1.resolve)(), void 0)
-            : resolveResult;
-        const rsdkCliCommand = package_loader_1.PackageLoader.getEntry(resolvedPackage.resolved);
-        const cmds = rsdkCliCommand.getCommands();
-        for (const cmd of cmds) {
-            commander_1.program.addCommand(cmd);
-        }
-    }
-    catch (error) {
-        if (!(error instanceof Error)) {
-            throw error;
-        }
-        exception_1.FailedToInstall.assertError(error, cmdPackage, rsdkCommand);
-        throw error;
-    }
-    commander_1.program.parse();
-};
-exports.execute = execute;
-//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,6DAA6D;AAC7D,yCAAoC;AACpC,uCAAkC;AAClC,yCAAoC;AAEpC,gCAA8B;AAE9B,2CAA8C;AAC9C,qDAAiD;AAEjD,+EAA+E;AAC/E,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;AAEnC,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;AAEhB,MAAM,OAAO,GAAG,KAAK,IAAmB,EAAE;IAC/C,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAE7C,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QAChD,mBAAO,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO;IACT,CAAC;IACD,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,gBAAgB,GAAG,GAAG,CAAC;IAE1C,MAAM,cAAc,GAAG,IAAI,oCAAkB,CAAC,IAAI,WAAM,EAAE,EAAE,IAAA,mBAAO,GAAE,CAAC,CAAC;IAEvE,MAAM,aAAa,GAAG,MAAM,cAAc;SACvC,OAAO,CAAC,UAAU,EAAE,IAAA,mBAAO,GAAE,EAAE,IAAI,CAAC;SACpC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,CAAC;IAE3B,IAAI,CAAC;QACH,MAAM,aAAa,GAAG,aAAa,YAAY,KAAK,CAAC;QACrD,IAAI,aAAa,EAAE,CAAC;YAClB,OAAO,CAAC,GAAG,CACT,qBAAqB,UAAU,SAAS,EACxC,aAAa,CAAC,OAAO,CACtB,CAAC;YACF,MAAM,QAAQ,GAAG,MAAM,IAAA,iBAAM,EAAyB;gBACpD,IAAI,EAAE,SAAS;gBACf,IAAI,EAAE,WAAW;gBACjB,OAAO,EAAE,UAAU,GAAG,UAAU,GAAG,WAAW;gBAC9C,OAAO,EAAE,IAAI;aACd,CAAC,CAAC;YAEH,IAAI,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;gBACxB,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;gBACnC,OAAO;YACT,CAAC;YACD,MAAM,8BAAa,CAAC,cAAc,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,eAAe,GAAG,aAAa;YACnC,CAAC,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,UAAU,EAAE,IAAA,mBAAO,GAAE,EAAE,KAAK,CAAC,CAAC;YAC7D,CAAC,CAAC,aAAa,CAAC;QAElB,MAAM,cAAc,GAAG,8BAAa,CAAC,QAAQ,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAExE,MAAM,IAAI,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC;QAE1C,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,mBAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;IACH,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,IAAI,CAAC,CAAC,KAAK,YAAY,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,KAAK,CAAC;QACd,CAAC;QACD,2BAAe,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC;QAC5D,MAAM,KAAK,CAAC;IACd,CAAC;IAED,mBAAO,CAAC,KAAK,EAAE,CAAC;AAClB,CAAC,CAAC;AAxDW,QAAA,OAAO,WAwDlB"}

package/dist/package.loader.d.ts

@@ -1,6 +0,0 @@
-import type { PackageManager } from '@parcel/package-manager';
-import type { RsdkCliCommand } from '@rsdk/cli.common';
-export declare class PackageLoader {
-    static getEntry(cmdPackageName: string): RsdkCliCommand;
-    static installPackage(packageManager: PackageManager, cmdPackage: string): Promise<void>;
-}

package/dist/package.loader.js

@@ -1,28 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PackageLoader = void 0;
-const node_path_1 = require("node:path");
-class PackageLoader {
-    static getEntry(cmdPackageName) {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        return require(cmdPackageName).Cmd;
-    }
-    static async installPackage(packageManager, cmdPackage) {
-        const cliPackageJsonPath = require.resolve('../package.json', {
-            paths: [__dirname],
-        });
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const cliPackageJson = require(cliPackageJsonPath);
-        // @ts-expect-error not declared method
-        await packageManager.install([
-            {
-                name: cmdPackage,
-                semVer: cliPackageJson.version,
-            },
-        ], (0, node_path_1.resolve)(''), {
-            saveDev: true,
-        });
-    }
-}
-exports.PackageLoader = PackageLoader;
-//# sourceMappingURL=package.loader.js.map

package/dist/package.loader.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"package.loader.js","sourceRoot":"","sources":["../src/package.loader.ts"],"names":[],"mappings":";;;AAEA,yCAAoC;AAEpC,MAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,cAAsB;QACpC,8DAA8D;QAC9D,OAAO,OAAO,CAAC,cAAc,CAAC,CAAC,GAAG,CAAC;IACrC,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,cAAc,CACzB,cAA8B,EAC9B,UAAkB;QAElB,MAAM,kBAAkB,GAAW,OAAO,CAAC,OAAO,CAAC,iBAAiB,EAAE;YACpE,KAAK,EAAE,CAAC,SAAS,CAAC;SACnB,CAAC,CAAC;QAEH,8DAA8D;QAC9D,MAAM,cAAc,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAAC;QAEnD,uCAAuC;QACvC,MAAM,cAAc,CAAC,OAAO,CAC1B;YACE;gBACE,IAAI,EAAE,UAAU;gBAChB,MAAM,EAAE,cAAc,CAAC,OAAO;aAC/B;SACF,EACD,IAAA,mBAAO,EAAC,EAAE,CAAC,EACX;YACE,OAAO,EAAE,IAAI;SACd,CACF,CAAC;IACJ,CAAC;CACF;AA/BD,sCA+BC"}

package/dist/reconfigure-logger.d.ts

@@ -1,5 +0,0 @@
-/**
- * TODO: написать корректную работу с логгером, с учетом того что она может (уже используется вне DI) и может аффектить tracing
- */
-import { LogLevel } from '@rsdk/logging';
-export declare const logLevelFromEnv: LogLevel | undefined;

package/dist/reconfigure-logger.js

@@ -1,12 +0,0 @@
-"use strict";
-/**
- * TODO: написать корректную работу с логгером, с учетом того что она может (уже используется вне DI) и может аффектить tracing
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.logLevelFromEnv = void 0;
-const logging_1 = require("@rsdk/logging");
-exports.logLevelFromEnv = logging_1.LogLevel[(process.env.LOG_LEVEL ?? 'info')];
-logging_1.LoggerFactory.reconfigure({
-    level: exports.logLevelFromEnv ?? logging_1.LogLevel.info,
-});
-//# sourceMappingURL=reconfigure-logger.js.map

package/dist/reconfigure-logger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"reconfigure-logger.js","sourceRoot":"","sources":["../src/reconfigure-logger.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,2CAAwD;AAE3C,QAAA,eAAe,GAAG,kBAAQ,CACrC,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,MAAM,CAAa,CACtB,CAAC;AAE1B,uBAAa,CAAC,WAAW,CAAC;IACxB,KAAK,EAAE,uBAAe,IAAI,kBAAQ,CAAC,IAAI;CACxC,CAAC,CAAC"}

package/src/exception.ts

@@ -1,25 +0,0 @@
-export class FailedToInstall extends Error {
-  constructor(packageName: string, rsdkCommand: string, cause?: any) {
-    super('Failed to install ' + packageName, {
-      cause: {
-        packageName,
-        rsdkCommand,
-        cause,
-      },
-    });
-    this.name = this.constructor.name;
-  }
-
-  static assertError(
-    error: Error,
-    packageName: string,
-    rsdkCommand: string,
-  ): void {
-    const isFailedToInstall = (error.message as string).startsWith(
-      'Failed to install',
-    );
-    if (isFailedToInstall) {
-      throw new FailedToInstall(packageName, rsdkCommand, error);
-    }
-  }
-}

package/src/index.ts

@@ -1,73 +0,0 @@
-import { NodeFS } from '@parcel/fs';
-import { NodePackageManager } from '@parcel/package-manager';
-import { program } from 'commander';
-import { prompt } from 'enquirer';
-import { resolve } from 'node:path';
-
-import './reconfigure-logger';
-
-import { FailedToInstall } from './exception';
-import { PackageLoader } from './package.loader';
-
-// TODO: сделать более понятным, переиспользуемым, консистентным и контролируем
-process.env.RSDK_CLI_MODE = 'true';
-
-process.title = 'rsdk';
-
-export const execute = async (): Promise<void> => {
-  const rsdkCommand = process.argv.slice(2)[0];
-
-  if (!rsdkCommand || rsdkCommand.startsWith('-')) {
-    program.parse();
-    return;
-  }
-  const cmd = rsdkCommand.split(':')[0];
-  const cmdPackage = '@rsdk/cli.cmd.' + cmd;
-
-  const packageManager = new NodePackageManager(new NodeFS(), resolve());
-
-  const resolveResult = await packageManager
-    .resolve(cmdPackage, resolve(), null)
-    .catch((error) => error);
-
-  try {
-    const isNotResolved = resolveResult instanceof Error;
-    if (isNotResolved) {
-      console.log(
-        `Unable to resolve ${cmdPackage} cause:`,
-        resolveResult.message,
-      );
-      const response = await prompt<{ isInstall: boolean }>({
-        type: 'confirm',
-        name: 'isInstall',
-        message: 'Install ' + cmdPackage + ' package?',
-        initial: true,
-      });
-
-      if (!response.isInstall) {
-        console.log('Install was aborted');
-        return;
-      }
-      await PackageLoader.installPackage(packageManager, cmdPackage);
-    }
-    const resolvedPackage = isNotResolved
-      ? await packageManager.resolve(cmdPackage, resolve(), void 0)
-      : resolveResult;
-
-    const rsdkCliCommand = PackageLoader.getEntry(resolvedPackage.resolved);
-
-    const cmds = rsdkCliCommand.getCommands();
-
-    for (const cmd of cmds) {
-      program.addCommand(cmd);
-    }
-  } catch (error: any) {
-    if (!(error instanceof Error)) {
-      throw error;
-    }
-    FailedToInstall.assertError(error, cmdPackage, rsdkCommand);
-    throw error;
-  }
-
-  program.parse();
-};

package/src/package.loader.ts

@@ -1,36 +0,0 @@
-import type { PackageManager } from '@parcel/package-manager';
-import type { RsdkCliCommand } from '@rsdk/cli.common';
-import { resolve } from 'node:path';
-
-export class PackageLoader {
-  static getEntry(cmdPackageName: string): RsdkCliCommand {
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    return require(cmdPackageName).Cmd;
-  }
-
-  static async installPackage(
-    packageManager: PackageManager,
-    cmdPackage: string,
-  ): Promise<void> {
-    const cliPackageJsonPath: string = require.resolve('../package.json', {
-      paths: [__dirname],
-    });
-
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const cliPackageJson = require(cliPackageJsonPath);
-
-    // @ts-expect-error not declared method
-    await packageManager.install(
-      [
-        {
-          name: cmdPackage,
-          semVer: cliPackageJson.version,
-        },
-      ],
-      resolve(''),
-      {
-        saveDev: true,
-      },
-    );
-  }
-}

package/src/reconfigure-logger.ts

@@ -1,13 +0,0 @@
-/**
- * TODO: написать корректную работу с логгером, с учетом того что она может (уже используется вне DI) и может аффектить tracing
- */
-
-import { LoggerFactory, LogLevel } from '@rsdk/logging';
-
-export const logLevelFromEnv = LogLevel[
-  (process.env.LOG_LEVEL ?? 'info') as LogLevel
-] as LogLevel | undefined;
-
-LoggerFactory.reconfigure({
-  level: logLevelFromEnv ?? LogLevel.info,
-});