Added example of querying JSON field with dot

Author: Dekel Barzilay

README.md

@@ -291,6 +291,12 @@ app.service('companies').find({
     arr: { '(0).objectField.object': 'string in arr[0].objectField.object' }
   }
 });
+
+app.service('companies').find({
+  query: {
+    obj: { "(field.WithDot)": 'string' }
+  }
+});
 ```
 
 ### Graph upsert

example/app.js

@@ -1,7 +1,7 @@
 import feathers from '@feathersjs/feathers'
 import express from '@feathersjs/express'
 import rest from '@feathersjs/express/rest'
-import errorHandler from '@feathersjs/express/errors'
+import { errorHandler } from '@feathersjs/express'
 import bodyParser from 'body-parser'
 import { Model } from 'objection'
 import createService from '../src'

example/todo.js

@@ -12,7 +12,13 @@ class Todo extends Model {
     properties: {
       id: { type: 'integer' },
       text: { type: 'string' },
-      complete: { type: 'boolean', default: false }
+      complete: { type: 'boolean', default: false },
+      metadata: {
+        type: ['object', 'null'],
+        properties: {
+          'written.by': { type: ['string', 'null'] }
+        }
+      }
     },
     options: {
       timestamps: true
@@ -43,6 +49,7 @@ module.exports = function (app) {
         table.increments('id')
         table.string('text')
         table.boolean('complete')
+        table.json('metadata')
         table.timestamp('createdAt')
         table.timestamp('updatedAt')
       })

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "feathers-objection",
   "description": "A service plugin for ObjectionJS an ORM based on KnexJS",
-  "version": "4.6.4",
+  "version": "4.6.5",
   "homepage": "https://github.com/feathersjs-ecosystem/feathers-objection",
   "keywords": [
     "feathers",
@@ -65,6 +65,7 @@
   "devDependencies": {
     "@babel/cli": "^7.7.7",
     "@babel/core": "^7.7.7",
+    "@babel/node": "^7.7.7",
     "@babel/preset-env": "^7.7.7",
     "@babel/register": "^7.7.7",
     "@feathersjs/adapter-tests": "^4.4.3",

package.json

@@ -214,7 +214,11 @@ class Service extends AdapterService {
           if (!methodKey && key[0] === '$') {
             refColumn = ref(`${this.Model.tableName}.${column}`);
           } else {
-            refColumn = ref(`${this.Model.tableName}.${methodKey || column}:${(methodKey ? column : key).replace(/\(/g, '[').replace(/\)/g, ']')}`);
+            const prop = (methodKey ? column : key)
+              .replace(/\(/g, '[')
+              .replace(/\)/g, ']');
+
+            refColumn = ref(`${this.Model.tableName}.${methodKey || column}:${prop}`);
           }
 
           if (operator === '@>') {

src/index.js

@@ -22,7 +22,8 @@ export default class Company extends Model {
             properties: {
               object: { type: 'string' }
             }
-          }
+          },
+          'first.founder': { type: ['string', 'null'] }
         }
       },
       jsonArray: { type: ['array', 'null'] },

test/company.js

@@ -1254,7 +1254,8 @@ describe('Feathers Objection Service', () => {
               numberField: 1.5,
               objectField: {
                 object: 'string in jsonObject.objectField.object'
-              }
+              },
+              'first.founder': 'John'
             },
             jsonArray: [
               {
@@ -1267,6 +1268,10 @@ describe('Feathers Objection Service', () => {
         ]);
     });
 
+    after(async () => {
+      await companies.remove(null);
+    });
+
     it('object', () => {
       return companies.find({ query: { jsonObject: { $ne: null } } }).then(data => {
         expect(data[0].jsonObject.stringField).to.equal('string');
@@ -1320,6 +1325,18 @@ describe('Feathers Objection Service', () => {
         expect(data[0].jsonArray[0].objectField.object).to.equal('I\'m string in jsonArray[0].objectField.object');
       });
     });
+
+    it('dot in property name', () => {
+      return companies.find({ query: { jsonObject: { '(first.founder)': 'John' } } }).then(data => {
+        expect(data[0].jsonObject['first.founder']).to.equal('John');
+      });
+    });
+
+    it('dot in property name with brackets', () => {
+      return companies.find({ query: { jsonObject: { '[first.founder]': 'John' } } }).then(data => {
+        expect(data[0].jsonObject['first.founder']).to.equal('John');
+      });
+    });
   });
 
   describe.skip('JSON operators (Postgres)', () => {
@@ -1464,6 +1481,12 @@ describe('Feathers Objection Service', () => {
         ]);
     });
 
+    afterEach(async () => {
+      try {
+        await companies.remove(null);
+      } catch (err) {}
+    });
+
     it('create with $noSelect', () => {
       return companies.create({
         name: 'Apple',