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

package/lib/shared/request.js

@@ -1,64 +1,64 @@
-const extend = require('node.extend.without.arrays')
-const omit = require('lodash.omit')
-
-module.exports = (obj, parent) => {
-  if (parent && !parent.__isJsreportRequest__) {
-    throw new Error('Invalid parent request passed')
-  }
-
-  const request = Object.create({}, {
-    __isJsreportRequest__: {
-      value: true,
-      writable: false,
-      configurable: false,
-      enumerable: false
-    }
-  })
-
-  request.template = extend(true, {}, obj.template)
-
-  if (parent) {
-    request.context = Object.assign({}, request.context, omit(parent.context, ['id', 'logs', 'systemHelpers']))
-    request.context.isChildRequest = true
-    request.options = Object.assign({}, request.options, parent.options)
-
-    if (parent.data) {
-      const dataInput = normalizeJSONData(parent.data)
-      request.data = Object.assign(Array.isArray(dataInput) ? [] : {}, dataInput)
-    }
-  }
-
-  request.options = extend(true, {}, request.options, obj.options)
-  request.context = extend(true, {}, request.context, obj.context)
-  request.context.shared = extend(true, {}, request.context.shared)
-
-  if (obj.data) {
-    const dataInput = normalizeJSONData(obj.data)
-    request.data = Object.assign(Array.isArray(dataInput) ? [] : {}, request.data, dataInput)
-
-    // don't override value if it was already set by caller
-    if (obj.context == null || obj.context.originalInputDataIsEmpty == null) {
-      request.context.originalInputDataIsEmpty = false
-    }
-  } else if (!parent) {
-    // don't override value if it was already set by caller
-    if (obj.context == null || obj.context.originalInputDataIsEmpty == null) {
-      request.context.originalInputDataIsEmpty = true
-    }
-  }
-
-  // initialize data if it is empty
-  if (!request.data) {
-    request.data = {}
-  }
-
-  return request
-}
-
-function normalizeJSONData (data) {
-  if (typeof data === 'string') {
-    return JSON.parse(data)
-  }
-
-  return data
-}
+const extend = require('node.extend.without.arrays')
+const omit = require('lodash.omit')
+
+module.exports = (obj, parent) => {
+  if (parent && !parent.__isJsreportRequest__) {
+    throw new Error('Invalid parent request passed')
+  }
+
+  const request = Object.create({}, {
+    __isJsreportRequest__: {
+      value: true,
+      writable: false,
+      configurable: false,
+      enumerable: false
+    }
+  })
+
+  request.template = extend(true, {}, obj.template)
+
+  if (parent) {
+    request.context = Object.assign({}, request.context, omit(parent.context, ['id', 'logs']))
+    request.context.isChildRequest = true
+    request.options = Object.assign({}, request.options, parent.options)
+
+    if (parent.data) {
+      const dataInput = normalizeJSONData(parent.data)
+      request.data = Object.assign(Array.isArray(dataInput) ? [] : {}, dataInput)
+    }
+  }
+
+  request.options = extend(true, {}, request.options, obj.options)
+  request.context = extend(true, {}, request.context, obj.context)
+  request.context.shared = extend(true, {}, request.context.shared)
+
+  if (obj.data) {
+    const dataInput = normalizeJSONData(obj.data)
+    request.data = Object.assign(Array.isArray(dataInput) ? [] : {}, request.data, dataInput)
+
+    // don't override value if it was already set by caller
+    if (obj.context == null || obj.context.originalInputDataIsEmpty == null) {
+      request.context.originalInputDataIsEmpty = false
+    }
+  } else if (!parent) {
+    // don't override value if it was already set by caller
+    if (obj.context == null || obj.context.originalInputDataIsEmpty == null) {
+      request.context.originalInputDataIsEmpty = true
+    }
+  }
+
+  // initialize data if it is empty
+  if (!request.data) {
+    request.data = {}
+  }
+
+  return request
+}
+
+function normalizeJSONData (data) {
+  if (typeof data === 'string') {
+    return JSON.parse(data)
+  }
+
+  return data
+}

package/lib/shared/tempFilesHandler.js

