Skip to content

refactor(commons): Replace the _ utilities with standalone functions (v6) #3724

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
fratzinger wants to merge 1 commit into
base: v6
Choose a base branch
from
Open

refactor(commons): Replace the _ utilities with standalone functions (v6) #3724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/feathers/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
"require": "./cjs/hooks/index.js"
},
"./commons": {
"import": "./lib/commons.js",
"require": "./cjs/commons.js"
"import": "./lib/commons/index.js",
"require": "./cjs/commons/index.js"
},
"./errors": {
"import": "./lib/errors.js",
Expand Down Expand Up @@ -57,7 +57,7 @@
"./lib/hooks/index.d.ts"
],
"commons": [
"./lib/commons.d.ts"
"./lib/commons/index.d.ts"
],
"client": [
"./lib/client/index.d.ts"
Expand Down
2 changes: 1 addition & 1 deletion packages/feathers/src/application.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { EventEmitter } from './event-emitter.js'
import { HOOKS, hooks, middleware } from './hooks/index.js'

import { stripSlashes } from './commons.js'
import { stripSlashes } from './commons/index.js'
import { createDebug } from './debug.js'

import version from './version.js'
Expand Down
9 changes: 6 additions & 3 deletions packages/feathers/src/client/fetch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
import { Params, Id, Query, NullableId } from '../declarations.js'
import { BadRequest, Unavailable, convert, errors } from '../errors.js'
import { _, stripSlashes } from '../commons.js'
import { pick, stripSlashes } from '../commons/index.js'
import { protectedProperties } from '../service.js'

function toError(error: Error & { code: string }, status?: number) {
function toError(
error: Error & { code: string; address?: string; port?: number; config?: unknown },
status?: number
) {
if (error.code === 'ECONNREFUSED') {
return new Unavailable(error.message, _.pick(error, 'address', 'port', 'config'))
return new Unavailable(error.message, pick(error, 'address', 'port', 'config'))
}

return convert(error, status)
Expand Down
226 changes: 0 additions & 226 deletions packages/feathers/src/commons.test.ts
View file
Open in desktop

This file was deleted.

106 changes: 0 additions & 106 deletions packages/feathers/src/commons.ts
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions packages/feathers/src/commons/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export * from './object.js'
export * from './path.js'
Loading
Loading