ics-builder 4.1.85 → 4.1.89

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ics-builder",
-	"version": "4.1.85",
+	"version": "4.1.89",
 	"description": "",
 	"main": "./src/app.js",
 	"preferGlobal": true,
@@ -58,7 +58,7 @@
 		"ts-loader": "^6.2.1",
 		"tsconfig-paths-webpack-plugin": "^3.2.0",
 		"typescript": "^3.8.3",
-		"typescript-json-schema": "^0.43.0",
+		"typescript-json-schema": "^0.51.0",
 		"virtual-module-webpack-plugin": "^0.4.1",
 		"webpack": "^4.42.1",
 		"webpack-cli": "^3.3.2",

package/src/builder/api/csprojFile.js

@@ -0,0 +1,47 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.CsprojFile = void 0;
+var xml2js = require("xml2js");
+var fs = require("fs");
+var CsprojFile = /** @class */ (function () {
+    function CsprojFile(_path) {
+        this._path = _path;
+    }
+    CsprojFile.prototype._readFile = function () {
+        var _this = this;
+        var file = fs.readFileSync(this._path);
+        xml2js.parseString(file, function (err, result) { return _this._xmlObj = result; });
+    };
+    CsprojFile.prototype.addPostBuildCopy = function (copyToPath) {
+        if (!this._xmlObj)
+            this._readFile();
+        if (!this._xmlObj.Project)
+            this._xmlObj.Project = {};
+        this._xmlObj.Project.Target = {
+            $: {
+                Name: "CopyTarget",
+                AfterTargets: "PostBuildEvent"
+            },
+            ItemGroup: {
+                OutputFiles: {
+                    $: {
+                        Include: "$(TargetDir)\\*.*"
+                    }
+                }
+            },
+            Copy: {
+                $: {
+                    SourceFiles: "@(OutputFiles)",
+                    DestinationFolder: copyToPath,
+                }
+            }
+        };
+    };
+    CsprojFile.prototype.save = function (path) {
+        var builder = new xml2js.Builder();
+        var xml = builder.buildObject(this._xmlObj);
+        fs.writeFileSync(path, xml);
+    };
+    return CsprojFile;
+}());
+exports.CsprojFile = CsprojFile;

package/src/builder/api/dotnetApiBuilder.js

@@ -123,13 +123,8 @@ var DotnetApiBuilder = /** @class */ (function (_super) {
                 if (/(\.svc)$/.test(fileName))
                     utils_1.Utils.copyFile(path.join(moduleDir, fileName), path.join(targetDir, fileName));
             });
-            var moduleConfigFile = path.join(moduleDir, "app.config");
-            if (utils_1.Utils.ensurePath(moduleConfigFile)) {
-                var baseDir = path.basename(moduleDir);
-                if (baseDir.endsWith("api"))
-                    baseDir = path.basename(path.dirname(moduleDir));
-                utils_1.Utils.copyFile(moduleConfigFile, path.join(targetDir, moduleName + ".app.config"));
-            }
+            var moduleConfigFileName = "app.config";
+            this.copyModuleConfig(moduleDir, targetDir, moduleConfigFileName, moduleName + "." + moduleConfigFileName);
             utils_1.Utils.deleteFiles(targetDir, ["packages.config", "web.config.template"]);
             utils_1.Logger.info(moduleName.replace("._core", "") + ": " + info.join(", "));
         }

package/src/builder/api/net5Builder.js

@@ -20,19 +20,20 @@ var baseBuilder_1 = require("../baseBuilder");
 var utils_1 = require("../../utils");
 var dotnetUtils_1 = require("../../dotnetUtils");
 var packageStructureManager_1 = require("../../services/packageStructure/packageStructureManager");
