ics-builder 4.4.9 → 4.4.10

package/.prettierignore

@@ -0,0 +1 @@
+*.yml

package/.prettierrc

@@ -0,0 +1,7 @@
+{
+	"printWidth": 120,
+	"tabWidth": 4,
+	"useTabs": true,
+	"trailingComma": "none",
+	"arrowParens": "avoid"
+}

package/.vscode/launch.json

@@ -0,0 +1,15 @@
+{
+	// Use IntelliSense to learn about possible attributes.
+	// Hover to view descriptions of existing attributes.
+	// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+	"version": "0.2.0",
+	"configurations": [
+		{
+			"type": "node",
+			"request": "launch",
+			"name": "Launch Program",
+			"runtimeArgs": ["-r", "ts-node/register"],
+			"args": ["${workspaceFolder}/src/app.ts", "source"]
+		}
+	]
+}

package/.vscode/settings.json

@@ -0,0 +1,6 @@
+{
+	"editor.insertSpaces": false,
+	"editor.detectIndentation": false,
+	"editor.formatOnSave": true,
+	"typescript.tsdk": "node_modules\\typescript\\lib"
+}

package/Dockerfile

@@ -0,0 +1,32 @@
+ARG CPU_ARCH
+
+FROM gitlab.ics-it.ru:4567/devops/oci-images:7.0-sdk-alpine-${CPU_ARCH} AS NET7
+ARG NPM_REGISTRY
+WORKDIR /app/builder
+COPY . .
+RUN npm set registry ${NPM_REGISTRY} && \
+	npm install && \
+	npx tsc && \
+	cp -R ./src/services/source/assets ./dist/src/services/source && \
+	cp ./package.json ./dist && \
+	cp ./jest.config.js ./dist && \
+	cd dist && \
+	npm pack && \
+	cd ../ && \
+	npm install -g ./dist
+
+FROM gitlab.ics-it.ru:4567/devops/oci-images:6.0-sdk-alpine-${CPU_ARCH} AS NET6
+ARG NPM_REGISTRY
+COPY --from=NET7 /app/builder /app/builder
+COPY --from=NET7 /root/.npm /root/.npm
+WORKDIR /app/builder
+RUN npm set registry ${NPM_REGISTRY} && \
+	npm install -g ./dist
+
+FROM gitlab.ics-it.ru:4567/devops/oci-images:5.0-sdk-alpine-${CPU_ARCH} AS NET5
+ARG NPM_REGISTRY
+COPY --from=NET7 /app/builder /app/builder
+COPY --from=NET7 /root/.npm /root/.npm
+WORKDIR /app/builder
+RUN npm set registry ${NPM_REGISTRY} && \
+	npm install -g ./dist

package/build/modules.yaml

@@ -0,0 +1,7 @@
+-
+  code: ""
+  version: ""
+  modules:
+    -
+      name: ._core
+      dir: ._core

package/build.template.yml

@@ -0,0 +1,51 @@
+version: "4.1"
+mode: dev
+using:
+  mdt: '#ui-webpack'
+  rb: '#RB-978'
+  data: default
+  ent: default
+paths:
+  source: source
+  build: build
+modules: 
+  - mdt.admin
+  - mdt.audit
+  - mdt.oauth
+  - mdt.binding
+  - mdt.dataext
+  - mdt.dbm
+  - mdt.directory
+  - mdt.dm
+  - mdt.feedback
+  - mdt.import
+  - mdt.inline
+  - mdt.job
+  - mdt.log
+  - mdt.mapping
+  - mdt.password
+  - mdt.status
+  - mdt.tag
+  - mdt.odata
+  - mdt.apps
+  - ent.em
+  - ent.routes
+  - data.server.etl
+  - data.geo
+  - data.dadata
+  - data.calendar
+  - rb
+  - rb.geo
+  - rb.dadata
+  - rb.mtx
+  - rb.pnl
+  - rb.qst
+  - rb.binding
+ui:
+  theme: 'mdt.coffee'
+  themes:
+    - mdt.coffee
+    - mdt.pink
+    - mdt.dark-blue
+    - mdt.light-blue
+    - mdt.modern-blue

