-
Notifications
You must be signed in to change notification settings - Fork 46
Fix type error when extending Sandbox class #264
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@cloudflare/sandbox': patch | ||
| --- | ||
|
|
||
| Fix type error when extending Sandbox class by making getSandbox and SandboxEnv generic |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,11 +45,11 @@ import { | |
| import type { MountInfo } from './storage-mount/types'; | ||
| import { SDK_VERSION } from './version'; | ||
|
|
||
| export function getSandbox( | ||
| ns: DurableObjectNamespace<Sandbox>, | ||
| export function getSandbox<T extends Sandbox<any>>( | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add a comment explaining why // Use 'any' for Env parameter to allow covariance - we need to accept
// Sandbox subclasses with any environment type (Sandbox<E> for all E)
export function getSandbox<T extends Sandbox<any>>(This is one of the rare valid uses of
ghostwriternr marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| ns: DurableObjectNamespace<T>, | ||
| id: string, | ||
| options?: SandboxOptions | ||
| ): Sandbox { | ||
| ): T { | ||
| const sanitizedId = sanitizeSandboxId(id); | ||
| const effectiveId = options?.normalizeId | ||
| ? sanitizedId.toLowerCase() | ||
|
|
@@ -65,7 +65,7 @@ export function getSandbox( | |
| ); | ||
| } | ||
|
|
||
| const stub = getContainer(ns, effectiveId) as unknown as Sandbox; | ||
| const stub = getContainer(ns, effectiveId); | ||
|
|
||
| stub.setSandboxName?.(effectiveId, options?.normalizeId); | ||
|
|
||
|
|
@@ -87,7 +87,7 @@ export function getSandbox( | |
|
|
||
| return Object.assign(stub, { | ||
| wsConnect: connect(stub) | ||
| }); | ||
| }) as T; | ||
| } | ||
|
|
||
| export function connect(stub: { | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add the same explanatory comment here about the
anyusage to align with the codebase's "never use any" standard.