Remove reference to non-existent types from CLIENT_TYPES_MAP values (#317)

Author: trivikr

scripts/generateClientTypesMap/getClientTypeMap.ts renamed to scripts/generateClientTypesMap/getClientTypesMap.ts

@@ -2,14 +2,16 @@ import { readFile } from "fs/promises";
 import jscodeshift, { Identifier, TSArrayType, TSTypeLiteral, TSTypeReference } from "jscodeshift";
 import { join } from "path";
 
+import { getClientTypesMapWithKeysRemovedFromValues } from "./getClientTypesMapWithKeysRemovedFromValues";
+
 const TYPES_TO_SKIP = ["apiVersion", "ClientConfiguration"];
 const ElementTypeToNativeTypeMap = {
   TSStringKeyword: "string",
   TSNumberKeyword: "number",
   TSBooleanKeyword: "boolean",
 };
 
-export const getClientTypeMap = async (clientName: string): Promise<Record<string, string>> => {
+export const getClientTypesMap = async (clientName: string): Promise<Record<string, string>> => {
   const clientTypesMap = {};
 
   const typesPath = join("node_modules", "aws-sdk", "clients", `${clientName.toLowerCase()}.d.ts`);
@@ -121,7 +123,9 @@ export const getClientTypeMap = async (clientName: string): Promise<Record<strin
     });
   });
 
