diff --git a/src/browser.js b/src/browser.js index c459669..037de92 100644 --- a/src/browser.js +++ b/src/browser.js @@ -3,7 +3,7 @@ import createMixin from './shared/mixin' import setOptions from './shared/options' import { isUndefined } from './shared/is-type' import $meta from './client/$meta' -import hasMetaInfo from './shared/hasMetaInfo' +import { hasMetaInfo } from './shared/meta-helpers' /** * Plugin install function. diff --git a/src/index.js b/src/index.js index 9e049d0..470fb7d 100644 --- a/src/index.js +++ b/src/index.js @@ -2,7 +2,7 @@ import { version } from '../package.json' import createMixin from './shared/mixin' import setOptions from './shared/options' import $meta from './server/$meta' -import hasMetaInfo from './shared/hasMetaInfo' +import { hasMetaInfo } from './shared/meta-helpers' /** * Plugin install function. diff --git a/src/shared/getComponentOption.js b/src/shared/getComponentOption.js index b66df4c..7e46bec 100644 --- a/src/shared/getComponentOption.js +++ b/src/shared/getComponentOption.js @@ -1,6 +1,6 @@ import { merge } from './merge' -import applyTemplate from './applyTemplate' -import inMetaInfoBranch from './inMetaInfoBranch' +import { applyTemplate } from './template' +import { inMetaInfoBranch } from './meta-helpers' import { isFunction, isObject } from './is-type' /** diff --git a/src/shared/hasMetaInfo.js b/src/shared/hasMetaInfo.js deleted file mode 100644 index 033c34a..0000000 --- a/src/shared/hasMetaInfo.js +++ /dev/null @@ -1,6 +0,0 @@ -import { isObject } from './is-type' - -// Vue $root instance has a _vueMeta object property, otherwise its a boolean true -export default function hasMetaInfo(vm = this) { - return vm && (vm._vueMeta === true || isObject(vm._vueMeta)) -} diff --git a/src/shared/inMetaInfoBranch.js b/src/shared/inMetaInfoBranch.js deleted file mode 100644 index cf89e9e..0000000 --- a/src/shared/inMetaInfoBranch.js +++ /dev/null @@ -1,6 +0,0 @@ -import { isUndefined } from './is-type' - -// a component is in a metaInfo branch when itself has meta info or one of its (grand-)children has -export default function inMetaInfoBranch(vm = this) { - return vm && !isUndefined(vm._vueMeta) -} diff --git a/src/shared/meta-helpers.js b/src/shared/meta-helpers.js new file mode 100644 index 0000000..382e7f0 --- /dev/null +++ b/src/shared/meta-helpers.js @@ -0,0 +1,11 @@ +import { isUndefined, isObject } from './is-type' + +// Vue $root instance has a _vueMeta object property, otherwise its a boolean true +export function hasMetaInfo(vm = this) { + return vm && (vm._vueMeta === true || isObject(vm._vueMeta)) +} + +// a component is in a metaInfo branch when itself has meta info or one of its (grand-)children has +export function inMetaInfoBranch(vm = this) { + return vm && !isUndefined(vm._vueMeta) +} diff --git a/test/unit/getComponentOptions.test.js b/test/unit/getComponentOptions.test.js index e49ffaa..7bdc895 100644 --- a/test/unit/getComponentOptions.test.js +++ b/test/unit/getComponentOptions.test.js @@ -1,5 +1,5 @@ import getComponentOption from '../../src/shared/getComponentOption' -import inMetaInfoBranch from '../../src/shared/inMetaInfoBranch' +import { inMetaInfoBranch } from '../../src/shared/meta-helpers' import { mount, getVue, loadVueMetaPlugin } from '../utils' describe('getComponentOption', () => {