@typespec/http 1.11.0-dev.0 → 1.11.0-dev.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (15) hide show
  1. package/dist/generated-defs/TypeSpec.Http.Private.d.ts +11 -7
  2. package/dist/generated-defs/TypeSpec.Http.Private.d.ts.map +1 -1
  3. package/dist/src/index.js +1 -1
  4. package/dist/src/index.js.map +1 -1
  5. package/dist/src/merge-patch.d.ts +3 -1
  6. package/dist/src/merge-patch.d.ts.map +1 -1
  7. package/dist/src/merge-patch.js +39 -9
  8. package/dist/src/merge-patch.js.map +1 -1
  9. package/dist/src/tsp-index.d.ts +6 -0
  10. package/dist/src/tsp-index.d.ts.map +1 -1
  11. package/dist/src/tsp-index.js +6 -1
  12. package/dist/src/tsp-index.js.map +1 -1
  13. package/lib/main.tsp +11 -15
  14. package/lib/private.decorators.tsp +8 -0
  15. package/package.json +3 -3
package/dist/generated-defs/TypeSpec.Http.Private.d.ts CHANGED
@@ -1,4 +1,4 @@
1
- import type { DecoratorContext, DecoratorValidatorCallbacks, Model, ModelProperty, Type } from "@typespec/compiler";
1
+ import type { DecoratorContext, DecoratorValidatorCallbacks, FunctionContext, Model, ModelProperty, Type } from "@typespec/compiler";
2
2
  export interface HttpPartOptions {
3
3
  readonly name?: string;
4
4
  }
