feat: Change media type files to .d.ts

koumiGoogle · copybara-github · commit ad8a3e521b71 · 2024-12-20T09:57:45.000-08:00
PiperOrigin-RevId: 708352246
diff --git a/web/BUILD b/web/BUILD
@@ -23,7 +23,8 @@ ts_library(
     srcs = ["meetmediaapiclient.ts"],
     deps = [
         "@media_api_samples//web/internal/communication_protocols:communication_protocol_interface",
-        "@media_api_samples//web/types:data_channels",
+        "@media_api_samples//web/types:datachannels",
+        "@media_api_samples//web/types:enums",
         "@media_api_samples//web/types:media_types",
         "@media_api_samples//web/types:subcribable",
     ],
@@ -43,7 +44,8 @@ ts_library(
         "@media_api_samples//web/internal/channel_handlers",
         "@media_api_samples//web/internal/communication_protocols:communication_protocol_interface",
         "@media_api_samples//web/internal/communication_protocols:default_communication_protocol",
-        "@media_api_samples//web/types:data_channels",
+        "@media_api_samples//web/types:datachannels",
+        "@media_api_samples//web/types:enums",
         "@media_api_samples//web/types:media_types",
         "@media_api_samples//web/types:subcribable",
     ],
diff --git a/web/internal/channel_handlers/BUILD b/web/internal/channel_handlers/BUILD
@@ -32,7 +32,8 @@ ts_library(
         "@media_api_samples//web/internal:internal_types",
         "@media_api_samples//web/internal:subscribable_impl",
         "@media_api_samples//web/internal:utils",
-        "@media_api_samples//web/types:data_channels",
+        "@media_api_samples//web/types:datachannels",
+        "@media_api_samples//web/types:enums",
         "@media_api_samples//web/types:media_types",
     ],
 )
diff --git a/web/internal/channel_handlers/channel_logger.ts b/web/internal/channel_handlers/channel_logger.ts
@@ -25,7 +25,8 @@ import {
   MediaApiResponse,
   ResourceSnapshot,
 } from '../../types/datachannels';
-import {LogEvent, LogLevel, LogSourceType} from '../../types/mediatypes';
+import {LogLevel} from '../../types/enums';
+import {LogEvent, LogSourceType} from '../../types/mediatypes';
 
 /**
  * Helper class that helps log channel resources, updates or errors.
diff --git a/web/internal/channel_handlers/media_entries_channel_handler.ts b/web/internal/channel_handlers/media_entries_channel_handler.ts
@@ -23,8 +23,8 @@ import {
   MediaEntriesChannelToClient,
   MediaEntry as MediaEntryResource,
 } from '../../types/datachannels';
+import {LogLevel} from '../../types/enums';
 import {
-  LogLevel,
   MediaEntry,
   MediaLayout,
   MeetStreamTrack,
diff --git a/web/internal/channel_handlers/media_stats_channel_handler.ts b/web/internal/channel_handlers/media_stats_channel_handler.ts
@@ -27,7 +27,7 @@ import {
   UploadMediaStatsRequest,
   UploadMediaStatsResponse,
 } from '../../types/datachannels';
-import {LogLevel} from '../../types/mediatypes';
+import {LogLevel} from '../../types/enums';
 import {ChannelLogger} from './channel_logger';
 
 type SupportedMediaStatsTypes =
diff --git a/web/internal/channel_handlers/participants_channel_handler.ts b/web/internal/channel_handlers/participants_channel_handler.ts
@@ -23,9 +23,9 @@ import {
   ParticipantResource,
   ParticipantsChannelToClient,
 } from '../../types/datachannels';
+import {LogLevel} from '../../types/enums';
 import {
   Participant as LocalParticipant,
-  LogLevel,
   MediaEntry,
 } from '../../types/mediatypes';
 import {InternalMediaEntry, InternalParticipant} from '../internal_types';
diff --git a/web/internal/channel_handlers/session_control_channel_handler.ts b/web/internal/channel_handlers/session_control_channel_handler.ts
@@ -23,7 +23,7 @@ import {
   SessionControlChannelFromClient,
   SessionControlChannelToClient,
 } from '../../types/datachannels';
-import {LogLevel, MeetSessionStatus} from '../../types/mediatypes';
+import {LogLevel, MeetSessionStatus} from '../../types/enums';
 import {SubscribableDelegate} from '../subscribable_impl';
 import {ChannelLogger} from './channel_logger';
 
diff --git a/web/internal/channel_handlers/video_assignment_channel_handler.ts b/web/internal/channel_handlers/video_assignment_channel_handler.ts
@@ -27,8 +27,8 @@ import {
   VideoAssignmentChannelFromClient,
   VideoAssignmentChannelToClient,
 } from '../../types/datachannels';
+import {LogLevel} from '../../types/enums';
 import {
-  LogLevel,
   MediaEntry,
   MediaLayout,
   MediaLayoutRequest,
diff --git a/web/meetmediaapiclient.ts b/web/meetmediaapiclient.ts
@@ -20,12 +20,12 @@
 
 import {MediaApiCommunicationProtocol} from './internal/communication_protocols/communication_protocol';
 import {MediaApiResponseStatus} from './types/datachannels';
+import {MeetSessionStatus} from './types/enums';
 import {
   CanvasDimensions,
   MediaEntry,
   MediaLayout,
   MediaLayoutRequest,
-  MeetSessionStatus,
   MeetStreamTrack,
   Participant,
 } from './types/mediatypes';
diff --git a/web/meetmediaapiclient_impl.ts b/web/meetmediaapiclient_impl.ts
@@ -39,13 +39,13 @@ import {
 } from './internal/subscribable_impl';
 import {MeetMediaApiClient} from './meetmediaapiclient';
 import {MediaApiResponseStatus} from './types/datachannels';
+import {MeetSessionStatus} from './types/enums';
 import {
   CanvasDimensions,
   MediaEntry,
   MediaLayout,
   MediaLayoutRequest,
   MeetMediaClientRequiredConfiguration,
-  MeetSessionStatus,
   MeetStreamTrack,
   Participant,
 } from './types/mediatypes';
diff --git a/web/samples/BUILD b/web/samples/BUILD
@@ -29,6 +29,7 @@ ts_library(
     srcs = ["script.ts"],
     deps = [
         "@media_api_samples//web:meetmediaapiclient_impl",
+        "@media_api_samples//web/types:enums",
         "@media_api_samples//web/types:media_types",
     ],
 )
diff --git a/web/samples/script.ts b/web/samples/script.ts
@@ -15,7 +15,8 @@
  */
 
 import {MeetMediaApiClientImpl} from '../meetmediaapiclient_impl';
