polylith 0.1.24 → 0.1.25

package/bin/app/templates/build.js.txt

@@ -4,7 +4,11 @@ import path from "path/posix";
 var projectRoot = path.join(utils.fileToPath(import.meta.url), '../');
 class {App}App extends App {
 	constructor() {
-		super('{app}', projectRoot, '{path}{src}/index.js', '{dest}');
+		super('{app}', {
+			root: projectRoot,
+			index: '{path}{src}/index.js',
+			dest: '{dest}'
+		});
 		this.setHtmlTemplate('{path}/{src}/index.html', '{dest}{path}/index.html');
 		this.addResources('',  [
 			{

package/bin/apps.js

@@ -106,6 +106,25 @@ async function getApp(spec, options) {
 	return app;
 }
 
+
+async function walkApps(name, config, options, cb) {
+	var specs = getAppSpecs(name, config, options);
+	var apps = [];
+
+	// using for loop because we are making async calls
+	for (let spec of specs) {
+		let app = await getApp(spec, options);
+		if (!app) continue;
+
+		if (await cb(app)) apps.push(app)
+	}
+
+	return apps;
+
+}
+
+
+
 /**
  * Call this method to build all the applications specified on the command line
  *
@@ -117,18 +136,10 @@ async function getApp(spec, options) {
  * @returns {Promise.<Array.<App>>} the list of built apps
  */
 export async function build(name, config, options, watch) {
-	var specs = getAppSpecs(name, config, options);
-	var apps = [];
-
-	// using for loop because we are making async calls
-	for (let spec of specs) {
-		let app = await getApp(spec, options);
-		if (!app) continue;
-
-		apps.push(app);
+	var apps = await walkApps(name, config, options, async function(app) {
 		app.setLiveReload(watch);
-		await app.build();
-	}
+		return await app.build();
+	})
 
 	return apps;
 }
@@ -136,7 +147,7 @@ export async function build(name, config, options, watch) {
 
 async function server(apps, options) {
 	var server = new PolylithServer({apps: apps}, options.dest);
-	await server.create(apps);
+	server.create(apps);
 	server.start(options.port || '8081');
 }
 
@@ -149,3 +160,18 @@ export async function watch(name, config, options) {
 
 	server(apps, options);
 }
+
+export async function test(name, config, options) {
+	var apps = await walkApps(name, config, options, async function(app) {
+		return await app.test();
+	})
+
+	if (options.watch) {
+		for (let app of apps) {
+			app.watch();
+		}
+	}
+
+	return apps;
+
+}

package/bin/polylith.js

@@ -7,12 +7,14 @@ import { promisify } from 'node:util';
 import child_process  from 'node:child_process';
 import { readFile, writeFile } from 'node:fs/promises';
 import { processManifest } from './templates.js';
-import { watch, build } from './apps.js';
+import { watch, build, test } from './apps.js';
 
 var exec = promisify(child_process.exec);
 var argv = minimist(process.argv.slice(2))
 var params = argv._;
-var OPTIONS = {
+
+// these are the default options
+var clOptions = {
 	multiple: false,
 	dest: 'dist',
 	src: 'src',
@@ -21,6 +23,7 @@ var OPTIONS = {
 	code: false,
 	index: true,
 	react: true,
+	watch: false,
 }
 
 var thisDir = path.dirname(forceToPosix(import.meta.url));
@@ -66,7 +69,7 @@ function checkBoolean(val) {
 function getOption(name, short) {
 	if (argv[name] !== undefined) return checkBoolean(argv[name]);
 	if (argv[short] != undefined) return checkBoolean(argv[short]);
-	return OPTIONS[name];
+	return clOptions[name];
 }
 
 /**
@@ -74,12 +77,12 @@ function getOption(name, short) {
  * be in the working directory.
  *
  * @returns {Object} the json parsed object from the config file, or the default
- * 		oprions if the file does not exist
+ * 		options if the file does not exist
  */
 async function readConfig() {
 	var filename = path.join(workingDir(), 'polylith.json');
 	var exists = await fileExists(filename);
-	var config = OPTIONS;
+	var config = {};
 
 	if (exists) {
 		try {
@@ -94,7 +97,7 @@ async function readConfig() {
 }
 
 /**
- * Call this metho to sorts the top level keys of the given object.
+ * Call this method to sort the top level keys of the given object.
  *
  * @param {Object} config the object to sort
  *
@@ -136,19 +139,20 @@ async function writeConfig(config) {
 async function setOptions() {
 	var config = await readConfig();
 
-	Object.assign(OPTIONS, config);
+	clOptions = {...clOptions, ...config};
 
-	OPTIONS.multiple = getOption('multiple', 'm');
-	OPTIONS.dest = getOption('dest', 'd');
-	OPTIONS.src = getOption('src', 's')
-	OPTIONS.builds = getOption('builds', 'b')
-	OPTIONS.all = getOption('all', 'a')
-	OPTIONS.code = getOption('code', 'c')
-	OPTIONS.index = getOption('index', 'i')
-	OPTIONS.react = getOption('react', 'r')
+	clOptions.multiple = getOption('multiple', 'm');
+	clOptions.dest = getOption('dest', 'd');
+	clOptions.src = getOption('src', 's')
+	clOptions.builds = getOption('builds', 'b')
+	clOptions.all = getOption('all', 'a')
+	clOptions.code = getOption('code', 'c')
+	clOptions.index = getOption('index', 'i')
+	clOptions.react = getOption('react', 'r')
+	clOptions.watch = getOption('watch', 'w')
 
 	// force multiple if we already have more than one app;
-	if (config.apps && config.apps.length > 1) OPTIONS.multiple = true;
+	if (config.apps && config.apps.length > 1) clOptions.multiple = true;
 }
 
 /**
@@ -202,7 +206,7 @@ function pascalCase(name) {
  * each part of the name with an uppercase letter except the first which has the
  * first letter lowercase.  It assumes the part separator is either '-' or '_'
  *
- * @param {String} name th ename to convert
+ * @param {String} name the name to convert
  * @returns {String} the camel case name
  */
 function camelCase(name) {
@@ -215,10 +219,9 @@ function camelCase(name) {
 }
 
 /**
- * Call this method to normalize the name so that each individual part
- * is lower case and separated by '_'. It makes no assumptions about how the
- * name was formed other than it uses some standard to separate individual
- * parts.
+ * Call this method to normalize the name so that each individual part is lower
+ * case and separated by '_'. The name is assumed to be either separated with
+ * spaces, -, or _; or is in camel case or pascal case.
  *
  * @param {String} name the name to normalize
  *
@@ -235,9 +238,8 @@ function normalizeCase(name) {
 	// separate the string by assuming each part starts with an uppercase letter
 	var parts = [...name.matchAll(/([A-Z][a-z]*)/g)];
 
-
-	var parts = parts.map(function (part) {
-		return nameCase(part[1]);
+	parts = parts.map(function (part) {
+		return part[1].toLowerCase();
 	})
 
 	return parts.join('_');
@@ -255,7 +257,7 @@ function normalizeCase(name) {
  *	-	APP_ = Upper snake case
  *	-	app_ = snake case;
  *	-	['App Title'] = title case
- *	-	app the given cae from the command line
+ *	-	app = the name as given from the command line
  *
  *
  * @param {Object} params the parameters from the command line
@@ -268,7 +270,7 @@ function getNames(params) {
 	var app = '';
 	var name = '';
 
-	if (OPTIONS.multiple && !OPTIONS.all) {
+	if (clOptions.multiple && !clOptions.all) {
 		app = params[1];
 		name = params[2];
 	} else {
@@ -296,11 +298,11 @@ function getNames(params) {
 		names.name = name;
 	}
 
-	names.dest = OPTIONS.dest;
-	names.builds = OPTIONS.builds;
-	names.src = OPTIONS.src;
-	names.react = OPTIONS.react;
-	names.path = OPTIONS.multiple ? '/' + app : '';
+	names.dest = clOptions.dest;
+	names.builds = clOptions.builds;
+	names.src = clOptions.src;
+	names.react = clOptions.react;
+	names.path = clOptions.multiple ? '/' + app : '';
 
 	return names;
 }
@@ -319,8 +321,8 @@ async function runInstall() {
  * @returns {Boolean} true if the number of parameters is correct
  */
 function verifyParams() {
-	var multiple = OPTIONS.multiple;
-	var all = OPTIONS.all;
+	var multiple = clOptions.multiple;
+	var all = clOptions.all;
 	var command = params[0];
 
 	if (!command) return false;
@@ -384,30 +386,34 @@ async function run() {
 	{
 		case 'init': {
 			let names = getNames(params);
-			await processManifest('install', names, OPTIONS);
+			await processManifest('install', names, clOptions);
 			await runInstall();
 			break;
 		}
 
 		case 'app': {
 			let names = getNames(params);
-			await processManifest('app', names, OPTIONS);
-			await addAppJson(names, OPTIONS);
+			await processManifest('app', names, clOptions);
+			await addAppJson(names, clOptions);
 			break;
 		}
 
 		case 'feature': {
 			let names = getNames(params);
-			processManifest('feature', names, OPTIONS);
+			processManifest('feature', names, clOptions);
 			break;
 		}
 
 		case 'build': {
-			await build(params[1], config, OPTIONS, false);
+			await build(params[1], config, clOptions, false);
 		}
 
 		case 'watch': {
-			watch(params[1], config, OPTIONS)
+			await watch(params[1], config, clOptions)
+		}
+
+		case 'test': {
+			await test(params[1], config, clOptions)
 		}
 	}
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "polylith",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "cli for the polylith environment",
   "bin": {
     "polylith": "bin/polylith.js"