jxp 3.0.0 → 4.1.0

package/package.json

@@ -1,70 +1,122 @@
 {
-  "name": "jxp",
-  "description:": "An opinionated RESTful API library based on Mongoose and Restify. Make an API by just writing Mongoose models.",
-  "version": "3.0.0",
-  "private": false,
-  "main": "libs/jxp.js",
-  "scripts": {
-    "start": "node bin/server.js",
-    "test": "mocha --timeout 1000 -b --exit",
-    "wstest": "mocha test/wstest",
-    "setup": "node bin/setup.js"
-  },
-  "bin": {
-    "jxp": "bin/setup.js",
-    "jxp-setup": "bin/setup.js",
-    "jxp-add-admin": "bin/init_db.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/WorkSpaceMan/jxp.git"
-  },
-  "keywords": [
-    "api",
-    "mongoose"
-  ],
-  "author": "Jason Norwood-Young <jason@10layer.com> (https://github.com/j-norwood-young/)",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/WorkSpaceMan/jxp/issues"
-  },
-  "dependencies": {
-    "axios": "^1.8.4",
-    "bcryptjs": "^3.0.2",
-    "commander": "^13.1.0",
-    "config": "^3.3.12",
-    "dotenv": "^16.5.0",
-    "glob": "11.0.1",
-    "js-yaml": "4.1.0",
-    "json2csv": "^5.0.7",
-    "jsonwebtoken": "^9.0.2",
-    "jstransformer-markdown-it": "^3.0.0",
-    "jxp-helper": "^1.4.3",
-    "mkdirp": "^3.0.1",
-    "moment": "^2.30.1",
-    "mongoose": "6.12.6",
-    "mongoose-friendly": "^0.1.4",
-    "morgan": "^1.10.0",
-    "node-cache": "^5.1.2",
-    "nodemailer": "^6.10.1",
-    "nodemailer-smtp-transport": "^2.7.4",
-    "path": "^0.12.7",
-    "pug": "^3.0.3",
-    "querystring": "^0.2.1",
-    "rand-token": "^1.0.1",
-    "readline-sync": "^1.4.10",
-    "restify": "^11.1.0",
-    "restify-cors-middleware2": "^2.2.1",
-    "restify-errors": "^8.0.2",
-    "traverse": "^0.6.11",
-    "underscore": "^1.13.7",
-    "ws": "^8.18.1"
-  },
-  "devDependencies": {
-    "chai": "^4.3.10",
-    "chai-http": "^4.4.0",
-    "mocha": "^10.2.0",
-    "moment": "^2.29.4",
-    "should": "^13.2.3"
-  }
-}
+	"name": "jxp",
+	"description": "An opinionated RESTful API library based on Mongoose and Restify. Make an API by just writing Mongoose models.",
+	"version": "4.1.0",
+	"private": false,
+	"main": "dist/libs/jxp.js",
+	"types": "dist/libs/jxp.d.ts",
+	"files": [
+		"dist",
+		".env.sample",
+		"templates",
+		"docs",
+		"mkdocs.yml"
+	],
+	"exports": {
+		".": {
+			"types": "./dist/libs/jxp.d.ts",
+			"default": "./dist/libs/jxp.js"
+		},
+		"./libs/schema": {
+			"types": "./dist/libs/schema.d.ts",
+			"default": "./dist/libs/schema.js"
+		},
+		"./libs/query_manipulation": {
+			"types": "./dist/libs/query_manipulation.d.ts",
+			"default": "./dist/libs/query_manipulation.js"
+		},
+		"./globals": {
+			"types": "./dist/globals.d.ts",
+			"default": "./dist/globals.js"
+		},
+		"./libs/load-config": {
+			"types": "./dist/libs/load-config.d.ts",
+			"default": "./dist/libs/load-config.js"
+		},
+		"./libs/connection_string": {
+			"types": "./dist/libs/connection_string.d.ts",
+			"default": "./dist/libs/connection_string.js"
+		},
+		"./types/jxp-config": {
+			"types": "./dist/types/jxp-config.d.ts"
+		}
+	},
+	"scripts": {
+		"build": "tsc -p tsconfig.build.json",
+		"prepublishOnly": "npm run build",
+		"prepare": "node -e \"require('fs').existsSync('src')&&require('child_process').execSync('npm run build',{stdio:'inherit'})\"",
+		"start": "node dist/bin/server.js",
+		"dev": "nodemon --watch src --ext ts --exec 'npm run build && node dist/bin/server.js'",
+		"test": "npm run build && mocha --require test/env.js --timeout 1000 -b --exit",
+		"setup": "node dist/bin/setup.js"
+	},
+	"bin": {
+		"jxp": "dist/bin/setup.js",
+		"jxp-setup": "dist/bin/setup.js",
+		"jxp-add-admin": "dist/bin/init_db.js"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git://github.com/WorkSpaceMan/jxp.git"
+	},
+	"keywords": [
+		"api",
+		"mongoose",
+		"typescript"
+	],
+	"author": "Jason Norwood-Young <jason@10layer.com> (https://github.com/j-norwood-young/)",
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/WorkSpaceMan/jxp/issues"
+	},
+	"dependencies": {
+		"bcryptjs": "^3.0.2",
+		"commander": "^13.1.0",
+		"dotenv": "^16.5.0",
+		"glob": "11.1.0",
+		"js-yaml": "4.1.1",
+		"@json2csv/plainjs": "^7.0.6",
+		"jsonwebtoken": "^9.0.2",
+		"markdown-it": "^14.1.1",
+		"jxp-helper": "^1.4.3",
+		"moment": "^2.30.1",
+		"mongoose": "6.13.9",
+		"mongoose-friendly": "^0.1.4",
+		"morgan": "^1.10.0",
+		"node-cache": "^5.1.2",
+		"nodemailer": "^8.0.7",
+		"pug": "^3.0.3",
+		"rand-token": "^1.0.1",
+		"readline-sync": "^1.4.10",
+		"restify": "^11.1.0",
+		"restify-cors-middleware2": "^2.2.1",
+		"restify-errors": "^8.0.2",
+		"traverse": "^0.6.11",
+		"underscore": "^1.13.8",
+		"ws": "^8.18.1"
+	},
+	"devDependencies": {
+		"@types/markdown-it": "^14.1.2",
+		"@types/bcryptjs": "^2.4.6",
+		"@types/jsonwebtoken": "^9.0.9",
+		"@types/morgan": "^1.9.9",
+		"@types/node": "^22.15.21",
+		"@types/underscore": "^1.13.0",
+		"@types/ws": "^8.18.1",
+		"chai": "^4.3.10",
+		"chai-http": "^4.4.0",
+		"mocha": "^11.7.5",
+		"nodemon": "^3.1.0",
+		"should": "^13.2.3",
+		"typescript": "^5.8.3"
+	},
+	"engines": {
+		"node": ">=22.0.0"
+	},
+	"overrides": {
+		"find-my-way": "^8.2.2",
+		"send": "^0.19.0",
+		"serialize-javascript": "^7.0.5",
+		"diff": "^8.0.3"
+	}
+}

