@architect/inventory 3.3.4 → 3.4.0-RC.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "3.3.4",
+  "version": "3.4.0-RC.0",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
@@ -21,23 +21,24 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@architect/asap": "~5.1.0",
+    "@architect/asap": "~5.1.1",
     "@architect/parser": "~6.0.2",
     "@architect/utils": "~3.1.2",
+    "esm": "~3.2.25",
     "lambda-runtimes": "~1.1.3"
   },
   "devDependencies": {
-    "@architect/eslint-config": "~2.0.1",
+    "@architect/eslint-config": "~2.1.1",
     "aws-sdk": "2.1055.0",
     "aws-sdk-mock": "~5.8.0",
     "cross-env": "~7.0.3",
     "dotenv": "~16.0.3",
-    "eslint": "~8.28.0",
+    "eslint": "~8.32.0",
     "mock-fs": "~5.2.0",
     "mock-require": "~3.0.3",
     "nyc": "~15.1.0",
     "tap-spec": "^5.0.0",
-    "tape": "^5.6.1"
+    "tape": "^5.6.3"
   },
   "eslintConfig": {
     "extends": "@architect/eslint-config"

package/src/config/pragmas/plugins.js

@@ -6,6 +6,7 @@ let nonLambdaSetters = [ 'customLambdas', 'env', 'proxy', 'runtimes', 'shared',
 let setters = [ ...lambdas, ...nonLambdaSetters ]
 let pluginMethods = [ 'deploy', 'hydrate', 'sandbox' ]
 let reservedNames = [ '_methods' ]
+let requireEsm
 
 module.exports = function getPluginModules ({ arc, inventory, errors }) {
   if (!arc?.plugins?.length && !arc?.macros?.length) return null
@@ -44,9 +45,31 @@ module.exports = function getPluginModules ({ arc, inventory, errors }) {
     }
     if (pluginPath) {
       try {
+        /* istanbul ignore next: idk why but for some reason nyc isn't picking up the catches; all cases are covered in tests, though! */
         if (type === 'plugin') {
-          // eslint-disable-next-line
-          plugins[name] = require(pluginPath)
+          try {
+            // eslint-disable-next-line
+            plugins[name] = require(pluginPath)
+          }
+          catch (err) {
+            // TODO: if we refactor all pragma visitors to async we can use Node's built in support for dynamic import within CJS
+            if (hasEsmError(err)) {
+              try {
+                if (!requireEsm) {
+                  // eslint-disable-next-line
+                  requireEsm = require('esm')(module)
+                }
+                let plugin = requireEsm(pluginPath)
+                plugins[name] = plugin.default ? plugin.default : plugin
+              }
+              catch (err) {
+                errors.push(err)
+              }
+            }
+            else {
+              errors.push(err)
+            }
+          }
         }
         // Remap @macros to deploy.start
         if (type === 'macro') {
@@ -100,15 +123,18 @@ module.exports = function getPluginModules ({ arc, inventory, errors }) {
   return plugins
 }
 
+/* istanbul ignore next: per above, nyc isn't picking this up, but it is covered! */
 function getPath (cwd, srcDir, name) {
   let path1 = join(cwd, 'src', srcDir, `${name}.js`)
-  let path2 = join(cwd, 'src', srcDir, name)
-  let path3 = join(cwd, 'node_modules', name)
-  let path4 = join(cwd, 'node_modules', `@${name}`)
+  let path2 = join(cwd, 'src', srcDir, `${name}.mjs`)
+  let path3 = join(cwd, 'src', srcDir, name)
+  let path4 = join(cwd, 'node_modules', name)
+  let path5 = join(cwd, 'node_modules', `@${name}`)
   /**/ if (existsSync(path1)) return path1
   else if (existsSync(path2)) return path2
   else if (existsSync(path3)) return path3
   else if (existsSync(path4)) return path4
+  else if (existsSync(path5)) return path5
   try {
     return require.resolve(name)
   }
@@ -121,3 +147,12 @@ function getPath (cwd, srcDir, name) {
     }
   }
 }
+
+let esmErrors = [
+  'Cannot use import statement outside a module',
+  `Unexpected token 'export'`,
+  'require() of ES Module',
+  'Must use import to load ES Module',
+]
+/* istanbul ignore next: per above, nyc isn't picking this up, but it is covered! */
+let hasEsmError = err => esmErrors.some(msg => err.message.includes(msg))

package/src/config/pragmas/static.js

@@ -21,6 +21,8 @@ module.exports = function configureStatic ({ arc, inventory, errors }) {
     staging: null,
     production: null,
   }
+  let validSettings = Object.entries(_static).map(([ setting ]) => setting)
+  let validSetting = key => validSettings.includes(key)
 
   if (is.array(arc.static)) {
     let disabled = [ false, 'disable', 'disabled' ]
@@ -36,15 +38,25 @@ module.exports = function configureStatic ({ arc, inventory, errors }) {
     type: 'static',
   })
 
-  let settings = Object.entries(_static).map(([ setting ]) => setting)
-  let validSetting = key => settings.includes(key)
   for (let setting of staticPragma) {
-    // The ignore setting can come in a couple shapes, so we have to handle those
+    // The ignore setting can come in one of two shapes, handle both
+    let ignore
+
+    // Ignore is a named vector
     if (setting.ignore) {
-      _static.ignore = setting.ignore
+      ignore = setting.ignore
     }
+    // Plain vector settings
     else if (is.array(setting) && validSetting(setting[0])) {
-      _static[setting[0]] = setting[0] === 'ignore' ? [ ...setting.slice(1) ] : setting[1]
+      if (setting[0] === 'ignore') ignore = setting.slice(1)
+      else _static[setting[0]] = setting[1]
+    }
+
+    // Merge manifest + plugin ignore patterns
+    if (ignore) {
+      _static.ignore = _static.ignore
+        ? [ ...new Set([ ..._static.ignore, ...setting.ignore ]) ] // De-dupe
+        : ignore
     }
   }