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
43 changes: 22 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "spdx-dependency-track",
"version": "0.1.0",
"packageManager": "yarn@4.1.1",
"packageManager": "yarn@4.9.1",
"private": true,
"license": "MIT",
"scripts": {
Expand All @@ -18,43 +18,44 @@
"ci-build": "./bin/build.sh",
"ci-test": "echo 'no tests yet'",
"ci-lint": "echo 'n/a'",
"ci-format": "biome ci ."
"ci-format": "biome ci .",
"ci-pipeline": "yarn ci-build && yarn ci-test && yarn ci-format && yarn ci-lint"
},
"dependencies": {
"@ariga/atlas": "^0.32.1",
"@dotenvx/dotenvx": "^0.27.2",
"@ariga/atlas": "^0.33.1",
"@dotenvx/dotenvx": "^1.44.0",
"@emotion/cache": "^11.14.0",
"@emotion/react": "^11.14.0",
"@emotion/styled": "^11.14.0",
"@hookform/resolvers": "^3.10.0",
"@mui/icons-material": "^5.17.1",
"@mui/material": "^5.17.1",
"@mui/material-nextjs": "^5.16.14",
"@hookform/resolvers": "^5.0.1",
"@mui/icons-material": "^7.1.0",
"@mui/material": "^7.1.0",
"@mui/material-nextjs": "^7.1.0",
"@nahkies/typescript-fetch-runtime": "^0.20.0",
"@nahkies/typescript-koa-runtime": "^0.20.0",
"@tanstack/react-query": "^5.75.7",
"@tanstack/react-query-devtools": "^5.75.7",
"@tanstack/react-query-next-experimental": "^5.75.7",
"better-sqlite3": "^9.6.0",
"next": "14.2.28",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.56.3",
"semver": "^7.7.1",
"@tanstack/react-query": "^5.76.1",
"@tanstack/react-query-devtools": "^5.76.1",
"@tanstack/react-query-next-experimental": "^5.76.1",
"better-sqlite3": "^11.10.0",
"next": "15.3.2",
"react": "^19.1.0",
"react-dom": "^19.1.0",
"react-hook-form": "^7.56.4",
"semver": "^7.7.2",
"spdx-expression-parse": "^4.0.0",
"zod": "^3.24.4"
},
"devDependencies": {
"@biomejs/biome": "^1.9.4",
"@nahkies/openapi-code-generator": "^0.20.0",
"@types/better-sqlite3": "^7.6.13",
"@types/node": "^22.15.17",
"@types/react": "^18.3.21",
"@types/react-dom": "^18.3.7",
"@types/node": "^22.15.18",
"@types/react": "^19.1.4",
"@types/react-dom": "^19.1.5",
"@types/semver": "^7.7.0",
"@types/spdx-expression-parse": "^3.0.5",
"husky": "^9.1.7",
"lint-staged": "^15.5.2",
"lint-staged": "^16.0.0",
"markdown-toc": "^1.2.0",
"typescript": "^5.8.3"
},
Expand Down
3 changes: 1 addition & 2 deletions src/app/api/licenses/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import {database} from "@/lib/database/database"

export const dynamic = "force-dynamic"

