Works now

Author: mosuem

pkgs/intl4x/example_native/pubspec.yaml

@@ -13,8 +13,8 @@ dependencies:
 dev_dependencies:
   lints: ^6.0.0
 
-hook:
-  intl4x:
-    buildMode: checkout
-    checkoutPath: ../../../submodules/icu4x
-    treeshake: true
+hooks:
+  user_defines:
+    intl4x:
+      buildMode: checkout
+      checkoutPath: ../../../submodules/icu4x

pkgs/intl4x/hook/build.dart

@@ -7,46 +7,48 @@ import 'dart:io';
 import 'package:crypto/crypto.dart' show sha256;
 import 'package:intl4x/src/hook_helpers/build_libs.g.dart' show buildLib;
 import 'package:intl4x/src/hook_helpers/build_options.dart'
-    show BuildModeEnum, getBuildOptions;
+    show BuildModeEnum, BuildOptions, getBuildOptions;
 import 'package:intl4x/src/hook_helpers/hashes.dart' show fileHashes;
 import 'package:intl4x/src/hook_helpers/shared.dart' show assetId, package;
 import 'package:intl4x/src/hook_helpers/version.dart' show version;
 import 'package:native_assets_cli/code_assets.dart';
 
 void main(List<String> args) async {
   await build(args, (input, output) async {
-    final buildOptions = await getBuildOptions(
-      input.outputDirectory.toFilePath(),
-    );
-    if (buildOptions == null) {
+    BuildOptions buildOptions;
+    try {
+      buildOptions = await getBuildOptions(input.userDefines);
+    } catch (e) {
       throw ArgumentError('''
+Error: $e
+
+
+Set the build mode with either `fetch`, `local`, or `checkout` by writing into your pubspec:
 
-Unknown build mode for icu4x. Set the build mode with either `fetch`, `local`, or `checkout` by writing into your pubspec:
 * fetch: Fetch the precompiled binary from a CDN.
 ```
-...
-hook:
-  intl4x:
-    buildMode: fetch
-...
+hooks:
+  user_defines:
+    intl4x:
+      buildMode: fetch
 ```
+
 * local: Use a locally existing binary at the environment variable `LOCAL_ICU4X_BINARY`.
 ```
-...
-hook:
-  intl4x:
-    buildMode: local
-    localDylibPath: path/to/dylib.so
-...
+hooks:
+  user_defines:
+    intl4x:
+      buildMode: local
+      localDylibPath: path/to/dylib.so
 ```
+
 * checkout: Build a fresh library from a local git checkout of the icu4x repository.
 ```
-...
-hook:
-  intl4x:
-    buildMode: checkout
-    checkoutPath: path/to/checkout
-...
+hooks:
+  user_defines:
+    intl4x:
+      buildMode: checkout
+      checkoutPath: path/to/checkout
 ```
 
 ''');
@@ -70,17 +72,13 @@ hook:
     final builtLibrary = await buildMode.build();
     // For debugging purposes
     // ignore: deprecated_member_use
-    output.addMetadatum('ICU4X_BUILD_MODE', buildOptions.buildMode.name);
+    output.metadata.addAll({'ICU4X_BUILD_MODE': buildOptions.buildMode.name});
 
-    final targetOS = input.config.code.targetOS;
-    final targetArchitecture = input.config.code.targetArchitecture;
     output.assets.code.add(
       CodeAsset(
         package: package,
         name: assetId,
         linkMode: DynamicLoadingBundled(),
-        architecture: targetArchitecture,
-        os: targetOS,
         file: builtLibrary,
       ),
       routing:
@@ -156,12 +154,12 @@ final class FetchMode extends BuildMode {
 }
 
 final class LocalMode extends BuildMode {
-  final String? localPath;
+  final Uri? localPath;
   LocalMode(super.input, this.localPath, super.treeshake);
 
   String get _localLibraryPath {
     if (localPath != null) {
-      return localPath!;
+      return localPath!.toFilePath(windows: Platform.isWindows);
     }
     throw ArgumentError(
       '`LOCAL_ICU4X_BINARY` is empty. '
@@ -190,7 +188,7 @@ final class LocalMode extends BuildMode {
 }
 
 final class CheckoutMode extends BuildMode {
-  final String? checkoutPath;
+  final Uri? checkoutPath;
 
   CheckoutMode(super.input, this.checkoutPath, super.treeshake);
 
@@ -209,23 +207,23 @@ final class CheckoutMode extends BuildMode {
       input.config.buildStatic(treeshake),
       input.config.code.targetOS == OS.iOS &&
           input.config.code.iOS.targetSdk == IOSSdk.iPhoneSimulator,
-      Directory(checkoutPath!),
+      Directory.fromUri(checkoutPath!),
       [
         'icu_collator',
         'icu_datetime',
         'icu_list',
         'icu_decimal',
         'icu_plurals',
         'experimental_components',
+        'default_components',
+        'compiled_data',
       ],
     );
     return builtLib.uri;
   }
 
   @override
-  List<Uri> get dependencies => [
-    Uri.directory(checkoutPath!).resolve('Cargo.lock'),
-  ];
+  List<Uri> get dependencies => [checkoutPath!.resolve('Cargo.lock')];
 }
 
 extension on BuildConfig {

pkgs/intl4x/lib/src/hook_helpers/build_options.dart

@@ -5,13 +5,13 @@
 import 'dart:convert' show JsonEncoder;
 import 'dart:io';
 
+// ignore: implementation_imports
+import 'package:native_assets_cli/src/config.dart';
 import 'package:path/path.dart' as path;
 import 'package:yaml/yaml.dart' show YamlMap, loadYaml;
 
-Future<BuildOptions?> getBuildOptions(String searchDir) async {
-  final (map, dir) = await readOptionsFromPubspec(searchDir);
-  print('Reading build options from $map');
-  final buildOptions = BuildOptions.fromMap(map?['intl4x'] as Map? ?? {}, dir);
+Future<BuildOptions> getBuildOptions(HookInputUserDefines userDefines) async {
+  final buildOptions = BuildOptions.fromDefines(userDefines);
   print('Got build options: ${buildOptions.toJson()}');
   return buildOptions;
 }
@@ -38,8 +38,8 @@ enum BuildModeEnum { local, checkout, fetch }
 
 class BuildOptions {
   final BuildModeEnum buildMode;
-  final String? localDylibPath;
-  final String? checkoutPath;
+  final Uri? localDylibPath;
+  final Uri? checkoutPath;
   final bool? treeshake;
 
   BuildOptions({
@@ -52,22 +52,20 @@ class BuildOptions {
   Map<String, dynamic> toMap() {
     return {
       'buildMode': buildMode.name,
-      if (localDylibPath != null) 'localDylibPath': localDylibPath,
-      if (checkoutPath != null) 'checkoutPath': checkoutPath,
+      if (localDylibPath != null) 'localDylibPath': localDylibPath.toString(),
+      if (checkoutPath != null) 'checkoutPath': checkoutPath.toString(),
       if (treeshake != null) 'treeshake': treeshake.toString(),
     };
   }
 
-  factory BuildOptions.fromMap(Map map, Directory dir) {
-    final localPath = map['localDylibPath'] as String?;
-    final checkoutPath = map['checkoutPath'] as String?;
+  factory BuildOptions.fromDefines(HookInputUserDefines defines) {
     return BuildOptions(
       buildMode: BuildModeEnum.values.firstWhere(
-        (element) => element.name == map['buildMode'],
+        (element) => element.name == defines['buildMode'],
       ),
-      localDylibPath: localPath != null ? getPath(dir, localPath) : null,
-      checkoutPath: checkoutPath != null ? getPath(dir, checkoutPath) : null,
-      treeshake: map['treeshake'] == true,
+      localDylibPath: defines.path('localDylibPath'),
+      checkoutPath: defines.path('checkoutPath'),
+      treeshake: (defines['treeshake'] ?? true) == true,
     );
   }
 

pkgs/intl4x/pubspec.yaml

@@ -26,8 +26,8 @@ dependencies:
   ffi: ^2.1.0
   logging: ^1.3.0
   meta: ^1.12.0
-  native_assets_cli: ^0.16.0
-  native_toolchain_c: ^0.13.0
+  native_assets_cli: ^0.17.0
+  native_toolchain_c: ^0.14.0
   path: ^1.9.0
   record_use: ^0.3.0
   yaml: ^3.1.3

pkgs/intl4x/tool/write_option_file.dart

@@ -17,11 +17,11 @@ Future<void> main(List<String> args) async {
   final buildOptions = switch (buildMode) {
     BuildModeEnum.local => BuildOptions(
       buildMode: buildMode,
-      localDylibPath: pathString,
+      localDylibPath: Uri.parse(pathString!),
     ),
     BuildModeEnum.checkout => BuildOptions(
       buildMode: buildMode,
-      checkoutPath: pathString,
+      checkoutPath: Uri.parse(pathString!),
     ),
     BuildModeEnum.fetch => BuildOptions(buildMode: buildMode),
   };