Feature/2010 seo friendly urls dynroutes

config/default.json

@@ -17,7 +17,7 @@
       "elasticCacheQuota": 4096
     },
     "seo": {
-      "useUrlDispatcher": false
+      "useUrlDispatcher": true
     },    
     "console": {
       "showErrorOnProduction" : true,
@@ -144,7 +144,7 @@
       "twoStageCaching": true,
       "optimizeShoppingCart": true,
       "category": {
-        "includeFields": [ "id", "*.children_data.id", "*.id", "children_count", "sku", "name", "is_active", "parent_id", "level", "url_key", "product_count", "path"],
+        "includeFields": [ "id", "*.children_data.id", "*.id", "children_count", "sku", "name", "is_active", "parent_id", "level", "url_key", "url_path", "product_count", "path"],
         "excludeFields": [ "sgn" ],
         "categoriesRootCategorylId": 2,
         "categoriesDynamicPrefetchLevel": 2,
@@ -155,11 +155,11 @@
       },
       "productList": {
         "sort": "",
-        "includeFields": [ "type_id", "sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "priceInclTax", "originalPriceInclTax", "originalPrice", "specialPriceInclTax", "id", "image", "sale", "new", "url_key", "status", "tier_prices", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.priceInclTax", "configurable_children.specialPriceInclTax", "configurable_children.originalPrice", "configurable_children.originalPriceInclTax" ],
+        "includeFields": [ "type_id", "sku", "product_links", "tax_class_id", "special_price", "special_to_date", "special_from_date", "name", "price", "priceInclTax", "originalPriceInclTax", "originalPrice", "specialPriceInclTax", "id", "image", "sale", "new", "url_path", "url_key", "status", "tier_prices", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.priceInclTax", "configurable_children.specialPriceInclTax", "configurable_children.originalPrice", "configurable_children.originalPriceInclTax" ],
         "excludeFields": [ "description", "configurable_options", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options" ]
       },
       "productListWithChildren": {
-        "includeFields": [ "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "priceInclTax", "originalPriceInclTax", "originalPrice", "specialPriceInclTax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.priceInclTax", "configurable_children.specialPriceInclTax", "configurable_children.originalPrice", "configurable_children.originalPriceInclTax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_key", "status", "tier_prices"],
+        "includeFields": [ "type_id", "sku", "name", "tax_class_id", "special_price", "special_to_date", "special_from_date", "price", "priceInclTax", "originalPriceInclTax", "originalPrice", "specialPriceInclTax", "id", "image", "sale", "new", "configurable_children.image", "configurable_children.sku", "configurable_children.price", "configurable_children.special_price", "configurable_children.priceInclTax", "configurable_children.specialPriceInclTax", "configurable_children.originalPrice", "configurable_children.originalPriceInclTax", "configurable_children.color", "configurable_children.size", "configurable_children.id", "configurable_children.tier_prices", "product_links", "url_path", "url_key", "status", "tier_prices"],
         "excludeFields": [ "description", "sgn", "*.sgn", "msrp_display_actual_price_type", "*.msrp_display_actual_price_type", "required_options"]
       },
       "review": {

core/app.ts

@@ -65,7 +65,7 @@ const createApp  = async (ssrContext, config): Promise<{app: Vue, router: VueRou
   // sync router with vuex 'router' store
   sync(store, router)
   // TODO: Don't mutate the state directly, use mutation instead
-  store.state.version = '1.7.0'
+  store.state.version = '1.8.2'
   store.state.config = config
   store.state.__DEMO_MODE__ = (config.demomode === true) ? true : false
   if(ssrContext) Vue.prototype.$ssrRequestContext = ssrContext

core/build/webpack.base.config.ts

@@ -78,6 +78,7 @@ export default {
       inject: isProd == false
     })
   ],
+  devtool: 'source-map',
   entry: {
     app: ['babel-polyfill', './core/client-entry.ts']
   },

core/build/webpack.client.config.ts

@@ -32,7 +32,7 @@ const config = merge(base, {
       'process.env.VUE_ENV': '"client"'
     }),
     new VueSSRClientPlugin()
-  ]
+  ],
 })
 
 export default config;

