Skip to content

Commit 661ade2

Browse files
committed
refactor(before_v0.60): fix gen-js-ext.nu
It has already been moved but not ported from the old version - replace pipeline `for` with `each` - explicit print - port `$nu.scope` to `scope commands`
1 parent 5a85fb3 commit 661ade2

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

make_release/gen-js-ext.nu

+30-30
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,57 @@
11
def gen_keywords [] {
2-
let cmds = ($nu.scope.commands
2+
let cmds = (scope commands
33
| where is_extern == false
44
and is_custom == false
55
and category !~ deprecated
6-
and ($it.command | str contains -n ' ')
7-
| get command
6+
and ($it.name | str contains -n ' ')
7+
| get name
88
| str join '|')
99

1010
let var_with_dash_or_under_regex = '(([a-zA-Z]+[\\-_]){1,}[a-zA-Z]+\\s)'
1111
let preamble = '\\b('
1212
let postamble = ')\\b'
1313
$'"match": "($var_with_dash_or_under_regex)|($preamble)($cmds)($postamble)",'
1414
}
15-
$"Generating keywords(char nl)"
16-
gen_keywords
17-
char nl
18-
char nl
15+
print $"Generating keywords(char nl)"
16+
print (gen_keywords)
17+
print (char nl)
18+
print (char nl)
1919

2020
def gen_sub_keywords [] {
21-
let sub_cmds = ($nu.scope.commands
21+
let sub_cmds = (scope commands
2222
| where is_extern == false
2323
and is_custom == false
2424
and category !~ deprecated
25-
and ($it.command | str contains ' ')
26-
| get command)
25+
and ($it.name | str contains ' ')
26+
| get name)
2727

2828
let preamble = '\\b('
2929
let postamble = ')\\b'
30-
let cmds = (for x in $sub_cmds {
30+
let cmds = ($sub_cmds | each {|x|
3131
let parts = ($x | split row ' ')
3232
$'($parts.0)\\s($parts.1)'
3333
} | str join '|')
3434
$'"match": "($preamble)($cmds)($postamble)",'
3535
}
36-
$"Generating sub keywords(char nl)"
37-
gen_sub_keywords
38-
char nl
36+
print $"Generating sub keywords(char nl)"
37+
print (gen_sub_keywords)
38+
print (char nl)
3939

4040
def gen_keywords_alphabetically [] {
4141
let alphabet = [a b c d e f g h i j k l m n o p q r s t u v w x y z]
42-
let cmds = ($nu.scope.commands
42+
let cmds = (scope commands
4343
| where is_extern == false
4444
and is_custom == false
4545
and category !~ deprecated
46-
and ($it.command | str contains -n ' ')
47-
| get command)
46+
and ($it.name | str contains -n ' ')
47+
| get name)
4848

4949
let preamble = '\\b('
5050
let postamble = ')\\b'
5151

5252

53-
for alpha in $alphabet {
54-
let letter_cmds = (for cmd in $cmds {
53+
$alphabet | each {|alpha|
54+
let letter_cmds = ($cmds | each {|cmd|
5555
if ($cmd | str starts-with $alpha) {
5656
$cmd
5757
} else {
@@ -64,25 +64,25 @@ def gen_keywords_alphabetically [] {
6464
} | str join "\n"
6565
}
6666

67-
"Generating keywords alphabetically\n"
68-
gen_keywords_alphabetically
69-
char nl
67+
print "Generating keywords alphabetically\n"
68+
print (gen_keywords_alphabetically)
69+
print (char nl)
7070

7171
def gen_sub_keywords_alphabetically [] {
7272
let alphabet = [a b c d e f g h i j k l m n o p q r s t u v w x y z]
73-
let sub_cmds = ($nu.scope.commands
73+
let sub_cmds = (scope commands |
7474
| where is_extern == false
7575
and is_custom == false
7676
and category !~ deprecated
77-
and ($it.command | str contains ' ')
78-
| get command)
77+
and ($it.name | str contains ' ')
78+
| get name)
7979

8080
let preamble = '\\b('
8181
let postamble = ')\\b'
8282

8383

84-
for alpha in $alphabet {
85-
let letter_cmds = (for cmd in $sub_cmds {
84+
$alphabet | each {|alpha|
85+
let letter_cmds = ($sub_cmds | each {|cmd|
8686
if ($cmd | str starts-with $alpha) {
8787
let parts = ($cmd | split row ' ')
8888
$'($parts.0)\\s($parts.1)'
@@ -96,6 +96,6 @@ def gen_sub_keywords_alphabetically [] {
9696
} | str join "\n"
9797
}
9898

99-
"Generating sub keywords alphabetically\n"
100-
gen_sub_keywords_alphabetically
101-
char nl
99+
print "Generating sub keywords alphabetically\n"
100+
print (gen_sub_keywords_alphabetically)
101+
print (char nl)

0 commit comments

Comments
 (0)