ldap-rest 1.3.0 → 2.0.0

package/docs/plugin-development/options.md

@@ -42,17 +42,43 @@ export type ExampleOptions = OptionsOf<typeof exampleOptions>;
 The key is the `Config` name: `example_timeout` is `--example-timeout`,
 `DM_EXAMPLE_TIMEOUT` when the descriptor names that variable.
 
+### Deprecating an option
+
+Rename an option by giving the old name as an alias: the parser still reads
+it, and the server warns once at startup. Keep the alias for two minor
+releases, as [CONTRIBUTING.md](../../CONTRIBUTING.md#deprecating-a-published-contract)
+requires.
+
+```typescript
+export const exampleOptions = defineOptions({
+  example_url: opt.string({
+    env: 'DM_EXAMPLE_URL',
+    aliases: ['example-uri'],
+    envAliases: ['DM_EXAMPLE_URI'],
+  }),
+});
+```
+
+A CLI alias takes one value per occurrence, as the singular form does, and an
+array option's plural form has no alias: renaming it is a breaking change. An
+environment alias is read when `env` is unset, or empty for a type where an
+empty value means nothing, and only for a non-array option when its canonical
+CLI name is absent; an array option combines the environment value with the
+CLI one, so its alias is still read.
+
 Each declaration takes:
 
-| Field      | Meaning                                                             |
-| ---------- | ------------------------------------------------------------------- |
-| `env`      | Environment variable read when the CLI does not set the option      |
-| `default`  | Value kept when neither the CLI nor the environment sets the option |
-| `required` | Refuse an empty value instead of reading it as unset                |
-| `plural`   | Array only: CLI name of the plural form, without the leading `--`   |
-| `kind`     | Array only: how a value splits, see `ArrayKind` in `parseConfig.ts` |
-| `min/max`  | Number only: bounds checked when the option is read                 |
-| `choices`  | String only: the values the option accepts                          |
+| Field        | Meaning                                                               |
+| ------------ | --------------------------------------------------------------------- |
+| `env`        | Environment variable read when the CLI does not set the option        |
+| `default`    | Value kept when neither the CLI nor the environment sets the option   |
+| `required`   | Refuse an empty value instead of reading it as unset                  |
+| `plural`     | Array only: CLI name of the plural form, without the leading `--`     |
+| `kind`       | Array only: how a value splits, see `ArrayKind` in `parseConfig.ts`   |
+| `min/max`    | Number only: bounds checked when the option is read                   |
+| `choices`    | String only: the values the option accepts                            |
+| `aliases`    | Former CLI names still accepted, without the leading `--`             |
+| `envAliases` | Former environment variables still accepted, read when `env` is unset |
 
 ## Reading options
 
@@ -103,7 +129,8 @@ moved. A migrated plugin no longer reads them: it uses `options()`.
 
 Plugins outside the repository cannot add to `args.ts` yet, but they can
 declare options the same way and name them in `optionDefinitions`: the startup
-report subtracts those keys, and `options()` reads a declared `env` variable
-when the parser did not carry the key. An option without a declaration still
-reaches `this.config` from an unknown `--key value` pair, and the startup
-report names it.
+report subtracts those keys and their aliases, and `options()` reads a declared
+`env` variable or a deprecated CLI alias the parser did not carry, warning at
+startup for the alias as it does for a core option. An option without a
+declaration still reaches `this.config` from an unknown `--key value` pair, and
+the startup report names it.

package/docs/plugin-development/services.md

@@ -0,0 +1,95 @@
+# Plugin services
+
+A plugin sometimes needs what another plugin holds: the group operations, the
+entity schemas, the trash. A service is a typed interface a plugin provides
+under a token, and another plugin reaches with `this.service(token)`.
+
+The token carries the interface. The compiler checks that an instance bound
+with `with()` answers it, and gives a consumer the type it declared. Whether a
+provider exists is a runtime question: a plugin that stops declaring the token
+still compiles, and its consumers get `null` and a warning. The plugin
+registry name stays what it is for: loading a plugin and naming it in the
+logs.
+
+## Declaring a service
+
+Put the token and its interface in a module both sides import — a plugin
+family's own service in its own module. A service shared between families is
+declared in `src/lib/services/` and re-exported from `ldap-rest/plugin`, one
+of the package's entry points; a module under `src/lib/` has no export path of
+its own.
+
+```typescript
+import { serviceToken } from 'ldap-rest/plugin';
+
+export interface GroupsApi {
+  listGroups(): Promise<string[]>;
+}
+
+export const GroupsService = serviceToken<GroupsApi>('groups');
+```
+
+Declare a token once. The object is the registry key; calling `serviceToken`
+again under the same name declares another service, not the same one. The name
+only identifies it in the logs.
+
+## Providing a service
+
+Bind the plugin instance to each token it provides:
+
+```typescript
+import DmPlugin from 'ldap-rest/plugin';
+
+export default class LdapGroups extends DmPlugin {
+  name = 'ldapGroups';
+  provides = [GroupsService.with(this)];
+
+  async listGroups(): Promise<string[]> {
+    /* … */
+  }
+}
+```
+
+`with(this)` is checked by the compiler: an instance that does not answer the
+interface does not compile. A plugin can provide several services. A service
+is registered once its plugin's registration completes — after `api()` and
+the hooks — so a consumer loaded afterwards finds it, and a provider does not
+find its own service there. A plugin needing another one declares it in
+[`dependencies`](dependencies.md#explicit-dependencies) so that it loads
+first.
+
+The first provider to register wins. A second one offering the same token is
+ignored and named in a warning: which one answered would otherwise depend on
+load order. Loading the same module twice under two names gives two instances
+but one module-level token, so the second instance cannot provide it either.
+
+When a host registers a plugin after startup, its `assertComposition` runs
+before the service is registered, so a provider does not find its own service
+there; the configuration's plugins are all registered before their
+`assertComposition` runs.
+
+## Consuming a service
+
+```typescript
+const groups = this.service(GroupsService);
+if (!groups) {
+  // Nothing provides it: the plugin skips the feature it would serve
+  return;
+}
+await groups.listGroups();
+```
+
+`service()` answers the provided instance, or `null` when nothing provides the
+token. It logs one warning per plugin and service rather than one per call. A
+plugin that cannot work without a service declares the provider in
+`dependencies`, checks the answer in `assertComposition`, and throws naming the
+service — that stops the server at startup instead of leaving a feature
+silently absent. A constructor runs before the dependencies load, so it cannot
+be the place for that check.
+
+The registry belongs to the server and is shared by the views `withConfig`
+builds for plugins loaded with overrides. It has no removal: a plugin
+registers once and keeps its services for the life of the server.
+
+`this.requirePlugin(name)` remains for a plugin whose interface is not yet
+declared as a service; new code reaches another plugin through a token.

package/docs/usage/operations.md

@@ -53,6 +53,15 @@ The image runs as its unprivileged `node` user: with `docker run`, a
 `DM_PORT` below 1024 stops the server at startup, where the default 8081
 changes nothing.
 
+The image is built in two stages: a builder produces the package and installs
+its production dependencies, the runtime stage copies them and carries no
+compiler nor package manager cache. Its base image is pinned by digest in
+`scripts/buildDockerfile.ts`, so the image built is the one reviewed even if
+the tag moves; the digest follows the tag it names, taken from the
+[Docker Hub tag page](https://hub.docker.com/_/node/tags?name=25-alpine) and
+updated by hand with it. Dependabot ignores the image: it would open a change
+to the generated `Dockerfile`, which the drift check refuses.
+
 ### What the shipped plugins report
 
 | Plugin           | `degraded` when                                                                                                                                                                                             |

package/docs/usage/plugins/integrations/instances.md

@@ -19,7 +19,13 @@ gets no instance.
   An entry holding `--twake-instance-skip-value` in
   `--twake-instance-skip-attribute`, a technical account for instance, gets
   none, and neither does a tombstone
-  (`--twake-lifecycle-deleted-attribute`) put back in place.
+  (`--twake-lifecycle-deleted-attribute`) put back in place. Each expression
+  is tried against the canonical DN first, then against the DN as sent: an
+  account created under a branch written with other spacing or case is still
+  one, and an expression written with the directory's own spelling (`\2C`, a
+  doubled space) still matches. An expression naming a value that holds a
+  comma writes it `\2C` or `\,`: a value comma never stands in for an RDN
+  separator in the form matched.
 - The address (`--twake-instance-fqdn-attribute`) and the mark
   (`--twake-instance-sent-attribute`) are this plugin's to write: an add that
   carries them has them removed, and an address written by a modify is taken
@@ -80,8 +86,10 @@ before it takes its members' `user.created`. Then `organization.created` is
 published on the b2b exchange, and the entry is marked. The message carries
 the organization's id, address, domain, and its name as `organization`, read
 from `--twake-instance-organization-name-attribute`, which
-`ensureOrganization` fills from `name` when the entry has none. The mark, not
-the address, says the organization is done.
+`ensureOrganization` fills from `name` when the entry has none. An id captured
+from a `--twake-instance-dn` group is read from the organization entry when
+one exists, so the case a caller spells the branch in is not sent. The mark,
+not the address, says the organization is done.
 
 With the Cloudery, a member's `user.created` waits for its organization's: a
 member under an organization entry that is not marked yet gets its address

package/docs/usage/plugins/integrations/lifecycle-events.md

@@ -110,7 +110,10 @@ operational one such as `pwdAccountLockedTime` is seen on both sides.
   means entries are never tombstones, and only a removal publishes `deleted`.
 - `--twake-lifecycle-deleted-at-attribute`,
   `--twake-lifecycle-deleted-at-format` (`iso8601`, the default, or
-  `generalizedTime`): the deletion date. It is always published as ISO 8601.
+  `generalizedTime`): the deletion date. It is read whether it is written as
+  a GeneralizedTime or as an ISO 8601 date, and always published as ISO 8601;
+  a value of neither shape is left out. A GeneralizedTime needs its zone; an
+  ISO 8601 date and time without one is read in the server's time zone.
 - `--twake-lifecycle-member-attribute` (default `member`): the attribute
   `memberAdded`, `memberRemoved` and member lists read.
 - `--twake-lifecycle-rules`: a JSON file, or the JSON itself.

package/docs/usage/plugins/integrations/scim.md

@@ -223,16 +223,17 @@ and `--scim-group-mapping`.
 
 Each element of `entries` is a `MappingEntry` with the following optional fields:
 
-| Field           | Purpose                                                                                                              |
-| --------------- | -------------------------------------------------------------------------------------------------------------------- |
-| `scim`          | **Required.** Top-level SCIM attribute name (`userName`, `displayName`, `emails`, …).                                |
-| `ldap`          | Simple 1:1 mapping to an LDAP attribute.                                                                             |
-| `ldapPrimary`   | For multi-valued SCIM attributes (`emails`, `phoneNumbers`, …), the LDAP attribute that stores the _primary_ value.  |
-| `ldapSecondary` | LDAP attribute that stores the _non-primary_ values of the same SCIM attribute (array).                              |
-| `sub`           | Object that maps SCIM sub-attributes to LDAP attributes. Used for complex SCIM values like `name.familyName` → `sn`. |
-| `multi`         | `"array"` or `"single"` (default) — hints array serialization for `ldap`.                                            |
-| `readOnly`      | `true` to skip this attribute on write (create/update ignore it).                                                    |
-| `operational`   | `true` for LDAP operational attributes (e.g. `entryUUID`) — loaded on read only.                                     |
+| Field           | Purpose                                                                                                                       |
+| --------------- | ----------------------------------------------------------------------------------------------------------------------------- |
+| `scim`          | **Required.** Top-level SCIM attribute name (`userName`, `displayName`, `emails`, …).                                         |
+| `ldap`          | Simple 1:1 mapping to an LDAP attribute.                                                                                      |
+| `ldapPrimary`   | For multi-valued SCIM attributes (`emails`, `phoneNumbers`, …), the LDAP attribute that stores the _primary_ value.           |
+| `ldapSecondary` | LDAP attribute that stores the _non-primary_ values of the same SCIM attribute (array).                                       |
+| `sub`           | Object that maps SCIM sub-attributes to LDAP attributes. Used for complex SCIM values like `name.familyName` → `sn`.          |
+| `subDn`         | Sub-attribute names in `sub` whose value is a DN (for example `["value"]` for `manager`); they are held to RFC 4514 on write. |
+| `multi`         | `"array"` or `"single"` (default) — hints array serialization for `ldap`.                                                     |
+| `readOnly`      | `true` to skip this attribute on write (create/update ignore it).                                                             |
+| `operational`   | `true` for LDAP operational attributes (e.g. `entryUUID`) — loaded on read only.                                              |
 
 ### Merging
 
@@ -269,7 +270,8 @@ override only what's different and inherit the rest.
     },
     {
       "scim": "urn:ietf:params:scim:schemas:extension:enterprise:2.0:User:manager",
-      "sub": { "value": "manager" }
+      "sub": { "value": "manager" },
+      "subDn": ["value"]
     }
   ]
 }