// biome-ignore lint/correctness/noEmptyPattern: <explanation>
export const GET = _GET(async ({}, respond, context) => {
export const GET = _GET(async (respond, context) => {
const licenses = await database.licensesRepository.getLicenses()

return respond.with200().body(licenses)
Expand Down
3 changes: 1 addition & 2 deletions src/app/api/repositories/summaries/route.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import {_GET} from "@/generated/api/repositories/summaries/route"
import {database} from "@/lib/database/database"

// biome-ignore lint/correctness/noEmptyPattern: <explanation>
export const GET = _GET(async ({}, respond, context) => {
export const GET = _GET(async (respond, context) => {
const summaries = await database.repositoryRepository.getRepositorySummaries()
return respond.with200().body(summaries)
})
10 changes: 5 additions & 5 deletions src/app/repositories/[repositoryId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ import {
} from "@mui/material"
import {useQuery} from "@tanstack/react-query"
import Link from "next/link"
import {use} from "react"

export default function RepositoryPage({
params,
}: {params: {repositoryId: string}}) {
}: {params: Promise<{repositoryId: string}>}) {
const {repositoryId} = use(params)
const queryOptions = useQueryOptions()
const summary = useQuery(
queryOptions.getRepositorySummary(params.repositoryId),
)
const scans = useQuery(queryOptions.getRepositoryScans(params.repositoryId))
const summary = useQuery(queryOptions.getRepositorySummary(repositoryId))
const scans = useQuery(queryOptions.getRepositoryScans(repositoryId))

return (
<Stack spacing={2}>
Expand Down
17 changes: 9 additions & 8 deletions src/app/repositories/[repositoryId]/scans/[scanId]/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ import {
TableRow,
Typography,
} from "@mui/material"
import {useMutation, useQuery} from "@tanstack/react-query"
import {useQuery} from "@tanstack/react-query"
import Link from "next/link"
import type React from "react"
import {use} from "react"
import {useState} from "react"

const DependencyName: React.FC<{name: string; version: string}> = ({
Expand All @@ -43,17 +44,16 @@ const DependencyName: React.FC<{name: string; version: string}> = ({

export default function RepositoryScanPage({
params,
}: {params: {repositoryId: string; scanId: string}}) {
}: {params: Promise<{repositoryId: string; scanId: string}>}) {
const {repositoryId, scanId} = use(params)
const [excludePermissive, setExcludePermissive] = useState<boolean>(false)

const queryOptions = useQueryOptions()
const summary = useQuery(
queryOptions.getRepositorySummary(params.repositoryId),
)
const summary = useQuery(queryOptions.getRepositorySummary(repositoryId))
const dependencies = useQuery(
queryOptions.getRepositoryScanDependencies(
params.repositoryId,
params.scanId,
repositoryId,
scanId,
excludePermissive,
),
)
Expand Down Expand Up @@ -90,9 +90,10 @@ export default function RepositoryScanPage({
<TableBody>
{!dependencies.isPending &&
!dependencies.isError &&
// TODO: we get some duplicates here.
dependencies.data.map((dependency) => (
<TableRow
key={dependency.dependencyName + dependency.dependencyVersion}
key={`${dependency.dependencyName}-${dependency.dependencyVersion}`}
>
<TableCell>
<DependencyName
Expand Down
12 changes: 4 additions & 8 deletions src/generated/api/licenses/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,21 @@ import {
KoaRuntimeResponse,
StatusCode,
} from "@nahkies/typescript-koa-runtime/server"
import { Params } from "@nahkies/typescript-koa-runtime/zod"
import { NextRequest } from "next/server"

// /api/licenses
export type GetLicensesResponder = {
with200(): KoaRuntimeResponse<t_License[]>
} & KoaRuntimeResponder

export type GetLicenses = (
params: Params<void, void, void, void>,
respond: GetLicensesResponder,
ctx: { request: NextRequest },
request: NextRequest,
) => Promise<KoaRuntimeResponse<unknown>>

export const _GET =
(implementation: GetLicenses) =>
async (
request: NextRequest,
{ params }: { params: unknown },
): Promise<Response> => {
async (request: NextRequest): Promise<Response> => {
const input = {
params: undefined,
// TODO: this swallows repeated parameters
Expand All @@ -45,7 +41,7 @@ export const _GET =
},
}

const { status, body } = await implementation(input, responder, { request })
const { status, body } = await implementation(responder, request)
.then((it) => it.unpack())
.catch((err) => {
throw KoaRuntimeError.HandlerError(err)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { Params, parseRequestInput } from "@nahkies/typescript-koa-runtime/zod"
import { NextRequest } from "next/server"
import { z } from "zod"

// /api/repositories/{repositoryId}/scans/{scanId}
export type GetRepositoryScanResponder = {
with200(): KoaRuntimeResponse<t_RepositoryScanDependency[]>
} & KoaRuntimeResponder
Expand All @@ -33,7 +34,7 @@ export type GetRepositoryScan = (
void
>,
respond: GetRepositoryScanResponder,
ctx: { request: NextRequest },
request: NextRequest,
) => Promise<KoaRuntimeResponse<unknown>>

const getRepositoryScanParamSchema = z.object({
Expand All @@ -49,12 +50,12 @@ export const _GET =
(implementation: GetRepositoryScan) =>
async (
request: NextRequest,
{ params }: { params: unknown },
{ params }: { params: Promise<unknown> },
): Promise<Response> => {
const input = {
params: parseRequestInput(
getRepositoryScanParamSchema,
params,
await params,
RequestInputType.RouteParam,
),
// TODO: this swallows repeated parameters
Expand All @@ -76,7 +77,7 @@ export const _GET =
},
}

const { status, body } = await implementation(input, responder, { request })
const { status, body } = await implementation(input, responder, request)
.then((it) => it.unpack())
.catch((err) => {
throw KoaRuntimeError.HandlerError(err)
Expand Down
9 changes: 5 additions & 4 deletions src/generated/api/repositories/[repositoryId]/scans/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ import { Params, parseRequestInput } from "@nahkies/typescript-koa-runtime/zod"
import { NextRequest } from "next/server"
import { z } from "zod"

// /api/repositories/{repositoryId}/scans
export type GetRepositoryScansResponder = {
with200(): KoaRuntimeResponse<t_RepositoryScan[]>
} & KoaRuntimeResponder

export type GetRepositoryScans = (
params: Params<t_GetRepositoryScansParamSchema, void, void, void>,
respond: GetRepositoryScansResponder,
ctx: { request: NextRequest },
request: NextRequest,
) => Promise<KoaRuntimeResponse<unknown>>

const getRepositoryScansParamSchema = z.object({ repositoryId: z.string() })
Expand All @@ -35,12 +36,12 @@ export const _GET =
(implementation: GetRepositoryScans) =>
async (
request: NextRequest,
{ params }: { params: unknown },
{ params }: { params: Promise<unknown> },
): Promise<Response> => {
const input = {
params: parseRequestInput(
getRepositoryScansParamSchema,
params,
await params,
RequestInputType.RouteParam,
),
// TODO: this swallows repeated parameters
Expand All @@ -58,7 +59,7 @@ export const _GET =
},
}

const { status, body } = await implementation(input, responder, { request })
const { status, body } = await implementation(input, responder, request)
.then((it) => it.unpack())
.catch((err) => {
throw KoaRuntimeError.HandlerError(err)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ import { Params, parseRequestInput } from "@nahkies/typescript-koa-runtime/zod"
import { NextRequest } from "next/server"
import { z } from "zod"

// /api/repositories/{repositoryId}/summary
export type GetRepositorySummaryResponder = {
with200(): KoaRuntimeResponse<t_RepositorySummary>
} & KoaRuntimeResponder

export type GetRepositorySummary = (
params: Params<t_GetRepositorySummaryParamSchema, void, void, void>,
respond: GetRepositorySummaryResponder,
ctx: { request: NextRequest },
request: NextRequest,
) => Promise<KoaRuntimeResponse<unknown>>

const getRepositorySummaryParamSchema = z.object({ repositoryId: z.string() })
Expand All @@ -35,12 +36,12 @@ export const _GET =
(implementation: GetRepositorySummary) =>
async (
request: NextRequest,
{ params }: { params: unknown },
{ params }: { params: Promise<unknown> },
): Promise<Response> => {
const input = {
params: parseRequestInput(
getRepositorySummaryParamSchema,
params,
await params,
RequestInputType.RouteParam,
),
// TODO: this swallows repeated parameters
Expand All @@ -58,7 +59,7 @@ export const _GET =
},
}

const { status, body } = await implementation(input, responder, { request })
const { status, body } = await implementation(input, responder, request)
.then((it) => it.unpack())
.catch((err) => {
throw KoaRuntimeError.HandlerError(err)
Expand Down
10 changes: 4 additions & 6 deletions src/generated/api/repositories/scan/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,22 @@ import {
import { Params, parseRequestInput } from "@nahkies/typescript-koa-runtime/zod"
import { NextRequest } from "next/server"

// /api/repositories/scan
export type ScanRepositoriesResponder = {
with204(): KoaRuntimeResponse<void>
} & KoaRuntimeResponder

export type ScanRepositories = (
params: Params<void, void, t_ScanRepositoriesBodySchema, void>,
respond: ScanRepositoriesResponder,
ctx: { request: NextRequest },
request: NextRequest,
) => Promise<KoaRuntimeResponse<unknown>>

const scanRepositoriesBodySchema = s_scanRepositoriesJsonRequestBody

export const _POST =
(implementation: ScanRepositories) =>
async (
request: NextRequest,
{ params }: { params: unknown },
): Promise<Response> => {
async (request: NextRequest): Promise<Response> => {
const input = {
params: undefined,
// TODO: this swallows repeated parameters
Expand All @@ -55,7 +53,7 @@ export const _POST =
},
}

const { status, body } = await implementation(input, responder, { request })
const { status, body } = await implementation(input, responder, request)
.then((it) => it.unpack())
.catch((err) => {
throw KoaRuntimeError.HandlerError(err)
Expand Down
12 changes: 4 additions & 8 deletions src/generated/api/repositories/summaries/route.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,25 +9,21 @@ import {
KoaRuntimeResponse,
StatusCode,
} from "@nahkies/typescript-koa-runtime/server"
import { Params } from "@nahkies/typescript-koa-runtime/zod"
import { NextRequest } from "next/server"

// /api/repositories/summaries
export type GetRepositorySummariesResponder = {
with200(): KoaRuntimeResponse<t_RepositorySummary[]>
} & KoaRuntimeResponder

export type GetRepositorySummaries = (
params: Params<void, void, void, void>,
respond: GetRepositorySummariesResponder,
ctx: { request: NextRequest },
request: NextRequest,
) => Promise<KoaRuntimeResponse<unknown>>

export const _GET =
(implementation: GetRepositorySummaries) =>
async (
request: NextRequest,
{ params }: { params: unknown },
): Promise<Response> => {
async (request: NextRequest): Promise<Response> => {
const input = {
params: undefined,
// TODO: this swallows repeated parameters
Expand All @@ -45,7 +41,7 @@ export const _GET =
},
}

const { status, body } = await implementation(input, responder, { request })
const { status, body } = await implementation(responder, request)
.then((it) => it.unpack())
.catch((err) => {
throw KoaRuntimeError.HandlerError(err)
Expand Down
Loading