@rohal12/spindle-lsp 0.15.14 → 0.15.15

package/dist/bin.js

@@ -55,7 +55,7 @@ var VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    VERSION = false ? pkg.version : "0.15.14";
+    VERSION = false ? pkg.version : "0.15.15";
   }
 });
 
@@ -33390,6 +33390,20 @@ var init_markup_index = __esm({
   }
 });
 
+// src/core/workspace/story-data.ts
+import { createRequire as createCompilerRequire2 } from "node:module";
+function readStoryData(content2) {
+  const { StoryBuilder } = createCompilerRequire2(import.meta.url)("@rohal12/twee-ts");
+  const builder = new StoryBuilder();
+  builder.add({ name: "StoryData", tags: [], text: content2 }, []);
+  return builder.build().twine2;
+}
+var init_story_data = __esm({
+  "src/core/workspace/story-data.ts"() {
+    "use strict";
+  }
+});
+
 // src/core/workspace/spindle-version.ts
 import { existsSync as existsSync3, readFileSync as readFileSync5 } from "node:fs";
 import { dirname as dirname2, join as join3, resolve as resolve4 } from "node:path";
@@ -33500,31 +33514,14 @@ function isSpindleFormatName(name) {
   return name.trim().toLowerCase() === "spindle";
 }
 function readStoryDataFormat(content2) {
-  let data2;
-  try {
-    data2 = JSON.parse(content2);
-  } catch {
-    return void 0;
-  }
-  if (typeof data2 !== "object" || data2 === null || Array.isArray(data2)) return void 0;
-  const format = data2.format;
-  if (typeof format !== "string") return void 0;
-  return format.trim() || void 0;
+  return readStoryData(content2).format.trim() || void 0;
 }
 function readStoryDataFormatVersion(content2) {
-  let data2;
-  try {
-    data2 = JSON.parse(content2);
-  } catch {
+  const metadata2 = readStoryData(content2);
+  if (metadata2.format.trim() && !isSpindleFormatName(metadata2.format)) {
     return void 0;
   }
-  if (typeof data2 !== "object" || data2 === null || Array.isArray(data2)) return void 0;
-  const record2 = data2;
-  if (typeof record2.format === "string" && record2.format.trim() && !isSpindleFormatName(record2.format)) {
-    return void 0;
-  }
-  const version2 = record2["format-version"];
-  return typeof version2 === "string" && version2.trim() ? version2.trim() : void 0;
+  return metadata2.formatVersion.trim() || void 0;
 }
 function resolveStoryFormat(declared) {
   let foreign;
@@ -33619,6 +33616,7 @@ var init_story_format = __esm({
     "use strict";
     init_document_store();
     init_passage_index();
+    init_story_data();
     init_macro_sources();
     init_spindle_version();
     UNDECLARED_STORY_FORMAT = { name: void 0, isSpindle: true };
@@ -81083,9 +81081,9 @@ function preserveEntryPassage(oldName, newName, workspace, addEdit) {
     } catch {
       throw new RenameError("Cannot preserve the entry passage: StoryData must contain a valid JSON object.").at(declaration.uri, declaration.nameRange);
     }
-    const start = typeof data2.start === "string" && data2.start ? data2.start : "Start";
+    const start = readStoryData(passage.content).start || "Start";
     if (start !== oldName) continue;
-    if (Object.hasOwn(data2, "start") && typeof data2.start !== "string") {
+    if (Object.entries(data2).some(([key, value]) => isEntryField(key) && typeof value !== "string")) {
       throw new RenameError("Cannot preserve the entry passage: StoryData.start must be a string.").at(declaration.uri, declaration.nameRange);
     }
     let depth = 0;
@@ -81100,7 +81098,7 @@ function preserveEntryPassage(oldName, newName, workspace, addEdit) {
       literal(text3, index) {
         if (depth !== 1 || !text3.startsWith('"')) return;
         const isKey = /^\s*:/.test(passage.content.slice(index + text3.length));
-        if (isKey) startValue = JSON.parse(text3) === "start";
+        if (isKey) startValue = isEntryField(JSON.parse(text3));
         else if (startValue) {
           addEdit(declaration.uri, passage.range(index, index + text3.length), JSON.stringify(newName));
           replaced = true;
@@ -81120,6 +81118,9 @@ function preserveEntryPassage(oldName, newName, workspace, addEdit) {
     addEdit(declaration.uri, { start: end, end }, `${eol}${eol}:: StoryData${eol}${JSON.stringify({ start: newName })}${eol}`);
   }
 }
+function isEntryField(key) {
+  return readStoryData(JSON.stringify({ [key]: "Start" })).start === "Start";
+}
 function passageHeaderProblem(name) {
   if (name.trim() === "") return "a passage name cannot be empty";
   if (/[\r\n]/.test(name)) return "a passage header is a single line, so the name cannot contain a line break";
@@ -81237,6 +81238,7 @@ var init_rename = __esm({
   "src/plugins/rename.ts"() {
     "use strict";
     import_vscode_languageserver2 = __toESM(require_api3(), 1);
+    init_story_data();
     init_tooling();
     init_source_view();
     init_text();