tnx-shared 5.1.5 → 5.1.6

package/assets/gulpfile.js

@@ -108,6 +108,14 @@ task('loadAngularSchemaTemplate', function () {
     });
 });
 
+task('loadAngularSchema', function () {
+    return readFile(pathAngularSchema, (content) => {
+        angularSchemaObj = cloneObject(content);
+        return true;
+    });
+});
+
+
 task('updatePackageJson', function () {
     return modifyFile(pathPackageJson, rootProjectPath, (content) => {
         const parsed = JSON.parse(content);
@@ -197,30 +205,30 @@ task('updateNextVersionService', function (done) {
 });
 
 task('updateDepdendServiceToLatest', function (done) {
-    let serviceName = argv.serviceName;
-    try {
-        if (!serviceName.startsWith('tnx-')) {
-            serviceName = 'tnx-' + serviceName;
-        }
-        getCurrentVersion({}, serviceName, (version) => {
-            if (version) {
-                console.log(`latest version of service ${serviceName} is ${version.versionString}`);
-                modifyFile(pathPackageJson, rootProjectPath, (content) => {
-                    const json = JSON.parse(content);
-                    json.dependencies[serviceName] = version.versionString;
-                    return JSON.stringify(json);
-                });
-            }
-            else {
-                console.log(`cannot get version or does not existed of service ${serviceName}`);
+        let serviceName = argv.serviceName;
+        try {
+            if (!serviceName.startsWith('tnx-')) {
+                serviceName = 'tnx-' + serviceName;
             }
+            getCurrentVersion({}, serviceName, (version) => {
+                if (version) {
+                    console.log(`latest version of service ${serviceName} is ${version.versionString}`);
+                    modifyFile(pathPackageJson, rootProjectPath, (content) => {
+                        const json = JSON.parse(content);
+                        json.dependencies[serviceName] = version.versionString;
+                        return JSON.stringify(json);
+                    });
+                }
+                else {
+                    console.log(`cannot get version or does not existed of service ${serviceName}`);
+                }
+                done();
+            });
+        }
+        catch (e) {
+            console.log(`error on update service to latest ${serviceName}`, e);
             done();
-        });
-    }
-    catch (e) {
-        console.log(`error on update service to latest ${serviceName}`, e);
-        done();
-    }
+        }
 });
 
 function resetPackageJson() {
@@ -746,14 +754,19 @@ function processNextVersion(packageName, type, callback) {
             return new Promise((resolve, reject) => {
                 const obj = JSON.parse(content);
                 getCurrentVersion(obj, packageName, (currentVersion) => {
-                    obj.versionPrev = currentVersion.versionString;
+                    if (currentVersion) {
+                        obj.versionPrev = currentVersion.versionString;
 
-                    const nextVersion = getNextVersion(currentVersion, type);
-                    obj.version = nextVersion.versionString;
-                    console.log(`version moi cua package ${packageName} se la ${obj.version}`);
+                        const nextVersion = getNextVersion(currentVersion, type);
+                        obj.version = nextVersion.versionString;
+                        console.log(`version moi cua package ${packageName} se la ${obj.version}`);
 
-                    resolve(JSON.stringify(obj));
-                    callback();
+                        resolve(JSON.stringify(obj));
+                        callback();
+                    }
+                    else {
+                        console.log(`cannot get version ${angularSchemaObj.clientVersion} or does not existed of service ${packageName}`);
+                    }
                 });
             });
         });
@@ -777,7 +790,7 @@ function getNextVersion(currentVersion, nextVersionType) {
     return currentVersion;
 }
 
-function getCurrentVersion(pkgObj, packageName, onGetVersion) {
+function getCurrentVersion(pkgObj, packageName, onGetVersion, ) {
     if (!packageName.startsWith('tnx-')) {
         packageName = 'tnx-' + packageName;
     }
@@ -789,9 +802,9 @@ function getCurrentVersion(pkgObj, packageName, onGetVersion) {
         if (body) {
             const bodyObj = JSON.parse(body);
             versionStr = bodyObj[`version${angularSchemaObj.clientVersion}`];
-            // if (versionStr == null) {
-            //     versionStr = `${angularSchemaObj.clientVersion}.0`;
-            // }
+            if (pkgObj.version) {
+                versionStr = `${angularSchemaObj.clientVersion}.0`;
+            }
         }
         else {
             console.warn('cannot get latest version, get from local instead', body);
@@ -825,8 +838,8 @@ 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 = task('updateNextVersionService');
-exports.updateDepdendServiceToLatest = task('updateDepdendServiceToLatest');
+exports.updateNextVersionService = series('loadAngularSchema', 'updateNextVersionService');
+exports.updateDepdendServiceToLatest = series('loadAngularSchema', 'updateDepdendServiceToLatest');
 exports.generateAll = series(
     'loadAngularSchemaTemplate',
     'generateAngularJson',

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "tnx-shared",
-  "version": "5.1.5",
+  "version": "5.1.6",
   "clientVersion": "5.1",
-  "versionPrev": "5.1.4",
+  "versionPrev": "5.1.5",
   "version5.0": "5.0.5",
-  "version5.1": "5.1.5",
+  "version5.1": "5.1.6",
   "description": "",
   "dependencies": {
     "@angular/animations": "11.0.0",