@architect/inventory 3.0.0-RC.3 → 3.0.0-RC.4

package/changelog.md

@@ -40,6 +40,8 @@
 - Improved memory footprint of Inventory object by preserving references in `lambdaSrcDirs`, `lambdasBySrcDir`
   - Added `pragma` property to all Lambdas to aid in reference preservation
 - Tidy up order of enumerated properties in each Lambda
+Update CI
+- Stop publishing to the GitHub Package registry
 
 ---
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@architect/inventory",
-  "version": "3.0.0-RC.3",
+  "version": "3.0.0-RC.4",
   "description": "Architect project resource enumeration utility",
   "main": "src/index.js",
   "scripts": {
@@ -29,15 +29,15 @@
   "devDependencies": {
     "@architect/eslint-config": "~2.0.1",
     "aws-sdk": "2.880.0",
-    "aws-sdk-mock": "~5.5.0",
+    "aws-sdk-mock": "~5.6.0",
     "cross-env": "~7.0.3",
-    "dotenv": "~12.0.3",
-    "eslint": "~8.5.0",
+    "dotenv": "~14.3.2",
+    "eslint": "~8.7.0",
     "mock-fs": "~5.1.2",
     "mock-require": "~3.0.3",
     "nyc": "~15.1.0",
     "tap-spec": "^5.0.0",
-    "tape": "^5.3.2"
+    "tape": "^5.4.1"
   },
   "eslintConfig": {
     "extends": "@architect/eslint-config"

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

@@ -11,7 +11,7 @@ module.exports = function setEnvPlugins (params, project) {
     envPlugins.forEach(fn => {
       let errType = `plugin: ${fn.plugin}, method: set.env`
       try {
-        let result = fn({ inventory: inv })
+        let result = fn({ inventory: { inv } })
         if (!is.object(result) || !Object.keys(result).length) {
           return errors.push(`Env plugin returned invalid data, must return an Object with one or more keys + values: ${errType}`)
         }

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

@@ -15,7 +15,7 @@ module.exports = function setRuntimePlugins (params, project) {
     runtimePlugins.forEach(fn => {
       let errType = `plugin: ${fn.plugin}, method: set.runtimes`
       try {
-        let result = fn({ inventory: inv })
+        let result = fn({ inventory: { inv } })
         result = is.array(result) ? result : [ result ]
         result.forEach(runtime => {
           // TODO add more validation

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

@@ -11,21 +11,38 @@ function log(message) {
   console.log(`[dotenv][DEBUG] ${message}`);
 }
 var NEWLINE = "\n";
-var RE_INI_KEY_VAL = /^\s*([\w.-]+)\s*=\s*(.*)?\s*$/;
+var RE_INI_KEY_VAL = /^\s*([\w.-]+)\s*=\s*("[^"]*"|'[^']*'|.*?)(\s+#.*)?$/;
 var RE_NEWLINES = /\\n/g;
 var NEWLINES_MATCH = /\r\n|\n|\r/;
 function parse(src, options) {
   const debug = Boolean(options && options.debug);
+  const multiline = Boolean(options && options.multiline);
   const obj = {};
-  src.toString().split(NEWLINES_MATCH).forEach(function(line, idx) {
+  const lines = src.toString().split(NEWLINES_MATCH);
+  for (let idx = 0; idx < lines.length; idx++) {
+    let line = lines[idx];
     const keyValueArr = line.match(RE_INI_KEY_VAL);
     if (keyValueArr != null) {
       const key = keyValueArr[1];
       let val = keyValueArr[2] || "";
-      const end = val.length - 1;
+      let end = val.length - 1;
       const isDoubleQuoted = val[0] === '"' && val[end] === '"';
       const isSingleQuoted = val[0] === "'" && val[end] === "'";
-      if (isSingleQuoted || isDoubleQuoted) {
+      const isMultilineDoubleQuoted = val[0] === '"' && val[end] !== '"';
+      const isMultilineSingleQuoted = val[0] === "'" && val[end] !== "'";
+      if (multiline && (isMultilineDoubleQuoted || isMultilineSingleQuoted)) {
+        const quoteChar = isMultilineDoubleQuoted ? '"' : "'";
+        val = val.substring(1);
+        while (idx++ < lines.length - 1) {
+          line = lines[idx];
+          end = line.length - 1;
+          if (line[end] === quoteChar) {
+            val += NEWLINE + line.substring(0, end);
+            break;
+          }
+          val += NEWLINE + line;
+        }
+      } else if (isSingleQuoted || isDoubleQuoted) {
         val = val.substring(1, end);
         if (isDoubleQuoted) {
           val = val.replace(RE_NEWLINES, NEWLINE);
@@ -35,9 +52,12 @@ function parse(src, options) {
       }
       obj[key] = val;
     } else if (debug) {
-      log(`did not match key and value when parsing line ${idx + 1}: ${line}`);
+      const trimmedLine = line.trim();
+      if (trimmedLine.length && trimmedLine[0] !== "#") {
+        log(`Failed to match key and value when parsing line ${idx + 1}: ${line}`);
+      }
     }
-  });
+  }
   return obj;
 }
 function resolveHome(envPath) {
@@ -47,6 +67,8 @@ function config(options) {
   let dotenvPath = path.resolve(process.cwd(), ".env");
   let encoding = "utf8";
   const debug = Boolean(options && options.debug);
+  const override = Boolean(options && options.override);
+  const multiline = Boolean(options && options.multiline);
   if (options) {
     if (options.path != null) {
       dotenvPath = resolveHome(options.path);
@@ -56,18 +78,35 @@ function config(options) {
     }
   }
   try {
-    const parsed = parse(fs.readFileSync(dotenvPath, { encoding }), { debug });
+    const parsed = DotenvModule.parse(fs.readFileSync(dotenvPath, { encoding }), { debug, multiline });
     Object.keys(parsed).forEach(function(key) {
       if (!Object.prototype.hasOwnProperty.call(process.env, key)) {
         process.env[key] = parsed[key];
-      } else if (debug) {
-        log(`"${key}" is already defined in \`process.env\` and will not be overwritten`);
+      } else {
+        if (override === true) {
+          process.env[key] = parsed[key];
+        }
+        if (debug) {
+          if (override === true) {
+            log(`"${key}" is already defined in \`process.env\` and WAS overwritten`);
+          } else {
+            log(`"${key}" is already defined in \`process.env\` and was NOT overwritten`);
+          }
+        }
       }
     });
     return { parsed };
   } catch (e) {
+    if (debug) {
+      log(`Failed to load ${dotenvPath} ${e.message}`);
+    }
     return { error: e };
   }
 }
-module.exports.config = config;
-module.exports.parse = parse;
+var DotenvModule = {
+  config,
+  parse
+};
+module.exports.config = DotenvModule.config;
+module.exports.parse = DotenvModule.parse;
+module.exports = DotenvModule;

package/src/config/project/validate/index.js

@@ -2,12 +2,19 @@ let { is } = require('./../../../lib')
 
 module.exports = function validatePreferences (preferences, errors) {
   // Env checks
-  let { env } = preferences
-  if (!env) return
-  if (env && !is.object(env)) errors.push(`Invalid preferences setting: @env ${env}`)
-
+  let { env, sandbox } = preferences
   let envs = [ 'testing', 'staging', 'production' ]
-  envs.forEach(e => {
-    if (env[e] && !is.object(env[e])) errors.push(`Invalid preferences setting: @env ${e}`)
-  })
+
+  if (env && !is.object(env)) {
+    errors.push(`Invalid preferences setting: @env ${env}`)
+  }
+  else if (env) {
+    envs.forEach(e => {
+      if (env[e] && !is.object(env[e])) errors.push(`Invalid preferences setting: @env ${e}`)
+    })
+  }
+
+  if (sandbox?.env && !envs.includes(sandbox.env)) {
+    errors.push(`Invalid preferences setting: @sandbox env ${sandbox.env}`)
+  }
 }