@jsreport/jsreport-core 3.9.0 → 3.10.0

package/README.md

@@ -282,6 +282,21 @@ jsreport.documentStore.collection('templates')
 
 ## Changelog
 
+### 3.10.0
+
+- `mainReporter.executeWorkerAction` now supports cancellation with `AbortController.signal`
+- add support for specifying what are the main document properties of templates entitySet
+
+### 3.9.0
+
+- add more store methods `collection.findAdmin`, `collection.findOneAdmin`, `reporter.adminRequest` to easily allow execure store queries without taking into account permissions
+- improve logging for child requests and user level logs
+- differentiate between template not found errors and permissions related errors (it is now more clean what is the cause of specific error)
+- normalize to error when non-errors are throw (like throw "string")
+- improve errors in helpers (it now includes the helper name)
+- improve error message when template was not found in child request
+- improve error handling in sandbox
+
 ### 3.8.1
 
 - update vm2 for fix security issue

package/lib/main/reporter.js

@@ -557,6 +557,16 @@ class MainReporter extends Reporter {
         timeout
       })
 
+    const handleAbortSignal = () => {
+      if (worker) {
+        worker.release(req).catch((e) => this.logger.error('Failed to release worker ' + e))
+      }
+    }
+
+    if (options.signal && !options.worker) {
+      options.signal.addEventListener('abort', handleAbortSignal, { once: true })
+    }
+
     try {
       const result = await worker.execute({
         actionName,
@@ -579,7 +589,16 @@ class MainReporter extends Reporter {
       return result
     } finally {
       if (!options.worker) {
-        await worker.release(req)
+        let shouldRelease = true
+
+        if (options.signal) {
+          options.signal.removeEventListener('abort', handleAbortSignal)
+          shouldRelease = options.signal.aborted !== true
+        }
+
+        if (shouldRelease) {
+          await worker.release(req)
+        }
       }
     }
   }

package/lib/main/templates.js

@@ -2,9 +2,9 @@
 module.exports = (reporter) => {
   reporter.documentStore.registerEntityType('TemplateType', {
     name: { type: 'Edm.String' },
-    content: { type: 'Edm.String', document: { extension: 'html', engine: true } },
+    content: { type: 'Edm.String', document: { main: true, extension: 'html', engine: true } },
     recipe: { type: 'Edm.String' },
-    helpers: { type: 'Edm.String', document: { extension: 'js' }, schema: { type: 'object' } },
+    helpers: { type: 'Edm.String', document: { main: true, extension: 'js' }, schema: { type: 'object' } },
     engine: { type: 'Edm.String' }
   }, true)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-core",
-  "version": "3.9.0",
+  "version": "3.10.0",
   "description": "javascript based business reporting",
   "keywords": [
     "report",
@@ -54,7 +54,7 @@
     "diff-match-patch": "1.0.5",
     "enhanced-resolve": "5.8.3",
     "has-own-deep": "1.1.0",
-    "isbinaryfile": "4.0.0",
+    "isbinaryfile": "5.0.0",
     "listener-collection": "2.0.0",
     "lodash.get": "4.4.2",
     "lodash.groupby": "4.6.0",