@@ -317,7 +319,11 @@ of them; a complex attribute takes an object whose sub-attributes are scalars
 multi-valued complex attribute such as `emails` takes a list of objects whose
 `value` is a scalar. Anything else is answered
 `400 invalidValue`, as is a PATCH operation that is not an object or whose
-`op` is not a string.
+`op` is not a string. A reference the mapping declares a DN (`subDn`) is
+refused with `400 invalidValue` when its value holds an escape RFC 4514 does
+not define, as the flat routes hold a client-written DN. The directory
+refuses such a value itself on an attribute of DN syntax; this names the
+escape in the SCIM answer and applies wherever the mapping declares one.
 
 A PATCH `add`, or a `remove` naming values, changes only the values it names:
 values the caller's read did not show, such as group members an
@@ -715,18 +721,14 @@ Response shape (truncated):
             "id",
             "active"
           ],
-          "mapping": [
-            /* same shape as default-mapping.json */
-          ]
+          "mapping": [/* same shape as default-mapping.json */]
         },
         {
           "id": "Group",
           "endpoint": "/scim/v2/Groups",
           "schema": "urn:ietf:params:scim:schemas:core:2.0:Group",
           "rdnAttribute": "cn",
-          "mapping": [
-            /* ... */
-          ]
+          "mapping": [/* ... */]
         }
       ],
       "idStrategy": "rdn",

