@architect/inventory 3.4.3 → 3.5.0-RC.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "3.4.3",
+  "version": "3.5.0-RC.0",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {

package/src/config/pragmas/plugins.js

@@ -4,7 +4,7 @@ let { is, pragmas, tidyError, validationPatterns } = require('../../lib')
 let { lambdas } = pragmas
 let nonLambdaSetters = [ 'customLambdas', 'env', 'proxy', 'runtimes', 'shared', 'static', 'views', 'tables', 'tables-indexes' ]
 let setters = [ ...lambdas, ...nonLambdaSetters ]
-let pluginMethods = [ 'deploy', 'hydrate', 'sandbox' ]
+let pluginMethods = [ 'deploy', 'create', 'hydrate', 'sandbox' ]
 let reservedNames = [ '_methods' ]
 
 module.exports = async function getPluginModules ({ arc, inventory, errors }) {

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

@@ -1,5 +1,6 @@
 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
@@ -21,7 +22,10 @@ module.exports = function getHandler ({ config, src, build, errors }) {
   }
   // Compiled to a binary
   else if (customRuntimeType === 'compiled') {
-    handlerFile = join(build, runtimeConfig.handlerFile || 'handler')
+    /* istanbul ignore next */
+    let bootstrap = `bootstrap${isWin ? '.exe' : ''}`
+    handlerFile = join(build, runtimeConfig.buildSubpath || '', runtimeConfig.handlerFile || bootstrap)
+    handlerMethod = null
   }
   // Interpreted
   else if (customRuntimeType === 'interpreted') {

package/src/config/project/plugins/runtimes.js

@@ -12,18 +12,18 @@ module.exports = function setRuntimePlugins (params, project) {
   if (runtimePlugins?.length) {
     let runtimes = {
       runtimes: [],
+      runtimePlugins: {}, // Map runtimes to their corresponding plugins
     }
     // inventory._project is not yet built, so provide as much as we can to plugins for now
     let inv = deepFrozenCopy({ ...inventory, _project: project })
     let build
     runtimePlugins.forEach(fn => {
-      let errType = `plugin: ${fn.plugin}, method: set.runtimes`
+      let errType = `plugin: ${fn._plugin}, method: set.runtimes`
       try {
         var result = fn({ arc: inv._project.arc, inventory: { inv } })
       }
       catch (err) {
-        err.message = `Runtime plugin exception: ${errType}`
-                      + `\n` + err.message
+        err.message = `Runtime plugin exception: ${errType}\n` + err.message
         throw err
       }
       // Accept one or more results, then loop through them
@@ -55,13 +55,14 @@ module.exports = function setRuntimePlugins (params, project) {
           if (is.string(runtime.build)) build = runtime.build
         }
         if (type === 'transpiled' && !allRuntimes.includes(baseRuntime)) {
-          return errors.push(`Runtime '${name}' must include a valid baseRuntime property corresponding to a valid Lambda runtime (e.g. 'nodejs16.x')`)
+          return errors.push(`Runtime '${name}' must include a valid baseRuntime property corresponding to a valid Lambda runtime (e.g. 'nodejs18.x')`)
         }
         runtimes.runtimes.push(name)
+        runtimes.runtimePlugins[name] = fn._plugin
         runtimes[name] = runtime
       })
     })
-    return { build, runtimes }
+    return { build, runtimes, runtimePlugins }
   }
   return {}
 }