Merge pull request #4 from caido/ef-nodenext

Move to nodenext
caido · Apr 4, 2024 · fef1443 · fef1443
2 parents c4da3cc + feb2072
commit fef1443
Show file tree

Hide file tree

Showing 21 changed files with 84 additions and 84 deletions.
diff --git a/js/src/deserialize/expr.int.ts b/js/src/deserialize/expr.int.ts
@@ -1,10 +1,10 @@
 import type { SyntaxNode } from "@lezer/common";
 import { err, ok, type Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { terms } from "../parser";
-import { type ExprInt, OperatorInt } from "../primitives";
-import { getChildString, isPresent } from "../utils";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import { type ExprInt, OperatorInt } from "../primitives.js";
+import { getChildString, isPresent } from "../utils.js";
 
 export const deserializeIntExpr = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/expr.string.ts b/js/src/deserialize/expr.string.ts
@@ -2,12 +2,12 @@ import type { SyntaxNode } from "@lezer/common";
 import { err } from "neverthrow";
 import type { Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { terms } from "../parser";
-import { type ExprString, OperatorString } from "../primitives";
-import { getChildString, isAbsent, isPresent } from "../utils";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import { type ExprString, OperatorString } from "../primitives.js";
+import { getChildString, isAbsent, isPresent } from "../utils.js";
 
-import { deserializeString } from "./string";
+import { deserializeString } from "./string.js";
 
 export const deserializeStringExpr = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/index.spec.ts b/js/src/deserialize/index.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "vitest";
 
-import { OperatorInt, OperatorString, type Preset } from "../primitives";
+import { OperatorInt, OperatorString, type Preset } from "../primitives.js";
 
-import { deserialize } from "./index";
+import { deserialize } from "./index.js";
 
 const BACKSLASH = "\\";
 

diff --git a/js/src/deserialize/index.ts b/js/src/deserialize/index.ts
@@ -1,12 +1,12 @@
 import { err, ok } from "neverthrow";
 import type { Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { parser, terms } from "../parser";
-import type { Options, Query } from "../primitives";
-import { isAbsent } from "../utils";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { parser, terms } from "../parser/index.js";
+import type { Options, Query } from "../primitives.js";
+import { isAbsent } from "../utils.js";
 
-import { deserializeQuery } from "./query";
+import { deserializeQuery } from "./query.js";
 
 export const deserialize = (
   doc: string,

diff --git a/js/src/deserialize/query.combined.ts b/js/src/deserialize/query.combined.ts
@@ -1,11 +1,11 @@
 import type { SyntaxNode } from "@lezer/common";
 import { err, Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { terms } from "../parser";
-import type { Options, Query } from "../primitives";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import type { Options, Query } from "../primitives.js";
 
-import { deserializeQuery } from "./query";
+import { deserializeQuery } from "./query.js";
 
 export const deserializeCombinedQuery = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/query.group.ts b/js/src/deserialize/query.group.ts
@@ -1,12 +1,12 @@
 import type { SyntaxNode } from "@lezer/common";
 import { ok, type Result } from "neverthrow";
 
-import type { HTTPQLError } from "../errors";
-import { terms } from "../parser";
-import type { Options, Query } from "../primitives";
-import { isPresent } from "../utils";
+import type { HTTPQLError } from "../errors.js";
+import { terms } from "../parser/index.js";
+import type { Options, Query } from "../primitives.js";
+import { isPresent } from "../utils.js";
 
-import { deserializeQuery } from "./query";
+import { deserializeQuery } from "./query.js";
 
 export const deserializeGroupQuery = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/query.preset.ts b/js/src/deserialize/query.preset.ts
@@ -1,13 +1,13 @@
 import type { SyntaxNode } from "@lezer/common";
 import { err, ok, type Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { terms } from "../parser";
-import type { ExprPreset, Options } from "../primitives";
-import { ExprPresetSource } from "../primitives";
-import { getChildString, isPresent } from "../utils";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import type { ExprPreset, Options } from "../primitives.js";
+import { ExprPresetSource } from "../primitives.js";
+import { getChildString, isPresent } from "../utils.js";
 
-import { deserializeString } from "./string";
+import { deserializeString } from "./string.js";
 
 export const deserializePresetQuery = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/query.request.ts b/js/src/deserialize/query.request.ts
@@ -2,13 +2,13 @@ import type { SyntaxNode } from "@lezer/common";
 import { err } from "neverthrow";
 import type { Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { terms } from "../parser";
-import type { ClauseRequest } from "../primitives";
-import { getChildString, isPresent } from "../utils";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import type { ClauseRequest } from "../primitives.js";
+import { getChildString, isPresent } from "../utils.js";
 
-import { deserializeIntExpr } from "./expr.int";
-import { deserializeStringExpr } from "./expr.string";
+import { deserializeIntExpr } from "./expr.int.js";
+import { deserializeStringExpr } from "./expr.string.js";
 
 export const deserializeRequestQuery = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/query.response.ts b/js/src/deserialize/query.response.ts
@@ -1,13 +1,13 @@
 import type { SyntaxNode } from "@lezer/common";
 import { err, type Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { terms } from "../parser";
-import type { ClauseResponse } from "../primitives";
-import { getChildString, isPresent } from "../utils";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import type { ClauseResponse } from "../primitives.js";
+import { getChildString, isPresent } from "../utils.js";
 
-import { deserializeIntExpr } from "./expr.int";
-import { deserializeStringExpr } from "./expr.string";
+import { deserializeIntExpr } from "./expr.int.js";
+import { deserializeStringExpr } from "./expr.string.js";
 
 export const deserializeResponseQuery = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/query.single.ts b/js/src/deserialize/query.single.ts
@@ -1,14 +1,14 @@
 import type { SyntaxNode } from "@lezer/common";
 import { err, type Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { terms } from "../parser";
-import type { Options, Query } from "../primitives";
-import { isPresent } from "../utils";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import type { Options, Query } from "../primitives.js";
+import { isPresent } from "../utils.js";
 
-import { deserializePresetQuery } from "./query.preset";
-import { deserializeRequestQuery } from "./query.request";
-import { deserializeResponseQuery } from "./query.response";
+import { deserializePresetQuery } from "./query.preset.js";
+import { deserializeRequestQuery } from "./query.request.js";
+import { deserializeResponseQuery } from "./query.response.js";
 
 export const deserializeSingleQuery = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/query.string.ts b/js/src/deserialize/query.string.ts
@@ -1,10 +1,10 @@
 import type { SyntaxNode } from "@lezer/common";
 import type { Result } from "neverthrow";
 
-import { type HTTPQLError } from "../errors";
-import { OperatorString, type Query } from "../primitives";
+import { type HTTPQLError } from "../errors.js";
+import { OperatorString, type Query } from "../primitives.js";
 
-import { deserializeString } from "./string";
+import { deserializeString } from "./string.js";
 
 export const deserializeStringQuery = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/query.ts b/js/src/deserialize/query.ts
@@ -1,15 +1,15 @@
 import type { SyntaxNode } from "@lezer/common";
 import { ok, type Result } from "neverthrow";
 
-import type { HTTPQLError } from "../errors";
-import { terms } from "../parser";
-import type { Options, Query } from "../primitives";
-import { isPresent } from "../utils";
+import type { HTTPQLError } from "../errors.js";
+import { terms } from "../parser/index.js";
+import type { Options, Query } from "../primitives.js";
+import { isPresent } from "../utils.js";
 
-import { deserializeCombinedQuery } from "./query.combined";
-import { deserializeGroupQuery } from "./query.group";
-import { deserializeSingleQuery } from "./query.single";
-import { deserializeStringQuery } from "./query.string";
+import { deserializeCombinedQuery } from "./query.combined.js";
+import { deserializeGroupQuery } from "./query.group.js";
+import { deserializeSingleQuery } from "./query.single.js";
+import { deserializeStringQuery } from "./query.string.js";
 
 export const deserializeQuery = (
   node: SyntaxNode,

diff --git a/js/src/deserialize/string.ts b/js/src/deserialize/string.ts
@@ -2,9 +2,9 @@ import type { SyntaxNode } from "@lezer/common";
 import { err, ok } from "neverthrow";
 import type { Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery } from "../errors";
-import { terms } from "../parser";
-import { getChildString, isAbsent } from "../utils";
+import { type HTTPQLError, InvalidQuery } from "../errors.js";
+import { terms } from "../parser/index.js";
+import { getChildString, isAbsent } from "../utils.js";
 
 export const deserializeString = (
   node: SyntaxNode,

diff --git a/js/src/errors.ts b/js/src/errors.ts
@@ -1,5 +1,5 @@
-import type { Maybe } from "./primitives";
-import { isPresent } from "./utils";
+import type { Maybe } from "./primitives.js";
+import { isPresent } from "./utils.js";
 
 export class HTTPQLError extends Error {
   source: Maybe<Error>;

diff --git a/js/src/index.spec.ts b/js/src/index.spec.ts
@@ -2,9 +2,9 @@ import * as fs from "fs";
 
 import { describe, expect, it } from "vitest";
 
-import type { Options } from "./primitives";
+import type { Options } from "./primitives.js";
 
-import { deserialize, serialize } from "./index";
+import { deserialize, serialize } from "./index.js";
 
 describe("httpql", () => {
   const cases = [1, 2, 3, 4, 5];

diff --git a/js/src/index.ts b/js/src/index.ts
@@ -1,4 +1,4 @@
-export * from "./primitives";
-export { deserialize } from "./deserialize";
-export { parser, terms } from "./parser";
-export { serialize } from "./serialize";
+export * from "./primitives.js";
+export { deserialize } from "./deserialize/index.js";
+export { parser, terms } from "./parser/index.js";
+export { serialize } from "./serialize.js";
diff --git a/js/src/parser/index.ts b/js/src/parser/index.ts
@@ -1,2 +1,2 @@
-export * from "./parser";
-export * as terms from "./parser.terms";
+export * from "./parser.js";
+export * as terms from "./parser.terms.js";
diff --git a/js/src/parser/parser.spec.ts b/js/src/parser/parser.spec.ts
@@ -1,8 +1,8 @@
 import { describe, expect, it } from "vitest";
 
-import { getString } from "../utils";
+import { getString } from "../utils.js";
 
-import { parser } from "./parser";
+import { parser } from "./parser.js";
 import {
   And,
   CombinedQuery,
@@ -13,7 +13,7 @@ import {
   RequestQuery,
   SingleQuery,
   StringValue,
-} from "./parser.terms";
+} from "./parser.terms.js";
 
 describe("parser", () => {
   it("Should parse single query", () => {

diff --git a/js/src/parser/parser.ts b/js/src/parser/parser.ts
@@ -1,7 +1,7 @@
 // This file was generated by lezer-generator. You probably shouldn't edit it.
 import { LocalTokenGroup, LRParser } from "@lezer/lr";
 
-import { highlight } from "./props";
+import { highlight } from "./props.js";
 export const parser = LRParser.deserialize({
   version: 14,
   states:

diff --git a/js/src/serialize.ts b/js/src/serialize.ts
@@ -1,6 +1,6 @@
 import { err, ok, Result } from "neverthrow";
 
-import { type HTTPQLError, InvalidQuery, MissingPreset } from "./errors";
+import { type HTTPQLError, InvalidQuery, MissingPreset } from "./errors.js";
 import type {
   ClauseRequest,
   ClauseResponse,
@@ -9,9 +9,9 @@ import type {
   ExprString,
   Options,
   Query,
-} from "./primitives";
-import { ExprPresetSource } from "./primitives";
-import { isAbsent, isPresent } from "./utils";
+} from "./primitives.js";
+import { ExprPresetSource } from "./primitives.js";
+import { isAbsent, isPresent } from "./utils.js";
 
 export const serialize = (
   query: Query,

diff --git a/js/tsconfig.json b/js/tsconfig.json
@@ -1,7 +1,7 @@
 {
   "compilerOptions": {
     "target": "esnext",
-    "module": "esnext",
+    "module": "NodeNext",
 
     "noImplicitAny": true,
     "noUncheckedIndexedAccess": true,
@@ -10,7 +10,7 @@
     "resolveJsonModule": true,
     "noUnusedLocals": true,
 
-    "moduleResolution": "node",
+    "moduleResolution": "NodeNext",
     "esModuleInterop": true,
     "sourceMap": true,
     "useDefineForClassFields": true,