@infomaximum/package-cli 2.10.1 → 2.10.2

package/CHANGELOG.md

@@ -2,6 +2,14 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.10.2](https://github.com/Infomaximum/package-cli/compare/v2.10.1...v2.10.2) (2024-10-02)
+
+
+### Bug Fixes
+
+* возвращено стандартное семантическое версионирование ([2ba7fbc](https://github.com/Infomaximum/package-cli/commit/2ba7fbce4363bcd64957a594efb1d44d72ade484))
+* поля в манифесте виджета 2408 ([ed269f4](https://github.com/Infomaximum/package-cli/commit/ed269f4fc726f14349c308131817e4e75eeb2b36))
+
 ### [2.10.1](https://github.com/Infomaximum/package-cli/compare/v2.10.0...v2.10.1) (2024-09-30)
 
 

package/dist/widget/commands/common.js

@@ -1,34 +1,25 @@
-import { __rest } from "tslib";
 import chalk from "chalk";
 import { assertSimple } from "@infomaximum/assert";
 import { DEFAULT_BUILD_DIR_NAME } from "../../const.js";
-export function registerWidgetManifestOption(command) {
-    command.option("--widget-manifest <manifestPath>", "путь до файла манифеста виджета");
-}
 export function registerCommonOption(command) {
     command
         .option("--entry <path>", "путь до entrypoint")
         .option("--assets-dir <assetsDirPath>", "путь до директории с ресурсами виджета, которые будут перенесены в архив с виджетом")
         .option("--package-manifest <manifestPath>", "путь до файла манифеста пакета")
-        .option("--package-dir <packageDirPath>", "путь до директории с файлами пакета");
-    registerWidgetManifestOption(command);
-}
-export function configMergeWithWidgetManifestOptions(config, _a) {
-    var { "widget-manifest": optionWidgetManifest } = _a, rest = __rest(_a, ["widget-manifest"]);
-    const widgetManifest = optionWidgetManifest || (config === null || config === void 0 ? void 0 : config.widgetManifest);
-    assertSimple(!!widgetManifest, chalk.red("В конфигурации не задан widgetManifest"));
-    return Object.assign({ widgetManifest }, rest);
+        .option("--package-dir <packageDirPath>", "путь до директории с файлами пакета")
+        .option("--widget-manifest <manifestPath>", "путь до файла манифеста виджета");
 }
 export function configMergeWithOptionsCommon(config, options) {
     const entry = options.entry || (config === null || config === void 0 ? void 0 : config.entry);
-    const assetsDir = options["assets-dir"] || (config === null || config === void 0 ? void 0 : config.assetsDir);
-    const packageDir = options["package-dir"] || (config === null || config === void 0 ? void 0 : config.packageDir);
+    const assetsDir = (options === null || options === void 0 ? void 0 : options.assetsDir) || (config === null || config === void 0 ? void 0 : config.assetsDir);
+    const packageDir = (options === null || options === void 0 ? void 0 : options.packageDir) || (config === null || config === void 0 ? void 0 : config.packageDir);
     const buildDir = (config === null || config === void 0 ? void 0 : config.buildDir) || DEFAULT_BUILD_DIR_NAME;
-    const packageManifest = options["package-manifest"] || (config === null || config === void 0 ? void 0 : config.packageManifest);
+    const packageManifest = (options === null || options === void 0 ? void 0 : options.packageManifest) || (config === null || config === void 0 ? void 0 : config.packageManifest);
+    const widgetManifest = (options === null || options === void 0 ? void 0 : options.widgetManifest) || (config === null || config === void 0 ? void 0 : config.widgetManifest);
     assertSimple(!!entry, chalk.red("В конфигурации не задан entry"));
     assertSimple(!!packageDir, chalk.red("В конфигурации не задан packageDir"));
     assertSimple(!!packageManifest, chalk.red("В конфигурации не задан packageManifest"));
-    const widgetManifest = configMergeWithWidgetManifestOptions(config, options).widgetManifest;
+    assertSimple(!!widgetManifest, chalk.red("В конфигурации не задан widgetManifest"));
     return {
         entry,
         assetsDir,

package/dist/widget/commands/release.js

@@ -1,10 +1,6 @@
 import { runReleaseWidget } from "../scripts/release/release.js";
-import { configMergeWithWidgetManifestOptions, registerWidgetManifestOption, } from "./common.js";
-import { getConfigFromFile } from "../configs/file.js";
 export const registerWidgetReleaseCommand = (widgetCommand) => {
     const widgetReleaseCommand = widgetCommand.command("release");
-    const config = getConfigFromFile();
-    registerWidgetManifestOption(widgetReleaseCommand);
     widgetReleaseCommand
         .description("Создание релиза виджета")
         .option("--first", "Первый релиз без повышения версии в package.json", false)
@@ -14,6 +10,6 @@ export const registerWidgetReleaseCommand = (widgetCommand) => {
         .option("--skip-bump", "Не увеличивать версию", false)
         .option("--dry-run", "Посмотреть что будет сделано при релизе", false)
         .action((options) => {
-        runReleaseWidget(configMergeWithWidgetManifestOptions(config, options));
+        runReleaseWidget(options);
     });
 };

package/dist/widget/scripts/release/release.js

@@ -1,17 +1,12 @@
 import { __awaiter } from "tslib";
-import fs from "fs-extra";
 import path from "path";
-import semver from "semver";
 import standardVersion, {} from "standard-version";
 import stringifyPackage from "stringify-package";
-import { number } from "@inquirer/prompts";
 import { generateGlobalPaths } from "../../../paths.js";
 import { getConfigFromFile } from "../../configs/file.js";
 import { DEFAULT_BUILD_DIR_NAME } from "../../../const.js";
 import { isExist } from "../../../utils.js";
-import { getWidgetManifestPath } from "../../widgetPaths.js";
-import { getJsonContentFile, getRecommendedReleaseType, validateSystemVersion, } from "./utils.js";
-import { MIN_SYSTEM_VERSION_MANIFEST_FIELD_NAME } from "./const.js";
+import { getJsonContentFile } from "./utils.js";
 const getSkipOptions = ({ skipChangelog, skipBump, skipCommit, skipTag, }) => {
     return {
         changelog: skipChangelog,
@@ -20,25 +15,13 @@ const getSkipOptions = ({ skipChangelog, skipBump, skipCommit, skipTag, }) => {
         tag: skipTag,
     };
 };
-const getBumpFiles = (manifestWidgetPath) => {
+const getBumpFiles = () => {
     const readVersionPackageJson = (contents) => JSON.parse(contents).version;
-    const readVersionManifest = (contents) => { var _a; return (_a = JSON.parse(contents)) === null || _a === void 0 ? void 0 : _a[MIN_SYSTEM_VERSION_MANIFEST_FIELD_NAME]; };
     const writeVersionPackageJson = (contents, version) => {
         const { json, indent, newline } = getJsonContentFile(contents);
         json.version = version;
         return stringifyPackage(json, indent, newline);
     };
-    const writeVersionManifest = (contents, version) => {
-        const { json, indent, newline } = getJsonContentFile(contents);
-        const newVersion = semver.major(version);
-        const currentMajorVersion = semver.major(readVersionManifest(contents));
-        const validator = validateSystemVersion(currentMajorVersion);
-        const isValid = validator(newVersion);
-        if (isValid === true) {
-            json[MIN_SYSTEM_VERSION_MANIFEST_FIELD_NAME] = String(newVersion);
-        }
-        return stringifyPackage(json, indent, newline);
-    };
     return [
         {
             filename: "package.json",
@@ -49,75 +32,26 @@ const getBumpFiles = (manifestWidgetPath) => {
                 writeVersion: writeVersionPackageJson,
             },
         },
-        {
-            filename: manifestWidgetPath,
-            readVersion: readVersionManifest,
-            writeVersion: writeVersionManifest,
-            updater: {
-                readVersion: readVersionManifest,
-                writeVersion: writeVersionManifest,
-            },
-        },
     ];
 };
-const getVersionOnRelease = (_a) => __awaiter(void 0, [_a], void 0, function* ({ globalPaths, manifestWidgetPath, }) {
-    const releaseType = yield getRecommendedReleaseType(globalPaths.appPath);
-    const [packageJsonContent, widgetManifestContent] = yield Promise.all([
-        fs.readFile(globalPaths.appPackageJson, {
-            encoding: "utf-8",
-        }),
-        fs.readFile(manifestWidgetPath, {
-            encoding: "utf-8",
-        }),
-    ]);
-    const packageJSON = JSON.parse(packageJsonContent);
-    const currentWidgetVersion = packageJSON.version;
-    const manifestJSON = JSON.parse(widgetManifestContent);
-    const minSystemVersionFromManifest = manifestJSON === null || manifestJSON === void 0 ? void 0 : manifestJSON[MIN_SYSTEM_VERSION_MANIFEST_FIELD_NAME];
-    let newVersion = currentWidgetVersion;
-    if (releaseType === "major") {
-        const majorWidgetVersion = semver.major(currentWidgetVersion);
-        const currentMinSystemVersion = minSystemVersionFromManifest && +minSystemVersionFromManifest;
-        const isValidVersion = typeof currentMinSystemVersion === "number" &&
-            !isNaN(currentMinSystemVersion) &&
-            currentMinSystemVersion > majorWidgetVersion;
-        const minSystemVersion = isValidVersion
-            ? currentMinSystemVersion
-            : yield number({
-                message: "Введите минимальную версию системы в которой работает виджет (в формате 2409): ",
-                validate: validateSystemVersion(majorWidgetVersion),
-            });
-        const version = `${minSystemVersion}.0.0`;
-        if (!semver.valid(version)) {
-            throw new Error(`Не валидная версия ${version}`);
-        }
-        newVersion = version;
-    }
-    else {
-        newVersion = semver.inc(currentWidgetVersion, releaseType);
-    }
-    return newVersion;
-});
 export const runReleaseWidget = (options) => __awaiter(void 0, void 0, void 0, function* () {
     var _a;
-    const { first, widgetManifest, dryRun } = options;
+    const { first, dryRun } = options;
     const config = getConfigFromFile();
     const globalPaths = generateGlobalPaths({
         buildDirPath: (_a = config === null || config === void 0 ? void 0 : config.buildDir) !== null && _a !== void 0 ? _a : DEFAULT_BUILD_DIR_NAME,
     });
-    const manifestWidgetPath = getWidgetManifestPath(widgetManifest);
     const changelogFile = path.resolve(globalPaths.appPath, "CHANGELOG.md");
     const isFirstRelease = first || !(yield isExist(changelogFile));
     yield standardVersion({
-        releaseAs: yield getVersionOnRelease({ globalPaths, manifestWidgetPath }),
         header: "",
         dryRun,
         path: globalPaths.appPath,
-        bumpFiles: getBumpFiles(manifestWidgetPath),
+        bumpFiles: getBumpFiles(),
         firstRelease: isFirstRelease,
         infile: changelogFile,
         skip: getSkipOptions(options),
-        packageFiles: [path.basename(globalPaths.appPackageJson), widgetManifest],
+        packageFiles: [path.basename(globalPaths.appPackageJson)],
         verify: false,
     });
 });

package/dist/widget/scripts/release/utils.js

@@ -1,33 +1,5 @@
-import { __awaiter } from "tslib";
-import { Bumper } from "conventional-recommended-bump";
 import detectIndent from "detect-indent";
 import { detectNewline } from "detect-newline";
-import semver, {} from "semver";
-export const getRecommendedReleaseType = (projectPath) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a;
-    const bumper = new Bumper(projectPath).loadPreset("angular");
-    const recommendation = yield bumper.bump();
-    return (_a = recommendation.releaseType) !== null && _a !== void 0 ? _a : "patch";
-});
-export const validateSystemVersion = (currentMajorVersion) => (version) => {
-    if (!version) {
-        return "Версия не была указана, укажите версию";
-    }
-    const versionStr = `${version}`;
-    const versionRegex = /^\d{4}$/;
-    if (!versionRegex.test(versionStr)) {
-        return `Указанная версия (${version}) не соответствует шаблону версии системы 2409`;
-    }
-    if (version <= currentMajorVersion) {
-        return `Указанная версия системы (${version}) должна быть больше текущей версии (${currentMajorVersion}) `;
-    }
-    const year = parseInt(versionStr.slice(0, 2), 10);
-    const month = parseInt(versionStr.slice(2, 4), 10);
-    if (year >= 23 && month >= 1 && month <= 12) {
-        return true;
-    }
-    return `Указанная версия (${version}) не является валидной`;
-};
 export const getJsonContentFile = (content) => {
     const json = JSON.parse(content);
     const indent = detectIndent(content).indent;

package/dist/widget/templates/widgetManifest.js

@@ -1,13 +1,11 @@
 import { randomUUID } from "node:crypto";
 import { CUSTOM_PACKAGE_CLI_LIB_NAME } from "../../const.js";
 import { capitalizeHelperName } from "../../plopHelpers.js";
-import { MIN_SYSTEM_VERSION_MANIFEST_FIELD_NAME } from "../scripts/release/const.js";
 export const WIDGET_MANIFEST_TEMPLATE = `\
 {
   "$schema": "node_modules/${CUSTOM_PACKAGE_CLI_LIB_NAME}/schemas/widgetManifestSchema.json",
   "uuid": "${randomUUID()}",
   "api_version": 1,
-  "${MIN_SYSTEM_VERSION_MANIFEST_FIELD_NAME}": "2408",
   "name": {
     "en": "{{${capitalizeHelperName} packageName}}",
     "ru": "{{${capitalizeHelperName} packageName}}"

package/dist/widget/widgetPaths.js

@@ -5,8 +5,5 @@ export function generateWidgetPaths({ entry, assetsDir, widgetManifest, buildDir
     const globalPaths = generateGlobalPaths({ buildDirPath: buildDir });
     return Object.assign(Object.assign({}, globalPaths), { get moduleIndex() {
             return generateIndexPath(entry);
-        }, widgetManifestJsonPath: getWidgetManifestPath(widgetManifest), widgetResourcesPath: assetsDir ? resolveApp(assetsDir) : null, widgetResourcesDirName: assetsDir ? path.basename(assetsDir) : null, widgetBuildDirPath: resolveApp(buildDir) });
-}
-export function getWidgetManifestPath(widgetManifest) {
-    return resolveApp(widgetManifest);
+        }, widgetManifestJsonPath: resolveApp(widgetManifest), widgetResourcesPath: assetsDir ? resolveApp(assetsDir) : null, widgetResourcesDirName: assetsDir ? path.basename(assetsDir) : null, widgetBuildDirPath: resolveApp(buildDir) });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infomaximum/package-cli",
-  "version": "2.10.1",
+  "version": "2.10.2",
   "exports": "./dist/index.js",
   "type": "module",
   "license": "Apache-2.0",
@@ -26,7 +26,6 @@
     "@babel/plugin-transform-runtime": "^7.23.6",
     "@infomaximum/assert": "^1.1.3",
     "@infomaximum/json-modify-webpack-plugin": "^1.1.0",
-    "@inquirer/prompts": "^6.0.1",
     "@pmmmwh/react-refresh-webpack-plugin": "^0.5.11",
     "@svgr/webpack": "^8.1.0",
     "autoprefixer": "^10.4.16",

package/schemas/widgetManifestSchema.json

@@ -38,15 +38,9 @@
     },
     "default_size_percentage": {
       "type": "object",
-      "title": "Размеры виджета по умолчанию при переносе его на холст",
-      "required": ["width", "height", "min_width", "min_height"],
+      "title": "Размеры виджета по умолчанию",
+      "required": ["min_width", "min_height"],
       "properties": {
-        "width": {
-          "type": "integer"
-        },
-        "height": {
-          "type": "integer"
-        },
         "min_width": {
           "type": "integer"
         },
@@ -56,5 +50,5 @@
       }
     }
   },
-  "required": ["uuid", "name"]
+  "required": ["uuid", "name", "min_system_version"]
 }

package/dist/widget/scripts/release/const.js

@@ -1 +0,0 @@
-export const MIN_SYSTEM_VERSION_MANIFEST_FIELD_NAME = "min_system_version";