zcatalyst-cli 1.13.3 → 1.14.0

package/lib/cli_table/src/utils.js

@@ -1,267 +1,302 @@
-"use strict";
 const stringWidth = require('string-width');
+
 function codeRegex(capture) {
-    return capture ? /\u001b\[((?:\d*;){0,5}\d*)m/g : /\u001b\[(?:\d*;){0,5}\d*m/g;
+	return capture ? /\u001b\[((?:\d*;){0,5}\d*)m/g : /\u001b\[(?:\d*;){0,5}\d*m/g;
 }
+
 function strlen(str) {
-    const code = codeRegex();
-    const stripped = ('' + str).replace(code, '');
-    const split = stripped.split('\n');
-    return split.reduce((memo, s) => {
-        return stringWidth(s) > memo ? stringWidth(s) : memo;
-    }, 0);
+	const code = codeRegex();
+	const stripped = ('' + str).replace(code, '');
+	const split = stripped.split('\n');
+	return split.reduce((memo, s) => {
+		return stringWidth(s) > memo ? stringWidth(s) : memo;
+	}, 0);
 }
+
 function repeat(str, times) {
-    return Array(times + 1).join(str);
+	return Array(times + 1).join(str);
 }
+
 function pad(str, len, pad, dir) {
-    const length = strlen(str);
-    if (len + 1 >= length) {
-        const padlen = len - length;
-        switch (dir) {
-            case 'right': {
-                str = repeat(pad, padlen) + str;
-                break;
-            }
-            case 'center': {
-                const right = Math.ceil(padlen / 2);
-                const left = padlen - right;
-                str = repeat(pad, left) + str + repeat(pad, right);
-                break;
-            }
-            default: {
-                str = str + repeat(pad, padlen);
-                break;
-            }
-        }
-    }
-    return str;
+	const length = strlen(str);
+	if (len + 1 >= length) {
+		const padlen = len - length;
+		switch (dir) {
+			case 'right': {
+				str = repeat(pad, padlen) + str;
+				break;
+			}
+			case 'center': {
+				const right = Math.ceil(padlen / 2);
+				const left = padlen - right;
+				str = repeat(pad, left) + str + repeat(pad, right);
+				break;
+			}
+			default: {
+				str = str + repeat(pad, padlen);
+				break;
+			}
+		}
+	}
+	return str;
 }
+
 const codeCache = {};
+
 function addToCodeCache(name, on, off) {
-    on = '\u001b[' + on + 'm';
-    off = '\u001b[' + off + 'm';
-    codeCache[on] = { set: name, to: true };
-    codeCache[off] = { set: name, to: false };
-    codeCache[name] = { on: on, off: off };
+	on = '\u001b[' + on + 'm';
+	off = '\u001b[' + off + 'm';
+	codeCache[on] = { set: name, to: true };
+	codeCache[off] = { set: name, to: false };
+	codeCache[name] = { on: on, off: off };
 }
+
+// https://github.com/Marak/colors.js/blob/master/lib/styles.js
 addToCodeCache('bold', 1, 22);
 addToCodeCache('italics', 3, 23);
 addToCodeCache('underline', 4, 24);
 addToCodeCache('inverse', 7, 27);
 addToCodeCache('strikethrough', 9, 29);
+
 function updateState(state, controlChars) {
-    const controlCode = controlChars[1] ? parseInt(controlChars[1].split(';')[0]) : 0;
-    if ((controlCode >= 30 && controlCode <= 39) || (controlCode >= 90 && controlCode <= 97)) {
-        state.lastForegroundAdded = controlChars[0];
-        return;
-    }
-    if ((controlCode >= 40 && controlCode <= 49) || (controlCode >= 100 && controlCode <= 107)) {
-        state.lastBackgroundAdded = controlChars[0];
-        return;
-    }
-    if (controlCode === 0) {
-        for (const i in state) {
-            if (Object.prototype.hasOwnProperty.call(state, i)) {
-                delete state[i];
-            }
-        }
-        return;
-    }
-    const info = codeCache[controlChars[0]];
-    if (info) {
-        state[info.set] = info.to;
-    }
+	const controlCode = controlChars[1] ? parseInt(controlChars[1].split(';')[0]) : 0;
+	if ((controlCode >= 30 && controlCode <= 39) || (controlCode >= 90 && controlCode <= 97)) {
+		state.lastForegroundAdded = controlChars[0];
+		return;
+	}
+	if ((controlCode >= 40 && controlCode <= 49) || (controlCode >= 100 && controlCode <= 107)) {
+		state.lastBackgroundAdded = controlChars[0];
+		return;
+	}
+	if (controlCode === 0) {
+		for (const i in state) {
+			/* istanbul ignore else */
+			if (Object.prototype.hasOwnProperty.call(state, i)) {
+				delete state[i];
+			}
+		}
+		return;
+	}
+	const info = codeCache[controlChars[0]];
+	if (info) {
+		state[info.set] = info.to;
+	}
 }
+
 function readState(line) {
-    const code = codeRegex(true);
-    let controlChars = code.exec(line);
-    const state = {};
-    while (controlChars !== null) {
-        updateState(state, controlChars);
-        controlChars = code.exec(line);
-    }
-    return state;
+	const code = codeRegex(true);
+	let controlChars = code.exec(line);
+	const state = {};
+	while (controlChars !== null) {
+		updateState(state, controlChars);
+		controlChars = code.exec(line);
+	}
+	return state;
 }
+
 function unwindState(state, ret) {
-    const lastBackgroundAdded = state.lastBackgroundAdded;
-    const lastForegroundAdded = state.lastForegroundAdded;
-    delete state.lastBackgroundAdded;
-    delete state.lastForegroundAdded;
-    Object.keys(state).forEach((key) => {
-        if (state[key]) {
-            ret += codeCache[key].off;
-        }
-    });
-    if (lastBackgroundAdded && lastBackgroundAdded != '\u001b[49m') {
-        ret += '\u001b[49m';
-    }
-    if (lastForegroundAdded && lastForegroundAdded != '\u001b[39m') {
-        ret += '\u001b[39m';
-    }
-    return ret;
+	const lastBackgroundAdded = state.lastBackgroundAdded;
+	const lastForegroundAdded = state.lastForegroundAdded;
+
+	delete state.lastBackgroundAdded;
+	delete state.lastForegroundAdded;
+
+	Object.keys(state).forEach((key) => {
+		if (state[key]) {
+			ret += codeCache[key].off;
+		}
+	});
+
+	if (lastBackgroundAdded && lastBackgroundAdded != '\u001b[49m') {
+		ret += '\u001b[49m';
+	}
+	if (lastForegroundAdded && lastForegroundAdded != '\u001b[39m') {
+		ret += '\u001b[39m';
+	}
+
+	return ret;
 }
+
 function rewindState(state, ret) {
-    const lastBackgroundAdded = state.lastBackgroundAdded;
-    const lastForegroundAdded = state.lastForegroundAdded;
-    delete state.lastBackgroundAdded;
-    delete state.lastForegroundAdded;
-    Object.keys(state).forEach((key) => {
-        if (state[key]) {
-            ret = codeCache[key].on + ret;
-        }
-    });
-    if (lastBackgroundAdded && lastBackgroundAdded != '\u001b[49m') {
-        ret = lastBackgroundAdded + ret;
-    }
-    if (lastForegroundAdded && lastForegroundAdded != '\u001b[39m') {
-        ret = lastForegroundAdded + ret;
-    }
-    return ret;
+	const lastBackgroundAdded = state.lastBackgroundAdded;
+	const lastForegroundAdded = state.lastForegroundAdded;
+
+	delete state.lastBackgroundAdded;
+	delete state.lastForegroundAdded;
+
+	Object.keys(state).forEach((key) => {
+		if (state[key]) {
+			ret = codeCache[key].on + ret;
+		}
+	});
+
+	if (lastBackgroundAdded && lastBackgroundAdded != '\u001b[49m') {
+		ret = lastBackgroundAdded + ret;
+	}
+	if (lastForegroundAdded && lastForegroundAdded != '\u001b[39m') {
+		ret = lastForegroundAdded + ret;
+	}
+
+	return ret;
 }
+
 function truncateWidth(str, desiredLength) {
-    if (str.length === strlen(str)) {
-        return str.substr(0, desiredLength);
-    }
-    while (strlen(str) > desiredLength) {
-        str = str.slice(0, -1);
-    }
-    return str;
+	if (str.length === strlen(str)) {
+		return str.substr(0, desiredLength);
+	}
+
+	while (strlen(str) > desiredLength) {
+		str = str.slice(0, -1);
+	}
+
+	return str;
 }
+
 function truncateWidthWithAnsi(str, desiredLength) {
-    const code = codeRegex(true);
-    const split = str.split(codeRegex());
-    let splitIndex = 0;
-    let retLen = 0;
-    let ret = '';
-    let myArray;
-    const state = {};
-    while (retLen < desiredLength) {
-        myArray = code.exec(str);
-        let toAdd = split[splitIndex];
-        splitIndex++;
-        if (retLen + strlen(toAdd) > desiredLength) {
-            toAdd = truncateWidth(toAdd, desiredLength - retLen);
-        }
-        ret += toAdd;
-        retLen += strlen(toAdd);
-        if (retLen < desiredLength) {
-            if (!myArray) {
-                break;
-            }
-            ret += myArray[0];
-            updateState(state, myArray);
-        }
-    }
-    return unwindState(state, ret);
+	const code = codeRegex(true);
+	const split = str.split(codeRegex());
+	let splitIndex = 0;
+	let retLen = 0;
+	let ret = '';
+	let myArray;
+	const state = {};
+
+	while (retLen < desiredLength) {
+		myArray = code.exec(str);
+		let toAdd = split[splitIndex];
+		splitIndex++;
+		if (retLen + strlen(toAdd) > desiredLength) {
+			toAdd = truncateWidth(toAdd, desiredLength - retLen);
+		}
+		ret += toAdd;
+		retLen += strlen(toAdd);
+
+		if (retLen < desiredLength) {
+			if (!myArray) {
+				break;
+			} // full-width chars may cause a whitespace which cannot be filled
+			ret += myArray[0];
+			updateState(state, myArray);
+		}
+	}
+
+	return unwindState(state, ret);
 }
+
 function truncate(str, desiredLength, truncateChar) {
-    truncateChar = truncateChar || '…';
-    const lengthOfStr = strlen(str);
-    if (lengthOfStr <= desiredLength) {
-        return str;
-    }
-    desiredLength -= strlen(truncateChar);
-    const ret = truncateWidthWithAnsi(str, desiredLength);
-    return ret + truncateChar;
+	truncateChar = truncateChar || '…';
+	const lengthOfStr = strlen(str);
+	if (lengthOfStr <= desiredLength) {
+		return str;
+	}
+	desiredLength -= strlen(truncateChar);
+
+	const ret = truncateWidthWithAnsi(str, desiredLength);
+
+	return ret + truncateChar;
 }
+
 function defaultOptions() {
-    return {
-        chars: {
-            top: '─',
-            'top-mid': '┬',
-            'top-left': '┌',
-            'top-right': '┐',
-            bottom: '─',
-            'bottom-mid': '┴',
-            'bottom-left': '└',
-            'bottom-right': '┘',
-            left: '│',
-            'left-mid': '├',
-            mid: '─',
-            'mid-mid': '┼',
-            right: '│',
-            'right-mid': '┤',
-            middle: '│'
-        },
-        truncate: '…',
-        colWidths: [],
-        rowHeights: [],
-        colAligns: [],
-        rowAligns: [],
-        style: {
-            'padding-left': 1,
-            'padding-right': 1,
-            head: ['red'],
-            border: ['grey'],
-            compact: false
-        },
-        head: []
-    };
+	return {
+		chars: {
+			top: '─',
+			'top-mid': '┬',
+			'top-left': '┌',
+			'top-right': '┐',
+			bottom: '─',
+			'bottom-mid': '┴',
+			'bottom-left': '└',
+			'bottom-right': '┘',
+			left: '│',
+			'left-mid': '├',
+			mid: '─',
+			'mid-mid': '┼',
+			right: '│',
+			'right-mid': '┤',
+			middle: '│'
+		},
+		truncate: '…',
+		colWidths: [],
+		rowHeights: [],
+		colAligns: [],
+		rowAligns: [],
+		style: {
+			'padding-left': 1,
+			'padding-right': 1,
+			head: ['red'],
+			border: ['grey'],
+			compact: false
+		},
+		head: []
+	};
 }
+
 function mergeOptions(options, defaults) {
-    options = options || {};
-    defaults = defaults || defaultOptions();
-    const ret = Object.assign({}, defaults, options);
-    ret.chars = Object.assign({}, defaults.chars, options.chars);
-    ret.style = Object.assign({}, defaults.style, options.style);
-    return ret;
+	options = options || {};
+	defaults = defaults || defaultOptions();
+	const ret = Object.assign({}, defaults, options);
+	ret.chars = Object.assign({}, defaults.chars, options.chars);
+	ret.style = Object.assign({}, defaults.style, options.style);
+	return ret;
 }
+
 function wordWrap(maxLength, input) {
-    const lines = [];
-    const split = input.split(/(\s+)/g);
-    let line = [];
-    let lineLength = 0;
-    let whitespace;
-    for (let i = 0; i < split.length; i += 2) {
-        const word = split[i];
-        let newLength = lineLength + strlen(word);
-        if (lineLength > 0 && whitespace) {
-            newLength += whitespace.length;
-        }
-        if (newLength > maxLength) {
-            if (lineLength !== 0) {
-                lines.push(line.join(''));
-            }
-            line = [word];
-            lineLength = strlen(word);
-        }
-        else {
-            line.push(whitespace || '', word);
-            lineLength = newLength;
-        }
-        whitespace = split[i + 1];
-    }
-    if (lineLength) {
-        lines.push(line.join(''));
-    }
-    return lines;
+	const lines = [];
+	const split = input.split(/(\s+)/g);
+	let line = [];
+	let lineLength = 0;
+	let whitespace;
+	for (let i = 0; i < split.length; i += 2) {
+		const word = split[i];
+		let newLength = lineLength + strlen(word);
+		if (lineLength > 0 && whitespace) {
+			newLength += whitespace.length;
+		}
+		if (newLength > maxLength) {
+			if (lineLength !== 0) {
+				lines.push(line.join(''));
+			}
+			line = [word];
+			lineLength = strlen(word);
+		} else {
+			line.push(whitespace || '', word);
+			lineLength = newLength;
+		}
+		whitespace = split[i + 1];
+	}
+	if (lineLength) {
+		lines.push(line.join(''));
+	}
+	return lines;
 }
+
 function multiLineWordWrap(maxLength, input) {
-    const output = [];
-    input = input.split('\n');
-    for (let i = 0; i < input.length; i++) {
-        output.push.apply(output, wordWrap(maxLength, input[i]));
-    }
-    return output;
+	const output = [];
+	input = input.split('\n');
+	for (let i = 0; i < input.length; i++) {
+		output.push.apply(output, wordWrap(maxLength, input[i]));
+	}
+	return output;
 }
+
 function colorizeLines(input) {
-    let state = {};
-    const output = [];
-    for (let i = 0; i < input.length; i++) {
-        const line = rewindState(state, input[i]);
-        state = readState(line);
-        const temp = Object.assign({}, state);
-        output.push(unwindState(temp, line));
-    }
-    return output;
+	let state = {};
+	const output = [];
+	for (let i = 0; i < input.length; i++) {
+		const line = rewindState(state, input[i]);
+		state = readState(line);
+		const temp = Object.assign({}, state);
+		output.push(unwindState(temp, line));
+	}
+	return output;
 }
+
 module.exports = {
-    strlen: strlen,
-    repeat: repeat,
-    pad: pad,
-    truncate: truncate,
-    mergeOptions: mergeOptions,
-    wordWrap: multiLineWordWrap,
-    colorizeLines: colorizeLines
+	strlen: strlen,
+	repeat: repeat,
+	pad: pad,
+	truncate: truncate,
+	mergeOptions: mergeOptions,
+	wordWrap: multiLineWordWrap,
+	colorizeLines: colorizeLines
 };

package/lib/client-utils.js

@@ -58,13 +58,25 @@ exports.clientUtils = {
             });
         }
         const name = js_1.JS.get(packageJson, 'name', null);
-        const homepage = js_1.JS.get(packageJson, 'homepage', null);
+        const homepage = js_1.JS.get(packageJson, 'homepage', 'index.html');
+        const notFoundPagePath = js_1.JS.get(packageJson, '404', '404.html');
+        if (homepage === notFoundPagePath) {
+            throw new error_1.default('404 page and homepage cannot be the same', {
+                exit: 1,
+                errorId: 'CLIENT-UTILS-7',
+                arg: [(0, ansi_colors_1.bold)('404'), (0, ansi_colors_1.bold)('HOME'), ansi_colors_1.italic.red(homepage)]
+            });
+        }
+        const notFoundPage = notFoundPagePath && (yield fs_1.ASYNC.fileExists((0, path_1.resolve)(sourceDir, notFoundPagePath)))
+            ? (0, path_1.resolve)(sourceDir, notFoundPagePath)
+            : (yield fs_1.ASYNC.fileExists((0, path_1.join)(sourceDir, constants_1.FILENAME.client.notFoundPage))) &&
+                (0, path_1.join)(sourceDir, constants_1.FILENAME.client.notFoundPage);
         const loginRedirect = runtime_store_1.default.get('context.client.login_redirect', packageJson.login_redirect);
-        if (js_1.JS.isNull(name) || js_1.JS.isNull(homepage)) {
+        if (js_1.JS.isNull(name)) {
             throw new error_1.default(constants_1.FILENAME.client.package_json + ' file is corrupted.', {
                 exit: 1,
                 errorId: 'CLIENT-UTILS-4',
-                arg: [(0, ansi_colors_1.bold)(packageJsonFile), (0, ansi_colors_1.bold)('name'), (0, ansi_colors_1.bold)('homepage')]
+                arg: [(0, ansi_colors_1.bold)(packageJsonFile), (0, ansi_colors_1.bold)('name')]
             });
         }
         runtime_store_1.default.set('context.client.name', name);
@@ -72,6 +84,7 @@ exports.clientUtils = {
         runtime_store_1.default.set('context.client.source', sourceDir);
         runtime_store_1.default.set('context.client.login_redirect', loginRedirect || homepage);
         runtime_store_1.default.set('context.client.package_json', packageJsonFile);
+        runtime_store_1.default.set('context.client.notFoundPage', notFoundPage);
         const validatePlugin = yield (0, plugin_loader_1.default)('client', 'validate').catch((err) => (0, logger_1.debug)(err));
         if (typeof validatePlugin !== 'function') {
             runtime_store_1.default.set('context.client.valid', true);
@@ -120,6 +133,7 @@ exports.clientUtils = {
         let source = (0, project_1.resolveProjectPath)(config_1.clientConfig.source());
         const buildPlugin = yield (0, plugin_loader_1.default)('client', 'build').catch((err) => (0, logger_1.debug)(err));
         if (typeof buildPlugin === 'function') {
+            process.env.X_CATALYST_WEBAPP_PATH = source;
             const logStreamPlugin = yield (0, plugin_loader_1.default)('client', 'logs').catch((err) => (0, logger_1.debug)(err));
             let stream;
             const streamLogFn = (chunk) => (0, logger_1.log)('info', chunk.toString(), true);
@@ -154,7 +168,7 @@ exports.clientUtils = {
             }
         }
         const exclude = config_1.clientConfig.ignore(source);
-        const files = yield fs_1.ASYNC.walk(source, { exclude });
+        const files = yield fs_1.ASYNC.walk(source, { filter: { exclude, excludeDir: true } });
         const zip = new archiver_1.default();
         files.forEach((file) => {
             zip.add(file.replace(source + path_1.sep, ''), fs_1.SYNC.getReadStream(file));