@valbuild/server 0.26.0 → 0.28.0

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

@@ -1442,7 +1442,7 @@ class ProxyValServer {
     return url.toString();
   }
   getAppErrorUrl(error) {
-    const url = new URL("/authorize", this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   }
@@ -1745,7 +1745,7 @@ 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;
+    const maybeValName = opts.valName || process.env.VAL_NAME;
     if (!maybeValName) {
       throw new Error("VAL_NAME env var must be set in proxy mode");
     }

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

@@ -1442,7 +1442,7 @@ class ProxyValServer {
     return url.toString();
   }
   getAppErrorUrl(error) {
-    const url = new URL("/authorize", this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   }
@@ -1745,7 +1745,7 @@ 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;
+    const maybeValName = opts.valName || process.env.VAL_NAME;
     if (!maybeValName) {
       throw new Error("VAL_NAME env var must be set in proxy mode");
     }

package/dist/valbuild-server.esm.js

@@ -1411,7 +1411,7 @@ class ProxyValServer {
     return url.toString();
   }
   getAppErrorUrl(error) {
-    const url = new URL("/authorize", this.options.valBuildUrl);
+    const url = new URL(`/auth/${this.options.valName}/authorize`, this.options.valBuildUrl);
     url.searchParams.set("error", encodeURIComponent(error));
     return url.toString();
   }
@@ -1714,7 +1714,7 @@ 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;
+    const maybeValName = opts.valName || process.env.VAL_NAME;
     if (!maybeValName) {
       throw new Error("VAL_NAME env var must be set in proxy mode");
     }

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.26.0",
+  "version": "0.28.0",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -25,8 +25,8 @@
     "concurrently": "^7.6.0"
   },
   "dependencies": {
-    "@valbuild/core": "~0.26.0",
-    "@valbuild/ui": "~0.26.0",
+    "@valbuild/core": "~0.28.0",
+    "@valbuild/ui": "~0.28.0",
     "express": "^4.18.2",
     "image-size": "^1.0.2",
     "quickjs-emscripten": "^0.21.1",
@@ -37,5 +37,8 @@
   },
   "engines": {
     "node": ">=16.0.0"
-  }
+  },
+  "files": [
+    "dist"
+  ]
 }

package/.babelrc.json

@@ -1,5 +0,0 @@
-{
-  "targets": {
-    "node": 16
-  }
-}

package/jest.config.js

@@ -1,4 +0,0 @@
-/** @type {import("jest").Config} */
-module.exports = {
-  preset: "../../jest.preset",
-};

package/src/LocalValServer.ts

@@ -1,167 +0,0 @@
-import express from "express";
-import { Service } from "./Service";
-import { result } from "@valbuild/core/fp";
-import { parsePatch, PatchError } from "@valbuild/core/patch";
-import { PatchJSON } from "./patch/validation";
-import { ValServer } from "./ValServer";
-import { ApiTreeResponse, ModuleId, ModulePath } from "@valbuild/core";
-import { disable, enable } from "./ProxyValServer";
-import { promises as fs } from "fs";
-import path from "path";
-import { z } from "zod";
-
-export type LocalValServerOptions = {
-  service: Service;
-  git: {
-    commit?: string;
-    branch?: string;
-  };
-};
-
-export class LocalValServer implements ValServer {
-  constructor(readonly options: LocalValServerOptions) {}
-
-  async session(_req: express.Request, res: express.Response): Promise<void> {
-    res.json({
-      mode: "local",
-    });
-  }
-
-  async getTree(req: express.Request, res: express.Response): Promise<void> {
-    try {
-      // TODO: use the params: patch, schema, source
-      const treePath = req.params["0"].replace("~", "");
-      const rootDir = process.cwd();
-      const moduleIds: string[] = [];
-      // iterate over all .val files in the root directory
-      const walk = async (dir: string) => {
-        const files = await fs.readdir(dir);
-        for (const file of files) {
-          if ((await fs.stat(path.join(dir, file))).isDirectory()) {
-            if (file === "node_modules") continue;
-            await walk(path.join(dir, file));
-          } else {
-            const isValFile =
-              file.endsWith(".val.js") || file.endsWith(".val.ts");
-            if (!isValFile) {
-              continue;
-            }
-            if (
-              treePath &&
-              !path.join(dir, file).replace(rootDir, "").startsWith(treePath)
-            ) {
-              continue;
-            }
-            moduleIds.push(
-              path
-                .join(dir, file)
-                .replace(rootDir, "")
-                .replace(".val.js", "")
-                .replace(".val.ts", "")
-            );
-          }
-        }
-      };
-      const serializedModuleContent = await walk(rootDir).then(async () => {
-        return Promise.all(
-          moduleIds.map(async (moduleId) => {
-            return await this.options.service.get(
-              moduleId as ModuleId,
-              "" as ModulePath
-            );
-          })
-        );
-      });
-
-      //
-      const modules = Object.fromEntries(
-        serializedModuleContent.map((serializedModuleContent) => {
-          const module: ApiTreeResponse["modules"][keyof ApiTreeResponse["modules"]] =
-            {
-              schema: serializedModuleContent.schema,
-              source: serializedModuleContent.source,
-              errors: serializedModuleContent.errors,
-            };
-          return [serializedModuleContent.path, module];
-        })
-      );
-      const apiTreeResponse: ApiTreeResponse = {
-        modules,
-        git: this.options.git,
-      };
-      res.send(JSON.stringify(apiTreeResponse));
-    } catch (err) {
-      console.error(err);
-      res.sendStatus(500);
-    }
-  }
-
-  async enable(req: express.Request, res: express.Response): Promise<void> {
-    return enable(req, res);
-  }
-
-  async disable(req: express.Request, res: express.Response): Promise<void> {
-    return disable(req, res);
-  }
-
-  async postPatches(
-    req: express.Request<{ 0: string }>,
-    res: express.Response
-  ): Promise<void> {
-    // First validate that the body has the right structure
-    const patchJSON = z.record(PatchJSON).safeParse(req.body);
-    if (!patchJSON.success) {
-      res.status(401).json(patchJSON.error.issues);
-      return;
-    }
-
-    try {
-      for (const moduleId in patchJSON.data) {
-        // Then parse/validate
-        // TODO: validate all and then fail instead:
-        const patch = parsePatch(patchJSON.data[moduleId]);
-        if (result.isErr(patch)) {
-          res.status(401).json(patch.error);
-          return;
-        }
-        await this.options.service.patch(moduleId, patch.value);
-      }
-      res.json({});
-    } catch (err) {
-      if (err instanceof PatchError) {
-        res.status(400).send({ message: err.message });
-      } else {
-        console.error(err);
-        res.status(500).send({
-          message: err instanceof Error ? err.message : "Unknown error",
-        });
-      }
-    }
-  }
-  private async badRequest(
-    req: express.Request,
-    res: express.Response
-  ): Promise<void> {
-    console.debug("Local server does handle this request", req.url);
-    res.sendStatus(400);
-  }
-
-  commit(req: express.Request, res: express.Response): Promise<void> {
-    return this.badRequest(req, res);
-  }
-
-  authorize(req: express.Request, res: express.Response): Promise<void> {
-    return this.badRequest(req, res);
-  }
-
-  callback(req: express.Request, res: express.Response): Promise<void> {
-    return this.badRequest(req, res);
-  }
-
-  logout(req: express.Request, res: express.Response): Promise<void> {
-    return this.badRequest(req, res);
-  }
-  getFiles(req: express.Request, res: express.Response): Promise<void> {
-    return this.badRequest(req, res);
-  }
-}