@jsreport/jsreport-core 3.6.1 → 3.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jsreport/jsreport-core",
-  "version": "3.6.1",
+  "version": "3.8.0",
   "description": "javascript based business reporting",
   "keywords": [
     "report",
@@ -17,12 +17,19 @@
     "name": "Jan Blaha",
     "email": "jan.blaha@hotmail.com"
   },
+  "maintainers": [
+    {
+      "name": "pofider",
+      "email": "jan.blaha@hotmail.com"
+    }
+  ],
   "main": "index.js",
   "files": [
     "lib",
     "index.js",
     "test/store/common.js",
-    "test/blobStorage/common.js"
+    "test/blobStorage/common.js",
+    "test/extensions/validExtensions/listeners"
   ],
   "scripts": {
     "test": "mocha --timeout 5000 --recursive test --exit && standard",
@@ -32,8 +39,10 @@
     "@babel/code-frame": "7.12.13",
     "@babel/parser": "7.14.4",
     "@babel/traverse": "7.12.9",
+    "@colors/colors": "1.5.0",
     "@jsreport/advanced-workers": "1.2.3",
     "@jsreport/mingo": "2.4.1",
+    "@jsreport/reap": "0.1.0",
     "ajv": "6.12.6",
     "app-root-path": "3.0.0",
     "bytes": "3.1.2",
@@ -56,7 +65,6 @@
     "nanoid": "3.2.0",
     "nconf": "0.12.0",
     "node.extend.without.arrays": "1.1.6",
-    "@jsreport/reap": "0.1.0",
     "semver": "7.3.5",
     "serializator": "1.0.2",
     "stack-trace": "0.0.10",
@@ -64,8 +72,8 @@
     "unset-value": "1.0.0",
     "uuid": "8.3.2",
     "vm2": "3.9.9",
-    "winston": "3.3.3",
-    "winston-transport": "4.4.0"
+    "winston": "3.8.1",
+    "winston-transport": "4.5.0"
   },
   "devDependencies": {
     "mocha": "9.2.2",
@@ -77,12 +85,6 @@
   "engines": {
     "node": ">=16.11"
   },
-  "maintainers": [
-    {
-      "name": "pofider",
-      "email": "jan.blaha@hotmail.com"
-    }
-  ],
   "standard": {
     "env": {
       "mocha": true

package/test/extensions/validExtensions/listeners/jsreport.dontdiscover.config.js

@@ -0,0 +1,9 @@
+module.exports = {
+  name: 'listeners',
+  main: 'main.js',
+  worker: 'worker.js',
+  dependencies: ['a', 'b', 'c', 'd', 'e', 'f'],
+  requires: {},
+  hasPublicPart: false,
+  directory: __dirname
+}

package/test/extensions/validExtensions/listeners/main.js

@@ -0,0 +1,51 @@
+
+module.exports = (reporter, definition) => {
+  reporter.tests = reporter.tests || {}
+  reporter.tests.beforeRenderListeners = reporter.createListenerCollection()
+  reporter.tests.afterRenderListeners = reporter.createListenerCollection()
+  reporter.tests.validateRenderListeners = reporter.createListenerCollection()
+  reporter.tests.afterTemplatingEnginesExecutedListeners = reporter.createListenerCollection()
+
+  reporter.registerMainAction('test-beforeRender-listeners', async (data, req) => {
+    data.req = reporter.Request(data.req)
+    await reporter.tests.beforeRenderListeners.fire(data.req, data.res)
+    return { req: data.req, res: data.res }
+  })
+  reporter.registerMainAction('test-afterRender-listeners', async (data, req) => {
+    data.req = reporter.Request(data.req)
+    await reporter.tests.afterRenderListeners.fire(data.req, data.res)
+    return { req: data.req, res: data.res }
+  })
+  reporter.registerMainAction('test-validateRender-listeners', async (data, req) => {
+    data.req = reporter.Request(data.req)
+    await reporter.tests.validateRenderListeners.fire(data.req, data.res)
+    return { req: data.req, res: data.res }
+  })
+  reporter.registerMainAction('test-afterTemplatingEnginesExecuted-listeners', async (data, req) => {
+    data.req = reporter.Request(data.req)
+    await reporter.tests.afterTemplatingEnginesExecutedListeners.fire(data.req, data.res)
+    return { req: data.req, res: data.res }
+  })
+
+  let beforeRenderEval
+  reporter.tests.beforeRenderEval = (fn) => {
+    beforeRenderEval = fn
+  }
+  reporter.registerMainAction('test-beforeRenderEval', async (data, req) => {
+    if (beforeRenderEval == null) {
+      return
+    }
+    return beforeRenderEval.toString()
+  })
+
+  let afterRenderEval
+  reporter.tests.afterRenderEval = (fn) => {
+    afterRenderEval = fn
+  }
+  reporter.registerMainAction('test-afterRenderEval', async (data, req) => {
+    if (afterRenderEval == null) {
+      return
+    }
+    return afterRenderEval.toString()
+  })
+}

package/test/extensions/validExtensions/listeners/worker.js

@@ -0,0 +1,68 @@
+const extend = require('node.extend.without.arrays')
+const vm = require('vm')
+const path = require('path')
+const process = require('process')
+
+module.exports = (reporter, definition) => {
+  reporter.initializeListeners.add('test-listeners', () => {
+    reporter.beforeRenderListeners.add('listeners', async (req, res) => {
+      const result = await reporter.executeMainAction('test-beforeRender-listeners', { req, res }, req)
+      extend(true, req, result.req)
+      extend(true, res, result.res)
+    })
+
+    reporter.afterRenderListeners.add('listeners', async (req, res) => {
+      const result = await reporter.executeMainAction('test-afterRender-listeners', { req, res }, req)
+      extend(true, req, result.req)
+      extend(true, res, result.res)
+    })
+
+    reporter.validateRenderListeners.add('listeners', async (req, res) => {
+      const result = await reporter.executeMainAction('test-validateRender-listeners', { req, res }, req)
+      extend(true, req, result.req)
+      extend(true, res, result.res)
+    })
+
+    reporter.afterTemplatingEnginesExecutedListeners.add('listeners', async (req, res) => {
+      const result = await reporter.executeMainAction('test-afterTemplatingEnginesExecuted-listeners', { req, res }, req)
+      extend(true, req, result.req)
+      extend(true, res, result.res)
+    })
+
+    const evalInWorker = (code, req, res) => {
+      const script = new vm.Script(`
+          ;(function () {
+            return ${code}
+          })()
+      `)
+
+      return script.runInThisContext({
+        displayErrors: true
+      })(req, res, {
+        require: (m) => {
+          try {
+            return require(path.join(process.cwd(), 'node_modules', m))
+          } catch (e) {
+            // hack, make it working in monorepo as well as normal extension
+            return require(path.join(process.cwd(), '../../node_modules', m))
+          }
+        },
+        reporter
+      })
+    }
+
+    reporter.afterRenderListeners.add('eval-listeners', async (req, res) => {
+      const code = await reporter.executeMainAction('test-afterRenderEval', {}, req)
+      if (code) {
+        return evalInWorker(code, req, res)
+      }
+    })
+
+    reporter.beforeRenderListeners.insert(0, 'eval-listeners', async (req, res) => {
+      const code = await reporter.executeMainAction('test-beforeRenderEval', {}, req)
+      if (code) {
+        return evalInWorker(code, req, res)
+      }
+    })
+  })
+}

package/test/store/common.js

@@ -228,7 +228,7 @@ function collectionTests (store, isInternal, runTransactions) {
     const colName = !isInternal ? 'templates' : 'internalTemplates'
 
     await getCollection(colName).insert({ name: '1', engine: 'none', recipe: 'a' })
-    await getCollection(colName).insert({ name: '2', engine: 'none', recipe: 'a' })
+    await getCollection(colName).insert({ name: '2', engine: 'test2', recipe: 'a' })
     const res = await getCollection(colName).update({ recipe: 'a' }, { $set: { engine: 'test2' } })
     res.should.be.eql(2)
   })