package/docs/usage/plugins/integrations/tombstone.md

@@ -10,10 +10,13 @@ is old enough, or right away when forced.
 
 ## Behaviour
 
-- A delete of an entry whose DN matches `--twake-tombstone-dn` writes, in one
-  modify: the deleted attribute, the deletion date (now), the reason, the
-  lock, and removes `--twake-tombstone-clear-attributes`. Other entries are
-  deleted as usual.
+- A delete of an entry whose DN matches `--twake-tombstone-dn` — under any
+  spelling the directory folds, so spaces, case and escapes do not matter —
+  writes, in one modify: the deleted attribute, the deletion date (now), the
+  reason, the lock, and removes `--twake-tombstone-clear-attributes`. Other
+  entries are deleted as usual. A multi-valued RDN may not match: an
+  expression anchored on `uid=` misses a DN written `cn=…+uid=…`, and that
+  delete removes the entry for good.
 - A delete of an existing tombstone writes nothing and answers as a delete.
   It fires the `twakedeletionreplay` hook with the tombstone, so
   [lifecycle events](lifecycle-events.md) publishes the deletion again, with
@@ -62,8 +65,9 @@ Content-Type: application/json
 
 - `200`: erased.
 - `404`: no tombstone at this DN.
-- `409`: the deletion is younger than `--twake-tombstone-erase-min-age` and
-  `force` is not true.
+- `409`: `force` is not true, and either the deletion is younger than
+  `--twake-tombstone-erase-min-age` or its date cannot be read as
+  [lifecycle events](lifecycle-events.md) reads it.
 
 Other plugins call `erase(dn, { force, req })`.
 

