update livewire

Author: zodman

livewire/static/livewire/src/Message.js

@@ -1,56 +1,42 @@
-import store from '@/Store'
-
 export default class {
-    constructor(component, actionQueue) {
+    constructor(component, updateQueue) {
         this.component = component
-        this.actionQueue = actionQueue
-    }
-
-    get refs() {
-        return this.actionQueue
-            .map(action => {
-                return action.ref
-            })
-            .filter(ref => ref)
+        this.updateQueue = updateQueue
     }
 
     payload() {
-        let payload = {
-            id: this.component.id,
-            data: this.component.data,
-            name: this.component.name,
-            checksum: this.component.checksum,
-            children: this.component.children,
-            actionQueue: this.actionQueue.map(action => {
-                // This ensures only the type & payload properties only get sent over.
-                return {
-                    type: action.type,
-                    payload: action.payload,
-                }
-            }),
+        return {
+            fingerprint: this.component.fingerprint,
+            serverMemo: this.component.serverMemo,
+            // This ensures only the type & payload properties only get sent over.
+            updates: this.updateQueue.map(update => ({
+                type: update.type,
+                payload: update.payload,
+            })),
         }
+    }
 
-        if (Object.keys(this.component.errorBag).length > 0) {
-            payload.errorBag = this.component.errorBag
-        }
+    storeResponse(payload) {
+        return (this.response = payload)
+    }
+
+    resolve() {
+        let returns = this.response.effects.returns || []
+
+        this.updateQueue.forEach(update => {
+            if (update.type !== 'callMethod') return
 
-        return payload
+            update.resolve(
+                returns[update.method] !== undefined
+                    ? returns[update.method]
+                    : null
+            )
+        })
     }
 
-    storeResponse(payload) {
-        return this.response = {
-            id: payload.id,
-            dom: payload.dom,
-            checksum: payload.checksum,
-            children: payload.children,
-            dirtyInputs: payload.dirtyInputs,
-            eventQueue: payload.eventQueue,
-            dispatchQueue: payload.dispatchQueue,
-            events: payload.events,
-            data: payload.data,
-            redirectTo: payload.redirectTo,
-            errorBag: payload.errorBag || {},
-            updatesQueryString: payload.updatesQueryString,
-        }
+    reject() {
+        this.updateQueue.forEach(update => {
+            update.reject()
+        })
     }
 }

livewire/static/livewire/src/PrefetchMessage.js

@@ -6,21 +6,6 @@ export default class extends Message {
     }
 
     get prefetchId() {
-        return this.actionQueue[0].toId()
-    }
-
-    payload() {
-        return {
-            fromPrefetch: this.prefetchId,
-            ...super.payload()
-        }
-    }
-
-    storeResponse(payload) {
-        super.storeResponse(payload)
-
-        this.response.fromPrefetch = payload.fromPrefetch
-
-        return this.response
+        return this.updateQueue[0].toId()
     }
 }

livewire/static/livewire/src/Store.js

@@ -1,15 +1,19 @@
-import EventAction from "@/action/event";
-import HookManager from "@/HookManager";
-import DirectiveManager from "@/DirectiveManager";
-import MessageBus from "./MessageBus";
+import EventAction from '@/action/event'
+import HookManager from '@/HookManager'
+import DirectiveManager from '@/DirectiveManager'
+import MessageBus from './MessageBus'
 
 const store = {
     componentsById: {},
-    listeners: new MessageBus,
+    listeners: new MessageBus(),
+    initialRenderIsFinished: false,
     livewireIsInBackground: false,
     livewireIsOffline: false,
+    sessionHasExpired: false,
+    requestIsOut: false,
     hooks: HookManager,
     directives: DirectiveManager,
+    onErrorCallback: () => {},
 
     components() {
         return Object.keys(this.componentsById).map(key => {
@@ -18,22 +22,21 @@ const store = {
     },
 
     addComponent(component) {
-        return this.componentsById[component.id] = component
+        return (this.componentsById[component.id] = component)
     },
 
     findComponent(id) {
         return this.componentsById[id]
     },
 
     getComponentsByName(name) {
-        return this.components()
-            .filter(component => {
-                return component.name === name
-            })
+        return this.components().filter(component => {
+            return component.name === name
+        })
     },
 
     hasComponent(id) {
-        return !! this.componentsById[id]
+        return !!this.componentsById[id]
     },
 
     tearDownComponents() {
@@ -49,39 +52,34 @@ const store = {
     emit(event, ...params) {
         this.listeners.call(event, ...params)
 
-        this.componentsListeningForEvent(event).forEach(
-            component => component.addAction(new EventAction(
-                event, params
-            ))
+        this.componentsListeningForEvent(event).forEach(component =>
+            component.addAction(new EventAction(event, params))
         )
     },
 
     emitUp(el, event, ...params) {
-        this.componentsListeningForEventThatAreTreeAncestors(el, event).forEach(
-            component => component.addAction(new EventAction(
-                event, params
-            ))
+        this.componentsListeningForEventThatAreTreeAncestors(
+            el,
+            event
+        ).forEach(component =>
+            component.addAction(new EventAction(event, params))
         )
     },
 
     emitSelf(componentId, event, ...params) {
         let component = this.findComponent(componentId)
 
-        if (component.events.includes(event)) {
-            component.addAction(new EventAction(
-                event, params
-            ))
+        if (component.listeners.includes(event)) {
+            component.addAction(new EventAction(event, params))
         }
     },
 
     emitTo(componentName, event, ...params) {
         let components = this.getComponentsByName(componentName)
 
         components.forEach(component => {
-            if (component.events.includes(event)) {
-                component.addAction(new EventAction(
-                    event, params
-                ))
+            if (component.listeners.includes(event)) {
+                component.addAction(new EventAction(event, params))
             }
         })
     },
@@ -98,14 +96,16 @@ const store = {
         }
 
         return this.components().filter(component => {
-            return component.events.includes(event)
-                && parentIds.includes(component.id)
+            return (
+                component.listeners.includes(event) &&
+                parentIds.includes(component.id)
+            )
         })
     },
 
     componentsListeningForEvent(event) {
         return this.components().filter(component => {
-            return component.events.includes(event)
+            return component.listeners.includes(event)
         })
     },
 
@@ -126,7 +126,11 @@ const store = {
         component.tearDown()
         // Remove the component from the store.
         delete this.componentsById[component.id]
-    }
+    },
+
+    onError(callback) {
+        this.onErrorCallback = callback
+    },
 }
 
 export default store

livewire/static/livewire/src/action/deferred-model.js

@@ -0,0 +1,14 @@
+import Action from '.'
+
+export default class extends Action {
+    constructor(name, value, el) {
+        super(el)
+
+        this.type = 'syncInput'
+        this.name = name
+        this.payload = {
+            name,
+            value,
+        }
+    }
+}

livewire/static/livewire/src/action/index.js

@@ -2,6 +2,8 @@
 export default class {
     constructor(el) {
         this.el = el
+        this.resolveCallback = () => {}
+        this.rejectCallback = () => {}
     }
 
     get ref() {
@@ -11,4 +13,20 @@ export default class {
     toId() {
         return btoa(encodeURIComponent(this.el.el.outerHTML))
     }
+
+    onResolve(callback) {
+        this.resolveCallback = callback
+    }
+
+    onReject(callback) {
+        this.rejectCallback = callback
+    }
+
+    resolve(thing) {
+        this.resolveCallback(thing)
+    }
+
+    reject(thing) {
+        this.rejectCallback(thing)
+    }
 }

livewire/static/livewire/src/action/method.js

@@ -5,6 +5,7 @@ export default class extends Action {
         super(el)
 
         this.type = 'callMethod'
+        this.method = method
         this.payload = {
             method,
             params,

livewire/static/livewire/src/action/model.js

@@ -5,6 +5,7 @@ export default class extends Action {
         super(el)
 
         this.type = 'syncInput'
+        this.name = name
         this.payload = {
             name,
             value,