Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/src/generators/forms/stacked_form_generator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,11 @@ FieldConfig _readFieldConfig({
var fieldReader = ConstantReader(fieldConfig);

bool isTextField =
fieldReader.instanceOf(const TypeChecker.fromRuntime(FormTextField));
fieldReader.instanceOf(const TypeChecker.typeNamed(FormTextField));
bool isDateField =
fieldReader.instanceOf(const TypeChecker.fromRuntime(FormDateField));
fieldReader.instanceOf(const TypeChecker.typeNamed(FormDateField));
bool isDropdownField =
fieldReader.instanceOf(const TypeChecker.fromRuntime(FormDropdownField));
fieldReader.instanceOf(const TypeChecker.typeNamed(FormDropdownField));

if (isTextField) {
return _readTextFieldConfig(
Expand Down
12 changes: 6 additions & 6 deletions lib/src/generators/getit/dependency_config_factory.dart
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class DependencyConfigFactory {
// NOTE: This can be used for actual dependency inject. We do service location instead.
final constructor = classElement.unnamedConstructor2;

if (dependencyReader.instanceOf(const TypeChecker.fromRuntime(Factory))) {
if (dependencyReader.instanceOf(const TypeChecker.typeNamed(Factory))) {
return FactoryDependency(
instanceName: instanceName,
import: import!,
Expand All @@ -74,7 +74,7 @@ class DependencyConfigFactory {
environments: environments,
);
} else if (dependencyReader
.instanceOf(const TypeChecker.fromRuntime(Singleton))) {
.instanceOf(const TypeChecker.typeNamed(Singleton))) {
final ConstantReader? resolveUsing =
dependencyReader.peek('resolveUsing');
final resolveObject = resolveUsing?.objectValue.toFunctionValue2();
Expand All @@ -88,7 +88,7 @@ class DependencyConfigFactory {
environments: environments,
resolveFunction: resolveObject?.displayName);
} else if (dependencyReader
.instanceOf(const TypeChecker.fromRuntime(LazySingleton))) {
.instanceOf(const TypeChecker.typeNamed(LazySingleton))) {
final ConstantReader? resolveUsing =
dependencyReader.peek('resolveUsing');
final resolveObject = resolveUsing?.objectValue.toFunctionValue2();
Expand All @@ -103,7 +103,7 @@ class DependencyConfigFactory {
resolveFunction: resolveObject?.displayName);
} else if (dependencyReader
// ignore: deprecated_member_use
.instanceOf(const TypeChecker.fromRuntime(Presolve))) {
.instanceOf(const TypeChecker.typeNamed(Presolve))) {
final ConstantReader? presolveUsing =
dependencyReader.peek('presolveUsing');
final presolveObject = presolveUsing?.objectValue.toFunctionValue2();
Expand All @@ -116,7 +116,7 @@ class DependencyConfigFactory {
environments: environments,
presolveFunction: presolveObject?.displayName);
} else if (dependencyReader
.instanceOf(const TypeChecker.fromRuntime(InitializableSingleton))) {
.instanceOf(const TypeChecker.typeNamed(InitializableSingleton))) {
return InitializableSingletonDependency(
instanceName: instanceName,
import: import!,
Expand All @@ -126,7 +126,7 @@ class DependencyConfigFactory {
environments: environments,
);
} else if (dependencyReader
.instanceOf(const TypeChecker.fromRuntime(FactoryWithParam))) {
.instanceOf(const TypeChecker.typeNamed(FactoryWithParam))) {
final Set<FactoryParameter> clazzParams = {};
var params = constructor?.formalParameters;
if (params?.isNotEmpty == true && constructor != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import 'package:stacked_shared/stacked_shared.dart';

import 'dependency_config/factory_param_dependency.dart';

const _factoryParamChecker = TypeChecker.fromRuntime(FactoryParam);
const _factoryParamChecker = TypeChecker.typeNamed(FactoryParam);

class DependencyParameterResolver {
final ImportResolver _importResolver;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ class RouteConfigFactory {
});

RouteConfig fromResolver(ConstantReader stackedRoute) {
if (stackedRoute
.instanceOf(const TypeChecker.fromRuntime(CupertinoRoute))) {
if (stackedRoute.instanceOf(const TypeChecker.typeNamed(CupertinoRoute))) {
return CupertinoRouteConfig(
className: className,
classImport: classImport,
Expand All @@ -54,7 +53,7 @@ class RouteConfigFactory {
parentClassName: parentClassName,
);
} else if (stackedRoute
.instanceOf(const TypeChecker.fromRuntime(AdaptiveRoute))) {
.instanceOf(const TypeChecker.typeNamed(AdaptiveRoute))) {
return AdaptiveRouteConfig(
className: className,
classImport: classImport,
Expand All @@ -70,7 +69,7 @@ class RouteConfigFactory {
parentClassName: parentClassName,
);
} else if (stackedRoute
.instanceOf(const TypeChecker.fromRuntime(CustomRoute))) {
.instanceOf(const TypeChecker.typeNamed(CustomRoute))) {
final function = stackedRoute
.peek('transitionsBuilder')
?.objectValue
Expand Down
10 changes: 5 additions & 5 deletions lib/src/generators/router_2/resolvers/route_config_resolver.dart
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const TypeChecker autoRouteChecker = TypeChecker.fromUrl(
'package:stacked_shared/src/code_generation/stacked_app.dart#StackedApp',
);

const TypeChecker stackedRouteChecker = TypeChecker.fromRuntime(StackedRoute);
const TypeChecker stackedRouteChecker = TypeChecker.typeNamed(StackedRoute);

const validMetaValues = [
'String',
Expand Down Expand Up @@ -127,19 +127,19 @@ class RouteConfigResolver {
ResolvedType? customRouteBuilder;
ResolvedType? transitionBuilder;
int? customRouteBarrierColor;
if (stackedRoute.instanceOf(const TypeChecker.fromRuntime(MaterialRoute))) {
if (stackedRoute.instanceOf(const TypeChecker.typeNamed(MaterialRoute))) {
routeType = RouteType.material;
} else if (stackedRoute
.instanceOf(const TypeChecker.fromRuntime(CupertinoRoute))) {
.instanceOf(const TypeChecker.typeNamed(CupertinoRoute))) {
routeType = RouteType.cupertino;
cupertinoNavTitle = stackedRoute.peek('title')?.stringValue;
} else if (stackedRoute
.instanceOf(const TypeChecker.fromRuntime(AdaptiveRoute))) {
.instanceOf(const TypeChecker.typeNamed(AdaptiveRoute))) {
routeType = RouteType.adaptive;
cupertinoNavTitle = stackedRoute.peek('cupertinoPageTitle')?.stringValue;
customRouteOpaque = stackedRoute.peek('opaque')?.boolValue;
} else if (stackedRoute
.instanceOf(const TypeChecker.fromRuntime(CustomRoute))) {
.instanceOf(const TypeChecker.typeNamed(CustomRoute))) {
routeType = RouteType.custom;
durationInMilliseconds =
stackedRoute.peek('durationInMilliseconds')?.intValue;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ class RouterConfigResolver {
bool? customRouteBarrierDismissible;
ResolvedType? transitionBuilder;
ResolvedType? customRouteBuilder;
if (stackedApp.instanceOf(const TypeChecker.fromRuntime(CupertinoRouter))) {
if (stackedApp.instanceOf(const TypeChecker.typeNamed(CupertinoRouter))) {
routeType = RouteType.cupertino;
} else if (stackedApp
.instanceOf(const TypeChecker.fromRuntime(AdaptiveRouter))) {
.instanceOf(const TypeChecker.typeNamed(AdaptiveRouter))) {
routeType = RouteType.adaptive;
} else if (stackedApp
.instanceOf(const TypeChecker.fromRuntime(CustomRouter))) {
.instanceOf(const TypeChecker.typeNamed(CustomRouter))) {
routeType = RouteType.custom;

durationInMilliseconds =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import 'package:stacked_generator/src/generators/router_common/resolvers/type_re
import 'package:stacked_generator/utils.dart';
import 'package:stacked_shared/stacked_shared.dart';

const _pathParamChecker = TypeChecker.fromRuntime(PathParam);
const _queryParamChecker = TypeChecker.fromRuntime(QueryParam);
const _pathParamChecker = TypeChecker.typeNamed(PathParam);
const _queryParamChecker = TypeChecker.typeNamed(QueryParam);

class RouteParameterResolver {
final TypeResolver _typeResolver;
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ dependencies:
build: ^3.0.0
path: ^1.9.1
recase: ^4.1.0
source_gen: ^3.0.0
source_gen: ^3.1.0
meta: ^1.16.0
logger: ^2.6.0
stacked_shared: ^1.4.2
Expand Down