muhammara 3.2.0 → 3.3.0

package/node_modules/tar/lib/write-entry.js

@@ -8,8 +8,9 @@ const normPath = require('./normalize-windows-path.js')
 const stripSlash = require('./strip-trailing-slashes.js')
 
 const prefixPath = (path, prefix) => {
-  if (!prefix)
+  if (!prefix) {
     return normPath(path)
+  }
   path = normPath(path).replace(/^\.(\/|$)/, '')
   return stripSlash(prefix) + '/' + path
 }
@@ -44,8 +45,9 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
   constructor (p, opt) {
     opt = opt || {}
     super(opt)
-    if (typeof p !== 'string')
+    if (typeof p !== 'string') {
       throw new TypeError('path is required')
+    }
     this.path = normPath(p)
     // suppress atime, ctime, uid, gid, uname, gname
     this.portable = !!opt.portable
@@ -72,8 +74,9 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
     this.pos = null
     this.remain = null
 
-    if (typeof opt.onwarn === 'function')
+    if (typeof opt.onwarn === 'function') {
       this.on('warn', opt.onwarn)
+    }
 
     let pathWarn = false
     if (!this.preservePaths) {
@@ -94,8 +97,9 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
 
     this.absolute = normPath(opt.absolute || path.resolve(this.cwd, p))
 
-    if (this.path === '')
+    if (this.path === '') {
       this.path = './'
+    }
 
     if (pathWarn) {
       this.warn('TAR_ENTRY_INFO', `stripping ${pathWarn} from absolute path`, {
@@ -104,22 +108,25 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
       })
     }
 
-    if (this.statCache.has(this.absolute))
+    if (this.statCache.has(this.absolute)) {
       this[ONLSTAT](this.statCache.get(this.absolute))
-    else
+    } else {
       this[LSTAT]()
+    }
   }
 
   emit (ev, ...data) {
-    if (ev === 'error')
+    if (ev === 'error') {
       this[HAD_ERROR] = true
+    }
     return super.emit(ev, ...data)
   }
 
   [LSTAT] () {
     fs.lstat(this.absolute, (er, stat) => {
-      if (er)
+      if (er) {
         return this.emit('error', er)
+      }
       this[ONLSTAT](stat)
     })
   }
@@ -127,8 +134,9 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
   [ONLSTAT] (stat) {
     this.statCache.set(this.absolute, stat)
     this.stat = stat
-    if (!stat.isFile())
+    if (!stat.isFile()) {
       stat.size = 0
+    }
     this.type = getType(stat)
     this.emit('stat', stat)
     this[PROCESS]()
@@ -153,8 +161,9 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
   }
 
   [HEADER] () {
-    if (this.type === 'Directory' && this.portable)
+    if (this.type === 'Directory' && this.portable) {
       this.noMtime = true
+    }
 
     this.header = new Header({
       path: this[PREFIX](this.path),
@@ -196,8 +205,9 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
   }
 
   [DIRECTORY] () {
-    if (this.path.substr(-1) !== '/')
+    if (this.path.slice(-1) !== '/') {
       this.path += '/'
+    }
     this.stat.size = 0
     this[HEADER]()
     this.end()
@@ -205,8 +215,9 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
 
   [SYMLINK] () {
     fs.readlink(this.absolute, (er, linkpath) => {
-      if (er)
+      if (er) {
         return this.emit('error', er)
+      }
       this[ONREADLINK](linkpath)
     })
   }
@@ -230,31 +241,35 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
       const linkKey = this.stat.dev + ':' + this.stat.ino
       if (this.linkCache.has(linkKey)) {
         const linkpath = this.linkCache.get(linkKey)
-        if (linkpath.indexOf(this.cwd) === 0)
+        if (linkpath.indexOf(this.cwd) === 0) {
           return this[HARDLINK](linkpath)
+        }
       }
       this.linkCache.set(linkKey, this.absolute)
     }
 
     this[HEADER]()
-    if (this.stat.size === 0)
+    if (this.stat.size === 0) {
       return this.end()
+    }
 
     this[OPENFILE]()
   }
 
   [OPENFILE] () {
     fs.open(this.absolute, 'r', (er, fd) => {
-      if (er)
+      if (er) {
         return this.emit('error', er)
+      }
       this[ONOPENFILE](fd)
     })
   }
 
   [ONOPENFILE] (fd) {
     this.fd = fd
-    if (this[HAD_ERROR])
+    if (this[HAD_ERROR]) {
       return this[CLOSE]()
+    }
 
     this.blockLen = 512 * Math.ceil(this.stat.size / 512)
     this.blockRemain = this.blockLen
@@ -318,10 +333,11 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
       this.buf : this.buf.slice(this.offset, this.offset + bytesRead)
 
     const flushed = this.write(writeBuf)
-    if (!flushed)
+    if (!flushed) {
       this[AWAITDRAIN](() => this[ONDRAIN]())
-    else
+    } else {
       this[ONDRAIN]()
+    }
   }
 
   [AWAITDRAIN] (cb) {
@@ -343,8 +359,9 @@ const WriteEntry = warner(class WriteEntry extends MiniPass {
 
   [ONDRAIN] () {
     if (!this.remain) {
-      if (this.blockRemain)
+      if (this.blockRemain) {
         super.write(Buffer.alloc(this.blockRemain))
+      }
       return this[CLOSE](er => er ? this.emit('error', er) : this.end())
     }
 
@@ -412,8 +429,9 @@ const WriteEntryTar = warner(class WriteEntryTar extends MiniPass {
 
     this.readEntry = readEntry
     this.type = readEntry.type
-    if (this.type === 'Directory' && this.portable)
+    if (this.type === 'Directory' && this.portable) {
       this.noMtime = true
+    }
 
     this.prefix = opt.prefix || null
 
@@ -429,8 +447,9 @@ const WriteEntryTar = warner(class WriteEntryTar extends MiniPass {
     this.ctime = this.portable ? null : readEntry.ctime
     this.linkpath = normPath(readEntry.linkpath)
 
-    if (typeof opt.onwarn === 'function')
+    if (typeof opt.onwarn === 'function') {
       this.on('warn', opt.onwarn)
+    }
 
     let pathWarn = false
     if (!this.preservePaths) {
@@ -500,15 +519,17 @@ const WriteEntryTar = warner(class WriteEntryTar extends MiniPass {
 
   write (data) {
     const writeLen = data.length
-    if (writeLen > this.blockRemain)
+    if (writeLen > this.blockRemain) {
       throw new Error('writing more to entry than is appropriate')
+    }
     this.blockRemain -= writeLen
     return super.write(data)
   }
 
   end () {
-    if (this.blockRemain)
+    if (this.blockRemain) {
       super.write(Buffer.alloc(this.blockRemain))
+    }
     return super.end()
   }
 })

package/node_modules/tar/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "tar@^6.1.11",
-  "_id": "tar@6.1.11",
+  "_id": "tar@6.1.12",
   "_inBundle": false,
-  "_integrity": "sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==",
+  "_integrity": "sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==",
   "_location": "/tar",
   "_phantomChildren": {},
   "_requested": {
@@ -18,14 +18,12 @@
   "_requiredBy": [
     "/@mapbox/node-pre-gyp"
   ],
-  "_resolved": "https://registry.npmjs.org/tar/-/tar-6.1.11.tgz",
-  "_shasum": "6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621",
+  "_resolved": "https://registry.npmjs.org/tar/-/tar-6.1.12.tgz",
+  "_shasum": "3b742fb05669b55671fb769ab67a7791ea1a62e6",
   "_spec": "tar@^6.1.11",
   "_where": "/home/runner/work/MuhammaraJS/MuhammaraJS/node_modules/@mapbox/node-pre-gyp",
   "author": {
-    "name": "Isaac Z. Schlueter",
-    "email": "i@izs.me",
-    "url": "http://blog.izs.me/"
+    "name": "GitHub Inc."
   },
   "bugs": {
     "url": "https://github.com/npm/node-tar/issues"
@@ -42,26 +40,23 @@
   "deprecated": false,
   "description": "tar for node",
   "devDependencies": {
+    "@npmcli/eslint-config": "^4.0.0",
+    "@npmcli/template-oss": "4.8.0",
     "chmodr": "^1.2.0",
     "end-of-stream": "^1.4.3",
-    "eslint": "^7.17.0",
-    "eslint-plugin-import": "^2.22.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-standard": "^5.0.0",
     "events-to-array": "^1.1.2",
     "mutate-fs": "^2.1.1",
-    "rimraf": "^2.7.1",
-    "tap": "^15.0.9",
-    "tar-fs": "^1.16.3",
-    "tar-stream": "^1.6.2"
+    "nock": "^13.2.9",
+    "rimraf": "^3.0.2",
+    "tap": "^16.0.1"
   },
   "engines": {
-    "node": ">= 10"
+    "node": ">=10"
   },
   "files": [
-    "index.js",
-    "lib/*.js"
+    "bin/",
+    "lib/",
+    "index.js"
   ],
   "homepage": "https://github.com/npm/node-tar#readme",
   "license": "ISC",
@@ -71,22 +66,41 @@
     "url": "git+https://github.com/npm/node-tar.git"
   },
   "scripts": {
-    "bench": "for i in benchmarks/*/*.js; do echo $i; for j in {1..5}; do node $i || break; done; done",
-    "eslint": "eslint",
     "genparse": "node scripts/generate-parse-fixtures.js",
-    "lint": "npm run eslint -- test lib",
+    "lint": "eslint \"**/*.js\"",
     "lintfix": "npm run lint -- --fix",
+    "postlint": "template-oss-check",
     "posttest": "npm run lint",
-    "postversion": "npm publish",
-    "prepublishOnly": "git push origin --follow-tags",
-    "preversion": "npm test",
-    "test": "node test/fixtures/test.js",
-    "test:posix": "tap",
-    "test:win32": "tap --lines=98 --branches=98 --statements=98 --functions=98"
+    "snap": "tap",
+    "template-oss-apply": "template-oss-apply --force",
+    "test": "tap"
   },
   "tap": {
     "coverage-map": "map.js",
-    "check-coverage": true
+    "timeout": 0,
+    "nyc-arg": [
+      "--exclude",
+      "tap-snapshots/**"
+    ]
   },
-  "version": "6.1.11"
+  "templateOSS": {
+    "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
+    "version": "4.8.0",
+    "content": "scripts/template-oss",
+    "engines": ">=10",
+    "distPaths": [
+      "index.js"
+    ],
+    "allowPaths": [
+      "/index.js"
+    ],
+    "ciVersions": [
+      "10.x",
+      "12.x",
+      "14.x",
+      "16.x",
+      "18.x"
+    ]
+  },
+  "version": "6.1.12"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "muhammara",
-  "version": "3.2.0",
+  "version": "3.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",

package/src/deps/FreeType/binding.gyp

@@ -14,6 +14,16 @@
              './include/freetype/internal',
              './include/freetype/internal/services'
             ],
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 './src/base/ftbbox.c',
                 './src/base/ftgxval.c',

package/src/deps/LibAesgm/binding.gyp

@@ -3,6 +3,16 @@
         {
             'target_name': 'libaesgm',
             'type': 'static_library',
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 'aescrypt.c',
                 'aeskey.c',

package/src/deps/LibJpeg/binding.gyp

@@ -3,6 +3,16 @@
         {
             'target_name': 'libjpeg',
             'type': 'static_library',
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 'jaricom.c',
                 'jcapimin.c',

package/src/deps/LibPng/binding.gyp

@@ -8,7 +8,17 @@
             ],    
             'include_dirs': [
               '<(module_root_dir)/src/deps/ZLib',
-            ],                    
+            ],
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 'png.c',
                 'pngerror.c',

package/src/deps/LibTiff/binding.gyp

@@ -27,6 +27,16 @@
              'include_dirs': [
               '<(module_root_dir)/src/deps/ZLib',
             ],
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
            'sources': [
                 'tif_aux.c',
                 'tif_close.c',

package/src/deps/PDFWriter/binding.gyp

@@ -12,6 +12,16 @@
                    }
                 }]
             ],
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'dependencies': [
                '<(module_root_dir)/src/deps/LibAesgm/binding.gyp:libaesgm',
                '<(module_root_dir)/src/deps/FreeType/binding.gyp:freetype',

package/src/deps/ZLib/binding.gyp

@@ -3,6 +3,16 @@
         {
             'target_name': 'zlib',
             'type': 'static_library',
+           'msvs_settings':
+			{
+				'VCCLCompilerTool':
+				{
+					'AdditionalOptions':
+						[
+						'/std:c++17',
+						]
+				}
+			},
             'sources': [
                 'adler32.c',
                 'compress.c',