@qrvey/utils 1.2.10-4 → 1.2.10-5

package/bitbucket-pipelines.yml

@@ -1,4 +1,4 @@
-image: node:14.17.3
+image: node:16.14.1
 
 pipelines:
   default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.10-4",
+  "version": "1.2.10-5",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",

package/publishing.js

@@ -17,7 +17,6 @@ const question = util.promisify(rl.question).bind(rl);
 async function execute(command) {
     console.log(command);
     const response = await exec(command);
-    console.log('response', response);
     if (response.error != null) {
         throw new Error(response.error);
     }
@@ -61,66 +60,57 @@ async function spawning(command, sArguments) {
                 reject();
             }
             resolve();
-            
         });
     });
 }
 
-async function openingPackageJson(settings) {
-    console.log('>>> Opening package.json file...');
+async function getPackageJson(settings) {
+    console.log('==>>> Opening package.json file...');
     const packageJson = await fs.readFileSync(settings.packagePath, 'utf8');
     const packageObject = JSON.parse(packageJson);
     if (packageObject != null) {
-        console.log(`The current version is ${packageObject.version}`);
+        console.log(`**** The current version is ${packageObject.version}`);
         return packageObject.version;
     }
     return '';
 }
 
+async function getNewVersion() {
+    console.log('==>>> Checking the new version provided...');
+    let newVersion;
+    const versionIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-new-version='); });
+    if (versionIndex > -1) {
+        const versionArg = proc.argv[versionIndex].split('--np-new-version=');
+        newVersion = versionArg[1] == null || versionArg[1] === '' ? undefined : versionArg[1];
+    }
+    if (newVersion == null) {
+        newVersion = question('No version provided. Type the new version: ');
+    }
+    console.log('**** Version to publish: ' + newVersion);
+    return newVersion;
+}
+
 async function cleaningProject(settings) {
-    console.log('>>> Cleaning project...');
+    console.log('==>>> Cleaning project...');
     await execute(`rm -f ${settings.packageLockPath}`);
     await execute(`rm -f -R ${settings.nodeModulesPath}`);
     await execute(`rm -f -R ${settings.distPath}`);
 }
 
 async function buildingBundle(_settings) {
-    console.log('>>> Installing Dependencies...');
+    console.log('==>>> Installing Dependencies...');
     await execute('npm install');
 
-    console.log('>>> Generating Build...');
+    console.log('==>>> Generating Build...');
     await execute('npm run build');
 }
 
-async function generatingDocument(settings) {
-    console.log('>>> Generating Document...');
-    await execute(`doxdox './dist/.+\\.js' --output ${settings.docsFileName} --ignore './dist/cjs/.+\\.js' --package ${settings.packagePath}`);
-}
-
-async function pushingChanges(settings) {
-    console.log('>>> Commiting and Pushing Docs changes...');
-
-    const gitStdout = await execute('git rev-parse --abbrev-ref HEAD');
-    console.log('gitStdout', gitStdout);
-    await execute(`git add ${settings.docsPath}`);
-    await execute(`git commit -m "📝 docs: Updated docs${settings.packageVersion !== '' ? ' for ' + settings.packageVersion : ''}"`);
-    await execute(`git push -u origin ${gitStdout}`);
-}
-
-async function revertChanges(settings) {
-    console.log('>>> Checking for modifications...');
-    console.warn(`>>> Unstaging posible changes from ${settings.docsFileName} file`);
-    await execute(`git restore --staged ${settings.docsPath}`);
-    console.warn(`>>> Discarting posible changes of ${settings.docsFileName} file`);
-    await execute(`git checkout -- ${settings.docsPath}`);
-}
-
 async function startPublishingVersion(settings) {
     await callingPublisher(settings);
 }
 
 async function callingPublisher(settings) {
-    console.log('>>> Calling Publisher');
+    console.log('==>>> Calling Publisher');
     let anyBranch = '', tag = '';
     const anyBranchIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-any-branch='); });
     const tagIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-tag='); });
@@ -132,49 +122,60 @@ async function callingPublisher(settings) {
         const tagArg = proc.argv[tagIndex].split('--np-tag=');
         tag = tagArg[1] == null || tagArg[1] === '' ? '' : proc.argv[tagIndex].replace('--np-tag=', '--tag=');
     }
-    // await execute(`np ${settings.newVersion} ${anyBranch} ${tag}`);
     await spawning(`np ${settings.newVersion}`, [anyBranch, tag]);
 }
 
 async function startGeneratingDocs(settings) {
-    console.log('>>> Starting of the Docs generation.');
+    console.log('==>>> Starting the Docs generation');
 
     await generatingDocument(settings);
     await pushingChanges(settings);
 }
 
-async function getNewVersion() {
-    let newVersion;
-    const versionIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-new-version='); });
-    if (versionIndex > -1) {
-        const versionArg = proc.argv[versionIndex].split('--np-new-version=');
-        newVersion = versionArg[1] == null || versionArg[1] === '' ? undefined : versionArg[1];
-    }
-    if (newVersion == null) {
-        newVersion = question('No version provided. Type the new version: ');
-    }
-    return newVersion;
+async function generatingDocument(settings) {
+    console.log('==>>> Generating Document...');
+    await execute(`doxdox './dist/.+\\.js' --output ${settings.docsFileName} --ignore './dist/cjs/.+\\.js' --package ${settings.packagePath}`);
+}
+
+async function pushingChanges(settings) {
+    console.log('==>>> Commiting and Pushing Docs changes...');
+
+    const gitStdout = await execute('git rev-parse --abbrev-ref HEAD');
+    console.log('gitStdout', gitStdout);
+    await execute(`git add ${settings.docsPath}`);
+    await execute(`git commit -m "📝 docs: Updated docs${settings.newVersion != null || settings.newVersion !== '' ? ' for ' + settings.newVersion : ''}"`);
+    await execute(`git push -u origin ${gitStdout.stdout}`);
+}
+
+async function revertChanges(settings) {
+    console.log('>>> Checking for modifications...');
+    console.warn(`>>> Unstaging posible changes from ${settings.docsFileName} and ${settings.packageFileName} file`);
+    await execute(`git restore --staged ${settings.docsPath} ${settings.packagePath}`);
+    console.warn(`>>> Discarting posible changes of ${settings.docsFileName} and ${settings.packageFileName} file`);
+    await execute(`git checkout -- ${settings.docsPath} ${settings.packagePath}`);
 }
 
 async function init() {
     let settings = {
+        currentVersion: '',
         distPath: './dist',
         docsPath: './README.md',
         docsFileName: 'README.md',
         newVersion: undefined,
         nodeModulesPath: './node_modules',
+        packageFileName: 'package.json',
         packageLockPath: './package-lock.json',
         packagePath: './package.json',
-        packageVersion: '',
+        
     };
 
     console.log('Welcome. The publishing operationg will begin.');
     try {
-        settings["packageVersion"] = await openingPackageJson(settings);
+        settings["currentVersion"] = await getPackageJson(settings);
         settings["newVersion"] = await getNewVersion();
 
-        // await cleaningProject(settings);
-        // await buildingBundle(settings);
+        await cleaningProject(settings);
+        await buildingBundle(settings);
         await startPublishingVersion(settings);
         await startGeneratingDocs(settings);
         console.info('Finished Publishing');