core/build/webpack.prod.client.config.ts

@@ -7,6 +7,7 @@ const extendedConfig = require(path.join(themeRoot, '/webpack.config.js'))
 
 const prodClientConfig = merge(baseClientConfig, {
   mode: 'production',
+  devtool: 'nosources-source-map',
   plugins: [
   ]
 })

core/build/webpack.prod.server.config.ts

@@ -8,6 +8,7 @@ const extendedConfig = require(path.join(themeRoot, '/webpack.config.js'))
 
 export default extendedConfig(baseServerConfig, {
   mode: 'production',
+  devtool: 'nosources-source-map',  
   isClient: false,
   isDev: false
 })

core/client-entry.ts

@@ -31,7 +31,6 @@ const invokeClientEntry = async () => {
       prepareStoreView(storeCode)
     }
   }
-
   function _commonErrorHandler (err, reject) {
     if (err.message.indexOf('query returned empty result') > 0) {
       rootStore.dispatch('notification/spawnNotification', {
@@ -68,9 +67,9 @@ const invokeClientEntry = async () => {
       _commonErrorHandler(err, next)
     })
   }
-
+  let _appMounted = false
   router.onReady(() => {
-    router.beforeResolve((to, from, next) => {
+    router.beforeResolve((to, from, next) => { // this is NOT CALLED after SSR request as no component is being resolved client side
       if (!from.name) return next() // do not resolve asyncData on server render - already been done
       if (Vue.prototype.$ssrRequestContext) Vue.prototype.$ssrRequestContext.output.cacheTags = new Set<string>()
       const matched = router.getMatchedComponents(to)
@@ -88,14 +87,10 @@ const invokeClientEntry = async () => {
           }
         }
       }
-      let diffed = false
-      const activated = matched.filter((c, i) => {
-        return diffed || (diffed = (prevMatched[i] !== c))
-      })
-      if (!activated.length) {
+      if (!matched.length) {
         return next()
       }
-      Promise.all(activated.map((c: any) => { // TODO: update me for mixins support
+      Promise.all(matched.map((c: any) => { // TODO: update me for mixins support
         const components = c.mixins && config.ssr.executeMixedinAsyncData ? Array.from(c.mixins) : []
         union(components, [c]).map(SubComponent => {
           if (SubComponent.preAsyncData) {

core/helpers/index.ts

@@ -2,6 +2,7 @@ import rootStore from '@vue-storefront/store'
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
 import { remove as removeAccents } from 'remove-accents'
 import { Logger } from '@vue-storefront/core/lib/logger'
+import { formatCategoryLink } from '@vue-storefront/core/modules/url/helpers'
 
 /**
  * Create slugify -> "create-slugify" permalink  of text
@@ -19,7 +20,34 @@ export function slugify (text) {
     .replace(/[^\w-]+/g, '') // Remove all non-word chars
     .replace(/--+/g, '-') // Replace multiple - with single -
 }
+/**
+ * 
+ * @param obj Build URL query string
+ */
+export function buildURLQuery (obj, removeNullValues = true) {  
+  let pairs = Object.entries(obj)
+  if (removeNullValues) pairs = pairs.filter(pair => {
+    if (pair.length == 2 && !pair[1]) return false
+    return true
+  })
+  return (pairs.map(pair => {
+    return pair.map(encodeURIComponent).join('=')
+  }).join('&'))
+}
 
+export function parseURLQuery (queryString) {
+  if (queryString === null || typeof queryString !== 'string') return {}
+  const params = {}
+  let queries, temp, i, l
+  // Split into key/value pairs
+  queries = queryString.split("&")
+  // Convert the array of strings into an object
+  for ( i = 0, l = queries.length; i < l; i++ ) {
+      temp = queries[i].split('=')
+      params[temp[0]] = temp[1]
+  }
+  return params
+}
 /**
  * @param relativeUrl
  * @param width
@@ -54,7 +82,7 @@ export function breadCrumbRoutes (categoryPath) {
   for (let sc of categoryPath) {
     tmpRts.push({
       name: sc.name,
-      route_link: (rootStore.state.config.products.useShortCatalogUrls ? '/' : '/c/') + sc.slug
+      route_link: formatCategoryLink(sc)
     })
   }
 

core/lib/async-data-loader.ts

@@ -36,13 +36,13 @@ const AsyncDataLoader = {
   flush : function (actionContext: AsyncDataLoaderActionContext) {
     if (!actionContext.category) actionContext.category = DEFAULT_ACTION_CATEGORY
     const actionsToExecute = this.queue.filter(ac => (!ac.category || !actionContext.category) || ac.category === actionContext.category && (!ac.executedAt)).map(ac => {
+      ac.executedAt = new Date()
       return ac.execute(actionContext) // function must return Promise
     })
     if (actionsToExecute.length > 0) {
       Logger.info('Executing data loader actions(' + actionsToExecute.length + ')', 'dataloader')()
     }
-    return Promise.all(actionsToExecute).then(results => {
-      actionsToExecute.map(ac => ac.executedAt = new Date())
+    return Promise.all(actionsToExecute).then(results => {      
       return results
     })
   }

core/lib/logger.ts

@@ -1,6 +1,5 @@
 import { isServer } from '@vue-storefront/core/helpers'
 import buildTimeConfig from 'config'
-
 const bgColorStyle = (color) => `color: white; background: ${color}; padding: 4px; font-weight: bold; font-size: 0.8em'`
 
 /** VS message logger. By default works only on dev mode */
@@ -34,6 +33,22 @@ class Logger
     this.isProduction = process.env.NODE_ENV === 'production';
   }
 
+  /**
+   * Convert message to string - as it may be object, array either primitive
+   * @param payload
+   */
+  convertToString (payload: any) {
+    if (typeof payload === 'string' || typeof payload === 'boolean' || typeof payload === 'number') return payload
+    if (Array.isArray(payload)) return JSON.stringify(payload)
+    if (typeof payload === 'object') {
+      if (payload.hasOwnProperty('message')) {
+        return payload.message
+      } else {
+        return JSON.stringify(payload)
+      }
+    }
+  }
+
   /**
    * Check if method can print into console
    *
@@ -65,12 +80,12 @@ class Logger
    * @param tag short tag specifying area where message was spawned (eg. cart, sync, module)
    * @param context meaningful data related to this message
    */
-  debug (message: string, tag: string = null, context: any = null) : () => void {
+  debug (message: any, tag: string = null, context: any = null) : () => void {
     if (!isServer && this.canPrint('debug')) {
       if (tag) {
-        return console.debug.bind(window.console, '%cVSF%c %c' + tag +'%c ' + message, bgColorStyle('grey'), 'color: inherit', bgColorStyle('gray'), 'font-weight: normal', context);
+        return console.debug.bind(window.console, '%cVSF%c %c' + tag +'%c ' + this.convertToString(message), bgColorStyle('grey'), 'color: inherit', bgColorStyle('gray'), 'font-weight: normal', context);
       } else {
-        return console.debug.bind(window.console, '%cVSF%c ' + message, bgColorStyle('white'), 'font-weight: normal', context);
+        return console.debug.bind(window.console, '%cVSF%c ' + this.convertToString(message), bgColorStyle('grey'), 'font-weight: normal', context);
       }
     } else {
       return function () {}
@@ -85,7 +100,7 @@ class Logger
    * @param tag short tag specifying area where message was spawned (eg. cart, sync, module)
    * @param context meaningful data related to this message
    */
-  log (message: string, tag: string = null, context: any = null) : () => void {
+  log (message: any, tag: string = null, context: any = null) : () => void {
     return this.info(message, tag, context);
   }
 
@@ -97,12 +112,12 @@ class Logger
    * @param tag short tag specifying area where message was spawned (eg. cart, sync, module)
    * @param context meaningful data related to this message
    */
-  info (message: string, tag: string = null, context: any = null) : () => void {
+  info (message: any, tag: string = null, context: any = null) : () => void {
     if (!isServer && this.canPrint('info')) {
       if (tag) {
-        return console.log.bind(window.console, '%cVSF%c %c' + tag +'%c ' + message, bgColorStyle('green'), 'color: inherit', bgColorStyle('gray'), 'font-weight: bold', context);
+        return console.log.bind(window.console, '%cVSF%c %c' + tag +'%c ' + this.convertToString(message), bgColorStyle('green'), 'color: inherit', bgColorStyle('gray'), 'font-weight: bold', context);
       } else {
-        return console.log.bind(window.console, '%cVSF%c ' + message, bgColorStyle('green'), 'font-weight: bold', context);
+        return console.log.bind(window.console, '%cVSF%c ' + this.convertToString(message), bgColorStyle('green'), 'font-weight: bold', context);
       }
     } else {
       return function () {}
@@ -117,12 +132,16 @@ class Logger
    * @param tag short tag specifying area where message was spawned (eg. cart, sync, module)
    * @param context meaningful data related to this message
    */
-  warn (message: string, tag: string = null, context: any = null) : () => void {
-    if (!isServer && this.canPrint('warn')) {
-      if (tag) {
-        return console.warn.bind(window.console, '%cVSF%c %c' + tag +'%c ' + message, bgColorStyle('orange'), 'color: inherit', bgColorStyle('gray'), 'font-weight: bold', context);
+  warn (message: any, tag: string = null, context: any = null) : () => void {
+    if (this.canPrint('warn')) {
+      if (!isServer) {
+        if (tag) {
+          return console.warn.bind(window.console, '%cVSF%c %c' + tag +'%c ' + this.convertToString(message), bgColorStyle('orange'), 'color: inherit', bgColorStyle('gray'), 'font-weight: bold', context);
+        } else {
+          return console.warn.bind(window.console, '%cVSF%c ' + this.convertToString(message), bgColorStyle('orange'), 'font-weight: bold', context);
+        }
       } else {
-        return console.warn.bind(window.console, '%cVSF%c ' + message, bgColorStyle('orange'), 'font-weight: bold', context);
+        return console.warn.bind(console, message, context);
       }
     } else {
       return function () {}
@@ -137,12 +156,16 @@ class Logger
    * @param tag short tag specifying area where message was spawned (eg. cart, sync, module)
    * @param context meaningful data related to this message
    */
-  error (message: string, tag: string = null, context: any = null) : () => void {
-    if (!isServer && this.canPrint('error')) {
-      if (tag) {
-        return console.error.bind(window.console, '%cVSF%c %c' + tag +'%c ' + message, bgColorStyle('red'), 'color: inherit', bgColorStyle('gray'), 'font-weight: bold', context);
+  error (message: any, tag: string = null, context: any = null) : () => void {
+    if (this.canPrint('error')) { // we should display SSR errors for better monitoring + error handling
+      if (!isServer) {
+        if (tag) {
+          return console.error.bind(window.console, '%cVSF%c %c' + tag +'%c ' + this.convertToString(message), bgColorStyle('red'), 'color: inherit', bgColorStyle('gray'), 'font-weight: bold', context);
+        } else {
+          return console.error.bind(window.console, '%cVSF%c ' + this.convertToString(message), bgColorStyle('red'), 'font-weight: bold', context);
+        }
       } else {
-        return console.error.bind(window.console, '%cVSF%c ' + message, bgColorStyle('red'), 'font-weight: bold', context);
+        return console.error.bind(console, message, context);
       }
     } else {
       return function () {}

core/lib/multistore.ts

@@ -3,6 +3,7 @@ import { loadLanguageAsync } from '@vue-storefront/i18n'
 import { initializeSyncTaskStorage } from './sync/task'
 import Vue from 'vue'
 import { Route } from 'vue-router'
+import { buildURLQuery } from '@vue-storefront/core/helpers'
 
 export interface StoreView {
   storeCode: string,
@@ -92,13 +93,14 @@ export function adjustMultistoreApiUrl (url: string) : string {
 }
 
 export function localizedRoute (routeObj: Route | string, storeCode: string) {
+  if (routeObj && typeof routeObj === 'object' && routeObj.fullPath) return localizedDispatcherRoute(Object.assign({}, routeObj, { params: null }), storeCode)
   if (storeCode && routeObj && rootStore.state.config.defaultStoreCode !== storeCode) {
     if (typeof routeObj === 'object') {
       if (routeObj.name) {
         routeObj.name = storeCode + '-' + routeObj.name
       }
       if (routeObj.path) {
-        routeObj.path = '/' + storeCode + '/' + routeObj.path.slice(1)
+        routeObj.path = '/' + storeCode + '/' + (routeObj.path.startsWith('/') ? routeObj.path.slice(1) : routeObj.path)
       }
     } else {
       return '/' + storeCode + routeObj
@@ -107,6 +109,17 @@ export function localizedRoute (routeObj: Route | string, storeCode: string) {
   return routeObj
 }
 
+export function localizedDispatcherRoute (routeObj: Route | string, storeCode: string) {
+  if (typeof routeObj === 'string') {
+    return '/' + storeCode + routeObj
+  } 
+  if (routeObj && typeof routeObj === 'object' && routeObj.fullPath) { // case of using dispatcher
+    return '/' + ((rootStore.state.config.defaultStoreCode !== storeCode) ? (storeCode + '/') : '') + routeObj.fullPath + (routeObj.params ? ('?' + buildURLQuery(routeObj.params)) : '')
+  } else {
+    return routeObj
+  }
+}
+
 export function setupMultistoreRoutes (config, router, routes) {
   if (config.storeViews.mapStoreUrlsFor.length > 0 && config.storeViews.multistore === true) {
     for (let storeCode of config.storeViews.mapStoreUrlsFor) {

core/lib/search/adapter/api/searchAdapter.ts

@@ -2,7 +2,7 @@ import map from 'lodash-es/map'
 import rootStore from '@vue-storefront/store'
 import { prepareElasticsearchQueryBody } from './elasticsearchQuery'
 import fetch from 'isomorphic-fetch'
-import { slugify } from '@vue-storefront/core/helpers'
+import { slugify, buildURLQuery } from '@vue-storefront/core/helpers'
 import { currentStoreView, prepareStoreView } from '../../../multistore'
 import SearchQuery from '@vue-storefront/core/lib/search/searchQuery'
 import HttpQuery from '@vue-storefront/core/types/search/HttpQuery'
@@ -20,9 +20,6 @@ export class SearchAdapter {
     if (!this.entities[Request.type]) {
       throw new Error('No entity type registered for ' + Request.type )
     }
-
-    const buildURLQuery = obj => Object.entries(obj).map(pair => pair.map(encodeURIComponent).join('=')).join('&')
-
     let ElasticsearchQueryBody = {}
     if (Request.searchQuery instanceof SearchQuery) {
       ElasticsearchQueryBody = await prepareElasticsearchQueryBody(Request.searchQuery)
@@ -94,7 +91,7 @@ export class SearchAdapter {
     if (resp.hasOwnProperty('hits')) {
       return {
         items: map(resp.hits.hits, hit => {
-          return Object.assign(hit._source, { _score: hit._score, slug: (hit._source.hasOwnProperty('url_key') && rootStore.state.config.products.useMagentoUrlKeys) ? hit._source.url_key : (hit._source.hasOwnProperty('name') ? slugify(hit._source.name) + '-' + hit._source.id : '') }) // TODO: assign slugs server side
+          return Object.assign(hit._source, { _score: hit._score, slug: hit._source.hasOwnProperty('slug') ? hit._source.slug : ((hit._source.hasOwnProperty('url_key') && rootStore.state.config.products.useMagentoUrlKeys) ? hit._source.url_key : (hit._source.hasOwnProperty('name') ? slugify(hit._source.name) + '-' + hit._source.id : '')) }) // TODO: assign slugs server side
         }), // TODO: add scoring information
         total: resp.hits.total,
         start: start,