@typespec/emitter-framework 0.6.0-dev.4 → 0.6.0-dev.5

package/dist/src/typescript/components/interface-method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interface-method.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-method.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACzF,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,oBAAoB,GAAG,4BAA4B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,iDA8BpE"}
+{"version":3,"file":"interface-method.d.ts","sourceRoot":"","sources":["../../../../src/typescript/components/interface-method.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAI/C,MAAM,WAAW,4BAA6B,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACzF,IAAI,EAAE,SAAS,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,cAAc,CAAC,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;CACnD;AAED,MAAM,MAAM,oBAAoB,GAAG,4BAA4B,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAE1F;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,QAAQ,CAAC,oBAAoB,CAAC,iDA4BpE"}

package/dist/src/typescript/components/interface-method.js

@@ -15,7 +15,7 @@ export function InterfaceMethod(props) {
     return _$createComponent(ts.InterfaceMethod, props);
   }
   const [efProps, updateProps, forwardProps] = splitProps(props, ["type"], ["returnType", "parameters"]);
-  const name = props.name ? props.name : ts.useTSNamePolicy().getName(efProps.type.name, "function");
+  const name = props.name ?? ts.useTSNamePolicy().getName(efProps.type.name, "function");
   const returnType = props.returnType ?? _$createComponent(TypeExpression, {
     get type() {
       return getReturnType(efProps.type);
@@ -25,10 +25,10 @@ export function InterfaceMethod(props) {
     params: props.parameters,
     mode: props.parametersMode
   });
-  return _$createComponent(ts.InterfaceMethod, _$mergeProps(forwardProps, {
+  return _$createComponent(ts.InterfaceMethod, _$mergeProps(forwardProps, updateProps, {
     name: name,
     returnType: returnType,
     parameters: allParameters
-  }, updateProps));
+  }));
 }
 //# sourceMappingURL=interface-method.js.map

package/dist/src/typescript/components/interface-method.js.map

@@ -1 +1 @@
-{"version":3,"file":"interface-method.js","names":["splitProps","ts","buildParameterDescriptors","getReturnType","TypeExpression","InterfaceMethod","props","isTypeSpecTyped","_$createComponent","efProps","updateProps","forwardProps","name","useTSNamePolicy","getName","type","returnType","allParameters","parameters","params","mode","parametersMode","_$mergeProps"],"sources":["../../../../src/typescript/components/interface-method.tsx"],"sourcesContent":[null],"mappings":";;AAAA,SAASA,UAAU,QAAQ,4BAA4B;AACvD,OAAO,KAAKC,EAAE,MAAM,sBAAsB;AAE1C,SAASC,yBAAyB,EAAEC,aAAa,QAAQ,uBAAuB;AAChF,SAASC,cAAc;AAUvB;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACC,KAAqC,EAAE;EACrE,MAAMC,eAAe,GAAG,MAAM,IAAID,KAAK;EACvC,IAAI,CAACC,eAAe,EAAE;IACpB,OAAAC,iBAAA,CAAQP,EAAE,CAACI,eAAe,EAAKC,KAAK;EACtC;EAEA,MAAM,CAACG,OAAO,EAAEC,WAAW,EAAEC,YAAY,CAAC,GAAGX,UAAU,CACrDM,KAAK,EACL,CAAC,MAAM,CAAC,EACR,CAAC,YAAY,EAAE,YAAY,CAC7B,CAAC;EAED,MAAMM,IAAI,GAAGN,KAAK,CAACM,IAAI,GACnBN,KAAK,CAACM,IAAI,GACVX,EAAE,CAACY,eAAe,CAAC,CAAC,CAACC,OAAO,CAACL,OAAO,CAACM,IAAI,CAACH,IAAI,EAAE,UAAU,CAAC;EAC/D,MAAMI,UAAU,GAAGV,KAAK,CAACU,UAAU,IAAAR,iBAAA,CAAKJ,cAAc;IAAA,IAACW,IAAIA,CAAA;MAAA,OAAEZ,aAAa,CAACM,OAAO,CAACM,IAAI,CAAC;IAAA;EAAA,EAAI;EAC5F,MAAME,aAAa,GAAGf,yBAAyB,CAACO,OAAO,CAACM,IAAI,CAACG,UAAU,EAAE;IACvEC,MAAM,EAAEb,KAAK,CAACY,UAAU;IACxBE,IAAI,EAAEd,KAAK,CAACe;EACd,CAAC,CAAC;EAEF,OAAAb,iBAAA,CACGP,EAAE,CAACI,eAAe,EAAAiB,YAAA,CACbX,YAAY;IAChBC,IAAI,EAAEA,IAAI;IACVI,UAAU,EAAEA,UAAU;IACtBE,UAAU,EAAED;EAAa,GACrBP,WAAW;AAGrB","ignoreList":[]}
+{"version":3,"file":"interface-method.js","names":["splitProps","ts","buildParameterDescriptors","getReturnType","TypeExpression","InterfaceMethod","props","isTypeSpecTyped","_$createComponent","efProps","updateProps","forwardProps","name","useTSNamePolicy","getName","type","returnType","allParameters","parameters","params","mode","parametersMode","_$mergeProps"],"sources":["../../../../src/typescript/components/interface-method.tsx"],"sourcesContent":[null],"mappings":";;AAAA,SAASA,UAAU,QAAQ,4BAA4B;AACvD,OAAO,KAAKC,EAAE,MAAM,sBAAsB;AAE1C,SAASC,yBAAyB,EAAEC,aAAa,QAAQ,uBAAuB;AAChF,SAASC,cAAc;AAUvB;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAACC,KAAqC,EAAE;EACrE,MAAMC,eAAe,GAAG,MAAM,IAAID,KAAK;EACvC,IAAI,CAACC,eAAe,EAAE;IACpB,OAAAC,iBAAA,CAAQP,EAAE,CAACI,eAAe,EAAKC,KAAK;EACtC;EAEA,MAAM,CAACG,OAAO,EAAEC,WAAW,EAAEC,YAAY,CAAC,GAAGX,UAAU,CACrDM,KAAK,EACL,CAAC,MAAM,CAAC,EACR,CAAC,YAAY,EAAE,YAAY,CAC7B,CAAC;EAED,MAAMM,IAAI,GAAGN,KAAK,CAACM,IAAI,IAAIX,EAAE,CAACY,eAAe,CAAC,CAAC,CAACC,OAAO,CAACL,OAAO,CAACM,IAAI,CAACH,IAAI,EAAE,UAAU,CAAC;EACtF,MAAMI,UAAU,GAAGV,KAAK,CAACU,UAAU,IAAAR,iBAAA,CAAKJ,cAAc;IAAA,IAACW,IAAIA,CAAA;MAAA,OAAEZ,aAAa,CAACM,OAAO,CAACM,IAAI,CAAC;IAAA;EAAA,EAAI;EAC5F,MAAME,aAAa,GAAGf,yBAAyB,CAACO,OAAO,CAACM,IAAI,CAACG,UAAU,EAAE;IACvEC,MAAM,EAAEb,KAAK,CAACY,UAAU;IACxBE,IAAI,EAAEd,KAAK,CAACe;EACd,CAAC,CAAC;EAEF,OAAAb,iBAAA,CACGP,EAAE,CAACI,eAAe,EAAAiB,YAAA,CACbX,YAAY,EACZD,WAAW;IACfE,IAAI,EAAEA,IAAI;IACVI,UAAU,EAAEA,UAAU;IACtBE,UAAU,EAAED;EAAa;AAG/B","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/emitter-framework",
-  "version": "0.6.0-dev.4",
+  "version": "0.6.0-dev.5",
   "type": "module",
   "main": "dist/index.js",
   "exports": {

package/src/typescript/components/interface-method.tsx

@@ -29,9 +29,7 @@ export function InterfaceMethod(props: Readonly<InterfaceMethodProps>) {
     ["returnType", "parameters"],
   );
 
-  const name = props.name
-    ? props.name
-    : ts.useTSNamePolicy().getName(efProps.type.name, "function");
+  const name = props.name ?? ts.useTSNamePolicy().getName(efProps.type.name, "function");
   const returnType = props.returnType ?? <TypeExpression type={getReturnType(efProps.type)} />;
   const allParameters = buildParameterDescriptors(efProps.type.parameters, {
     params: props.parameters,
@@ -41,10 +39,10 @@ export function InterfaceMethod(props: Readonly<InterfaceMethodProps>) {
   return (
     <ts.InterfaceMethod
       {...forwardProps}
+      {...updateProps}
       name={name}
       returnType={returnType}
       parameters={allParameters}
-      {...updateProps}
     />
   );
 }

package/test/typescript/components/interface-method.test.tsx

@@ -15,7 +15,7 @@ describe("interface methods with a `type` prop", () => {
     runner = await createEmitterFrameworkTestRunner();
   });
 
-  it("creates a interface member", async () => {
+  it("creates a interface method", async () => {
     const { getName } = (await runner.compile(`
       @test op getName(id: string): string;
     `)) as { getName: Operation };
@@ -65,5 +65,170 @@ describe("interface methods with a `type` prop", () => {
     );
   });
 
-  it.todo("can append extra parameters with raw params provided", async () => {});
+  it("can append extra parameters with raw params provided", async () => {
+    const { getName } = (await runner.compile(`
+      @test op getName(id: string): string;
+    `)) as { getName: Operation };
+
+    const res = render(
+      <Output>
+        <SourceFile path="test.ts">
+          <InterfaceDeclaration name="basicInterface">
+            <InterfaceMethod
+              type={getName}
+              parametersMode="append"
+              parameters={[{ name: "foo", type: "string" }]}
+            />
+          </InterfaceDeclaration>
+        </SourceFile>
+      </Output>,
+    );
+
+    assertFileContents(
+      res,
+      d`
+        interface basicInterface {
+          getName(id: string, foo: string): string
+        }
+      `,
+    );
+  });
+
+  it("can prepend extra parameters with raw params provided", async () => {
+    const { getName } = (await runner.compile(`
+      @test op getName(id: string): string;
+    `)) as { getName: Operation };
+
+    const res = render(
+      <Output>
+        <SourceFile path="test.ts">
+          <InterfaceDeclaration name="basicInterface">
+            <InterfaceMethod
+              type={getName}
+              parametersMode="prepend"
+              parameters={[{ name: "foo", type: "string" }]}
+            />
+          </InterfaceDeclaration>
+        </SourceFile>
+      </Output>,
+    );
+
+    assertFileContents(
+      res,
+      d`
+        interface basicInterface {
+          getName(foo: string, id: string): string
+        }
+      `,
+    );
+  });
+
+  it("can replace parameters with raw params provided", async () => {
+    const { getName } = (await runner.compile(`
+      @test op getName(id: string): string;
+    `)) as { getName: Operation };
+
+    const res = render(
+      <Output>
+        <SourceFile path="test.ts">
+          <InterfaceDeclaration name="basicInterface">
+            <InterfaceMethod
+              type={getName}
+              parametersMode="replace"
+              parameters={[
+                { name: "foo", type: "string" },
+                { name: "bar", type: "number" },
+              ]}
+            />
+          </InterfaceDeclaration>
+        </SourceFile>
+      </Output>,
+    );
+
+    assertFileContents(
+      res,
+      d`
+        interface basicInterface {
+          getName(foo: string, bar: number): string
+        }
+      `,
+    );
+  });
+
+  it("can override return type", async () => {
+    const { getName } = (await runner.compile(`
+      @test op getName(id: string): string;
+    `)) as { getName: Operation };
+
+    const res = render(
+      <Output>
+        <SourceFile path="test.ts">
+          <InterfaceDeclaration name="basicInterface">
+            <InterfaceMethod type={getName} returnType="Promise<Record<string, unknown>>" />
+          </InterfaceDeclaration>
+        </SourceFile>
+      </Output>,
+    );
+
+    assertFileContents(
+      res,
+      d`
+        interface basicInterface {
+          getName(id: string): Promise<Record<string, unknown>>
+        }
+      `,
+    );
+  });
+
+  it("can override method name", async () => {
+    const { getName } = (await runner.compile(`
+      @test op getName(id: string): string;
+    `)) as { getName: Operation };
+
+    const res = render(
+      <Output>
+        <SourceFile path="test.ts">
+          <InterfaceDeclaration name="basicInterface">
+            <InterfaceMethod type={getName} name="getNameCustom" />
+          </InterfaceDeclaration>
+        </SourceFile>
+      </Output>,
+    );
+
+    assertFileContents(
+      res,
+      d`
+        interface basicInterface {
+          getNameCustom(id: string): string
+        }
+      `,
+    );
+  });
+});
+
+describe("interface methods without a `type` prop", () => {
+  it("renders a plain interface method", async () => {
+    const res = render(
+      <Output>
+        <SourceFile path="test.ts">
+          <InterfaceDeclaration name="basicInterface">
+            <InterfaceMethod
+              name="plainMethod"
+              parameters={[{ name: "param1", type: "string" }]}
+              returnType="number"
+            />
+          </InterfaceDeclaration>
+        </SourceFile>
+      </Output>,
+    );
+
+    assertFileContents(
+      res,
+      d`
+        interface basicInterface {
+          plainMethod(param1: string): number
+        }
+      `,
+    );
+  });
 });