@nxtedition/lib 23.3.13 → 23.3.15

package/app.js

@@ -451,7 +451,7 @@ export function makeApp(appConfig, onTerminate) {
   }
 
   if (appConfig.compiler) {
-    compiler = makeTemplateCompiler({ ds, ...appConfig.compiler })
+    compiler = makeTemplateCompiler({ ds, logger, ...appConfig.compiler })
   }
 
   const monitorProviders = {}

package/package.json

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

package/util/template/index.js

@@ -7,7 +7,7 @@ import objectHash from 'object-hash'
 import { makeWeakCache } from '../../weakCache.js'
 import firstValueFrom from '../../rxjs/firstValueFrom.js'
 
-export function makeTemplateCompiler({ ds, proxify }) {
+export function makeTemplateCompiler({ ds, proxify, logger = globalThis.__nxt_lib_app?.logger }) {
   const compiler = {
     current: null,
     resolveTemplate,
@@ -17,8 +17,8 @@ export function makeTemplateCompiler({ ds, proxify }) {
   }
 
   const compilers = {
-    nxt: getNxtpressionsCompiler({ ds }),
-    js: getJavascriptCompiler({ ds, proxify, compiler }),
+    nxt: getNxtpressionsCompiler({ ds, logger }),
+    js: getJavascriptCompiler({ ds, proxify, compiler, logger }),
   }
 
   function inner(str) {

package/util/template/javascript.js

@@ -212,7 +212,7 @@ function makeWrapper(expression) {
   return (value, suspend = true) => proxify(value, expression, handler, suspend)
 }
 
-export default function ({ ds, proxify, compiler }) {
+export default function ({ ds, proxify, compiler, logger }) {
   class Expression {
     constructor(script, expression, args, observer) {
       this._expression = expression
@@ -405,7 +405,11 @@ export default function ({ ds, proxify, compiler }) {
         })
 
         if (this._suspended) {
-          process.emitWarning(error)
+          if (logger) {
+            logger.error({ err })
+          } else {
+            process.emitWarning(error)
+          }
         } else {
           this._observer.error(error)
         }

package/util/template/nextpressions.js

@@ -27,7 +27,7 @@ function asFilter(transform, predicate, obj) {
   )
 }
 
-export default function ({ ds } = {}) {
+export default function ({ ds, logger } = {}) {
   const FILTERS = {
     // any
     ...asFilter(null, null, {
@@ -587,8 +587,8 @@ export default function ({ ds } = {}) {
           rxjs.switchMap((value) => reduceValue(value, 0, filters, options)),
           rxjs.distinctUntilChanged(),
           rxjs.catchError((err) => {
-            options?.logger?.error(
-              { err, expression: { expression, context: JSON.stringify(context) } },
+            ;(options?.logger ?? logger)?.error(
+              { err, data: { expression, context: JSON.stringify(context) } },
               'expression failed',
             )
             return rxjs.of(null)