@@ -1,81 +1,81 @@
-const path = require('path')
-const fs = require('fs')
-const fsAsync = require('fs/promises')
-const { v4: uuidv4 } = require('uuid')
-
-module.exports.ensureTempDirectoryExists = async function (tempDirectory) {
-  await fsAsync.mkdir(tempDirectory, {
-    recursive: true
-  })
-
-  return {
-    directoryPath: tempDirectory
-  }
-}
-
-module.exports.readTempFile = async function readTempFile (tempDirectory, filename, opts = {}) {
-  const pathToFile = path.join(tempDirectory, filename)
-
-  const content = await fsAsync.readFile(pathToFile, opts)
-
-  return {
-    pathToFile,
-    filename,
-    content
-  }
-}
-
-module.exports.readTempFileStream = async function readTempFileStream (tempDirectory, filename, opts = {}) {
-  const pathToFile = path.join(tempDirectory, filename)
-
-  return new Promise((resolve) => {
-    const stream = fs.createReadStream(pathToFile, opts)
-
-    resolve({
-      pathToFile,
-      filename,
-      stream
-    })
-  })
-}
-
-module.exports.writeTempFile = async function writeTempFile (tempDirectory, filenameFn, content, opts = {}) {
-  return writeFile(tempDirectory, filenameFn, content, opts)
-}
-
-module.exports.writeTempFileStream = async function writeTempFileStream (tempDirectory, filenameFn, opts = {}) {
-  return writeFile(tempDirectory, filenameFn, undefined, opts, true)
-}
-
-async function writeFile (tempDirectory, filenameFn, content, opts, asStream = false) {
-  const filename = filenameFn(uuidv4())
-
-  if (filename == null || filename === '') {
-    throw new Error('No valid filename was returned from filenameFn')
-  }
-
-  const pathToFile = path.join(tempDirectory, filename)
-
-  await fsAsync.mkdir(tempDirectory, {
-    recursive: true
-  })
-
-  if (asStream === true) {
-    return new Promise((resolve) => {
-      const stream = fs.createWriteStream(pathToFile, opts)
-
-      resolve({
-        pathToFile,
-        filename,
-        stream
-      })
-    })
-  } else {
-    await fsAsync.writeFile(pathToFile, content, opts)
-
-    return {
-      pathToFile,
-      filename
-    }
-  }
-}
+const path = require('path')
+const fs = require('fs')
+const fsAsync = require('fs/promises')
+const { v4: uuidv4 } = require('uuid')
+
+module.exports.ensureTempDirectoryExists = async function (tempDirectory) {
+  await fsAsync.mkdir(tempDirectory, {
+    recursive: true
+  })
+
+  return {
+    directoryPath: tempDirectory
+  }
+}
+
+module.exports.readTempFile = async function readTempFile (tempDirectory, filename, opts = {}) {
+  const pathToFile = path.join(tempDirectory, filename)
+
+  const content = await fsAsync.readFile(pathToFile, opts)
+
+  return {
+    pathToFile,
+    filename,
+    content
+  }
+}
+
+module.exports.readTempFileStream = async function readTempFileStream (tempDirectory, filename, opts = {}) {
+  const pathToFile = path.join(tempDirectory, filename)
+
+  return new Promise((resolve) => {
+    const stream = fs.createReadStream(pathToFile, opts)
+
+    resolve({
+      pathToFile,
+      filename,
+      stream
+    })
+  })
+}
+
+module.exports.writeTempFile = async function writeTempFile (tempDirectory, filenameFn, content, opts = {}) {
+  return writeFile(tempDirectory, filenameFn, content, opts)
+}
+
+module.exports.writeTempFileStream = async function writeTempFileStream (tempDirectory, filenameFn, opts = {}) {
+  return writeFile(tempDirectory, filenameFn, undefined, opts, true)
+}
+
+async function writeFile (tempDirectory, filenameFn, content, opts, asStream = false) {
+  const filename = filenameFn(uuidv4())
+
+  if (filename == null || filename === '') {
+    throw new Error('No valid filename was returned from filenameFn')
+  }
+
+  const pathToFile = path.join(tempDirectory, filename)
+
+  await fsAsync.mkdir(tempDirectory, {
+    recursive: true
+  })
+
+  if (asStream === true) {
+    return new Promise((resolve) => {
+      const stream = fs.createWriteStream(pathToFile, opts)
+
+      resolve({
+        pathToFile,
+        filename,
+        stream
+      })
+    })
+  } else {
+    await fsAsync.writeFile(pathToFile, content, opts)
+
+    return {
+      pathToFile,
+      filename
+    }
+  }
+}

