iotagent-node-lib 2.17.0 → 2.20.0

package/lib/services/ngsi/ngsiUtils.js

@@ -233,42 +233,6 @@ function getMetaData(typeInformation, name, metadata) {
     return undefined;
 }
 
-/**
- * Given a NGSI v1 Body, determines whether it contains any NGSI error.
- *
- * @param {String} body             String representing a NGSI body in JSON format.
- * @return {Number|*}
- */
-function getErrorField(body) {
-    let errorField = body.errorCode || body.orionError;
-
-    if (body && body.contextResponses) {
-        for (const i in body.contextResponses) {
-            if (body.contextResponses[i].statusCode && body.contextResponses[i].statusCode.code !== '200') {
-                errorField = body.contextResponses[i].statusCode;
-            }
-        }
-    }
-
-    return errorField;
-}
-
-/**
- * Given a NGSI v2 Body, determines whether it contains any NGSI error.
- *
- * @param {Object} body             Object representing a NGSI body in JSON format.
- * @return {String|undefined}       String with the error and description or undefined if body is not a NGSIv2 error response
- */
-function getErrorFieldV2(body) {
-    let errorField = body.error;
-    if (body.description) {
-        errorField += ':' + body.description;
-    }
-    return errorField;
-}
-
-exports.getErrorField = intoTrans(context, getErrorField);
-exports.getErrorFieldV2 = intoTrans(context, getErrorFieldV2);
 exports.createRequestObject = createRequestObject;
 exports.applyMiddlewares = applyMiddlewares;
 exports.getMetaData = getMetaData;

package/lib/services/ngsi/subscriptionService.js

@@ -40,14 +40,11 @@ function init() {
         case 'ld':
             subscriptionHandler = require('./subscription-NGSI-LD');
             break;
-        case 'v2':
-            subscriptionHandler = require('./subscription-NGSI-v2');
-            break;
         case 'mixed':
             subscriptionHandler = require('./subscription-NGSI-mixed');
             break;
         default:
-            subscriptionHandler = require('./subscription-NGSI-v1');
+            subscriptionHandler = require('./subscription-NGSI-v2');
     }
 }
 

package/lib/services/northBound/contextServer-NGSI-LD.js

@@ -40,6 +40,7 @@ const context = {
 const updateContextTemplateNgsiLD = require('../../templates/updateContextNgsiLD.json');
 const notificationTemplateNgsiLD = require('../../templates/notificationTemplateNgsiLD.json');
 const contextServerUtils = require('./contextServerUtils');
+const ngsiLD = require('../ngsi/entities-NGSI-LD');
 
 const updatePaths = ['/ngsi-ld/v1/entities/:entity/attrs/:attr'];
 const queryPaths = ['/ngsi-ld/v1/entities/:entity'];
@@ -250,10 +251,10 @@ function defaultQueryHandlerNgsiLD(id, type, service, subservice, attributes, ca
                     attributeType = lazyAttribute.type;
                 }
 
-                contextElement[attributes[i]] = {
+                contextElement[attributes[i]] = ngsiLD.convertAttrNGSILD({
                     type: attributeType,
                     value: ''
-                };
+                });
             }
 
             callback(null, contextElement);
@@ -408,6 +409,10 @@ function handleQueryNgsiLD(req, res, next) {
     }
 
     logger.debug(context, 'Handling query from [%s]', req.get('host'));
+    if ((req.is('json') || req.is('application/ld+json')) === false) {
+        return handleQueryContextRequests(new errors.UnsupportedContentType(req.header('content-type')));
+    }
+
     if (req.body) {
         logger.debug(context, JSON.stringify(req.body, null, 4));
     }

package/lib/services/northBound/contextServer-NGSI-v2.js

@@ -538,25 +538,37 @@ function handleQueryNgsi2(req, res, next) {
         logger.debug(context, JSON.stringify(req.body, null, 4));
     }
     const contextEntity = {};
