@nxtedition/lib 19.4.11 → 19.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/lib",
-  "version": "19.4.11",
+  "version": "19.5.1",
   "license": "MIT",
   "author": "Robert Nagy <robert.nagy@boffins.se>",
   "type": "module",

package/sequence.js

@@ -55,7 +55,7 @@ export class Sequence {
       }
 
       if (identity != null) {
-        if (typeof identity === 'string') {
+        if (typeof identity === 'number') {
           assert(identity === this.identity)
         } else if (Array.isArray(identity)) {
           for (let n = 0; n < identity.length; n++) {

package/util/template/javascript.js

@@ -12,6 +12,8 @@ import _ from 'lodash'
 import moment from 'moment-timezone'
 import Timecode from 'smpte-timecode'
 
+const SEP = String.fromCharCode(30) // ASCII 1E
+
 const kSuspend = Symbol('kSuspend')
 const kEmpty = Symbol('kEmpty')
 const maxInt = 2147483647
@@ -52,6 +54,7 @@ class FetchEntry {
         dispatcher: fetchClient,
       })
         .then(async (res) => {
+          // TODO (fix): Check cache-control and invalidate entry...
           const body = await res.text()
           if (this.refresh) {
             // TODO (fix): max size...
@@ -82,12 +85,33 @@ class FetchEntry {
 }
 
 class RecordEntry {
-  constructor(key, refresh, ds) {
+  constructor(key, refresh, { name, path, ds, state }) {
+    if (state == null) {
+      state =
+        name.startsWith('{') || name.includes('?')
+          ? ds.record.STATE.PROVIDER
+          : ds.record.STATE.SERVER
+    } else if (typeof state === 'string') {
+      state = ds.record.STATE[state.toUpperCase()] ?? ds.record.STATE.SERVER
+    }
+
     this.key = key
     this.counter = -1
 
-    this.refresh = refresh
-    this.record = ds.record.getRecord(key)
+    this.record = ds.record.getRecord(name)
+
+    this.data = this.record.get(path)
+    this.ready = this.record.state >= state
+    this.refresh = () => {
+      const data = this.record.get(path)
+      const ready = this.record.state >= state
+
+      if (data !== this.data || ready !== this.ready) {
+        this.data = data
+        this.ready = ready
+        refresh()
+      }
+    }
 
     if (this.record.subscribe) {
       this.record.subscribe(this.refresh)
@@ -106,6 +130,8 @@ class RecordEntry {
 
     this.record = null
     this.refresh = null
+    this.data = null
+    this.ready = false
   }
 }
 
@@ -203,8 +229,6 @@ function proxify(value, expression, handler, suspend = true) {
   }
 }
 
-const MAP_POOL = []
-
 function makeWrapper(expression) {
   const handler = {
     get: (target, prop) => proxify(target[prop], expression, handler),
@@ -222,7 +246,7 @@ export default function ({ ds, proxify, compiler }) {
 
       // TODO (perf): This could be faster by using an array + indices.
       // A bit similar to how react-hooks works.
-      this._entries = null
+      this._entries = new Map()
       this._refreshing = false
       this._counter = 0
       this._value = kEmpty
@@ -276,8 +300,19 @@ export default function ({ ds, proxify, compiler }) {
       return this._getPromise(promise, suspend)
     }
 
-    ds(id, state, suspend) {
-      return this._getRecord(id, state, suspend)
+    /** @deprecated */
+    ds(name, state, suspend) {
+      return !name || typeof name !== 'string'
+        ? ds.record.JSON.EMPTY_OBJ
+        : this._getRecord(name, null, state, suspend)
+    }
+
+    get(name, path, state, suspend) {
+      return !name || typeof name !== 'string'
+        ? path
+          ? undefined
+          : ds.record.JSON.EMPTY_OBJ
+        : this._getRecord(name, path, state, suspend)
     }
 
     timer(dueTime, dueValue = dueTime, suspend) {
@@ -292,10 +327,19 @@ export default function ({ ds, proxify, compiler }) {
       return objectHash(value)
     }
 
-    _ds(key, postfix, state, suspend) {
-      return !key || typeof key !== 'string'
-        ? null
-        : this._getRecord(postfix ? key + postfix : key, state, suspend)
+    /** @deprecated */
+    _ds(name, postfix, state, suspend) {
+      return !name || typeof name !== 'string'
+        ? ds.record.JSON.EMPTY_OBJ
+        : this._getRecord(postfix ? name + postfix : name, null, state, suspend)
+    }
+
+    _get(name, postfix, path, state, suspend) {
+      return !name || typeof name !== 'string'
+        ? path
+          ? undefined
+          : ds.record.JSON.EMPTY_OBJ
+        : this._getRecord(postfix ? name + postfix : name, path, state, suspend)
     }
 
     _asset(id, type, state, suspend) {
@@ -312,18 +356,10 @@ export default function ({ ds, proxify, compiler }) {
       this._destroyed = true
       this._subscription?.unsubscribe()
 
-      if (this._entries) {
-        for (const entry of this._entries.values()) {
-          entry.dispose()
-        }
-        this._entries.clear()
-
-        if (MAP_POOL.length < 1024) {
-          MAP_POOL.push(this._entries)
-        }
-
-        this._entries = null
+      for (const entry of this._entries.values()) {
+        entry.dispose()
       }
+      this._entries.clear()
     }
 
     _refreshImpl() {
@@ -380,15 +416,10 @@ export default function ({ ds, proxify, compiler }) {
         this._suspended = false
         this._disposing = true
 
-        if (this._entries) {
-          for (const entry of this._entries.values()) {
-            if (entry.counter !== this._counter) {
-              entry.dispose()
-              this._entries.delete(entry.key)
-            }
-          }
-          if (this._entries.size === 0) {
-            this._entries = null
+        for (const entry of this._entries.values()) {
+          if (entry.counter !== this._counter) {
+            entry.dispose()
+            this._entries.delete(entry.key)
           }
         }
 
@@ -411,7 +442,6 @@ export default function ({ ds, proxify, compiler }) {
     }
 
     _getEntry(key, Entry, opaque) {
-      this._entries ??= MAP_POOL.pop() ?? new Map()
       let entry = this._entries.get(key)
       if (!entry) {
         entry = new Entry(key, this._refresh, opaque)
@@ -519,35 +549,32 @@ export default function ({ ds, proxify, compiler }) {
       return dueValue
     }
 
-    _getRecord(key, state, suspend) {
-      if (!key || typeof key !== 'string') {
-        throw new Error(`invalid argument: key (${key})`)
+    _getRecord(name, path, state, suspend) {
+      if (name != null && typeof name !== 'string') {
+        throw new Error(`invalid argument: key (${name})`)
       }
 
-      if (state == null) {
-        state =
-          key.startsWith('{') || key.includes('?')
-            ? ds.record.STATE.PROVIDER
-            : ds.record.STATE.SERVER
-      } else if (typeof state === 'string') {
-        state = ds.record.STATE[state.toUpperCase()]
-        if (state == null) {
-          throw new Error(`invalid argument: state (${state})`)
-        }
+      if (path != null && typeof path !== 'string') {
+        throw new Error(`invalid argument: path (${path})`)
+      }
+
+      if (state != null && typeof state !== 'string' && typeof state !== 'number') {
+        throw new Error(`invalid argument: state (${state})`)
       }
 
-      const entry = this._getEntry(key, RecordEntry, ds)
+      const key = '' + (name ?? '') + SEP + (path ?? '') + SEP + (state ?? '')
+      const entry = this._getEntry(key, RecordEntry, { ds, name, path, state })
 
-      if (entry.record.state < state) {
+      if (!entry.ready) {
         this._suspended = true
         if (suspend ?? this._errored) {
           throw kSuspend
         } else {
-          return entry.record.data
+          return entry.data
         }
       }
 
-      return entry.record.data
+      return entry.data
     }
 
     _getHasRawAssetType(id, type, state, suspend) {
@@ -559,8 +586,13 @@ export default function ({ ds, proxify, compiler }) {
         throw new Error(`invalid argument: type (${type})`)
       }
 
-      const data = this._getRecord(id + ':asset.rawTypes?', state ?? ds.record.PROVIDER, suspend)
-      return data && Array.isArray(data.value) && data.value.includes(type) ? id : null
+      const rawTypes = this._getRecord(
+        id + ':asset.rawTypes?',
+        'value',
+        state ?? ds.record.PROVIDER,
+        suspend,
+      )
+      return Array.isArray(rawTypes) && rawTypes.includes(type) ? id : null
     }
   }
 
@@ -571,10 +603,11 @@ export default function ({ ds, proxify, compiler }) {
       "use strict";
       {
         const _ = pipe;
-        _.asset = (type, state, throws) => (id) => nxt._asset(id, type, state, throws);
-        _.ds = (postfix, state, throws) => (id) => nxt._ds(id, postfix, state, throws);
+        _.asset = (type, state, suspend) => (name) => nxt._asset(name, type, state, suspend);
+        _.ds = (postfix, state, suspend) => (name) => nxt._ds(name, postfix, state, suspend);
+        _.get = (postfix, path, state, suspend) => (name) => nxt._get(name, postfix, path, state, suspend);
         _.timer = (dueTime) => (dueValue) => nxt.timer(dueTime, dueValue);
-        _.fetch = (options, throws) => (resource) => nxt.fetch(resource, options, throws);
+        _.fetch = (options, suspend) => (resource) => nxt.fetch(resource, options, suspend);
         ${expression}
       }
     `)