Merge pull request #74 from t-unit/platform-support

t-unit · web-flow · commit 14aeedd68511 · 2026-01-25T13:16:27.000+01:00
Better platform support and documenation
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,11 +8,19 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        sdk: [stable, beta]
-      fail-fast: false
+        include:
+          - os: ubuntu-latest
+            sdk: stable
+          - os: macos-latest
+            sdk: stable
+          - os: windows-latest
+            sdk: stable
+          - os: ubuntu-latest
+            sdk: beta
+      fail-fast: true
 
     steps:
       - uses: actions/checkout@v6
@@ -30,6 +38,7 @@ jobs:
 
       - name: Setup integration test
         run: ./scripts/setup_integration_tests.sh
+        shell: bash
 
       - name: Run tests with coverage
         run: melos run test:coverage 
@@ -142,7 +151,7 @@ jobs:
           dart pub get
           dart test --concurrency=1
       - name: Format and merge coverage reports
-        if: matrix.sdk == 'stable'
+        if: matrix.sdk == 'stable' && matrix.os == 'ubuntu-latest'
         run: |
           # Ensure output directory exists before format_coverage writes files
           mkdir -p coverage
@@ -187,7 +196,7 @@ jobs:
           cat coverage/*.lcov.info > coverage/lcov.info 2>/dev/null || echo "No coverage files found"
 
       - name: Upload coverage to Codecov
-        if: matrix.sdk == 'stable'
+        if: matrix.sdk == 'stable' && matrix.os == 'ubuntu-latest'
         uses: codecov/codecov-action@v5
         with:
           files: ./coverage/lcov.info
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -8,6 +8,7 @@
     "Behaviour",
     "Blub",
     "cbor",
+    "codegen",
     "codegeneration",
     "endpointcost",
     "fastify",
diff --git a/integration_test/binary_models/binary_models_test/analysis_options.yaml b/integration_test/binary_models/binary_models_test/analysis_options.yaml
@@ -1 +1,5 @@
 include: package:very_good_analysis/analysis_options.yaml
+
+linter:
+  rules:
+    avoid_print: false
diff --git a/integration_test/binary_models/binary_models_test/imposter/response.groovy b/integration_test/binary_models/binary_models_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response based on path and status
 def response = respond().withStatusCode(Integer.parseInt(responseStatus))
diff --git a/integration_test/binary_models/binary_models_test/test/content_media_type_test.dart b/integration_test/binary_models/binary_models_test/test/content_media_type_test.dart
@@ -77,9 +77,10 @@ void main() {
       // Serialize to JSON
       final json = imageEncodedData.toJson()! as Map<String, dynamic>;
 
-      // The schema has contentEncoding: base64, but this test uses ASCII-compatible
-      // bytes that are valid UTF-8 to demonstrate the bidirectional conversion.
-      // In this test, List<int> is decoded as UTF-8 string in JSON for simplicity.
+      // The schema has contentEncoding: base64, but this test uses
+      // ASCII-compatible bytes that are valid UTF-8 to demonstrate the
+      // bidirectional conversion. In this test, List<int> is decoded as UTF-8
+      // string in JSON for simplicity.
       expect(json['imageData'], isA<String>());
       expect(json['imageData'], equals('Hello'));
     });
diff --git a/integration_test/binary_models/binary_models_test/test/test_helper.dart b/integration_test/binary_models/binary_models_test/test/test_helper.dart
@@ -1,4 +1,5 @@
 import 'dart:async';
+import 'dart:convert';
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
@@ -36,6 +37,13 @@ class ImposterServer {
       ],
     );
 
+    _process!.stdout.transform(const Utf8Decoder()).listen((data) {
+      print('Imposter stdout: $data');
+    });
+    _process!.stderr.transform(const Utf8Decoder()).listen((data) {
+      print('Imposter stderr: $data');
+    });
+
     // Wait for server to be ready
     await _waitForServer();
   }
diff --git a/integration_test/boolean_schemas/boolean_schemas_test/imposter/response.groovy b/integration_test/boolean_schemas/boolean_schemas_test/imposter/response.groovy
@@ -2,7 +2,8 @@ import groovy.json.JsonSlurper
 import groovy.json.JsonOutput
 
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response status code
 def response = respond()
diff --git a/integration_test/fastify_type_provider_zod/fastify_type_provider_zod_test/imposter/response.groovy b/integration_test/fastify_type_provider_zod/fastify_type_provider_zod_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response status code and use the OpenAPI specification
 respond()
diff --git a/integration_test/gov/gov_test/imposter/response.groovy b/integration_test/gov/gov_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response status code and use the OpenAPI specification
 respond()
diff --git a/integration_test/inference/inference_test/imposter/response.groovy b/integration_test/inference/inference_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 def statusCode = Integer.parseInt(responseStatus)
 def path = context.request.path
 def method = context.request.method
diff --git a/integration_test/medama/medama_test/imposter/response.groovy b/integration_test/medama/medama_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 def statusCode = Integer.parseInt(responseStatus)
 
 // Add required headers based on endpoint and status code
diff --git a/integration_test/music_streaming/music_streaming_test/imposter/response.groovy b/integration_test/music_streaming/music_streaming_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response status code and use the OpenAPI specification
 respond()
diff --git a/integration_test/petstore/petstore_test/imposter/response.groovy b/integration_test/petstore/petstore_test/imposter/response.groovy
@@ -1,20 +1,27 @@
-// Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+// Get the response status from the request header (case-insensitive for Windows compatibility)
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response status code and use the OpenAPI specification
 def response = respond()
     .withStatusCode(Integer.parseInt(responseStatus))
+    .usingDefaultBehaviour()
 
+// Override specific endpoints that need custom responses (without resetting default behavior)
 if (context.request.path == '/api/v3/user/login' && responseStatus == '200') {
     // For login endpoint with 200 status, return a properly formatted JSON string
-    response.withHeader('Content-Type', 'application/json')
-          .withContent('"example return value"')
+    response = respond()
+        .withStatusCode(Integer.parseInt(responseStatus))
+        .withHeader('Content-Type', 'application/json')
+        .withContent('"example return value"')
 
 } else if (context.request.path.matches('/api/v3/pet/\\d+/health') && responseStatus == '200') {
     // For pet health endpoint with 200 status, return RFC 7807 Problem Details JSON
     def petId = context.request.path.replaceAll('.*/pet/(\\d+)/health', '$1')
