tnx-shared 5.1.226 → 5.1.230

package/assets/angular-schema-template.json

@@ -1,28 +1,18 @@
 {
-    "comments": {
-        "docs": [
-            ""
-        ],
-        "release": {
-            "5.1": [
-                "bổ sung scripts build-app-template để dev test build trước khi release, cũng để kiểm tra code khi tạo MR",
-                "bỏ build-ci-template (vì đã có build-app-template chức năng tương đương)",
-                "bỏ ref-template, ref-update-template"
-            ]
-        }
-    },
     "schema": "./node_modules/@angular/cli/lib/config/schema.json",
     "scripts": {
         "generate-all-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js generateAll --env {{environmentName}}",
         "build-service-template": "node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng build --prod --project {{projectName}}",
-        "build-app-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng build --project {{projectName}} --prod --source-map={{sourceMap}}",
         "package-template": "npm run prebuild && npm run update-version-{{projectName}} && npm run build-{{projectName}} && cd ./dist/{{projectName}} && npm publish && cd ../..",
         "package-major-template": "npm run prebuild && npm run update-major-version-{{projectName}} && npm run build-{{projectName}} && cd ./dist/{{projectName}} && npm publish && cd ../..",
         "package-minor-template": "npm run prebuild && npm run update-minor-version-{{projectName}} && npm run build-{{projectName}} && cd ./dist/{{projectName}} && npm publish && cd ../..",
         "start-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng serve --project {{projectName}} --configuration={{environmentName}} --port={{port}} --open {{additionalParams}}",
-        "deploy-template": "npm run prebuild && npm run build-app-{{projectName}} & docker build -f ./build-config/{{projectName}}/Dockerfile -t dockerhub.dttt.vn/{{scopeName}}/{{projectName}}.client:{{clientVersion}} . & docker push dockerhub.dttt.vn/{{scopeName}}/{{projectName}}.client:{{clientVersion}}",
+        "deploy-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng build --project {{projectName}} --prod & docker build -f ./build-config/{{projectName}}/Dockerfile -t dockerhub.dttt.vn/{{scopeName}}/{{projectName}}.client:{{clientVersion}} . & docker push dockerhub.dttt.vn/{{scopeName}}/{{projectName}}.client:{{clientVersion}}",
         "prebuild-template": "npm run depend-all && npm install",
         "depend-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js updateDepdendServiceToLatest --serviceName tnx-{{serviceName}} --env init",
+        "ref-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js copyRefDirect --env {{environmentName}} --projectRefDirect {{projectName}}",
+        "ref-update-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js updateRefDirect --env {{environmentName}} --projectRefDirect {{projectName}}",
+        "build-ci-template": "npm run prebuild && node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng build --project {{projectName}} --prod",
         "reset-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js reset --reset-flag true",
         "start-quick-template": "node --max_old_space_size={{nodeMaxOldSpaceSize}} ./node_modules/@angular/cli/bin/ng serve --project {{projectName}} --configuration={{environmentName}} --port={{port}} --open {{additionalParams}}",
         "update-assets-tnx-shared-template": "gulp --gulpfile ./node_modules/tnx-shared/assets/gulpfile.js updateAssetsTnxshared --env init --isUpdateAssetsTnxshared true",
@@ -199,4 +189,4 @@
     "cli": {
         "analytics": false
     }
-}
+}

package/assets/gulpfile.js

@@ -32,7 +32,6 @@ const packageJsonTemplate = 'package.json.tmp';
 
 let pathShared = rootProjectPath + contentPathShared;
 if (ci) {
-    console.log('is ci: true');
     pathShared = rootProjectPath + `commonworkspacev5/App/shared`;
     contentPathShared = `commonworkspacev5/App/shared`;
 }
