@jsreport/jsreport-core 3.1.2-test.2 → 3.4.1

package/lib/worker/templates.js

@@ -1,78 +1,80 @@
-const extend = require('node.extend.without.arrays')
-
-module.exports = (reporter) => {
-  reporter.addRequestContextMetaConfig('currentFolderPath', { sandboxReadOnly: true })
-
-  reporter.beforeRenderListeners.add('templates', async (req, res) => {
-    if (
-      !req.template._id &&
-      !req.template.shortid &&
-      !req.template.name
-    ) {
-      if (req.template.content == null) {
-        throw reporter.createError('Template must contains _id, name, shortid or content attribute', {
-          weak: true,
-          statusCode: 400
-        })
-      }
-
-      reporter.logger.info(
-        `Rendering anonymous template { recipe: ${req.template.recipe}, engine: ${req.template.engine} }`,
-        req
-      )
-
-      return
-    }
-
-    const template = req.context.resolvedTemplate
-
-    if (!template && !req.template.content) {
-      throw reporter.createError(`Unable to find specified template or user does not have permissions to read it: ${
-        (req.template._id || req.template.shortid || req.template.name)
-      }`, {
-        weak: true,
-        statusCode: 404
-      })
-    }
-
-    // store a copy to prevent side-effects
-    req.template = template ? extend(true, {}, template, req.template) : req.template
-    req.template.content = req.template.content || ''
-
-    reporter.logger.info(
-      `Rendering template { name: ${req.template.name}, recipe: ${req.template.recipe}, engine: ${req.template.engine}, preview: ${(req.options.preview || false)} }`,
-      req
-    )
-
-    if (!req.options.reportName && req.template.name) {
-      res.meta.reportName = req.template.name
-    }
-
-    req.context.currentFolderPath = await resolveCurrentPath(reporter, req)
-  })
-}
-
-async function resolveCurrentPath (reporter, req) {
-  if (!req.template) {
-    return null
-  }
-
-  const pathFragments = []
-  let currentFolder = req.template.folder
-
-  if (currentFolder) {
-    currentFolder = await reporter.documentStore.collection('folders').findOne({ shortid: currentFolder.shortid }, req)
-  }
-
-  while (currentFolder) {
-    pathFragments.push(currentFolder.name)
-
-    if (!currentFolder.folder) {
-      currentFolder = null
-    } else {
-      currentFolder = await reporter.documentStore.collection('folders').findOne({ shortid: currentFolder.folder.shortid }, req)
-    }
-  }
-
-  return '/' + pathFragments.reverse().join('/')
-}
+const extend = require('node.extend.without.arrays')
+const omit = require('lodash.omit')
+
+module.exports = (reporter) => {
+  reporter.addRequestContextMetaConfig('currentFolderPath', { sandboxReadOnly: true })
+
+  reporter.beforeRenderListeners.add('templates', async (req, res) => {
+    if (
+      !req.template._id &&
+      !req.template.shortid &&
+      !req.template.name
+    ) {
+      if (req.template.content == null) {
+        throw reporter.createError('Template must contains _id, name, shortid or content attribute', {
+          weak: true,
+          statusCode: 400
+        })
+      }
+
+      reporter.logger.info(
+        `Rendering anonymous template { recipe: ${req.template.recipe}, engine: ${req.template.engine} }`,
+        req
+      )
+
+      return
+    }
+
+    const template = req.context.resolvedTemplate
+
+    if (!template && !req.template.content) {
+      throw reporter.createError(`Unable to find specified template or user does not have permissions to read it: ${
+        (req.template._id || req.template.shortid || req.template.name)
+      }`, {
+        weak: true,
+        statusCode: 404
+      })
+    }
+
+    // store a copy to prevent side-effects, we ignore name from the req.template because it can be path "/path/to/template"
+    // and we want that req.template.name be always the real template name
+    req.template = template ? extend(true, {}, template, omit(req.template, ['name'])) : req.template
+    req.template.content = req.template.content || ''
+
+    reporter.logger.info(
+      `Rendering template { name: ${req.template.name}, recipe: ${req.template.recipe}, engine: ${req.template.engine}, preview: ${(req.options.preview || false)} }`,
+      req
+    )
+
+    if (!req.options.reportName && req.template.name) {
+      res.meta.reportName = req.template.name
+    }
+
+    req.context.currentFolderPath = await resolveCurrentPath(reporter, req)
+  })
+}
+
+async function resolveCurrentPath (reporter, req) {
+  if (!req.template) {
+    return null
+  }
+
+  const pathFragments = []
+  let currentFolder = req.template.folder
+
+  if (currentFolder) {
+    currentFolder = await reporter.documentStore.collection('folders').findOne({ shortid: currentFolder.shortid }, req)
+  }
+
+  while (currentFolder) {
+    pathFragments.push(currentFolder.name)
+
+    if (!currentFolder.folder) {
+      currentFolder = null
+    } else {
+      currentFolder = await reporter.documentStore.collection('folders').findOne({ shortid: currentFolder.folder.shortid }, req)
+    }
+  }
+
+  return '/' + pathFragments.reverse().join('/')
+}

