verdnatura-mirror
/
loopback
mirror of https://github.com/strongloop/loopback.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1271 from strongloop/refactor/core-models 

Refactor Model and PersistedModel registration
This commit is contained in:
Miroslav Bajtoš 2015-04-03 09:40:21 +02:00
parent 72d547971a c72c134d80
commit 5a51c7f0fa
3 changed files with 2116 additions and 2107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/model.js
View File

@ -1,12 +1,13 @@
/*!
* Module Dependencies.
*/
var registry = require('./registry');
var assert = require('assert');
var RemoteObjects = require('strong-remoting');
var SharedClass = require('strong-remoting').SharedClass;
var extend = require('util')._extend;
module.exports = function(registry) {
/**
* The base class for **all models**.
*
@ -95,7 +96,7 @@ var extend = require('util')._extend;
* @class
*/
var Model = module.exports = registry.modelBuilder.define('Model');
var Model = registry.modelBuilder.define('Model');
/*!
* Called when a model is extended.
@ -809,3 +810,6 @@ Model.ValidationError = require('loopback-datasource-juggler').ValidationError;
// setup the initial model
Model.setup();
return Model;
};

11
lib/persisted-model.js
View File

@ -2,14 +2,16 @@
* Module Dependencies.
*/
var Model = require('./model');
var registry = require('./registry');
var runtime = require('./runtime');
var assert = require('assert');
var async = require('async');
var deprecated = require('depd')('loopback');
var debug = require('debug')('loopback:persisted-model');
module.exports = function(registry) {
var Model = registry.Model;
/**
* Extends Model with basic query and CRUD support.
*
@ -26,7 +28,7 @@ var debug = require('debug')('loopback:persisted-model');
* @class PersistedModel
*/
var PersistedModel = module.exports = Model.extend('PersistedModel');
var PersistedModel = Model.extend('PersistedModel');
/*!
* Setup the `PersistedModel` constructor.
@ -1443,3 +1445,6 @@ PersistedModel.rectifyChange = function(id, callback) {
};
PersistedModel.setup();
return PersistedModel;
};

4
lib/registry.js
View File

@ -431,8 +431,8 @@ registry.DataSource = DataSource;
* @private
*/
registry.Model = require('./model');
registry.PersistedModel = require('./persisted-model');
registry.Model = require('./model')(registry);
registry.PersistedModel = require('./persisted-model')(registry);
// temporary alias to simplify migration of code based on <=2.0.0-beta3
Object.defineProperty(registry, 'DataModel', {