Skip to content
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.

Sign up for GitHub

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

Check for null when using UriResolverExtensionFileReader to read wasm module #1317

Merged
merged 8 commits into from
Oct 11, 2022
Merged

Check for null when using UriResolverExtensionFileReader to read wasm module #1317

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b04790a
added null value condition to trigger error in WasmWrapper.ts when tr…
krisbitney Oct 11, 2022
dbcf0bf
added null value condition to trigger error in WasmPackage.ts when tr…
krisbitney Oct 11, 2022
22409c6
replaced null check with more robust falsiness check
krisbitney Oct 11, 2022
63c7e36
moved null check to UriResolverExtensionFileReader.ts
krisbitney Oct 11, 2022
accbdb5
chore: improve UriResolverExtensionFileReader error messaging
dOrgJelli Oct 11, 2022
efc5fbf
fix: correct UriResolver getFile result typings
dOrgJelli Oct 11, 2022
58de735
fix: compiler error
dOrgJelli Oct 11, 2022
47c90cf
fix: lint fixes
dOrgJelli Oct 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions packages/js/uri-resolver-extensions/src/UriResolverExtensionFileReader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
Wrapper,
} from "@polywrap/core-js";
import { IFileReader } from "@polywrap/wasm-js";
import { Result } from "@polywrap/result";
import { Result, ResultErr } from "@polywrap/result";

export class UriResolverExtensionFileReader implements IFileReader {
constructor(
Expand All @@ -18,7 +18,7 @@ export class UriResolverExtensionFileReader implements IFileReader {
) {}

async readFile(filePath: string): Promise<Result<Uint8Array, Error>> {
return await UriResolverInterface.module.getFile(
const result = await UriResolverInterface.module.getFile(
{
invoke: <TData = unknown, TUri extends Uri | string = string>(
options: InvokeOptions<TUri>
Expand All @@ -32,5 +32,10 @@ export class UriResolverExtensionFileReader implements IFileReader {
this.resolverExtensionUri,
combinePaths(this.wrapperUri.path, filePath)
);
if (!result.ok) return result;
if (!result.value) {
return ResultErr(new Error(`File not found at ${filePath}`));
}
return result;
}
}