muhammara 5.2.0 → 5.4.0

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/lib/recipe/vector-polygon.js

@@ -101,7 +101,7 @@ exports.polygon = function polygon(coordinates = [], options = {}) {
       height,
       pathOptions,
       (ctx, xObject) => {
-        ctx.gs(xObject.getGsName(pathOptions.fillGsId)), setPathOptions(ctx);
+        (ctx.gs(xObject.getGsName(pathOptions.fillGsId)), setPathOptions(ctx));
         xObject.fill(colorModel);
         drawPolygon(ctx, coordinates);
         ctx.f();

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/@mapbox/node-pre-gyp/package.json

@@ -1,39 +1,24 @@
 {
-  "_from": "@mapbox/node-pre-gyp@^1.0.11",
-  "_id": "@mapbox/node-pre-gyp@1.0.11",
-  "_inBundle": false,
-  "_integrity": "sha512-Yhlar6v9WQgUp/He7BdgzOz8lqMQ8sU+jkCq7Wx8Myc5YFJLbEe7lgui/V7G1qB1DJykHSGwreceSaD60Y0PUQ==",
-  "_location": "/@mapbox/node-pre-gyp",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "@mapbox/node-pre-gyp@^1.0.11",
-    "name": "@mapbox/node-pre-gyp",
-    "escapedName": "@mapbox%2fnode-pre-gyp",
-    "scope": "@mapbox",
-    "rawSpec": "^1.0.11",
-    "saveSpec": null,
-    "fetchSpec": "^1.0.11"
-  },
-  "_requiredBy": [
-    "/"
+  "name": "@mapbox/node-pre-gyp",
+  "description": "Node.js native addon binary install tool",
+  "version": "1.0.11",
+  "keywords": [
+    "native",
+    "addon",
+    "module",
+    "c",
+    "c++",
+    "bindings",
+    "binary"
   ],
-  "_resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-1.0.11.tgz",
-  "_shasum": "417db42b7f5323d79e93b34a6d7a2a12c0df43fa",
-  "_spec": "@mapbox/node-pre-gyp@^1.0.11",
-  "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS",
-  "author": {
-    "name": "Dane Springmeyer",
-    "email": "dane@mapbox.com"
-  },
-  "bin": {
-    "node-pre-gyp": "bin/node-pre-gyp"
-  },
-  "bugs": {
-    "url": "https://github.com/mapbox/node-pre-gyp/issues"
+  "license": "BSD-3-Clause",
+  "author": "Dane Springmeyer <dane@mapbox.com>",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/mapbox/node-pre-gyp.git"
   },
-  "bundleDependencies": false,
+  "bin": "./bin/node-pre-gyp",
+  "main": "./lib/node-pre-gyp.js",
   "dependencies": {
     "detect-libc": "^2.0.0",
     "https-proxy-agent": "^5.0.0",
@@ -45,8 +30,6 @@
     "semver": "^7.3.5",
     "tar": "^6.1.11"
   },
-  "deprecated": false,
-  "description": "Node.js native addon binary install tool",
   "devDependencies": {
     "@mapbox/cloudfriend": "^5.1.0",
     "@mapbox/eslint-config-mapbox": "^3.0.0",
@@ -61,19 +44,6 @@
     "tape": "^5.5.2",
     "tar-fs": "^2.1.1"
   },
-  "homepage": "https://github.com/mapbox/node-pre-gyp#readme",
-  "keywords": [
-    "native",
-    "addon",
-    "module",
-    "c",
-    "c++",
-    "bindings",
-    "binary"
-  ],
-  "license": "BSD-3-Clause",
-  "main": "./lib/node-pre-gyp.js",
-  "name": "@mapbox/node-pre-gyp",
   "nyc": {
     "all": true,
     "skip-full": false,
@@ -81,17 +51,12 @@
       "test/**"
     ]
   },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/mapbox/node-pre-gyp.git"
-  },
   "scripts": {
     "coverage": "nyc --all --include index.js --include lib/ npm test",
-    "fix": "npm run lint -- --fix",
+    "upload-coverage": "nyc report --reporter json && codecov --clear --flags=unit --file=./coverage/coverage-final.json",
     "lint": "eslint bin/node-pre-gyp lib/*js lib/util/*js test/*js scripts/*js",
-    "test": "tape test/*test.js",
+    "fix": "npm run lint -- --fix",
     "update-crosswalk": "node scripts/abi_crosswalk.js",
-    "upload-coverage": "nyc report --reporter json && codecov --clear --flags=unit --file=./coverage/coverage-final.json"
-  },
-  "version": "1.0.11"
+    "test": "tape test/*test.js"
+  }
 }

package/node_modules/abbrev/package.json

