@caweb/cli 1.4.0 → 1.4.1

package/commands/a11y.js

@@ -3,9 +3,10 @@
 /**
  * External dependencies
  */
+import achecker from 'accessibility-checker';
 import path from 'path';
+import { isUrl } from 'check-valid-url';
 import fs from 'fs';
-import resolveBin from 'resolve-bin';
 
 /**
  * Internal dependencies
@@ -16,7 +17,7 @@ import defaultConfig from '../configs/aceconfig.js';
 import { 
     runCmd, 
 } from '../lib/index.js';
-
+import { stderr, stdout } from 'process';
 
 
 /**
@@ -25,14 +26,17 @@ import {
  * @param {Object}  options
  * @param {Object}  options.spinner A CLI spinner which indicates progress.
  * @param {boolean} options.debug   True if debug mode is enabled.
+ * @param {boolean} options.url   True if debug mode is enabled.
  */
 export default async function a11y({
 	spinner,
 	debug, 
+    url
 } ) {
 
     // Spinner not needed at the moment
-	spinner.stop()
+	spinner.stop();
+
     const {
         ruleArchive,
         policies,
@@ -62,13 +66,30 @@ export default async function a11y({
         outputFormat,
         '---outputFilenameTimestamp',
         outputFilenameTimestamp,
-        process.argv.pop()
+        url
     ];
 
-    // run webpack with our arguments.
-    await runCmd(
-		'achecker', 
-		acheckerArgs, 
-	)
+    // run accessibility checker with our arguments.
+    if( isUrl( url ) || fs.existsSync( url ) ){
+        let outputDir = path.resolve('.',  outputFolder);
+        let outputFileName = isUrl( url ) ?
+            url.replace(/http[s]+:\/\//, '')
+            :
+            path.resolve(url).replace(':', '_');
+
+        
+        let reportFile = path.resolve(outputDir, outputFileName ) + '.html'
+
+        await runCmd(
+            'achecker', 
+            acheckerArgs,
+        ).then(({stderr, stdout}) => {
+            console.log( reportFile );
+        })
+
+    }else{
+        console.log( `${url} is not a valid url.` )
+    }
+    
 
 };

package/commands/serve.js

@@ -15,6 +15,8 @@ import {
     runCmd
  } from '../lib/index.js';
 
+import a11y from './a11y.js';
+
 /**
  * Serves the current project
  * 
@@ -79,6 +81,11 @@ export default async function serve({
         if( stderr && ! stdout.toString() ){
             console.log( stderr.toString() )
         }else{
+                    
+            // run a11y checker as well
+            //await a11y({spinner, debug, url: './public/index.html' })
+
+            //return;
             spinner.text = 'Done'
         }
     });

package/docs/tool/index.js

@@ -7,7 +7,7 @@
 import path from 'node:path';
 import fs from 'fs-extra';
 
-import { CAWEB_OPTIONS, DIVI_OPTIONS } from '../../lib/options.js';
+import { CAWEB_OPTIONS, DIVI_OPTIONS } from '../../lib/index.js';
 
 generateOverridesMD()
 

package/lib/cli.js

@@ -227,6 +227,7 @@ export default function cli() {
 
 	// a11y Command.
 	program.command('a11y')
+		.addArgument(new Argument('<url>', 'URL to scan for accessibility checks.'))
 		.description('Runs accessibility checks.')
 		.allowUnknownOption(true)
 		.action(withSpinner(env.a11y))

package/lib/helpers.js

@@ -40,9 +40,12 @@ async function runCmd(cmd, args,opts = { stdio: ['inherit', 'pipe'] }){
 			 */
 			cmd += /^win/.test(process.platform) ? '.cmd' : '';
 			break;
+		case 'achecker':
+			cmd = resolveBin('accessibility-checker', {executable: 'achecker'})
+			break;	
 		case 'webpack':
 			cmd = resolveBin(cmd)
-			break
+			break;
 	}
 
 	return spawn.sync( cmd, args, {...opts, env: process.env});

package/lib/index.js

@@ -25,7 +25,9 @@ import {
 	convertToMultisite,
 	generateHTAccess,
 	getTaxonomies,
-    createTaxonomies
+    createTaxonomies,
+	CAWEB_OPTIONS,
+	DIVI_OPTIONS
 } from './wordpress/index.js';
 
 export {
@@ -49,5 +51,7 @@ export {
 	convertToMultisite,
 	generateHTAccess,
 	getTaxonomies,
-    createTaxonomies
+    createTaxonomies,
+	CAWEB_OPTIONS,
+	DIVI_OPTIONS
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@caweb/cli",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "description": "CAWebPublishing Command Line Interface.",
   "exports": "./lib/env.js",
   "type": "module",
@@ -22,6 +22,7 @@
     "template"
   ],
   "scripts": {
+    "doc": "node ./docs/tool/index.js",
     "test": "echo \"Error: run tests from root\" && exit 0"
   },
   "homepage": "https://github.com/CAWebPublishing/cli#readme",
@@ -58,14 +59,15 @@
     }
   },
   "dependencies": {
-    "@wordpress/create-block": "^4.43.0",
-    "@wordpress/env": "^10.0.0",
-    "@wordpress/scripts": "^28.0.0",
-    "accessibility-checker": "^3.1.72",
+    "@wordpress/create-block": "^4.44.0",
+    "@wordpress/env": "^10.1.0",
+    "@wordpress/scripts": "^28.1.0",
+    "accessibility-checker": "^3.1.73",
     "autoprefixer": "^10.4.19",
     "axios": "^1.7.2",
     "axios-retry": "^4.4.0",
     "chalk": "^5.3.0",
+    "check-valid-url": "^0.1.0",
     "commander": "^12.1.0",
     "cross-spawn": "^7.0.3",
     "css-loader": "^7.1.2",
@@ -82,6 +84,6 @@
     "sass-loader": "^14.2.1",
     "terminal-link": "^3.0.0",
     "url": "^0.11.3",
-    "webpack": "^5.92.0"
+    "webpack": "^5.92.1"
   }
 }