package/dist/jest.config.js

@@ -0,0 +1,4 @@
+module.exports = {
+	preset: "ts-jest",
+	testEnvironment: "node"
+};

package/dist/package.json

@@ -0,0 +1,76 @@
+{
+	"name": "ics-builder",
+	"version": "4.4.10",
+	"description": "",
+	"main": "./src/index.js",
+	"preferGlobal": true,
+	"scripts": {
+		"test": "jest",
+		"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",
+		"major": "npx tsc && npm run copy-assets && npm version major && copy package.json dist && copy jest.config.js dist && cd dist && npm publish",
+		"pack": "npx tsc && npm run copy-assets && copy package.json dist && copy jest.config.js dist && cd dist && npm pack"
+	},
+	"bin": {
+		"builder": "./src/index.js"
+	},
+	"keywords": [
+		"build tool"
+	],
+	"repository": {
+		"type": "hg",
+		"url": "https://bitbucket.org/icsit/builder"
+	},
+	"author": "Sergey Voinkov <sergey.voinkov@ics-it.ru>",
+	"license": "ISC",
+	"devDependencies": {
+		"@types/jest": "^25.1.2",
+		"@types/jest-cli": "^24.3.0",
+		"@types/node": "^11.13.5",
+		"@types/shelljs": "^0.8.5",
+		"@types/webpack": "^4.4.31",
+		"@types/webpack-dev-server": "^3.1.5",
+		"@types/xml2js": "^0.4.5",
+		"@types/yamljs": "^0.2.30",
+		"ts-node": "^8.1.0"
+	},
+	"dependencies": {
+		"@babel/core": "^7.12.0",
+		"@babel/preset-env": "^7.12.0",
+		"autoprefixer": "^9.5.1",
+		"babel-loader": "^8.3.0",
+		"bundle-loader": "^0.5.6",
+		"chokidar": "^4.0.1",
+		"copy-webpack-plugin": "^5.0.3",
+		"css-loader": "^2.1.1",
+		"file-loader": "^3.0.1",
+		"html-webpack-plugin": "^3.2.0",
+		"jest-cli": "^26.6.3",
+		"jest-junit": "^12.0.0",
+		"just-task": "^0.9.9",
+		"less": "^3.13.1",
+		"less-loader": "^5.0.0",
+		"mini-css-extract-plugin": "^0.6.0",
+		"postcss-loader": "^3.0.0",
+		"shelljs": "^0.8.3",
+		"strip-bom-buf": "^2.0.0",
+		"style-loader": "^0.23.1",
+		"svg-inline-loader": "^0.8.0",
+		"ts-jest": "^25.5.1",
+		"ts-loader": "^6.2.1",
+		"tsconfig-paths-webpack-plugin": "^3.2.0",
+		"typescript": "^3.8.3",
+		"typescript-json-schema": "^0.51.0",
+		"virtual-module-webpack-plugin": "^0.4.1",
+		"webpack": "^4.42.1",
+		"webpack-cli": "^3.3.2",
+		"webpack-concat-plugin": "^3.0.0",
+		"webpack-dev-server": "^3.10.3",
+		"webpack-fix-style-only-entries": "^0.2.1",
+		"xml2js": "=0.4.17",
+		"yamljs": "^0.3.0",
+		"yargs": "^16.2.0"
+	}
+}

package/{src → dist/src}/builder/ui/webpackUiBuilder.js

@@ -247,6 +247,9 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
             resolveAlias["react"] = path.resolve(basePath, "ui", "./node_modules/react");
             resolveAlias["react-dom"] = path.resolve(basePath, "ui", "./node_modules/react-dom");
         }