@@ -8,17 +8,17 @@ export interface ApplyMergePatchOptions {
8
8
  export type PlainDataDecorator = (context: DecoratorContext, target: Model) => DecoratorValidatorCallbacks | void;
9
9
  export type HttpFileDecorator = (context: DecoratorContext, target: Model) => DecoratorValidatorCallbacks | void;
10
10
  export type HttpPartDecorator = (context: DecoratorContext, target: Model, type: Type, options: HttpPartOptions) => DecoratorValidatorCallbacks | void;
11
- /**
12
- * Performs the canonical merge-patch transformation on the given model and injects its
13
- * transformed properties into the target.
14
- */
15
- export type ApplyMergePatchDecorator = (context: DecoratorContext, target: Model, source: Model, nameTemplate: string, options: ApplyMergePatchOptions) => DecoratorValidatorCallbacks | void;
16
11
  /**
17
12
  * Specify if inapplicable metadata should be included in the payload for the given entity.
18
13
  *
19
14
  * @param value If true, inapplicable metadata will be included in the payload.
20
15
  */
21
16
  export type IncludeInapplicableMetadataInPayloadDecorator = (context: DecoratorContext, target: Type, value: boolean) => DecoratorValidatorCallbacks | void;
17
+ /**
18
+ * Performs the canonical merge-patch transformation on the given model and injects its
19
+ * transformed properties into the target.
20
+ */
21
+ export type ApplyMergePatchDecorator = (context: DecoratorContext, target: Model, source: Model, nameTemplate: string, options: ApplyMergePatchOptions) => DecoratorValidatorCallbacks | void;
22
22
  /**
23
23
  * Marks a model that was generated by applying the MergePatch
24
24
  * transform and links to its source model
@@ -33,9 +33,13 @@ export type TypeSpecHttpPrivateDecorators = {
33
33
  plainData: PlainDataDecorator;
34
34
  httpFile: HttpFileDecorator;
35
35
  httpPart: HttpPartDecorator;
36
- applyMergePatch: ApplyMergePatchDecorator;
37
36
  includeInapplicableMetadataInPayload: IncludeInapplicableMetadataInPayloadDecorator;
37
+ applyMergePatch: ApplyMergePatchDecorator;
38
38
  mergePatchModel: MergePatchModelDecorator;
39
39
  mergePatchProperty: MergePatchPropertyDecorator;
40
40
  };
41
+ export type ApplyMergePatchTransformFunctionImplementation = (context: FunctionContext, input: Model, nameTemplate: string, options: ApplyMergePatchOptions) => Model;
42
+ export type TypeSpecHttpPrivateFunctions = {
43
+ applyMergePatchTransform: ApplyMergePatchTransformFunctionImplementation;
44
+ };
41
45
  //# sourceMappingURL=TypeSpec.Http.Private.d.ts.map
package/dist/generated-defs/TypeSpec.Http.Private.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"TypeSpec.Http.Private.d.ts","sourceRoot":"","sources":["../../generated-defs/TypeSpec.Http.Private.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC3B,KAAK,EACL,aAAa,EACb,IAAI,EACL,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC/B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,KACV,2BAA2B,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,iBAAiB,GAAG,CAC9B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,KACV,2BAA2B,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,iBAAiB,GAAG,CAC9B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,eAAe,KACrB,2BAA2B,GAAG,IAAI,CAAC;AAExC;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACrC,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,KAAK,EACb,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,sBAAsB,KAC5B,2BAA2B,GAAG,IAAI,CAAC;AAExC;;;;GAIG;AACH,MAAM,MAAM,6CAA6C,GAAG,CAC1D,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,IAAI,EACZ,KAAK,EAAE,OAAO,KACX,2BAA2B,GAAG,IAAI,CAAC;AAExC;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACrC,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,KAAK,KACV,2BAA2B,GAAG,IAAI,CAAC;AAExC;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,CACxC,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,aAAa,KAClB,2BAA2B,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,SAAS,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,eAAe,EAAE,wBAAwB,CAAC;IAC1C,oCAAoC,EAAE,6CAA6C,CAAC;IACpF,eAAe,EAAE,wBAAwB,CAAC;IAC1C,kBAAkB,EAAE,2BAA2B,CAAC;CACjD,CAAC"}
1
+ {"version":3,"file":"TypeSpec.Http.Private.d.ts","sourceRoot":"","sources":["../../generated-defs/TypeSpec.Http.Private.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC3B,eAAe,EACf,KAAK,EACL,aAAa,EACb,IAAI,EACL,MAAM,oBAAoB,CAAC;AAE5B,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;CAClC;AAED,MAAM,MAAM,kBAAkB,GAAG,CAC/B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,KACV,2BAA2B,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,iBAAiB,GAAG,CAC9B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,KACV,2BAA2B,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,iBAAiB,GAAG,CAC9B,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,eAAe,KACrB,2BAA2B,GAAG,IAAI,CAAC;AAExC;;;;GAIG;AACH,MAAM,MAAM,6CAA6C,GAAG,CAC1D,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,IAAI,EACZ,KAAK,EAAE,OAAO,KACX,2BAA2B,GAAG,IAAI,CAAC;AAExC;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACrC,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,KAAK,EACb,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,sBAAsB,KAC5B,2BAA2B,GAAG,IAAI,CAAC;AAExC;;;GAGG;AACH,MAAM,MAAM,wBAAwB,GAAG,CACrC,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,MAAM,EAAE,KAAK,KACV,2BAA2B,GAAG,IAAI,CAAC;AAExC;;;GAGG;AACH,MAAM,MAAM,2BAA2B,GAAG,CACxC,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,aAAa,KAClB,2BAA2B,GAAG,IAAI,CAAC;AAExC,MAAM,MAAM,6BAA6B,GAAG;IAC1C,SAAS,EAAE,kBAAkB,CAAC;IAC9B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,QAAQ,EAAE,iBAAiB,CAAC;IAC5B,oCAAoC,EAAE,6CAA6C,CAAC;IACpF,eAAe,EAAE,wBAAwB,CAAC;IAC1C,eAAe,EAAE,wBAAwB,CAAC;IAC1C,kBAAkB,EAAE,2BAA2B,CAAC;CACjD,CAAC;AAEF,MAAM,MAAM,8CAA8C,GAAG,CAC3D,OAAO,EAAE,eAAe,EACxB,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,sBAAsB,KAC5B,KAAK,CAAC;AAEX,MAAM,MAAM,4BAA4B,GAAG;IACzC,wBAAwB,EAAE,8CAA8C,CAAC;CAC1E,CAAC"}
package/dist/src/index.js CHANGED
@@ -14,5 +14,5 @@ export { getHttpFileModel, getHttpPart, isHttpFile, isOrExtendsHttpFile, } from
14
14
  export { getResponsesForOperation } from "./responses.js";
15
15
  export { addQueryParamsToUriTemplate, getRouteOptionsForNamespace, getRoutePath, getUriTemplatePathParam, joinPathSegments, } from "./route.js";
16
16
  /** @internal */
17
- export { $decorators } from "./tsp-index.js";
17
+ export { $decorators, $functions } from "./tsp-index.js";
18
18
  //# sourceMappingURL=index.js.map
package/dist/src/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACL,KAAK,EACL,WAAW,EACX,SAAS,EACT,OAAO,EACP,OAAO,EACP,IAAI,EACJ,KAAK,EACL,OAAO,EACP,cAAc,EACd,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,MAAM,EACN,OAAO,EACP,WAAW,EACX,QAAQ,EACR,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,6BAA6B,EAC7B,MAAM,EACN,YAAY,EACZ,UAAU,EACV,aAAa,EACb,QAAQ,EACR,uBAAuB,EACvB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,iBAAiB,GAElB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC3F,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,gBAAgB;AAChB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EACL,sBAAsB,EACtB,UAAU,EACV,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,0BAA0B,EAC1B,UAAU,EACV,SAAS,EACT,wBAAwB,GAGzB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAEL,gBAAgB,EAChB,WAAW,EACX,UAAU,EACV,mBAAmB,GACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,YAAY,EACZ,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,YAAY,CAAC;AA0DpB,gBAAgB;AAChB,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACjF,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EACL,KAAK,EACL,WAAW,EACX,SAAS,EACT,OAAO,EACP,OAAO,EACP,IAAI,EACJ,KAAK,EACL,OAAO,EACP,cAAc,EACd,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,MAAM,EACN,OAAO,EACP,WAAW,EACX,QAAQ,EACR,iBAAiB,EACjB,qBAAqB,EACrB,kBAAkB,EAClB,qBAAqB,EACrB,gBAAgB,EAChB,eAAe,EACf,gBAAgB,EAChB,mBAAmB,EACnB,iBAAiB,EACjB,oBAAoB,EACpB,UAAU,EACV,wBAAwB,EACxB,cAAc,EACd,6BAA6B,EAC7B,MAAM,EACN,YAAY,EACZ,UAAU,EACV,aAAa,EACb,QAAQ,EACR,uBAAuB,EACvB,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,iBAAiB,GAElB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC3F,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AACtC,gBAAgB;AAChB,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAEhD,OAAO,EACL,sBAAsB,EACtB,UAAU,EACV,kBAAkB,EAClB,mBAAmB,EACnB,oBAAoB,EACpB,0BAA0B,EAC1B,UAAU,EACV,SAAS,EACT,wBAAwB,GAGzB,MAAM,eAAe,CAAC;AACvB,OAAO,EACL,kBAAkB,EAClB,gBAAgB,EAChB,cAAc,EACd,sBAAsB,EACtB,oBAAoB,EACpB,gBAAgB,GACjB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAEL,gBAAgB,EAChB,WAAW,EACX,UAAU,EACV,mBAAmB,GACpB,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EACL,2BAA2B,EAC3B,2BAA2B,EAC3B,YAAY,EACZ,uBAAuB,EACvB,gBAAgB,GACjB,MAAM,YAAY,CAAC;AA0DpB,gBAAgB;AAChB,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC"}
package/dist/src/merge-patch.d.ts CHANGED
@@ -1,5 +1,7 @@
1
- import { ApplyMergePatchDecorator, MergePatchModelDecorator, MergePatchPropertyDecorator } from "../generated-defs/TypeSpec.Http.Private.js";
1
+ import { DecoratorContext, FunctionContext, Model } from "@typespec/compiler";
2
+ import { ApplyMergePatchDecorator, ApplyMergePatchOptions, MergePatchModelDecorator, MergePatchPropertyDecorator } from "../generated-defs/TypeSpec.Http.Private.js";
2
3
  export declare const $mergePatchModel: MergePatchModelDecorator;
3
4
  export declare const $mergePatchProperty: MergePatchPropertyDecorator;
5
+ export declare function applyMergePatchTransform(ctx: FunctionContext | DecoratorContext, input: Model, nameTemplate: string, options: ApplyMergePatchOptions): Model;
4
6
  export declare const $applyMergePatch: ApplyMergePatchDecorator;
5
7
  //# sourceMappingURL=merge-patch.d.ts.map
package/dist/src/merge-patch.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"merge-patch.d.ts","sourceRoot":"","sources":["../../src/merge-patch.ts"],"names":[],"mappings":"AAiCA,OAAO,EACL,wBAAwB,EAExB,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,4CAA4C,CAAC;AAYpD,eAAO,MAAM,gBAAgB,EAAE,wBAM9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,2BAMjC,CAAC;AAmCF,eAAO,MAAM,gBAAgB,EAAE,wBAwC9B,CAAC"}
1
+ {"version":3,"file":"merge-patch.d.ts","sourceRoot":"","sources":["../../src/merge-patch.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,gBAAgB,EAEhB,eAAe,EAKf,KAAK,EAWN,MAAM,oBAAoB,CAAC;AAW5B,OAAO,EACL,wBAAwB,EACxB,sBAAsB,EACtB,wBAAwB,EACxB,2BAA2B,EAC5B,MAAM,4CAA4C,CAAC;AAYpD,eAAO,MAAM,gBAAgB,EAAE,wBAM9B,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,2BAMjC,CAAC;AAmCF,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,GAAG,gBAAgB,EACvC,KAAK,EAAE,KAAK,EACZ,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,sBAAsB,GAC9B,KAAK,CAqCP;AAED,eAAO,MAAM,gBAAgB,EAAE,wBAa9B,CAAC"}
package/dist/src/merge-patch.js CHANGED
@@ -1,4 +1,4 @@
1
- import { $invisible, $removeVisibility, $visibility, compilerAssert, getDiscriminatedUnion, getDiscriminator, getLifecycleVisibilityEnum, isVisible, navigateType, resetVisibilityModifiersForClass, } from "@typespec/compiler";
1
+ import { $invisible, $removeVisibility, $visibility, compilerAssert, getDiscriminatedUnion, getDiscriminator, getLifecycleVisibilityEnum, isVisible, navigateType, resetVisibilityModifiersForClass, setMediaTypeHint, } from "@typespec/compiler";
2
2
  import { unsafe_mutateSubgraph as mutateSubgraph, unsafe_MutatorFlow as MutatorFlow, } from "@typespec/compiler/experimental";
3
3
  import { $ } from "@typespec/compiler/typekit";
4
4
  import { isCookieParam, isHeader, isPathParam, isQueryParam, isStatusCode } from "./decorators.js";
@@ -22,15 +22,14 @@ function cachedMutateSubgraph(program, mutator, type) {
22
22
  return cached;
23
23
  }
24
24
  const MERGE_PATCH_MUTATOR_CACHE = Symbol.for("TypeSpec.Http.MergePatchMutatorCache");
25
- export const $applyMergePatch = (ctx, target, source, nameTemplate, options) => {
26
- setMergePatchSource(ctx.program, target, source);
25
+ export function applyMergePatchTransform(ctx, input, nameTemplate, options) {
27
26
  let reported = false;
28
- navigateType(source, {
27
+ navigateType(input, {
29
28
  intrinsic: (i) => {
30
29
  if (!reported && i.name === "null") {
31
30
  reportDiagnostic(ctx.program, {
32
31
  code: "merge-patch-contains-null",
33
- target,
32
+ target: input,
34
33
  });
35
34
  reported = true;
36
35
  }
@@ -40,9 +39,15 @@ export const $applyMergePatch = (ctx, target, source, nameTemplate, options) =>
40
39
  const visibilityMode = options.visibilityMode.value
41
40
  .name;
42
41
  const mutator = ((mutatorCache[nameTemplate] ??= {})[visibilityMode] ??= createMergePatchMutator(ctx, nameTemplate, visibilityMode));
43
- const mutated = cachedMutateSubgraph(ctx.program, mutator, source);
44
- target.properties = mutated.type.properties;
45
- ctx.program.stateMap(HttpStateKeys.mergePatchModel).set(target, source);
42
+ const { type } = cachedMutateSubgraph(ctx.program, mutator, input);
43
+ compilerAssert(type.kind === "Model", "Expected the root of the MergePatch transform to be a Model");
44
+ return type;
45
+ }
46
+ export const $applyMergePatch = (ctx, target, source, nameTemplate, options) => {
47
+ const transformed = applyMergePatchTransform(ctx, source, nameTemplate, options);
48
+ setMergePatchSource(ctx.program, target, source);
49
+ setMediaTypeHint(ctx.program, target, "application/merge-patch+json");
50
+ target.properties = transformed.properties;
46
51
  };
47
52
  function visibilityModeToFilters(program, visibilityMode) {
48
53
  const Lifecycle = getLifecycleVisibilityEnum(program);
@@ -162,7 +167,10 @@ function createMergePatchMutator(ctx, nameTemplate, visibilityMode) {
162
167
  overrides?.optional ?? (isDiscriminatedProperty(program, prop) ? false : true);
163
168
  clone.defaultValue = undefined;
164
169
  }
165
- ctx.program.stateMap(HttpStateKeys.mergePatchProperty).set(clone, prop);
170
+ clone.decorators.push({
171
+ decorator: $mergePatchProperty,
172
+ args: [{ value: prop, jsValue: prop }],
173
+ });
166
174
  },
167
175
  },
168
176
  };
@@ -182,6 +190,19 @@ function createMergePatchMutator(ctx, nameTemplate, visibilityMode) {
182
190
  clone.variants.set(key, variant);
183
191
  }
184
192
  }
193
+ if (union.name) {
194
+ // We have to set the media type in a decorator, not just by calling `setMediaTypeHint`, in order for it to be
195
+ // preserved on further mutation.
196
+ clone.decorators = [
197
+ ...clone.decorators,
198
+ {
199
+ decorator: function (ctx, target) {
200
+ setMediaTypeHint(ctx.program, target, "application/merge-patch+json");
201
+ },
202
+ args: [],
203
+ },
204
+ ];
205
+ }
185
206
  rename(ctx.program, clone, nameTemplate);
186
207
  },
187
208
  },
@@ -238,6 +259,15 @@ function createMergePatchMutator(ctx, nameTemplate, visibilityMode) {
238
259
  }
239
260
  }
240
261
  clone.decorators = clone.decorators.filter((d) => d.decorator !== $applyMergePatch);
262
+ // We have to set the media type in a decorator, not just by calling `setMediaTypeHint`, in order for it to be
263
+ // preserved on further mutation.
264
+ clone.decorators.push({
265
+ decorator: function (ctx, target) {
266
+ setMergePatchSource(ctx.program, target, model);
267
+ setMediaTypeHint(ctx.program, target, "application/merge-patch+json");
268
+ },
269
+ args: [],
270
+ });
241
271
  ctx.program.stateMap(HttpStateKeys.mergePatchModel).set(clone, model);
242
272
  rename(ctx.program, clone, nameTemplate);
243
273
  },