+    const entities = req.body.entities || [];
 
-    // At the present moment, IOTA supports query request with one entity and without patterns. This is aligned
-    // with the utilization cases in combination with ContextBroker. Other cases are returned as error
-    if (req.body.entities.length !== 1) {
+    if (!req.is('json')) {
         logger.warn(
-            'queries with entities number different to 1 are not supported (%d found)',
-            req.body.entities.length
+            'queries must offer JSON entities, content-type not supported (%s found)',
+            req.header('content-type')
         );
-        handleQueryContextRequests({ code: 400, name: 'BadRequest', message: 'more than one entity in query' });
-        return;
+        return handleQueryContextRequests(new errors.UnsupportedContentType(req.header('content-type')));
+    }
+
+    // At the present moment, IOTA supports query request with one entity and without patterns. This is aligned
+    // with the utilization cases in combination with ContextBroker. Other cases are returned as error
+    if (entities.length !== 1) {
+        logger.warn('queries with entities number different to 1 are not supported (%d found)', entities.length);
+        return handleQueryContextRequests({
+            code: 400,
+            name: 'BadRequest',
+            message: 'query does not contain a single entity'
+        });
     }
-    if (req.body.entities[0].idPattern) {
+    if (entities[0].idPattern) {
         logger.warn('queries with idPattern are not supported');
-        handleQueryContextRequests({ code: 400, name: 'BadRequest', message: 'idPattern usage in query' });
-        return;
+        return handleQueryContextRequests({
+            code: 400,
+            name: 'BadRequest',
+            message: 'idPattern usage in query'
+        });
     }
 
-    contextEntity.id = req.body.entities[0].id;
-    contextEntity.type = req.body.entities[0].type;
+    contextEntity.id = entities[0].id;
+    contextEntity.type = entities[0].type;
     const queryAtts = req.body.attrs;
     createQueryRequest(queryAtts, contextEntity, handleQueryContextRequests);
 }

package/lib/services/northBound/contextServer.js

@@ -41,14 +41,11 @@ function init() {
         case 'ld':
             contextServerHandler = require('./contextServer-NGSI-LD');
             break;
-        case 'v2':
-            contextServerHandler = require('./contextServer-NGSI-v2');
-            break;
         case 'mixed':
             contextServerHandler = require('./contextServer-NGSI-mixed');
             break;
         default:
-            contextServerHandler = require('./contextServer-NGSI-v1');
+            contextServerHandler = require('./contextServer-NGSI-v2');
     }
 }
 

package/lib/services/northBound/contextServerUtils.js

@@ -26,14 +26,10 @@
 
 const async = require('async');
 const apply = async.apply;
-const logger = require('logops');
 const constants = require('../../constants');
 const config = require('../../commonConfig');
 const ngsi = require('../ngsi/ngsiService');
 const commands = require('../commands/commandService');