package/lib/worker/workerHandler.js

@@ -1,54 +1,55 @@
-const WorkerReporter = require('./reporter')
-const omit = require('lodash.omit')
-
-module.exports = (userInitData, { executeMain, convertUint8ArrayToBuffer }) => {
-  const reporter = new WorkerReporter(userInitData, async (actionName, data, req) => {
-    const actionRes = await executeMain({
-      actionName,
-      data
-    })
-    convertUint8ArrayToBuffer(actionRes)
-    return actionRes
-  })
-  let parsedReq
-  return {
-    init: () => {
-      return reporter.init()
-    },
-
-    close: () => {
-      return reporter.close()
-    },
-
-    execute: ({ actionName, data, req }) => {
-      // we need to convert back arrays to buffer because transfer to/from thread converts buffers to array
-      convertUint8ArrayToBuffer(data)
-      convertUint8ArrayToBuffer(req)
-
-      if (actionName === 'parse') {
-        try {
-          parsedReq = {
-            ...JSON.parse(req.rawContent),
-            context: req.context
-          }
-
-          return omit(parsedReq, 'data')
-        } catch (e) {
-          e.message = 'Invalid request json: ' + e.message
-          e.weak = true
-          throw e
-        }
-      }
-
-      if (parsedReq) {
-        if (parsedReq.context.rootId === req.context.rootId) {
-          req.data = parsedReq.data
-        }
-
-        parsedReq = null
-      }
-
-      return reporter.executeWorkerAction(actionName, data, req)
-    }
-  }
-}
+const WorkerReporter = require('./reporter')
+const omit = require('lodash.omit')
+
+module.exports = (userInitData, { executeMain, convertUint8ArrayToBuffer }) => {
+  const reporter = new WorkerReporter(userInitData, async (actionName, data, req) => {
+    const actionRes = await executeMain({
+      actionName,
+      data
+    })
+    convertUint8ArrayToBuffer(actionRes)
+    return actionRes
+  })
+  let parsedReq
+  return {
+    init: () => {
+      return reporter.init()
+    },
+
+    close: () => {
+      return reporter.close()
+    },
+
+    execute: ({ actionName, data, req }) => {
+      // we need to convert back arrays to buffer because transfer to/from thread converts buffers to array
+      convertUint8ArrayToBuffer(data)
+      convertUint8ArrayToBuffer(req)
+
+      if (actionName === 'parse') {
+        try {
+          parsedReq = {
+            ...JSON.parse(req.rawContent),
+            context: req.context
+          }
+          parsedReq.context.parsedInWorker = true
+
+          return omit(parsedReq, 'data')
+        } catch (e) {
+          e.message = 'Invalid request json: ' + e.message
+          e.weak = true
+          throw e
+        }
+      }
+
+      if (parsedReq) {
+        if (parsedReq.context.rootId === req.context.rootId) {
+          req.data = parsedReq.data
+        }
+
+        parsedReq = null
+      }
+
+      return reporter.executeWorkerAction(actionName, data, req)
+    }
+  }
+}