+var csprojFile_1 = require("./csprojFile");
 var Net5ApiBuilder = /** @class */ (function (_super) {
     __extends(Net5ApiBuilder, _super);
     function Net5ApiBuilder(config) {
         var _this = _super.call(this, config) || this;
         _this.modules = new Array();
         _this.allProjects = [];
+        _this.configFile = "appsettings.json";
         _this.buildApiFolder = path.join(_this.config.paths.build, "api");
         shell.config.silent = true;
         return _this;
     }
     Net5ApiBuilder.prototype.run = function () {
         var _this = this;
-        var _a;
         this.config.packages.forEach(function (pkg) {
             _this.collectModuleInfo(pkg);
         });
@@ -40,16 +41,43 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         this.allProjects.forEach(function (p) {
             _this.clearCache(path.dirname(p));
         });
+        this._build();
+    };
+    Net5ApiBuilder.prototype._build = function () {
+        var _this = this;
+        var _a;
+        var coreModule = this.modules.find(function (m) { return m.IsCoreModule; });
+        var slnName = "Mdt";
+        var slnDir = path.dirname(coreModule.Project);
         var configuration = ((_a = this.config.api) === null || _a === void 0 ? void 0 : _a.configuration) || "Debug";
-        this.modules.forEach(function (m) {
-            dotnetUtils_1.DotnetUtils.restoreNugetPackages(m.Project);
-            var isCoreModule = m.Module.name == "_core" && m.Package == "mdt";
-            var outputPath = isCoreModule ? _this.buildApiFolder : path.join(_this.buildApiFolder, "modules", utils_1.Utils.getFileName(m.Project));
-            utils_1.Utils.exec("dotnet publish " + m.Project + " --no-restore -c " + configuration + " -o " + outputPath + " -nologo -v q", {
-                silent: false,
-                skipLog: true
+        var tempSlnPath = path.join(slnDir, slnName + ".sln");
+        var tempProjects = [];
+        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.addPostBuildCopy(m.OutputPath);
+                var tempProjPath = this.getTempProjPath(m.Project);
+                tempProjects.push(tempProjPath);
+                csproj.save(tempProjPath);
+            }
+            dotnetUtils_1.DotnetUtils.addProjectsToSln(tempSlnPath, tempProjects);
+            dotnetUtils_1.DotnetUtils.restoreNugetPackages(tempSlnPath);
+            dotnetUtils_1.DotnetUtils.publish(tempSlnPath, configuration);
+            this.modules.filter(function (m) { return !m.IsCoreModule; }).forEach(function (m) {
+                var projectDir = path.dirname(m.Project);
+                _this.copyModuleConfig(projectDir, m.OutputPath, _this.configFile);
             });
-        });
+        }
+        finally {
+            utils_1.Utils.deleteFile(tempSlnPath);
+            tempProjects.forEach(function (p) { return utils_1.Utils.deleteFile(p); });
+        }
+    };
+    Net5ApiBuilder.prototype.getTempProjPath = function (projPath) {
+        var dir = path.dirname(projPath);
+        return path.join(dir, utils_1.Utils.getFileName(projPath) + "_temp.csproj");
     };
     Net5ApiBuilder.prototype.collectModuleInfo = function (pkg) {
         var _this = this;
@@ -69,18 +97,18 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
                 utils_1.Logger.error(csprojPath + " does not exist");
                 return;
             }
-            this.modules.push({ Module: md, Package: pkg, Project: csprojPath });
+            this.modules.push(new ApiModuleInfo(pkg, md, csprojPath, this.buildApiFolder));
             projectFile.push(csprojPath);
         }
         else {
             var files_1 = shell.ls(path.join(modulePath, "*.sln"));
             if (files_1.length) {
-                this.modules.push({ Module: md, Package: pkg, Project: files_1[0] });
+                this.modules.push(new ApiModuleInfo(pkg, md, files_1[0], this.buildApiFolder));
                 return;
             }
             files_1 = shell.ls(path.join(modulePath, "*.csproj"));
             if (files_1.length) {
-                this.modules.push({ Module: md, Package: pkg, Project: files_1[0] });
+                this.modules.push(new ApiModuleInfo(pkg, md, files_1[0], this.buildApiFolder));
             }
             else {
                 utils_1.Logger.warn("Module " + md.name + " does not have .csproj file and will be skipped");
@@ -99,3 +127,15 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
     return Net5ApiBuilder;
 }(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
+            ? buildApiFolder
+            : path.join(buildApiFolder, "modules", utils_1.Utils.getFileName(project));
+    }
+    return ApiModuleInfo;
+}());

package/src/builder/baseBuilder.js

@@ -38,6 +38,12 @@ var BaseBuilder = /** @class */ (function () {
                 utils_1.Logger.info("Tests successfully passed. Coverage report: \n" + stdout);
         }
     };
+    BaseBuilder.prototype.copyModuleConfig = function (sourceDir, targetDir, configFileName, newConfigFileName) {
+        var moduleConfigFile = path.join(sourceDir, configFileName);
+        if (utils_1.Utils.ensurePath(moduleConfigFile)) {
+            utils_1.Utils.copyFile(moduleConfigFile, path.join(targetDir, newConfigFileName !== null && newConfigFileName !== void 0 ? newConfigFileName : configFileName));
+        }
+    };
     return BaseBuilder;
 }());
 exports.BaseBuilder = BaseBuilder;

package/src/builder/schema/schemaBuilder.js

