ics-builder 4.1.99 → 4.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ics-builder",
-	"version": "4.1.99",
+	"version": "4.2.3",
 	"description": "",
 	"main": "./src/app.js",
 	"preferGlobal": true,

package/src/builder/ui/customUiBuilder.js

@@ -37,10 +37,15 @@ var CustomUiBuilder = /** @class */ (function (_super) {
         });
     };
     CustomUiBuilder.prototype.prepareEnvArgs = function () {
+        var _this = this;
         var env = this.config.ui.env || {};
         return Object.keys(env).map(function (k) {
             var v = env[k];
-            return "--env." + k + "=" + (v instanceof Array ? v.toString() : v);
+            var splitters = {
+                space: " ",
+                dot: "."
+            };
+            return "--env" + (splitters[_this.config.ui.envSplitter] || ".") + k + "=" + (v instanceof Array ? v.toString() : v);
         });
     };
     CustomUiBuilder.prototype.prepareCmd = function (cmd, args) {

package/src/services/commandManager.js

@@ -54,6 +54,7 @@ var CommandManager = /** @class */ (function () {
     CommandManager.prototype.initTasks = function () {
         var _this = this;
         index_1.task("source", function () { return _this.packageManager.loadAllPackages(); });
+        index_1.task("source:ci", function () { return _this.packageManager.loadAllPackages(false, true); });
         index_1.task("build-api", function () { return _this.runBuilder(_this.builderManager.buildApi()); });
         index_1.task("build-db", function () { return _this.runBuilder(_this.builderManager.buildDb()); });
         index_1.task("generate-schema", function () { return _this.runBuilder(_this.builderManager.buildSchema()); });

package/src/services/packageManager.js

@@ -19,8 +19,9 @@ var PackageManager = /** @class */ (function () {
         }
         return PackageManager.instance;
     };
-    PackageManager.prototype.loadAllPackages = function (skipLoad) {
-        this.loadPackages(null, null, skipLoad);
+    PackageManager.prototype.loadAllPackages = function (skipLoad, mainPackageSkipLoad) {
+        if (!mainPackageSkipLoad)
+            this.loadPackages(null, null, skipLoad);
         if (this.config.using) {
             this.loadPackages(this.config.using, "build.yml", skipLoad);
         }

package/src/services/packageStructure/packageStructureManager.js

@@ -68,7 +68,7 @@ var PackageStructureManager = /** @class */ (function () {
         if (!moduleInfoPath)
             return [];
         var moduleInfo = yaml.load(moduleInfoPath);
-        return (_a = moduleInfo.dependencies) !== null && _a !== void 0 ? _a : [];
+        return (_a = moduleInfo === null || moduleInfo === void 0 ? void 0 : moduleInfo.dependencies) !== null && _a !== void 0 ? _a : [];
     };
     return PackageStructureManager;
 }());

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

@@ -6,8 +6,8 @@ var GitScmProvider = /** @class */ (function () {
     function GitScmProvider(options) {
         this.options = options;
     }
-    GitScmProvider.prototype.exec = function (cmd, targetDir) {
-        return utils_1.Utils.exec("git " + cmd, { silent: true, cwd: targetDir || "" });
+    GitScmProvider.prototype.exec = function (cmd, targetDir, skipError) {
+        return utils_1.Utils.exec("git " + cmd, { silent: true, cwd: targetDir || "", skipError: skipError });
     };
     GitScmProvider.prototype.clone = function (config) {
         utils_1.Logger.info("Cloning repository " + config.package.name + " in " + config.paths.source + ", please wait...");
@@ -19,8 +19,11 @@ var GitScmProvider = /** @class */ (function () {
     };
     GitScmProvider.prototype.update = function (config, version) {
         var update = this.exec("checkout " + version.branch + " --force", config.paths.source);
-        if (!version.isTag)
-            this.exec("merge", config.paths.source);
+        if (!version.isTag) {
+            var result = this.exec("merge", config.paths.source, true);
+            if (result.code !== 0)
+                throw result.stderr || result.stdout;
+        }
         utils_1.Logger.info(config.package.name + " updated to " + version.branch + " (rev. " + version.revision + ")");
         return update;
     };

package/src/services/source/sourceManager.js

@@ -29,16 +29,39 @@ var SourceManager = /** @class */ (function () {
         var scmProvider = sourceType === "git" ? new gitScmProvider_1.GitScmProvider(scmOptions) : new hgScmProvider_1.HgScmProvider(scmOptions);
         var version;
         if (!skipLoad) {
-            utils_1.Utils.ensurePath(path.join(sourceConfig.paths.source, "." + sourceType.toLowerCase()))
-                ? scmProvider.pull(sourceConfig)
-                : scmProvider.clone(sourceConfig);
-            version = scmProvider.getVersion(sourceConfig);
-            scmProvider.update(sourceConfig, version);
+            try {
+                utils_1.Utils.ensurePath(path.join(sourceConfig.paths.source, "." + sourceType.toLowerCase()))
+                    ? scmProvider.pull(sourceConfig)
+                    : scmProvider.clone(sourceConfig);
+                version = this.update(scmProvider, sourceConfig, true);
+            }
+            catch (e) {
+                if (e.includes("Merge conflict")) {
+                    utils_1.Logger.warn("Merge conflict, retrying");
+                    utils_1.Utils.prepareDir(sourceConfig.paths.source);
+                    scmProvider.clone(sourceConfig);
+                    version = this.update(scmProvider, sourceConfig, false);
+                }
+                else
+                    throw e;
+            }
         }
         else
             version = scmProvider.getVersion(sourceConfig);
         return version;
     };
+    SourceManager.prototype.update = function (scmProvider, sourceConfig, throwError) {
+        try {
+            var version = scmProvider.getVersion(sourceConfig);
+            scmProvider.update(sourceConfig, version);
+            return version;
+        }
+        catch (e) {
+            if (throwError)
+                throw e;
+            utils_1.Logger.error(e);
+        }
+    };
     return SourceManager;
 }());
 exports.SourceManager = SourceManager;