@valbuild/server 0.101.0 → 0.102.0

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

@@ -20,7 +20,7 @@ export { extractImageMetadata, extractFileMetadata } from "./extractMetadata.js"
 export { validateMetadata } from "./validateMetadata.js";
 export { getValidationErrorFileRef } from "./getValidationErrorFileRef.js";
 export { checkRemoteRef, downloadFileFromRemote, getCachedRemoteFileDir, getCachedRemoteFilePath, } from "./checkRemoteRef.js";
-export { hasRemoteFileSchema } from "./hasRemoteFileSchema.js";
+export { hasRemoteFileSchema } from "@valbuild/core";
 export { getFileExt } from "./getFileExt.js";
 export { evalValConfigFile, findAndEvalValConfigFile, } from "./evalValConfigFile.js";
 export { startValLogin, awaitValLoginConfirmation, persistPersonalAccessToken, ValLoginError, DEFAULT_LOGIN_HOST, DEFAULT_LOGIN_MAX_DURATION, DEFAULT_LOGIN_POLL_INTERVAL, } from "./login.js";

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

@@ -1562,6 +1562,35 @@ function resolveExistingJsonPath(moduleFilePath, importPath) {
  * module errors (see `findNestedJsonValuesRecords`), so they can never reach
  * here — if that guard is ever relaxed, this must become a recursive visitor or
  * nested entries silently get no content validation at all.
+ *
+ * ## NOT validated, and it should be: the entry's FILE PATH
+ *
+ * The key↔file mapping is canonical. `getNewJsonEntryPaths` derives it, and both
+ * write paths use it — the `jsonValues:extract-entry` fix and the patch commit:
+ *
+ *     /content/kb.val.ts  +  key "kb-000"  ->  /content/kb/kb-000.val.json
+ *
+ * This function does not check it. It calls the thunk and validates whatever
+ * comes back, so an entry may point at ANY file in the project and pass. The
+ * repo's own fixture does exactly that — `examples/next/content/kb.val.ts` has
+ * `"kb-000": c.json(() => import("./kb/entry-000.val.json"))`, where the
+ * canonical path is `./kb/kb-000.val.json`, and `val validate` calls it valid.
+ *
+ * Two consequences, the first a live bug:
+ *
+ * - **A key rename writes to the DERIVED path**, which for a non-canonical entry
+ *   is not the file the old key was reading. The old file is orphaned and the new
+ *   key reads a file that was never written.
+ * - It blocks localising entry staleness. `jsonEntriesSha` cannot say which entry
+ *   changed, so the client drops a whole module's loaded content; with the mapping
+ *   guaranteed, a changed file resolves to one key by derivation alone.
+ *
+ * The fix belongs here and needs no new machinery: the module's `.val.ts` is
+ * already parsed (`ValSourceFileHandler`), so the import specifier is readable
+ * from the AST — no `thunk.toString()`, which a bundler would defeat. A
+ * `jsonValues:rename-entry-file` fix could move the file and rewrite the import,
+ * exactly as `extract-entry` writes both. See `packages/ui/spa/stores/openquestions.md`
+ * item 9b.
  */
 async function validateJsonValuesEntries(schema, source, modulePath) {
   const out = {};
@@ -5823,51 +5852,6 @@ function parsePersonalAccessTokenFile(content) {
   }
 }
 
-/**
- * Iterates through all schemas and find if there is 1 or more remote files in them
- */
-function hasRemoteFileSchema(schema) {
-  if (schema.type === "file" || schema.type === "image") {
-    return !!schema.remote;
-  } else if (schema.type === "richtext") {
-    var _schema$options;
-    if (typeof ((_schema$options = schema.options) === null || _schema$options === void 0 || (_schema$options = _schema$options.inline) === null || _schema$options === void 0 ? void 0 : _schema$options.img) === "object") {
-      return hasRemoteFileSchema(schema.options.inline.img);
-    }
-    return false;
-  } else if (schema.type === "array" || schema.type === "record") {
-    return hasRemoteFileSchema(schema.item);
-  } else if (schema.type === "object") {
-    for (const key in schema.items) {
-      const hasRemoteFile = hasRemoteFileSchema(schema.items[key]);
-      if (hasRemoteFile) {
-        return true;
-      }
-    }
-    return false;
-  } else if (schema.type === "union") {
-    const unionStringSchema = typeof schema.key === "object" && schema.key.type === "literal" ? schema : undefined;
-    const unionObjectSchema = typeof schema.key === "string" ? schema : undefined;
-    if (unionStringSchema) {
-      return false;
-    }
-    if (unionObjectSchema) {
-      for (const key in unionObjectSchema.items) {
-        const hasRemoteFile = hasRemoteFileSchema(unionObjectSchema.items[key]);
-        if (hasRemoteFile) {
-          return true;
-        }
-      }
-    }
-    return false;
-  } else if (schema.type === "boolean" || schema.type === "number" || schema.type === "string" || schema.type === "literal" || schema.type === "date" || schema.type === "dateTime" || schema.type === "color" || schema.type === "keyOf" || schema.type === "route") {
-    return false;
-  } else {
-    const exhaustiveCheck = schema;
-    throw new Error(`Unexpected schema: ${JSON.stringify(exhaustiveCheck)}`);
-  }
-}
-
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const ValServer = (valModules, options, callbacks) => {
   const AIContentBlock = z.z.union([z.z.object({
@@ -7466,7 +7450,11 @@ const ValServer = (valModules, options, callbacks) => {
                 sourceFilePatchErrors: Object.fromEntries(Object.entries(preparedCommit.sourceFilePatchErrors).map(([key, errors]) => [key, errors.map(e => ({
                   message: formatPatchSourceError(e)
                 }))])),
-                binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+                binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors,
+                // Attributed to the patch that caused it, so the studio can
+                // name the offending change and offer to remove it instead of
+                // leaving the editor with "Failed to publish changes".
+                unappliablePatches: preparedCommit.unappliablePatches
               }
             }
           };
@@ -8580,7 +8568,7 @@ function getIsRemoteRequired(schemas) {
   for (const moduleFilePathS in schemas) {
     const moduleFilePath = moduleFilePathS;
     const schema = schemas[moduleFilePath]["executeSerialize"]();
-    const isRemoteRequired = hasRemoteFileSchema(schema);
+    const isRemoteRequired = core.hasRemoteFileSchema(schema);
     if (isRemoteRequired) {
       return true;
     }
@@ -10589,6 +10577,10 @@ function readCapturedReport(snapshotDir) {
   return JSON.parse(fs__default["default"].readFileSync(reportPath, "utf-8"));
 }
 
+Object.defineProperty(exports, 'hasRemoteFileSchema', {
+  enumerable: true,
+  get: function () { return core.hasRemoteFileSchema; }
+});
 exports.DEFAULT_LOGIN_HOST = DEFAULT_LOGIN_HOST;
 exports.DEFAULT_LOGIN_MAX_DURATION = DEFAULT_LOGIN_MAX_DURATION;
 exports.DEFAULT_LOGIN_POLL_INTERVAL = DEFAULT_LOGIN_POLL_INTERVAL;
@@ -10629,7 +10621,6 @@ exports.getModulePathRange = getModulePathRange;
 exports.getPersonalAccessTokenPath = getPersonalAccessTokenPath;
 exports.getSettings = getSettings;
 exports.getValidationErrorFileRef = getValidationErrorFileRef;
-exports.hasRemoteFileSchema = hasRemoteFileSchema;
 exports.loadValModules = loadValModules;
 exports.parsePersonalAccessTokenFile = parsePersonalAccessTokenFile;
 exports.patchSourceFile = patchSourceFile;

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

@@ -1562,6 +1562,35 @@ function resolveExistingJsonPath(moduleFilePath, importPath) {
  * module errors (see `findNestedJsonValuesRecords`), so they can never reach
  * here — if that guard is ever relaxed, this must become a recursive visitor or
  * nested entries silently get no content validation at all.
+ *
+ * ## NOT validated, and it should be: the entry's FILE PATH
+ *
+ * The key↔file mapping is canonical. `getNewJsonEntryPaths` derives it, and both
+ * write paths use it — the `jsonValues:extract-entry` fix and the patch commit:
+ *
+ *     /content/kb.val.ts  +  key "kb-000"  ->  /content/kb/kb-000.val.json
+ *
+ * This function does not check it. It calls the thunk and validates whatever
+ * comes back, so an entry may point at ANY file in the project and pass. The
+ * repo's own fixture does exactly that — `examples/next/content/kb.val.ts` has
+ * `"kb-000": c.json(() => import("./kb/entry-000.val.json"))`, where the
+ * canonical path is `./kb/kb-000.val.json`, and `val validate` calls it valid.
+ *
+ * Two consequences, the first a live bug:
+ *
+ * - **A key rename writes to the DERIVED path**, which for a non-canonical entry
+ *   is not the file the old key was reading. The old file is orphaned and the new
+ *   key reads a file that was never written.
+ * - It blocks localising entry staleness. `jsonEntriesSha` cannot say which entry
+ *   changed, so the client drops a whole module's loaded content; with the mapping
+ *   guaranteed, a changed file resolves to one key by derivation alone.
+ *
+ * The fix belongs here and needs no new machinery: the module's `.val.ts` is
+ * already parsed (`ValSourceFileHandler`), so the import specifier is readable
+ * from the AST — no `thunk.toString()`, which a bundler would defeat. A
+ * `jsonValues:rename-entry-file` fix could move the file and rewrite the import,
+ * exactly as `extract-entry` writes both. See `packages/ui/spa/stores/openquestions.md`
+ * item 9b.
  */
 async function validateJsonValuesEntries(schema, source, modulePath) {
   const out = {};
@@ -5823,51 +5852,6 @@ function parsePersonalAccessTokenFile(content) {
   }
 }
 
-/**
- * Iterates through all schemas and find if there is 1 or more remote files in them
- */
-function hasRemoteFileSchema(schema) {
-  if (schema.type === "file" || schema.type === "image") {
-    return !!schema.remote;
-  } else if (schema.type === "richtext") {
-    var _schema$options;
-    if (typeof ((_schema$options = schema.options) === null || _schema$options === void 0 || (_schema$options = _schema$options.inline) === null || _schema$options === void 0 ? void 0 : _schema$options.img) === "object") {
-      return hasRemoteFileSchema(schema.options.inline.img);
-    }
-    return false;
-  } else if (schema.type === "array" || schema.type === "record") {
-    return hasRemoteFileSchema(schema.item);
-  } else if (schema.type === "object") {
-    for (const key in schema.items) {
-      const hasRemoteFile = hasRemoteFileSchema(schema.items[key]);
-      if (hasRemoteFile) {
-        return true;
-      }
-    }
-    return false;
-  } else if (schema.type === "union") {
-    const unionStringSchema = typeof schema.key === "object" && schema.key.type === "literal" ? schema : undefined;
-    const unionObjectSchema = typeof schema.key === "string" ? schema : undefined;
-    if (unionStringSchema) {
-      return false;
-    }
-    if (unionObjectSchema) {
-      for (const key in unionObjectSchema.items) {
-        const hasRemoteFile = hasRemoteFileSchema(unionObjectSchema.items[key]);
-        if (hasRemoteFile) {
-          return true;
-        }
-      }
-    }
-    return false;
-  } else if (schema.type === "boolean" || schema.type === "number" || schema.type === "string" || schema.type === "literal" || schema.type === "date" || schema.type === "dateTime" || schema.type === "color" || schema.type === "keyOf" || schema.type === "route") {
-    return false;
-  } else {
-    const exhaustiveCheck = schema;
-    throw new Error(`Unexpected schema: ${JSON.stringify(exhaustiveCheck)}`);
-  }
-}
-
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const ValServer = (valModules, options, callbacks) => {
   const AIContentBlock = z.z.union([z.z.object({
@@ -7466,7 +7450,11 @@ const ValServer = (valModules, options, callbacks) => {
                 sourceFilePatchErrors: Object.fromEntries(Object.entries(preparedCommit.sourceFilePatchErrors).map(([key, errors]) => [key, errors.map(e => ({
                   message: formatPatchSourceError(e)
                 }))])),
-                binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+                binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors,
+                // Attributed to the patch that caused it, so the studio can
+                // name the offending change and offer to remove it instead of
+                // leaving the editor with "Failed to publish changes".
+                unappliablePatches: preparedCommit.unappliablePatches
               }
             }
           };
@@ -8580,7 +8568,7 @@ function getIsRemoteRequired(schemas) {
   for (const moduleFilePathS in schemas) {
     const moduleFilePath = moduleFilePathS;
     const schema = schemas[moduleFilePath]["executeSerialize"]();
-    const isRemoteRequired = hasRemoteFileSchema(schema);
+    const isRemoteRequired = core.hasRemoteFileSchema(schema);
     if (isRemoteRequired) {
       return true;
     }
@@ -10589,6 +10577,10 @@ function readCapturedReport(snapshotDir) {
   return JSON.parse(fs__default["default"].readFileSync(reportPath, "utf-8"));
 }
 
+Object.defineProperty(exports, 'hasRemoteFileSchema', {
+  enumerable: true,
+  get: function () { return core.hasRemoteFileSchema; }
+});
 exports.DEFAULT_LOGIN_HOST = DEFAULT_LOGIN_HOST;
 exports.DEFAULT_LOGIN_MAX_DURATION = DEFAULT_LOGIN_MAX_DURATION;
 exports.DEFAULT_LOGIN_POLL_INTERVAL = DEFAULT_LOGIN_POLL_INTERVAL;
@@ -10629,7 +10621,6 @@ exports.getModulePathRange = getModulePathRange;
 exports.getPersonalAccessTokenPath = getPersonalAccessTokenPath;
 exports.getSettings = getSettings;
 exports.getValidationErrorFileRef = getValidationErrorFileRef;
-exports.hasRemoteFileSchema = hasRemoteFileSchema;
 exports.loadValModules = loadValModules;
 exports.parsePersonalAccessTokenFile = parsePersonalAccessTokenFile;
 exports.patchSourceFile = patchSourceFile;

package/dist/valbuild-server.esm.js

@@ -1,6 +1,7 @@
 import ts from 'typescript';
 import { pipe, result, array } from '@valbuild/core/fp';
-import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, VAL_EXTENSION, derefPatch, RecordSchema, Internal, extractValModules, ImageSchema, DEFAULT_CONTENT_HOST } from '@valbuild/core';
+import { FILE_REF_PROP, FILE_REF_SUBTYPE_TAG, VAL_EXTENSION, derefPatch, RecordSchema, Internal, extractValModules, ImageSchema, DEFAULT_CONTENT_HOST, hasRemoteFileSchema } from '@valbuild/core';
+export { hasRemoteFileSchema } from '@valbuild/core';
 import { PatchError, deepEqual, parseAndValidateArrayIndex, isNotRoot, applyPatch, JSONOps, deepClone, sourceToPatchPath } from '@valbuild/core/patch';
 import * as path from 'path';
 import path__default from 'path';
@@ -1528,6 +1529,35 @@ function resolveExistingJsonPath(moduleFilePath, importPath) {
  * module errors (see `findNestedJsonValuesRecords`), so they can never reach
  * here — if that guard is ever relaxed, this must become a recursive visitor or
  * nested entries silently get no content validation at all.
+ *
+ * ## NOT validated, and it should be: the entry's FILE PATH
+ *
+ * The key↔file mapping is canonical. `getNewJsonEntryPaths` derives it, and both
+ * write paths use it — the `jsonValues:extract-entry` fix and the patch commit:
+ *
+ *     /content/kb.val.ts  +  key "kb-000"  ->  /content/kb/kb-000.val.json
+ *
+ * This function does not check it. It calls the thunk and validates whatever
+ * comes back, so an entry may point at ANY file in the project and pass. The
+ * repo's own fixture does exactly that — `examples/next/content/kb.val.ts` has
+ * `"kb-000": c.json(() => import("./kb/entry-000.val.json"))`, where the
+ * canonical path is `./kb/kb-000.val.json`, and `val validate` calls it valid.
+ *
+ * Two consequences, the first a live bug:
+ *
+ * - **A key rename writes to the DERIVED path**, which for a non-canonical entry
+ *   is not the file the old key was reading. The old file is orphaned and the new
+ *   key reads a file that was never written.
+ * - It blocks localising entry staleness. `jsonEntriesSha` cannot say which entry
+ *   changed, so the client drops a whole module's loaded content; with the mapping
+ *   guaranteed, a changed file resolves to one key by derivation alone.
+ *
+ * The fix belongs here and needs no new machinery: the module's `.val.ts` is
+ * already parsed (`ValSourceFileHandler`), so the import specifier is readable
+ * from the AST — no `thunk.toString()`, which a bundler would defeat. A
+ * `jsonValues:rename-entry-file` fix could move the file and rewrite the import,
+ * exactly as `extract-entry` writes both. See `packages/ui/spa/stores/openquestions.md`
+ * item 9b.
  */
 async function validateJsonValuesEntries(schema, source, modulePath) {
   const out = {};
@@ -5789,51 +5819,6 @@ function parsePersonalAccessTokenFile(content) {
   }
 }
 
-/**
- * Iterates through all schemas and find if there is 1 or more remote files in them
- */
-function hasRemoteFileSchema(schema) {
-  if (schema.type === "file" || schema.type === "image") {
-    return !!schema.remote;
-  } else if (schema.type === "richtext") {
-    var _schema$options;
-    if (typeof ((_schema$options = schema.options) === null || _schema$options === void 0 || (_schema$options = _schema$options.inline) === null || _schema$options === void 0 ? void 0 : _schema$options.img) === "object") {
-      return hasRemoteFileSchema(schema.options.inline.img);
-    }
-    return false;
-  } else if (schema.type === "array" || schema.type === "record") {
-    return hasRemoteFileSchema(schema.item);
-  } else if (schema.type === "object") {
-    for (const key in schema.items) {
-      const hasRemoteFile = hasRemoteFileSchema(schema.items[key]);
-      if (hasRemoteFile) {
-        return true;
-      }
-    }
-    return false;
-  } else if (schema.type === "union") {
-    const unionStringSchema = typeof schema.key === "object" && schema.key.type === "literal" ? schema : undefined;
-    const unionObjectSchema = typeof schema.key === "string" ? schema : undefined;
-    if (unionStringSchema) {
-      return false;
-    }
-    if (unionObjectSchema) {
-      for (const key in unionObjectSchema.items) {
-        const hasRemoteFile = hasRemoteFileSchema(unionObjectSchema.items[key]);
-        if (hasRemoteFile) {
-          return true;
-        }
-      }
-    }
-    return false;
-  } else if (schema.type === "boolean" || schema.type === "number" || schema.type === "string" || schema.type === "literal" || schema.type === "date" || schema.type === "dateTime" || schema.type === "color" || schema.type === "keyOf" || schema.type === "route") {
-    return false;
-  } else {
-    const exhaustiveCheck = schema;
-    throw new Error(`Unexpected schema: ${JSON.stringify(exhaustiveCheck)}`);
-  }
-}
-
 /* eslint-disable @typescript-eslint/no-unused-vars */
 const ValServer = (valModules, options, callbacks) => {
   const AIContentBlock = z.union([z.object({
@@ -7432,7 +7417,11 @@ const ValServer = (valModules, options, callbacks) => {
                 sourceFilePatchErrors: Object.fromEntries(Object.entries(preparedCommit.sourceFilePatchErrors).map(([key, errors]) => [key, errors.map(e => ({
                   message: formatPatchSourceError(e)
                 }))])),
-                binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors
+                binaryFilePatchErrors: preparedCommit.binaryFilePatchErrors,
+                // Attributed to the patch that caused it, so the studio can
+                // name the offending change and offer to remove it instead of
+                // leaving the editor with "Failed to publish changes".
+                unappliablePatches: preparedCommit.unappliablePatches
               }
             }
           };
@@ -10555,4 +10544,4 @@ function readCapturedReport(snapshotDir) {
   return JSON.parse(fs.readFileSync(reportPath, "utf-8"));
 }
 
-export { DEFAULT_LOGIN_HOST, DEFAULT_LOGIN_MAX_DURATION, DEFAULT_LOGIN_POLL_INTERVAL, Service, ValFSHost, ValLoginError, ValModuleLoader, ValOpsFS, ValOpsHttp, ValSourceFileHandler, analyzeValModule, awaitValLoginConfirmation, checkRemoteRef, compareWithCapturedReport, createFixPatch, createJsonEntryPathMap, createModulePathMap, createService, createValApiRouter, createValServer, decodeJwt, downloadFileFromRemote, encodeJwt, evalValConfigFile, extractFileMetadata, extractImageMetadata, extractJsonValuesEntry, findAndEvalValConfigFile, findJsonEntryFilePath, formatPatchSourceError, formatSyntaxErrorTree, getCachedRemoteFileDir, getCachedRemoteFilePath, getCompilerOptions, getExpire, getFileExt, getModulePathRange, getPersonalAccessTokenPath, getSettings, getValidationErrorFileRef, hasRemoteFileSchema, loadValModules, parsePersonalAccessTokenFile, patchSourceFile, persistPersonalAccessToken, readCapturedReport, replaySnapshot, safeReadGit, startValLogin, uploadRemoteFile, validateMetadata };
+export { DEFAULT_LOGIN_HOST, DEFAULT_LOGIN_MAX_DURATION, DEFAULT_LOGIN_POLL_INTERVAL, Service, ValFSHost, ValLoginError, ValModuleLoader, ValOpsFS, ValOpsHttp, ValSourceFileHandler, analyzeValModule, awaitValLoginConfirmation, checkRemoteRef, compareWithCapturedReport, createFixPatch, createJsonEntryPathMap, createModulePathMap, createService, createValApiRouter, createValServer, decodeJwt, downloadFileFromRemote, encodeJwt, evalValConfigFile, extractFileMetadata, extractImageMetadata, extractJsonValuesEntry, findAndEvalValConfigFile, findJsonEntryFilePath, formatPatchSourceError, formatSyntaxErrorTree, getCachedRemoteFileDir, getCachedRemoteFilePath, getCompilerOptions, getExpire, getFileExt, getModulePathRange, getPersonalAccessTokenPath, getSettings, getValidationErrorFileRef, loadValModules, parsePersonalAccessTokenFile, patchSourceFile, persistPersonalAccessToken, readCapturedReport, replaySnapshot, safeReadGit, startValLogin, uploadRemoteFile, validateMetadata };

package/package.json

@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.101.0",
+  "version": "0.102.0",
   "devDependencies": {
     "@prettier/sync": "^0.6.1",
     "@types/jest": "^30.0.0"
@@ -29,9 +29,9 @@
     "typescript": "^5.9.3",
     "zod": "^4.3.5",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.101.0",
-    "@valbuild/shared": "0.101.0",
-    "@valbuild/ui": "0.101.0"
+    "@valbuild/core": "0.102.0",
+    "@valbuild/shared": "0.102.0",
+    "@valbuild/ui": "0.102.0"
   },
   "engines": {
     "node": ">=18.17.0"

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

@@ -1,5 +0,0 @@
-import { SerializedSchema } from "@valbuild/core";
-/**
- * Iterates through all schemas and find if there is 1 or more remote files in them
- */
-export declare function hasRemoteFileSchema(schema: SerializedSchema): boolean;