@jsreport/jsreport-core 3.1.1 → 3.3.0

package/lib/shared/folders/resolveEntityFromPath.js

@@ -1,88 +1,88 @@
-const normalizeEntityPath = require('./normalizeEntityPath')
-
-module.exports = (reporter) => async (entityPathParam, targetEntitySet, options, req) => {
-  if (req == null) {
-    req = options
-    options = {}
-  }
-
-  const entityPath = normalizeEntityPath(entityPathParam, options, req)
-  const fragments = entityPath.split('/').filter(s => s)
-  let currentEntity = null
-  let currentEntitySet = null
-  let currentFolder = null
-
-  if (targetEntitySet) {
-    const entitySet = reporter.documentStore.model.entitySets[targetEntitySet]
-
-    if (!entitySet) {
-      throw new Error(`Target entity set "${targetEntitySet}" does not exists`)
-    }
-
-    if (!entitySet.entityTypeDef.name) {
-      throw new Error(`Entity set "${targetEntitySet}" does not have a name attribute`)
-    }
-  }
-
-  if (fragments.length === 0) {
-    return
-  }
-
-  const lastIndex = fragments.length - 1
-
-  for (const [index, entityName] of fragments.entries()) {
-    if (lastIndex === index) {
-      if (!targetEntitySet) {
-        for (const c of Object.keys(reporter.documentStore.collections)) {
-          if (!reporter.documentStore.model.entitySets[c].entityTypeDef.name) {
-            continue
-          }
-
-          const query = getSearchQuery(entityName, currentFolder)
-          currentEntitySet = c
-          currentEntity = await reporter.documentStore.collection(c).findOne(query, req)
-
-          if (currentEntity) {
-            break
-          }
-        }
-      } else {
-        const query = getSearchQuery(entityName, currentFolder)
-        currentEntitySet = targetEntitySet
-        currentEntity = await reporter.documentStore.collection(targetEntitySet).findOne(query, req)
-      }
-    } else {
-      const query = getSearchQuery(entityName, currentFolder)
-      const folder = await reporter.documentStore.collection('folders').findOne(query, req)
-
-      if (!folder) {
-        break
-      }
-
-      currentFolder = folder
-    }
-  }
-
-  if (!currentEntity) {
-    return
-  }
-
-  return {
-    entitySet: currentEntitySet,
-    entity: currentEntity
-  }
-}
-
-function getSearchQuery (name, currentFolder) {
-  const query = {
-    name
-  }
-
-  if (currentFolder) {
-    query.folder = { shortid: currentFolder.shortid }
-  } else {
-    query.folder = null
-  }
-
-  return query
-}
+const normalizeEntityPath = require('./normalizeEntityPath')
+
+module.exports = (reporter) => async (entityPathParam, targetEntitySet, options, req) => {
+  if (req == null) {
+    req = options
+    options = {}
+  }
+
+  const entityPath = normalizeEntityPath(entityPathParam, options, req)
+  const fragments = entityPath.split('/').filter(s => s)
+  let currentEntity = null
+  let currentEntitySet = null
+  let currentFolder = null
+
+  if (targetEntitySet) {
+    const entitySet = reporter.documentStore.model.entitySets[targetEntitySet]
+
+    if (!entitySet) {
+      throw new Error(`Target entity set "${targetEntitySet}" does not exists`)
+    }
+
+    if (!entitySet.entityTypeDef.name) {
+      throw new Error(`Entity set "${targetEntitySet}" does not have a name attribute`)
+    }
+  }
+
+  if (fragments.length === 0) {
+    return
+  }
+
+  const lastIndex = fragments.length - 1
+
+  for (const [index, entityName] of fragments.entries()) {
+    if (lastIndex === index) {
+      if (!targetEntitySet) {
+        for (const c of Object.keys(reporter.documentStore.collections)) {
+          if (!reporter.documentStore.model.entitySets[c].entityTypeDef.name) {
+            continue
+          }
+
+          const query = getSearchQuery(entityName, currentFolder)
+          currentEntitySet = c
+          currentEntity = await reporter.documentStore.collection(c).findOne(query, req)
+
+          if (currentEntity) {
+            break
+          }
+        }
+      } else {
+        const query = getSearchQuery(entityName, currentFolder)
+        currentEntitySet = targetEntitySet
+        currentEntity = await reporter.documentStore.collection(targetEntitySet).findOne(query, req)
+      }
+    } else {
+      const query = getSearchQuery(entityName, currentFolder)
+      const folder = await reporter.documentStore.collection('folders').findOne(query, req)
+
+      if (!folder) {
+        break
+      }
+
+      currentFolder = folder
+    }
+  }
+
+  if (!currentEntity) {
+    return
+  }
+
+  return {
+    entitySet: currentEntitySet,
+    entity: currentEntity
+  }
+}
+
+function getSearchQuery (name, currentFolder) {
+  const query = {
+    name
+  }
+
+  if (currentFolder) {
+    query.folder = { shortid: currentFolder.shortid }
+  } else {
+    query.folder = null
+  }
+
+  return query
+}

package/lib/shared/folders/resolveEntityPath.js

