fix: event triggered before ga is loaded are ignored

closes #142

Author: MatteoGabriele

src/bootstrap.js

@@ -1,49 +1,61 @@
-import { loadScript, shouldGaLoad } from './helpers'
+import { promisify, loadScript, shouldGaLoad } from './helpers'
 import config, { update } from './config'
 import createTrackers from './create-trackers'
 import collectors from './collectors'
 import { autoTracking } from 'lib/page'
+import untracked from './untracked'
 import noga from './no-ga'
 
 export default () => {
   if (typeof document === 'undefined' || typeof window === 'undefined') {
     return
   }
 
-  const { wait, id, disabled, debug, disableScriptLoader } = config
-  const filename = debug.enabled ? 'analytics_debug' : 'analytics'
+  const { disableScriptLoader: noScript } = config
+  const filename = config.debug.enabled ? 'analytics_debug' : 'analytics'
   const resource = `https://www.google-analytics.com/${filename}.js`
 
-  if (!id) {
+  if (!config.id) {
     throw new Error(
       '[vue-analytics] Missing the "id" parameter. Add at least one tracking domain ID'
     )
   }
 
-  if (shouldGaLoad() && (!window.ga || !disableScriptLoader)) {
-    loadScript(resource).catch(() => {
-      console.error(
-        `[vue-analytics] An error occured trying to load ${resource}. Please check your connection ` +
-        `or if you have any Google Analytics blocker installed in your browser.`
-      )
-    })
+  const queue = [
+    promisify(config.id),
+    promisify(config.disabled)
+  ]
+
+  if (shouldGaLoad() && (!window.ga || !noScript)) {
+    queue.push(loadScript(resource))
   }
 
-  Promise.resolve(
-    (typeof id === 'function') ? id() : id
-  ).then(newId => {
-    update({ id: newId })
-  }).then(() => {
-    return (typeof disabled === 'function') ? disabled() : disabled
-  }).then(disableTracking => {
-    update({ disabled: disableTracking })
+  return Promise.all(queue).then(response => {
+    update({
+      id: response[0],
+      disabled: response[1]
+    })
 
-    if (disableTracking) {
-      noga()
-    }
+    // Opt-in/opt-out #gdpr
+    noga(config.disabled)
 
+    // Creates necessary trackers
     createTrackers()
+
+    // Fires all untracked event that have been fired
+    // meanwhile GoogleAnalayitcs script was loading
+    untracked()
+
+    // Fires all shorthand fields in the options
     collectors()
+
+    // Starts auto tracking
     autoTracking()
+  }).catch(response => {
+    console.error(
+      `[vue-analytics] An error occured! Please check your connection, ` +
+      `if you have any Google Analytics blocker installed in your browser ` +
+      `or check your custom resource URL if you have added any.`
+    )
   })
 }

src/helpers.js

@@ -106,6 +106,16 @@ export function isRouter (data) {
   return data.currentRoute
 }
 
-export function hasProps (props) {
-  return Object.keys(props).length > 0
-}
+export const promisify = value => {
+  if (value.then) {
+    return value
+  }
+
+  if (typeof value === 'function') {
+    const payload = value()
+
+    return payload.then ? payload : Promise.resolve(payload)
+  }
+
+  return Promise.resolve(value)
+}

src/index.js

@@ -1,6 +1,6 @@
 import bootstrap from './bootstrap'
 import lib from './lib'
-import config, { update } from './config'
+import { update } from './config'
 import { onAnalyticsReady } from './helpers'
 import ga from 'directives/ga'
 import * as exception from 'lib/exception'
@@ -9,13 +9,6 @@ import analyticsMiddleware from './vuex-middleware'
 export default function install (Vue, options = {}) {
   update({ ...options, $vue: Vue })
 
-  if (typeof window !== 'undefined' && !window.ga) {
-    window.ga = window.ga || function () {
-      (window.ga.q = window.ga.q || []).push(arguments)
-    }
-    window.ga.l = Number(new Date())
-  }
-
   Vue.directive('ga', ga)
 
   Vue.prototype.$ga = Vue.$ga = lib

src/lib/page.js

@@ -3,14 +3,11 @@ import set from 'lib/set'
 import screenview from 'lib/screenview'
 import query from 'lib/query'
 import {
-  noop,
   getQueryString,
   isRouteIgnored,
-  getRouteAnalytics,
   isRoute,
   isRouter,
-  getBasePath,
-  hasProps
+  getBasePath
 } from '../helpers'
 
 export default function page (...args) {
@@ -71,7 +68,7 @@ export function trackRoute (route) {
 
     let path = route.path + (transformQueryString ? queryString : '')
     path = needsBase ? getBasePath(base, path) : path
-    
+
     page(path)
   }
 }

src/lib/query.js

@@ -10,11 +10,18 @@ export default function query (method, ...args) {
   }
 
   getId().forEach(function (id) {
+    const t = {
+      m: getMethod(method, id),
+      a: args
+    }
+
+    if(!window.ga) {
+      config.untracked.push(t)
+      return
+    }
+
     if (config.batch.enabled) {
-      coll.push({
-        m: getMethod(method, id),
-        a: args
-      })
+      coll.push(t)
 
       if (!intr) {
         intr = setInterval(() => {

src/untracked.js

@@ -0,0 +1,8 @@
+import config from './config'
+import query from './lib/query'
+
+export default () => {
+  config.untracked.forEach(t => {
+    query(t.m, ...t.a)
+  })
+}