ics-builder 4.2.2 → 4.2.5

package/package.json

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

package/src/builder/api/dotnetApiBuilder.js

@@ -33,10 +33,10 @@ var DotnetApiBuilder = /** @class */ (function (_super) {
         }
         else {
             this.config.packages.forEach(function (pkg) {
-                var packageInfo = _this.parsePackageInfoLegacy(path.join(_this.config.paths.source, pkg.name, "package.yml"));
-                if (packageInfo && packageInfo.api && packageInfo.api.project) {
+                var pkgInfo = pkg.packageInfo;
+                if (pkgInfo.api && pkgInfo.api.project) {
                     var apiSourceDir = path.join(_this.config.paths.source, pkg.name, "api");
-                    _this.buildApiModule(path.dirname(path.join(apiSourceDir, packageInfo.api.project)), pkg.name);
+                    _this.buildApiModule(path.dirname(path.join(apiSourceDir, pkgInfo.api.project)), pkg.name);
                 }
                 else {
                     _this.buildApiModules(pkg);

package/src/builder/api/net5Builder.js

@@ -46,31 +46,41 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         this._build();
     };
     Net5ApiBuilder.prototype._build = function () {
+        var _a;
+        if (this.modules.length == 0) {
+            utils_1.Logger.warn("Api layer not found, skipping.");
+            return;
+        }
+        var configuration = ((_a = this.config.api) === null || _a === void 0 ? void 0 : _a.configuration) || "Debug";
+        this._buildProjects(configuration);
+        this._buildSolutions(configuration);
+    };
+    Net5ApiBuilder.prototype._buildProjects = function (configuration) {
         var _this = this;
         var _a;
-        var coreModule = this.modules.find(function (m) { return m.IsCoreModule; });
+        var coreModule = (_a = this.modules.find(function (m) { return m.isCoreModule; })) !== null && _a !== void 0 ? _a : this.modules[0];
         var slnName = "Mdt";
-        var slnDir = path.dirname(coreModule.Project);
-        var configuration = ((_a = this.config.api) === null || _a === void 0 ? void 0 : _a.configuration) || "Debug";
+        var slnDir = path.dirname(coreModule.buildFile.path);
         var tempSlnPath = path.join(slnDir, slnName + ".sln");
+        var projects = this.modules.map(function (m) { return m.buildFile; }).filter(function (f) { return f.type == ApiModuleBuildFileType.Project; });
         try {
             dotnetUtils_1.DotnetUtils.createTempSln(slnDir, slnName);
-            for (var _i = 0, _b = this.modules; _i < _b.length; _i++) {
-                var m = _b[_i];
-                var csproj = new csprojFile_1.CsprojFile(m.Project);
-                csproj.setPublishPath(m.OutputPath);
-                csproj.save(m.Project);
+            for (var _i = 0, projects_1 = projects; _i < projects_1.length; _i++) {
+                var p = projects_1[_i];
+                var csproj = new csprojFile_1.CsprojFile(p.path);
+                csproj.setPublishPath(p.outputPath);
+                csproj.save(p.path);
             }
-            dotnetUtils_1.DotnetUtils.addProjectsToSln(tempSlnPath, this.modules.map(function (m) { return m.Project; }));
+            dotnetUtils_1.DotnetUtils.addProjectsToSln(tempSlnPath, projects.map(function (p) { return p.path; }));
             dotnetUtils_1.DotnetUtils.restoreNugetPackages(tempSlnPath);
             dotnetUtils_1.DotnetUtils.publish(tempSlnPath, configuration);
-            var webConfigFilePath = path.join(coreModule.OutputPath, "web.config");
+            var webConfigFilePath = path.join(coreModule.buildFile.outputPath, "web.config");
             var webConfigFile = new webConfigFile_1.WebConfigFile(webConfigFilePath);
             webConfigFile.addDotnetProcessPath();
             webConfigFile.save();
-            this.modules.filter(function (m) { return !m.IsCoreModule; }).forEach(function (m) {
-                var projectDir = path.dirname(m.Project);
-                _this.copyModuleConfig(projectDir, m.OutputPath, _this.configFile);
+            projects.filter(function (p) { return p.path != coreModule.buildFile.path; }).forEach(function (p) {
+                var projectDir = path.dirname(p.path);
+                _this.copyModuleConfig(projectDir, p.outputPath, _this.configFile);
             });
             this.emptyModulesWithConfig.forEach(function (val, key) {
                 _this.copyModuleConfig(val, path.join(_this.buildApiFolder, "modules", key), _this.configFile);
@@ -80,6 +90,16 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
             utils_1.Utils.deleteFile(tempSlnPath);
         }
     };
+    Net5ApiBuilder.prototype._buildSolutions = function (configuration) {
+        var solutions = this.modules.map(function (m) { return m.buildFile; }).filter(function (f) { return f.type == ApiModuleBuildFileType.Solution; });
+        if (solutions.length == 0)
+            return;
+        utils_1.Logger.info("building additional solutions");
+        solutions.forEach(function (solution) {
+            dotnetUtils_1.DotnetUtils.restoreNugetPackages(solution.path);
+            dotnetUtils_1.DotnetUtils.publish(solution.path, configuration, solution.outputPath);
+        });
+    };
     Net5ApiBuilder.prototype.collectModuleInfo = function (pkg) {
         var _this = this;
         packageStructureManager_1.packageStructureManager.getModuleSourcePaths(pkg, "api", this.config).forEach(function (_a) {
@@ -134,14 +154,27 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
 }(baseBuilder_1.BaseBuilder));
 exports.Net5ApiBuilder = Net5ApiBuilder;
 var ApiModuleInfo = /** @class */ (function () {
-    function ApiModuleInfo(pkg, module, project, buildApiFolder) {
-        this.Package = pkg;
-        this.Module = module;
-        this.Project = project;
-        this.IsCoreModule = module.name == "_core" && pkg == "mdt";
-        this.OutputPath = this.IsCoreModule
+    function ApiModuleInfo(pkg, module, buildFilePath, buildApiFolder) {
+        this.package = pkg;
+        this.module = module;
+        this.isCoreModule = module.name == "_core" && pkg == "mdt";
+        var outputPath = this.isCoreModule
             ? buildApiFolder
-            : path.join(buildApiFolder, "modules", utils_1.Utils.getFileName(project));
+            : path.join(buildApiFolder, "modules", utils_1.Utils.getFileName(buildFilePath));
+        this.buildFile = new ApiModuleBuildFile(buildFilePath, outputPath);
     }
     return ApiModuleInfo;
 }());
+var ApiModuleBuildFile = /** @class */ (function () {
+    function ApiModuleBuildFile(path, outputPath) {
+        this.path = path;
+        this.outputPath = outputPath;
+        this.type = path.endsWith(".csproj") ? ApiModuleBuildFileType.Project : ApiModuleBuildFileType.Solution;
+    }
+    return ApiModuleBuildFile;
+}());
+var ApiModuleBuildFileType;
+(function (ApiModuleBuildFileType) {
+    ApiModuleBuildFileType[ApiModuleBuildFileType["Project"] = 0] = "Project";
+    ApiModuleBuildFileType[ApiModuleBuildFileType["Solution"] = 1] = "Solution";
+})(ApiModuleBuildFileType || (ApiModuleBuildFileType = {}));

package/src/builder/api/xmlFile.js

@@ -10,7 +10,11 @@ var XmlFile = /** @class */ (function () {
     XmlFile.prototype._readFile = function () {
         var _this = this;
         var file = fs.readFileSync(this._path);
-        xml2js.parseString(file, { explicitArray: false }, function (err, result) { return _this._xmlObj = result; });
+        xml2js.parseString(file, { explicitArray: false }, function (err, result) {
+            if (err)
+                throw new Error("Error while parsing xml file " + _this._path + ":\n" + err.message);
+            _this._xmlObj = result;
+        });
     };
     XmlFile.prototype.save = function (path) {
         if (path === void 0) { path = null; }

package/src/builder/baseBuilder.js

@@ -15,9 +15,6 @@ var BaseBuilder = /** @class */ (function () {
     BaseBuilder.prototype.parsePackageInfoLegacy = function (path) {
         return utils_1.Utils.ensurePath(path) ? yaml.load(path) : {};
     };
-    BaseBuilder.prototype.parsePackageInfo = function (path) {
-        return utils_1.Utils.ensurePath(path) ? yaml.load(path) : {};
-    };
     BaseBuilder.prototype.writeBuildInfo = function (targetPath, object, mode) {
         fs.writeFileSync(targetPath.replace(new RegExp("." + mode.replace("yml", "ya?ml") + "$"), "").concat("." + mode), mode === "json" ? JSON.stringify(object, null, "\t") : yaml.stringify(object));
     };

package/src/builder/ui/customUiBuilder.js

@@ -25,11 +25,11 @@ var CustomUiBuilder = /** @class */ (function (_super) {
     CustomUiBuilder.prototype.run = function () {
         var _this = this;
         this.config.packages.forEach(function (pkg) {
-            var _a, _b;
+            var _a, _b, _c, _d;
             var packageDir = path.join(_this.config.paths.source, pkg.name);
-            var packageInfo = _this.parsePackageInfo(path.join(packageDir, "package.yml"));
-            var buildDir = path.join(packageDir, (packageInfo.builder.ui.path || "").replace(pkg.name, ""));
-            var cmd = ((_b = (_a = packageInfo === null || packageInfo === void 0 ? void 0 : packageInfo.builder) === null || _a === void 0 ? void 0 : _a.ui) === null || _b === void 0 ? void 0 : _b.cmd) || "";
+            var pkgInfo = pkg.packageInfo;
+            var buildDir = path.join(packageDir, (((_b = (_a = pkgInfo === null || pkgInfo === void 0 ? void 0 : pkgInfo.builder) === null || _a === void 0 ? void 0 : _a.ui) === null || _b === void 0 ? void 0 : _b.path) || "").replace(pkg.name, ""));
+            var cmd = ((_d = (_c = pkgInfo === null || pkgInfo === void 0 ? void 0 : pkgInfo.builder) === null || _c === void 0 ? void 0 : _c.ui) === null || _d === void 0 ? void 0 : _d.cmd) || "";
             var envArgs = _this.prepareEnvArgs();
             if (envArgs.length)
                 cmd = _this.prepareCmd(cmd, envArgs);
@@ -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/buildManager.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BuildManager = void 0;
-var path = require("path");
-var yaml = require("yamljs");
 var utils_1 = require("../utils");
 var dotnetApiBuilder_1 = require("../builder/api/dotnetApiBuilder");
 var dbBuilder_1 = require("../builder/db/dbBuilder");
@@ -75,18 +73,14 @@ var BuildManager = /** @class */ (function () {
         var layerBuilders = new Map();
         var packages = this.packageManager.getAllPackages();
         packages.forEach(function (pkg) {
-            var packageInfoPath = path.join(_this.config.paths.source, pkg.name, "package.yml");
-            if (utils_1.Utils.ensurePath(packageInfoPath)) {
-                var packageInfo = yaml.load(packageInfoPath);
-                packageInfo = packageInfo || {};
-                var newVersionOfPackageYaml = !packageInfo.api;
-                if (newVersionOfPackageYaml && packageInfo.builder && packageInfo.builder[layer]) {
-                    var layerInfo = packageInfo.builder[layer];
-                    layerInfo.path = layerInfo.path || layer;
-                    var builderType_1 = layerInfo.type || _this.getDefaultBuilder(layer);
-                    _this.updateLayerBuilder(layer, builderType_1, layerBuilders, pkg);
-                    return;
-                }
+            var newVersionOfPackageYaml = !pkg.packageInfo.api;
+            var pkgInfo = pkg.packageInfo;
+            if (newVersionOfPackageYaml && pkgInfo.builder && pkgInfo.builder[layer]) {
+                var layerInfo = pkgInfo.builder[layer];
+                layerInfo.path = layerInfo.path || layer;
+                var builderType_1 = layerInfo.type || _this.getDefaultBuilder(layer);
+                _this.updateLayerBuilder(layer, builderType_1, layerBuilders, pkg);
+                return;
             }
             var builderType = _this.getDefaultBuilder(layer);
             _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);

package/src/services/packageManager.js

@@ -36,7 +36,8 @@ var PackageManager = /** @class */ (function () {
             var mainPackage = this.config.package;
             if (!skipload)
                 this.sourceManager.loadSource(mainPackage, skipload);
-            var pkgDependencies = this.getPackageDependencies(mainPackage.name, skipload);
+            mainPackage.packageInfo = this.getPackageInfo(mainPackage.name);
+            var pkgDependencies = this.getPackageDependencies(mainPackage, skipload);
             packageStructureManager_1.packageStructureManager.writePackageStructureInfo(mainPackage, this.config);
             this.packages.set(mainPackage.name, this.preparePackageModules(mainPackage, pkgDependencies));
         }
@@ -56,22 +57,19 @@ var PackageManager = /** @class */ (function () {
                     pkg.url = packageName;
                 }
                 _this.sourceManager.loadSource(pkg, skipload);
-                var pkgDependencies = _this.getPackageDependencies(packageName, 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));
             });
         }
     };
-    PackageManager.prototype.getPackageDependencies = function (packageName, skipload) {
-        var pkgDependencies = null;
-        var pkgInfoPath = this.getPackageInfoPath(packageName);
-        if (utils_1.Utils.ensurePath(pkgInfoPath)) {
-            var pkgInfo = yaml.load(pkgInfoPath);
-            pkgDependencies = pkgInfo.modules;
-            if (pkgInfo.using) {
-                delete pkgInfo.using[packageName];
-                this.loadPackages(pkgInfo.using, pkgInfoPath, skipload);
-            }
+    PackageManager.prototype.getPackageDependencies = function (pkg, skipload) {
+        var pkgDependencies = pkg.packageInfo.modules;
+        var using = pkg.packageInfo.using;
+        if (using) {
+            delete using[pkg.name];
+            this.loadPackages(using, this.getPackageInfoPath(pkg.name), skipload);
         }
         return pkgDependencies;
     };
@@ -134,8 +132,17 @@ var PackageManager = /** @class */ (function () {
         var _this = this;
         return packages.sort(function (prev, curr) { return _this.config.packagesOrder.indexOf(prev.name) - _this.config.packagesOrder.indexOf(curr.name); });
     };
+    PackageManager.prototype.getPackageInfo = function (packageName) {
+        var pkgInfoPath = this.getPackageInfoPath(packageName);
+        return utils_1.Utils.ensurePath(pkgInfoPath) ? yaml.load(pkgInfoPath) : {};
+    };
     PackageManager.prototype.getPackageInfoPath = function (packageName) {
-        return path.join(this.config.paths.source, packageName, "package.yml");
+        var packagePath = path.join(this.config.paths.source, packageName);
+        var packageInfoPath = path.join(packagePath, "package.yml");
+        if (utils_1.Utils.ensurePath(packageInfoPath))
+            return packageInfoPath;
+        packageInfoPath = path.join(packagePath, "package.yaml");
+        return packageInfoPath;
     };
     return PackageManager;
 }());