npm - @budibase/server - Versions diffs - 2.1.39 → 2.1.40-alpha.0 - Mend

@budibase/server 2.1.39 → 2.1.40-alpha.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (785) hide show

package/coverage/lcov-report/{api/controllers/query/validation.js.html → src/api/controllers/query/validation.ts.html} RENAMED Viewed

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for api/controllers/query/validation.js</title>
+    <title>Code coverage report for src/api/controllers/query/validation.ts</title>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../../prettify.css" />
-    <link rel="stylesheet" href="../../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../../favicon.png" />
+    <link rel="stylesheet" href="../../../../prettify.css" />
+    <link rel="stylesheet" href="../../../../base.css" />
+    <link rel="shortcut icon" type="image/x-icon" href="../../../../favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type='text/css'>
         .coverage-summary .sorter {
-            background-image: url(../../../sort-arrow-sprite.png);
+            background-image: url(../../../../sort-arrow-sprite.png);
         }
     </style>
 </head>
@@ -19,7 +19,7 @@
 <body>
 <div class='wrapper'>
     <div class='pad1'>
-        <h1><a href="../../../index.html">All files</a> / <a href="index.html">api/controllers/query</a> validation.js</h1>
+        <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/api/controllers/query</a> validation.ts</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
@@ -163,12 +163,12 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const { joiValidator } = require("@budibase/backend-core/auth")
-const Joi = require("joi")
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { auth } from "@budibase/backend-core"
+import Joi from "joi"
 &nbsp;
 const OPTIONAL_STRING = Joi.string().optional().allow(null).allow("")
 &nbsp;
