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
8 changes: 4 additions & 4 deletions e2e/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
const base = require("../jest.base")
const {name: displayName} = require("./package.json")
import base from "../jest.base.js"
import pkg from "./package.json" with {type: "json"}

/**
* @type { import('@jest/types').Config.ProjectConfig }
*/
const config = {
...base,
displayName,
displayName: pkg.name,
}

module.exports = config
export default config
1 change: 1 addition & 0 deletions e2e/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"author": "Michael Nahkies",
"license": "MIT",
"private": true,
"type": "module",
"scripts": {
"clean": "rm -rf ./dist && rm -rf ./src/generated",
"generate": "./scripts/generate.sh",
Expand Down
12 changes: 6 additions & 6 deletions e2e/src/express.entrypoint.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {type NextFunction, type Request, type Response, Router} from "express"
import {bootstrap} from "./generated/server/express"
import {createEscapeHatchesRouter} from "./routes/express/escape-hatches"
import {createMediaTypesRouter} from "./routes/express/media-types"
import {createRequestHeadersRouter} from "./routes/express/request-headers"
import {createValidationRouter} from "./routes/express/validation"
import {createErrorResponse} from "./shared"
import {bootstrap} from "./generated/server/express/index.ts"
import {createEscapeHatchesRouter} from "./routes/express/escape-hatches.ts"
import {createMediaTypesRouter} from "./routes/express/media-types.ts"
import {createRequestHeadersRouter} from "./routes/express/request-headers.ts"
import {createValidationRouter} from "./routes/express/validation.ts"
import {createErrorResponse} from "./shared.ts"

function createRouter() {
const router = Router()
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/generated/client/axios/client.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion e2e/src/generated/client/axios/schemas.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/src/generated/client/fetch/client.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion e2e/src/generated/client/fetch/schemas.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/src/generated/server/express/routes/media-types.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/src/generated/server/express/routes/request-headers.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/src/generated/server/express/routes/validation.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/src/generated/server/koa/routes/media-types.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/src/generated/server/koa/routes/request-headers.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/src/generated/server/koa/routes/validation.ts

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 7 additions & 4 deletions e2e/src/index.axios.spec.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,13 @@
import type {Server} from "node:http"
import {afterAll, beforeAll, describe, expect, it} from "@jest/globals"
import type {AxiosError} from "axios"
import {ApiClient, E2ETestClientServers} from "./generated/client/axios/client"
import type {t_ProductOrder} from "./generated/client/axios/models"
import {startServerFunctions} from "./index"
import {numberBetween} from "./test-utils"
import {
ApiClient,
E2ETestClientServers,
} from "./generated/client/axios/client.ts"
import type {t_ProductOrder} from "./generated/client/axios/models.ts"
import {startServerFunctions} from "./index.ts"
import {numberBetween} from "./test-utils.ts"

describe.each(startServerFunctions)(
"e2e - typescript-axios client against $name server",
Expand Down
11 changes: 7 additions & 4 deletions e2e/src/index.fetch.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
import type {Server} from "node:http"
import {afterAll, beforeAll, describe, expect, it} from "@jest/globals"
import {ApiClient, E2ETestClientServers} from "./generated/client/fetch/client"
import type {t_ProductOrder} from "./generated/client/fetch/models"
import {startServerFunctions} from "./index"
import {numberBetween} from "./test-utils"
import {
ApiClient,
E2ETestClientServers,
} from "./generated/client/fetch/client.ts"
import type {t_ProductOrder} from "./generated/client/fetch/models.ts"
import {startServerFunctions} from "./index.ts"
import {numberBetween} from "./test-utils.ts"

describe.each(startServerFunctions)(
"e2e - typescript-fetch client against $name server",
Expand Down
4 changes: 2 additions & 2 deletions e2e/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {startExpressServer} from "./express.entrypoint"
import {startKoaServer} from "./koa.entrypoint"
import {startExpressServer} from "./express.entrypoint.ts"
import {startKoaServer} from "./koa.entrypoint.ts"

type StartServerFunction = {
name: string
Expand Down
12 changes: 6 additions & 6 deletions e2e/src/koa.entrypoint.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Router from "@koa/router"
import {bootstrap} from "./generated/server/koa"
import {createEscapeHatchesRouter} from "./routes/koa/escape-hatches"
import {createMediaTypesRouter} from "./routes/koa/media-types"
import {createRequestHeadersRouter} from "./routes/koa/request-headers"
import {createValidationRouter} from "./routes/koa/validation"
import {createErrorResponse} from "./shared"
import {bootstrap} from "./generated/server/koa/index.ts"
import {createEscapeHatchesRouter} from "./routes/koa/escape-hatches.ts"
import {createMediaTypesRouter} from "./routes/koa/media-types.ts"
import {createRequestHeadersRouter} from "./routes/koa/request-headers.ts"
import {createValidationRouter} from "./routes/koa/validation.ts"
import {createErrorResponse} from "./shared.ts"

function createRouter() {
const router = new Router()
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/routes/express/escape-hatches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {SkipResponse} from "@nahkies/typescript-express-runtime/server"
import {
createRouter,
type GetEscapeHatchesPlainText,
} from "../../generated/server/express/routes/escape-hatches"
} from "../../generated/server/express/routes/escape-hatches.ts"

const getEscapeHatchesPlainText: GetEscapeHatchesPlainText = async (
_,
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/routes/express/media-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
createRouter,
type PostMediaTypesText,
type PostMediaTypesXWwwFormUrlencoded,
} from "../../generated/server/express/routes/media-types"
} from "../../generated/server/express/routes/media-types.ts"

const postMediaTypesText: PostMediaTypesText = async (
{body},
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/routes/express/request-headers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
createRouter,
type GetHeadersRequest,
type GetHeadersUndeclared,
} from "../../generated/server/express/routes/request-headers"
} from "../../generated/server/express/routes/request-headers.ts"

const getHeadersUndeclared: GetHeadersUndeclared = async (
{headers},
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/routes/express/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
type GetValidationNumbersRandomNumber,
type PostValidationEnums,
type PostValidationOptionalBody,
} from "../../generated/server/express/routes/validation"
} from "../../generated/server/express/routes/validation.ts"

const postValidationEnums: PostValidationEnums = async ({body}, respond) => {
return respond.with200().body(body)
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/routes/koa/escape-hatches.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {SkipResponse} from "@nahkies/typescript-koa-runtime/server"
import {
createRouter,
type GetEscapeHatchesPlainText,
} from "../../generated/server/koa/routes/escape-hatches"
} from "../../generated/server/koa/routes/escape-hatches.ts"

const getEscapeHatchesPlainText: GetEscapeHatchesPlainText = async (
_,
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/routes/koa/media-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
createRouter,
type PostMediaTypesText,
type PostMediaTypesXWwwFormUrlencoded,
} from "../../generated/server/koa/routes/media-types"
} from "../../generated/server/koa/routes/media-types.ts"

const postMediaTypesText: PostMediaTypesText = async (
{body},
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/routes/koa/request-headers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import {
createRouter,
type GetHeadersRequest,
type GetHeadersUndeclared,
} from "../../generated/server/koa/routes/request-headers"
} from "../../generated/server/koa/routes/request-headers.ts"

const getHeadersUndeclared: GetHeadersUndeclared = async (
{headers},
Expand Down
2 changes: 1 addition & 1 deletion e2e/src/routes/koa/validation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
type GetValidationNumbersRandomNumber,
type PostValidationEnums,
type PostValidationOptionalBody,
} from "../../generated/server/koa/routes/validation"
} from "../../generated/server/koa/routes/validation.ts"

const postValidationEnums: PostValidationEnums = async ({body}, respond) => {
return respond.with200().body(body)
Expand Down
6 changes: 5 additions & 1 deletion e2e/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,11 @@
"compilerOptions": {
"composite": false,
"outDir": "./dist",
"rootDir": "./src"
"rootDir": "./src",
"module": "NodeNext",
"target": "ESNext",
"verbatimModuleSyntax": true,
"rewriteRelativeImportExtensions": true
},
"include": ["src/**/*"]
}
1 change: 1 addition & 0 deletions integration-tests/typescript-express/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"author": "Michael Nahkies",
"license": "MIT",
"private": true,
"type": "module",
"scripts": {
"clean": "rm -rf ./dist && rm -rf ./src/generated",
"validate": "tsc -p ./tsconfig.json"
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading