ics-builder 4.1.96 → 4.1.97

package/package.json

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

package/src/builder/api/net5Builder.js

@@ -28,6 +28,7 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         var _this = _super.call(this, config) || this;
         _this.modules = new Array();
         _this.allProjects = [];
+        _this.emptyModulesWithConfig = new Map();
         _this.configFile = "appsettings.json";
         _this.buildApiFolder = path.join(_this.config.paths.build, "api");
         shell.config.silent = true;
@@ -71,6 +72,9 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
                 var projectDir = path.dirname(m.Project);
                 _this.copyModuleConfig(projectDir, m.OutputPath, _this.configFile);
             });
+            this.emptyModulesWithConfig.forEach(function (val, key) {
+                _this.copyModuleConfig(val, path.join(_this.buildApiFolder, "modules", key), _this.configFile);
+            });
         }
         finally {
             utils_1.Utils.deleteFile(tempSlnPath);
@@ -83,10 +87,8 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
             _this.writeModulesProjects(pkg.name, pkg.modules.find(function (m) { return m.name == moduleName; }), sourcePath);
         });
     };
-    Net5ApiBuilder.prototype.writeModulesProjects = function (pkg, md, modulePath) {
-        var _this = this;
+    Net5ApiBuilder.prototype.writeModulesProjects = function (packageName, module, modulePath) {
         var _a;
-        var projectFile = new Array();
         var moduleConfig = this.parsePackageInfoLegacy(path.join(modulePath, "module.yml"));
         if ((_a = moduleConfig === null || moduleConfig === void 0 ? void 0 : moduleConfig.api) === null || _a === void 0 ? void 0 : _a.project) {
             var csprojPath = path.join(modulePath, moduleConfig.api.project);
@@ -94,24 +96,31 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
                 utils_1.Logger.error(csprojPath + " does not exist");
                 return;
             }
-            this.modules.push(new ApiModuleInfo(pkg, md, csprojPath, this.buildApiFolder));
-            projectFile.push(csprojPath);
+            this.modules.push(new ApiModuleInfo(packageName, module, csprojPath, this.buildApiFolder));
         }
         else {
-            var files_1 = shell.ls(path.join(modulePath, "*.sln"));
-            if (files_1.length) {
-                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(new ApiModuleInfo(pkg, md, files_1[0], this.buildApiFolder));
+            var files = shell.ls(path.join(modulePath, "*.sln"));
+            if (files.length) {
+                this.modules.push(new ApiModuleInfo(packageName, module, files[0], this.buildApiFolder));
             }
             else {
-                utils_1.Logger.warn("Module " + md.name + " does not have .csproj file and will be skipped");
-                return;
+                files = shell.ls(path.join(modulePath, "*.csproj"));
+                if (files.length) {
+                    this.modules.push(new ApiModuleInfo(packageName, module, files[0], this.buildApiFolder));
+                }
+                else {
+                    utils_1.Logger.warn("Module " + module.name + " does not have .csproj file and will be skipped");
+                    var configFile = path.join(modulePath, this.configFile);
+                    if (utils_1.Utils.ensurePath(configFile))
+                        this.emptyModulesWithConfig.set(packageName + "." + module.name, modulePath);
+                    return;
+                }
             }
         }
+        this.addProjectFiles(modulePath);
+    };
+    Net5ApiBuilder.prototype.addProjectFiles = function (modulePath) {
+        var _this = this;
         var files = shell.ls(path.join(modulePath, "*.csproj"), path.join(modulePath, "*", "*.csproj"));
         files.forEach(function (f) {
             _this.allProjects.push(f);
@@ -129,7 +138,6 @@ var ApiModuleInfo = /** @class */ (function () {
         this.Package = pkg;
         this.Module = module;
         this.Project = project;
-        var dir = path.dirname(project);
         this.IsCoreModule = module.name == "_core" && pkg == "mdt";
         this.OutputPath = this.IsCoreModule
             ? buildApiFolder