-  return Object.entries(clientTypesMap)
+  const updatedClientTypesMap = getClientTypesMapWithKeysRemovedFromValues(clientTypesMap);
+
+  return Object.entries(updatedClientTypesMap)
     .sort(([key1], [key2]) => key1.localeCompare(key2))
     .reduce((obj, [key, value]) => {
       obj[key] = value;

scripts/generateClientTypesMap/getClientTypesMapWithKeysRemovedFromValues.ts

@@ -0,0 +1,29 @@
+import { hasReferenceToKeysInValues } from "./hasReferenceToKeysInValues";
+
+/**
+ * Checks if any of the values have reference to key, and replaces them recursively.
+ */
+export const getClientTypesMapWithKeysRemovedFromValues = (
+  clientTypesMap: Record<string, string>
+) => {
+  if (!hasReferenceToKeysInValues(clientTypesMap)) {
+    return clientTypesMap;
+  }
+
+  const newClientTypeMap = {};
+  const keys = Object.keys(clientTypesMap);
+
+  for (const [key, value] of Object.entries(clientTypesMap)) {
+    const refs = keys.filter((key) => value.includes(`<${key}>`));
+    if (refs.length === 0) {
+      newClientTypeMap[key] = value;
+    } else {
+      newClientTypeMap[key] = refs.reduce(
+        (acc, ref) => acc.replace(`<${ref}>`, `<${clientTypesMap[ref]}>`),
+        value
+      );
+    }
+  }
+
+  return getClientTypesMapWithKeysRemovedFromValues(newClientTypeMap);
+};

scripts/generateClientTypesMap/hasReferenceToKeysInValues.ts

@@ -0,0 +1,13 @@
+/**
+ * Checks if any of the values in the clientTypesMap has a reference to any of the keys.
+ * Reference is defined as key name inside brackets, i.e. `<key>` for `key`.
+ */
+export const hasReferenceToKeysInValues = (clientTypesMap: Record<string, string>) => {
+  const keys = Object.keys(clientTypesMap);
+  for (const value of Object.values(clientTypesMap)) {
+    if (keys.some((key) => value.includes(`<${key}>`))) {
+      return true;
+    }
+  }
+  return false;
+};

scripts/generateClientTypesMap/index.ts

@@ -3,7 +3,7 @@ import { join } from "path";
 import { format } from "prettier";
 
 import { CLIENT_NAMES } from "../../src/transforms/v2-to-v3/config";
-import { getClientTypeMap } from "./getClientTypeMap";
+import { getClientTypesMap } from "./getClientTypesMap";
 
 const codegenComment = `// This file is generated by scripts/generateClientTypesMap/index.ts
 // Do not edit this file directly. Instead, edit the script and run it to regenerate this file.`;
@@ -20,7 +20,7 @@ const relativeFilePath = join(__dirname, "..", "..", filePath);
   const clientTypesMap = {};
 
   for (const clientName of CLIENT_NAMES) {
-    clientTypesMap[clientName] = await getClientTypeMap(clientName);
+    clientTypesMap[clientName] = await getClientTypesMap(clientName);
   }
 
   fileContent += JSON.stringify(clientTypesMap);

src/transforms/v2-to-v3/config/CLIENT_TYPES_MAP.ts

@@ -3020,8 +3020,8 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     Queries: "Array<Query>",
     QueryResultColumn: "Record<string, string>",
     QueryResultKey: "string",
-    QueryResultRow: "Array<QueryResultColumn>",
-    QueryResultRows: "Array<Array<QueryResultColumn>>",
+    QueryResultRow: "Array<Record<string, string>>",
+    QueryResultRows: "Array<Array<Record<string, string>>>",
     QueryResultValue: "string",
     QueryStatement: "string",
     ResourceIdList: "Array<string>",
@@ -3365,7 +3365,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     QueryId: "string",
     QueryInfoList: "Array<QueryInfo>",
     QueryListMaxResults: "number",
-    QueryResults: "Array<ResultRows>",
+    QueryResults: "Array<Array<ResultField>>",
     QueryString: "string",
     ResourcePolicies: "Array<ResourcePolicy>",
     ResultRows: "Array<ResultField>",
@@ -3775,7 +3775,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     MinimumHealthyHostsValue: "number",
     NextToken: "string",
     NullableBoolean: "boolean",
-    OnPremisesTagSetList: "Array<TagFilterList>",
+    OnPremisesTagSetList: "Array<Array<TagFilter>>",
     Percentage: "number",
     RawStringContent: "string",
     RawStringSha256: "string",
@@ -6343,15 +6343,15 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     Configuration: "Record<string, string>",
     ConfigurationId: "string",
     ConfigurationIdList: "Array<string>",
-    Configurations: "Array<Configuration>",
+    Configurations: "Array<Record<string, string>>",
     ConfigurationsDownloadUrl: "string",
     ConfigurationsExportId: "string",
     ConfigurationTagSet: "Array<ConfigurationTag>",
     ContinuousExportDescriptions: "Array<ContinuousExportDescription>",
     ContinuousExportIds: "Array<string>",
     DatabaseName: "string",
     DescribeConfigurationsAttribute: "Record<string, string>",
-    DescribeConfigurationsAttributes: "Array<DescribeConfigurationsAttribute>",
+    DescribeConfigurationsAttributes: "Array<Record<string, string>>",
     DescribeContinuousExportsMaxResults: "number",
     DescribeImportTasksFilterList: "Array<ImportTaskFilter>",
     DescribeImportTasksMaxResults: "number",
@@ -6541,7 +6541,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     BackupSizeBytes: "number",
     BackupSummaries: "Array<BackupSummary>",
     BatchGetRequestMap: "Record<string, KeysAndAttributes>",
-    BatchGetResponseMap: "Record<string, Array<AttributeMap>>",
+    BatchGetResponseMap: "Record<string, Array<Record<string, AttributeValue>>>",
     BatchWriteItemRequestMap: "Record<string, Array<WriteRequest>>",
     BilledSizeBytes: "number",
     BinarySetAttributeValue: "Array<BinaryAttributeValue>",
@@ -6604,12 +6604,12 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     ItemCollectionSizeEstimateBound: "number",
     ItemCollectionSizeEstimateRange: "Array<number>",
     ItemCount: "number",
-    ItemList: "Array<AttributeMap>",
+    ItemList: "Array<Record<string, AttributeValue>>",
     ItemResponseList: "Array<ItemResponse>",
     Key: "Record<string, AttributeValue>",
     KeyConditions: "Record<string, Condition>",
     KeyExpression: "string",
-    KeyList: "Array<Key>",
+    KeyList: "Array<Record<string, AttributeValue>>",
     KeySchema: "Array<KeySchemaElement>",
     KeySchemaAttributeName: "string",
     KinesisDataStreamDestinations: "Array<KinesisDataStreamDestination>",
@@ -10256,7 +10256,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     KmsKeyArn: "string",
     LabelCount: "number",
     LatestSchemaVersionBoolean: "boolean",
-    LimitedPathList: "Array<LimitedStringList>",
+    LimitedPathList: "Array<Array<string>>",
     LimitedStringList: "Array<string>",
     LocationMap: "Record<string, string>",
     LocationString: "string",
@@ -10769,7 +10769,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     regionList: "Array<string>",
     service: "string",
     serviceList: "Array<string>",
-    tagFilter: "Array<tagSet>",
+    tagFilter: "Array<Record<string, string>>",
     tagKey: "string",
     tagSet: "Record<string, string>",
     tagValue: "string",
@@ -12046,8 +12046,8 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     SyncResourceFilters: "Array<SyncResourceFilter>",
     SyncResourceSummaries: "Array<SyncResourceSummary>",
     SyncSource: "string",
-    TabularPropertyValue: "Array<PropertyTableValue>",
-    TabularPropertyValues: "Array<Array<PropertyTableValue>>",
+    TabularPropertyValue: "Array<Record<string, DataValue>>",
+    TabularPropertyValues: "Array<Array<Record<string, DataValue>>>",
     TagKey: "string",
     TagKeyList: "Array<string>",
     TagMap: "Record<string, string>",
@@ -12152,7 +12152,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     IPAddress: "string",
     ISODateTimeString: "string",
     JoinEui: "string",
-    JoinEuiFilters: "Array<JoinEuiRange>",
+    JoinEuiFilters: "Array<Array<string>>",
     JoinEuiRange: "Array<string>",
     LAC: "number",
     LoRaWANGatewayMetadataList: "Array<LoRaWANGatewayMetadata>",
@@ -14205,7 +14205,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     ContainerServiceList: "Array<ContainerService>",
     ContainerServiceLogEventList: "Array<ContainerServiceLogEvent>",
     ContainerServiceMetadataEntry: "Record<string, string>",
-    ContainerServiceMetadataEntryList: "Array<ContainerServiceMetadataEntry>",
+    ContainerServiceMetadataEntryList: "Array<Record<string, string>>",
     ContainerServiceName: "string",
     ContainerServicePowerList: "Array<ContainerServicePower>",
     ContainerServicePublicDomains: "Record<string, Array<string>>",
@@ -14319,13 +14319,13 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     BatchUpdateDevicePositionRequestUpdatesList: "Array<DevicePositionUpdate>",
     Boolean: "boolean",
     BoundingBox: "Array<number>",
-    CalculateRouteMatrixRequestDeparturePositionsList: "Array<Position>",
-    CalculateRouteMatrixRequestDestinationPositionsList: "Array<Position>",
-    CalculateRouteMatrixResponseSnappedDeparturePositionsList: "Array<Position>",
-    CalculateRouteMatrixResponseSnappedDestinationPositionsList: "Array<Position>",
+    CalculateRouteMatrixRequestDeparturePositionsList: "Array<Array<number>>",
+    CalculateRouteMatrixRequestDestinationPositionsList: "Array<Array<number>>",
+    CalculateRouteMatrixResponseSnappedDeparturePositionsList: "Array<Array<number>>",
+    CalculateRouteMatrixResponseSnappedDestinationPositionsList: "Array<Array<number>>",
     CalculateRouteMatrixSummaryErrorCountInteger: "number",
     CalculateRouteMatrixSummaryRouteCountInteger: "number",
-    CalculateRouteRequestWaypointPositionsList: "Array<Position>",
+    CalculateRouteRequestWaypointPositionsList: "Array<Array<number>>",
     CalculateRouteSummaryDistanceDouble: "number",
     CalculateRouteSummaryDurationSecondsDouble: "number",
     CountryCode: "string",
@@ -14346,9 +14346,9 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     LegDistanceDouble: "number",
     LegDurationSecondsDouble: "number",
     LegList: "Array<Leg>",
-    LinearRing: "Array<Position>",
-    LinearRings: "Array<Array<Position>>",
-    LineString: "Array<Position>",
+    LinearRing: "Array<Array<number>>",
+    LinearRings: "Array<Array<Array<number>>>",
+    LineString: "Array<Array<number>>",
     ListDevicePositionsRequestMaxResultsInteger: "number",
     ListDevicePositionsResponseEntryList: "Array<ListDevicePositionsResponseEntry>",
     ListGeofenceCollectionsRequestMaxResultsInteger: "number",
@@ -14374,7 +14374,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     PropertyMapValueString: "string",
     ResourceDescription: "string",
     ResourceName: "string",
-    RouteMatrix: "Array<RouteMatrixRow>",
+    RouteMatrix: "Array<Array<RouteMatrixEntry>>",
     RouteMatrixEntryDistanceDouble: "number",
     RouteMatrixEntryDurationSecondsDouble: "number",
     RouteMatrixRow: "Array<RouteMatrixEntry>",
@@ -16414,7 +16414,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     TaskName: "string",
     TaskStatusMessage: "string",
     TaskTimestamp: "Date",
-    TsvStoreOptionsSchemaList: "Array<SchemaItem>",
+    TsvStoreOptionsSchemaList: "Array<Record<string, SchemaValueType>>",
     UpdateRunGroupRequestMaxCpusInteger: "number",
     UpdateRunGroupRequestMaxDurationInteger: "number",
     UpdateRunGroupRequestMaxRunsInteger: "number",
@@ -18102,7 +18102,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     Records: "Array<Record>",
     RecordsUpdated: "number",
     Row: "Array<Value>",
-    SqlParameterSets: "Array<SqlParametersList>",
+    SqlParameterSets: "Array<Array<SqlParameter>>",
     SqlParametersList: "Array<SqlParameter>",
     SqlRecords: "Array<Array<Field>>",
     SqlStatement: "string",
@@ -20071,7 +20071,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     InventoryItemContentContext: "Record<string, string>",
     InventoryItemContentHash: "string",
     InventoryItemEntry: "Record<string, string>",
-    InventoryItemEntryList: "Array<InventoryItemEntry>",
+    InventoryItemEntryList: "Array<Record<string, string>>",
     InventoryItemList: "Array<InventoryItem>",
     InventoryItemSchemaResultList: "Array<InventoryItemSchema>",
     InventoryItemSchemaVersion: "string",
@@ -20133,7 +20133,8 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     MaintenanceWindowTaskParameterName: "string",
     MaintenanceWindowTaskParameters:
       "Record<string, MaintenanceWindowTaskParameterValueExpression>",
-    MaintenanceWindowTaskParametersList: "Array<MaintenanceWindowTaskParameters>",
+    MaintenanceWindowTaskParametersList:
+      "Array<Record<string, MaintenanceWindowTaskParameterValueExpression>>",
     MaintenanceWindowTaskParameterValue: "string",
     MaintenanceWindowTaskParameterValueList: "Array<string>",
     MaintenanceWindowTaskPriority: "number",
@@ -20163,7 +20164,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     OpsEntityId: "string",
     OpsEntityItemCaptureTime: "string",
     OpsEntityItemEntry: "Record<string, string>",
-    OpsEntityItemEntryList: "Array<OpsEntityItemEntry>",
+    OpsEntityItemEntryList: "Array<Record<string, string>>",
     OpsEntityItemKey: "string",
     OpsEntityItemMap: "Record<string, OpsEntityItem>",
     OpsEntityList: "Array<OpsEntity>",
@@ -20284,7 +20285,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     PatchOtherNonCompliantCount: "number",
     PatchProduct: "string",
     PatchProductFamily: "string",
-    PatchPropertiesList: "Array<PatchPropertyEntry>",
+    PatchPropertiesList: "Array<Record<string, string>>",
     PatchPropertyEntry: "Record<string, string>",
     PatchRelease: "string",
     PatchRepository: "string",
@@ -20401,7 +20402,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     TargetLocations: "Array<TargetLocation>",
     TargetMap: "Record<string, Array<string>>",
     TargetMapKey: "string",
-    TargetMaps: "Array<TargetMap>",
+    TargetMaps: "Array<Record<string, Array<string>>>",
     TargetMapValue: "string",
     TargetMapValueList: "Array<string>",
     TargetParameterList: "Array<string>",
@@ -21423,9 +21424,9 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     ImageSourceBandList: "Array<string>",
     Integer: "number",
     ItemSourceList: "Array<ItemSource>",
-    LinearRing: "Array<Position>",
-    LinearRings: "Array<Array<Position>>",
-    LinearRingsList: "Array<Array<Array<Position>>>",
+    LinearRing: "Array<Array<number>>",
+    LinearRings: "Array<Array<Array<number>>>",
+    LinearRingsList: "Array<Array<Array<Array<number>>>>",
     ListEarthObservationJobInputMaxResultsInteger: "number",
     ListRasterDataCollectionsInputMaxResultsInteger: "number",
     ListVectorEnrichmentJobInputMaxResultsInteger: "number",
@@ -21598,7 +21599,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     TagList: "Array<Tag>",
     TagMap: "Record<string, string>",
     TagResourceArn: "string",
-    Tags: "Array<TagMap>",
+    Tags: "Array<Record<string, string>>",
     TagValue: "string",
     TargetArn: "string",
     TargetInput: "string",
@@ -22012,7 +22013,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     LogsStatusList: "Array<LogsStatus>",
     Long: "number",
     RegionSet: "Array<Region>",
-    RegionSourceTypesAccountsList: "Array<AllDimensionsMap>",
+    RegionSourceTypesAccountsList: "Array<Record<string, TwoDimensionsMap>>",
     RetentionSettingList: "Array<RetentionSetting>",
     RetentionSettingRetentionPeriodInteger: "number",
     RoleArn: "string",
@@ -22208,7 +22209,7 @@ export const CLIENT_TYPES_MAP: Record<string, Record<string, string>> = {
     ServiceActionSummaries: "Array<ServiceActionSummary>",
     ShareErrors: "Array<ShareError>",
     SortField: "string",
-    SourceProvisioningArtifactProperties: "Array<SourceProvisioningArtifactPropertiesMap>",
+    SourceProvisioningArtifactProperties: "Array<Record<string, string>>",
     SourceProvisioningArtifactPropertiesMap: "Record<string, string>",
     SourceRevision: "string",
     StackInstances: "Array<StackInstance>",