presidium 0.25.1 → 0.26.0

package/S3.js

@@ -346,14 +346,20 @@ S3.prototype.getObject = function s3GetObject(bucketname, key, options) {
   }).promise()
 }
 
-S3.prototype.getObjectStream = async function s3GetObject(
+S3.prototype.headObject = async function headObject(
   bucketname, key, options = {},
 ) {
-  const headRes = await this.s3.headObject({
+  return this.s3.headObject({
     Bucket: bucketname,
     Key: key,
     ...options,
   }).promise()
+}
+
+S3.prototype.getObjectStream = async function s3GetObject(
+  bucketname, key, options = {},
+) {
+  const headRes = await this.headObject(bucketname, key, options)
 
   const rs = this.s3.getObject({
     Bucket: bucketname,

package/S3Bucket.js

@@ -304,6 +304,10 @@ S3Bucket.prototype.getObject = async function getObject(key, options) {
   return this.s3.getObject(this.name, key, options)
 }
 
+S3Bucket.prototype.headObject = async function headObject(key, options) {
+  return this.s3.headObject(this.name, key, options)
+}
+
 S3Bucket.prototype.getObjectStream = async function getObjectStream(
   key, options,
 ) {

package/S3Bucket.test.js

@@ -69,6 +69,8 @@ const test = new Test('S3Bucket', S3Bucket)
   {
     const key = 'buffer2'
     await testBucket.upload(key, Buffer.from('buffer'))
+    const headRes = await testBucket.headObject(key)
+    assert.equal(headRes.ContentLength, 6)
     const res = await testBucket.getObjectStream(key)
     assert.equal(res.headers.ContentLength, 6)
   }

package/internal/pathWalk.js

@@ -1,5 +1,6 @@
 require('rubico/global')
 const fs = require('fs/promises')
+const { minimatch } = require('minimatch')
 const pathResolve = require('./pathResolve')
 const isArray = require('./isArray')
 
@@ -20,29 +21,36 @@ const isArray = require('./isArray')
  * }) // -> Promise<paths Array<string>>
  * ```
  */
-const pathWalk = function (path, options) {
-  const ignore = new Set(get('ignore', [])(options))
-  return pipe([
-    pathResolve,
-    tryCatch(
-      curry.arity(2, fs.readdir, __, { withFileTypes: true }),
-      () => []),
+const pathWalk = async function (path, options = {}) {
+  const { ignore = [] } = options
+  const absPath = pathResolve(path)
+  const dirents = await fs.readdir(absPath, { withFileTypes: true })
+  const result = []
 
-    flatMap(dirent => {
-      const direntName = dirent.name,
-        direntPath = pathResolve(path, direntName)
-      if (
-        ignore.size > 0
-          && (ignore.has(direntName) || ignore.has(direntPath))
-      ) {
-        return []
+  for (const dirent of dirents) {
+    const dirName = dirent.name
+    const dirPath = pathResolve(path, dirName)
+    let shouldIgnore = false
+    for (const pattern of ignore) {
+      if (minimatch(dirPath, pattern) || minimatch(dirName, pattern)) {
+        shouldIgnore = true
+        break
       }
-      if (dirent.isDirectory()) {
-        return pathWalk(direntPath)
-      }
-      return [direntPath]
-    }),
-  ])(path)
+    }
+
+    if (shouldIgnore) {
+      continue
+    }
+
+    if (dirent.isDirectory()) {
+      const subPaths = await pathWalk(dirPath, options)
+      result.push(...subPaths)
+    } else {
+      result.push(dirPath)
+    }
+  }
+
+  return result
 }
 
 module.exports = pathWalk

package/internal/pathWalk.test.js

@@ -3,14 +3,23 @@ const Test = require('thunk-test')
 const pathWalk = require('./pathWalk')
 const pathResolve = require('./pathResolve')
 
-module.exports = Test('pathWalk', pathWalk)
-  .case(__dirname, function (paths) {
-    assert(paths.length > 0)
-    this.allInternalPaths = paths
-  })
-  .case(__dirname, { ignore: ['pathWalk.js'] }, function (paths) {
-    assert.equal(paths.length, this.allInternalPaths.length - 1)
-  })
-  .case(__dirname, { ignore: [pathResolve(__dirname, 'pathWalk.js')] }, function (paths) {
-    assert.equal(paths.length, this.allInternalPaths.length - 1)
-  })
+const test = Test('pathWalk', pathWalk)
+
+.case(__dirname, function (paths) {
+  assert(paths.length > 0)
+  this.allInternalPaths = paths
+})
+
+.case(__dirname, { ignore: ['pathWalk.js'] }, function (paths) {
+  assert.equal(paths.length, this.allInternalPaths.length - 1)
+})
+
+.case(__dirname, { ignore: [pathResolve(__dirname, 'pathWalk.js')] }, function (paths) {
+  assert.equal(paths.length, this.allInternalPaths.length - 1)
+})
+
+if (process.argv[1] == __filename) {
+  test()
+}
+
+module.exports = test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "presidium",
-  "version": "0.25.1",
+  "version": "0.26.0",
   "description": "A library for creating web services",
   "author": "Richard Tong",
   "license": "MIT",
@@ -33,6 +33,7 @@
     "aws-sdk": "^2.1123.0",
     "bcrypt": "^5.1.0",
     "ioredis": "^4.19.0",
+    "minimatch": "^9.0.3",
     "mongodb": "^3.6.3",
     "node-fetch": "^2.6.1",
     "rubico": "latest",