@@ -1,56 +1,21 @@
 {
-  "_from": "abbrev@1",
-  "_id": "abbrev@1.1.1",
-  "_inBundle": false,
-  "_integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
-  "_location": "/abbrev",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "abbrev@1",
-    "name": "abbrev",
-    "escapedName": "abbrev",
-    "rawSpec": "1",
-    "saveSpec": null,
-    "fetchSpec": "1"
-  },
-  "_requiredBy": [
-    "/nopt"
-  ],
-  "_resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
-  "_shasum": "f8f2c887ad10bf67f634f005b6987fed3179aac8",
-  "_spec": "abbrev@1",
-  "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/nopt",
-  "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me"
-  },
-  "bugs": {
-    "url": "https://github.com/isaacs/abbrev-js/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
+  "name": "abbrev",
+  "version": "1.1.1",
   "description": "Like ruby's abbrev module, but in js",
+  "author": "Isaac Z. Schlueter <i@izs.me>",
+  "main": "abbrev.js",
+  "scripts": {
+    "test": "tap test.js --100",
+    "preversion": "npm test",
+    "postversion": "npm publish",
+    "postpublish": "git push origin --all; git push origin --tags"
+  },
+  "repository": "http://github.com/isaacs/abbrev-js",
+  "license": "ISC",
   "devDependencies": {
     "tap": "^10.1"
   },
   "files": [
     "abbrev.js"
-  ],
-  "homepage": "https://github.com/isaacs/abbrev-js#readme",
-  "license": "ISC",
-  "main": "abbrev.js",
-  "name": "abbrev",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/isaacs/abbrev-js.git"
-  },
-  "scripts": {
-    "postpublish": "git push origin --all; git push origin --tags",
-    "postversion": "npm publish",
-    "preversion": "npm test",
-    "test": "tap test.js --100"
-  },
-  "version": "1.1.1"
+  ]
 }

package/node_modules/agent-base/package.json

@@ -1,41 +1,40 @@
 {
-  "_from": "agent-base@6",
-  "_id": "agent-base@6.0.2",
-  "_inBundle": false,
-  "_integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
-  "_location": "/agent-base",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "agent-base@6",
-    "name": "agent-base",
-    "escapedName": "agent-base",
-    "rawSpec": "6",
-    "saveSpec": null,
-    "fetchSpec": "6"
-  },
-  "_requiredBy": [
-    "/https-proxy-agent"
+  "name": "agent-base",
+  "version": "6.0.2",
+  "description": "Turn a function into an `http.Agent` instance",
+  "main": "dist/src/index",
+  "typings": "dist/src/index",
+  "files": [
+    "dist/src",
+    "src"
   ],
-  "_resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-  "_shasum": "49fff58577cfee3f37176feab4c22e00f86d7f77",
-  "_spec": "agent-base@6",
-  "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/https-proxy-agent",
-  "author": {
-    "name": "Nathan Rajlich",
-    "email": "nathan@tootallnate.net",
-    "url": "http://n8.io/"
+  "scripts": {
+    "prebuild": "rimraf dist",
+    "build": "tsc",
+    "postbuild": "cpy --parents src test '!**/*.ts' dist",
+    "test": "mocha --reporter spec dist/test/*.js",
+    "test-lint": "eslint src --ext .js,.ts",
+    "prepublishOnly": "npm run build"
   },
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/TooTallNate/node-agent-base.git"
+  },
+  "keywords": [
+    "http",
+    "agent",
+    "base",
+    "barebones",
+    "https"
+  ],
+  "author": "Nathan Rajlich <nathan@tootallnate.net> (http://n8.io/)",
+  "license": "MIT",
   "bugs": {
     "url": "https://github.com/TooTallNate/node-agent-base/issues"
   },
-  "bundleDependencies": false,
   "dependencies": {
     "debug": "4"
   },
-  "deprecated": false,
-  "description": "Turn a function into an `http.Agent` instance",
   "devDependencies": {
     "@types/debug": "4",
     "@types/mocha": "^5.2.7",
@@ -61,34 +60,5 @@
   },
   "engines": {
     "node": ">= 6.0.0"
-  },
-  "files": [
-    "dist/src",
-    "src"
-  ],
-  "homepage": "https://github.com/TooTallNate/node-agent-base#readme",
-  "keywords": [
-    "http",
-    "agent",
-    "base",
-    "barebones",
-    "https"
-  ],
-  "license": "MIT",
-  "main": "dist/src/index",
-  "name": "agent-base",
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/TooTallNate/node-agent-base.git"
-  },
-  "scripts": {
-    "build": "tsc",
-    "postbuild": "cpy --parents src test '!**/*.ts' dist",
-    "prebuild": "rimraf dist",
-    "prepublishOnly": "npm run build",
-    "test": "mocha --reporter spec dist/test/*.js",
-    "test-lint": "eslint src --ext .js,.ts"
-  },
-  "typings": "dist/src/index",
-  "version": "6.0.2"
+  }
 }

package/node_modules/ansi-regex/package.json