-    response.withHeader('Content-Type', 'application/problem+json')
-          .withContent("""
+    response = respond()
+        .withStatusCode(Integer.parseInt(responseStatus))
+        .withHeader('Content-Type', 'application/problem+json')
+        .withContent("""
             {
               "type": "https://example.com/probs/pet-health",
               "title": "Pet Health Report",
@@ -24,8 +31,4 @@ if (context.request.path == '/api/v3/user/login' && responseStatus == '200') {
               "healthStatus": "healthy"
             }
           """.trim())
-
-} else {
-    // For all other cases, use default behavior
-    response.usingDefaultBehaviour()
 } 
diff --git a/integration_test/petstore_config/petstore_test/imposter/response.groovy b/integration_test/petstore_config/petstore_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response status code and use the OpenAPI specification
 def response = respond()
diff --git a/integration_test/petstore_config/petstore_test/test/deprecation_test.dart b/integration_test/petstore_config/petstore_test/test/deprecation_test.dart
@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:path/path.dart' as path;
 import 'package:petstore_deprecation_api/petstore_deprecation_api.dart';
 import 'package:test/test.dart';
 
@@ -12,7 +13,7 @@ void main() {
       final files = operationDir
           .listSync()
           .whereType<File>()
-          .map((f) => f.path.split('/').last)
+          .map((f) => path.basename(f.path))
           .toList();
 
       // Verify deprecated operations are NOT generated
@@ -32,7 +33,7 @@ void main() {
         final files = operationDir
             .listSync()
             .whereType<File>()
-            .map((f) => f.path.split('/').last)
+            .map((f) => path.basename(f.path))
             .toList();
 
         expect(
@@ -48,7 +49,7 @@ void main() {
       final files = modelDir
           .listSync()
           .whereType<File>()
-          .map((f) => f.path.split('/').last)
+          .map((f) => path.basename(f.path))
           .toList();
 
       // Verify deprecated schema is NOT generated
@@ -111,7 +112,7 @@ void main() {
       final files = operationDir
           .listSync()
           .whereType<File>()
-          .map((f) => f.path.split('/').last)
+          .map((f) => path.basename(f.path))
           .toList();
 
       // Verify expected non-deprecated operations ARE generated
@@ -129,7 +130,7 @@ void main() {
       final files = modelDir
           .listSync()
           .whereType<File>()
-          .map((f) => f.path.split('/').last)
+          .map((f) => path.basename(f.path))
           .toList();
 
       // Verify non-deprecated models ARE generated
diff --git a/integration_test/query_parameters/query_parameters_test/imposter/response.groovy b/integration_test/query_parameters/query_parameters_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response status code and use the OpenAPI specification
 respond()
diff --git a/integration_test/ref_siblings/ref_siblings_test/imposter/response.groovy b/integration_test/ref_siblings/ref_siblings_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 def statusCode = Integer.parseInt(responseStatus)
 
 // Echo-style responses: return the request body as the response
diff --git a/integration_test/simple_encoding/simple_encoding_test/imposter/response.groovy b/integration_test/simple_encoding/simple_encoding_test/imposter/response.groovy
@@ -1,5 +1,6 @@
 // Get the response status from the request header
-def responseStatus = context.request.headers['X-Response-Status'] ?: '200'
+def headers = context.request.headers
+def responseStatus = headers['X-Response-Status'] ?: headers['x-response-status'] ?: '200'
 
 // Set the response status code and prepare the response
 def response = respond()
diff --git a/packages/tonik/README.md b/packages/tonik/README.md
@@ -83,6 +83,10 @@ Path, query, and header parameters support all OpenAPI styles: `simple`, `label`
 
 Install with `dart pub global activate tonik` and run. No JVM, no Docker, no external dependencies.
 
+### Universal Platform Support
+
+Generated packages are pure Dart with no platform dependencies. Use them in Flutter apps targeting iOS, Android, web, desktop, or in server-side Dart—the same generated code works everywhere.
+
 ## Documentation
 
 - [Features Overview](https://github.com/t-unit/tonik/blob/main/docs/features.md) – Complete feature reference
diff --git a/packages/tonik_core/pubspec.yaml b/packages/tonik_core/pubspec.yaml
@@ -4,6 +4,14 @@ version: 0.4.0
 repository: https://github.com/t-unit/tonik
 resolution: workspace
 
+platforms:
+  android:
+  ios:
+  linux:
+  macos:
+  web:
+  windows:
+
 environment:
   sdk: '>=3.10.0 <4.0.0'
 
diff --git a/packages/tonik_generate/lib/src/library_generator.dart b/packages/tonik_generate/lib/src/library_generator.dart
@@ -9,8 +9,10 @@ void generateLibraryFile({
   required String package,
 }) {
   final packageDir = path.join(outputDirectory, package);
-  final libraryFile = File(path.join(packageDir, 'lib', '$package.dart'));
-  final srcDir = Directory(path.join(packageDir, 'lib', 'src'));
+  final libDirPath = path.join(packageDir, 'lib');
+  final libDir = Directory(libDirPath);
+  final libraryFile = File(path.join(libDirPath, '$package.dart'));
+  final srcDir = Directory(path.join(libDirPath, 'src'));
 
   final srcFiles = <String>[];
   if (srcDir.existsSync()) {
@@ -26,8 +28,6 @@ void generateLibraryFile({
     );
   }
 
-  srcFiles.sort();
-
   final docComments = _formatApiDocumentation(apiDocument);
 
   final buffer = StringBuffer()
@@ -45,10 +45,13 @@ void generateLibraryFile({
     ..writeln();
 
   for (final file in srcFiles) {
-    final normalizedPath = file.replaceAll(r'\\', '/');
+    final normalizedPath = file.replaceAll(r'\', '/');
     buffer.writeln("export '$normalizedPath';");
   }
 
+  if (!libDir.existsSync()) {
+    libDir.createSync(recursive: true);
+  }
   libraryFile.writeAsStringSync(buffer.toString());
 }
 
diff --git a/packages/tonik_generate/lib/src/server/server_file_generator.dart b/packages/tonik_generate/lib/src/server/server_file_generator.dart
@@ -6,12 +6,8 @@ import 'package:tonik_generate/src/server/server_generator.dart';
 
 /// Generates server class files.
 class ServerFileGenerator {
-  /// Creates a new ServerFileGenerator.
-  const ServerFileGenerator({
-    required this.serverGenerator,
-  });
+  const ServerFileGenerator({required this.serverGenerator});
 
-  /// The generator used to generate server classes.
   final ServerGenerator serverGenerator;
 
   /// Writes server files to the specified output directory.
@@ -30,14 +26,11 @@ class ServerFileGenerator {
       'server',
     );
 
-    final serverDir = Directory(serverDirPath);
-    if (!serverDir.existsSync()) {
-      serverDir.createSync(recursive: true);
-    }
-
     final result = serverGenerator.generate(apiDocument.servers.toList());
 
     final filePath = path.join(serverDirPath, result.filename);
-    File(filePath).writeAsStringSync(result.code);
+    final file = File(filePath);
+    file.parent.createSync(recursive: true);
+    file.writeAsStringSync(result.code);
   }
 }
diff --git a/packages/tonik_generate/pubspec.yaml b/packages/tonik_generate/pubspec.yaml
@@ -4,6 +4,14 @@ version: 0.4.0
 repository: https://github.com/t-unit/tonik
 resolution: workspace
 
+platforms:
+  android:
+  ios:
+  linux:
+  macos:
+  web:
+  windows:
+
 environment:
   sdk: '>=3.10.0 <4.0.0'
 
diff --git a/packages/tonik_parse/pubspec.yaml b/packages/tonik_parse/pubspec.yaml
diff --git a/packages/tonik_util/pubspec.yaml b/packages/tonik_util/pubspec.yaml

-Original file line number
+Diff line change
@@ @@ -1 +1,5 @@ @@
 include: package:very_good_analysis/analysis_options.yaml
++
 +linter:
 +  rules:
 +    avoid_print: false