@rsdk/cli.common 5.7.0-next.2 → 6.0.0-next.0

package/dist/common/metadata.registry.d.ts

@@ -0,0 +1,19 @@
+import type { CommandMetadata, OptionMetadata, OptionsMetadataMap, RunnableMetadata } from './types';
+/**
+ * TODO: Довольно полезная вещь - надо будет вынести из
+ * cli в отдельный пакет. Но для этого нужно допустить регистрацию
+ * метаданных с нескольких декораторов
+ */
+export declare class MetadataRegistry {
+    static getCommand(ctor: Function): CommandMetadata;
+    static getRunnable(ctor: Function): RunnableMetadata;
+    static getOptions(ctor: Function): OptionsMetadataMap;
+    static addOption(ctor: Function, parameterIndex: number, metadata: OptionMetadata): void;
+    /**
+     * Добавляет к метаданным класса дополнительные метаданные
+     * для свойства или параметра метода
+     */
+    static addCommand(ctor: object, value: CommandMetadata): void;
+    static addRunnable(ctor: object, value: RunnableMetadata): void;
+    private static get;
+}

package/dist/common/metadata.registry.js

@@ -0,0 +1,57 @@
+"use strict";
+/* eslint-disable @typescript-eslint/ban-types */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetadataRegistry = void 0;
+const types_1 = require("./types");
+/**
+ * TODO: Довольно полезная вещь - надо будет вынести из
+ * cli в отдельный пакет. Но для этого нужно допустить регистрацию
+ * метаданных с нескольких декораторов
+ */
+class MetadataRegistry {
+    static getCommand(ctor) {
+        const metadata = this.get(ctor, types_1.Key.COMMAND);
+        if (!(0, types_1.isCommandMetadata)(metadata)) {
+            throw new Error('Command metadata not found. Probably you forgot @Cmd decorator.', {
+                cause: { ctor },
+            });
+        }
+        return metadata;
+    }
+    static getRunnable(ctor) {
+        const metadata = this.get(ctor, types_1.Key.COMMAND);
+        if (!(0, types_1.isRunnableMetadata)(metadata)) {
+            throw new Error('Runnable metadata not found. Probably you forgot to use @SubCommand or @Variation decorator.');
+        }
+        return metadata;
+    }
+    static getOptions(ctor) {
+        return this.get(ctor, types_1.Key.OPTIONS, new Map());
+    }
+    static addOption(ctor, parameterIndex, metadata) {
+        const optionsMap = this.get(ctor, types_1.Key.OPTIONS, new Map());
+        const existing = optionsMap.has(parameterIndex);
+        if (existing) {
+            throw new Error(`Metadata for option ${ctor}.run [index: ${parameterIndex}] already exists`, {
+                cause: { existing, metadata },
+            });
+        }
+        optionsMap.set(parameterIndex, metadata);
+        Reflect.defineMetadata(types_1.Key.OPTIONS, optionsMap, ctor);
+    }
+    /**
+     * Добавляет к метаданным класса дополнительные метаданные
+     * для свойства или параметра метода
+     */
+    static addCommand(ctor, value) {
+        Reflect.defineMetadata(types_1.Key.COMMAND, value, ctor);
+    }
+    static addRunnable(ctor, value) {
+        Reflect.defineMetadata(types_1.Key.COMMAND, value, ctor);
+    }
+    static get(t, key, defaultValue) {
+        return Reflect.getMetadata(key, t) ?? defaultValue;
+    }
+}
+exports.MetadataRegistry = MetadataRegistry;
+//# sourceMappingURL=metadata.registry.js.map

