Skip to content

Commit 1c8fb05

Browse files
robmllzerobmllze
committed
Update
1 parent f870a38 commit 1c8fb05

25 files changed

+149
-35
lines changed

‎bin/generate_screen_access.dart renamed to ‎bin/genscr-access-v1.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@
77
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
88
//.title~
99

10-
// import 'dart:io' show Directory;
11-
1210
import 'package:df_generate_screen/df_generate_screen.dart';
1311
import 'package:df_log/df_log.dart';
1412

1513
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1614

15+
const VERSION = 'v1';
16+
1717
void main(List<String> args) async {
1818
DebugLog.debugOnly = false;
19-
await generateScreenAccessApp(args);
19+
await generateScreenAccessApp([
20+
...args,
21+
'--template',
22+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/access.dart.md',
23+
]);
2024
}

‎bin/generate_screen_bindings.dart renamed to ‎bin/genscr-access-v2.dart

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,18 @@
77
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
88
//.title~
99

10-
// import 'dart:io' show Directory;
11-
1210
import 'package:df_generate_screen/df_generate_screen.dart';
1311
import 'package:df_log/df_log.dart';
1412

1513
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1614

15+
const VERSION = 'v2';
16+
1717
void main(List<String> args) async {
1818
DebugLog.debugOnly = false;
19-
await runGenerateScreenBindingsApp(args);
19+
await generateScreenAccessApp([
20+
...args,
21+
'--template',
22+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/access.dart.md',
23+
]);
2024
}

‎bin/genscr-bindings-v1.dart

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//.title
2+
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
3+
//
4+
// Dart/Flutter (DF) Packages by DevCetra.com & contributors. SSee LICENSE file
5+
// in root directory.
6+
//
7+
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
8+
//.title~
9+
10+
import 'package:df_generate_screen/df_generate_screen.dart';
11+
import 'package:df_log/df_log.dart';
12+
13+
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
14+
15+
const VERSION = 'v1';
16+
17+
void main(List<String> args) async {
18+
DebugLog.debugOnly = false;
19+
await runGenerateScreenBindingsApp([
20+
...args,
21+
'--template',
22+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/bindings.dart.md',
23+
]);
24+
}

‎bin/genscr-bindings-v2.dart

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
//.title
2+
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
3+
//
4+
// Dart/Flutter (DF) Packages by DevCetra.com & contributors. SSee LICENSE file
5+
// in root directory.
6+
//
7+
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
8+
//.title~
9+
10+
import 'package:df_generate_screen/df_generate_screen.dart';
11+
import 'package:df_log/df_log.dart';
12+
13+
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
14+
15+
const VERSION = 'v2';
16+
17+
void main(List<String> args) async {
18+
DebugLog.debugOnly = false;
19+
await runGenerateScreenBindingsApp([
20+
...args,
21+
'--template',
22+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/bindings.dart.md',
23+
]);
24+
}

‎bin/generate_screen.dart renamed to ‎bin/genscr-v1.dart

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,33 @@ import 'package:df_string/df_string.dart';
1616

1717
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
1818