package/templates/api.pug

@@ -0,0 +1,32 @@
+extends layout
+
+block content
+  h1.mb-1 API reference
+  p.text-muted.mb-4 Explore resources, try requests with your API key, and inspect schemas.
+
+  if model_summaries.length
+    .table-responsive
+      table.table.table-striped.table-hover.align-middle
+        thead
+          tr
+            th Resource
+            th Collection
+            th Permissions
+            th
+        tbody
+          each summary in model_summaries
+            tr
+              td
+                a.fw-semibold(href="/docs/model/" + summary.slug)= summary.slug
+              td
+                code.small= summary.collection
+              td
+                if summary.perms
+                  each value, key in summary.perms
+                    span.badge.text-bg-secondary.me-1(title=key)= key + ': ' + value
+                else
+                  span.badge.text-bg-warning No perms
+              td.text-end
+                a.btn.btn-sm.btn-outline-primary(href="/docs/model/" + summary.slug) Open
+  else
+    .alert.alert-info No API resources are registered.

package/templates/app-server.js

@@ -0,0 +1,43 @@
+require("dotenv").config();
+const mongoose = require("mongoose");
+const JXP = require("jxp");
+const { loadJxpConfig, getMongoConnectionString } = require("jxp/libs/load-config");
+
+const apiconfig = loadJxpConfig();
+
+apiconfig.callbacks = {
+	post: function () {},
+	put: function () {},
+	delete: function () {},
+};
+
+apiconfig.pre_hooks = {
+	login: (req, res, next) => next(),
+	get: (req, res, next) => next(),
+	getOne: (req, res, next) => next(),
+	post: (req, res, next) => next(),
+	put: (req, res, next) => next(),
+	delete: (req, res, next) => next(),
+};
+
+mongoose.Promise = Promise;
+const mongo_options = Object.assign({}, apiconfig.mongo?.options || {}, {
+	useNewUrlParser: true,
+	useUnifiedTopology: true,
+});
+
+mongoose.connect(getMongoConnectionString(), mongo_options);
+
+mongoose.connection.on("error", console.error.bind(console, "connection error:"));
+mongoose.connection.once("open", () => {
+	console.log(`Connected to Mongo at: ${new Date()}`);
+});
+
+const server = JXP(apiconfig);
+const port = parseInt(process.env.PORT || String(apiconfig.port || 4001), 10);
+
+server.listen(port, function () {
+	console.log("%s listening at %s", server.name, server.url);
+});
+
+module.exports = server;

