@valbuild/server 0.33.0 → 0.35.0

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

@@ -1,8 +1,11 @@
-import express from "express";
 import { Service } from "./Service.js";
-import { ValServer } from "./ValServer.js";
+import { ApiGetPatchResponse, ApiPostPatchResponse, ApiTreeResponse } from "@valbuild/core";
+import { VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValServerJsonResult, ValServerRedirectResult, ValServerResult, ValSession } from "@valbuild/shared/internal";
+import { ValServer, ValServerCallbacks } from "./ValServer.js";
 export type LocalValServerOptions = {
     service: Service;
+    valEnableRedirectUrl?: string;
+    valDisableRedirectUrl?: string;
     git: {
         commit?: string;
         branch?: string;
@@ -10,19 +13,26 @@ export type LocalValServerOptions = {
 };
 export declare class LocalValServer implements ValServer {
     readonly options: LocalValServerOptions;
-    constructor(options: LocalValServerOptions);
-    session(_req: express.Request, res: express.Response): Promise<void>;
-    getTree(req: express.Request, res: express.Response): Promise<void>;
-    enable(req: express.Request, res: express.Response): Promise<void>;
-    disable(req: express.Request, res: express.Response): Promise<void>;
-    postPatches(req: express.Request<{
-        0: string;
-    }>, res: express.Response): Promise<void>;
+    readonly callbacks: ValServerCallbacks;
+    constructor(options: LocalValServerOptions, callbacks: ValServerCallbacks);
+    session(): Promise<ValServerJsonResult<ValSession>>;
+    getTree(treePath: string, query: {
+        patch?: string;
+        schema?: string;
+        source?: string;
+    }): Promise<ValServerJsonResult<ApiTreeResponse>>;
+    enable(query: {
+        redirect_to?: string;
+    }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;
+    disable(query: {
+        redirect_to?: string;
+    }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;
+    postPatches(body: unknown): Promise<ValServerJsonResult<ApiPostPatchResponse>>;
     private badRequest;
-    commit(req: express.Request, res: express.Response): Promise<void>;
-    authorize(req: express.Request, res: express.Response): Promise<void>;
-    callback(req: express.Request, res: express.Response): Promise<void>;
-    logout(req: express.Request, res: express.Response): Promise<void>;
-    getFiles(req: express.Request, res: express.Response): Promise<void>;
-    getPatches(req: express.Request, res: express.Response): Promise<void>;
+    postCommit(): Promise<ValServerJsonResult<{}>>;
+    authorize(): Promise<ValServerRedirectResult<VAL_STATE_COOKIE>>;
+    callback(): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
+    logout(): Promise<ValServerResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
+    getFiles(): Promise<ValServerResult<never, ReadableStream<Uint8Array>>>;
+    getPatches(): Promise<ValServerJsonResult<ApiGetPatchResponse>>;
 }

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

@@ -1,5 +1,5 @@
 import { type Source, type SerializedSchema, ValidationErrors } from "@valbuild/core";
-import { ModuleId, type SourcePath } from "@valbuild/core/src/val";
+import type { ModuleId, SourcePath } from "@valbuild/core";
 export declare const FATAL_ERROR_TYPES: readonly ["no-schema", "no-source", "invalid-id", "no-module"];
 export type FatalErrorType = (typeof FATAL_ERROR_TYPES)[number];
 export type SerializedModuleContent = {

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

@@ -26,6 +26,6 @@ export declare class Service {
     readonly valConfigPath: string;
     constructor({ valConfigPath }: ServiceOptions, sourceFileHandler: ValSourceFileHandler, runtime: QuickJSRuntime);
     get(moduleId: ModuleId, modulePath: ModulePath): Promise<SerializedModuleContent>;
-    patch(moduleId: string, patch: Patch): Promise<SerializedModuleContent>;
+    patch(moduleId: string, patch: Patch): Promise<void>;
     dispose(): void;
 }

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

@@ -1,16 +1,47 @@
-import express from "express";
+import { ApiGetPatchResponse, ApiPostPatchResponse, ApiTreeResponse } from "@valbuild/core";
+import { VAL_ENABLE_COOKIE_NAME, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, ValCookies, ValServerError, ValServerJsonResult, ValServerRedirectResult, ValServerResult, ValSession } from "@valbuild/shared/internal";
+export declare const ENABLE_COOKIE_VALUE: {
+    readonly value: "true";
+    readonly options: {
+        readonly httpOnly: false;
+        readonly sameSite: "lax";
+    };
+};
+export declare function getRedirectUrl(query: {
+    redirect_to?: string | undefined;
+}, overrideHost: string | undefined): string | ValServerError;
+export type ValServerCallbacks = {
+    isEnabled: () => Promise<boolean>;
+    onEnable: (success: boolean) => Promise<void>;
+    onDisable: (success: boolean) => Promise<void>;
+};
 export interface ValServer {
-    authorize(req: express.Request, res: express.Response): Promise<void>;
-    callback(req: express.Request, res: express.Response): Promise<void>;
-    logout(req: express.Request, res: express.Response): Promise<void>;
-    session(req: express.Request, res: express.Response): Promise<void>;
-    postPatches(req: express.Request<{
-        0: string;
-    }>, res: express.Response): Promise<void>;
-    commit(req: express.Request, res: express.Response): Promise<void>;
-    enable(req: express.Request, res: express.Response): Promise<void>;
-    disable(req: express.Request, res: express.Response): Promise<void>;
-    getTree(req: express.Request, res: express.Response): Promise<void>;
-    getFiles(req: express.Request, res: express.Response): Promise<void>;
-    getPatches(req: express.Request, res: express.Response): Promise<void>;
+    authorize(query: {
+        redirect_to?: string;
+    }): Promise<ValServerRedirectResult<VAL_STATE_COOKIE>>;
+    callback(query: {
+        code?: string;
+        state?: string;
+    }, cookies: ValCookies<VAL_STATE_COOKIE>): Promise<ValServerRedirectResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
+    enable(query: {
+        redirect_to?: string;
+    }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;
+    disable(query: {
+        redirect_to?: string;
+    }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;
+    logout(): Promise<ValServerResult<VAL_STATE_COOKIE | VAL_SESSION_COOKIE>>;
+    session(cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<ValSession>>;
+    getTree(treePath: string, query: {
+        patch?: string;
+        schema?: string;
+        source?: string;
+    }, cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<ApiTreeResponse>>;
+    getPatches(query: {
+        id?: string[];
+    }, cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<ApiGetPatchResponse>>;
+    postPatches(body: unknown, cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<ApiPostPatchResponse>>;
+    postCommit(cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<{}>>;
+    getFiles(treePath: string, query: {
+        sha256?: string;
+    }, cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerResult<never, ReadableStream<Uint8Array>>>;
 }

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

@@ -1,6 +1,6 @@
-/// <reference types="node" />
-import type { RequestListener } from "node:http";
 import { ServiceOptions } from "./Service.js";
+import { ValServer, ValServerCallbacks } from "./ValServer.js";
+import { ValServerGenericResult } from "@valbuild/shared/internal";
 type Opts = ValServerOverrides & ServiceOptions;
 type ValServerOverrides = Partial<{
     /**
@@ -105,9 +105,10 @@ type ValServerOverrides = Partial<{
      */
     valDisableRedirectUrl?: string;
 }>;
+export declare function createValServer(route: string, opts: Opts, callbacks: ValServerCallbacks): Promise<ValServer>;
 export declare function safeReadGit(cwd: string): Promise<{
     commit?: string;
     branch?: string;
 }>;
-export declare function createRequestListener(route: string, opts: Opts): RequestListener;
+export declare function createValApiRouter<Res>(route: string, valServerPromise: Promise<ValServer>, convert: (valServerRes: ValServerGenericResult) => Res): (req: Request) => Promise<Res>;
 export {};

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

@@ -1,7 +1,6 @@
 export type { ServiceOptions } from "./Service.js";
 export { createService, Service } from "./Service.js";
-export { createRequestHandler } from "./createRequestHandler.js";
-export { createRequestListener, safeReadGit } from "./hosting.js";
+export { createValApiRouter, createValServer, safeReadGit, } from "./createValApiRouter.js";
 export { ValModuleLoader } from "./ValModuleLoader.js";
 export { getCompilerOptions } from "./getCompilerOptions.js";
 export { ValSourceFileHandler } from "./ValSourceFileHandler.js";

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

@@ -4,6 +4,5 @@ import { type ValSyntaxErrorTree } from "./patch/ts/syntax.js";
 import { ValSourceFileHandler } from "./ValSourceFileHandler.js";
 import { QuickJSRuntime } from "quickjs-emscripten";
 import ts from "typescript";
-import { SerializedModuleContent } from "./SerializedModuleContent.js";
-export declare const patchValFile: (id: string, valConfigPath: string, patch: Patch, sourceFileHandler: ValSourceFileHandler, runtime: QuickJSRuntime) => Promise<SerializedModuleContent>;
+export declare const patchValFile: (id: string, valConfigPath: string, patch: Patch, sourceFileHandler: ValSourceFileHandler, runtime: QuickJSRuntime) => Promise<void>;
 export declare const patchSourceFile: (sourceFile: ts.SourceFile | string, patch: Patch) => result.Result<ts.SourceFile, ValSyntaxErrorTree | PatchError>;