@knowlearning/agents 0.9.133 → 0.9.135

package/agents/watch.js

@@ -13,20 +13,13 @@ export default function({ metadata, environment, state, watchers, synced, sentUp
     let removed = false
     metadata(scope, user, domain)
       .then(async ({ ii }) => {
-        if (removed) return
-
         const { auth: { user: u }, domain: d } = await environment()
-        qualifiedScope = isUUID(scope) ? scope : `${!domain || domain === d ? '' : domain}/${!user || user === u ? '' : user}/${scope}`
+        const state = await statePromise
 
-        fn({
-          scope,
-          user,
-          domain,
-          state: await statePromise,
-          patch: null,
-          ii
-        })
+        if (removed) return
 
+        qualifiedScope = isUUID(scope) ? scope : `${!domain || domain === d ? '' : domain}/${!user || user === u ? '' : user}/${scope}`
+        fn({ scope, user, domain, state, patch: null, ii })
         if (sentUpdates) sentUpdates[qualifiedScope] = ii
 
         if (removed) return
@@ -37,7 +30,7 @@ export default function({ metadata, environment, state, watchers, synced, sentUp
 
     return () => {
       removed = true
-      return removeWatcher(qualifiedScope, fn)
+      if (qualifiedScope) removeWatcher(qualifiedScope, fn)
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowlearning/agents",
-  "version": "0.9.133",
+  "version": "0.9.135",
   "description": "API for embedding applications in KnowLearning systems.",
   "main": "node.js",
   "browser": "browser.js",

package/vue/3/components/scope.vue

@@ -4,47 +4,46 @@
   </slot>
 </template>
 
-<script>
-import { ref, watch, onMounted, onBeforeUnmount, computed } from 'vue'
+<script setup>
+  import { ref, watch, onMounted, onBeforeUnmount, computed } from 'vue'
 
-export default {
-  props: {
+  const props = defineProps({
     id: String,
     path: { type: Array, default: [] },
     placeholder: { type: String, default: '' },
     metadata: { type: Boolean, default: false }
-  },
-  setup(props) {
-    const value = ref(undefined)
-    const loading = ref(true)
-    let stopWatching
-    let stopWatchingAttempted = false
-
-    const startWatching = async () => {
-      if (stopWatching) stopWatching()
-      if (props.metadata) {
-        const metadata = await Agent.metadata(props.id)
-        value.value = props.path.length === 1 ? metadata[props.path[0]] : metadata
-      } else {
-        stopWatching = Agent.watch([props.id, ...props.path], val => {
-          if (stopWatchingAttempted) console.warn('Watcher not stopped for vueScopeComponent')
-          else  value.value = val
-        })
-      }
-      loading.value = false
-    }
+  })
 
-    watch( [() => props.id, () => props.path], startWatching, { deep: true })
-    onMounted(() => startWatching())
-    onBeforeUnmount(() => stopWatching && stopWatching())
+  const value = ref(undefined)
+  const loading = ref(true)
+  let stopWatching
 
-    const defaultRenderedValue = computed(() => {
-      if (loading.value) return 'loading'
-      else if (value.value === null && props.placeholder) return props.placeholder
-      else return value.value
-    })
+  const startWatching = async () => {
+    if (stopWatching) stopWatching()
 
-    return { loading, value, defaultRenderedValue }
+    if (props.id === undefined) {
+      stopWatching = undefined
+      value.value = undefined
+    }
+    else if (props.metadata) {
+      const metadata = await Agent.metadata(props.id)
+      value.value = props.path.length === 1 ? metadata[props.path[0]] : metadata
+    } else {
+      stopWatching = Agent.watch([props.id, ...props.path], v => value.value = v)
+    }
+    loading.value = false
   }
-};
+
+  watch( [() => props.id, () => props.path], startWatching, { deep: true })
+
+  onBeforeUnmount(() => stopWatching && stopWatching())
+
+  startWatching()
+
+  const defaultRenderedValue = computed(() => {
+    if (loading.value) return 'loading'
+    else if (value.value === null && props.placeholder) return props.placeholder
+    else return value.value
+  })
+
 </script>