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

@budibase/server 2.1.38 → 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 (788) hide show

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

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for api/controllers/view/exporters.js</title>
+    <title>Code coverage report for src/api/controllers/view/exporters.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/view</a> exporters.js</h1>
+        <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/api/controllers/view</a> exporters.ts</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
@@ -89,7 +89,11 @@
 <a name='L24'></a><a href='#L24'>24</a>
 <a name='L25'></a><a href='#L25'>25</a>
 <a name='L26'></a><a href='#L26'>26</a>
-<a name='L27'></a><a href='#L27'>27</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">45x</span>
+<a name='L27'></a><a href='#L27'>27</a>
+<a name='L28'></a><a href='#L28'>28</a>
+<a name='L29'></a><a href='#L29'>29</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">45x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">2x</span>
@@ -115,7 +119,9 @@
 <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">exports.csv = function (headers, rows) {
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { Row } from "@budibase/types"
+&nbsp;
+export function csv(headers: string[], rows: Row[]) {
   let csv = headers.map(key =&gt; `"${key}"`).join(",")
 &nbsp;
   for (let row of rows) {
@@ -133,11 +139,11 @@
   return csv
 }
 &nbsp;
-exports.json = function (headers, rows) {
+export function json(headers: string[], rows: Row[]) {
   return JSON.stringify(rows, undefined, 2)
 }
 &nbsp;
-exports.ExportFormats = {
+export const ExportFormats = {
   CSV: "csv",
   JSON: "json",
 }
@@ -148,16 +154,16 @@ exports.ExportFormats = {
             <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 09:35:14 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 → src/api}/controllers/view/index.html RENAMED Viewed

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for api/controllers/view</title>
+    <title>Code coverage report for src/api/controllers/view</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> api/controllers/view</h1>
+        <h1><a href="../../../../index.html">All files</a> src/api/controllers/view</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
@@ -30,9 +30,9 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">76.69% </span>
+                <span class="strong">77.27% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>102/133</span>
+                <span class='fraction'>85/110</span>
             </div>
@@ -44,9 +44,9 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">77.5% </span>
+                <span class="strong">77.31% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>186/240</span>
+                <span class='fraction'>184/238</span>
             </div>
@@ -79,7 +79,7 @@
 </tr>
 </thead>
 <tbody><tr>
-	<td class="file high" data-value="exporters.js"><a href="exporters.js.html">exporters.js</a></td>
+	<td class="file high" data-value="exporters.ts"><a href="exporters.ts.html">exporters.ts</a></td>
 	<td data-value="100" class="pic high">
 	<div class="chart"><div class="cover-fill cover-full" style="width: 100%"></div><div class="cover-empty" style="width: 0%"></div></div>
 	</td>
@@ -94,48 +94,48 @@
 	</tr>
 <tr>
-	<td class="file high" data-value="index.js"><a href="index.js.html">index.js</a></td>
+	<td class="file high" data-value="index.ts"><a href="index.ts.html">index.ts</a></td>
 	<td data-value="90.38" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 90%"></div><div class="cover-empty" style="width: 10%"></div></div>
 	</td>
 	<td data-value="90.38" class="pct high">90.38%</td>
 	<td data-value="104" class="abs high">94/104</td>
-	<td data-value="90.76" class="pct high">90.76%</td>
-	<td data-value="65" class="abs high">59/65</td>
+	<td data-value="90.56" class="pct high">90.56%</td>
+	<td data-value="53" class="abs high">48/53</td>
 	<td data-value="72.72" class="pct medium">72.72%</td>
 	<td data-value="11" class="abs medium">8/11</td>
-	<td data-value="91.26" class="pct high">91.26%</td>
-	<td data-value="103" class="abs high">94/103</td>
+	<td data-value="91.08" class="pct high">91.08%</td>
+	<td data-value="101" class="abs high">92/101</td>
 	</tr>
 <tr>
-	<td class="file medium" data-value="utils.js"><a href="utils.js.html">utils.js</a></td>
-	<td data-value="51.16" class="pic medium">
+	<td class="file medium" data-value="utils.ts"><a href="utils.ts.html">utils.ts</a></td>
+	<td data-value="51.72" class="pic medium">
 	<div class="chart"><div class="cover-fill" style="width: 51%"></div><div class="cover-empty" style="width: 49%"></div></div>
 	</td>
-	<td data-value="51.16" class="pct medium">51.16%</td>
-	<td data-value="86" class="abs medium">44/86</td>
-	<td data-value="32.14" class="pct low">32.14%</td>
-	<td data-value="28" class="abs low">9/28</td>
+	<td data-value="51.72" class="pct medium">51.72%</td>
+	<td data-value="87" class="abs medium">45/87</td>
+	<td data-value="28.57" class="pct low">28.57%</td>
+	<td data-value="21" class="abs low">6/21</td>
 	<td data-value="66.66" class="pct medium">66.66%</td>
 	<td data-value="9" class="abs medium">6/9</td>
-	<td data-value="51.16" class="pct medium">51.16%</td>
-	<td data-value="86" class="abs medium">44/86</td>
+	<td data-value="51.72" class="pct medium">51.72%</td>
+	<td data-value="87" class="abs medium">45/87</td>
 	</tr>
 <tr>
-	<td class="file high" data-value="viewBuilder.js"><a href="viewBuilder.js.html">viewBuilder.js</a></td>
-	<td data-value="92.5" class="pic high">
+	<td class="file high" data-value="viewBuilder.ts"><a href="viewBuilder.ts.html">viewBuilder.ts</a></td>
+	<td data-value="92.3" class="pic high">
 	<div class="chart"><div class="cover-fill" style="width: 92%"></div><div class="cover-empty" style="width: 8%"></div></div>
 	</td>
-	<td data-value="92.5" class="pct high">92.5%</td>
-	<td data-value="40" class="abs high">37/40</td>
-	<td data-value="88.88" class="pct high">88.88%</td>
-	<td data-value="36" class="abs high">32/36</td>
+	<td data-value="92.3" class="pct high">92.3%</td>
+	<td data-value="39" class="abs high">36/39</td>
+	<td data-value="90.62" class="pct high">90.62%</td>
+	<td data-value="32" class="abs high">29/32</td>
 	<td data-value="100" class="pct high">100%</td>
 	<td data-value="5" class="abs high">5/5</td>
-	<td data-value="92.5" class="pct high">92.5%</td>
-	<td data-value="40" class="abs high">37/40</td>
+	<td data-value="92.3" class="pct high">92.3%</td>
+	<td data-value="39" class="abs high">36/39</td>
 	</tr>
 </tbody>
@@ -146,16 +146,16 @@
             <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 09:35:14 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/view/index.js.html → src/api/controllers/view/index.ts.html} RENAMED Viewed

@@ -3,15 +3,15 @@
 <html lang="en">
 <head>
-    <title>Code coverage report for api/controllers/view/index.js</title>
+    <title>Code coverage report for src/api/controllers/view/index.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/view</a> index.js</h1>
+        <h1><a href="../../../../index.html">All files</a> / <a href="index.html">src/api/controllers/view</a> index.ts</h1>
         <div class='clearfix'>
             <div class='fl pad1y space-right2'>
@@ -30,9 +30,9 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">90.76% </span>
+                <span class="strong">90.56% </span>
                 <span class="quiet">Branches</span>
-                <span class='fraction'>59/65</span>
+                <span class='fraction'>48/53</span>
             </div>
@@ -44,9 +44,9 @@
             <div class='fl pad1y space-right2'>
-                <span class="strong">91.26% </span>
+                <span class="strong">91.08% </span>
                 <span class="quiet">Lines</span>
-                <span class='fraction'>94/103</span>
+                <span class='fraction'>92/101</span>
             </div>
@@ -252,8 +252,16 @@
 <a name='L187'></a><a href='#L187'>187</a>
 <a name='L188'></a><a href='#L188'>188</a>
 <a name='L189'></a><a href='#L189'>189</a>
-<a name='L190'></a><a href='#L190'>190</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">44x</span>
-<span class="cline-any cline-yes">44x</span>
+<a name='L190'></a><a href='#L190'>190</a>
+<a name='L191'></a><a href='#L191'>191</a>
+<a name='L192'></a><a href='#L192'>192</a>
+<a name='L193'></a><a href='#L193'>193</a>
+<a name='L194'></a><a href='#L194'>194</a>
+<a name='L195'></a><a href='#L195'>195</a>
+<a name='L196'></a><a href='#L196'>196</a>
+<a name='L197'></a><a href='#L197'>197</a>
+<a name='L198'></a><a href='#L198'>198</a>
+<a name='L199'></a><a href='#L199'>199</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-yes">44x</span>
 <span class="cline-any cline-yes">44x</span>
@@ -262,6 +270,15 @@
 <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-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-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-yes">44x</span>
@@ -347,7 +364,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-yes">44x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -393,6 +410,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">4x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -441,24 +459,32 @@
 <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-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">const viewTemplate = require("./viewBuilder")
-const { apiFileReturn } = require("../../../utilities/fileSystem")
-const exporters = require("./exporters")
-const { saveView, getView, getViews, deleteView } = require("./utils")
-const { fetchView } = require("../row")
-const { FieldTypes } = require("../../../constants")
-const { getAppDB } = require("@budibase/backend-core/context")
-const { events } = require("@budibase/backend-core")
-const { DocumentType } = require("../../../db/utils")
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import viewTemplate from "./viewBuilder"
+import { apiFileReturn } from "../../../utilities/fileSystem"
+import * as exporters from "./exporters"
+import { deleteView, getView, getViews, saveView } from "./utils"
+import { fetchView } from "../row"
+import { FieldTypes } from "../../../constants"
+import { context, events } from "@budibase/backend-core"
+import { DocumentType } from "../../../db/utils"
+import sdk from "../../../sdk"
+import {
+  BBContext,
+  Row,
+  Table,
+  TableExportFormat,
+  TableSchema,
+  View,
+} from "@budibase/types"
+&nbsp;
 const { cloneDeep, isEqual } = require("lodash")
-const sdk = require("../../../sdk")
 &nbsp;
-exports.fetch = async ctx =&gt; {
+export async function fetch(ctx: BBContext) {
   ctx.body = await getViews()
 }
 &nbsp;
-exports.save = async ctx =&gt; {
-  const db = getAppDB()
+export async function save(ctx: BBContext) {
+  const db = context.getAppDB()
   const { originalName, ...viewToSave } = ctx.request.body
   const view = viewTemplate(viewToSave)
   const viewName = viewToSave.name
@@ -490,7 +516,7 @@ exports.save = async ctx =&gt; {
   }
 }
 &nbsp;
-const calculationEvents = async (existingView, newView) =&gt; {
+export async function calculationEvents(existingView: View, newView: View) {
   const existingCalculation = existingView &amp;&amp; existingView.calculation
   const newCalculation = newView &amp;&amp; newView.calculation
 &nbsp;
@@ -511,7 +537,7 @@ const calculationEvents = async (existingView, newView) =&gt; {
   }
 }
 &nbsp;
-const filterEvents = async (existingView, newView) =&gt; {
+export async function filterEvents(existingView: View, newView: View) {
   const hasExistingFilters = !!(
     existingView &amp;&amp;
     existingView.filters &amp;&amp;
@@ -536,7 +562,7 @@ const filterEvents = async (existingView, newView) =&gt; {
   }
 }
 &nbsp;
-const handleViewEvents = async (existingView, newView) =&gt; {
+async function handleViewEvents(existingView: View, newView: View) {
   if (!existingView) {
     await events.view.created(newView)
   } else {
@@ -546,8 +572,8 @@ const handleViewEvents = async (existingView, newView) =&gt; {
   await filterEvents(existingView, newView)
 }
 &nbsp;
-exports.destroy = async ctx =&gt; {
-  const db = getAppDB()
+export async function destroy(ctx: BBContext) {
+  const db = context.getAppDB()
   const viewName = decodeURI(ctx.params.viewName)
   const view = await deleteView(viewName)
   const table = await db.get(view.meta.tableId)
@@ -558,11 +584,11 @@ exports.destroy = async ctx =&gt; {
   ctx.body = view
 }
 &nbsp;
-exports.exportView = async ctx =&gt; {
-  const viewName = decodeURI(ctx.query.view)
+export async function exportView(ctx: BBContext) {
+  const viewName = decodeURI(ctx.query.view as string)
   const view = await getView(viewName)
 &nbsp;
-  const format = ctx.query.format
+  const format = ctx.query.format as string
   <span class="missing-if-branch" title="if path not taken" >I</span>if (!format || !Object.values(exporters.ExportFormats).includes(format)) {
 <span class="cstat-no" title="statement not covered" >    ctx.throw(400, "Format must be specified, either csv or json")</span>
   }
@@ -573,6 +599,7 @@ exports.exportView = async ctx =&gt; {
     ctx.query = {
       group: view.meta.groupBy,
       calculation: view.meta.calculation,
+      // @ts-ignore
       stats: !!view.meta.field,
       field: view.meta.field,
     }
@@ -583,22 +610,22 @@ exports.exportView = async ctx =&gt; {
   }
 &nbsp;
   await fetchView(ctx)
-  let rows = ctx.body
+  let rows = ctx.body as Row[]
 &nbsp;
-  let schema = view &amp;&amp; view.meta &amp;&amp; view.meta.schema
+  let schema: TableSchema = view &amp;&amp; view.meta &amp;&amp; view.meta.schema
   const tableId = ctx.params.tableId || view.meta.tableId
-  const table = await sdk.tables.getTable(tableId)
-  <span class="missing-if-branch" title="else path not taken" >E</span>if (!schema) {
+  const table: Table = await sdk.tables.getTable(tableId)
+  if (!schema) {
     schema = table.schema
   }
 &nbsp;
   // remove any relationships
   const relationships = Object.entries(schema)
     .filter(entry =&gt; entry[1].type === FieldTypes.LINK)
-    .map(<span class="fstat-no" title="function not covered" >en</span>try =&gt; <span class="cstat-no" title="statement not covered" >entry[0])</span>
+    .map(<span class="fstat-no" title="function not covered" >entry </span>=&gt; <span class="cstat-no" title="statement not covered" >entry[0])</span>
   // iterate relationship columns and remove from and row and schema
-  relationships.forEach(<span class="fstat-no" title="function not covered" >co</span>lumn =&gt; {
-<span class="cstat-no" title="statement not covered" >    rows.forEach(<span class="fstat-no" title="function not covered" >ro</span>w =&gt; {</span>
+  relationships.forEach(<span class="fstat-no" title="function not covered" >column </span>=&gt; {
+<span class="cstat-no" title="statement not covered" >    rows.forEach(<span class="fstat-no" title="function not covered" >row </span>=&gt; {</span>
 <span class="cstat-no" title="statement not covered" >      delete row[column]</span>
     })
 <span class="cstat-no" title="statement not covered" >    delete schema[column]</span>
@@ -618,16 +645,16 @@ exports.exportView = async ctx =&gt; {
 &nbsp;
   // Export part
   let headers = Object.keys(schema)
-  const exporter = exporters[format]
+  const exporter = format === "csv" ? exporters.csv : exporters.json
   const filename = `${viewName}.${format}`
   // send down the file
   ctx.attachment(filename)
   ctx.body = apiFileReturn(exporter(headers, rows))
 &nbsp;
   if (viewName.startsWith(DocumentType.TABLE)) {
-    await events.table.exported(table, format)
+    await events.table.exported(table, format as TableExportFormat)
   } else {
-    await events.view.exported(table, format)
+    await events.view.exported(table, format as TableExportFormat)
   }
 }
 &nbsp;</pre></td></tr></table></pre>
@@ -637,16 +664,16 @@ exports.exportView = 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 09:35:14 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>