ics-builder 4.4.1 → 4.4.3

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "ics-builder",
-	"version": "4.4.1",
+	"version": "4.4.3",
 	"description": "",
-	"main": "./src/app.js",
+	"main": "./src/index.js",
 	"preferGlobal": true,
 	"scripts": {
 		"test": "jest",
-		"dev": "ts-node ./src/app.ts",
+		"dev": "ts-node ./src/index.ts",
 		"copy-assets": "xcopy \"src/services/source/assets\" \"dist/src/services/source/assets\" /e /i",
 		"patch": "npx tsc && npm run copy-assets && npm version patch && copy package.json dist && copy jest.config.js dist && cd dist && npm publish",
 		"minor": "npx tsc && npm run copy-assets && npm version minor && copy package.json dist && copy jest.config.js dist && cd dist && npm publish",
@@ -14,7 +14,7 @@
 		"pack": "npx tsc && npm run copy-assets && copy package.json dist && copy jest.config.js dist && cd dist && npm pack"
 	},
 	"bin": {
-		"builder": "./src/app.js"
+		"builder": "./src/index.js"
 	},
 	"keywords": [
 		"build tool"
@@ -39,6 +39,7 @@
 	"dependencies": {
 		"autoprefixer": "^9.5.1",
 		"bundle-loader": "^0.5.6",
+		"chokidar": "^4.0.1",
 		"copy-webpack-plugin": "^5.0.3",
 		"css-loader": "^2.1.1",
 		"file-loader": "^3.0.1",

package/src/app.js

@@ -1,4 +1,3 @@
-#!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var path = require("path");

package/src/builder/db/dbBuilder.js

@@ -40,56 +40,80 @@ var DbBuilder = /** @class */ (function (_super) {
                 utils_1.Utils.copyAllFilesByPattern(path.join(sourcePath, "data"), path.join(moduleDestinationDir, "data"), "**/*.xml");
                 utils_1.Utils.copyAllFilesByPattern(path.join(sourcePath, "scripts"), path.join(moduleDestinationDir, "scripts"), "**/*.sql");
                 utils_1.Utils.copyAllFilesByPattern(path.join(sourcePath, "updates"), path.join(moduleDestinationDir, "updates"), "**/*.sql");
+                var otherUpdatesDirs = fs.readdirSync(sourcePath, { withFileTypes: true })
+                    .filter(function (d) { return d.isDirectory(); })
+                    .map(function (d) { return d.name; })
+                    .filter(function (d) { return d.startsWith("updates."); });
+                for (var _i = 0, otherUpdatesDirs_1 = otherUpdatesDirs; _i < otherUpdatesDirs_1.length; _i++) {
+                    var updateDir = otherUpdatesDirs_1[_i];
+                    utils_1.Utils.copyAllFilesByPattern(path.join(sourcePath, updateDir), path.join(moduleDestinationDir, updateDir), "**/*.sql");
+                }
+                var otherScriptsDirs = fs.readdirSync(sourcePath, { withFileTypes: true })
+                    .filter(function (d) { return d.isDirectory(); })
+                    .map(function (d) { return d.name; })
+                    .filter(function (d) { return d.startsWith("scripts."); });
+                for (var _b = 0, otherScriptsDirs_1 = otherScriptsDirs; _b < otherScriptsDirs_1.length; _b++) {
+                    var scriptDir = otherScriptsDirs_1[_b];
+                    utils_1.Utils.copyAllFilesByPattern(path.join(sourcePath, scriptDir), path.join(moduleDestinationDir, scriptDir), "**/*.sql");
+                }
                 if (utils_1.Utils.ensurePath(moduleDestinationDir)) {
-                    var order_1 = new Array();
-                    var files_1 = new Array();
-                    var dependencies_1 = {};
-                    var scriptsPath_1 = path.join(sourcePath, "scripts");
-                    var dirs = ["view*", "function*", "procedure*", "trigger*", "index*"];
-                    dirs.forEach(function (dir) {
-                        files_1 = files_1.concat(glob.sync(path.join(scriptsPath_1, dir, "**/*.sql")));
-                    });
-                    for (var i = 0; i < files_1.length; i++)
-                        files_1[i] = files_1[i].replace(/\//g, path.sep);
-                    var reorder_1 = function (file, parent) {
-                        if (file == parent)
-                            throw "Circular dependencies! " + parent;
-                        var deps = dependencies_1[file];
-                        deps &&
-                            deps.forEach(function (dep) {
-                                dep = path.resolve(scriptsPath_1, dep);
-                                if (files_1.indexOf(dep) != -1)
-                                    reorder_1(dep, parent || file);
-                            });
-                        if (!parent || order_1.indexOf(parent) > order_1.indexOf(file))
-                            return;
-                        order_1.splice(order_1.indexOf(file), 1);
-                        order_1.splice(order_1.indexOf(parent), 0, file);
-                    };
-                    files_1.forEach(function (file) {
-                        var deps = (dependencies_1[file] = []);
-                        var data = fs.readFileSync(file).toString();
-                        data.split("\n").forEach(function (line) {
-                            var m = line.replace(/^\uFEFF/, "").match(/^--\s*\$dep\s+(.+?)\s*$/);
-                            if (m) {
-                                deps.push(m[1]);
-                            }
-                        });
-                        order_1.push(file);
-                    });
-                    // reorder
-                    files_1.forEach(function (file) {
-                        reorder_1(file);
-                    });
-                    if (order_1.length)
-                        fs.writeFileSync(moduleDestinationDir + "/scripts/order.txt", order_1
-                            .map(function (f) {
-                            return path.relative(scriptsPath_1, f);
-                        })
-                            .join("\n"));
+                    var scriptsPath = path.join(sourcePath, "scripts");
+                    _this.GenerateOrderFile(scriptsPath, moduleDestinationDir + "/scripts");
+                    for (var _c = 0, otherScriptsDirs_2 = otherScriptsDirs; _c < otherScriptsDirs_2.length; _c++) {
+                        var scriptDir = otherScriptsDirs_2[_c];
+                        var otherScriptPath = path.join(sourcePath, scriptDir);
+                        _this.GenerateOrderFile(otherScriptPath, moduleDestinationDir + "/" + scriptDir);
+                    }
+                }
+            });
+        });
+    };
+    DbBuilder.prototype.GenerateOrderFile = function (scriptsPath, destinationScriptsPath) {
+        var order = new Array();
+        var files = new Array();
+        var dependencies = {};
+        var dirs = ["view*", "function*", "procedure*", "trigger*", "index*"];
+        dirs.forEach(function (dir) {
+            files = files.concat(glob.sync(path.join(scriptsPath, dir, "**/*.sql")));
+        });
+        for (var i = 0; i < files.length; i++)
+            files[i] = files[i].replace(/\//g, path.sep);
+        var reorder = function (file, parent) {
+            if (file == parent)
+                throw "Circular dependencies! " + parent;
+            var deps = dependencies[file];
+            deps &&
+                deps.forEach(function (dep) {
+                    dep = path.resolve(scriptsPath, dep);
+                    if (files.indexOf(dep) != -1)
+                        reorder(dep, parent || file);
+                });
+            if (!parent || order.indexOf(parent) > order.indexOf(file))
+                return;
+            order.splice(order.indexOf(file), 1);
+            order.splice(order.indexOf(parent), 0, file);
+        };
+        files.forEach(function (file) {
+            var deps = (dependencies[file] = []);
+            var data = fs.readFileSync(file).toString();
+            data.split("\n").forEach(function (line) {
+                var m = line.replace(/^\uFEFF/, "").match(/^--\s*\$dep\s+(.+?)\s*$/);
+                if (m) {
+                    deps.push(m[1]);
                 }
             });
+            order.push(file);
+        });
+        // reorder
+        files.forEach(function (file) {
+            reorder(file);
         });
+        if (order.length)
+            fs.writeFileSync(destinationScriptsPath + "/order.txt", order
+                .map(function (f) {
+                return path.relative(scriptsPath, f);
+            })
+                .join("\n"));
     };
     DbBuilder.prototype.convertToXml = function (paths, module, destinationDir) {
         paths.forEach(function (p) {

package/src/builder/ui/webpackUiBuilder.js

@@ -12,6 +12,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -120,6 +131,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
         this.config.packages
             .filter(function (p) { return !p.isLegacy; })
             .forEach(function (p) {
+            utils_1.Logger.info("Building package " + p.name);
             var outputModulesPath = path.join(_this.config.paths.build, "ui", "modules");
             packageStructureManager_1.packageStructureManager
                 .getModuleSourcePaths(p, "ui", _this.config)
@@ -130,6 +142,9 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                     return;
                 utils_1.Utils.exec("npm run build", { cwd: sourcePath });
                 var moduleFile = path.join(sourcePath, "dist/module.js");
+                if (!fs.existsSync(moduleFile)) {
+                    moduleFile = path.join(sourcePath, "dist/index.js");
+                }
                 var outputModuleFile = path.join(outputModulesPath, p.name, p.isSingleModule ? "index.js" : path.join(moduleName, "index.js"));
                 utils_1.Utils.copyFile(moduleFile, outputModuleFile);
             });
@@ -172,6 +187,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
         this.config.packages.forEach(function (pkg) {
             if (!pkg.isLegacy)
                 return;
+            utils_1.Logger.info("Adding package " + pkg.name + " to webpack config");
             resolvePlugins.push.apply(resolvePlugins, glob
                 .sync(path.join(_this.config.paths.source, pkg.name, "{!(node_modules),}/tsconfig.json"))
                 .map(function (tsconfig) { return new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({ configFile: tsconfig }); }));
@@ -220,6 +236,17 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                 fileName: "[name].js" + (this.isProd() ? "?[hash:8]" : ""),
                 filesToConcat: libs
             }));
+        // Настройка React для MDT
+        var resolveAlias = {};
+        if (this.config.packages.length) {
+            if (this.config.packages.length > 1) {
+                console.warn("\n\t\t\t\t\t\u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435: \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u043E \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043F\u0430\u043A\u0435\u0442\u043E\u0432 \u0432 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438.\n\t\t\t\t\t\n\t\t\t\t\t\u0414\u043B\u044F \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E\u0439 \u0440\u0430\u0431\u043E\u0442\u044B React \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E:\n\t\t\t\t\t1. \u0423\u0431\u0435\u0434\u0438\u0442\u044C\u0441\u044F, \u0447\u0442\u043E \u0432 \u043F\u0435\u0440\u0432\u043E\u043C \u043F\u0430\u043A\u0435\u0442\u0435 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u044B \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438 react \u0438 react-dom\n\t\t\t\t\t2. \u042D\u0442\u0438 \u0432\u0435\u0440\u0441\u0438\u0438 React \u0431\u0443\u0434\u0443\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u044B \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043E\u0441\u0442\u0430\u043B\u044C\u043D\u044B\u0445 \u043F\u0430\u043A\u0435\u0442\u043E\u0432\n\t\t\t\t\t\n\t\t\t\t\t\u0412\u0430\u0436\u043D\u043E: \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u0440\u0430\u0437\u043D\u044B\u0445 \u0432\u0435\u0440\u0441\u0438\u0439 React \u0432 \u043E\u0434\u043D\u043E\u043C \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0438 \u043C\u043E\u0436\u0435\u0442 \u043F\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u043A \u0441\u0435\u0440\u044C\u0435\u0437\u043D\u044B\u043C \u043E\u0448\u0438\u0431\u043A\u0430\u043C.\n\t\t\t\t\t");
+            }
+            var pack = this.config.packages[0];
+            var basePath = path.join(this.config.paths.source, pack.name);
+            resolveAlias["react"] = path.resolve(basePath, "ui", "./node_modules/react");
+            resolveAlias["react-dom"] = path.resolve(basePath, "ui", "./node_modules/react-dom");
+        }
         return {
             context: path.join(this.config.paths.source, "mdt/ui"),
             mode: this.isProd() ? "production" : "development",
@@ -234,9 +261,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                 modules: ["node_modules"],
                 extensions: [".ts", ".tsx", ".js", ".less", ".css", ".md", ".json"],
                 plugins: resolvePlugins,
-                alias: {
-                    mithril: "node_modules/mithril"
-                }
+                alias: __assign({ mithril: "node_modules/mithril" }, resolveAlias)
             },
             plugins: plugins,
             optimization: {
@@ -279,6 +304,17 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                                 outputPath: "./_res/fonts"
                             }
                         }
+                    },
+                    {
+                        test: /\.css$/,
+                        use: ["style-loader", "css-loader"],
+                        include: function (path) {
+                            // Стили для monaco-editor обрабатываются отдельно в самой библиотеке
+                            if (path.includes("monaco-editor")) {
+                                return false;
+                            }
+                            return true;
+                        }
                     }
                 ]
             }