package/package.json

@@ -1,92 +1,91 @@
-{
-  "name": "@jsreport/jsreport-core",
-  "version": "3.1.2-test.2",
-  "description": "javascript based business reporting",
-  "keywords": [
-    "report",
-    "business",
-    "javascript"
-  ],
-  "homepage": "https://github.com/jsreport/jsreport/tree/master/packages/jsreport-core",
-  "repository": {
-    "type": "git",
-    "url": "git+ssh://git@github.com/jsreport/jsreport.git"
-  },
-  "license": "LGPL",
-  "author": {
-    "name": "Jan Blaha",
-    "email": "jan.blaha@hotmail.com"
-  },
-  "main": "index.js",
-  "files": [
-    "lib",
-    "index.js",
-    "test/store/common.js",
-    "test/blobStorage/common.js"
-  ],
-  "scripts": {
-    "test": "mocha --timeout 5000 --recursive test --exit && standard",
-    "test:watch": "mocha --watch --recursive test"
-  },
-  "dependencies": {
-    "@babel/code-frame": "7.12.13",
-    "@babel/parser": "7.14.4",
-    "@babel/traverse": "7.12.9",
-    "@jsreport/advanced-workers": "1.1.0",
-    "@jsreport/mingo": "2.4.1",
-    "ajv": "6.12.6",
-    "app-root-path": "2.0.1",
-    "async-replace": "1.0.1",
-    "camelcase": "5.0.0",
-    "debug": "4.3.2",
-    "decamelize": "2.0.0",
-    "deepmerge": "2.1.0",
-    "diff": "3.5.0",
-    "diff-match-patch": "1.0.5",
-    "enhanced-resolve": "5.8.3",
-    "has-own-deep": "1.1.0",
-    "isbinaryfile": "4.0.0",
-    "listener-collection": "1.2.0",
-    "lodash.get": "4.4.2",
-    "lodash.groupby": "4.6.0",
-    "lodash.omit": "4.5.0",
-    "lodash.set": "4.3.2",
-    "lru-cache": "4.1.1",
-    "ms": "2.1.3",
-    "nanoid": "3.1.16",
-    "nconf": "0.10.0",
-    "node.extend.without.arrays": "1.1.6",
-    "reap2": "1.0.1",
-    "semver": "7.3.5",
-    "serializator": "1.0.2",
-    "stack-trace": "0.0.10",
-    "triple-beam": "1.3.0",
-    "unset-value": "1.0.0",
-    "uuid": "8.3.2",
-    "v8-compile-cache": "*",
-    "vm2": "3.9.5",
-    "winston": "3.3.3",
-    "winston-transport": "4.4.0"
-  },
-  "devDependencies": {
-    "mocha": "8.2.1",
-    "should": "13.2.3",
-    "standard": "16.0.3",
-    "std-mocks": "1.0.1",
-    "winston-loggly-bulk": "3.2.1"
-  },
-  "engines": {
-    "node": ">=16.11"
-  },
-  "maintainers": [
-    {
-      "name": "pofider",
-      "email": "jan.blaha@hotmail.com"
-    }
-  ],
-  "standard": {
-    "env": {
-      "mocha": true
-    }
-  }
-}
+{
+  "name": "@jsreport/jsreport-core",
+  "version": "3.4.1",
+  "description": "javascript based business reporting",
+  "keywords": [
+    "report",
+    "business",
+    "javascript"
+  ],
+  "homepage": "https://github.com/jsreport/jsreport/tree/master/packages/jsreport-core",
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com/jsreport/jsreport.git"
+  },
+  "license": "LGPL",
+  "author": {
+    "name": "Jan Blaha",
+    "email": "jan.blaha@hotmail.com"
+  },
+  "main": "index.js",
+  "files": [
+    "lib",
+    "index.js",
+    "test/store/common.js",
+    "test/blobStorage/common.js"
+  ],
+  "scripts": {
+    "test": "mocha --timeout 5000 --recursive test --exit && standard",
+    "test:watch": "mocha --watch --recursive test"
+  },
+  "dependencies": {
+    "@babel/code-frame": "7.12.13",
+    "@babel/parser": "7.14.4",
+    "@babel/traverse": "7.12.9",
+    "@jsreport/advanced-workers": "1.2.0",
+    "@jsreport/mingo": "2.4.1",
+    "ajv": "6.12.6",
+    "app-root-path": "2.0.1",
+    "async-replace": "1.0.1",
+    "camelcase": "5.0.0",
+    "debug": "4.3.2",
+    "decamelize": "2.0.0",
+    "deepmerge": "2.1.0",
+    "diff": "3.5.0",
+    "diff-match-patch": "1.0.5",
+    "enhanced-resolve": "5.8.3",
+    "has-own-deep": "1.1.0",
+    "isbinaryfile": "4.0.0",
+    "listener-collection": "1.2.0",
+    "lodash.get": "4.4.2",
+    "lodash.groupby": "4.6.0",
+    "lodash.omit": "4.5.0",
+    "lodash.set": "4.3.2",
+    "lru-cache": "4.1.1",
+    "ms": "2.1.3",
+    "nanoid": "3.2.0",
+    "nconf": "0.11.3",
+    "node.extend.without.arrays": "1.1.6",
+    "reap2": "1.0.1",
+    "semver": "7.3.5",
+    "serializator": "1.0.2",
+    "stack-trace": "0.0.10",
+    "triple-beam": "1.3.0",
+    "unset-value": "1.0.0",
+    "uuid": "8.3.2",
+    "vm2": "3.9.5",
+    "winston": "3.3.3",
+    "winston-transport": "4.4.0"
+  },
+  "devDependencies": {
+    "mocha": "8.2.1",
+    "should": "13.2.3",
+    "standard": "16.0.4",
+    "std-mocks": "1.0.1",
+    "winston-loggly-bulk": "3.2.1"
+  },
+  "engines": {
+    "node": ">=16.11"
+  },
+  "maintainers": [
+    {
+      "name": "pofider",
+      "email": "jan.blaha@hotmail.com"
+    }
+  ],
+  "standard": {
+    "env": {
+      "mocha": true
+    }
+  }
+}

