Merge branch 'ABenassi87-issue-50'

Author: paustint

.gitignore

@@ -7,6 +7,8 @@ dist/
 .env
 debug/lib
 
+.idea/
+
 # Created by https://www.gitignore.io/api/node
 
 ### Node ###
@@ -67,8 +69,6 @@ typings/
 .yarn-integrity
 
 # dotenv environment variables file
-.env
-
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 

README.md

@@ -341,6 +341,9 @@ export type LiteralType =
   | 'DATE_LITERAL'
   | 'DATE_N_LITERAL';
 export type FieldType = Field | FieldFunctionExpression | FieldRelationship | FieldSubquery | FieldTypeOf;
+export type OrderByCriterion = 'ASC' | 'DESC';
+export type NullsOrder = 'FIRST' | 'LAST';
+export type GroupByType = 'CUBE' | 'ROLLUP';
 
 export interface Field {
   type: 'Field';
@@ -428,13 +431,13 @@ export interface Condition {
 export interface OrderByClause {
   field?: string;
   fn?: FunctionExp;
-  order?: 'ASC' | 'DESC';
-  nulls?: 'FIRST' | 'LAST';
+  order?: OrderByCriterion;
+  nulls?: NullsOrder;
 }
 
 export interface GroupByClause {
   field: string | string[];
-  type?: 'CUBE' | 'ROLLUP';
+  type?: GroupByType;
 }
 
 export interface HavingClause {
@@ -470,6 +473,7 @@ export interface WithDataCategoryCondition {
   selector: GroupSelector;
   parameters: string[];
 }
+
 ```
 
 

lib/models/SoqlQuery.model.ts

@@ -16,6 +16,9 @@ export type LiteralType =
   | 'DATE_LITERAL'
   | 'DATE_N_LITERAL';
 export type FieldType = Field | FieldFunctionExpression | FieldRelationship | FieldSubquery | FieldTypeOf;
+export type OrderByCriterion = 'ASC' | 'DESC';
+export type NullsOrder = 'FIRST' | 'LAST';
+export type GroupByType = 'CUBE' | 'ROLLUP';
 
 export interface Field {
   type: 'Field';
@@ -103,13 +106,13 @@ export interface Condition {
 export interface OrderByClause {
   field?: string;
   fn?: FunctionExp;
-  order?: 'ASC' | 'DESC';
-  nulls?: 'FIRST' | 'LAST';
+  order?: OrderByCriterion;
+  nulls?: NullsOrder;
 }
 
 export interface GroupByClause {
   field: string | string[];
-  type?: 'CUBE' | 'ROLLUP';
+  type?: GroupByType;
 }
 
 export interface HavingClause {