@iankibetsh/vue-streamline 1.1.4 → 1.1.6

package/README.md

@@ -32,7 +32,7 @@ Vue.use(streamline, {
 import { useStreamline } from '@iankibet/vue-streamline'
 
 
-const {service:tasksService} = useStreamline('tasks')
+const {getActionUrl, service:tasksService} = useStreamline('tasks')
 
 // call the service methods
 
@@ -46,5 +46,5 @@ tasksServices.getTasks().then(response => {
 
 You can get the url to an action/method in the service by calling the getActionUrl method on the service object passing the action name and any parameters
 ```js
- tasksService.getActionUrl('getTasks', 'active')
+getActionUrl('getTasks', 'active')
  ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iankibetsh/vue-streamline",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Vue library for streamlining laravel backend services with @iankibet/streamline composer package",
  "type": "module",
   "scripts": {

package/src/App.vue

@@ -1,26 +1,28 @@
 <script setup>
 import useStreamline from './composables/useStreamline.js'
-import { ref } from 'vue'
+import { onMounted, ref, toRefs } from 'vue'
 
-const {loading, service:paybillService} = useStreamline('mpesa/paybill',28)
+const {loading, service:paybillService, getActionUrl} = useStreamline('mpesa/paybill',3)
 
 
 const foundPaybill = ref(null)
 
+onMounted(()=>{
+  paybillService.callAnyMethod(3).then(res=>{
+    foundPaybill.value = res
+  })
+})
 const findPaybill = async ()=>{
-  foundPaybill.value = await paybillService.getPaybill(28)
+  foundPaybill.value = await paybillService.getPaybill(3)
+  console.log(getActionUrl('getPaybill',3))
 }
 </script>
 
 <template>
   <div>
-    {{ paybillService.getMethods() }}
-    <input type="text">
-    {{ paybillService.paybill }}
-    <h1 @click="findPaybill(28)">Try Find</h1>
-    {{ paybillService.getActionUrl('addPaybill') }}
-<h3 class="text-success" v-if="loading">Loading...</h3>
-    {{ foundPaybill }}
+    <hr/>
+    <h3 class="text-success" >Loading : {{ loading }}</h3>
+    <h1 @click="findPaybill">Get Paybill</h1>
   </div>
 </template>
 

package/src/composables/useStreamline.js

@@ -1,5 +1,5 @@
 import Axios from 'axios'
-import { inject, reactive, ref, toRefs } from 'vue'
+import { inject, onMounted, reactive, ref, toRefs } from 'vue'
 
 const useStreamline = (stream, ...initialArgs) => {
     let formData = {}
@@ -14,8 +14,33 @@ const useStreamline = (stream, ...initialArgs) => {
             ...streamlineHeaders
         }
     })
+    const handler = {
+        get(target, prop, receiver) {
+            if (prop in target) {
+                return target[prop]
+            }
+            return async (...args) => {
+                loading.value = true
+                try {
+                    const response = await axios.post(streamlineUrl, {
+                        action: prop,
+                        stream,
+                        ...formData,
+                        params: args
+                    })
+                    return response.data
+                } catch (error) {
+                    console.error(`Error calling ${prop} on stream ${stream}`, error)
+                    throw error
+                } finally {
+                    loading.value = false
+                }
+            }
+        }
+    }
 
-    const service = reactive({}) // Make the service object reactive
+    const service = reactive({
+    }) // Make the service object reactive
 
     // Function to fetch the public properties of the service class
     const fetchServiceProperties = async () => {
@@ -35,12 +60,13 @@ const useStreamline = (stream, ...initialArgs) => {
         }
     }
 
+
     // Function to assign properties and methods to the service object
     const assignPropertiesAndMethods = (data) => {
         Object.assign(service, data.properties) // Assign the properties to the reactive service object
-        const methods = data.methods
-        for (const method of methods) {
-            service[method] = async (...args) => {
+        for (const method of data.methods) {
+            const fn = async (...args) => {
+                loading.value = true
                 try {
                     const response = await axios.post(streamlineUrl, {
                         action: method,
@@ -52,64 +78,33 @@ const useStreamline = (stream, ...initialArgs) => {
                 } catch (error) {
                     console.error(`Error calling ${method} on stream ${stream}`, error)
                     throw error
+                } finally {
+                    loading.value = false
                 }
             }
+            service[method] = fn
         }
     }
 
-    const proxyService = new Proxy(service, {
-        get(target, action) {
-            if (action in target) {
-                return target[action] // Return the reactive property if it exists
-            }
-
-            return (...args) => {
-                const setDataActions = ['setFormData', 'setData']
-                if (setDataActions.includes(action)) {
-                    formData = args[0]
-                    return proxyService
-                }
-                const getMethodsActions = ['getMethods','getActions','getFunctions','getServiceMethods']
-                if(getMethodsActions.includes(action)) {
-                    return Object.keys(proxyService).filter(key=>{
-                        if(typeof proxyService[key] === 'function') {
-                            return key
-                        }
-                    })
-                }
-
-                const postBody = {
-                    action,
-                    stream,
-                    ...formData,
-                }
+    const getActionUrl = (action, ...args) => {
+       // console log all arguments to this
 
-                const getUrlMethods = ['getUrl', 'getFullUrl', 'getActionUrl']
-                if (getUrlMethods.includes(action)) {
-                    postBody.action = args[0]
-                    const params = args.slice(1)
-                    if (params.length > 0) {
-                        postBody.params = params
-                    }
-                    return streamlineUrl + '?' + new URLSearchParams(postBody).toString()
-                }
-
-                postBody.params = args
-                return axios.post(streamlineUrl, postBody).then(response => response.data).catch(error => {
-                    console.error(`Error calling ${action} on stream ${stream}`, error)
-                    throw error
-                })
-            }
+        const post = {
+            action,
+            stream,
+            params: args
         }
-    })
+        return streamlineUrl + '?' + new URLSearchParams(post).toString()
 
-    // Fetch and set the properties on initialization
-    fetchServiceProperties()
+    }
+    onMounted(()=>{
+        fetchServiceProperties()
+    })
 
     return {
-        ...toRefs(service), // Spread the reactive service properties and return as refs for reactivity
-        service: proxyService, // Return the proxy service for method calls
-        loading
+        loading,
+        service: new Proxy(service, handler),
+        getActionUrl
     }
 }
 

package/dist/vite.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>