+        // Библиотеки с современным синтаксисом, которые нужно транспилировать для webpack 4
+        var packagesToTranspile = ["ics-ui-kit", "zustand-computed"];
+        var transpileRegex = new RegExp(packagesToTranspile.join("|"));
         return {
             context: path.join(this.config.paths.source, "mdt/ui"),
             mode: this.isProd() ? "production" : "development",
@@ -282,8 +285,8 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                     // Обработка современного JS из библиотеки ics-ui-kit для совместимости со старыми браузерами (IE 10+)
                     // Babel транспилирует ES2020+ синтаксис (nullish coalescing ??, optional chaining ?.) в ES5
                     {
-                        test: /\.js$/,
-                        include: /ics-ui-kit/,
+                        test: /\.m?js$/,
+                        include: transpileRegex,
                         use: {
                             loader: require.resolve("babel-loader"),
                             options: {

package/dist/src/services/source/assets/hostList.yml

@@ -0,0 +1,12 @@
+gitlab:
+  url: "git@gitlab.ics-it.ru:"
+  defaultType: git
+  defaultGroup: ics
+bitbucket:
+  url: ssh://hg@bitbucket.org/
+  defaultType: hg
+  defaultGroup: icsit
+cartis:
+  url: "git@dev.cart.is:"
+  defaultType: git
+  defaultGroup: CART

package/dist/src/services/source/assets/sourceList.yml

@@ -0,0 +1,50 @@
+CART:
+  cartis:
+    host: cartis
+  cartis-mdt:
+    host: cartis
+ics:
+  ics-components:
+    host: gitlab
+  data:
+    host: gitlab
+  ics:
+    host: gitlab
+  dwh-etl:
+    host: gitlab
+  sellout:
+    host: gitlab
+  sellout-connector:
+    host: gitlab
+  mdt:
+    host: gitlab
+  ent:
+    host: gitlab
+  mdlz:
+    host: gitlab
+  alcon:
+    host: gitlab
+  libs:
+    host: gitlab
+  rb:
+    host: gitlab
+  jacobs:
+    host: gitlab
+  tasks:
+    host: gitlab
+  nordfox:
+    host: gitlab
+  fmd:
+    host: gitlab
+  etl:
+    host: gitlab
+  mars:
+    host: gitlab
+  cloud:
+    host: gitlab
+  kc:
+    host: gitlab
+  templates:
+    host: gitlab
+  valeant:
+    host: gitlab

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ics-builder",
-	"version": "4.4.9",
+	"version": "4.4.10",
 	"description": "",
 	"main": "./src/index.js",
 	"preferGlobal": true,

package/src/app.ts

@@ -0,0 +1,64 @@
+import * as path from "path";
+import { ConfigManager } from "./services/configManager";
+import { CommandManager } from "./services/commandManager";
+import * as yargs from "yargs";
+import { Utils } from "./utils";
+
+const configs: { name: string; defaultValue: string | Function; alias: string; description: string }[] = [
+	{
+		name: "c",
+		defaultValue: () => path.join(process.cwd(), "build.yml"),
+		alias: "configName",
+		description: "Build configuration file name"
+	},
+	{
+		name: "w",
+		defaultValue: "false",
+		alias: "watch",
+		description: "Run tests in watch mode"
+	},
+	{
+		name: "m",
+		defaultValue: "false",
+		alias: "multiple",
+		description: "Generate multiple files"
+	},
+	{
+		name: "tbp",
+		defaultValue: process.cwd(),
+		alias: "testBasePath",
+		description: "Path to test files"
+	},
+	{
+		name: "trp",
+		defaultValue: () => path.join(process.cwd() + "/result.xml"),
+		alias: "testResultPath",
+		description: "Path to test output"
+	}
+];
+
+let yargsArgs = yargs.usage("Usage: $0 <cmd> [args]");
+configs.forEach(config => {
+	yargsArgs = yargsArgs
+		.default(config.name, typeof config.defaultValue == "string" ? config.defaultValue : config.defaultValue())
+		.alias(config.name, config.alias)
+		.describe(config.name, config.description);
+});
+
+let args = yargsArgs.argv;
+
+let config =
+	!Utils.ensurePath(args["c"] as string) && args["_"].findIndex(c => c == "test-api" || c == "test-ui") != -1
+		? null
+		: ConfigManager.getConfig(args["c"] as string, args["m"] == "true");
+
+let testConfig = {
+	basePath: args["tbp"] as string,
+	resultPath: args["trp"] as string,
+	watch: args["w"] === "true" || args["w"] === true
+};
+
+let commandManager = new CommandManager(config, testConfig);
+
+commandManager.addTasks(args["_"] as string[]);
+commandManager.runTasks();

package/src/builder/api/csprojFile.ts

@@ -0,0 +1,15 @@
+import {XmlFile} from "./xmlFile"
+
+export class CsprojFile extends XmlFile {
+	setPublishPath(publishPath: string): void {
+		if (!this._xmlObj) this._readFile();
+		if (!this._xmlObj.Project)
+			this._xmlObj.Project = {};
+		if (!this._xmlObj.Project.PropertyGroup)
+			this._xmlObj.Project.PropertyGroup = {};
+		let propertyGroup = Array.isArray(this._xmlObj.Project.PropertyGroup)
+			? this._xmlObj.Project.PropertyGroup[0]
+			: this._xmlObj.Project.PropertyGroup;
+		propertyGroup.PublishDir = publishPath;
+	}
+}

package/src/builder/api/dotnetApiBuilder.ts

@@ -0,0 +1,145 @@
+import * as path from "path";
+import * as shell from "shelljs";
+import * as fs from "fs";
+
+import { Package, PackageInfoLegacy } from "../../services/configManager";
+import { Utils, Logger } from "../../utils";
+import { BaseBuilder, BuilderConfig } from "../baseBuilder";
+import { Net5ApiBuilder } from "../api/net5Builder";
+import { packageStructureManager } from "../../services/packageStructure/packageStructureManager";
+
+export class DotnetApiBuilder extends BaseBuilder {
+	constructor(config: BuilderConfig) {
+		super(config);
+	}
+
+	run(): void | Promise<void> {
+		if (this.config.api && this.config.api.framework && this.config.api.framework === ".net5") {
+			new Net5ApiBuilder(this.config).run();
+		} else {
+			this.config.packages.forEach(pkg => {
+				let pkgInfo = pkg.packageInfo as PackageInfoLegacy;
+				if (pkgInfo.api && pkgInfo.api.project) {
+					let apiSourceDir = path.join(this.config.paths.source, pkg.name, "api");
+					this.buildApiModule(path.dirname(path.join(apiSourceDir, pkgInfo.api.project)), pkg.name);
+				} else {
+					this.buildApiModules(pkg);
+				}
+			});
+		}
+
+		let buildInfo = this.packageManager.getAllPackages().map(pkg => {
+			return {
+				name: pkg.name,
+				version: pkg.version,
+				modules: pkg.modules.map(module => {
+					return `${pkg.name}.${module.name}`;
+				})
+			};
+		});
+
+		let infoDir = path.join(this.config.paths.build, "api");
+
+		if (Utils.ensurePath(infoDir)) {
+			this.writeBuildInfo(
+				path.join(this.config.paths.build, "api/settings"),
+				{
+					version: buildInfo
+						.map(pkg => {
+							return `${pkg.name} ${pkg.version}`;
+						})
+						.join(" / ")
+				},
+				"yml"
+			);
+			this.writeBuildInfo(path.join(this.config.paths.build, "build"), buildInfo, "json");
+		}
+	}
+
+	private buildApiModules(pkg: Package) {
+		packageStructureManager.getModuleSourcePaths(pkg, "api", this.config).forEach(({ moduleName, sourcePath }) => {
+			this.buildApiModule(sourcePath, `${pkg.name}.${moduleName}`);
+		});
+	}
+
+	private buildApiModule(moduleDir: string, moduleName: string) {
+		let projectFile = null;
+
+		let moduleConfig = this.parsePackageInfoLegacy(path.join(moduleDir, "module.yml"));
+
+		if (moduleConfig && moduleConfig.api && moduleConfig.api.project)
+			projectFile = path.join(moduleDir, moduleConfig.api.project);
+		else {
+			let files = shell.ls(path.join(moduleDir, "*.csproj"));
+			if (files.length) projectFile = files[0];
+		}
+
+		let targetDir = path.join(this.config.paths.build, "api");
+		let info = Array<string>();
+
+		if (Utils.ensurePath(projectFile)) {
+			let configuration = (this.config.api && this.config.api.configuration) || "debug";
+
+			moduleDir = path.dirname(projectFile);
+			let projectBinDir = path.join(moduleDir, "bin");
+			let webAppPath = path.join(moduleDir, "global.asax");
+
+			this.clearCache(moduleDir);
+			if (Utils.ensurePath(webAppPath)) {
+				Utils.copyFile(path.join(moduleDir, "web.config.template"), path.join(moduleDir, "web.config"));
+			}
+
+			this.msbuild(
+				projectFile,
+				["Clean", "Build"],
+				[
+					`Configuration=${configuration}`,
+					"PostBuildEvent=",
+					"PreBuildEvent="
+					//					"RestoreAdditionalProjectSources=https://stage.ics-it.ru/nuget/nuget"
+				]
+			);
+			info.push(path.basename(projectFile) + " is built");
+
+			// web project?
+			if (Utils.ensurePath(webAppPath)) {
+				Utils.copyFile(path.join(moduleDir, "web.config.template"), path.join(targetDir, "web.config"));
+				Utils.copyFile(webAppPath, path.join(targetDir, "global.asax"));
+			} else {
+				projectBinDir = path.join(projectBinDir, configuration);
+			}
+
+			// remove *.dll.config and *.xml files from BIN
+			let files = fs.readdirSync(projectBinDir);
+			files.forEach(fileName => {
+				if (/(dll\.config|\.xml)$/.test(fileName)) fs.unlinkSync(path.join(projectBinDir, fileName));
+			});
+
+			// copy BIN and content directories
+			Utils.copyFolder(projectBinDir, path.join(targetDir, "bin"));
+			Utils.copyFolder(path.join(moduleDir, "content"), path.join(targetDir, "content"));
+			files = fs.readdirSync(moduleDir);
+			files.forEach(fileName => {
+				if (/(\.svc)$/.test(fileName))
+					Utils.copyFile(path.join(moduleDir, fileName), path.join(targetDir, fileName));
+			});
+
+			const moduleConfigFileName = "app.config";
+			this.copyModuleConfig(moduleDir, targetDir, moduleConfigFileName, moduleName + "." +moduleConfigFileName);
+			Utils.deleteFiles(targetDir, ["packages.config", "web.config.template"]);
+			Logger.info(moduleName.replace("._core", "") + ": " + info.join(", "));
+		}
+	}
+
+	private msbuild(project: string, targets: Array<string>, props: Array<string>): void {
+		let args = targets.map(t => "/t:" + t).join(" ") + " " + props.map(p => "/p:" + p).join(" ");
+		Utils.exec(`msbuild /restore /nologo /clp:ErrorsOnly;WarningsOnly /verbosity:quiet ${project} ${args}`, {
+			silent: false
+		});
+	}
+
+	private clearCache(folderPath: string): void {
+		Utils.deleteAllFoldersRecursively(folderPath, "bin");
+		Utils.deleteAllFoldersRecursively(folderPath, "obj");
+	}
+}