mrpastewart/platform-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed NNBD issues

Browse source
This commit is contained in:
thomashii 2021-09-07 08:11:42 +08:00
parent 3bfdf05c0e
commit 422c92098a
20 changed files with 97 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Change Log
## 3.1.1
* Fixed NNBD issues
## 3.1.0
* Upgraded to support `analyzer` 2.0.0 major release

2
README.md
View file

@ -2,7 +2,7 @@
[![Screenshot of Terminal](screenshots/angel3-screenshot.png)](https://github.com/dukefirehawk/angel3-cli)
[![version](https://img.shields.io/badge/pub-v3.1.0-brightgreen)](https://pub.dartlang.org/angel3_cli)
[![version](https://img.shields.io/badge/pub-v3.1.1-brightgreen)](https://pub.dartlang.org/angel3_cli)
[![Null Safety](https://img.shields.io/badge/null-safety-brightgreen)](https://dart.dev/null-safety)
[![Gitter](https://img.shields.io/gitter/room/angel_dart/discussion)](https://gitter.im/angel_dart/discussion)

15
lib/src/commands/deploy/systemd.dart
View file

@ -30,7 +30,7 @@ class SystemdCommand extends Command {
Future run() async {
var projectPath = p.absolute(p.current);
var pubspec = await loadPubspec();
var user = argResults!['user'];
var user = argResults?['user'];
var systemdText = '''
[Unit]
Description=`${pubspec.name}` server
@ -47,14 +47,15 @@ WantedBy=multi-user.target
'''
.trim();
if (!argResults!.wasParsed('out') && !argResults!.wasParsed('install')) {
if (argResults?.wasParsed('out') != true &&
argResults?.wasParsed('install') != true) {
print(systemdText);
} else if (argResults!.wasParsed('install')) {
var systemdPath = argResults!.wasParsed('out')
? (argResults!['out'] as String?)!
} else if (argResults?.wasParsed('install') == true) {
var systemdPath = argResults?.wasParsed('out') == true
? (argResults?['out'] as String)
: p.join('etc', 'systemd', 'system');
var serviceFilename = p.join(systemdPath,
p.setExtension(argResults!['install'] as String, '.service'));
p.setExtension(argResults?['install'] as String, '.service'));
var file = File(serviceFilename);
await file.create(recursive: true);
await file.writeAsString(systemdText);
@ -76,7 +77,7 @@ WantedBy=multi-user.target
print(red.wrap('$ballot Failed to install service system-wide.'));
}
} else {
var file = File(argResults!['out'] as String);
var file = File(argResults?['out'] as String);
await file.create(recursive: true);
await file.writeAsString(systemdText);
print(green.wrap(

12
lib/src/commands/install.dart
View file

@ -55,16 +55,16 @@ class InstallCommand extends Command {
'See here: https://github.com/angel-dart/install.git\n\n'
'To stop seeing this, downgrade to `package:angel_cli@<=2.0.0`.'));
if (argResults!['wipe'] as bool) {
if (argResults?['wipe'] as bool) {
if (await installRepo.exists()) await installRepo.delete(recursive: true);
} else if (argResults!['list'] as bool) {
} else if (argResults?['list'] as bool) {
var addons = await list();
print('${addons.length} add-on(s) installed:');
for (var addon in addons) {
print(' * ${addon.name}@${addon.version}: ${addon.description}');
}
} else if (argResults!['update'] as bool) {
} else if (argResults?['update'] as bool) {
await update();
} else if (argResults!.rest.isNotEmpty) {
if (!await installRepo.exists()) {
@ -73,7 +73,7 @@ class InstallCommand extends Command {
var pubspec = await loadPubspec();
for (var packageName in argResults!.rest) {
for (var packageName in argResults?.rest ?? <String>[]) {
var packageDir =
Directory.fromUri(installRepo.uri.resolve(packageName));
@ -98,7 +98,7 @@ class InstallCommand extends Command {
}
return null;
})
.where((d) => d != null)
.whereType<MakerDependency>()
.toList();
deps.addAll(projectPubspec.devDependencies.keys.map((k) {
@ -107,7 +107,7 @@ class InstallCommand extends Command {
return MakerDependency(k, dep.version.toString(), dev: true);
}
return null;
}).where((d) => d != null));
}).whereType<MakerDependency>());
await depend(deps);

10
lib/src/commands/make/controller.dart
View file

@ -32,7 +32,9 @@ class ControllerCommand extends Command {
@override
Future run() async {
String? name;
if (argResults!.wasParsed('name')) name = argResults!['name'] as String?;
if (argResults?.wasParsed('name') == true) {
name = argResults!['name'] as String?;
}
if (name?.isNotEmpty != true) {
name = prompts.get('Name of controller class');
@ -46,7 +48,7 @@ class ControllerCommand extends Command {
var rc = ReCase(name!);
var controllerLib = Library((controllerLib) {
if (argResults!['websocket'] as bool) {
if (argResults?['websocket'] as bool) {
deps.add(const MakerDependency('angel3_websocket', '^4.0.0'));
controllerLib.directives
.add(Directive.import('package:angel3_websocket/server.dart'));
@ -58,7 +60,7 @@ class ControllerCommand extends Command {
controllerLib.body.add(Class((clazz) {
clazz
..name = '${rc.pascalCase}Controller'
..extend = refer(argResults!['websocket'] as bool
..extend = refer(argResults?['websocket'] as bool
? 'WebSocketController'
: 'Controller');
@ -106,7 +108,7 @@ class ControllerCommand extends Command {
});
var outputDir = Directory.fromUri(
Directory.current.uri.resolve(argResults!['output-dir'] as String));
Directory.current.uri.resolve(argResults?['output-dir'] as String));
var controllerFile =
File.fromUri(outputDir.uri.resolve('${rc.snakeCase}.dart'));
if (!await controllerFile.exists()) {

10
lib/src/commands/make/maker.dart
View file

@ -12,13 +12,13 @@ class MakerDependency implements Comparable<MakerDependency> {
int compareTo(MakerDependency other) => name.compareTo(other.name);
}
Future depend(Iterable<MakerDependency?> deps) async {
Future depend(Iterable<MakerDependency> deps) async {
var pubspec = await loadPubspec();
var missing = <MakerDependency?>[];
var missing = <MakerDependency>[];
for (var dep in deps) {
var isPresent = false;
if (dep!.dev) {
if (dep.dev) {
isPresent = pubspec.devDependencies.containsKey(dep.name);
} else {
isPresent = pubspec.dependencies.containsKey(dep.name);
@ -41,8 +41,8 @@ Future depend(Iterable<MakerDependency?> deps) async {
}
}
var missingDeps = missing.where((d) => !d!.dev).toList()..sort();
var missingDevDeps = missing.where((d) => d!.dev).toList()..sort();
var missingDeps = missing.where((d) => !d.dev).toList()..sort();
var missingDevDeps = missing.where((d) => d.dev).toList()..sort();
var totalCount = missingDeps.length + missingDevDeps.length;
if (totalCount > 0) {

4
lib/src/commands/make/migration.dart
View file

@ -29,7 +29,9 @@ class MigrationCommand extends Command {
@override
FutureOr run() async {
String? name;
if (argResults!.wasParsed('name')) name = argResults!['name'] as String?;
if (argResults?.wasParsed('name') == true) {
name = argResults?['name'] as String?;
}
if (name?.isNotEmpty != true) {
name = prompts.get('Name of model class');

16
lib/src/commands/make/model.dart
View file

@ -34,7 +34,9 @@ class ModelCommand extends Command {
@override
Future run() async {
String? name;
if (argResults!.wasParsed('name')) name = argResults!['name'] as String?;
if (argResults?.wasParsed('name') == true) {
name = argResults?['name'] as String?;
}
if (name?.isNotEmpty != true) {
name = prompts.get('Name of model class');
@ -47,14 +49,14 @@ class ModelCommand extends Command {
var rc = ReCase(name!);
var modelLib = Library((modelLib) {
if (argResults!['orm'] as bool && argResults!['migration'] as bool) {
if (argResults?['orm'] as bool && argResults?['migration'] as bool) {
modelLib.directives.addAll([
Directive.import('package:angel3_migration/angel3_migration.dart'),
]);
}
var needsSerialize =
argResults!['serializable'] as bool || argResults!['orm'] as bool;
argResults?['serializable'] as bool || argResults?['orm'] as bool;
// argResults['migration'] as bool;
if (needsSerialize) {
@ -71,7 +73,7 @@ class ModelCommand extends Command {
// deps.add(const MakerDependency('angel_model', '^1.0.0'));
// }
if (argResults!['orm'] as bool) {
if (argResults?['orm'] as bool) {
modelLib.directives.addAll([
Directive.import('package:angel3_orm/angel3_orm.dart'),
]);
@ -93,8 +95,8 @@ class ModelCommand extends Command {
modelClazz.annotations.add(refer('serializable'));
}
if (argResults!['orm'] as bool) {
if (argResults!['migration'] as bool) {
if (argResults?['orm'] as bool) {
if (argResults?['migration'] as bool) {
modelClazz.annotations.add(refer('orm'));
} else {
modelClazz.annotations.add(
@ -106,7 +108,7 @@ class ModelCommand extends Command {
// Save model file
var outputDir = Directory.fromUri(
Directory.current.uri.resolve(argResults!['output-dir'] as String));
Directory.current.uri.resolve(argResults?['output-dir'] as String));
var modelFile = File.fromUri(outputDir.uri.resolve('${rc.snakeCase}.dart'));
if (!await modelFile.exists()) await modelFile.create(recursive: true);

4
lib/src/commands/make/plugin.dart
View file

@ -28,7 +28,9 @@ class PluginCommand extends Command {
Future run() async {
var pubspec = await loadPubspec();
String? name;
if (argResults!.wasParsed('name')) name = argResults!['name'] as String?;
if (argResults?.wasParsed('name') == true) {
name = argResults?['name'] as String?;
}
if (name?.isNotEmpty != true) {
name = prompts.get('Name of plug-in class');

45
lib/src/commands/make/service.dart
View file

@ -34,7 +34,9 @@ class ServiceCommand extends Command {
void run() async {
await loadPubspec();
String? name;
if (argResults!.wasParsed('name')) name = argResults!['name'] as String?;
if (argResults?.wasParsed('name') == true) {
name = argResults?['name'] as String?;
}
if (name?.isNotEmpty != true) {
name = prompts.get('Name of service');
@ -61,11 +63,11 @@ class ServiceCommand extends Command {
if (!deps.any((d) => d.name == dep.name)) deps.add(dep);
}
if (generator.goesFirst) {
if (name != null && generator.goesFirst) {
generator.applyToLibrary(serviceLib, name, rc.snakeCase);
serviceLib.directives.add(
Directive.import('package:angel3_framework/angel3_framework.dart'));
} else {
} else if (name != null) {
serviceLib.directives.add(
Directive.import('package:angel3_framework/angel3_framework.dart'));
generator.applyToLibrary(serviceLib, name, rc.snakeCase);
@ -83,8 +85,10 @@ class ServiceCommand extends Command {
..returns = refer('AngelConfigurer');
configureServer.body = Block((block) {
generator.applyToConfigureServer(
serviceLib, configureServer, block, name, rc.snakeCase);
if (name != null) {
generator.applyToConfigureServer(
serviceLib, configureServer, block, name, rc.snakeCase);
}
// return (Angel app) async {}
var closure = Method((closure) {
@ -93,24 +97,27 @@ class ServiceCommand extends Command {
..requiredParameters.add(Parameter((b) => b
..name = 'app'
..type = refer('Angel')));
closure.body = Block((block) {
generator.beforeService(serviceLib, block, name, rc.snakeCase);
if (name != null) {
generator.beforeService(serviceLib, block, name, rc.snakeCase);
// app.use('/api/todos', new MapService());
var service = generator.createInstance(
serviceLib, closure, name, rc.snakeCase);
// app.use('/api/todos', new MapService());
var service = generator.createInstance(
serviceLib, closure, name, rc.snakeCase);
if (argResults!['typed'] as bool) {
var tb = TypeReference((b) => b
..symbol = 'TypedService'
..types.add(refer(rc.pascalCase)));
service = tb.newInstance([service]);
if (argResults!['typed'] as bool) {
var tb = TypeReference((b) => b
..symbol = 'TypedService'
..types.add(refer(rc.pascalCase)));
service = tb.newInstance([service]);
}
block.addExpression(refer('app').property('use').call([
literal('/api/${pluralize(rc.snakeCase)}'),
service,
]));
}
block.addExpression(refer('app').property('use').call([
literal('/api/${pluralize(rc.snakeCase)}'),
service,
]));
});
});

8
lib/src/commands/make/test.dart
View file

@ -31,7 +31,9 @@ class TestCommand extends Command {
Future run() async {
var pubspec = await loadPubspec();
String? name;
if (argResults!.wasParsed('name')) name = argResults!['name'] as String?;
if (argResults?.wasParsed('name') == true) {
name = argResults?['name'] as String?;
}
if (name?.isNotEmpty != true) {
name = prompter.get('Name of test');
@ -45,7 +47,7 @@ class TestCommand extends Command {
var rc = ReCase(name!);
final testDir = Directory.fromUri(
Directory.current.uri.resolve(argResults!['output-dir'] as String));
Directory.current.uri.resolve(argResults?['output-dir'] as String));
final testFile =
File.fromUri(testDir.uri.resolve('${rc.snakeCase}_test.dart'));
if (!await testFile.exists()) await testFile.create(recursive: true);
@ -69,7 +71,7 @@ class TestCommand extends Command {
}
}
String _generateRunConfiguration(String? name, ReCase rc) {
String _generateRunConfiguration(String name, ReCase rc) {
return '''
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="$name Tests" type="DartTestRunConfigurationType" factoryName="Dart Test" singleton="true">

8
lib/src/commands/rename.dart
View file

@ -21,15 +21,15 @@ class RenameCommand extends Command {
@override
Future run() async {
String newName;
String? newName;
if (argResults!.rest.isNotEmpty) {
newName = argResults!.rest.first;
if (argResults?.rest.isNotEmpty == true) {
newName = argResults?.rest.first;
} else {
newName = prompts.get('Rename project to');
}
newName = ReCase(newName).snakeCase;
newName = ReCase(newName!).snakeCase;
var choice = prompts.getBool('Rename the project to `$newName`?');

4
lib/src/commands/service_generators/custom.dart
View file

@ -11,7 +11,7 @@ class CustomServiceGenerator extends ServiceGenerator {
const CustomServiceGenerator() : super('Custom');
@override
void applyToLibrary(LibraryBuilder library, String? name, String lower) {
void applyToLibrary(LibraryBuilder library, String name, String lower) {
library.body.add(Class((clazz) {
clazz
..name = '${name}Service'
@ -21,7 +21,7 @@ class CustomServiceGenerator extends ServiceGenerator {
@override
Expression createInstance(LibraryBuilder library, MethodBuilder methodBuilder,
String? name, String lower) {
String name, String lower) {
return refer('${name}Service').newInstance([]);
}
}

4
lib/src/commands/service_generators/file_service.dart
View file

@ -26,7 +26,7 @@ class FileServiceGenerator extends ServiceGenerator {
}
@override
void applyToLibrary(LibraryBuilder library, String? name, String lower) {
void applyToLibrary(LibraryBuilder library, String name, String lower) {
library.directives.addAll([
Directive.import('package:angel3_file_service/angel3_file_service.dart'),
]);
@ -34,7 +34,7 @@ class FileServiceGenerator extends ServiceGenerator {
@override
Expression createInstance(LibraryBuilder library, MethodBuilder methodBuilder,
String? name, String lower) {
String name, String lower) {
library.directives.addAll([
Directive.import('package:file/file.dart'),
]);

8
lib/src/commands/service_generators/generator.dart
View file

@ -25,20 +25,20 @@ class ServiceGenerator {
bool get goesFirst => false;
void applyToLibrary(LibraryBuilder library, String? name, String lower) {}
void applyToLibrary(LibraryBuilder library, String name, String lower) {}
void beforeService(LibraryBuilder library, BlockBuilder builder, String? name,
void beforeService(LibraryBuilder library, BlockBuilder builder, String name,
String lower) {}
void applyToConfigureServer(
LibraryBuilder library,
MethodBuilder configureServer,
BlockBuilder block,
String? name,
String name,
String lower) {}
Expression createInstance(LibraryBuilder library, MethodBuilder methodBuilder,
String? name, String lower) =>
String name, String lower) =>
literal(null);
@override

2
lib/src/commands/service_generators/map.dart
View file

@ -9,7 +9,7 @@ class MapServiceGenerator extends ServiceGenerator {
@override
Expression createInstance(LibraryBuilder library, MethodBuilder methodBuilder,
String? name, String lower) {
String name, String lower) {
return refer('MapService').newInstance([]);
}
}

4
lib/src/commands/service_generators/mongo.dart
View file

@ -26,7 +26,7 @@ class MongoServiceGenerator extends ServiceGenerator {
}
@override
void applyToLibrary(LibraryBuilder library, String? name, String lower) {
void applyToLibrary(LibraryBuilder library, String name, String lower) {
library.directives.addAll([
Directive.import('package:angel3_mongo/angel3_mongo.dart'),
Directive.import('package:mongo_dart/mongo_dart.dart'),
@ -35,7 +35,7 @@ class MongoServiceGenerator extends ServiceGenerator {
@override
Expression createInstance(LibraryBuilder library, MethodBuilder methodBuilder,
String? name, String lower) {
String name, String lower) {
return refer('MongoService').newInstance([
refer('db').property('collection').call([literal(pluralize(lower))])
]);

4
lib/src/commands/service_generators/rethink.dart
View file

@ -31,7 +31,7 @@ class RethinkServiceGenerator extends ServiceGenerator {
}
@override
void applyToLibrary(LibraryBuilder library, String? name, String lower) {
void applyToLibrary(LibraryBuilder library, String name, String lower) {
library.directives.addAll([
'package:angel3_rethink/angel3_rethink.dart',
'package:rethinkdb_dart/rethinkdb_dart.dart'
@ -40,7 +40,7 @@ class RethinkServiceGenerator extends ServiceGenerator {
@override
Expression createInstance(LibraryBuilder library, MethodBuilder methodBuilder,
String? name, String lower) {
String name, String lower) {
return refer('RethinkService').newInstance([
refer('connection'),
refer('r').property('table').call([literal(pluralize(lower))])

6
lib/src/util.dart
View file

@ -9,10 +9,10 @@ final String checkmark = ansiOutputEnabled ? '\u2714' : '[Success]';
final String ballot = ansiOutputEnabled ? '\u2717' : '[Failure]';
String? get homeDirPath =>
Platform.environment['HOME'] ?? Platform.environment['USERPROFILE'];
String get homeDirPath =>
Platform.environment['HOME'] ?? Platform.environment['USERPROFILE'] ?? '.';
Directory get homeDir => Directory(homeDirPath!);
Directory get homeDir => Directory(homeDirPath);
Directory get angelDir => Directory(p.join(homeDir.path, '.angel'));

2
pubspec.yaml
View file

@ -1,5 +1,5 @@
name: angel3_cli
version: 3.1.0
version: 3.1.1
description: Command line tools for the Angel3 framework, including scaffolding.
homepage: https://angel3-framework.web.app/
repository: https://github.com/dukefirehawk/angel3-cli