Skip to content
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.

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

Add 'unique' filter #335

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
# 0.15.2

### Enhancements

- Added support for unique filter using `unique`. This filter allows you to extract unique values from an array
[David Bertet](https://github.com/DavidBertet)

## 0.15.1

### Bug Fixes
Expand Down
1 change: 1 addition & 0 deletions Sources/Stencil/Extension.swift
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ class DefaultExtension: Extension {
registerFilter("split", filter: splitFilter)
registerFilter("indent", filter: indentFilter)
registerFilter("filter", filter: filterFilter)
registerFilter("unique", filter: unique)
}
}

Expand Down
9 changes: 9 additions & 0 deletions Sources/Stencil/Filters.swift
Original file line number Diff line number Diff line change
Expand Up @@ -137,3 +137,12 @@ func filterFilter(value: Any?, arguments: [Any?], context: Context) throws -> An
try expr.resolve(context)
}
}

func unique(_ value: Any?) -> Any? {
if let array = value as? [any Hashable] {
var seen: Set<String> = []
return array.filter { seen.insert(stringify($0)).inserted }
} else {
return value
}
}
4 changes: 2 additions & 2 deletions Tests/StencilTests/EnvironmentBaseAndChildTemplateSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ final class EnvironmentBaseAndChildTemplateTests: XCTestCase {
baseTemplate = try environment.loadTemplate(name: "invalid-base.html")

try expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
childToken: "extends \"invalid-base.html\"",
baseToken: "target|unknown"
)
Expand Down Expand Up @@ -67,7 +67,7 @@ final class EnvironmentBaseAndChildTemplateTests: XCTestCase {
)

try expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
childToken: "target|unknown",
baseToken: nil
)
Expand Down
2 changes: 1 addition & 1 deletion Tests/StencilTests/EnvironmentIncludeTemplateSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ final class EnvironmentIncludeTemplateTests: XCTestCase {
includedTemplate = try environment.loadTemplate(name: "invalid-include.html")

try expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
token: #"include "invalid-include.html""#,
includedToken: "target|unknown"
)
Expand Down
14 changes: 7 additions & 7 deletions Tests/StencilTests/EnvironmentSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -91,55 +91,55 @@ final class EnvironmentTests: XCTestCase {
it("reports syntax error in for tag") {
self.template = "{% for name in names|unknown %}{{ name }}{% endfor %}"
try self.expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
token: "names|unknown"
)
}

it("reports syntax error in for-where tag") {
self.template = "{% for name in names where name|unknown %}{{ name }}{% endfor %}"
try self.expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
token: "name|unknown"
)
}

it("reports syntax error in if tag") {
self.template = "{% if name|unknown %}{{ name }}{% endif %}"
try self.expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
token: "name|unknown"
)
}

it("reports syntax error in elif tag") {
self.template = "{% if name %}{{ name }}{% elif name|unknown %}{% endif %}"
try self.expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
token: "name|unknown"
)
}

it("reports syntax error in ifnot tag") {
self.template = "{% ifnot name|unknown %}{{ name }}{% endif %}"
try self.expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
token: "name|unknown"
)
}

it("reports syntax error in filter tag") {
self.template = "{% filter unknown %}Text{% endfilter %}"
try self.expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
token: "filter unknown"
)
}

it("reports syntax error in variable tag") {
self.template = "{{ name|unknown }}"
try self.expectError(
reason: "Unknown filter 'unknown'. Found similar filters: 'uppercase'.",
reason: "Unknown filter 'unknown'. Found similar filters: 'unique'.",
token: "name|unknown"
)
}
Expand Down
20 changes: 20 additions & 0 deletions Tests/StencilTests/FilterSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,26 @@ final class FilterTests: XCTestCase {
}
}

func testUniqueFilter() {
let template = Template(templateString: """
{{ value|unique }}
""")

it("collection of strings") {
let result = try template.render(Context(dictionary: ["value": ["One", "Two", "One", "two"]]))
try expect(result) == """
["One", "Two", "two"]
"""
}

it("mixed-type collection") {
let result = try template.render(Context(dictionary: ["value": ["One", 2, true, 2, true, 10.5, "2", "five", "One"]]))
try expect(result) == """
["One", 2, true, 10.5, "five"]
"""
}
}

private func expectError(
reason: String,
token: String,
Expand Down
11 changes: 11 additions & 0 deletions docs/builtins.rst
Original file line number Diff line number Diff line change
Expand Up @@ -449,3 +449,14 @@ Applies the filter with the name provided as an argument to the current expressi
{{ string|filter:myfilter }}

This expression will resolve the `myfilter` variable, find a filter named the same as resolved value, and will apply it to the `string` variable. I.e. if `myfilter` variable resolves to string `uppercase` this expression will apply file `uppercase` to `string` variable.

``unique``
~~~~~~~~~

Returns a list of unique items from the given value.

.. code-block:: html+django

{{ value|unique }}

The unique items are yielded in the same order as their first occurrence in the iterable passed to the filter.