package/dist/common/metadata.registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"metadata.registry.js","sourceRoot":"","sources":["../../src/common/metadata.registry.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;AAQjD,mCAAqE;AAErE;;;;GAIG;AACH,MAAa,gBAAgB;IAC3B,MAAM,CAAC,UAAU,CAAC,IAAc;QAC9B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAkB,IAAI,EAAE,WAAG,CAAC,OAAO,CAAC,CAAC;QAE9D,IAAI,CAAC,IAAA,yBAAiB,EAAC,QAAQ,CAAC,EAAE,CAAC;YACjC,MAAM,IAAI,KAAK,CACb,iEAAiE,EACjE;gBACE,KAAK,EAAE,EAAE,IAAI,EAAE;aAChB,CACF,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,IAAc;QAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAmB,IAAI,EAAE,WAAG,CAAC,OAAO,CAAC,CAAC;QAE/D,IAAI,CAAC,IAAA,0BAAkB,EAAC,QAAQ,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CACb,8FAA8F,CAC/F,CAAC;QACJ,CAAC;QAED,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,IAAc;QAC9B,OAAO,IAAI,CAAC,GAAG,CAAqB,IAAI,EAAE,WAAG,CAAC,OAAO,EAAE,IAAI,GAAG,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,MAAM,CAAC,SAAS,CACd,IAAc,EACd,cAAsB,EACtB,QAAwB;QAExB,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CACzB,IAAI,EACJ,WAAG,CAAC,OAAO,EACX,IAAI,GAAG,EAAE,CACV,CAAC;QAEF,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAChD,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,IAAI,KAAK,CACb,uBAAuB,IAAI,gBAAgB,cAAc,kBAAkB,EAC3E;gBACE,KAAK,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE;aAC9B,CACF,CAAC;QACJ,CAAC;QAED,UAAU,CAAC,GAAG,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;QAEzC,OAAO,CAAC,cAAc,CAAC,WAAG,CAAC,OAAO,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;IACxD,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,UAAU,CAAC,IAAY,EAAE,KAAsB;QACpD,OAAO,CAAC,cAAc,CAAC,WAAG,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,IAAY,EAAE,KAAuB;QACtD,OAAO,CAAC,cAAc,CAAC,WAAG,CAAC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IACnD,CAAC;IAIO,MAAM,CAAC,GAAG,CAAI,CAAS,EAAE,GAAQ,EAAE,YAAgB;QACzD,OAAO,OAAO,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,YAAY,CAAC;IACrD,CAAC;CACF;AA3ED,4CA2EC"}

package/dist/common/types.d.ts

@@ -0,0 +1,32 @@
+import type { Constructor, PropertyParser } from '@rsdk/common';
+export declare enum Key {
+    COMMAND = "COMMAND",
+    OPTIONS = "OPTIONS"
+}
+export type ParameterIndex = number;
+export type PropertyKey = string;
+/**
+ * Метаданные для конечной запускаемой команды,
+ * команды суффиксом или подкоманды
+ */
+export type RunnableMetadata = {
+    name: string;
+    description: string;
+};
+export declare const isRunnableMetadata: (metadata: unknown) => metadata is RunnableMetadata;
+export type CommandMetadata = RunnableMetadata & {
+    variations: Constructor[];
+    subcommands: Constructor[];
+};
+export declare const isCommandMetadata: (metadata: unknown) => metadata is CommandMetadata;
+export type OptionMetadata<T = any> = {
+    name: string;
+    description: string;
+    alias?: string;
+    parser?: PropertyParser<T>;
+    defaultValue?: T;
+};
+/**
+ * В таком виде храним метаданные опций по ключу MetaKeys.OPTION
+ */
+export type OptionsMetadataMap = Map<ParameterIndex, OptionMetadata>;

package/dist/common/types.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isCommandMetadata = exports.isRunnableMetadata = exports.Key = void 0;
+var Key;
+(function (Key) {
+    Key["COMMAND"] = "COMMAND";
+    Key["OPTIONS"] = "OPTIONS";
+})(Key || (exports.Key = Key = {}));
+const isRunnableMetadata = (metadata) => {
+    return (typeof metadata === 'object' &&
+        metadata !== null &&
+        'name' in metadata &&
+        'description' in metadata);
+};
+exports.isRunnableMetadata = isRunnableMetadata;
+const isCommandMetadata = (metadata) => {
+    return ((0, exports.isRunnableMetadata)(metadata) &&
+        'variations' in metadata &&
+        'subcommands' in metadata);
+};
+exports.isCommandMetadata = isCommandMetadata;
+//# sourceMappingURL=types.js.map