-import {MeetSessionStatus, MeetStreamTrack} from '../types/mediatypes';
+import {MeetSessionStatus} from '../types/enums';
+import {MeetStreamTrack} from '../types/mediatypes';
 
 // Function maps session status to strings. If the session is joined, we go
 // ahead and request a layout.
diff --git a/web/types/BUILD b/web/types/BUILD
@@ -18,21 +18,27 @@ package(default_visibility = ["//visibility:public"])
 
 ts_library(
     name = "media_types",
-    srcs = ["mediatypes.ts"],
+    srcs = ["mediatypes.d.ts"],
     deps = [
-        ":data_channels",
+        ":datachannels",
+        ":enums",
         ":subcribable",
     ],
 )
 
 ts_library(
     name = "subcribable",
-    srcs = ["subscribable.ts"],
+    srcs = ["subscribable.d.ts"],
 )
 
 ts_library(
-    name = "data_channels",
-    srcs = ["datachannels.ts"],
+    name = "enums",
+    srcs = ["enums.ts"],
+)
+
+ts_library(
+    name = "datachannels",
+    srcs = ["datachannels.d.ts"],
 )
 
 ts_library(
diff --git a/web/types/datachannels.d.ts b/web/types/datachannels.d.ts
diff --git a/web/types/enums.ts b/web/types/enums.ts
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2024 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * @fileoverview Enums for the Media API Web Client. Since other files are
+ * using the .d.ts file, we need to keep the enums in this file.
+ */
+
+/**
+ * Log level for each data channel.
+ */
+export enum LogLevel {
+  UNKNOWN = 0,
+  ERRORS = 1,
+  RESOURCES = 2,
+  MESSAGES = 3,
+}
+
+/**
+ * Enum for the status of the Meet session.
+ */
+export enum MeetSessionStatus {
+  NEW = 0 /* Default value */,
+  WAITING = 1,
+  JOINED = 2,
+  DISCONNECTED = 3,
+  KICKED = 4 /* DISCONNECTED with leave request */,
+  REJECTED = 5 /* Error state */,
+}
diff --git a/web/types/mediatypes.d.ts b/web/types/mediatypes.d.ts
@@ -24,6 +24,7 @@ import {
   MediaApiResponse,
   ResourceSnapshot,
 } from './datachannels';
+import {LogLevel} from './enums';
 import {Subscribable} from './subscribable';
 
 /**
@@ -196,18 +197,6 @@ export type MediaLayoutRequest =
   // loudest speaker, presenter, etc.
   | {mediaLayout: MediaLayout; mediaEntry?: never; presenter?: never};
 
-/**
- * Enum for the status of the Meet session.
- */
-export enum MeetSessionStatus {
-  NEW = 0 /* Default value */,
-  WAITING = 1,
-  JOINED = 2,
-  DISCONNECTED = 3,
-  KICKED = 4 /* DISCONNECTED with leave request */,
-  REJECTED = 5 /* Error state */,
-}
-
 /**
  * Required configuration for the MeetMediaApiClient.
  */
@@ -222,16 +211,6 @@ export interface MeetMediaClientRequiredConfiguration {
   logsCallback?: (logEvent: LogEvent) => void;
 }
 
-/**
- * Log level for each data channel.
- */
-export enum LogLevel {
-  UNKNOWN = 0,
-  ERRORS = 1,
-  RESOURCES = 2,
-  MESSAGES = 3,
-}
-
 /**
  * List of log source types
  */
diff --git a/web/types/subscribable.d.ts b/web/types/subscribable.d.ts
