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

package/lib/main/blobStorage/blobStorage.js

@@ -1,47 +1,52 @@
-module.exports = (reporter, options) => {
-  let provider
-
-  return {
-    async read (blobName, req) {
-      const r = await provider.read(blobName, req)
-      if (r == null) {
-        throw reporter.createError(`Blob ${blobName} wasn't found`, {
-          statusCode: 404
-        })
-      }
-      return r
-    },
-
-    write (blobName, buffer, req) {
-      return provider.write(blobName, buffer, req)
-    },
-
-    async remove (blobName, req) {
-      return provider.remove(blobName)
-    },
-
-    async append (blobName, buffer, req) {
-      if (!provider.append) {
-        const existingBuf = await provider.read(blobName, req)
-        return provider.write(blobName, existingBuf ? Buffer.concat([existingBuf, buffer]) : buffer, req)
-      }
-      return provider.append(blobName, buffer, req)
-    },
-
-    async init () {
-      if (provider.init) {
-        return provider.init()
-      }
-    },
-
-    drop () {
-      if (provider.drop) {
-        return provider.drop()
-      }
-    },
-
-    registerProvider (p) {
-      provider = p
-    }
-  }
-}
+module.exports = (reporter, options) => {
+  let provider
+
+  return {
+    async read (blobName, req) {
+      const r = await provider.read(blobName, req)
+      if (r == null) {
+        throw reporter.createError(`Blob ${blobName} wasn't found`, {
+          statusCode: 404
+        })
+      }
+      return r
+    },
+
+    write (blobName, buffer, req) {
+      return provider.write(blobName, buffer, req)
+    },
+
+    async remove (blobName, req) {
+      return provider.remove(blobName)
+    },
+
+    async append (blobName, buffer, req) {
+      if (!provider.append) {
+        let existingBuf = Buffer.from([])
+        try {
+          existingBuf = await provider.read(blobName, req)
+        } catch (e) {
+          // so far blob storage throws when blob doesnt exit
+        }
+        return provider.write(blobName, existingBuf ? Buffer.concat([existingBuf, buffer]) : buffer, req)
+      }
+      return provider.append(blobName, buffer, req)
+    },
+
+    async init () {
+      if (provider.init) {
+        return provider.init()
+      }
+    },
+
+    drop () {
+      if (provider.drop) {
+        return provider.drop()
+      }
+    },
+
+    registerProvider (p) {
+      provider = p
+    }
+  }
+}

package/lib/main/blobStorage/inMemoryProvider.js

@@ -1,27 +1,27 @@
-module.exports = (options) => {
-  const storage = {}
-
-  return {
-    write (blobName, buffer) {
-      storage[blobName] = buffer
-      return blobName
-    },
-
-    read (blobName) {
-      return storage[blobName]
-    },
-
-    remove (blobName) {
-      delete storage[blobName]
-    },
-
-    append (blobName, buffer) {
-      storage[blobName] = storage[blobName] || Buffer.from('')
-      storage[blobName] = Buffer.concat([storage[blobName], buffer])
-    },
-
-    init () {
-
-    }
-  }
-}
+module.exports = (options) => {
+  const storage = {}
+
+  return {
+    write (blobName, buffer) {
+      storage[blobName] = buffer
+      return blobName
+    },
+
+    read (blobName) {
+      return storage[blobName]
+    },
+
+    remove (blobName) {
+      delete storage[blobName]
+    },
+
+    append (blobName, buffer) {
+      storage[blobName] = storage[blobName] || Buffer.from('')
+      storage[blobName] = Buffer.concat([storage[blobName], buffer])
+    },
+
+    init () {
+
+    }
+  }
+}

package/lib/main/blobStorage/mainActions.js

