@benjy2976/pmsg 0.1.3 → 0.1.5

package/README.md

@@ -114,10 +114,10 @@ Producto.show(1)
 if you are using Pinia you can create the storeDefault
 crating the next structure
 ```js
-/store
-/store/modules
+/stores
+/stores/modules
 ```
-into /store/modules you can create a products.js file
+into /stores/modules you can create a products.js file
 ```js
 //import {Product} from '../../models' //import if necessary
 
@@ -216,7 +216,7 @@ export default {
 
 
 ```
-you need to create a file index.js into a /store folder you have two ways to declare the state
+you need to create a file index.js into a /stores folder you have two ways to declare the state
 
 ````js
 import { defineStore } from "pinia";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@benjy2976/pmsg",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "generator of models and store default for pinia",
   "main": "src/Model.js",
   "scripts": {

package/src/Model.js

@@ -24,6 +24,8 @@ export default class Model {
       modelGetters        : {},// Aquí se configuran parámetros adicionales a enviar en los request excepto DELETE
       paginate            : false,// Condicional para definir si el modelo tiene paginación
       pagination          : {current_page: 1, per_page: 10},// Configuración de paginación
+      responseAdapter     : (response) => response?.data?.data ?? response?.data ?? response,// Extrae la data del response
+      paginationAdapter   : (response) => response?.data?.meta ?? null,// Extrae datos de paginación si existen
     }
     //config.hasKey=config.hasKey!=undefined?config.hasKey:config.key!=undefined
     defaultValues = Object.assign(defaultValues, config)
@@ -48,6 +50,8 @@ export default class Model {
     this.modelGetters = defaultValues.modelGetters
     this.paginate = defaultValues.paginate
     this.pagination = defaultValues.pagination
+    this.responseAdapter = defaultValues.responseAdapter
+    this.paginationAdapter = defaultValues.paginationAdapter
     this.state = {}
     this.getters = {}
     this.actions = {}
@@ -56,7 +60,7 @@ export default class Model {
   get(url = '', params = {}, config = {}) {
     params = Object.assign(params, this.params)
     url = this.route + '/' + url
-    return this.instance.get(url, params, config)
+    return this.instance.get(url, { params }, config)
   }
 
   post(url = '', params = {}) {
@@ -68,7 +72,7 @@ export default class Model {
   // Función para obtener el listado de Objetos de la base de datos
   getAll(params = {}, config = {}) {
     params = Object.assign(params, this.params)
-    return this.instance.get(this.route, params, config)
+    return this.instance.get(this.route, { params }, config)
   }
 
   // Función para crear un objeto en la base de datos
@@ -190,9 +194,11 @@ export default class Model {
 
         }
       }),
-      sync       : this.sync,
-      paginate   : this.paginate,
-      pagination : this.pagination,
+      sync              : this.sync,
+      paginate          : this.paginate,
+      pagination        : this.pagination,
+      responseAdapter   : this.responseAdapter,
+      paginationAdapter : this.paginationAdapter,
     }
   }
 

package/src/useModelStore.js

@@ -5,7 +5,9 @@ import { areObjEquals } from "./helpers";
 
 export default function createModelStore (model, state = {}, getters = {}, actions = {}) {
   const defData = {
-    key : 'id',
+    key               : 'id',
+    responseAdapter   : (response) => response?.data?.data ?? response?.data ?? response,
+    paginationAdapter : (response) => response?.data?.meta ?? null,
   }
   const config = Object.assign(defData, model.getStoreConfig())
   let check =(d,data)=>{return d[config.key] === data[config.key]}
@@ -23,7 +25,7 @@ export default function createModelStore (model, state = {}, getters = {}, actio
     }
   }
   return {
-    state : {
+    state : () => ({
       itemSelected        : { loading: false, ...model.getDefault() },
       items               : [],
       keysAsinc           : [],
@@ -33,14 +35,14 @@ export default function createModelStore (model, state = {}, getters = {}, actio
       maxRelationsResolve : config.maxRelationsResolve,
       relations           : config.relations,
       syncStatus          : config.sync,
-      paginate            : config.paginate,  
+      paginate            : config.paginate,
       pagination          : config.pagination,
       selectedStatus      : false,
       timeOutAsinc        : null,
       check               : check,
       resolve             : (item) => item,
       ...state
-    },
+    }),
     getters : {
       // Getter para obtener el indice de la tabla
       //key     : ({key}) => { return key },
@@ -124,7 +126,7 @@ export default function createModelStore (model, state = {}, getters = {}, actio
         //var commit = store.commit
         return new Promise((resolve, reject) => {
           model.show(id).then(response => {
-            this.syncItem(response.data)
+            this.syncItem(config.responseAdapter(response))
             resolve(response);
           }).catch(reject);
         })
@@ -142,13 +144,14 @@ export default function createModelStore (model, state = {}, getters = {}, actio
         if (!(await model.saved(params))) {
           return new Promise((resolve, reject) => {
             model.getAll(params).then(response => {
-              const data = response.data;
-              model.save(data.data);
-              this[action](data.data);
+              const data = config.responseAdapter(response);
+              model.save(data);
+              this[action](data);
               if (this.paginate) {
-                // eslint-disable-next-line no-unused-vars
-                const { data: _, ...pagination } = data.meta;
-                this.pagination = Object.assign(this.pagination, pagination);
+                const pagination = config.paginationAdapter(response);
+                if (pagination) {
+                  this.pagination = Object.assign(this.pagination, pagination);
+                }
               }
               this.afterGet();
               resolve(response);
@@ -177,7 +180,7 @@ export default function createModelStore (model, state = {}, getters = {}, actio
         //var commit = store.commit
         return new Promise((resolve, reject) => {
           model.getAll(params).then(response => {
-            this.sync(response.data.data);
+            this.sync(config.responseAdapter(response));
             this.afterGet();
             resolve(response);
           }).catch(reject);
@@ -190,7 +193,7 @@ export default function createModelStore (model, state = {}, getters = {}, actio
           // divide y vencceras
           this.setItems([]);
           model.getAll(params).then(response => {
-            this.setItems(response.data.data);
+            this.setItems(config.responseAdapter(response));
             this.afterGet();
             resolve(response);
           }).catch(reject);
@@ -205,7 +208,7 @@ export default function createModelStore (model, state = {}, getters = {}, actio
       create( data){
         return new Promise((resolve, reject) => {
           model.create(data).then(response => {
-            this.syncItem(response.data.data);
+            this.syncItem(config.responseAdapter(response));
             resolve(response)
           }).catch(error => {
             reject(error)
@@ -217,7 +220,7 @@ export default function createModelStore (model, state = {}, getters = {}, actio
       update( data){
         return new Promise((resolve, reject) => {
           model.update(data).then(response => {
-            this.syncItem(response.data.data);
+            this.syncItem(config.responseAdapter(response));
             resolve(response)
           }).catch(error => {
             reject(error)