Skip to content

Commit 755a249

Browse files
authored
fix(wrangler): default worker entrypoint suport with wrangler types (#9897)
1 parent defea6f commit 755a249

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

.changeset/sad-experts-return.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"wrangler": patch
3+
---
4+
5+
fix: wrangler types should infer the types of the default worker entrypoint

packages/wrangler/src/__tests__/type-generation.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -701,9 +701,9 @@ describe("generate types", () => {
701701
D1_TESTING_SOMETHING: D1Database;
702702
SECRET: SecretsStoreSecret;
703703
HELLO_WORLD: HelloWorldBinding;
704-
SERVICE_BINDING: Fetcher /* service_name */;
704+
SERVICE_BINDING: Service<typeof import(\\"../b/index\\").default>;
705705
OTHER_SERVICE_BINDING: Service /* entrypoint FakeEntrypoint from service_name_2 */;
706-
OTHER_SERVICE_BINDING_ENTRYPOINT: Service<import(\\"../c/index\\").RealEntrypoint>;
706+
OTHER_SERVICE_BINDING_ENTRYPOINT: Service<typeof import(\\"../c/index\\").RealEntrypoint>;
707707
AE_DATASET_BINDING: AnalyticsEngineDataset;
708708
NAMESPACE_BINDING: DispatchNamespace;
709709
LOGFWDR_SCHEMA: any;

packages/wrangler/src/type-generation/index.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -464,13 +464,13 @@ export async function generateEnvTypes(
464464
: undefined;
465465

466466
const exportExists = serviceEntry?.exports?.some(
467-
(e) => e === service.entrypoint
467+
(e) => e === (service.entrypoint ?? "default")
468468
);
469469

470470
let typeName: string;
471471

472472
if (importPath && exportExists) {
473-
typeName = `Service<import("${importPath}").${service.entrypoint ?? "default"}>`;
473+
typeName = `Service<typeof import("${importPath}").${service.entrypoint ?? "default"}>`;
474474
} else if (service.entrypoint) {
475475
typeName = `Service /* entrypoint ${service.entrypoint} from ${service.service} */`;
476476
} else {

0 commit comments

Comments
 (0)