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.

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

Jump to bottom

Add support for parameters as Array #39

Merged
merged 3 commits into from
Apr 18, 2024
Merged

Add support for parameters as Array #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a4d50c
Add support for parameters as Array
sousousore1 Apr 2, 2024
8852930
Remove type assertion
sousousore1 Apr 18, 2024
5fee200
Fix expectation of array of arrays
sousousore1 Apr 18, 2024
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
8 changes: 7 additions & 1 deletion lib/js_rails_routes/language/javascript.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,13 @@ class JavaScript < Base
var query = [];
for (var param in params) if (Object.prototype.hasOwnProperty.call(params, param)) {
if (keys.indexOf(param) === -1) {
query.push(param + "=" + encodeURIComponent(params[param]));
if (Array.isArray(params[param])) {
for (var value of params[param] as Value[]) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove type assertion, since it's JavaScript. 🙏

Suggested change
for (var value of params[param] as Value[]) {
for (var value of params[param]) {

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your feedback. I have made the suggested changes.

query.push(param + "[]=" + encodeURIComponent(value));
}
} else {
query.push(param + "=" + encodeURIComponent(params[param]));
}
}
}
return query.length ? route + "?" + query.join("&") : route;
Expand Down
10 changes: 8 additions & 2 deletions lib/js_rails_routes/language/typescript.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,20 @@ module JSRailsRoutes
module Language
class TypeScript < JavaScript
PROCESS_FUNC = <<~TYPESCRIPT
type Value = string | number
type Value = string | number | Value[]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about this instead, since we don't expect array of array?

Suggested change
type Value = string | number | Value[]
type Value = string | number | (string | number)[]

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for your feedback. I have made the suggested changes.

type Params<Keys extends string> = { [key in Keys]: Value } & Record<string, Value>
function process(route: string, params: Record<string, Value> | undefined, keys: string[]): string {
if (!params) return route
var query: string[] = [];
for (var param in params) if (Object.prototype.hasOwnProperty.call(params, param)) {
if (keys.indexOf(param) === -1) {
query.push(param + "=" + encodeURIComponent(params[param].toString()));
if (Array.isArray(params[param])) {
for (var value of params[param] as Value[]) {
query.push(param + "[]=" + encodeURIComponent(value.toString()));
}
} else {
query.push(param + "=" + encodeURIComponent(params[param].toString()));
}
}
}
return query.length ? route + "?" + query.join("&") : route;
Expand Down
8 changes: 7 additions & 1 deletion spec/js_rails_routes/language/javascript_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@
var query = [];
for (var param in params) if (Object.prototype.hasOwnProperty.call(params, param)) {
if (keys.indexOf(param) === -1) {
query.push(param + "=" + encodeURIComponent(params[param]));
if (Array.isArray(params[param])) {
for (var value of params[param] as Value[]) {
query.push(param + "[]=" + encodeURIComponent(value));
}
} else {
query.push(param + "=" + encodeURIComponent(params[param]));
}
}
}
return query.length ? route + "?" + query.join("&") : route;
Expand Down
10 changes: 8 additions & 2 deletions spec/js_rails_routes/language/typescript_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,20 @@

it 'returns a typescript function' do
expect(subject).to eq <<~TYPESCRIPT
type Value = string | number
type Value = string | number | Value[]
type Params<Keys extends string> = { [key in Keys]: Value } & Record<string, Value>
function process(route: string, params: Record<string, Value> | undefined, keys: string[]): string {
if (!params) return route
var query: string[] = [];
for (var param in params) if (Object.prototype.hasOwnProperty.call(params, param)) {
if (keys.indexOf(param) === -1) {
query.push(param + "=" + encodeURIComponent(params[param].toString()));
if (Array.isArray(params[param])) {
for (var value of params[param] as Value[]) {
query.push(param + "[]=" + encodeURIComponent(value.toString()));
}
} else {
query.push(param + "=" + encodeURIComponent(params[param].toString()));
}
}
}
return query.length ? route + "?" + query.join("&") : route;
Expand Down
Loading