@@ -1,46 +1,46 @@
-
-async function resolveEntityPath (reporter, entity, lookup, req) {
-  const fullPath = []
-  let currentEntity = entity
-
-  while (currentEntity != null) {
-    if (currentEntity.folder != null) {
-      let folder
-
-      if (lookup) {
-        folder = await lookup(currentEntity.folder.shortid)
-      } else {
-        folder = await reporter.documentStore.collection('folders').findOne({
-          shortid: currentEntity.folder.shortid
-        }, req)
-      }
-
-      if (folder != null) {
-        fullPath.unshift(folder.name)
-        currentEntity = folder
-      } else {
-        throw new Error(`Folder with shortid "${currentEntity.folder.shortid}" does not exists`)
-      }
-    } else {
-      currentEntity = null
-    }
-  }
-
-  fullPath.push(entity.name)
-
-  return `/${fullPath.join('/')}`
-}
-
-module.exports = (reporter) => async (entity, entitySet, req, lookup) => {
-  const entitySetInfo = reporter.documentStore.model.entitySets[entitySet]
-
-  if (!entitySetInfo) {
-    throw new Error(`Unknown entitySet "${entitySet}"`)
-  }
-
-  if (entitySetInfo.entityTypeDef.name == null) {
-    throw new Error(`Could not find name attribute of entity of type "${entitySet}"`)
-  }
-
-  return resolveEntityPath(reporter, entity, lookup, req)
-}
+
+async function resolveEntityPath (reporter, entity, lookup, req) {
+  const fullPath = []
+  let currentEntity = entity
+
+  while (currentEntity != null) {
+    if (currentEntity.folder != null) {
+      let folder
+
+      if (lookup) {
+        folder = await lookup(currentEntity.folder.shortid)
+      } else {
+        folder = await reporter.documentStore.collection('folders').findOne({
+          shortid: currentEntity.folder.shortid
+        }, req)
+      }
+
+      if (folder != null) {
+        fullPath.unshift(folder.name)
+        currentEntity = folder
+      } else {
+        throw new Error(`Folder with shortid "${currentEntity.folder.shortid}" does not exists`)
+      }
+    } else {
+      currentEntity = null
+    }
+  }
+
+  fullPath.push(entity.name)
+
+  return `/${fullPath.join('/')}`
+}
+
+module.exports = (reporter) => async (entity, entitySet, req, lookup) => {
+  const entitySetInfo = reporter.documentStore.model.entitySets[entitySet]
+
+  if (!entitySetInfo) {
+    throw new Error(`Unknown entitySet "${entitySet}"`)
+  }
+
+  if (entitySetInfo.entityTypeDef.name == null) {
+    throw new Error(`Could not find name attribute of entity of type "${entitySet}"`)
+  }
+
+  return resolveEntityPath(reporter, entity, lookup, req)
+}

package/lib/shared/folders/resolveFolderFromPath.js

@@ -1,38 +1,38 @@
-const normalizeEntityPath = require('./normalizeEntityPath')
-
-module.exports = (reporter) => async (entityPathParam, req) => {
-  const entityPath = normalizeEntityPath(entityPathParam, {}, req)
-  const fragments = entityPath.split('/').filter(s => s)
-  let found = false
-  let currentFolder = null
-
-  for (const f of fragments) {
-    if (found) {
-      currentFolder = null
-      break
-    }
-
-    const query = {
-      name: f
-    }
-
-    if (currentFolder) {
-      query.folder = { shortid: currentFolder.shortid }
-    } else {
-      query.folder = null
-    }
-
-    const folder = await reporter.documentStore.collection('folders').findOne(query, req)
-
-    if (!folder) {
-      found = true
-      // we don't know from path /a/b if b is template or folder,
-      // so if folder is not found, we assume it was other entity and continue
-      continue
-    }
-
-    currentFolder = folder
-  }
-
-  return currentFolder
-}
+const normalizeEntityPath = require('./normalizeEntityPath')
+
+module.exports = (reporter) => async (entityPathParam, req) => {
+  const entityPath = normalizeEntityPath(entityPathParam, {}, req)
+  const fragments = entityPath.split('/').filter(s => s)
+  let found = false
+  let currentFolder = null
+
+  for (const f of fragments) {
+    if (found) {
+      currentFolder = null
+      break
+    }
+
+    const query = {
+      name: f
+    }
+
+    if (currentFolder) {
+      query.folder = { shortid: currentFolder.shortid }
+    } else {
+      query.folder = null
+    }
+
+    const folder = await reporter.documentStore.collection('folders').findOne(query, req)
+
+    if (!folder) {
+      found = true
+      // we don't know from path /a/b if b is template or folder,
+      // so if folder is not found, we assume it was other entity and continue
+      continue
+    }
+
+    currentFolder = folder
+  }
+
+  return currentFolder
+}

package/lib/shared/generateRequestId.js

@@ -1,4 +1,4 @@
-const { customAlphabet } = require('nanoid')
-const nanoid = customAlphabet('0123456789abcdefghijklmnopqrstuvwxyz', 15)
-
-module.exports = () => nanoid()
+const { customAlphabet } = require('nanoid')
+const nanoid = customAlphabet('0123456789abcdefghijklmnopqrstuvwxyz', 15)
+
+module.exports = () => nanoid()