@rsdk/cli.core 4.3.2 → 4.3.3-next.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/dist/cli.d.ts +2 -0
- package/dist/cli.js +1 -1
- package/dist/cli.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.js +8 -2
- package/dist/index.js.map +1 -1
- package/package.json +5 -5
- package/src/cli.ts +2 -1
- package/src/index.ts +10 -2
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,12 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [4.3.3-next.0](https://github.com/R-Vision/rsdk/compare/v4.3.2...v4.3.3-next.0) (2024-03-26)
|
|
7
|
+
|
|
8
|
+
### Bug Fixes
|
|
9
|
+
|
|
10
|
+
* **cli.core:** added parse root cli package name ([#224](https://github.com/R-Vision/rsdk/issues/224)) ([c70d2f9](https://github.com/R-Vision/rsdk/commit/c70d2f914f26c928a54c8614961c6a2570fb18f6))
|
|
11
|
+
|
|
6
12
|
## [4.3.2](https://github.com/R-Vision/rsdk/compare/v4.3.2-next.0...v4.3.2) (2024-03-26)
|
|
7
13
|
|
|
8
14
|
**Note:** Version bump only for package @rsdk/cli.core
|
package/dist/cli.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export declare class Cli {
|
|
|
7
7
|
cmd: string;
|
|
8
8
|
})[];
|
|
9
9
|
discoverPlugins?: boolean;
|
|
10
|
+
cliPackageName: string;
|
|
10
11
|
} | undefined;
|
|
11
12
|
constructor(opts?: {
|
|
12
13
|
plugins?: (string | {
|
|
@@ -14,6 +15,7 @@ export declare class Cli {
|
|
|
14
15
|
cmd: string;
|
|
15
16
|
})[];
|
|
16
17
|
discoverPlugins?: boolean;
|
|
18
|
+
cliPackageName: string;
|
|
17
19
|
} | undefined);
|
|
18
20
|
installCmdPackage(cmdPackage: string): Promise<void>;
|
|
19
21
|
resolveCmdPackage(cmdPackage: string): Promise<ResolveResult>;
|
package/dist/cli.js
CHANGED
|
@@ -22,7 +22,7 @@ class Cli {
|
|
|
22
22
|
return await packageManager.resolve(cmdPackage, (0, node_path_1.resolve)(), null);
|
|
23
23
|
}
|
|
24
24
|
async getRsdkCommand(cmd) {
|
|
25
|
-
const cmdPackage = '
|
|
25
|
+
const cmdPackage = [this.opts?.cliPackageName, 'cmd', cmd].join('.');
|
|
26
26
|
try {
|
|
27
27
|
const resolvedPackage = await this.resolveCmdPackage(cmdPackage);
|
|
28
28
|
return package_loader_1.PackageLoader.getEntry(resolvedPackage.resolved);
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AACpC,6DAA6D;AAG7D,yCAAoC;AACpC,uCAAkC;AAClC,yCAAoC;AAEpC,2CAA8C;AAC9C,qDAAiD;AAEjD,MAAa,GAAG;IAEH;IADX,YACW,
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -1,13 +1,19 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.execute = void 0;
|
|
4
|
+
const node_path_1 = require("node:path");
|
|
4
5
|
require("./reconfigure-logger");
|
|
5
6
|
const cli_1 = require("./cli");
|
|
6
7
|
// TODO: сделать более понятным, переиспользуемым, консистентным и контролируем
|
|
7
8
|
process.env.RSDK_CLI_MODE = 'true';
|
|
8
|
-
|
|
9
|
+
const getCliPackageName = () => {
|
|
10
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
11
|
+
return require((0, node_path_1.join)((0, node_path_1.dirname)(require.main.filename), 'package.json')).name;
|
|
12
|
+
};
|
|
9
13
|
const execute = async (opts) => {
|
|
10
|
-
|
|
14
|
+
const cliPackageName = opts?.scope ?? getCliPackageName();
|
|
15
|
+
process.title = 'rsdk';
|
|
16
|
+
await new cli_1.Cli({ ...opts, cliPackageName }).handle(process.argv);
|
|
11
17
|
};
|
|
12
18
|
exports.execute = execute;
|
|
13
19
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AACA,yCAA0C;AAE1C,gCAA8B;AAE9B,+BAA4B;AAE5B,+EAA+E;AAC/E,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,MAAM,CAAC;AACnC,MAAM,iBAAiB,GAAG,GAAW,EAAE;IACrC,8DAA8D;IAC9D,OAAO,OAAO,CAAC,IAAA,gBAAI,EAAC,IAAA,mBAAO,EAAC,OAAO,CAAC,IAAK,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC;AAC7E,CAAC,CAAC;AAEK,MAAM,OAAO,GAAG,KAAK,EAAE,IAI7B,EAAiB,EAAE;IAClB,MAAM,cAAc,GAAG,IAAI,EAAE,KAAK,IAAI,iBAAiB,EAAE,CAAC;IAE1D,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC;IACvB,MAAM,IAAI,SAAG,CAAC,EAAE,GAAG,IAAI,EAAE,cAAc,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;AAClE,CAAC,CAAC;AATW,QAAA,OAAO,WASlB"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@rsdk/cli.core",
|
|
3
|
-
"version": "4.3.
|
|
3
|
+
"version": "4.3.3-next.0",
|
|
4
4
|
"description": "entry package to cli functions",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"publishConfig": {
|
|
@@ -24,9 +24,9 @@
|
|
|
24
24
|
"yaml": "^2.3.1"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
|
-
"@rsdk/cli.cmd.kafka": "^4.3.
|
|
28
|
-
"@rsdk/cli.common": "^4.3.
|
|
29
|
-
"@rsdk/logging": "^4.3.
|
|
27
|
+
"@rsdk/cli.cmd.kafka": "^4.3.3-next.0",
|
|
28
|
+
"@rsdk/cli.common": "^4.3.3-next.0",
|
|
29
|
+
"@rsdk/logging": "^4.3.3-next.0"
|
|
30
30
|
},
|
|
31
|
-
"gitHead": "
|
|
31
|
+
"gitHead": "2aca1ac4738e8375d15b209b4eb63ad1895c570c"
|
|
32
32
|
}
|
package/src/cli.ts
CHANGED
|
@@ -14,6 +14,7 @@ export class Cli {
|
|
|
14
14
|
readonly opts?: {
|
|
15
15
|
plugins?: (string | { command: RsdkCliCommand; cmd: string })[];
|
|
16
16
|
discoverPlugins?: boolean;
|
|
17
|
+
cliPackageName: string;
|
|
17
18
|
},
|
|
18
19
|
) {}
|
|
19
20
|
|
|
@@ -30,7 +31,7 @@ export class Cli {
|
|
|
30
31
|
}
|
|
31
32
|
|
|
32
33
|
async getRsdkCommand(cmd: string): Promise<RsdkCliCommand | undefined> {
|
|
33
|
-
const cmdPackage = '
|
|
34
|
+
const cmdPackage = [this.opts?.cliPackageName, 'cmd', cmd].join('.');
|
|
34
35
|
|
|
35
36
|
try {
|
|
36
37
|
const resolvedPackage = await this.resolveCmdPackage(cmdPackage);
|
package/src/index.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import type { RsdkCliCommand } from '@rsdk/cli.common';
|
|
2
|
+
import { dirname, join } from 'node:path';
|
|
2
3
|
|
|
3
4
|
import './reconfigure-logger';
|
|
4
5
|
|
|
@@ -6,11 +7,18 @@ import { Cli } from './cli';
|
|
|
6
7
|
|
|
7
8
|
// TODO: сделать более понятным, переиспользуемым, консистентным и контролируем
|
|
8
9
|
process.env.RSDK_CLI_MODE = 'true';
|
|
10
|
+
const getCliPackageName = (): string => {
|
|
11
|
+
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
12
|
+
return require(join(dirname(require.main!.filename), 'package.json')).name;
|
|
13
|
+
};
|
|
9
14
|
|
|
10
|
-
process.title = 'rsdk';
|
|
11
15
|
export const execute = async (opts?: {
|
|
12
16
|
plugins?: (string | { command: RsdkCliCommand; cmd: string })[];
|
|
13
17
|
discoverPlugins?: boolean;
|
|
18
|
+
scope?: string;
|
|
14
19
|
}): Promise<void> => {
|
|
15
|
-
|
|
20
|
+
const cliPackageName = opts?.scope ?? getCliPackageName();
|
|
21
|
+
|
|
22
|
+
process.title = 'rsdk';
|
|
23
|
+
await new Cli({ ...opts, cliPackageName }).handle(process.argv);
|
|
16
24
|
};
|