diff --git a/api/gist.js b/api/gist.js index 7edbd676..049018a4 100644 --- a/api/gist.js +++ b/api/gist.js @@ -1,6 +1,6 @@ // @ts-check -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { isLocaleAvailable } from "../src/translations.js"; import { renderGistCard } from "../src/cards/gist.js"; import { fetchGist } from "../src/fetchers/gist.js"; diff --git a/api/index.js b/api/index.js index d6d6514e..6ea4ffe0 100644 --- a/api/index.js +++ b/api/index.js @@ -13,7 +13,7 @@ import { retrieveSecondaryMessage, } from "../src/common/error.js"; import { parseArray, parseBoolean } from "../src/common/ops.js"; -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { fetchStats } from "../src/fetchers/stats.js"; import { isLocaleAvailable } from "../src/translations.js"; diff --git a/api/pin.js b/api/pin.js index ccadb803..ada95516 100644 --- a/api/pin.js +++ b/api/pin.js @@ -13,7 +13,7 @@ import { retrieveSecondaryMessage, } from "../src/common/error.js"; import { parseBoolean } from "../src/common/ops.js"; -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { fetchRepo } from "../src/fetchers/repo.js"; import { isLocaleAvailable } from "../src/translations.js"; diff --git a/api/top-langs.js b/api/top-langs.js index a2733918..a2e352e7 100644 --- a/api/top-langs.js +++ b/api/top-langs.js @@ -13,7 +13,7 @@ import { retrieveSecondaryMessage, } from "../src/common/error.js"; import { parseArray, parseBoolean } from "../src/common/ops.js"; -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { fetchTopLanguages } from "../src/fetchers/top-languages.js"; import { isLocaleAvailable } from "../src/translations.js"; diff --git a/api/wakatime.js b/api/wakatime.js index f88eeebf..002f9de0 100644 --- a/api/wakatime.js +++ b/api/wakatime.js @@ -1,7 +1,7 @@ // @ts-check import { renderWakatimeCard } from "../src/cards/wakatime.js"; -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { fetchWakatimeStats } from "../src/fetchers/wakatime.js"; import { isLocaleAvailable } from "../src/translations.js"; import { diff --git a/src/cards/gist.js b/src/cards/gist.js index 2db6782f..220f5308 100644 --- a/src/cards/gist.js +++ b/src/cards/gist.js @@ -6,7 +6,7 @@ import { flexLayout, iconWithLabel, createLanguageNode, -} from "../common/utils.js"; +} from "../common/render.js"; import Card from "../common/Card.js"; import { getCardColors } from "../common/color.js"; import { kFormatter, wrapTextMultiline } from "../common/fmt.js"; diff --git a/src/cards/repo.js b/src/cards/repo.js index fbc23231..50556c72 100644 --- a/src/cards/repo.js +++ b/src/cards/repo.js @@ -12,7 +12,7 @@ import { measureText, iconWithLabel, createLanguageNode, -} from "../common/utils.js"; +} from "../common/render.js"; import { repoCardLocales } from "../translations.js"; const ICON_SIZE = 16; diff --git a/src/cards/stats.js b/src/cards/stats.js index 3c81d4b1..5e7bf717 100644 --- a/src/cards/stats.js +++ b/src/cards/stats.js @@ -7,7 +7,7 @@ import { kFormatter } from "../common/fmt.js"; import { I18n } from "../common/I18n.js"; import { icons, rankIcon } from "../common/icons.js"; import { clampValue } from "../common/ops.js"; -import { flexLayout, measureText } from "../common/utils.js"; +import { flexLayout, measureText } from "../common/render.js"; import { statCardLocales, wakatimeCardLocales } from "../translations.js"; const CARD_MIN_WIDTH = 287; diff --git a/src/cards/top-languages.js b/src/cards/top-languages.js index 7d4ac977..4493835f 100644 --- a/src/cards/top-languages.js +++ b/src/cards/top-languages.js @@ -6,7 +6,7 @@ import { createProgressNode } from "../common/createProgressNode.js"; import { formatBytes } from "../common/fmt.js"; import { I18n } from "../common/I18n.js"; import { chunkArray, clampValue, lowercaseTrim } from "../common/ops.js"; -import { flexLayout, measureText } from "../common/utils.js"; +import { flexLayout, measureText } from "../common/render.js"; import { langCardLocales } from "../translations.js"; const DEFAULT_CARD_WIDTH = 300; diff --git a/src/cards/wakatime.js b/src/cards/wakatime.js index 687750e1..811fb243 100644 --- a/src/cards/wakatime.js +++ b/src/cards/wakatime.js @@ -5,7 +5,7 @@ import { getCardColors } from "../common/color.js"; import { createProgressNode } from "../common/createProgressNode.js"; import { I18n } from "../common/I18n.js"; import { clampValue, lowercaseTrim } from "../common/ops.js"; -import { flexLayout } from "../common/utils.js"; +import { flexLayout } from "../common/render.js"; import { wakatimeCardLocales } from "../translations.js"; /** Import language colors. diff --git a/src/common/Card.js b/src/common/Card.js index d32da562..2c2c2e19 100644 --- a/src/common/Card.js +++ b/src/common/Card.js @@ -1,4 +1,4 @@ -import { encodeHTML, flexLayout } from "./utils.js"; +import { encodeHTML, flexLayout } from "./render.js"; class Card { /** diff --git a/src/common/access.js b/src/common/access.js index 5b15dc5d..89151832 100644 --- a/src/common/access.js +++ b/src/common/access.js @@ -1,6 +1,6 @@ // @ts-check -import { renderError } from "./utils.js"; +import { renderError } from "./render.js"; import { blacklist } from "./blacklist.js"; import { whitelist, gistWhitelist } from "./envs.js"; diff --git a/src/common/fmt.js b/src/common/fmt.js index ca86f3cf..a292d002 100644 --- a/src/common/fmt.js +++ b/src/common/fmt.js @@ -1,7 +1,7 @@ // @ts-check import wrap from "word-wrap"; -import { encodeHTML } from "./utils.js"; +import { encodeHTML } from "./render.js"; /** * Retrieves num with suffix k(thousands) precise to given decimal places. diff --git a/src/common/index.js b/src/common/index.js index 12fe563b..e87f04a6 100644 --- a/src/common/index.js +++ b/src/common/index.js @@ -12,4 +12,4 @@ export { encodeHTML, flexLayout, measureText, -} from "./utils.js"; +} from "./render.js"; diff --git a/src/common/utils.js b/src/common/render.js similarity index 100% rename from src/common/utils.js rename to src/common/render.js diff --git a/src/translations.js b/src/translations.js index a5d522cd..d86abc46 100644 --- a/src/translations.js +++ b/src/translations.js @@ -1,6 +1,6 @@ // @ts-check -import { encodeHTML } from "./common/utils.js"; +import { encodeHTML } from "./common/render.js"; /** * Retrieves stat card labels in the available locales. diff --git a/tests/api.test.js b/tests/api.test.js index 967bfae6..a9cc12af 100644 --- a/tests/api.test.js +++ b/tests/api.test.js @@ -13,7 +13,7 @@ import MockAdapter from "axios-mock-adapter"; import api from "../api/index.js"; import { calculateRank } from "../src/calculateRank.js"; import { renderStatsCard } from "../src/cards/stats.js"; -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { CACHE_TTL, DURATIONS } from "../src/common/cache.js"; /** diff --git a/tests/flexLayout.test.js b/tests/flexLayout.test.js index a2bb580d..740d9daa 100644 --- a/tests/flexLayout.test.js +++ b/tests/flexLayout.test.js @@ -1,5 +1,5 @@ import { describe, expect, it } from "@jest/globals"; -import { flexLayout } from "../src/common/utils.js"; +import { flexLayout } from "../src/common/render.js"; describe("flexLayout", () => { it("should work with row & col layouts", () => { diff --git a/tests/gist.test.js b/tests/gist.test.js index 186edbdb..15d86b05 100644 --- a/tests/gist.test.js +++ b/tests/gist.test.js @@ -6,7 +6,7 @@ import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import gist from "../api/gist.js"; import { renderGistCard } from "../src/cards/gist.js"; -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { CACHE_TTL, DURATIONS } from "../src/common/cache.js"; const gist_data = { diff --git a/tests/pin.test.js b/tests/pin.test.js index 126bb2aa..6bc8bff9 100644 --- a/tests/pin.test.js +++ b/tests/pin.test.js @@ -6,7 +6,7 @@ import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import pin from "../api/pin.js"; import { renderRepoCard } from "../src/cards/repo.js"; -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { CACHE_TTL, DURATIONS } from "../src/common/cache.js"; const data_repo = { diff --git a/tests/utils.test.js b/tests/render.test.js similarity index 90% rename from tests/utils.test.js rename to tests/render.test.js index 7e8d3705..026bc9fc 100644 --- a/tests/utils.test.js +++ b/tests/render.test.js @@ -3,9 +3,9 @@ import { describe, expect, it } from "@jest/globals"; import { queryByTestId } from "@testing-library/dom"; import "@testing-library/jest-dom/jest-globals"; -import { encodeHTML, renderError } from "../src/common/utils.js"; +import { encodeHTML, renderError } from "../src/common/render.js"; -describe("Test utils.js", () => { +describe("Test render.js", () => { it("should test encodeHTML", () => { expect(encodeHTML(`hello world<,.#4^&^@%!))`)).toBe( "<html>hello world<,.#4^&^@%!))", diff --git a/tests/top-langs.test.js b/tests/top-langs.test.js index fb065fb7..9ba35a78 100644 --- a/tests/top-langs.test.js +++ b/tests/top-langs.test.js @@ -6,7 +6,7 @@ import axios from "axios"; import MockAdapter from "axios-mock-adapter"; import topLangs from "../api/top-langs.js"; import { renderTopLanguages } from "../src/cards/top-languages.js"; -import { renderError } from "../src/common/utils.js"; +import { renderError } from "../src/common/render.js"; import { CACHE_TTL, DURATIONS } from "../src/common/cache.js"; const data_langs = {