Skip to content

Commit 8e64bf9

Browse files
committed
refactor: move packages to @mojis/versions
1 parent ea823ff commit 8e64bf9

9 files changed

Lines changed: 24 additions & 12 deletions

File tree

packages/adapters/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
"@mojis/moji-compare": "catalog:prod",
4141
"@mojis/parsers": "workspace:*",
4242
"@mojis/schemas": "workspace:*",
43+
"@mojis/versions": "workspace:*",
4344
"arktype": "catalog:prod",
4445
"defu": "catalog:prod",
4546
"fs-extra": "catalog:prod"

packages/adapters/src/handlers/source/metadata.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { EmojiGroup, GroupedEmojiMetadata } from "@mojis/schemas/emojis";
2-
import { extractEmojiVersion, extractUnicodeVersion, isBefore } from "@mojis/internal-utils";
2+
import { isBefore } from "@mojis/internal-utils";
33
import { EMOJI_GROUPS_SCHEMA, GROUPED_BY_GROUP_EMOJI_METADATA_SCHEMA, GROUPED_BY_HEXCODE_EMOJI_METADATA_SCHEMA } from "@mojis/schemas/emojis";
4+
import { extractEmojiVersion, extractUnicodeVersion } from "@mojis/versions";
45
import { type } from "arktype";
56
import { createSourceAdapter } from "../../builders/source-builder/builder";
67
import { joinPath } from "../../utils";

packages/cli/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
"@mojis/internal-utils": "workspace:*",
3737
"@mojis/moji-compare": "catalog:prod",
3838
"@mojis/schemas": "workspace:*",
39+
"@mojis/versions": "workspace:*",
3940
"arktype": "catalog:prod",
4041
"farver": "catalog:prod",
4142
"fs-extra": "catalog:prod",

packages/cli/src/cmd/emoji-versions.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { EmojiSpecRecord } from "@mojis/schemas/emojis";
22
import type { CLIArguments } from "../cli-utils";
3-
import { getAllEmojiVersions, getLatestEmojiVersion } from "@mojis/internal-utils";
3+
import { getAllEmojiVersions, getLatestEmojiVersion } from "@mojis/versions";
44
import { green, red, yellow } from "farver/fast";
55
import { printHelp } from "../cli-utils";
66
import { writeFileSafe } from "../files";

packages/cli/src/cmd/generate.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@ import type { EmojiSpecRecord } from "@mojis/schemas/emojis";
22
import type { CLIArguments } from "../cli-utils";
33
import { runSourceAdapter, sourceHandlers } from "@mojis/adapters";
44
import {
5-
getAllEmojiVersions,
6-
getLatestEmojiVersion,
7-
mapEmojiVersionToUnicodeVersion,
85
OFFICIAL_SUPPORTED_VERSIONS,
96
} from "@mojis/internal-utils";
107
import mojiCompare from "@mojis/moji-compare";
8+
import {
9+
getAllEmojiVersions,
10+
getLatestEmojiVersion,
11+
mapEmojiVersionToUnicodeVersion,
12+
} from "@mojis/versions";
1113
import { green, yellow } from "farver/fast";
1214
import fs from "fs-extra";
1315
import { printHelp } from "../cli-utils";

packages/cli/test/cmd/emoji-versions.test.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
import fs from "node:fs/promises";
33
import path from "node:path";
44
import * as internalUtils from "@mojis/internal-utils";
5+
import * as versions from "@mojis/versions";
56
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
67
import { testdir } from "vitest-testdirs";
78
import * as cliUtils from "../../src/cli-utils";
89
import { runEmojiVersions } from "../../src/cmd/emoji-versions";
910
import * as files from "../../src/files";
1011

1112
vi.mock("@mojis/internal-utils", async () => {
12-
const actual = await vi.importActual("@mojis/internal-utils");
13+
const actual = await vi.importActual("@mojis/versions");
1314
return {
1415
...actual,
1516
getAllEmojiVersions: vi.fn(),
@@ -49,8 +50,8 @@ describe("emoji-versions command", () => {
4950

5051
beforeEach(() => {
5152
vi.resetAllMocks();
52-
vi.mocked(internalUtils.getAllEmojiVersions).mockResolvedValue(mockEmojiVersions);
53-
vi.mocked(internalUtils.getLatestEmojiVersion)
53+
vi.mocked(versions.getAllEmojiVersions).mockResolvedValue(mockEmojiVersions);
54+
vi.mocked(versions.getLatestEmojiVersion)
5455
.mockImplementation((versions, includeDrafts) =>
5556
includeDrafts ? mockLatestVersionWithDrafts : mockLatestVersion);
5657
console.log = vi.fn();
@@ -120,7 +121,7 @@ describe("emoji-versions command", () => {
120121
force: false,
121122
},
122123
});
123-
expect(internalUtils.getLatestEmojiVersion).toHaveBeenCalledWith(mockEmojiVersions, true);
124+
expect(versions.getLatestEmojiVersion).toHaveBeenCalledWith(mockEmojiVersions, true);
124125
expect(console.log).toHaveBeenCalled();
125126
expect(vi.mocked(console.log).mock.calls[0]?.[0]).toContain("15.1");
126127
});
@@ -141,7 +142,7 @@ describe("emoji-versions command", () => {
141142
});
142143

143144
it("should handle case when no versions are found", async () => {
144-
vi.mocked(internalUtils.getLatestEmojiVersion).mockReturnValue(null);
145+
vi.mocked(versions.getLatestEmojiVersion).mockReturnValue(null);
145146
await runEmojiVersions("latest", {
146147
flags: {
147148
_: ["latest"],
@@ -200,7 +201,7 @@ describe("emoji-versions command", () => {
200201
});
201202

202203
it("should handle empty results after filtering", async () => {
203-
vi.mocked(internalUtils.getAllEmojiVersions).mockResolvedValue([
204+
vi.mocked(versions.getAllEmojiVersions).mockResolvedValue([
204205
{
205206
emoji_version: "15.1",
206207
unicode_version: "",

packages/internal-utils/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ export * from "./hexcode";
66
export * from "./predicates";
77
export * from "./shortcodes";
88
export type * from "./types";
9-
export * from "./versions";
109

1110
interface ArkTypeResultError {
1211
success: false;

pnpm-lock.yaml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tsconfig.base.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
"@mojis/internal-utils": ["./packages/internal-utils/src/index.ts"],
1010
"@mojis/internal-utils/shortcodes": ["./packages/internal-utils/src/shortcodes"],
1111
"@mojis/internal-utils/constants": ["./packages/internal-utils/src/constants"],
12+
"@mojis/versions": ["./packages/versions/src/index.ts"],
1213
"@mojis/adapters": ["./packages/adapters/src/index.ts"],
1314
"@mojis/parsers": ["./packages/parsers/src/index.ts"],
1415
"@mojis/schemas": ["./packages/schemas/src/index.ts"],

0 commit comments

Comments
 (0)