diff --git a/lib/api/services/JsonApiService.js b/lib/api/services/JsonApiService.js index 36b695a..d38caa7 100644 --- a/lib/api/services/JsonApiService.js +++ b/lib/api/services/JsonApiService.js @@ -1,5 +1,4 @@ const _ = require("lodash"); -const cleanObject = require('clean-object'); const JSONAPISerializer = require('json-api-serializer'); const jsonApiValidator = require('../../context-aware-jsonapi-validator/validator'); const Serializer = new JSONAPISerializer(); @@ -10,23 +9,6 @@ var createRecord = require('../blueprints/create'); var destroyOneRecord = require('../blueprints/destroy'); var updateOneRecord = require('../blueprints/update'); -function deepMap(obj, iterator) { - return _.transform(obj, function(result, val, key) { - result[key] = _.isObject(val) ? - deepMap(val, iterator) : - iterator.call(this, val, key, obj); - }); -} - -function _setIdTypeToString(object) { - - if (typeof object['id'] === "number") { - object['id'] = object['id'].toString(); - } - - return object; -} - module.exports = { findRecords: findRecords, @@ -107,22 +89,7 @@ module.exports = { id: 'id' }); - var dataToSerialize = null; - - // JSON API specifies resource IDs MUST be strings - // Let's convert all Sails integer index to strings - if (data instanceof Array) { - dataToSerialize = []; - - data.forEach(function(resource) { - var object = _setIdTypeToString(resource); - dataToSerialize.push(object); - }); - } else if (typeof data === "object") { - dataToSerialize = _setIdTypeToString(data); - } - - var returnedValue = cleanObject(Serializer.serialize(modelName, dataToSerialize)); + var returnedValue = Serializer.serialize(modelName, data); delete returnedValue.jsonapi; // Let's ignore the version for now return returnedValue; diff --git a/lib/hook.js b/lib/hook.js index 6b7a3ae..0025231 100644 --- a/lib/hook.js +++ b/lib/hook.js @@ -4,7 +4,6 @@ var _ = require('lodash'); var util = require('util'); -var nodePath = require('path'); var pluralize = require('pluralize'); var BlueprintController = { create : require('./api/blueprints/create') diff --git a/package.json b/package.json index dbcdf4d..62de455 100644 --- a/package.json +++ b/package.json @@ -25,11 +25,9 @@ }, "homepage": "https://github.com/dynamiccast/sails-json-api-blueprints#readme", "dependencies": { - "clean-object": "^1.0.2", - "json-api-serializer": "1.0.0", + "json-api-serializer": "1.1.0", "jsonapi-validator": "^2.0.0", "lodash": "3.10.1", - "path": "^0.12.7", "pluralize": "^2.0.0", "util": "^0.10.3" },