@kaspernj/api-maker 1.0.150 → 1.0.151

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.150",
+  "version": "1.0.151",
   "description": "",
   "main": "index.js",
   "repository": {

package/src/config.js

@@ -11,6 +11,14 @@ class ApiMakerConfig {
     return this.global.currenciesCollection
   }
 
+  getRouteDefinitions() {
+    return this.global.routeDefinitions
+  }
+
+  getRoutes() {
+    return this.global.routes
+  }
+
   setCurrenciesCollection(newCurrenciesCollection) {
     this.global.currenciesCollection = newCurrenciesCollection
   }
@@ -18,6 +26,14 @@ class ApiMakerConfig {
   setHistory(history) {
     this.global.history = history
   }
+
+  setRouteDefinitions(routeDefinitions) {
+    this.global.routeDefinitions = routeDefinitions
+  }
+
+  setRoutes(routes) {
+    this.global.routes = routes
+  }
 }
 
 const apiMakerConfig = new ApiMakerConfig()

package/src/router.jsx

@@ -1,110 +1,22 @@
-import escapeStringRegexp from "escape-string-regexp"
-import inflection from "inflection"
 import PropTypes from "prop-types"
 import React from "react"
-import {shouldComponentUpdate} from "set-state-compare"
+import shouldComponentUpdate from "set-state-compare/src/should-component-update"
 import {Suspense} from "react"
+import withRouter from "./with-router"
 
-export default class ApiMakerRouter extends React.Component {
+class ApiMakerRouter extends React.Component {
   static propTypes = {
     notFoundComponent: PropTypes.elementType,
-    path: PropTypes.string.isRequired,
-    requireComponent: PropTypes.func.isRequired,
-    routes: PropTypes.object,
-    routeDefinitions: PropTypes.object
+    requireComponent: PropTypes.func.isRequired
   }
 
-  parsedRouteDefinitions = this.parseRouteDefinitions()
-
   shouldComponentUpdate(nextProps, nextState) {
     return shouldComponentUpdate(this, nextProps, nextState)
   }
 
-  findRouteParams (routeDefinition) {
-    const result = []
-    const parts = routeDefinition.path.split("/")
-
-    for (const part of parts) {
-      if (part.match(/^:([a-z_]+)$/))
-        result.push(part)
-    }
-
-    return result
-  }
-
-  parseRouteDefinitions() {
-    const Locales = require("shared/locales").default
-    const {routeDefinitions, routes} = this.props
-    const regex = /:([A-z\d_]+)/
-    const parsedRouteDefinitions = []
-
-    for (const locale of Locales.availableLocales()) {
-      for (const routeDefinition of routeDefinitions.routes) {
-        const routePathName = `${inflection.camelize(routeDefinition.name, true)}Path`
-        const params = this.findRouteParams(routeDefinition)
-
-        params.push({locale})
-
-        if (!(routePathName in routes))
-          throw new Error(`${routePathName} not found in routes: ${Object.keys(routes, ", ")}`)
-
-        const routePath = routes[routePathName](...params).replace(/[\/]+$/, "")
-        const groups = []
-
-        let pathRegexString = '^'
-
-        pathRegexString += escapeStringRegexp(routePath)
-
-        while (true) {
-          const match = pathRegexString.match(regex)
-
-          if (!match) break
-
-          const variableName = match[1]
-
-          groups.push(variableName)
-
-          pathRegexString = pathRegexString.replace(match[0], `([^\/]+)`)
-        }
-
-        pathRegexString += '$'
-
-        const pathRegex = new RegExp(pathRegexString)
-
-        parsedRouteDefinitions.push({groups, pathRegex, routeDefinition})
-      }
-    }
-
-    return parsedRouteDefinitions
-  }
-
-  findMatchingRoute() {
-    const path = this.props.path.replace(/[\/]+$/, "")
-
-    for (const parsedRouteDefinition of this.parsedRouteDefinitions) {
-      const match = path.match(parsedRouteDefinition.pathRegex)
-      let matched, params
-
-      if (match) {
-        matched = true
-        params = {}
-
-        for (const groupKey in parsedRouteDefinition.groups) {
-          const groupName = parsedRouteDefinition.groups[groupKey]
-
-          params[groupName] = match[Number(groupKey) + 1]
-        }
-      }
-
-      if (path == "" && parsedRouteDefinition.routeDefinition.path == "/") matched = true
-      if (matched) {
-        return {params, parsedRouteDefinition}
-      }
-    }
-  }
-
   render() {
-    const matchingRoute = this.findMatchingRoute()
+    const {match, ...restProps} = this.props
+    const {matchingRoute} = match
 
     if (!matchingRoute) {
       if (this.props.notFoundComponent) {
@@ -124,8 +36,10 @@ export default class ApiMakerRouter extends React.Component {
 
     return (
       <Suspense fallback={<div />}>
-        <Component match={{params: matchingRoute.params}} />
+        <Component match={match} {...restProps} />
       </Suspense>
     )
   }
 }
+
+export default withRouter(ApiMakerRouter)

package/src/with-router.jsx

@@ -0,0 +1,128 @@
+import config from "./config"
+import escapeStringRegexp from "escape-string-regexp"
+import inflection from "inflection"
+import PropTypes from "prop-types"
+import React from "react"
+import shouldComponentUpdate from "set-state-compare/src/should-component-update"
+
+export default (WrapperComponent) => class WithRouter extends React.Component {
+  static propTypes = {
+    path: PropTypes.string,
+    routes: PropTypes.object,
+    routeDefinitions: PropTypes.object
+  }
+
+  parsedRouteDefinitions = this.parseRouteDefinitions()
+
+  shouldComponentUpdate(nextProps, nextState) {
+    return shouldComponentUpdate(this, nextProps, nextState)
+  }
+
+  findRouteParams (routeDefinition) {
+    const result = []
+    const parts = routeDefinition.path.split("/")
+
+    for (const part of parts) {
+      if (part.match(/^:([a-z_]+)$/))
+        result.push(part)
+    }
+
+    return result
+  }
+
+  path() {
+    let path = this.props.path || window.location.pathname
+
+    path = path.replace(/[\/]+$/, "")
+
+    return path
+  }
+
+  routeDefinitions() { return this.props.routeDefinitions || config.getRouteDefinitions() }
+  routes() { return this.props.routes || config.getRoutes() }
+
+  parseRouteDefinitions() {
+    const Locales = require("shared/locales").default
+    const routeDefinitions = this.routeDefinitions()
+    const routes = this.routes()
+    const regex = /:([A-z\d_]+)/
+    const parsedRouteDefinitions = []
+
+    for (const locale of Locales.availableLocales()) {
+      for (const routeDefinition of routeDefinitions.routes) {
+        const routePathName = `${inflection.camelize(routeDefinition.name, true)}Path`
+        const params = this.findRouteParams(routeDefinition)
+
+        params.push({locale})
+
+        if (!(routePathName in routes))
+          throw new Error(`${routePathName} not found in routes: ${Object.keys(routes, ", ")}`)
+
+        const routePath = routes[routePathName](...params).replace(/[\/]+$/, "")
+        const groups = []
+
+        let pathRegexString = '^'
+
+        pathRegexString += escapeStringRegexp(routePath)
+
+        while (true) {
+          const match = pathRegexString.match(regex)
+
+          if (!match) break
+
+          const variableName = match[1]
+
+          groups.push(variableName)
+
+          pathRegexString = pathRegexString.replace(match[0], `([^\/]+)`)
+        }
+
+        pathRegexString += '$'
+
+        const pathRegex = new RegExp(pathRegexString)
+
+        parsedRouteDefinitions.push({groups, pathRegex, routeDefinition})
+      }
+    }
+
+    return parsedRouteDefinitions
+  }
+
+  findMatchingRoute() {
+    const path = this.path()
+
+    for (const parsedRouteDefinition of this.parsedRouteDefinitions) {
+      const match = path.match(parsedRouteDefinition.pathRegex)
+      let matched, params
+
+      if (match) {
+        matched = true
+        params = {}
+
+        for (const groupKey in parsedRouteDefinition.groups) {
+          const groupName = parsedRouteDefinition.groups[groupKey]
+
+          params[groupName] = match[Number(groupKey) + 1]
+        }
+      }
+
+      if (path == "" && parsedRouteDefinition.routeDefinition.path == "/") matched = true
+      if (matched) {
+        return {params, parsedRouteDefinition}
+      }
+    }
+  }
+
+  render() {
+    const {path, routes, routeDefinitions, ...restProps} = this.props
+    const matchingRoute = this.findMatchingRoute()
+    const match = {
+      matchingRoute,
+      params: matchingRoute.params
+    }
+
+    return (
+      <WrapperComponent match={match} {...restProps} />
+    )
+  }
+}