muhammara 5.1.0 → 5.3.0

package/CHANGELOG.md

@@ -7,6 +7,25 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [5.3.0] - 2024-12-14
+
+### Added
+
+- Add electron 31.7.0, 33.1.0, 33.2.0, 33.3.0 [#439](https://github.com/julianhille/MuhammaraJS/issues/439)
+
+### Fixed
+
+- Fix recipe with new buffers [#372](https://github.com/julianhille/MuhammaraJS/issues/372)
+- Wrong node versions for 2.2, 32.1 and 31.6 [#439](https://github.com/julianhille/MuhammaraJS/issues/439)
+- Fix recipes createPage typescript definition and jsdoc, discourage
+  use of '-size' values for pageType [#369](https://github.com/julianhille/MuhammaraJS/issues/369)
+
+## [5.2.0] - 2024-10-20
+
+### Added
+
+- Add electron 33.0, 32.1, 32.2, 31.5, 31.6, 30.5
+
 ## [5.1.0] - 2024-10-17
 
 ### Added
@@ -465,7 +484,9 @@ with the following changes.
 
 - Initial release
 
-:[unreleased]: https://github.com/julianhille/MuhammaraJS/compare/5.1.0...HEAD
+:[unreleased]: https://github.com/julianhille/MuhammaraJS/compare/5.3.0...HEAD
+[5.3.0]: https://github.com/julianhille/MuhammaraJS/compare/5.2.0...5.3.0
+[5.2.0]: https://github.com/julianhille/MuhammaraJS/compare/5.1.0...5.2.0
 [5.1.0]: https://github.com/julianhille/MuhammaraJS/compare/5.0.2...5.1.0
 [5.0.2]: https://github.com/julianhille/MuhammaraJS/compare/5.0.1...5.0.2
 [5.0.1]: https://github.com/julianhille/MuhammaraJS/compare/5.0.0...5.0.1

package/README.md

@@ -152,7 +152,7 @@ const pdfDoc = new Recipe("new", "output.pdf", {
   subject: "A brand new PDF",
 });
 
-pdfDoc.createPage("letter-size").endPage().endPDF();
+pdfDoc.createPage("letter").endPage().endPDF();
 ```
 
 ```javascript
@@ -161,7 +161,7 @@ const pdfDoc = new Recipe("new", "output.pdf");
 
 pdfDoc
   // 1st Page
-  .createPage("letter-size")
+  .createPage("letter")
   .circle("center", 100, 30, { stroke: "#3b7721", fill: "#eee000" })
   .polygon(
     [
@@ -243,7 +243,7 @@ const pdfDoc = new Recipe(Buffer.from("new"), null, {
   subject: "A brand new PDF",
 });
 
-const pdfBuffer = pdfDoc.createPage("letter-size").endPage().endPDF();
+const pdfBuffer = pdfDoc.createPage("letter").endPage().endPDF();
 ```
 
 ### Modify an existing PDF

package/lib/Recipe.js

@@ -28,7 +28,9 @@ class Recipe {
     this.src = src;
     // detect the src is Buffer or not
     this.isBufferSrc = this.src instanceof Buffer;
-    this.isNewPDF = !this.isBufferSrc && src.toLowerCase() === "new";
+    this.isNewPDF =
+      (!this.isBufferSrc && src.toLowerCase() === "new") ||
+      (this.isBufferSrc && this.src.equals(Buffer.from("new")));
     this.encryptOptions = this._getEncryptOptions(options, this.isNewPDF);
     this.options = Object.assign({}, options, this.encryptOptions);
     this.current = {};
@@ -75,12 +77,21 @@ class Recipe {
 
   _createWriter() {
     if (this.isNewPDF) {
-      this.writer = muhammara.createWriter(
-        this.output,
-        Object.assign({}, this.encryptOptions, {
-          version: this._getVersion(this.options.version),
-        }),
-      );
+      if (!this.isBufferSrc) {
+        this.writer = muhammara.createWriter(
+          this.output,
+          Object.assign({}, this.encryptOptions, {
+            version: this._getVersion(this.options.version),
+          }),
+        );
+      } else {
+        this.writer = muhammara.createWriter(
+          new muhammara.PDFStreamForResponse(this.outStream),
+          Object.assign({}, this.encryptOptions, {
+            log: this.logFile,
+          }),
+        );
+      }
     } else {
       this.read();
       try {

package/lib/recipe/page.js

@@ -2,13 +2,14 @@ const muhammara = require("../muhammara");
 
 /**
  * Create a new page, specifying either actual width and height, or the name
- * of a supported page size (eg. 'letter', )
+ * of a supported page size (eg. 'letter', 'letter-size')
+ * '-size' will be removed from string but is discouraged to use.
  * @name createPage
  * @function
  * @memberof Recipe
- * @param {number|string} [pageWidth_or_pageSizeName='letter'] - The page width, or name of medium size.
+ * @param {number|string} [pageWidth] - The page width, or name of medium size.
  * Known named medium sizes: executive, folio, legal, letter, ledger, tabloid, a0-a10, b0-b10, c0-c10, ra0-ra4, sra0-ara4
- * @param {number} [pageHeight_or_rotation] - The page height, or rotation (90) when when page size name given.
+ * @param {number} [pageHeight] - The page height, or rotation (90) when page size name given.
  * @param {object} [margins] - page margin definitions.
  * @param {number} [margins.left] - Left margin.
  * @param {number} [margins.right] - Right margin.

package/muhammara.d.ts

@@ -1100,8 +1100,8 @@ declare module "muhammara" {
       options?: Recipe.OverlayOptions,
     ): Recipe;
 
-    createPage(pageWidth: number, pageHeight: number): Recipe;
-
+    createPage(pageWidth?: number, pageHeight?: number): Recipe;
+    createPage(pageType: string, rotation?: number): Recipe;
     endPage(): Recipe;
 
     editPage(pageNumber: number): Recipe;

package/node_modules/debug/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "debug@4",
-  "_id": "debug@4.3.7",
+  "_id": "debug@4.4.0",
   "_inBundle": false,
-  "_integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+  "_integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
   "_location": "/debug",
   "_phantomChildren": {},
   "_requested": {
@@ -20,8 +20,8 @@
     "/https-proxy-agent",
     "/mocha"
   ],
-  "_resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-  "_shasum": "87945b4151a011d76d95a198d7111c865c360a52",
+  "_resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+  "_shasum": "2b3f2aea2ffeb776477460267377dc8710faba8a",
   "_spec": "debug@4",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/https-proxy-agent",
   "author": {
@@ -100,5 +100,10 @@
     "test:coverage": "cat ./coverage/lcov.info | coveralls",
     "test:node": "istanbul cover _mocha -- test.js test.node.js"
   },
-  "version": "4.3.7"
+  "version": "4.4.0",
+  "xo": {
+    "rules": {
+      "import/extensions": "off"
+    }
+  }
 }

package/node_modules/debug/src/browser.js

@@ -129,6 +129,7 @@ function useColors() {
 
 	// Is webkit? http://stackoverflow.com/a/16459606/376773
 	// document is undefined in react-native: https://github.com/facebook/react-native/pull/1632
+	// eslint-disable-next-line no-return-assign
 	return (typeof document !== 'undefined' && document.documentElement && document.documentElement.style && document.documentElement.style.WebkitAppearance) ||
 		// Is firebug? http://stackoverflow.com/a/398120/376773
 		(typeof window !== 'undefined' && window.console && (window.console.firebug || (window.console.exception && window.console.table))) ||

package/node_modules/debug/src/common.js

@@ -166,24 +166,62 @@ function setup(env) {
 		createDebug.names = [];
 		createDebug.skips = [];
 
-		let i;
-		const split = (typeof namespaces === 'string' ? namespaces : '').split(/[\s,]+/);
-		const len = split.length;
-
-		for (i = 0; i < len; i++) {
-			if (!split[i]) {
-				// ignore empty strings
-				continue;
+		const split = (typeof namespaces === 'string' ? namespaces : '')
+			.trim()
+			.replace(' ', ',')
+			.split(',')
+			.filter(Boolean);
+
+		for (const ns of split) {
+			if (ns[0] === '-') {
+				createDebug.skips.push(ns.slice(1));
+			} else {
+				createDebug.names.push(ns);
 			}
+		}
+	}
 
-			namespaces = split[i].replace(/\*/g, '.*?');
-
-			if (namespaces[0] === '-') {
-				createDebug.skips.push(new RegExp('^' + namespaces.slice(1) + '$'));
+	/**
+	 * Checks if the given string matches a namespace template, honoring
+	 * asterisks as wildcards.
+	 *
+	 * @param {String} search
+	 * @param {String} template
+	 * @return {Boolean}
+	 */
+	function matchesTemplate(search, template) {
+		let searchIndex = 0;
+		let templateIndex = 0;
+		let starIndex = -1;
+		let matchIndex = 0;
+
+		while (searchIndex < search.length) {
+			if (templateIndex < template.length && (template[templateIndex] === search[searchIndex] || template[templateIndex] === '*')) {
+				// Match character or proceed with wildcard
+				if (template[templateIndex] === '*') {
+					starIndex = templateIndex;
+					matchIndex = searchIndex;
+					templateIndex++; // Skip the '*'
+				} else {
+					searchIndex++;
+					templateIndex++;
+				}
+			} else if (starIndex !== -1) { // eslint-disable-line no-negated-condition
+				// Backtrack to the last '*' and try to match more characters
+				templateIndex = starIndex + 1;
+				matchIndex++;
+				searchIndex = matchIndex;
 			} else {
-				createDebug.names.push(new RegExp('^' + namespaces + '$'));
+				return false; // No match
 			}
 		}
+
+		// Handle trailing '*' in template
+		while (templateIndex < template.length && template[templateIndex] === '*') {
+			templateIndex++;
+		}
+
+		return templateIndex === template.length;
 	}
 
 	/**
@@ -194,8 +232,8 @@ function setup(env) {
 	*/
 	function disable() {
 		const namespaces = [
-			...createDebug.names.map(toNamespace),
-			...createDebug.skips.map(toNamespace).map(namespace => '-' + namespace)
+			...createDebug.names,
+			...createDebug.skips.map(namespace => '-' + namespace)
 		].join(',');
 		createDebug.enable('');
 		return namespaces;
@@ -209,21 +247,14 @@ function setup(env) {
 	* @api public
 	*/
 	function enabled(name) {
-		if (name[name.length - 1] === '*') {
-			return true;
-		}
-
-		let i;
-		let len;
-
-		for (i = 0, len = createDebug.skips.length; i < len; i++) {
-			if (createDebug.skips[i].test(name)) {
+		for (const skip of createDebug.skips) {
+			if (matchesTemplate(name, skip)) {
 				return false;
 			}
 		}
 
-		for (i = 0, len = createDebug.names.length; i < len; i++) {
-			if (createDebug.names[i].test(name)) {
+		for (const ns of createDebug.names) {
+			if (matchesTemplate(name, ns)) {
 				return true;
 			}
 		}
@@ -231,19 +262,6 @@ function setup(env) {
 		return false;
 	}
 
-	/**
-	* Convert regexp to namespace
-	*
-	* @param {RegExp} regxep
-	* @return {String} namespace
-	* @api private
-	*/
-	function toNamespace(regexp) {
-		return regexp.toString()
-			.substring(2, regexp.toString().length - 2)
-			.replace(/\.\*\?$/, '*');
-	}
-
 	/**
 	* Coerce `val`.
 	*

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muhammara",
-  "version": "5.1.0",
+  "version": "5.3.0",
   "description": "Create, read and modify PDF files and streams. A drop in replacement for hummusjs PDF library",
   "homepage": "https://github.com/julianhille/Muhammarajs",
   "license": "Apache-2.0",