Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion lib/services.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,22 @@ ejs.filters.q = function(obj) {
* @returns {string} The generated javascript code.
* @header generateServices
*/
module.exports = function generateServices(app, ngModuleName, apiUrl) {
module.exports = function generateServices(app, ngModuleName, apiUrl,
includeSchemas) {
ngModuleName = ngModuleName || 'lbServices';
apiUrl = apiUrl || '/';

var models = describeModels(app);

if (includeSchemas === true) {
for (var modelName in models) {
var modelProperties = app.models[modelName].definition.rawProperties;
models[modelName].modelSchema = {
name: modelName,
properties: modelProperties
};
}
}
var servicesTemplate = fs.readFileSync(
require.resolve('./services.template.ejs'),
{ encoding: 'utf-8' }
Expand Down
12 changes: 12 additions & 0 deletions lib/services.template.ejs
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,18 @@ module.factory(
<% }); // forEach methods name -%>
<% } // for each scope -%>

<% if (meta.modelSchema) { -%>
/**
* @ngdoc object
* @name <%-: moduleName %>.<%- modelName %>#schema
* @propertyOf <%-: moduleName %>.<%- modelName %>
* @description
* The schema of the model represented by this $resource
*/
R.schema = <%- JSON.stringify(meta.modelSchema, null, '\t') -%>;


<% } -%>
return R;
}]);

Expand Down
27 changes: 27 additions & 0 deletions test.e2e/spec/services.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -832,6 +832,33 @@ define(['angular', 'given', 'util'], function(angular, given, util) {
});
});
});

describe('$resource for model generated with include schema', function() {
var $injector;
before(function() {
return given.servicesForLoopBackApp(
{
models: {
'pretender': {},
},
includeSchema: true,
setupFn: (function(app, cb) {
var Pretender = app.models.Pretender;
cb();
}).toString(),
})
.then(function(createInjector) {
$injector = createInjector();
});
});

it('has a schema method generated', function() {
var Pretender = $injector.get('Pretender');
var methodNames = Object.keys(Pretender);
console.log('methods', methodNames);
expect(methodNames).to.include.members(['schema']);
});
});

describe('for models with belongsTo relation', function() {
var $injector, Town, Country, testData;
Expand Down
3 changes: 2 additions & 1 deletion test.e2e/test-server.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ masterApp.post('/setup', function(req, res, next) {
var name = opts.name;
var models = opts.models;
var enableAuth = opts.enableAuth;
var includeSchema = opts.includeSchema;
var setupFn = compileSetupFn(name, opts.setupFn);

if (!name)
Expand Down Expand Up @@ -105,7 +106,7 @@ masterApp.post('/setup', function(req, res, next) {
}

try {
servicesScript = generator.services(lbApp, name, apiUrl);
servicesScript = generator.services(lbApp, name, apiUrl, includeSchema);
} catch (err) {
console.error('Cannot generate services script:', err.stack);
servicesScript = 'throw new Error("Error generating services script.");';
Expand Down