faet: full repo clean-up and reorganisation in preparation for alpha release (#27)

* fix: general repo cleanup

* chore: repo clean-up and reorganisation

Author: slightfoot

.fvmrc

@@ -1,3 +1,3 @@
 {
-  "flutter": "3.16.9"
+  "flutter": "stable"
 }

.gitignore

@@ -33,5 +33,4 @@ pubspec_overrides.yaml
 # FVM Version Cache
 .fvm/
 
-packages/clerk_auth/.env.test
 packages/clerk_flutter/widgetbook/.env

melos.yaml

@@ -2,17 +2,41 @@ name: clerk_sdk
 
 packages:
   - packages/**
-  - packages/clerk_flutter/widgetbook
 
 ide:
   intellij:
     enabled: true
     moduleNamePrefix: ''
 
 scripts:
+  # Clean all packages
+  clean:
+    name: Clean all
+    description: Run flutter clean in all packages
+    run: melos exec -- flutter clean
+
+  # Pub get all packages
+  get:
+    name: Get all
+    description: Run pub get in all packages
+    run: melos exec -o -- dart pub get
+
+  # Pub upgrade all packages
+  upgrade:
+    name: Upgrade all
+    description: Run pub upgrade in all packages
+    run: melos exec -o -- dart pub upgrade
+
+  # Build runner (code generation)
   brunner:
-    run: melos exec --fail-fast -c 1 --depends-on="build_runner" -- dart run build_runner build --delete-conflicting-outputs
+    run: melos exec -o -- dart run build_runner build --delete-conflicting-outputs
+    packageFilters:
+      scope: "clerk_auth"
+
+  # Format code
   format:
-    run: melos exec --fail-fast -c 1 -- dart format --line-length=100 --output=none .
+    run: melos exec -- dart format MELOS_PACKAGE_PATH --line-length=100
+
+  # Run build and format code
   brunner_format:
     run: melos brunner && melos format

packages/clerk_analysis/.gitignore

@@ -1,8 +1,24 @@
+# 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/
+
 # https://dart.dev/guides/libraries/private-files
 # Created by `dart pub`
 .dart_tool/
+build/
 
 # Avoid committing pubspec.lock for library packages; see
 # https://dart.dev/guides/libraries/private-files#pubspeclock.
 pubspec.lock
-/.env.test
+.env.test
+
+# Flutter auto-generated files
+.flutter-plugins
+.flutter-plugins-dependencies

packages/clerk_analysis/LICENSE

@@ -0,0 +1,3 @@
+## 0.0.1
+
+- Pre-alpha version.

packages/clerk_analysis/README.md

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 Clerk
+Copyright (c) 2024 Clerk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

packages/clerk_analysis/pubspec.yaml

@@ -1 +1,23 @@
-include: package:clerk_analysis/lints.yaml
+include: package:lints/recommended.yaml
+
+# analyzer:
+#   exclude:
+#     - path/to/excluded/files/**
+
+linter:
+  rules:
+    - avoid_print
+    - avoid_unnecessary_containers
+    - avoid_web_libraries_in_flutter
+    - no_logic_in_create_state
+    #    - public_member_api_docs
+    - prefer_const_constructors
+    - prefer_const_constructors_in_immutables
+    - prefer_const_declarations
+    - prefer_const_literals_to_create_immutables
+    - sized_box_for_whitespace
+    - sort_constructors_first
+    - sort_child_properties_last
+    - use_build_context_synchronously
+    - use_full_hex_values_for_flutter_colors
+    - use_key_in_widget_constructors

packages/clerk_auth/.gitignore

@@ -0,0 +1,12 @@
+targets:
+  $default:
+    sources:
+      exclude:
+        - test/**
+    builders:
+      # See https://pub.dev/packages/json_serializable
+      json_serializable:
+        options:
+          explicit_to_json: true
+          field_rename: snake
+          include_if_null: false

packages/clerk_auth/CHANGELOG.md

@@ -1,5 +1,8 @@
 /// Package that will allow you to authenticate and use Clerk from Dart code.
 library clerk_auth;
 
-export 'clerk_auth/clerk_auth.dart';
-export 'models/models.dart';
+export 'src/clerk_api/api.dart';
+export 'src/clerk_auth/auth.dart';
+export 'src/models/models.dart';
+export 'src/utils/extensions.dart';
+export 'src/utils/logging.dart';

packages/clerk_auth/LICENSE

@@ -2,14 +2,13 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io' show HttpStatus, HttpHeaders;
 
-import 'package:clerk_auth/clerk_api/token_cache.dart';
+import 'package:clerk_auth/src/clerk_api/token_cache.dart';
 import 'package:clerk_auth/clerk_auth.dart';
-import 'package:common/common.dart';
 import 'package:http/http.dart' as http;
 
-class Api with Logging {
-  static final _caches = <String, Api>{};
+export 'package:clerk_auth/src/models/models.dart';
 
+class Api with Logging {
   Api._(this._tokenCache, this._domain, this._client);
 
   factory Api({
@@ -28,6 +27,8 @@ class Api with Logging {
   final String _domain;
   final HttpClient _client;
 
+  static final _caches = <String, Api>{};
+
   static const _scheme = 'https';
   static const _kJwtKey = 'jwt';
   static const _kIsNative = '_is_native';
@@ -36,7 +37,6 @@ class Api with Logging {
   static const _kErrorsKey = 'errors';
   static const _kClientKey = 'client';
   static const _kResponseKey = 'response';
-  static const _kDataKey = 'data';
 
   // environment & client
 
@@ -63,6 +63,7 @@ class Api with Logging {
   }
 
   Future<Client> createClient() => _fetchClient(method: HttpMethod.post);
+
   Future<Client> currentClient() => _fetchClient(method: HttpMethod.get);
 
   // Sign out / delete user
@@ -260,7 +261,7 @@ class Api with Logging {
   }) async {
     final factor = signIn.factorFor(strategy, stage);
     if (factor is! Factor) {
-      return ApiResponse(status: HttpStatus.badRequest);
+      return const ApiResponse(status: HttpStatus.badRequest);
     }
 
     return _fetchApiResponse(
@@ -395,7 +396,6 @@ class Api with Logging {
         return ApiResponse(status: resp.statusCode, errors: errors);
       }
     } catch (error, stacktrace) {
-      print('ERROR: $error');
       logSevere('Error during fetch', error, stacktrace);
       return ApiResponse(
         status: HttpStatus.internalServerError,
@@ -460,7 +460,7 @@ class Api with Logging {
   static String deriveDomainFrom(String key) {
     final domainStartPosition = key.lastIndexOf('_') + 1;
     if (domainStartPosition < 1) {
-      throw FormatException('Public key not in correct format');
+      throw const FormatException('Public key not in correct format');
     }
 
     // base64 requires quad-byte aligned strings, but the string that comes from Clerk

packages/clerk_auth/analysis_options.yaml

@@ -6,15 +6,16 @@ import 'package:http/http.dart' as http;
 import 'package:logger/logger.dart';
 
 class TokenCache {
-  static const _tokenExpiryBuffer = Duration(seconds: 10);
+  TokenCache(this.publicKey, this.persistor);
 
   final String publicKey;
   final Persistor? persistor;
+
+  static const _tokenExpiryBuffer = Duration(seconds: 10);
+
   final logger = Logger();
   late final RSAPublicKey rsaKey = RSAPublicKey(publicKey);
 
-  TokenCache(this.publicKey, this.persistor);
-
   bool get canRefreshSessionToken => clientToken.isNotEmpty && sessionId.isNotEmpty;
 
   String _sessionId = '';