@@ -1,87 +1,55 @@
 {
-  "_from": "ansi-regex@^5.0.1",
-  "_id": "ansi-regex@5.0.1",
-  "_inBundle": false,
-  "_integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-  "_location": "/ansi-regex",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "ansi-regex@^5.0.1",
-    "name": "ansi-regex",
-    "escapedName": "ansi-regex",
-    "rawSpec": "^5.0.1",
-    "saveSpec": null,
-    "fetchSpec": "^5.0.1"
-  },
-  "_requiredBy": [
-    "/strip-ansi"
-  ],
-  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-  "_shasum": "082cb2c89c9fe8659a311a53bd6a4dc5301db304",
-  "_spec": "ansi-regex@^5.0.1",
-  "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/strip-ansi",
-  "author": {
-    "name": "Sindre Sorhus",
-    "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/chalk/ansi-regex/issues"
-  },
-  "bundleDependencies": false,
-  "deprecated": false,
-  "description": "Regular expression for matching ANSI escape codes",
-  "devDependencies": {
-    "ava": "^2.4.0",
-    "tsd": "^0.9.0",
-    "xo": "^0.25.3"
-  },
-  "engines": {
-    "node": ">=8"
-  },
-  "files": [
-    "index.js",
-    "index.d.ts"
-  ],
-  "homepage": "https://github.com/chalk/ansi-regex#readme",
-  "keywords": [
-    "ansi",
-    "styles",
-    "color",
-    "colour",
-    "colors",
-    "terminal",
-    "console",
-    "cli",
-    "string",
-    "tty",
-    "escape",
-    "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
-    "command-line",
-    "text",
-    "regex",
-    "regexp",
-    "re",
-    "match",
-    "test",
-    "find",
-    "pattern"
-  ],
-  "license": "MIT",
-  "name": "ansi-regex",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/chalk/ansi-regex.git"
-  },
-  "scripts": {
-    "test": "xo && ava && tsd",
-    "view-supported": "node fixtures/view-codes.js"
-  },
-  "version": "5.0.1"
+	"name": "ansi-regex",
+	"version": "5.0.1",
+	"description": "Regular expression for matching ANSI escape codes",
+	"license": "MIT",
+	"repository": "chalk/ansi-regex",
+	"author": {
+		"name": "Sindre Sorhus",
+		"email": "sindresorhus@gmail.com",
+		"url": "sindresorhus.com"
+	},
+	"engines": {
+		"node": ">=8"
+	},
+	"scripts": {
+		"test": "xo && ava && tsd",
+		"view-supported": "node fixtures/view-codes.js"
+	},
+	"files": [
+		"index.js",
+		"index.d.ts"
+	],
+	"keywords": [
+		"ansi",
+		"styles",
+		"color",
+		"colour",
+		"colors",
+		"terminal",
+		"console",
+		"cli",
+		"string",
+		"tty",
+		"escape",
+		"formatting",
+		"rgb",
+		"256",
+		"shell",
+		"xterm",
+		"command-line",
+		"text",
+		"regex",
+		"regexp",
+		"re",
+		"match",
+		"test",
+		"find",
+		"pattern"
+	],
+	"devDependencies": {
+		"ava": "^2.4.0",
+		"tsd": "^0.9.0",
+		"xo": "^0.25.3"
+	}
 }

package/node_modules/aproba/package.json

@@ -1,63 +1,35 @@
 {
-  "_from": "aproba@^1.0.3 || ^2.0.0",
-  "_id": "aproba@2.0.0",
-  "_inBundle": false,
-  "_integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
-  "_location": "/aproba",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "range",
-    "registry": true,
-    "raw": "aproba@^1.0.3 || ^2.0.0",
-    "name": "aproba",
-    "escapedName": "aproba",
-    "rawSpec": "^1.0.3 || ^2.0.0",
-    "saveSpec": null,
-    "fetchSpec": "^1.0.3 || ^2.0.0"
-  },
-  "_requiredBy": [
-    "/gauge"
-  ],
-  "_resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
-  "_shasum": "52520b8ae5b569215b354efc0caa3fe1e45a8adc",
-  "_spec": "aproba@^1.0.3 || ^2.0.0",
-  "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/gauge",
-  "author": {
-    "name": "Rebecca Turner",
-    "email": "me@re-becca.org"
-  },
-  "bugs": {
-    "url": "https://github.com/iarna/aproba/issues"
+  "name": "aproba",
+  "version": "2.0.0",
+  "description": "A ridiculously light-weight argument validator (now browser friendly)",
+  "main": "index.js",
+  "directories": {
+    "test": "test"
   },
-  "bundleDependencies": false,
   "dependencies": {},
-  "deprecated": false,
-  "description": "A ridiculously light-weight argument validator (now browser friendly)",
   "devDependencies": {
     "standard": "^11.0.1",
     "tap": "^12.0.1"
   },
-  "directories": {
-    "test": "test"
-  },
   "files": [
     "index.js"
   ],
-  "homepage": "https://github.com/iarna/aproba",
+  "scripts": {
+    "pretest": "standard",
+    "test": "tap --100 -J test/*.js"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/iarna/aproba"
+  },
   "keywords": [
     "argument",
     "validate"
   ],
+  "author": "Rebecca Turner <me@re-becca.org>",
   "license": "ISC",
-  "main": "index.js",
-  "name": "aproba",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/iarna/aproba.git"
-  },
-  "scripts": {
-    "pretest": "standard",
-    "test": "tap --100 -J test/*.js"
+  "bugs": {
+    "url": "https://github.com/iarna/aproba/issues"
   },
-  "version": "2.0.0"
+  "homepage": "https://github.com/iarna/aproba"
 }