@architect/inventory 2.2.1-RC.0 → 2.2.1

package/changelog.md

@@ -6,7 +6,8 @@
 
 ### Fixed
 
-- Adds HTTP route sorting, which should ensure Sandbox behaves much more like API Gateway despite how you've organized your `@http` pragma; fixes #977
+- Fixed HTTP route sorting; however you've organized your `@http` pragma, Sandbox should now behave much more like API Gateway; fixes #977
+- Fixed overly strict path parameter validation; allow `_`, `.`, `-`; thanks @jkarsrud!
 
 ---
 

package/package.json

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

package/src/config/pragmas/populate-lambda/index.js

@@ -100,7 +100,7 @@ function getLambda (params) {
   if (type === 'scheduled') return getScheduled(params)
   if (type === ts)          return getTablesStreams(params)
   if (type === 'tables')    return getTablesStreams(params) // Shortcut for creating streams
-  /* istanbul ignore else */ /* Clearer to be explicit here */
+  /* istanbul ignore else: clearer to be explicit here */
   if (type === 'ws')        return getWS(params)
 }
 

package/src/config/pragmas/sort/http.js

@@ -55,6 +55,7 @@ module.exports = function sortHTTP (http) {
         if (a.path < b.path) return -1
         if (a.path > b.path) return 1
       })
+      // Trailing capture sort
       .sort((a, b) => {
         if (!a.depth && b.depth === 1 && b.trailingCapture) return -1
         if (a.depth - b.depth < 0) return

package/src/config/pragmas/validate/_http.js

@@ -49,7 +49,7 @@ module.exports = function validateHTTP (http, errors) {
       let params = path.match(/\/:/g)
       if (params) {
         // Params cannot have non-alphanumeric characters
-        let match = path.match(/\/:[a-zA-Z0-9]+(\/|$)/g)
+        let match = path.match(/\/:[\w.-]+(\/|$)/g)
         if (!match) errors.push(`Invalid @http path (parameters must have only alphanumeric characters): ${name}`)
       }
 

package/src/config/project/index.js

@@ -36,7 +36,7 @@ module.exports = function getProjectConfig (params, errors) {
       project[`${scope}PreferencesFile`] = p.preferencesFile
 
       // Build out the final preferences
-      /* istanbul ignore else */ // jic
+      /* istanbul ignore else: jic */
       if (!project.preferences) project.preferences = {}
       Object.keys(p.preferences).forEach(pragma => {
         // Ignore the raw data
@@ -47,7 +47,7 @@ module.exports = function getProjectConfig (params, errors) {
           return
         }
         // Traverse and merge individual settings
-        /* istanbul ignore else */ // jic
+        /* istanbul ignore else: jic */
         if (!project.preferences[pragma]) project.preferences[pragma] = {}
         Object.entries(p.preferences[pragma]).forEach(([ setting, value ]) => {
           project.preferences[pragma][setting] = value

package/src/config/project/prefs.js

@@ -18,13 +18,13 @@ module.exports = function getPrefs ({ scope, inventory, errors }) {
     Object.entries(prefs.arc).forEach(([ key, val ]) => {
       // TODO add additional preferences checks and normalization
 
-      /* istanbul ignore else */ // Parser should get this, but jic
+      /* istanbul ignore else: Parser should get this, but jic */
       if (!preferences[key]) preferences[key] = {}
-      /* istanbul ignore else */ // Parser should only produce arrays, but jic
+      /* istanbul ignore else: Parser should only produce arrays, but jic */
       if (is.array(val)) {
         val.forEach(v => {
           if (is.array(v)) {
-            /* istanbul ignore if */ // Single vals should be strings, but jic
+            /* istanbul ignore if: Single vals should be strings, but jic */
             if (v.length === 1) preferences[key] = v[0]
             if (v.length === 2) preferences[key][v[0]] = v[1]
             if (v.length > 2)   preferences[key][v[0]] = [ ...v.slice(1) ]
@@ -39,7 +39,7 @@ module.exports = function getPrefs ({ scope, inventory, errors }) {
       // Turn env vars with spaces into strings
       if (key === 'env') {
         [ 'testing', 'staging', 'production' ].forEach(e => {
-          /* istanbul ignore else */ // Yet another jic
+          /* istanbul ignore else: Yet another jic */
           if (preferences.env[e]) {
             Object.entries(preferences.env[e]).forEach(([ key, val ]) => {
               if (is.array(val)) preferences.env[e][key] = val.join(' ')
@@ -51,7 +51,7 @@ module.exports = function getPrefs ({ scope, inventory, errors }) {
       if (key === 'sandbox-startup') {
         preferences[key] = val.map(v => {
           if (is.string(v)) return v
-          /* istanbul ignore else */ // Yet another jic
+          /* istanbul ignore else: Yet another jic */
           if (is.array(v)) return v.join(' ')
         })
       }

package/src/env/index.js

@@ -45,7 +45,7 @@ module.exports = function env (params, inventory, callback) {
             }
           }))
           // Check for more data and, if so, recurse
-          /* istanbul ignore if */ // Sadly no way to easily mock this for testing
+          /* istanbul ignore if: Sadly no way to easily mock this for testing */
           if (data.NextToken) {
             getSomeEnvVars(name, data.NextToken, callback)
           }