Skip to content

refactor: fix logic for empty resource #84

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

Merged
alexander-akait merged 1 commit into from
Oct 8, 2025
Merged

refactor: fix logic for empty resource #84

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 3 additions & 8 deletions lib/LoaderRunner.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,6 @@ module.exports.runLoaders = function runLoaders(options, callback) {
Object.defineProperty(loaderContext, "resource", {
enumerable: true,
get() {
if (loaderContext.resourcePath === undefined) return undefined;
return (
loaderContext.resourcePath.replace(/#/g, "\0#") +
loaderContext.resourceQuery.replace(/#/g, "\0#") +
Expand All @@ -419,15 +418,11 @@ module.exports.runLoaders = function runLoaders(options, callback) {
},
set(value) {
const splittedResource = value && parseIdentifier(value);
loaderContext.resourcePath = splittedResource
? splittedResource[0]
: undefined;
loaderContext.resourceQuery = splittedResource
? splittedResource[1]
: undefined;
loaderContext.resourcePath = splittedResource ? splittedResource[0] : "";
loaderContext.resourceQuery = splittedResource ? splittedResource[1] : "";
loaderContext.resourceFragment = splittedResource
? splittedResource[2]
: undefined;
: "";
},
});
Object.defineProperty(loaderContext, "request", {
Expand Down
7 changes: 7 additions & 0 deletions test/fixtures/set-empty-resource-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const path = require("path");

module.exports = function (source) {
this.resource = "";

return source + "-simple";
};
7 changes: 7 additions & 0 deletions test/fixtures/set-resource-loader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
const path = require("path");

module.exports = function (source) {
this.resource = `${path.resolve(__dirname, "./resource.bin")}?foo=bar#hash`;

return source + "-simple";
};
180 changes: 180 additions & 0 deletions test/runLoaders.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,6 +809,186 @@ describe("runLoaders", () => {
);
});

it("should have to correct keys in context with empty resource", (done) => {
runLoaders(
{
resource: "",
loaders: [
`${path.resolve(fixtures, "keys-loader.js")}?loader-query`,
path.resolve(fixtures, "simple-loader.js"),
],
},
(err, result) => {
if (err) return done(err);
try {
JSON.parse(result.result[0]).should.be.eql({
context: null,
resource: "",
resourcePath: "",
resourceQuery: "",
resourceFragment: "",
loaderIndex: 0,
query: "?loader-query",
currentRequest: `${path.resolve(
fixtures,
"keys-loader.js"
)}?loader-query!${path.resolve(fixtures, "simple-loader.js")}!`,
remainingRequest: `${path.resolve(fixtures, "simple-loader.js")}!`,
previousRequest: "",
request: `${path.resolve(
fixtures,
"keys-loader.js"
)}?loader-query!${path.resolve(fixtures, "simple-loader.js")}!`,
data: null,
loaders: [
{
request: `${path.resolve(fixtures, "keys-loader.js")}?loader-query`,
path: path.resolve(fixtures, "keys-loader.js"),
query: "?loader-query",
fragment: "",
data: null,
pitchExecuted: true,
normalExecuted: true,
},
{
request: path.resolve(fixtures, "simple-loader.js"),
path: path.resolve(fixtures, "simple-loader.js"),
query: "",
fragment: "",
data: null,
pitchExecuted: true,
normalExecuted: true,
},
],
});
} catch (err_) {
return done(err_);
}
done();
}
);
});

it("should have to correct keys in context with empty resource and set a new resource", (done) => {
runLoaders(
{
resource: "",
loaders: [
`${path.resolve(fixtures, "keys-loader.js")}?loader-query`,
path.resolve(fixtures, "set-resource-loader.js"),
],
},
(err, result) => {
if (err) return done(err);
try {
JSON.parse(result.result[0]).should.be.eql({
context: null,
resource: `${path.resolve(fixtures, "resource.bin")}?foo=bar#hash`,
resourcePath: path.resolve(fixtures, "resource.bin"),
resourceQuery: "?foo=bar",
resourceFragment: "#hash",
loaderIndex: 0,
query: "?loader-query",
currentRequest: `${path.resolve(
fixtures,
"keys-loader.js"
)}?loader-query!${path.resolve(fixtures, "set-resource-loader.js")}!${path.resolve(fixtures, "resource.bin")}?foo=bar#hash`,
remainingRequest: `${path.resolve(fixtures, "set-resource-loader.js")}!${path.resolve(fixtures, "resource.bin")}?foo=bar#hash`,
previousRequest: "",
request: `${path.resolve(
fixtures,
"keys-loader.js"
)}?loader-query!${path.resolve(fixtures, "set-resource-loader.js")}!${path.resolve(fixtures, "resource.bin")}?foo=bar#hash`,
data: null,
loaders: [
{
request: `${path.resolve(fixtures, "keys-loader.js")}?loader-query`,
path: path.resolve(fixtures, "keys-loader.js"),
query: "?loader-query",
fragment: "",
data: null,
pitchExecuted: true,
normalExecuted: true,
},
{
request: path.resolve(fixtures, "set-resource-loader.js"),
path: path.resolve(fixtures, "set-resource-loader.js"),
query: "",
fragment: "",
data: null,
pitchExecuted: true,
normalExecuted: true,
},
],
});
} catch (err_) {
return done(err_);
}
done();
}
);
});

it("should have to correct keys in context with resource and set a new resource", (done) => {
runLoaders(
{
resource: path.resolve(fixtures, "resource.bin"),
loaders: [
`${path.resolve(fixtures, "keys-loader.js")}?loader-query`,
path.resolve(fixtures, "set-empty-resource-loader.js"),
],
},
(err, result) => {
if (err) return done(err);
try {
JSON.parse(result.result[0]).should.be.eql({
context: fixtures,
resource: "",
resourcePath: "",
resourceQuery: "",
resourceFragment: "",
loaderIndex: 0,
query: "?loader-query",
currentRequest: `${path.resolve(
fixtures,
"keys-loader.js"
)}?loader-query!${path.resolve(fixtures, "set-empty-resource-loader.js")}!`,
remainingRequest: `${path.resolve(fixtures, "set-empty-resource-loader.js")}!`,
previousRequest: "",
request: `${path.resolve(
fixtures,
"keys-loader.js"
)}?loader-query!${path.resolve(fixtures, "set-empty-resource-loader.js")}!`,
data: null,
loaders: [
{
request: `${path.resolve(fixtures, "keys-loader.js")}?loader-query`,
path: path.resolve(fixtures, "keys-loader.js"),
query: "?loader-query",
fragment: "",
data: null,
pitchExecuted: true,
normalExecuted: true,
},
{
request: path.resolve(fixtures, "set-empty-resource-loader.js"),
path: path.resolve(fixtures, "set-empty-resource-loader.js"),
query: "",
fragment: "",
data: null,
pitchExecuted: true,
normalExecuted: true,
},
],
});
} catch (err_) {
return done(err_);
}
done();
}
);
});

describe("getContext", () => {
const TESTS = [
["/", "/"],
Expand Down