@react-pug/typescript-plugin-react-pug 0.1.3 → 0.1.5

package/dist/plugin.js

@@ -23816,9 +23816,9 @@ function findProgramInsertionOffset(text, program) {
   }
   return lastLeading ? getOffsetAfterTrailingLineBreak(text, lastLeading.end ?? 0) : 0;
 }
-function findBlockInsertionOffset(block) {
+function findBlockInsertionOffset(text, block) {
   const firstNonDirective = block.body.find((statement) => !isDirectiveStatement(statement));
-  if (firstNonDirective) return firstNonDirective.start ?? (block.start ?? 0) + 1;
+  if (firstNonDirective) return getLineStartOffset(text, firstNonDirective.start ?? (block.start ?? 0) + 1);
   return Math.max(0, (block.end ?? 0) - 1);
 }
 function buildArrowExpressionScopeTarget(text, node) {
@@ -23838,7 +23838,7 @@ function buildBlockScopeTarget(text, block) {
   const blockIndent = getLineIndent(text, block.start ?? 0);
   return {
     kind: "block",
-    insertionOffset: findBlockInsertionOffset(block),
+    insertionOffset: findBlockInsertionOffset(text, block),
     statementIndent: `${blockIndent}  `,
     closingIndent: blockIndent
   };
@@ -24788,14 +24788,14 @@ function emitMergedClassShorthandAttribute(targetAttr, mergeMode, classNames, ex
     emitter.emitSynthetic("={[");
     for (let i = 0; i < classNames.length; i += 1) {
       if (i > 0) emitter.emitSynthetic(", ");
-      emitter.emitSynthetic('"');
+      emitter.emitSynthetic("'");
       emitter.emitDerived(
         classNames[i].name,
         classNames[i].offset,
         Math.max(1, classNames[i].sourceLength),
         CSS_CLASS
       );
-      emitter.emitSynthetic('"');
+      emitter.emitSynthetic("'");
     }
     if (existingAttr) {
       if (classNames.length > 0) emitter.emitSynthetic(", ");
@@ -25440,123 +25440,6 @@ function compilePugToTsx(pugText, options = {}) {
   }
 }
 
-// ../react-pug-core/src/language/positionMapping.ts
-var import_source_map = __toESM(require_source_map());
-var sourceMapCache = /* @__PURE__ */ new WeakMap();
-function getSourceMap(region) {
-  let sm = sourceMapCache.get(region);
-  if (!sm) {
-    sm = new import_source_map.SourceMap(region.mappings);
-    sourceMapCache.set(region, sm);
-  }
-  return sm;
-}
-function rawToStrippedOffset(rawText, rawOffset, commonIndent) {
-  if (commonIndent === 0) return rawOffset;
-  let stripped = 0;
-  let raw = 0;
-  const lines = rawText.split("\n");
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    const lineEnd = raw + line.length;
-    if (rawOffset <= lineEnd) {
-      const colInRaw = rawOffset - raw;
-      const indentToRemove2 = line.trim().length === 0 ? line.length : commonIndent;
-      if (indentToRemove2 > 0 && colInRaw < indentToRemove2) return null;
-      return stripped + Math.max(0, colInRaw - indentToRemove2);
-    }
-    const indentToRemove = line.trim().length === 0 ? line.length : commonIndent;
-    stripped += Math.max(0, line.length - indentToRemove) + 1;
-    raw = lineEnd + 1;
-  }
-  return stripped;
-}
-function strippedToRawOffset2(rawText, strippedOffset, commonIndent) {
-  if (commonIndent === 0) return strippedOffset;
-  let stripped = 0;
-  let raw = 0;
-  const lines = rawText.split("\n");
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i];
-    const indentToRemove = line.trim().length === 0 ? line.length : commonIndent;
-    const strippedLineLen = Math.max(0, line.length - indentToRemove);
-    if (strippedOffset <= stripped + strippedLineLen) {
-      return raw + indentToRemove + (strippedOffset - stripped);
-    }
-    stripped += strippedLineLen + 1;
-    raw += line.length + 1;
-  }
-  return raw;
-}
-function findSegmentAtOffset(segments, offset, getStart, getEnd) {
-  let lo = 0;
-  let hi = segments.length - 1;
-  while (lo <= hi) {
-    const mid = lo + hi >>> 1;
-    const segment = segments[mid];
-    if (offset < getStart(segment)) {
-      hi = mid - 1;
-    } else if (offset >= getEnd(segment)) {
-      lo = mid + 1;
-    } else {
-      return segment;
-    }
-  }
-  return null;
-}
-function getMappedRegionsForRegion(doc, regionIndex) {
-  return doc.mappedRegions.filter((region) => region.regionIndex === regionIndex);
-}
-function findRegionAtOriginalOffset(doc, offset) {
-  return findSegmentAtOffset(doc.regions, offset, (region) => region.originalStart, (region) => region.originalEnd);
-}
-function findCopySegmentAtOriginalOffset(doc, offset) {
-  return findSegmentAtOffset(doc.copySegments, offset, (segment) => segment.originalStart, (segment) => segment.originalEnd);
-}
-function findCopySegmentAtShadowOffset(doc, offset) {
-  return findSegmentAtOffset(doc.copySegments, offset, (segment) => segment.shadowStart, (segment) => segment.shadowEnd);
-}
-function originalToShadow(doc, originalOffset) {
-  if (originalOffset === doc.originalText.length) return doc.shadowText.length;
-  const region = findRegionAtOriginalOffset(doc, originalOffset);
-  if (region) {
-    const regionIndex = doc.regions.indexOf(region);
-    const rawOffset = originalOffset - region.pugTextStart;
-    if (rawOffset < 0) return null;
-    const rawText = doc.originalText.slice(region.pugTextStart, region.pugTextEnd);
-    const strippedOffset = rawToStrippedOffset(rawText, rawOffset, region.commonIndent);
-    if (strippedOffset == null) return null;
-    for (const mappedRegion of getMappedRegionsForRegion(doc, regionIndex)) {
-      if (strippedOffset < mappedRegion.sourceStart || strippedOffset >= mappedRegion.sourceEnd) continue;
-      const sm = getSourceMap(mappedRegion);
-      for (const [generatedOffset] of sm.toGeneratedLocation(strippedOffset)) {
-        return mappedRegion.shadowStart + generatedOffset;
-      }
-    }
-    return null;
-  }
-  const copySegment = findCopySegmentAtOriginalOffset(doc, originalOffset);
-  if (!copySegment) return null;
-  return copySegment.shadowStart + (originalOffset - copySegment.originalStart);
-}
-function shadowToOriginal(doc, shadowOffset) {
-  if (shadowOffset === doc.shadowText.length) return doc.originalText.length;
-  for (const mappedRegion of doc.mappedRegions) {
-    if (shadowOffset < mappedRegion.shadowStart || shadowOffset >= mappedRegion.shadowEnd) continue;
-    const localOffset = shadowOffset - mappedRegion.shadowStart;
-    const sm = getSourceMap(mappedRegion);
-    for (const [sourceOffset] of sm.toSourceLocation(localOffset)) {
-      const region = doc.regions[mappedRegion.regionIndex];
-      const rawText = doc.originalText.slice(region.pugTextStart, region.pugTextEnd);
-      const rawOffset = strippedToRawOffset2(rawText, sourceOffset, region.commonIndent);
-      return region.pugTextStart + rawOffset;
-    }
-  }
-  const copySegment = findCopySegmentAtShadowOffset(doc, shadowOffset);
-  if (!copySegment) return null;
-  return copySegment.originalStart + (shadowOffset - copySegment.shadowStart);
-}
-
 // ../react-pug-core/src/language/shadowDocument.ts
 var STARTUPJS_OR_CSSXJS_RE = /['"](?:startupjs|cssxjs)['"]/;
 function resolveCompileOptions(originalText, compileOptions) {
@@ -25619,7 +25502,7 @@ function buildStyleCallText(region, styleBlock, helper, statementIndent) {
     text += "\n";
     generatedOffset += 1;
   }
-  text += `${statementIndent}\`;
+  text += `${statementIndent}\`
 `;
   return {
     text,
@@ -25652,7 +25535,7 @@ function buildStyleInsertions(originalText, regions, plans) {
     const mappedRegions = [];
     if (target.kind === "arrow-expression" || target.kind === "statement-body") {
       text += "{\n";
-    } else if (target.insertionOffset > 0) {
+    } else if (target.insertionOffset > 0 && originalText[target.insertionOffset - 1] !== "\n" && originalText[target.insertionOffset - 1] !== "\r" && originalText[target.insertionOffset] !== "\n" && originalText[target.insertionOffset] !== "\r") {
       const prevChar = originalText[target.insertionOffset - 1];
       if (prevChar !== "\n" && prevChar !== "\r") text += "\n";
     }
@@ -25718,30 +25601,11 @@ ${target.closingIndent}}`,
   }
   return insertions;
 }
-function applyImportCleanups(doc, cleanups) {
-  if (cleanups.length === 0) return doc.shadowText;
-  const chars2 = doc.shadowText.split("");
-  for (const cleanup of cleanups) {
-    const shadowStart = originalToShadow(doc, cleanup.originalStart);
-    if (shadowStart == null) continue;
-    const shadowEnd = shadowStart + (cleanup.originalEnd - cleanup.originalStart);
-    for (let i = shadowStart; i < shadowEnd; i += 1) {
-      chars2[i] = "";
-    }
-    chars2[shadowStart] = cleanup.replacementText;
-  }
-  return chars2.join("");
-}
-function padToLength2(text, targetLength) {
-  if (text.length > targetLength) return null;
-  return text + " ".repeat(targetLength - text.length);
-}
 function buildImportCleanupWithHelpers(originalText, entry, helpersToAdd, removeTagImport) {
   const declaration = entry.declaration;
   const originalStart = declaration.start ?? 0;
   const originalEnd = declaration.end ?? originalStart;
   const originalImportText = originalText.slice(originalStart, originalEnd);
-  const originalLength = originalEnd - originalStart;
   const hasSemicolon = originalImportText.trimEnd().endsWith(";");
   const sourceText = entry.sourceText;
   const matchedSpecifiers = removeTagImport ? entry.matchedSpecifiers : [];
@@ -25771,27 +25635,11 @@ function buildImportCleanupWithHelpers(originalText, entry, helpersToAdd, remove
     const importPrefix = declaration.importKind === "type" ? "import type " : "import ";
     replacement = `${importPrefix}${parts.join(", ")} from ${sourceText}${hasSemicolon ? ";" : ""}`;
   }
-  let replacementText = padToLength2(replacement, originalLength);
-  if (replacementText == null) {
-    const compactParts = [];
-    if (defaultSpecifier) compactParts.push(originalText.slice(defaultSpecifier.start ?? 0, defaultSpecifier.end ?? 0));
-    if (namespaceSpecifier) compactParts.push(originalText.slice(namespaceSpecifier.start ?? 0, namespaceSpecifier.end ?? 0));
-    if (namedPieces.length > 0) compactParts.push(`{${namedPieces.join(",")}}`);
-    const importPrefix = declaration.importKind === "type" ? "import type " : "import ";
-    const compactReplacement = compactParts.length === 0 ? declaration.importKind === "type" ? "" : `import ${sourceText}${hasSemicolon ? ";" : ""}` : `${importPrefix}${compactParts.join(",")} from ${sourceText}${hasSemicolon ? ";" : ""}`;
-    replacementText = padToLength2(compactReplacement, originalLength);
-  }
-  if (replacementText == null) {
-    return {
-      cleanup: removeTagImport ? entry.cleanup : null,
-      mergedHelpers: /* @__PURE__ */ new Set()
-    };
-  }
   return {
     cleanup: {
       originalStart,
       originalEnd,
-      replacementText
+      replacementText: replacement
     },
     mergedHelpers
   };
@@ -25888,6 +25736,13 @@ function buildShadowDocument(originalText, uri, version = 1, tagName = "pug", co
     }
   }
   pendingInsertions.push(...buildStyleInsertions(originalText, regions, stylePlans));
+  const pendingImportCleanups = importCleanups.map((cleanup) => ({
+    kind: "import-cleanup",
+    originalStart: cleanup.originalStart,
+    originalEnd: cleanup.originalEnd,
+    text: cleanup.replacementText,
+    priority: -2
+  }));
   const pendingReplacements = regions.map((region, regionIndex) => ({
     kind: "replace",
     originalStart: region.originalStart,
@@ -25903,6 +25758,11 @@ function buildShadowDocument(originalText, uri, version = 1, tagName = "pug", co
     } : null
   }));
   const edits = [
+    ...pendingImportCleanups.map((replacement) => ({
+      sortStart: replacement.originalStart,
+      priority: replacement.priority,
+      edit: replacement
+    })),
     ...pendingInsertions.map((insertion) => ({
       sortStart: insertion.originalOffset,
       priority: insertion.priority,
@@ -25937,14 +25797,16 @@ function buildShadowDocument(originalText, uri, version = 1, tagName = "pug", co
       }
       const shadowStart2 = shadowText.length;
       edit.text && (shadowText += edit.text);
-      regions[edit.regionIndex].shadowStart = shadowStart2;
-      regions[edit.regionIndex].shadowEnd = shadowText.length;
-      if (edit.mappedRegion) {
-        mappedRegions.push({
-          ...edit.mappedRegion,
-          shadowStart: shadowStart2,
-          shadowEnd: shadowText.length
-        });
+      if ("regionIndex" in edit) {
+        regions[edit.regionIndex].shadowStart = shadowStart2;
+        regions[edit.regionIndex].shadowEnd = shadowText.length;
+        if (edit.mappedRegion) {
+          mappedRegions.push({
+            ...edit.mappedRegion,
+            shadowStart: shadowStart2,
+            shadowEnd: shadowText.length
+          });
+        }
       }
       cursor = edit.originalEnd;
       continue;
@@ -26003,12 +25865,126 @@ function buildShadowDocument(originalText, uri, version = 1, tagName = "pug", co
     hasTagImport: analysis.hasTagImport,
     missingTagImport
   };
-  if (importCleanups.length > 0) {
-    document.shadowText = applyImportCleanups(document, importCleanups);
-  }
   return document;
 }
 
+// ../react-pug-core/src/language/positionMapping.ts
+var import_source_map = __toESM(require_source_map());
+var sourceMapCache = /* @__PURE__ */ new WeakMap();
+function getSourceMap(region) {
+  let sm = sourceMapCache.get(region);
+  if (!sm) {
+    sm = new import_source_map.SourceMap(region.mappings);
+    sourceMapCache.set(region, sm);
+  }
+  return sm;
+}
+function rawToStrippedOffset(rawText, rawOffset, commonIndent) {
+  if (commonIndent === 0) return rawOffset;
+  let stripped = 0;
+  let raw = 0;
+  const lines = rawText.split("\n");
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const lineEnd = raw + line.length;
+    if (rawOffset <= lineEnd) {
+      const colInRaw = rawOffset - raw;
+      const indentToRemove2 = line.trim().length === 0 ? line.length : commonIndent;
+      if (indentToRemove2 > 0 && colInRaw < indentToRemove2) return null;
+      return stripped + Math.max(0, colInRaw - indentToRemove2);
+    }
+    const indentToRemove = line.trim().length === 0 ? line.length : commonIndent;
+    stripped += Math.max(0, line.length - indentToRemove) + 1;
+    raw = lineEnd + 1;
+  }
+  return stripped;
+}
+function strippedToRawOffset2(rawText, strippedOffset, commonIndent) {
+  if (commonIndent === 0) return strippedOffset;
+  let stripped = 0;
+  let raw = 0;
+  const lines = rawText.split("\n");
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i];
+    const indentToRemove = line.trim().length === 0 ? line.length : commonIndent;
+    const strippedLineLen = Math.max(0, line.length - indentToRemove);
+    if (strippedOffset <= stripped + strippedLineLen) {
+      return raw + indentToRemove + (strippedOffset - stripped);
+    }
+    stripped += strippedLineLen + 1;
+    raw += line.length + 1;
+  }
+  return raw;
+}
+function findSegmentAtOffset(segments, offset, getStart, getEnd) {
+  let lo = 0;
+  let hi = segments.length - 1;
+  while (lo <= hi) {
+    const mid = lo + hi >>> 1;
+    const segment = segments[mid];
+    if (offset < getStart(segment)) {
+      hi = mid - 1;
+    } else if (offset >= getEnd(segment)) {
+      lo = mid + 1;
+    } else {
+      return segment;
+    }
+  }
+  return null;
+}
+function getMappedRegionsForRegion(doc, regionIndex) {
+  return doc.mappedRegions.filter((region) => region.regionIndex === regionIndex);
+}
+function findRegionAtOriginalOffset(doc, offset) {
+  return findSegmentAtOffset(doc.regions, offset, (region) => region.originalStart, (region) => region.originalEnd);
+}
+function findCopySegmentAtOriginalOffset(doc, offset) {
+  return findSegmentAtOffset(doc.copySegments, offset, (segment) => segment.originalStart, (segment) => segment.originalEnd);
+}
+function findCopySegmentAtShadowOffset(doc, offset) {
+  return findSegmentAtOffset(doc.copySegments, offset, (segment) => segment.shadowStart, (segment) => segment.shadowEnd);
+}
+function originalToShadow(doc, originalOffset) {
+  if (originalOffset === doc.originalText.length) return doc.shadowText.length;
+  const region = findRegionAtOriginalOffset(doc, originalOffset);
+  if (region) {
+    const regionIndex = doc.regions.indexOf(region);
+    const rawOffset = originalOffset - region.pugTextStart;
+    if (rawOffset < 0) return null;
+    const rawText = doc.originalText.slice(region.pugTextStart, region.pugTextEnd);
+    const strippedOffset = rawToStrippedOffset(rawText, rawOffset, region.commonIndent);
+    if (strippedOffset == null) return null;
+    for (const mappedRegion of getMappedRegionsForRegion(doc, regionIndex)) {
+      if (strippedOffset < mappedRegion.sourceStart || strippedOffset >= mappedRegion.sourceEnd) continue;
+      const sm = getSourceMap(mappedRegion);
+      for (const [generatedOffset] of sm.toGeneratedLocation(strippedOffset)) {
+        return mappedRegion.shadowStart + generatedOffset;
+      }
+    }
+    return null;
+  }
+  const copySegment = findCopySegmentAtOriginalOffset(doc, originalOffset);
+  if (!copySegment) return null;
+  return copySegment.shadowStart + (originalOffset - copySegment.originalStart);
+}
+function shadowToOriginal(doc, shadowOffset) {
+  if (shadowOffset === doc.shadowText.length) return doc.originalText.length;
+  for (const mappedRegion of doc.mappedRegions) {
+    if (shadowOffset < mappedRegion.shadowStart || shadowOffset >= mappedRegion.shadowEnd) continue;
+    const localOffset = shadowOffset - mappedRegion.shadowStart;
+    const sm = getSourceMap(mappedRegion);
+    for (const [sourceOffset] of sm.toSourceLocation(localOffset)) {
+      const region = doc.regions[mappedRegion.regionIndex];
+      const rawText = doc.originalText.slice(region.pugTextStart, region.pugTextEnd);
+      const rawOffset = strippedToRawOffset2(rawText, sourceOffset, region.commonIndent);
+      return region.pugTextStart + rawOffset;
+    }
+  }
+  const copySegment = findCopySegmentAtShadowOffset(doc, shadowOffset);
+  if (!copySegment) return null;
+  return copySegment.originalStart + (shadowOffset - copySegment.shadowStart);
+}
+
 // ../../node_modules/@jridgewell/sourcemap-codec/dist/sourcemap-codec.mjs
 var comma = ",".charCodeAt(0);
 var semicolon = ";".charCodeAt(0);