@telorun/ide-support 0.12.0 → 0.13.0

package/dist/diagnostics/fix-edit.d.ts

@@ -5,36 +5,13 @@
  *  scalar's quotes. (The YAML tag sits outside that span, so `!cel` survives a
  *  replacement without anything doing it on purpose.) Writing the bare value
  *  into a quoted span therefore strips the quotes, and a CEL expression is
- *  exactly the kind of text that stops being one scalar once unquoted: a
- *  `: ` inside it starts a mapping, a trailing `#` starts a comment, a leading
- *  `%` or `&` is an indicator.
+ *  exactly the kind of text that stops being one scalar once unquoted.
  *
- *  So the replacement is re-quoted in the style the author used, and promoted
- *  to double quotes when a plain scalar could not survive the round-trip. This
- *  lives here rather than in one editor because both surfaces — the VS Code
- *  extension's quick fix and the Tauri editor's — apply the same repair to the
- *  same source, and the two must not disagree about how a value is written. */
-/** Whether `value` can be written as a plain scalar without changing meaning. */
-export declare function isPlainSafe(value: string): boolean;
-/** Quote style of the source text a fix is replacing. */
-export type QuoteStyle = "double" | "single" | "plain";
-export declare function quoteStyleOf(source: string): QuoteStyle;
-/** Render `replacement` so it occupies `originalSource`'s span as the same
- *  scalar the author would have written by hand, or `undefined` when the span
- *  cannot be rewritten safely.
- *
- *  A plain original is kept plain when it can be — rewriting `Run.Sequenc` to
- *  `"Run.Sequence"` would be a correct but noisy diff on a kind name — and
- *  promoted to double quotes when the new value would not survive unquoted.
- *
- *  **A multi-line span is refused.** A block scalar's span covers its `|`/`>-`
- *  indicator AND its trailing newline, so writing a single-line scalar over it
- *  deletes the line break that ended the mapping entry and glues the next key
- *  onto the value — the document stops parsing. Re-emitting a block scalar
- *  correctly needs the node's indentation, which no consumer of this function
- *  has. A multi-line REPLACEMENT is refused for the mirror reason: its
- *  continuation lines would land at column 0, which is not a legal mapping
- *  value. `DiagnosticFix` promises a repair that can be applied without review,
- *  so the only honest answer for these is no repair. */
-export declare function renderFixReplacement(originalSource: string, replacement: string): string | undefined;
+ *  **The rule itself lives in `@telorun/analyzer`** (`yaml-source-edit.ts`),
+ *  not here. It started here because both editors' quick fixes had to agree
+ *  about how a value is written; `telo migrate` then became a third writer of
+ *  the same files, and the analyzer is below all three. Re-exported rather than
+ *  moved outright so a host keeps importing its repair rendering from the
+ *  package that owns the rest of its diagnostic presentation. */
+export { applyTextEdits, isPlainSafe, quoteStyleOf, renderFixReplacement, type QuoteStyle, type TextEdit, } from "@telorun/analyzer";
 //# sourceMappingURL=fix-edit.d.ts.map

package/dist/diagnostics/fix-edit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fix-edit.d.ts","sourceRoot":"","sources":["../../src/diagnostics/fix-edit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;+EAe+E;AAS/E,iFAAiF;AACjF,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAUlD;AAED,yDAAyD;AACzD,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC;AAEvD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,UAAU,CAIvD;AAED;;;;;;;;;;;;;;;;wDAgBwD;AACxD,wBAAgB,oBAAoB,CAClC,cAAc,EAAE,MAAM,EACtB,WAAW,EAAE,MAAM,GAClB,MAAM,GAAG,SAAS,CAcpB"}
+{"version":3,"file":"fix-edit.d.ts","sourceRoot":"","sources":["../../src/diagnostics/fix-edit.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;iEAciE;AAEjE,OAAO,EACL,cAAc,EACd,WAAW,EACX,YAAY,EACZ,oBAAoB,EACpB,KAAK,UAAU,EACf,KAAK,QAAQ,GACd,MAAM,mBAAmB,CAAC"}

package/dist/diagnostics/fix-edit.js

@@ -5,74 +5,12 @@
  *  scalar's quotes. (The YAML tag sits outside that span, so `!cel` survives a
  *  replacement without anything doing it on purpose.) Writing the bare value
  *  into a quoted span therefore strips the quotes, and a CEL expression is
