Module factory

core/lib/module.ts

@@ -117,16 +117,16 @@ export class VueStorefrontModule {
         if (extending.key === this._c.key) this._extend(extending)
       })
 
-      let isUnique = true
+      let areStoresUnique = true
       if ( this._c.store) {
         this._c.store.modules.forEach(store => {
           if (VueStorefrontModule._doesStoreAlreadyExists(store.key)) {
             Logger.warn('Error during "' + this._c.key + '" module registration! Store with key "' + store.key + '" already exists!', 'module')()
-            isUnique = false
+            areStoresUnique = false
           }
         })
       }
-      if (isUnique) {
+      if (areStoresUnique) {
         if (this._c.beforeRegistration) {
           if (this._c.beforeRegistration.length === 1 ) { 
             this._c.beforeRegistration(VSF) 
@@ -162,3 +162,7 @@ export function registerModules (modules: VueStorefrontModule[], context): void
     }
   )()
 }
+
+export function createModule(config: VueStorefrontModuleConfig) {
+  return new VueStorefrontModule(config)
+}

core/modules/breadcrumbs/index.ts

@@ -1,13 +1,10 @@
 import { module } from './store'
-import { VueStorefrontModule, VueStorefrontModuleConfig } from '@vue-storefront/core/lib/module'
+import { createModule } from '@vue-storefront/core/lib/module'
 
 export const KEY = 'breadcrumbs'
-
-const moduleConfig: VueStorefrontModuleConfig = {
+export const Breadcrumbs = createModule({
   key: KEY,
   store: { modules: [
     { key: KEY, module: module }
   ] },
-}
-
-export const Breadcrumbs = new VueStorefrontModule(moduleConfig)
+})

core/modules/cart/index.ts

@@ -1,15 +1,12 @@
 import { module } from './store'
-import { VueStorefrontModule, VueStorefrontModuleConfig } from '@vue-storefront/core/lib/module'
+import { createModule } from '@vue-storefront/core/lib/module'
 import { beforeRegistration } from './hooks/beforeRegistration'
 import { afterRegistration } from './hooks/afterRegistration'
 
 export const KEY = 'cart'
-
-const moduleConfig: VueStorefrontModuleConfig = {
+export const Cart = createModule({
   key: KEY,
   store: { modules: [{ key: KEY, module }] },
   beforeRegistration,
   afterRegistration
-}
-
-export const Cart = new VueStorefrontModule(moduleConfig)
+})

core/modules/catalog/index.ts

@@ -3,12 +3,11 @@ import { attributeModule } from './store/attribute'
 import { stockModule } from './store/stock'
 import { taxModule } from './store/tax'
 import { categoryModule } from './store/category'
-import { VueStorefrontModule, VueStorefrontModuleConfig } from '@vue-storefront/core/lib/module'
+import { createModule } from '@vue-storefront/core/lib/module'
 import { beforeRegistration } from './hooks/beforeRegistration'
 
 export const KEY = 'catalog'
-
-const moduleConfig: VueStorefrontModuleConfig = {
+export const Catalog = createModule({
   key: KEY,
   store: { modules: [
     { key: 'product', module: productModule },
@@ -18,6 +17,4 @@ const moduleConfig: VueStorefrontModuleConfig = {
     { key: 'category', module: categoryModule }
   ] },
   beforeRegistration
-}
-
-export const Catalog = new VueStorefrontModule(moduleConfig)
+})

core/modules/checkout/index.ts

@@ -3,12 +3,10 @@ import { paymentModule } from './store/payment'
 import { shippingModule } from './store/shipping'
 import { beforeRegistration } from './hooks/beforeRegistration'
 import { afterRegistration } from './hooks/afterRegistration'
-
-import { VueStorefrontModule, VueStorefrontModuleConfig } from '@vue-storefront/core/lib/module'
+import { createModule } from '@vue-storefront/core/lib/module'
 
 export const KEY = 'checkout'
-
-const moduleConfig: VueStorefrontModuleConfig = {
+export const Checkout = createModule({
   key: KEY,
   store: { modules: [
     { key: 'shipping', module: shippingModule },
@@ -17,6 +15,4 @@ const moduleConfig: VueStorefrontModuleConfig = {
   ] },
   beforeRegistration,
   afterRegistration
-}
-
-export const Checkout = new VueStorefrontModule(moduleConfig)
+})

core/modules/cms/index.ts

@@ -1,22 +1,19 @@
 import { cmsPageModule } from './store/page'
 import { cmsBlockModule } from './store/block'
 import { cmsHierarchyModule } from './store/hierarchy'
-import { VueStorefrontModule, VueStorefrontModuleConfig } from '@vue-storefront/core/lib/module'
+import { createModule } from '@vue-storefront/core/lib/module'
 import { beforeRegistration } from './hooks/beforeRegistration'
 import { plugin } from './store/plugin'
 import { initCacheStorage } from '@vue-storefront/core/helpers/initCacheStorage';
 
 export const KEY = 'cms'
 export const cacheStorage = initCacheStorage(KEY)
-
-const moduleConfig: VueStorefrontModuleConfig = {
+export const Cms = createModule({
   key: KEY,
   store: { modules: [
     { key: 'cmsPage', module: cmsPageModule },
     { key: 'cmsBlock', module: cmsBlockModule },
     { key: 'cmsHierarchy', module: cmsHierarchyModule }
   ], plugin },
   beforeRegistration
-}
-
-export const Cms = new VueStorefrontModule(moduleConfig)
+})

core/modules/compare/index.ts

@@ -1,19 +1,15 @@
 import { module } from './store'
-import { VueStorefrontModule, VueStorefrontModuleConfig } from '@vue-storefront/core/lib/module'
+import { createModule } from '@vue-storefront/core/lib/module'
 import { beforeRegistration } from './hooks/beforeRegistration'
 import { afterRegistration } from './hooks/afterRegistration'
 import { initCacheStorage } from '@vue-storefront/core/helpers/initCacheStorage';
 import { plugin } from './store/plugin'
 
 export const KEY = 'compare'
-
 export const cacheStorage = initCacheStorage(KEY)
-
-const moduleConfig: VueStorefrontModuleConfig = {
+export const Compare = createModule({
   key: KEY,
   store: { modules: [{ key: KEY, module }], plugin },
   beforeRegistration,
   afterRegistration
-}
-
-export const Compare = new VueStorefrontModule(moduleConfig)
+})

core/modules/mailer/index.ts

@@ -1,11 +1,8 @@
 import { module } from './store'
-import { VueStorefrontModule, VueStorefrontModuleConfig } from '@vue-storefront/core/lib/module'
+import { createModule } from '@vue-storefront/core/lib/module'
 
 export const KEY = 'mailer'
-
-const moduleConfig: VueStorefrontModuleConfig = {
+export const Mailer = createModule({
   key: KEY,
   store: { modules: [{ key: KEY, module }] },
-}
-
-export const Mailer = new VueStorefrontModule(moduleConfig)
+})