ics-builder 4.4.0 → 4.4.2

package/package.json

@@ -1,12 +1,12 @@
 {
 	"name": "ics-builder",
-	"version": "4.4.0",
+	"version": "4.4.2",
 	"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"

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/uiDependency/dependencyBuilder.js

@@ -45,9 +45,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

@@ -10,7 +10,7 @@ var ConfigManager = /** @class */ (function () {
     ConfigManager.getConfig = function (configPath, multipleSchemaFiles) {
         var config;
         if (!utils_1.Utils.ensurePath(configPath)) {
-            utils_1.Logger.info("Build config " + configPath + " is not found. Using default config.");
+            utils_1.Logger.warn("Build config " + configPath + " is not found. Using default config.");
             config = { api: { configuration: "Debug", framework: ".net5" } };
         }
         else

package/src/services/packageManager.js

@@ -30,7 +30,7 @@ var PackageManager = /** @class */ (function () {
         var _this = this;
         if (!using) {
             if (!this.config.package && skipload) {
-                this.packages.set(null, { name: "", version: "", modules: [{ name: "_core" }], isSingleModule: true });
+                this.packages.set(null, { name: "", version: "", modules: [{ name: "_core" }], isSingleModule: true, packageInfo: {} });
                 return;
             }
             var mainPackage = this.config.package;

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

@@ -47,6 +47,9 @@ var GitScmProvider = /** @class */ (function () {
             utils_1.Logger.error("Cannot find version " + config.package.version + " of module " + config.package.name);
         return version;
     };
+    GitScmProvider.prototype.cleanPackageLock = function (config) {
+        return this.exec("clean -fdx '*/package-lock.json'", 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,9 @@ var HgScmProvider = /** @class */ (function () {
             utils_1.Logger.error("Cannot find version " + config.package.version + " of module " + config.package.name);
         return version;
     };
+    HgScmProvider.prototype.cleanPackageLock = function (config) {
+        return null;
+    };
     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.cleanPackageLock(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);
     };