-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #54 from jbee/enums-top-level
feat! SPI enum types as top level types
- Loading branch information
Showing
65 changed files
with
289 additions
and
326 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
49 changes: 49 additions & 0 deletions
49
src/commonMain/kotlin/org/hisp/dhis/lib/expression/ExpressionMode.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
package org.hisp.dhis.lib.expression | ||
|
||
import org.hisp.dhis.lib.expression.eval.NodeValidator | ||
import org.hisp.dhis.lib.expression.spi.ValueType | ||
import org.hisp.dhis.lib.expression.syntax.ExpressionGrammar | ||
import org.hisp.dhis.lib.expression.syntax.Fragment | ||
import kotlin.js.JsExport | ||
|
||
@JsExport | ||
enum class ExpressionMode( | ||
internal val fragments: List<Fragment>, | ||
internal val validators: List<NodeValidator>, | ||
vararg resultTypes: ValueType) { | ||
// analyses data values for validity | ||
VALIDATION_RULE_EXPRESSION(ExpressionGrammar.ValidationRuleExpressionMode, ValueType.NUMBER), | ||
VALIDATION_RULE_RESULT_TEST(ExpressionGrammar.SimpleTestMode, ValueType.BOOLEAN), | ||
|
||
// data value generators | ||
PREDICTOR_GENERATOR_EXPRESSION(ExpressionGrammar.PredictorExpressionMode, ValueType.NUMBER, ValueType.STRING), | ||
|
||
// do a section in the data needs skipping (ignore) | ||
PREDICTOR_SKIP_TEST(ExpressionGrammar.PredictorSkipTestMode, ValueType.BOOLEAN), | ||
|
||
// ad-hoc calculated (no DB) | ||
// query analytics to compute some aggregate value | ||
INDICATOR_EXPRESSION(ExpressionGrammar.IndicatorExpressionMode, ValueType.NUMBER), | ||
|
||
// always SQL for entire expression | ||
// query analytics to compute some aggregate value | ||
PROGRAM_INDICATOR_EXPRESSION(ExpressionGrammar.ProgramIndicatorExpressionMode, ValueType.NUMBER), | ||
|
||
// never SQL (also we need JS) | ||
// PROGRAM_RULE_EXPRESSION | ||
RULE_ENGINE_CONDITION(ExpressionGrammar.RuleEngineMode, NodeValidator.RuleEngineMode, ValueType.BOOLEAN), | ||
RULE_ENGINE_ACTION( | ||
ExpressionGrammar.RuleEngineMode, | ||
NodeValidator.RuleEngineMode, | ||
ValueType.BOOLEAN, | ||
ValueType.STRING, | ||
ValueType.NUMBER, | ||
ValueType.DATE); | ||
|
||
internal val resultTypes: Set<ValueType> = setOf(*resultTypes) | ||
|
||
constructor(fragments: List<Fragment>, vararg resultTypes: ValueType) : this( | ||
fragments, | ||
listOf<NodeValidator>(), | ||
*resultTypes) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 6 additions & 6 deletions
12
src/commonMain/kotlin/org/hisp/dhis/lib/expression/ast/Tag.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
package org.hisp.dhis.lib.expression.ast | ||
|
||
import org.hisp.dhis.lib.expression.spi.ID | ||
import org.hisp.dhis.lib.expression.spi.IDType | ||
|
||
/** | ||
* Tags allowed to use in data item positions before a UID. | ||
* <pre> | ||
* tag:UID | ||
</pre> * | ||
*/ | ||
enum class Tag(val idType: ID.Type) { | ||
enum class Tag(val idType: IDType) { | ||
|
||
deGroup(ID.Type.DateElementGroupUID), | ||
coGroup(ID.Type.CategoryOptionGroupUID), | ||
co(ID.Type.CategoryOptionUID), | ||
PS_EVENTDATE(ID.Type.ProgramStageUID) | ||
deGroup(IDType.DateElementGroupUID), | ||
coGroup(IDType.CategoryOptionGroupUID), | ||
co(IDType.CategoryOptionUID), | ||
PS_EVENTDATE(IDType.ProgramStageUID) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 0 additions & 2 deletions
2
src/commonMain/kotlin/org/hisp/dhis/lib/expression/math/NormalDistribution.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 4 additions & 1 deletion
5
...his/lib/expression/ast/AggregationType.kt → ...his/lib/expression/spi/AggregationType.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 20 additions & 17 deletions
37
src/commonMain/kotlin/org/hisp/dhis/lib/expression/spi/DataItemType.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 4 additions & 27 deletions
31
src/commonMain/kotlin/org/hisp/dhis/lib/expression/spi/ID.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
29 changes: 29 additions & 0 deletions
29
src/commonMain/kotlin/org/hisp/dhis/lib/expression/spi/IDType.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package org.hisp.dhis.lib.expression.spi | ||
|
||
import kotlin.js.JsExport | ||
|
||
@JsExport | ||
enum class IDType { | ||
AttributeUID, | ||
AttributeOptionComboUID, | ||
CategoryOptionUID, | ||
CategoryOptionComboUID, | ||
CategoryOptionGroupUID, | ||
DataElementUID, | ||
DateElementGroupUID, | ||
DataSetUID, | ||
ConstantUID, | ||
IndicatorUID, | ||
OrganisationUnitGroupUID, | ||
ProgramUID, | ||
ProgramIndicatorUID, | ||
ProgramVariableName, | ||
ProgramStageUID, | ||
|
||
// not a UID but an Identifier | ||
ReportingRateType; | ||
|
||
fun isUID(): Boolean { | ||
return this != ProgramVariableName && this != ReportingRateType; | ||
} | ||
} |
5 changes: 4 additions & 1 deletion
5
...his/lib/expression/ast/ProgramVariable.kt → ...his/lib/expression/spi/ProgramVariable.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 change: 0 additions & 1 deletion
1
src/commonMain/kotlin/org/hisp/dhis/lib/expression/spi/QueryModifiers.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.