package/dist/common/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/common/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,GAGX;AAHD,WAAY,GAAG;IACb,0BAAmB,CAAA;IACnB,0BAAmB,CAAA;AACrB,CAAC,EAHW,GAAG,mBAAH,GAAG,QAGd;AAcM,MAAM,kBAAkB,GAAG,CAChC,QAAiB,EACa,EAAE;IAChC,OAAO,CACL,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,KAAK,IAAI;QACjB,MAAM,IAAI,QAAQ;QAClB,aAAa,IAAI,QAAQ,CAC1B,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,kBAAkB,sBAS7B;AAOK,MAAM,iBAAiB,GAAG,CAC/B,QAAiB,EACY,EAAE;IAC/B,OAAO,CACL,IAAA,0BAAkB,EAAC,QAAQ,CAAC;QAC5B,YAAY,IAAI,QAAQ;QACxB,aAAa,IAAI,QAAQ,CAC1B,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,iBAAiB,qBAQ5B"}

package/dist/decorators/command.decorator.d.ts

@@ -0,0 +1,14 @@
+import type { Constructor } from '@rsdk/common';
+import type { IRunnable } from '../runnable.interface';
+export type CommandOptions = {
+    description: string;
+    variations?: Constructor<IRunnable>[];
+    subcommands?: Constructor<IRunnable>[];
+};
+/**
+ * Декоратор для определения основной команды CLI.
+ * @param name - Имя команды
+ * @param description - Описание команды
+ * @returns Декоратор класса
+ */
+export declare const Command: (name: string, options: CommandOptions) => ClassDecorator;

package/dist/decorators/command.decorator.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Command = void 0;
+const metadata_registry_1 = require("../common/metadata.registry");
+/**
+ * Декоратор для определения основной команды CLI.
+ * @param name - Имя команды
+ * @param description - Описание команды
+ * @returns Декоратор класса
+ */
+const Command = (name, options) => {
+    return (target) => {
+        /**
+         * TODO: Поскольку согласно документации typescript, декораторы классов отрабатывают
+         * в тот момент, когда декораторы всех методов и их параметров уже отработали,
+         * мы можем провести кое-какую валидацию. Подумать, какую именно.
+         */
+        metadata_registry_1.MetadataRegistry.addCommand(target, {
+            name,
+            subcommands: [],
+            variations: [],
+            ...options,
+        });
+    };
+};
+exports.Command = Command;
+//# sourceMappingURL=command.decorator.js.map

package/dist/decorators/command.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"command.decorator.js","sourceRoot":"","sources":["../../src/decorators/command.decorator.ts"],"names":[],"mappings":";;;AAEA,mEAA+D;AAS/D;;;;;GAKG;AACI,MAAM,OAAO,GAAG,CACrB,IAAY,EACZ,OAAuB,EACP,EAAE;IAClB,OAAO,CAAC,MAAM,EAAE,EAAE;QAChB;;;;WAIG;QAEH,oCAAgB,CAAC,UAAU,CAAC,MAAM,EAAE;YAClC,IAAI;YACJ,WAAW,EAAE,EAAE;YACf,UAAU,EAAE,EAAE;YACd,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AAlBW,QAAA,OAAO,WAkBlB"}

package/dist/decorators/index.d.ts

@@ -0,0 +1,5 @@
+export * from './command.decorator';
+export * from './option.decorator';
+export * from './option-with-value.decorator';
+export * from './sub-command.decorator';
+export * from './variation.decorator';

package/dist/decorators/index.js

@@ -0,0 +1,22 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./command.decorator"), exports);
+__exportStar(require("./option.decorator"), exports);
+__exportStar(require("./option-with-value.decorator"), exports);
+__exportStar(require("./sub-command.decorator"), exports);
+__exportStar(require("./variation.decorator"), exports);
+//# sourceMappingURL=index.js.map

package/dist/decorators/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/decorators/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC;AACpC,qDAAmC;AACnC,gEAA8C;AAC9C,0DAAwC;AACxC,wDAAsC"}

package/dist/decorators/option-with-value.decorator.d.ts

