[wasm_builder] Replace parts with libs

osa1 · Commit Queue · commit 26f08dd0364d · 2025-02-18T02:35:11.000-08:00
Parts make it difficult to see dependencies between files and which files can be imported. Replace them with libs. Change-Id: I0a07b48bc3c4a545a420f3efae23f61c4918bdcf Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/410400 Commit-Queue: Ömer Ağacan <omersa@google.com> Reviewed-by: Martin Kustermann <kustermann@google.com>
diff --git a/pkg/wasm_builder/lib/src/builder/builder.dart b/pkg/wasm_builder/lib/src/builder/builder.dart
@@ -4,13 +4,17 @@
 
 import '../ir/ir.dart' as ir;
 
-export 'data_segments.dart' show DataSegmentBuilder, DataSegmentsBuilder;
+export 'data_segments.dart' show DataSegmentsBuilder;
+export 'data_segment.dart' show DataSegmentBuilder;
 export 'exports.dart' show ExportsBuilder;
-export 'globals.dart' show GlobalsBuilder, GlobalBuilder;
-export 'functions.dart' show FunctionsBuilder, FunctionBuilder;
+export 'globals.dart' show GlobalsBuilder;
+export 'global.dart' show GlobalBuilder;
+export 'functions.dart' show FunctionsBuilder;
+export 'function.dart' show FunctionBuilder;
 export 'memories.dart' show MemoriesBuilder;
 export 'module.dart' show ModuleBuilder;
-export 'tables.dart' show TablesBuilder, TableBuilder;
+export 'tables.dart' show TablesBuilder;
+export 'table.dart' show TableBuilder;
 export 'tags.dart' show TagsBuilder;
 export 'types.dart' show TypesBuilder;
 export 'instructions.dart' show InstructionsBuilder, Label, ValidationError;
diff --git a/pkg/wasm_builder/lib/src/builder/data_segment.dart b/pkg/wasm_builder/lib/src/builder/data_segment.dart
@@ -2,7 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'data_segments.dart';
+import 'dart:typed_data';
+
+import '../ir/ir.dart' as ir;
+import 'builder.dart';
 
 /// A data segment builder in a module builder.
 class DataSegmentBuilder extends ir.BaseDataSegment
diff --git a/pkg/wasm_builder/lib/src/builder/data_segments.dart b/pkg/wasm_builder/lib/src/builder/data_segments.dart
@@ -7,8 +7,6 @@ import 'dart:typed_data';
 import '../ir/ir.dart' as ir;
 import 'builder.dart';
 