-const context = {
-    op: 'IoTAgentNGSI.ContextServerUtils'
-};
 
 /**
  * Returns the Current Tenant  defined for the NGSI-LD Broker. Tenant is based on the request
@@ -68,81 +64,6 @@ function getLDPath(req) {
     return config.getConfig().contextBroker.fallbackPath;
 }
 
-/**
- * Create the response for an UpdateContext operation, based on the results of the individual updates. The signature
- * retains the results object for homogeinity with the createQuery* version.
- *
- * @param {Object} req              Request that was handled in first place.
- * @param {Object} res              Response that will be sent.
- * @param {Object} results          Ignored for this function. TODO: to be removed in later versions.
- * @return {{contextResponses: Array}}
- */
-
-/* eslint-disable-next-line  no-unused-vars */
-function createUpdateResponse(req, res, results) {
-    const result = {
-        contextResponses: []
-    };
-
-    for (let i = 0; i < req.body.contextElements.length; i++) {
-        const contextResponse = {
-            contextElement: {
-                attributes: req.body.contextElements[i].attributes,
-                id: req.body.contextElements[i].id,
-                isPattern: false,
-                type: req.body.contextElements[i].type
-            },
-            statusCode: {
-                code: 200,
-                reasonPhrase: 'OK'
-            }
-        };
-
-        for (let j = 0; j < contextResponse.contextElement.attributes.length; j++) {
-            contextResponse.contextElement.attributes[i].value = '';
-        }
-
-        result.contextResponses.push(contextResponse);
-    }
-
-    logger.debug(context, 'Generated update response: %j', result);
-
-    return result;
-}
-
-/**
- * Create the response for a queryContext operation based on the individual results gathered from the query handlers.
- * The returned response is in the NGSI Response format.
- *
- * @param {Object} req              Request that was handled in first place.
- * @param {Object} res              Response that will be sent.
- * @param {Object} results          Individual Context Element results from the query handlers.
- * @return {{contextResponses: Array}}
- */
-function createQueryResponse(req, res, results) {
-    const result = {
-        contextResponses: []
-    };
-
-    for (let i = 0; i < results.length; i++) {
-        const contextResponse = {
-            contextElement: results[i],
-            statusCode: {
-                code: 200,
-                reasonPhrase: 'OK'
-            }
-        };
-
-        contextResponse.contextElement.isPattern = false;
-
-        result.contextResponses.push(contextResponse);
-    }
-
-    logger.debug(context, 'Generated query response: %j', result);
-
-    return result;
-}
-
 /**
  * Retrieve the Device that corresponds to a Context Update, and execute the update side effects
  * if there were any (e.g.: creation of attributes related to comands).
@@ -199,8 +120,6 @@ exports.updateHandler = null;
 exports.commandHandler = null;
 exports.queryHandler = null;
 exports.notificationHandler = null;
-exports.createUpdateResponse = createUpdateResponse;
-exports.createQueryResponse = createQueryResponse;
 exports.executeUpdateSideEffects = executeUpdateSideEffects;
 exports.pushCommandsToQueue = pushCommandsToQueue;
 exports.getLDTenant = getLDTenant;

package/lib/services/northBound/deviceProvisioningServer.js

@@ -34,6 +34,7 @@ const context = {
 };
 const apply = async.apply;
 let provisioningHandler;
+let updatingHandler;
 let removeDeviceHandler;
 let updateDeviceTemplate;
 let createDeviceTemplate;
@@ -53,6 +54,7 @@ const provisioningAPITranslation = {
     protocol: 'protocol',
     transport: 'transport',
     endpoint: 'endpoint',
+    polling: 'polling',
     attributes: 'active',
     commands: 'commands',
     lazy: 'lazy',
@@ -181,7 +183,8 @@ function attributeToProvisioningAPIFormat(attribute) {
         reverse: attribute.reverse,
         entity_name: attribute.entity_name,
         entity_type: attribute.entity_type,
-        mqtt: attribute.mqtt
+        mqtt: attribute.mqtt,
+        metadata: attribute.metadata
     };
 }
 
@@ -203,6 +206,7 @@ function toProvisioningAPIFormat(device) {
         timezone: device.timezone,
         timestamp: device.timestamp,
         endpoint: device.endpoint,
+        polling: device.polling,
         transport: device.transport,
         attributes: device.active ? device.active.map(attributeToProvisioningAPIFormat) : undefined,
         lazy: device.lazy ? device.lazy.map(attributeToProvisioningAPIFormat) : undefined,
@@ -316,6 +320,14 @@ function handleRemoveDevice(req, res, next) {
  * This middleware handles updates in the provisioning devices. The only attribute
  */
 function handleUpdateDevice(req, res, next) {
+    function applyUpdatingHandler(device, callback) {
+        if (updatingHandler) {
+            updatingHandler(device, callback);
+        } else {
+            callback(null, device);
+        }
+    }
+
     if (req.body.device_id) {
         next(new errors.BadRequest("Can't change the ID of a preprovisioned device"));
     } else {
@@ -337,12 +349,19 @@ function handleUpdateDevice(req, res, next) {
                     if (req.body.entity_name || req.body.entity_type) {
                         isTypeOrNameUpdated = true;
                     }
-                    deviceService.updateRegister(newDevice, isTypeOrNameUpdated, function handleDeviceUpdate(error) {
-                        if (error) {
-                            next(error);
-                        } else {
-                            res.status(204).json({});
-                        }
+                    async.waterfall([apply(applyUpdatingHandler, newDevice)], function handleUpdating(
+                        error,
+                        newDeviceUpdated
+                    ) {
+                        deviceService.updateRegister(newDeviceUpdated, isTypeOrNameUpdated, function handleDeviceUpdate(
+                            error
+                        ) {
+                            if (error) {
+                                next(error);
+                            } else {
+                                res.status(204).json({});
+                            }
+                        });
                     });
                 } else {
                     next(new errors.DeviceNotFound(req.params.deviceId));
@@ -391,6 +410,10 @@ function setProvisioningHandler(newHandler) {
     provisioningHandler = newHandler;
 }
 
+function setUpdatingHandler(newHandler) {
+    updatingHandler = newHandler;
+}
+
 function setRemoveDeviceHandler(newHandler) {
     removeDeviceHandler = newHandler;
 }
@@ -408,6 +431,7 @@ function clear(callback) {
 exports.setConfiguration = setConfiguration;
 exports.loadContextRoutes = intoTrans(context, loadContextRoutes);
 exports.setProvisioningHandler = intoTrans(context, setProvisioningHandler);
+exports.setUpdatingHandler = intoTrans(context, setUpdatingHandler);
 exports.setRemoveDeviceHandler = intoTrans(context, setRemoveDeviceHandler);
 exports.addDeviceProvisionMiddleware = addDeviceProvisionMiddleware;
 exports.clear = clear;

package/lib/services/northBound/northboundServer.js

@@ -31,6 +31,7 @@ const domainUtils = require('../common/domain');
 const middlewares = require('../common/genericMiddleware');
 const intoTrans = domainUtils.intoTrans;
 const deviceProvisioning = require('./deviceProvisioningServer');
+const deviceUpdating = require('./deviceProvisioningServer');
 const groupProvisioning = require('./deviceGroupAdministrationServer');
 const logger = require('logops');
 const context = {
@@ -116,6 +117,7 @@ exports.setNotificationHandler = intoTrans(context, contextServer.setNotificatio
 exports.setConfigurationHandler = intoTrans(context, groupProvisioning.setConfigurationHandler);
 exports.setRemoveConfigurationHandler = intoTrans(context, groupProvisioning.setRemoveConfigurationHandler);
 exports.setProvisioningHandler = intoTrans(context, deviceProvisioning.setProvisioningHandler);
+exports.setUpdatingHandler = intoTrans(context, deviceUpdating.setUpdatingHandler);
 exports.setRemoveDeviceHandler = intoTrans(context, deviceProvisioning.setRemoveDeviceHandler);
 exports.addDeviceProvisionMiddleware = deviceProvisioning.addDeviceProvisionMiddleware;
 exports.addConfigurationProvisionMiddleware = groupProvisioning.addConfigurationProvisionMiddleware;

package/lib/services/northBound/restUtils.js

@@ -35,7 +35,7 @@ const context = {
     op: 'IoTAgentNGSI.RestUtils'
 };
 const _ = require('underscore');
-const request = require('request');
+const request = require('../../request-shim');
 const async = require('async');
 const apply = async.apply;
 const ngsiService = require('../ngsi/ngsiService');
@@ -123,25 +123,6 @@ function checkBody(template) {
     };
 }
 
-/**
- * Checks if the timestamp properties of NGSIv1 entities are valid ISO8601 dates.
- *
- * @param {Object} payload         NGSIv1 payload to be analyzed.
- * @return {Boolean}               true if timestamp attributes are valid ISO8601. false if not.
- */
-function IsValidTimestamped(payload) {
-    for (const i in payload.contextElements[0].attributes) {
-        if (
-            payload.contextElements[0].attributes[i].name === constants.TIMESTAMP_ATTRIBUTE &&
-            !moment(payload.contextElements[0].attributes[i].value, moment.ISO_8601).isValid()
-        ) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
 /**
  * Checks if the timestamp properties of NGSIv2 entities are valid ISO8601 dates.
  *
@@ -173,22 +154,6 @@ function IsValidTimestampedNgsi2(payload) {
     return isValidTimestampedNgsi2Entity(payload);
 }
 
-/**
- * Checks if timestamp attributes are included in NGSIv1 entities.
- *
- * @param {Object} payload         NGSIv1 payload to be analyzed.
- * @return {Boolean}               true if timestamp attributes are included. false if not.
- */
-function isTimestamped(payload) {
-    for (const i in payload.contextElements[0].attributes) {
-        if (payload.contextElements[0].attributes[i].name === constants.TIMESTAMP_ATTRIBUTE) {
-            return true;
-        }
-    }
-
-    return false;
-}
-
 /**
  * Checks if timestamp attributes are included in NGSIv2 entities.
  *
@@ -273,7 +238,5 @@ exports.executeWithSecurity = executeWithSecurity;
 exports.checkMandatoryQueryParams = intoTrans(context, checkMandatoryQueryParams);
 exports.checkRequestAttributes = intoTrans(context, checkRequestAttributes);
 exports.checkBody = intoTrans(context, checkBody);
-exports.isTimestamped = isTimestamped;
-exports.IsValidTimestamped = IsValidTimestamped;
 exports.isTimestampedNgsi2 = isTimestampedNgsi2;
 exports.IsValidTimestampedNgsi2 = IsValidTimestampedNgsi2;

package/lib/templates/updateDevice.json

@@ -177,6 +177,10 @@
         }
       }
     },
+    "internal_attributes": {
+      "description": "Free form array of internal attributes for particular IOTAgents",
+      "type": "any"
+    },
     "static_attributes": {
       "description": "Free form array of data to be appended to the target entity",
       "type": "array"

package/lib/templates/updateDeviceLax.json

@@ -149,6 +149,10 @@
         }
       }
     },
+    "internal_attributes": {
+      "description": "Free form array of internal attributes for particular IOTAgents",
+      "type": "any"
+    },
     "static_attributes": {
       "description": "Free form array of data to be appended to the target entity",
       "type": "array"

package/package.json

@@ -2,7 +2,7 @@
   "name": "iotagent-node-lib",
   "license": "AGPL-3.0-only",
   "description": "IoT Agent library to interface with NGSI Context Broker",
-  "version": "2.17.0",
+  "version": "2.20.0",
   "homepage": "https://github.com/telefonicaid/iotagent-node-lib",
   "keywords": [
     "fiware",
@@ -21,22 +21,20 @@
   "bugs": {
     "url": "https://github.com/telefonicaid/iotagent-node-lib/issues"
   },
-  "bin": {
-    "agentConsole": "bin/agentConsole.js",
-    "iotAgentTester": "bin/iotAgentTester.js"
-  },
   "main": "lib/fiware-iotagent-lib",
   "engines": {
     "node": ">=12"
   },
   "scripts": {
     "clean": "rm -rf package-lock.json && rm -rf node_modules && rm -rf coverage",
-    "lint": "eslint lib/ bin/ test/ --cache --fix",
+    "lint": "eslint lib/ test/ --cache --fix",
     "lint:md": "remark  -f '*.md' 'doc/*.md'",
     "lint:text": "textlint '*.md' 'doc/*.md'",
     "prettier": "prettier --config .prettierrc.json --write '**/**/**/**/*.js' '**/**/**/*.js' '**/**/*.js' '**/*.js' '*.js'",
     "prettier:text": "prettier 'README.md' 'doc/*.md' 'doc/**/*.md' --no-config --tab-width 4 --print-width 120 --write --prose-wrap always",
-    "test": "nyc --reporter=text mocha --recursive 'test/**/*.js' --reporter spec --timeout 5000 --ui bdd --exit --color true",
+    "test": "nyc --reporter=text mocha --recursive 'test/**/*.js' --reporter spec --timeout 8000 --ui bdd --exit --color true",
+    "test:expression": "nyc --reporter=text mocha --recursive 'test/unit/expressions/*.js' --reporter spec --timeout 5000 --ui bdd --exit --color true",
+    "test:multientity": "nyc --reporter=text mocha --recursive 'test/unit/ngsiv2/plugins/multientity-plugin_test.js' --reporter spec --timeout 5000 --ui bdd --exit --color true",
     "test:debug": "mocha --recursive 'test/**/*.js' --reporter spec --inspect-brk --timeout 30000 --ui bdd --exit",
     "test:coverage": "nyc --reporter=lcov mocha -- --recursive 'test/**/*.js' --reporter spec --timeout 5000 --exit",
     "test:coveralls": "npm run test:coverage && cat ./coverage/lcov.info | coveralls && rm -rf ./coverage",
@@ -46,18 +44,16 @@
   "dependencies": {
     "async": "2.6.2",
     "body-parser": "~1.19.0",
-    "command-shell-lib": "1.0.0",
     "express": "~4.16.4",
-    "jexl": "2.1.1",
+    "got": "~11.8.2",
+    "jexl": "2.3.0",
     "jison": "0.4.18",
-    "logops": "2.1.0",
+    "logops": "2.1.2",
     "moment": "~2.24.0",
     "moment-timezone": "~0.5.25",
     "mongodb": "3.6.8",
     "mongoose": "5.7.7",
-    "mu2": "~0.5.20",
     "query-string": "6.5.0",
-    "request": "2.88.0",
     "revalidator": "~0.3.1",
     "underscore": "~1.12.1",
     "uuid": "~3.3.2"
@@ -92,12 +88,10 @@
   },
   "lint-staged": {
     "*.md": [
-      "prettier --parser markdown --tab-width 4 --print-width 120 --write --prose-wrap always",
-      "git add"
+      "prettier --parser markdown --tab-width 4 --print-width 120 --write --prose-wrap always"
     ],
     "*.js": [
-      "prettier --config .prettierrc.json --write",
-      "git add"
+      "prettier --config .prettierrc.json --write"
     ]
   }
 }

package/test/tools/utils.js

@@ -22,6 +22,7 @@
  */
 
 const fs = require('fs');
+const request = require('../../lib/fiware-iotagent-lib').request;
 
 function readExampleFile(name, raw) {
     let text = null;
@@ -36,3 +37,4 @@ function readExampleFile(name, raw) {
 }
 
 exports.readExampleFile = readExampleFile;
+exports.request = request;

package/test/unit/examples/groupProvisioningRequests/multipleGroupsCreation.json

@@ -41,4 +41,4 @@
       "attributes": []
     }
   ]
-}
+}

package/test/unit/expressions/jexlExpression-test.js

@@ -23,6 +23,7 @@
 
 const should = require('should');
 const expressionParser = require('../../../lib/plugins/jexlParser');
+expressionParser.setTransforms({});
 
 describe('Jexl expression interpreter', function () {
     const scope = {
@@ -203,6 +204,16 @@ describe('Jexl expression interpreter', function () {
         });
     });
 
+    describe('When an slice function is used with an string', function () {
+        it('should work on the expression value', function (done) {
+            expressionParser.parse('"AABBCC"|slice(2,4)', scope, function (error, result) {
+                should.not.exist(error);
+                result.should.equal('BB');
+                done();
+            });
+        });
+    });
+
     describe('When an ternary operator is used with an expression', function () {
         it('should work on the expression value', function (done) {
             expressionParser.parse('value == 6? true : false', scope, function (error, result) {
@@ -258,7 +269,7 @@ describe('Jexl expression interpreter', function () {
         const noMap = "I'm not what you expect";
 
         it('it should detect when it is not a map', function (done) {
-            let [error, message, resultMap] = expressionParser.checkTransformationMap(noMap);
+            const [error, message, resultMap] = expressionParser.checkTransformationMap(noMap);
             should.exist(error);
             message.should.equal('No trasformations were added to JEXL Parser');
             resultMap.should.eql({});
@@ -266,7 +277,7 @@ describe('Jexl expression interpreter', function () {
         });
 
         it('it should be empty {}', function (done) {
-            let [error, message, resultMap] = expressionParser.checkTransformationMap({});
+            const [error, message, resultMap] = expressionParser.checkTransformationMap({});
             should.not.exist(error);
             message.should.equal('No trasformations were added to JEXL Parser');
             resultMap.should.eql({});
@@ -274,7 +285,7 @@ describe('Jexl expression interpreter', function () {
         });
 
         it('it should be empty null', function (done) {
-            let [error, message, resultMap] = expressionParser.checkTransformationMap(null);
+            const [error, message, resultMap] = expressionParser.checkTransformationMap(null);
             should.not.exist(error);
             message.should.equal('No trasformations were added to JEXL Parser');
             resultMap.should.eql({});
@@ -282,7 +293,7 @@ describe('Jexl expression interpreter', function () {
         });
 
         it('it should detect wrong transformations (not a funtion)', function (done) {
-            let [error, message, resultMap] = expressionParser.checkTransformationMap(wrongMap);
+            const [error, message, resultMap] = expressionParser.checkTransformationMap(wrongMap);
             should.not.exist(error);
             message.should.equal('wrongTransformation1,wrongTransformation2 must be a function');
             should.not.exist(resultMap.wrongTransformation1);
@@ -292,7 +303,7 @@ describe('Jexl expression interpreter', function () {
         });
 
         it('it should be correct (map of funtions)', function (done) {
-            let [error, message, resultMap] = expressionParser.checkTransformationMap(niceMap);
+            const [error, message, resultMap] = expressionParser.checkTransformationMap(niceMap);
             should.not.exist(error);
             message.should.equal('Trasformations can be added to JEXL parser');
             resultMap.should.eql(niceMap);
@@ -323,6 +334,17 @@ describe('Jexl expression interpreter', function () {
         });
     });
 
+    describe('When a JSON with an NGSI operator is applied', function () {
+        it('should work on the expression value', function (done) {
+            const scope = { ina: 34, outa: 4 };
+            expressionParser.parse('{$inc:ina-outa}', scope, function (error, result) {
+                should.not.exist(error);
+                result.should.eql({ $inc: 30 });
+                done();
+            });
+        });
+    });
+
     describe('When an expression aims at creating an object', function () {
         it('it should work', function (done) {
             expressionParser.parse('{type:"Point",coordinates: [value,other]}', scope, function (error, result) {
@@ -332,4 +354,21 @@ describe('Jexl expression interpreter', function () {
             });
         });
     });
+
+    describe('When an expression access to non existent property', function () {
+        it('it should return null', function (done) {
+            expressionParser.parse('object["nothing"]', scope, function (error, result) {
+                should.not.exist(error);
+                should.equal(result, null);
+                done();
+            });
+        });
+        it('it should return null', function (done) {
+            expressionParser.parse('object["nothing"]?object["nothing"]:null', scope, function (error, result) {
+                should.not.exist(error);
+                should.equal(result, null);
+                done();
+            });
+        });
+    });
 });