import relative

Author: ianmacartney

packages/convex-helpers/server/validators.test.ts

@@ -29,10 +29,10 @@ import {
 import { type GenericId, v, type Infer, type ObjectType } from "convex/values";
 import { assertType, describe, expect, expectTypeOf, test } from "vitest";
 import { modules } from "./setup.test.js";
-import { getOrThrow } from "convex-helpers/server/relationships";
+import { getOrThrow } from "./relationships.js";
 import { validate } from "../validators.js";
 import { fail } from "assert";
-import { type Expand } from "convex-helpers";
+import { type Expand } from "../index.js";
 
 export const testLiterals = internalQueryGeneric({
   args: {

packages/convex-helpers/validators.ts

@@ -1,26 +1,26 @@
+import type {
+  DataModelFromSchemaDefinition,
+  GenericDatabaseReader,
+  GenericDataModel,
+  SchemaDefinition,
+  TableNamesInDataModel,
+} from "convex/server";
 import type {
   GenericValidator,
   Infer,
   ObjectType,
   OptionalProperty,
   PropertyValidators,
+  Validator,
   VLiteral,
   VObject,
   VOptional,
   VString,
   VUnion,
-  Validator,
 } from "convex/values";
 import { v } from "convex/values";
 import type { Expand } from "./index.js";
-import type {
-  DataModelFromSchemaDefinition,
-  GenericDatabaseReader,
-  GenericDataModel,
-  SchemaDefinition,
-  TableNamesInDataModel,
-} from "convex/server";
-import { assert } from "convex-helpers";
+import { assert } from "./index.js";
 
 /**
  * Helper for defining a union of literals more concisely.

tsconfig.json

@@ -8,8 +8,8 @@
     "allowSyntheticDefaultImports": true,
     "strict": true,
     "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
+    "module": "NodeNext",
+    "moduleResolution": "NodeNext",
     "resolveJsonModule": true,
     "isolatedModules": true,
     "noEmit": true,