@nymphjs/tilmeld-setup 1.0.0-beta.13 → 1.0.0-beta.130

package/dist/index.d.ts

@@ -1,4 +1,6 @@
-import { NymphOptions } from '@nymphjs/client';
-import { Nymph } from '@nymphjs/nymph';
-export declare function setup(options: NymphOptions, nymph: Nymph): import("express-serve-static-core").Express;
+import type { NymphOptions } from '@nymphjs/client';
+import type { Nymph } from '@nymphjs/nymph';
+export declare function setup(options: NymphOptions, nymph: Nymph, { allowRegistration }?: {
+    allowRegistration?: boolean;
+}): import("express-serve-static-core").Express;
 export default setup;

package/dist/index.js

@@ -1,17 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setup = void 0;
-const express_1 = __importDefault(require("express"));
-const strtotime_1 = __importDefault(require("locutus/php/datetime/strtotime"));
-function setup(options, nymph) {
-    const app = (0, express_1.default)();
-    if (!nymph.tilmeld) {
-        throw new Error('You need to configure Tilmeld on your Nymph instance first.');
-    }
-    const tilmeld = nymph.tilmeld;
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import express from 'express';
+import { strtotime } from 'locutus/php/datetime/index';
+import { enforceTilmeld } from '@nymphjs/tilmeld';
+const __dirname = dirname(fileURLToPath(import.meta.url));
+export function setup(options, nymph, { allowRegistration = false } = {}) {
+    const app = express();
+    const tilmeld = enforceTilmeld(nymph);
     app.use('/verify', async (request, response, next) => {
         if (!tilmeld.config.verifyEmail || request.query.action == null) {
             next();
@@ -74,6 +69,7 @@ function setup(options, nymph) {
                 printError(500, 'An error occurred.');
                 return;
             case 'verify':
+                // Verify new user's email address.
                 if (user.secret == null || request.query.secret !== user.secret) {
                     printError(500, 'An error occurred.');
                     return;
@@ -85,6 +81,7 @@ function setup(options, nymph) {
                 delete user.secret;
                 break;
             case 'verifychange':
+                // Email address change.
                 if (user.newEmailSecret == null ||
                     user.newEmailAddress == null ||
                     request.query.secret !== user.newEmailSecret) {
@@ -110,6 +107,7 @@ function setup(options, nymph) {
                 delete user.newEmailSecret;
                 break;
             case 'cancelchange':
+                // Cancel an email address change.
                 if (user.cancelEmailSecret == null ||
                     user.cancelEmailAddress == null ||
                     request.query.secret !== user.cancelEmailSecret) {
@@ -119,7 +117,7 @@ function setup(options, nymph) {
                 if (tilmeld.config.emailRateLimit !== '' &&
                     user.emailChangeDate != null &&
                     user.emailChangeDate <
-                        ((0, strtotime_1.default)('-' + tilmeld.config.emailRateLimit) || 0) * 1000) {
+                        (strtotime('-' + tilmeld.config.emailRateLimit) || 0) * 1000) {
                     printError(400, "That email change cancellation link has expired. Please contact an administrator if you can't access your account.");
                     return;
                 }
@@ -134,7 +132,8 @@ function setup(options, nymph) {
                 delete user.cancelEmailSecret;
                 break;
         }
-        if (await user.$saveSkipAC()) {
+        try {
+            await user.$saveSkipAC();
             switch (request.query.action) {
                 case 'verify':
                 default:
@@ -148,20 +147,21 @@ function setup(options, nymph) {
                     break;
             }
         }
-        else {
+        catch (e) {
             printError(500, 'An error occurred.');
         }
     });
     app.get('/options.js', async (_request, response) => {
         response.type('text/javascript');
-        response.send(`window.nymphOptions = ${JSON.stringify(options)};`);
+        response.send(`window.nymphOptions = ${JSON.stringify(options)};\n` +
+            `window.allowRegistration = ${JSON.stringify(allowRegistration)};\n` +
+            `window.appUrl = ${JSON.stringify(tilmeld.config.appUrl)};`);
     });
-    app.use('/app', express_1.default.static(__dirname + '/app', {
+    app.use('/app', express.static(__dirname + '/app', {
         fallthrough: true,
     }));
-    app.use(express_1.default.static(__dirname + '/../static', { fallthrough: false }));
+    app.use(express.static(__dirname + '/../static', { fallthrough: false }));
     return app;
 }
-exports.setup = setup;
-exports.default = setup;
+export default setup;
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/jest.config.js

@@ -1,6 +1,32 @@
-/** @type {import('ts-jest').JestConfigWithTsJest} */
-module.exports = {
-  preset: 'ts-jest',
-  testEnvironment: 'node',
-  rootDir: 'src/',
+const jestConfig = {
+  extensionsToTreatAsEsm: ['.ts', '.tsx'],
+  testMatch: [
+    '<rootDir>/src/**/__tests__/**/*.{js,ts,jsx,tsx,mjs,mts}',
+    '<rootDir>/src/**/?(*.)(spec|test).{js,ts,jsx,tsx,mjs,mts}',
+  ],
+  transform: {
+    '^.+\\.(ts|tsx|mts)$': [
+      '@swc/jest',
+      {
+        jsc: {
+          parser: {
+            syntax: 'typescript',
+            tsx: true,
+            decorators: true,
+          },
+          target: 'es2024',
+        },
+        module: {
+          type: 'commonjs',
+        },
+      },
+    ],
+  },
+  transformIgnorePatterns: ['[/\\\\]node_modules[/\\\\].+\\.(js|jsx|mjs)$'],
+  moduleDirectories: ['node_modules', 'src'],
+  moduleNameMapper: {
+    '^(\\.|\\.\\.)\\/(.+)\\.js': '$1/$2',
+  },
 };
+
+export default jestConfig;

package/package.json

@@ -1,91 +1,102 @@
 {
   "name": "@nymphjs/tilmeld-setup",
-  "version": "1.0.0-beta.13",
-  "description": "NymphJS - Tilmeld Setup App",
-  "type": "commonjs",
+  "version": "1.0.0-beta.130",
+  "description": "Nymph.js - Tilmeld Setup App",
+  "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "keywords": [
     "nymph",
-    "ORM",
-    "object relational mapper"
+    "nymph.js",
+    "application data framework",
+    "application data and access framework",
+    "tilmeld",
+    "user and group management"
   ],
   "scripts": {
     "clean": "test -d dist && rm -r dist || true",
     "build": "npm run build:server && npm run build:app && npm run build:app:theme",
     "build:server": "tsc -p tsconfig.server.json",
-    "build:app": "webpack",
+    "build:app": "NODE_ENV=\"production\" rollup -c",
     "build:app:theme": "smui-theme compile dist/app/smui.css -i app/theme",
     "watch:server": "tsc --watch -p tsconfig.server.json",
-    "watch:app": "webpack --watch",
-    "prepare": "npm run clean && npm run build",
-    "test": "jest",
-    "test:watch": "jest --watch"
+    "watch:app": "NODE_ENV=\"development\" rollup -c --watch",
+    "prepublish": "npm run clean && npm run build",
+    "typecheck": "npx tsc --noEmit",
+    "test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests",
+    "test:watch": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --passWithNoTests --watch"
   },
   "publishConfig": {
     "access": "public"
   },
+  "homepage": "https://nymph.io",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sciactive/nymphjs.git"
+    "url": "https://forge.sciactive.com/sciactive/nymphjs.git",
+    "directory": "packages/tilmeld-setup"
   },
-  "author": "Hunter Perrin <hperrin@gmail.com>",
+  "author": "Hunter Perrin <hperrin@port87.com>",
   "bugs": {
-    "url": "https://github.com/sciactive/nymphjs/issues"
+    "url": "https://forge.sciactive.com/sciactive/nymphjs/issues"
   },
   "license": "Apache-2.0",
   "dependencies": {
-    "@nymphjs/nymph": "^1.0.0-beta.13",
-    "@nymphjs/tilmeld": "^1.0.0-beta.13",
-    "express": "^4.18.2",
-    "locutus": "^2.0.16"
+    "@nymphjs/nymph": "^1.0.0-beta.130",
+    "@nymphjs/tilmeld": "^1.0.0-beta.130",
+    "express": "^5.2.1",
+    "locutus": "^3.0.36"
   },
   "devDependencies": {
     "@material/elevation": "^14.0.0",
     "@material/typography": "^14.0.0",
-    "@mdi/js": "^7.1.96",
-    "@nymphjs/client": "^1.0.0-beta.13",
-    "@nymphjs/driver-sqlite3": "^1.0.0-beta.13",
-    "@nymphjs/query-parser": "^1.0.0-beta.13",
-    "@nymphjs/server": "^1.0.0-beta.13",
-    "@nymphjs/tilmeld-client": "^1.0.0-beta.13",
-    "@nymphjs/tilmeld-components": "^1.0.0-beta.13",
-    "@smui/button": "^7.0.0-beta.0",
-    "@smui/card": "^7.0.0-beta.0",
-    "@smui/checkbox": "^7.0.0-beta.0",
-    "@smui/circular-progress": "^7.0.0-beta.0",
-    "@smui/common": "^7.0.0-beta.0",
-    "@smui/data-table": "^7.0.0-beta.0",
-    "@smui/dialog": "^7.0.0-beta.0",
-    "@smui/drawer": "^7.0.0-beta.0",
-    "@smui/fab": "^7.0.0-beta.0",
-    "@smui/form-field": "^7.0.0-beta.0",
-    "@smui/icon-button": "^7.0.0-beta.0",
-    "@smui/layout-grid": "^7.0.0-beta.0",
-    "@smui/list": "^7.0.0-beta.0",
-    "@smui/menu": "^7.0.0-beta.0",
-    "@smui/paper": "^7.0.0-beta.0",
-    "@smui/radio": "^7.0.0-beta.0",
-    "@smui/tab": "^7.0.0-beta.0",
-    "@smui/tab-bar": "^7.0.0-beta.0",
-    "@smui/textfield": "^7.0.0-beta.0",
-    "@smui/top-app-bar": "^7.0.0-beta.0",
-    "@tsconfig/recommended": "^1.0.2",
-    "@tsconfig/svelte": "^3.0.0",
-    "@types/express": "^4.17.17",
-    "@types/jest": "^29.4.0",
-    "@types/locutus": "^0.0.6",
-    "jest": "^29.4.3",
-    "smui-theme": "^7.0.0-beta.0",
-    "svelte": "^3.55.1",
-    "svelte-check": "^3.0.4",
-    "svelte-loader": "^3.1.7",
-    "svelte-preprocess": "^5.0.1",
-    "ts-jest": "^29.0.5",
-    "ts-loader": "^9.4.2",
-    "typescript": "~4.9.5",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.1"
+    "@mdi/js": "^7.4.47",
+    "@nymphjs/client": "^1.0.0-beta.130",
+    "@nymphjs/driver-sqlite3": "^1.0.0-beta.130",
+    "@nymphjs/query-parser": "^1.0.0-beta.130",
+    "@nymphjs/server": "^1.0.0-beta.130",
+    "@nymphjs/tilmeld-client": "^1.0.0-beta.130",
+    "@nymphjs/tilmeld-components": "^1.0.0-beta.130",
+    "@rollup/plugin-commonjs": "^29.0.3",
+    "@rollup/plugin-node-resolve": "^16.0.3",
+    "@rollup/plugin-sucrase": "^5.1.0",
+    "@rollup/plugin-typescript": "^12.3.0",
+    "@smui/button": "^9.0.2",
+    "@smui/card": "^9.0.2",
+    "@smui/checkbox": "^9.0.2",
+    "@smui/circular-progress": "^9.0.2",
+    "@smui/common": "^9.0.2",
+    "@smui/data-table": "^9.0.2",
+    "@smui/dialog": "^9.0.2",
+    "@smui/drawer": "^9.0.2",
+    "@smui/fab": "^9.0.2",
+    "@smui/form-field": "^9.0.2",
+    "@smui/icon-button": "^9.0.2",
+    "@smui/layout-grid": "^9.0.2",
+    "@smui/list": "^9.0.2",
+    "@smui/menu": "^9.0.2",
+    "@smui/paper": "^9.0.2",
+    "@smui/radio": "^9.0.2",
+    "@smui/tab": "^9.0.2",
+    "@smui/tab-bar": "^9.0.2",
+    "@smui/textfield": "^9.0.2",
+    "@smui/top-app-bar": "^9.0.2",
+    "@swc/core": "^1.16.1",
+    "@swc/jest": "^0.2.39",
+    "@tsconfig/recommended": "^1.0.13",
+    "@tsconfig/svelte": "^5.0.8",
+    "@types/express": "^5.0.6",
+    "@types/jest": "^30.0.0",
+    "@types/locutus": "^0.0.8",
+    "cross-env": "^10.1.0",
+    "jest": "^30.4.2",
+    "rollup": "^4.62.5",
+    "rollup-plugin-postcss": "^4.0.2",
+    "rollup-plugin-svelte": "^7.2.3",
+    "smui-theme": "^9.0.3",
+    "svelte": "^5.56.10",
+    "svelte-spa-router": "^5.1.1",
+    "tslib": "^2.8.1",
+    "typescript": "^7.0.2"
   },
-  "gitHead": "fcc750b12db6426cbf9dbd38618280c1ba965491"
+  "gitHead": "c6f7f2da04eec397ac1f9c64f1ce2ccc7fd47292"
 }

package/rollup.config.mjs

@@ -0,0 +1,36 @@
+import svelte from 'rollup-plugin-svelte';
+import resolve from '@rollup/plugin-node-resolve';
+// This doesn't work with TS7
+// import typescript from '@rollup/plugin-typescript';
+import sucrase from '@rollup/plugin-sucrase';
+import commonjs from '@rollup/plugin-commonjs';
+import postcss from 'rollup-plugin-postcss';
+
+export default {
+  input: 'app/index.ts',
+  output: {
+    file: 'dist/app/index.js',
+    format: 'iife',
+  },
+  plugins: [
+    resolve({
+      browser: true,
+      exportConditions: ['svelte'],
+      extensions: ['.svelte', '.mjs', '.js', '.json', '.node'],
+      dedupe: ['svelte'],
+    }),
+    commonjs(),
+    // typescript(),
+    sucrase({
+      exclude: ['node_modules/**'],
+      include: ['**/*.ts', '**/*.tsx', '**/*.mts'],
+      transforms: ['typescript'],
+    }),
+    svelte({
+      emitCss: true,
+    }),
+    postcss({
+      extract: true,
+    }),
+  ],
+};

package/src/index.ts

@@ -1,19 +1,20 @@
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 import express from 'express';
-import strtotime from 'locutus/php/datetime/strtotime';
-import { NymphOptions } from '@nymphjs/client';
-import { Nymph } from '@nymphjs/nymph';
-import type { Tilmeld } from '@nymphjs/tilmeld';
-
-export function setup(options: NymphOptions, nymph: Nymph) {
+import { strtotime } from 'locutus/php/datetime/index';
+import type { NymphOptions } from '@nymphjs/client';
+import type { Nymph } from '@nymphjs/nymph';
+import { enforceTilmeld } from '@nymphjs/tilmeld';
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export function setup(
+  options: NymphOptions,
+  nymph: Nymph,
+  { allowRegistration = false }: { allowRegistration?: boolean } = {},
+) {
   const app = express();
-
-  if (!nymph.tilmeld) {
-    throw new Error(
-      'You need to configure Tilmeld on your Nymph instance first.'
-    );
-  }
-
-  const tilmeld = nymph.tilmeld as Tilmeld;
+  const tilmeld = enforceTilmeld(nymph);
 
   app.use('/verify', async (request, response, next) => {
     if (!tilmeld.config.verifyEmail || request.query.action == null) {
@@ -95,7 +96,7 @@ export function setup(options: NymphOptions, nymph: Nymph) {
         if (tilmeld.config.unverifiedAccess) {
           user.groups = await nymph.getEntities(
             { class: tilmeld.Group, skipAc: true },
-            { type: '&', equal: ['defaultSecondary', true] }
+            { type: '&', equal: ['defaultSecondary', true] },
           );
         }
         user.enabled = true;
@@ -151,7 +152,7 @@ export function setup(options: NymphOptions, nymph: Nymph) {
         ) {
           printError(
             400,
-            "That email change cancellation link has expired. Please contact an administrator if you can't access your account."
+            "That email change cancellation link has expired. Please contact an administrator if you can't access your account.",
           );
           return;
         }
@@ -169,43 +170,48 @@ export function setup(options: NymphOptions, nymph: Nymph) {
         break;
     }
 
-    if (await user.$saveSkipAC()) {
+    try {
+      await user.$saveSkipAC();
       switch (request.query.action) {
         case 'verify':
         default:
           printSuccess(
             'Your account has been verified.',
-            tilmeld.config.verifyRedirect
+            tilmeld.config.verifyRedirect,
           );
           break;
         case 'verifychange':
           printSuccess(
             'Your new email address has been verified.',
-            tilmeld.config.verifyChangeRedirect
+            tilmeld.config.verifyChangeRedirect,
           );
           break;
         case 'cancelchange':
           printSuccess(
             'The email address change has been canceled.',
-            tilmeld.config.cancelChangeRedirect
+            tilmeld.config.cancelChangeRedirect,
           );
           break;
       }
-    } else {
+    } catch (e: any) {
       printError(500, 'An error occurred.');
     }
   });
 
   app.get('/options.js', async (_request, response) => {
     response.type('text/javascript');
-    response.send(`window.nymphOptions = ${JSON.stringify(options)};`);
+    response.send(
+      `window.nymphOptions = ${JSON.stringify(options)};\n` +
+        `window.allowRegistration = ${JSON.stringify(allowRegistration)};\n` +
+        `window.appUrl = ${JSON.stringify(tilmeld.config.appUrl)};`,
+    );
   });
 
   app.use(
     '/app',
     express.static(__dirname + '/app', {
       fallthrough: true,
-    })
+    }),
   );
   app.use(express.static(__dirname + '/../static', { fallthrough: false }));
 

package/static/index.html

@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <head>
   <title>Tilmeld Setup App</title>
 
@@ -24,6 +24,9 @@
   <!-- SMUI CSS -->
   <link rel="stylesheet" href="app/smui.css" />
 
+  <!-- App CSS -->
+  <link rel="stylesheet" href="app/index.css" />
+
   <style>
     html,
     body {

package/test.mjs

@@ -2,11 +2,8 @@ import express from 'express';
 import { SQLite3Driver } from '@nymphjs/driver-sqlite3';
 import { Nymph } from '@nymphjs/nymph';
 import { Tilmeld } from '@nymphjs/tilmeld';
-import server from '@nymphjs/server';
-import setupApp from './dist/index.js';
-
-const createServer = server.default;
-const setup = setupApp.default;
+import createServer from '@nymphjs/server';
+import setup from './dist/index.js';
 
 const nymph = new Nymph(
   {},
@@ -20,12 +17,13 @@ const nymph = new Nymph(
     cookiePath: '/',
     setupPath: '/user',
     emailUsernames: false,
+    domainSupport: true,
     clientEnabledUIDs: ['test'],
     verifyRedirect: 'http://localhost:8080',
     verifyChangeRedirect: 'http://localhost:8080',
     cancelChangeRedirect: 'http://localhost:8080',
     jwtSecret: 'shhhhh',
-  })
+  }),
 );
 
 const app = express();
@@ -37,11 +35,14 @@ app.use(
     {
       restUrl: 'http://localhost:8080/rest',
     },
-    nymph
-  )
+    nymph,
+    {
+      allowRegistration: true,
+    },
+  ),
 );
 
-app.listen(8080);
-
-console.log('App is loaded. Go here in your browser:');
-console.log('    http://localhost:8080/user/');
+app.listen(8080, () => {
+  console.log('App is loaded. Go here in your browser:');
+  console.log('    http://localhost:8080/user/');
+});

package/tsconfig.json

@@ -2,8 +2,20 @@
   "extends": "@tsconfig/svelte/tsconfig.json",
 
   "compilerOptions": {
+    "types": ["jest"],
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "lib": ["DOM", "es2024"],
+    "target": "es2024",
     "noImplicitAny": true,
-    "strict": true
+    "strict": true,
+
+    "removeComments": false,
+    "sourceMap": true,
+    "rootDir": "app/",
+    "outDir": "dist/app",
+    "resolveJsonModule": true,
+    "declaration": true
   },
   "include": ["app/**/*"],
   "exclude": ["node_modules/*"]

package/tsconfig.server.json

@@ -2,10 +2,13 @@
   "extends": "@tsconfig/recommended/tsconfig.json",
 
   "compilerOptions": {
-    "lib": ["ES2021"],
-    "target": "ES2021",
+    "types": ["node", "jest"],
+    "module": "nodenext",
+    "moduleResolution": "nodenext",
+    "lib": ["es2024"],
+    "target": "es2024",
     "noImplicitAny": true,
-    "removeComments": true,
+    "removeComments": false,
     "sourceMap": true,
     "outDir": "dist",
     "resolveJsonModule": true,

package/typedoc.json

@@ -0,0 +1,5 @@
+{
+  "extends": ["../../typedoc.base.json"],
+  "entryPoints": ["src/index.ts"],
+  "tsconfig": "./tsconfig.server.json"
+}