@awes-io/vue-mc 0.7.0 → 0.9.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.9.0](https://github.com/awes-io/client/compare/@awes-io/vue-mc@0.8.0...@awes-io/vue-mc@0.9.0) (2023-11-23)
+
+
+### Features
+
+* **vue-mc:** injectable system added ([98a6cb6](https://github.com/awes-io/client/commit/98a6cb6542122e4404817d63fa198e160dcc99b1))
+
+
+
+
+
+# [0.8.0](https://github.com/awes-io/client/compare/@awes-io/vue-mc@0.7.0...@awes-io/vue-mc@0.8.0) (2023-08-22)
+
+
+### Features
+
+* unused modules removed ([09334f1](https://github.com/awes-io/client/commit/09334f1677a837df5eac8c4063e4a55941fde40e))
+
+
+
+
+
 # [0.7.0](https://github.com/awes-io/client/compare/@awes-io/vue-mc@0.6.0...@awes-io/vue-mc@0.7.0) (2022-07-11)
 
 

package/dist/index.esm.js

@@ -1,5 +1,5 @@
-import axios from 'axios';
 import { Response as Response$1, Request as Request$1, Collection, Model } from 'vue-mc';
+import axios from 'axios';
 import { pathOr } from 'rambdax';
 
 function _classCallCheck(instance, Constructor) {
@@ -133,15 +133,33 @@ function _get(target, property, receiver) {
   return _get(target, property, receiver || target);
 }
 
+var injections = new Map([['axios', axios]]);
+var applyInjections = function applyInjections(context) {
+  injections.forEach(function (value, key) {
+    context['$' + key] = value;
+  });
+};
+function inject(key, value) {
+  injections.set(key, value);
+}
+
 var Response = /*#__PURE__*/function (_VueMCResponse) {
   _inherits(Response, _VueMCResponse);
 
   var _super = _createSuper(Response);
 
   function Response() {
+    var _this;
+
     _classCallCheck(this, Response);
 
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    applyInjections(_assertThisInitialized(_this));
+    return _this;
   }
 
   _createClass(Response, [{
@@ -164,13 +182,17 @@ var Request = /*#__PURE__*/function (_VueMCRequest) {
 
   var _super = _createSuper(Request);
 
-  function Request(config, axios) {
+  function Request() {
     var _this;
 
     _classCallCheck(this, Request);
 
-    _this = _super.call(this, config);
-    _this.axios = axios;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    applyInjections(_assertThisInitialized(_this));
     return _this;
   }
 
@@ -184,7 +206,7 @@ var Request = /*#__PURE__*/function (_VueMCRequest) {
     value: function send() {
       var _this2 = this;
 
-      return this.axios.request(this.config).then(this.createResponse).catch(function (error) {
+      return this.$axios.request(this.config).then(this.createResponse).catch(function (error) {
         throw _this2.createError(error);
       });
     }
@@ -199,38 +221,52 @@ var BaseCollection = /*#__PURE__*/function (_Collection) {
   var _super = _createSuper(BaseCollection);
 
   function BaseCollection() {
+    var _this;
+
     _classCallCheck(this, BaseCollection);
 
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    applyInjections(_assertThisInitialized(_this));
+    return _this;
   }
 
   _createClass(BaseCollection, [{
     key: "createRequest",
     value: function createRequest(config) {
-      return new Request(config, this.$axios);
+      return new Request(config);
     }
   }]);
 
   return BaseCollection;
 }(Collection);
 
-BaseCollection.prototype.$axios = axios;
-
 var BaseModel = /*#__PURE__*/function (_Model) {
   _inherits(BaseModel, _Model);
 
   var _super = _createSuper(BaseModel);
 
   function BaseModel() {
+    var _this;
+
     _classCallCheck(this, BaseModel);
 
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    applyInjections(_assertThisInitialized(_this));
+    return _this;
   }
 
   _createClass(BaseModel, [{
     key: "createRequest",
     value: function createRequest(config) {
-      return new Request(config, this.$axios);
+      return new Request(config);
     }
   }, {
     key: "getDefaultMethods",
@@ -257,6 +293,4 @@ var BaseModel = /*#__PURE__*/function (_Model) {
   return BaseModel;
 }(Model);
 
-BaseModel.prototype.$axios = axios;
-
-export { BaseCollection, BaseModel };
+export { BaseCollection, BaseModel, Request, Response, inject };

package/dist/index.js

@@ -4,8 +4,8 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
 
-var axios = _interopDefault(require('axios'));
 var vueMc = require('vue-mc');
+var axios = _interopDefault(require('axios'));
 var rambdax = require('rambdax');
 
 function _classCallCheck(instance, Constructor) {
@@ -139,15 +139,33 @@ function _get(target, property, receiver) {
   return _get(target, property, receiver || target);
 }
 
+var injections = new Map([['axios', axios]]);
+var applyInjections = function applyInjections(context) {
+  injections.forEach(function (value, key) {
+    context['$' + key] = value;
+  });
+};
+function inject(key, value) {
+  injections.set(key, value);
+}
+
 var Response = /*#__PURE__*/function (_VueMCResponse) {
   _inherits(Response, _VueMCResponse);
 
   var _super = _createSuper(Response);
 
   function Response() {
+    var _this;
+
     _classCallCheck(this, Response);
 
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    applyInjections(_assertThisInitialized(_this));
+    return _this;
   }
 
   _createClass(Response, [{
@@ -170,13 +188,17 @@ var Request = /*#__PURE__*/function (_VueMCRequest) {
 
   var _super = _createSuper(Request);
 
-  function Request(config, axios) {
+  function Request() {
     var _this;
 
     _classCallCheck(this, Request);
 
-    _this = _super.call(this, config);
-    _this.axios = axios;
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    applyInjections(_assertThisInitialized(_this));
     return _this;
   }
 
@@ -190,7 +212,7 @@ var Request = /*#__PURE__*/function (_VueMCRequest) {
     value: function send() {
       var _this2 = this;
 
-      return this.axios.request(this.config).then(this.createResponse).catch(function (error) {
+      return this.$axios.request(this.config).then(this.createResponse).catch(function (error) {
         throw _this2.createError(error);
       });
     }
@@ -205,38 +227,52 @@ var BaseCollection = /*#__PURE__*/function (_Collection) {
   var _super = _createSuper(BaseCollection);
 
   function BaseCollection() {
+    var _this;
+
     _classCallCheck(this, BaseCollection);
 
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    applyInjections(_assertThisInitialized(_this));
+    return _this;
   }
 
   _createClass(BaseCollection, [{
     key: "createRequest",
     value: function createRequest(config) {
-      return new Request(config, this.$axios);
+      return new Request(config);
     }
   }]);
 
   return BaseCollection;
 }(vueMc.Collection);
 
-BaseCollection.prototype.$axios = axios;
-
 var BaseModel = /*#__PURE__*/function (_Model) {
   _inherits(BaseModel, _Model);
 
   var _super = _createSuper(BaseModel);
 
   function BaseModel() {
+    var _this;
+
     _classCallCheck(this, BaseModel);
 
-    return _super.apply(this, arguments);
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _super.call.apply(_super, [this].concat(args));
+    applyInjections(_assertThisInitialized(_this));
+    return _this;
   }
 
   _createClass(BaseModel, [{
     key: "createRequest",
     value: function createRequest(config) {
-      return new Request(config, this.$axios);
+      return new Request(config);
     }
   }, {
     key: "getDefaultMethods",
@@ -263,7 +299,8 @@ var BaseModel = /*#__PURE__*/function (_Model) {
   return BaseModel;
 }(vueMc.Model);
 
-BaseModel.prototype.$axios = axios;
-
 exports.BaseCollection = BaseCollection;
 exports.BaseModel = BaseModel;
+exports.Request = Request;
+exports.Response = Response;
+exports.inject = inject;

package/nuxt/templates/vue-mc-context-provider.plugin.js

@@ -1,62 +1,8 @@
-import { BaseModel, BaseCollection } from '@awes-io/vue-mc'
-import Request from '@awes-io/vue-mc/src/Structures/Request'
+import { inject } from '@awes-io/vue-mc'
 
-const wrapAuthHandler = (fn, context, redirect) => {
-    return async (...args) => {
-        try {
-            return await fn.apply(context, args)
-        } catch (e) {
-            console.log(e)
-
-            if (e.name === 'ExpiredAuthSessionError') {
-                redirect('/login')
-            } else {
-                throw e
-            }
-        }
-    }
-}
-
-export default ({ $axios, $dayjs, store, app, redirect }) => {
-    // axios
-    BaseModel.prototype.$axios = $axios
-    BaseCollection.prototype.$axios = $axios
-
-    // request
-    BaseModel.prototype.createRequest = function(config) {
-        return new Request(config, $axios)
-    }
-    BaseCollection.prototype.createRequest = function(config) {
-        return new Request(config, $axios)
-    }
-
-    // store
-    BaseModel.prototype.$store = store
-    BaseCollection.prototype.$store = store
-
-    // localization
-    const $t = app.i18n.t.bind(app.i18n)
-    BaseModel.prototype.$t = $t
-    BaseCollection.prototype.$t = $t
-
-    // dayjs
-    if ($dayjs) {
-        BaseModel.prototype.$dayjs = $dayjs
-        BaseCollection.prototype.$dayjs = $dayjs
-    }
-
-    // request overwrite to handle expired auth error
-    const modelRequest = BaseModel.prototype.request
-    const collectionRequest = BaseCollection.prototype.request
-
-    BaseModel.prototype.request = wrapAuthHandler(
-        modelRequest,
-        BaseModel.prototype,
-        redirect
-    )
-    BaseCollection.prototype.request = wrapAuthHandler(
-        collectionRequest,
-        BaseCollection.prototype,
-        redirect
-    )
+export default ({ $axios, $dayjs, store, app }) => {
+    inject('axios', $axios)
+    inject('dayjs', $dayjs)
+    inject('store', store)
+    inject('t', app.i18n.t.bind(app.i18n))
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@awes-io/vue-mc",
-    "version": "0.7.0",
+    "version": "0.9.0",
     "description": "Models and collections abstract layer.",
     "homepage": "https://awes.io",
     "bugs": {
@@ -31,5 +31,15 @@
         "rollup": "^1.30.1",
         "rollup-plugin-babel": "^4.3.3"
     },
-    "gitHead": "20130efc0ba9efdce40af425a4ee09bb5f90d84a"
+    "overrides": {
+        "vue": "2.7.14",
+        "vue-template-compiler": "2.7.14",
+        "vue-server-renderer": "2.7.14"
+    },
+    "resolutions": {
+        "vue": "2.7.14",
+        "vue-template-compiler": "2.7.14",
+        "vue-server-renderer": "2.7.14"
+    },
+    "gitHead": "078158dae22db6592008e4fc37c34e08ccfeb618"
 }

package/src/Structures/Collection.js

@@ -1,13 +1,17 @@
-import axios from 'axios'
 import { Collection } from 'vue-mc'
+import { applyInjections } from '../injectable'
 import Request from './Request'
 
 class BaseCollection extends Collection {
+    constructor(...args) {
+        super(...args)
+
+        applyInjections(this)
+    }
+
     createRequest(config) {
-        return new Request(config, this.$axios)
+        return new Request(config)
     }
 }
 
-BaseCollection.prototype.$axios = axios
-
 export default BaseCollection

package/src/Structures/Model.js

@@ -1,10 +1,16 @@
-import axios from 'axios'
 import { Model } from 'vue-mc'
+import { applyInjections } from '../injectable'
 import Request from './Request'
 
 class BaseModel extends Model {
+    constructor(...args) {
+        super(...args)
+
+        applyInjections(this)
+    }
+
     createRequest(config) {
-        return new Request(config, this.$axios)
+        return new Request(config)
     }
 
     getDefaultMethods() {
@@ -27,6 +33,4 @@ class BaseModel extends Model {
     }
 }
 
-BaseModel.prototype.$axios = axios
-
 export default BaseModel

package/src/Structures/Request.js

@@ -1,10 +1,12 @@
 import { Request as VueMCRequest } from 'vue-mc'
+import { applyInjections } from '../injectable'
 import Response from './Response'
 
 export default class Request extends VueMCRequest {
-    constructor(config, axios) {
-        super(config)
-        this.axios = axios
+    constructor(...args) {
+        super(...args)
+
+        applyInjections(this)
     }
 
     createResponse(axiosResponse) {
@@ -12,7 +14,7 @@ export default class Request extends VueMCRequest {
     }
 
     send() {
-        return this.axios
+        return this.$axios
             .request(this.config)
             .then(this.createResponse)
             .catch((error) => {

package/src/Structures/Response.js

@@ -1,7 +1,14 @@
 import { Response as VueMCResponse } from 'vue-mc'
+import { applyInjections } from '../injectable'
 import { pathOr } from 'rambdax'
 
 export default class Response extends VueMCResponse {
+    constructor(...args) {
+        super(...args)
+
+        applyInjections(this)
+    }
+
     getData() {
         return pathOr(null, 'data.data', this.response)
     }

package/src/index.js

@@ -1,3 +1,9 @@
 export { default as BaseCollection } from './Structures/Collection'
 
 export { default as BaseModel } from './Structures/Model'
+
+export { default as Request } from './Structures/Request'
+
+export { default as Response } from './Structures/Response'
+
+export { default as inject } from './injectable'

package/src/injectable.js

@@ -0,0 +1,13 @@
+import axios from 'axios'
+
+const injections = new Map([['axios', axios]])
+
+export const applyInjections = (context) => {
+    injections.forEach((value, key) => {
+        context['$' + key] = value
+    })
+}
+
+export default function inject(key, value) {
+    injections.set(key, value)
+}