@architect/inventory 3.6.3 → 3.6.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "3.6.3",
+  "version": "3.6.5",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
@@ -21,7 +21,7 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@architect/asap": "~6.0.3",
+    "@architect/asap": "~6.0.4",
     "@architect/parser": "~6.0.3",
     "@architect/utils": "~3.1.9",
     "lambda-runtimes": "~1.1.6"
@@ -32,8 +32,9 @@
     "aws-sdk-mock": "~5.8.0",
     "cross-env": "~7.0.3",
     "dotenv": "~16.3.1",
-    "eslint": "~8.54.0",
+    "eslint": "~8.55.0",
     "mock-fs": "~5.2.0",
+    "mock-tmp": "~0.0.2",
     "nyc": "~15.1.0",
     "tap-arc": "^1.2.2",
     "tape": "^5.7.2"

package/src/config/pragmas/shared.js

@@ -52,8 +52,8 @@ module.exports = function configureShared ({ arc, pragmas, inventory, errors })
   }
   else if (foundPluginSrc) {
     if (!required) {
-      if (!is.exists(shared.src)) shared.src = src
-      if (!is.exists(shared.src)) return null
+      if (!is.exists(shared.src) && !is.exists(join(cwd, shared.src))) shared.src = src
+      if (!is.exists(shared.src) && !is.exists(join(cwd, shared.src))) return null
     }
     validate.shared(shared.src, cwd, errors, required)
   }

package/src/config/pragmas/sort/http.js

@@ -66,6 +66,12 @@ module.exports = function sortHTTP (http) {
       .sort((a, b) => {
         if (!a.depth && b.depth === 1 && b.trailingCapture) return -1
         if (a.depth - b.depth < 0) return
+        if (a.depth === b.depth &&
+            a.trailingCapture && b.trailingCapture) {
+          if (a.trailingCapture === b.trailingCapture) return
+          if (a.trailingCapture === 'param' && b.trailingCapture === 'catchall') return -1
+          return 1
+        }
         if (a.trailingCapture) return 1
         if (b.trailingCapture) return -1
       })

package/src/config/pragmas/views.js

@@ -56,8 +56,8 @@ module.exports = function configureViews ({ arc, pragmas, inventory, errors }) {
   }
   else if (foundPluginSrc) {
     if (!required) {
-      if (!is.exists(views.src)) views.src = src
-      if (!is.exists(views.src)) return null
+      if (!is.exists(views.src) && !is.exists(join(cwd, views.src))) views.src = src
+      if (!is.exists(views.src) && !is.exists(join(cwd, views.src))) return null
     }
     validate.shared(views.src, cwd, errors, required)
   }

package/src/config/project/prefs/index.js

@@ -4,11 +4,11 @@ let read = require('../../../read')
 let validate = require('../validate')
 let { is, validationPatterns: valid } = require('../../../lib')
 let { parse } = require('./dotenv')
-let { homedir } = require('os')
+let os = require('os')
 
 module.exports = function getPrefs ({ scope, inventory, errors }) {
   let cwd = scope === 'global'
-    ? homedir()
+    ? os.homedir()
     : inventory._project.cwd
 
   let envFilepath = join(cwd, '.env')

package/src/lib/asap-src.js

@@ -1,23 +1,26 @@
 let { join } = require('path')
 let { existsSync } = require('fs')
 
-module.exports = function asapSrc () {
+module.exports = function asapSrc (params = {}) {
+  let { _testing } = params
+  let dirname = _testing ? _testing : __dirname
   // Inventory running as an arc/arc dependency (most common use case)
   let src = join(process.cwd(), 'node_modules', '@architect', 'asap', 'src')
   if (existsSync(src)) return src
 
   // Inventory running in arc/arc as a global install
-  let global = join(__dirname, '..', '..', '..', 'asap', 'src')
+  let global = join(dirname, '..', '..', '..', 'asap', 'src')
   if (existsSync(global)) return global
 
   // Inventory running from a local (symlink) context (usually testing/dev)
-  let local = join(__dirname, '..', '..', 'node_modules', '@architect', 'asap', 'src')
+  let local = join(dirname, '..', '..', 'node_modules', '@architect', 'asap', 'src')
   if (existsSync(local)) return local
 
   try {
     return require.resolve('@architect/asap')
   }
-  catch (err) {
+  catch {
+    /* istanbul ignore next */
     throw Error('Cannot find ASAP module!')
   }
 }

package/src/validate/index.js

@@ -39,5 +39,4 @@ module.exports = function finalValidation (params, inventory) {
   if (errors.length) {
     return errorFmt({ type: 'file path', errors })
   }
-
 }