Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support field in condition #1980

Merged
merged 16 commits into from
Jun 11, 2017
Merged

Support field in condition #1980

merged 16 commits into from
Jun 11, 2017

Commits on Jun 8, 2017

  1. Declare Conditional and Condition 

    - Conditional as a generic type for conditional channelDef
- Condition as a generic type of channelDef with `selection` predicate
    @kanitw
    kanitw committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    57d8176 View commit details
    Browse the repository at this point in the history

  2. Declare ConditionLegend/TextDef, PositionDef to simplify declaration … 

    …of encoding.ts
    @kanitw
    kanitw committed Jun 8, 2017
    Configuration menu
    Copy the full SHA
    e39ec50 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2017

  1. Revise all isFieldDef occurrence -- make sure to check `isFieldDef(ch… 

    …annelDef.condition)` if applicable

- Introduce
  - `getFieldDef()` which returns the fieldDef -- either from the outer channelDef or from the condition of channelDef
  - `hasConditionFieldDef()` and `isConditionalDef()`
    @kanitw
    kanitw committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    323e4bb View commit details
    Browse the repository at this point in the history

  2. Add missing ConditionOnlyDef

    @kanitw
    kanitw committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    5c873ef View commit details
    Browse the repository at this point in the history

  3. Make wrapCondition support ConditionFieldDef

    @kanitw
    kanitw committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    9a953fa View commit details
    Browse the repository at this point in the history

  4. Make model.fieldDef() correctly uses getFieldDef() 

    - Correct type signature for subsets of Channel (SingleDefChannel, ScaleChannel, etc.)
- Remove outdated logic for row/column's axis (we no longer use axis for row/column -- and use header instead!)
- Make model.fieldDef() references check for undefined
    @kanitw
    kanitw committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    fba528d View commit details
    Browse the repository at this point in the history

  5. Remove unused model.channels()

    @kanitw
    kanitw committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    46fbafe View commit details
    Browse the repository at this point in the history

  6. Manually declare SingleDefChannel as this leads to error with `npm ru… 

    …n schema`
    @kanitw
    kanitw committed Jun 9, 2017
    1 Configuration menu
    Copy the full SHA
    b82b8ab View commit details
    Browse the repository at this point in the history

  7. Remove "not" from example specs

    @kanitw
    kanitw committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    902dbb9 View commit details
    Browse the repository at this point in the history

  8. Add test for aggregating ConditionField

    @kanitw
    kanitw committed Jun 9, 2017
    Configuration menu
    Copy the full SHA
    584361b View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2017

  1. Add comment

    @kanitw
    kanitw committed Jun 10, 2017
    Configuration menu
    Copy the full SHA
    49a9688 View commit details
    Browse the repository at this point in the history

  2. Simplify schema

    @kanitw
    kanitw committed Jun 10, 2017
    Configuration menu
    Copy the full SHA
    ddf2317 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2017

  1. Remove ConditionLegend/TextDef, PositionDef to simplify schema file

    @kanitw
    kanitw committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    61a62d7 View commit details
    Browse the repository at this point in the history

  2. Separate Condition<F | V> to Condition<F> | Condition<V> to 

    1) Avoid schema generator bug (cc: @domoritz)
2) Produce better schema

Also update rename script
    @kanitw
    kanitw committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    06cc8dc View commit details
    Browse the repository at this point in the history

  3. Further remove generic for Conditon*Def<...> and TopLevel<...>

    @kanitw
    kanitw committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    28a18bc View commit details
    Browse the repository at this point in the history

  4. Fix typo in the rename script

    @kanitw
    kanitw committed Jun 11, 2017
    Configuration menu
    Copy the full SHA
    012807d View commit details
    Browse the repository at this point in the history