Rename files and move things around

Author: ntkme

bin/sass.dart

@@ -17,9 +17,7 @@ import 'package:sass/src/importer/filesystem.dart';
 import 'package:sass/src/io.dart';
 import 'package:sass/src/stylesheet_graph.dart';
 import 'package:sass/src/utils.dart';
-import 'package:sass/src/embedded/executable.dart'
-    if (dart.library.js) 'package:sass/src/embedded/js/executable.dart'
-    as embedded;
+import 'package:sass/src/embedded/executable.dart' as embedded;
 
 Future<void> main(List<String> args) async {
   if (args case ['--embedded', ...var rest]) {

lib/src/embedded/executable.dart

@@ -1,21 +1,5 @@
-// Copyright 2019 Google Inc. Use of this source code is governed by an
+// Copyright 2025 Google Inc. Use of this source code is governed by an
 // MIT-style license that can be found in the LICENSE file or at
 // https://opensource.org/licenses/MIT.
 
-import 'dart:io';
-
-import 'package:stream_channel/stream_channel.dart';
-
-import 'isolate_dispatcher.dart';
-import 'options.dart';
-import 'util/length_delimited_transformer.dart';
-
-void main(List<String> args) {
-  if (parseOptions(args)) {
-    IsolateDispatcher(
-            StreamChannel.withGuarantees(stdin, stdout, allowSinkErrors: false)
-                .transform(lengthDelimited),
-            gracefulShutdown: false)
-        .listen();
-  }
-}
+export 'vm/executable.dart' if (dart.library.js) 'js/executable.dart';

lib/src/embedded/js/executable.dart

@@ -4,24 +4,24 @@
 
 import 'package:stream_channel/stream_channel.dart';
 
-import '../isolate_dispatcher.dart';
-import '../isolate_main.dart';
 import '../options.dart';
 import '../util/length_delimited_transformer.dart';
+import '../worker_dispatcher.dart';
+import '../worker_entrypoint.dart';
 import 'io.dart';
 import 'sync_receive_port.dart';
 import 'worker_threads.dart';
 
 void main(List<String> args) {
   if (parseOptions(args)) {
     if (isMainThread) {
-      IsolateDispatcher(StreamChannel.withGuarantees(stdin, stdout,
+      WorkerDispatcher(StreamChannel.withGuarantees(stdin, stdout,
                   allowSinkErrors: false)
               .transform(lengthDelimited))
           .listen();
     } else {
       var port = workerData! as MessagePort;
-      isolateMain(JSSyncReceivePort(port), JSSendPort(port));
+      workerEntryPoint(JSSyncReceivePort(port), JSSendPort(port));
     }
   }
 }

lib/src/embedded/js/reusable_isolate.dart renamed to lib/src/embedded/js/reusable_worker.dart

@@ -10,12 +10,12 @@ import 'js.dart';
 import 'sync_message_port.dart';
 import 'worker_threads.dart';
 
-/// The entrypoint for a [ReusableIsolate].
+/// The entrypoint for a [ReusableWorker].
 ///
 /// This must return a Record of filename and argv for creating the Worker.
-typedef ReusableIsolateEntryPoint = (String, JSArray<JSAny?>) Function();
+typedef ReusableWorkerEntryPoint = (String, JSArray<JSAny?>) Function();
 
-class ReusableIsolate {
+class ReusableWorker {
   /// The worker.
   final Worker _worker;
 
@@ -28,14 +28,14 @@ class ReusableIsolate {
   /// The subscription to [_receivePort].
   final StreamSubscription<dynamic> _subscription;
 
-  /// Whether the current isolate has been borrowed.
+  /// Whether the current worker has been borrowed.
   bool _borrowed = false;
 
-  ReusableIsolate._(
+  ReusableWorker._(
       this._worker, this._sendPort, this._receivePort, this._subscription);
 
-  /// Spawns a [ReusableIsolate] that runs the the entrypoint script.
-  static Future<ReusableIsolate> spawn(ReusableIsolateEntryPoint entryPoint,
+  /// Spawns a [ReusableWorker] that runs the the entrypoint script.
+  static Future<ReusableWorker> spawn(ReusableWorkerEntryPoint entryPoint,
       {Function? onError}) async {
     var (filename, argv) = entryPoint();
     var channel = SyncMessagePort.createChannel();
@@ -53,14 +53,14 @@ class ReusableIsolate {
         ((JSUint8Array buffer) {
           controller.add(buffer.toDart);
         }).toJS);
-    return ReusableIsolate._(worker, sendPort, receivePort,
+    return ReusableWorker._(worker, sendPort, receivePort,
         controller.stream.listen(_defaultOnData));
   }
 
   /// Subscribe to messages from [_receivePort].
   void borrow(void onData(dynamic event)?) {
     if (_borrowed) {
-      throw StateError('ReusableIsolate has already been borrowed.');
+      throw StateError('ReusableWorker has already been borrowed.');
     }
     _borrowed = true;
     _subscription.onData(onData);
@@ -69,16 +69,16 @@ class ReusableIsolate {
   /// Unsubscribe to messages from [_receivePort].
   void release() {
     if (!_borrowed) {
-      throw StateError('ReusableIsolate has not been borrowed.');
+      throw StateError('ReusableWorker has not been borrowed.');
     }
     _borrowed = false;
     _subscription.onData(_defaultOnData);
   }
 
-  /// Sends [message] to the isolate.
+  /// Sends [message] to the worker.
   ///
-  /// Throws a [StateError] if this is called while the isolate isn't borrowed,
-  /// or if a second message is sent before the isolate has processed the first
+  /// Throws a [StateError] if this is called while the worker isn't borrowed,
+  /// or if a second message is sent before the worker has processed the first
   /// one.
   void send(Uint8List message) {
     if (!_borrowed) {
@@ -88,15 +88,15 @@ class ReusableIsolate {
     _sendPort.postMessage(array, [array.buffer].toJS);
   }
 
-  /// Shuts down the isolate.
+  /// Shuts down the worker.
   void kill() {
     _sendPort.close();
     _worker.terminate();
     _receivePort.close();
   }
 }
 
-/// The default handler for data events from the wrapped isolate when it's not
+/// The default handler for data events from the wrapped worker when it's not
 /// borrowed.
 void _defaultOnData(dynamic _) {
   throw StateError("Shouldn't receive a message before being borrowed.");

lib/src/embedded/js/isolate_main.dart renamed to lib/src/embedded/js/worker_entrypoint.dart

@@ -9,6 +9,6 @@ import 'js.dart';
 @JS('process.argv')
 external JSArray<JSAny?> get _argv;
 
-(String, JSArray<JSString>) isolateMain() {
+(String, JSArray<JSString>) workerEntryPoint() {
   return ((_argv[1]! as JSString).toDart, _argv.slice(2) as JSArray<JSString>);
 }

lib/src/embedded/options.dart

@@ -5,14 +5,14 @@
 import 'dart:convert';
 
 import '../io.dart';
-import 'isolate_dispatcher.dart';
+import 'worker_dispatcher.dart';
 
 /// Returns true if should start embedded compiler,
 /// and false if should exit.
 bool parseOptions(List<String> args) {
   switch (args) {
     case ["--version", ...]:
-      var response = IsolateDispatcher.versionResponse();
+      var response = WorkerDispatcher.versionResponse();
       response.id = 0;
       safePrint(JsonEncoder.withIndent("  ").convert(response.toProto3Json()));
       return false;

lib/src/embedded/concurrency.dart renamed to lib/src/embedded/vm/concurrency.dart

@@ -0,0 +1,21 @@
+// Copyright 2025 Google Inc. Use of this source code is governed by an
+// MIT-style license that can be found in the LICENSE file or at
+// https://opensource.org/licenses/MIT.
+
+import 'dart:io';
+
+import 'package:stream_channel/stream_channel.dart';
+
+import '../options.dart';
+import '../util/length_delimited_transformer.dart';
+import '../worker_dispatcher.dart';
+
+void main(List<String> args) {
+  if (parseOptions(args)) {
+    WorkerDispatcher(
+            StreamChannel.withGuarantees(stdin, stdout, allowSinkErrors: false)
+                .transform(lengthDelimited),
+            gracefulShutdown: false)
+        .listen();
+  }
+}

lib/src/embedded/vm/executable.dart

@@ -9,21 +9,21 @@ import 'dart:typed_data';
 import 'package:native_synchronization/mailbox.dart';
 import 'package:native_synchronization/sendable.dart';
 
-import 'sync_receive_port.dart';
+import '../sync_receive_port.dart';
 
-/// The entrypoint for a [ReusableIsolate].
+/// The entrypoint for a [ReusableWorker].
 ///
 /// This must be a static global function. It's run when the isolate is spawned,
-/// and is passed a [Mailbox] that receives messages from [ReusableIsolate.send]
+/// and is passed a [Mailbox] that receives messages from [ReusableWorker.send]
 /// and a [SendPort] that sends messages to the [ReceivePort] listened by
-/// [ReusableIsolate.borrow].
+/// [ReusableWorker.borrow].
 ///
-/// If the [sendPort] sends a message before [ReusableIsolate.borrow] is called,
+/// If the [sendPort] sends a message before [ReusableWorker.borrow] is called,
 /// this will throw an unhandled [StateError].
-typedef ReusableIsolateEntryPoint = FutureOr<void> Function(
+typedef ReusableWorkerEntryPoint = FutureOr<void> Function(
     SyncReceivePort receivePort, SendPort sendPort);
 
-class ReusableIsolate {
+class ReusableWorker {
   /// The wrapped isolate.
   final Isolate _isolate;
 
@@ -39,16 +39,16 @@ class ReusableIsolate {
   /// Whether the current isolate has been borrowed.
   bool _borrowed = false;
 
-  ReusableIsolate._(
+  ReusableWorker._(
     this._isolate,
     this._mailbox,
     this._receivePort, {
     Function? onError,
   }) : _subscription = _receivePort.listen(_defaultOnData, onError: onError);
 
-  /// Spawns a [ReusableIsolate] that runs the given [entryPoint].
-  static Future<ReusableIsolate> spawn(
-    ReusableIsolateEntryPoint entryPoint, {
+  /// Spawns a [ReusableWorker] that runs the given [entryPoint].
+  static Future<ReusableWorker> spawn(
+    ReusableWorkerEntryPoint entryPoint, {
     Function? onError,
   }) async {
     var mailbox = Mailbox();
@@ -58,13 +58,13 @@ class ReusableIsolate {
       mailbox.asSendable,
       receivePort.sendPort,
     ));
-    return ReusableIsolate._(isolate, mailbox, receivePort, onError: onError);
+    return ReusableWorker._(isolate, mailbox, receivePort, onError: onError);
   }
 
   /// Subscribe to messages from [_receivePort].
   void borrow(void onData(dynamic event)?) {
     if (_borrowed) {
-      throw StateError('ReusableIsolate has already been borrowed.');
+      throw StateError('ReusableWorker has already been borrowed.');
     }
     _borrowed = true;
     _subscription.onData(onData);
@@ -73,7 +73,7 @@ class ReusableIsolate {
   /// Unsubscribe to messages from [_receivePort].
   void release() {
     if (!_borrowed) {
-      throw StateError('ReusableIsolate has not been borrowed.');
+      throw StateError('ReusableWorker has not been borrowed.');
     }
     _borrowed = false;
     _subscription.onData(_defaultOnData);
@@ -108,7 +108,7 @@ void _defaultOnData(dynamic _) {
 }
 
 void _isolateMain(
-  (ReusableIsolateEntryPoint, Sendable<Mailbox>, SendPort) message,
+  (ReusableWorkerEntryPoint, Sendable<Mailbox>, SendPort) message,
 ) {
   var (entryPoint, sendableMailbox, sendPort) = message;
   entryPoint(MailboxSyncReceivePort(sendableMailbox.materialize()), sendPort);