@@ -0,0 +1,13 @@
+import type { PropertyParser } from '@rsdk/common';
+import type { OptionMetadata } from '../common/types';
+/**
+ * Определяет опцию со значением для команды или подкоманды
+ * @param name - Имя опции
+ * @param parser - Функция для преобразования строкового значения в нужный тип
+ * @param params - Параметры опции
+ * @param params.description - Описание опции
+ * @param params.alias - Опциональный короткий синоним для опции
+ * @param params.defaultValue - Значение по умолчанию
+ * @returns Декоратор параметра, добавляющий метаданные опции
+ */
+export declare const ValueOption: <T>(name: string, parser: PropertyParser<T>, params: Omit<OptionMetadata<T>, "name" | "parser">) => ParameterDecorator;

package/dist/decorators/option-with-value.decorator.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValueOption = void 0;
+const metadata_registry_1 = require("../common/metadata.registry");
+/**
+ * Определяет опцию со значением для команды или подкоманды
+ * @param name - Имя опции
+ * @param parser - Функция для преобразования строкового значения в нужный тип
+ * @param params - Параметры опции
+ * @param params.description - Описание опции
+ * @param params.alias - Опциональный короткий синоним для опции
+ * @param params.defaultValue - Значение по умолчанию
+ * @returns Декоратор параметра, добавляющий метаданные опции
+ */
+const ValueOption = (name, parser, params) => {
+    const option = {
+        name,
+        parser,
+        ...params,
+    };
+    return (target, _, parameterIndex) => {
+        metadata_registry_1.MetadataRegistry.addOption(target.constructor, parameterIndex, option);
+    };
+};
+exports.ValueOption = ValueOption;
+//# sourceMappingURL=option-with-value.decorator.js.map

package/dist/decorators/option-with-value.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"option-with-value.decorator.js","sourceRoot":"","sources":["../../src/decorators/option-with-value.decorator.ts"],"names":[],"mappings":";;;AAEA,mEAA+D;AAG/D;;;;;;;;;GASG;AACI,MAAM,WAAW,GAAG,CACzB,IAAY,EACZ,MAAyB,EACzB,MAAkD,EAC9B,EAAE;IACtB,MAAM,MAAM,GAAsB;QAChC,IAAI;QACJ,MAAM;QACN,GAAG,MAAM;KACV,CAAC;IAEF,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE;QACnC,oCAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,WAAW,eActB"}

package/dist/decorators/option.decorator.d.ts

@@ -0,0 +1,10 @@
+import type { OptionMetadata } from '../common/types';
+/**
+ * Определяет флаг-опцию (без значения) для команды или подкоманды
+ * @param name - Имя опции
+ * @param params - Параметры опции
+ * @param params.description - Описание опции
+ * @param params.alias - Опциональный короткий синоним для опции
+ * @returns Декоратор параметра, добавляющий метаданные опции
+ */
+export declare const Option: (name: string, params: Pick<OptionMetadata<boolean>, "description" | "defaultValue">) => ParameterDecorator;

package/dist/decorators/option.decorator.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Option = void 0;
+const metadata_registry_1 = require("../common/metadata.registry");
+/**
+ * Определяет флаг-опцию (без значения) для команды или подкоманды
+ * @param name - Имя опции
+ * @param params - Параметры опции
+ * @param params.description - Описание опции
+ * @param params.alias - Опциональный короткий синоним для опции
+ * @returns Декоратор параметра, добавляющий метаданные опции
+ */
+const Option = (name, params) => {
+    const option = {
+        name,
+        ...params,
+    };
+    return (target, _, parameterIndex) => {
+        metadata_registry_1.MetadataRegistry.addOption(target.constructor, parameterIndex, option);
+    };
+};
+exports.Option = Option;
+//# sourceMappingURL=option.decorator.js.map

package/dist/decorators/option.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"option.decorator.js","sourceRoot":"","sources":["../../src/decorators/option.decorator.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAG/D;;;;;;;GAOG;AACI,MAAM,MAAM,GAAG,CACpB,IAAY,EACZ,MAAqE,EACjD,EAAE;IACtB,MAAM,MAAM,GAA4B;QACtC,IAAI;QACJ,GAAG,MAAM;KACV,CAAC;IAEF,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,cAAc,EAAE,EAAE;QACnC,oCAAgB,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;IACzE,CAAC,CAAC;AACJ,CAAC,CAAC;AAZW,QAAA,MAAM,UAYjB"}

