Revert "Use fixed DON tools package for circular OAS dereference [deploy-test]"

This reverts commit f602d1f.

Author: pasibun

README.md

@@ -4,7 +4,8 @@ HTTP API voor de tools op `developer.overheid.nl`.
 
 Deze repository bevat de API-laag voor versie 1 van de Tools API: routing, OpenAPI-validatie,
 response headers, foutafhandeling en de koppeling naar de daadwerkelijke businesslogica. Die
-businesslogica staat in `@developer-overheid-nl/don-tools` en wordt los beheerd in `don-tools`.
+businesslogica staat in `@developer-overheid-nl/don-tools-logic` en wordt los beheerd in
+`don-tools-api-v2`.
 
 ## Wat zit hierin?
 
@@ -71,15 +72,15 @@ Mock mode kan ook direct via:
 npm run dev-mock
 ```
 
-## Relatie met `don-tools`
+## Relatie met `don-tools-api-v2`
 
 `don-tools-api` is de v1 HTTP-adapter. De herbruikbare logica zit in
-`@developer-overheid-nl/don-tools`.
+`@developer-overheid-nl/don-tools-logic`.
 
 Zodra de logic package op npm gepubliceerd is, pin deze API op een expliciete packageversie:
 
 ```sh
-npm install @developer-overheid-nl/don-tools@<version>
+npm install @developer-overheid-nl/don-tools-logic@<version>
 ```
 
 Gebruik liever een npm-versie dan een GitHub dependency in CI/CD. Dat voorkomt dat builds afhankelijk
@@ -119,7 +120,7 @@ api/             OpenAPI contract en gegenereerde API interfaces
 app/             NestJS/Fastify bootstrap en OpenAPI middleware
 controllers/     Gegenereerde NestJS controllers
 decorators/      Gegenereerde request decorators
-implementation/  Handgeschreven adapter naar don-tools
+implementation/  Handgeschreven adapter naar don-tools-logic
 models/          Gegenereerde request/response modellen
 test/            Vitest tests
 ```

implementation/tools-api.service.ts

@@ -1,6 +1,6 @@
-import { HttpException, Injectable } from "@nestjs/common";
+import { BadRequestException, Injectable } from "@nestjs/common";
 import type { FastifyReply } from "fastify";
-import type { OasInput, UntrustedClientInput, ValidateInput } from "@developer-overheid-nl/don-tools";
+import type { OasInput, UntrustedClientInput, ValidateInput } from "@developer-overheid-nl/don-tools-logic";
 import { ToolsApi } from "../api";
 import type { ModelsKeycloakClientResult, ModelsLintResult } from "../models";
 
