@architect/inventory 3.6.0 → 3.6.2

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@architect/inventory",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
     "test": "npm run lint && npm run test:integration && npm run coverage",
-    "test:unit": "cross-env tape 'test/unit/**/*-test.js' | tap-spec",
-    "test:integration": "cross-env tape 'test/integration/**/*-test.js' | tap-spec",
+    "test:unit": "cross-env tape 'test/unit/**/*-test.js' | tap-arc",
+    "test:integration": "cross-env tape 'test/integration/**/*-test.js' | tap-arc",
     "coverage": "nyc --reporter=lcov --reporter=text npm run test:unit",
     "lint": "eslint . --fix",
     "rc": "npm version prerelease --preid RC",
@@ -35,7 +35,7 @@
     "eslint": "~8.42.0",
     "mock-fs": "~5.2.0",
     "nyc": "~15.1.0",
-    "tap-spec": "^5.0.0",
+    "tap-arc": "^1.0.0",
     "tape": "^5.6.3"
   },
   "eslintConfig": {

package/src/config/_upsert.js

@@ -60,7 +60,7 @@ module.exports = function upsertProps (config, newConfig) {
       policies = policies.concat(value)
     }
     else {
-      props[name] = value[0]
+      props[name] = value.length === 1 ? value[0] : value
     }
   }
 

package/src/config/pragmas/populate-lambda/index.js

@@ -1,4 +1,4 @@
-let { sep } = require('path')
+let { basename, sep } = require('path')
 let { deepFrozenCopy } = require('@architect/utils')
 let read = require('../../../read')
 let getLambda = require('./get-lambda')
@@ -132,7 +132,7 @@ function populate (type, pragma, inventory, errors, plugin) {
     }
 
     // Now we know the final source dir + runtime + handler: assemble handler props
-    let handlerProps = getHandler({ config, src, build, errors })
+    let handlerProps = getHandler({ config, build, errors, src })
 
     let lambda = {
       name,
@@ -144,6 +144,14 @@ function populate (type, pragma, inventory, errors, plugin) {
       configFile,
       pragma: type !== 'customLambdas' ? type : null,
     }
+    // Ensure the correct handler configuration is being used
+    // If the config is the same as the default, regenerate the setting based on the returned handlerFile, as Python / Ruby may have it set to `lambda.`
+    if (config.handler === defaultProjectConfig().handler) {
+      let { handlerFile } = handlerProps
+      let file = basename(handlerFile).split('.')[0]
+      config.handler = `${file}.handler`
+    }
+
     // Final tidying of any undefined properties
     Object.keys(lambda).forEach(k => !is.defined(lambda[k]) && delete lambda[k])