package/templates/app.env.sample

@@ -0,0 +1,8 @@
+PORT={port}
+API_URL={url}
+MONGO_CONNECTION_STRING={connection_string}
+SHARED_SECRET={shared_secret}
+TOKEN_EXPIRY=86400
+REFRESH_TOKEN_EXPIRY=2678400
+MODEL_DIR=./models
+LOG_FILE=./logs/access.log

package/templates/assets/api-console.js

@@ -0,0 +1,151 @@
+(function () {
+	"use strict";
+
+	const STORAGE_KEY = "jxp_docs_api_key";
+	const STORAGE_REMEMBER = "jxp_docs_remember_key";
+
+	function getApiKey() {
+		const input = document.getElementById("docs-api-key");
+		return input ? input.value.trim() : "";
+	}
+
+	function loadStoredKey() {
+		if (localStorage.getItem(STORAGE_REMEMBER) !== "1") return;
+		const key = localStorage.getItem(STORAGE_KEY);
+		if (!key) return;
+		const input = document.getElementById("docs-api-key");
+		const remember = document.getElementById("docs-remember-key");
+		if (input) input.value = key;
+		if (remember) remember.checked = true;
+	}
+
+	function saveKeyIfRemembered() {
+		const remember = document.getElementById("docs-remember-key");
+		const input = document.getElementById("docs-api-key");
+		if (!remember || !input) return;
+		if (remember.checked) {
+			localStorage.setItem(STORAGE_REMEMBER, "1");
+			localStorage.setItem(STORAGE_KEY, input.value.trim());
+		} else {
+			localStorage.removeItem(STORAGE_REMEMBER);
+			localStorage.removeItem(STORAGE_KEY);
+		}
+	}
+
+	function formatBody(text) {
+		if (!text) return "";
+		try {
+			return JSON.stringify(JSON.parse(text), null, 2);
+		} catch {
+			return text;
+		}
+	}
+
+	function formatResponse(text) {
+		if (!text) return "(empty)";
+		try {
+			return JSON.stringify(JSON.parse(text), null, 2);
+		} catch {
+			return text;
+		}
+	}
+
+	async function sendRequest(panel) {
+		const method = panel.dataset.method;
+		const pathInput = panel.querySelector(".api-path-input");
+		const bodyInput = panel.querySelector(".api-body-input");
+		const responseEl = panel.querySelector(".api-response");
+		const metaEl = panel.querySelector(".api-response-meta");
+		const btn = panel.querySelector(".api-send-btn");
+
+		const path = pathInput ? pathInput.value.trim() : panel.dataset.defaultPath;
+		if (!path.startsWith("/")) {
+			responseEl.textContent = "Path must start with /";
+			responseEl.classList.remove("empty");
+			return;
+		}
+
+		const headers = { Accept: "application/json" };
+		const apiKey = getApiKey();
+		if (apiKey) headers["X-API-Key"] = apiKey;
+
+		const opts = { method, headers };
+		if (bodyInput && (method === "POST" || method === "PUT")) {
+			const raw = bodyInput.value.trim();
+			if (raw) {
+				headers["Content-Type"] = "application/json";
+				opts.body = raw;
+			}
+		}
+
+		btn.disabled = true;
+		responseEl.textContent = "Sending…";
+		responseEl.classList.remove("empty");
+		metaEl.textContent = "";
+
+		const start = performance.now();
+		try {
+			const res = await fetch(path, opts);
+			const elapsed = Math.round(performance.now() - start);
+			const text = await res.text();
+			responseEl.textContent = formatResponse(text);
+			metaEl.textContent = `HTTP ${res.status} ${res.statusText} · ${elapsed} ms`;
+			metaEl.className = "api-response-meta " + (res.ok ? "text-success" : "text-danger");
+		} catch (err) {
+			responseEl.textContent = String(err.message || err);
+			metaEl.textContent = "Request failed";
+			metaEl.className = "api-response-meta text-danger";
+		} finally {
+			btn.disabled = false;
+		}
+	}
+
+	function initPanel(panel) {
+		const sendBtn = panel.querySelector(".api-send-btn");
+		if (sendBtn) {
+			sendBtn.addEventListener("click", function () {
+				saveKeyIfRemembered();
+				sendRequest(panel);
+			});
+		}
+		const bodyInput = panel.querySelector(".api-body-input");
+		if (bodyInput) {
+			bodyInput.addEventListener("blur", function () {
+				bodyInput.value = formatBody(bodyInput.value);
+			});
+		}
+	}
+
+	async function loadSessionApiKey() {
+		const access = document.documentElement.dataset.docsAccess;
+		if (access !== "protected") return;
+		try {
+			const res = await fetch("/docs/session", { credentials: "same-origin" });
+			if (!res.ok) return;
+			const data = await res.json();
+			if (!data.apikey) return;
+			const input = document.getElementById("docs-api-key");
+			if (input) input.value = data.apikey;
+		} catch {
+			/* ignore */
+		}
+	}
+
+	document.addEventListener("DOMContentLoaded", function () {
+		const access = document.documentElement.dataset.docsAccess;
+		loadSessionApiKey().then(function () {
+			if (access !== "protected") loadStoredKey();
+		});
+
+		const keyInput = document.getElementById("docs-api-key");
+		const remember = document.getElementById("docs-remember-key");
+		if (keyInput) {
+			keyInput.addEventListener("change", saveKeyIfRemembered);
+		}
+		if (remember) {
+			remember.addEventListener("change", saveKeyIfRemembered);
+		}
+
+		document.querySelectorAll(".api-try-panel").forEach(initPanel);
+	});
+})();

