fix parser for computed properties with an explicit getter function

lib/parser.js

@@ -59,15 +59,16 @@ class Parser extends EventEmitter {
  entry.name = Object.keys(entry.value)[0]
  entry.value = entry.value[entry.name]
 
- if (entry.value instanceof utils.NodeFunction) {
- switch (property.key.name) {
- case 'computed':
- entry.dependencies = utils.getDependencies(entry.value, this.source.script)
- break
-
- default:
- entry.params = entry.value.params
+ if (property.key.name === 'computed') {
+ if (entry.value instanceof utils.NodeFunction) {
+ entry.dependencies = utils.getDependencies(entry.value, this.source.script)
+ } else if (entry.value instanceof Object && entry.value.get instanceof utils.NodeFunction) {
+ entry.dependencies = utils.getDependencies(entry.value.get, this.source.script)
+ } else {
+ entry.dependencies = []
  }
+ } else if (entry.value instanceof utils.NodeFunction) {
+ entry.params = entry.value.params
  } else if (property.key.name === 'props') {
  if (entry.describeModel) {
  entry.name = 'v-model'

test/integration.spec.js

@@ -198,6 +198,12 @@ describe('component.computed', () => {
  },
  type () {
  return 'text'
+ },
+ getter: {
+ get () {
+ const value = this.value
+ return this.name + value
+ }
  }
  }
  }
@@ -209,13 +215,16 @@ describe('component.computed', () => {
  return parser.parse(options).then((component) => {
  const computed = component.computed
 
- assert.equal(computed.length, 2)
+ assert.equal(computed.length, 3)
 
  assert.equal(computed[0].name, 'id')
  assert.deepEqual(computed[0].dependencies, [ 'value', 'name' ])
 
  assert.equal(computed[1].name, 'type')
  assert.deepEqual(computed[1].dependencies, [])
+
+ assert.equal(computed[2].name, 'getter')
+ assert.deepEqual(computed[2].dependencies, [ 'value', 'name' ])
  })
  })
 })

test/parser.spec.js

@@ -463,6 +463,80 @@ describe('Parser', () => {
  })
  })
 
+ it('should successfully emit a computed property item with a getter', (done) => {
+ const filename = './fixtures/checkbox.vue'
+ const script = `
+ export default {
+ computed: {
+ /**
+ * ID computed prop
+ *
+ * @private
+ */
+ idGetter: {
+ get () {
+ const value = this.value
+ return this.name + value
+ }
+ }
+ }
+ }
+ `
+ const options = {
+ source: { script },
+ filename
+ }
+ const parser = new Parser(options)
+ const expected = {
+ name: 'idGetter',
+ keywords: [{ name: 'private', description: '' }],
+ visibility: 'private',
+ description: 'ID computed prop',
+ dependencies: ['value', 'name']
+ }
+
+ parser.walk().on('computed', (prop) => {
+ assert.equal(prop.name, expected.name)
+ assert.deepEqual(prop.keywords, expected.keywords)
+ assert.equal(prop.visibility, expected.visibility)
+ assert.equal(prop.description, expected.description)
+ assert.equal(prop.value.get.type, 'FunctionExpression')
+ assert.deepEqual(prop.dependencies, expected.dependencies)
+ done()
+ })
+ })
+
+ it('should ignore functions other than get on computed property', (done) => {
+ const filename = './fixtures/checkbox.vue'
+ const script = `
+ export default {
+ computed: {
+ /**
+ * ID computed prop
+ *
+ * @private
+ */
+ idGetter: {
+ foo () {
+ const value = this.value
+ return this.name + value
+ }
+ }
+ }
+ }
+ `
+ const options = {
+ source: { script },
+ filename
+ }
+ const parser = new Parser(options)
+
+ parser.walk().on('computed', (prop) => {
+ assert.deepEqual(prop.dependencies, [])
+ done()
+ })
+ })
+
  it('should successfully emit an unknow item', (done) => {
  const filename = './fixtures/checkbox.vue'
  const defaultMethodVisibility = 'public'