package/src/builder/uiDependency/dependencyBuilder.js

@@ -28,6 +28,7 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
         this.config.packages.forEach(function (pkg) {
             if (pkg.isLegacy) {
                 var sourcePath = Path.join(_this.config.paths.source, pkg.name, "ui");
+                utils_1.Logger.info("Loading ui dependencies for package " + pkg.name);
                 _this.runNpmInstall(sourcePath);
                 return;
             }
@@ -35,6 +36,7 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
                 .getModuleSourcePaths(pkg, "ui", _this.config)
                 .forEach(function (_a) {
                 var moduleName = _a.moduleName, sourcePath = _a.sourcePath;
+                utils_1.Logger.info("Loading ui dependencies for module " + pkg.name + "." + moduleName);
                 _this.runNpmInstall(sourcePath);
             });
         });
@@ -45,9 +47,9 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
             utils_1.Logger.warn("File package.json not found!");
             return;
         }
-        var packageLockPath = Path.join(cwd, "package-lock.json");
-        var hasPackageLockPath = utils_1.Utils.ensurePath(packageLockPath);
-        utils_1.Utils.exec("npm " + (hasPackageLockPath ? "ci" : "install") + " --force", { silent: true, cwd: cwd });
+        // let packageLockPath = Path.join(cwd, "package-lock.json");
+        // let hasPackageLockPath = Utils.ensurePath(packageLockPath);
+        utils_1.Utils.exec("npm install --no-save --prefer-offline --force", { silent: true, cwd: cwd });
     };
     return UIDependencyBuilder;
 }(baseBuilder_1.BaseBuilder));

