diff --git a/.gitignore b/.gitignore index 86683bd..b0ec7d8 100644 --- a/.gitignore +++ b/.gitignore @@ -8,12 +8,16 @@ build.xml node_modules/* npm-debug.log *.js +!config/* +!karma.conf.js +!webpack.config.js *.map *.d.ts !make.js -!bundles/*.js +!examples/**/*.js +coverage *.metadata.json -*.ngfactory.ts +bundles ################# ## JetBrains diff --git a/.npmignore b/.npmignore index 05fcf02..b874db4 100755 --- a/.npmignore +++ b/.npmignore @@ -9,9 +9,13 @@ node_modules/* npm-debug.log *.ts !*.d.ts +tests +examples +config .github +coverage !*.metadata.json -make.js +!bundles/*.js ################# ## JetBrains diff --git a/bundles/ng2-resource-rest.js b/bundles/ng2-resource-rest.js deleted file mode 100644 index a4d1b26..0000000 --- a/bundles/ng2-resource-rest.js +++ /dev/null @@ -1,1020 +0,0 @@ -!function(e){function r(e,r,o){return 4===arguments.length?t.apply(this,arguments):void n(e,{declarative:!0,deps:r,declare:o})}function t(e,r,t,o){n(e,{declarative:!1,deps:r,executingRequire:t,execute:o})}function n(e,r){r.name=e,e in v||(v[e]=r),r.normalizedDeps=r.deps}function o(e,r){if(r[e.groupIndex]=r[e.groupIndex]||[],-1==g.call(r[e.groupIndex],e)){r[e.groupIndex].push(e);for(var t=0,n=e.normalizedDeps.length;n>t;t++){var a=e.normalizedDeps[t],u=v[a];if(u&&!u.evaluated){var d=e.groupIndex+(u.declarative!=e.declarative);if(void 0===u.groupIndex||u.groupIndex=0;a--){for(var u=t[a],i=0;ia;a++){var d=t.importers[a];if(!d.locked)for(var i=0;ia;a++){var l,s=r.normalizedDeps[a],c=v[s],f=y[s];f?l=f.exports:c&&!c.declarative?l=c.esModule:c?(d(c),f=c.module,l=f.exports):l=p(s),f&&f.importers?(f.importers.push(t),t.dependencies.push(f)):t.dependencies.push(null),t.setters[a]&&t.setters[a](l)}}}function i(e){var r,t=v[e];if(t)t.declarative?f(e,[]):t.evaluated||l(t),r=t.module.exports;else if(r=p(e),!r)throw new Error("Unable to load dependency "+e+".");return(!t||t.declarative)&&r&&r.__useDefault?r["default"]:r}function l(r){if(!r.module){var t={},n=r.module={exports:t,id:r.name};if(!r.executingRequire)for(var o=0,a=r.normalizedDeps.length;a>o;o++){var u=r.normalizedDeps[o],d=v[u];d&&l(d)}r.evaluated=!0;var c=r.execute.call(e,function(e){for(var t=0,n=r.deps.length;n>t;t++)if(r.deps[t]==e)return i(r.normalizedDeps[t]);throw new TypeError("Module "+e+" not declared as a dependency.")},t,n);void 0!==typeof c&&(n.exports=c),t=n.exports,t&&t.__esModule?r.esModule=t:r.esModule=s(t)}}function s(r){var t={};if(("object"==typeof r||"function"==typeof r)&&r!==e)if(m)for(var n in r)"default"!==n&&c(t,r,n);else{var o=r&&r.hasOwnProperty;for(var n in r)"default"===n||o&&!r.hasOwnProperty(n)||(t[n]=r[n])}return t["default"]=r,x(t,"__useDefault",{value:!0}),t}function c(e,r,t){try{var n;(n=Object.getOwnPropertyDescriptor(r,t))&&x(e,t,n)}catch(o){return e[t]=r[t],!1}}function f(r,t){var n=v[r];if(n&&!n.evaluated&&n.declarative){t.push(r);for(var o=0,a=n.normalizedDeps.length;a>o;o++){var u=n.normalizedDeps[o];-1==g.call(t,u)&&(v[u]?f(u,t):p(u))}n.evaluated||(n.evaluated=!0,n.module.execute.call(e))}}function p(e){if(I[e])return I[e];if("@node/"==e.substr(0,6))return I[e]=s(D(e.substr(6)));var r=v[e];if(!r)throw"Module "+e+" not present.";return a(e),f(e,[]),v[e]=void 0,r.declarative&&x(r.module.exports,"__esModule",{value:!0}),I[e]=r.declarative?r.module.exports:r.esModule}var v={},g=Array.prototype.indexOf||function(e){for(var r=0,t=this.length;t>r;r++)if(this[r]===e)return r;return-1},m=!0;try{Object.getOwnPropertyDescriptor({a:0},"a")}catch(h){m=!1}var x;!function(){try{Object.defineProperty({},"a",{})&&(x=Object.defineProperty)}catch(e){x=function(e,r,t){try{e[r]=t.value||t.get.call(e)}catch(n){}}}}();var y={},D="undefined"!=typeof System&&System._nodeRequire||"undefined"!=typeof require&&require.resolve&&"undefined"!=typeof process&&require,I={"@empty":{}};return function(e,n,o,a){return function(u){u(function(u){for(var d={_nodeRequire:D,register:r,registerDynamic:t,get:p,set:function(e,r){I[e]=r},newModule:function(e){return e}},i=0;i1)for(var i=1;ir;r++)if(this[r]===e)return r;return-1},s=["_g","sessionStorage","localStorage","clipboardData","frames","frameElement","external","mozAnimationStartTime","webkitStorageInfo","webkitIndexedDB","mozInnerScreenY","mozInnerScreenX"];i.set("@@global-helpers",i.newModule({prepareGlobal:function(r,t,i){var a=e.define;e.define=void 0;var l;if(i){l={};for(var s in i)l[s]=e[s],e[s]=i[s]}return t||(f={},o(function(e,r){f[e]=r})),function(){var r;if(t)r=n(t);else{r={};var i,s;o(function(e,n){f[e]!==n&&"undefined"!=typeof n&&(r[e]=n,"undefined"!=typeof i?s||i===n||(s=!0):i=n)}),r=s?r:i}if(l)for(var u in l)e[u]=l[u];return e.define=a,r}}}))}("undefined"!=typeof self?self:global); -$__System.registerDynamic("2", [], false, function ($__require, $__exports, $__module) { - var _retrieveGlobal = $__System.get("@@global-helpers").prepareGlobal($__module.id, null, null); - - (function ($__global) {})(this); - - return _retrieveGlobal(); -}); -$__System.register("3", ["4", "5", "6"], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var http_1, Resource_1, ResourceAction_1; - var __extends, __decorate, __metadata, ResourceCRUD; - return { - setters:[ - function (http_1_1) { - http_1 = http_1_1; - }, - function (Resource_1_1) { - Resource_1 = Resource_1_1; - }, - function (ResourceAction_1_1) { - ResourceAction_1 = ResourceAction_1_1; - }], - execute: function() { - __extends = (this && this.__extends) || function (d, b) { - for (var p in b) - if (b.hasOwnProperty(p)) - d[p] = b[p]; - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; - __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") - r = Reflect.decorate(decorators, target, key, desc); - else - for (var i = decorators.length - 1; i >= 0; i--) - if (d = decorators[i]) - r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; - }; - __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") - return Reflect.metadata(k, v); - }; - exports_1("ResourceCRUD", ResourceCRUD = (function (_super) { - __extends(ResourceCRUD, _super); - function ResourceCRUD() { - _super.apply(this, arguments); - } - // Alias to save - ResourceCRUD.prototype.create = function (data, callback) { - return this.save(data, callback); - }; - __decorate([ - ResourceAction_1.ResourceAction({ - isArray: true - }), - __metadata('design:type', Function) - ], ResourceCRUD.prototype, "query", void 0); - __decorate([ - ResourceAction_1.ResourceAction({ - path: '/{!id}' - }), - __metadata('design:type', Function) - ], ResourceCRUD.prototype, "get", void 0); - __decorate([ - ResourceAction_1.ResourceAction({ - method: http_1.RequestMethod.Post - }), - __metadata('design:type', Function) - ], ResourceCRUD.prototype, "save", void 0); - __decorate([ - ResourceAction_1.ResourceAction({ - method: http_1.RequestMethod.Put, - path: '/{!id}' - }), - __metadata('design:type', Function) - ], ResourceCRUD.prototype, "update", void 0); - __decorate([ - ResourceAction_1.ResourceAction({ - method: http_1.RequestMethod.Delete, - path: '/{!id}' - }), - __metadata('design:type', Function) - ], ResourceCRUD.prototype, "remove", void 0); - return ResourceCRUD; - }(Resource_1.Resource))); - } - } -}); - -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VDUlVELmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiUmVzb3VyY2VDUlVELmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7UUFBSSxTQUFTLEVBS1QsVUFBVSxFQU1WLFVBQVUsRUFNSCxZQUFZOzs7Ozs7Ozs7Ozs7O1lBakJuQixTQUFTLEdBQUcsQ0FBQyxJQUFJLElBQUksSUFBSSxDQUFDLFNBQVMsQ0FBQyxJQUFJLFVBQVUsQ0FBQyxFQUFFLENBQUM7Z0JBQ3RELEdBQUcsQ0FBQyxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQztvQkFBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3RELGdCQUFnQixJQUFJLENBQUMsV0FBVyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZDLENBQUMsQ0FBQyxTQUFTLEdBQUcsQ0FBQyxLQUFLLElBQUksR0FBRyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLFNBQVMsR0FBRyxDQUFDLENBQUMsU0FBUyxFQUFFLElBQUksRUFBRSxFQUFFLENBQUMsQ0FBQztZQUN6RixDQUFDLENBQUM7WUFDRSxVQUFVLEdBQUcsQ0FBQyxJQUFJLElBQUksSUFBSSxDQUFDLFVBQVUsQ0FBQyxJQUFJLFVBQVUsVUFBVSxFQUFFLE1BQU0sRUFBRSxHQUFHLEVBQUUsSUFBSTtnQkFDakYsSUFBSSxDQUFDLEdBQUcsU0FBUyxDQUFDLE1BQU0sRUFBRSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxNQUFNLEdBQUcsSUFBSSxLQUFLLElBQUksR0FBRyxJQUFJLEdBQUcsTUFBTSxDQUFDLHdCQUF3QixDQUFDLE1BQU0sRUFBRSxHQUFHLENBQUMsR0FBRyxJQUFJLEVBQUUsQ0FBQyxDQUFDO2dCQUM3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 -$__System.register("5", ["7"], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var ResourceGlobalConfig_1; - var Resource; - return { - setters:[ - function (ResourceGlobalConfig_1_1) { - ResourceGlobalConfig_1 = ResourceGlobalConfig_1_1; - }], - execute: function() { - exports_1("Resource", Resource = (function () { - function Resource(http, injector) { - this.http = http; - this.injector = injector; - this._url = null; - this._path = null; - this._headers = null; - this._params = null; - this._data = null; - if (this.constructor.model) { - this.constructor.model.resourceInstance = this; - } - } - /** - * Get main url of the resource - * @returns {string|Promise} - */ - Resource.prototype.getUrl = function () { - return this._url || this._getUrl() || ResourceGlobalConfig_1.ResourceGlobalConfig.url || ''; - }; - /** - * Set resource url - * @param url - */ - Resource.prototype.setUrl = function (url) { - this._url = url; - }; - /** - * Get path of the resource - * @returns {string|Promise} - */ - Resource.prototype.getPath = function () { - return this._path || this._getPath() || ResourceGlobalConfig_1.ResourceGlobalConfig.path || ''; - }; - /** - * Set resource path - * @param path - */ - Resource.prototype.setPath = function (path) { - this._path = path; - }; - /** - * Get headers - * @returns {any|Promise} - */ - Resource.prototype.getHeaders = function () { - return this._headers || this._getHeaders() || ResourceGlobalConfig_1.ResourceGlobalConfig.headers || {}; - }; - /** - * Set resource headers - * @param headers - */ - Resource.prototype.setHeaders = function (headers) { - this._headers = headers; - }; - /** - * Get default params - * @returns {any|Promise|{}} - */ - Resource.prototype.getParams = function () { - return this._params || this._getParams() || ResourceGlobalConfig_1.ResourceGlobalConfig.params || {}; - }; - /** - * Set default resource params - * @param params - */ - Resource.prototype.setParams = function (params) { - this._params = params; - }; - /** - * Get default data - * @returns {any|Promise|{}} - */ - Resource.prototype.getData = function () { - return this._data || this._getData() || ResourceGlobalConfig_1.ResourceGlobalConfig.data || {}; - }; - /** - * Set default resource params - * @param data - */ - Resource.prototype.setData = function (data) { - this._data = data; - }; - /** - * That is called before executing request - * @param req - */ - Resource.prototype.requestInterceptor = function (req) { - return req; - }; - /** - * Request observable interceptor - * @param observable - * @returns {Observable} - */ - Resource.prototype.responseInterceptor = function (observable, req) { - return observable.map(function (res) { return res._body ? res.json() : null; }); - }; - Resource.prototype.removeTrailingSlash = function () { - return true; - }; - Resource.prototype.map = function (item) { - return item; - }; - Resource.prototype.filter = function (item) { - return true; - }; - Resource.prototype._getUrl = function () { - return null; - }; - Resource.prototype._getPath = function () { - return null; - }; - Resource.prototype._getHeaders = function () { - return null; - }; - Resource.prototype._getParams = function () { - return null; - }; - Resource.prototype._getData = function () { - return null; - }; - Resource.prototype._getResourceOptions = function () { - return null; - }; - return Resource; - }())); - } - } -}); - -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2UuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJSZXNvdXJjZS5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O1FBQ1csUUFBUTs7Ozs7OztZQUFSLHNCQUFBLFFBQVEsR0FBRyxDQUFDO2dCQUNuQixrQkFBa0IsSUFBSSxFQUFFLFFBQVE7b0JBQzVCLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO29CQUNqQixJQUFJLENBQUMsUUFBUSxHQUFHLFFBQVEsQ0FBQztvQkFDekIsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUM7b0JBQ2pCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO29CQUNsQixJQUFJLENBQUMsUUFBUSxHQUFHLElBQUksQ0FBQztvQkFDckIsSUFBSSxDQUFDLE9BQU8sR0FBRyxJQUFJLENBQUM7b0JBQ3BCLElBQUksQ0FBQyxLQUFLLEdBQUcsSUFBSSxDQUFDO29CQUNsQixFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsV0FBVyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7d0JBQ3pCLElBQUksQ0FBQyxXQUFXLENBQUMsS0FBSyxDQUFDLGdCQUFnQixHQUFHLElBQUksQ0FBQztvQkFDbkQsQ0FBQztnQkFDTCxDQUFDO2dCQUNEOzs7bUJBR0c7Z0JBQ0gsUUFBUSxDQUFDLFNBQVMsQ0FBQyxNQUFNLEdBQUc7b0JBQ3hCLE1BQU0sQ0FBQyxJQUFJLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxPQUFPLEVBQUUsSUFBSSwyQ0FBb0IsQ0FBQyxHQUFHLElBQUksRUFBRSxDQUFDO2dCQUN6RSxDQUFDLENBQUM7Z0JBQ0Y7OzttQkFHRztnQkFDSCxRQUFRLENBQUMsU0FBUyxDQUFDLE1BQU0sR0FBRyxVQUFVLEdBQUc7b0JBQ3JDLElBQUksQ0FBQyxJQUFJLEdBQUcsR0FBRyxDQUFDO2dCQUNwQixDQUFDLENBQUM7Z0JBQ0Y7OzttQkFHRztnQkFDSCxRQUFRLENBQUMsU0FBUyxDQUFDLE9BQU8sR0FB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 -$__System.register("8", ["4", "5", "6"], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var http_1, Resource_1, ResourceAction_1; - var __extends, __decorate, __metadata, ResourceCRUDBase; - return { - setters:[ - function (http_1_1) { - http_1 = http_1_1; - }, - function (Resource_1_1) { - Resource_1 = Resource_1_1; - }, - function (ResourceAction_1_1) { - ResourceAction_1 = ResourceAction_1_1; - }], - execute: function() { - __extends = (this && this.__extends) || function (d, b) { - for (var p in b) - if (b.hasOwnProperty(p)) - d[p] = b[p]; - function __() { this.constructor = d; } - d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); - }; - __decorate = (this && this.__decorate) || function (decorators, target, key, desc) { - var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d; - if (typeof Reflect === "object" && typeof Reflect.decorate === "function") - r = Reflect.decorate(decorators, target, key, desc); - else - for (var i = decorators.length - 1; i >= 0; i--) - if (d = decorators[i]) - r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r; - return c > 3 && r && Object.defineProperty(target, key, r), r; - }; - __metadata = (this && this.__metadata) || function (k, v) { - if (typeof Reflect === "object" && typeof Reflect.metadata === "function") - return Reflect.metadata(k, v); - }; - exports_1("ResourceCRUDBase", ResourceCRUDBase = (function (_super) { - __extends(ResourceCRUDBase, _super); - function ResourceCRUDBase() { - _super.apply(this, arguments); - } - // Alias to save - ResourceCRUDBase.prototype.create = function (data, callback) { - return this.save(data, callback); - }; - __decorate([ - ResourceAction_1.ResourceAction({ - isArray: true - }), - __metadata('design:type', Function) - ], ResourceCRUDBase.prototype, "query", void 0); - __decorate([ - ResourceAction_1.ResourceAction(), - __metadata('design:type', Function) - ], ResourceCRUDBase.prototype, "get", void 0); - __decorate([ - ResourceAction_1.ResourceAction({ - method: http_1.RequestMethod.Post - }), - __metadata('design:type', Function) - ], ResourceCRUDBase.prototype, "save", void 0); - __decorate([ - ResourceAction_1.ResourceAction({ - method: http_1.RequestMethod.Put - }), - __metadata('design:type', Function) - ], ResourceCRUDBase.prototype, "update", void 0); - __decorate([ - ResourceAction_1.ResourceAction({ - method: http_1.RequestMethod.Delete - }), - __metadata('design:type', Function) - ], ResourceCRUDBase.prototype, "remove", void 0); - return ResourceCRUDBase; - }(Resource_1.Resource))); - } - } -}); - -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VDUlVEQmFzZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIlJlc291cmNlQ1JVREJhc2UuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztRQUFJLFNBQVMsRUFLVCxVQUFVLEVBTVYsVUFBVSxFQU1ILGdCQUFnQjs7Ozs7Ozs7Ozs7OztZQWpCdkIsU0FBUyxHQUFHLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxVQUFVLENBQUMsRUFBRSxDQUFDO2dCQUN0RCxHQUFHLENBQUMsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsQ0FBQzt3QkFBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN0RCxnQkFBZ0IsSUFBSSxDQUFDLFdBQVcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDO2dCQUN2QyxDQUFDLENBQUMsU0FBUyxHQUFHLENBQUMsS0FBSyxJQUFJLEdBQUcsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxTQUFTLEdBQUcsQ0FBQyxDQUFDLFNBQVMsRUFBRSxJQUFJLEVBQUUsRUFBRSxDQUFDLENBQUM7WUFDekYsQ0FBQyxDQUFDO1lBQ0UsVUFBVSxHQUFHLENBQUMsSUFBSSxJQUFJLElBQUksQ0FBQyxVQUFVLENBQUMsSUFBSSxVQUFVLFVBQVUsRUFBRSxNQUFNLEVBQUUsR0FBRyxFQUFFLElBQUk7Z0JBQ2pGLElBQUksQ0FBQyxHQUFHLFNBQVMsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLEdBQUcsTUFBTSxHQUFHLElBQUksS0FBSyxJQUFJLEdBQUcsSUFBSSxHQUFHLE1BQU0sQ0FBQyx3QkFBd0IsQ0FBQyxNQUFNLEVBQUUsR0FBRyxDQUFDLEdBQUcsSUFBSSxFQUFFLENBQUMs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 -$__System.register("7", [], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var ResourceGlobalConfig; - return { - setters:[], - execute: function() { - exports_1("ResourceGlobalConfig", ResourceGlobalConfig = (function () { - function ResourceGlobalConfig() { - } - ResourceGlobalConfig.url = null; - ResourceGlobalConfig.path = null; - ResourceGlobalConfig.headers = { - 'Accept': 'application/json', - 'Content-Type': 'application/json' - }; - ResourceGlobalConfig.params = null; - ResourceGlobalConfig.data = null; - return ResourceGlobalConfig; - }())); - } - } -}); - -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VHbG9iYWxDb25maWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJSZXNvdXJjZUdsb2JhbENvbmZpZy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7UUFBVyxvQkFBb0I7Ozs7WUFBcEIsa0NBQUEsb0JBQW9CLEdBQUcsQ0FBQztnQkFDL0I7Z0JBQ0EsQ0FBQztnQkFDRCxvQkFBb0IsQ0FBQyxHQUFHLEdBQUcsSUFBSSxDQUFDO2dCQUNoQyxvQkFBb0IsQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDO2dCQUNqQyxvQkFBb0IsQ0FBQyxPQUFPLEdBQUc7b0JBQzNCLFFBQVEsRUFBRSxrQkFBa0I7b0JBQzVCLGNBQWMsRUFBRSxrQkFBa0I7aUJBQ3JDLENBQUM7Z0JBQ0Ysb0JBQW9CLENBQUMsTUFBTSxHQUFHLElBQUksQ0FBQztnQkFDbkMsb0JBQW9CLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQztnQkFDakMsTUFBTSxDQUFDLG9CQUFvQixDQUFDO1lBQ2hDLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQzs7OztBQUNMLHNtQ0FBc21DIn0= -$__System.register("6", ["4", "9", "a"], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var http_1, Rx_1, core_1; - function ResourceAction(methodOptions) { - methodOptions = methodOptions || {}; - if (methodOptions.method === undefined) { - methodOptions.method = http_1.RequestMethod.Get; - } - if (methodOptions.useModel === undefined) { - methodOptions.useModel = true; - } - return function (target, propertyKey) { - target[propertyKey] = function () { - var _this = this; - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i - 0] = arguments[_i]; - } - var resourceOptions = this._getResourceOptions(); - var isGetRequest = methodOptions.method === http_1.RequestMethod.Get; - var ret; - var resourceModel; - if (methodOptions.useModel) { - if (this.constructor.hasOwnProperty('getResourceModel') && !methodOptions.model) { - resourceModel = this.constructor.getResourceModel(args); - } - else { - resourceModel = methodOptions.model || this.constructor['model']; - } - } - if (resourceModel && !methodOptions.isArray) { - ret = resourceModel.create({}, false); - } - else if (methodOptions.isLazy) { - ret = {}; - } - else { - ret = methodOptions.isArray ? [] : {}; - } - var mainDeferredSubscriber = null; - var mainObservable = null; - ret.$resolved = false; - ret.$observable = Rx_1.Observable.create(function (subscriber) { - mainDeferredSubscriber = subscriber; - }).flatMap(function () { return mainObservable; }); - ret.$abortRequest = function () { - ret.$resolved = true; - }; - function releaseMainDeferredSubscriber() { - if (mainDeferredSubscriber) { - mainDeferredSubscriber.next(); - mainDeferredSubscriber.complete(); - mainDeferredSubscriber = null; - } - } - if (!methodOptions.isLazy) { - ret.$observable = ret.$observable.publish(); - ret.$observable.connect(); - } - Promise.all([ - Promise.resolve(methodOptions.url || this.getUrl()), - Promise.resolve(methodOptions.path || this.getPath()), - Promise.resolve(methodOptions.headers || this.getHeaders()), - Promise.resolve(methodOptions.params || this.getParams()), - Promise.resolve(methodOptions.data || this.getData()) - ]) - .then(function (dataAll) { - if (ret.$resolved) { - mainObservable = Rx_1.Observable.create(function (observer) { - observer.next(null); - }); - releaseMainDeferredSubscriber(); - } - var url = dataAll[0] + dataAll[1]; - var headers = new http_1.Headers(dataAll[2]); - var defPathParams = dataAll[3]; - var data = args.length ? args[0] : null; - var callback = args.length > 1 ? args[1] : null; - if (typeof data === 'function') { - if (!callback) { - callback = data; - data = null; - } - else if (typeof callback !== 'function') { - var tmpData = callback; - callback = data; - data = tmpData; - } - else { - data = null; - } - } - var usedPathParams = {}; - if (!Array.isArray(data)) { - data = Object.assign({}, dataAll[4], data); - var pathParams = url.match(/{([^}]*)}/g) || []; - var _loop_1 = function (i) { - var pathParam = pathParams[i]; - var pathKey = pathParam.substr(1, pathParam.length - 2); - var isMandatory = pathKey[0] === '!'; - if (isMandatory) { - pathKey = pathKey.substr(1); - } - var isGetOnly = pathKey[0] === ':'; - if (isGetOnly) { - pathKey = pathKey.substr(1); - } - var value = getValueForPath(pathKey, defPathParams, data, usedPathParams); - if (isGetOnly) { - delete data[pathKey]; - } - if (isNullOrUndefined(value)) { - if (isMandatory) { - var consoleMsg_1 = "Mandatory " + pathParam + " path parameter is missing"; - mainObservable = Rx_1.Observable.create(function (observer) { - observer.error(new Error(consoleMsg_1)); - }); - console.warn(consoleMsg_1); - releaseMainDeferredSubscriber(); - return { value: void 0 }; - } - url = url.substr(0, url.indexOf(pathParam)); - return "break"; - } - // Replacing in the url - url = url.replace(pathParam, value); - }; - for (var i = 0; i < pathParams.length; i++) { - var state_1 = _loop_1(i); - if (typeof state_1 === "object") - return state_1.value; - if (state_1 === "break") - break; - } - } - // Removing double slashed from final url - url = url.replace(/\/\/+/g, '/'); - if (url.startsWith('http')) { - url = url.replace(':/', '://'); - } - // Remove trailing slash - if (typeof methodOptions.removeTrailingSlash === 'undefined') { - methodOptions.removeTrailingSlash = _this.removeTrailingSlash(); - } - if (methodOptions.removeTrailingSlash) { - while (url[url.length - 1] === '/') { - url = url.substr(0, url.length - 1); - } - } - // Remove mapped params - for (var key in defPathParams) { - if (defPathParams[key][0] === '@') { - delete defPathParams[key]; - } - } - // Default search params or data - var body = null; - var searchParams; - if (isGetRequest) { - // GET - searchParams = Object.assign({}, defPathParams, data); - } - else { - // NON GET - if (data) { - body = JSON.stringify(data); - } - searchParams = defPathParams; - } - // Setting search params - var search = new http_1.URLSearchParams(); - for (var key in searchParams) { - if (!usedPathParams[key]) { - var value = searchParams[key]; - if (Array.isArray(value)) { - for (var _i = 0, value_1 = value; _i < value_1.length; _i++) { - var arr_value = value_1[_i]; - search.append(key, arr_value); - } - } - else { - if (typeof value === 'object') { - /// Convert dates to ISO format string - if (value instanceof Date) { - value = value.toISOString(); - } - else { - value = JSON.stringify(value); - } - } - search.append(key, value); - } - } - } - // Adding TS if needed - var tsName = methodOptions.addTimestamp || resourceOptions.addTimestamp; - if (tsName) { - if (tsName === true) { - tsName = 'ts'; - } - search.append(tsName, '' + new Date().getTime()); - } - // Removing Content-Type header if no body - if (!body) { - headers.delete('content-type'); - } - // Creating request options - var requestOptions = new http_1.RequestOptions({ - method: methodOptions.method, - headers: headers, - body: body, - url: url, - search: search, - withCredentials: methodOptions.withCredentials || resourceOptions.withCredentials - }); - // Creating request object - var req = new http_1.Request(requestOptions); - req = methodOptions.requestInterceptor ? - methodOptions.requestInterceptor(req) : - _this.requestInterceptor(req); - if (!req) { - mainObservable = Rx_1.Observable.create(function (observer) { - observer.error(new Error('Request is null')); - }); - console.warn('Request is null'); - releaseMainDeferredSubscriber(); - return; - } - // Doing the request - var requestObservable = _this.http.request(req); - // noinspection TypeScriptValidateTypes - requestObservable = methodOptions.responseInterceptor ? - methodOptions.responseInterceptor(requestObservable, req) : - _this.responseInterceptor(requestObservable, req); - if (methodOptions.isLazy) { - mainObservable = requestObservable; - } - else { - mainObservable = Rx_1.Observable.create(function (subscriber) { - var reqSubscr = requestObservable.subscribe(function (resp) { - if (resp !== null) { - var map = methodOptions.map ? methodOptions.map : _this.map; - var filter = methodOptions.filter ? methodOptions.filter : _this.filter; - if (methodOptions.isArray) { - if (!Array.isArray(resp)) { - console.error('Returned data should be an array. Received', resp); - } - else { - var result = resp.filter(filter).map(map); - result = !!resourceModel ? mapToModel.bind(_this)(result, resourceModel) : result; - Array.prototype.push.apply(ret, result); - } - } - else { - if (Array.isArray(resp)) { - console.error('Returned data should be an object. Received', resp); - } - else { - if (filter(resp)) { - if (!!resourceModel) { - ret.$fillFromObject(map(resp)); - } - else { - Object.assign(ret, map(resp)); - } - } - } - } - } - subscriber.next(resp); - }, function (err) { return subscriber.error(err); }, function () { - ret.$resolved = true; - subscriber.complete(); - if (callback) { - callback(ret); - } - }); - ret.$abortRequest = function () { - if (ret.$resolved) { - return; - } - reqSubscr.unsubscribe(); - ret.$resolved = true; - }; - }); - } - releaseMainDeferredSubscriber(); - }); - if (resourceModel) { - ret.$observable = ret.$observable.map(function (resp) { - return mapToModel.bind(_this)(resp, resourceModel); - }); - } - return ret; - }; - }; - } - exports_1("ResourceAction", ResourceAction); - function mapToModel(resp, model) { - var modelProviders = Reflect.getMetadata('providers', model) || []; - var providers = core_1.ReflectiveInjector.resolve(modelProviders); - var injector = core_1.ReflectiveInjector.fromResolvedProviders(providers, this.injector); - var properties = Reflect.getMetadata('design:paramtypes', model) || []; - var injection = []; - for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) { - var property = properties_1[_i]; - injection.push(injector.get(property)); - } - var result; - if (Array.isArray(resp)) { - result = []; - for (var _a = 0, resp_1 = resp; _a < resp_1.length; _a++) { - var item = resp_1[_a]; - var modelInstance = new (model.bind.apply(model, [void 0].concat(injection)))().$fillFromObject(item); - modelInstance.$resource = this; - result.push(modelInstance); - } - } - else { - result = new (model.bind.apply(model, [void 0].concat(injection)))().$fillFromObject(resp); - result.$resource = this; - } - return result; - } - exports_1("mapToModel", mapToModel); - function getValueForPath(key, params, data, usedPathParams) { - if (!isNullOrUndefined(data[key]) && typeof data[key] !== 'object') { - usedPathParams[key] = true; - return data[key]; - } - if (isNullOrUndefined(params[key])) { - return null; - } - if (params[key][0] === '@') { - return getValueForPath(params[key].substr(1), params, data, usedPathParams); - } - usedPathParams[key] = true; - return params[key]; - } - function isNullOrUndefined(value) { - return value === null || value === undefined; - } - return { - setters:[ - function (http_1_1) { - http_1 = http_1_1; - }, - function (Rx_1_1) { - Rx_1 = Rx_1_1; - }, - function (core_1_1) { - core_1 = core_1_1; - }], - execute: function() { - } - } -}); - -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"ResourceAction.js","sourceRoot":"","sources":["ResourceAction.js"],"names":[],"mappings":"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"} -$__System.register("b", ["6"], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var ResourceAction_1; - var ResourceModel; - function ResourceModelParams(params) { - return function (target) { - var providers = []; - if (params) { - providers = params.providers || []; - } - Reflect.defineMetadata('providers', providers, target); - }; - } - exports_1("ResourceModelParams", ResourceModelParams); - return { - setters:[ - function (ResourceAction_1_1) { - ResourceAction_1 = ResourceAction_1_1; - }], - execute: function() { - exports_1("ResourceModel", ResourceModel = (function () { - function ResourceModel() { - this.$primaryKey = 'id'; - } - ResourceModel.create = function (data, commit) { - if (data === void 0) { - data = {}; - } - if (commit === void 0) { - commit = true; - } - if (!this.resourceInstance) { - console.error('You should first instantiate Resource by injecting.'); - } - var result = ResourceAction_1.mapToModel.bind(this.resourceInstance)(data, this); - if (commit) { - result = result.$save(); - } - return result; - }; - ResourceModel.prototype.$fillFromObject = function (_object) { - for (var propName in _object) { - this[propName] = _object[propName]; - } - return this; - }; - ResourceModel.prototype.$getData = function () { - var _object = {}; - for (var propName in this) { - if (!(this[propName] instanceof Function) && !(propName.charAt(0) === '$')) { - _object[propName] = this[propName]; - } - } - return _object; - }; - ResourceModel.prototype.$save = function () { - if (this[this.$primaryKey]) { - return this.$update(); - } - else { - return this.$create(); - } - }; - ResourceModel.prototype.$update = function () { - return this.$resource_method('update'); - }; - ResourceModel.prototype.$remove = function () { - return this.$resource_method('remove'); - }; - ResourceModel.prototype.$resource_method = function (method_name) { - var _this = this; - var _method = this.$resource[method_name]; - if (!_method) { - console.error("Your Resource has no implemented " + method_name + " method."); - return this; - } - var data = (method_name === 'remove') ? { id: this[this.$primaryKey] } : this.$getData(); - var result = _method.bind(this.$resource)(data); - this.$resolved = result.$resolved; - this.$observable = result.$observable; - this.$abortRequest = result.$abortRequest; - this.$observable.subscribe(function (resp) { - _this.$fillFromObject(resp.$getData()); - }); - return this; - }; - ResourceModel.prototype.$create = function () { - return this.$resource_method('create'); - }; - return ResourceModel; - }())); - } - } -}); - -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VNb2RlbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIlJlc291cmNlTW9kZWwuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7OztRQVVXLGFBQWE7SUFUeEIsNkJBQW9DLE1BQU07UUFDdEMsTUFBTSxDQUFDLFVBQVUsTUFBTTtZQUNuQixJQUFJLFNBQVMsR0FBRyxFQUFFLENBQUM7WUFDbkIsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDVCxTQUFTLEdBQUcsTUFBTSxDQUFDLFNBQVMsSUFBSSxFQUFFLENBQUM7WUFDdkMsQ0FBQztZQUNELE9BQU8sQ0FBQyxjQUFjLENBQUMsV0FBVyxFQUFFLFNBQVMsRUFBRSxNQUFNLENBQUMsQ0FBQztRQUMzRCxDQUFDLENBQUM7SUFDTixDQUFDO0lBUkQscURBUUMsQ0FBQTs7Ozs7OztZQUNVLDJCQUFBLGFBQWEsR0FBRyxDQUFDO2dCQUN4QjtvQkFDSSxJQUFJLENBQUMsV0FBVyxHQUFHLElBQUksQ0FBQztnQkFDNUIsQ0FBQztnQkFDRCxhQUFhLENBQUMsTUFBTSxHQUFHLFVBQVUsSUFBSSxFQUFFLE1BQU07b0JBQ3pDLEVBQUUsQ0FBQyxDQUFDLElBQUksS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQUMsSUFBSSxHQUFHLEVBQUUsQ0FBQztvQkFBQyxDQUFDO29CQUNuQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUFDLE1BQU0sR0FBRyxJQUFJLENBQUM7b0JBQUMsQ0FBQztvQkFDekMsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsQ0FBQyxDQUFDO3dCQUN6QixPQUFPLENBQUMsS0FBSyxDQUFDLHFEQUFxRCxDQUFDLENBQUM7b0JBQ3pFLENBQUM7b0JBQ0QsSUFBSSxNQUFNLEdBQUcsMkJBQVUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLGdCQUFnQixDQUFDLENB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 -$__System.register("c", ["a", "4"], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var core_1, http_1; - var ResourceProviders; - return { - setters:[ - function (core_1_1) { - core_1 = core_1_1; - }, - function (http_1_1) { - http_1 = http_1_1; - }], - execute: function() { - exports_1("ResourceProviders", ResourceProviders = (function () { - function ResourceProviders() { - } - ResourceProviders.add = function (resource, subSet) { - if (subSet === void 0) { - subSet = null; - } - if (!subSet) { - subSet = this.mainProvidersName; - } - if (!this.providers[subSet]) { - this.providers[subSet] = []; - } - var deps = Reflect.getMetadata('design:paramtypes', resource); - if (deps.length === 0) { - deps = [http_1.Http, core_1.Injector]; - } - this.providers[subSet].push({ - provide: resource, - useFactory: function () { - var args = []; - for (var _i = 0; _i < arguments.length; _i++) { - args[_i - 0] = arguments[_i]; - } - return new (resource.bind.apply(resource, [void 0].concat(args)))(); - }, - deps: deps - }); - }; - ResourceProviders.get = function (subSet) { - if (subSet === void 0) { - subSet = null; - } - if (!subSet) { - subSet = this.mainProvidersName; - } - return this.providers[subSet] || []; - }; - ResourceProviders.mainProvidersName = '__mainProviders'; - ResourceProviders.providers = { - __mainProviders: [] - }; - return ResourceProviders; - }())); - } - } -}); - -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VQcm92aWRlcnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJSZXNvdXJjZVByb3ZpZGVycy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O1FBRVcsaUJBQWlCOzs7Ozs7Ozs7O1lBQWpCLCtCQUFBLGlCQUFpQixHQUFHLENBQUM7Z0JBQzVCO2dCQUNBLENBQUM7Z0JBQ0QsaUJBQWlCLENBQUMsR0FBRyxHQUFHLFVBQVUsUUFBUSxFQUFFLE1BQU07b0JBQzlDLEVBQUUsQ0FBQyxDQUFDLE1BQU0sS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQUMsTUFBTSxHQUFHLElBQUksQ0FBQztvQkFBQyxDQUFDO29CQUN6QyxFQUFFLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7d0JBQ1YsTUFBTSxHQUFHLElBQUksQ0FBQyxpQkFBaUIsQ0FBQztvQkFDcEMsQ0FBQztvQkFDRCxFQUFFLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUMxQixJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsQ0FBQztvQkFDaEMsQ0FBQztvQkFDRCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLG1CQUFtQixFQUFFLFFBQVEsQ0FBQyxDQUFDO29CQUM5RCxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUM7d0JBQ3BCLElBQUksR0FBRyxDQUFDLFdBQUksRUFBRSxlQUFRLENBQUMsQ0FBQztvQkFDNUIsQ0FBQztvQkFDRCxJQUFJLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQzt3QkFDeEIsT0FBTyxFQUFFLFFBQVE7d0JBQ2pCLFVBQVUsRUFBRTs0QkFDUixJQUFJLElBQUksR0FBRyxFQUFFLENBQUM7NEJBQ2QsR0FBRyxDQUFDLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxFQUFFLEVBQUUsR0FBRyxTQUFTLENBQUMsTUFBTSxFQUFFLEVBQUUsRUFBRSxFQUFFLENBQUM7Z0NBQzNDLElBQUksQ0FBQyxFQUFFLEdBQUcsQ0FBQyxDQUFDLEdBQUcsU0FBUyxDQUFDLEVBQUUsQ0FBQyxDQUFDOzRCQUNqQyxDQUFDOzRCQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxLQUFLLENBQUMsUUFBUSxFQUFFLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7d0JBQ3hFLENBQUM7d0JBQ0QsSUFBSSxFQUFFLElBQUk7cUJBQ2IsQ0FBQyxDQUFDO2dCQUNQLENBQUMsQ0FBQztnQkFDRixpQkFBaUIsQ0FBQyxHQUFHLEdBQUcsVUFBVSxNQUFNO29CQUNwQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUFDLE1BQU0sR0FBRyxJQUFJLENBQUM7b0JBQUMsQ0FBQztvQkFDekMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO3dCQUNWLE1BQU0sR0FBRyxJQUFJLENBQUMsaUJBQWlCLENBQUM7b0JBQ3BDLENBQUM7b0JBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxDQUFDO2dCQUN4QyxDQUFDLENBQUM7Z0JBQ0YsaUJBQWlCLENBQUMsaUJBQWlCLEdBQUcsaUJBQWlCLENBQUM7Z0JBQ3hELGlCQUFpQixDQUFDLFNBQVMsR0FBRztvQkFDMUIsZUFBZSxFQUFFLEVBQUU7aUJBQ3RCLENBQUM7Z0JBQ0YsTUFBTSxDQUFDLGlCQUFpQixDQUFDO1lBQzdCLENBQUMsRUFBRSxDQUFDLENBQUEsQ0FBQzs7OztBQUNMLDh0R0FBOHRHIn0= -$__System.register("d", ["c"], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var ResourceProviders_1; - function ResourceParams(params) { - if (params === void 0) { - params = {}; - } - return function (target) { - target.prototype._getResourceOptions = function () { - return params; - }; - if (params.add2Provides !== false) { - ResourceProviders_1.ResourceProviders.add(target, params.providersSubSet); - } - if (typeof params.removeTrailingSlash !== 'undefined') { - target.prototype.removeTrailingSlash = function () { - return !!params.removeTrailingSlash; - }; - } - if (params.url) { - target.prototype._getUrl = function () { - return params.url; - }; - } - if (params.path) { - target.prototype._getPath = function () { - return params.path; - }; - } - if (params.headers) { - target.prototype._getHeaders = function () { - return params.headers; - }; - } - if (params.params) { - target.prototype._getParams = function () { - return params.params; - }; - } - if (params.data) { - target.prototype._getData = function () { - return params.data; - }; - } - }; - } - exports_1("ResourceParams", ResourceParams); - return { - setters:[ - function (ResourceProviders_1_1) { - ResourceProviders_1 = ResourceProviders_1_1; - }], - execute: function() { - } - } -}); - -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVzb3VyY2VQYXJhbXMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJSZXNvdXJjZVBhcmFtcy5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0lBQ0Esd0JBQStCLE1BQU07UUFDakMsRUFBRSxDQUFDLENBQUMsTUFBTSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUFDLE1BQU0sR0FBRyxFQUFFLENBQUM7UUFBQyxDQUFDO1FBQ3ZDLE1BQU0sQ0FBQyxVQUFVLE1BQU07WUFDbkIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxtQkFBbUIsR0FBRztnQkFDbkMsTUFBTSxDQUFDLE1BQU0sQ0FBQztZQUNsQixDQUFDLENBQUM7WUFDRixFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsWUFBWSxLQUFLLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ2hDLHFDQUFpQixDQUFDLEdBQUcsQ0FBQyxNQUFNLEVBQUUsTUFBTSxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQzFELENBQUM7WUFDRCxFQUFFLENBQUMsQ0FBQyxPQUFPLE1BQU0sQ0FBQyxtQkFBbUIsS0FBSyxXQUFXLENBQUMsQ0FBQyxDQUFDO2dCQUNwRCxNQUFNLENBQUMsU0FBUyxDQUFDLG1CQUFtQixHQUFHO29CQUNuQyxNQUFNLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxtQkFBbUIsQ0FBQztnQkFDeEMsQ0FBQyxDQUFDO1lBQ04sQ0FBQztZQUNELEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUNiLE1BQU0sQ0FBQyxTQUFTLENBQUMsT0FBTyxHQUFHO29CQUN2QixNQUFNLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQztnQkFDdEIsQ0FBQyxDQUFDO1lBQ04sQ0FBQztZQUNELEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO2dCQUNkLE1BQU0sQ0FBQyxTQUFTLENBQUMsUUFBUSxHQUFHO29CQUN4QixNQUFNLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQztnQkFDdkIsQ0FBQyxDQUFDO1lBQ04sQ0FBQztZQUNELEVBQUUsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDO2dCQUNqQixNQUFNLENBQUMsU0FBUyxDQUFDLFdBQVcsR0FBRztvQkFDM0IsTUFBTSxDQUFDLE1BQU0sQ0FBQyxPQUFPLENBQUM7Z0JBQzFCLENBQUMsQ0FBQztZQUNOLENBQUM7WUFDRCxFQUFFLENBQUMsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQztnQkFDaEIsTUFBTSxDQUFDLFNBQVMsQ0FBQyxVQUFVLEdBQUc7b0JBQzFCLE1BQU0sQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDO2dCQUN6QixDQUFDLENBQUM7WUFDTixDQUFDO1lBQ0QsRUFBRSxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7Z0JBQ2QsTUFBTSxDQUFDLFNBQVMsQ0FBQyxRQUFRLEdBQUc7b0JBQ3hCLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDO2dCQUN2QixDQUFDLENBQUM7WUFDTixDQUFDO1FBQ0wsQ0FBQyxDQUFDO0lBQ04sQ0FBQztJQXhDRCwyQ0F3Q0MsQ0FBQTs7Ozs7Ozs7OztBQUNELDhzSEFBOHNIIn0= -$__System.register("1", ["a", "e", "4", "c", "2", "5", "6", "3", "8", "7", "b", "d"], function(exports_1, context_1) { - "use strict"; - var __moduleName = context_1 && context_1.id; - var core_1, common_1, http_1, ResourceProviders_1; - var ResourceModule; - var exportedNames_1 = { - 'ResourceModule': true - }; - function exportStar_1(m) { - var exports = {}; - for(var n in m) { - if (n !== "default"&& !exportedNames_1.hasOwnProperty(n)) exports[n] = m[n]; - } - exports_1(exports); - } - return { - setters:[ - function (core_1_1) { - core_1 = core_1_1; - }, - function (common_1_1) { - common_1 = common_1_1; - }, - function (http_1_1) { - http_1 = http_1_1; - }, - function (ResourceProviders_1_1) { - ResourceProviders_1 = ResourceProviders_1_1; - exportStar_1(ResourceProviders_1_1); - }, - function (Interfaces_1_1) { - exportStar_1(Interfaces_1_1); - }, - function (Resource_1_1) { - exportStar_1(Resource_1_1); - }, - function (ResourceAction_1_1) { - exportStar_1(ResourceAction_1_1); - }, - function (ResourceCRUD_1_1) { - exportStar_1(ResourceCRUD_1_1); - }, - function (ResourceCRUDBase_1_1) { - exportStar_1(ResourceCRUDBase_1_1); - }, - function (ResourceGlobalConfig_1_1) { - exportStar_1(ResourceGlobalConfig_1_1); - }, - function (ResourceModel_1_1) { - exportStar_1(ResourceModel_1_1); - }, - function (ResourceParams_1_1) { - exportStar_1(ResourceParams_1_1); - }], - execute: function() { - exports_1("ResourceModule", ResourceModule = (function () { - function ResourceModule() { - } - ResourceModule.forRoot = function () { - return { - ngModule: ResourceModule, - providers: ResourceProviders_1.ResourceProviders.providers[ResourceProviders_1.ResourceProviders.mainProvidersName] - }; - }; - ResourceModule.forChild = function (subSet) { - return { - ngModule: ResourceModule, - providers: ResourceProviders_1.ResourceProviders.providers[subSet] ? ResourceProviders_1.ResourceProviders.providers[subSet] : [] - }; - }; - ResourceModule.decorators = [ - { type: core_1.NgModule, args: [{ - imports: [common_1.CommonModule, http_1.HttpModule] - },] }, - ]; - /** @nocollapse */ - ResourceModule.ctorParameters = []; - return ResourceModule; - }())); - } - } -}); - -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibmcyLXJlc291cmNlLXJlc3QuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyJuZzItcmVzb3VyY2UtcmVzdC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O1FBYVcsY0FBYzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O1lBQWQsNEJBQUEsY0FBYyxHQUFHLENBQUM7Z0JBQ3pCO2dCQUNBLENBQUM7Z0JBQ0QsY0FBYyxDQUFDLE9BQU8sR0FBRztvQkFDckIsTUFBTSxDQUFDO3dCQUNILFFBQVEsRUFBRSxjQUFjO3dCQUN4QixTQUFTLEVBQUUscUNBQWlCLENBQUMsU0FBUyxDQUFDLHFDQUFpQixDQUFDLGlCQUFpQixDQUFDO3FCQUM5RSxDQUFDO2dCQUNOLENBQUMsQ0FBQztnQkFDRixjQUFjLENBQUMsUUFBUSxHQUFHLFVBQVUsTUFBTTtvQkFDdEMsTUFBTSxDQUFDO3dCQUNILFFBQVEsRUFBRSxjQUFjO3dCQUN4QixTQUFTLEVBQUUscUNBQWlCLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLHFDQUFpQixDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFO3FCQUM1RixDQUFDO2dCQUNOLENBQUMsQ0FBQztnQkFDRixjQUFjLENBQUMsVUFBVSxHQUFHO29CQUN4QixFQUFFLElBQUksRUFBRSxlQUFRLEVBQUUsSUFBSSxFQUFFLENBQUM7Z0NBQ2IsT0FBTyxFQUFFLENBQUMscUJBQVksRUFBRSxpQkFBVSxDQUFDOzZCQUN0QyxFQUFFLEVBQUU7aUJBQ2hCLENBQUM7Z0JBQ0Ysa0JBQWtCO2dCQUNsQixjQUFjLENBQUMsY0FBYyxHQUFHLEVBQUUsQ0FBQztnQkFDbkMsTUFBTSxDQUFDLGNBQWMsQ0FBQztZQUMxQixDQUFDLEVBQUUsQ0FBQyxDQUFBLENBQUM7Ozs7QUFDTCwwbEdBQTBsRyJ9 -}) -(function(factory) { - if (typeof define == 'function' && define.amd) - define(["@angular/common","@angular/core","@angular/http","rxjs/Rx"], factory); - else if (typeof module == 'object' && module.exports && typeof require == 'function') - module.exports = factory(require("@angular/common"), require("@angular/core"), require("@angular/http"), require("rxjs/Rx")); - else - throw new Error("Module must be loaded as AMD or CommonJS"); -}); \ No newline at end of file diff --git a/config/helpers.js b/config/helpers.js new file mode 100644 index 0000000..609b9e1 --- /dev/null +++ b/config/helpers.js @@ -0,0 +1,32 @@ +/** + * taken from angular2-webpack-starter + */ +var path = require('path'); + +// Helper functions +var ROOT = path.resolve(__dirname, '..'); + +function hasProcessFlag(flag) { + return process.argv.join('').indexOf(flag) > -1; +} + +function isWebpackDevServer() { + return process.argv[1] && !! (/webpack-dev-server$/.exec(process.argv[1])); +} + +function root(args) { + args = Array.prototype.slice.call(arguments, 0); + return path.join.apply(path, [ROOT].concat(args)); +} + +function checkNodeImport(context, request, cb) { + if (!path.isAbsolute(request) && request.charAt(0) !== '.') { + cb(null, 'commonjs ' + request); return; + } + cb(); +} + +exports.hasProcessFlag = hasProcessFlag; +exports.isWebpackDevServer = isWebpackDevServer; +exports.root = root; +exports.checkNodeImport = checkNodeImport; \ No newline at end of file diff --git a/config/karma.conf.js b/config/karma.conf.js new file mode 100644 index 0000000..4035862 --- /dev/null +++ b/config/karma.conf.js @@ -0,0 +1,77 @@ +module.exports = function(config) { + var testWebpackConfig = require('./webpack.test.js'); + + var configuration = { + basePath: '', + + frameworks: ['jasmine'], + + // list of files to exclude + exclude: [], + + /* + * list of files / patterns to load in the browser + * + * we are building the test environment in ./spec-bundle.js + */ + files: [ { pattern: './config/spec-bundle.js', watched: false } ], + + preprocessors: { './config/spec-bundle.js': ['coverage', 'webpack', 'sourcemap'] }, + + // Webpack Config at ./webpack.test.js + webpack: testWebpackConfig, + + coverageReporter: { + type: 'in-memory' + }, + + remapCoverageReporter: { + 'text-summary': null, + json: './coverage/coverage.json', + html: './coverage/html' + }, + + // Webpack please don't spam the console when running in karma! + webpackMiddleware: { stats: 'errors-only'}, + + reporters: [ 'mocha', 'coverage', 'remap-coverage' ], + + mochaReporter: { + ignoreSkipped: true + }, + + // web server port + port: 9876, + + colors: true, + + /* + * level of logging + * possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG + */ + logLevel: config.LOG_INFO, + + autoWatch: false, + + browsers: [ + 'Chrome' + ], + + customLaunchers: { + ChromeTravisCi: { + base: 'Chrome', + flags: ['--no-sandbox'] + } + }, + + singleRun: true + }; + + if (process.env.TRAVIS){ + configuration.browsers = [ + 'ChromeTravisCi' + ]; + } + + config.set(configuration); +}; \ No newline at end of file diff --git a/config/spec-bundle.js b/config/spec-bundle.js new file mode 100644 index 0000000..81c94c8 --- /dev/null +++ b/config/spec-bundle.js @@ -0,0 +1,58 @@ +/* + * When testing with webpack and ES6, we have to do some extra + * things to get testing to work right. Because we are gonna write tests + * in ES6 too, we have to compile those as well. That's handled in + * karma.conf.js with the karma-webpack plugin. This is the entry + * file for webpack test. Just like webpack will create a bundle.js + * file for our client, when we run test, it will compile and bundle them + * all here! Crazy huh. So we need to do some setup + */ +Error.stackTraceLimit = Infinity; + +require('core-js/es6'); +require('core-js/es7/reflect'); + +// Typescript emit helpers polyfill +require('ts-helpers'); + +require('zone.js/dist/zone'); +require('zone.js/dist/long-stack-trace-zone'); +require('zone.js/dist/async-test'); +require('zone.js/dist/fake-async-test'); +require('zone.js/dist/sync-test'); +require('zone.js/dist/proxy'); // since zone.js 0.6.15 +require('zone.js/dist/jasmine-patch'); // put here since zone.js 0.6.14 + +// RxJS +require('rxjs/Rx'); + +var testing = require('@angular/core/testing'); +var browser = require('@angular/platform-browser-dynamic/testing'); + +testing.TestBed.initTestEnvironment( + browser.BrowserDynamicTestingModule, + browser.platformBrowserDynamicTesting() +); + +/* + * Ok, this is kinda crazy. We can use the context method on + * require that webpack created in order to tell webpack + * what files we actually want to require or import. + * Below, context will be a function/object with file names as keys. + * Using that regex we are saying look in ../src then find + * any file that ends with spec.ts and get its path. By passing in true + * we say do this recursively + */ +var testContext = require.context('../tests', true, /\.spec\.ts/); + +/* + * get all the files, for each file, call the context function + * that will require the file and load it up here. Context will + * loop and require those spec files here + */ +function requireAll(requireContext) { + return requireContext.keys().map(requireContext); +} + +// requires and returns all modules that match +var modules = requireAll(testContext); \ No newline at end of file diff --git a/config/testing-utils.ts b/config/testing-utils.ts new file mode 100644 index 0000000..e7d202d --- /dev/null +++ b/config/testing-utils.ts @@ -0,0 +1,46 @@ +/// + +/* + Temporary fiile for referencing the TypeScript defs for Jasmine + some potentially + utils for testing. Will change/adjust this once I find a better way of doing + */ + +declare module jasmine { + interface Matchers { + toHaveText(text: string): boolean; + toContainText(text: string): boolean; + } +} + +beforeEach(() => { + jasmine.addMatchers({ + + toHaveText: function() { + return { + compare: function(actual, expectedText) { + var actualText = actual.textContent; + return { + pass: actualText === expectedText, + get message() { + return 'Expected ' + actualText + ' to equal ' + expectedText; + } + }; + } + }; + }, + + toContainText: function() { + return { + compare: function(actual, expectedText) { + var actualText = actual.textContent; + return { + pass: actualText.indexOf(expectedText) > -1, + get message() { + return 'Expected ' + actualText + ' to contain ' + expectedText; + } + }; + } + }; + } + }); +}); \ No newline at end of file diff --git a/config/webpack.test.js b/config/webpack.test.js new file mode 100644 index 0000000..fce1c2a --- /dev/null +++ b/config/webpack.test.js @@ -0,0 +1,89 @@ +/** + * Adapted from angular2-webpack-starter + */ + +const helpers = require('./helpers'), + webpack = require('webpack'), + LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin'); + +/** + * Webpack Plugins + */ + +module.exports = { + + /** + * Source map for Karma from the help of karma-sourcemap-loader & karma-webpack + * + * Do not change, leave as is or it wont work. + * See: https://github.com/webpack/karma-webpack#source-maps + */ + devtool: 'inline-source-map', + + resolve: { + extensions: ['.ts', '.js'], + modules: [helpers.root('src'), 'node_modules'] + }, + + module: { + rules: [{ + enforce: 'pre', + test: /\.ts$/, + loader: 'tslint-loader', + exclude: [helpers.root('node_modules')] + }, { + enforce: 'pre', + test: /\.js$/, + loader: 'source-map-loader', + exclude: [ + // these packages have problems with their sourcemaps + helpers.root('node_modules/rxjs'), + helpers.root('node_modules/@angular') + ] + }, { + test: /\.ts$/, + loader: 'awesome-typescript-loader', + query: { + // use inline sourcemaps for "karma-remap-coverage" reporter + sourceMap: false, + inlineSourceMap: true, + module: "commonjs", + removeComments: true + }, + exclude: [/\.e2e\.ts$/] + }, { + enforce: 'post', + test: /\.(js|ts)$/, + loader: 'istanbul-instrumenter-loader', + include: helpers.root('src'), + exclude: [/\.spec\.ts$/, /\.e2e\.ts$/, /node_modules/] + }], + }, + + plugins: [ + // fix the warning in ./~/@angular/core/src/linker/system_js_ng_module_factory_loader.js + new webpack.ContextReplacementPlugin( + /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/, + helpers.root('./src') + ), + + new LoaderOptionsPlugin({ + debug: true, + options: { + + /** + * Static analysis linter for TypeScript advanced options configuration + * Description: An extensible linter for the TypeScript language. + * + * See: https://github.com/wbuchwalter/tslint-loader + */ + tslint: { + emitErrors: false, + failOnHint: false, + resourcePath: 'src' + }, + + } + }) + ] +}; diff --git a/index.ts b/index.ts new file mode 100755 index 0000000..d33bf3b --- /dev/null +++ b/index.ts @@ -0,0 +1,34 @@ +import {NgModule, ModuleWithProviders} from '@angular/core'; +import {CommonModule} from '@angular/common'; +import {HttpModule} from '@angular/http'; +import {ResourceProviders} from './src/ResourceProviders'; + +export * from './src/Resource'; +export * from './src/ResourceAction'; +export * from './src/ResourceCRUD'; +export * from './src/ResourceCRUDBase'; +export * from './src/ResourceGlobalConfig'; +export * from './src/ResourceModel'; +export * from './src/ResourceParams'; +export * from './src/ResourceProviders'; +export * from './src/Interfaces'; + +@NgModule({ + imports: [CommonModule, HttpModule] +}) +export class ResourceModule { + static forRoot(): ModuleWithProviders { + return { + ngModule: ResourceModule, + providers: ResourceProviders.providers[ResourceProviders.mainProvidersName] + }; + } + + static forChild(subSet: string): ModuleWithProviders { + return { + ngModule: ResourceModule, + providers: ResourceProviders.providers[subSet] ? ResourceProviders.providers[subSet] : [] + }; + } + +} diff --git a/make.js b/make.js deleted file mode 100755 index a16ac16..0000000 --- a/make.js +++ /dev/null @@ -1,36 +0,0 @@ -var pkg = require('./package.json'); -var path = require('path'); -var Builder = require('systemjs-builder'); -var name = pkg.name; - -var builder = new Builder(); -var config = { - baseURL: '.', - transpiler: 'typescript', - typescriptOptions: { - module: 'cjs' - }, - map: { - typescript: './node_modules/typescript/lib/typescript.js', - '@angular': './node_modules/@angular', - rxjs: './node_modules/rxjs' - }, - paths: { - '*': '*.js' - }, - meta: { - './node_modules/@angular/*': { build: false }, - './node_modules/rxjs/*': { build: false } - } -}; - -builder.config(config); - -builder -.buildStatic(name, path.resolve(__dirname, 'bundles/', name + '.js'), {format: 'umd'}) -.then(function() { - console.log('Build complete.'); -}) -.catch(function(err) { - console.log('Error', err); -}); diff --git a/ng2-resource-rest.ts b/ng2-resource-rest.ts old mode 100755 new mode 100644 index e4a1ade..ea465c2 --- a/ng2-resource-rest.ts +++ b/ng2-resource-rest.ts @@ -1,34 +1 @@ -import {NgModule, ModuleWithProviders} from '@angular/core'; -import {CommonModule} from '@angular/common'; -import {HttpModule} from '@angular/http'; -import {ResourceProviders} from './src/ResourceProviders'; - -export * from './src/Interfaces'; -export * from './src/Resource'; -export * from './src/ResourceAction'; -export * from './src/ResourceCRUD'; -export * from './src/ResourceCRUDBase'; -export * from './src/ResourceGlobalConfig'; -export * from './src/ResourceModel'; -export * from './src/ResourceParams'; -export * from './src/ResourceProviders'; - -@NgModule({ - imports: [CommonModule, HttpModule] -}) -export class ResourceModule { - static forRoot(): ModuleWithProviders { - return { - ngModule: ResourceModule, - providers: ResourceProviders.providers[ResourceProviders.mainProvidersName] - }; - } - - static forChild(subSet: string): ModuleWithProviders { - return { - ngModule: ResourceModule, - providers: ResourceProviders.providers[subSet] ? ResourceProviders.providers[subSet] : [] - }; - } - -} +export * from './index'; diff --git a/package.json b/package.json index 91fc001..82917ed 100644 --- a/package.json +++ b/package.json @@ -1,10 +1,11 @@ { "name": "ng2-resource-rest", - "version": "1.6.1", + "version": "1.7.0", "description": "Angular2 resource module with simple decorators", "scripts": { "ngc": "ngc", - "compile": "ngc && node make.js" + "compile": "ngc && npm run build", + "build": "webpack && cp bundles/ng2-resource-rest.umd.js bundles/index.js" }, "keywords": [ "ng2-resource", @@ -15,8 +16,8 @@ "Resource" ], "main": "bundles/ng2-resource-rest.js", - "module": "ng2-resource-rest.js", - "typings": "./ng2-resource-rest.d.ts", + "module": "index.js", + "typings": "index.d.ts", "repository": { "type": "git", "url": "git+https://github.com/troyanskiy/ng2-resource-rest.git" @@ -28,24 +29,28 @@ }, "homepage": "https://github.com/troyanskiy/ng2-resource-rest#readme", "peerDependencies": { - "@angular/core": "^2.1.1", - "@angular/common": "^2.1.1", - "@angular/http": "^2.1.1" + "@angular/core": "^2.0.0", + "@angular/common": "^2.0.0", + "@angular/http": "^2.0.0" }, "devDependencies": { - "@angular/common": "^2.1.1", - "@angular/compiler": "^2.1.1", - "@angular/compiler-cli": "^2.1.1", - "@angular/core": "^2.1.1", - "@angular/http": "^2.1.1", - "@angular/platform-browser": "^2.1.1", - "@angular/platform-server": "^2.1.1", - "@types/node": "^6.0.41", - "rxjs": "^5.0.0-beta.12", - "systemjs": "^0.19.39", - "systemjs-builder": "^0.15.32", - "typescript": "^2.0.3", - "zone.js": "^0.6.21" + "@angular/common": "2.4.0", + "@angular/compiler": "2.4.0", + "@angular/compiler-cli": "2.4.0", + "@angular/core": "2.4.0", + "@angular/http": "2.4.0", + "@angular/platform-browser": "2.4.0", + "@angular/platform-server": "2.4.0", + "@types/node": "6.0.52", + "awesome-typescript-loader": "3.0.0-beta.17", + "codelyzer": "2.0.0-beta.3", + "rxjs": "5.0.1", + "ts-helpers": "1.1.2", + "tslint": "4.0.2", + "tslint-loader": "3.3.0", + "typescript": "2.0.10", + "webpack": "2.1.0-beta.28", + "zone.js": "0.7.2" }, "dependencies": {} } diff --git a/src/Interfaces.ts b/src/Interfaces.ts index d1438e1..cf79f6e 100755 --- a/src/Interfaces.ts +++ b/src/Interfaces.ts @@ -60,4 +60,4 @@ export type ResourceResult = R & { $resolved?: boolean; $observable?: Observable; $abortRequest?: () => void; -} +}; diff --git a/src/Resource.ts b/src/Resource.ts index 0e8b7b5..a7fe1e6 100755 --- a/src/Resource.ts +++ b/src/Resource.ts @@ -4,7 +4,7 @@ import { Type } from '@angular/core/src/type'; import { Observable } from 'rxjs/Rx'; import { ResourceGlobalConfig } from './ResourceGlobalConfig'; import { ResourceModel } from './ResourceModel'; -import { ResourceParamsBase } from './Interfaces'; +// import { ResourceParamsBase } from './Interfaces'; export class Resource { @@ -153,8 +153,8 @@ export class Resource { return null; } - private _getResourceOptions(): ResourceParamsBase { - return null; - } + // private _getResourceOptions(): ResourceParamsBase { + // return null; + // } } diff --git a/src/ResourceModel.ts b/src/ResourceModel.ts index 649d150..9a8d271 100755 --- a/src/ResourceModel.ts +++ b/src/ResourceModel.ts @@ -43,7 +43,9 @@ export class ResourceModel { public $fillFromObject(_object: any) { for (let propName in _object) { - (this)[propName] = _object[propName]; + if (_object.hasOwnProperty(propName)) { + (this)[propName] = _object[propName]; + } } return this; } diff --git a/tsconfig.json b/tsconfig.json index 7be861d..cb3ae5a 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,14 +5,16 @@ "target": "es5", "emitDecoratorMetadata": true, "experimentalDecorators": true, - "inlineSourceMap": true, - "inlineSources": true, "declaration": true, +// "inlineSourceMap": true, +// "inlineSources": true, "moduleResolution": "node", + "noUnusedLocals": true, "types": ["node"], "lib": ["es2015", "dom"] }, "files": [ + "index.ts", "ng2-resource-rest.ts", "./src/Interfaces", "./src/Resource", @@ -25,9 +27,11 @@ "./src/ResourceProviders" ], "exclude": [ - "node_modules" + "node_modules", + "bundles" ], "angularCompilerOptions": { - "strictMetadataEmit": true + "strictMetadataEmit": true, + "skipTemplateCodegen": true } } diff --git a/tslint.json b/tslint.json new file mode 100644 index 0000000..9345810 --- /dev/null +++ b/tslint.json @@ -0,0 +1,67 @@ +{ + "rulesDirectory": [ + "node_modules/codelyzer" + ], + "rules": { + "class-name": true, + "curly": true, + "forin": true, + "indent": [ + true, + "spaces" + ], + "label-position": true, + "member-access": false, + "no-arg": true, + "no-bitwise": true, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-construct": true, + "no-duplicate-variable": true, + "no-empty": false, + "no-eval": true, + "no-inferrable-types": false, + "no-shadowed-variable": true, + "no-string-literal": false, + "no-unused-expression": true, + "no-use-before-declare": true, + "object-literal-sort-keys": false, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "radix": true, + "semicolon": [ + "always" + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "variable-name": false, + "use-input-property-decorator": true, + "use-output-property-decorator": true, + "use-host-property-decorator": false, + "use-life-cycle-interface": true, + "use-pipe-transform-interface": true + } +} diff --git a/webpack.config.js b/webpack.config.js new file mode 100644 index 0000000..c6ef4e6 --- /dev/null +++ b/webpack.config.js @@ -0,0 +1,64 @@ +/** + * Adapted from angular2-webpack-starter + */ + +const helpers = require('./config/helpers'), + webpack = require('webpack'); + +/** + * Webpack Plugins + */ +const ProvidePlugin = require('webpack/lib/ProvidePlugin'); +const DefinePlugin = require('webpack/lib/DefinePlugin'); +const LoaderOptionsPlugin = require('webpack/lib/LoaderOptionsPlugin'); + +module.exports = { + devtool: 'inline-source-map', + + resolve: { + extensions: ['.ts', '.js'] + }, + + entry: helpers.root('ng2-resource-rest.ts'), + + output: { + path: helpers.root('bundles'), + publicPath: '/', + filename: 'ng2-resource-rest.umd.js', + libraryTarget: 'umd', + library: 'ng2-resource-rest' + }, + + // require those dependencies but don't bundle them + externals: [/^\@angular\//, /^rxjs\//], + + module: { + rules: [{ + enforce: 'pre', + test: /\.ts$/, + loader: 'tslint-loader', + exclude: [helpers.root('node_modules')] + }, { + test: /\.ts$/, + loader: 'awesome-typescript-loader?declaration=false', + exclude: [/\.e2e\.ts$/] + }] + }, + + plugins: [ + // fix the warning in ./~/@angular/core/src/linker/system_js_ng_module_factory_loader.js + new webpack.ContextReplacementPlugin( + /angular(\\|\/)core(\\|\/)(esm(\\|\/)src|src)(\\|\/)linker/, + helpers.root('./src') + ), + + new webpack.LoaderOptionsPlugin({ + options: { + tslintLoader: { + emitErrors: false, + failOnHint: false + } + } + }) + ] +};