Expose the select statement for a query

packages/composer-common/.gitignore

@@ -47,4 +47,5 @@ out
 # Build generated files should be ignored by git, but not by npm.
 lib/acl/parser.js
 lib/introspect/parser.js
+lib/query/parser.js
 index.d.ts

packages/composer-common/.npmignore

@@ -47,4 +47,5 @@ out
 # Build generated files should be ignored by git, but not by npm.
 # lib/acl/parser.js
 # lib/introspect/parser.js
+# lib/query/parser.js
 # index.d.ts

packages/composer-common/index.js

@@ -54,6 +54,7 @@ module.exports.AssetDeclaration = require('./lib/introspect/assetdeclaration');
 module.exports.BaseException = require('./lib/baseexception');
 module.exports.BusinessNetworkDefinition = require('./lib/businessnetworkdefinition');
 module.exports.ClassDeclaration = require('./lib/introspect/classdeclaration');
+module.exports.CodeGen = require('./lib/codegen/codegen.js');
 module.exports.ComboConnectionProfileStore = require('./lib/comboconnectionprofilestore');
 module.exports.Concept = require('./lib/model/concept');
 module.exports.ConceptDeclaration = require('./lib/introspect/conceptdeclaration');
@@ -74,8 +75,11 @@ module.exports.Logger = require('./lib/log/logger');
 module.exports.LoopbackVisitor = require('./lib/codegen/fromcto/loopback/loopbackvisitor');
 module.exports.ModelFile = require('./lib/introspect/modelfile');
 module.exports.ModelManager = require('./lib/modelmanager');
+module.exports.OrderBy = require('./lib/query/orderby');
 module.exports.ParticipantDeclaration = require('./lib/introspect/participantdeclaration');
 module.exports.Property = require('./lib/introspect/property');
+module.exports.Query = require('./lib/query/query');
+module.exports.QueryFile = require('./lib/query/queryfile');
 module.exports.Relationship = require('./lib/model/relationship');
 module.exports.RelationshipDeclaration = require('./lib/introspect/relationshipdeclaration');
 module.exports.Resource = require('./lib/model/resource');
@@ -84,11 +88,13 @@ module.exports.Script = require('./lib/introspect/script');
 module.exports.ScriptManager = require('./lib/scriptmanager');
 module.exports.SecurityContext = require('./lib/securitycontext');
 module.exports.SecurityException = require('./lib/securityexception');
+module.exports.Select = require('./lib/query/select');
 module.exports.Serializer = require('./lib/serializer');
+module.exports.Sort = require('./lib/query/sort');
 module.exports.TransactionDeclaration = require('./lib/introspect/transactiondeclaration');
 module.exports.TypescriptVisitor = require('./lib/codegen/fromcto/typescript/typescriptvisitor');
 module.exports.Util = require('./lib/util');
 module.exports.Wallet = require('./lib/wallet');
-module.exports.CodeGen = require('./lib/codegen/codegen.js');
+module.exports.Where = require('./lib/query/where');
 module.exports.Writer = require('./lib/codegen/writer.js');
 module.exports.version = require('./package.json');

packages/composer-common/lib/query/orderby.js

@@ -99,7 +99,9 @@ class OrderBy {
      */
     toJSON() {
         let result = {
-            sortCriteria: this.sortCriteria.toJSON()
+            sortCriteria: this.sortCriteria.map((sortCriteria) => {
+                return sortCriteria.toJSON();
+            })
         };
         return result;
     }

packages/composer-common/lib/query/query.js

@@ -96,14 +96,22 @@ class Query {
     }
 
     /**
-     * Returns the description associated with this ACL Rule.
+     * Returns the description associated with this Query.
      *
      * @return {string} the description
      */
     getDescription() {
         return this.description;
     }
 
+    /**
+     * Returns the select statement associated with this Query.
+     * @return {Select} The select statement.
+     */
+    getSelect() {
+        return this.select;
+    }
+
     /**
      * Returns a new object representing this Query that is
      * suitable for serializing as JSON.