@valbuild/server 0.63.2 → 0.64.0

package/dist/declarations/src/{createValApiRouter.d.ts → ValRouter.d.ts}

@@ -113,7 +113,7 @@ type ValServerOverrides = Partial<{
      */
     disableCache?: boolean;
 }>;
-export declare function createValServer(valModules: ValModules, route: string, opts: ValApiOptions, callbacks: ValServerCallbacks, formatter?: (code: string, filePath: string) => string): Promise<ValServer>;
+export declare function createValServer(valModules: ValModules, route: string, opts: ValApiOptions, callbacks: ValServerCallbacks, formatter?: (code: string, filePath: string) => string | Promise<string>): Promise<ValServer>;
 export declare function safeReadGit(cwd: string): Promise<{
     commit?: string;
     branch?: string;

package/dist/declarations/src/ValServer.d.ts

@@ -1,12 +1,12 @@
 /// <reference types="node" />
-import { ApiCommitResponse, ApiGetPatchResponse, ApiPostValidationErrorResponse, ApiTreeResponse, ApiDeletePatchResponse, ValModules, ApiSchemaResponse } from "@valbuild/core";
-import { VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValCookies, ValServerError, ValServerJsonResult, ValServerRedirectResult, ValServerResult, ValServerResultCookies, ValSession } from "@valbuild/shared/internal";
+import { ValModules } from "@valbuild/core";
+import { Api, ServerOf } from "@valbuild/shared/internal";
 import { z } from "zod";
 export type ValServerOptions = {
     route: string;
     valEnableRedirectUrl?: string;
     valDisableRedirectUrl?: string;
-    formatter?: (code: string, filePath: string) => string;
+    formatter?: (code: string, filePath: string) => string | Promise<string>;
     valBuildUrl?: string;
     valSecret?: string;
     apiKey?: string;
@@ -15,7 +15,6 @@ export type ValServerOptions = {
 export type ValServerConfig = ValServerOptions & ({
     mode: "fs";
     cwd: string;
-    formatter?: (code: string, filePath: string) => string;
 } | {
     mode: "http";
     valContentUrl: string;
@@ -25,62 +24,8 @@ export type ValServerConfig = ValServerOptions & ({
     branch: string;
     root?: string;
 });
-export declare class ValServer {
-    readonly valModules: ValModules;
-    private readonly options;
-    readonly callbacks: ValServerCallbacks;
-    private serverOps;
-    constructor(valModules: ValModules, options: ValServerConfig, callbacks: ValServerCallbacks);
-    enable(query: {
-        redirect_to?: string;
-    }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;
-    disable(query: {
-        redirect_to?: string;
-    }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;
-    authorize(query: {
-        redirect_to?: string;
-    }): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_ENABLE_COOKIE_NAME>>;
-    callback(query: {
-        code?: string;
-        state?: string;
-    }, cookies: ValCookies<"val_state">): Promise<ValServerRedirectResult<"val_state" | "val_session" | "val_enable">>;
-    session(cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<ValSession>>;
-    private consumeCode;
-    private getAuthorizeUrl;
-    private getAppErrorUrl;
-    getAuth(cookies: Partial<Record<"val_session", string>>): {
-        error: string;
-    } | {
-        id: string;
-        error?: undefined;
-    } | {
-        error: null;
-        id: null;
-    };
-    logout(): Promise<ValServerResult<VAL_SESSION_COOKIE | VAL_STATE_COOKIE>>;
-    getPatches(query: {
-        authors?: string[];
-    }, cookies: Partial<Record<"val_session", string>>): Promise<ValServerJsonResult<ApiGetPatchResponse>>;
-    deletePatches(query: {
-        id?: string[];
-    }, cookies: Partial<Record<"val_session", string>>): Promise<ValServerJsonResult<ApiDeletePatchResponse>>;
-    getSchema(cookies: Partial<Record<"val_session", string>>): Promise<ValServerJsonResult<ApiSchemaResponse>>;
-    putTree(body: unknown, treePath: string, query: {
-        patches_sha?: string;
-        validate_all?: string;
-        validate_sources?: string;
-        validate_binary_files?: string;
-    }, cookies: Partial<Record<"val_session", string>>): Promise<ValServerJsonResult<ApiTreeResponse>>;
-    postSave(body: unknown, cookies: Partial<Record<"val_session", string>>): Promise<ValServerJsonResult<ApiCommitResponse, ApiPostValidationErrorResponse>>;
-    getFiles(filePath: string, query: {
-        patch_id?: string;
-    }): Promise<ValServerError | {
-        status: 200 | 201;
-        headers?: Record<string, string>;
-        cookies?: ValServerResultCookies<never>;
-        body?: ReadableStream<Uint8Array>;
-    }>;
-}
+export type ValServer = ServerOf<Api>;
+export declare const ValServer: (valModules: ValModules, options: ValServerConfig, callbacks: ValServerCallbacks) => ServerOf<Api>;
 export type ValServerCallbacks = {
     isEnabled: () => Promise<boolean>;
     onEnable: (success: boolean) => Promise<void>;
@@ -95,14 +40,14 @@ declare const IntegratedServerJwtPayload: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     project: string;
     sub: string;
-    exp: number;
     token: string;
+    exp: number;
     org: string;
 }, {
     project: string;
     sub: string;
-    exp: number;
     token: string;
+    exp: number;
     org: string;
 }>;
 export type IntegratedServerJwtPayload = z.infer<typeof IntegratedServerJwtPayload>;
@@ -116,6 +61,11 @@ export declare const ENABLE_COOKIE_VALUE: {
 export declare function bufferToReadableStream(buffer: Buffer): ReadableStream<any>;
 export declare function getRedirectUrl(query: {
     redirect_to?: string | undefined;
-}, overrideHost: string | undefined): string | ValServerError;
+}, overrideHost: string | undefined): string | {
+    status: 400;
+    json: {
+        message: string;
+    };
+};
 export declare function guessMimeTypeFromPath(filePath: string): string | null;
 export {};

package/dist/declarations/src/index.d.ts

@@ -1,6 +1,6 @@
 export type { ServiceOptions } from "./Service.js";
 export { createService, Service } from "./Service.js";
-export { createValApiRouter, createValServer, safeReadGit, } from "./createValApiRouter.js";
+export { createValApiRouter, createValServer, safeReadGit } from "./ValRouter.js";
 export { ValModuleLoader } from "./ValModuleLoader.js";
 export { getCompilerOptions } from "./getCompilerOptions.js";
 export { ValSourceFileHandler } from "./ValSourceFileHandler.js";
@@ -12,3 +12,4 @@ export { formatSyntaxErrorTree } from "./patch/ts/syntax.js";
 export { createFixPatch } from "./createFixPatch.js";
 export { PatchJSON, Patch } from "./patch/validation.js";
 export * from "./jwt.js";
+export type { ValServer } from "./ValServer.js";