public/browser
1
0
Fork 0
mirror of https://github.com/lightpanda-io/browser.git synced 2025-10-29 15:13:28 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

use resource_str for stitching url

Browse Source
This commit is contained in:
Muki Kiboigo
2025-07-11 06:12:02 -07:00
parent dffd8b5fec
commit 06e514cc2e
1 changed files with 3 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/runtime/js.zig
View File

@@ -1515,48 +1515,28 @@ pub fn Env(comptime State: type, comptime WebApis: type) type {
const resolver = v8.PromiseResolver.init(context.v8_context); const resolver = v8.PromiseResolver.init(context.v8_context);
const specifier: v8.String = .{ .handle = v8_specifier.? }; const specifier: v8.String = .{ .handle = v8_specifier.? };
const specifier_str = jsStringToZig(context.call_arena, specifier, iso) catch { const specifier_str = jsStringToZig(context.context_arena, specifier, iso) catch {
const error_msg = v8.String.initUtf8(iso, "Failed to parse module specifier"); const error_msg = v8.String.initUtf8(iso, "Failed to parse module specifier");
_ = resolver.reject(ctx, error_msg.toValue()); _ = resolver.reject(ctx, error_msg.toValue());
return @constCast(resolver.getPromise().handle); return @constCast(resolver.getPromise().handle);
}; };
const resource: v8.String = .{ .handle = resource_name.? }; const resource: v8.String = .{ .handle = resource_name.? };
const resource_str = jsStringToZig(context.call_arena, resource, iso) catch { const resource_str = jsStringToZig(context.context_arena, resource, iso) catch {
const error_msg = v8.String.initUtf8(iso, "Failed to parse module resource"); const error_msg = v8.String.initUtf8(iso, "Failed to parse module resource");
_ = resolver.reject(ctx, error_msg.toValue()); _ = resolver.reject(ctx, error_msg.toValue());
return @constCast(resolver.getPromise().handle); return @constCast(resolver.getPromise().handle);
}; };
const referrer_full_url = blk: {
var it = context.module_identifier.valueIterator();
while (it.next()) |full_url| {
const last_slash = std.mem.lastIndexOfScalar(u8, full_url.*, '/') orelse 0;
const filename = full_url.*[last_slash + 1 ..];
const resource_clean = if (std.mem.startsWith(u8, resource_str, "./"))
resource_str[2..]
else
resource_str;
if (std.mem.eql(u8, filename, resource_clean)) {
break :blk full_url.*;
}
}
break :blk resource_str;
};
const normalized_specifier = @import("../url.zig").stitch( const normalized_specifier = @import("../url.zig").stitch(
context.context_arena, context.context_arena,
specifier_str, specifier_str,
referrer_full_url, resource_str,
.{ .alloc = .if_needed }, .{ .alloc = .if_needed },
) catch unreachable; ) catch unreachable;
log.debug(.js, "dynamic import", .{ log.debug(.js, "dynamic import", .{
.specifier = specifier_str, .specifier = specifier_str,
.resource = resource_str, .resource = resource_str,
.referrer_full = referrer_full_url,
.normalized_specifier = normalized_specifier, .normalized_specifier = normalized_specifier,
}); });