Skip to content

Commit

Permalink
feat: rework module utils (#47)
Browse files Browse the repository at this point in the history
  • Loading branch information
SoaresMG authored Aug 9, 2024
1 parent 4f6250c commit 9c2f7c5
Show file tree
Hide file tree
Showing 20 changed files with 29 additions and 24 deletions.
5 changes: 5 additions & 0 deletions .changeset/lemon-pans-listen.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"nuxt-mock-server": minor
---

Rework module utils
10 changes: 5 additions & 5 deletions src/module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
import { readPackageJSON } from "pkg-types";
import { setupDevToolsUI } from "./devtools";
import type { ModulePackageInfo } from "./runtime/types";
import { DEFAULT_PRESET } from "./runtime/server/utils/constants";
import { DEFAULT_PRESET } from "./runtime/utils";

const logger = useLogger("@nuxt/mock-server");

Expand Down Expand Up @@ -84,24 +84,24 @@ export {};
if (options.devtools) {
addServerHandler({
route: "/__mock-server__/presets",
handler: resolver.resolve("./runtime/server/routes/__mock-server__/presets"),
handler: resolver.resolve("./runtime/server/routes/presets"),
});

addServerHandler({
route: "/__mock-server__/meta",
handler: resolver.resolve("./runtime/server/routes/__mock-server__/meta"),
handler: resolver.resolve("./runtime/server/routes/meta"),
});

addServerHandler({
route: "/__mock-server__/set-preset",
method: "POST",
handler: resolver.resolve("./runtime/server/routes/__mock-server__/set-preset.post"),
handler: resolver.resolve("./runtime/server/routes/set-preset.post"),
});

addServerHandler({
route: "/__mock-server__/delete-preset",
method: "POST",
handler: resolver.resolve("./runtime/server/routes/__mock-server__/delete-preset.post"),
handler: resolver.resolve("./runtime/server/routes/delete-preset.post"),
});

setupDevToolsUI(nuxt, resolver);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { FormatterDataType, MockRequest, MockEntry, MockResponse } from "../../types";
import type { FormatterDataType, MockRequest, MockEntry, MockResponse } from "../types";
import type { BaseFormatter, OnErrorCallback } from "./base";
import { JsonFormatter } from "./json-formatter";
import { TextFormatter } from "./text-formatter";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { resolve } from "node:path";
import { mkdir, writeFile, stat, readFile } from "node:fs/promises";
import superjson from "superjson";
import type { MockRequest, MockEntry, MockResponse, MockMeta } from "../../types";
import { MAIN_HEADER_KEY, MAIN_HEADER_VALUE } from "../utils/constants";
import type { MockRequest, MockEntry, MockResponse, MockMeta } from "../types";
import { MAIN_HEADER_KEY, MAIN_HEADER_VALUE } from "../utils";

async function exists(path: string) {
try {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { MockEntry, MockRequest } from "../../types";
import type { MockEntry, MockRequest } from "../types";
import { Formatter } from "./base";

export class JsonFormatter extends Formatter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { MockEntry, MockRequest } from "../../types";
import type { MockEntry, MockRequest } from "../types";
import { TextFormatter } from "./text-formatter";

export class StreamFormatter extends TextFormatter {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { MockEntry, MockRequest } from "../../types";
import type { MockEntry, MockRequest } from "../types";
import { Formatter } from "./base";

export class TextFormatter extends Formatter {
Expand Down
2 changes: 1 addition & 1 deletion src/runtime/server/handlers/define-preset-handler.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { EventHandler, EventHandlerRequest, H3Event } from "h3";
import { DEFAULT_PRESET, PRESET_COOKIE_KEY } from "../utils/constants";
import { DEFAULT_PRESET, PRESET_COOKIE_KEY } from "../../utils";
import { defineEventHandler, getCookie, setCookie } from "#imports";

export interface PresetHandlerOptions {
Expand Down
4 changes: 2 additions & 2 deletions src/runtime/server/plugins/mock-processor.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import consola from "consola";
import { AutoFormatter } from "../formatters";
import { AutoFormatter } from "../../formatters";
import type { FormatterDataType } from "../../types";
import { MAIN_HEADER_KEY, MAIN_HEADER_VALUE } from "../utils/constants";
import { MAIN_HEADER_KEY, MAIN_HEADER_VALUE } from "../../utils";
import { defineErrorHandler, definePresetHandler } from "../handlers";
import { defineNitroPlugin, useRuntimeConfig } from "#imports";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
import { defineEventHandler, deleteCookie, getQuery, setCookie } from "h3";
import { PRESET_COOKIE_KEY } from "../../utils/constants";
import { getAllMockPresets } from "../../utils";
import { deletePreset } from "../../utils/delete-preset";
import { PRESET_COOKIE_KEY, getPresets, deletePreset } from "../../utils";

export default defineEventHandler(async (event) => {
const query = getQuery(event);
Expand All @@ -10,7 +8,7 @@ export default defineEventHandler(async (event) => {
return;
}

const presets = await getAllMockPresets(event);
const presets = await getPresets(event);

const deletingPreset = presets.find(preset => preset.name === query.preset);
const newPreset = presets.find(preset => preset.name !== query.preset);
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { defineEventHandler, getQuery, setCookie } from "h3";
import { PRESET_COOKIE_KEY } from "../../utils/constants";
import { PRESET_COOKIE_KEY } from "../../utils";

export default defineEventHandler((event) => {
const query = getQuery(event);
Expand Down
2 changes: 0 additions & 2 deletions src/runtime/server/utils/index.ts

This file was deleted.

File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import fs from "node:fs/promises";
import type { H3Event } from "h3";
import consola from "consola";
import type { MockPreset } from "../../types";
import type { MockPreset } from "../types";
import { useRuntimeConfig } from "#imports";

export async function deletePreset(event: H3Event, preset: MockPreset): Promise<boolean> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import fs from "node:fs/promises";
import type { H3Event } from "h3";
import consola from "consola";
import { AutoFormatter } from "../formatters";
import type { MockPreset } from "../../types";
import type { MockPreset } from "../types";
import { notUndefinedOrNull } from "./not-undefined";
import { useRuntimeConfig } from "#imports";

Expand All @@ -12,7 +12,7 @@ const getEntry = (dirent: Dirent) => {
return formatter.getEntry(dirent.name);
};

export async function getAllMockPresets(event: H3Event) {
export async function getPresets(event: H3Event) {
const { mockServer } = useRuntimeConfig(event);

if (!mockServer || !mockServer.enabled || !mockServer.pathMatch || !mockServer.mockDir) {
Expand Down
4 changes: 4 additions & 0 deletions src/runtime/utils/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export * from "./not-undefined";
export * from "./get-presets";
export * from "./constants";
export * from "./delete-preset";
File renamed without changes.

0 comments on commit 9c2f7c5

Please sign in to comment.