Move font config into fonts key, move generated package dir to .fontsource.

Author: jwr1

.gitattributes

@@ -1 +1 @@
-example/* linguist-vendored
+example/** linguist-vendored

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.2.0
+
+- Move font configuration into `fonts` key in fontsource config.
+- Move generated package directory to `.fontsource`.
+- Fix current working directory resolving incorrectly.
+
 ## 0.1.1
 
 - Fix version key not accepting "latest".

example/.fontsource/pubspec.yaml

@@ -0,0 +1,16 @@
+name: fontsource_gen
+
+environment:
+  sdk: '>=2.15.1 <3.0.0'
+  flutter: '>=1.17.0'
+
+flutter:
+  fonts:
+    - family: Alex Brush
+      fonts:
+        - asset: ../.dart_tool/fontsource/alex-brush/latin-400-normal.ttf
+          weight: 400
+        - asset: ../.dart_tool/fontsource/alex-brush/latin-ext-400-normal.ttf
+          weight: 400
+        - asset: ../.dart_tool/fontsource/alex-brush/vietnamese-400-normal.ttf
+          weight: 400

example/lib/main.dart

@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:fontsource/fontsource.dart';
 
-const title = 'Fontsource Example';
-
 void main() {
   runApp(const MyApp());
 }
@@ -13,60 +11,20 @@ class MyApp extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
-      title: title,
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-      ),
-      home: const MyHomePage(title: title),
-    );
-  }
-}
-
-class MyHomePage extends StatefulWidget {
-  const MyHomePage({Key? key, required this.title}) : super(key: key);
-
-  final String title;
-
-  @override
-  State<MyHomePage> createState() => _MyHomePageState();
-}
-
-class _MyHomePageState extends State<MyHomePage> {
-  int _counter = 0;
-
-  void _incrementCounter() {
-    setState(() {
-      _counter++;
-    });
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(widget.title),
-      ),
-      body: Center(
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          children: <Widget>[
-            const Text(
-              'You have pushed the button this many times:',
-              style:
-                  FontsourceTextStyle(fontFamily: 'Alex Brush', fontSize: 30),
-            ),
-            Text(
-              '$_counter',
-              style: Theme.of(context).textTheme.headline4,
-            ),
-          ],
+      home: Scaffold(
+        body: Center(
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: const <Widget>[
+              Text(
+                'Sphinx of black quartz, judge my vow.',
+                style:
+                    FontsourceTextStyle(fontFamily: 'Alex Brush', fontSize: 40),
+              ),
+            ],
+          ),
         ),
       ),
-      floatingActionButton: FloatingActionButton(
-        onPressed: _incrementCounter,
-        tooltip: 'Increment',
-        child: const Icon(Icons.add),
-      ),
     );
   }
 }

example/pubspec.lock

@@ -80,11 +80,11 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.1.1"
+    version: "0.2.0"
   fontsource_gen:
     dependency: "direct main"
     description:
-      path: ".dart_tool/fontsource"
+      path: ".fontsource"
       relative: true
     source: path
     version: "0.0.0"

example/pubspec.yaml

@@ -8,12 +8,11 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-
   cupertino_icons: ^1.0.2
   fontsource:
     path: ../
   fontsource_gen:
-    path: .dart_tool/fontsource
+    path: .fontsource
 
 dev_dependencies:
   flutter_test:
@@ -24,7 +23,8 @@ flutter:
   uses-material-design: true
 
 fontsource:
-  alex-brush:
-    subsets: all
-    weights: [400]
-    styles: [normal]
+  fonts:
+    alex-brush:
+      subsets: all
+      weights: [400]
+      styles: [normal]

lib/src/api/fetch_font_file.dart

@@ -33,7 +33,7 @@ Future<Uint8List> fetchFontFile(
       break;
     default:
   }
-  var response = await http.get(Uri.parse(
+  final response = await http.get(Uri.parse(
       '$apiUrl/v1/fonts/$fontId/$subset-$weight-$style.$ext${version == null ? '' : '?version=$version'}'));
 
   return response.bodyBytes;

lib/src/api/list_font_metadata.dart

@@ -76,7 +76,7 @@ Future<List<FontMetadata>> listFontMetadata(
     String? category,
     String? version,
     String? type}) async {
-  var query = {
+  final query = {
     'id': id,
     'family': family,
     'subsets': subsets,
@@ -90,7 +90,7 @@ Future<List<FontMetadata>> listFontMetadata(
     'type': type,
   };
   query.removeWhere((_, value) => value == null);
-  var response = await http
+  final response = await http
       .get(Uri.parse('$apiUrl/v1/fonts?${Uri(queryParameters: query).query}'));
   List<dynamic> fonts = jsonDecode(response.body);
 

lib/src/api/list_fonts.dart

@@ -6,7 +6,7 @@ import 'constants.dart';
 
 /// Returns a list of font ids.
 Future<List<String>> listFonts() async {
-  var response = await http.get(Uri.parse('$apiUrl/fontlist'));
+  final response = await http.get(Uri.parse('$apiUrl/fontlist'));
   Map<String, String> fontList =
       jsonDecode(response.body).cast<String, String>();
 

lib/src/cli/config.dart

@@ -2,6 +2,8 @@ import 'dart:io';
 import 'package:fontsource/api.dart';
 import 'package:yaml/yaml.dart';
 
+import '../utils.dart';
+
 class FontConfig {
   List<String> subsets;
   List<int> weights;
@@ -16,12 +18,19 @@ class FontConfig {
   }
 }
 
-typedef FontsourceConfig = Map<String, FontConfig>;
+class FontsourceConfig {
+  Map<String, FontConfig> fonts;
+  FontsourceConfig(this.fonts);
+  @override
+  String toString() {
+    return '{fonts: $fonts}';
+  }
+}
 
 Future<FontsourceConfig> getConfig() async {
   dynamic configYaml;
   try {
-    File fontsourceFile = File('fontsource.yaml');
+    File fontsourceFile = File(cwdJoin('fontsource.yaml'));
     if (fontsourceFile.existsSync()) {
       String fontsourceFileString = fontsourceFile.readAsStringSync();
 
@@ -30,7 +39,7 @@ Future<FontsourceConfig> getConfig() async {
       }
     }
     if (configYaml == null) {
-      File pubspecFile = File('pubspec.yaml');
+      File pubspecFile = File(cwdJoin('pubspec.yaml'));
 
       if (pubspecFile.existsSync()) {
         dynamic pubspecYaml = loadYaml(pubspecFile.readAsStringSync());
@@ -45,9 +54,10 @@ Future<FontsourceConfig> getConfig() async {
     throw Exception('Fontsource config not found.');
   }
 
-  Map configDynamicMap = configYaml;
-  FontsourceConfig config = {};
-  await Future.wait(configDynamicMap.keys.map((id) async {
+  Map configMap = configYaml;
+  Map fontsMap = configMap['fonts'] ?? {};
+  final config = FontsourceConfig({});
+  await Future.wait(fontsMap.keys.map((id) async {
     FontMetadata metadata;
     try {
       metadata = (await listFontMetadata(id: id))[0];
@@ -58,11 +68,10 @@ Future<FontsourceConfig> getConfig() async {
     List<String> subsets;
     List<int> weights;
     List<String> styles;
-    if (configDynamicMap[id]?['subsets'] == null ||
-        configDynamicMap[id]['subsets'] == 'all') {
+    if (fontsMap[id]?['subsets'] == null || fontsMap[id]['subsets'] == 'all') {
       subsets = metadata.subsets;
     } else {
-      subsets = (configDynamicMap[id]['subsets'] as YamlList)
+      subsets = (fontsMap[id]['subsets'] as YamlList)
           .map((subset) => subset as String)
           .toList();
       for (var subset in subsets) {
@@ -72,11 +81,10 @@ Future<FontsourceConfig> getConfig() async {
         }
       }
     }
-    if (configDynamicMap[id]?['weights'] == null ||
-        configDynamicMap[id]['weights'] == 'all') {
+    if (fontsMap[id]?['weights'] == null || fontsMap[id]['weights'] == 'all') {
       weights = metadata.weights;
     } else {
-      weights = (configDynamicMap[id]['weights'] as YamlList)
+      weights = (fontsMap[id]['weights'] as YamlList)
           .map((weight) => weight as int)
           .toList();
       for (var weight in weights) {
@@ -86,11 +94,10 @@ Future<FontsourceConfig> getConfig() async {
         }
       }
     }
-    if (configDynamicMap[id]?['weights'] == null ||
-        configDynamicMap[id]['styles'] == 'all') {
+    if (fontsMap[id]?['weights'] == null || fontsMap[id]['styles'] == 'all') {
       styles = metadata.styles;
     } else {
-      styles = (configDynamicMap[id]['styles'] as YamlList)
+      styles = (fontsMap[id]['styles'] as YamlList)
           .map((style) => style as String)
           .toList();
       for (var style in styles) {
@@ -99,10 +106,10 @@ Future<FontsourceConfig> getConfig() async {
         }
       }
     }
-    String? version = configDynamicMap[id]?['version'];
+    String? version = fontsMap[id]?['version'];
     if (version == 'latest') version = null;
-    config[id] = FontConfig(
-        subsets, weights, styles, metadata, configDynamicMap[id]?['version']);
+    config.fonts[id] = FontConfig(
+        subsets, weights, styles, metadata, fontsMap[id]?['version']);
   }));
 
   return config;