@@ -10,31 +10,15 @@ const setHeaders = (reply: FastifyReply, headers: Record<string, string>) => {
 
 const importEsm = new Function("specifier", "return import(specifier)") as <T>(specifier: string) => Promise<T>;
 const loadLogic = () =>
-  import("@developer-overheid-nl/don-tools").catch(() =>
-    importEsm<typeof import("@developer-overheid-nl/don-tools")>("@developer-overheid-nl/don-tools"),
+  import("@developer-overheid-nl/don-tools-logic").catch(() =>
+    importEsm<typeof import("@developer-overheid-nl/don-tools-logic")>("@developer-overheid-nl/don-tools-logic"),
   );
 
-const getLogicErrorStatus = (error: unknown): number | undefined => {
-  if (typeof error !== "object" || error === null || !("status" in error)) return undefined;
-  const status = (error as { status: unknown }).status;
-  return typeof status === "number" ? status : undefined;
-};
-
-const getLogicErrorMessage = (error: unknown): string => {
-  if (typeof error !== "object" || error === null) {
-    return "Request validation failed";
-  }
-  if (error instanceof Error && error.message.length > 0) return error.message;
-  const detail = "detail" in error ? (error as { detail: unknown }).detail : undefined;
-  if (typeof detail === "string" && detail.length > 0) return detail;
-  return "Request validation failed";
-};
-
-const asHttpException = async <T>(operation: () => Promise<T>): Promise<T> => {
+const asBadRequest = async <T>(operation: () => Promise<T>): Promise<T> => {
   try {
     return await operation();
   } catch (error) {
-    throw new HttpException(getLogicErrorMessage(error), getLogicErrorStatus(error) ?? 400);
+    throw new BadRequestException(error instanceof Error ? error.message : "Request validation failed");
   }
 };
 
@@ -43,52 +27,52 @@ export class ToolsApiService extends ToolsApi {
   async arazzoMarkdown(oasInput: OasInput | undefined, _request: Request, reply: FastifyReply): Promise<string> {
     const { arazzoMarkdown } = await loadLogic();
     reply.type("text/markdown; charset=utf-8");
-    return asHttpException(() => arazzoMarkdown(oasInput as OasInput));
+    return asBadRequest(() => arazzoMarkdown(oasInput as OasInput));
   }
 
   async arazzoMermaid(oasInput: OasInput | undefined, _request: Request, reply: FastifyReply): Promise<string> {
     const { arazzoMermaid } = await loadLogic();
     reply.type("text/plain; charset=utf-8");
-    return asHttpException(() => arazzoMermaid(oasInput as OasInput));
+    return asBadRequest(() => arazzoMermaid(oasInput as OasInput));
   }
 
   async bundleOAS(oasInput: OasInput | undefined, _request: Request, reply: FastifyReply): Promise<void> {
     const { bundleOAS } = await loadLogic();
-    const result = await asHttpException(() => bundleOAS(oasInput as OasInput));
+    const result = await asBadRequest(() => bundleOAS(oasInput as OasInput));
     setHeaders(reply, result.headers);
     return result.rawBody as never;
   }
 
   async convertOAS(oasInput: OasInput | undefined, _request: Request, reply: FastifyReply): Promise<void> {
     const { convertOAS } = await loadLogic();
-    const result = await asHttpException(() => convertOAS(oasInput as OasInput));
+    const result = await asBadRequest(() => convertOAS(oasInput as OasInput));
     setHeaders(reply, result.headers);
     return result.rawBody as never;
   }
 
   async createPostmanCollection(oasInput: OasInput | undefined, _request: Request, reply: FastifyReply): Promise<void> {
     const { createPostmanCollection } = await loadLogic();
-    const result = await asHttpException(() => createPostmanCollection(oasInput as OasInput));
+    const result = await asBadRequest(() => createPostmanCollection(oasInput as OasInput));
     setHeaders(reply, result.headers);
     return result.rawBody as never;
   }
 
   async generateOAS(oasInput: OasInput | undefined, _request: Request, reply: FastifyReply): Promise<object> {
     const { generateOAS } = await loadLogic();
-    const result = await asHttpException(() => generateOAS(oasInput as OasInput));
+    const result = await asBadRequest(() => generateOAS(oasInput as OasInput));
     setHeaders(reply, result.headers);
     return JSON.parse(Buffer.from(result.rawBody).toString("utf8")) as object;
   }
 
   async untrustClient(untrustClientInput: UntrustedClientInput | undefined): Promise<ModelsKeycloakClientResult> {
     const { untrustedClient } = await loadLogic();
-    return asHttpException(() =>
+    return asBadRequest(() =>
       untrustedClient(untrustClientInput as UntrustedClientInput),
     ) as Promise<ModelsKeycloakClientResult>;
   }
 
   async validatorOpenAPIPost(oasInput: OasInput | undefined): Promise<ModelsLintResult> {
     const { validatorOpenAPIPost } = await loadLogic();
-    return asHttpException(() => validatorOpenAPIPost(oasInput as ValidateInput)) as Promise<ModelsLintResult>;
+    return asBadRequest(() => validatorOpenAPIPost(oasInput as ValidateInput)) as Promise<ModelsLintResult>;
   }
 }

package-lock.json

@@ -18,7 +18,7 @@
   "license": "EUPL-1.2",
   "private": true,
   "dependencies": {
-    "@developer-overheid-nl/don-tools": "git+https://github.com/developer-overheid-nl/don-tools.git#d3d54ba222717d070b8d1ddd7689713dd0aaab26",
+    "@developer-overheid-nl/don-tools-logic": "^0.0.2",
     "@fastify/cors": "^11.2.0",
     "@nestjs/common": "^11.1.27",
     "@nestjs/core": "^11.1.27",

package.json

@@ -60,40 +60,6 @@ describe("app", () => {
     expect(JSON.parse(response.body)).toMatchObject({ openapi: "3.1.0" });
   });
 
-  it("returns 422 when an OpenAPI document cannot be fully dereferenced", async () => {
-    const response = await inject({
-      method: "POST",
-      url: "/v1/oas/bundle",
-      payload: {
-        oasBody: JSON.stringify({
-          openapi: "3.0.3",
-          info: { title: "Recursive API", version: "1.0.0" },
-          paths: {},
-          components: {
-            schemas: {
-              Node: {
-                type: "object",
-                properties: {
-                  children: {
-                    type: "array",
-                    items: { $ref: "#/components/schemas/Node" },
-                  },
-                },
-              },
-            },
-          },
-        }),
-      },
-    });
-
-    expect(response.statusCode).toBe(422);
-    expect(response.headers["content-type"]).toContain("application/problem+json");
-    expect(response.json()).toMatchObject({
-      status: 422,
-      title: "De OpenAPI specificatie bevat circulaire verwijzingen en kan niet volledig worden gedereferenced.",
-    });
-  });
-
   it("returns generated OpenAPI directly", async () => {
     const response = await inject({
       method: "POST",

test/app.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, it } from "vitest";
 import { load } from "js-yaml";
-import { convertOAS } from "@developer-overheid-nl/don-tools";
+import { convertOAS } from "@developer-overheid-nl/don-tools-logic";
 
 const toJson = (buffer: Buffer) => JSON.parse(buffer.toString("utf8"));
 const toYaml = (buffer: Buffer) => load(buffer.toString("utf8")) as Record<string, unknown>;
@@ -53,13 +53,7 @@ components:
   });
 
   it("downgrades 3.1 -> 3.0 (JSON)", async () => {
-    const sourceSpec = {
-      openapi: "3.1.0",
-      info: { title: "Test API", version: "1.0.0" },
-      paths: {},
-      webhooks: { onEvent: { post: { responses: { 200: { description: "OK" } } } } },
-      components: { schemas: { Pet: { type: "object", properties: { nickname: { type: ["string", "null"] } } } } },
-    };
+    const sourceSpec = { openapi: "3.1.0", info: { title: "Test API", version: "1.0.0" }, paths: {}, webhooks: { onEvent: { post: { responses: { 200: { description: "OK" } } } } }, components: { schemas: { Pet: { type: "object", properties: { nickname: { type: ["string", "null"] } } } } } };
     const result = await convertOAS({ oasBody: JSON.stringify(sourceSpec), targetVersion: "3.0" });
     const converted = toJson(result.rawBody);
     expect(converted.openapi).toBe("3.0.3");