@jwilleke/ngdpbase-types 5.36.0 → 5.37.0

package/lib/packages/ngdpbase-types/testing.js

@@ -48,7 +48,7 @@ export function openAddonTestDatabase(owner, options, declaredBy) {
     checkAddonDatabaseRequest(owner, options);
     if (declaredBy) {
         const { slug, defaults } = declaredBy;
-        const layer = addonDatabaseLayer([{ slug, dir: '', source: 'directory', enabled: true, defaults }], {});
+        const layer = addonDatabaseLayer([{ slug, dir: '', enabled: true, defaults }], {});
         const refused = layer.refused.get(slug);
         if (refused)
             throw new Error(`Add-on '${slug}' is not loaded: ${refused}`);

package/lib/src/managers/AddonsManager.d.ts

@@ -342,8 +342,6 @@ declare class AddonsManager extends BaseManager {
     private addonsPaths;
     /** Resolved absolute paths to addons directories */
     private resolvedAddonsPaths;
-    /** #673: npm package globs (from `node_modules:` addons-path entries) to discover from node_modules. */
-    private npmAddonPatterns;
     /** #1830: `<data>/addons`, where installed add-ons live; null when there is no data folder. */
     private installedDir;
     /** #1830: the installed add-ons verified this boot — the only ones loaded from `installedDir`. */
@@ -461,25 +459,10 @@ declare class AddonsManager extends BaseManager {
      * Scan a single addons directory and register any add-ons found.
      */
     private scanAddonsDirectory;
-    /**
-     * #673 (packaged model): discover addons published as npm packages, matching a
-     * `node_modules:<glob>` addons-path entry (e.g. `node_modules:@jwilleke/*-addon`).
-     * Each matching package is loaded through the same slug/module/register()
-     * contract as bundled and drop-in addons — only discovery differs.
-     */
-    private scanNpmAddons;
-    /** Locate the node_modules directory (app root / cwd). */
-    private findNodeModules;
-    /** Expand a `@scope/glob` (or bare `glob`) pattern to package directories. */
-    private resolveNpmAddonDirs;
     /**
      * Load a single addon from its directory (index.js/ts + optional package.json
-     * `ngdpbase` manifest) and register it. Shared by directory scans and npm
-     * (#673) discovery; `sourceLabel` is for logging only. `source` selects the
-     * no-slug identity fallback (#927): a directory addon's folder name is its
-     * identity verbatim, while an npm package strips the conventional `-addon`
-     * suffix. Duplicate ids are skipped — since npm discovery runs last, a
-     * bundled/drop-in addon wins.
+     * `ngdpbase` manifest) and register it. `sourceLabel` is for logging only.
+     * Duplicate ids are skipped, so the first directory scanned wins.
      */
     private registerAddonFromDir;
     /**

package/lib/src/managers/ConfigurationManager.d.ts

@@ -141,16 +141,15 @@ declare class ConfigurationManager extends BaseManager {
     /**
      * #672: refuse to start if any `ngdpbase.addons.<id>.enabled = true` key
      * references an `<id>` that has no matching addon in any configured
-     * `addons-path` entry — either a directory (bundled/drop-in) or, per
-     * #673/#924, an npm package matched by a `node_modules:<glob>` entry.
+     * `addons-path` directory (bundled/drop-in) and is not named in
+     * `ngdpbase.addons.install`. A retired `node_modules:` entry is ignored (#2102).
      * The discovery logic mirrors what `AddonsManager` does at runtime —
      * directory/package present with `index.js` or `index.ts` — but without
      * importing the modules (boot-time speed; `ConfigurationManager.initialize()`
-     * runs before any managers). The directory-vs-npm-pattern split, npm glob
-     * matching, AND the canonical-identity resolution are all shared with
+     * runs before any managers). The addons-path parsing AND the
+     * canonical-identity resolution are shared with
      * `AddonsManager` via `utils/addonsPathResolver.ts` so the two can no
-     * longer drift out of sync (#924: they had, and packaged addons could
-     * never boot as a result).
+     * longer drift out of sync (#924).
      *
      * Catches the failure mode that caused the 2026-05-10 geohazardwatch.com
      * outage: the deploy configmap had `ngdpbase.addons.ve-geology.enabled =

package/lib/src/utils/addonConfigLayer.d.ts

@@ -18,8 +18,8 @@
  * shipped entry. The operator's file still wins over everything.
  *
  * Discovery follows `ngdpbase.managers.addons-manager.addons-path` exactly as
- * AddonsManager does — directories and `node_modules:` patterns — so bundled
- * and external addons are treated alike. Only an addon whose
+ * AddonsManager does — directory entries — so bundled
+ * and drop-in addons are treated alike. Only an addon whose
  * `ngdpbase.addons.<slug>.enabled` is true in the shipped+custom view
  * contributes; a disabled addon's opinions do not reach the catalog.
  *
@@ -63,7 +63,6 @@ export declare const ADDONS_MANAGER_ENABLED_KEY = "ngdpbase.managers.addons-mana
 export interface AddonDefaults {
     slug: string;
     dir: string;
-    source: 'directory' | 'npm';
     /**
      * Whether the addon is switched on. A turned-off addon's file is read for its
      * system-categories alone (#1559); none of its other keys reach the merge.
@@ -83,7 +82,6 @@ export declare function isAddonEnabled(base: Record<string, unknown>, slug: stri
  */
 export declare function discoverAddonDirs(base: Record<string, unknown>, cwd?: string, dataFolder?: string): Array<{
     dir: string;
-    source: 'directory' | 'npm';
 }>;
 /**
  * The defaults of every installed addon, enabled or not, in discovery order,

package/lib/src/utils/addonConfigLayer.js

@@ -18,8 +18,8 @@
  * shipped entry. The operator's file still wins over everything.
  *
  * Discovery follows `ngdpbase.managers.addons-manager.addons-path` exactly as
- * AddonsManager does — directories and `node_modules:` patterns — so bundled
- * and external addons are treated alike. Only an addon whose
+ * AddonsManager does — directory entries — so bundled
+ * and drop-in addons are treated alike. Only an addon whose
  * `ngdpbase.addons.<slug>.enabled` is true in the shipped+custom view
  * contributes; a disabled addon's opinions do not reach the catalog.
  *
@@ -61,7 +61,7 @@ import fs from 'fs';
 import path from 'path';
 import { isDeepStrictEqual } from 'util';
 import { configFilePaths, deepMergeConfigs, deepMergeObjects, instanceDataFolder, isPlainObject, readConfigFilesSync } from './configFiles.js';
-import { configuredInstallSlugs, findNodeModulesDir, installedAddonsDir, matchNpmPackageDirs, resolveAddonSlug, splitAddonsPath } from './addonsPathResolver.js';
+import { configuredInstallSlugs, installedAddonsDir, resolveAddonSlug, splitAddonsPath } from './addonsPathResolver.js';
 import { lockedAddonDirsSync } from './addonLock.js';
 import { LEGACY_SECRET_KEYS_KEY, SENSITIVE_VALUES_KEY } from './sensitiveValues.js';
 import { parsePrivatestore } from './privateStorePath.js';
@@ -81,7 +81,7 @@ export function isAddonEnabled(base, slug) {
 export function discoverAddonDirs(base, cwd = process.cwd(), dataFolder = instanceDataFolder()) {
     if (base[ADDONS_MANAGER_ENABLED_KEY] === false)
         return [];
-    const { directories, npmPatterns } = splitAddonsPath(base[ADDONS_PATH_KEY] ?? './addons');
+    const { directories } = splitAddonsPath(base[ADDONS_PATH_KEY] ?? './addons');
     const found = [];
     for (const raw of directories) {
         const root = path.resolve(cwd, raw);
@@ -95,20 +95,13 @@ export function discoverAddonDirs(base, cwd = process.cwd(), dataFolder = instan
         for (const entry of entries) {
             if (!entry.isDirectory() || entry.name.startsWith('.') || entry.name === 'shared')
                 continue;
-            found.push({ dir: path.join(root, entry.name), source: 'directory' });
+            found.push({ dir: path.join(root, entry.name) });
         }
     }
     const installed = installedAddonsDir(dataFolder, cwd);
     if (!found.some((f) => path.dirname(f.dir) === installed)) {
         for (const dir of lockedAddonDirsSync(installed, configuredInstallSlugs(base)))
-            found.push({ dir, source: 'directory' });
-    }
-    const nmRoot = npmPatterns.length > 0 ? findNodeModulesDir(cwd) : null;
-    if (nmRoot) {
-        for (const pattern of npmPatterns) {
-            for (const dir of matchNpmPackageDirs(nmRoot, pattern))
-                found.push({ dir, source: 'npm' });
-        }
+            found.push({ dir });
     }
     return found;
 }
@@ -122,8 +115,8 @@ export function discoverAddonDirs(base, cwd = process.cwd(), dataFolder = instan
  */
 export function discoverAddonDefaults(base, cwd = process.cwd(), dataFolder = instanceDataFolder()) {
     const out = [];
-    for (const { dir, source } of discoverAddonDirs(base, cwd, dataFolder)) {
-        const slug = resolveAddonSlug(dir, source);
+    for (const { dir } of discoverAddonDirs(base, cwd, dataFolder)) {
+        const slug = resolveAddonSlug(dir);
         const enabled = isAddonEnabled(base, slug);
         const file = path.join(dir, 'config', 'default-config.json');
         if (!fs.existsSync(file))
@@ -136,10 +129,10 @@ export function discoverAddonDefaults(base, cwd = process.cwd(), dataFolder = in
             for (const [key, value] of Object.entries(raw))
                 if (!key.startsWith('_'))
                     defaults[key] = value;
-            out.push({ slug, dir, source, enabled, defaults });
+            out.push({ slug, dir, enabled, defaults });
         }
         catch (err) {
-            out.push({ slug, dir, source, enabled, defaults: {}, error: err instanceof Error ? err.message : String(err) });
+            out.push({ slug, dir, enabled, defaults: {}, error: err instanceof Error ? err.message : String(err) });
         }
     }
     return out;

package/lib/src/utils/addonsPathResolver.d.ts

@@ -1,30 +1,26 @@
 /**
  * Shared parsing/discovery for the `ngdpbase.managers.addons-manager.addons-path`
- * config value.
+ * config value, used by `AddonsManager` (runtime discovery), `ConfigurationManager`
+ * (the #672 boot-time "does this enabled addon exist" check) and the add-on
+ * config layer, so the three cannot drift (#924).
  *
- * #924: `AddonsManager` (real runtime discovery) and `ConfigurationManager`
- * (the #672 boot-time "does this enabled addon exist" safety check) used to
- * each carry their own copy of this logic. They drifted: `AddonsManager` was
- * updated for #673's `node_modules:<glob>` packaged-addon syntax, but the
- * validator's copy was not, so it resolved a `node_modules:` entry as a
- * literal (non-existent) directory and treated every packaged addon as
- * "unknown" — crashing boot the moment one was enabled. Consolidating the
- * parsing/matching into one module removes the class of bug, not just this
- * instance of it.
+ * #2102: the packaged model (`node_modules:<glob>` entries) is gone. A site
+ * config may still hold such an entry; it is ignored, never treated as a
+ * directory, and never stops the boot.
  */
-/** Prefix marking an addons-path entry as an npm-package glob rather than a directory. */
-export declare const NPM_ADDON_PREFIX = "node_modules:";
 export interface SplitAddonsPath {
     /** Plain directory entries (bundled/drop-in), not yet resolved to absolute. */
     directories: string[];
-    /** npm package name globs (the part after `node_modules:`), e.g. `@jwilleke/*-addon`. */
-    npmPatterns: string[];
+    /** Retired `node_modules:` entries (#2102): ignored; AddonsManager warns about them once at start. */
+    retired: string[];
 }
 /**
  * Coerce the raw config value (string or string[]) and split it into
- * filesystem directory entries vs. `node_modules:<glob>` npm patterns.
+ * filesystem directory entries and retired `node_modules:` entries.
  */
 export declare function splitAddonsPath(raw: unknown): SplitAddonsPath;
+/** The warning for one retired `node_modules:` entry (#2102). */
+export declare function retiredAddonsPathWarning(entry: string): string;
 /** The config key naming the add-ons to install (#1830). */
 export declare const ADDONS_INSTALL_KEY = "ngdpbase.addons.install";
 /**
@@ -35,42 +31,15 @@ export declare const ADDONS_INSTALL_KEY = "ngdpbase.addons.install";
 export declare function installedAddonsDir(dataFolder: string, cwd?: string): string;
 /** The slugs `ngdpbase.addons.install` names, from a merged or shipped+custom view. */
 export declare function configuredInstallSlugs(config: Record<string, unknown>): string[];
-/** Locate the `node_modules` directory to search for packaged addons (resolved from cwd). */
-export declare function findNodeModulesDir(cwd?: string): string | null;
-/**
- * Expand a `@scope/glob` (or bare `glob`) npm pattern to matching package
- * directories under `nmRoot`.
- */
-export declare function matchNpmPackageDirs(nmRoot: string, pattern: string): string[];
-/**
- * Best-effort addon identity for a packaged (npm) addon directory, derived
- * from its package-directory name alone — no module import, matching the
- * same boot-time-speed, no-module-loading design already accepted for the
- * directory-scan case (see `ConfigurationManager.assertConfiguredAddonsExist`).
- *
- * Follows the documented packaged-addon naming convention
- * (`@scope/<slug>-addon`, see docs/platform/deployment/addon-packaged.md):
- * strips a trailing `-addon` suffix if present, else returns the folder name
- * as-is.
- *
- * Caveat (same class as the existing directory-name heuristic): the addon's
- * *real* identity is whatever its module exports as `name` at runtime. A
- * package that doesn't follow the `-addon` naming convention, or whose
- * module exports a different `name`, won't be matched precisely here — this
- * is a validation-time approximation, not the source of truth.
- */
-export declare function deriveAddonSlugFromPackageDirName(dirName: string): string;
 /**
  * Canonical identity for an addon directory (#927), resolved the SAME
  * import-free way in every layer (discovery, `isEnabled`, the boot-time
- * validator) so the four historical identities (folder name, module `name`,
- * config key, manifest slug) can no longer drift:
+ * validator):
  *
- *   canonicalId = package.json `ngdpbase.slug`  ??  deriveAddonSlugFromPackageDirName(folder)
+ *   canonicalId = package.json `ngdpbase.slug`  ??  the folder name verbatim
  *
- * Reads `package.json` statically — never imports the module — which is what
- * lets the boot validator compute the exact id the runtime will register
- * under, instead of guessing. The module's exported `name` is a display
- * label validated against this at load time, not a source of identity.
+ * Reads `package.json` statically — never imports the module. The module's
+ * exported `name` is a display label validated against this at load time,
+ * not a source of identity.
  */
-export declare function resolveAddonSlug(addonDir: string, source: 'directory' | 'npm'): string;
+export declare function resolveAddonSlug(addonDir: string): string;

package/lib/src/utils/addonsPathResolver.js

@@ -1,36 +1,32 @@
 /**
  * Shared parsing/discovery for the `ngdpbase.managers.addons-manager.addons-path`
- * config value.
+ * config value, used by `AddonsManager` (runtime discovery), `ConfigurationManager`
+ * (the #672 boot-time "does this enabled addon exist" check) and the add-on
+ * config layer, so the three cannot drift (#924).
  *
- * #924: `AddonsManager` (real runtime discovery) and `ConfigurationManager`
- * (the #672 boot-time "does this enabled addon exist" safety check) used to
- * each carry their own copy of this logic. They drifted: `AddonsManager` was
- * updated for #673's `node_modules:<glob>` packaged-addon syntax, but the
- * validator's copy was not, so it resolved a `node_modules:` entry as a
- * literal (non-existent) directory and treated every packaged addon as
- * "unknown" — crashing boot the moment one was enabled. Consolidating the
- * parsing/matching into one module removes the class of bug, not just this
- * instance of it.
+ * #2102: the packaged model (`node_modules:<glob>` entries) is gone. A site
+ * config may still hold such an entry; it is ignored, never treated as a
+ * directory, and never stops the boot.
  */
 import * as fs from 'fs';
 import * as path from 'path';
-import { minimatch } from 'minimatch';
-/** Prefix marking an addons-path entry as an npm-package glob rather than a directory. */
-export const NPM_ADDON_PREFIX = 'node_modules:';
+/** The retired packaged-model prefix, recognised only so the entry can be ignored with a warning. */
+const RETIRED_PACKAGED_PREFIX = 'node_modules:';
 /**
  * Coerce the raw config value (string or string[]) and split it into
- * filesystem directory entries vs. `node_modules:<glob>` npm patterns.
+ * filesystem directory entries and retired `node_modules:` entries.
  */
 export function splitAddonsPath(raw) {
     const entries = Array.isArray(raw) ? raw.map(String) : [String(raw)];
     return {
-        directories: entries.filter(p => !p.startsWith(NPM_ADDON_PREFIX)),
-        npmPatterns: entries
-            .filter(p => p.startsWith(NPM_ADDON_PREFIX))
-            .map(p => p.slice(NPM_ADDON_PREFIX.length).trim())
-            .filter(Boolean)
+        directories: entries.filter(p => !p.trim().startsWith(RETIRED_PACKAGED_PREFIX)),
+        retired: entries.filter(p => p.trim().startsWith(RETIRED_PACKAGED_PREFIX))
     };
 }
+/** The warning for one retired `node_modules:` entry (#2102). */
+export function retiredAddonsPathWarning(entry) {
+    return `addons-path entry '${entry}' is no longer supported and is ignored; install add-ons with ngdpbase.addons.install`;
+}
 /** The config key naming the add-ons to install (#1830). */
 export const ADDONS_INSTALL_KEY = 'ngdpbase.addons.install';
 /**
@@ -46,69 +42,18 @@ export function configuredInstallSlugs(config) {
     const map = config[ADDONS_INSTALL_KEY];
     return map && typeof map === 'object' && !Array.isArray(map) ? Object.keys(map) : [];
 }
-/** Locate the `node_modules` directory to search for packaged addons (resolved from cwd). */
-export function findNodeModulesDir(cwd = process.cwd()) {
-    const nm = path.resolve(cwd, 'node_modules');
-    return fs.existsSync(nm) && fs.statSync(nm).isDirectory() ? nm : null;
-}
-/**
- * Expand a `@scope/glob` (or bare `glob`) npm pattern to matching package
- * directories under `nmRoot`.
- */
-export function matchNpmPackageDirs(nmRoot, pattern) {
-    let baseDir = nmRoot;
-    let nameGlob = pattern;
-    if (pattern.startsWith('@')) {
-        const slash = pattern.indexOf('/');
-        const scope = slash > 0 ? pattern.slice(0, slash) : pattern;
-        nameGlob = slash > 0 ? pattern.slice(slash + 1) : '*';
-        baseDir = path.join(nmRoot, scope);
-    }
-    if (!fs.existsSync(baseDir))
-        return [];
-    const out = [];
-    for (const entry of fs.readdirSync(baseDir, { withFileTypes: true })) {
-        if (entry.isDirectory() && !entry.name.startsWith('.') && minimatch(entry.name, nameGlob)) {
-            out.push(path.join(baseDir, entry.name));
-        }
-    }
-    return out;
-}
-/**
- * Best-effort addon identity for a packaged (npm) addon directory, derived
- * from its package-directory name alone — no module import, matching the
- * same boot-time-speed, no-module-loading design already accepted for the
- * directory-scan case (see `ConfigurationManager.assertConfiguredAddonsExist`).
- *
- * Follows the documented packaged-addon naming convention
- * (`@scope/<slug>-addon`, see docs/platform/deployment/addon-packaged.md):
- * strips a trailing `-addon` suffix if present, else returns the folder name
- * as-is.
- *
- * Caveat (same class as the existing directory-name heuristic): the addon's
- * *real* identity is whatever its module exports as `name` at runtime. A
- * package that doesn't follow the `-addon` naming convention, or whose
- * module exports a different `name`, won't be matched precisely here — this
- * is a validation-time approximation, not the source of truth.
- */
-export function deriveAddonSlugFromPackageDirName(dirName) {
-    const suffix = '-addon';
-    return dirName.endsWith(suffix) ? dirName.slice(0, -suffix.length) : dirName;
-}
 /**
  * Canonical identity for an addon directory (#927), resolved the SAME
  * import-free way in every layer (discovery, `isEnabled`, the boot-time
- * validator) so the four historical identities (folder name, module `name`,
- * config key, manifest slug) can no longer drift:
+ * validator):
  *
- *   canonicalId = package.json `ngdpbase.slug`  ??  deriveAddonSlugFromPackageDirName(folder)
+ *   canonicalId = package.json `ngdpbase.slug`  ??  the folder name verbatim
  *
- * Reads `package.json` statically — never imports the module — which is what
- * lets the boot validator compute the exact id the runtime will register
- * under, instead of guessing. The module's exported `name` is a display
- * label validated against this at load time, not a source of identity.
+ * Reads `package.json` statically — never imports the module. The module's
+ * exported `name` is a display label validated against this at load time,
+ * not a source of identity.
  */
-export function resolveAddonSlug(addonDir, source) {
+export function resolveAddonSlug(addonDir) {
     const dirName = path.basename(addonDir);
     const pkgPath = path.join(addonDir, 'package.json');
     try {
@@ -118,12 +63,7 @@ export function resolveAddonSlug(addonDir, source) {
             return slug.trim();
     }
     catch {
-        /* no/invalid package.json — fall back to the folder-derived id */
+        /* no/invalid package.json — fall back to the folder name */
     }
-    // Fallback when no slug is declared. npm packages follow the
-    // `@scope/<slug>-addon` publishing convention, so strip the conventional
-    // trailing `-addon`. A plain directory (bundled/drop-in) addon's folder
-    // name IS its identity verbatim — an addon may legitimately be named
-    // `something-addon` on disk — so never strip there.
-    return source === 'npm' ? deriveAddonSlugFromPackageDirName(dirName) : dirName;
+    return dirName;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jwilleke/ngdpbase-types",
-  "version": "5.36.0",
+  "version": "5.37.0",
   "description": "TypeScript types for ngdpbase add-ons, and a test kit of core's own values. A dev dependency, versioned with ngdpbase.",
   "license": "Apache-2.0",
   "author": "Jim Willeke",
@@ -41,15 +41,14 @@
     "@types/multer": "^2.3.0",
     "@types/node": "^24.19.2",
     "better-sqlite3-multiple-ciphers": "^13.0.3",
-    "dotenv": "^18.0.8",
+    "dotenv": "^18.0.9",
     "express": "^5.3.0",
     "express-session": "^1.19.0",
     "fs-extra": "^11.4.1",
     "ipaddr.js": "^2.5.0",
-    "jose": "^6.2.12",
-    "linkedom": "^0.18.13",
+    "jose": "^6.2.13",
+    "linkedom": "^0.18.14",
     "markdown-it": "^14.3.3",
-    "minimatch": "^10.2.6",
     "minisearch": "7.2.0",
     "multer": "^2.4.0",
     "rrule-temporal": "2.2.8",