- *  exactly the kind of text that stops being one scalar once unquoted: a
- *  `: ` inside it starts a mapping, a trailing `#` starts a comment, a leading
- *  `%` or `&` is an indicator.
+ *  exactly the kind of text that stops being one scalar once unquoted.
  *
- *  So the replacement is re-quoted in the style the author used, and promoted
- *  to double quotes when a plain scalar could not survive the round-trip. This
- *  lives here rather than in one editor because both surfaces — the VS Code
- *  extension's quick fix and the Tauri editor's — apply the same repair to the
- *  same source, and the two must not disagree about how a value is written. */
-/** Characters that make a plain (unquoted) YAML scalar reparse as something
- *  else. `-` and `?` are indicators only when followed by a space, so they are
- *  handled by the leading-token check rather than listed here. */
-const PLAIN_UNSAFE_LEAD = new Set([
-    "&", "*", "!", "|", ">", "%", "@", "`", "#", "'", '"', "{", "[", "}", "]", ",",
-]);
-/** Whether `value` can be written as a plain scalar without changing meaning. */
-export function isPlainSafe(value) {
-    if (value === "" || value.trim() !== value)
-        return false;
-    if (PLAIN_UNSAFE_LEAD.has(value[0]))
-        return false;
-    // `-`/`?`/`:` lead only matter when a space follows — `-x` is a scalar,
-    // `- x` is a sequence entry.
-    if (/^[-?:]\s/.test(value))
-        return false;
-    // A colon-space anywhere opens a mapping; a space-hash opens a comment.
-    if (value.includes(": ") || value.includes(" #"))
-        return false;
-    if (value.endsWith(":"))
-        return false;
-    return !/[\n\r]/.test(value);
-}
-export function quoteStyleOf(source) {
-    if (source.length >= 2 && source.startsWith('"') && source.endsWith('"'))
-        return "double";
-    if (source.length >= 2 && source.startsWith("'") && source.endsWith("'"))
-        return "single";
-    return "plain";
-}
-/** Render `replacement` so it occupies `originalSource`'s span as the same
- *  scalar the author would have written by hand, or `undefined` when the span
- *  cannot be rewritten safely.
- *
- *  A plain original is kept plain when it can be — rewriting `Run.Sequenc` to
- *  `"Run.Sequence"` would be a correct but noisy diff on a kind name — and
- *  promoted to double quotes when the new value would not survive unquoted.
- *
- *  **A multi-line span is refused.** A block scalar's span covers its `|`/`>-`
- *  indicator AND its trailing newline, so writing a single-line scalar over it
- *  deletes the line break that ended the mapping entry and glues the next key
- *  onto the value — the document stops parsing. Re-emitting a block scalar
- *  correctly needs the node's indentation, which no consumer of this function
- *  has. A multi-line REPLACEMENT is refused for the mirror reason: its
- *  continuation lines would land at column 0, which is not a legal mapping
- *  value. `DiagnosticFix` promises a repair that can be applied without review,
- *  so the only honest answer for these is no repair. */
-export function renderFixReplacement(originalSource, replacement) {
-    if (/[\n\r]/.test(originalSource) || /[\n\r]/.test(replacement))
-        return undefined;
-    const style = quoteStyleOf(originalSource);
-    if (style === "single") {
-        // A single-quoted YAML scalar escapes only the quote, by doubling it. CEL
-        // string literals use single quotes constantly, so this is the common case
-        // for an expression written in a single-quoted scalar.
-        return `'${replacement.replaceAll("'", "''")}'`;
-    }
-    if (style === "double" || !isPlainSafe(replacement)) {
-        return `"${replacement.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
-    }
-    return replacement;
-}
+ *  **The rule itself lives in `@telorun/analyzer`** (`yaml-source-edit.ts`),
+ *  not here. It started here because both editors' quick fixes had to agree
+ *  about how a value is written; `telo migrate` then became a third writer of
+ *  the same files, and the analyzer is below all three. Re-exported rather than
+ *  moved outright so a host keeps importing its repair rendering from the
+ *  package that owns the rest of its diagnostic presentation. */
+export { applyTextEdits, isPlainSafe, quoteStyleOf, renderFixReplacement, } from "@telorun/analyzer";

package/dist/diagnostics/graph-diagnostics.d.ts

@@ -21,9 +21,9 @@ export declare function compromisedFiles(graph: LoadedGraph): Set<string>;
  * (`suppressed`). The presentation policy lives here — not in the analyzer,
  * which only emits raw channels — so every host applies it identically.
  *
- * `diagnostics` folds parse, version-reconciliation, import-resolution, and the
- * *live* analysis diagnostics (those on non-compromised files) into one list,
- * in that order. `suppressed` carries the analysis cascade dropped from
+ * `diagnostics` folds parse, migration, version-reconciliation,
+ * import-resolution, and the *live* analysis diagnostics (those on
+ * non-compromised files) into one list, in that order. `suppressed` carries the analysis cascade dropped from
  * compromised files, still available to a host that wants to render it dimmed /
  * as related information rather than hide it.
  *

package/dist/diagnostics/graph-diagnostics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graph-diagnostics.d.ts","sourceRoot":"","sources":["../../src/diagnostics/graph-diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;AAG3B;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAShE;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,WAAW,EAClB,mBAAmB,EAAE,kBAAkB,EAAE,GACxC;IAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;IAAC,UAAU,EAAE,kBAAkB,EAAE,CAAA;CAAE,CAoBzE"}
+{"version":3,"file":"graph-diagnostics.d.ts","sourceRoot":"","sources":["../../src/diagnostics/graph-diagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,kBAAkB,EACvB,KAAK,WAAW,EACjB,MAAM,mBAAmB,CAAC;AAG3B;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,WAAW,GAAG,GAAG,CAAC,MAAM,CAAC,CAShE;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,wBAAwB,CACtC,KAAK,EAAE,WAAW,EAClB,mBAAmB,EAAE,kBAAkB,EAAE,GACxC;IAAE,WAAW,EAAE,kBAAkB,EAAE,CAAC;IAAC,UAAU,EAAE,kBAAkB,EAAE,CAAA;CAAE,CA0BzE"}

package/dist/diagnostics/graph-diagnostics.js

@@ -1,4 +1,4 @@
-import { importResolutionDiagnostics, } from "@telorun/analyzer";
+import { importResolutionDiagnostics, remapMigratedPaths, } from "@telorun/analyzer";
 import { findPositions } from "./find-positions.js";
 /**
  * Files whose static-analysis output is an unreliable cascade rather than a set
@@ -33,9 +33,9 @@ export function compromisedFiles(graph) {
  * (`suppressed`). The presentation policy lives here — not in the analyzer,
  * which only emits raw channels — so every host applies it identically.
  *
- * `diagnostics` folds parse, version-reconciliation, import-resolution, and the
- * *live* analysis diagnostics (those on non-compromised files) into one list,
- * in that order. `suppressed` carries the analysis cascade dropped from
+ * `diagnostics` folds parse, migration, version-reconciliation,
+ * import-resolution, and the *live* analysis diagnostics (those on
+ * non-compromised files) into one list, in that order. `suppressed` carries the analysis cascade dropped from
  * compromised files, still available to a host that wants to render it dimmed /
  * as related information rather than hide it.
  *
@@ -54,7 +54,12 @@ export function assembleGraphDiagnostics(graph, analysisDiagnostics) {
     const entrySource = graph.entry.owner.source;
     const live = [];
     const suppressed = [];
-    for (const d of analysisDiagnostics) {
+    // Analysis ran over the MIGRATED tree, while positions come from the raw
+    // file. Remapping each `data.path` back through the driver's provenance
+    // record is what keeps a squiggle on the author's own line after a key
+    // rename — and what stops a fix among them writing across a parent's span.
+    // A no-op when nothing in the graph was migrated.
+    for (const d of remapMigratedPaths(graph, analysisDiagnostics)) {
         const rawFilePath = d.data?.filePath;
         const file = findPositions(graph, d.data)?.file ?? rawFilePath ?? entrySource;
         (compromised.has(file) ? suppressed : live).push(d);
@@ -62,6 +67,7 @@ export function assembleGraphDiagnostics(graph, analysisDiagnostics) {
     return {
         diagnostics: [
             ...graph.parseDiagnostics,
+            ...graph.migrationDiagnostics,
             ...graph.versionDiagnostics,
             ...importResolutionDiagnostics(graph),
             ...live,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@telorun/ide-support",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "description": "Editor-host-agnostic IDE support (completions, diagnostic normalization) for Telo manifests.",
   "keywords": [
     "telo",
@@ -36,7 +36,7 @@
     "src/**"
   ],
   "dependencies": {
-    "@telorun/analyzer": "0.57.0"
+    "@telorun/analyzer": "0.58.0"
   },
   "devDependencies": {
     "@types/node": "^20.0.0",

package/src/diagnostics/fix-edit.ts

@@ -5,77 +5,20 @@
  *  scalar's quotes. (The YAML tag sits outside that span, so `!cel` survives a
  *  replacement without anything doing it on purpose.) Writing the bare value
  *  into a quoted span therefore strips the quotes, and a CEL expression is
- *  exactly the kind of text that stops being one scalar once unquoted: a
- *  `: ` inside it starts a mapping, a trailing `#` starts a comment, a leading
- *  `%` or `&` is an indicator.
+ *  exactly the kind of text that stops being one scalar once unquoted.
  *
- *  So the replacement is re-quoted in the style the author used, and promoted
- *  to double quotes when a plain scalar could not survive the round-trip. This
- *  lives here rather than in one editor because both surfaces — the VS Code
- *  extension's quick fix and the Tauri editor's — apply the same repair to the
- *  same source, and the two must not disagree about how a value is written. */
+ *  **The rule itself lives in `@telorun/analyzer`** (`yaml-source-edit.ts`),
+ *  not here. It started here because both editors' quick fixes had to agree
+ *  about how a value is written; `telo migrate` then became a third writer of
+ *  the same files, and the analyzer is below all three. Re-exported rather than
+ *  moved outright so a host keeps importing its repair rendering from the
+ *  package that owns the rest of its diagnostic presentation. */
 
-/** Characters that make a plain (unquoted) YAML scalar reparse as something
- *  else. `-` and `?` are indicators only when followed by a space, so they are
- *  handled by the leading-token check rather than listed here. */
-const PLAIN_UNSAFE_LEAD = new Set([
-  "&", "*", "!", "|", ">", "%", "@", "`", "#", "'", '"', "{", "[", "}", "]", ",",
-]);
-
-/** Whether `value` can be written as a plain scalar without changing meaning. */
-export function isPlainSafe(value: string): boolean {
-  if (value === "" || value.trim() !== value) return false;
-  if (PLAIN_UNSAFE_LEAD.has(value[0]!)) return false;
-  // `-`/`?`/`:` lead only matter when a space follows — `-x` is a scalar,
-  // `- x` is a sequence entry.
-  if (/^[-?:]\s/.test(value)) return false;
-  // A colon-space anywhere opens a mapping; a space-hash opens a comment.
-  if (value.includes(": ") || value.includes(" #")) return false;
-  if (value.endsWith(":")) return false;
-  return !/[\n\r]/.test(value);
-}
-
-/** Quote style of the source text a fix is replacing. */
-export type QuoteStyle = "double" | "single" | "plain";
-
-export function quoteStyleOf(source: string): QuoteStyle {
-  if (source.length >= 2 && source.startsWith('"') && source.endsWith('"')) return "double";
-  if (source.length >= 2 && source.startsWith("'") && source.endsWith("'")) return "single";
-  return "plain";
-}
-
-/** Render `replacement` so it occupies `originalSource`'s span as the same
- *  scalar the author would have written by hand, or `undefined` when the span
- *  cannot be rewritten safely.
- *
- *  A plain original is kept plain when it can be — rewriting `Run.Sequenc` to
- *  `"Run.Sequence"` would be a correct but noisy diff on a kind name — and
- *  promoted to double quotes when the new value would not survive unquoted.
- *
- *  **A multi-line span is refused.** A block scalar's span covers its `|`/`>-`
- *  indicator AND its trailing newline, so writing a single-line scalar over it
- *  deletes the line break that ended the mapping entry and glues the next key
- *  onto the value — the document stops parsing. Re-emitting a block scalar
- *  correctly needs the node's indentation, which no consumer of this function
- *  has. A multi-line REPLACEMENT is refused for the mirror reason: its
- *  continuation lines would land at column 0, which is not a legal mapping
- *  value. `DiagnosticFix` promises a repair that can be applied without review,
- *  so the only honest answer for these is no repair. */
-export function renderFixReplacement(
-  originalSource: string,
-  replacement: string,
-): string | undefined {
-  if (/[\n\r]/.test(originalSource) || /[\n\r]/.test(replacement)) return undefined;
-  const style = quoteStyleOf(originalSource);
-
-  if (style === "single") {
-    // A single-quoted YAML scalar escapes only the quote, by doubling it. CEL
-    // string literals use single quotes constantly, so this is the common case
-    // for an expression written in a single-quoted scalar.
-    return `'${replacement.replaceAll("'", "''")}'`;
-  }
-  if (style === "double" || !isPlainSafe(replacement)) {
-    return `"${replacement.replaceAll("\\", "\\\\").replaceAll('"', '\\"')}"`;
-  }
-  return replacement;
-}
+export {
+  applyTextEdits,
+  isPlainSafe,
+  quoteStyleOf,
+  renderFixReplacement,
+  type QuoteStyle,
+  type TextEdit,
+} from "@telorun/analyzer";

package/src/diagnostics/graph-diagnostics.ts

@@ -1,5 +1,6 @@
 import {
   importResolutionDiagnostics,
+  remapMigratedPaths,
   type AnalysisDiagnostic,
   type LoadedGraph,
 } from "@telorun/analyzer";
@@ -37,9 +38,9 @@ export function compromisedFiles(graph: LoadedGraph): Set<string> {
  * (`suppressed`). The presentation policy lives here — not in the analyzer,
  * which only emits raw channels — so every host applies it identically.
  *
- * `diagnostics` folds parse, version-reconciliation, import-resolution, and the
- * *live* analysis diagnostics (those on non-compromised files) into one list,
- * in that order. `suppressed` carries the analysis cascade dropped from
+ * `diagnostics` folds parse, migration, version-reconciliation,
+ * import-resolution, and the *live* analysis diagnostics (those on
+ * non-compromised files) into one list, in that order. `suppressed` carries the analysis cascade dropped from
  * compromised files, still available to a host that wants to render it dimmed /
  * as related information rather than hide it.
  *
@@ -61,7 +62,12 @@ export function assembleGraphDiagnostics(
   const entrySource = graph.entry.owner.source;
   const live: AnalysisDiagnostic[] = [];
   const suppressed: AnalysisDiagnostic[] = [];
-  for (const d of analysisDiagnostics) {
+  // Analysis ran over the MIGRATED tree, while positions come from the raw
+  // file. Remapping each `data.path` back through the driver's provenance
+  // record is what keeps a squiggle on the author's own line after a key
+  // rename — and what stops a fix among them writing across a parent's span.
+  // A no-op when nothing in the graph was migrated.
+  for (const d of remapMigratedPaths(graph, analysisDiagnostics)) {
     const rawFilePath = (d.data as { filePath?: string } | undefined)?.filePath;
     const file = findPositions(graph, d.data)?.file ?? rawFilePath ?? entrySource;
     (compromised.has(file) ? suppressed : live).push(d);
@@ -70,6 +76,7 @@ export function assembleGraphDiagnostics(
   return {
     diagnostics: [
       ...graph.parseDiagnostics,
+      ...graph.migrationDiagnostics,
       ...graph.versionDiagnostics,
       ...importResolutionDiagnostics(graph),
       ...live,