Skip to content

Commit 11bcb66

Browse files
nickmeinholdwing328
nickmeinhold
authored and
wing328
committed
Dart generate keywords (#4449)
* Add script to use Dart SDK to generate keywords * Read generated keywords in dart generator
1 parent 7bfc53b commit 11bcb66

9 files changed

Lines changed: 388 additions & 15 deletions

File tree

‎bin/utils/dart-keywords/README.md‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
2+
## What is the purpose?
3+
4+
Running `./save_dart_keywords.sh` from this directory will generate `dart-keywords.txt` which contains the current Dart keywords and is used by the dart generator as a set of reserved words.
5+
6+
## When should the keywords be generated?
7+
8+
`save_dart_keywords.sh` should be run when a new version of Dart is release to update the keywords file.
9+
10+
The last Dart version that was used to generate the keywords can be found in `dart-version.txt`.
11+
12+
## What does the shellscript do?
13+
14+
1. compile a dart app
15+
- `dart2native save-dart-keywords.dart`
16+
17+
1. run the dart app
18+
- `./save-dart-keywords.exe`
19+
20+
1. the ouput is `dart-keywords.txt` and `dart-version.txt`

‎bin/utils/dart-keywords/dart-version.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Dart VM version: 2.7.0-dev.0.0 (Tue Nov 5 12:57:33 2019 +0100) on "macos_x64"

‎bin/utils/dart-keywords/pubspec.lock‎

Lines changed: 194 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,194 @@
1+
# Generated by pub
2+
# See https://dart.dev/tools/pub/glossary#lockfile
3+
packages:
4+
_fe_analyzer_shared:
5+
dependency: transitive
6+
description:
7+
name: _fe_analyzer_shared
8+
url: "https://pub.dartlang.org"
9+
source: hosted
10+
version: "1.0.0"
11+
analyzer:
12+
dependency: "direct main"
13+
description:
14+
name: analyzer
15+
url: "https://pub.dartlang.org"
16+
source: hosted
17+
version: "0.39.1"
18+
args:
19+
dependency: transitive
20+
description:
21+
name: args
22+
url: "https://pub.dartlang.org"
23+
source: hosted
24+
version: "1.5.2"
25+
async:
26+
dependency: transitive
27+
description:
28+
name: async
29+
url: "https://pub.dartlang.org"
30+
source: hosted
31+
version: "2.4.0"
32+
charcode:
33+
dependency: transitive
34+
description:
35+
name: charcode
36+
url: "https://pub.dartlang.org"
37+
source: hosted
38+
version: "1.1.2"
39+
collection:
40+
dependency: transitive
41+
description:
42+
name: collection
43+
url: "https://pub.dartlang.org"
44+
source: hosted
45+
version: "1.14.12"
46+
convert:
47+
dependency: transitive
48+
description:
49+
name: convert
50+
url: "https://pub.dartlang.org"
51+
source: hosted
52+
version: "2.1.1"
53+
crypto:
54+
dependency: transitive
55+
description:
56+
name: crypto
57+
url: "https://pub.dartlang.org"
58+
source: hosted
59+
version: "2.1.3"
60+
csslib:
61+
dependency: transitive
62+
description:
63+
name: csslib
64+
url: "https://pub.dartlang.org"
65+
source: hosted
66+
version: "0.16.1"
67+
front_end:
68+
dependency: transitive
69+
description:
70+
name: front_end
71+
url: "https://pub.dartlang.org"
72+
source: hosted
73+
version: "0.1.29"
74+
glob:
75+
dependency: transitive
76+
description:
77+
name: glob
78+
url: "https://pub.dartlang.org"
79+
source: hosted
80+
version: "1.2.0"
81+
html:
82+
dependency: transitive
83+
description:
84+
name: html
85+
url: "https://pub.dartlang.org"
86+
source: hosted
87+
version: "0.14.0+3"
88+
js:
89+
dependency: transitive
90+
description:
91+
name: js
92+
url: "https://pub.dartlang.org"
93+
source: hosted
94+
version: "0.6.1+1"
95+
kernel:
96+
dependency: transitive
97+
description:
98+
name: kernel
99+
url: "https://pub.dartlang.org"
100+
source: hosted
101+
version: "0.3.29"
102+
meta:
103+
dependency: transitive
104+
description:
105+
name: meta
106+
url: "https://pub.dartlang.org"
107+
source: hosted
108+
version: "1.1.8"
109+
node_interop:
110+
dependency: transitive
111+
description:
112+
name: node_interop
113+
url: "https://pub.dartlang.org"
114+
source: hosted
115+
version: "1.0.3"
116+
node_io:
117+
dependency: transitive
118+
description:
119+
name: node_io
120+
url: "https://pub.dartlang.org"
121+
source: hosted
122+
version: "1.0.1+2"
123+
package_config:
124+
dependency: transitive
125+
description:
126+
name: package_config
127+
url: "https://pub.dartlang.org"
128+
source: hosted
129+
version: "1.1.0"
130+
path:
131+
dependency: transitive
132+
description:
133+
name: path
134+
url: "https://pub.dartlang.org"
135+
source: hosted
136+
version: "1.6.4"
137+
pedantic:
138+
dependency: transitive
139+
description:
140+
name: pedantic
141+
url: "https://pub.dartlang.org"
142+
source: hosted
143+
version: "1.8.0+1"
144+
pub_semver:
145+
dependency: transitive
146+
description:
147+
name: pub_semver
148+
url: "https://pub.dartlang.org"
149+
source: hosted
150+
version: "1.4.2"
151+
source_span:
152+
dependency: transitive
153+
description:
154+
name: source_span
155+
url: "https://pub.dartlang.org"
156+
source: hosted
157+
version: "1.5.5"
158+
string_scanner:
159+
dependency: transitive
160+
description:
161+
name: string_scanner
162+
url: "https://pub.dartlang.org"
163+
source: hosted
164+
version: "1.0.5"
165+
term_glyph:
166+
dependency: transitive
167+
description:
168+
name: term_glyph
169+
url: "https://pub.dartlang.org"
170+
source: hosted
171+
version: "1.1.0"
172+
typed_data:
173+
dependency: transitive
174+
description:
175+
name: typed_data
176+
url: "https://pub.dartlang.org"
177+
source: hosted
178+
version: "1.1.6"
179+
watcher:
180+
dependency: transitive
181+
description:
182+
name: watcher
183+
url: "https://pub.dartlang.org"
184+
source: hosted
185+
version: "0.9.7+12"
186+
yaml:
187+
dependency: transitive
188+
description:
189+
name: yaml
190+
url: "https://pub.dartlang.org"
191+
source: hosted
192+
version: "2.2.0"
193+
sdks:
194+
dart: ">=2.6.0 <3.0.0"

‎bin/utils/dart-keywords/pubspec.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
name: dart_keywords
2+
description: Use the Dart SDK to generate Dart keywords.
3+
4+
version: 1.0.0+1
5+
6+
environment:
7+
sdk: ">=2.6.0 <3.0.0"
8+
9+
dependencies:
10+
analyzer:

‎bin/utils/dart-keywords/save-dart-keywords.dart‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import 'dart:io';
2+
3+
import 'package:analyzer/dart/ast/token.dart';
4+
5+
main() {
6+
// save keywords to a text file
7+
final txtFile = File(
8+
'../../../modules/openapi-generator/src/main/resources/dart/dart-keywords.txt');
9+
String txtString = '';
10+
for (String keyword in Keyword.keywords.keys.toList()) {
11+
txtString += keyword + '\n';
12+
}
13+
txtString =
14+
txtString.substring(0, txtString.length - 1); // remove last newline
15+
txtFile.writeAsStringSync(txtString);
16+
}

‎bin/utils/dart-keywords/save_dart_keywords.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dart2native save-dart-keywords.dart
2+
./save-dart-keywords.exe
3+
dart --version &> dart-version.txt

‎modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartClientCodegen.java‎

Lines changed: 45 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,47 @@
2626
import org.slf4j.Logger;
2727
import org.slf4j.LoggerFactory;
2828

29+
import java.io.BufferedReader;
2930
import java.io.File;
31+
import java.io.FileInputStream;
32+
import java.io.InputStreamReader;
33+
import java.nio.charset.Charset;
3034
import java.util.*;
3135

3236
import static org.openapitools.codegen.utils.StringUtils.camelize;
3337
import static org.openapitools.codegen.utils.StringUtils.underscore;
3438

39+
// import static org.openapitools.codegen.utils.StringUtils.camelize;
40+
// import static org.openapitools.codegen.utils.StringUtils.underscore;
41+
42+
// import java.io.BufferedReader;
43+
// import java.io.File;
44+
// import java.io.FileInputStream;
45+
// import java.io.InputStreamReader;
46+
// import java.nio.charset.Charset;
47+
// import java.util.ArrayList;
48+
// import java.util.Arrays;
49+
// import java.util.HashMap;
50+
// import java.util.HashSet;
51+
// import java.util.List;
52+
// import java.util.Map;
53+
// import java.util.Set;
54+
55+
// import javax.xml.validation.Schema;
56+
57+
// import org.apache.commons.io.FilenameUtils;
58+
// import org.openapitools.codegen.CodegenConfig;
59+
// import org.openapitools.codegen.CodegenConstants;
60+
// import org.openapitools.codegen.CodegenModel;
61+
// import org.openapitools.codegen.CodegenProperty;
62+
// import org.openapitools.codegen.CodegenType;
63+
// import org.openapitools.codegen.DefaultCodegen;
64+
// import org.openapitools.codegen.utils.ModelUtils;
65+
// import org.openapitools.codegen.utils.StringUtils;
66+
// import org.slf4j.LoggerFactory;
67+
68+
// import io.swagger.v3.oas.models.media.ArraySchema;
69+
3570
public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
3671
private static final Logger LOGGER = LoggerFactory.getLogger(DartClientCodegen.class);
3772

@@ -55,8 +90,7 @@ public class DartClientCodegen extends DefaultCodegen implements CodegenConfig {
5590
public DartClientCodegen() {
5691
super();
5792

58-
// clear import mapping (from default generator) as dart does not use it
59-
// at the moment
93+
// clear import mapping (from default generator) as dart does not use it at the moment
6094
importMapping.clear();
6195

6296
outputFolder = "generated-code/dart";
@@ -71,19 +105,15 @@ public DartClientCodegen() {
71105
modelTestTemplateFiles.put("model_test.mustache", ".dart");
72106
apiTestTemplateFiles.put("api_test.mustache", ".dart");
73107

74-
setReservedWordsLowerCase(
75-
Arrays.asList(
76-
"abstract", "as", "assert", "async", "async*", "await",
77-
"break", "case", "catch", "class", "const", "continue",
78-
"default", "deferred", "do", "dynamic", "else", "enum",
79-
"export", "external", "extends", "factory", "false", "final",
80-
"finally", "for", "get", "if", "implements", "import", "in",
81-
"is", "library", "new", "null", "operator", "part", "rethrow",
82-
"return", "set", "static", "super", "switch", "sync*", "this",
83-
"throw", "true", "try", "typedef", "var", "void", "while",
84-
"with", "yield", "yield*", "hide", "interface", "mixin", "on",
85-
"show", "async")
86-
);
108+
List<String> reservedWordsList = new ArrayList<String>();
109+
try {
110+
BufferedReader reader = new BufferedReader(new InputStreamReader(new FileInputStream("src/main/resources/dart/dart-keywords.txt"), Charset.forName("UTF-8")));
111+
while(reader.ready()) { reservedWordsList.add(reader.readLine()); }
112+
reader.close();
113+
} catch (Exception e) {
114+
LOGGER.error("Error reading dart keywords. Exception: {}", e.getMessage());
115+
}
116+
setReservedWordsLowerCase(reservedWordsList);
87117

88118
languageSpecificPrimitives = new HashSet<String>(
89119
Arrays.asList(

0 commit comments

Comments
 (0)