single-file-core 1.3.32 → 1.4.1

package/core/index.js

@@ -86,12 +86,10 @@ const RESOURCE_LOADED = "resource-loaded";
 const PAGE_ENDED = "page-ended";
 const STAGE_STARTED = "stage-started";
 const STAGE_ENDED = "stage-ended";
-const STAGE_TASK_STARTED = "stage-task-started";
-const STAGE_TASK_ENDED = "stage-task-ended";
 
 class ProgressEvent {
 	constructor(type, detail) {
-		return { type, detail, PAGE_LOADING, PAGE_LOADED, RESOURCES_INITIALIZING, RESOURCES_INITIALIZED, RESOURCE_LOADED, PAGE_ENDED, STAGE_STARTED, STAGE_ENDED, STAGE_TASK_STARTED, STAGE_TASK_ENDED };
+		return { type, detail, PAGE_LOADING, PAGE_LOADED, RESOURCES_INITIALIZING, RESOURCES_INITIALIZED, RESOURCE_LOADED, PAGE_ENDED, STAGE_STARTED, STAGE_ENDED };
 	}
 }
 
@@ -268,7 +266,7 @@ class Runner {
 
 	async getPageData() {
 		if (this.root) {
-			await this.onprogress(new ProgressEvent(PAGE_ENDED, { pageURL: this.options.url, options: this.options  }));
+			await this.onprogress(new ProgressEvent(PAGE_ENDED, { pageURL: this.options.url, options: this.options }));
 		}
 		return this.processor.getPageData();
 	}
@@ -285,11 +283,9 @@ class Runner {
 				startTime = Date.now();
 				log("  -- STARTED task =", task.action);
 			}
-			await this.onprogress(new ProgressEvent(STAGE_TASK_STARTED, { pageURL: this.options.url, step, task: task.action, frame, options: this.options }));
 			if (!this.cancelled) {
 				this.executeTask(task);
 			}
-			await this.onprogress(new ProgressEvent(STAGE_TASK_ENDED, { pageURL: this.options.url, step, task: task.action, frame, options: this.options }));
 			if (DEBUG) {
 				log("  -- ENDED   task =", task.action, "delay =", Date.now() - startTime);
 			}
@@ -302,11 +298,9 @@ class Runner {
 					startTime = Date.now();
 					log("  // STARTED task =", task.action);
 				}
-				await this.onprogress(new ProgressEvent(STAGE_TASK_STARTED, { pageURL: this.options.url, step, task: task.action, frame, options: this.options }));
 				if (!this.cancelled) {
 					await this.executeTask(task);
 				}
-				await this.onprogress(new ProgressEvent(STAGE_TASK_ENDED, { pageURL: this.options.url, step, task: task.action, frame, options: this.options }));
 				if (DEBUG) {
 					log("  // ENDED task =", task.action, "delay =", Date.now() - startTime);
 				}

package/modules/template-formatter.js

@@ -17014,8 +17014,14 @@ async function evalTemplate(template = "", options, content, doc, dontReplaceSla
 		"encode-uri": value => { try { return encodeURI(value); } catch (error) { return value; } },
 		"decode-uri": value => { try { return decodeURI(value); } catch (error) { return value; } },
 		"encode-uri-component": value => { try { return encodeURIComponent(value); } catch (error) { return value; } },
-		"decode-uri-component": value => { try { return decodeURIComponent(value); } catch (error) { return value; } }
+		"decode-uri-component": value => { try { return decodeURIComponent(value); } catch (error) { return value; } },
+		"date-locale": locales => new Date().toLocaleDateString(locales),
+		"time-locale": locales => new Date().toLocaleTimeString(locales),
+		"datetime-locale": locales => new Date().toLocaleString(locales)
 	};
+	functions["date-locale"].dontReplaceSlash = false;
+	functions["time-locale"].dontReplaceSlash = false;
+	functions["datetime-locale"].dontReplaceSlash = false;
 	if (doc) {
 		functions["page-element-text"] = (selector) => {
 			const element = doc.querySelector(selector);
@@ -17043,7 +17049,8 @@ async function evalTemplate(template = "", options, content, doc, dontReplaceSla
 					.filter(argument => argument != undefined && argument != null && argument != "");
 				if ((argument != undefined && argument != null && argument != "") || optionalArguments.length > 0) {
 					try {
-						return await getValue(() => fn(argument, ...optionalArguments), true, options.filenameReplacementCharacter, lengthData);
+						const dontReplaceSlash = fn.dontReplaceSlash === undefined ? true : fn.dontReplaceSlash;
+						return await getValue(() => fn(argument, ...optionalArguments), dontReplaceSlash, options.filenameReplacementCharacter, lengthData);
 					} catch (error) {
 						return "";
 					}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "single-file-core",
-  "version": "1.3.32",
+  "version": "1.4.1",
   "description": "SingleFile Core",
   "author": "Gildas Lormeau",
   "license": "AGPL-3.0-or-later",

package/single-file.js

@@ -90,12 +90,14 @@ async function getPageData(options = {}, initOptions, doc = globalThis.document,
 	options.insertCanonicalLink = true;
 
 	const externalOnProgress = options.onprogress;
-	options.onprogress = event => {
+	options.onprogress = async event => {
 		if (event.type === event.RESOURCES_INITIALIZED && doc && win && options.loadDeferredImages) {
 			processors.lazy.resetZoomLevel(options);
 		}
 
-		if (externalOnProgress) externalOnProgress(event);
+		if (externalOnProgress) {
+			await externalOnProgress(event);
+		}
 	};
 
 	const processor = new SingleFile(options);