Skip to content

Commit 68a90bb

Browse files
committed
refactor: simplification of removals
1 parent 25abb07 commit 68a90bb

File tree

2 files changed

+11
-13
lines changed

2 files changed

+11
-13
lines changed

nut/project.nu

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,16 @@ export def "remove dependency" [
7171
let dependencies = $project | child dependencies
7272
let id = $package | package to id
7373

74+
let category = $project | find category $package
75+
if $category == null {
76+
error make { msg: $"Package doesn't exist in project: ($id)" }
77+
}
78+
7479
{
7580
...($project | reject --ignore-errors dependencies)
7681
dependencies: {
77-
runtime: {
78-
...($dependencies | child runtime | reject --ignore-errors $id)
79-
}
80-
development: {
81-
...($dependencies | child development | reject --ignore-errors $id)
82+
$category: {
83+
...($dependencies | child $category | reject --ignore-errors $id)
8284
}
8385
}
8486
}

test/project_test.nu

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -245,14 +245,11 @@ def "remove package that was not added" [] {
245245
fragment: ""
246246
}
247247

248-
let result = $project | project remove dependency $pkg
249-
250-
assert equal $result {
251-
dependencies: {
252-
runtime: { }
253-
development: { }
254-
}
248+
let error = catch-error {
249+
$project | project remove dependency $pkg
255250
}
251+
252+
assert equal $error "Package doesn't exist in project: github.com/example/project"
256253
}
257254

258255
# [test]
@@ -295,7 +292,6 @@ def "remove package that was previously added" [] {
295292
revision: "01"
296293
}
297294
}
298-
development: { }
299295
}
300296
}
301297
}

0 commit comments

Comments
 (0)