@valbuild/language-server 0.150.0 → 0.150.1

package/CHANGELOG.md

@@ -1,5 +1,59 @@
 # @valbuild/language-server
 
+## 0.150.1
+
+### Patch Changes
+
+- [#894](https://github.com/valbuild/val/pull/894) [`9171baa`](https://github.com/valbuild/val/commit/9171baad7beb1b2a355c70724d2339467b126e02) Thanks [@freekh](https://github.com/freekh)! - `val validate` no longer fails a project just because some of its files are
+  local while the project stores files remotely (`files: { remote: true }` or
+  `.remote()`). Every project made from a template starts like that, and the
+  site serves those files from `public/` until they are uploaded. They are now
+  reported as **warnings**, grouped into one block per file with the command
+  that uploads them:
+
+  ```
+  content/images.val.ts  ⚠ 7 warnings  (12ms)
+  │
+  │  ⚠  Local files in a project with remote files. Your site serves them from public/ for now; they move to remote storage when uploaded.
+  │
+  │     content/images.val.ts:7:5  /public/val/images/image-0_00000.png
+  │     content/images.val.ts:8:5  /public/val/images/image-1_00001.png
+  │     content/images.val.ts:9:5  /public/val/images/image-2_00002.png
+  │     content/images.val.ts:10:5  /public/val/images/image-3_00003.png
+  │     content/images.val.ts:11:5  /public/val/images/image-4_00004.png
+  │     … 2 more
+  │
+  │     → val validate --fix uploads them (needs val login)
+  │
+
+  ✔ No validation errors · 7 warnings in 1 file
+  ```
+
+  - `--strict` on `val validate` and `val publish` makes warnings fail too.
+  - `val validate --fix` still fails when it cannot upload them, for example
+    when you are not logged in.
+  - A local file that does not exist is still an error.
+  - The language server shows these as warnings.
+  - In the Studio, **Check everything** on the Validate page lists them with a
+    **Fix** button that uploads them, so a hosted project, which
+    has no command line, can move its template's images and files to remote
+    storage. That covers images, files and videos (a video's poster, captions
+    and HLS stream go up with it), images inside rich text included, and the
+    fields that picked a gallery image or a video from a set are updated with
+    it.
+  - On a hosted project, **Check everything** no longer reports the template's
+    images and videos as "The file is gone", and no longer offers a Fix that
+    would remove them from their gallery or video set.
+
+  Fixable errors are now printed with `✘`, like every other error, instead of
+  the `⚠` warnings use. They were always errors and still make `val validate`
+  fail.
+
+- Updated dependencies [[`9171baa`](https://github.com/valbuild/val/commit/9171baad7beb1b2a355c70724d2339467b126e02)]:
+  - @valbuild/core@0.150.1
+  - @valbuild/server@0.150.1
+  - @valbuild/shared@0.150.1
+
 ## 0.150.0
 
 ### Patch Changes

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

@@ -60,15 +60,18 @@ export type ValDiagnosticData = {
 /**
  * Severity policy, in one place.
  *
- * - **Warning** — Val can fix it automatically. Mirrors the CLI, which prints
- *   these with `⚠` (its `validation-fixable-error` event) rather than `✘`. In an
- *   editor a one-click-fixable metadata mismatch should not shout as loudly as a
- *   type error.
+ * - **Warning** — two kinds:
+ *   - A local file in a project with remote files (`isValidationWarning`).
+ *     The CLI calls this a warning too: `val validate` reports it and passes
+ *     unless `--strict`. Every project made from a template starts this way.
+ *   - Anything Val can fix automatically. In an editor a one-click-fixable
+ *     metadata mismatch should not shout as loudly as a type error. The CLI
+ *     still counts these as errors (`✘`, "run --fix") and exits non-zero, so
+ *     Warning here is about presentation, not about the problem being
+ *     optional.
  * - **Error** — everything else: the content is wrong, the schema is wrong, or
- *   the module does not work at all.
- *
- * Note that `val validate` still exits non-zero for fixable errors, so Warning
- * here is about presentation, not about the problem being optional.
+ *   the module does not work at all. A local file that does not exist is
+ *   `val/file-not-found`, an Error, whatever fix it was reported with.
  */
 export declare function severityFor({ code, fixes, }: {
     code: ValDiagnosticCode;

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

@@ -183,7 +183,7 @@ var packageJson = {
 		"lsp",
 		"language-server"
 	],
-	version: "0.150.0",
+	version: "0.150.1",
 	bin: {
 		"val-language-server": "./bin.js"
 	},
@@ -1371,20 +1371,29 @@ const VAL_DIAGNOSTIC_CODES = [/** Content does not satisfy the schema. */
 /**
  * Severity policy, in one place.
  *
- * - **Warning** — Val can fix it automatically. Mirrors the CLI, which prints
- *   these with `⚠` (its `validation-fixable-error` event) rather than `✘`. In an
- *   editor a one-click-fixable metadata mismatch should not shout as loudly as a
- *   type error.
+ * - **Warning** — two kinds:
+ *   - A local file in a project with remote files (`isValidationWarning`).
+ *     The CLI calls this a warning too: `val validate` reports it and passes
+ *     unless `--strict`. Every project made from a template starts this way.
+ *   - Anything Val can fix automatically. In an editor a one-click-fixable
+ *     metadata mismatch should not shout as loudly as a type error. The CLI
+ *     still counts these as errors (`✘`, "run --fix") and exits non-zero, so
+ *     Warning here is about presentation, not about the problem being
+ *     optional.
  * - **Error** — everything else: the content is wrong, the schema is wrong, or
- *   the module does not work at all.
- *
- * Note that `val validate` still exits non-zero for fixable errors, so Warning
- * here is about presentation, not about the problem being optional.
+ *   the module does not work at all. A local file that does not exist is
+ *   `val/file-not-found`, an Error, whatever fix it was reported with.
  */
 function severityFor({
   code,
   fixes
 }) {
+  // Its own branch, so it stays a warning if the one below ever changes.
+  if (code === "val/validation" && internal.isValidationWarning({
+    fixes
+  })) {
+    return vscodeLanguageserver.DiagnosticSeverity.Warning;
+  }
   if (code === "val/validation" && fixes && fixes.length > 0) {
     return vscodeLanguageserver.DiagnosticSeverity.Warning;
   }
@@ -1418,7 +1427,16 @@ const FILE_FIXES = ["image:add-metadata", "image:check-metadata", "image:upload-
 // Local only: core never asks a remote video for its metadata.
 "video:add-metadata",
 // The same, for a video set's entry, whose file is its KEY.
-"videos:add-metadata"];
+"videos:add-metadata",
+// A collection entry still to upload: its file is its key too, and a
+// missing one has to stay an error rather than read as the warning
+// `isValidationWarning` makes of the upload.
+"images:upload-remote", "files:upload-remote", "videos:upload-remote",
+// A video still to upload: `path` is the video's file.
+"video:upload-remote"];
+
+/** Fixes reported on a collection entry, whose file is its key, not a `path`. */
+const KEYED_BY_FILE = ["videos:add-metadata", "images:upload-remote", "files:upload-remote", "videos:upload-remote"];
 function build(range, message, data) {
   return {
     range,
@@ -1592,18 +1610,38 @@ function missingFileRef({
   try {
     const [, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
     const resolved = core.Internal.resolvePath(modulePath, content.source, content.schema);
-    const ref = fixes.includes("videos:add-metadata") ?
-    // A video set entry is keyed by its file; the value has no `path`.
-    core.Internal.splitModulePath(modulePath).pop() : resolved.source?.path;
-    if (typeof ref !== "string") {
-      return undefined;
+    const value = resolved.source;
+    const source = isRecord(value) ? value : undefined;
+    const refs = fixes.some(fix => KEYED_BY_FILE.includes(fix)) ?
+    // A collection entry is keyed by its file; the value has no `path`.
+    [core.Internal.splitModulePath(modulePath).pop()] : [source?.path];
+    if (fixes.includes("video:upload-remote") || fixes.includes("videos:upload-remote")) {
+      // Every file the upload moves, as the CLI checks before it moves any:
+      // the poster and captions too. A field picked from a set moves only
+      // those -- the video is the set's (`movablePathsOf`).
+      if (fixes.includes("video:upload-remote") && resolved.schema.type === "video" && resolved.schema.referencedModule !== undefined) {
+        refs.length = 0;
+      }
+      if (isRecord(source?.poster)) {
+        refs.push(source.poster.path);
+      }
+      if (Array.isArray(source?.captions)) {
+        for (const track of source.captions) {
+          if (isRecord(track)) refs.push(track.path);
+        }
+      }
     }
-    // Remote references are URLs and are not expected on disk.
-    if (core.Internal.remote.splitRemoteRef(ref).status === "success") {
-      return undefined;
+    for (const ref of refs) {
+      // Remote references are URLs and are not expected on disk.
+      if (typeof ref !== "string" || core.Internal.remote.splitRemoteRef(ref).status === "success") {
+        continue;
+      }
+      const filePath = path__default["default"].join(valRoot, ref);
+      if (!fs__default["default"].existsSync(filePath)) {
+        return filePath;
+      }
     }
-    const filePath = path__default["default"].join(valRoot, ref);
-    return fs__default["default"].existsSync(filePath) ? undefined : filePath;
+    return undefined;
   } catch {
     // Resolution can fail when the schema failed to serialize; skip the check
     // rather than dropping the underlying validation error.
@@ -1901,6 +1939,9 @@ function galleryMembershipAt({
     mediaType: schema.type
   };
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 /**
  * Narrow an edit down to the region that actually changed.

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

@@ -183,7 +183,7 @@ var packageJson = {
 		"lsp",
 		"language-server"
 	],
-	version: "0.150.0",
+	version: "0.150.1",
 	bin: {
 		"val-language-server": "./bin.js"
 	},
@@ -1371,20 +1371,29 @@ const VAL_DIAGNOSTIC_CODES = [/** Content does not satisfy the schema. */
 /**
  * Severity policy, in one place.
  *
- * - **Warning** — Val can fix it automatically. Mirrors the CLI, which prints
- *   these with `⚠` (its `validation-fixable-error` event) rather than `✘`. In an
- *   editor a one-click-fixable metadata mismatch should not shout as loudly as a
- *   type error.
+ * - **Warning** — two kinds:
+ *   - A local file in a project with remote files (`isValidationWarning`).
+ *     The CLI calls this a warning too: `val validate` reports it and passes
+ *     unless `--strict`. Every project made from a template starts this way.
+ *   - Anything Val can fix automatically. In an editor a one-click-fixable
+ *     metadata mismatch should not shout as loudly as a type error. The CLI
+ *     still counts these as errors (`✘`, "run --fix") and exits non-zero, so
+ *     Warning here is about presentation, not about the problem being
+ *     optional.
  * - **Error** — everything else: the content is wrong, the schema is wrong, or
- *   the module does not work at all.
- *
- * Note that `val validate` still exits non-zero for fixable errors, so Warning
- * here is about presentation, not about the problem being optional.
+ *   the module does not work at all. A local file that does not exist is
+ *   `val/file-not-found`, an Error, whatever fix it was reported with.
  */
 function severityFor({
   code,
   fixes
 }) {
+  // Its own branch, so it stays a warning if the one below ever changes.
+  if (code === "val/validation" && internal.isValidationWarning({
+    fixes
+  })) {
+    return vscodeLanguageserver.DiagnosticSeverity.Warning;
+  }
   if (code === "val/validation" && fixes && fixes.length > 0) {
     return vscodeLanguageserver.DiagnosticSeverity.Warning;
   }
@@ -1418,7 +1427,16 @@ const FILE_FIXES = ["image:add-metadata", "image:check-metadata", "image:upload-
 // Local only: core never asks a remote video for its metadata.
 "video:add-metadata",
 // The same, for a video set's entry, whose file is its KEY.
-"videos:add-metadata"];
+"videos:add-metadata",
+// A collection entry still to upload: its file is its key too, and a
+// missing one has to stay an error rather than read as the warning
+// `isValidationWarning` makes of the upload.
+"images:upload-remote", "files:upload-remote", "videos:upload-remote",
+// A video still to upload: `path` is the video's file.
+"video:upload-remote"];
+
+/** Fixes reported on a collection entry, whose file is its key, not a `path`. */
+const KEYED_BY_FILE = ["videos:add-metadata", "images:upload-remote", "files:upload-remote", "videos:upload-remote"];
 function build(range, message, data) {
   return {
     range,
@@ -1592,18 +1610,38 @@ function missingFileRef({
   try {
     const [, modulePath] = core.Internal.splitModuleFilePathAndModulePath(sourcePath);
     const resolved = core.Internal.resolvePath(modulePath, content.source, content.schema);
-    const ref = fixes.includes("videos:add-metadata") ?
-    // A video set entry is keyed by its file; the value has no `path`.
-    core.Internal.splitModulePath(modulePath).pop() : resolved.source?.path;
-    if (typeof ref !== "string") {
-      return undefined;
+    const value = resolved.source;
+    const source = isRecord(value) ? value : undefined;
+    const refs = fixes.some(fix => KEYED_BY_FILE.includes(fix)) ?
+    // A collection entry is keyed by its file; the value has no `path`.
+    [core.Internal.splitModulePath(modulePath).pop()] : [source?.path];
+    if (fixes.includes("video:upload-remote") || fixes.includes("videos:upload-remote")) {
+      // Every file the upload moves, as the CLI checks before it moves any:
+      // the poster and captions too. A field picked from a set moves only
+      // those -- the video is the set's (`movablePathsOf`).
+      if (fixes.includes("video:upload-remote") && resolved.schema.type === "video" && resolved.schema.referencedModule !== undefined) {
+        refs.length = 0;
+      }
+      if (isRecord(source?.poster)) {
+        refs.push(source.poster.path);
+      }
+      if (Array.isArray(source?.captions)) {
+        for (const track of source.captions) {
+          if (isRecord(track)) refs.push(track.path);
+        }
+      }
     }
-    // Remote references are URLs and are not expected on disk.
-    if (core.Internal.remote.splitRemoteRef(ref).status === "success") {
-      return undefined;
+    for (const ref of refs) {
+      // Remote references are URLs and are not expected on disk.
+      if (typeof ref !== "string" || core.Internal.remote.splitRemoteRef(ref).status === "success") {
+        continue;
+      }
+      const filePath = path__default["default"].join(valRoot, ref);
+      if (!fs__default["default"].existsSync(filePath)) {
+        return filePath;
+      }
     }
-    const filePath = path__default["default"].join(valRoot, ref);
-    return fs__default["default"].existsSync(filePath) ? undefined : filePath;
+    return undefined;
   } catch {
     // Resolution can fail when the schema failed to serialize; skip the check
     // rather than dropping the underlying validation error.
@@ -1901,6 +1939,9 @@ function galleryMembershipAt({
     mediaType: schema.type
   };
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 /**
  * Narrow an edit down to the region that actually changed.

package/dist/valbuild-language-server.esm.js

@@ -8,7 +8,7 @@ import { TextDocument } from 'vscode-languageserver-textdocument';
 import crypto from 'crypto';
 import { createRequire } from 'node:module';
 import { fixHandlers, createService, analyzeValModule, createFixPatch, findJsonEntryFilePath, rebaseContentOp, classifyJsonValuesOp, parsePersonalAccessTokenFile, getPersonalAccessTokenPath, startValLogin, awaitValLoginConfirmation, persistPersonalAccessToken, ValLoginError, findAndEvalValConfigFile, patchSourceFile, getSettings, uploadRemoteFile, planJsonValuesEntryExtraction, extractVideoMetadataFromFile, extractImageMetadata, extractFileMetadata, findDefaultExport } from '@valbuild/server';
-import { resolveSchemaSourceFixes, SCHEMA_SOURCE_FIXES, getRoutesWithModulePaths } from '@valbuild/shared/internal';
+import { isValidationWarning, resolveSchemaSourceFixes, SCHEMA_SOURCE_FIXES, getRoutesWithModulePaths } from '@valbuild/shared/internal';
 import { result } from '@valbuild/core/fp';
 import { JSONOps, applyPatch, deepClone } from '@valbuild/core/patch';
 
@@ -172,7 +172,7 @@ var packageJson = {
 		"lsp",
 		"language-server"
 	],
-	version: "0.150.0",
+	version: "0.150.1",
 	bin: {
 		"val-language-server": "./bin.js"
 	},
@@ -1360,20 +1360,29 @@ const VAL_DIAGNOSTIC_CODES = [/** Content does not satisfy the schema. */
 /**
  * Severity policy, in one place.
  *
- * - **Warning** — Val can fix it automatically. Mirrors the CLI, which prints
- *   these with `⚠` (its `validation-fixable-error` event) rather than `✘`. In an
- *   editor a one-click-fixable metadata mismatch should not shout as loudly as a
- *   type error.
+ * - **Warning** — two kinds:
+ *   - A local file in a project with remote files (`isValidationWarning`).
+ *     The CLI calls this a warning too: `val validate` reports it and passes
+ *     unless `--strict`. Every project made from a template starts this way.
+ *   - Anything Val can fix automatically. In an editor a one-click-fixable
+ *     metadata mismatch should not shout as loudly as a type error. The CLI
+ *     still counts these as errors (`✘`, "run --fix") and exits non-zero, so
+ *     Warning here is about presentation, not about the problem being
+ *     optional.
  * - **Error** — everything else: the content is wrong, the schema is wrong, or
- *   the module does not work at all.
- *
- * Note that `val validate` still exits non-zero for fixable errors, so Warning
- * here is about presentation, not about the problem being optional.
+ *   the module does not work at all. A local file that does not exist is
+ *   `val/file-not-found`, an Error, whatever fix it was reported with.
  */
 function severityFor({
   code,
   fixes
 }) {
+  // Its own branch, so it stays a warning if the one below ever changes.
+  if (code === "val/validation" && isValidationWarning({
+    fixes
+  })) {
+    return DiagnosticSeverity.Warning;
+  }
   if (code === "val/validation" && fixes && fixes.length > 0) {
     return DiagnosticSeverity.Warning;
   }
@@ -1407,7 +1416,16 @@ const FILE_FIXES = ["image:add-metadata", "image:check-metadata", "image:upload-
 // Local only: core never asks a remote video for its metadata.
 "video:add-metadata",
 // The same, for a video set's entry, whose file is its KEY.
-"videos:add-metadata"];
+"videos:add-metadata",
+// A collection entry still to upload: its file is its key too, and a
+// missing one has to stay an error rather than read as the warning
+// `isValidationWarning` makes of the upload.
+"images:upload-remote", "files:upload-remote", "videos:upload-remote",
+// A video still to upload: `path` is the video's file.
+"video:upload-remote"];
+
+/** Fixes reported on a collection entry, whose file is its key, not a `path`. */
+const KEYED_BY_FILE = ["videos:add-metadata", "images:upload-remote", "files:upload-remote", "videos:upload-remote"];
 function build(range, message, data) {
   return {
     range,
@@ -1581,18 +1599,38 @@ function missingFileRef({
   try {
     const [, modulePath] = Internal.splitModuleFilePathAndModulePath(sourcePath);
     const resolved = Internal.resolvePath(modulePath, content.source, content.schema);
-    const ref = fixes.includes("videos:add-metadata") ?
-    // A video set entry is keyed by its file; the value has no `path`.
-    Internal.splitModulePath(modulePath).pop() : resolved.source?.path;
-    if (typeof ref !== "string") {
-      return undefined;
+    const value = resolved.source;
+    const source = isRecord(value) ? value : undefined;
+    const refs = fixes.some(fix => KEYED_BY_FILE.includes(fix)) ?
+    // A collection entry is keyed by its file; the value has no `path`.
+    [Internal.splitModulePath(modulePath).pop()] : [source?.path];
+    if (fixes.includes("video:upload-remote") || fixes.includes("videos:upload-remote")) {
+      // Every file the upload moves, as the CLI checks before it moves any:
+      // the poster and captions too. A field picked from a set moves only
+      // those -- the video is the set's (`movablePathsOf`).
+      if (fixes.includes("video:upload-remote") && resolved.schema.type === "video" && resolved.schema.referencedModule !== undefined) {
+        refs.length = 0;
+      }
+      if (isRecord(source?.poster)) {
+        refs.push(source.poster.path);
+      }
+      if (Array.isArray(source?.captions)) {
+        for (const track of source.captions) {
+          if (isRecord(track)) refs.push(track.path);
+        }
+      }
     }
-    // Remote references are URLs and are not expected on disk.
-    if (Internal.remote.splitRemoteRef(ref).status === "success") {
-      return undefined;
+    for (const ref of refs) {
+      // Remote references are URLs and are not expected on disk.
+      if (typeof ref !== "string" || Internal.remote.splitRemoteRef(ref).status === "success") {
+        continue;
+      }
+      const filePath = path.join(valRoot, ref);
+      if (!fs.existsSync(filePath)) {
+        return filePath;
+      }
     }
-    const filePath = path.join(valRoot, ref);
-    return fs.existsSync(filePath) ? undefined : filePath;
+    return undefined;
   } catch {
     // Resolution can fail when the schema failed to serialize; skip the check
     // rather than dropping the underlying validation error.
@@ -1890,6 +1928,9 @@ function galleryMembershipAt({
     mediaType: schema.type
   };
 }
+function isRecord(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
 
 /**
  * Narrow an edit down to the region that actually changed.

package/package.json

@@ -11,7 +11,7 @@
     "lsp",
     "language-server"
   ],
-  "version": "0.150.0",
+  "version": "0.150.1",
   "bin": {
     "val-language-server": "./bin.js"
   },
@@ -29,9 +29,9 @@
     "typescript": "^6.0.3",
     "vscode-languageserver": "^10.1.0",
     "vscode-languageserver-textdocument": "^1.0.14",
-    "@valbuild/core": "0.148.7",
-    "@valbuild/server": "0.150.0",
-    "@valbuild/shared": "0.149.7"
+    "@valbuild/core": "0.150.1",
+    "@valbuild/server": "0.150.1",
+    "@valbuild/shared": "0.150.1"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",