package/dist/decorators/sub-command.decorator.d.ts

@@ -0,0 +1,9 @@
+export type SubCommandOptions = {
+    description: string;
+};
+/**
+ * Декоратор для определения подкоманды CLI
+ * @param name - Имя подкоманды
+ * @param description - Описание подкоманды
+ */
+export declare const SubCommand: (name: string, options: SubCommandOptions) => ClassDecorator;

package/dist/decorators/sub-command.decorator.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SubCommand = void 0;
+const metadata_registry_1 = require("../common/metadata.registry");
+/**
+ * Декоратор для определения подкоманды CLI
+ * @param name - Имя подкоманды
+ * @param description - Описание подкоманды
+ */
+const SubCommand = (name, options) => {
+    return (target) => {
+        metadata_registry_1.MetadataRegistry.addRunnable(target, {
+            name,
+            ...options,
+        });
+    };
+};
+exports.SubCommand = SubCommand;
+//# sourceMappingURL=sub-command.decorator.js.map

package/dist/decorators/sub-command.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sub-command.decorator.js","sourceRoot":"","sources":["../../src/decorators/sub-command.decorator.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAM/D;;;;GAIG;AACI,MAAM,UAAU,GAAG,CACxB,IAAY,EACZ,OAA0B,EACV,EAAE;IAClB,OAAO,CAAC,MAAM,EAAE,EAAE;QAChB,oCAAgB,CAAC,WAAW,CAAC,MAAM,EAAE;YACnC,IAAI;YACJ,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,UAAU,cAUrB"}

package/dist/decorators/variation.decorator.d.ts

@@ -0,0 +1,10 @@
+export type VariationOptions = {
+    description: string;
+};
+/**
+ * Декоратор для определения основной команды CLI.
+ * @param name - Имя команды
+ * @param description - Описание команды
+ * @returns Декоратор класса
+ */
+export declare const CommandVariation: (name: `${string}:${string}`, options: VariationOptions) => ClassDecorator;

package/dist/decorators/variation.decorator.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CommandVariation = void 0;
+const metadata_registry_1 = require("../common/metadata.registry");
+/**
+ * Декоратор для определения основной команды CLI.
+ * @param name - Имя команды
+ * @param description - Описание команды
+ * @returns Декоратор класса
+ */
+const CommandVariation = (name, options) => {
+    return (target) => {
+        metadata_registry_1.MetadataRegistry.addRunnable(target, {
+            name,
+            ...options,
+        });
+    };
+};
+exports.CommandVariation = CommandVariation;
+//# sourceMappingURL=variation.decorator.js.map

package/dist/decorators/variation.decorator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"variation.decorator.js","sourceRoot":"","sources":["../../src/decorators/variation.decorator.ts"],"names":[],"mappings":";;;AAAA,mEAA+D;AAM/D;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAC9B,IAA2B,EAC3B,OAAyB,EACT,EAAE;IAClB,OAAO,CAAC,MAAM,EAAE,EAAE;QAChB,oCAAgB,CAAC,WAAW,CAAC,MAAM,EAAE;YACnC,IAAI;YACJ,GAAG,OAAO;SACX,CAAC,CAAC;IACL,CAAC,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B"}

package/dist/index.d.ts

@@ -1,14 +1,5 @@
-import type { Command } from 'commander';
 import 'reflect-metadata';
-export { getMetadataByPredict } from './rsdk/metadata.aggregator';
-export { RsdkJson } from './types';
-export { RsdkJsonParser } from './rsdk-json.parser';
-export { getCommanderCommand } from './cmd.core';
-export interface RsdkCliCommand {
-    getCommands(): Command[];
-}
-export { Default } from './decorators';
-export { Alias } from './decorators';
-export { Option } from './decorators';
-export { SubCmd } from './decorators';
-export { Cmd } from './decorators';
+export * from './decorators';
+export { IRunnable } from './runnable.interface';
+export { Key, OptionMetadata, PropertyKey, ParameterIndex, } from './common/types';
+export { MetadataRegistry } from './common/metadata.registry';

