Bump gts from 5.3.1 to 6.0.2 (#345)

* Bump gts from 5.3.1 to 6.0.2 Bumps [gts](https://github.com/google/gts) from 5.3.1 to 6.0.2. - [Release notes](https://github.com/google/gts/releases) - [Changelog](https://github.com/google/gts/blob/main/CHANGELOG.md) - [Commits](google/gts@v5.3.1...v6.0.2) --- updated-dependencies: - dependency-name: gts dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * run "npm run fix" with gts v6 Fixes needed because `gts` turned on `composite: true`: * Add package.json to tsconfig. The file is referenced by TS files. * Add a declarationDir `_types`. This directory is ignored. This is necessary because we can't omit `declarations`. --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Carlos (Goodwine) <[email protected]>
sass · Nov 4, 2024 · a72459f · a72459f
1 parent 350cbc9
commit a72459f
Show file tree

Hide file tree

Showing 57 changed files with 313 additions and 308 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 .DS_Store
+_types
 build
 dist
 lib/src/vendor

diff --git a/bin/sass.ts b/bin/sass.ts
@@ -14,7 +14,7 @@ try {
     {
       stdio: 'inherit',
       windowsHide: true,
-    }
+    },
   );
 } catch (error) {
   if (error.code) {

diff --git a/lib/src/compile.ts b/lib/src/compile.ts
@@ -11,7 +11,7 @@ export {NodePackageImporter} from './importer-registry';
 
 export function compile(
   path: string,
-  options?: OptionsWithLegacy<'sync'>
+  options?: OptionsWithLegacy<'sync'>,
 ): CompileResult {
   const compiler = initCompiler();
   try {
@@ -23,7 +23,7 @@ export function compile(
 
 export function compileString(
   source: string,
-  options?: StringOptionsWithLegacy<'sync'>
+  options?: StringOptionsWithLegacy<'sync'>,
 ): CompileResult {
   const compiler = initCompiler();
   try {
@@ -35,7 +35,7 @@ export function compileString(
 
 export async function compileAsync(
   path: string,
-  options?: OptionsWithLegacy<'async'>
+  options?: OptionsWithLegacy<'async'>,
 ): Promise<CompileResult> {
   const compiler = await initAsyncCompiler();
   try {
@@ -47,7 +47,7 @@ export async function compileAsync(
 
 export async function compileStringAsync(
   source: string,
-  options?: StringOptionsWithLegacy<'async'>
+  options?: StringOptionsWithLegacy<'async'>,
 ): Promise<CompileResult> {
   const compiler = await initAsyncCompiler();
   try {

diff --git a/lib/src/compiler-path.ts b/lib/src/compiler-path.ts
@@ -17,7 +17,7 @@ function isLinuxMusl(path: string): boolean {
     return p.basename(interpreter).startsWith('ld-musl-');
   } catch (error) {
     console.warn(
-      `Warning: Failed to detect linux-musl, fallback to linux-gnu: ${error.message}`
+      `Warning: Failed to detect linux-musl, fallback to linux-gnu: ${error.message}`,
     );
     return false;
   }
@@ -37,7 +37,7 @@ export const compilerCommand = (() => {
     const executable = p.resolve(
       __dirname,
       path,
-      `dart-sass/sass${platform === 'win32' ? '.bat' : ''}`
+      `dart-sass/sass${platform === 'win32' ? '.bat' : ''}`,
     );
 
     if (fs.existsSync(executable)) return [executable];
@@ -47,10 +47,10 @@ export const compilerCommand = (() => {
     return [
       require.resolve(
         `sass-embedded-${platform}-${arch}/dart-sass/src/dart` +
-          (platform === 'win32' ? '.exe' : '')
+          (platform === 'win32' ? '.exe' : ''),
       ),
       require.resolve(
-        `sass-embedded-${platform}-${arch}/dart-sass/src/sass.snapshot`
+        `sass-embedded-${platform}-${arch}/dart-sass/src/sass.snapshot`,
       ),
     ];
   } catch (ignored) {
@@ -61,7 +61,7 @@ export const compilerCommand = (() => {
     return [
       require.resolve(
         `sass-embedded-${platform}-${arch}/dart-sass/sass` +
-          (platform === 'win32' ? '.bat' : '')
+          (platform === 'win32' ? '.bat' : ''),
       ),
     ];
   } catch (e: unknown) {
@@ -74,6 +74,6 @@ export const compilerCommand = (() => {
     "Embedded Dart Sass couldn't find the embedded compiler executable. " +
       'Please make sure the optional dependency ' +
       `sass-embedded-${platform}-${arch} is installed in ` +
-      'node_modules.'
+      'node_modules.',
   );
 })();
diff --git a/lib/src/compiler.test.ts b/lib/src/compiler.test.ts
@@ -110,15 +110,15 @@ describe('asyncCompiler', () => {
   describe('compilation ID', () => {
     it('resets after concurrent compilations complete', async () => {
       await Promise.all(
-        Array.from({length: 10}, () => asyncCompiler.compileStringAsync(''))
+        Array.from({length: 10}, () => asyncCompiler.compileStringAsync('')),
       );
       await asyncCompiler.compileStringAsync('');
       expect(getIdHistory()).toEqual([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 1]);
     });
 
     it('keeps working after failed compilations', async () => {
       await expect(
-        asyncCompiler.compileStringAsync('invalid')
+        asyncCompiler.compileStringAsync('invalid'),
       ).rejects.toThrow();
       await Promise.all([
         asyncCompiler.compileStringAsync(''),

diff --git a/lib/src/compiler/async.ts b/lib/src/compiler/async.ts
@@ -46,10 +46,10 @@ export class AsyncCompiler {
       cwd: path.dirname(compilerCommand[0]),
       // Node blocks launching .bat and .cmd without a shell due to CVE-2024-27980
       shell: ['.bat', '.cmd'].includes(
-        path.extname(compilerCommand[0]).toLowerCase()
+        path.extname(compilerCommand[0]).toLowerCase(),
       ),
       windowsHide: true,
-    }
+    },
   );
 
   /** The next compilation ID. */
@@ -101,7 +101,7 @@ export class AsyncCompiler {
   private async compileRequestAsync(
     request: proto.InboundMessage_CompileRequest,
     importers: ImporterRegistry<'async'>,
-    options?: OptionsWithLegacy<'async'> & {legacy?: boolean}
+    options?: OptionsWithLegacy<'async'> & {legacy?: boolean},
   ): Promise<CompileResult> {
     const optionsKey = Symbol();
     activeDeprecationOptions.set(optionsKey, options ?? {});
@@ -116,7 +116,7 @@ export class AsyncCompiler {
           handleFileImportRequest: request => importers.fileImport(request),
           handleCanonicalizeRequest: request => importers.canonicalize(request),
           handleFunctionCallRequest: request => functions.call(request),
-        }
+        },
       );
       dispatcher.logEvents$.subscribe(event => handleLogEvent(options, event));
 
@@ -133,7 +133,7 @@ export class AsyncCompiler {
             } else {
               resolve(response!);
             }
-          })
+          }),
       );
       this.compilations.add(compilation);
 
@@ -148,7 +148,7 @@ export class AsyncCompiler {
     if (flag !== initFlag) {
       throw utils.compilerError(
         'AsyncCompiler can not be directly constructed. ' +
-          'Please use `sass.initAsyncCompiler()` instead.'
+          'Please use `sass.initAsyncCompiler()` instead.',
       );
     }
     this.stderr$.subscribe(data => process.stderr.write(data));
@@ -157,33 +157,33 @@ export class AsyncCompiler {
     });
     this.messageTransformer = new MessageTransformer(
       packetTransformer.outboundProtobufs$,
-      packet => packetTransformer.writeInboundProtobuf(packet)
+      packet => packetTransformer.writeInboundProtobuf(packet),
     );
   }
 
   compileAsync(
     path: string,
-    options?: OptionsWithLegacy<'async'>
+    options?: OptionsWithLegacy<'async'>,
   ): Promise<CompileResult> {
     this.throwIfDisposed();
     const importers = new ImporterRegistry(options);
     return this.compileRequestAsync(
       newCompilePathRequest(path, importers, options),
       importers,
-      options
+      options,
     );
   }
 
   compileStringAsync(
     source: string,
-    options?: StringOptionsWithLegacy<'async'>
+    options?: StringOptionsWithLegacy<'async'>,
   ): Promise<CompileResult> {
     this.throwIfDisposed();
     const importers = new ImporterRegistry(options);
     return this.compileRequestAsync(
       newCompileStringRequest(source, importers, options),
       importers,
-      options
+      options,
     );
   }
 

diff --git a/lib/src/compiler/sync.ts b/lib/src/compiler/sync.ts
@@ -46,10 +46,10 @@ export class Compiler {
       cwd: path.dirname(compilerCommand[0]),
       // Node blocks launching .bat and .cmd without a shell due to CVE-2024-27980
       shell: ['.bat', '.cmd'].includes(
-        path.extname(compilerCommand[0]).toLowerCase()
+        path.extname(compilerCommand[0]).toLowerCase(),
       ),
       windowsHide: true,
-    }
+    },
   );
 
   /** The next compilation ID. */
@@ -107,7 +107,7 @@ export class Compiler {
   private compileRequestSync(
     request: proto.InboundMessage_CompileRequest,
     importers: ImporterRegistry<'sync'>,
-    options?: OptionsWithLegacy<'sync'>
+    options?: OptionsWithLegacy<'sync'>,
   ): CompileResult {
     const optionsKey = Symbol();
     activeDeprecationOptions.set(optionsKey, options ?? {});
@@ -122,7 +122,7 @@ export class Compiler {
           handleFileImportRequest: request => importers.fileImport(request),
           handleCanonicalizeRequest: request => importers.canonicalize(request),
           handleFunctionCallRequest: request => functions.call(request),
-        }
+        },
       );
       this.dispatchers.add(dispatcher);
 
@@ -168,7 +168,7 @@ export class Compiler {
     if (flag !== initFlag) {
       throw utils.compilerError(
         'Compiler can not be directly constructed. ' +
-          'Please use `sass.initAsyncCompiler()` instead.'
+          'Please use `sass.initAsyncCompiler()` instead.',
       );
     }
     this.stderr$.subscribe(data => process.stderr.write(data));
@@ -177,7 +177,7 @@ export class Compiler {
     });
     this.messageTransformer = new MessageTransformer(
       packetTransformer.outboundProtobufs$,
-      packet => packetTransformer.writeInboundProtobuf(packet)
+      packet => packetTransformer.writeInboundProtobuf(packet),
     );
   }
 
@@ -187,7 +187,7 @@ export class Compiler {
     return this.compileRequestSync(
       newCompilePathRequest(path, importers, options),
       importers,
-      options
+      options,
     );
   }
 
@@ -197,7 +197,7 @@ export class Compiler {
     return this.compileRequestSync(
       newCompileStringRequest(source, importers, options),
       importers,
-      options
+      options,
     );
   }
 

diff --git a/lib/src/compiler/utils.ts b/lib/src/compiler/utils.ts
@@ -51,21 +51,21 @@ export type StringOptionsWithLegacy<sync extends 'sync' | 'async'> =
 export function createDispatcher<sync extends 'sync' | 'async'>(
   compilationId: number,
   messageTransformer: MessageTransformer,
-  handlers: DispatcherHandlers<sync>
+  handlers: DispatcherHandlers<sync>,
 ): Dispatcher<sync> {
   return new Dispatcher<sync>(
     compilationId,
     messageTransformer.outboundMessages$,
     message => messageTransformer.writeInboundMessage(message),
-    handlers
+    handlers,
   );
 }
 
 // Creates a compilation request for the given `options` without adding any
 // input-specific options.
 function newCompileRequest(
   importers: ImporterRegistry<'sync' | 'async'>,
-  options?: Options<'sync' | 'async'>
+  options?: Options<'sync' | 'async'>,
 ): proto.InboundMessage_CompileRequest {
   const request = create(proto.InboundMessage_CompileRequestSchema, {
     importers: importers.importers,
@@ -103,7 +103,7 @@ function newCompileRequest(
 export function newCompilePathRequest(
   path: string,
   importers: ImporterRegistry<'sync' | 'async'>,
-  options?: Options<'sync' | 'async'>
+  options?: Options<'sync' | 'async'>,
 ): proto.InboundMessage_CompileRequest {
   const absPath = p.resolve(path);
   const request = newCompileRequest(importers, options);
@@ -115,7 +115,7 @@ export function newCompilePathRequest(
 export function newCompileStringRequest(
   source: string,
   importers: ImporterRegistry<'sync' | 'async'>,
-  options?: StringOptions<'sync' | 'async'>
+  options?: StringOptions<'sync' | 'async'>,
 ): proto.InboundMessage_CompileRequest {
   const input = create(proto.InboundMessage_CompileRequest_StringInputSchema, {
     source,
@@ -134,7 +134,7 @@ export function newCompileStringRequest(
       proto.InboundMessage_CompileRequest_ImporterSchema,
       {
         importer: {case: 'path', value: p.resolve('.')},
-      }
+      },
     );
   } else {
     // When importer is not set on the host, the compiler will set a
@@ -148,15 +148,15 @@ export function newCompileStringRequest(
 
 /** Type guard to check that `id` is a valid deprecation ID. */
 function validDeprecationId(
-  id: string | number | symbol | undefined
+  id: string | number | symbol | undefined,
 ): id is keyof typeof deprecations {
   return !!id && id in deprecations;
 }
 
 /** Handles a log event according to `options`. */
 export function handleLogEvent(
   options: OptionsWithLegacy<'sync' | 'async'> | undefined,
-  event: proto.OutboundMessage_LogEvent
+  event: proto.OutboundMessage_LogEvent,
 ): void {
   let span = event.span ? deprotofySourceSpan(event.span) : null;
   if (span && options?.legacy) span = removeLegacyImporterFromSpan(span);
@@ -210,7 +210,7 @@ export function handleLogEvent(
  * Throws a `SassException` if the compilation failed.
  */
 export function handleCompileResponse(
-  response: proto.OutboundMessage_CompileResponse
+  response: proto.OutboundMessage_CompileResponse,
 ): CompileResult {
   if (response.result.case === 'success') {
     const success = response.result.value;