@@ -1,24 +1,24 @@
-module.exports = (reporter) => {
-  reporter.registerMainAction('blobStorage.read', async (spec, originalReq) => {
-    const localReq = reporter.Request(originalReq)
-    const res = await reporter.blobStorage.read(spec.blobName, localReq)
-
-    return res.toString('base64')
-  })
-
-  reporter.registerMainAction('blobStorage.write', async (spec, originalReq) => {
-    const localReq = reporter.Request(originalReq)
-
-    return await reporter.blobStorage.write(spec.blobName, Buffer.from(spec.content, 'base64'), localReq)
-  })
-
-  reporter.registerMainAction('blobStorage.remove', async (spec, originalReq) => {
-    const localReq = reporter.Request(originalReq)
-    return reporter.blobStorage.remove(spec.blobName, localReq)
-  })
-
-  reporter.registerMainAction('blobStorage.append', async (spec, originalReq) => {
-    const localReq = reporter.Request(originalReq)
-    return reporter.blobStorage.append(spec.blobName, Buffer.from(spec.content, 'base64'), localReq)
-  })
-}
+module.exports = (reporter) => {
+  reporter.registerMainAction('blobStorage.read', async (spec, originalReq) => {
+    const localReq = reporter.Request(originalReq)
+    const res = await reporter.blobStorage.read(spec.blobName, localReq)
+
+    return res.toString('base64')
+  })
+
+  reporter.registerMainAction('blobStorage.write', async (spec, originalReq) => {
+    const localReq = reporter.Request(originalReq)
+
+    return await reporter.blobStorage.write(spec.blobName, Buffer.from(spec.content, 'base64'), localReq)
+  })
+
+  reporter.registerMainAction('blobStorage.remove', async (spec, originalReq) => {
+    const localReq = reporter.Request(originalReq)
+    return reporter.blobStorage.remove(spec.blobName, localReq)
+  })
+
+  reporter.registerMainAction('blobStorage.append', async (spec, originalReq) => {
+    const localReq = reporter.Request(originalReq)
+    return reporter.blobStorage.append(spec.blobName, Buffer.from(spec.content, 'base64'), localReq)
+  })
+}

package/lib/main/createDefaultLoggerFormat.js

@@ -1,17 +1,17 @@
-const { MESSAGE } = require('triple-beam')
-const winston = require('winston')
-
-module.exports = (options = {}) => {
-  return winston.format((info) => {
-    const { level, message, ...meta } = info
-    info[MESSAGE] = `${options.timestamp === true ? `${new Date().toISOString()} - ` : ''}${level}: ${message}`
-
-    const metaKeys = Object.keys(meta)
-
-    if (metaKeys.length > 0) {
-      info[MESSAGE] += ` ${metaKeys.map((k) => `${k}=${meta[k]}`).join(', ')}`
-    }
-
-    return info
-  })
-}
+const { MESSAGE } = require('triple-beam')
+const winston = require('winston')
+
+module.exports = (options = {}) => {
+  return winston.format((info) => {
+    const { level, message, ...meta } = info
+    info[MESSAGE] = `${options.timestamp === true ? `${new Date().toISOString()} - ` : ''}${level}: ${message}`
+
+    const metaKeys = Object.keys(meta)
+
+    if (metaKeys.length > 0) {
+      info[MESSAGE] += ` ${metaKeys.map((k) => `${k}=${meta[k]}`).join(', ')}`
+    }
+
+    return info
+  })
+}

package/lib/main/defaults.js

@@ -1,14 +1,14 @@
-const os = require('os')
-const path = require('path')
-
-exports.getDefaultTempDirectory = () => {
-  return path.join(os.tmpdir(), 'jsreport')
-}
-
-exports.getDefaultRootDirectory = () => {
-  return path.join(__dirname, '../../../../')
-}
-
-exports.getDefaultLoadConfig = () => {
-  return false
-}
+const os = require('os')
+const path = require('path')
+
+exports.getDefaultTempDirectory = () => {
+  return path.join(os.tmpdir(), 'jsreport')
+}
+
+exports.getDefaultRootDirectory = () => {
+  return path.join(__dirname, '../../../../')
+}
+
+exports.getDefaultLoadConfig = () => {
+  return false
+}

package/lib/main/extensions/discover.js

@@ -1,20 +1,20 @@
-const path = require('path')
-const locationCache = require('./locationCache')
-
-module.exports = async (config) => {
-  const cache = locationCache(config)
-
-  config.logger.info(`Searching for available extensions in ${config.rootDirectory}`)
-
-  const results = await cache.get()
-  config.logger.info(`Found ${results.length} extension(s)`)
-
-  const availableExtensions = results.map((configFile) => (
-    Object.assign({
-      directory: path.dirname(configFile)
-    }, require(configFile))
-  ))
-
-  await cache.save(availableExtensions)
-  return availableExtensions
-}
+const path = require('path')
+const locationCache = require('./locationCache')
+
+module.exports = async (config) => {
+  const cache = locationCache(config)
+
+  config.logger.info(`Searching for available extensions in ${config.rootDirectory}`)
+
+  const results = await cache.get()
+  config.logger.info(`Found ${results.length} extension(s)`)
+
+  const availableExtensions = results.map((configFile) => (
+    Object.assign({
+      directory: path.dirname(configFile)
+    }, require(configFile))
+  ))
+
+  await cache.save(availableExtensions)
+  return availableExtensions
+}