package/test/blobStorage/common.js

@@ -1,21 +1,25 @@
-module.exports = (storage) => {
-  it('write and read', async () => {
-    await storage().write('foo', Buffer.from('hula'))
-
-    const content = await storage().read('foo')
-    content.toString().should.be.eql('hula')
-  })
-
-  it('write remove read should fail', async () => {
-    await storage().write('foo', Buffer.from('hula'))
-    await storage().remove('foo')
-
-    return storage().read('foo').should.be.rejected()
-  })
-
-  it('should work with folders and paths', async () => {
-    await storage().write('foldera/folderb/myblob.txt', Buffer.from('hula'))
-    const buf = await storage().read('foldera/folderb/myblob.txt')
-    buf.toString().should.be.eql('hula')
-  })
-}
+module.exports = (storage) => {
+  it('write and read', async () => {
+    await storage().write('foo', Buffer.from('hula'))
+
+    const content = await storage().read('foo')
+    content.toString().should.be.eql('hula')
+  })
+
+  it('write remove read should fail', async () => {
+    await storage().write('foo', Buffer.from('hula'))
+    await storage().remove('foo')
+
+    return storage().read('foo').should.be.rejected()
+  })
+
+  it('should work with folders and paths', async () => {
+    await storage().write('foldera/folderb/myblob.txt', Buffer.from('hula'))
+    const buf = await storage().read('foldera/folderb/myblob.txt')
+    buf.toString().should.be.eql('hula')
+  })
+
+  it('remove shouldnt fail for missing blob', async () => {
+    await storage().remove('foo')
+  })
+}