Removes .get - Part 1 (#5788)

Łukasz Sobek · jasonLaster · commit 2b34694ae69b · 2018-03-26T19:39:37.000-04:00
diff --git a/docs/dbg.md b/docs/dbg.md
@@ -19,7 +19,7 @@ The actions are bound so you can call them directly!
 
 ```js
 const source = dbg.store.getState().sources.sources.first();
-dbg.actions.selectSource(source.get("id")))
+dbg.actions.selectSource(source.id))
 ```
 
 ### selectors
@@ -39,7 +39,7 @@ The commands are the interface for talking to the debugger server.
 ```js
 const source = dbg.selectors.getSelectedSource();
 dbg.client
-  .setBreakpoint({line: 24, sourceId: source.get("id")})
+  .setBreakpoint({line: 24, sourceId: source.id})
   .then(console.log)
 ```
 
diff --git a/src/actions/file-search.js b/src/actions/file-search.js
@@ -26,7 +26,7 @@ type Match = Object;
 export function doSearch(query: string, editor: Editor) {
   return ({ getState, dispatch }: ThunkArgs) => {
     const selectedSource = getSelectedSource(getState());
-    if (!selectedSource || !selectedSource.get("text")) {
+    if (!selectedSource || !selectedSource.text) {
       return;
     }
 
@@ -75,19 +75,15 @@ export function searchContents(query: string, editor: Object) {
       !query ||
       !editor ||
       !selectedSource ||
-      !selectedSource.get("text") ||
+      !selectedSource.text ||
       !modifiers
     ) {
       return;
     }
 
     const ctx = { ed: editor, cm: editor.codeMirror };
     const _modifiers = modifiers.toJS();
-    const matches = await getMatches(
-      query,
-      selectedSource.get("text"),
-      _modifiers
-    );
+    const matches = await getMatches(query, selectedSource.text, _modifiers);
 
     const res = find(ctx, query, true, _modifiers);
     if (!res) {
diff --git a/src/actions/pause/mapScopes.js b/src/actions/pause/mapScopes.js
@@ -52,8 +52,8 @@ export function mapScopes(scopes: Promise<Scope>, frame: Frame) {
 
     const shouldMapScopes =
       features.mapScopes &&
-      !generatedSourceRecord.get("isWasm") &&
-      !sourceRecord.get("isPrettyPrinted") &&
+      !generatedSourceRecord.isWasm &&
+      !sourceRecord.isPrettyPrinted &&
       !isGeneratedId(frame.location.sourceId);
 
     await dispatch({
diff --git a/src/actions/project-text-search.js b/src/actions/project-text-search.js
@@ -51,12 +51,11 @@ export function searchSources(query: string) {
       .valueSeq()
       .filter(
         source =>
-          !hasPrettySource(getState(), source.get("id")) &&
-          !isThirdParty(source)
+          !hasPrettySource(getState(), source.id) && !isThirdParty(source)
       );
     for (const source of validSources) {
       await dispatch(loadSourceText(source));
-      await dispatch(searchSource(source.get("id"), query));
+      await dispatch(searchSource(source.id, query));
     }
     dispatch(updateSearchStatus(statusType.done));
   };
diff --git a/src/actions/sources/prettyPrint.js b/src/actions/sources/prettyPrint.js
@@ -26,7 +26,7 @@ import type { ThunkArgs } from "../types";
 export function createPrettySource(sourceId: string) {
   return async ({ dispatch, getState, sourceMaps }: ThunkArgs) => {
     const source = getSource(getState(), sourceId);
-    const url = getPrettySourceURL(source.get("url"));
+    const url = getPrettySourceURL(source.url);
     const id = await sourceMaps.generatedToOriginalId(sourceId, url);
 
     const prettySource = {
@@ -39,7 +39,7 @@ export function createPrettySource(sourceId: string) {
     dispatch({ type: "ADD_SOURCE", source: prettySource });
 
     const { code, mappings } = await prettyPrint({ source, url });
-    await sourceMaps.applySourceMap(source.get("id"), url, code, mappings);
+    await sourceMaps.applySourceMap(source.id, url, code, mappings);
 
     const loadedPrettySource = {
       ...prettySource,
@@ -84,7 +84,7 @@ export function togglePrettyPrint(sourceId: string) {
     );
 
     const selectedLocation = getSelectedLocation(getState());
-    const url = getPrettySourceURL(source.get("url"));
+    const url = getPrettySourceURL(source.url);
     const prettySource = getSourceByURL(getState(), url);
 
     const options = {};
diff --git a/src/actions/sources/select.js b/src/actions/sources/select.js
@@ -56,7 +56,7 @@ export function selectSourceURL(
   return async ({ dispatch, getState }: ThunkArgs) => {
     const source = getSourceByURL(getState(), url);
     if (source) {
-      const sourceId = source.get("id");
+      const sourceId = source.id;
       const location = createLocation({ ...options.location, sourceId });
       // flow is unable to comprehend that if an options.location object
       // exists, that we have a valid Location object, and if it doesnt,
@@ -131,7 +131,7 @@ export function selectLocation(location: Location) {
       isMinified(selectedSource)
     ) {
       await dispatch(togglePrettyPrint(sourceId));
-      dispatch(closeTab(source.get("url")));
+      dispatch(closeTab(source.url));
     }
 
     dispatch(setSymbols(sourceId));
diff --git a/src/actions/sources/tests/loadSource.spec.js b/src/actions/sources/tests/loadSource.spec.js
@@ -15,12 +15,12 @@ describe("loadSourceText", async () => {
     await dispatch(actions.loadSourceText(I.Map({ id: "foo1" })));
     const fooSource = selectors.getSource(getState(), "foo1");
 
-    expect(fooSource.get("text").indexOf("return foo1")).not.toBe(-1);
+    expect(fooSource.text.indexOf("return foo1")).not.toBe(-1);
 
     await dispatch(actions.loadSourceText(I.Map({ id: "foo2" })));
     const foo2Source = selectors.getSource(getState(), "foo2");
 
-    expect(foo2Source.get("text").indexOf("return foo2")).not.toBe(-1);
+    expect(foo2Source.text.indexOf("return foo2")).not.toBe(-1);
   });
 
   it("loads two sources w/ one request", async () => {
@@ -47,7 +47,7 @@ describe("loadSourceText", async () => {
     resolve({ source: "yay", contentType: "text/javascript" });
     await loading;
     expect(count).toEqual(1);
-    expect(selectors.getSource(getState(), id).get("text")).toEqual("yay");
+    expect(selectors.getSource(getState(), id).text).toEqual("yay");
   });
 
   it("doesn't re-load loaded sources", async () => {
@@ -72,7 +72,7 @@ describe("loadSourceText", async () => {
     source = selectors.getSource(getState(), id);
     await dispatch(actions.loadSourceText(source));
     expect(count).toEqual(1);
-    expect(selectors.getSource(getState(), id).get("text")).toEqual("yay");
+    expect(selectors.getSource(getState(), id).text).toEqual("yay");
   });
 
   it("should cache subsequent source text loads", async () => {
diff --git a/src/actions/sources/tests/select.spec.js b/src/actions/sources/tests/select.spec.js
@@ -40,7 +40,7 @@ describe("sources", () => {
     expect(selectedSource.get("id")).toEqual("foo1");
 
     const source = getSource(getState(), selectedSource.get("id"));
-    expect(source.get("id")).toEqual("foo1");
+    expect(source.id).toEqual("foo1");
 
     await waitForState(
       store,
@@ -58,7 +58,7 @@ describe("sources", () => {
 
     expect(getSelectedSource(getState())).toBe(undefined);
     await dispatch(actions.newSource(baseSource));
-    expect(getSelectedSource(getState()).get("url")).toBe(baseSource.url);
+    expect(getSelectedSource(getState()).url).toBe(baseSource.url);
   });
 
   it("should open a tab for the source", async () => {
diff --git a/src/components/Editor/EditorMenu.js b/src/components/Editor/EditorMenu.js
@@ -70,7 +70,7 @@ function getMenuItems(
   const blackboxKey = L10N.getStr("sourceFooter.blackbox.accesskey");
   const blackboxLabel = L10N.getStr("sourceFooter.blackbox");
   const unblackboxLabel = L10N.getStr("sourceFooter.unblackbox");
-  const toggleBlackBoxLabel = selectedSource.get("isBlackBoxed")
+  const toggleBlackBoxLabel = selectedSource.isBlackBoxed
     ? unblackboxLabel
     : blackboxLabel;
   const copyFunctionKey = L10N.getStr("copyFunction.accesskey");
@@ -101,7 +101,7 @@ function getMenuItems(
     label: copyToClipboardLabel,
     accesskey: copyToClipboardKey,
     disabled: false,
-    click: () => copyToTheClipboard(selectedSource.get("text"))
+    click: () => copyToTheClipboard(selectedSource.text)
   };
 
   const copySourceItem = {
@@ -117,7 +117,7 @@ function getMenuItems(
     label: copySourceUri2Label,
     accesskey: copySourceUri2Key,
     disabled: false,
-    click: () => copyToTheClipboard(getRawSourceURL(selectedSource.get("url")))
+    click: () => copyToTheClipboard(getRawSourceURL(selectedSource.url))
   };
 
   const sourceId = selectedSource.get("id");
diff --git a/src/components/Editor/Footer.js b/src/components/Editor/Footer.js
@@ -74,7 +74,7 @@ class SourceFooter extends PureComponent<Props> {
       return;
     }
 
-    const blackboxed = selectedSource.get("isBlackBoxed");
+    const blackboxed = selectedSource.isBlackBoxed;
 
     const tooltip = L10N.getStr("sourceFooter.blackbox");
     const type = "black-box";
@@ -98,7 +98,7 @@ class SourceFooter extends PureComponent<Props> {
   blackBoxSummary() {
     const { selectedSource } = this.props;
 
-    if (!selectedSource || !selectedSource.get("isBlackBoxed")) {
+    if (!selectedSource || !selectedSource.isBlackBoxed) {
       return;
     }
 
diff --git a/src/components/Editor/Tab.js b/src/components/Editor/Tab.js
@@ -112,7 +112,7 @@ class Tab extends PureComponent<Props> {
         item: {
           ...tabMenuItems.copyToClipboard,
           disabled: selectedSource.get("id") !== tab,
-          click: () => copyToTheClipboard(sourceTab.get("text"))
+          click: () => copyToTheClipboard(sourceTab.text)
         }
       },
       {
@@ -157,7 +157,7 @@ class Tab extends PureComponent<Props> {
     } = this.props;
     const src = source.toJS();
     const filename = getFilename(src);
-    const sourceId = source.get("id");
+    const sourceId = source.id;
     const active =
       selectedSource &&
       sourceId == selectedSource.get("id") &&
@@ -167,7 +167,7 @@ class Tab extends PureComponent<Props> {
 
     function onClickClose(e) {
       e.stopPropagation();
-      closeTab(source.get("url"));
+      closeTab(source.url);
     }
 
     function handleTabClick(e) {
@@ -176,7 +176,7 @@ class Tab extends PureComponent<Props> {
 
       // Accommodate middle click to close tab
       if (e.button === 1) {
-        return closeTab(source.get("url"));
+        return closeTab(source.url);
       }
 
       return selectSource(sourceId);
@@ -212,7 +212,7 @@ export default connect(
     return {
       tabSources: getSourcesForTabs(state),
       selectedSource: selectedSource,
-      sourceMetaData: getSourceMetaData(state, source.get("id")),
+      sourceMetaData: getSourceMetaData(state, source.id),
       activeSearch: getActiveSearch(state)
     };
   },
diff --git a/src/components/Editor/Tabs.js b/src/components/Editor/Tabs.js
@@ -98,7 +98,7 @@ class Tabs extends PureComponent<Props, State> {
     const hiddenTabs = getHiddenTabs(tabSources, sourceTabEls);
 
     if (isVisible() && hiddenTabs.indexOf(selectedSource) !== -1) {
-      return moveTab(selectedSource.get("url"), 0);
+      return moveTab(selectedSource.url, 0);
     }
 
     this.setState({ hiddenTabs });
@@ -114,7 +114,7 @@ class Tabs extends PureComponent<Props, State> {
     if (isPretty(source)) {
       return "prettyPrint";
     }
-    if (source.get("isBlackBoxed")) {
+    if (source.isBlackBoxed) {
       return "blackBox";
     }
     return "file";
@@ -124,9 +124,9 @@ class Tabs extends PureComponent<Props, State> {
     const { selectSource } = this.props;
     const filename = getFilename(source.toJS());
 
-    const onClick = () => selectSource(source.get("id"));
+    const onClick = () => selectSpecificSource(source.id);
     return (
-      <li key={source.get("id")} onClick={onClick}>
+      <li key={source.id} onClick={onClick}>
         <img className={`dropdown-icon ${this.getIconClass(source)}`} />
         {filename}
       </li>
diff --git a/src/components/Editor/index.js b/src/components/Editor/index.js
@@ -331,7 +331,7 @@ class Editor extends PureComponent<Props, State> {
     if (
       (ev.ctrlKey && ev.button === 0) ||
       ev.which === 3 ||
-      (selectedSource && selectedSource.get("isBlackBoxed")) ||
+      (selectedSource && selectedSource.isBlackBoxed) ||
       !selectedSource
     ) {
       return;
diff --git a/src/components/SecondaryPanes/Breakpoints.js b/src/components/SecondaryPanes/Breakpoints.js
@@ -70,7 +70,7 @@ function getBreakpointFilename(source) {
 
 function renderSourceLocation(source, line, column) {
   const filename = getBreakpointFilename(source);
-  const isWasm = source && source.get("isWasm");
+  const isWasm = source && source.isWasm;
   const columnVal = features.columnBreakpoints && column ? `:${column}` : "";
   const bpLocation = isWasm
     ? `0x${line.toString(16).toUpperCase()}`
@@ -199,9 +199,7 @@ const _getBreakpoints = createSelector(
   (breakpoints, sources, frame, why) =>
     breakpoints
       .map(bp => updateLocation(sources, frame, why, bp))
-      .filter(
-        bp => bp.location.source && !bp.location.source.get("isBlackBoxed")
-      )
+      .filter(bp => bp.location.source && !bp.location.source.isBlackBoxed)
 );
 
 export default connect(
diff --git a/src/test/mochitest/browser_dbg-editor-highlight.js b/src/test/mochitest/browser_dbg-editor-highlight.js
@@ -40,6 +40,6 @@ add_task(async function() {
   is(getSource(getState(), simple1.id).get("loadedState"), "loading");
 
   await waitForSelectedSource(dbg, "simple1.js");
-  ok(getSource(getState(), simple1.id).get("text"));
+  ok(getSource(getState(), simple1.id).text);
   assertHighlightLocation(dbg, "simple1.js", 6);
 });
diff --git a/src/test/mochitest/head.js b/src/test/mochitest/head.js
@@ -259,7 +259,7 @@ function waitForSelectedSource(dbg, url) {
       }
 
       const newSource = findSource(dbg, url, { silent: true });
-      if (newSource.id != source.get("id")) {
+      if (newSource.id != source.id) {
         return false;
       }
 
@@ -314,7 +314,7 @@ function assertDebugLine(dbg, line) {
   const lineInfo = getCM(dbg).lineInfo(line - 1);
   const source = dbg.selectors.getSelectedSource(dbg.getState());
   if (source && source.get("loadedState") == "loading") {
-    const url = source.get("url");
+    const url = source.url;
     ok(
       false,
       `Looks like the source ${url} is still loading. Try adding waitForLoadedSource in the test.`
@@ -466,7 +466,7 @@ function isSelectedFrameSelected(dbg, state) {
     return false;
   }
 
-  return source.get("id") == sourceId;
+  return source.id == sourceId;
 }
 
 function createDebuggerContext(toolbox) {
diff --git a/src/utils/isMinified.js b/src/utils/isMinified.js
@@ -13,8 +13,8 @@ const CHARACTER_LIMIT = 250;
 const _minifiedCache = new Map();
 
 export function isMinified(source: SourceRecord) {
-  if (_minifiedCache.has(source.get("id"))) {
-    return _minifiedCache.get(source.get("id"));
+  if (_minifiedCache.has(source.id)) {
+    return _minifiedCache.get(source.id);
   }
 
   let text = source.get("text");
diff --git a/src/utils/quick-open.js b/src/utils/quick-open.js
@@ -111,7 +111,7 @@ export function formatSources(sources: SourcesMap): Array<QuickOpenResult> {
     .valueSeq()
     .filter(source => !isPretty(source))
     .map(source => {
-      const sourcePath = getSourcePath(source.get("url"));
+      const sourcePath = getSourcePath(source.url);
       return {
         value: sourcePath,
         title: sourcePath
@@ -121,8 +121,8 @@ export function formatSources(sources: SourcesMap): Array<QuickOpenResult> {
         subtitle: endTruncateStr(sourcePath, 100)
           .replace(sourcePath.split("/").pop(), "")
           .slice(1, -1),
-        id: source.get("id"),
-        url: source.get("url")
+        id: source.id,
+        url: source.url
       };
     })
     .filter(({ value }) => value != "")
diff --git a/src/utils/source.js b/src/utils/source.js
diff --git a/src/utils/tabs.js b/src/utils/tabs.js
diff --git a/src/utils/tests/source.spec.js b/src/utils/tests/source.spec.js
diff --git a/src/workers/pretty-print/index.js b/src/workers/pretty-print/index.js

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ class SourceFooter extends PureComponent<Props> {`
`74`	`74`	`return;`
`75`	`75`	`}`
`76`	`76`
`77`		`- const blackboxed = selectedSource.get("isBlackBoxed");`
	`77`	`+ const blackboxed = selectedSource.isBlackBoxed;`
`78`	`78`
`79`	`79`	`const tooltip = L10N.getStr("sourceFooter.blackbox");`
`80`	`80`	`const type = "black-box";`
`@@ -98,7 +98,7 @@ class SourceFooter extends PureComponent<Props> {`
`98`	`98`	`blackBoxSummary() {`
`99`	`99`	`const { selectedSource } = this.props;`
`100`	`100`
`101`		`- if (!selectedSource \|\| !selectedSource.get("isBlackBoxed")) {`
	`101`	`+ if (!selectedSource \|\| !selectedSource.isBlackBoxed) {`
`102`	`102`	`return;`
`103`	`103`	`}`
`104`	`104`