19+
const VERSION = 'v1';
20+
1921
void main(List<String> args) async {
2022
final currentDir = Directory.current.path;
2123
DebugLog.debugOnly = false;
22-
final argsChecker = await runGenerateScreensApp(args);
24+
25+
final argsChecker = await runGenerateScreensApp([
26+
...args,
27+
'--templates',
28+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/',
29+
]);
30+
final folder = argsChecker.screenName?.toSnakeCase() ?? '.';
2331
await runGenerateScreenBindingsApp([
2432
'-r',
2533
currentDir,
2634
'-s',
27-
argsChecker.screenName?.toSnakeCase() ?? '.',
35+
folder,
36+
'--template',
37+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/bindings.dart.md',
2838
]);
2939
await generateScreenAccessApp([
3040
'-r',
3141
currentDir,
3242
'-s',
3343
'.',
44+
'--template',
45+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/access.dart.md',
3446
]);
3547
await runGenerateIndexFilesForDartApp([
3648
'-r',

‎bin/genscr-v2.dart

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
//.title
2+
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
3+
//
4+
// Dart/Flutter (DF) Packages by DevCetra.com & contributors. SSee LICENSE file
5+
// in root directory.
6+
//
7+
// ▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓▓
8+
//.title~
9+
10+
import 'dart:io' show Directory;
11+
12+
import 'package:df_generate_screen/df_generate_screen.dart';
13+
14+
import 'package:df_log/df_log.dart';
15+
import 'package:df_string/df_string.dart';
16+
17+
// ░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░░
18+
19+
const VERSION = 'v2';
20+
21+
void main(List<String> args) async {
22+
final currentDir = Directory.current.path;
23+
DebugLog.debugOnly = false;
24+
25+
final argsChecker = await runGenerateScreensApp([
26+
...args,
27+
'--templates',
28+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/',
29+
]);
30+
final folder = argsChecker.screenName?.toSnakeCase() ?? '.';
31+
await runGenerateScreenBindingsApp([
32+
'-r',
33+
currentDir,
34+
'-s',
35+
folder,
36+
'--template',
37+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/bindings.dart.md',
38+
]);
39+
await generateScreenAccessApp([
40+
'-r',
41+
currentDir,
42+
'-s',
43+
'.',
44+
'--template',
45+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/$VERSION/access.dart.md',
46+
]);
47+
await runGenerateIndexFilesForDartApp([
48+
'-r',
49+
currentDir,
50+
'-s',
51+
'.',
52+
]);
53+
}

‎lib/src/generate_screen/app.dart

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Future<_ArgsChecker> runGenerateScreensApp(List<String> args) async {
5353
'templates',
5454
help: 'Template dir path or URL.',
5555
defaultsTo:
56-
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/msm1/',
56+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/v1/',
5757
)
5858
..addOption(
5959
'path',
@@ -97,14 +97,11 @@ Future<_ArgsChecker> runGenerateScreensApp(List<String> args) async {
9797
})
9898
.nonNulls
9999
.toSet();
100-
return entries != null
101-
? Map<String, String>.fromEntries(entries)
102-
: null;
100+
return entries != null ? Map<String, String>.fromEntries(entries) : null;
103101
}
104102

105103
bool toBool(String option) {
106-
return results[option]?.toString().toLowerCase().trim() ==
107-
true.toString();
104+
return results[option]?.toString().toLowerCase().trim() == true.toString();
108105
}
109106

110107
return argsChecker = _ArgsChecker(
@@ -132,8 +129,7 @@ Future<_ArgsChecker> runGenerateScreensApp(List<String> args) async {
132129
templatesPath: args.templatesPath!,
133130
path: args.path,
134131
isAccessibleOnlyIfLoggedIn: args.isAccessibleOnlyIfLoggedIn ?? false,
135-
isAccessibleOnlyIfLoggedInAndVerified:
136-
args.isAccessibleOnlyIfLoggedInAndVerified ?? false,
132+
isAccessibleOnlyIfLoggedInAndVerified: args.isAccessibleOnlyIfLoggedInAndVerified ?? false,
137133
isAccessibleOnlyIfLoggedOut: args.isAccessibleOnlyIfLoggedOut ?? false,
138134
isRedirectable: args.isRedirectable ?? false,
139135
internalParameters: args.internalParameters ?? const {},
@@ -197,8 +193,7 @@ class _ArgsChecker extends ValidArgsChecker {
197193
outputDirPath,
198194
screenName,
199195
if (templatesPath != null) templatesPath,
200-
if (isAccessibleOnlyIfLoggedInAndVerified != null)
201-
isAccessibleOnlyIfLoggedInAndVerified,
196+
if (isAccessibleOnlyIfLoggedInAndVerified != null) isAccessibleOnlyIfLoggedInAndVerified,
202197
if (isAccessibleOnlyIfLoggedIn != null) isAccessibleOnlyIfLoggedIn,
203198
if (isAccessibleOnlyIfLoggedOut != null) isAccessibleOnlyIfLoggedOut,
204199
if (isRedirectable != null) isRedirectable,

‎lib/src/generate_screen_access/app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ Future<void> generateScreenAccessApp(List<String> args) async {
4949
abbr: 't',
5050
help: 'Template file path or URL.',
5151
defaultsTo:
52-
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/msm1/access.dart.md',
52+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/v1/access.dart.md',
5353
)
5454
..addOption(
5555
'output',

‎lib/src/generate_screen_bindings/app.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Future<_ArgsChecker> runGenerateScreenBindingsApp(List<String> args) async {
5050
abbr: 't',
5151
help: 'Template file path or URL.',
5252
defaultsTo:
53-
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/msm1/bindings.dart.md',
53+
'https://raw.githubusercontent.com/robmllze/df_generate_screen/main/templates/v1/bindings.dart.md',
5454
)
5555
..addOption(
5656
'dart-sdk',

‎pubspec.yaml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ dev_dependencies:
4949
## -----------------------------------------------------------------------------
5050

5151
executables:
52-
df_generate_screen: generate_screen
53-
generate_screen: generate_screen
54-
genscr: generate_screen
52+
genscr: genscr-v1
53+
genscr-access: genscr-access-v1
54+
genscr-bindings: genscr-bindings-v1
5555

56-
df_generate_screen_access: generate_screen_access
57-
generate_screen_access: generate_screen_access
58-
genscr-access: generate_screen_access
56+
genscr-v1: genscr-v1
57+
genscr-access-v1: genscr-access-v1
58+
genscr-bindings-v1: genscr-bindings-v1
5959

60-
df_generate_screen_bindings: generate_screen_bindings
61-
generate_screen_bindings: generate_screen_bindings
62-
genscr-bindings: generate_screen_bindings
60+
genscr-v2: genscr-v2
61+
genscr-access-v2: genscr-access-v2
62+
genscr-bindings-v2: genscr-bindings-v2

0 commit comments

Comments
 (0)