diff --git a/.vitepress/config.js b/.vitepress/config.js
index 050746f20..9468be736 100644
--- a/.vitepress/config.js
+++ b/.vitepress/config.js
@@ -102,7 +102,7 @@ config.rewrites = rewrites
 config.themeConfig.capire = {
   versions: {
     java_services: '3.5.0',
-    java_cds4j: '3.5.0'
+    java_cds4j: '3.6.0'
   },
   gotoLinks: [],
   maven_host_base: 'https://repo1.maven.org/maven2'
diff --git a/.vitepress/theme/Layout.vue b/.vitepress/theme/Layout.vue
index 6b502bd16..3c4f1bcf7 100644
--- a/.vitepress/theme/Layout.vue
+++ b/.vitepress/theme/Layout.vue
@@ -6,12 +6,16 @@ import ImplVariants from './components/implvariants/ImplVariants.vue'
 import NavScreenMenuItem from './components/implvariants/NavScreenMenuItem.vue'
 import Ribbon from './components/Ribbon.vue'
 import ScrollToTop from './components/ScrollToTopSimple.vue'
+import WasThisHelpful from './components/WasThisHelpful.vue'
+import { useRoute } from 'vitepress'
 
 const isPreview = !!import.meta.env.VITE_CAPIRE_PREVIEW
 
 const { Layout } = DefaultTheme
 const { frontmatter } = useData()
 
+const route = useRoute()
+
 </script>
 
 <template>
@@ -24,6 +28,9 @@ const { frontmatter } = useData()
     <template #doc-top>
       <slot name="doc-top" />
     </template>
+    <template #doc-after>
+      <WasThisHelpful :key="route.path" />
+    </template>
     <template #not-found>
       <slot name="not-found" />
     </template>
diff --git a/.vitepress/theme/components/ShortcutsList.vue b/.vitepress/theme/components/ShortcutsList.vue
index b5a284f9b..a4e4bd93f 100644
--- a/.vitepress/theme/components/ShortcutsList.vue
+++ b/.vitepress/theme/components/ShortcutsList.vue
@@ -84,6 +84,8 @@ watch(visible, isVisible => {
 })
 
 function onKeyDown(event) {
+  const { tagName, isContentEditable } = document.activeElement
+  if (tagName === 'INPUT' || tagName === 'TEXTAREA' || isContentEditable)  return
   if (document.activeElement === document.querySelectorAll(querySelectorSearchInput)[0])  return // search is active
   if (event.altKey || event.ctrlKey || event.metaKey)  return // only simple keys for now
   if (event.key === 'Shift' && visible.value) {
@@ -92,7 +94,7 @@ function onKeyDown(event) {
   }
   const cmd = commands.value.find(cmd => !!cmd.keys.find(k => k.value === event.key))
   const enabled = cmd && cmd.run && ('enabled' in cmd ? cmd.enabled() : true)
-  if (enabled)  {
+  if (enabled) {
     event.preventDefault()
     cmd.run(event)
   }
diff --git a/.vitepress/theme/components/WasThisHelpful.vue b/.vitepress/theme/components/WasThisHelpful.vue
new file mode 100644
index 000000000..6d2e0342f
--- /dev/null
+++ b/.vitepress/theme/components/WasThisHelpful.vue
@@ -0,0 +1,216 @@
+<template>
+  <div class="helpful-container">
+    <p v-if="!feedbackSent">Was this page helpful?</p>
+    <div v-if="!feedbackSent" class="button-row">
+      <button
+        :class="{ selected: selection === 'Positive' }"
+        @click="handlePositive"
+        title="This page was helpful"
+      >
+        👍
+      </button>
+      <button
+        :class="{ selected: selection === 'Negative' }"
+        @click="handleNegative"
+        title="This page was not helpful"
+      >
+        👎
+      </button>
+    </div>
+
+    <p v-if="feedbackSent" class="thank-you">Thank you for your feedback!</p>
+
+    <div class="feedback-section" v-if="feedbackSelected && !feedbackSent">
+      <div>
+        <p>Thank you for your feedback!</p>
+        <p><br>Feel free to add an optional comment below.<br>Make sure not to include any personal information.</p>
+      </div>
+      <div class="textarea-container">
+        <textarea
+          ref="feedbackInput"
+          v-model="feedbackText"
+          :placeholder="placeholderText"
+          :maxlength="charLimit"
+          class="feedback-textarea"
+        ></textarea>
+
+        <p class="char-count">{{ feedbackText.length }}/140</p>
+      </div>
+
+      <div class="send-feedback">
+        <button class="feedback-button" @click="sendFeedback" :disabled="!feedbackText.trim()">Send</button>
+      </div>
+    </div>
+
+    <p class="more-feedback" v-if="feedbackSelected">
+      More to say?
+      <a href="https://github.com/cap-js/docs/issues" target="_blank">
+        Report an issue.
+      </a>
+    </p>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed } from 'vue'
+
+const charLimit = 140
+const feedbackText = ref('')
+const feedbackSelected = ref(false)
+const feedbackSent = ref(false)
+const selection = ref(null)
+
+const handlePositive = () => {
+  if (selection.value === 'Positive') return
+  if (typeof window !== 'undefined' && window._paq) {
+    const path = new URL(window.location.href).pathname
+    window._paq.push(['trackEvent', path, 'Positive'])
+  }
+  feedbackSelected.value = true
+  selection.value = 'Positive'
+}
+
+const handleNegative = () => {
+  if (selection.value === 'Negative') return
+  if (typeof window !== 'undefined' && window._paq) {
+    const path = new URL(window.location.href).pathname
+    window._paq.push(['trackEvent', path, 'Negative'])
+  }
+  feedbackSelected.value = true
+  selection.value = 'Negative'
+}
+
+const sendFeedback = () => {
+  if (typeof window !== 'undefined' && window._paq) {
+    const path = new URL(window.location.href).pathname
+    const name = feedbackText.value.trim()
+    window._paq.push(['trackEvent', path, selection.value, name])
+    feedbackSent.value = true
+  }
+}
+
+const placeholderText = computed(() => {
+  if (selection.value === 'Positive') return 'What did you like about the page?'
+  if (selection.value === 'Negative') return 'What did you miss on this page?'
+  return ''
+})
+</script>
+
+<style scoped>
+.helpful-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  margin-top: 30px;
+}
+
+p {
+  margin: 0;
+}
+
+.button-row {
+  display: flex;
+  gap: 1rem;
+  margin-top: 0.5rem;
+  justify-content: center;
+}
+
+button {
+  cursor: pointer;
+  border: 1px solid var(--vp-c-divider);
+  padding: 0.5rem 1rem;
+  border-radius: 4px;
+  background: none;
+}
+
+button:hover {
+  border-color: var(--vp-c-brand-1);
+}
+
+button.selected {
+  border-color: var(--vp-c-brand-1);
+  font-weight: bold;
+}
+
+.feedback-button {
+  background-color: #3b82f7;
+  border: none;
+  font-weight: 600;
+  transition: opacity 0.2s;
+  min-width: 100px;
+}
+
+.feedback-button:hover, .feedback-button.selected {
+  border: none;
+  opacity: 0.8;
+}
+
+.feedback-button:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.feedback-section {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  width: 100%;
+  max-width: 500px;
+  gap: 0.5rem;
+  margin-top: 1rem;
+  position: relative;
+  text-align: center;
+}
+
+.textarea-container {
+  position: relative;
+  width: 100%;
+}
+
+.feedback-textarea {
+  font-family: var(--vp-font-family);
+  font-size: 14px;
+  font-weight: 500;
+  width: 100%;
+  height: 90px;
+  padding: 0.5rem;
+  border: 1px solid var(--vp-c-divider);
+  border-radius: 4px;
+  resize: none;
+}
+
+.char-count {
+  position: absolute;
+  bottom: 0.5rem;
+  right: 0.5rem;
+  font-size: 0.9rem;
+  color: #666;
+  padding: 0 0.3rem;
+  border-radius: 3px;
+}
+
+.send-feedback {
+  color: white;
+  text-align: center;
+}
+
+.thank-you {
+  margin-top: 1rem;
+  font-size: 1rem;
+  color: var(--vp-c-success);
+}
+
+.more-feedback {
+  margin-top: 2rem;
+  text-align: center;
+}
+
+.more-feedback a {
+  color: var(--vp-c-brand-1);
+  text-decoration: none;
+}
+
+.more-feedback a:hover {
+  text-decoration: underline;
+}
+</style>
diff --git a/cds/cdl.md b/cds/cdl.md
index 73020f529..7eb56429c 100644
--- a/cds/cdl.md
+++ b/cds/cdl.md
@@ -595,7 +595,7 @@ No restrictions apply for reading a calculated element on-write.
 
 #### Association-like calculated elements {#association-like-calculated-elements}
 
-A calculated element can also define a filtered association or composition, like in this example:
+A calculated element can also define a filtered association/composition using infix filters:
 
 ```cds
 entity Employees {
@@ -607,7 +607,7 @@ entity Employees {
 For such a calculated element, no explicit type can be specified.
 Only a single association or composition can occur in the expression, and a filter must be specified.
 
-The effect essentially is like [publishing an association with a filter](#publish-associations-with-filter).
+The effect essentially is like [publishing an association with an infix filter](#publish-associations-with-filter).
 
 
 ### Default Values
@@ -1062,7 +1062,7 @@ entity P_Employees as projection on Employees {
 The effective signature of the projection contains an association `addresses` with the same
 properties as association `addresses` of entity `Employees`.
 
-#### Publish Associations with Filter {#publish-associations-with-filter}
+#### Publish Associations with Infix Filter {#publish-associations-with-filter}
 
 When publishing an unmanaged association in a view or projection, you can add a filter condition.
 The ON condition of the resulting association is the ON condition of the original
diff --git a/cds/cqn.md b/cds/cqn.md
index 2abdab96d..50c7888e7 100644
--- a/cds/cqn.md
+++ b/cds/cqn.md
@@ -40,6 +40,8 @@ Such queries can be [executed with `cds.run`](../node.js/core-services#srv-run-q
 let results = await cds.run (query)
 ```
 
+Following is a detailed specification of the CQN as [TypeScript declarations](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html), including all query types and their properties,
+as well as the fundamental expression types. Find the [full CQN type definitions in the appendix below](#full-cqn-d-ts-file).
 
 
 ## SELECT
@@ -55,7 +57,6 @@ class SELECT { SELECT: {
   columns?    : column[]
   where?      : xo[]
   having?     : xo[]
-  search?     : xo[]
   groupBy?    : expr[]
   orderBy?    : order[]
   limit?      : { rows: val, offset: val }
@@ -82,8 +83,7 @@ which is equivalent to SQL's `SELECT * from ...`.
 
 
 ### `.from`
-
-{#source}
+###### source
 
 Property `from` specifies the source of the query, which can be a table, a view, or a subquery.
 It is specified with type `source` as follows:
@@ -112,9 +112,11 @@ type source = ref &as | SELECT | {
 
 ### `.columns`
 
-{#column}
+###### column
+###### as
+###### cast
+###### expand
 
-{#as}
 
 Property `columns` specifies the columns to be selected, projected, or aggregated, and is specified as an array of `column`s:
 
@@ -128,6 +130,8 @@ type column = '*' | expr &as &cast | ref &as &(
   { expand?: column[] } |
   { inline?: column[] }
 ) &infix
+```
+```tsx
 interface as { as?: name }
 interface cast { cast?: {type:name} }
 ```
@@ -135,7 +139,7 @@ interface cast { cast?: {type:name} }
 >
 > Using:
 > [`expr`](#expr),
-> [`name`](#name)
+> [`name`](#name),
 > [`ref`](#ref),
 > [`infix`](#infix)
 >
@@ -159,6 +163,7 @@ class SELECT { SELECT: {
 
 
 ### `.orderBy`
+###### order
 
 ```tsx
 class SELECT { SELECT: { //...
@@ -247,6 +252,8 @@ let q = {INSERT:{ into: { ref: ['Authors'] }, entries: [
 
 ### `.values`
 
+{#scalar}
+
 Allows input data to be specified as an single array of values, as in SQL.
 
 ```js
@@ -307,8 +314,7 @@ interface data  { [element:name]: scalar | data | data[] }
 
 
 ### `.with`
-
-{#changes}
+###### changes
 
 Property `with` specifies the changes to be applied to the data, very similar to property [`data`](#data) with the difference to also allow [expressions](#expressions) as values.
 
@@ -337,22 +343,21 @@ class DELETE { DELETE: {
 
 
 ## Expressions
-
-{#expr}
-
-{#ref}
-
-{#val}
-
-{#xpr}
-
-{#list}
-
-{#func}
-
-{#param}
-
-Following are the axiomatic building blocks used in CQN expressions:
+###### expr
+###### ref
+###### val
+###### xpr
+###### list
+###### func
+###### param
+###### infix
+###### xo
+###### name
+###### scalar
+
+Expressions can be entity or element references, query parameters,
+literal values, lists of all the former, function calls, sub selects,
+or compound expressions.
 
 ```tsx
 type expr  = ref | val | xpr | list | func | param | SELECT
@@ -366,5 +371,174 @@ type func  = { func: string, args: expr[] }
 type param = { ref: [ '?' | number | string ], param: true }
 ```
 
+```tsx
+type xo       = expr | keyword | operator
+type operator = '=' | '==' | '!=' | '<' | '<=' | '>' | '>='
+type keyword  = 'in' | 'like' | 'and' | 'or' | 'not'
+type scalar   = number | string | boolean | null
+type name     = string
+```
+
+>[!note]
+> CQN by intent does not _understand_ expressions and therefore
+> keywords and operators are just represented as plain strings in flat
+> `xo` sequences. This allows us to translate to and from any other query languages,
+> including support for native SQL features.
+
 
 <div id="hierarchy-queries" />
+
+
+## Full `cqn.d.ts` File
+
+::: code-group
+
+```tsx [cqn.d.ts]
+/**
+ * `INSERT` and `UPSERT` queries are represented by the same internal
+ * structures. The `UPSERT` keyword is used to indicate that the
+ * statement should be updated if the targeted data exists.
+ * The `into` property specifies the target entity.
+ *
+ * The data to be inserted or updated can be specified in different ways:
+ *
+ * - in the `entries` property as deeply nested records.
+ * - in the `columns` and `values` properties as in SQL.
+ * - in the `columns` and `rows` properties, with `rows` being array of `values`.
+ * - in the `from` property with a `SELECT` query to provide the data to be inserted.
+ *
+ * The latter is the equivalent of SQL's `INSERT INTO ... SELECT ...` statements.
+ */
+export class INSERT { INSERT: UPSERT['UPSERT'] }
+export class UPSERT { UPSERT: {
+  into      : ref
+  entries?  : data[]
+  columns?  : string[]
+  values?   : scalar[]
+  rows?     : scalar[][]
+  from?     : SELECT
+}}
+
+
+/**
+ * `UPDATE` queries are used to capture modifications to existing data.
+ * They support a `where` clause to specify the rows to be updated,
+ * and a `with` clause to specify the new values. Alternatively, the
+ * `data` property can be used to specify updates with plain data only.
+ */
+export class UPDATE { UPDATE: {
+  entity  : ref
+  where?  : expr
+  data    : data
+  with    : changes
+}}
+
+
+/**
+ * `DELETE` queries are used to remove data from a target datasource.
+ * They support a `where` clause to specify the rows to be deleted.
+ */
+export class DELETE { DELETE: {
+  from    : ref
+  where?  : expr
+}}
+
+
+/**
+ * `SELECT` queries are used to retrieve data from a target datasource,
+ * and very much resemble SQL's `SELECT` statements, with these noteworthy
+ * additions:
+ *
+ * - The `from` clause supports `{ref}` paths with infix filters.
+ * - The `columns` clause supports deeply nested projections.
+ * - The `count` property requests the total count, similar to OData's `$count`.
+ * - The `one` property indicates that only a single record object shall be
+ *   returned instead of an array.
+ *
+ * Also, CDS, and hence CQN, supports minimalistic `SELECT` statements with a `from`
+ * as the only mandatory property, which is equivalent to SQL's `SELECT * from ...`.
+ */
+export class SELECT { SELECT: {
+  distinct?   : true
+  count?      : true
+  one?        : true
+  from        : source
+  columns?    : column[]
+  where?      : xo[]
+  having?     : xo[]
+  groupBy?    : expr[]
+  orderBy?    : order[]
+  limit?      : { rows: val, offset: val }
+}}
+
+type source = OneOf< ref &as | SELECT | {
+  join : 'inner' | 'left' | 'right'
+  args : [ source, source ]
+  on?  : expr
+}>
+
+type column = OneOf< '*' | expr &as &cast | ref &as & OneOf<(
+  { expand?: column[] } |
+  { inline?: column[] }
+)> &infix >
+
+type order = expr & {
+  sort  : 'asc' | 'desc'
+  nulls : 'first' | 'last'
+}
+
+
+interface changes { [elm:string]: OneOf< scalar | expr | changes | changes[] >}
+interface data { [elm:string]: OneOf< scalar | data | data[] >}
+interface as { as?: name }
+interface cast { cast?: {type:name} }
+
+interface infix {
+  orderBy?  : order[]
+  where?    : expr
+  limit?    : { rows: val, offset: val }
+}
+
+
+/**
+ * Expressions can be entity or element references, query parameters,
+ * literal values, lists of all the former, function calls, sub selects,
+ * or compound expressions.
+ */
+export type expr  = OneOf< ref | val | xpr | list | func | param | SELECT >
+export type ref   = { ref: OneOf< name | { id:name &infix } >[] }
+export type val   = { val: scalar }
+export type xpr   = { xpr: xo[] }
+export type list  = { list: expr[] }
+export type func  = { func: string, args: expr[] }
+export type param = { ref: [ '?' | number | string ], param: true }
+
+/**
+ * This is used in `{xpr}` objects as well as in `SELECT.where` clauses to
+ * represent compound expressions as flat `xo` sequences.
+ * Note that CQN by intent does not _understand_ expressions and therefore
+ * keywords and operators are just represented as plain strings.
+ * This allows us to translate to and from any other query languages,
+ * including support for native SQL features.
+ */
+type xo       = OneOf< expr | keyword | operator >
+type operator = '=' | '==' | '!=' | '<' | '<=' | '>' | '>='
+type keyword  = 'in' | 'like' | 'and' | 'or' | 'not'
+type scalar   = number | string | boolean | null
+type name     = string
+
+
+
+// ---------------------------------------------------------------------------
+//  maybe coming later...
+
+declare class CREATE { CREATE: {} }
+declare class DROP { DROP: {} }
+
+
+// ---------------------------------------------------------------------------
+//  internal helpers...
+
+type OneOf<U> = Partial<(U extends any ? (k:U) => void : never) extends (k: infer I) => void ? I : never>
+```
+:::
\ No newline at end of file
diff --git a/get-started/troubleshooting.md b/get-started/troubleshooting.md
index ce04aa81e..12a3efba7 100644
--- a/get-started/troubleshooting.md
+++ b/get-started/troubleshooting.md
@@ -498,6 +498,15 @@ Options in [Saas Provisioning Service upgrade API](../guides/multitenancy/mtxs#e
 
 <div id="hana-ips" />
 
+#### Deployment fails — _... build plugin for file suffix "hdbmigrationtable" [8210015]_ 
+{#missingPlugin}
+
+|  | Explanation |
+| --- | ---- |
+| _Root Cause_ | Your project configuration is missing some configuration in your _.hdiconfig_ file. |
+| _Solution_ | Use `cds add hana` to add the needed configuration to your project. Or maintain the _hdbmigrationtable_ plugin in your _.hdiconfig_ file manually: `"hdbmigrationtable": { "plugin_name": "com.sap.hana.di.table.migration" }`
+
+
 #### Deployment fails — _In USING declarations only main artifacts can be accessed, not sub artifacts of \<name\>_
 This error occurs if all of the following applies:
 + You [added native SAP HANA objects](../advanced/hana#add-native-objects) to your CAP model.
diff --git a/guides/databases.md b/guides/databases.md
index 31e1514f7..698000bb1 100644
--- a/guides/databases.md
+++ b/guides/databases.md
@@ -782,13 +782,35 @@ The following rules apply:
   a potential name mapping yourself, for example, for structured elements.
 
 - Annotation `@sql.prepend` is only supported for entities translating to tables. It can't be used with views nor with elements.
-- For SAP HANA tables, there's an implicit  that is overwritten by an explicitly provided `@sql.prepend`.
+- For SAP HANA tables, there's an implicit `@sql.prepend: 'COLUMN'` that is overwritten by an explicitly provided `@sql.prepend`.
 
 * Both `@sql.prepend` and `@sql.append` are disallowed in SaaS extension projects.
 
 If you use native database clauses in combination with `@cds.persistence.journal`, see [Schema Evolution Support of Native Database Clauses](databases-hana#schema-evolution-native-db-clauses).
 
 
+
+#### Creating a Row Table on SAP HANA
+
+By using `@sql.prepend: 'ROW'`, you can create a row table:
+
+```cds
+@sql.prepend: 'ROW'
+entity E {
+  key id: Integer;
+}
+```
+
+Run `cds compile - 2 hdbtable` on the previous sample and this is the result:
+
+```sql [E.hdbtable]
+ROW TABLE E (
+  id INTEGER NOT NULL,
+  PRIMARY KEY(id)
+)
+```
+
+[Learn more about Columnar and Row-Based Data Storage](https://help.sap.com/docs/hana-cloud-database/sap-hana-cloud-sap-hana-database-administration-guide/columnar-and-row-based-data-storage){.learn-more}
 ### Reserved Words
 
 The CDS compiler and CAP runtimes provide smart quoting for reserved words in SQLite and in SAP HANA so that they can still be used in most situations. But in general reserved words cannot be used as identifiers. The list of reserved words varies per database.
diff --git a/guides/providing-services.md b/guides/providing-services.md
index 0cfd4794d..819a15a2e 100644
--- a/guides/providing-services.md
+++ b/guides/providing-services.md
@@ -1120,7 +1120,11 @@ GET .../sue/Foo(2)/Sue.getStock()     // bound function
 POST .../sue/Foo(2)/Sue.order {"x":1} // bound action
 ```
 
-> Note: You always need to add the `()` for functions, even if no arguments are required. The OData standard specifies that bound actions/functions need to be prefixed with the service's name. In the previous example, entity `Foo` has a bound action `order`. That action must be called via `/Foo(2)/Sue.order` instead of simply `/Foo(2)/order`. For convenience, however, the Node.js runtime also allows calling bound actions/functions without prefixing them with the service name.
+> Note: You always need to add the `()` for functions, even if no arguments are required. The OData standard specifies that bound actions/functions need to be prefixed with the service's name. In the previous example, entity `Foo` has a bound action `order`. That action must be called via `/Foo(2)/Sue.order` instead of simply `/Foo(2)/order`.
+> For convenience, the CAP Node.js runtime also allows the following:
+> - Call bound actions/functions without prefixing them with the service name.
+> - Omit the `()` if no parameter is required.
+> - Use query options to provide function parameters like `sue/sum?x=1&y=2`
 
 <br>
 
diff --git a/java/change-tracking.md b/java/change-tracking.md
index e31edcf89..61d4225ea 100644
--- a/java/change-tracking.md
+++ b/java/change-tracking.md
@@ -19,7 +19,7 @@ to the remote services aren't tracked.
 
 ## Enabling Change Tracking
 
-To use the change tracking feature, you need to add a dependency to [cds-feature-change-tracking](https://central.sonatype.com/artifact/com.sap.cds/cds-feature-change-tracking) in the `pom.xml` file of your service:
+To use the change tracking feature, you need to add a dependency to [cds-feature-change-tracking](https://central.sonatype.com/artifact/com.sap.cds/cds-feature-change-tracking) in the `srv/pom.xml` file of your service:
 
 ```xml
 <dependency>
diff --git a/node.js/_menu.md b/node.js/_menu.md
index 7e57f98a1..eec927567 100644
--- a/node.js/_menu.md
+++ b/node.js/_menu.md
@@ -47,6 +47,7 @@
   ## [UPSERT](cds-ql#upsert)
   ## [UPDATE](cds-ql#update)
   ## [DELETE](cds-ql#delete)
+  ## [Expressions](cds-ql#expressions)
 
 # [cds. tx()](cds-tx)
 # [cds. log()](cds-log)
diff --git a/node.js/cds-compile.md b/node.js/cds-compile.md
index 48cc39fad..5f8df6b80 100644
--- a/node.js/cds-compile.md
+++ b/node.js/cds-compile.md
@@ -292,40 +292,40 @@ The three main methods are offered as classic functions, as well as [tagged temp
 
 
 
-### `CDL`, cds. parse. cdl() {.method #parse-cdl }
+### cds. parse. cdl() {.method #parse-cdl }
 
-Parses a source string in _[CDL](../cds/cdl)_ syntax and returns it as a parsed model according to the [_CSN spec_](../cds/csn).
+Parses a source string in _[CDL](../cds/cdl)_ syntax and returns it as a parsed model according to the [_CSN spec_](../cds/csn). Supports tagged template strings as well as plain string arguments.
 It's essentially a [shortcut to `cds.compile (..., {flavor:'parsed'})`](#cds-compile).
 
 Examples:
 ```js
-let csn = CDL`entity Foo{}`
-let csn = cds.parse (`entity Foo{}`)  //= shortcut to:
 let csn = cds.parse.cdl (`entity Foo{}`)
+let csn = cds.parse.cdl `entity Foo{}`
+let csn = cds.parse `entity Foo{}`  //> shortcut to the above
 ```
 
 
 
-### `CQL`, cds. parse. cql() {.method #parse-cql }
+### cds. parse. cql() {.method #parse-cql }
 
-Parses a source string in _[CQL](../cds/cql)_ syntax and returns it as a parsed query according to the [_CQN spec_](../cds/cqn).
+Parses a source string in _[CQL](../cds/cql)_ syntax and returns it as a parsed query according to the [_CQN spec_](../cds/cqn). Supports tagged template strings as well as plain string arguments.
 
 Examples:
 ```js
-let cqn = CQL`SELECT * from Foo`
 let cqn = cds.parse.cql (`SELECT * from Foo`)
+let cqn = cds.parse.cql `SELECT * from Foo`
 ```
 
 
 
-### `CXL`, cds. parse. expr() {.method #parse-cxl }
+### cds. parse. expr() {.method #parse-cxl }
 
-Parses a source string in CQL expression syntax and returns it as a parsed expression according to the [_CQN Expressions spec_](../cds/cxn#operators).
+Parses a source string in CQL expression syntax and returns it as a parsed expression according to the [_CQN Expressions spec_](../cds/cxn#operators). Supports tagged template strings as well as plain string arguments.
 
 Examples:
 ```js
-let cxn = CXL`foo.bar > 9`
 let cxn = cds.parse.expr (`foo.bar > 9`)
+let cxn = cds.parse.expr `foo.bar > 9`
 //> {xpr:[ {ref:['foo', 'bar']}, '>', {val:9} ] }
 ```
 
diff --git a/node.js/cds-ql.md b/node.js/cds-ql.md
index ecaa9458b..8bfeebfa9 100644
--- a/node.js/cds-ql.md
+++ b/node.js/cds-ql.md
@@ -13,51 +13,58 @@ status: released
 
 ## Constructing Queries
 
-Module `cds.ql` provides facilities to construct queries in [*Core Query Notation (CQN)*](../cds/cqn) in three major ways: 
+Module `cds.ql` provides facilities to construct queries in [*Core Query Notation (CQN)*](../cds/cqn) in different flavours and styles:
 
-1. Using tagged template literals
-2. Using a fluent API
-3. Using CQN constructors 
-
-Module `cds.ql` provides a SQL-like fluent API to construct queries:
+1. Fluent API style, with query-by-example objects for where clauses and order by clauses:
 
 ```js
-let q1 = SELECT.from('Books').where({ID:201})
-let q2 = INSERT.into('Books',{ title: 'Wuthering Heights' })
-let q3 = UPDATE('Books',201).with({ title: 'Sturmhöhe' })
-let q4 = DELETE.from('Books').where({ID:201})
+let q = SELECT.from('Books').where({ID:201}).orderBy({title:1})
 ```
 
-We can also use the fluent API with tagged template literals:
+2. Using with [tagged template literals (TTL)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#tagged_templates):
 
 ```js
-let q1 = SELECT.from `Books` .where `ID=${201}`
-let q2 = INSERT.into `Books` .entries ({ title:'Wuthering Heights' })
-let q3 = UPDATE `Books` .where `ID=${201}` .with `title=${'Sturmhöhe'}`
-let q4 = DELETE.from `Books` .where `ID=${201}`
+let q = cds.ql `SELECT from Books where ID=${201} order by title`
 ```
 
-As well as with full queries in TTL:
+3. Fluent API with interspersed [tagged template literals (TTL)](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Template_literals#tagged_templates):
 
 ```js
-let q3 = UPDATE `Books where ID=${201}` .with `title=${'Sturmhöhe'}`
-let q1 = SELECT.from `Books where ID=${201}`
-let q4 = DELETE.from `Books where ID=${201}`
+let q = SELECT.from `Books where ID=${201} order by title`
+let p = SELECT.from `Books`.where`ID=${201}`.orderBy`title`
 ```
 
-
-
-Constructing individual CQN objects:
+4. Manually constructing CQN objects:
 
 ```js
-const { ref } = cds.ql
-let q1 = SELECT.from (ref`Books`) .where (ref`ID`,'=',val(201))
-let q2 = INSERT.into (ref`Books`) .entries ({ title:'Wuthering Heights' })
-let q3 = UPDATE (ref`Books`) .where (ref`ID`,'=',val(201)) .with (ref`title`,'=',val`Sturmhöhe`)
-let q4 = DELETE.from (ref`Books`) .where (ref`ID`,'=',val(201))
+const { expr, ref, val, columns, expand, where, orderBy } = cds.ql
+```
+```js
+let q = {
+  SELECT: {
+    from: ref`Books`,
+    where: [ref`ID`, '=', val(201)],
+    orderBy: [ref`title`],
+  }
+}
+```
+```js
+let q = {
+  SELECT: {
+    from: ref`Authors`,
+    columns: [
+      ref`ID`,
+      ref`name`,
+      expand (ref`books`, where`stock>7`, orderBy`title`,
+        columns`ID,title`
+      )
+    ],
+    where: [ref`name`, 'like', val('%Poe%')]
+  }
+}
 ```
 
-
+#### API Facades
 
 The API is made available through global objects `SELECT`, `INSERT`, `UPSERT`, `UPDATE`, `DELETE`. Alternatively, you can obtain these objects from `cds.ql` like so:
 
@@ -66,25 +73,20 @@ const cds = require('@sap/cds')
 const { SELECT, INSERT, UPDATE, DELETE } = cds.ql
 ```
 
-The API is also available through [`cds.Service`'s CRUD-style Convenience API](core-services#crud-style-api) {.learn-more}
-
-::: details Using Reflected Definitions
+#### Using Reflected Definitions
 
-It is recommended best practice to use entity definitions reflected from a service's model to construct queries.
-Doing so greatly simplifies code as it avoids repeating namespaces all over the place.
+It is recommended best practice to use entity definitions reflected from a service's model to construct queries. Doing so simplifies code as it avoids repeating namespaces all over the place.
 
-```sql
+```js
 const { Books } = cds.entities
 let q1 = SELECT.from (Books) .where `ID=${201}`
 ```
 
 [Learn more about using reflected definitions from a service's model](core-services#entities){.learn-more}
 
-:::
+####  Not Locked in to SQL
 
-::: details *Not Locked in to SQL*
 While both [CQL](../cds/cql) / [CQN](../cds/cqn) as well as the fluent API of `cds.ql` resemble well-known SQL syntax neither of them are locked in to SQL. In fact, queries can be sent to any kind of services, including NoSQL databases or remote services for execution.
-:::
 
 
 
@@ -112,6 +114,13 @@ let books = await cats.run (query)
 
 > `CatalogService` might be a remote service connected via OData. In this case, the query would be translated to an OData request sent via http.
 
+The APIs are also available through [`cds.Service`'s CRUD-style Convenience API](core-services#crud-style-api), e.g.:
+
+```js
+const db = cds.db
+let books = await db.read`Books`.where`ID=${201}`.orderBy`title`
+```
+
 
 
 ## First-Class Objects
@@ -165,8 +174,7 @@ for (let a of Authors) { //> looping over eagerly materialized Authors
 
 
 ## Avoiding SQL Injection
-All the APIs are designed to easily avoid [SQL Injection](https://wikipedia.org/wiki/SQL_injection) by default.
-For example, let's see how the following code would be executed:
+All the APIs are designed to avoid [SQL Injection](https://wikipedia.org/wiki/SQL_injection) by default. For example, let's see how the following code would be executed:
 
 ```js
 let input = 201 //> might be entered by end users
@@ -218,6 +226,88 @@ Never use string concatenation when constructing queries!
 Never surround tagged template strings with parentheses!
 :::
 
+## Using `cds repl`
+
+Event though being a reference doc, the sections below will never be able to cover any possible query you might want to construct. For that reason, we recommend to use the `cds repl` command to experiment with queries interactively. It is a great way to learn how to construct queries and to experiment with them. Here is an example session:
+
+```sh
+cds repl -u ql
+```
+```js
+cds.ql`SELECT from Authors {
+  ID, name, books [order by title] {
+    ID, title, genre.name as genre
+  }
+} where exists books.genre[name = 'Mystery']`
+```
+... which will display this:
+```js
+cds.ql {
+  SELECT: {
+    from: { ref: [ 'Authors' ] },
+    columns: [
+      { ref: [ 'ID' ] },
+      { ref: [ 'name' ] },
+      {
+        ref: [
+          {
+            id: 'books',
+            orderBy: [ { ref: [ 'title' ] } ]
+          }
+        ],
+        expand: [
+          { ref: [ 'ID' ] },
+          { ref: [ 'title' ] },
+          { ref: [ 'genre', 'name' ], as: 'genre' }
+        ]
+      }
+    ],
+    where: [
+      'exists',
+      {
+        ref: [
+          'books',
+          {
+            id: 'genre',
+            where: [ { ref: [ 'name' ] }, '=', { val: 'Mystery' } ]
+          }
+        ]
+      }
+    ]
+  }
+}
+```
+
+You can also test-drive the query by executing it with a running application:
+
+```sh
+cds repl -u ql -r cap/samples/bookshpop
+```
+```js
+await cds.ql`SELECT from Authors {
+  ID, name, books [order by title] {
+    ID, title, genre.name as genre
+  }
+} where exists books.genre[name = 'Mystery']`
+```
+... which would display the results like that:
+```js
+[
+  {
+    ID: 150,
+    name: 'Edgar Allen Poe',
+    books: [
+      { ID: 251, title: 'The Raven', genre: 'Mystery' },
+      { ID: 252, title: 'Eleonora', genre: 'Romance' }
+    ]
+  }
+]
+```
+
+> [!TIP]
+> Using `cds repl` as shown above is likely the best way to learn how to construct queries in detail.
+> When doing so, ensure to use the `cds.ql` functions with full queries in CQL syntax, as shown in the example above, as that is the most reliable way to ensure correctness.
+
 
 
 ## cds.ql. Query {#class-cds-ql-query .class}
@@ -235,8 +325,6 @@ The kind of query, that is one of these strings:
 - `'UPSERT'`
 - `'UPDATE'`
 - `'DELETE'`
-- `'CREATE'`
-- `'DROP'`
 
 This is usefull for generic query processors, such as outbound protocol adapters or database services, which need to translate given queries into target representations.
 
@@ -908,3 +996,169 @@ function DELETE.from (
 ### where() {.method}
 
 [As in SELECT.where](#where) {.learn-more}
+
+
+
+## Expressions
+
+The following methods facilitate constructing CXN objects manually.
+
+> [!note]
+> Many sections below are still under construction. We are working on it... Please refer to the [CXL](../cds/cxn) documentation for more information on the CXN syntax for the time being.
+
+### expr() {.method}
+
+Constructs a CXN expression object from given input.
+Same as [`xpr`](#xpr), but if the result contains only single
+entries these are returned as is.
+
+```js
+const { expr } = cds.ql
+expr([ref`foo`,'=',val(11)]) //> {xpr:[{ref:['foo']},'=',{val:11}]}
+expr(ref`foo`,'=',val(11))   //> {xpr:[{ref:['foo']},'=',{val:11}]}
+expr`foo = 11`               //> {xpr:[{ref:['foo']},'=',{val:11}]}
+expr`foo`                    //> {ref:['foo']}
+expr`11`                     //> {val:11}
+```
+
+### ref() {.method}
+
+Constructs a CXN `{ref}` object from given input, which can be one of:
+
+- several path segment strings
+- a single array of the same
+- a tagged template literal in CXL path syntax
+
+
+```js
+const { ref } = cds.ql
+ref('foo')        //> {ref:['foo']}
+ref('foo','bar')  //> {ref:['foo','bar']}
+ref`foo.bar`      //> {ref:['foo','bar']}
+ref`foo`          //> {ref:['foo']}
+```
+
+Note that only simple paths are supported, that is, without infix filters or functions.
+
+[Use `expr()` to parse paths with infix filters via a tagged template literals.](#expr) {.learn-more}
+
+
+### val() {.method}
+
+Constructs CXN `{val}` object from given input, which can be one of:
+- a single `string`, `number`, `boolean`, or `null`
+- a tagged template literal in CXL literal syntax
+
+```js
+const { val } = cds.ql
+val(`foo`) //> {val:'foo'}`
+val`foo`   //> {val:'foo'}
+val`11`    //> {val:11}
+val(11)    //> {val:11}
+```
+
+### xpr() {.method}
+
+Constructs a CXN `xpr` object from given input, which can be one of:
+- multiple CXN `expr` objects, or strings representing keywords or operators
+- a single array of the same
+- a tagged template literal in CXL syntax
+
+```js
+const { xpr } = cds.ql
+xpr([ref`foo`,'=',val(11)]) //> {xpr:[{ref:['foo']},'=',{val:11}]}
+xpr(ref`foo`,'=',val(11))   //> {xpr:[{ref:['foo']},'=',{val:11}]}
+xpr`foo = 11`               //> {xpr:[{ref:['foo']},'=',{val:11}]}
+xpr`foo`                    //> {xpr:[{ref:['foo']}]}
+xpr`'foo'`                  //> {xpr:[{val:'foo'}]}
+xpr`11`                     //> {xpr:[{val:11}]}
+xpr('=')                    //> {xpr:['=']}
+xpr('like')                 //> {xpr:['like']}
+```
+
+[See also `expr()`](#expr) {.learn-more}
+
+
+### list() {.method}
+
+ Constructs a CXN `list` object from given input, with can be one of:
+ - multiple CXN `expr` objects, or values turned into `{val}`s, including strings
+ - a single array of the same
+ ```js
+ const { list } = cds.ql
+ list([`foo`,11]) //> {list:[{val:'foo'},{val:11}]}
+ list(`foo`,11)   //> {list:[{val:'foo'},{val:11}]}
+ expr`'foo',11`   //> {list:[{val:'foo'},{val:11}]}
+ expr`foo,11`     //> {list:[{ref:['foo']},{val:11}]}
+ ```
+[Use `expr()` to get the same via a tagged template literals.](#expr) {.learn-more}
+
+
+### func() {.method}
+
+Constructs a CXN `func` object from given input. The first argument is the
+function name, the remaining `args` can the same as in {@link ql.list `list()`},
+and are handled the same way.
+```js
+const { func } = cds.ql
+func('substring',[`foo`,1]) //> {func:'substring',args:[{val:'foo'},{val:1}]}
+func('substring',`foo`,1)   //> {func:'substring',args:[{val:'foo'},{val:1}]}
+expr`substring('foo',1)`    //> {func:'substring',args:[{val:'foo'},{val:1}]}
+expr`substring(foo,1)`      //> {func:'substring',args:[{ref:['foo']},{val:1}]}
+expr`substring(foo,1)`      //> {func:'substring',args:[{ref:['foo']},{val:1}]}
+```
+[Use `expr()` to get the same via a tagged template literals.](#expr) {.learn-more}
+
+
+### predicate() {.method}
+<UnderConstruction/>
+
+TODO: Add description
+
+```js
+const { predicate } = cds.ql
+predicate`a=1 and b=2 or c=3 and d=4`
+predicate ({ a:1, b:2, or:{ c:3, d:4 }})
+predicate ('a=',1,'and ( b=',2,'or c=',3,')')
+```
+
+### columns() {.method}
+<UnderConstruction/>
+
+TODO
+
+### nested() {.method}
+<UnderConstruction/>
+
+TODO
+
+### expand() {.method}
+<UnderConstruction/>
+
+TODO: Add description
+
+```js
+expand (ref`books`, where`stock>7`, orderBy`title`,
+   columns`ID,title`
+)
+```
+
+### inline() {.method}
+<UnderConstruction/>
+
+TODO
+
+### where() {.method}
+<UnderConstruction/>
+
+TODO
+
+### orderBy() {.method}
+<UnderConstruction/>
+
+TODO
+
+### orders() {.method}
+<UnderConstruction/>
+
+TODO
\ No newline at end of file
diff --git a/node.js/cds-reflect.md b/node.js/cds-reflect.md
index 77b1e2e64..fdb008a74 100644
--- a/node.js/cds-reflect.md
+++ b/node.js/cds-reflect.md
@@ -43,7 +43,7 @@ let linked = cds.linked(csn) // linked === csn
 Instead of a already compiled CSN, you can also pass a string containing CDL source code:
 
 ```js
-let linked = cds.linked(`
+let linked = cds.linked`
   entity Books {
   	key ID: UUID;
   	title: String;
@@ -53,7 +53,7 @@ let linked = cds.linked(`
   	key ID: UUID;
   	name: String;
   }
-`)
+`
 ```
 
 The passed in model gets **modified**, and the returned linked model is actually the modified passed-in csn.
@@ -88,7 +88,7 @@ These are convenient shortcuts to access all *[service](../cds/cdl#services)* or
 For example:
 
 ```js
-let csn = CDL`
+let m = cds.linked`
   namespace my.bookshop;
   entity Books {...}
   entity Authors {...}
@@ -96,7 +96,6 @@ let csn = CDL`
     entity ListOfBooks as projection on Books {...}
   }
 `
-let m = cds.linked (csn)
 
 // Object nature
 let { CatalogService, AdminService } = m.services
@@ -458,11 +457,10 @@ cds.Composition = class Composition extends Association {...}
 For example, you can use these classes as follows:
 
 ```js
-let model = CDL`
+let m = cds.linked`
    entity Books { author: Association to Authors; }
    entity Authors { key ID: UUID; }
 `)
-let m = cds.linked(model)
 let { Books, Authors } = m.entities
 let isEntity = Books instanceof cds.entity
 let keys = Books.keys
@@ -502,12 +500,12 @@ cds.linked.classes .mixin (
 )
 
 // test drive
-let csn = CDL`
-entity Books : cuid { title:String; author: Association to Authors }
-entity Authors : cuid { name:String; }
-aspect cuid : { key ID:UUID; }
+let m = cds.linked`
+  entity Books : cuid { title:String; author: Association to Authors }
+  entity Authors : cuid { name:String; }
+  aspect cuid : { key ID:UUID; }
 `
-cds.linked(csn).foreach (d => console.log(d.toCDL()))
+m.foreach (d => console.log(d.toCDL()))
 ```
 
 
@@ -522,8 +520,8 @@ This property gives you access to all prototypes of the builtin classes as well
 
 Actually, at runtime CDS is in fact bootstrapped out of this using core [CSN](../cds/csn) object structures and [`cds.linked`] techniques. Think of it to be constructed as follows:
 
-```cds
-cds.builtin.types = cds.linked (CDL`
+```js
+cds.builtin.types = cds.linked`
   using from './roots';
   context cds {
     type UUID         : String(36);
@@ -545,7 +543,7 @@ cds.builtin.types = cds.linked (CDL`
     type LargeString  : string;
     type LargeBinary  : string;
   }
-`) .definitions
+`.definitions
 ```
 
 With `./roots` being this in-memory CSN:
diff --git a/package-lock.json b/package-lock.json
index 9d52b6cbe..0a0e3a65a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -418,9 +418,9 @@
       }
     },
     "node_modules/@cap-js/cds-typer": {
-      "version": "0.30.0",
-      "resolved": "https://registry.npmjs.org/@cap-js/cds-typer/-/cds-typer-0.30.0.tgz",
-      "integrity": "sha512-NYrajYDo0t+T6T/SgglPssR0ZnLApDYkoEreo65UWpPVZCBCDzvSIDktJ68fxRGAnyQRAdNnA/npxt+JFCYPOA==",
+      "version": "0.31.0",
+      "resolved": "https://registry.npmjs.org/@cap-js/cds-typer/-/cds-typer-0.31.0.tgz",
+      "integrity": "sha512-blMWCENR1H1/3Ntu42s4/Dnpvd6fdlYJFmnmEUiYOhK7LoRN0kUDaZa3wmQpY/NRmzbytE4UNQ2xCGb1P42S3w==",
       "dev": true,
       "license": "SEE LICENSE IN LICENSE",
       "bin": {
@@ -446,9 +446,9 @@
       }
     },
     "node_modules/@cspell/cspell-bundled-dicts": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.16.1.tgz",
-      "integrity": "sha512-EkbtoYpmiN9YPfcOoPcMnIrJBZh13mun64jPyyaYhrPPToiU5+CisZ7ZKUBGnqNaatuciMUxwIudhanQJ7Yhnw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.17.1.tgz",
+      "integrity": "sha512-HmkXS5uX4bk/XxsRS4Q+zRvhgRa81ddGiR2/Xfag9MIi5L5UnEJ4g21EpmIlXkMxYrTu2fp69SZFss5NfcFF9Q==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -456,7 +456,7 @@
         "@cspell/dict-al": "^1.0.3",
         "@cspell/dict-aws": "^4.0.7",
         "@cspell/dict-bash": "^4.1.8",
-        "@cspell/dict-companies": "^3.1.7",
+        "@cspell/dict-companies": "^3.1.8",
         "@cspell/dict-cpp": "^6.0.2",
         "@cspell/dict-cryptocurrencies": "^5.0.3",
         "@cspell/dict-csharp": "^4.0.5",
@@ -469,12 +469,12 @@
         "@cspell/dict-en_us": "^4.3.28",
         "@cspell/dict-en-common-misspellings": "^2.0.7",
         "@cspell/dict-en-gb": "1.1.33",
-        "@cspell/dict-filetypes": "^3.0.8",
+        "@cspell/dict-filetypes": "^3.0.9",
         "@cspell/dict-flutter": "^1.0.3",
         "@cspell/dict-fonts": "^4.0.3",
         "@cspell/dict-fsharp": "^1.0.4",
         "@cspell/dict-fullstack": "^3.2.3",
-        "@cspell/dict-gaming-terms": "^1.0.8",
+        "@cspell/dict-gaming-terms": "^1.0.9",
         "@cspell/dict-git": "^3.0.3",
         "@cspell/dict-golang": "^6.0.17",
         "@cspell/dict-google": "^1.0.4",
@@ -491,16 +491,16 @@
         "@cspell/dict-markdown": "^2.0.7",
         "@cspell/dict-monkeyc": "^1.0.9",
         "@cspell/dict-node": "^5.0.5",
-        "@cspell/dict-npm": "^5.1.14",
+        "@cspell/dict-npm": "^5.1.17",
         "@cspell/dict-php": "^4.0.13",
         "@cspell/dict-powershell": "^5.0.13",
         "@cspell/dict-public-licenses": "^2.0.11",
-        "@cspell/dict-python": "^4.2.12",
+        "@cspell/dict-python": "^4.2.13",
         "@cspell/dict-r": "^2.0.4",
         "@cspell/dict-ruby": "^5.0.7",
         "@cspell/dict-rust": "^4.0.10",
         "@cspell/dict-scala": "^5.0.6",
-        "@cspell/dict-software-terms": "^4.1.17",
+        "@cspell/dict-software-terms": "^4.1.19",
         "@cspell/dict-sql": "^2.1.8",
         "@cspell/dict-svelte": "^1.0.5",
         "@cspell/dict-swift": "^2.0.4",
@@ -513,22 +513,22 @@
       }
     },
     "node_modules/@cspell/cspell-json-reporter": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.16.1.tgz",
-      "integrity": "sha512-ue1paJ2OE2BjIBQHXFMHnFqJL5xMrE/TLveOntDSCKJw7edCGP4XJA6Q0ZfUgR/ZAP3SYKNPkajEWbDTMfG+XA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.17.1.tgz",
+      "integrity": "sha512-EV9Xkh42Xw3aORvDZfxusICX91DDbqQpYdGKBdPGuhgxWOUYYZKpLXsHCmDkhruMPo2m5gDh++/OqjLRPZofKQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-types": "8.16.1"
+        "@cspell/cspell-types": "8.17.1"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/@cspell/cspell-pipe": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.16.1.tgz",
-      "integrity": "sha512-6N+QZ3y65JRgGrQhZHmaBHESR+nC0J8nySGaYKclit8yk3jLZ/ORw9aoSGIj+dMPzImkNEDh+C1B1zdV4X8W6A==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.17.1.tgz",
+      "integrity": "sha512-uhC99Ox+OH3COSgShv4fpVHiotR70dNvAOSkzRvKVRzV6IGyFnxHjmyVVPEV0dsqzVLxltwYTqFhwI+UOwm45A==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -536,9 +536,9 @@
       }
     },
     "node_modules/@cspell/cspell-resolver": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.16.1.tgz",
-      "integrity": "sha512-CfVI2JFMwh9/n1QuU9niEONbYCX1XGKqmyCcHQUzAapSqGzbAmFrRFnvyKwNL+mmy1bxli9EZV8f5vBco26f9Q==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.17.1.tgz",
+      "integrity": "sha512-XEK2ymTdQNgsV3ny60VkKzWskbICl4zNXh/DbxsoRXHqIRg43MXFpTNkEJ7j873EqdX7BU4opQQ+5D4stWWuhQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -549,9 +549,9 @@
       }
     },
     "node_modules/@cspell/cspell-service-bus": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.16.1.tgz",
-      "integrity": "sha512-URaralJKcdHZH/Lr25L28GJo2Ub07adHPPhOL83BvmPyGkboehmz5arjNrgQFwS+IvGjHLdp5uzEJd0xyeHGdw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.17.1.tgz",
+      "integrity": "sha512-2sFWQtMEWZ4tdz7bw0bAx4NaV1t0ynGfjpuKWdQppsJFKNb+ZPZZ6Ah1dC13AdRRMZaG194kDRFwzNvRaCgWkQ==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -559,9 +559,9 @@
       }
     },
     "node_modules/@cspell/cspell-types": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.16.1.tgz",
-      "integrity": "sha512-B8bHlBaDSMDMEq++H8qO9osKUkzWUrP4CgWQyRqlXZ9EOdnJ469Tp1wghcQ7DezII3aXYrHiVKsUYY9VvjkhIg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.17.1.tgz",
+      "integrity": "sha512-NJbov7Jp57fh8addoxesjb8atg/APQfssCH5Q9uZuHBN06wEJDgs7fhfE48bU+RBViC9gltblsYZzZZQKzHYKg==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -597,9 +597,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-companies": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.1.7.tgz",
-      "integrity": "sha512-ncVs/efuAkP1/tLDhWbXukBjgZ5xOUfe03neHMWsE8zvXXc5+Lw6TX5jaJXZLOoES/f4j4AhRE20jsPCF5pm+A==",
+      "version": "3.1.9",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-companies/-/dict-companies-3.1.9.tgz",
+      "integrity": "sha512-w7XEJ2B6x2jq9ws5XNyYgpYj2MxdZ3jW3PETLxjK7nc8pulCFmaGVgZ0JTnDWfJ3QMOczoagn5f9LM2PZ/CuJg==",
       "dev": true,
       "license": "MIT"
     },
@@ -695,9 +695,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-filetypes": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.8.tgz",
-      "integrity": "sha512-D3N8sm/iptzfVwsib/jvpX+K/++rM8SRpLDFUaM4jxm8EyGmSIYRbKZvdIv5BkAWmMlTWoRqlLn7Yb1b11jKJg==",
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-filetypes/-/dict-filetypes-3.0.9.tgz",
+      "integrity": "sha512-U7ycC1cE32A5aEgwzp/iE0TVabonUFnVt+Ygbf6NsIWqEuFWZgZChC7gfztA4T1fpuj602nFdp7eOnTWKORsnQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -730,9 +730,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-gaming-terms": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.0.8.tgz",
-      "integrity": "sha512-7OL0zTl93WFWhhtpXFrtm9uZXItC3ncAs8d0iQDMMFVNU1rBr6raBNxJskxE5wx2Ant12fgI66ZGVagXfN+yfA==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-gaming-terms/-/dict-gaming-terms-1.0.9.tgz",
+      "integrity": "sha512-AVIrZt3YiUnxsUzzGYTZ1XqgtkgwGEO0LWIlEf+SiDUEVLtv4CYmmyXFQ+WXDN0pyJ0wOwDazWrP0Cu7avYQmQ==",
       "dev": true,
       "license": "MIT"
     },
@@ -855,9 +855,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-npm": {
-      "version": "5.1.14",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.1.14.tgz",
-      "integrity": "sha512-7VV/rrRlxOwy5j0bpw6/Uci+nx/rwSgx45FJdeKq++nHsBx/nEXMFNODknm4Mi6i7t7uOVHExpifrR6w6xTWww==",
+      "version": "5.1.18",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.1.18.tgz",
+      "integrity": "sha512-/Nukl+DSxtEWSlb8svWFSpJVctAsM9SP+f5Q1n+qdDcXNKMb1bUCo/d3QZPwyOhuMjDawnsGBUAfp+iq7Mw83Q==",
       "dev": true,
       "license": "MIT"
     },
@@ -883,9 +883,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-python": {
-      "version": "4.2.12",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.12.tgz",
-      "integrity": "sha512-U25eOFu+RE0aEcF2AsxZmq3Lic7y9zspJ9SzjrC0mfJz+yr3YmSCw4E0blMD3mZoNcf7H/vMshuKIY5AY36U+Q==",
+      "version": "4.2.13",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.13.tgz",
+      "integrity": "sha512-mZIcmo9qif8LkJ6N/lqTZawcOk2kVTcuWIUOSbMcjyomO0XZ7iWz15TfONyr03Ea/l7o5ULV+MZ4vx76bAUb7w==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -921,9 +921,9 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dict-software-terms": {
-      "version": "4.1.17",
-      "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-4.1.17.tgz",
-      "integrity": "sha512-QORIk1R5DV8oOQ+oAlUWE7UomaJwUucqu2srrc2+PmkoI6R1fJwwg2uHCPBWlIb4PGDNEdXLv9BAD13H+0wytQ==",
+      "version": "4.1.20",
+      "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-4.1.20.tgz",
+      "integrity": "sha512-ma51njqbk9ZKzZF9NpCZpZ+c50EwR5JTJ2LEXlX0tX+ExVbKpthhlDLhT2+mkUh5Zvj+CLf5F9z0qB4+X3re/w==",
       "dev": true,
       "license": "MIT"
     },
@@ -970,12 +970,13 @@
       "license": "MIT"
     },
     "node_modules/@cspell/dynamic-import": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.16.1.tgz",
-      "integrity": "sha512-mEfdeS1kFKpJoDsQ8wW6PxO3+ncYuZCWCASR0trbzZDduzO2RcogMUgzP99obHtYbgXadw94qcQWXB8OYTPSwg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.17.1.tgz",
+      "integrity": "sha512-XQtr2olYOtqbg49E+8SISd6I5DzfxmsKINDn0ZgaTFeLalnNdF3ewDU4gOEbApIzGffRa1mW9t19MsiVrznSDw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
+        "@cspell/url": "8.17.1",
         "import-meta-resolve": "^4.1.0"
       },
       "engines": {
@@ -983,9 +984,9 @@
       }
     },
     "node_modules/@cspell/filetypes": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-8.16.1.tgz",
-      "integrity": "sha512-zpbNg3n26muR1jdMbylw5YsaVGyS9LU5Lfy20gU7RygAk6kFyx3Yz4C84EihBGQHy2gVEsEeyCCxk+R8RXuPZA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-8.17.1.tgz",
+      "integrity": "sha512-AxYw6j7EPYtDFAFjwybjFpMc9waXQzurfBXmEVfQ5RQRlbylujLZWwR6GnMqofeNg4oGDUpEjcAZFrgdkvMQlA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -993,9 +994,9 @@
       }
     },
     "node_modules/@cspell/strong-weak-map": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.16.1.tgz",
-      "integrity": "sha512-jJQS05wg2iUkLKnPR8NEq3LqvqHWKnvUDFoPwaJzYw6ol/O4yi/lv+Me9+XCPrgjpnAz+8APhWkhrR/O71R1Bw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.17.1.tgz",
+      "integrity": "sha512-8cY3vLAKdt5gQEMM3Gr57BuQ8sun2NjYNh9qTdrctC1S9gNC7XzFghTYAfHSWR4VrOUcMFLO/izMdsc1KFvFOA==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1003,9 +1004,9 @@
       }
     },
     "node_modules/@cspell/url": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/@cspell/url/-/url-8.16.1.tgz",
-      "integrity": "sha512-kGlr7Wdo4xJpXKal/Gqo3Ll5Is7ptlIlLZOB/hzR6R53Fw4N6SdipTDIeHHqC15p2AXTEG6TSNdhk9dA50LY6w==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/@cspell/url/-/url-8.17.1.tgz",
+      "integrity": "sha512-LMvReIndW1ckvemElfDgTt282fb2C3C/ZXfsm0pJsTV5ZmtdelCHwzmgSBmY5fDr7D66XDp8EurotSE0K6BTvw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -1578,9 +1579,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.16.0.tgz",
-      "integrity": "sha512-tw2HxzQkrbeuvyj1tG2Yqq+0H9wGoI2IMk4EOsQeX+vmd75FtJAzf+gTA69WF+baUKRYQ3x2kbLE08js5OsTVg==",
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.17.0.tgz",
+      "integrity": "sha512-Sxc4hqcs1kTu0iID3kcZDW3JHq2a77HO9P8CP6YEA/FpH3Ll8UXE2r/86Rz9YJLKme39S9vU5OWNjC6Xl0Cr3w==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2723,16 +2724,16 @@
       "license": "MIT"
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.0.tgz",
-      "integrity": "sha512-hgUZ3kTEpVzKaK3uNibExUYm6SKKOmTU2BOxBSvOYwtJEPdVQ70kZJpPjstlnhCHcuc2WGfSbpKlb/69ttyN5Q==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.18.1.tgz",
+      "integrity": "sha512-rBnTWHCdbYM2lh7hjyXqxk70wvon3p2FyaniZuey5TrcGBpfhVp0OxOa6gxr9Q9YhZFKyfbEnxc24ZnVbbUkCA==",
       "dev": true,
-      "license": "MITClause",
+      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.18.0",
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/typescript-estree": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0",
+        "@typescript-eslint/scope-manager": "8.18.1",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/typescript-estree": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2748,14 +2749,14 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.0.tgz",
-      "integrity": "sha512-PNGcHop0jkK2WVYGotk/hxj+UFLhXtGPiGtiaWgVBVP1jhMoMCHlTyJA+hEj4rszoSdLTK3fN4oOatrL0Cp+Xw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.18.1.tgz",
+      "integrity": "sha512-HxfHo2b090M5s2+/9Z3gkBhI6xBH8OJCFjH9MhQ+nnoZqxU3wNxkLT+VWXWSFWc3UF3Z+CfPAyqdCTdoXtDPCQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0"
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2766,9 +2767,9 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.0.tgz",
-      "integrity": "sha512-FNYxgyTCAnFwTrzpBGq+zrnoTO4x0c1CKYY5MuUTzpScqmY5fmsh2o3+57lqdI3NZucBDCzDgdEbIaNfAjAHQA==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.18.1.tgz",
+      "integrity": "sha512-7uoAUsCj66qdNQNpH2G8MyTFlgerum8ubf21s3TSM3XmKXuIn+H2Sifh/ES2nPOPiYSRJWAk0fDkW0APBWcpfw==",
       "dev": true,
       "license": "MIT",
       "engines": {
@@ -2780,14 +2781,14 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.0.tgz",
-      "integrity": "sha512-rqQgFRu6yPkauz+ms3nQpohwejS8bvgbPyIDq13cgEDbkXt4LH4OkDMT0/fN1RUtzG8e8AKJyDBoocuQh8qNeg==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.18.1.tgz",
+      "integrity": "sha512-z8U21WI5txzl2XYOW7i9hJhxoKKNG1kcU4RzyNvKrdZDmbjkmLBo8bgeiOJmA06kizLI76/CCBAAGlTlEeUfyg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
-        "@typescript-eslint/visitor-keys": "8.18.0",
+        "@typescript-eslint/types": "8.18.1",
+        "@typescript-eslint/visitor-keys": "8.18.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
@@ -2807,13 +2808,13 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.18.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.0.tgz",
-      "integrity": "sha512-pCh/qEA8Lb1wVIqNvBke8UaRjJ6wrAWkJO5yyIbs8Yx6TNGYyfNjOo61tLv+WwLvoLPp4BQ8B7AHKijl8NGUfw==",
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.18.1.tgz",
+      "integrity": "sha512-Vj0WLm5/ZsD013YeUKn+K0y8p1M0jPpxOkKdbD1wB0ns53a5piVY02zjf072TblEweAbcYiFiPoSMF3kp+VhhQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.18.0",
+        "@typescript-eslint/types": "8.18.1",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -3840,9 +3841,9 @@
       "license": "MIT"
     },
     "node_modules/cross-spawn": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.5.tgz",
-      "integrity": "sha512-ZVJrKKYunU38/76t0RMOulHOnUcbU9GbpWKAOZ0mhjr7CX6FVrH+4FrAapSOekrgFQ3f/8gwMEuIft0aKq6Hug==",
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -3855,25 +3856,25 @@
       }
     },
     "node_modules/cspell": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell/-/cspell-8.16.1.tgz",
-      "integrity": "sha512-ILuCjnY3JPY2oO62PodTQD6n3DGTKTwB+IU1tE9EC6EP2Xw6z3Ir+hO2DO6QlRUmZlGrkGMek5U06nNmztt4eA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell/-/cspell-8.17.1.tgz",
+      "integrity": "sha512-D0lw8XTXrTycNzOn5DkfPJNUT00X53OgvFDm+0SzhBr1r+na8LEh3CnQ6zKYVU0fL0x8vU82vs4jmGjDho9mPg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-json-reporter": "8.16.1",
-        "@cspell/cspell-pipe": "8.16.1",
-        "@cspell/cspell-types": "8.16.1",
-        "@cspell/dynamic-import": "8.16.1",
-        "@cspell/url": "8.16.1",
+        "@cspell/cspell-json-reporter": "8.17.1",
+        "@cspell/cspell-pipe": "8.17.1",
+        "@cspell/cspell-types": "8.17.1",
+        "@cspell/dynamic-import": "8.17.1",
+        "@cspell/url": "8.17.1",
         "chalk": "^5.3.0",
         "chalk-template": "^1.1.0",
         "commander": "^12.1.0",
-        "cspell-dictionary": "8.16.1",
-        "cspell-gitignore": "8.16.1",
-        "cspell-glob": "8.16.1",
-        "cspell-io": "8.16.1",
-        "cspell-lib": "8.16.1",
+        "cspell-dictionary": "8.17.1",
+        "cspell-gitignore": "8.17.1",
+        "cspell-glob": "8.17.1",
+        "cspell-io": "8.17.1",
+        "cspell-lib": "8.17.1",
         "fast-json-stable-stringify": "^2.1.0",
         "file-entry-cache": "^9.1.0",
         "get-stdin": "^9.0.0",
@@ -3892,13 +3893,13 @@
       }
     },
     "node_modules/cspell-config-lib": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.16.1.tgz",
-      "integrity": "sha512-ohbSi9sI14rMdFc2g17ogObGGkd/x6zUVOzCH1nEOefC9yJYYfsvaMHqdhk0rOjvmF95j5OK4dm5oid+DKQcpw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.17.1.tgz",
+      "integrity": "sha512-x1S7QWprgUcwuwiJB1Ng0ZTBC4G50qP9qQyg/aroMkcdMsHfk26E8jUGRPNt4ftHFzS4YMhwtXuJQ9IgRUuNPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-types": "8.16.1",
+        "@cspell/cspell-types": "8.17.1",
         "comment-json": "^4.2.5",
         "yaml": "^2.6.1"
       },
@@ -3907,15 +3908,15 @@
       }
     },
     "node_modules/cspell-dictionary": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.16.1.tgz",
-      "integrity": "sha512-NL/vwf5SjtkWWaEUh+0dogKdEU4UuepJaNh36FX8W1CFtQXj7yEs45x4K7/Fp+pn/4AT7Qe7WpSSWi9z5GcqKg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.17.1.tgz",
+      "integrity": "sha512-zSl9l3wii+x16yc2NVZl/+CMLeLBAiuEd5YoFkOYPcbTJnfPwdjMNcj71u7wBvNJ+qwbF+kGbutEt15yHW3NBw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-pipe": "8.16.1",
-        "@cspell/cspell-types": "8.16.1",
-        "cspell-trie-lib": "8.16.1",
+        "@cspell/cspell-pipe": "8.17.1",
+        "@cspell/cspell-types": "8.17.1",
+        "cspell-trie-lib": "8.17.1",
         "fast-equals": "^5.0.1"
       },
       "engines": {
@@ -3923,15 +3924,15 @@
       }
     },
     "node_modules/cspell-gitignore": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.16.1.tgz",
-      "integrity": "sha512-Gg8qvFc8wr1D7TvB+GSfT1jyrUoUmPiG3WdOnQnxOSYKJesOiVvNxLv7YXRFkcUKG1VU6XDUkpb/uzKh3k2rKw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.17.1.tgz",
+      "integrity": "sha512-bk727Zf4FBCjm9Mwvyreyhgjwe+YhPQEW7PldkHiinKd+Irfez4s8GXLQb1EgV0UpvViqaqBqLmngjZdS30BTA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/url": "8.16.1",
-        "cspell-glob": "8.16.1",
-        "cspell-io": "8.16.1",
+        "@cspell/url": "8.17.1",
+        "cspell-glob": "8.17.1",
+        "cspell-io": "8.17.1",
         "find-up-simple": "^1.0.0"
       },
       "bin": {
@@ -3942,13 +3943,13 @@
       }
     },
     "node_modules/cspell-glob": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.16.1.tgz",
-      "integrity": "sha512-EukaXFaUrgrY9G4bB2PguzpkAoOq6ai9acLl6gWD+6DgVEwkLqPmCWjsFJA0MaqVp9QvPsIfCy4KCnx35csG/g==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.17.1.tgz",
+      "integrity": "sha512-cUwM5auSt0RvLX7UkP2GEArJRWc85l51B1voArl+3ZIKeMZwcJpJgN3qvImtF8yRTZwYeYCs1sgsihb179q+mg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/url": "8.16.1",
+        "@cspell/url": "8.17.1",
         "micromatch": "^4.0.8"
       },
       "engines": {
@@ -3956,14 +3957,14 @@
       }
     },
     "node_modules/cspell-grammar": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.16.1.tgz",
-      "integrity": "sha512-7IRYa0O1xfK2HVbhGSpOPPt5HlP2ZHRHtdLU2iOvMSCkh0cSPERu++kdprvcaOf7E7koo0P+bxHSprcYbU/agg==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.17.1.tgz",
+      "integrity": "sha512-H5tLcBuW7aUj9L0rR+FSbnWPEsWb8lWppHVidtqw9Ll1CUHWOZC9HTB2RdrhJZrsz/8DJbM2yNbok0Xt0VAfdw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-pipe": "8.16.1",
-        "@cspell/cspell-types": "8.16.1"
+        "@cspell/cspell-pipe": "8.17.1",
+        "@cspell/cspell-types": "8.17.1"
       },
       "bin": {
         "cspell-grammar": "bin.mjs"
@@ -3973,42 +3974,42 @@
       }
     },
     "node_modules/cspell-io": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-8.16.1.tgz",
-      "integrity": "sha512-25MOQfy7EhdVeoNUW/+jyb5ArDYSLbaFwVToakHtLGuYk9cW8q8MAHq1W9GzW06wXswT2sQsRvaozmIOTDIOnw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-8.17.1.tgz",
+      "integrity": "sha512-liIOsblt7oVItifzRAbuxiYrwlgw1VOqKppMxVKtYoAn2VUuuEpjCj6jLWpoTqSszR/38o7ChsHY1LHakhJZmw==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-service-bus": "8.16.1",
-        "@cspell/url": "8.16.1"
+        "@cspell/cspell-service-bus": "8.17.1",
+        "@cspell/url": "8.17.1"
       },
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/cspell-lib": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.16.1.tgz",
-      "integrity": "sha512-Gn1vJcyhYe78iB+9dms8rnfgDEfJgYocXapFPTOcZV3EUWKcV4wyCiHdbK3j2ElLXmPuSPg4eZSlxxk8ITD0Aw==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.17.1.tgz",
+      "integrity": "sha512-66n83Q7bK5tnvkDH7869/pBY/65AKmZVfCOAlsbhJn3YMDbNHFCHR0d1oNMlqG+n65Aco89VGwYfXxImZY+/mA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-bundled-dicts": "8.16.1",
-        "@cspell/cspell-pipe": "8.16.1",
-        "@cspell/cspell-resolver": "8.16.1",
-        "@cspell/cspell-types": "8.16.1",
-        "@cspell/dynamic-import": "8.16.1",
-        "@cspell/filetypes": "8.16.1",
-        "@cspell/strong-weak-map": "8.16.1",
-        "@cspell/url": "8.16.1",
+        "@cspell/cspell-bundled-dicts": "8.17.1",
+        "@cspell/cspell-pipe": "8.17.1",
+        "@cspell/cspell-resolver": "8.17.1",
+        "@cspell/cspell-types": "8.17.1",
+        "@cspell/dynamic-import": "8.17.1",
+        "@cspell/filetypes": "8.17.1",
+        "@cspell/strong-weak-map": "8.17.1",
+        "@cspell/url": "8.17.1",
         "clear-module": "^4.1.2",
         "comment-json": "^4.2.5",
-        "cspell-config-lib": "8.16.1",
-        "cspell-dictionary": "8.16.1",
-        "cspell-glob": "8.16.1",
-        "cspell-grammar": "8.16.1",
-        "cspell-io": "8.16.1",
-        "cspell-trie-lib": "8.16.1",
+        "cspell-config-lib": "8.17.1",
+        "cspell-dictionary": "8.17.1",
+        "cspell-glob": "8.17.1",
+        "cspell-grammar": "8.17.1",
+        "cspell-io": "8.17.1",
+        "cspell-trie-lib": "8.17.1",
         "env-paths": "^3.0.0",
         "fast-equals": "^5.0.1",
         "gensequence": "^7.0.0",
@@ -4023,14 +4024,14 @@
       }
     },
     "node_modules/cspell-trie-lib": {
-      "version": "8.16.1",
-      "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.16.1.tgz",
-      "integrity": "sha512-T86nszsjQjyZ35dOWk7qN17Hem0cVeXJ4D1v/gIG+Y0Umo7dBW7AwmTvUy8iMFAra29cSdgRH+yk6q1qdpA+ZA==",
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.17.1.tgz",
+      "integrity": "sha512-13WNa5s75VwOjlGzWprmfNbBFIfXyA7tYYrbV+LugKkznyNZJeJPojHouEudcLq3SYb2Q6tJ7qyWcuT5bR9qPA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@cspell/cspell-pipe": "8.16.1",
-        "@cspell/cspell-types": "8.16.1",
+        "@cspell/cspell-pipe": "8.17.1",
+        "@cspell/cspell-types": "8.17.1",
         "gensequence": "^7.0.0"
       },
       "engines": {
@@ -4345,9 +4346,9 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.16.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.16.0.tgz",
-      "integrity": "sha512-whp8mSQI4C8VXd+fLgSM0lh3UlmcFtVwUQjyKCFfsp+2ItAIYhlq/hqGahGqHE6cv9unM41VlqKk2VtKYR2TaA==",
+      "version": "9.17.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.17.0.tgz",
+      "integrity": "sha512-evtlNcpJg+cZLcnVKwsai8fExnqjGPicK7gnUtlNuzu+Fv9bI0aLpND5T44VLQtoMEnI57LoXO9XAkIXwohKrA==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -4356,7 +4357,7 @@
         "@eslint/config-array": "^0.19.0",
         "@eslint/core": "^0.9.0",
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.16.0",
+        "@eslint/js": "9.17.0",
         "@eslint/plugin-kit": "^0.2.3",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -4365,7 +4366,7 @@
         "@types/json-schema": "^7.0.15",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.5",
+        "cross-spawn": "^7.0.6",
         "debug": "^4.3.2",
         "escape-string-regexp": "^4.0.0",
         "eslint-scope": "^8.2.0",