@feathersjs/feathers 5.0.10 → 5.0.11

package/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [5.0.11](https://github.com/feathersjs/feathers/compare/v5.0.10...v5.0.11) (2023-10-11)
+
+### Bug Fixes
+
+- **core:** context.path is now typed correctly ([#3303](https://github.com/feathersjs/feathers/issues/3303)) ([ff18b3f](https://github.com/feathersjs/feathers/commit/ff18b3f8b7c8dbc97be588f699d539226785343a))
+- **knex:** Update all dependencies and Knex peer ([#3308](https://github.com/feathersjs/feathers/issues/3308)) ([d2f9860](https://github.com/feathersjs/feathers/commit/d2f986036c4741cce2339d8abbcc6b2eb037a12a))
+
 ## [5.0.10](https://github.com/feathersjs/feathers/compare/v5.0.9...v5.0.10) (2023-10-03)
 
 **Note:** Version bump only for package @feathersjs/feathers

package/lib/declarations.d.ts

@@ -3,6 +3,10 @@ import { EventEmitter } from 'events';
 import { NextFunction, HookContext as BaseHookContext } from '@feathersjs/hooks';
 type SelfOrArray<S> = S | S[];
 type OptionalPick<T, K extends PropertyKey> = Pick<T, Extract<keyof T, K>>;
+type Entries<T> = {
+    [K in keyof T]: [K, T[K]];
+}[keyof T][];
+type GetKeyByValue<Obj, Value> = Extract<Entries<Obj>[number], [PropertyKey, Value]>[0];
 export type { NextFunction };
 /**
  * The object returned from `.find` call by standard database adapters
@@ -260,6 +264,7 @@ export interface Http {
     location?: string;
 }
 export type HookType = 'before' | 'after' | 'error' | 'around';
+type Serv<FA> = FA extends Application<infer S> ? S : never;
 export interface HookContext<A = Application, S = any> extends BaseHookContext<ServiceGenericType<S>> {
     /**
      * A read only property that contains the Feathers application object. This can be used to
@@ -275,7 +280,7 @@ export interface HookContext<A = Application, S = any> extends BaseHookContext<S
      * A read only property and contains the service name (or path) without leading or
      * trailing slashes.
      */
-    readonly path: string;
+    path: 0 extends 1 & S ? keyof Serv<A> & string : GetKeyByValue<Serv<A>, S> & string;
     /**
      * A read only property and contains the service this hook currently runs on.
      */

package/lib/version.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "5.0.10";
+declare const _default: "5.0.11";
 export default _default;

package/lib/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '5.0.10';
+exports.default = '5.0.11';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@feathersjs/feathers",
   "description": "A framework for real-time applications and REST API with JavaScript and TypeScript",
-  "version": "5.0.10",
+  "version": "5.0.11",
   "homepage": "http://feathersjs.com",
   "repository": {
     "type": "git",
@@ -58,17 +58,17 @@
     "access": "public"
   },
   "dependencies": {
-    "@feathersjs/commons": "^5.0.10",
+    "@feathersjs/commons": "^5.0.11",
     "@feathersjs/hooks": "^0.8.1",
     "events": "^3.3.0"
   },
   "devDependencies": {
     "@types/mocha": "^10.0.2",
-    "@types/node": "^20.8.2",
+    "@types/node": "^20.8.4",
     "mocha": "^10.2.0",
     "shx": "^0.3.4",
     "ts-node": "^10.9.1",
     "typescript": "^5.2.2"
   },
-  "gitHead": "463dedcd35b16e43bc55e04df877ca82ed38dcea"
+  "gitHead": "91294817845178ff0e9d4709127cb3e46d3562be"
 }

package/src/declarations.ts

@@ -3,6 +3,10 @@ import { NextFunction, HookContext as BaseHookContext } from '@feathersjs/hooks'
 
 type SelfOrArray<S> = S | S[]
 type OptionalPick<T, K extends PropertyKey> = Pick<T, Extract<keyof T, K>>
+type Entries<T> = {
+  [K in keyof T]: [K, T[K]]
+}[keyof T][]
+type GetKeyByValue<Obj, Value> = Extract<Entries<Obj>[number], [PropertyKey, Value]>[0]
 
 export type { NextFunction }
 
@@ -355,6 +359,8 @@ export interface Http {
 
 export type HookType = 'before' | 'after' | 'error' | 'around'
 
+type Serv<FA> = FA extends Application<infer S> ? S : never
+
 export interface HookContext<A = Application, S = any> extends BaseHookContext<ServiceGenericType<S>> {
   /**
    * A read only property that contains the Feathers application object. This can be used to
@@ -370,7 +376,7 @@ export interface HookContext<A = Application, S = any> extends BaseHookContext<S
    * A read only property and contains the service name (or path) without leading or
    * trailing slashes.
    */
-  readonly path: string
+  path: 0 extends 1 & S ? keyof Serv<A> & string : GetKeyByValue<Serv<A>, S> & string
   /**
    * A read only property and contains the service this hook currently runs on.
    */

package/src/version.ts

@@ -1 +1 @@
-export default '5.0.10'
+export default '5.0.11'