diff --git a/app/__test__/ui/json-form.spec.ts b/app/__test__/ui/json-form.spec.ts index 3a2df82..644544b 100644 --- a/app/__test__/ui/json-form.spec.ts +++ b/app/__test__/ui/json-form.spec.ts @@ -139,8 +139,7 @@ describe("json form", () => { required: ["description"] }; - const lib = new Draft2019(schema); - - lib.eachSchema(console.log); + //const lib = new Draft2019(schema); + //lib.eachSchema(console.log); }); }); diff --git a/app/package.json b/app/package.json index 2b56aab..4ae12b1 100644 --- a/app/package.json +++ b/app/package.json @@ -3,7 +3,7 @@ "type": "module", "sideEffects": false, "bin": "./dist/cli/index.js", - "version": "0.7.0-rc.5", + "version": "0.7.0-rc.7", "description": "Lightweight Firebase/Supabase alternative built to run anywhere — incl. Next.js, Remix, Astro, Cloudflare, Bun, Node, AWS Lambda & more.", "homepage": "https://bknd.io", "repository": { diff --git a/app/src/adapter/nextjs/nextjs.adapter.ts b/app/src/adapter/nextjs/nextjs.adapter.ts index f674eb1..adaf853 100644 --- a/app/src/adapter/nextjs/nextjs.adapter.ts +++ b/app/src/adapter/nextjs/nextjs.adapter.ts @@ -1,7 +1,7 @@ import type { IncomingMessage, ServerResponse } from "node:http"; +import { nodeRequestToRequest } from "adapter/utils"; import type { App } from "bknd"; import { type FrameworkBkndConfig, createFrameworkApp } from "bknd/adapter"; -import { nodeRequestToRequest } from "bknd/adapter/node"; import { Api } from "bknd/client"; export type NextjsBkndConfig = FrameworkBkndConfig & { diff --git a/app/src/adapter/node/index.ts b/app/src/adapter/node/index.ts index 41c6aaf..b70a274 100644 --- a/app/src/adapter/node/index.ts +++ b/app/src/adapter/node/index.ts @@ -1,4 +1,3 @@ -import type { IncomingMessage } from "node:http"; import { registries } from "bknd"; import { type LocalAdapterConfig, @@ -8,30 +7,6 @@ import { export * from "./node.adapter"; export { StorageLocalAdapter, type LocalAdapterConfig }; -export function nodeRequestToRequest(req: IncomingMessage): Request { - let protocol = "http"; - try { - protocol = req.headers["x-forwarded-proto"] as string; - } catch (e) {} - const host = req.headers.host; - const url = `${protocol}://${host}${req.url}`; - const headers = new Headers(); - - for (const [key, value] of Object.entries(req.headers)) { - if (Array.isArray(value)) { - headers.append(key, value.join(", ")); - } else if (value) { - headers.append(key, value); - } - } - - const method = req.method || "GET"; - return new Request(url, { - method, - headers - }); -} - export function registerLocalMediaAdapter() { registries.media.register("local", StorageLocalAdapter); } diff --git a/app/src/adapter/utils.ts b/app/src/adapter/utils.ts new file mode 100644 index 0000000..f804133 --- /dev/null +++ b/app/src/adapter/utils.ts @@ -0,0 +1,25 @@ +import type { IncomingMessage } from "node:http"; + +export function nodeRequestToRequest(req: IncomingMessage): Request { + let protocol = "http"; + try { + protocol = req.headers["x-forwarded-proto"] as string; + } catch (e) {} + const host = req.headers.host; + const url = `${protocol}://${host}${req.url}`; + const headers = new Headers(); + + for (const [key, value] of Object.entries(req.headers)) { + if (Array.isArray(value)) { + headers.append(key, value.join(", ")); + } else if (value) { + headers.append(key, value); + } + } + + const method = req.method || "GET"; + return new Request(url, { + method, + headers + }); +} diff --git a/app/src/ui/components/form/json-schema-form/utils.ts b/app/src/ui/components/form/json-schema-form/utils.ts index 9df7848..2ce374d 100644 --- a/app/src/ui/components/form/json-schema-form/utils.ts +++ b/app/src/ui/components/form/json-schema-form/utils.ts @@ -58,7 +58,7 @@ export function unflatten( for (const pointer in obj) { const required = isRequired(pointer, schema); let subschema = lib.getSchema({ pointer }); - console.log("subschema", pointer, subschema, selections); + //console.log("subschema", pointer, subschema, selections); if (!subschema) { throw new Error(`"${pointer}" not found in schema`); }