@live-change/vue-api 0.1.7 → 0.1.11

package/lib/Api.js

@@ -1,5 +1,6 @@
 const { DaoProxy, DaoPrerenderCache, DaoCache, Path } = require("@live-change/dao")
 const validators = require('@live-change/framework/lib/utils/validators.js')
+const { hashCode, encodeNumber, uidGenerator } = require('@live-change/uid')
 
 function guid() {
   function s4() {
@@ -15,12 +16,14 @@ class Api extends DaoProxy {
     this.source = source
     this.settings = settings
 
+    this.uidGenerator = () => { throw new Error("uid generator not initialized yet") }
+
     this.createReactiveObject = this.settings.createReactiveObject
 
     this.preFetchComponents = []
     this.afterPreFetch = []
 
-    this.valdators = validators
+    this.validators = validators
 
     this.globals = {
       $validators: validators
@@ -91,34 +94,37 @@ class Api extends DaoProxy {
         ]
       },
       watch: {
-        serviceDefinitions(definitions, oldDefinitions) {
+        api(api) {
+          if(!api) return
           api.generateServicesApi()
         }
       }
-    }, )
+    })
     this.preFetchComponents.push(api.metadata)
     this.afterPreFetch.push(() => api.generateServicesApi())
   }
 
   generateServicesApi() {
     const api = this
-    let definitions = api.metadata.api?.services
-    console.log("GENERATE SERVICES API", api.metadata.api)
-    if(!definitions) {
+    let apiInfo = api.metadata.api
+    if(!apiInfo) {
       const cachePath = '["metadata","api"]'
       if(typeof window != 'undefined') {
         const ssrCache = window[this.settings.ssrCacheGlobal || '__DAO_CACHE__']
         if(ssrCache) {
           for(const [daoPath, value] of ssrCache) {
-            if(daoPath == cachePath) definitions = value?.services
+            if(daoPath == cachePath) apiInfo = value
           }
         }
       } else {
-        definitions = this.prerenderCache.cache.get(cachePath)?.services
+        apiInfo = this.prerenderCache.cache.get(cachePath)
       }
     }
+    console.log("GENERATE SERVICES API", apiInfo)
+    const definitions = apiInfo?.services
     if(JSON.stringify(definitions) == JSON.stringify(api.servicesApiDefinitions)) return
     if(!definitions) throw new Error("API DEFINITIONS NOT FOUND! UNABLE TO GENERATE API!")
+    api.uidGenerator = uidGenerator(apiInfo.client.user || apiInfo.client.session.slice(0, 16), 1)
     //console.log("GENERATE API DEFINITIONS", definitions)
     api.servicesApiDefinitions = definitions
     let globalViews = {}
@@ -144,10 +150,16 @@ class Api extends DaoProxy {
         actions[actionName].definition = serviceDefinition.actions[actionName]
       }
     }
+
     api.views = globalViews
     api.fetch = globalFetch
     api.actions = globalActions
-    api.globals.$client = this.metadata.client
+    api.client = this.metadata.client
+    api.uid = api.uidGenerator
+
+    api.globals.$lc = api
+
+    /// Deprecated:
     api.globals.$api = this
     api.globals.$views = this.views
     api.globals.$actions = this.actions
@@ -175,13 +187,11 @@ class Api extends DaoProxy {
       if(component.$options.reactivePreFetch) {
         const paths = component.$options.reactivePreFetch.apply(this.globals)
         console.log("PREFETCH PATHS", JSON.stringify(paths))
-        const promise = this.get({ paths }).then(results => {
+        const promise = this.get({ paths })/*.then(results => {
           for(let { what, data } of results) {
-            //console.log("PREFETCHED", JSON.stringify(what), ":", JSON.stringify(data, null, '  '))
-            //console.log("SET", what, this.prerenderCache.set.toString())
             this.prerenderCache.set(what, data)
           }
-        })
+        })*/// It's useless because DaoPrerenderCache support paths
         preFetchPromises.push(promise)
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/vue-api",
-  "version": "0.1.7",
+  "version": "0.1.11",
   "description": "Live Change Framework - vue api base",
   "main": "index.js",
   "scripts": {
@@ -22,6 +22,7 @@
   "homepage": "https://github.com/live-change/vue-api",
   "dependencies": {
     "@live-change/dao": "^0.3.6",
-    "debug": "^4.3.2"
+    "debug": "^4.3.2",
+    "@live-change/uid": "^0.1.3"
   }
 }