package/docs/usage/plugins/ldap/flat-generic.md

@@ -453,7 +453,14 @@ Content-Type: application/json
 
 The identifier may also be the whole DN of the entry, in the entity's
 branch: `"uid": "uid=Smith\\,John,ou=users,dc=example,dc=com"` creates the
-entry `Smith,John`, whose DN spells the name with its escapes.
+entry `Smith,John`, whose DN spells the name with its escapes. The DN must
+use the escapes RFC 4514 defines; an escape it does not define (`\q`) is
+refused with a `400`. Send the bare value to have the server escape it.
+
+The name written is the value the RDN gives under the folding the directory
+applies (Unicode NFKC, and its insignificant spaces): `uid=\ zoë` and
+`uid=zoë` name one entry, written `uid=zoë`, and a name sent decomposed is
+stored composed.
 
 ### Modify Entry
 

package/docs/usage/plugins/ldap/groups.md

@@ -157,7 +157,10 @@ POST /api/v1/ldap/groups
 
 **Notes:**
 
-- `cn` is required
+- `cn` is required; it is a name, or the group's DN in the groups branch,
+  whose first RDN gives the name, folded as the directory folds it. The DN
+  form follows the same
+  [escape rule as a flat entity's identifier](flat-generic.md#create-entry)
 - `member` can be a string (single member) or array (multiple members)
 - If no members provided, a dummy member is automatically added, and it is
   left out of `member` when the group is read back, on both the list and the

package/docs/usage/plugins/ldap/password-policy.md

@@ -155,6 +155,10 @@ curl "http://localhost:8081/api/v1/users/uid%3Djohn.doe%2Cou%3Dusers%2Cdc%3Dexam
 }
 ```
 
+A `pwdMaxAge` large enough to put the expiry beyond the representable date
+range is reported as no expiry: `expiresAt` and `daysUntilExpiration` are
+`null`, and `isExpired` stays `false`.
+
 ### Unlock User Account
 
 ```http