package/dist/src/merge-patch.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"merge-patch.js","sourceRoot":"","sources":["../../src/merge-patch.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"merge-patch.js","sourceRoot":"","sources":["../../src/merge-patch.ts"],"names":[],"mappings":"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"}
package/dist/src/tsp-index.d.ts CHANGED
@@ -1,3 +1,9 @@
1
+ import { applyMergePatchTransform } from "./merge-patch.js";
1
2
  export { $lib } from "./lib.js";
2
3
  export { $onValidate } from "./validate.js";
4
+ export declare const $functions: {
5
+ "TypeSpec.Http.Private": {
6
+ applyMergePatchTransform: typeof applyMergePatchTransform;
7
+ };
8
+ };
3
9
  //# sourceMappingURL=tsp-index.d.ts.map
package/dist/src/tsp-index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tsp-index.d.ts","sourceRoot":"","sources":["../../src/tsp-index.ts"],"names":[],"mappings":"AA+BA,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC"}
1
+ {"version":3,"file":"tsp-index.d.ts","sourceRoot":"","sources":["../../src/tsp-index.ts"],"names":[],"mappings":"AA0BA,OAAO,EAIL,wBAAwB,EACzB,MAAM,kBAAkB,CAAC;AAQ1B,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAoC5C,eAAO,MAAM,UAAU;;;;CAItB,CAAC"}
package/dist/src/tsp-index.js CHANGED
@@ -1,7 +1,7 @@
1
1
  import { $body, $bodyIgnore, $bodyRoot, $cookie, $delete, $get, $head, $header, $multipartBody, $patch, $path, $post, $put, $query, $server, $statusCode, $useAuth, } from "./decorators.js";
2
2
  import { $route } from "./decorators/route.js";
3
3
  import { $sharedRoute } from "./decorators/shared-route.js";
4
- import { $applyMergePatch, $mergePatchModel, $mergePatchProperty } from "./merge-patch.js";
4
+ import { $applyMergePatch, $mergePatchModel, $mergePatchProperty, applyMergePatchTransform, } from "./merge-patch.js";
5
5
  import { $httpFile, $httpPart, $includeInapplicableMetadataInPayload, $plainData, } from "./private.decorators.js";
6
6
  export { $lib } from "./lib.js";
7
7
  export { $onValidate } from "./validate.js";
@@ -38,4 +38,9 @@ export const $decorators = {
38
38
  mergePatchProperty: $mergePatchProperty,
39
39
  },
40
40
  };