-exports.queryValidation = () =&gt; {
+export function queryValidation() {
   return Joi.object({
     _id: Joi.string(),
     _rev: Joi.string(),
@@ -190,14 +190,14 @@ exports.queryValidation = () =&gt; {
   }).unknown(true)
 }
 &nbsp;
-exports.generateQueryValidation = () =&gt; {
+export function generateQueryValidation() {
   // prettier-ignore
-  return joiValidator.body(exports.queryValidation())
+  return auth.joiValidator.body(queryValidation())
 }
 &nbsp;
-exports.generateQueryPreviewValidation = () =&gt; {
+export function generateQueryPreviewValidation() {
   // prettier-ignore
-  return joiValidator.body(Joi.object({
+  return auth.joiValidator.body(Joi.object({
     _id: OPTIONAL_STRING,
     _rev: OPTIONAL_STRING,
     readable: Joi.boolean().optional(),
@@ -220,16 +220,16 @@ exports.generateQueryPreviewValidation = () =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Nov 28 2022 14:12:33 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 29 2022 11:32:32 GMT+0000 (Coordinated Universal Time)
             </div>
-        <script src="../../../prettify.js"></script>
+        <script src="../../../../prettify.js"></script>
         <script>
             window.onload = function () {
                 prettyPrint();
             };
         </script>
-        <script src="../../../sorter.js"></script>
-        <script src="../../../block-navigation.js"></script>
+        <script src="../../../../sorter.js"></script>
+        <script src="../../../../block-navigation.js"></script>
     </body>
 </html>

package/coverage/lcov-report/{api/controllers/role.js.html → src/api/controllers/role.ts.html} RENAMED Viewed

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for api/controllers/role.js</title>
+    <title>Code coverage report for src/api/controllers/role.ts</title>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../prettify.css" />
-    <link rel="stylesheet" href="../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
+    <link rel="stylesheet" href="../../../prettify.css" />
+    <link rel="stylesheet" href="../../../base.css" />
+    <link rel="shortcut icon" type="image/x-icon" href="../../../favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type='text/css'>
         .coverage-summary .sorter {
-            background-image: url(../../sort-arrow-sprite.png);
+            background-image: url(../../../sort-arrow-sprite.png);
         }
     </style>
 </head>
@@ -19,20 +19,20 @@
 <body>
 <div class='wrapper'>
     <div class='pad1'>
-        <h1><a href="../../index.html">All files</a> / <a href="index.html">api/controllers</a> role.js</h1>
+        <h1><a href="../../../index.html">All files</a> / <a href="index.html">src/api/controllers</a> role.ts</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">91.93% </span>
+                <span class="strong">91.66% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>57/62</span>
+                <span class='fraction'>55/60</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">83.33% </span>
+                <span class="strong">82.35% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>20/24</span>
+                <span class='fraction'>14/17</span>
             </div>
@@ -44,9 +44,9 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">93.44% </span>
+                <span class="strong">93.22% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>57/61</span>
+                <span class='fraction'>55/59</span>
             </div>
@@ -167,25 +167,19 @@
 <a name='L102'></a><a href='#L102'>102</a>
 <a name='L103'></a><a href='#L103'>103</a>
 <a name='L104'></a><a href='#L104'>104</a>
-<a name='L105'></a><a href='#L105'>105</a>
-<a name='L106'></a><a href='#L106'>106</a>
-<a name='L107'></a><a href='#L107'>107</a>
-<a name='L108'></a><a href='#L108'>108</a>
-<a name='L109'></a><a href='#L109'>109</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L105'></a><a href='#L105'>105</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">44x</span>
-<span class="cline-any cline-yes">44x</span>
-<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -232,8 +226,6 @@
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">7x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -279,26 +271,24 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const {
-  Role,
-  getRole,
-  isBuiltin,
-  getAllRoles,
-} = require("@budibase/backend-core/roles")
-const {
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { roles, context, events } from "@budibase/backend-core"
+import {
   generateRoleID,
   getUserMetadataParams,
   InternalTables,
-} = require("../../db/utils")
-const { getAppDB } = require("@budibase/backend-core/context")
-const { events } = require("@budibase/backend-core")
+} from "../../db/utils"
+import { BBContext, Database } from "@budibase/types"
 &nbsp;
 const UpdateRolesOptions = {
   CREATED: "created",
   REMOVED: "removed",
 }
 &nbsp;
-async function updateRolesOnUserTable(db, roleId, updateOption) {
+async function updateRolesOnUserTable(
+  db: Database,
+  roleId: string,
+  updateOption: string
+) {
   const table = await db.get(InternalTables.USER_METADATA)
   const schema = table.schema
   const remove = updateOption === UpdateRolesOptions.REMOVED
@@ -316,32 +306,30 @@ async function updateRolesOnUserTable(db, roleId, updateOption) {
       break
     }
   }
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (updated) {
+  if (updated) {
     await db.put(table)
   }
 }
 &nbsp;
-exports.fetch = async function (ctx) {
-  ctx.body = await getAllRoles()
+export async function fetch(ctx: BBContext) {
+  ctx.body = await roles.getAllRoles()
 }
 &nbsp;
-exports.find = async function (ctx) {
-  ctx.body = await getRole(ctx.params.roleId)
+export async function find(ctx: BBContext) {
+  ctx.body = await roles.getRole(ctx.params.roleId)
 }
 &nbsp;
-exports.save = async function (ctx) {
-  const db = getAppDB()
+export async function save(ctx: BBContext) {
+  const db = context.getAppDB()
   let { _id, name, inherits, permissionId } = ctx.request.body
   let isCreate = false
   if (!_id) {
     _id = generateRoleID()
     isCreate = true
-  } else <span class="missing-if-branch" title="if path not taken" >I</span>if (isBuiltin(_id)) {
+  } else <span class="missing-if-branch" title="if path not taken" >I</span>if (roles.isBuiltin(_id)) {
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Cannot update builtin roles.")</span>
   }
-  const role = new Role(_id, name)
-    .addPermission(permissionId)
-    .addInheritance(inherits)
+  const role = new roles.Role(_id, name, permissionId).addInheritance(inherits)
   if (ctx.request.body._rev) {
     role._rev = ctx.request.body._rev
   }
@@ -357,22 +345,22 @@ exports.save = async function (ctx) {
   ctx.message = `Role '${role.name}' created successfully.`
 }
 &nbsp;
-exports.destroy = async function (ctx) {
-  const db = getAppDB()
+export async function destroy(ctx: BBContext) {
+  const db = context.getAppDB()
   const roleId = ctx.params.roleId
   const role = await db.get(roleId)
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (isBuiltin(roleId)) {
+  <span class="missing-if-branch" title="if path not taken" >I</span>if (roles.isBuiltin(roleId)) {
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Cannot delete builtin role.")</span>
   }
   // first check no users actively attached to role
   const users = (
     await db.allDocs(
-      getUserMetadataParams(null, {
+      getUserMetadataParams(undefined, {
         include_docs: true,
       })
     )
-  ).rows.map(<span class="fstat-no" title="function not covered" >ro</span>w =&gt; <span class="cstat-no" title="statement not covered" >row.doc)</span>
-  const usersWithRole = users.filter(<span class="fstat-no" title="function not covered" >us</span>er =&gt; <span class="cstat-no" title="statement not covered" >user.roleId === roleId)</span>
+  ).rows.map(<span class="fstat-no" title="function not covered" >row </span>=&gt; <span class="cstat-no" title="statement not covered" >row.doc)</span>
+  const usersWithRole = users.filter(<span class="fstat-no" title="function not covered" >user </span>=&gt; <span class="cstat-no" title="statement not covered" >user.roleId === roleId)</span>
   <span class="missing-if-branch" title="if path not taken" >I</span>if (usersWithRole.length !== 0) {
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Cannot delete role when it is in use.")</span>
   }
@@ -394,16 +382,16 @@ exports.destroy = async function (ctx) {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Nov 28 2022 14:12:33 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 29 2022 11:32:32 GMT+0000 (Coordinated Universal Time)
             </div>
-        <script src="../../prettify.js"></script>
+        <script src="../../../prettify.js"></script>
         <script>
             window.onload = function () {
                 prettyPrint();
             };
         </script>
-        <script src="../../sorter.js"></script>
-        <script src="../../block-navigation.js"></script>
+        <script src="../../../sorter.js"></script>
+        <script src="../../../block-navigation.js"></script>
     </body>
 </html>

package/coverage/lcov-report/{api/controllers/routing.js.html → src/api/controllers/routing.ts.html} RENAMED Viewed

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for api/controllers/routing.js</title>
+    <title>Code coverage report for src/api/controllers/routing.ts</title>
     <meta charset="utf-8" />
-    <link rel="stylesheet" href="../../prettify.css" />
-    <link rel="stylesheet" href="../../base.css" />
-    <link rel="shortcut icon" type="image/x-icon" href="../../favicon.png" />
+    <link rel="stylesheet" href="../../../prettify.css" />
+    <link rel="stylesheet" href="../../../base.css" />
+    <link rel="shortcut icon" type="image/x-icon" href="../../../favicon.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type='text/css'>
         .coverage-summary .sorter {
-            background-image: url(../../sort-arrow-sprite.png);
+            background-image: url(../../../sort-arrow-sprite.png);
         }
     </style>
 </head>
@@ -19,20 +19,20 @@
 <body>
 <div class='wrapper'>
     <div class='pad1'>
-        <h1><a href="../../index.html">All files</a> / <a href="index.html">api/controllers</a> routing.js</h1>
+        <h1><a href="../../../index.html">All files</a> / <a href="index.html">src/api/controllers</a> routing.ts</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
-                <span class="strong">89.79% </span>
+                <span class="strong">89.13% </span>
                 <span class="quiet">Statements</span>
-                <span class='fraction'>44/49</span>
+                <span class='fraction'>41/46</span>
             </div>
             <div class='fl pad1y space-right2'>
-                <span class="strong">64.28% </span>
+                <span class="strong">68.42% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>9/14</span>
+                <span class='fraction'>13/19</span>
             </div>
@@ -44,9 +44,9 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">89.79% </span>
+                <span class="strong">89.13% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>44/49</span>
+                <span class='fraction'>41/46</span>
             </div>
@@ -155,19 +155,22 @@
 <a name='L90'></a><a href='#L90'>90</a>
 <a name='L91'></a><a href='#L91'>91</a>
 <a name='L92'></a><a href='#L92'>92</a>
-<a name='L93'></a><a href='#L93'>93</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">44x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
+<a name='L93'></a><a href='#L93'>93</a>
+<a name='L94'></a><a href='#L94'>94</a>
+<a name='L95'></a><a href='#L95'>95</a>
+<a name='L96'></a><a href='#L96'>96</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">44x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -175,7 +178,7 @@
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">3x</span>
@@ -190,7 +193,7 @@
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">44x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -200,6 +203,7 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -220,6 +224,8 @@
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
@@ -247,43 +253,44 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const { getRoutingInfo } = require("../../utilities/routing")
-const {
-  getUserRoleHierarchy,
-  BUILTIN_ROLE_IDS,
-} = require("@budibase/backend-core/roles")
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { getRoutingInfo } from "../../utilities/routing"
+import { roles } from "@budibase/backend-core"
+import { BBContext } from "@budibase/types"
 &nbsp;
 const URL_SEPARATOR = "/"
 &nbsp;
-function Routing() {
-  this.json = {}
-}
-&nbsp;
-Routing.prototype.getTopLevel = function (fullpath) {
-  <span class="missing-if-branch" title="if path not taken" >I</span>if (fullpath.charAt(0) !== URL_SEPARATOR) {
-<span class="cstat-no" title="statement not covered" >    fullpath = URL_SEPARATOR + fullpath</span>
+class Routing {
+  json: any
+  constructor() {
+    this.json = {}
   }
-  // replace the first value with the home route
-  return URL_SEPARATOR + fullpath.split(URL_SEPARATOR)[1]
-}
 &nbsp;
-Routing.prototype.getScreensProp = function (fullpath) {
-  const topLevel = this.getTopLevel(fullpath)
-  if (!this.json[topLevel]) {
-    this.json[topLevel] = {
-      subpaths: {},
+  getTopLevel(fullpath: string) {
+    <span class="missing-if-branch" title="if path not taken" >I</span>if (fullpath.charAt(0) !== URL_SEPARATOR) {
+<span class="cstat-no" title="statement not covered" >      fullpath = URL_SEPARATOR + fullpath</span>
     }
+    // replace the first value with the home route
+    return URL_SEPARATOR + fullpath.split(URL_SEPARATOR)[1]
   }
-  if (!this.json[topLevel].subpaths[fullpath]) {
-    this.json[topLevel].subpaths[fullpath] = {
-      screens: {},
+&nbsp;
+  getScreensProp(fullpath: string) {
+    const topLevel = this.getTopLevel(fullpath)
+    if (!this.json[topLevel]) {
+      this.json[topLevel] = {
+        subpaths: {},
+      }
+    }
+    if (!this.json[topLevel].subpaths[fullpath]) {
+      this.json[topLevel].subpaths[fullpath] = {
+        screens: {},
+      }
     }
+    return this.json[topLevel].subpaths[fullpath].screens
   }
-  return this.json[topLevel].subpaths[fullpath].screens
-}
 &nbsp;
-Routing.prototype.addScreenId = function (fullpath, roleId, screenId) {
-  this.getScreensProp(fullpath)[roleId] = screenId
+  addScreenId(fullpath: string, roleId: string, screenId: string) {
+    this.getScreensProp(fullpath)[roleId] = screenId
+  }
 }
 &nbsp;
 /**
@@ -304,26 +311,28 @@ async function getRoutingStructure() {
   return { routes: routing.json }
 }
 &nbsp;
-exports.fetch = async ctx =&gt; {
+export async function fetch(ctx: BBContext) {
   ctx.body = await getRoutingStructure()
 }
 &nbsp;
-exports.clientFetch = async ctx =&gt; {
+export async function clientFetch(ctx: BBContext) {
   const routing = await getRoutingStructure()
-  let roleId = ctx.user.role._id
-  const roleIds = await getUserRoleHierarchy(roleId)
-  for (let topLevel of Object.values(routing.routes)) {
+  let roleId = ctx.user<span class="branch-0 cbranch-no" title="branch not covered" >?.r</span>ole<span class="branch-0 cbranch-no" title="branch not covered" >?._</span>id
+  const roleIds = (await roles.getUserRoleHierarchy(roleId, {
+    idOnly: true,
+  })) as string[]
+  for (let topLevel of Object.values(routing.routes) as any) {
     for (let subpathKey of Object.keys(topLevel.subpaths)) {
       let found = false
       const subpath = topLevel.subpaths[subpathKey]
       const roleOptions = Object.keys(subpath.screens)
       <span class="missing-if-branch" title="if path not taken" >I</span>if (roleOptions.length === 1 &amp;&amp; <span class="branch-1 cbranch-no" title="branch not covered" >!roleOptions[0])</span> {
 <span class="cstat-no" title="statement not covered" >        subpath.screenId = subpath.screens[roleOptions[0]]</span>
-<span class="cstat-no" title="statement not covered" >        subpath.roleId = BUILTIN_ROLE_IDS.BASIC</span>
+<span class="cstat-no" title="statement not covered" >        subpath.roleId = roles.BUILTIN_ROLE_IDS.BASIC</span>
 <span class="cstat-no" title="statement not covered" >        found = true</span>
       } else {
         for (let roleId of roleIds) {
-          <span class="missing-if-branch" title="else path not taken" >E</span>if (roleOptions.indexOf(roleId) !== -1) {
+          if (roleId &amp;&amp; roleOptions.indexOf(roleId) !== -1) {
             subpath.screenId = subpath.screens[roleId]
             subpath.roleId = roleId
             found = true
@@ -346,16 +355,16 @@ exports.clientFetch = async ctx =&gt; {
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Mon Nov 28 2022 14:12:33 GMT+0000 (Coordinated Universal Time)
+                at Tue Nov 29 2022 11:32:32 GMT+0000 (Coordinated Universal Time)
             </div>
-        <script src="../../prettify.js"></script>
+        <script src="../../../prettify.js"></script>
         <script>
             window.onload = function () {
                 prettyPrint();
             };
         </script>
-        <script src="../../sorter.js"></script>
-        <script src="../../block-navigation.js"></script>
+        <script src="../../../sorter.js"></script>
+        <script src="../../../block-navigation.js"></script>
     </body>
 </html>