wp-advads 1.0.5 → 1.0.7

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "wp-advads",
-  "version": "1.0.5",
+  "version": "1.0.7",
   "description": "Create a Advanced Ads wordPress plugin eco system.",
   "author": {
     "name": "Shakeeb Ahmed",

package/src/app.js

@@ -11,9 +11,11 @@ import logSymbols from 'log-symbols'
  * Internal Dependencies
  */
 import { getCommand } from './helpers.js'
-import { execute as helpCommand } from './commands/help/index.js'
 import { execute as backupCommand } from './commands/backup/index.js'
+import { execute as helpCommand } from './commands/help/index.js'
+import { execute as releaseCommand } from './commands/release/index.js'
 import { execute as setupCommand } from './commands/setup/index.js'
+import packageDetails from '../package.json' assert { type: "json" }
 
 /**
  * App
@@ -22,7 +24,7 @@ async function app() {
     console.log(
         [
             chalk.hex('#FADC00').inverse.bold('Advanced Ads WordPress Plugin Scaffolding'),
-            chalk.white( 'v1.0.0' ),
+            chalk.white( 'v' + packageDetails.version ),
             chalk.dim( 'by Shakeeb Ahmed' )
         ].join(" ")
     );
@@ -41,6 +43,10 @@ async function app() {
         setupCommand()
     }
 
+    if ( 'release' === command ) {
+        releaseCommand(args)
+    }
+
     // if ( 'make:file' === command ) {
     //     waterfall(
     //         [
@@ -54,18 +60,6 @@ async function app() {
     //         }
     //     )
     // }
-
-    // if ( 'make:plugin' === command ) {
-    //     waterfall(
-    //         [
-    //             prompts,
-    //             createPlugin,
-    //         ],
-    //         ( err, results ) => {
-    //             console.log( `${logSymbols.success} ${chalk.bold.green(`All done!`)}` )
-    //         }
-    //     )
-    // }
 }
 
 app()

package/src/commands/help/index.js

@@ -5,4 +5,5 @@ export function execute() {
     onNewLine('List of commands')
     console.log('    npx wp-advads backup');
     console.log('    npx wp-advads setup');
+    console.log('    npx wp-advads release');
 }

package/src/commands/release/index.js

@@ -0,0 +1,70 @@
+/**
+ * External Dependencies
+ */
+import chalk from 'chalk'
+import { waterfall } from 'async'
+import logSymbols from 'log-symbols'
+
+/**
+ * Internal Dependencies
+ */
+import { heading, runCommand } from "../../helpers.js"
+
+async function getPackage() {
+    const rootPath = process.cwd()
+    const { default: data } = await import( rootPath + '/package.json', { assert: { type: "json" } });
+
+    return data
+}
+
+function wpPot( next ) {
+    const rootPath = process.cwd()
+    const { wpPot = {} } = getPackage()
+    const {output, file, domain, exclude = [] } = wpPot
+
+    heading('Creating POT file...')
+
+    try {
+        exclude.push(".github")
+        exclude.push("vendor")
+        exclude.push("tools")
+        runCommand( 'wp', [ 'i18n', 'make-pot', rootPath, `${rootPath}${output}${file} --domain=${domain} --exclude=${exclude.join(',')}` ], next )
+
+        console.log( logSymbols.success + ' Done' )
+    } catch {
+        console.log( logSymbols.error + ' Error' )
+    }
+}
+
+function updateTranslations( next ) {
+    heading('Downloading translations')
+    runCommand( 'npm', [ 'run', 'translations' ], next )
+    console.log( logSymbols.success + ' Done' )
+}
+
+export function execute(args) {
+    heading('Releasing the plugin...')
+    console.log('')
+
+    const {
+        potOnly = false,
+        translationsOnly = false
+    } = args
+
+    const falls = []
+
+    if (potOnly) {
+        falls.push(wpPot)
+    }
+
+    if (translationsOnly) {
+        falls.push(updateTranslations)
+    }
+
+    waterfall(
+        falls,
+        ( err, results ) => {
+            console.log( `${logSymbols.success} ${chalk.bold.green(`All done!`)}` )
+        }
+    )
+}

package/src/commands/setup/create-plugin.js

@@ -148,7 +148,7 @@ class CreatePlugin {
             'async',
             'browser-sync',
             'browser-sync-webpack-plugin',
-            'chalk',
+            'chalk@4.1.2',
             'eslint-plugin-prettier',
             'husky',
             'laravel-mix',
@@ -158,7 +158,6 @@ class CreatePlugin {
             'sass',
             'sass-loader',
             'shelljs',
-            'stylelint',
             'webpack',
         ]
 

package/src/helpers.js

@@ -41,10 +41,12 @@ export function onNewLine(text) {
 
 export function getCommand() {
     const args = getArguments()
+    const { _, ...rest } = args
+    const command = _[0] || 'help'
 
     return {
-        command: args._[0] || 'help',
-        args: args._[1] || []
+        command,
+        args: rest || []
     }
 }
 

package/template/configs/package.json

@@ -55,5 +55,10 @@
 	"glotpress": {
 		"project": "{{package.name}}",
 		"destination": "./languages/"
+	},
+	"wpPot": {
+		"output": "/languages/",
+		"file": "{{wp.textDomain}}.pot",
+		"domain": "{{wp.textDomain}}"
 	}
 }

package/template/tools/laravel-mix/wp-pot.js

@@ -27,8 +27,6 @@ class WordPressPot {
 
 	const rootPath = process.cwd()
 
-	console.log(`${rootPath}${output}${file}`);
-
     sh.exec(`wp i18n make-pot ${rootPath} ${rootPath}${output}${file} --domain=${domain} --exclude=${exclude.join(',')}`)
 	if ( false !== skipJS ) {
     	sh.exec(`wp i18n make-json ${rootPath}${output}`, { silent: true })

package/template/tools/wp-glotpress.js

@@ -1,68 +1,101 @@
 #!/usr/bin/env node
+/* eslint-disable no-console */
 
 // Packages.
-const chalk = require("chalk");
-const fs = require("fs");
-const { resolve } = require("path");
-const async = require("async");
+const chalk = require('chalk');
+const fs = require('fs');
+const { resolve } = require('path');
+const async = require('async');
 
 // Settings.
-const package = require("../package.json");
+const packageDetails = require('../package.json');
 const BASEURL = 'https://translate.wpadvancedads.com/api/projects';
 
 // Validation of settings.
-if ( undefined === package.glotpress || Object.keys(package.glotpress).length < 1 ) {
-	console.log( chalk.bgRed.bold("Error:") + " The GlotPress settings is not defined." );
-	return;
+function validateSettings() {
+	if (
+		undefined === packageDetails.glotpress ||
+		Object.keys(packageDetails.glotpress).length < 1
+	) {
+		console.log(
+			chalk.bgRed.bold('Error:') +
+				' The GlotPress settings is not defined.'
+		);
+		return false;
+	}
+
+	if (
+		undefined === packageDetails.glotpress.project ||
+		('' === undefined) === packageDetails.glotpress.project
+	) {
+		console.log(
+			chalk.bgRed.bold('Error:') +
+				' The GlotPress project name is not defined.'
+		);
+		return false;
+	}
+
+	if (
+		undefined === packageDetails.glotpress.destination ||
+		('' === undefined) === packageDetails.glotpress.destination
+	) {
+		console.log(
+			chalk.bgRed.bold('Error:') +
+				' The destination directory is not defined.'
+		);
+		return false;
+	}
+
+	return true;
 }
 
-if ( undefined === package.glotpress.project || '' === undefined === package.glotpress.project ) {
-	console.log( chalk.bgRed.bold("Error:") + " The GlotPress project name is not defined." );
-	return;
-}
-
-if ( undefined === package.glotpress.destination || '' === undefined === package.glotpress.destination ) {
-	console.log( chalk.bgRed.bold("Error:") + " The destination directory is not defined." );
-	return;
-}
-
-const { glotpress } = package
-const { project } = glotpress
-let { potPrefix, destination } = glotpress
-potPrefix = potPrefix ?? project
-destination =resolve(destination)
+const { glotpress } = packageDetails;
+const { project } = glotpress;
+let { potPrefix, destination } = glotpress;
+potPrefix = potPrefix ?? project;
+destination = resolve(destination);
 
 if (!fs.existsSync(destination)) {
 	fs.mkdirSync(destination);
 }
 
 async function getGlotPressData() {
-	const response = await fetch(`${BASEURL}/${package.glotpress.project}`);
+	const response = await fetch(
+		`${BASEURL}/${packageDetails.glotpress.project}`
+	);
 	const data = await response.json();
-	const sets = {}
+	const sets = {};
+
+	if (undefined !== data.success && !data.success) {
+		console.log(chalk.bgRed.bold('Error:') + ' ' + data.error);
+		return false;
+	}
+
 	data.translation_sets.map((set) => {
-		if ( set.current_count > 0 ) {
+		if (set.current_count > 0) {
 			let id = set.wp_locale;
-			if ( 'default' !== set.slug ) {
+			if ('default' !== set.slug) {
 				id += '_' + set.slug;
 			}
 
-			sets[ id ] = set
+			sets[id] = set;
 		}
-	})
 
-	return sets
+		return false;
+	});
+
+	return sets;
 }
 
 // Download Handler.
 async function downloadFile(locale, data, format) {
-	console.log( chalk.bold("Downloading: " + format));
+	console.log(chalk.bold('Downloading: ' + format));
 
-	const target = `${destination}/${potPrefix}-${locale}.${format}`
-	const endpoint = `${BASEURL}/${project}/${data.locale}/${data.slug}/export-translations?format=${format}`
+	const target = `${destination}/${potPrefix}-${locale}.${format}`;
+	const endpoint = `${BASEURL}/${project}/${data.locale}/${data.slug}/export-translations?format=${format}`;
 
 	// Download.
-	const response = await fetch(endpoint)
+	const response = await fetch(endpoint);
 	const content = await response.text();
 
 	fs.writeFileSync(target, content);
@@ -71,25 +104,37 @@ async function downloadFile(locale, data, format) {
 async function runCommand() {
 	const locales = await getGlotPressData();
 
+	if (false === locales) {
+		return;
+	}
+
 	// Download files.
 	async.map(
 		Object.keys(locales),
 		(locale, callback) => {
-			const localeData = locales[locale]
-
-			console.log("");
-			console.log( chalk.bgGreen.bold("Updating Language:") + ` ${chalk.italic(localeData.name)}`);
-			async.map(
-				['mo', 'po'],
-				(format) => downloadFile(locale, localeData, format)
-			)
-
-			callback(null, true)
+			const localeData = locales[locale];
+
+			console.log('');
+			console.log(
+				chalk.bgGreen.bold('Updating Language:') +
+					` ${chalk.italic(localeData.name)}`
+			);
+			async.map(['mo', 'po'], (format) =>
+				downloadFile(locale, localeData, format)
+			);
+
+			callback(null, true);
 		},
-		function(err, results) {
-			console.log("");
-			console.log(chalk.bgGreen.bold("Success:") + " All files has been downloaded.");
+		function () {
+			console.log('');
+			console.log(
+				chalk.bgGreen.bold('Success:') +
+					' All files has been downloaded.'
+			);
 		}
 	);
 }
-runCommand()
+
+if (validateSettings()) {
+	runCommand();
+}