package/src/index.js

@@ -0,0 +1,37 @@
+#!/usr/bin/env node
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var utils_1 = require("./utils");
+var path = require("path");
+function isLegacyProviderNeeded() {
+    var nodeJsMajorVersion = parseInt(process.versions.node.split(".")[0]);
+    return nodeJsMajorVersion > 16;
+}
+function getCliArgs() {
+    return process.argv.slice(2);
+}
+function envWithLagacyProvider() {
+    return __assign(__assign({}, process.env), { NODE_OPTIONS: "--openssl-legacy-provider" });
+}
+function run() {
+    var options = {
+        stdio: "inherit",
+        cwd: process.cwd()
+    };
+    if (isLegacyProviderNeeded())
+        options.env = envWithLagacyProvider();
+    var pathToApp = path.resolve(__dirname, "app");
+    utils_1.Utils.execModule(pathToApp, getCliArgs(), options);
+}
+run();

package/src/services/configManager.js

@@ -17,7 +17,7 @@ var ConfigManager = /** @class */ (function () {
             config = yaml.load(configPath);
         // if (!config.paths) Logger.error(`paths section is required in build config.`);
         // if (!config.package) Logger.error("'package' section is required in build config");
-        config.modules = config.modules || [];
+        config.modules = Array.from(new Set(config.modules).values()) || [];
         config.ui = config.ui || { theme: "mdt.coffee", themes: ["mdt.coffee"], port: 9002, checkTypes: false };
         if (["boolean", "undefined"].includes(typeof config.ui.checkTypes)) {
             config.ui.checkTypes = !!config.ui.checkTypes;

package/src/services/packageManager.js

@@ -44,23 +44,23 @@ var PackageManager = /** @class */ (function () {
         else {
             var packagesNames = Object.keys(using).map(function (packageName) { return packageName; });
             packagesNames.forEach(function (packageName) {
-                if (packageName === _this.config.package.name)
-                    utils_1.Logger.error("Circular dependency. Package config " + packageInfoPath + " has circular reference to main package \"" + _this.config.package.name + "\".");
-                if (_this.packages.has(packageName)) {
-                    utils_1.Logger.warn("Package " + packageName + " with version " + _this.packages.get(packageName).version + " already added to build packages list. Version " + using[packageName] + " from " + packageInfoPath + " is skipped.");
-                    return;
-                }
                 var pkg = { name: packageName, version: using[packageName] };
                 var gitRepositoryNameRegexResult = /([^\/\\:]*)\.git\/?$/.exec(packageName);
                 if (gitRepositoryNameRegexResult) {
                     pkg.name = gitRepositoryNameRegexResult[1];
                     pkg.url = packageName;
                 }
+                if (pkg.name === _this.config.package.name)
+                    utils_1.Logger.error("Circular dependency. Package config " + packageInfoPath + " has circular reference to main package \"" + _this.config.package.name + "\".");
+                if (_this.packages.has(pkg.name)) {
+                    utils_1.Logger.warn("Package " + pkg.name + " with version " + _this.packages.get(pkg.name).version + " already added to build packages list. Version " + using[packageName] + " from " + packageInfoPath + " is skipped.");
+                    return;
+                }
                 _this.sourceManager.loadSource(pkg, skipload);
                 pkg.packageInfo = _this.getPackageInfo(pkg.name);
                 var pkgDependencies = _this.getPackageDependencies(pkg, skipload);
                 packageStructureManager_1.packageStructureManager.writePackageStructureInfo(pkg, _this.config);
-                _this.packages.set(packageName, _this.preparePackageModules(pkg, pkgDependencies));
+                _this.packages.set(pkg.name, _this.preparePackageModules(pkg, pkgDependencies));
             });
         }
     };

package/src/services/source/loaders/gitScmProvider.js

@@ -47,6 +47,13 @@ var GitScmProvider = /** @class */ (function () {
             utils_1.Logger.error("Cannot find version " + config.package.version + " of module " + config.package.name);
         return version;
     };
+    GitScmProvider.prototype.clean = function (config) {
+        this.exec("clean -fdx '*/package-lock.json'", config.paths.source);
+        this.exec("clean -fdx 'api/*/bin/*'", config.paths.source);
+        this.exec("clean -fdx '*/api/*/bin/*'", config.paths.source);
+        this.exec("clean -fdx 'api/*/obj/*'", config.paths.source);
+        this.exec("clean -fdx '*/api/*/obj/*'", config.paths.source);
+    };
     GitScmProvider.prototype._getGitUrl = function (config) {
         var _a;
         return (_a = config.package.url) !== null && _a !== void 0 ? _a : this.options.url + this.options.group + "/" + config.package.name;

package/src/services/source/loaders/hgScmProvider.js

@@ -44,6 +44,8 @@ var HgScmProvider = /** @class */ (function () {
             utils_1.Logger.error("Cannot find version " + config.package.version + " of module " + config.package.name);
         return version;
     };
+    HgScmProvider.prototype.clean = function (config) {
+    };
     return HgScmProvider;
 }());
 exports.HgScmProvider = HgScmProvider;

package/src/services/source/sourceManager.js

@@ -30,9 +30,13 @@ var SourceManager = /** @class */ (function () {
         var version;
         if (!skipLoad) {
             try {
-                utils_1.Utils.ensurePath(path.join(sourceConfig.paths.source, "." + sourceType.toLowerCase()))
-                    ? scmProvider.pull(sourceConfig)
-                    : scmProvider.clone(sourceConfig);
+                if (utils_1.Utils.ensurePath(path.join(sourceConfig.paths.source, "." + sourceType.toLowerCase()))) {
+                    scmProvider.clean(sourceConfig);
+                    scmProvider.pull(sourceConfig);
+                }
+                else {
+                    scmProvider.clone(sourceConfig);
+                }
                 version = this.update(scmProvider, sourceConfig, true);
             }
             catch (e) {

package/src/utils.js

@@ -29,6 +29,7 @@ var fs = require("fs");
 var path = require("path");
 var glob = require("glob");
 var stripBomBuffer = require("strip-bom-buf");
+var child_process = require("child_process");
 var Utils = /** @class */ (function () {
     function Utils() {
     }
@@ -52,6 +53,21 @@ var Utils = /** @class */ (function () {
                 throw e;
         }
     };
+    Utils.execModule = function (path, args, options) {
+        var proc = child_process.fork(path, args, options);
+        process.on("SIGTERM", function () { return proc.kill("SIGTERM"); });
+        process.on("SIGINT", function () { return proc.kill("SIGINT"); });
+        process.on("SIGBREAK", function () { return proc.kill("SIGBREAK"); });
+        process.on("SIGHUP", function () { return proc.kill("SIGHUP"); });
+        proc.on("exit", function (code, signal) {
+            var exitCode = code;
+            if (exitCode === null) {
+                exitCode = signal === "SIGINT" ? 0 : 1;
+            }
+            process.exit(exitCode);
+        });
+        return proc;
+    };
     Utils.ensurePath = function (path) {
         return fs.existsSync(path);
     };