Fix up type errors
parent
b36fb786f2
commit
2d1ff2cf46
|
@ -106,7 +106,6 @@ export default class Walker {
|
|||
object: {name: object.name, type: object.type},
|
||||
property: {name: name || value, type},
|
||||
type: node.type,
|
||||
paren,
|
||||
},
|
||||
]
|
||||
}
|
||||
|
@ -116,17 +115,11 @@ export default class Walker {
|
|||
}
|
||||
|
||||
if (node.name) {
|
||||
results = [
|
||||
...results,
|
||||
{type: node.type, source: node.location.source, paren},
|
||||
]
|
||||
results = [...results, {type: node.type, source: node.location.source}]
|
||||
}
|
||||
|
||||
if (node.value) {
|
||||
results = [
|
||||
...results,
|
||||
{type: node.type, source: node.location.source, paren},
|
||||
]
|
||||
results = [...results, {type: node.type, source: node.location.source}]
|
||||
}
|
||||
|
||||
const isRightParen = this.hasParen(node, node.right)
|
||||
|
|
|
@ -29,7 +29,7 @@ export class Filter extends PureComponent<Props, State> {
|
|||
try {
|
||||
const ast = await getAST({url: links.ast, body: value})
|
||||
const nodes = new Walker(ast).inOrderExpression
|
||||
this.setState({nodes}, () => console.log(this.state.nodes))
|
||||
this.setState({nodes})
|
||||
} catch (error) {
|
||||
console.error('Could not parse AST', error)
|
||||
}
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
import React, {PureComponent} from 'react'
|
||||
import {BinaryExpressionNode, MemberExpressionNode} from 'src/types/ifql'
|
||||
import {MemberExpressionNode} from 'src/types/ifql'
|
||||
|
||||
type FilterNode = BinaryExpressionNode | MemberExpressionNode
|
||||
type FilterNode = MemberExpressionNode
|
||||
|
||||
interface Props {
|
||||
nodes: FilterNode[]
|
||||
|
|
|
@ -46,7 +46,8 @@ interface ObjectNode {
|
|||
}
|
||||
|
||||
interface PropertyNode {
|
||||
value: string
|
||||
name?: string
|
||||
value?: string
|
||||
type: string
|
||||
}
|
||||
|
||||
|
|
|
@ -2,6 +2,8 @@ import React from 'react'
|
|||
import {shallow} from 'enzyme'
|
||||
import {Filter} from 'src/ifql/components/Filter'
|
||||
|
||||
jest.mock('src/ifql/apis', () => require('mocks/ifql/apis'))
|
||||
|
||||
const setup = (override = {}) => {
|
||||
const props = {
|
||||
argKey: 'fn',
|
||||
|
@ -10,6 +12,7 @@ const setup = (override = {}) => {
|
|||
declarationID: 'd1',
|
||||
value: '(r) => r["measurement"] === "m1"',
|
||||
onChangeArg: () => {},
|
||||
render: () => <div className="test-element" />,
|
||||
links: {
|
||||
self: '',
|
||||
ast: '',
|
||||
|
|
Loading…
Reference in New Issue