@@ -337,6 +341,9 @@ curl -X PATCH "http://localhost:8081/api/v1/password-policies/default" \
 
 - `pwdAttribute` and `pwdCheckModule` are read-only. Before OpenLDAP 2.6,
   `pwdCheckModule` is the path of a library slapd loads; set it in slapd.
+- Durations and counts are integers from 0 to 9007199254740991 (2⁵³ − 1),
+  the largest a JSON number holds exactly: a larger value, or one sent as an
+  exponent such as `1e21`, is refused with a `400`.
 - `pwdCheckModuleArg`, the configuration of the quality-check module (ppm,
   for instance), is a string, usually of several lines. Writing it, or
   `pwdUseCheckModule`, gives the entry the `pwdPolicyChecker` class. Both

package/docs/usage/upgrading.md

@@ -4,6 +4,65 @@ What to check before deploying, newest first. Only releases that need a
 decision or a configuration change appear here; see the
 [CHANGELOG](../../CHANGELOG.md) for everything else.
 
+## From 1.3.0
+
+### A plugin with its own `service` member
+
+**Who is affected:** a plugin built outside this repository that declares a
+field, getter or method named `service`.
+
+`DmPlugin` now has `service(token)`, which returns the instance another plugin
+provides under a service token. Rename the plugin's own `service` member. See
+[plugin services](../plugin-development/services.md).
+
+### A plugin with its own `provides` member
+
+**Who is affected:** a plugin built outside this repository that declares a
+field named `provides`.
+
+`DmPlugin` now has `provides`, the services a plugin offers to others. Rename
+the plugin's own `provides` member, or it becomes the list of services the
+plugin declares. See
+[plugin services](../plugin-development/services.md#providing-a-service).
+
+### A path parameter is percent-decoded once
+
+**Who is affected:** a client that encoded a path parameter twice to reach an
+identifier holding `%`, sending `/users/100%2525` for the entry `100%`.
+
+The parameter is decoded once now, as RFC 3986 spells it: an identifier
+holding `%` goes out as `100%25`. A parameter still encoded twice names the
+escaped text, so `/users/100%2525` addresses the entry `100%25`
+([details](../client-development/api/rest-api.md#url-encoding)).
+
+### A paged search opens its connection on the first page
+
+**Who is affected:** a plugin calling `ldap.search()` with paging, leaving the
+returned generator unread and expecting a connection to have been opened, or
+expecting a connection or hook error from the call itself.
+
+A paged search takes its pooled connection when the first page is read, not
+when `search()` is called. A generator that is never walked holds no
+connection, and the next request can use the slot. A connection or bind
+failure, the 30 s wait for a pooled connection and an `ldapsearchresult` hook
+that refuses are answered on the first page, not by the call; a read that
+must fail when it is made uses `paged: false`.
+
+### A deletion date written in another shape
+
+**Who is affected:** a deployment whose writer writes the lifecycle deletion
+date as something other than an ISO 8601 date or a GeneralizedTime with its
+zone — for example `date '+%F %T'` (`2025-01-01 12:00:00`), an RFC 2822 date,
+or a US-style `01/02/2025`.
+
+The deletion date is read only in those two shapes now, where the default
+`iso8601` mode handed anything else to `new Date()`. An unreadable date makes
+`erase` answer `409` without `force`, leaves `deletedAt` out of the events,
+and a rule whose payload holds only `$changed.<date>` publishes nothing. Write
+an ISO 8601 date, such as with `date -u '+%Y-%m-%dT%H:%M:%SZ'`, or a
+GeneralizedTime with its zone, and see
+[lifecycle events](plugins/integrations/lifecycle-events.md#configuration).
+
 ## From 1.2.1
 
 ### A plugin written against the old hooks API

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ldap-rest",
-  "version": "1.3.0",
+  "version": "2.0.0",
   "description": "Light directory manager",
   "keywords": [
     "Identity-Manager"
@@ -790,6 +790,7 @@
     "dist",
     "static",
     "docs",
+    "!docs/usage/options.snapshot.json",
     "examples",
     "LICENSE",
     "package.json"
@@ -805,11 +806,13 @@
     "build:pages": "tsx scripts/build-pages.ts",
     "build:prod": "npm run clean && NODE_ENV=production rollup -c && npm run build:browser && node scripts/moveBrowserLibs.mjs && npm run build:dockerfile",
     "build:watch": "rollup -c --watch",
-    "check": "npm run check:ts && npm run lint && npm run format:check && npm run check:hooks && npm run check:no-client-values && npm run check:openapi",
+    "check": "npm run check:ts && npm run lint && npm run format:check && npm run check:hooks && npm run check:no-client-values && npm run check:openapi && npm run check:options",
     "check:hooks": "tsx scripts/hooks-doc.ts",
     "check:no-client-values": "sh scripts/check-no-client-values.sh",
     "check:openapi": "tsx scripts/check-openapi.ts",
-    "check:ts": "tsc --noEmit",
+    "check:options": "tsx scripts/options-snapshot.ts --check",
+    "check:ts": "node ./node_modules/typescript/bin/tsc --noEmit",
+    "check:ts7": "node ./node_modules/typescript7/bin/tsc --noEmit",
     "clean": "rimraf dist/* static/browser/* coverage",
     "coverage": "c8 --config .c8rc.json mocha",
     "coverage:check": "npm run check:ts && c8 --config .c8rc.json --exclude 'src/browser/**' --check-coverage --statements 84 --lines 84 --branches 75 --functions 86 mocha",
@@ -820,8 +823,9 @@
     "format:fix": "prettier --write .",
     "format:fix-diff": "prettier --write $(git checkout|grep -E '^(M|A)'|cut -f2)",
     "generate:openapi": "tsx scripts/generate-openapi.ts",
-    "lint": "eslint \"src/**/*.{ts,tsx,js,jsx}\"",
-    "lint:fix": "eslint \"src/**/*.{ts,tsx,js,jsx}\" --fix",
+    "lint": "eslint \"src/**/*.{ts,tsx,js,jsx}\" \"test/**/*.ts\"",
+    "lint:fix": "eslint \"src/**/*.{ts,tsx,js,jsx}\" \"test/**/*.ts\" --fix",
+    "snapshot:options": "tsx scripts/options-snapshot.ts",
     "start:dev": "./.dev.mk start",
     "test": "npm run check:ts && mocha",
     "test:dev": "./.dev.mk test",
@@ -829,9 +833,8 @@
   },
   "overrides": {
     "diff": ">=8.0.3",
-    "fast-xml-parser": ">=5.3.6",
-    "glob": ">=11.0.4",
-    "minimatch": "^10.2.1",
+    "glob": ">=11.1.0",
+    "minimatch": "^10.2.3",
     "postcss-selector-parser": "^7.1.6",
     "serialize-javascript": ">=7.0.3"
   },
@@ -849,6 +852,7 @@
     "winston": "^3.17.0"
   },
   "devDependencies": {
+    "@eslint/js": "^10.0.1",
     "@rollup/plugin-commonjs": "^29.0.3",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-terser": "^1.0.2",
@@ -865,15 +869,15 @@
     "@typescript-eslint/parser": "^8.44.0",
     "c8": "^12.0.0",
     "chai": "^6.0.1",
-    "eslint": "^9.39.0",
+    "eslint": "^10.13.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-import": "^2.32.0",
+    "eslint-plugin-import-x": "^4.17.1",
     "eslint-plugin-prettier": "^5.5.4",
     "globals": "^17.13.0",
     "js-yaml": "^5.5.0",
     "mocha": "^12.0.0",
     "nock": "^14.0.10",
-    "prettier": "^3.6.2",
+    "prettier": "^3.9.10",
     "rimraf": "^6.0.1",
     "rollup": "^4.50.2",
     "rollup-plugin-postcss": "^4.0.2",
@@ -882,7 +886,8 @@
     "tinyglobby": "^0.2.17",
     "tslib": "^2.8.1",
     "tsx": "^4.20.5",
-    "typescript": "^5.9.2"
+    "typescript": "^6.0.3",
+    "typescript7": "npm:typescript@^7.0.2"
   },
   "optionalDependencies": {
     "@linagora/rabbitmq-client": "^0.7.2",

package/static/browser/ldap-tree-viewer/LdapTreeViewer.js.map

@@ -1 +1 @@
-{"version":3,"file":"LdapTreeViewer.js","sources":["../../../../src/browser/ldap-tree-viewer/LdapTreeViewer.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}
+{"version":3,"file":"LdapTreeViewer.js","sources":["../../../../src/browser/ldap-tree-viewer/LdapTreeViewer.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}