package/lib/shared/templates.js

@@ -1,82 +1,82 @@
-
-module.exports = (reporter) => {
-  return {
-    resolveTemplate: (req) => resolveTemplate(reporter, req)
-  }
-}
-
-async function resolveTemplate (reporter, req) {
-  let queryResult
-
-  if (req.template._id) {
-    queryResult = {
-      query: { _id: req.template._id },
-      meta: { field: '_id', value: req.template._id }
-    }
-  } else if (req.template.shortid) {
-    queryResult = {
-      query: { shortid: req.template.shortid },
-      meta: { field: 'shortid', value: req.template.shortid }
-    }
-  }
-
-  const meta = {}
-  let templates = []
-
-  if (queryResult) {
-    meta.field = queryResult.meta.field
-    meta.value = queryResult.meta.value
-    templates = await reporter.documentStore.collection('templates').find(queryResult.query, req)
-  } else if (req.template.name) {
-    const nameIsPath = req.template.name.indexOf('/') !== -1
-
-    meta.field = 'name'
-    meta.value = req.template.name
-
-    if (!req.template.name.startsWith('/') && nameIsPath && !req.context.currentFolderPath) {
-      throw reporter.createError('Invalid template path, path should be absolute and start with "/"', {
-        statusCode: 400,
-        weak: true
-      })
-    }
-
-    const pathParts = req.template.name.split('/').filter((p) => p)
-
-    if (pathParts.length === 0) {
-      throw reporter.createError('Invalid template path,', {
-        statusCode: 400,
-        weak: true
-      })
-    }
-
-    if (!nameIsPath) {
-      // if name is not path do global search by name (with no folder).
-      // since template name resolution here does not support relative syntax we should not run
-      // resolveEntityFromPath if the name is not path
-      templates = await reporter.documentStore.collection('templates').find({
-        name: req.template.name
-      }, req)
-    } else {
-      const result = await reporter.folders.resolveEntityFromPath(req.template.name, 'templates', req)
-
-      if (result) {
-        templates = [result.entity]
-      }
-    }
-  }
-
-  let template
-
-  if (templates.length > 1) {
-    throw reporter.createError(`Duplicated templates found for query ${meta.field}: ${meta.value}`, {
-      statusCode: 400,
-      weak: true
-    })
-  }
-
-  if (templates.length === 1) {
-    template = templates[0]
-  }
-
-  return template
-}
+
+module.exports = (reporter) => {
+  return {
+    resolveTemplate: (req) => resolveTemplate(reporter, req)
+  }
+}
+
+async function resolveTemplate (reporter, req) {
+  let queryResult
+
+  if (req.template._id) {
+    queryResult = {
+      query: { _id: req.template._id },
+      meta: { field: '_id', value: req.template._id }
+    }
+  } else if (req.template.shortid) {
+    queryResult = {
+      query: { shortid: req.template.shortid },
+      meta: { field: 'shortid', value: req.template.shortid }
+    }
+  }
+
+  const meta = {}
+  let templates = []
+
+  if (queryResult) {
+    meta.field = queryResult.meta.field
+    meta.value = queryResult.meta.value
+    templates = await reporter.documentStore.collection('templates').find(queryResult.query, req)
+  } else if (req.template.name) {
+    const nameIsPath = req.template.name.indexOf('/') !== -1
+
+    meta.field = 'name'
+    meta.value = req.template.name
+
+    if (!req.template.name.startsWith('/') && nameIsPath && !req.context.currentFolderPath) {
+      throw reporter.createError('Invalid template path, path should be absolute and start with "/"', {
+        statusCode: 400,
+        weak: true
+      })
+    }
+
+    const pathParts = req.template.name.split('/').filter((p) => p)
+
+    if (pathParts.length === 0) {
+      throw reporter.createError('Invalid template path,', {
+        statusCode: 400,
+        weak: true
+      })
+    }
+
+    if (!nameIsPath) {
+      // if name is not path do global search by name (with no folder).
+      // since template name resolution here does not support relative syntax we should not run
+      // resolveEntityFromPath if the name is not path
+      templates = await reporter.documentStore.collection('templates').find({
+        name: req.template.name
+      }, req)
+    } else {
+      const result = await reporter.folders.resolveEntityFromPath(req.template.name, 'templates', req)
+
+      if (result) {
+        templates = [result.entity]
+      }
+    }
+  }
+
+  let template
+
+  if (templates.length > 1) {
+    throw reporter.createError(`Duplicated templates found for query ${meta.field}: ${meta.value}`, {
+      statusCode: 400,
+      weak: true
+    })
+  }
+
+  if (templates.length === 1) {
+    template = templates[0]
+  }
+
+  return template
+}

