@valbuild/language-server 0.126.0 → 0.128.0

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # @valbuild/language-server
 
+## 0.128.0
+
+### Patch Changes
+
+- Updated dependencies [[`8b52b33`](https://github.com/valbuild/val/commit/8b52b33e1f629f14f66cc71dcc7cf415d210c7d4), [`362fb49`](https://github.com/valbuild/val/commit/362fb49f30d2b04c4ff78d54dca2bf5ad978a05c), [`c595799`](https://github.com/valbuild/val/commit/c59579977a436ec530c6c69f2b340ab9829d97ab)]:
+  - @valbuild/core@0.128.0
+  - @valbuild/server@0.128.0
+  - @valbuild/shared@0.128.0
+
+## 0.127.0
+
+### Patch Changes
+
+- Updated dependencies [[`7fa8699`](https://github.com/valbuild/val/commit/7fa869974bc895af992a7d5c18b76253636d7d65), [`5b7fe05`](https://github.com/valbuild/val/commit/5b7fe05cec6365f9cd1de9ba31e65ed4a87edb63), [`88262ac`](https://github.com/valbuild/val/commit/88262ac8db068650a664981ef73556457d87741a), [`7072e07`](https://github.com/valbuild/val/commit/7072e07623c953a09ac14388ae22dada0b431ce3), [`29811c3`](https://github.com/valbuild/val/commit/29811c3f8c7e001a950e6f4833af6888e6a4efea)]:
+  - @valbuild/core@0.127.0
+  - @valbuild/shared@0.127.0
+  - @valbuild/server@0.127.0
+
 ## 0.126.0
 
 ### Patch Changes

package/README.md

@@ -154,7 +154,7 @@ shape, or changed semantics an older client would misread.
 | `fix/download-remote`      | Download a remote file back into the project.                                                                                                                                |
 | `login`                    | The `val.login` command (device flow; writes `.val/pat.json`, the same file the CLI uses).                                                                                   |
 | `completions/mediaPath`    | The `path` of an image or file, with `width`/`height`/`mimeType` filled in on accept.                                                                                        |
-| `completions/galleryKey`   | Keys of an `s.images()` / `s.files()` collection.                                                                                                                            |
+| `completions/galleryKey`   | Keys of an `s.imageset()` / `s.fileset()` collection.                                                                                                                        |
 | `completions/keyOf`        | Keys of the record or object an `s.keyOf()` field points at.                                                                                                                 |
 | `completions/route`        | Routes the project defines.                                                                                                                                                  |
 | `completions/richtextLink` | Route completion inside a richtext inline link's `href`.                                                                                                                     |

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

@@ -206,7 +206,7 @@ export type GalleryMembership = {
     /** Module path of the gallery this field points at. */
     referencedModule: string;
     /** The gallery's directory, when it declares one. */
-    directory?: string;
+    dir?: string;
     /** The path the field currently holds. */
     path: string;
     /** `image` or `file`, for wording and for which metadata to read. */

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

@@ -183,7 +183,7 @@ var packageJson = {
 		"lsp",
 		"language-server"
 	],
-	version: "0.126.0",
+	version: "0.128.0",
 	bin: {
 		"val-language-server": "./bin.js"
 	},
@@ -1707,7 +1707,7 @@ function longestResolvedPrefixRange(modulePath, modulePathMap) {
 /**
  * Gallery checks core emits unconditionally.
  *
- * `RecordSchema.validate` attaches these to every `s.images()` / `s.files()`
+ * `RecordSchema.validate` attaches these to every `s.imageset()` / `s.fileset()`
  * module whether or not anything is actually wrong (see
  * `packages/core/src/schema/record.ts`): they are placeholders asking someone to
  * go and look. `val validate` looks by running the matching fix handler, which
@@ -1786,8 +1786,17 @@ function galleryCheckKey(sourcePath, error) {
   return `${sourcePath}|${(error.fixes ?? []).join(",")}`;
 }
 
-/** Fixes core cannot resolve without a project-wide snapshot. */
-const DEFERRED_FIXES = ["keyof:check-keys", "router:check-route"];
+/**
+ * Fixes core cannot resolve without a project-wide snapshot.
+ *
+ * The shared list, not a copy: this had its own and fell behind by two, so a
+ * locale field and a declared-key record each put the marker's developer-facing
+ * placeholder — "should typically be processed by Val internally … version
+ * mismatch" — into the editor's diagnostics whenever the snapshot was missing.
+ * Every caller that recognises some of these has to recognise all of them; see
+ * `SCHEMA_SOURCE_FIXES`.
+ */
+const DEFERRED_FIXES = internal.SCHEMA_SOURCE_FIXES;
 
 /**
  * Fallback for when no snapshot is available: drop the placeholders rather than
@@ -1847,7 +1856,7 @@ function galleryMembershipAt({
     return undefined;
   }
   const gallery = snapshot?.schemas[referencedModule];
-  const directory = gallery?.type === "record" && typeof gallery.directory === "string" ? gallery.directory : undefined;
+  const dir = gallery?.type === "record" && typeof gallery.dir === "string" ? gallery.dir : undefined;
   // Core emits TWO fixless errors on a gallery-backed field: this one, and "an
   // image from a gallery must not carry its own width, height...". Both look
   // identical from here, and offering "add it to the gallery" for the second
@@ -1862,8 +1871,8 @@ function galleryMembershipAt({
   }
   return {
     referencedModule,
-    ...(directory !== undefined ? {
-      directory
+    ...(dir !== undefined ? {
+      dir
     } : {}),
     path: currentPath,
     mediaType: schema.type
@@ -3446,7 +3455,7 @@ function createSchemaDrivenCompletions({
     if (!container || typeof container !== "object" || !("type" in container) || container.type !== "record" || !("mediaType" in container) || !container.mediaType) {
       return [];
     }
-    const directory = "directory" in container && typeof container.directory === "string" ? container.directory : undefined;
+    const directory = "dir" in container && typeof container.dir === "string" ? container.dir : undefined;
     const galleryFiles = container.mediaType === "images" ? files.images(directory) : files.list(directory);
     return items(galleryFiles.map(file => file.ref), vscodeLanguageserver.CompletionItemKind.File, range);
   }
@@ -3512,11 +3521,11 @@ function mediaPathItems({
 }) {
   const referencedModule = typeof container.referencedModule === "string" ? container.referencedModule : undefined;
   const options = container.options;
-  let directory = typeof options?.directory === "string" ? options.directory : undefined;
+  let directory = typeof options?.dir === "string" ? options.dir : undefined;
   if (directory === undefined && referencedModule) {
     const gallery = snapshot.schemas[referencedModule];
-    if (gallery?.type === "record" && typeof gallery.directory === "string") {
-      directory = gallery.directory;
+    if (gallery?.type === "record" && typeof gallery.dir === "string") {
+      directory = gallery.dir;
     }
   }
   const candidates = container.type === "image" ? files.images(directory) : files.list(directory);
@@ -3702,7 +3711,7 @@ async function createGalleryMembershipActions({
   if (register) {
     actions.push(register);
   }
-  if (allowRename && gallery.directory && onDisk) {
+  if (allowRename && gallery.dir && onDisk) {
     const move = createMoveIntoGalleryDirectoryAction({
       document,
       gallery,
@@ -3727,7 +3736,7 @@ async function createRegisterInGalleryAction({
     // a "file does not exist" one.
     return undefined;
   }
-  if (gallery.directory && !gallery.path.startsWith(`${gallery.directory}/`)) {
+  if (gallery.dir && !gallery.path.startsWith(`${gallery.dir}/`)) {
     // Outside the gallery's directory: registering it would break the gallery's
     // own directory check. Moving is the remedy, not registering.
     return undefined;
@@ -3768,7 +3777,7 @@ function createMoveIntoGalleryDirectoryAction({
   gallery,
   valRoot
 }) {
-  const directory = gallery.directory;
+  const directory = gallery.dir;
   if (!directory || gallery.path.startsWith(`${directory}/`)) {
     return undefined;
   }

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

@@ -183,7 +183,7 @@ var packageJson = {
 		"lsp",
 		"language-server"
 	],
-	version: "0.126.0",
+	version: "0.128.0",
 	bin: {
 		"val-language-server": "./bin.js"
 	},
@@ -1707,7 +1707,7 @@ function longestResolvedPrefixRange(modulePath, modulePathMap) {
 /**
  * Gallery checks core emits unconditionally.
  *
- * `RecordSchema.validate` attaches these to every `s.images()` / `s.files()`
+ * `RecordSchema.validate` attaches these to every `s.imageset()` / `s.fileset()`
  * module whether or not anything is actually wrong (see
  * `packages/core/src/schema/record.ts`): they are placeholders asking someone to
  * go and look. `val validate` looks by running the matching fix handler, which
@@ -1786,8 +1786,17 @@ function galleryCheckKey(sourcePath, error) {
   return `${sourcePath}|${(error.fixes ?? []).join(",")}`;
 }
 
-/** Fixes core cannot resolve without a project-wide snapshot. */
-const DEFERRED_FIXES = ["keyof:check-keys", "router:check-route"];
+/**
+ * Fixes core cannot resolve without a project-wide snapshot.
+ *
+ * The shared list, not a copy: this had its own and fell behind by two, so a
+ * locale field and a declared-key record each put the marker's developer-facing
+ * placeholder — "should typically be processed by Val internally … version
+ * mismatch" — into the editor's diagnostics whenever the snapshot was missing.
+ * Every caller that recognises some of these has to recognise all of them; see
+ * `SCHEMA_SOURCE_FIXES`.
+ */
+const DEFERRED_FIXES = internal.SCHEMA_SOURCE_FIXES;
 
 /**
  * Fallback for when no snapshot is available: drop the placeholders rather than
@@ -1847,7 +1856,7 @@ function galleryMembershipAt({
     return undefined;
   }
   const gallery = snapshot?.schemas[referencedModule];
-  const directory = gallery?.type === "record" && typeof gallery.directory === "string" ? gallery.directory : undefined;
+  const dir = gallery?.type === "record" && typeof gallery.dir === "string" ? gallery.dir : undefined;
   // Core emits TWO fixless errors on a gallery-backed field: this one, and "an
   // image from a gallery must not carry its own width, height...". Both look
   // identical from here, and offering "add it to the gallery" for the second
@@ -1862,8 +1871,8 @@ function galleryMembershipAt({
   }
   return {
     referencedModule,
-    ...(directory !== undefined ? {
-      directory
+    ...(dir !== undefined ? {
+      dir
     } : {}),
     path: currentPath,
     mediaType: schema.type
@@ -3446,7 +3455,7 @@ function createSchemaDrivenCompletions({
     if (!container || typeof container !== "object" || !("type" in container) || container.type !== "record" || !("mediaType" in container) || !container.mediaType) {
       return [];
     }
-    const directory = "directory" in container && typeof container.directory === "string" ? container.directory : undefined;
+    const directory = "dir" in container && typeof container.dir === "string" ? container.dir : undefined;
     const galleryFiles = container.mediaType === "images" ? files.images(directory) : files.list(directory);
     return items(galleryFiles.map(file => file.ref), vscodeLanguageserver.CompletionItemKind.File, range);
   }
@@ -3512,11 +3521,11 @@ function mediaPathItems({
 }) {
   const referencedModule = typeof container.referencedModule === "string" ? container.referencedModule : undefined;
   const options = container.options;
-  let directory = typeof options?.directory === "string" ? options.directory : undefined;
+  let directory = typeof options?.dir === "string" ? options.dir : undefined;
   if (directory === undefined && referencedModule) {
     const gallery = snapshot.schemas[referencedModule];
-    if (gallery?.type === "record" && typeof gallery.directory === "string") {
-      directory = gallery.directory;
+    if (gallery?.type === "record" && typeof gallery.dir === "string") {
+      directory = gallery.dir;
     }
   }
   const candidates = container.type === "image" ? files.images(directory) : files.list(directory);
@@ -3702,7 +3711,7 @@ async function createGalleryMembershipActions({
   if (register) {
     actions.push(register);
   }
-  if (allowRename && gallery.directory && onDisk) {
+  if (allowRename && gallery.dir && onDisk) {
     const move = createMoveIntoGalleryDirectoryAction({
       document,
       gallery,
@@ -3727,7 +3736,7 @@ async function createRegisterInGalleryAction({
     // a "file does not exist" one.
     return undefined;
   }
-  if (gallery.directory && !gallery.path.startsWith(`${gallery.directory}/`)) {
+  if (gallery.dir && !gallery.path.startsWith(`${gallery.dir}/`)) {
     // Outside the gallery's directory: registering it would break the gallery's
     // own directory check. Moving is the remedy, not registering.
     return undefined;
@@ -3768,7 +3777,7 @@ function createMoveIntoGalleryDirectoryAction({
   gallery,
   valRoot
 }) {
-  const directory = gallery.directory;
+  const directory = gallery.dir;
   if (!directory || gallery.path.startsWith(`${directory}/`)) {
     return undefined;
   }

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

@@ -8,7 +8,7 @@ import { TextDocuments, TextDocumentSyncKind, createConnection, ProposedFeatures
 import { TextDocument } from 'vscode-languageserver-textdocument';
 import crypto from 'crypto';
 import { createRequire } from 'node:module';
-import { resolveSchemaSourceFixes, getRoutesWithModulePaths } from '@valbuild/shared/internal';
+import { 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.126.0",
+	version: "0.128.0",
 	bin: {
 		"val-language-server": "./bin.js"
 	},
@@ -1696,7 +1696,7 @@ function longestResolvedPrefixRange(modulePath, modulePathMap) {
 /**
  * Gallery checks core emits unconditionally.
  *
- * `RecordSchema.validate` attaches these to every `s.images()` / `s.files()`
+ * `RecordSchema.validate` attaches these to every `s.imageset()` / `s.fileset()`
  * module whether or not anything is actually wrong (see
  * `packages/core/src/schema/record.ts`): they are placeholders asking someone to
  * go and look. `val validate` looks by running the matching fix handler, which
@@ -1775,8 +1775,17 @@ function galleryCheckKey(sourcePath, error) {
   return `${sourcePath}|${(error.fixes ?? []).join(",")}`;
 }
 
-/** Fixes core cannot resolve without a project-wide snapshot. */
-const DEFERRED_FIXES = ["keyof:check-keys", "router:check-route"];
+/**
+ * Fixes core cannot resolve without a project-wide snapshot.
+ *
+ * The shared list, not a copy: this had its own and fell behind by two, so a
+ * locale field and a declared-key record each put the marker's developer-facing
+ * placeholder — "should typically be processed by Val internally … version
+ * mismatch" — into the editor's diagnostics whenever the snapshot was missing.
+ * Every caller that recognises some of these has to recognise all of them; see
+ * `SCHEMA_SOURCE_FIXES`.
+ */
+const DEFERRED_FIXES = SCHEMA_SOURCE_FIXES;
 
 /**
  * Fallback for when no snapshot is available: drop the placeholders rather than
@@ -1836,7 +1845,7 @@ function galleryMembershipAt({
     return undefined;
   }
   const gallery = snapshot?.schemas[referencedModule];
-  const directory = gallery?.type === "record" && typeof gallery.directory === "string" ? gallery.directory : undefined;
+  const dir = gallery?.type === "record" && typeof gallery.dir === "string" ? gallery.dir : undefined;
   // Core emits TWO fixless errors on a gallery-backed field: this one, and "an
   // image from a gallery must not carry its own width, height...". Both look
   // identical from here, and offering "add it to the gallery" for the second
@@ -1851,8 +1860,8 @@ function galleryMembershipAt({
   }
   return {
     referencedModule,
-    ...(directory !== undefined ? {
-      directory
+    ...(dir !== undefined ? {
+      dir
     } : {}),
     path: currentPath,
     mediaType: schema.type
@@ -3435,7 +3444,7 @@ function createSchemaDrivenCompletions({
     if (!container || typeof container !== "object" || !("type" in container) || container.type !== "record" || !("mediaType" in container) || !container.mediaType) {
       return [];
     }
-    const directory = "directory" in container && typeof container.directory === "string" ? container.directory : undefined;
+    const directory = "dir" in container && typeof container.dir === "string" ? container.dir : undefined;
     const galleryFiles = container.mediaType === "images" ? files.images(directory) : files.list(directory);
     return items(galleryFiles.map(file => file.ref), CompletionItemKind.File, range);
   }
@@ -3501,11 +3510,11 @@ function mediaPathItems({
 }) {
   const referencedModule = typeof container.referencedModule === "string" ? container.referencedModule : undefined;
   const options = container.options;
-  let directory = typeof options?.directory === "string" ? options.directory : undefined;
+  let directory = typeof options?.dir === "string" ? options.dir : undefined;
   if (directory === undefined && referencedModule) {
     const gallery = snapshot.schemas[referencedModule];
-    if (gallery?.type === "record" && typeof gallery.directory === "string") {
-      directory = gallery.directory;
+    if (gallery?.type === "record" && typeof gallery.dir === "string") {
+      directory = gallery.dir;
     }
   }
   const candidates = container.type === "image" ? files.images(directory) : files.list(directory);
@@ -3691,7 +3700,7 @@ async function createGalleryMembershipActions({
   if (register) {
     actions.push(register);
   }
-  if (allowRename && gallery.directory && onDisk) {
+  if (allowRename && gallery.dir && onDisk) {
     const move = createMoveIntoGalleryDirectoryAction({
       document,
       gallery,
@@ -3716,7 +3725,7 @@ async function createRegisterInGalleryAction({
     // a "file does not exist" one.
     return undefined;
   }
-  if (gallery.directory && !gallery.path.startsWith(`${gallery.directory}/`)) {
+  if (gallery.dir && !gallery.path.startsWith(`${gallery.dir}/`)) {
     // Outside the gallery's directory: registering it would break the gallery's
     // own directory check. Moving is the remedy, not registering.
     return undefined;
@@ -3757,7 +3766,7 @@ function createMoveIntoGalleryDirectoryAction({
   gallery,
   valRoot
 }) {
-  const directory = gallery.directory;
+  const directory = gallery.dir;
   if (!directory || gallery.path.startsWith(`${directory}/`)) {
     return undefined;
   }

package/package.json

@@ -11,7 +11,7 @@
     "lsp",
     "language-server"
   ],
-  "version": "0.126.0",
+  "version": "0.128.0",
   "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.126.0",
-    "@valbuild/server": "0.126.0",
-    "@valbuild/shared": "0.126.0"
+    "@valbuild/server": "0.128.0",
+    "@valbuild/shared": "0.128.0",
+    "@valbuild/core": "0.128.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",