chore: resolve rebase conflicts and NodeNext import extensions

Author: jremy42

packages/client/src/bridge.ts

@@ -12,13 +12,6 @@ export type { WaitForOptions } from './internal/async/interval-retrier.js'
 export { waitForResource } from './internal/async/interval-retrier.js'
 export { API } from './scw/api.js'
 export type { DefaultValues } from './scw/client-settings.js'
-export type {
-  Money,
-  ServiceInfo,
-  ScwFile,
-  TimeSeries,
-} from './scw/custom-types.js'
-export { Decimal } from './scw/custom-types.js'
 export {
   marshalBlobToScwFile,
   marshalDecimal,
@@ -32,5 +25,12 @@ export {
   unmarshalTimeSeries,
   unmarshalTimeSeriesPoint,
 } from './scw/custom-marshalling.js'
+export type {
+  Money,
+  ScwFile,
+  ServiceInfo,
+  TimeSeries,
+} from './scw/custom-types.js'
+export { Decimal } from './scw/custom-types.js'
 export { enrichForPagination } from './scw/fetch/resource-paginator.js'
 export type { Region, Zone } from './scw/locality.js'

packages/client/src/internal/logger/console-logger.ts

@@ -1,5 +1,5 @@
-import { LevelResolver, shouldLog } from './level-resolver.js'
 import type { LogLevel } from './level-resolver.js'
+import { LevelResolver, shouldLog } from './level-resolver.js'
 import type { Logger } from './logger.js'
 
 /**

packages/client/src/scw/auth.ts

@@ -3,8 +3,8 @@ import {
   addHeaderInterceptor,
 } from '../internal/interceptors/helpers.js'
 import type { RequestInterceptor } from '../internal/interceptors/types.js'
-import { assertValidAuthenticationSecrets } from './client-ini-profile.js'
 import type { AuthenticationSecrets } from './client-ini-profile.js'
+import { assertValidAuthenticationSecrets } from './client-ini-profile.js'
 import { AUTH_HEADER_KEY, SESSION_HEADER_KEY } from './constants.js'
 
 interface TokenAccessor {

packages/client/src/scw/client-ini-factory.ts

@@ -1,7 +1,7 @@
 import type { NetworkInterceptors } from '../index.js'
 import { authenticateWithSecrets } from './auth.js'
-import { hasAuthenticationSecrets } from './client-ini-profile.js'
 import type { Profile } from './client-ini-profile.js'
+import { hasAuthenticationSecrets } from './client-ini-profile.js'
 import type { Settings } from './client-settings.js'
 
 /**

packages/client/src/scw/client.ts

@@ -8,8 +8,8 @@ import {
 import type { Settings } from './client-settings.js'
 import { assertValidSettings } from './client-settings.js'
 import { userAgent, version } from './constants.js'
-import { buildFetcher } from './fetch/build-fetcher.js'
 import type { Fetcher } from './fetch/build-fetcher.js'
+import { buildFetcher } from './fetch/build-fetcher.js'
 
 /** Default {@link Settings} values. */
 const DEFAULT_SETTINGS: Settings = {

packages/client/src/scw/errors/standard/index.ts

@@ -1,20 +1,20 @@
 export { ScalewayError } from '../scw-error.js'
 export { AlreadyExistsError } from './already-exists-error.js'
 export { DeniedAuthenticationError } from './denied-authentication-error.js'
-export { InvalidArgumentsError } from './invalid-arguments-error.js'
 export type { InvalidArgumentsErrorDetails } from './invalid-arguments-error.js'
+export { InvalidArgumentsError } from './invalid-arguments-error.js'
 export { OutOfStockError } from './out-of-stock-error.js'
-export { PermissionsDeniedError } from './permissions-denied-error.js'
 export type { PermissionsDeniedErrorDetails } from './permissions-denied-error.js'
+export { PermissionsDeniedError } from './permissions-denied-error.js'
 export { PreconditionFailedError } from './precondition-failed-error.js'
-export { QuotasExceededError } from './quotas-exceeded-error.js'
 export type {
   QuotasExceededErrorDetails,
   QuotasExceededErrorScope,
 } from './quotas-exceeded-error.js'
+export { QuotasExceededError } from './quotas-exceeded-error.js'
 export { ResourceExpiredError } from './resource-expired-error.js'
 export { ResourceLockedError } from './resource-locked-error.js'
 export { ResourceNotFoundError } from './resource-not-found-error.js'
-export { TooManyRequestsError } from './too-many-requests-error.js'
 export type { TooManyRequestsQuotaPolicy } from './too-many-requests-error.js'
+export { TooManyRequestsError } from './too-many-requests-error.js'
 export { TransientStateError } from './transient-state-error.js'

packages/client/src/scw/fetch/__tests__/resource-paginator.test.ts

@@ -1,5 +1,8 @@
 import { describe, expect, it, vi } from 'vitest'
-import type { PaginatedContent, PaginatedFetcher } from '../resource-paginator.js'
+import type {
+  PaginatedContent,
+  PaginatedFetcher,
+} from '../resource-paginator.js'
 import {
   enrichForPagination,
   fetchAll,

packages/client/src/scw/fetch/__tests__/response-parser.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from 'vitest'
-import { isJSONObject } from '../../../helpers/json.js'
 import type { JSONObject } from '../../../helpers/json.js'
+import { isJSONObject } from '../../../helpers/json.js'
 import { ScalewayError } from '../../errors/scw-error.js'
 import { fixLegacyTotalCount, responseParser } from '../response-parser.js'
 

packages_generated/audit_trail/src/v1alpha1/index.gen.ts

@@ -53,12 +53,7 @@ export type {
   ResourceType,
   SecretManagerSecretInfo,
   SecretManagerSecretVersionInfo,
-<<<<<<< HEAD
   SystemEvent,
   SystemEventKind,
-} from './types.gen'
-export * as ValidationRules from './validation-rules.gen'
-=======
 } from './types.gen.js'
 export * as ValidationRules from './validation-rules.gen.js'
->>>>>>> 0df1f9117 (chore: add extension for nodenext)

packages_generated/audit_trail/src/v1alpha1/marshalling.gen.ts

@@ -45,12 +45,8 @@ import type {
   Resource,
   SecretManagerSecretInfo,
   SecretManagerSecretVersionInfo,
-<<<<<<< HEAD
   SystemEvent,
-} from './types.gen'
-=======
 } from './types.gen.js'
->>>>>>> 0df1f9117 (chore: add extension for nodenext)
 
 const unmarshalExportJobS3 = (data: unknown): ExportJobS3 => {
   if (!isJSONObject(data)) {