@valbuild/server 0.16.0 → 0.16.1

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

@@ -66,6 +66,14 @@ type ValServerOverrides = Partial<{
      * @example "https://app.val.build"
      */
     valBuildUrl: string;
+    /**
+     * The full name of this Val project.
+     *
+     * Typically this is set using the VAL_NAME env var.
+     *
+     * @example "myorg/my-project"
+     */
+    valName: string;
 }>;
 export declare function createRequestListener(route: string, opts: Opts): RequestListener;
 export {};

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

@@ -12,3 +12,4 @@ export { patchSourceFile } from "./patchValFile.js";
 export { formatSyntaxErrorTree } from "./patch/ts/syntax.js";
 export { LocalValServer } from "./LocalValServer.js";
 export { createFixPatch } from "./createFixPatch.js";
+export { PatchJSON } from "./patch/validation.js";

package/dist/declarations/src/patch/validation.d.ts

@@ -0,0 +1,4 @@
+import type { PatchJSON as PatchJSONT } from "@valbuild/core/patch";
+import z from "zod";
+export declare const PatchJSON: z.ZodType<PatchJSONT>;
+export type PatchJSON = PatchJSONT;

package/dist/valbuild-server.cjs.dev.js

@@ -1193,8 +1193,9 @@ class ProxyValServer {
     }
   }
   async session(req, res) {
+    console.log("hit session");
     return this.withAuth(req, res, async data => {
-      const url = new URL("/api/val/auth/user/session", this.options.valBuildUrl);
+      const url = new URL(`/api/val/${this.options.valName}/auth/session`, this.options.valBuildUrl);
       const fetchRes = await fetch(url, {
         headers: this.getAuthHeaders(data.token, "application/json")
       });
@@ -1297,7 +1298,7 @@ class ProxyValServer {
     };
   }
   async consumeCode(code) {
-    const url = new URL("/api/val/auth/user/token", this.options.valBuildUrl);
+    const url = new URL(`/api/val/${this.options.valName}/auth/token`, this.options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     return fetch(url, {
       method: "POST",
@@ -1323,7 +1324,7 @@ class ProxyValServer {
     });
   }
   getAuthorizeUrl(publicValApiRoute, token) {
-    const url = new URL("/authorize", this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRoute}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
@@ -1479,6 +1480,10 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
+    const maybeValName = opts.gitBranch || process.env.VAL_NAME;
+    if (!maybeValName) {
+      throw new Error("VAL_NAME env var must be set in proxy mode");
+    }
     return {
       mode: "proxy",
       route,
@@ -1486,7 +1491,8 @@ async function initHandlerOptions(route, opts) {
       valSecret: maybeValSecret,
       valBuildUrl,
       gitCommit: maybeGitCommit,
-      gitBranch: maybeGitBranch
+      gitBranch: maybeGitBranch,
+      valName: maybeValName
     };
   } else {
     const service = await createService(process.cwd(), opts);
@@ -1549,6 +1555,7 @@ class ValFSHost {
   }
 }
 
+// TODO: find a better name? transformFixesToPatch?
 async function createFixPatch(config, apply, sourcePath, validationError) {
   async function getImageMetadata() {
     const maybeRef = validationError.value && typeof validationError.value === "object" && core.FILE_REF_PROP in validationError.value && typeof validationError.value[core.FILE_REF_PROP] === "string" ? validationError.value[core.FILE_REF_PROP] : undefined;
@@ -1658,6 +1665,7 @@ const getSHA256Hash = async bits => {
 };
 
 exports.LocalValServer = LocalValServer;
+exports.PatchJSON = PatchJSON;
 exports.Service = Service;
 exports.ValFSHost = ValFSHost;
 exports.ValModuleLoader = ValModuleLoader;

package/dist/valbuild-server.cjs.prod.js

@@ -1193,8 +1193,9 @@ class ProxyValServer {
     }
   }
   async session(req, res) {
+    console.log("hit session");
     return this.withAuth(req, res, async data => {
-      const url = new URL("/api/val/auth/user/session", this.options.valBuildUrl);
+      const url = new URL(`/api/val/${this.options.valName}/auth/session`, this.options.valBuildUrl);
       const fetchRes = await fetch(url, {
         headers: this.getAuthHeaders(data.token, "application/json")
       });
@@ -1297,7 +1298,7 @@ class ProxyValServer {
     };
   }
   async consumeCode(code) {
-    const url = new URL("/api/val/auth/user/token", this.options.valBuildUrl);
+    const url = new URL(`/api/val/${this.options.valName}/auth/token`, this.options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     return fetch(url, {
       method: "POST",
@@ -1323,7 +1324,7 @@ class ProxyValServer {
     });
   }
   getAuthorizeUrl(publicValApiRoute, token) {
-    const url = new URL("/authorize", this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRoute}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
@@ -1479,6 +1480,10 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
+    const maybeValName = opts.gitBranch || process.env.VAL_NAME;
+    if (!maybeValName) {
+      throw new Error("VAL_NAME env var must be set in proxy mode");
+    }
     return {
       mode: "proxy",
       route,
@@ -1486,7 +1491,8 @@ async function initHandlerOptions(route, opts) {
       valSecret: maybeValSecret,
       valBuildUrl,
       gitCommit: maybeGitCommit,
-      gitBranch: maybeGitBranch
+      gitBranch: maybeGitBranch,
+      valName: maybeValName
     };
   } else {
     const service = await createService(process.cwd(), opts);
@@ -1549,6 +1555,7 @@ class ValFSHost {
   }
 }
 
+// TODO: find a better name? transformFixesToPatch?
 async function createFixPatch(config, apply, sourcePath, validationError) {
   async function getImageMetadata() {
     const maybeRef = validationError.value && typeof validationError.value === "object" && core.FILE_REF_PROP in validationError.value && typeof validationError.value[core.FILE_REF_PROP] === "string" ? validationError.value[core.FILE_REF_PROP] : undefined;
@@ -1658,6 +1665,7 @@ const getSHA256Hash = async bits => {
 };
 
 exports.LocalValServer = LocalValServer;
+exports.PatchJSON = PatchJSON;
 exports.Service = Service;
 exports.ValFSHost = ValFSHost;
 exports.ValModuleLoader = ValModuleLoader;

package/dist/valbuild-server.esm.js

@@ -1179,8 +1179,9 @@ class ProxyValServer {
     }
   }
   async session(req, res) {
+    console.log("hit session");
     return this.withAuth(req, res, async data => {
-      const url = new URL("/api/val/auth/user/session", this.options.valBuildUrl);
+      const url = new URL(`/api/val/${this.options.valName}/auth/session`, this.options.valBuildUrl);
       const fetchRes = await fetch(url, {
         headers: this.getAuthHeaders(data.token, "application/json")
       });
@@ -1283,7 +1284,7 @@ class ProxyValServer {
     };
   }
   async consumeCode(code) {
-    const url = new URL("/api/val/auth/user/token", this.options.valBuildUrl);
+    const url = new URL(`/api/val/${this.options.valName}/auth/token`, this.options.valBuildUrl);
     url.searchParams.set("code", encodeURIComponent(code));
     return fetch(url, {
       method: "POST",
@@ -1309,7 +1310,7 @@ class ProxyValServer {
     });
   }
   getAuthorizeUrl(publicValApiRoute, token) {
-    const url = new URL("/authorize", this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("redirect_uri", encodeURIComponent(`${publicValApiRoute}/callback`));
     url.searchParams.set("state", token);
     return url.toString();
@@ -1465,6 +1466,10 @@ async function initHandlerOptions(route, opts) {
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
+    const maybeValName = opts.gitBranch || process.env.VAL_NAME;
+    if (!maybeValName) {
+      throw new Error("VAL_NAME env var must be set in proxy mode");
+    }
     return {
       mode: "proxy",
       route,
@@ -1472,7 +1477,8 @@ async function initHandlerOptions(route, opts) {
       valSecret: maybeValSecret,
       valBuildUrl,
       gitCommit: maybeGitCommit,
-      gitBranch: maybeGitBranch
+      gitBranch: maybeGitBranch,
+      valName: maybeValName
     };
   } else {
     const service = await createService(process.cwd(), opts);
@@ -1535,6 +1541,7 @@ class ValFSHost {
   }
 }
 
+// TODO: find a better name? transformFixesToPatch?
 async function createFixPatch(config, apply, sourcePath, validationError) {
   async function getImageMetadata() {
     const maybeRef = validationError.value && typeof validationError.value === "object" && FILE_REF_PROP in validationError.value && typeof validationError.value[FILE_REF_PROP] === "string" ? validationError.value[FILE_REF_PROP] : undefined;
@@ -1643,4 +1650,4 @@ const getSHA256Hash = async bits => {
   return hash;
 };
 
-export { LocalValServer, Service, ValFSHost, ValModuleLoader, ValSourceFileHandler, createFixPatch, createRequestHandler, createRequestListener, createService, formatSyntaxErrorTree, getCompilerOptions, patchSourceFile };
+export { LocalValServer, PatchJSON, Service, ValFSHost, ValModuleLoader, ValSourceFileHandler, createFixPatch, createRequestHandler, createRequestListener, createService, formatSyntaxErrorTree, getCompilerOptions, patchSourceFile };

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.16.0",
+  "version": "0.16.1",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",

package/src/ProxyValServer.ts

@@ -18,6 +18,7 @@ export type ProxyValServerOptions = {
   valBuildUrl: string;
   gitCommit: string;
   gitBranch: string;
+  valName: string;
 };
 
 export class ProxyValServer implements ValServer {
@@ -112,9 +113,10 @@ export class ProxyValServer implements ValServer {
   }
 
   async session(req: express.Request, res: express.Response): Promise<void> {
+    console.log("hit session");
     return this.withAuth(req, res, async (data) => {
       const url = new URL(
-        "/api/val/auth/user/session",
+        `/api/val/${this.options.valName}/auth/session`,
         this.options.valBuildUrl
       );
       const fetchRes = await fetch(url, {
@@ -233,7 +235,10 @@ export class ProxyValServer implements ValServer {
     project: string;
     token: string;
   } | null> {
-    const url = new URL("/api/val/auth/user/token", this.options.valBuildUrl);
+    const url = new URL(
+      `/api/val/${this.options.valName}/auth/token`,
+      this.options.valBuildUrl
+    );
     url.searchParams.set("code", encodeURIComponent(code));
     return fetch(url, {
       method: "POST",
@@ -262,7 +267,10 @@ export class ProxyValServer implements ValServer {
   }
 
   private getAuthorizeUrl(publicValApiRoute: string, token: string): string {
-    const url = new URL("/authorize", this.options.valBuildUrl);
+    const url = new URL(
+      `/auth/${this.options.valName}/authorize`,
+      this.options.valBuildUrl
+    );
     url.searchParams.set(
       "redirect_uri",
       encodeURIComponent(`${publicValApiRoute}/callback`)

package/src/createFixPatch.ts

@@ -5,6 +5,7 @@ import path from "path";
 import fs from "fs";
 import crypto from "crypto";
 
+// TODO: find a better name? transformFixesToPatch?
 export async function createFixPatch(
   config: { projectRoot: string },
   apply: boolean,

package/src/hosting.ts

@@ -73,6 +73,14 @@ type ValServerOverrides = Partial<{
    * @example "https://app.val.build"
    */
   valBuildUrl: string;
+  /**
+   * The full name of this Val project.
+   *
+   * Typically this is set using the VAL_NAME env var.
+   *
+   * @example "myorg/my-project"
+   */
+  valName: string;
 }>;
 
 async function _createRequestListener(
@@ -119,6 +127,10 @@ async function initHandlerOptions(
     if (!maybeGitBranch) {
       throw new Error("VAL_GIT_BRANCH env var must be set in proxy mode");
     }
+    const maybeValName = opts.gitBranch || process.env.VAL_NAME;
+    if (!maybeValName) {
+      throw new Error("VAL_NAME env var must be set in proxy mode");
+    }
     return {
       mode: "proxy",
       route,
@@ -127,6 +139,7 @@ async function initHandlerOptions(
       valBuildUrl,
       gitCommit: maybeGitCommit,
       gitBranch: maybeGitBranch,
+      valName: maybeValName,
     };
   } else {
     const service = await createService(process.cwd(), opts);

package/src/index.ts

@@ -12,3 +12,4 @@ export { patchSourceFile } from "./patchValFile";
 export { formatSyntaxErrorTree } from "./patch/ts/syntax";
 export { LocalValServer } from "./LocalValServer";
 export { createFixPatch } from "./createFixPatch";
+export { PatchJSON } from "./patch/validation";