single-file-cli 2.0.4 → 2.0.5

package/{back-ends → lib}/single-file-script.js

@@ -24,8 +24,9 @@
 /* global singlefile, XMLHttpRequest */
 
 import { script, hookScript, zipScript } from "../lib/single-file-bundle.js";
-import { readTextFile } from "../deno-polyfill.js";
+import { Deno } from "./deno-polyfill.js";
 
+const { readTextFile } = Deno;
 export { getScriptSource, getHookScriptSource, getZipScriptSource };
 
 function initSingleFile() {
@@ -75,7 +76,7 @@ async function getHookScriptSource() {
 
 async function getZipScriptSource() {
 	return zipScript;
-} 
+}
 
 async function readScriptFiles(paths) {
 	return (await Promise.all(paths.map(path => readTextFile(path)))).join("");

package/{args.js → options.js}

@@ -21,7 +21,7 @@
  *   Source.
  */
 
-import { exit, args } from "./deno-polyfill.js";
+import { Deno } from "./lib/deno-polyfill.js";
 
 const USAGE_TEXT = `single-file [url] [output]
 
@@ -53,6 +53,7 @@ const OPTIONS_INFO = {
 	"browser-debug": { description: "Enable debug mode", type: "boolean" },
 	"browser-script": { description: "Path of a script executed in the page (and all the frames) before it is loaded", type: "string[]" },
 	"browser-stylesheet": { description: "Path of a stylesheet file inserted into the page (and all the frames) after it is loaded", type: "string[]" },
+	"browser-arg": { description: "Argument passed to the browser", type: "string[]", alias: "browser-argument" },
 	"browser-args": { description: "Arguments provided as a JSON array and passed to the browser", type: "string" },
 	"browser-start-minimized": { description: "Minimize the browser", type: "boolean" },
 	"browser-cookie": { description: "Ordered list of cookie parameters separated by a comma (name,value,domain,path,expires,httpOnly,secure,sameSite,url)", type: "string[]" },
@@ -122,11 +123,12 @@ const OPTIONS_INFO = {
 	"output-directory": { description: "Path to where to save files, this path must exist.", type: "string" }
 };
 
+const { args, exit } = Deno;
 const options = getOptions();
 export default options;
 
 function getOptions() {
-	const { positionals, options } = parseArgs();
+	const { positionals, options } = parseArgs(Array.from(args));
 	if ((!positionals.length && !Object.keys(options).length) || positionals.length > 2 || options.help) {
 		console.log(USAGE_TEXT + "\n"); // eslint-disable-line no-console
 		console.log("Options:"); // eslint-disable-line no-console
@@ -144,12 +146,10 @@ function getOptions() {
 		exit(0);
 	}
 	Object.keys(OPTIONS_INFO).forEach(optionName => {
-		const optionKey = getOptionKey(optionName);
-		if (options[optionKey] === undefined) {
-			const optionInfo = getOptionInfo(optionName);
-			if (optionInfo.defaultValue !== undefined) {
-				options[optionKey] = OPTIONS_INFO[optionName].defaultValue;
-			}
+		const optionInfo = getOptionInfo(optionName);
+		const optionKey = getOptionKey(optionName, optionInfo);
+		if (optionInfo.defaultValue !== undefined) {
+			options[optionKey] = OPTIONS_INFO[optionName].defaultValue;
 		}
 	});
 	options.acceptHeaders = {
@@ -159,6 +159,12 @@ function getOptions() {
 		script: options.acceptHeaderScript,
 		document: options.acceptHeaderDocument
 	};
+	if (options.browserArgs) {
+		const browserArguments = options.browserArguments || [];
+		browserArguments.push(...JSON.parse(options.browserArgs));
+		options.browserArgs = browserArguments;
+		delete options.browserArguments;
+	}
 	delete options.acceptHeaderFont;
 	delete options.acceptHeaderImage;
 	delete options.acceptHeaderStylesheet;
@@ -167,14 +173,13 @@ function getOptions() {
 	return { ...options, url: positionals[0], output: positionals[1] };
 }
 
-function parseArgs() {
-	const parsedArgs = Array.from(args);
+function parseArgs(args) {
 	const positionals = [];
 	const options = {};
 	const result = { positionals, options: {} };
 	let argIndex = 0;
-	while (argIndex < parsedArgs.length) {
-		const arg = parsedArgs[argIndex];
+	while (argIndex < args.length) {
+		const arg = args[argIndex];
 		const { argName, argValue, optionInfo } = parseArg(arg);
 		if (optionInfo) {
 			if (options[argName] === undefined) {
@@ -183,12 +188,12 @@ function parseArgs() {
 			let nextArgName;
 			if (argValue === undefined) {
 				while (
-					argIndex + 1 < parsedArgs.length &&
-					({ argName: nextArgName } = parseArg(parsedArgs[argIndex + 1])) &&
+					argIndex + 1 < args.length &&
+					({ argName: nextArgName } = parseArg(args[argIndex + 1])) &&
 					(nextArgName === undefined || !getOptionInfo(nextArgName)) &&
-					isValid(optionInfo.type, parsedArgs[argIndex + 1]) &&
+					isValid(optionInfo.type, args[argIndex + 1]) &&
 					(isArray(optionInfo.type) || !options[argName].length)) {
-					options[argName].push(parsedArgs[argIndex + 1]);
+					options[argName].push(args[argIndex + 1]);
 					argIndex++;
 				}
 			} else if (isValid(optionInfo.type, argValue) && (isArray(optionInfo.type) || !options[argName].length)) {
@@ -202,8 +207,8 @@ function parseArgs() {
 		argIndex++;
 	}
 	Object.keys(options).forEach(optionName => {
-		const optionKey = getOptionKey(optionName);
 		const optionInfo = getOptionInfo(optionName);
+		const optionKey = getOptionKey(optionName, optionInfo);
 		let optionValue = options[optionName];
 		const isArrayType = isArray(optionInfo.type);
 		if (optionInfo.type.startsWith("boolean")) {
@@ -226,16 +231,14 @@ function parseArgs() {
 	return result;
 }
 
-function getOptionKey(optionName) {
-	let optionKey;
-	const optionInfo = getOptionInfo(optionName);
+function getOptionKey(optionKeyName, optionInfo) {
 	if (optionInfo) {
+		const optionName = optionInfo.alias || optionKeyName;
 		if (isArray(optionInfo.type)) {
-			optionKey = kebabToCamelCase(optionName + "s");
+			return kebabToCamelCase(optionName + "s");
 		} else {
-			optionKey = kebabToCamelCase(optionName);
+			return kebabToCamelCase(optionName);
 		}
-		return optionKey;
 	}
 }
 
@@ -247,7 +250,7 @@ function parseArg(arg) {
 		const optionInfo = getOptionInfo(argName);
 		if (argValue !== undefined &&
 			((argValue.startsWith("\"") && argValue.endsWith("\"")) ||
-			(argValue.startsWith("'") && argValue.endsWith("'")))) {
+				(argValue.startsWith("'") && argValue.endsWith("'")))) {
 			argValue = argValue.substring(1, argValue.length - 1);
 		}
 		return { argName, argValue, optionInfo };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "single-file-cli",
-	"version": "2.0.4",
+	"version": "2.0.5",
 	"description": "SingleFile CLI",
 	"author": "Gildas Lormeau",
 	"engines": {

package/single-file

@@ -24,11 +24,13 @@
  */
 
 import { VALID_URL_TEST, initialize } from "./single-file-cli-api.js";
-import { initGlobalThisProperties, readTextFile, toFileUrl } from "./deno-polyfill.js";
-import args from "./args.js";
+import { initGlobalThisProperties, Deno, path } from "./lib/deno-polyfill.js";
+import options from "./options.js";
 
+const { readTextFile } = Deno;
+const { toFileUrl } = path;
 await initGlobalThisProperties();
-await run(args);
+await run(options);
 
 async function run(options = {}) {
 	let urls;

package/single-file-cli-api.js

@@ -23,9 +23,9 @@
 
 /* global URL */
 
-import * as backend from "./back-ends/chromium-back-end.js";
-import { getZipScriptSource } from "./back-ends/single-file-script.js";
-import { readTextFile, writeTextFile, stdout, mkdir, stat, dirname } from "./deno-polyfill.js";
+import * as backend from "./lib/cdp-client.js";
+import { getZipScriptSource } from "./lib/single-file-script.js";
+import { Deno, path } from "./lib/deno-polyfill.js";
 
 const VALID_URL_TEST = /^(https?|file):\/\//;
 
@@ -76,6 +76,7 @@ const DEFAULT_OPTIONS = {
 const STATE_PROCESSING = "processing";
 const STATE_PROCESSED = "processed";
 
+const { readTextFile, writeTextFile, stdout, mkdir, stat } = Deno;
 let tasks = [], maxParallelWorkers, sessionFilename;
 
 export { DEFAULT_OPTIONS, VALID_URL_TEST, initialize };
@@ -253,7 +254,7 @@ async function capturePage(options) {
 			filename = await getFilename(pageData.filename, options);
 		}
 		if (filename) {
-			const directoryName = await dirname(filename);
+			const directoryName = await path.dirname(filename);
 			if (directoryName !== ".") {
 				await mkdir(directoryName, { recursive: true });
 			}