From 967b5d73a3bc7f178454c200ee2e1c14f7a8c7dd Mon Sep 17 00:00:00 2001 From: Gajus Kuizinas Date: Sun, 4 Aug 2019 10:02:12 +0100 Subject: [PATCH] fix: sort alphabetically method declarations --- src/factories/createSqlTag.js | 118 +++++++++++++++++----------------- src/types.js | 2 - 2 files changed, 59 insertions(+), 61 deletions(-) diff --git a/src/factories/createSqlTag.js b/src/factories/createSqlTag.js index f45ada69..6f84bb2f 100644 --- a/src/factories/createSqlTag.js +++ b/src/factories/createSqlTag.js @@ -120,6 +120,51 @@ export default (configuration?: SqlTagConfigurationType) => { return query; }; + sql.array = ( + values: $ReadOnlyArray, + memberType: string + ): ArraySqlTokenType => { + return deepFreeze({ + memberType, + type: ArrayToken, + values, + }); + }; + + sql.assignmentList = ( + namedAssignment: NamedAssignmentType + ): AssignmentListSqlTokenType => { + return deepFreeze({ + namedAssignment, + normalizeIdentifier, + type: AssignmentListToken, + }); + }; + + sql.booleanExpression = ( + members: $ReadOnlyArray, + operator: LogicalBooleanOperatorType + ): BooleanExpressionSqlTokenType => { + return deepFreeze({ + members, + operator, + type: BooleanExpressionToken, + }); + }; + + sql.comparisonPredicate = ( + leftOperand: ValueExpressionType, + operator: ComparisonOperatorType, + rightOperand: ValueExpressionType + ): ComparisonPredicateSqlTokenType => { + return deepFreeze({ + leftOperand, + operator, + rightOperand, + type: ComparisonPredicateToken, + }); + }; + sql.identifier = ( names: $ReadOnlyArray ): IdentifierSqlTokenType => { @@ -140,6 +185,15 @@ export default (configuration?: SqlTagConfigurationType) => { }); }; + sql.json = ( + value: SerializableValueType + ): JsonSqlTokenType => { + return deepFreeze({ + type: JsonToken, + value, + }); + }; + sql.raw = ( rawSql: string, values?: $ReadOnlyArray @@ -151,26 +205,6 @@ export default (configuration?: SqlTagConfigurationType) => { }); }; - sql.valueList = ( - values: $ReadOnlyArray - ): ValueListSqlTokenType => { - return deepFreeze({ - type: ValueListToken, - values, - }); - }; - - sql.array = ( - values: $ReadOnlyArray, - memberType: string - ): ArraySqlTokenType => { - return deepFreeze({ - memberType, - type: ArrayToken, - values, - }); - }; - sql.tuple = ( values: $ReadOnlyArray ): TupleSqlTokenType => { @@ -200,46 +234,12 @@ export default (configuration?: SqlTagConfigurationType) => { }); }; - sql.booleanExpression = ( - members: $ReadOnlyArray, - operator: LogicalBooleanOperatorType - ): BooleanExpressionSqlTokenType => { - return deepFreeze({ - members, - operator, - type: BooleanExpressionToken, - }); - }; - - sql.comparisonPredicate = ( - leftOperand: ValueExpressionType, - operator: ComparisonOperatorType, - rightOperand: ValueExpressionType - ): ComparisonPredicateSqlTokenType => { - return deepFreeze({ - leftOperand, - operator, - rightOperand, - type: ComparisonPredicateToken, - }); - }; - - sql.assignmentList = ( - namedAssignment: NamedAssignmentType - ): AssignmentListSqlTokenType => { - return deepFreeze({ - namedAssignment, - normalizeIdentifier, - type: AssignmentListToken, - }); - }; - - sql.json = ( - value: SerializableValueType - ): JsonSqlTokenType => { + sql.valueList = ( + values: $ReadOnlyArray + ): ValueListSqlTokenType => { return deepFreeze({ - type: JsonToken, - value, + type: ValueListToken, + values, }); }; diff --git a/src/types.js b/src/types.js index f15066ee..569226d3 100644 --- a/src/types.js +++ b/src/types.js @@ -218,8 +218,6 @@ export type NamedParameterValuesType = { [key: string]: ValueExpressionType, }; - - export type IdentifierListMemberType = $ReadOnlyArray | {| +alias: string,