@architect/inventory 3.0.0-RC.9 → 3.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "3.0.0-RC.9",
+  "version": "3.0.0",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
@@ -21,9 +21,9 @@
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@architect/asap": "~5.0.0-RC.0",
-    "@architect/parser": "~6.0.0-RC.0",
-    "@architect/utils": "~3.1.0-RC.0",
+    "@architect/asap": "~5.0.0",
+    "@architect/parser": "~6.0.0",
+    "@architect/utils": "~3.1.0",
     "lambda-runtimes": "~1.1.1"
   },
   "devDependencies": {
@@ -31,13 +31,13 @@
     "aws-sdk": "2.1001.0",
     "aws-sdk-mock": "~5.6.2",
     "cross-env": "~7.0.3",
-    "dotenv": "~15.0.0",
-    "eslint": "~8.8.0",
+    "dotenv": "~16.0.0",
+    "eslint": "~8.9.0",
     "mock-fs": "~5.1.2",
     "mock-require": "~3.0.3",
     "nyc": "~15.1.0",
     "tap-spec": "^5.0.0",
-    "tape": "^5.5.0"
+    "tape": "^5.5.2"
   },
   "eslintConfig": {
     "extends": "@architect/eslint-config"

package/src/config/pragmas/plugins.js

@@ -1,6 +1,6 @@
 let { join } = require('path')
 let { existsSync } = require('fs')
-let { is, normalizeSrc, pragmas, validationPatterns } = require('../../lib')
+let { is, normalizeSrc, pragmas, tidyError, validationPatterns } = require('../../lib')
 let { lambdas } = pragmas
 let nonLambdaSetters = [ 'customLambdas', 'env', 'runtimes' ]
 let setters = [ ...lambdas, ...nonLambdaSetters ]
@@ -91,7 +91,7 @@ module.exports = function getPluginModules ({ arc, inventory, errors }) {
         })
       }
       catch (err) {
-        errors.push(`Unable to load plugin '${name}': ${err.message.split('\n')[0]}`)
+        errors.push(`Unable to load plugin '${name}': ${tidyError(err)}`)
       }
     }
     else errors.push(`Cannot find plugin '${name || plugin}'! Are you sure you have installed or created it correctly?`)

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

@@ -1,5 +1,5 @@
 let { deepFrozenCopy } = require('@architect/utils')
-let { is, validationPatterns: valid } = require('../../../lib')
+let { is, tidyError, validationPatterns: valid } = require('../../../lib')
 let envs = [ 'testing', 'staging', 'production' ]
 let str = value => {
   if (is.object(value) || is.array(value)) return JSON.stringify(value)
@@ -62,7 +62,7 @@ module.exports = function setEnvPlugins (params, project) {
         }
       }
       catch (err) {
-        errors.push(`Runtime plugin '${fn.plugin}' failed: ${err.message}`)
+        errors.push(`Runtime plugin '${fn.plugin}' failed: ${tidyError(err)}`)
       }
     })
     return env

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

@@ -7,7 +7,7 @@
 var fs = require("fs");
 var path = require("path");
 var os = require("os");
-var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
+var LINE = /(?:^|^)\s*(?:export\s+)?([\w.-]+)(?:\s*=\s*?|:\s+?)(\s*'(?:\\'|[^'])*'|\s*"(?:\\"|[^"])*"|\s*`(?:\\`|[^`])*`|[^#\r\n]+)?\s*(?:#.*)?(?:$|$)/mg;
 function parse(src) {
   const obj = {};
   let lines = src.toString();
@@ -18,7 +18,7 @@ function parse(src) {
     let value = match[2] || "";
     value = value.trim();
     const maybeQuote = value[0];
-    value = value.replace(/^(['"])([\s\S]+)\1$/mg, "$2");
+    value = value.replace(/^(['"`])([\s\S]*)\1$/mg, "$2");
     if (maybeQuote === '"') {
       value = value.replace(/\\n/g, "\n");
       value = value.replace(/\\r/g, "\r");

package/src/lib/index.js

@@ -24,6 +24,9 @@ let validationPatterns = {
   envVar: /^[a-zA-Z0-9_]+$/,
 }
 
+// Error tidier: remove the error name, just print the message + stack data
+let tidyError = err => err.message + `\n` + err.stack.split('\n').slice(1).join('\n')
+
 module.exports = {
   asapSrc,
   compiledRuntimes,
@@ -34,5 +37,6 @@ module.exports = {
   mergeEnvVars,
   normalizeSrc: getLambdaDirs.normalizeSrc,
   pragmas,
+  tidyError,
   validationPatterns,
 }