package/lib/static/helpers.js

@@ -1,33 +1,33 @@
-/* eslint-disable no-unused-vars */
-async function module (moduleName) {
-  const jsreport = require('jsreport-proxy')
-  return jsreport.module(moduleName)
-}
-
-function toJS (data) {
-  function jsStringEscape (string) {
-    return ('' + string).replace(/["'\\\n\r\u2028\u2029]/g, function (character) {
-      // Escape all characters not included in SingleStringCharacters and
-      // DoubleStringCharacters on
-      // http://www.ecma-international.org/ecma-262/5.1/#sec-7.8.4
-      switch (character) {
-        case '"':
-        case "'":
-        case '\\':
-          return '\\' + character
-          // Four possible LineTerminator characters need to be escaped:
-        case '\n':
-          return '\\n'
-        case '\r':
-          return '\\r'
-        case '\u2028':
-          return '\\u2028'
-        case '\u2029':
-          return '\\u2029'
-      }
-    })
-  }
-
-  const validDataStr = jsStringEscape(JSON.stringify(data))
-  return `JSON.parse('${validDataStr}')`
-}
+/* eslint-disable no-unused-vars */
+async function module (moduleName) {
+  const jsreport = require('jsreport-proxy')
+  return jsreport.module(moduleName)
+}
+
+function toJS (data) {
+  function jsStringEscape (string) {
+    return ('' + string).replace(/["'\\\n\r\u2028\u2029]/g, function (character) {
+      // Escape all characters not included in SingleStringCharacters and
+      // DoubleStringCharacters on
+      // http://www.ecma-international.org/ecma-262/5.1/#sec-7.8.4
+      switch (character) {
+        case '"':
+        case "'":
+        case '\\':
+          return '\\' + character
+          // Four possible LineTerminator characters need to be escaped:
+        case '\n':
+          return '\\n'
+        case '\r':
+          return '\\r'
+        case '\u2028':
+          return '\\u2028'
+        case '\u2029':
+          return '\\u2029'
+      }
+    })
+  }
+
+  const validDataStr = jsStringEscape(JSON.stringify(data))
+  return `JSON.parse('${validDataStr}')`
+}

package/lib/worker/blobStorage.js

@@ -1,34 +1,34 @@
-module.exports = (executeMainAction) => {
-  return {
-    async read (blobName, req) {
-      const r = await executeMainAction('blobStorage.read', {
-        blobName
-      }, req)
-      return Buffer.from(r, 'base64')
-    },
-
-    write (blobName, content, req) {
-      return executeMainAction('blobStorage.write', {
-        blobName,
-        content: Buffer.from(content).toString('base64')
-      }, req)
-    },
-
-    remove (blobName, req) {
-      return executeMainAction('blobStorage.remove', {
-        blobName
-      }, req)
-    },
-
-    append (blobName, content, req) {
-      return executeMainAction('blobStorage.append', {
-        blobName,
-        content: Buffer.from(content).toString('base64')
-      }, req)
-    },
-
-    init () {
-
-    }
-  }
-}
+module.exports = (executeMainAction) => {
+  return {
+    async read (blobName, req) {
+      const r = await executeMainAction('blobStorage.read', {
+        blobName
+      }, req)
+      return Buffer.from(r, 'base64')
+    },
+
+    write (blobName, content, req) {
+      return executeMainAction('blobStorage.write', {
+        blobName,
+        content: Buffer.from(content).toString('base64')
+      }, req)
+    },
+
+    remove (blobName, req) {
+      return executeMainAction('blobStorage.remove', {
+        blobName
+      }, req)
+    },
+
+    append (blobName, content, req) {
+      return executeMainAction('blobStorage.append', {
+        blobName,
+        content: Buffer.from(content).toString('base64')
+      }, req)
+    },
+
+    init () {
+
+    }
+  }
+}