@@ -109,7 +109,8 @@ var SchemaBuilder = /** @class */ (function (_super) {
         var settings = {
             ignoreErrors: true,
             validationKeywords: ["markdownDescription", "defaultSnippets", "title"],
-            required: true
+            required: true,
+            excludePrivate: true
         };
         var tsConfigPath = Path.join(sourcePath, "tsconfig.json");
         if (!utils_1.Utils.ensurePath(tsConfigPath)) {

package/src/dotnetUtils.js

@@ -10,10 +10,18 @@ var DotnetUtils = /** @class */ (function () {
         utils_1.Utils.deleteFiles(slnFilePath, [slnFileName + ".sln"]);
         utils_1.Utils.exec("dotnet new sln -n " + slnFileName + " -o " + slnFilePath);
     };
-    DotnetUtils.restoreNugetPackages = function (projectPath, dropSlnOnFail) {
-        utils_1.Utils.exec(
-        //			`dotnet restore ${projectPath} -s "https://stage.ics-it.ru/nuget/nuget/" -s "https://api.nuget.org/v3/index.json" -nologo -v q`);
-        "dotnet restore " + projectPath + " -nologo -v q");
+    DotnetUtils.restoreNugetPackages = function (projectPath) {
+        utils_1.Utils.exec("dotnet restore " + projectPath + " -nologo -v q");
+    };
+    DotnetUtils.publish = function (projectPath, configuration, outputPath) {
+        if (outputPath === void 0) { outputPath = null; }
+        var command = "dotnet publish " + projectPath + " --no-restore -c " + configuration + " -nologo -v q";
+        if (outputPath)
+            command += " -o " + outputPath;
+        utils_1.Utils.exec(command, {
+            silent: false,
+            skipLog: true
+        });
     };
     DotnetUtils.addProjectsToSln = function (slnFilePath, projects, dropSlnOnFail) {
         var _this = this;

package/src/exceptions/BuilderException.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var BuilderException = /** @class */ (function () {
+    function BuilderException(message) {
+        this.message = message;
+    }
+    return BuilderException;
+}());
+exports.default = BuilderException;

package/src/services/packageStructure/structureUtils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.structureUtils = void 0;
+var BuilderException_1 = require("../../exceptions/BuilderException");
 exports.structureUtils = {
     getModules: function (pkg, pkgDependencies, config, getAllPackageModuleNames, getModuleDeps) {
         if (getModuleDeps === void 0) { getModuleDeps = null; }
@@ -11,16 +12,19 @@ exports.structureUtils = {
             });
         var modules;
         var core = "_core";
+        var allModuleNames = getAllPackageModuleNames(pkg, isIgnoredDirectory, config);
         if (config.modules && config.modules.length > 0)
             modules = config.modules
                 .filter(function (m) { return pkg.name == m.split(".")[0]; })
                 .map(function (val) {
                 var split = val.split(".");
                 var moduleName = split.length == 1 ? core : split.slice(1).join(".");
+                if (!isIgnoredModule(pkg.name, moduleName) && !allModuleNames.includes(moduleName))
+                    throw new BuilderException_1.default("Module " + val + " not found!");
                 return createModule(mappedPkgDependencies, moduleName, pkg, getModuleDeps, config);
             });
         else {
-            modules = getAllPackageModuleNames(pkg, isIgnoredDirectory, config).map(function (moduleName) {
+            modules = allModuleNames.map(function (moduleName) {
                 return createModule(mappedPkgDependencies, moduleName, pkg, getModuleDeps, config);
             });
         }
@@ -29,6 +33,15 @@ exports.structureUtils = {
         return modules;
     }
 };
+function isIgnoredModule(packageName, moduleName) {
+    if (moduleName === "_core")
+        return true;
+    if (packageName === "mdt") {
+        if (moduleName === "storage" || moduleName === "template")
+            return true;
+    }
+    return false;
+}
 function isIgnoredDirectory(name) {
     return name == "node_modules" || name == "_core" || name.startsWith(".");
 }

package/src/utils.js

@@ -136,10 +136,13 @@ var Utils = /** @class */ (function () {
     Utils.deleteFiles = function (dir, files) {
         for (var i = 0; i < files.length; i++) {
             var file = path.join(dir, files[i]);
-            if (fs.existsSync(file))
-                fs.unlinkSync(file);
+            this.deleteFile(file);
         }
     };
+    Utils.deleteFile = function (path) {
+        if (fs.existsSync(path))
+            fs.unlinkSync(path);
+    };
     Utils.prepareDir = function (dir) {
         Utils.clearFolder(dir);
         Utils.ensureFolder(dir);