From 30914cc767ebead5f3dadd6e5d389c1f77edb69c Mon Sep 17 00:00:00 2001 From: Tobe O Date: Sat, 17 Aug 2019 18:35:55 -0400 Subject: [PATCH] Apply pedantic lints --- angel_orm_generator/example/main.dart | 8 +- .../lib/src/migration_generator.dart | 63 +++---- .../lib/src/orm_build_context.dart | 73 +++++---- .../lib/src/orm_generator.dart | 155 +++++++++--------- angel_orm_generator/lib/src/readers.dart | 2 +- 5 files changed, 159 insertions(+), 142 deletions(-) diff --git a/angel_orm_generator/example/main.dart b/angel_orm_generator/example/main.dart index 2a19b3c8..b81ac762 100644 --- a/angel_orm_generator/example/main.dart +++ b/angel_orm_generator/example/main.dart @@ -7,13 +7,13 @@ import 'package:angel_serialize/angel_serialize.dart'; part 'main.g.dart'; main() async { - var query = new EmployeeQuery() + var query = EmployeeQuery() ..where.firstName.equals('Rich') ..where.lastName.equals('Person') ..orWhere((w) => w.salary.greaterThanOrEqualTo(75000)) ..join('companies', 'company_id', 'id'); - var richPerson = await query.getOne(new _FakeExecutor()); + var richPerson = await query.getOne(_FakeExecutor()); print(richPerson.toJson()); } @@ -24,7 +24,7 @@ class _FakeExecutor extends QueryExecutor { Future> query( String tableName, String query, Map substitutionValues, [returningFields]) async { - var now = new DateTime.now(); + var now = DateTime.now(); print( '_FakeExecutor received query: $query and values: $substitutionValues'); return [ @@ -34,7 +34,7 @@ class _FakeExecutor extends QueryExecutor { @override Future transaction(FutureOr Function(QueryExecutor) f) { - throw new UnsupportedError('Transactions are not supported.'); + throw UnsupportedError('Transactions are not supported.'); } } diff --git a/angel_orm_generator/lib/src/migration_generator.dart b/angel_orm_generator/lib/src/migration_generator.dart index f5a8901a..eb629f2b 100644 --- a/angel_orm_generator/lib/src/migration_generator.dart +++ b/angel_orm_generator/lib/src/migration_generator.dart @@ -11,14 +11,14 @@ import 'package:source_gen/source_gen.dart' hide LibraryBuilder; import 'orm_build_context.dart'; Builder migrationBuilder(BuilderOptions options) { - return new SharedPartBuilder([ - new MigrationGenerator( + return SharedPartBuilder([ + MigrationGenerator( autoSnakeCaseNames: options.config['auto_snake_case_names'] != false) ], 'angel_migration'); } class MigrationGenerator extends GeneratorForAnnotation { - static final Parameter _schemaParam = new Parameter((b) => b + static final Parameter _schemaParam = Parameter((b) => b ..name = 'schema' ..type = refer('Schema')); static final Reference _schema = refer('schema'); @@ -26,13 +26,14 @@ class MigrationGenerator extends GeneratorForAnnotation { /// If `true` (default), then field names will automatically be (de)serialized as snake_case. final bool autoSnakeCaseNames; - const MigrationGenerator({this.autoSnakeCaseNames: true}); + const MigrationGenerator({this.autoSnakeCaseNames = true}); @override Future generateForAnnotatedElement( Element element, ConstantReader annotation, BuildStep buildStep) async { - if (element is! ClassElement) + if (element is! ClassElement) { throw 'Only classes can be annotated with @ORM().'; + } var generateMigrations = annotation.peek('generateMigrations')?.boolValue ?? true; @@ -47,13 +48,13 @@ class MigrationGenerator extends GeneratorForAnnotation { var lib = generateMigrationLibrary( ctx, element as ClassElement, resolver, buildStep); if (lib == null) return null; - return new DartFormatter().format(lib.accept(new DartEmitter()).toString()); + return DartFormatter().format(lib.accept(DartEmitter()).toString()); } Library generateMigrationLibrary(OrmBuildContext ctx, ClassElement element, Resolver resolver, BuildStep buildStep) { - return new Library((lib) { - lib.body.add(new Class((clazz) { + return Library((lib) { + lib.body.add(Class((clazz) { clazz ..name = '${ctx.buildContext.modelClassName}Migration' ..extend = refer('Migration') @@ -64,7 +65,7 @@ class MigrationGenerator extends GeneratorForAnnotation { } Method buildUpMigration(OrmBuildContext ctx, LibraryBuilder lib) { - return new Method((meth) { + return Method((meth) { var autoIdAndDateFields = const TypeChecker.fromRuntime(Model) .isAssignableFromType(ctx.buildContext.clazz.type); meth @@ -72,20 +73,20 @@ class MigrationGenerator extends GeneratorForAnnotation { ..annotations.add(refer('override')) ..requiredParameters.add(_schemaParam); - //var closure = new Method.closure()..addPositional(parameter('table')); - var closure = new Method((closure) { + //var closure = Method.closure()..addPositional(parameter('table')); + var closure = Method((closure) { closure - ..requiredParameters.add(new Parameter((b) => b..name = 'table')) - ..body = new Block((closureBody) { + ..requiredParameters.add(Parameter((b) => b..name = 'table')) + ..body = Block((closureBody) { var table = refer('table'); List dup = []; ctx.columns.forEach((name, col) { var key = ctx.buildContext.resolveFieldName(name); - if (dup.contains(key)) + if (dup.contains(key)) { return; - else { + } else { // if (key != 'id' || autoIdAndDateFields == false) { // // Check for relationships that might duplicate // for (var rName in ctx.relations.keys) { @@ -111,15 +112,17 @@ class MigrationGenerator extends GeneratorForAnnotation { List positional = [literal(key)]; Map named = {}; - if (autoIdAndDateFields != false && name == 'id') + if (autoIdAndDateFields != false && name == 'id') { methodName = 'serial'; + } if (methodName == null) { switch (col.type) { case ColumnType.varChar: methodName = 'varChar'; - if (col.length != null) + if (col.length != null) { named['length'] = literal(col.length); + } break; case ColumnType.serial: methodName = 'serial'; @@ -196,13 +199,14 @@ class MigrationGenerator extends GeneratorForAnnotation { // Definitely an analyzer issue. } } else { - defaultExpr = new CodeExpression( - new Code(dartObjectToString(defaultValue)), + defaultExpr = CodeExpression( + Code(dartObjectToString(defaultValue)), ); } - if (defaultExpr != null) + if (defaultExpr != null) { cascade.add(refer('defaultsTo').call([defaultExpr])); + } } if (col.indexType == IndexType.primaryKey || @@ -212,20 +216,20 @@ class MigrationGenerator extends GeneratorForAnnotation { cascade.add(refer('unique').call([])); } - if (col.isNullable != true) + if (col.isNullable != true) { cascade.add(refer('notNull').call([])); + } if (cascade.isNotEmpty) { - var b = new StringBuffer() - ..writeln(field.accept(new DartEmitter())); + var b = StringBuffer()..writeln(field.accept(DartEmitter())); for (var ex in cascade) { b ..write('..') - ..writeln(ex.accept(new DartEmitter())); + ..writeln(ex.accept(DartEmitter())); } - field = new CodeExpression(new Code(b.toString())); + field = CodeExpression(Code(b.toString())); } closureBody.addExpression(field); @@ -259,15 +263,16 @@ class MigrationGenerator extends GeneratorForAnnotation { if (relationship.cascadeOnDelete != false && const [RelationshipType.hasOne, RelationshipType.belongsTo] - .contains(relationship.type)) + .contains(relationship.type)) { ref = ref.property('onDeleteCascade').call([]); + } closureBody.addExpression(ref); } }); }); }); - meth.body = new Block((b) { + meth.body = Block((b) { b.addExpression(_schema.property('create').call([ literal(ctx.tableName), closure.closure, @@ -277,12 +282,12 @@ class MigrationGenerator extends GeneratorForAnnotation { } Method buildDownMigration(OrmBuildContext ctx) { - return new Method((b) { + return Method((b) { b ..name = 'down' ..annotations.add(refer('override')) ..requiredParameters.add(_schemaParam) - ..body = new Block((b) { + ..body = Block((b) { var named = {}; if (ctx.relations.values.any((r) => diff --git a/angel_orm_generator/lib/src/orm_build_context.dart b/angel_orm_generator/lib/src/orm_build_context.dart index f22a7c31..8ac2b5fe 100644 --- a/angel_orm_generator/lib/src/orm_build_context.dart +++ b/angel_orm_generator/lib/src/orm_build_context.dart @@ -43,7 +43,7 @@ FieldElement findPrimaryFieldInList( var columnAnnotation = columnTypeChecker.firstAnnotationOf(element); if (columnAnnotation != null) { - var column = reviveColumn(new ConstantReader(columnAnnotation)); + var column = reviveColumn(ConstantReader(columnAnnotation)); // print( // ' * Found column on ${field.name} with indexType = ${column.indexType}'); // print(element.metadata); @@ -66,7 +66,7 @@ Future buildOrmContext( BuildStep buildStep, Resolver resolver, bool autoSnakeCaseNames, - {bool heedExclude: true}) async { + {bool heedExclude = true}) async { // Check for @generatedSerializable // ignore: unused_local_variable DartObject generatedSerializable; @@ -88,12 +88,12 @@ Future buildOrmContext( var ormAnnotation = reviveORMAnnotation(annotation); // print( // 'tableName (${annotation.objectValue.type.name}) => ${ormAnnotation.tableName} from ${clazz.name} (${annotation.revive().namedArguments})'); - var ctx = new OrmBuildContext( + var ctx = OrmBuildContext( buildCtx, ormAnnotation, (ormAnnotation.tableName?.isNotEmpty == true) ? ormAnnotation.tableName - : pluralize(new ReCase(clazz.name).snakeCase)); + : pluralize(ReCase(clazz.name).snakeCase)); _cache[id] = ctx; // Read all fields @@ -105,7 +105,7 @@ Future buildOrmContext( // print('${element.name} => $columnAnnotation'); if (columnAnnotation != null) { - column = reviveColumn(new ConstantReader(columnAnnotation)); + column = reviveColumn(ConstantReader(columnAnnotation)); } if (column == null && isSpecialId(ctx, field)) { @@ -117,7 +117,7 @@ Future buildOrmContext( if (column == null) { // Guess what kind of column this is... - column = new Column( + column = Column( type: inferColumnType( buildCtx.resolveSerializedFieldType(field.name), ), @@ -125,7 +125,7 @@ Future buildOrmContext( } if (column != null && column.type == null) { - column = new Column( + column = Column( isNullable: column.isNullable, length: column.length, indexType: column.indexType, @@ -139,7 +139,7 @@ Future buildOrmContext( var ann = relationshipTypeChecker.firstAnnotationOf(el); if (ann != null) { - var cr = new ConstantReader(ann); + var cr = ConstantReader(ann); var rc = ctx.buildContext.modelClassNameRecase; var type = cr.read('type').intValue; var localKey = cr.peek('localKey')?.stringValue; @@ -157,7 +157,7 @@ Future buildOrmContext( isListOfModelType(field.type as InterfaceType)) || isModelClass(field.type); if (!canUse) { - throw new UnsupportedError( + throw UnsupportedError( 'Cannot apply relationship to field "${field.name}" - ${field.type} is not assignable to Model.'); } else { try { @@ -174,7 +174,7 @@ Future buildOrmContext( foreign = await buildOrmContext( modelType.element as ClassElement, - new ConstantReader(const TypeChecker.fromRuntime(Orm) + ConstantReader(const TypeChecker.fromRuntime(Orm) .firstAnnotationOf(modelType.element)), buildStep, resolver, @@ -184,7 +184,7 @@ Future buildOrmContext( if (through != null && through is InterfaceType) { throughContext = await buildOrmContext( through.element, - new ConstantReader(const TypeChecker.fromRuntime(Serializable) + ConstantReader(const TypeChecker.fromRuntime(Serializable) .firstAnnotationOf(modelType.element)), buildStep, resolver, @@ -196,20 +196,20 @@ Future buildOrmContext( if (ormAnn != null) { foreignTable = - new ConstantReader(ormAnn).peek('tableName')?.stringValue; + ConstantReader(ormAnn).peek('tableName')?.stringValue; } foreignTable ??= pluralize(foreign.buildContext.modelClassNameRecase.snakeCase); } on StackOverflowError { - throw new UnsupportedError( + throw UnsupportedError( 'There is an infinite cycle between ${clazz.name} and ${field.type.name}. This triggered a stack overflow.'); } } } // Fill in missing keys - var rcc = new ReCase(field.name); + var rcc = ReCase(field.name); String keyName(OrmBuildContext ctx, String missing) { var _keyName = @@ -236,7 +236,7 @@ Future buildOrmContext( localKey ??= '${rcc.snakeCase}_$foreignKey'; } - var relation = new RelationshipReader( + var relation = RelationshipReader( type, localKey: localKey, foreignKey: foreignKey, @@ -251,28 +251,31 @@ Future buildOrmContext( // 'foreignKey=$foreignKey, localKey=$localKey'); if (relation.type == RelationshipType.belongsTo) { - var name = new ReCase(relation.localKey).camelCase; + var name = ReCase(relation.localKey).camelCase; ctx.buildContext.aliases[name] = relation.localKey; if (!ctx.effectiveFields.any((f) => f.name == field.name)) { var foreignField = relation.findForeignField(ctx); var foreign = relation.throughContext ?? relation.foreign; var type = foreignField.type; - if (isSpecialId(foreign, foreignField)) + if (isSpecialId(foreign, foreignField)) { type = field.type.element.context.typeProvider.intType; - var rf = new RelationFieldImpl(name, relation, type, field); + } + var rf = RelationFieldImpl(name, relation, type, field); ctx.effectiveFields.add(rf); } } ctx.relations[field.name] = relation; } else { - if (column?.type == null) + if (column?.type == null) { throw 'Cannot infer SQL column type for field "${ctx.buildContext.originalClassName}.${field.name}" with type "${field.type.displayName}".'; + } ctx.columns[field.name] = column; - if (!ctx.effectiveFields.any((f) => f.name == field.name)) + if (!ctx.effectiveFields.any((f) => f.name == field.name)) { ctx.effectiveFields.add(field); + } } } @@ -280,22 +283,30 @@ Future buildOrmContext( } ColumnType inferColumnType(DartType type) { - if (const TypeChecker.fromRuntime(String).isAssignableFromType(type)) + if (const TypeChecker.fromRuntime(String).isAssignableFromType(type)) { return ColumnType.varChar; - if (const TypeChecker.fromRuntime(int).isAssignableFromType(type)) + } + if (const TypeChecker.fromRuntime(int).isAssignableFromType(type)) { return ColumnType.int; - if (const TypeChecker.fromRuntime(double).isAssignableFromType(type)) + } + if (const TypeChecker.fromRuntime(double).isAssignableFromType(type)) { return ColumnType.decimal; - if (const TypeChecker.fromRuntime(num).isAssignableFromType(type)) + } + if (const TypeChecker.fromRuntime(num).isAssignableFromType(type)) { return ColumnType.numeric; - if (const TypeChecker.fromRuntime(bool).isAssignableFromType(type)) + } + if (const TypeChecker.fromRuntime(bool).isAssignableFromType(type)) { return ColumnType.boolean; - if (const TypeChecker.fromRuntime(DateTime).isAssignableFromType(type)) + } + if (const TypeChecker.fromRuntime(DateTime).isAssignableFromType(type)) { return ColumnType.timeStamp; - if (const TypeChecker.fromRuntime(Map).isAssignableFromType(type)) + } + if (const TypeChecker.fromRuntime(Map).isAssignableFromType(type)) { return ColumnType.jsonb; - if (const TypeChecker.fromRuntime(List).isAssignableFromType(type)) + } + if (const TypeChecker.fromRuntime(List).isAssignableFromType(type)) { return ColumnType.jsonb; + } if (type is InterfaceType && type.element.isEnum) return ColumnType.int; return null; } @@ -317,10 +328,10 @@ Column reviveColumn(ConstantReader cr) { } if (columnObj != null) { - columnType = new _ColumnType(columnObj); + columnType = _ColumnType(columnObj); } - return new Column( + return Column( isNullable: cr.peek('isNullable')?.boolValue, length: cr.peek('length')?.intValue, type: columnType, @@ -329,7 +340,7 @@ Column reviveColumn(ConstantReader cr) { } const TypeChecker relationshipTypeChecker = - const TypeChecker.fromRuntime(Relationship); + TypeChecker.fromRuntime(Relationship); class OrmBuildContext { final BuildContext buildContext; diff --git a/angel_orm_generator/lib/src/orm_generator.dart b/angel_orm_generator/lib/src/orm_generator.dart index e0f3e6b7..e2919a90 100644 --- a/angel_orm_generator/lib/src/orm_generator.dart +++ b/angel_orm_generator/lib/src/orm_generator.dart @@ -17,14 +17,14 @@ var floatTypes = [ ]; Builder ormBuilder(BuilderOptions options) { - return new SharedPartBuilder([ - new OrmGenerator( + return SharedPartBuilder([ + OrmGenerator( autoSnakeCaseNames: options.config['auto_snake_case_names'] != false) ], 'angel_orm'); } TypeReference futureOf(String type) { - return new TypeReference((b) => b + return TypeReference((b) => b ..symbol = 'Future' ..types.add(refer(type))); } @@ -42,14 +42,14 @@ class OrmGenerator extends GeneratorForAnnotation { var ctx = await buildOrmContext(element, annotation, buildStep, buildStep.resolver, autoSnakeCaseNames); var lib = buildOrmLibrary(buildStep.inputId, ctx); - return lib.accept(new DartEmitter()).toString(); + return lib.accept(DartEmitter()).toString(); } else { throw 'The @Orm() annotation can only be applied to classes.'; } } Library buildOrmLibrary(AssetId inputId, OrmBuildContext ctx) { - return new Library((lib) { + return Library((lib) { // Create `FooQuery` class // Create `FooQueryWhere` class lib.body.add(buildQueryClass(ctx)); @@ -59,12 +59,12 @@ class OrmGenerator extends GeneratorForAnnotation { } Class buildQueryClass(OrmBuildContext ctx) { - return new Class((clazz) { + return Class((clazz) { var rc = ctx.buildContext.modelClassNameRecase; var queryWhereType = refer('${rc.pascalCase}QueryWhere'); clazz ..name = '${rc.pascalCase}Query' - ..extend = new TypeReference((b) { + ..extend = TypeReference((b) { b ..symbol = 'Query' ..types.addAll([ @@ -96,7 +96,7 @@ class OrmGenerator extends GeneratorForAnnotation { })); // Add values - clazz.fields.add(new Field((b) { + clazz.fields.add(Field((b) { var type = refer('${rc.pascalCase}QueryValues'); b ..name = 'values' @@ -107,23 +107,23 @@ class OrmGenerator extends GeneratorForAnnotation { })); // Add tableName - clazz.methods.add(new Method((m) { + clazz.methods.add(Method((m) { m ..name = 'tableName' ..annotations.add(refer('override')) ..type = MethodType.getter - ..body = new Block((b) { + ..body = Block((b) { b.addExpression(literalString(ctx.tableName).returned); }); })); // Add fields getter - clazz.methods.add(new Method((m) { + clazz.methods.add(Method((m) { m ..name = 'fields' ..annotations.add(refer('override')) ..type = MethodType.getter - ..body = new Block((b) { + ..body = Block((b) { var names = ctx.effectiveFields .map((f) => literalString(ctx.buildContext.resolveFieldName(f.name))) @@ -133,41 +133,41 @@ class OrmGenerator extends GeneratorForAnnotation { })); // Add _where member - clazz.fields.add(new Field((b) { + clazz.fields.add(Field((b) { b ..name = '_where' ..type = queryWhereType; })); // Add where getter - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { b ..name = 'where' ..type = MethodType.getter ..returns = queryWhereType ..annotations.add(refer('override')) - ..body = new Block((b) => b.addExpression(refer('_where').returned)); + ..body = Block((b) => b.addExpression(refer('_where').returned)); })); // newWhereClause() - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { b ..name = 'newWhereClause' ..annotations.add(refer('override')) ..returns = queryWhereType - ..body = new Block((b) => b.addExpression( + ..body = Block((b) => b.addExpression( queryWhereType.newInstance([refer('this')]).returned)); })); // Add deserialize() - clazz.methods.add(new Method((m) { + clazz.methods.add(Method((m) { m ..name = 'parseRow' ..static = true ..returns = ctx.buildContext.modelClassType - ..requiredParameters.add(new Parameter((b) => b + ..requiredParameters.add(Parameter((b) => b ..name = 'row' ..type = refer('List'))) - ..body = new Block((b) { + ..body = Block((b) { int i = 0; var args = {}; @@ -177,11 +177,11 @@ class OrmGenerator extends GeneratorForAnnotation { if (isSpecialId(ctx, field)) type = refer('int'); var expr = (refer('row').index(literalNum(i++))); - if (isSpecialId(ctx, field)) + if (isSpecialId(ctx, field)) { expr = expr.property('toString').call([]); - else if (field is RelationFieldImpl) + } else if (field is RelationFieldImpl) { continue; - else if (ctx.columns[field.name]?.type == ColumnType.json) { + } else if (ctx.columns[field.name]?.type == ColumnType.json) { expr = refer('json') .property('decode') .call([expr.asA(refer('String'))]).asA(type); @@ -193,14 +193,15 @@ class OrmGenerator extends GeneratorForAnnotation { var isNull = expr.equalTo(literalNull); expr = isNull.conditional(literalNull, type.property('values').index(expr.asA(refer('int')))); - } else + } else { expr = expr.asA(type); + } args[field.name] = expr; } b.statements - .add(new Code('if (row.every((x) => x == null)) return null;')); + .add(Code('if (row.every((x) => x == null)) return null;')); b.addExpression(ctx.buildContext.modelClassType .newInstance([], args).assignVar('model')); @@ -230,11 +231,11 @@ class OrmGenerator extends GeneratorForAnnotation { } var expr = refer('model').property('copyWith').call([], {name: parsed}); - var block = new Block( - (b) => b.addExpression(refer('model').assign(expr))); - var blockStr = block.accept(new DartEmitter()); + var block = + Block((b) => b.addExpression(refer('model').assign(expr))); + var blockStr = block.accept(DartEmitter()); var ifStr = 'if (row.length > $i) { $blockStr }'; - b.statements.add(new Code(ifStr)); + b.statements.add(Code(ifStr)); i += relation.foreign.effectiveFields.length; }); @@ -242,20 +243,20 @@ class OrmGenerator extends GeneratorForAnnotation { }); })); - clazz.methods.add(new Method((m) { + clazz.methods.add(Method((m) { m ..name = 'deserialize' ..annotations.add(refer('override')) - ..requiredParameters.add(new Parameter((b) => b + ..requiredParameters.add(Parameter((b) => b ..name = 'row' ..type = refer('List'))) - ..body = new Block((b) { + ..body = Block((b) { b.addExpression(refer('parseRow').call([refer('row')]).returned); }); })); // If there are any relations, we need some overrides. - clazz.constructors.add(new Constructor((b) { + clazz.constructors.add(Constructor((b) { b ..optionalParameters.add(Parameter((b) => b ..named = true @@ -263,7 +264,7 @@ class OrmGenerator extends GeneratorForAnnotation { ..type = TypeReference((b) => b ..symbol = 'Set' ..types.add(refer('String'))))) - ..body = new Block((b) { + ..body = Block((b) { b.statements.addAll([ Code('trampoline ??= Set();'), Code('trampoline.add(tableName);'), @@ -331,12 +332,11 @@ class OrmGenerator extends GeneratorForAnnotation { }); var out = outExprs.reduce((a, b) => a.and(b)); - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { b ..name = 'canCompile' ..annotations.add(refer('override')) - ..requiredParameters - .add(new Parameter((b) => b..name = 'trampoline')) + ..requiredParameters.add(Parameter((b) => b..name = 'trampoline')) ..returns = refer('bool') ..body = Block((b) { b.addExpression(out.returned); @@ -346,16 +346,16 @@ class OrmGenerator extends GeneratorForAnnotation { // TODO: Ultimately remove the insert override if (false && ctx.relations.isNotEmpty) { - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { b ..name = 'insert' ..annotations.add(refer('override')) - ..requiredParameters.add(new Parameter((b) => b..name = 'executor')) - ..body = new Block((b) { - var inTransaction = new Method((b) { + ..requiredParameters.add(Parameter((b) => b..name = 'executor')) + ..body = Block((b) { + var inTransaction = Method((b) { b ..modifier = MethodModifier.async - ..body = new Block((b) { + ..body = Block((b) { b.addExpression(refer('super') .property('insert') .call([refer('executor')]) @@ -404,24 +404,24 @@ class OrmGenerator extends GeneratorForAnnotation { // Create a Future fetchLinked(T model, QueryExecutor), if necessary. if (false && ctx.relations.values.any((r) => r.type == RelationshipType.hasMany)) { - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { b ..name = 'fetchLinked' ..modifier = MethodModifier.async - ..returns = new TypeReference((b) { + ..returns = TypeReference((b) { b ..symbol = 'Future' ..types.add(ctx.buildContext.modelClassType); }) ..requiredParameters.addAll([ - new Parameter((b) => b + Parameter((b) => b ..name = 'model' ..type = ctx.buildContext.modelClassType), - new Parameter((b) => b + Parameter((b) => b ..name = 'executor' ..type = refer('QueryExecutor')), ]) - ..body = new Block((b) { + ..body = Block((b) { var args = {}; ctx.relations.forEach((name, relation) { @@ -443,9 +443,9 @@ class OrmGenerator extends GeneratorForAnnotation { : 'model.${localField.name}'; var cascadeText = '..where.${foreignField.name}.equals($queryValue)'; - var queryText = queryInstance.accept(new DartEmitter()); + var queryText = queryInstance.accept(DartEmitter()); var combinedExpr = - new CodeExpression(new Code('($queryText$cascadeText)')); + CodeExpression(Code('($queryText$cascadeText)')); // Finally, just call get and await it. var expr = combinedExpr @@ -466,12 +466,12 @@ class OrmGenerator extends GeneratorForAnnotation { // execute in a transaction, and invoke fetchLinked. if (ctx.relations.values.any((r) => r.type == RelationshipType.hasMany)) { for (var methodName in const ['get', 'update', 'delete']) { - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { var type = ctx.buildContext.modelClassType.accept(DartEmitter()); b ..name = methodName ..annotations.add(refer('override')) - ..requiredParameters.add(new Parameter((b) => b + ..requiredParameters.add(Parameter((b) => b ..name = 'executor' ..type = refer('QueryExecutor'))); @@ -500,7 +500,7 @@ class OrmGenerator extends GeneratorForAnnotation { '@HasMany and @ManyToMany relations require a primary key to be defined on the model.'; } - b.body = new Code(''' + b.body = Code(''' return super.$methodName(executor).then((result) { return result.fold>([], (out, model) { var idx = out.indexWhere((m) => m.$keyName == model.$keyName); @@ -521,19 +521,19 @@ class OrmGenerator extends GeneratorForAnnotation { } Class buildWhereClass(OrmBuildContext ctx) { - return new Class((clazz) { + return Class((clazz) { var rc = ctx.buildContext.modelClassNameRecase; clazz ..name = '${rc.pascalCase}QueryWhere' ..extend = refer('QueryWhere'); // Build expressionBuilders getter - clazz.methods.add(new Method((m) { + clazz.methods.add(Method((m) { m ..name = 'expressionBuilders' ..annotations.add(refer('override')) ..type = MethodType.getter - ..body = new Block((b) { + ..body = Block((b) { var references = ctx.effectiveFields.map((f) => refer(f.name)); b.addExpression(literalList(references).returned); }); @@ -557,11 +557,11 @@ class OrmGenerator extends GeneratorForAnnotation { if (const TypeChecker.fromRuntime(int).isExactlyType(type) || const TypeChecker.fromRuntime(double).isExactlyType(type) || isSpecialId(ctx, field)) { - builderType = new TypeReference((b) => b + builderType = TypeReference((b) => b ..symbol = 'NumericSqlExpressionBuilder' ..types.add(refer(isSpecialId(ctx, field) ? 'int' : type.name))); } else if (type is InterfaceType && type.element.isEnum) { - builderType = new TypeReference((b) => b + builderType = TypeReference((b) => b ..symbol = 'EnumSqlExpressionBuilder' ..types.add(convertTypeReference(type))); args.add(CodeExpression(Code('(v) => v.index'))); @@ -580,20 +580,20 @@ class OrmGenerator extends GeneratorForAnnotation { builderType = refer('ListSqlExpressionBuilder'); } else if (ctx.relations.containsKey(field.name)) { var relation = ctx.relations[field.name]; - if (relation.type != RelationshipType.belongsTo) + if (relation.type != RelationshipType.belongsTo) { continue; - else { - builderType = new TypeReference((b) => b + } else { + builderType = TypeReference((b) => b ..symbol = 'NumericSqlExpressionBuilder' ..types.add(refer('int'))); name = relation.localKey; } } else { - throw new UnsupportedError( + throw UnsupportedError( 'Cannot generate ORM code for field of type ${field.type.name}.'); } - clazz.fields.add(new Field((b) { + clazz.fields.add(Field((b) { b ..name = name ..modifier = FieldModifier.final$ @@ -611,9 +611,9 @@ class OrmGenerator extends GeneratorForAnnotation { } // Now, just add a constructor that initializes each builder. - clazz.constructors.add(new Constructor((b) { + clazz.constructors.add(Constructor((b) { b - ..requiredParameters.add(new Parameter((b) => b + ..requiredParameters.add(Parameter((b) => b ..name = 'query' ..type = refer('${rc.pascalCase}Query'))) ..initializers.addAll(initializers); @@ -622,7 +622,7 @@ class OrmGenerator extends GeneratorForAnnotation { } Class buildValuesClass(OrmBuildContext ctx) { - return new Class((clazz) { + return Class((clazz) { var rc = ctx.buildContext.modelClassNameRecase; clazz ..name = '${rc.pascalCase}QueryValues' @@ -660,7 +660,7 @@ class OrmGenerator extends GeneratorForAnnotation { var name = ctx.buildContext.resolveFieldName(field.name); var type = convertTypeReference(field.type); - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { var value = refer('values').index(literalString(name)); if (fType is InterfaceType && fType.element.isEnum) { @@ -684,10 +684,10 @@ class OrmGenerator extends GeneratorForAnnotation { ..name = field.name ..type = MethodType.getter ..returns = type - ..body = new Block((b) => b.addExpression(value.returned)); + ..body = Block((b) => b.addExpression(value.returned)); })); - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { Expression value = refer('value'); if (fType is InterfaceType && fType.element.isEnum) { @@ -702,7 +702,7 @@ class OrmGenerator extends GeneratorForAnnotation { b ..name = field.name ..type = MethodType.setter - ..requiredParameters.add(new Parameter((b) => b + ..requiredParameters.add(Parameter((b) => b ..name = 'value' ..type = type)) ..body = @@ -711,17 +711,18 @@ class OrmGenerator extends GeneratorForAnnotation { } // Add an copyFrom(model) - clazz.methods.add(new Method((b) { + clazz.methods.add(Method((b) { b ..name = 'copyFrom' ..returns = refer('void') - ..requiredParameters.add(new Parameter((b) => b + ..requiredParameters.add(Parameter((b) => b ..name = 'model' ..type = ctx.buildContext.modelClassType)) - ..body = new Block((b) { + ..body = Block((b) { for (var field in ctx.effectiveFields) { - if (isSpecialId(ctx, field) || field is RelationFieldImpl) + if (isSpecialId(ctx, field) || field is RelationFieldImpl) { continue; + } b.addExpression(refer(field.name) .assign(refer('model').property(field.name))); } @@ -744,11 +745,11 @@ class OrmGenerator extends GeneratorForAnnotation { } var cond = prop.notEqualTo(literalNull); - var condStr = cond.accept(new DartEmitter()); + var condStr = cond.accept(DartEmitter()); var blkStr = - new Block((b) => b.addExpression(target.assign(parsedId))) - .accept(new DartEmitter()); - var ifStmt = new Code('if ($condStr) { $blkStr }'); + Block((b) => b.addExpression(target.assign(parsedId))) + .accept(DartEmitter()); + var ifStmt = Code('if ($condStr) { $blkStr }'); b.statements.add(ifStmt); } } diff --git a/angel_orm_generator/lib/src/readers.dart b/angel_orm_generator/lib/src/readers.dart index 4017168b..5c251dd1 100644 --- a/angel_orm_generator/lib/src/readers.dart +++ b/angel_orm_generator/lib/src/readers.dart @@ -5,7 +5,7 @@ import 'package:angel_orm/angel_orm.dart'; import 'package:source_gen/source_gen.dart'; import 'orm_build_context.dart'; -const TypeChecker columnTypeChecker = const TypeChecker.fromRuntime(Column); +const TypeChecker columnTypeChecker = TypeChecker.fromRuntime(Column); Orm reviveORMAnnotation(ConstantReader reader) { return Orm(