jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/387235 )
Change subject: Chore: move page marshallers to subdirectories
......................................................................
Chore: move page marshallers to subdirectories
Move page-base, page, and page summary to subdirectories so it's easy to
see which files are relevant to each marshaller. For instance, the page
marshaller has eight files.
Change-Id: I872452bf2cfd2e35c42ff593921e1a80a115571d
---
M src/common/http/page-http-client.ts
M src/common/http/page-summary-http-client.ts
R src/common/marshallers/page-base/page-base-unmarshaller.test.ts
R src/common/marshallers/page-base/page-base-unmarshaller.ts
R src/common/marshallers/page-summary/page-summary-expected.test.json
R src/common/marshallers/page-summary/page-summary-restbase.test.json
R src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts
R src/common/marshallers/page-summary/page-summary-unmarshaller.ts
R src/common/marshallers/page/page-body-expected.test.json
R src/common/marshallers/page/page-body-restbase.test.json
R src/common/marshallers/page/page-expected.test.json
R src/common/marshallers/page/page-lead-expected.test.json
R src/common/marshallers/page/page-lead-restbase.test.json
R src/common/marshallers/page/page-restbase.test.json
R src/common/marshallers/page/page-unmarshaller.test.ts
R src/common/marshallers/page/page-unmarshaller.ts
16 files changed, 43 insertions(+), 40 deletions(-)
Approvals:
Niedzielski: Looks good to me, approved
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/common/http/page-http-client.ts
b/src/common/http/page-http-client.ts
index 0fa40a4..48235e7 100644
--- a/src/common/http/page-http-client.ts
+++ b/src/common/http/page-http-client.ts
@@ -6,7 +6,7 @@
import {
unmarshalPage,
unmarshalPageLead
-} from "../marshallers/page-unmarshaller";
+} from "../marshallers/page/page-unmarshaller";
import { RESTBase } from "../marshallers/restbase";
import HttpResponse from "./http-response";
import { PageRedirect } from "./page-redirect";
diff --git a/src/common/http/page-summary-http-client.ts
b/src/common/http/page-summary-http-client.ts
index e18f0a7..f64f798 100644
--- a/src/common/http/page-summary-http-client.ts
+++ b/src/common/http/page-summary-http-client.ts
@@ -2,7 +2,7 @@
import { PageSummary } from "../models/page/summary";
import { PageTitlePath } from "../models/page/title";
import { RESTBase } from "../marshallers/restbase";
-import { unmarshalPageSummary } from
"../marshallers/page-summary-unmarshaller";
+import { unmarshalPageSummary } from
"../marshallers/page-summary/page-summary-unmarshaller"; // eslint-disable-line
max-len
import HttpResponse from "./http-response";
import { PageRedirect } from "./page-redirect";
import reencodeRESTBaseTitlePath from "./restbase-title-encoder";
diff --git a/src/common/marshallers/page-base-unmarshaller.test.ts
b/src/common/marshallers/page-base/page-base-unmarshaller.test.ts
similarity index 80%
rename from src/common/marshallers/page-base-unmarshaller.test.ts
rename to src/common/marshallers/page-base/page-base-unmarshaller.test.ts
index 9a7ac64..c0d5a97 100644
--- a/src/common/marshallers/page-base-unmarshaller.test.ts
+++ b/src/common/marshallers/page-base/page-base-unmarshaller.test.ts
@@ -1,11 +1,11 @@
import * as assert from "assert";
-import { PageGeolocation } from "../models/page/geolocation";
+import { PageGeolocation } from "../../models/page/geolocation";
+import { RESTBase } from "../restbase";
+import { EXPECTED_ETAG, HEADERS } from "../utils.test";
import {
unmarshalETag,
unmarshalPageGeolocation
} from "./page-base-unmarshaller";
-import { RESTBase } from "./restbase";
-import { EXPECTED_ETAG, HEADERS } from "./utils.test";
describe("page-base-unmarshaller", () => {
it(".unmarshalPageGeolocation() unmarshals", () => {
diff --git a/src/common/marshallers/page-base-unmarshaller.ts
b/src/common/marshallers/page-base/page-base-unmarshaller.ts
similarity index 76%
rename from src/common/marshallers/page-base-unmarshaller.ts
rename to src/common/marshallers/page-base/page-base-unmarshaller.ts
index b87c104..f3cbd2b 100644
--- a/src/common/marshallers/page-base-unmarshaller.ts
+++ b/src/common/marshallers/page-base/page-base-unmarshaller.ts
@@ -1,9 +1,9 @@
-import { ETag } from "../models/etag";
-import { PageGeolocation } from "../models/page/geolocation";
-import { PageTitleID } from "../models/page/title";
-import { IsomorphicHeaders } from "../types/isomorphic-unfetch-extras";
-import { JSONObject } from "../types/json";
-import { RESTBase } from "./restbase";
+import { ETag } from "../../models/etag";
+import { PageGeolocation } from "../../models/page/geolocation";
+import { PageTitleID } from "../../models/page/title";
+import { IsomorphicHeaders } from "../../types/isomorphic-unfetch-extras";
+import { JSONObject } from "../../types/json";
+import { RESTBase } from "../restbase";
export function unmarshalPageTitleID(url: string): PageTitleID {
// Titles themselves may contain slashes, however, RESTBase only understands
diff --git a/src/common/marshallers/page-summary-expected.test.json
b/src/common/marshallers/page-summary/page-summary-expected.test.json
similarity index 100%
rename from src/common/marshallers/page-summary-expected.test.json
rename to src/common/marshallers/page-summary/page-summary-expected.test.json
diff --git a/src/common/marshallers/page-summary-restbase.test.json
b/src/common/marshallers/page-summary/page-summary-restbase.test.json
similarity index 100%
rename from src/common/marshallers/page-summary-restbase.test.json
rename to src/common/marshallers/page-summary/page-summary-restbase.test.json
diff --git a/src/common/marshallers/page-summary-unmarshaller.test.ts
b/src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts
similarity index 90%
rename from src/common/marshallers/page-summary-unmarshaller.test.ts
rename to src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts
index c0abf50..091474e 100644
--- a/src/common/marshallers/page-summary-unmarshaller.test.ts
+++ b/src/common/marshallers/page-summary/page-summary-unmarshaller.test.ts
@@ -1,13 +1,13 @@
import * as assert from "assert";
-import { PageSummary, pageSummaryReviver } from "../models/page/summary";
-import { PageImage, PageThumbnail } from "../models/page/image";
+import { PageSummary, pageSummaryReviver } from "../../models/page/summary";
+import { PageImage, PageThumbnail } from "../../models/page/image";
+import { RESTBase } from "../restbase";
+import { EXPECTED_ETAG, HEADERS, reviveFile } from "../utils.test";
import {
unmarshalPageImage,
unmarshalPageThumbnail,
unmarshalPageSummary
} from "./page-summary-unmarshaller";
-import { RESTBase } from "./restbase";
-import { EXPECTED_ETAG, HEADERS, reviveFile } from "./utils.test";
const NOW = new Date(Date.now()).toString();
@@ -102,7 +102,7 @@
json
});
const expected = reviveFile(
- "./page-summary-expected.test.json",
+ `${__dirname}/page-summary-expected.test.json`,
pageSummaryReviver
);
assert.deepStrictEqual(result, expected);
diff --git a/src/common/marshallers/page-summary-unmarshaller.ts
b/src/common/marshallers/page-summary/page-summary-unmarshaller.ts
similarity index 90%
rename from src/common/marshallers/page-summary-unmarshaller.ts
rename to src/common/marshallers/page-summary/page-summary-unmarshaller.ts
index 2b2b206..441a1d1 100644
--- a/src/common/marshallers/page-summary-unmarshaller.ts
+++ b/src/common/marshallers/page-summary/page-summary-unmarshaller.ts
@@ -1,14 +1,14 @@
-import { PageImage, PageThumbnail } from "../models/page/image";
-import { PageSummary } from "../models/page/summary";
-import { PageTitleID } from "../models/page/title";
-import { IsomorphicHeaders } from "../types/isomorphic-unfetch-extras";
-import { JSONObject } from "../types/json";
+import { PageImage, PageThumbnail } from "../../models/page/image";
+import { PageSummary } from "../../models/page/summary";
+import { PageTitleID } from "../../models/page/title";
+import { IsomorphicHeaders } from "../../types/isomorphic-unfetch-extras";
+import { JSONObject } from "../../types/json";
import {
unmarshalPageTitleID,
unmarshalPageGeolocation,
unmarshalETag
-} from "./page-base-unmarshaller";
-import { RESTBase } from "./restbase";
+} from "../page-base/page-base-unmarshaller";
+import { RESTBase } from "../restbase";
export const unmarshalPageThumbnail = (json: JSONObject): PageThumbnail => {
const type: RESTBase.PageSummary.Thumbnail = json as any;
diff --git a/src/common/marshallers/page-body-expected.test.json
b/src/common/marshallers/page/page-body-expected.test.json
similarity index 100%
rename from src/common/marshallers/page-body-expected.test.json
rename to src/common/marshallers/page/page-body-expected.test.json
diff --git a/src/common/marshallers/page-body-restbase.test.json
b/src/common/marshallers/page/page-body-restbase.test.json
similarity index 100%
rename from src/common/marshallers/page-body-restbase.test.json
rename to src/common/marshallers/page/page-body-restbase.test.json
diff --git a/src/common/marshallers/page-expected.test.json
b/src/common/marshallers/page/page-expected.test.json
similarity index 100%
rename from src/common/marshallers/page-expected.test.json
rename to src/common/marshallers/page/page-expected.test.json
diff --git a/src/common/marshallers/page-lead-expected.test.json
b/src/common/marshallers/page/page-lead-expected.test.json
similarity index 100%
rename from src/common/marshallers/page-lead-expected.test.json
rename to src/common/marshallers/page/page-lead-expected.test.json
diff --git a/src/common/marshallers/page-lead-restbase.test.json
b/src/common/marshallers/page/page-lead-restbase.test.json
similarity index 100%
rename from src/common/marshallers/page-lead-restbase.test.json
rename to src/common/marshallers/page/page-lead-restbase.test.json
diff --git a/src/common/marshallers/page-restbase.test.json
b/src/common/marshallers/page/page-restbase.test.json
similarity index 100%
rename from src/common/marshallers/page-restbase.test.json
rename to src/common/marshallers/page/page-restbase.test.json
diff --git a/src/common/marshallers/page-unmarshaller.test.ts
b/src/common/marshallers/page/page-unmarshaller.test.ts
similarity index 93%
rename from src/common/marshallers/page-unmarshaller.test.ts
rename to src/common/marshallers/page/page-unmarshaller.test.ts
index 2e54284..03940a5 100644
--- a/src/common/marshallers/page-unmarshaller.test.ts
+++ b/src/common/marshallers/page/page-unmarshaller.test.ts
@@ -1,7 +1,7 @@
import * as assert from "assert";
-import { PageImage } from "../models/page/image";
-import { PageNamespace } from "../models/page/namespace";
+import { PageImage } from "../../models/page/image";
+import { PageNamespace } from "../../models/page/namespace";
import {
Page,
PageLead,
@@ -9,8 +9,10 @@
PageSection,
pageReviver,
pageLeadReviver
-} from "../models/page/page";
-import { PageUser, PageUserGender } from "../models/page/user";
+} from "../../models/page/page";
+import { PageUser, PageUserGender } from "../../models/page/user";
+import { RESTBase } from "../restbase";
+import { EXPECTED_ETAG, HEADERS, reviveFile } from "../utils.test";
import {
unmarshalPage,
unmarshalPageLead,
@@ -21,8 +23,6 @@
unmarshalPageUser,
unmarshalPageUserGender
} from "./page-unmarshaller";
-import { RESTBase } from "./restbase";
-import { EXPECTED_ETAG, HEADERS, reviveFile } from "./utils.test";
const NOW = new Date(Date.now()).toString();
@@ -221,7 +221,7 @@
json
});
const expected = reviveFile(
- "./page-lead-expected.test.json",
+ `${__dirname}/page-lead-expected.test.json`,
pageLeadReviver
);
assert.deepStrictEqual(result, expected);
@@ -260,7 +260,7 @@
it("unmarshals a server response", () => {
const json = require("./page-body-restbase.test.json");
const result = unmarshalPageBody(json);
- const expected = reviveFile("./page-body-expected.test.json");
+ const expected = reviveFile(`${__dirname}/page-body-expected.test.json`);
assert.deepStrictEqual(result, expected);
});
});
@@ -322,7 +322,10 @@
headers: HEADERS,
json
});
- const expected = reviveFile("./page-expected.test.json", pageReviver);
+ const expected = reviveFile(
+ `${__dirname}/page-expected.test.json`,
+ pageReviver
+ );
assert.deepStrictEqual(result, expected);
});
});
diff --git a/src/common/marshallers/page-unmarshaller.ts
b/src/common/marshallers/page/page-unmarshaller.ts
similarity index 89%
rename from src/common/marshallers/page-unmarshaller.ts
rename to src/common/marshallers/page/page-unmarshaller.ts
index f19e859..aa070ae 100644
--- a/src/common/marshallers/page-unmarshaller.ts
+++ b/src/common/marshallers/page/page-unmarshaller.ts
@@ -1,15 +1,15 @@
-import { PageImage } from "../models/page/image";
-import { PageTitleID } from "../models/page/title";
-import { Page, PageLead, PageBody, PageSection } from "../models/page/page";
-import { PageUser, PageUserGender } from "../models/page/user";
-import { IsomorphicHeaders } from "../types/isomorphic-unfetch-extras";
-import { JSONArray, JSONObject } from "../types/json";
+import { PageImage } from "../../models/page/image";
+import { PageTitleID } from "../../models/page/title";
+import { Page, PageLead, PageBody, PageSection } from "../../models/page/page";
+import { PageUser, PageUserGender } from "../../models/page/user";
+import { IsomorphicHeaders } from "../../types/isomorphic-unfetch-extras";
+import { JSONArray, JSONObject } from "../../types/json";
import {
unmarshalPageTitleID,
unmarshalPageGeolocation,
unmarshalETag
-} from "./page-base-unmarshaller";
-import { RESTBase } from "./restbase";
+} from "../page-base/page-base-unmarshaller";
+import { RESTBase } from "../restbase";
export const unmarshalPageImageMap = (json: JSONObject): PageImage[] => {
const type: RESTBase.PageSections.ThumbnailMap = json as any;
--
To view, visit https://gerrit.wikimedia.org/r/387235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I872452bf2cfd2e35c42ff593921e1a80a115571d
Gerrit-PatchSet: 2
Gerrit-Project: marvin
Gerrit-Branch: master
Gerrit-Owner: Niedzielski <[email protected]>
Gerrit-Reviewer: Jhernandez <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: Sniedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