-part 'data_segment.dart';
-
 /// The interface for building data segments in a module.
 class DataSegmentsBuilder with Builder<ir.DataSegments> {
   final _dataSegmentBuilders = <DataSegmentBuilder>[];
diff --git a/pkg/wasm_builder/lib/src/builder/function.dart b/pkg/wasm_builder/lib/src/builder/function.dart
@@ -2,7 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'functions.dart';
+import '../ir/ir.dart' as ir;
+import 'builder.dart';
 
 /// A function defined in a module.
 class FunctionBuilder extends ir.BaseFunction
diff --git a/pkg/wasm_builder/lib/src/builder/functions.dart b/pkg/wasm_builder/lib/src/builder/functions.dart
@@ -6,8 +6,6 @@ import '../ir/ir.dart' as ir;
 import 'builder.dart';
 import 'util.dart';
 
-part 'function.dart';
-
 /// The interface for the functions in a module.
 class FunctionsBuilder with Builder<ir.Functions> {
   final ModuleBuilder _module;
diff --git a/pkg/wasm_builder/lib/src/builder/global.dart b/pkg/wasm_builder/lib/src/builder/global.dart
@@ -2,7 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'globals.dart';
+import '../ir/ir.dart' as ir;
+import 'builder.dart';
 
 /// A global variable defined in a module.
 class GlobalBuilder extends ir.Global with IndexableBuilder<ir.DefinedGlobal> {
diff --git a/pkg/wasm_builder/lib/src/builder/globals.dart b/pkg/wasm_builder/lib/src/builder/globals.dart
@@ -6,8 +6,6 @@ import '../ir/ir.dart' as ir;
 import 'builder.dart';
 import 'util.dart';
 
-part 'global.dart';
-
 class GlobalsBuilder with Builder<ir.Globals> {
   final ModuleBuilder _module;
   final _importedGlobals = <ir.ImportedGlobal>[];
diff --git a/pkg/wasm_builder/lib/src/builder/table.dart b/pkg/wasm_builder/lib/src/builder/table.dart
@@ -2,7 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'tables.dart';
+import '../ir/ir.dart' as ir;
+import 'builder.dart';
 
 /// A table defined in a module.
 class TableBuilder extends ir.Table with IndexableBuilder<ir.DefinedTable> {
diff --git a/pkg/wasm_builder/lib/src/builder/tables.dart b/pkg/wasm_builder/lib/src/builder/tables.dart
@@ -6,8 +6,6 @@ import '../ir/ir.dart' as ir;
 import 'builder.dart';
 import 'util.dart';
 
-part 'table.dart';
-
 /// The interface for the tables in a module.
 class TablesBuilder with Builder<ir.Tables> {
   final ModuleBuilder _module;
diff --git a/pkg/wasm_builder/lib/src/ir/data_segment.dart b/pkg/wasm_builder/lib/src/ir/data_segment.dart
@@ -2,7 +2,10 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'data_segments.dart';
+import 'dart:typed_data';
+
+import '../serialize/serialize.dart';
+import 'ir.dart';
 
 class BaseDataSegment {
   final int index;
diff --git a/pkg/wasm_builder/lib/src/ir/data_segments.dart b/pkg/wasm_builder/lib/src/ir/data_segments.dart
@@ -2,12 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import 'dart:typed_data';
-
-import '../serialize/serialize.dart';
-import 'ir.dart';
-
-part 'data_segment.dart';
+import 'data_segment.dart';
 
 class DataSegments {
   /// Data segments defined in this module.
diff --git a/pkg/wasm_builder/lib/src/ir/function.dart b/pkg/wasm_builder/lib/src/ir/function.dart
@@ -2,7 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'functions.dart';
+import '../builder/module.dart';
+import '../serialize/serialize.dart';
+import 'ir.dart';
 
 /// A local variable defined in a function.
 class Local {
diff --git a/pkg/wasm_builder/lib/src/ir/functions.dart b/pkg/wasm_builder/lib/src/ir/functions.dart
@@ -2,11 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import '../builder/module.dart';
-import '../serialize/serialize.dart';
-import 'ir.dart';
-
-part 'function.dart';
+import 'function.dart';
 
 /// The interface for the functions in a module.
 class Functions {
diff --git a/pkg/wasm_builder/lib/src/ir/global.dart b/pkg/wasm_builder/lib/src/ir/global.dart
@@ -2,7 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'globals.dart';
+import '../builder/module.dart';
+import '../serialize/serialize.dart';
+import 'ir.dart';
 
 /// An (imported or defined) global variable.
 abstract class Global with Indexable, Exportable {
diff --git a/pkg/wasm_builder/lib/src/ir/globals.dart b/pkg/wasm_builder/lib/src/ir/globals.dart
@@ -2,11 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import '../builder/module.dart';
-import '../serialize/serialize.dart';
-import 'ir.dart';
-
-part 'global.dart';
+import 'global.dart';
 
 class Globals {
   /// Imported globals.
diff --git a/pkg/wasm_builder/lib/src/ir/instruction.dart b/pkg/wasm_builder/lib/src/ir/instruction.dart
@@ -2,7 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'instructions.dart';
+import '../serialize/serialize.dart';
+import 'ir.dart';
 
 abstract class Instruction implements Serializable {
   /// The [ValueType] types referenced by this instruction. Used to determine
diff --git a/pkg/wasm_builder/lib/src/ir/instructions.dart b/pkg/wasm_builder/lib/src/ir/instructions.dart
@@ -6,8 +6,6 @@ import '../../source_map.dart';
 import '../serialize/serialize.dart';
 import 'ir.dart';
 
-part 'instruction.dart';
-
 class Instructions implements Serializable {
   /// The locals used by this group of instructions.
   final List<Local> locals;
diff --git a/pkg/wasm_builder/lib/src/ir/ir.dart b/pkg/wasm_builder/lib/src/ir/ir.dart
@@ -6,19 +6,27 @@
 // TODO(joshualitt): Make all of the ir types full immutable.
 library;
 
-export 'data_segments.dart' show BaseDataSegment, DataSegment, DataSegments;
+export 'data_segments.dart' show DataSegments;
+export 'data_segment.dart' show BaseDataSegment, DataSegment;
 export 'exports.dart' show Export, Exportable, Exports;
 export 'finalizable.dart' show Finalizable, FinalizableIndex;
 export 'indexable.dart' show Indexable;
 export 'imports.dart' show Import;
-export 'globals.dart' show DefinedGlobal, Global, Globals, ImportedGlobal;
-export 'functions.dart'
-    show BaseFunction, DefinedFunction, Functions, ImportedFunction, Local;
-export 'memories.dart' show DefinedMemory, ImportedMemory, Memories, Memory;
+export 'globals.dart' show Globals;
+export 'global.dart' show DefinedGlobal, Global, ImportedGlobal;
+export 'functions.dart' show Functions;
+export 'function.dart'
+    show BaseFunction, DefinedFunction, ImportedFunction, Local;
+export 'memories.dart' show Memories;
+export 'memory.dart' show DefinedMemory, ImportedMemory, Memory;
 export 'module.dart' show Module;
-export 'tables.dart' show DefinedTable, ImportedTable, Table, Tables;
+export 'tables.dart' show Tables;
+export 'table.dart' show DefinedTable, ImportedTable, Table;
 export 'tags.dart' show DefinedTag, ImportedTag, Tag, Tags;
-export 'types.dart'
+export 'types.dart' show Types;
+export 'instructions.dart' show Instructions;
+export 'instruction.dart';
+export 'type.dart'
     show
         ArrayType,
         DataType,
@@ -32,6 +40,4 @@ export 'types.dart'
         RefType,
         StorageType,
         StructType,
-        Types,
         ValueType;
-export 'instructions.dart';
diff --git a/pkg/wasm_builder/lib/src/ir/memories.dart b/pkg/wasm_builder/lib/src/ir/memories.dart
@@ -2,11 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import '../builder/module.dart';
-import '../serialize/serialize.dart';
-import 'ir.dart';
-
-part 'memory.dart';
+import 'memory.dart';
 
 class Memories {
   /// Imported memories.
diff --git a/pkg/wasm_builder/lib/src/ir/memory.dart b/pkg/wasm_builder/lib/src/ir/memory.dart
@@ -2,7 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'memories.dart';
+import '../builder/module.dart';
+import '../serialize/serialize.dart';
+import 'ir.dart';
 
 /// An (imported or defined) memory.
 class Memory with Indexable, Exportable {
diff --git a/pkg/wasm_builder/lib/src/ir/table.dart b/pkg/wasm_builder/lib/src/ir/table.dart
@@ -2,7 +2,9 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'tables.dart';
+import '../builder/module.dart';
+import '../serialize/serialize.dart';
+import 'ir.dart';
 
 /// An (imported or defined) table.
 class Table with Indexable, Exportable implements Serializable {
diff --git a/pkg/wasm_builder/lib/src/ir/tables.dart b/pkg/wasm_builder/lib/src/ir/tables.dart
@@ -2,11 +2,8 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import '../builder/module.dart';
-import '../serialize/serialize.dart';
 import 'ir.dart';
-
-part 'table.dart';
+import 'table.dart';
 
 class Tables {
   /// Imported tables.
diff --git a/pkg/wasm_builder/lib/src/ir/type.dart b/pkg/wasm_builder/lib/src/ir/type.dart
@@ -2,7 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-part of 'types.dart';
+import '../serialize/serialize.dart';
 
 // Representations of all Wasm types.
 
diff --git a/pkg/wasm_builder/lib/src/ir/types.dart b/pkg/wasm_builder/lib/src/ir/types.dart
@@ -2,9 +2,7 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-import '../serialize/serialize.dart';
-
-part 'type.dart';
+import 'type.dart';
 
 class Types {
   /// Types defined in this module.
