@architect/inventory 3.4.3-RC.1 → 3.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "3.4.3-RC.1",
+  "version": "3.4.3",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
@@ -23,8 +23,8 @@
   "dependencies": {
     "@architect/asap": "~5.1.1",
     "@architect/parser": "~6.0.2",
-    "@architect/utils": "~3.1.2",
-    "lambda-runtimes": "~1.1.3"
+    "@architect/utils": "~3.1.6",
+    "lambda-runtimes": "~1.1.4"
   },
   "devDependencies": {
     "@architect/eslint-config": "~2.1.1",
@@ -32,7 +32,7 @@
     "aws-sdk-mock": "~5.8.0",
     "cross-env": "~7.0.3",
     "dotenv": "~16.0.3",
-    "eslint": "~8.32.0",
+    "eslint": "~8.37.0",
     "mock-fs": "~5.2.0",
     "nyc": "~15.1.0",
     "tap-spec": "^5.0.0",

package/src/config/pragmas/populate-lambda/get-handler.js

@@ -1,6 +1,5 @@
 let { join } = require('path')
 let { existsSync, readFileSync } = require('fs')
-let isWin = process.platform.startsWith('win')
 
 module.exports = function getHandler ({ config, src, build, errors }) {
   let { handler, runtime, runtimeConfig } = config
@@ -22,10 +21,7 @@ module.exports = function getHandler ({ config, src, build, errors }) {
   }
   // Compiled to a binary
   else if (customRuntimeType === 'compiled') {
-    /* istanbul ignore next */
-    let bootstrap = `bootstrap${isWin ? '.exe' : ''}`
-    handlerFile = join(build, runtimeConfig.buildSubpath || '', runtimeConfig.handlerFile || bootstrap)
-    handlerMethod = null
+    handlerFile = join(build, runtimeConfig.handlerFile || 'handler')
   }
   // Interpreted
   else if (customRuntimeType === 'interpreted') {
@@ -45,36 +41,31 @@ let denoHandlers = [ 'mod.ts', 'mod.js' ]
 function getExt ({ runtime, src, errors }) {
   try {
     if (runtime.startsWith('node')) {
-      if (runtime === 'nodejs12.x') {
-        return { ext: 'js', handlerModuleSystem: 'cjs' }
-      }
       // This presumes Node.js ≥14 Lambda releases use the same CJS/ESM pattern
       // Generally in Lambda: CJS wins, but in Architect-land we attempt to default to ESM
-      else {
-        let { file, ext } = findHandler(nodeHandlers, src)
+      let { file, ext } = findHandler(nodeHandlers, src)
 
-        // Early return on extensions that imply module type
-        if (ext === 'mjs') return { file, ext, handlerModuleSystem: 'esm' }
-        if (ext === 'cjs') return { file, ext, handlerModuleSystem: 'cjs' }
+      // Early return on extensions that imply module type
+      if (ext === 'mjs') return { file, ext, handlerModuleSystem: 'esm' }
+      if (ext === 'cjs') return { file, ext, handlerModuleSystem: 'cjs' }
 
-        // In the odd case that there only exists an `index` file (no ext), default to ESM and let other things blow up when it's not found
-        ext = ext || 'mjs'
-        let handlerModuleSystem = ext === 'mjs' ? 'esm' : 'cjs'
+      // In the odd case that there only exists an `index` file (no ext), default to ESM and let other things blow up when it's not found
+      ext = ext || 'mjs'
+      let handlerModuleSystem = ext === 'mjs' ? 'esm' : 'cjs'
 
-        let pkgFile = join(src, 'package.json')
-        if (existsSync(pkgFile)) {
-          let pkg = JSON.parse(readFileSync(pkgFile))
+      let pkgFile = join(src, 'package.json')
+      if (existsSync(pkgFile)) {
+        let pkg = JSON.parse(readFileSync(pkgFile))
 
-          /**/ if (pkg?.type === 'module') handlerModuleSystem = 'esm'
-          else if (pkg?.type === 'commonjs') handlerModuleSystem = 'cjs'
-          else if (pkg?.type) throw Error(`Invalid 'type' field: ${pkg.type}`)
-          else handlerModuleSystem = 'cjs' // Lambda's default, not ours
+        /**/ if (pkg?.type === 'module') handlerModuleSystem = 'esm'
+        else if (pkg?.type === 'commonjs') handlerModuleSystem = 'cjs'
+        else if (pkg?.type) throw Error(`Invalid 'type' field: ${pkg.type}`)
+        else handlerModuleSystem = 'cjs' // Lambda's default, not ours
 
-          // We always get to make this a .js file, even if it's ESM!
-          ext = 'js'
-        }
-        return { file, ext, handlerModuleSystem }
+        // We always get to make this a .js file, even if it's ESM!
+        ext = 'js'
       }
+      return { file, ext, handlerModuleSystem }
     }
     if (runtime.startsWith('python')) return { ext: 'py' }
     if (runtime.startsWith('ruby')) return { ext: 'rb' }