@@ -45,22 +44,11 @@ const tnxSharedAssetPath = `${rootProjectPath}../../shared/AppSharedV5/projects/
 
 let angularSchemaObj = {};
 let angularSchemaTemplateObj = {};
-let personalEnvironmentObj = {};
 
 String.prototype.replaceAll = function (target, replacement) {
     return this.split(target).join(replacement);
 };
 
-task('getPersonalEnvironmentObj', function (cb) {
-    personalEnvironmentObj = angularSchemaObj.environments[personalEnvironmentName];
-
-    // kiểm tra tính đúng đắn của cấu hình personal
-    if (!personalEnvironmentObj.scopeName) {
-        throw new Error(`Không tìm thấy thiết lập scopeName trong environments:${personalEnvironmentName} (scopeName là mã dự án, ví dụ u2201)`);
-    }
-    return cb();
-});
-
 task('generateEnvironmentJsonFile', async function () {
     const listEnvironment = angularSchemaObj.environments;
     // generate application.json file
@@ -103,13 +91,6 @@ task('updateTsConfigJson', async function () {
     copyTsConfig();
 });
 
-task('getAngularSchemaObj', function () {
-    return readFile(pathAngularSchema, (content) => {
-        const parsed = JSON.parse(content);
-        angularSchemaObj = getAngularSchemaData(parsed);
-    });
-});
-
 task('generateAngularJson', function () {
     return modifyFile(pathAngularSchema, rootProjectPath, (content) => {
         const parsed = JSON.parse(content);
@@ -146,6 +127,47 @@ task('updatePackageJson', function () {
     });
 });
 
+task('confirmCopyProjectToRefDirect', function (done) {
+    if (readlineSync.keyInYN(`Ban co chac chan muon copy "${projectRefDirect}" project sang de ref truc tiep? Luu y neu da ton tai san project "${projectRefDirect}" ben nay thi co nguy co bi mat code. Neu ban da chac chan thi nhan Y`)) {
+        return done();
+    }
+    console.log('huy copy');
+    process.exit(1);
+});
+
+task('copyProjectToRefDirect', function () {
+    const projectList = getProjectList();
+    if (!projectList) {
+        console.error(`khong ton tai project ${projectRefDirect} trong projectList tai angular-schema.json`);
+    }
+    const projectInfo = projectList[projectRefDirect];
+    if (!projectInfo) {
+        console.error(`khong ton tai project ${projectRefDirect} trong projectList tai angular-schema.json`);
+    }
+    addProjectToGitIgnore(projectRefDirect);
+    return src(`${rootProjectPath}${projectInfo.refPath}/**/*`).pipe(dest(`${rootProjectPath}projects/${projectRefDirect}`));
+});
+
+task('confirmUpdateProjectRefDirectToOriginalProject', function (done) {
+    if (readlineSync.keyInYN(`Ban co chac chan muon update project "${projectRefDirect}" dang ref direct ve thu muc goc? Luu y viec copy nay se overwrite toan bo code o thu muc goc cua project ${projectRefDirect}. Nhan Y de dong y.`)) {
+        return done();
+    }
+    console.log('huy update');
+    process.exit(1);
+});
+
+task('updateProjectRefDirectToOriginalProject', function () {
+    const projectList = getProjectList();
+    if (!projectList) {
+        console.error(`khong ton tai project ${projectRefDirect} trong projectList tai angular-schema.json`);
+    }
+    const projectInfo = projectList[projectRefDirect];
+    if (!projectInfo) {
+        console.error(`khong ton tai project ${projectRefDirect} trong projectList tai angular-schema.json`);
+    }
+    return src(`${rootProjectPath}projects/${projectRefDirect}/**/*`).pipe(dest(`${rootProjectPath}${projectInfo.refPath}`));
+});
+
 task('reset', function (cb) {
     // reset script package.json
     resetPackageJson();
@@ -163,7 +185,7 @@ task('onInitDone', function (cb) {
     cb();
 });
 
-task('init', series('getAngularSchemaObj', 'loadAngularSchemaTemplate', 'generateAngularJson', 'updatePackageJson', 'onInitDone'));
+task('init', series('loadAngularSchemaTemplate', 'generateAngularJson', 'updatePackageJson', 'onInitDone'));
 
 task('confirmUpdateAssetTnxShared', function (done) {
     if (readlineSync.keyInYN(`Ban co chac chan muon update thu muc assets tai "node_modules/tnx-shared/assets" ve project goc? Luu y viec copy nay se overwrite toan bo code o thu muc goc. Nhan Y de dong y.`)) {
@@ -303,32 +325,32 @@ function readFile(sourceFile, readContent) {
 }
 
 function generateEnvironmentTsFile(environment) {
-    return modifyFile(`${pathSharedEnvironment}/environment.template.ts`, `${pathSharedEnvironment}/${personalEnvironmentObj.scopeName}`,
+    return modifyFile(`${pathSharedEnvironment}/environment.template.ts`, `${pathSharedEnvironment}/${angularSchemaObj.scopeName}`,
         (content) => {
             return transformEnvironmentTsAndJsonFile(environment, content);
         }, `environment.${environment}.ts`);
 }
 
 function transformEnvironmentTsAndJsonFile(envName, input) {
-    return input.replaceAll('{{environmentName}}', 'application,' + envName).replaceAll('{{scopeName}}', personalEnvironmentObj.scopeName);
+    return input.replaceAll('{{environmentName}}', 'application,' + envName).replaceAll('{{scopeName}}', angularSchemaObj.scopeName);
 }
 
 function generateApplicationJsonFile() {
-    if (!fs.existsSync(`${pathSharedAssets}/environments/${personalEnvironmentObj.scopeName}/application.json`)) {
+    if (!fs.existsSync(`${pathSharedAssets}/environments/${angularSchemaObj.scopeName}/application.json`)) {
         return src(`${pathSharedAssets}/environments/application-template.json`)
             .pipe(rename(`application.json`))
-            .pipe(dest(`${pathSharedAssets}/environments/${personalEnvironmentObj.scopeName}`));
+            .pipe(dest(`${pathSharedAssets}/environments/${angularSchemaObj.scopeName}`));
     }
 
     return true;
 }
 
 function generateEnvironmentJsonFile(environment) {
-    fs.access(`${pathSharedAssets}/environments/${personalEnvironmentObj.scopeName}/${environment}.json`, (err) => {
+    fs.access(`${pathSharedAssets}/environments/${angularSchemaObj.scopeName}/${environment}.json`, (err) => {
         if (err) {
             return modifyFile(
                 `${pathSharedAssets}/environments/template.json`,
-                `${pathSharedAssets}/environments/${personalEnvironmentObj.scopeName}`,
+                `${pathSharedAssets}/environments/${angularSchemaObj.scopeName}`,
                 (content) => {
                     return transformEnvironmentTsAndJsonFile(environment, content);
                 },
@@ -368,12 +390,12 @@ function transformTsConfigJson(input) {
         buildTsConfigPath(paths, project);
     });
 
-    delete paths[`tnx-template`];
-    delete paths[`tnx-template/*`];
-    delete paths[`tnx-template-direct`];
-    delete paths[`tnx-template-direct/*`];
-    delete paths[`tnx-template-package`];
-    delete paths[`tnx-template-package/*`];
+    delete paths[`${getRefPrefix()}template`];
+    delete paths[`${getRefPrefix()}template/*`];
+    delete paths[`${getRefPrefix()}template-direct`];
+    delete paths[`${getRefPrefix()}template-direct/*`];
+    delete paths[`${getRefPrefix()}template-package`];
+    delete paths[`${getRefPrefix()}template-package/*`];
 
     return input;
 }
@@ -381,7 +403,6 @@ function transformTsConfigJson(input) {
 function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
     const listEnvironment = angularSchema.environments;
     const scopeName = angularSchema.scopeName;
-    const clientVersion = angularSchema.clientVersion;
 
     let scriptDependAll = 'npm run depend-tnx-shared';
     Object.keys(angularSchema.projectList).filter(x => angularSchema.projectList[x].projectType == 'library').forEach(project => {
@@ -410,6 +431,15 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
                     .replaceAll('{{projectName}}', project);
                 input.scripts[`update-minor-version-${project}`] = angularSchemaTemplate.scripts['update-minor-version-template']
                     .replaceAll('{{projectName}}', project);
+
+                if (prj.refPath) {
+                    input.scripts[`ref-${project}`] = angularSchemaTemplate.scripts['ref-template']
+                        .replaceAll('{{projectName}}', project)
+                        .replaceAll('{{environmentName}}', personalEnvironmentName);
+                    input.scripts[`ref-update-${project}`] = angularSchemaTemplate.scripts['ref-update-template']
+                        .replaceAll('{{projectName}}', project)
+                        .replaceAll('{{environmentName}}', personalEnvironmentName);
+                }
             }
             else {
                 input.scripts[`depend-${project}`] = angularSchemaTemplate.scripts[`depend-template`]
@@ -468,15 +498,22 @@ function transformPackageJson(angularSchema, angularSchemaTemplate, input) {
                 .replaceAll('{{nodeMaxOldSpaceSize}}', nodeMaxOldSpaceSize);
         }
 
+        let baseHref = `/${project}/`;
+        if (prj.deploy) {
+            if (prj.deploy.baseHref) {
+                baseHref = prj.deploy.baseHref;
+            }
+        }
+
         input.scripts[`deploy-${project}`] = angularSchemaTemplate.scripts['deploy-template']
             .replaceAll('{{projectName}}', project)
-            .replaceAll('{{clientVersion}}', clientVersion)
+            .replaceAll('{{clientVersion}}', angularSchema.projectList[project].clientVersion)
             .replaceAll('{{scopeName}}', scopeName)
-            .replaceAll('{{nodeMaxOldSpaceSize}}', nodeMaxOldSpaceSize);
-        input.scripts[`build-app-${project}`] = angularSchemaTemplate.scripts['build-app-template']
-            .replaceAll('{{projectName}}', project)
             .replaceAll('{{nodeMaxOldSpaceSize}}', nodeMaxOldSpaceSize)
-            .replaceAll('{{sourceMap}}', prj.sourceMap ?? false);
+            .replaceAll('{{baseHref}}', baseHref);
+        input.scripts[`build-${project}-ci`] = angularSchemaTemplate.scripts['build-ci-template']
+            .replaceAll('{{projectName}}', project)
+            .replaceAll('{{nodeMaxOldSpaceSize}}', nodeMaxOldSpaceSize);
     });
 
     // add reset all generation
@@ -489,7 +526,6 @@ function transformAngularJson(input) {
     input['version'] = 1;
     input['$schema'] = input.schema;
     delete input.schema;
-    delete input.comments;
     const listEnvironment = input.environments;
 
     Object.keys(input.projectList).forEach(project => {
@@ -521,7 +557,7 @@ function transformAngularJson(input) {
                     = clonedBuildEnvironmentTemplate.fileReplacements[0].with
                         .replace('{{environmentName}}', env)
                         .replace('{{sharedDirectory}}', contentPathShared)
-                        .replace('{{scopeName}}', personalEnvironmentObj.scopeName);
+                        .replace('{{scopeName}}', angularSchemaObj.scopeName);
                 build[env] = clonedBuildEnvironmentTemplate;
                 clonedServeEnvironmentTemplate.browserTarget = clonedServeEnvironmentTemplate.browserTarget.replace('{{environmentName}}', env);
                 clonedServeEnvironmentTemplate.port = +projectPort;
@@ -546,7 +582,7 @@ function transformAngularJson(input) {
                 build['production'].fileReplacements[0].with = clonedBuildProdEnvironmentTemplate.fileReplacements[0].with
                     .replace('{{environmentName}}', prodEnvironmentName)
                     .replace('{{sharedDirectory}}', contentPathShared)
-                    .replace('{{scopeName}}', personalEnvironmentObj.scopeName);
+                    .replace('{{scopeName}}', angularSchemaObj.scopeName);
             }
 
             clonedTemplate.architect.build.options.index = clonedTemplate.architect.build.options.index.replaceAll('{{sharedDirectory}}', contentPathShared);
@@ -568,13 +604,6 @@ function transformAngularJson(input) {
                 productionConfiguration.fileReplacements[i].with = productionConfiguration.fileReplacements[i].with.replaceAll('{{sharedDirectory}}', contentPathShared);
             }
 
-            if (projectInfo.sourceMap) {
-                productionConfiguration.sourceMap = {
-                    "vendor": true,
-                    "scripts": true
-                };
-            }
-
             delete build.environmentTemplate;
             delete serve.configurations.environmentTemplate;
         }
@@ -648,12 +677,10 @@ function replaceKey(obj, pattern, value) {
 
 function buildTsConfigPath(paths, project) {
     const prj = getProjectInfo(project);
-    const prefix = getRefPrefix(project);
+    const prefix = getRefPrefix();
     const refType = prj.refType ? prj.refType : 'package';
-    if (project == 'tnx-shared') {
-        if (refType != 'package') {
-            paths[`tnx-shared`] = [`${prj.refPath}/src/lib/public-api`];
-        }
+    if (project == 'tnx-shared' && refType == 'direct') {
+        paths[`tnx-shared`] = [`${prj.refPath}/src/lib/public-api`];
     }
     else {
         const pathAlias = `${prefix}${project}`;
@@ -673,8 +700,9 @@ function addProjectToGitIgnore(projectName) {
     }, '.gitignore');
 }
 
-function getRefPrefix(project) {
-    return project.refPrefix ?? 'tnx-';
+function getRefPrefix(projectName = null) {
+    const prefix = 'tnx-'; // tạm fix luôn vì chưa thấy có trường hợp nào cần tùy biến prefix
+    return prefix;
 }
 
 function getProjectInfo(projectName) {
@@ -763,26 +791,17 @@ function getNextVersion(currentVersion, nextVersionType) {
 }
 
 function getCurrentVersion(pkgObj, packageName, onGetVersion,) {
-    var fullPackageName = packageName;
     if (!packageName.startsWith('tnx-')) {
-        fullPackageName = 'tnx-' + packageName;
+        packageName = 'tnx-' + packageName;
     }
 
     request({
-        url: `https://registry.npmjs.org/${fullPackageName}`
+        url: `https://registry.npmjs.org/${packageName}`
     }, function (error, response, body) {
         let versionStr;
         if (body) {
             const bodyObj = JSON.parse(body).versions;
-            let tempPackageName = packageName;
-            if (packageName != 'tnx-shared' && packageName.startsWith('tnx-')) { tempPackageName = tempPackageName.replace('tnx-', '') };
-            const prj = angularSchemaObj.projectList[tempPackageName];
-            if (!prj.clientVersion) { throw new Error(`Không tìm thấy clientVersion trong project ${tempPackageName}`); }
-            const clientVersion = prj.clientVersion;
-            if (!clientVersion) {
-                throw new Error(`Không tìm thấy clientVersion trong projectList:${tempPackageName}, từ core v5.1 cần phải khai báo property này (Ví dụ "canbo-service": {... "clientVersion": "5.1" ...})`);
-            }
-            const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(clientVersion));
+            const pkgVersions = Object.keys(bodyObj).filter(x => x.startsWith(angularSchemaObj.clientVersion));
             versionStr = pkgVersions[pkgVersions.length - 1];
         }
         else {
@@ -800,28 +819,26 @@ function getCurrentVersion(pkgObj, packageName, onGetVersion,) {
             });
         }
         else {
-            throw new Error(`Không tìm thấy mã phiên bản của package ${packageName}`);
-            // onGetVersion(null);
+            onGetVersion(null);
         }
     });
 }
 
-exports.generateAngularJson = series('getAngularSchemaObj', 'generateAngularJson');
+exports.generateAngularJson = task('generateAngularJson');
 exports.loadAngularSchemaTemplate = task('loadAngularSchemaTemplate');
 exports.updatePackageJson = task('updatePackageJson');
 exports.generateDockerBuildConfig = task('generateDockerBuildConfig');
 exports.updateTsConfigJson = task('updateTsConfigJson');
 exports.generateEnvironmentJsonFile = task('generateEnvironmentJsonFile');
-exports.getPersonalEnvironmentObj = task('getPersonalEnvironmentObj');
 exports.generateEnvironmentTsFile = task('generateEnvironmentTsFile');
-exports.reset = series('getAngularSchemaObj', 'reset');
+exports.reset = task('reset');
 exports.init = task('init');
+exports.copyRefDirect = series('confirmCopyProjectToRefDirect', series('init', 'copyProjectToRefDirect', 'updateTsConfigJson'));
+exports.updateRefDirect = series('confirmUpdateProjectRefDirectToOriginalProject', series('init', 'updateProjectRefDirectToOriginalProject'));
 exports.updateAssetsTnxshared = series('confirmUpdateAssetTnxShared', series('init', 'updateAssetTnxShared'));
 exports.updateNextVersionService = series('loadAngularSchema', 'updateNextVersionService');
 exports.updateDepdendServiceToLatest = series('loadAngularSchema', 'updateDepdendServiceToLatest');
 exports.generateAll = series(
-    'getAngularSchemaObj',
-    'getPersonalEnvironmentObj',
     'loadAngularSchemaTemplate',
     'generateAngularJson',
     'updatePackageJson',