@valbuild/server 0.62.3 → 0.62.5

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

@@ -39,12 +39,11 @@ export declare class ValServer {
     }): Promise<ValServerRedirectResult<VAL_ENABLE_COOKIE_NAME>>;
     authorize(query: {
         redirect_to?: string;
-    }): Promise<ValServerRedirectResult<VAL_STATE_COOKIE>>;
+    }): 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">>;
-    log(): Promise<ValServerResult<VAL_SESSION_COOKIE | VAL_STATE_COOKIE>>;
     session(cookies: ValCookies<VAL_SESSION_COOKIE>): Promise<ValServerJsonResult<ValSession>>;
     private consumeCode;
     private getAuthorizeUrl;

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

@@ -1541,7 +1541,7 @@ class ValOps {
           error: new patch.PatchError(`Module at path: '${path}' not found`)
         });
       }
-      const source = sources[path];
+      patchedSources[path] = sources[path];
       for (const {
         patchId
       } of patches) {
@@ -1576,7 +1576,9 @@ class ValOps {
               applicableOps.push(op);
             }
           }
-          const patchRes = patch.applyPatch(source, jsonOps, applicableOps.concat(...Object.values(fileFixOps)));
+          const patchRes = patch.applyPatch(patch.deepClone(patchedSources[path]),
+          // applyPatch mutates the source. On add operations it will add multiple items? There is something strange going on. DeepClone seems to fix, but is that the right?
+          jsonOps, applicableOps.concat(...Object.values(fileFixOps)));
           if (fp.result.isErr(patchRes)) {
             if (!errors[path]) {
               errors[path] = [];
@@ -3350,8 +3352,10 @@ class ValServer {
     const token = crypto.randomUUID();
     const redirectUrl = new URL(query.redirect_to);
     const appAuthorizeUrl = this.getAuthorizeUrl(`${redirectUrl.origin}/${this.options.route}`, token);
+    await this.callbacks.onEnable(true);
     return {
       cookies: {
+        [internal.VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [internal.VAL_STATE_COOKIE]: {
           value: createStateCookie({
             redirect_to: query.redirect_to,
@@ -3456,19 +3460,6 @@ class ValServer {
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
-  async log() {
-    return {
-      status: 200,
-      cookies: {
-        [internal.VAL_SESSION_COOKIE]: {
-          value: null
-        },
-        [internal.VAL_STATE_COOKIE]: {
-          value: null
-        }
-      }
-    };
-  }
   async session(cookies) {
     if (this.serverOps instanceof ValOpsFS) {
       return {
@@ -3981,6 +3972,22 @@ class ValServer {
       ...analysis,
       ...patches
     });
+    if (preparedCommit.hasErrors) {
+      console.error("Failed to create commit", {
+        sourceFilePatchErrors: preparedCommit.sourceFilePatchErrors,
+        binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+      });
+      return {
+        status: 400,
+        json: {
+          message: "Failed to create commit",
+          details: {
+            sourceFilePatchErrors: preparedCommit.sourceFilePatchErrors,
+            binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+          }
+        }
+      };
+    }
     if (this.serverOps instanceof ValOpsFS) {
       await this.serverOps.saveFiles(preparedCommit);
       return {

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

@@ -1541,7 +1541,7 @@ class ValOps {
           error: new patch.PatchError(`Module at path: '${path}' not found`)
         });
       }
-      const source = sources[path];
+      patchedSources[path] = sources[path];
       for (const {
         patchId
       } of patches) {
@@ -1576,7 +1576,9 @@ class ValOps {
               applicableOps.push(op);
             }
           }
-          const patchRes = patch.applyPatch(source, jsonOps, applicableOps.concat(...Object.values(fileFixOps)));
+          const patchRes = patch.applyPatch(patch.deepClone(patchedSources[path]),
+          // applyPatch mutates the source. On add operations it will add multiple items? There is something strange going on. DeepClone seems to fix, but is that the right?
+          jsonOps, applicableOps.concat(...Object.values(fileFixOps)));
           if (fp.result.isErr(patchRes)) {
             if (!errors[path]) {
               errors[path] = [];
@@ -3350,8 +3352,10 @@ class ValServer {
     const token = crypto.randomUUID();
     const redirectUrl = new URL(query.redirect_to);
     const appAuthorizeUrl = this.getAuthorizeUrl(`${redirectUrl.origin}/${this.options.route}`, token);
+    await this.callbacks.onEnable(true);
     return {
       cookies: {
+        [internal.VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [internal.VAL_STATE_COOKIE]: {
           value: createStateCookie({
             redirect_to: query.redirect_to,
@@ -3456,19 +3460,6 @@ class ValServer {
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
-  async log() {
-    return {
-      status: 200,
-      cookies: {
-        [internal.VAL_SESSION_COOKIE]: {
-          value: null
-        },
-        [internal.VAL_STATE_COOKIE]: {
-          value: null
-        }
-      }
-    };
-  }
   async session(cookies) {
     if (this.serverOps instanceof ValOpsFS) {
       return {
@@ -3981,6 +3972,22 @@ class ValServer {
       ...analysis,
       ...patches
     });
+    if (preparedCommit.hasErrors) {
+      console.error("Failed to create commit", {
+        sourceFilePatchErrors: preparedCommit.sourceFilePatchErrors,
+        binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+      });
+      return {
+        status: 400,
+        json: {
+          message: "Failed to create commit",
+          details: {
+            sourceFilePatchErrors: preparedCommit.sourceFilePatchErrors,
+            binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+          }
+        }
+      };
+    }
     if (this.serverOps instanceof ValOpsFS) {
       await this.serverOps.saveFiles(preparedCommit);
       return {

package/dist/valbuild-server.esm.js

@@ -2,7 +2,7 @@ import { newQuickJSWASMModule } from 'quickjs-emscripten';
 import ts from 'typescript';
 import { result, pipe } from '@valbuild/core/fp';
 import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, RT_IMAGE_TAG, VAL_EXTENSION, derefPatch, Internal, Schema, ImageSchema, FileSchema } from '@valbuild/core';
-import { deepEqual, isNotRoot, PatchError, parseAndValidateArrayIndex, applyPatch, JSONOps, sourceToPatchPath } from '@valbuild/core/patch';
+import { deepEqual, isNotRoot, PatchError, parseAndValidateArrayIndex, applyPatch, JSONOps, deepClone, sourceToPatchPath } from '@valbuild/core/patch';
 import * as fsPath from 'path';
 import fsPath__default from 'path';
 import fs, { promises } from 'fs';
@@ -1511,7 +1511,7 @@ class ValOps {
           error: new PatchError(`Module at path: '${path}' not found`)
         });
       }
-      const source = sources[path];
+      patchedSources[path] = sources[path];
       for (const {
         patchId
       } of patches) {
@@ -1546,7 +1546,9 @@ class ValOps {
               applicableOps.push(op);
             }
           }
-          const patchRes = applyPatch(source, jsonOps, applicableOps.concat(...Object.values(fileFixOps)));
+          const patchRes = applyPatch(deepClone(patchedSources[path]),
+          // applyPatch mutates the source. On add operations it will add multiple items? There is something strange going on. DeepClone seems to fix, but is that the right?
+          jsonOps, applicableOps.concat(...Object.values(fileFixOps)));
           if (result.isErr(patchRes)) {
             if (!errors[path]) {
               errors[path] = [];
@@ -3320,8 +3322,10 @@ class ValServer {
     const token = crypto.randomUUID();
     const redirectUrl = new URL(query.redirect_to);
     const appAuthorizeUrl = this.getAuthorizeUrl(`${redirectUrl.origin}/${this.options.route}`, token);
+    await this.callbacks.onEnable(true);
     return {
       cookies: {
+        [VAL_ENABLE_COOKIE_NAME]: ENABLE_COOKIE_VALUE,
         [VAL_STATE_COOKIE$1]: {
           value: createStateCookie({
             redirect_to: query.redirect_to,
@@ -3426,19 +3430,6 @@ class ValServer {
       redirectTo: callbackReqSuccess.redirect_uri || "/"
     };
   }
-  async log() {
-    return {
-      status: 200,
-      cookies: {
-        [VAL_SESSION_COOKIE$1]: {
-          value: null
-        },
-        [VAL_STATE_COOKIE$1]: {
-          value: null
-        }
-      }
-    };
-  }
   async session(cookies) {
     if (this.serverOps instanceof ValOpsFS) {
       return {
@@ -3951,6 +3942,22 @@ class ValServer {
       ...analysis,
       ...patches
     });
+    if (preparedCommit.hasErrors) {
+      console.error("Failed to create commit", {
+        sourceFilePatchErrors: preparedCommit.sourceFilePatchErrors,
+        binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+      });
+      return {
+        status: 400,
+        json: {
+          message: "Failed to create commit",
+          details: {
+            sourceFilePatchErrors: preparedCommit.sourceFilePatchErrors,
+            binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+          }
+        }
+      };
+    }
     if (this.serverOps instanceof ValOpsFS) {
       await this.serverOps.saveFiles(preparedCommit);
       return {

package/package.json

@@ -12,7 +12,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.62.3",
+  "version": "0.62.5",
   "scripts": {
     "typecheck": "tsc --noEmit",
     "test": "jest",
@@ -22,9 +22,9 @@
     "@types/jest": "^29.2.5"
   },
   "dependencies": {
-    "@valbuild/core": "~0.62.3",
-    "@valbuild/shared": "~0.62.3",
-    "@valbuild/ui": "~0.62.3",
+    "@valbuild/core": "~0.62.5",
+    "@valbuild/shared": "~0.62.5",
+    "@valbuild/ui": "~0.62.5",
     "image-size": "^1.0.2",
     "minimatch": "^3.0.4",
     "quickjs-emscripten": "^0.21.1",