iridium - npm Package Compare versions

Comparing version 5.5.4 to 5.6.0

build/coverage.js

@@ -22,3 +22,3 @@ var gulp = require('gulp'),
 					dir: paths.coverageFolder,
-					reporters: ['lcov', 'json', 'html'],
+					reporters: ['lcovonly', 'json', 'html'],
 					reportOpts: { dir: paths.coverageFolder }
@@ -25,0 +25,0 @@ }))

dist/lib/Decorators.js

@@ -60,2 +60,6 @@ /// <reference path="../_references.d.ts" />
     target.constructor.schema[name] = MongoDB.ObjectID;
+    target.constructor.transforms[name] = {
+        fromDB: function (value) { return value._bsontype == 'ObjectID' ? new MongoDB.ObjectID(value.id).toHexString() : value; },
+        toDB: function (value) { return value && typeof value === 'string' ? new MongoDB.ObjectID(value) : value; }
+    };
 }
@@ -62,0 +66,0 @@ exports.ObjectID = ObjectID;

dist/lib/Instance.js

@@ -241,3 +241,3 @@ var _ = require('lodash');
     Instance.schema = {
-        _id: MongoDB.ObjectID
+        _id: false
     };
@@ -249,8 +249,3 @@ Instance.validators = [
     ];
-    Instance.transforms = {
-        _id: {
-            fromDB: function (value) { return value._bsontype == 'ObjectID' ? new MongoDB.ObjectID(value.id).toHexString() : value; },
-            toDB: function (value) { return value && typeof value === 'string' ? new MongoDB.ObjectID(value) : value; }
-        }
-    };
+    Instance.transforms = {};
     Instance.indexes = [];
@@ -257,0 +252,0 @@ return Instance;

dist/lib/Model.js

@@ -0,1 +1,3 @@
+/// <reference path="../_references.d.ts" />
+var MongoDB = require('mongodb');
 var Bluebird = require('bluebird');
@@ -45,2 +47,9 @@ var _ = require('lodash');
         this._indexes = instanceType.indexes || [];
+        if (!this._schema._id)
+            this._schema._id = MongoDB.ObjectID;
+        if (this._schema._id === MongoDB.ObjectID && !this._transforms['_id'])
+            this._transforms['_id'] = {
+                fromDB: function (value) { return value._bsontype == 'ObjectID' ? new MongoDB.ObjectID(value.id).toHexString() : value; },
+                toDB: function (value) { return value && typeof value === 'string' ? new MongoDB.ObjectID(value) : value; }
+            };
         if (instanceType.prototype instanceof Instance_1.default)
@@ -47,0 +56,0 @@ this._Instance = ModelSpecificInstance_1.default(this, instanceType);

dist/lib/ModelSpecificInstance.js

@@ -12,6 +12,6 @@ var util = require('util');
                 get: function () {
-                    return model.transforms[property].fromDB(this._modified._id);
+                    return model.transforms[property].fromDB(this._modified[property]);
                 },
                 set: function (value) {
-                    this._modified._id = model.transforms[property].toDB(value);
+                    this._modified[property] = model.transforms[property].toDB(value);
                 },
@@ -18,0 +18,0 @@ enumerable: true,

lib/Decorators.ts

@@ -65,2 +65,6 @@ /// <reference path="../_references.d.ts" />
 	target.constructor.schema[name] = MongoDB.ObjectID;
+	target.constructor.transforms[name] = {
+        fromDB: value => value._bsontype == 'ObjectID' ? new MongoDB.ObjectID(value.id).toHexString() : value,
+        toDB: value => value && typeof value === 'string' ? new MongoDB.ObjectID(value) : value
+    };
 }

lib/Instance.ts

@@ -65,3 +65,3 @@ /// <reference path="../_references.d.ts" />
     static schema: Schema = {
-        _id: MongoDB.ObjectID
+        _id: false
     };
@@ -76,6 +76,3 @@
     static transforms: { [property: string]: { fromDB: (value: any) => any; toDB: (value: any) => any; } } = {
-        _id: {
-            fromDB: value => value._bsontype == 'ObjectID' ? new MongoDB.ObjectID(value.id).toHexString() : value,
-            toDB: value => value && typeof value === 'string' ? new MongoDB.ObjectID(value) : value
-        }
+        
     };
@@ -82,0 +79,0 @@

lib/Model.ts

@@ -64,2 +64,10 @@ /// <reference path="../_references.d.ts" />
         this._indexes = instanceType.indexes || [];
+        
+        if(!this._schema._id) this._schema._id = MongoDB.ObjectID;
+        
+        if(this._schema._id === MongoDB.ObjectID && !this._transforms['_id'])
+            this._transforms['_id'] = {
+                fromDB: value => value._bsontype == 'ObjectID' ? new MongoDB.ObjectID(value.id).toHexString() : value,
+                toDB: value => value && typeof value === 'string' ? new MongoDB.ObjectID(value) : value
+            };
 
@@ -66,0 +74,0 @@ if ((<Function>instanceType).prototype instanceof Instance)

lib/ModelSpecificInstance.ts

@@ -18,6 +18,6 @@ /// <reference path="../_references.d.ts" />
                 get: function () {
-                    return model.transforms[property].fromDB(this._modified._id);
+                    return model.transforms[property].fromDB(this._modified[property]);
                 },
                 set: function (value) {
-                    this._modified._id = model.transforms[property].toDB(value);
+                    this._modified[property] = model.transforms[property].toDB(value);
                 },
@@ -24,0 +24,0 @@ enumerable: true,

package.json

 {
   "name": "iridium",
-  "version": "5.5.4",
+  "version": "5.6.0",
   "author": "Benjamin Pannell <[e-mail]>",
@@ -5,0 +5,0 @@ "description": "A custom lightweight ORM for MongoDB designed for power-users",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

1049070

increased by191.59%

Number of package files

175

increased by66.67%

Lines of code

5062

increased by36.92%

No dependency changes