package/dist/index.js

@@ -1,21 +1,24 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Cmd = exports.SubCmd = exports.Option = exports.Alias = exports.Default = exports.getCommanderCommand = exports.RsdkJsonParser = exports.getMetadataByPredict = void 0;
+exports.MetadataRegistry = exports.Key = void 0;
 require("reflect-metadata");
-var metadata_aggregator_1 = require("./rsdk/metadata.aggregator");
-Object.defineProperty(exports, "getMetadataByPredict", { enumerable: true, get: function () { return metadata_aggregator_1.getMetadataByPredict; } });
-var rsdk_json_parser_1 = require("./rsdk-json.parser");
-Object.defineProperty(exports, "RsdkJsonParser", { enumerable: true, get: function () { return rsdk_json_parser_1.RsdkJsonParser; } });
-var cmd_core_1 = require("./cmd.core");
-Object.defineProperty(exports, "getCommanderCommand", { enumerable: true, get: function () { return cmd_core_1.getCommanderCommand; } });
-var decorators_1 = require("./decorators");
-Object.defineProperty(exports, "Default", { enumerable: true, get: function () { return decorators_1.Default; } });
-var decorators_2 = require("./decorators");
-Object.defineProperty(exports, "Alias", { enumerable: true, get: function () { return decorators_2.Alias; } });
-var decorators_3 = require("./decorators");
-Object.defineProperty(exports, "Option", { enumerable: true, get: function () { return decorators_3.Option; } });
-var decorators_4 = require("./decorators");
-Object.defineProperty(exports, "SubCmd", { enumerable: true, get: function () { return decorators_4.SubCmd; } });
-var decorators_5 = require("./decorators");
-Object.defineProperty(exports, "Cmd", { enumerable: true, get: function () { return decorators_5.Cmd; } });
+__exportStar(require("./decorators"), exports);
+var types_1 = require("./common/types");
+Object.defineProperty(exports, "Key", { enumerable: true, get: function () { return types_1.Key; } });
+var metadata_registry_1 = require("./common/metadata.registry");
+Object.defineProperty(exports, "MetadataRegistry", { enumerable: true, get: function () { return metadata_registry_1.MetadataRegistry; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;AAEA,4BAA0B;AAE1B,kEAAkE;AAAzD,2HAAA,oBAAoB,OAAA;AAI7B,uDAAoD;AAA3C,kHAAA,cAAc,OAAA;AAEvB,uCAAiD;AAAxC,+GAAA,mBAAmB,OAAA;AAM5B,2CAAuC;AAA9B,qGAAA,OAAO,OAAA;AAChB,2CAAqC;AAA5B,mGAAA,KAAK,OAAA;AACd,2CAAsC;AAA7B,oGAAA,MAAM,OAAA;AACf,2CAAsC;AAA7B,oGAAA,MAAM,OAAA;AACf,2CAAmC;AAA1B,iGAAA,GAAG,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,4BAA0B;AAE1B,+CAA6B;AAI7B,wCAKwB;AAJtB,4FAAA,GAAG,OAAA;AAML,gEAA8D;AAArD,qHAAA,gBAAgB,OAAA"}

package/dist/runnable.interface.d.ts

@@ -0,0 +1,11 @@
+/**
+ * Interface representing a command that can be executed.
+ */
+export interface IRunnable {
+    /**
+     * Runs the command with the provided arguments.
+     * @param args - Arguments passed to the command
+     * @returns Promise that resolves when command execution is complete
+     */
+    run(...args: any[]): Promise<void>;
+}

package/dist/runnable.interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=runnable.interface.js.map

package/dist/runnable.interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"runnable.interface.js","sourceRoot":"","sources":["../src/runnable.interface.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/cli.common",
-  "version": "5.7.0-next.2",
+  "version": "6.0.0-next.0",
   "description": "Shared types and helpers for build work with cli",
   "main": "dist/index.js",
   "bin": {
@@ -15,8 +15,9 @@
   ],
   "license": "Apache License 2.0",
   "dependencies": {
-    "@rsdk/common": "5.7.0-next.2",
-    "@rsdk/logging": "5.7.0-next.2",
+    "@rsdk/common": "6.0.0-next.0",
+    "@rsdk/common.node": "6.0.0-next.0",
+    "@rsdk/logging": "6.0.0-next.0",
     "@sinclair/typebox": "^0.34.9",
     "commander": "^12.1.0",
     "dotenv": "^16.3.1",
@@ -25,8 +26,7 @@
     "yaml": "^2.6.1"
   },
   "peerDependencies": {
-    "@rsdk/core": "*",
     "reflect-metadata": "^0.1.12 || ^0.2.0"
   },
-  "gitHead": "c85fca0b594a2ea168d06f1d2941a4fb05b59440"
+  "gitHead": "215cccea23d95118dd8b6af3ce11c6a35ce19c30"
 }

package/src/common/metadata.registry.ts

@@ -0,0 +1,91 @@
+/* eslint-disable @typescript-eslint/ban-types */
+
+import type {
+  CommandMetadata,
+  OptionMetadata,
+  OptionsMetadataMap,
+  RunnableMetadata,
+} from './types';
+import { isCommandMetadata, isRunnableMetadata, Key } from './types';
+
+/**
+ * TODO: Довольно полезная вещь - надо будет вынести из
+ * cli в отдельный пакет. Но для этого нужно допустить регистрацию
+ * метаданных с нескольких декораторов
+ */
+export class MetadataRegistry {
+  static getCommand(ctor: Function): CommandMetadata {
+    const metadata = this.get<CommandMetadata>(ctor, Key.COMMAND);
+
+    if (!isCommandMetadata(metadata)) {
+      throw new Error(
+        'Command metadata not found. Probably you forgot @Cmd decorator.',
+        {
+          cause: { ctor },
+        },
+      );
+    }
+
+    return metadata;
+  }
+
+  static getRunnable(ctor: Function): RunnableMetadata {
+    const metadata = this.get<RunnableMetadata>(ctor, Key.COMMAND);
+
+    if (!isRunnableMetadata(metadata)) {
+      throw new Error(
+        'Runnable metadata not found. Probably you forgot to use @SubCommand or @Variation decorator.',
+      );
+    }
+
+    return metadata;
+  }
+
+  static getOptions(ctor: Function): OptionsMetadataMap {
+    return this.get<OptionsMetadataMap>(ctor, Key.OPTIONS, new Map());
+  }
+
+  static addOption(
+    ctor: Function,
+    parameterIndex: number,
+    metadata: OptionMetadata,
+  ): void {
+    const optionsMap = this.get<OptionsMetadataMap>(
+      ctor,
+      Key.OPTIONS,
+      new Map(),
+    );
+
+    const existing = optionsMap.has(parameterIndex);
+    if (existing) {
+      throw new Error(
+        `Metadata for option ${ctor}.run [index: ${parameterIndex}] already exists`,
+        {
+          cause: { existing, metadata },
+        },
+      );
+    }
+
+    optionsMap.set(parameterIndex, metadata);
+
+    Reflect.defineMetadata(Key.OPTIONS, optionsMap, ctor);
+  }
+
+  /**
+   * Добавляет к метаданным класса дополнительные метаданные
+   * для свойства или параметра метода
+   */
+  static addCommand(ctor: object, value: CommandMetadata): void {
+    Reflect.defineMetadata(Key.COMMAND, value, ctor);
+  }
+
+  static addRunnable(ctor: object, value: RunnableMetadata): void {
+    Reflect.defineMetadata(Key.COMMAND, value, ctor);
+  }
+
+  private static get<T>(t: object, key: Key): T | undefined;
+  private static get<T>(t: object, key: Key, defaultValue: T): T;
+  private static get<T>(t: object, key: Key, defaultValue?: T): T | undefined {
+    return Reflect.getMetadata(key, t) ?? defaultValue;
+  }
+}