@iannisz/node-cms - npm Package Compare versions

Comparing version 0.0.70 to 0.0.71

package.json

 {
   "name": "@iannisz/node-cms",
-  "version": "0.0.70",
+  "version": "0.0.71",
   "description": "Node CMS",
@@ -5,0 +5,0 @@ "main": "index.js",

static/root/admin-panel/workers/add-page.node.ts

@@ -19,3 +19,3 @@ import { req, res } from 'apache-js-workers'
 			const pageContent = req.body.pageContent as Object
-	
+
 			const pagesDB = db(__dirname + '/../../../pages.json')
@@ -22,0 +22,0 @@ const pagesTable = pagesDB.table('pages')

static/root/admin-panel/workers/database/table/get.node.js

@@ -7,11 +7,63 @@ "use strict";
 const tableName = apache_js_workers_1.req.body.tableName;
-let orderArr = apache_js_workers_1.req.body.orderArr;
-if (orderArr == undefined)
-    orderArr = [];
+let from = apache_js_workers_1.req.body.from;
+let to = apache_js_workers_1.req.body.to;
+let filterArr = apache_js_workers_1.req.body.filterArr ?? [];
+let orderArr = apache_js_workers_1.req.body.orderArr ?? [];
+let builtInFilterArr = apache_js_workers_1.req.body.builtInFilterArr;
+const generateFilterFunction = (filter) => {
+    const { colName, operator, value } = filter;
+    switch (operator) {
+        case '==': return (row) => row[colName] == value;
+        case '!=': return (row) => row[colName] != value;
+        case '>': return (row) => row[colName] > value;
+        case '>=': return (row) => row[colName] >= value;
+        case '<': return (row) => row[colName] < value;
+        case '<=': return (row) => row[colName] <= value;
+        case 'startsWith': return (row) => row[colName].startsWith(value);
+        case '!startsWith': return (row) => !row[colName].startsWith(value);
+        case 'endsWith': return (row) => row[colName].endsWith(value);
+        case '!endsWith': return (row) => !row[colName].endsWith(value);
+        case 'contains': return (row) => row[colName].includes(value);
+        case '!contains': return (row) => !row[colName].includes(value);
+        case 'null': return (row) => row[colName] == null;
+        case '!null': return (row) => row[colName] != null;
+    }
+    throw new Error(`Unrecognised operator ${operator}`);
+};
 database_query_1.queryTable(dbName, tableName, tableFn => {
-    const table = tableFn.get();
-    const orderedTable = table.orderBy(orderArr);
-    const { rows, cols } = orderedTable;
+    let table = tableFn.get();
+    // Add rowNum to each row
+    let i = 0;
+    for (let row of table.rows)
+        row.rowNum = i++;
+    // Filter table
+    if (filterArr.length) {
+        for (let filter of filterArr) {
+            table = table.where(generateFilterFunction(filter));
+        }
+    }
+    for (let filter of builtInFilterArr) {
+        // Never let the user input a built-in filter function
+        const filterFunction = eval(tableFn.data.filters[filter]);
+        console.log(filterFunction);
+        if (filterFunction != null) {
+            table = table.where(filterFunction);
+        }
+    }
+    // Store the number of total rows
+    const totalRows = table.length;
+    // Order table
+    if (orderArr.length)
+        table = table.orderBy(orderArr);
+    // Get rows between indices
+    if (from == null)
+        from = 0;
+    if (to == null)
+        to = table.length - 1;
+    if (from != 0 || to != table.length - 1)
+        table = table.between(from, to);
+    // Send the table
+    const { rows, cols } = table;
     const { data } = tableFn;
-    apache_js_workers_1.res.send({ rows, cols, data });
+    apache_js_workers_1.res.send({ rows, cols, data, totalRows });
 })
@@ -18,0 +70,0 @@ .catch(err => {

static/root/admin-panel/workers/database/table/get.node.ts

 import { queryTable, handleError } from './../../../../../private-workers/database-query'
 import { req, res } from 'apache-js-workers'
+import { DB_Table_Row_Formatted as Row } from 'node-json-database'
 
 const dbName = req.body.dbName as string
 const tableName = req.body.tableName as string
+let from = req.body.from as number
+let to = req.body.to as number
 
-let orderArr = req.body.orderArr as (string | [ string, 'ASC' | 'DESC' ])[]
-if (orderArr == undefined) orderArr = []
+let filterArr = req.body.filterArr as Filter[] ?? []
+let orderArr = req.body.orderArr as (string | [ string, 'ASC' | 'DESC' ])[] ?? []
+let builtInFilterArr = req.body.builtInFilterArr as string[]
 
+interface Filter {
+	colName: string
+	operator: string
+	value: string
+}
+
+const generateFilterFunction = (filter: Filter) => {
+	const { colName, operator, value } = filter
+
+	switch (operator) {
+		case '==': return (row: Row) => row[colName] == value
+		case '!=': return (row: Row) => row[colName] != value
+		case '>': return (row: Row) => row[colName] > value
+		case '>=': return (row: Row) => row[colName] >= value
+		case '<': return (row: Row) => row[colName] < value
+		case '<=': return (row: Row) => row[colName] <= value
+		case 'startsWith': return (row: Row) => row[colName].startsWith(value)
+		case '!startsWith': return (row: Row) => !row[colName].startsWith(value)
+		case 'endsWith': return (row: Row) => row[colName].endsWith(value)
+		case '!endsWith': return (row: Row) => !row[colName].endsWith(value)
+		case 'contains': return (row: Row) => row[colName].includes(value)
+		case '!contains': return (row: Row) => !row[colName].includes(value)
+		case 'null': return (row: Row) => row[colName] == null
+		case '!null': return (row: Row) => row[colName] != null
+	}
+
+	throw new Error(`Unrecognised operator ${ operator }`)
+}
+
 queryTable(
@@ -14,12 +47,52 @@ dbName,
 	tableFn => {
-		const table = tableFn.get()
-		const orderedTable = table.orderBy(orderArr)
-		const { rows, cols } = orderedTable
+		let table = tableFn.get()
+
+		// Add rowNum to each row
+
+		let i = 0
+
+		for (let row of table.rows) row.rowNum = i++
+
+		// Filter table
+
+		if (filterArr.length) {
+			for (let filter of filterArr) {
+				table = table.where(generateFilterFunction(filter))
+			}
+		}
+
+		for (let filter of builtInFilterArr) {
+			// Never let the user input a built-in filter function
+
+			const filterFunction = eval(tableFn.data.filters[filter])
+			console.log(filterFunction)
+
+			if (filterFunction != null) {
+				table = table.where(filterFunction)
+			}
+		}
+
+		// Store the number of total rows
+
+		const totalRows = table.length
+
+		// Order table
+
+		if (orderArr.length) table = table.orderBy(orderArr)
+
+		// Get rows between indices
+
+		if (from == null) from = 0
+		if (to == null) to = table.length - 1
+		if (from != 0 || to != table.length - 1) table = table.between(from, to)
+
+		// Send the table
+
+		const { rows, cols } = table
 		const { data } = tableFn
 
-		res.send({ rows, cols, data })
-	}
-)
+		res.send({ rows, cols, data, totalRows })
+	})
 	.catch(err => {
 		handleError(err)
 	})

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Uses eval

Supply chain risk

Package uses dynamic code execution (e.g., eval()), which is a dangerous practice. This can prevent the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

457779

increased by2.6%

Number of package files

127

increased by1.6%

Lines of code

11470

increased by2.37%

Worsened metrics

Number of medium supply chain risk alerts

3

increased by50%

No dependency changes