41
+ export const $functions = {
42
+ "TypeSpec.Http.Private": {
43
+ applyMergePatchTransform,
44
+ },
45
+ };
41
46
  //# sourceMappingURL=tsp-index.js.map
package/dist/src/tsp-index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tsp-index.js","sourceRoot":"","sources":["../../src/tsp-index.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,KAAK,EACL,WAAW,EACX,SAAS,EACT,OAAO,EACP,OAAO,EACP,IAAI,EACJ,KAAK,EACL,OAAO,EACP,cAAc,EACd,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,MAAM,EACN,OAAO,EACP,WAAW,EACX,QAAQ,GACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EACL,SAAS,EACT,SAAS,EACT,qCAAqC,EACrC,UAAU,GACX,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,gBAAgB;AAChB,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,eAAe,EAAE;QACf,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,WAAW;QACvB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,OAAO;QACf,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,OAAO;QACf,IAAI,EAAE,KAAK;QACX,aAAa,EAAE,cAAc;QAC7B,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,IAAI;QACT,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,OAAO;QACf,WAAW,EAAE,YAAY;QACzB,UAAU,EAAE,WAAW;QACvB,OAAO,EAAE,QAAQ;KACe;IAClC,uBAAuB,EAAE;QACvB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,UAAU;QACrB,oCAAoC,EAAE,qCAAqC;QAC3E,eAAe,EAAE,gBAAgB;QACjC,eAAe,EAAE,gBAAgB;QACjC,kBAAkB,EAAE,mBAAmB;KACA;CAC1C,CAAC"}
1
+ {"version":3,"file":"tsp-index.js","sourceRoot":"","sources":["../../src/tsp-index.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,KAAK,EACL,WAAW,EACX,SAAS,EACT,OAAO,EACP,OAAO,EACP,IAAI,EACJ,KAAK,EACL,OAAO,EACP,cAAc,EACd,MAAM,EACN,KAAK,EACL,KAAK,EACL,IAAI,EACJ,MAAM,EACN,OAAO,EACP,WAAW,EACX,QAAQ,GACT,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,mBAAmB,EACnB,wBAAwB,GACzB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,SAAS,EACT,SAAS,EACT,qCAAqC,EACrC,UAAU,GACX,MAAM,yBAAyB,CAAC;AAEjC,OAAO,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAChC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,gBAAgB;AAChB,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,eAAe,EAAE;QACf,IAAI,EAAE,KAAK;QACX,UAAU,EAAE,WAAW;QACvB,QAAQ,EAAE,SAAS;QACnB,MAAM,EAAE,OAAO;QACf,MAAM,EAAE,OAAO;QACf,GAAG,EAAE,IAAI;QACT,MAAM,EAAE,OAAO;QACf,IAAI,EAAE,KAAK;QACX,aAAa,EAAE,cAAc;QAC7B,KAAK,EAAE,MAAM;QACb,IAAI,EAAE,KAAK;QACX,IAAI,EAAE,KAAK;QACX,GAAG,EAAE,IAAI;QACT,KAAK,EAAE,MAAM;QACb,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,OAAO;QACf,WAAW,EAAE,YAAY;QACzB,UAAU,EAAE,WAAW;QACvB,OAAO,EAAE,QAAQ;KACe;IAClC,uBAAuB,EAAE;QACvB,QAAQ,EAAE,SAAS;QACnB,QAAQ,EAAE,SAAS;QACnB,SAAS,EAAE,UAAU;QACrB,oCAAoC,EAAE,qCAAqC;QAC3E,eAAe,EAAE,gBAAgB;QACjC,eAAe,EAAE,gBAAgB;QACjC,kBAAkB,EAAE,mBAAmB;KACA;CAC1C,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG;IACxB,uBAAuB,EAAE;QACvB,wBAAwB;KACc;CACzC,CAAC"}
package/lib/main.tsp CHANGED
@@ -307,14 +307,14 @@ scalar LinkHeader<T extends Record<url> | Link[]> extends string;
307
307
  * @patch op update(...MergePatchUpdate<Widget>): Widget;
308
308
  * ```
309
309
  */
310
- @doc("")
311
- @friendlyName(NameTemplate, T)
312
- @mediaTypeHint("application/merge-patch+json")
313
- @applyMergePatch(T, NameTemplate, #{ visibilityMode: Private.MergePatchVisibilityMode.Update })
314
- model MergePatchUpdate<
310
+ alias MergePatchUpdate<
315
311
  T extends Reflection.Model,
316
312
  NameTemplate extends valueof string = "{name}MergePatchUpdate"
317
- > {}
313
+ > = applyMergePatchTransform(
314
+ T,
315
+ NameTemplate,
316
+ #{ visibilityMode: Private.MergePatchVisibilityMode.Update }
317
+ );
318
318
 
319
319
  /**
320
320
  * Create a MergePatch Request body for creating or updating the given resource Model.
@@ -351,15 +351,11 @@ model MergePatchUpdate<
351
351
  * @patch op update(...MergePatchCreateOrUpdate<Widget>): Widget;
352
352
  * ```
353
353
  */
354
- @doc("")
355
- @friendlyName(NameTemplate, T)
356
- @mediaTypeHint("application/merge-patch+json")
357
- @applyMergePatch(
354
+ alias MergePatchCreateOrUpdate<
355
+ T extends Reflection.Model,
356
+ NameTemplate extends valueof string = "{name}MergePatchCreateOrUpdate"
357
+ > = applyMergePatchTransform(
358
358
  T,
359
359
  NameTemplate,
360
360
  #{ visibilityMode: Private.MergePatchVisibilityMode.CreateOrUpdate }
361
- )
362
- model MergePatchCreateOrUpdate<
363
- T extends Reflection.Model,
364
- NameTemplate extends valueof string = "{name}MergePatchCreateOrUpdate"
365
- > {}
361
+ );
package/lib/private.decorators.tsp CHANGED
@@ -46,6 +46,7 @@ model ApplyMergePatchOptions {
46
46
  * Performs the canonical merge-patch transformation on the given model and injects its
47
47
  * transformed properties into the target.
48
48
  */
49
+ #deprecated "applyMergePatch is deprecated and will be removed in a future release. This decorator is not intended for public use."
49
50
  extern dec applyMergePatch(
50
51
  target: Reflection.Model,
51
52
  source: Reflection.Model,
@@ -53,6 +54,13 @@ extern dec applyMergePatch(
53
54
  options: valueof ApplyMergePatchOptions
54
55
  );
55
56
 
57
+ #suppress "experimental-feature"
58
+ internal extern fn applyMergePatchTransform(
59
+ input: Reflection.Model,
60
+ nameTemplate: valueof string,
61
+ options: valueof ApplyMergePatchOptions
62
+ ): Reflection.Model;
63
+
56
64
  /**
57
65
  * Marks a model that was generated by applying the MergePatch
58
66
  * transform and links to its source model
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@typespec/http",
3
- "version": "1.11.0-dev.0",
3
+ "version": "1.11.0-dev.1",
4
4
  "author": "Microsoft Corporation",
5
5
  "description": "TypeSpec HTTP protocol binding",
6
6
  "homepage": "https://github.com/microsoft/typespec",
@@ -59,7 +59,7 @@
59
59
  "!dist/test/**"
60
60
  ],
61
61
  "peerDependencies": {
62
- "@typespec/compiler": "^1.10.0 || >= 1.11.0-dev.0",
62
+ "@typespec/compiler": "^1.10.0 || >= 1.11.0-dev.3",
63
63
  "@typespec/streams": "^0.80.0 || >= 0.81.0-dev.0"
64
64
  },
65
65
  "peerDependenciesMeta": {
@@ -69,7 +69,7 @@
69
69
  },
70
70
  "devDependencies": {
71
71
  "@types/node": "~25.3.0",
72
- "@typespec/compiler": "^1.10.0 || >= 1.11.0-dev.0",
72
+ "@typespec/compiler": "^1.10.0 || >= 1.11.0-dev.3",
73
73
  "@typespec/library-linter": "^0.80.0 || >= 0.81.0-dev.0",
74
74
  "@typespec/streams": "^0.80.0 || >= 0.81.0-dev.0",
75
75
  "@typespec/tspd": "^0.74.1 || >= 0.74.2-dev.1",