wip

# Conflicts:
#	smithy-typescript-codegen/src/main/java/software/amazon/smithy/typescript/codegen/schema/SchemaGenerator.java

Author: kuhe

private/my-local-model-schema/src/commands/GetNumbersCommand.ts

@@ -5,7 +5,7 @@ import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
 
 import { commonParams } from "../endpoint/EndpointParameters";
 import type { GetNumbersRequest, GetNumbersResponse } from "../models/models_0";
-import { GetNumbers$ } from "../schemas/schemas_0";
+import { getNumbers } from "../schemas/schemas_0";
 import type { ServiceInputTypes, ServiceOutputTypes, XYZServiceClientResolvedConfig } from "../XYZServiceClient";
 
 /**
@@ -89,7 +89,7 @@ export class GetNumbersCommand extends $Command
   })
   .s("XYZService", "GetNumbers", {})
   .n("XYZServiceClient", "GetNumbersCommand")
-  .sc(GetNumbers$)
+  .sc(getNumbers)
   .build() {
   /** @internal type navigation helper, not in runtime. */
   protected declare static __types: {

private/my-local-model-schema/src/commands/TradeEventStreamCommand.ts

@@ -5,7 +5,7 @@ import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
 
 import { commonParams } from "../endpoint/EndpointParameters";
 import type { TradeEventStreamRequest, TradeEventStreamResponse } from "../models/models_0";
-import { TradeEventStream$ } from "../schemas/schemas_0";
+import { tradeEventStream } from "../schemas/schemas_0";
 import type { ServiceInputTypes, ServiceOutputTypes, XYZServiceClientResolvedConfig } from "../XYZServiceClient";
 
 /**
@@ -97,7 +97,7 @@ export class TradeEventStreamCommand extends $Command
     },
   })
   .n("XYZServiceClient", "TradeEventStreamCommand")
-  .sc(TradeEventStream$)
+  .sc(tradeEventStream)
   .build() {
   /** @internal type navigation helper, not in runtime. */
   protected declare static __types: {

private/my-local-model-schema/src/schemas/schemas_0.ts

@@ -46,60 +46,60 @@ import {
 } from "../models/XYZServiceSyntheticServiceException";
 
 /* eslint no-var: 0 */
-export var Alpha$: StaticStructureSchema = [3, n0, _A,
+export var alpha: StaticStructureSchema = [3, n0, _A,
   0,
   [_i, _t],
   [0, 4]
 ];
-export var CodedThrottlingError$: StaticErrorSchema = [-3, n0, _CTE,
+export var codedThrottlingError: StaticErrorSchema = [-3, n0, _CTE,
   { [_e]: _c, [_hE]: 429 },
   [],
   []
 ];
-TypeRegistry.for(n0).registerError(CodedThrottlingError$, __CodedThrottlingError);
-export var GetNumbersRequest$: StaticStructureSchema = [3, n0, _GNR,
+TypeRegistry.for(n0).registerError(codedThrottlingError, __CodedThrottlingError);
+export var getNumbersRequest: StaticStructureSchema = [3, n0, _GNR,
   0,
   [_bD, _bI, _fWM, _fWMi],
   [17, 19, 0, 0]
 ];
-export var GetNumbersResponse$: StaticStructureSchema = [3, n0, _GNRe,
+export var getNumbersResponse: StaticStructureSchema = [3, n0, _GNRe,
   0,
   [_bD, _bI],
   [17, 19]
 ];
-export var HaltError$: StaticErrorSchema = [-3, n0, _HE,
+export var haltError: StaticErrorSchema = [-3, n0, _HE,
   { [_e]: _c },
   [],
   []
 ];
-TypeRegistry.for(n0).registerError(HaltError$, __HaltError);
-export var MainServiceLinkedError$: StaticErrorSchema = [-3, n0, _MSLE,
+TypeRegistry.for(n0).registerError(haltError, __HaltError);
+export var mainServiceLinkedError: StaticErrorSchema = [-3, n0, _MSLE,
   { [_e]: _c, [_hE]: 400 },
   [],
   []
 ];
-TypeRegistry.for(n0).registerError(MainServiceLinkedError$, __MainServiceLinkedError);
-export var MysteryThrottlingError$: StaticErrorSchema = [-3, n0, _MTE,
+TypeRegistry.for(n0).registerError(mainServiceLinkedError, __MainServiceLinkedError);
+export var mysteryThrottlingError: StaticErrorSchema = [-3, n0, _MTE,
   { [_e]: _c },
   [],
   []
 ];
-TypeRegistry.for(n0).registerError(MysteryThrottlingError$, __MysteryThrottlingError);
-export var RetryableError$: StaticErrorSchema = [-3, n0, _RE,
+TypeRegistry.for(n0).registerError(mysteryThrottlingError, __MysteryThrottlingError);
+export var retryableError: StaticErrorSchema = [-3, n0, _RE,
   { [_e]: _c },
   [],
   []
 ];
-TypeRegistry.for(n0).registerError(RetryableError$, __RetryableError);
-export var TradeEventStreamRequest$: StaticStructureSchema = [3, n0, _TESR,
+TypeRegistry.for(n0).registerError(retryableError, __RetryableError);
+export var tradeEventStreamRequest: StaticStructureSchema = [3, n0, _TESR,
   0,
   [_eS],
-  [[() => TradeEvents$, 0]]
+  [[() => tradeEvents, 0]]
 ];
-export var TradeEventStreamResponse$: StaticStructureSchema = [3, n0, _TESRr,
+export var tradeEventStreamResponse: StaticStructureSchema = [3, n0, _TESRr,
   0,
   [_eS],
-  [[() => TradeEvents$, 0]]
+  [[() => tradeEvents, 0]]
 ];
 export var XYZServiceServiceException$: StaticErrorSchema = [-3, n0, _XYZSSE,
   { [_e]: _c },
@@ -110,14 +110,14 @@ TypeRegistry.for(n0).registerError(XYZServiceServiceException$, __XYZServiceServ
 var __Unit = "unit" as const;
 export var XYZServiceSyntheticServiceException: StaticErrorSchema = [-3, _s, "XYZServiceSyntheticServiceException", 0, [], []];
 TypeRegistry.for(_s).registerError(XYZServiceSyntheticServiceException, __XYZServiceSyntheticServiceException);
-export var TradeEvents$: StaticStructureSchema = [3, n0, _TE,
+export var tradeEvents: StaticStructureSchema = [3, n0, _TE,
   { [_st]: 1 },
   [_a, _b, _g],
-  [() => Alpha$, () => __Unit, () => __Unit]
+  [() => alpha, () => __Unit, () => __Unit]
 ];
-export var GetNumbers$: StaticOperationSchema = [9, n0, _GN,
-  0, () => GetNumbersRequest$, () => GetNumbersResponse$
+export var getNumbers: StaticOperationSchema = [9, n0, _GN,
+  0, () => getNumbersRequest, () => getNumbersResponse
 ];
-export var TradeEventStream$: StaticOperationSchema = [9, n0, _TES,
-  0, () => TradeEventStreamRequest$, () => TradeEventStreamResponse$
+export var tradeEventStream: StaticOperationSchema = [9, n0, _TES,
+  0, () => tradeEventStreamRequest, () => tradeEventStreamResponse
 ];

private/my-local-model-schema/test/index-objects.spec.mjs

@@ -1,57 +1,57 @@
 import {
-  Alpha$,
   CodedThrottlingError,
-  CodedThrottlingError$,
-  GetNumbers$,
   GetNumbersCommand,
-  GetNumbersRequest$,
-  GetNumbersResponse$,
   HaltError,
-  HaltError$,
   MainServiceLinkedError,
-  MainServiceLinkedError$,
   MysteryThrottlingError,
-  MysteryThrottlingError$,
   RetryableError,
-  RetryableError$,
-  TradeEventStream$,
   TradeEventStreamCommand,
-  TradeEventStreamRequest$,
-  TradeEventStreamResponse$,
-  TradeEvents$,
   XYZService,
   XYZServiceClient,
   XYZServiceServiceException,
   XYZServiceServiceException$,
   XYZServiceSyntheticServiceException,
+  alpha,
+  codedThrottlingError,
+  getNumbers,
+  getNumbersRequest,
+  getNumbersResponse,
+  haltError,
+  mainServiceLinkedError,
+  mysteryThrottlingError,
+  retryableError,
+  tradeEventStream,
+  tradeEventStreamRequest,
+  tradeEventStreamResponse,
+  tradeEvents,
 } from "../dist-cjs/index.js";
 import assert from "node:assert";
 // clients
 assert(typeof XYZServiceClient === "function");
 assert(typeof XYZService === "function");
 // commands
 assert(typeof GetNumbersCommand === "function");
-assert(typeof GetNumbers$ === "object");
+assert(typeof getNumbers === "object");
 assert(typeof TradeEventStreamCommand === "function");
-assert(typeof TradeEventStream$ === "object");
+assert(typeof tradeEventStream === "object");
 // structural schemas
-assert(typeof Alpha$ === "object");
-assert(typeof GetNumbersRequest$ === "object");
-assert(typeof GetNumbersResponse$ === "object");
-assert(typeof TradeEvents$ === "object");
-assert(typeof TradeEventStreamRequest$ === "object");
-assert(typeof TradeEventStreamResponse$ === "object");
+assert(typeof alpha === "object");
+assert(typeof getNumbersRequest === "object");
+assert(typeof getNumbersResponse === "object");
+assert(typeof tradeEvents === "object");
+assert(typeof tradeEventStreamRequest === "object");
+assert(typeof tradeEventStreamResponse === "object");
 // errors
 assert(CodedThrottlingError.prototype instanceof XYZServiceSyntheticServiceException);
-assert(typeof CodedThrottlingError$ === "object");
+assert(typeof codedThrottlingError === "object");
 assert(HaltError.prototype instanceof XYZServiceSyntheticServiceException);
-assert(typeof HaltError$ === "object");
+assert(typeof haltError === "object");
 assert(MainServiceLinkedError.prototype instanceof XYZServiceSyntheticServiceException);
-assert(typeof MainServiceLinkedError$ === "object");
+assert(typeof mainServiceLinkedError === "object");
 assert(MysteryThrottlingError.prototype instanceof XYZServiceSyntheticServiceException);
-assert(typeof MysteryThrottlingError$ === "object");
+assert(typeof mysteryThrottlingError === "object");
 assert(RetryableError.prototype instanceof XYZServiceSyntheticServiceException);
-assert(typeof RetryableError$ === "object");
+assert(typeof retryableError === "object");
 assert(XYZServiceServiceException.prototype instanceof XYZServiceSyntheticServiceException);
 assert(typeof XYZServiceServiceException$ === "object");
 assert(XYZServiceSyntheticServiceException.prototype instanceof Error);

private/smithy-rpcv2-cbor-schema/src/commands/EmptyInputOutputCommand.ts

@@ -6,7 +6,7 @@ import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
 import { commonParams } from "../endpoint/EndpointParameters";
 import type { EmptyStructure } from "../models/models_0";
 import type { RpcV2ProtocolClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../RpcV2ProtocolClient";
-import { EmptyInputOutput$ } from "../schemas/schemas_0";
+import { emptyInputOutput } from "../schemas/schemas_0";
 
 /**
  * @public
@@ -69,7 +69,7 @@ export class EmptyInputOutputCommand extends $Command
   })
   .s("RpcV2Protocol", "EmptyInputOutput", {})
   .n("RpcV2ProtocolClient", "EmptyInputOutputCommand")
-  .sc(EmptyInputOutput$)
+  .sc(emptyInputOutput)
   .build() {
   /** @internal type navigation helper, not in runtime. */
   protected declare static __types: {

private/smithy-rpcv2-cbor-schema/src/commands/Float16Command.ts

@@ -6,7 +6,7 @@ import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
 import { commonParams } from "../endpoint/EndpointParameters";
 import type { Float16Output } from "../models/models_0";
 import type { RpcV2ProtocolClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../RpcV2ProtocolClient";
-import { Float16$ } from "../schemas/schemas_0";
+import { float16 } from "../schemas/schemas_0";
 
 /**
  * @public
@@ -71,7 +71,7 @@ export class Float16Command extends $Command
   })
   .s("RpcV2Protocol", "Float16", {})
   .n("RpcV2ProtocolClient", "Float16Command")
-  .sc(Float16$)
+  .sc(float16)
   .build() {
   /** @internal type navigation helper, not in runtime. */
   protected declare static __types: {

private/smithy-rpcv2-cbor-schema/src/commands/FractionalSecondsCommand.ts

@@ -6,7 +6,7 @@ import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
 import { commonParams } from "../endpoint/EndpointParameters";
 import type { FractionalSecondsOutput } from "../models/models_0";
 import type { RpcV2ProtocolClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../RpcV2ProtocolClient";
-import { FractionalSeconds$ } from "../schemas/schemas_0";
+import { fractionalSeconds } from "../schemas/schemas_0";
 
 /**
  * @public
@@ -71,7 +71,7 @@ export class FractionalSecondsCommand extends $Command
   })
   .s("RpcV2Protocol", "FractionalSeconds", {})
   .n("RpcV2ProtocolClient", "FractionalSecondsCommand")
-  .sc(FractionalSeconds$)
+  .sc(fractionalSeconds)
   .build() {
   /** @internal type navigation helper, not in runtime. */
   protected declare static __types: {

private/smithy-rpcv2-cbor-schema/src/commands/GreetingWithErrorsCommand.ts

@@ -6,7 +6,7 @@ import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
 import { commonParams } from "../endpoint/EndpointParameters";
 import type { GreetingWithErrorsOutput } from "../models/models_0";
 import type { RpcV2ProtocolClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../RpcV2ProtocolClient";
-import { GreetingWithErrors$ } from "../schemas/schemas_0";
+import { greetingWithErrors } from "../schemas/schemas_0";
 
 /**
  * @public
@@ -84,7 +84,7 @@ export class GreetingWithErrorsCommand extends $Command
   })
   .s("RpcV2Protocol", "GreetingWithErrors", {})
   .n("RpcV2ProtocolClient", "GreetingWithErrorsCommand")
-  .sc(GreetingWithErrors$)
+  .sc(greetingWithErrors)
   .build() {
   /** @internal type navigation helper, not in runtime. */
   protected declare static __types: {

private/smithy-rpcv2-cbor-schema/src/commands/NoInputOutputCommand.ts

@@ -5,7 +5,7 @@ import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
 
 import { commonParams } from "../endpoint/EndpointParameters";
 import type { RpcV2ProtocolClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../RpcV2ProtocolClient";
-import { NoInputOutput$ } from "../schemas/schemas_0";
+import { noInputOutput } from "../schemas/schemas_0";
 
 /**
  * @public
@@ -68,7 +68,7 @@ export class NoInputOutputCommand extends $Command
   })
   .s("RpcV2Protocol", "NoInputOutput", {})
   .n("RpcV2ProtocolClient", "NoInputOutputCommand")
-  .sc(NoInputOutput$)
+  .sc(noInputOutput)
   .build() {
   /** @internal type navigation helper, not in runtime. */
   protected declare static __types: {

private/smithy-rpcv2-cbor-schema/src/commands/OperationWithDefaultsCommand.ts

@@ -6,7 +6,7 @@ import type { MetadataBearer as __MetadataBearer } from "@smithy/types";
 import { commonParams } from "../endpoint/EndpointParameters";
 import type { OperationWithDefaultsInput, OperationWithDefaultsOutput } from "../models/models_0";
 import type { RpcV2ProtocolClientResolvedConfig, ServiceInputTypes, ServiceOutputTypes } from "../RpcV2ProtocolClient";
-import { OperationWithDefaults$ } from "../schemas/schemas_0";
+import { operationWithDefaults } from "../schemas/schemas_0";
 
 /**
  * @public
@@ -137,7 +137,7 @@ export class OperationWithDefaultsCommand extends $Command
   })
   .s("RpcV2Protocol", "OperationWithDefaults", {})
   .n("RpcV2ProtocolClient", "OperationWithDefaultsCommand")
-  .sc(OperationWithDefaults$)
+  .sc(operationWithDefaults)
   .build() {
   /** @internal type navigation helper, not in runtime. */
   protected declare static __types: {