Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions eslint-rules/enforce-zod-v4.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
import path from "path";

// The file that is allowed to import from zod/v4
const configFilePath = path.resolve(import.meta.dirname, "../src/common/config.ts");
const schemasFilePath = path.resolve(import.meta.dirname, "../src/common/schemas.ts");
const configFilePath = path.resolve(import.meta.dirname, "../src/common/config/userConfig.ts");

// Ref: https://eslint.org/docs/latest/extend/custom-rules
export default {
Expand Down
12 changes: 6 additions & 6 deletions eslint-rules/enforce-zod-v4.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ const ruleTester = new RuleTester({
});

describe("enforce-zod-v4", () => {
it("should allow zod/v4 imports in config.ts", () => {
it("should allow zod/v4 imports in userConfig.ts", () => {
ruleTester.run("enforce-zod-v4", rule, {
valid: [
{
filename: resolve("src/common/config.ts"),
filename: resolve("src/common/config/userConfig.ts"),
code: 'import { z } from "zod/v4";\n',
},
{
filename: resolve("src/common/config.ts"),
filename: resolve("src/common/config/userConfig.ts"),
code: 'import * as z from "zod/v4";\n',
},
{
filename: resolve("src/common/config.ts"),
filename: resolve("src/common/config/userConfig.ts"),
code: 'import type { ZodType } from "zod/v4";\n',
},
],
Expand Down Expand Up @@ -63,7 +63,7 @@ describe("enforce-zod-v4", () => {
code: 'import { something } from "some-package";\n',
},
{
filename: resolve("src/common/config.ts"),
filename: resolve("src/common/config/userConfig.ts"),
code: 'import path from "path";\n',
},
{
Expand Down Expand Up @@ -127,7 +127,7 @@ describe("enforce-zod-v4", () => {
ruleTester.run("enforce-zod-v4", rule, {
valid: [
{
filename: resolve("src/common/config.ts"),
filename: resolve("src/common/config/userConfig.ts"),
code: `import { z } from "zod/v4";
import path from "path";
import type { UserConfig } from "./types.js";
Expand Down
75 changes: 0 additions & 75 deletions eslint-rules/no-config-imports.js

This file was deleted.

69 changes: 0 additions & 69 deletions eslint-rules/no-config-imports.test.js

This file was deleted.

7 changes: 0 additions & 7 deletions eslint.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import globals from "globals";
import tseslint from "typescript-eslint";
import eslintPluginPrettierRecommended from "eslint-plugin-prettier/recommended";
import vitestPlugin from "@vitest/eslint-plugin";
import noConfigImports from "./eslint-rules/no-config-imports.js";
import enforceZodV4 from "./eslint-rules/enforce-zod-v4.js";

const testFiles = ["tests/**/*.test.ts", "tests/**/*.ts"];
Expand Down Expand Up @@ -68,19 +67,13 @@ export default defineConfig([
{
files: ["src/**/*.ts"],
plugins: {
"no-config-imports": {
rules: {
"no-config-imports": noConfigImports,
},
},
"enforce-zod-v4": {
rules: {
"enforce-zod-v4": enforceZodV4,
},
},
},
rules: {
"no-config-imports/no-config-imports": "error",
"enforce-zod-v4/enforce-zod-v4": "error",
},
},
Expand Down
4 changes: 2 additions & 2 deletions scripts/generateArguments.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
import { readFileSync, writeFileSync } from "fs";
import { join, dirname } from "path";
import { fileURLToPath } from "url";
import { UserConfigSchema, configRegistry } from "../src/common/config.js";
import { UserConfigSchema, configRegistry } from "../src/common/config/userConfig.js";
import assert from "assert";
import { execSync } from "child_process";
import { OPTIONS } from "../src/common/argsParserOptions.js";
import { OPTIONS } from "../src/common/config/argsParserOptions.js";

const __filename = fileURLToPath(import.meta.url);
const __dirname = dirname(__filename);
Expand Down
2 changes: 1 addition & 1 deletion src/common/atlas/roles.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { UserConfig } from "../config.js";
import type { UserConfig } from "../config/userConfig.js";
import type { DatabaseUserRole } from "./openapi.js";

const readWriteRole: DatabaseUserRole = {
Expand Down
Loading
Loading