Ignore query in Stoplight endpoint URLs (#20)

* Ignore query in Stoplight endpoint URLs * test: mocking

Author: P0lip

lib/bundle/stoplight/generator.js

@@ -54,11 +54,22 @@ StoplightKeyGenerator.prototype.processPath = function (path) {
 
 StoplightKeyGenerator.prototype.extractFilepathFromUrl = function (url) {
  let { endpointUrl } = this._opts;
- let { href, query } = parse(url, true);
+ let { pathname, href, query } = parse(url, true);
+
+ if (pathname === "/" || pathname === null) {
+ return url;
+ }
 
  let mid = query.mid ? `_m${query.mid}` : "";
 
- let [, filepath] = href.split(endpointUrl);
+ let filepath;
+
+ if (endpointUrl instanceof RegExp) {
+ [, filepath] = pathname.split(endpointUrl);
+ }
+ else if (href.indexOf(endpointUrl) === 0) {
+ filepath = href.slice(endpointUrl.length);
+ }
 
  if (filepath) {
  return filepath + mid;

test/specs/custom-bundling-roots-new-stoplight/custom-bundling-roots-new-stoplight.spec.js

@@ -16,8 +16,14 @@ describe("Stoplight-specific defaults", () => {
  "http://jakub.stoplight-local.com:8080/api/v1/projects/jakub/my-project/nodes/reference/Book.v1.json": {
  title: "Book"
  },
+ "http://jakub.stoplight-local.com:8080/api/v1/projects/jakub/my-project/nodes/reference/Book.v1.json?deref=bundle&mid=1": {
+ title: "Book mid 1"
+ },
  "http://marc.stoplight-local.com:8080/api/v1/projects/marc/my-project/nodes/models/Street.v1.json": {
- title: "Book"
+ title: "Street"
+ },
+ "http://marc.stoplight-local.com:8080/api/v1/projects/marc/my-project/nodes/models/Street.v1.json?mid=1": {
+ title: "Street mid 1"
  },
  });
 
@@ -29,14 +35,19 @@ describe("Stoplight-specific defaults", () => {
  book: {
  $ref: "http://jakub.stoplight-local.com:8080/api/v1/projects/jakub/my-project/nodes/reference/Book.v1.json"
  },
+ "masked-book": {
+ $ref: "http://jakub.stoplight-local.com:8080/api/v1/projects/jakub/my-project/nodes/reference/Book.v1.json?deref=bundle&mid=1"
+ },
  street: {
  $ref: "http://marc.stoplight-local.com:8080/api/v1/projects/marc/my-project/nodes/models/Street.v1.json"
  },
+ "masked-street": {
+ $ref: "http://marc.stoplight-local.com:8080/api/v1/projects/marc/my-project/nodes/models/Street.v1.json?mid=1"
+ },
  }
  };
  });
 
-
  it("given explicit endpointUrl, should recognize platform references pointing at that entity", async () => {
  let defaults = createStoplightDefaults({
  cwd,
@@ -54,17 +65,26 @@ describe("Stoplight-specific defaults", () => {
  definitions: {
  "Book.v1": {
  title: "Book"
+ },
+ "Book.v1_m1": {
+ title: "Book mid 1"
  }
  },
  properties: {
  book: {
  $ref: "#/definitions/Book.v1"
  },
+ "masked-book": {
+ $ref: "#/definitions/Book.v1_m1"
+ },
  id: {
  type: "string"
  },
  street: {
- title: "Book"
+ title: "Street"
+ },
+ "masked-street": {
+ title: "Street mid 1"
  }
  }
  });
@@ -87,19 +107,31 @@ describe("Stoplight-specific defaults", () => {
  "Book.v1": {
  title: "Book"
  },
+ "Book.v1_m1": {
+ title: "Book mid 1"
+ },
  "Street.v1": {
- title: "Book"
+ title: "Street"
+ },
+ "Street.v1_m1": {
+ title: "Street mid 1"
  }
  },
  properties: {
  book: {
  $ref: "#/definitions/Book.v1"
  },
+ "masked-book": {
+ $ref: "#/definitions/Book.v1_m1"
+ },
  id: {
  type: "string"
  },
  street: {
  $ref: "#/definitions/Street.v1"
+ },
+ "masked-street": {
+ $ref: "#/definitions/Street.v1_m1"
  }
  }
  });

test/utils/setup-http-mocks-karma.js

@@ -22,9 +22,11 @@ afterEach(() => {
 module.exports = function (mocks) {
  fetchMock.config.warnOnFallback = true;
  for (const [url, body] of Object.entries(mocks)) {
- fetchMock.mock(url.replace(/([^\/])\?/, "$1/?"), {
- status: 200,
- body,
- });
+ for (const actualUrl of new Set([url.replace(/([^\/])\?/, "$1/?"), url.replace(/([^\/])\?/, "$1?")])) {
+ fetchMock.mock(actualUrl, {
+ status: 200,
+ body,
+ });
+ }
  }
 };

test/utils/setup-http-mocks-node.js

@@ -20,7 +20,10 @@ module.exports = function (mocks) {
  .persist(true);
 
  if (Object.keys(query).length > 0) {
- scope = scope.get(pathname.replace(/\/$/, "") + "/").query(query);
+ scope = scope.get(
+ new RegExp(pathname.replace(/\/$/, "").replace(/[-\/\\^$*+?.()|[\]{}]/g, "\\$&") + "\\/?$")
+ )
+ .query(query);
  }
  else {
  scope = scope.get(pathname);