diff --git a/.gitignore b/.gitignore
index 34c9858..38616e4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,7 +11,7 @@
migrate_working_dir/
# VSCode related
-.vscode/
+.vscode/settings.json
# IntelliJ related
*.iml
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 0000000..33f4d3c
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,13 @@
+{
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "name": "Run example app",
+ "program": "${workspaceFolder}/packages/thema/example/lib/main.dart",
+ "request": "launch",
+ "type": "dart",
+ "flutterMode": "debug",
+ "args": ["--enable-experiment=macros"]
+ }
+ ]
+}
diff --git a/analysis_options.yaml b/analysis_options.yaml
index c38912d..6978e0d 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,3 +1,4 @@
analyzer:
enable-experiment:
- macros
+ - enhanced-parts
diff --git a/melos.yaml b/melos.yaml
index 230d60c..3df481e 100644
--- a/melos.yaml
+++ b/melos.yaml
@@ -21,6 +21,10 @@ scripts:
run: melos exec -c 1 -- flutter pub get
description: Pub get
+ outdated:
+ run: melos exec -c 1 -- flutter pub outdated
+ description: Check for outdated dependencies
+
fmt:
run: melos exec -c 1 -- dart format --enable-experiment=macros .
description: Format dart code
diff --git a/packages/thema/example/.gitignore b/packages/thema/example/.gitignore
new file mode 100644
index 0000000..79c113f
--- /dev/null
+++ b/packages/thema/example/.gitignore
@@ -0,0 +1,45 @@
+# Miscellaneous
+*.class
+*.log
+*.pyc
+*.swp
+.DS_Store
+.atom/
+.build/
+.buildlog/
+.history
+.svn/
+.swiftpm/
+migrate_working_dir/
+
+# IntelliJ related
+*.iml
+*.ipr
+*.iws
+.idea/
+
+# The .vscode folder contains launch configuration and tasks you configure in
+# VS Code which you may wish to be included in version control, so this line
+# is commented out by default.
+#.vscode/
+
+# Flutter/Dart/Pub related
+**/doc/api/
+**/ios/Flutter/.last_build_id
+.dart_tool/
+.flutter-plugins
+.flutter-plugins-dependencies
+.pub-cache/
+.pub/
+/build/
+
+# Symbolication related
+app.*.symbols
+
+# Obfuscation related
+app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/packages/thema/example/.metadata b/packages/thema/example/.metadata
new file mode 100644
index 0000000..d327e2e
--- /dev/null
+++ b/packages/thema/example/.metadata
@@ -0,0 +1,36 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+ revision: "64906c28a6ac53fb6fd10396120c70cbd217319a"
+ channel: "master"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+ platforms:
+ - platform: root
+ create_revision: 64906c28a6ac53fb6fd10396120c70cbd217319a
+ base_revision: 64906c28a6ac53fb6fd10396120c70cbd217319a
+ - platform: android
+ create_revision: 64906c28a6ac53fb6fd10396120c70cbd217319a
+ base_revision: 64906c28a6ac53fb6fd10396120c70cbd217319a
+ - platform: ios
+ create_revision: 64906c28a6ac53fb6fd10396120c70cbd217319a
+ base_revision: 64906c28a6ac53fb6fd10396120c70cbd217319a
+ - platform: web
+ create_revision: 64906c28a6ac53fb6fd10396120c70cbd217319a
+ base_revision: 64906c28a6ac53fb6fd10396120c70cbd217319a
+
+ # User provided section
+
+ # List of Local paths (relative to this file) that should be
+ # ignored by the migrate tool.
+ #
+ # Files that are not part of the templates will be ignored by default.
+ unmanaged_files:
+ - 'lib/main.dart'
+ - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/packages/thema/example/README.md b/packages/thema/example/README.md
new file mode 100644
index 0000000..858ef2d
--- /dev/null
+++ b/packages/thema/example/README.md
@@ -0,0 +1,3 @@
+# thema_example
+
+A new Flutter project.
diff --git a/packages/thema/example/android/.gitignore b/packages/thema/example/android/.gitignore
new file mode 100644
index 0000000..55afd91
--- /dev/null
+++ b/packages/thema/example/android/.gitignore
@@ -0,0 +1,13 @@
+gradle-wrapper.jar
+/.gradle
+/captures/
+/gradlew
+/gradlew.bat
+/local.properties
+GeneratedPluginRegistrant.java
+
+# Remember to never publicly share your keystore.
+# See https://flutter.dev/to/reference-keystore
+key.properties
+**/*.keystore
+**/*.jks
diff --git a/packages/thema/example/android/app/build.gradle b/packages/thema/example/android/app/build.gradle
new file mode 100644
index 0000000..be47415
--- /dev/null
+++ b/packages/thema/example/android/app/build.gradle
@@ -0,0 +1,44 @@
+plugins {
+ id "com.android.application"
+ id "kotlin-android"
+ // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+ id "dev.flutter.flutter-gradle-plugin"
+}
+
+android {
+ namespace = "com.example.thema_example"
+ compileSdk = flutter.compileSdkVersion
+ ndkVersion = flutter.ndkVersion
+
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
+ }
+
+ kotlinOptions {
+ jvmTarget = JavaVersion.VERSION_1_8
+ }
+
+ defaultConfig {
+ // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
+ applicationId = "com.example.thema_example"
+ // You can update the following values to match your application needs.
+ // For more information, see: https://flutter.dev/to/review-gradle-config.
+ minSdk = flutter.minSdkVersion
+ targetSdk = flutter.targetSdkVersion
+ versionCode = flutter.versionCode
+ versionName = flutter.versionName
+ }
+
+ buildTypes {
+ release {
+ // TODO: Add your own signing config for the release build.
+ // Signing with the debug keys for now, so `flutter run --release` works.
+ signingConfig = signingConfigs.debug
+ }
+ }
+}
+
+flutter {
+ source = "../.."
+}
diff --git a/packages/thema/example/android/app/src/debug/AndroidManifest.xml b/packages/thema/example/android/app/src/debug/AndroidManifest.xml
new file mode 100644
index 0000000..399f698
--- /dev/null
+++ b/packages/thema/example/android/app/src/debug/AndroidManifest.xml
@@ -0,0 +1,7 @@
+
+
+
+
diff --git a/packages/thema/example/android/app/src/main/AndroidManifest.xml b/packages/thema/example/android/app/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..94fb7f6
--- /dev/null
+++ b/packages/thema/example/android/app/src/main/AndroidManifest.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/packages/thema/example/android/app/src/main/kotlin/com/example/thema_example/MainActivity.kt b/packages/thema/example/android/app/src/main/kotlin/com/example/thema_example/MainActivity.kt
new file mode 100644
index 0000000..7d252a1
--- /dev/null
+++ b/packages/thema/example/android/app/src/main/kotlin/com/example/thema_example/MainActivity.kt
@@ -0,0 +1,5 @@
+package com.example.thema_example
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()
diff --git a/packages/thema/example/android/app/src/main/res/drawable-v21/launch_background.xml b/packages/thema/example/android/app/src/main/res/drawable-v21/launch_background.xml
new file mode 100644
index 0000000..f74085f
--- /dev/null
+++ b/packages/thema/example/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+
+
+
+ indent({int size = 2}) {
+ return this.map((element) => element.indent(size: size)).toList();
+ }
+}
+
+extension _Commas on List {
+ List trailingComma() {
+ return this.map((element) => RawCode.fromParts([element, ','])).toList();
+ }
+}
diff --git a/packages/thema/lib/thema.dart b/packages/thema/lib/thema.dart
index 65ca544..04f34fb 100644
--- a/packages/thema/lib/thema.dart
+++ b/packages/thema/lib/thema.dart
@@ -1,305 +1 @@
-import 'dart:async';
-
-import 'package:collection/collection.dart';
-import 'package:macros/macros.dart';
-
-final _flutterMaterial = Uri.parse('package:flutter/material.dart');
-final _dartCore = Uri.parse('dart:core');
-
-macro class Thema
- implements ClassTypesMacro, ClassDeclarationsMacro, ClassDefinitionMacro {
- const Thema();
-
- @override
- FutureOr buildTypesForClass(
- ClassDeclaration clazz,
- ClassTypeBuilder builder,
- ) async {
- final superType =
- await builder.resolveIdentifier(_flutterMaterial, 'ThemeExtension');
- final superTypeCode = NamedTypeAnnotationCode(
- name: superType,
- typeArguments: [
- RawTypeAnnotationCode.fromString(clazz.identifier.name),
- ],
- );
-
- builder.extendsType(superTypeCode);
- }
-
- @override
- FutureOr buildDeclarationsForClass(
- ClassDeclaration clazz,
- MemberDeclarationBuilder builder,
- ) async {
- final hasUnexpetedFields =
- !await _validateFields(clazz: clazz, builder: builder);
- if (hasUnexpetedFields) return;
-
- await _declareConstractor(clazz: clazz, builder: builder);
-
- await (
- _declareCopyWith(clazz: clazz, builder: builder),
- _declareLeap(clazz: clazz, builder: builder),
- ).wait;
- }
-
- @override
- FutureOr buildDefinitionForClass(
- ClassDeclaration clazz,
- TypeDefinitionBuilder builder,
- ) async {
- await (
- _defineCopyWith(clazz: clazz, typeDefinisionBuilder: builder),
- _defineLeap(clazz: clazz, typeDefinisionBuilder: builder),
- ).wait;
- }
-
- Future _validateFields({
- required ClassDeclaration clazz,
- required MemberDeclarationBuilder builder,
- }) async {
- final fields = await builder.fieldsOf(clazz);
- final hasUnexpectedFields = fields.any((field) =>
- field.hasAbstract ||
- field.hasConst ||
- field.hasExternal ||
- !field.hasFinal ||
- field.hasInitializer ||
- field.hasLate ||
- field.hasStatic ||
- field.type.isNullable);
- if (hasUnexpectedFields) {
- builder.report(
- Diagnostic(
- DiagnosticMessage(
- 'Class contains unexpected fields to construst ThemeExtension.',
- ),
- Severity.error,
- ),
- );
- return false;
- }
-
- return true;
- }
-
- Future _declareConstractor({
- required ClassDeclaration clazz,
- required MemberDeclarationBuilder builder,
- }) async {
- final fields = await builder.fieldsOf(clazz);
- final constructorParameterCodes = fields
- .map((field) => RawCode.fromParts([
- 'required',
- ' ',
- field.identifier,
- ]))
- .toList();
- final constructorName = clazz.identifier.name;
- final constructorCode = DeclarationCode.fromParts(
- [
- 'const $constructorName({'.indent(),
- ...constructorParameterCodes.trailingComma().indent(size: 4),
- '});'.indent(),
- ].joinAsCode('\n'),
- );
- builder.declareInType(constructorCode);
- }
-
- Future _declareCopyWith({
- required ClassDeclaration clazz,
- required MemberDeclarationBuilder builder,
- }) async {
- final fields = await builder.fieldsOf(clazz);
- final copyWithParameterCodes = fields
- .map(
- (field) => ParameterCode(
- type: NullableTypeAnnotationCode(field.type.code),
- name: field.identifier.name,
- ),
- )
- .toList();
- final copyWithFunctionCode = DeclarationCode.fromParts(
- [
- RawCode.fromParts([clazz.identifier, ' ', 'copyWith({']).indent(),
- ...copyWithParameterCodes.trailingComma().indent(size: 4),
- '});'.indent(),
- ].joinAsCode('\n'),
- );
- builder.declareInType(copyWithFunctionCode);
- }
-
- Future _declareLeap({
- required ClassDeclaration clazz,
- required MemberDeclarationBuilder builder,
- }) async {
- final doubleIdentifier =
- await builder.resolveIdentifier(_dartCore, 'double');
- final leapFirstParameterCode = ParameterCode(
- keywords: ['covariant'],
- type: NullableTypeAnnotationCode(
- NamedTypeAnnotationCode(name: clazz.identifier),
- ),
- name: 'other',
- );
- final leapSecondParameterCode = ParameterCode(
- type: NamedTypeAnnotationCode(name: doubleIdentifier),
- name: 't',
- );
- final leapParameterCodes = [
- leapFirstParameterCode,
- leapSecondParameterCode,
- ].toList();
- final leapFunctionCode = DeclarationCode.fromParts(
- [
- RawCode.fromParts([
- clazz.identifier,
- ' ',
- 'lerp(',
- ]).indent(),
- ...leapParameterCodes.trailingComma().indent(size: 4),
- ');'.indent(),
- ].joinAsCode('\n'),
- );
- builder.declareInType(leapFunctionCode);
- }
-
- Future _defineCopyWith({
- required ClassDeclaration clazz,
- required TypeDefinitionBuilder typeDefinisionBuilder,
- }) async {
- final methods = await typeDefinisionBuilder.methodsOf(clazz);
- final copyWithDeclaration = methods
- .firstWhereOrNull((method) => method.identifier.name == 'copyWith');
- if (copyWithDeclaration == null) return;
-
- final fields = await typeDefinisionBuilder.fieldsOf(clazz);
- final instancePareterCodes = fields.map(
- (field) {
- final fieldName = field.identifier.name;
- return RawCode.fromParts([
- '$fieldName:',
- ' ',
- '$fieldName',
- ' ?? ',
- field.identifier,
- ]);
- },
- ).toList();
- final copyWithFunctionBodyCode = FunctionBodyCode.fromParts([
- '{',
- RawCode.fromParts([
- 'return',
- ' ',
- clazz.identifier,
- '(',
- ]).indent(size: 4),
- ...instancePareterCodes.trailingComma().indent(size: 6),
- ');'.indent(size: 4),
- '}'.indent(),
- ].joinAsCode('\n'));
-
- final builder =
- await typeDefinisionBuilder.buildMethod(copyWithDeclaration.identifier);
- builder.augment(copyWithFunctionBodyCode);
- }
-
- Future _defineLeap({
- required ClassDeclaration clazz,
- required TypeDefinitionBuilder typeDefinisionBuilder,
- }) async {
- final methods = await typeDefinisionBuilder.methodsOf(clazz);
- final leapDeclaration =
- methods.firstWhereOrNull((method) => method.identifier.name == 'lerp');
- if (leapDeclaration == null) return;
-
- final leapReturnTypeCode = NamedTypeAnnotationCode(name: clazz.identifier);
- final leapFirstParameterCode = ParameterCode(
- keywords: ['covariant'],
- type: NullableTypeAnnotationCode(leapReturnTypeCode),
- name: 'other',
- );
- final themeExtensionIdentifier = await typeDefinisionBuilder
- .resolveIdentifier(_flutterMaterial, 'ThemeExtension');
- final doubleIdentifier =
- await typeDefinisionBuilder.resolveIdentifier(_dartCore, 'double');
- final leapSecondParameterCode = ParameterCode(
- type: NamedTypeAnnotationCode(name: doubleIdentifier),
- name: 't',
- );
- final fields = await typeDefinisionBuilder.fieldsOf(clazz);
- final instancePareterCodes = await Future.wait(
- fields.map((field) async {
- final fieldName = field.identifier.name;
- final fieldTypeCode = field.type.code;
- final fieldStaticType =
- await typeDefinisionBuilder.resolve(fieldTypeCode);
- final themeExtensionStaticType = await typeDefinisionBuilder
- .resolve(NamedTypeAnnotationCode(name: themeExtensionIdentifier));
- if (await fieldStaticType.isSubtypeOf(themeExtensionStaticType)) {
- return RawCode.fromParts(
- [
- '$fieldName:',
- ' ',
- field.identifier,
- '.lerp(${leapFirstParameterCode.name}.$fieldName, ${leapSecondParameterCode.name})',
- ],
- );
- }
-
- return RawCode.fromParts(
- [
- '$fieldName: ',
- fieldTypeCode,
- '.lerp(',
- field.identifier,
- ', ${leapFirstParameterCode.name}.$fieldName, ${leapSecondParameterCode.name})!',
- ],
- );
- }),
- );
- final leapFunctionBodyCode = FunctionBodyCode.fromParts([
- '{',
- RawCode.fromParts([
- 'if (${leapFirstParameterCode.name} == null) {'.indent(size: 4),
- 'return this;'.indent(size: 6),
- '}'.indent(size: 4),
- ].joinAsCode('\n')),
- RawCode.fromParts([
- 'return',
- ' ',
- clazz.identifier,
- '(',
- ]).indent(size: 4),
- ...instancePareterCodes.trailingComma().indent(size: 6),
- ');'.indent(size: 4),
- '}'.indent(),
- ].joinAsCode('\n'));
-
- final builder =
- await typeDefinisionBuilder.buildMethod(leapDeclaration.identifier);
- builder.augment(leapFunctionBodyCode);
- }
-}
-
-extension _Indent on T {
- Code indent({int size = 2}) {
- return RawCode.fromParts([
- ' ' * size,
- this,
- ]);
- }
-}
-
-extension _Indents on List {
- List indent({int size = 2}) {
- return this.map((element) => element.indent(size: size)).toList();
- }
-}
-
-extension _Commas on List {
- List trailingComma() {
- return this.map((element) => RawCode.fromParts([element, ','])).toList();
- }
-}
+export 'src/thema.dart' show Thema;
diff --git a/packages/thema/pubspec.yaml b/packages/thema/pubspec.yaml
index 808450d..962eebc 100644
--- a/packages/thema/pubspec.yaml
+++ b/packages/thema/pubspec.yaml
@@ -4,13 +4,11 @@ version: 0.0.1
homepage:
environment:
- sdk: ^3.5.0-152
+ sdk: ">=3.6.0-0 <4.0.0"
dependencies:
- flutter:
- sdk: flutter
- json: ^0.20.2
collection: ^1.18.0
+ macros: ^0.1.0
dev_dependencies:
flutter_test:
diff --git a/pubspec.yaml b/pubspec.yaml
index 50254f7..e264b9e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,7 +1,7 @@
name: thema_workspace
environment:
- sdk: '>=3.4.0-0 <4.0.0'
+ sdk: ">=3.6.0-0 <4.0.0"
dev_dependencies:
melos: 6.1.0