Feature 921

packages/composer-admin/package.json

@@ -16,7 +16,7 @@
     "postlint": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf"
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.json"
   },
   "repository": {
     "type": "git",

packages/composer-client/package.json

@@ -13,7 +13,7 @@
     "pretest": "npm run licchk",
     "licchk": "license-check",
     "postlicchk": "npm run doc",
-    "doc": "jsdoc --pedantic --recurse -c jsdoc.conf",
+    "doc": "jsdoc --pedantic --recurse -c jsdoc.json",
     "postdoc": "npm run lint",
     "lint": "eslint .",
     "test": "node ./scripts/api-changelog.js && nyc mocha --recursive -t 10000"

packages/composer-common/index.js

@@ -85,6 +85,7 @@ 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.QueryAnalyzer = require('./lib/query/queryanalyzer.js');
 module.exports.QueryFile = require('./lib/query/queryfile');
 module.exports.QueryManager = require('./lib/querymanager');
 module.exports.Relationship = require('./lib/model/relationship');

packages/composer-common/lib/codegen/fromcto/loopback/loopbackvisitor.js

@@ -388,6 +388,36 @@ class LoopbackVisitor {
 
     }
 
+    /**
+     * Given a primitive Composer type returns the corresponding loopback type
+     * @param {string} type - the composer primitive type name
+     * @return {string} the loopback type
+     * @private
+     */
+    static toLoopbackType(type) {
+
+        let result = 'string';
+
+        switch (type) {
+        case 'String':
+            result = 'string';
+            break;
+        case 'Double':
+        case 'Integer':
+        case 'Long':
+            result= 'number';
+            break;
+        case 'DateTime':
+            result = 'date';
+            break;
+        case 'Boolean':
+            result = 'boolean';
+            break;
+        }
+
+        return result;
+    }
+
     /**
      * Visitor design pattern
      * @param {Field} field - the object being visited
@@ -404,22 +434,7 @@ class LoopbackVisitor {
 
             // Render the type as JSON Schema.
             jsonSchema = {};
-            switch (field.getType()) {
-            case 'String':
-                jsonSchema.type = 'string';
-                break;
-            case 'Double':
-            case 'Integer':
-            case 'Long':
-                jsonSchema.type = 'number';
-                break;
-            case 'DateTime':
-                jsonSchema.type = 'date';
-                break;
-            case 'Boolean':
-                jsonSchema.type = 'boolean';
-                break;
-            }
+            jsonSchema.type = LoopbackVisitor.toLoopbackType(field.getType());
 
             // If this field has a default value, add it.
             if (field.getDefaultValue()) {

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

@@ -144,7 +144,6 @@ class Query {
     getSelect() {
         return this.select;
     }
-
 }
 
 module.exports = Query;