package/templates/assets/docs-login.js

@@ -0,0 +1,66 @@
+(function () {
+	"use strict";
+
+	document.addEventListener("DOMContentLoaded", function () {
+		const form = document.getElementById("docs-login-form");
+		const errEl = document.getElementById("docs-login-error");
+		if (!form || !errEl) return;
+
+		form.addEventListener("submit", async function (e) {
+			e.preventDefault();
+			errEl.hidden = true;
+			const email = form.email.value.trim();
+			const password = form.password.value;
+			const next =
+				form.next && form.next.value && form.next.value.startsWith("/")
+					? form.next.value
+					: "/docs/api";
+
+			try {
+				const loginRes = await fetch("/login", {
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+						Accept: "application/json",
+					},
+					body: JSON.stringify({ email, password }),
+				});
+				const loginBody = await loginRes.json().catch(function () {
+					return {};
+				});
+				if (loginRes.status === 429) {
+					errEl.textContent =
+						"Too many login attempts. Please wait a minute and try again.";
+					errEl.hidden = false;
+					return;
+				}
+				if (!loginRes.ok || !loginBody.apikey) {
+					errEl.textContent =
+						loginBody.message || "Incorrect email or password";
+					errEl.hidden = false;
+					return;
+				}
+
+				const sessRes = await fetch("/docs/session", {
+					method: "POST",
+					headers: {
+						"Content-Type": "application/json",
+						Accept: "application/json",
+					},
+					credentials: "same-origin",
+					body: JSON.stringify({ apikey: loginBody.apikey }),
+				});
+				if (!sessRes.ok) {
+					errEl.textContent = "Signed in but could not start docs session";
+					errEl.hidden = false;
+					return;
+				}
+
+				window.location.href = next;
+			} catch {
+				errEl.textContent = "Login request failed";
+				errEl.hidden = false;
+			}
+		});
+	});
+})();