release: WRNexusJS 0.6.0

editors/vscode/src/formatter.js

@@ -26,6 +26,8 @@ function splitPropDeclarations(value) {
   let square = 0;
   let brace = 0;
   let paren = 0;
+  let segmentHasColon = false;
+  let segmentHasEquals = false;
 
   const isIdentifierStart = (character) => /[A-Za-z_]/.test(character || "");
   const isIdentifierPart = (character) => /[A-Za-z0-9_]/.test(character || "");
@@ -41,13 +43,14 @@ function splitPropDeclarations(value) {
       cursor += 1;
       while (cursor < value.length && isIdentifierPart(value[cursor])) cursor += 1;
       while (cursor < value.length && /[ \t]/.test(value[cursor])) cursor += 1;
-      return value[cursor] === "=";
+      return value[cursor] === "=" ? "=" : null;
     }
     if (!isIdentifierStart(value[cursor])) return false;
     cursor += 1;
     while (cursor < value.length && isIdentifierPart(value[cursor])) cursor += 1;
+    if (value[cursor] === "?") cursor += 1;
     while (cursor < value.length && /[ \t]/.test(value[cursor])) cursor += 1;
-    return value[cursor] === "=" || value[cursor] === ":";
+    return value[cursor] === "=" || value[cursor] === ":" ? value[cursor] : null;
   };
 
   while (index < value.length) {
@@ -74,18 +77,27 @@ function splitPropDeclarations(value) {
     else if (character === "(") paren += 1;
     else if (character === ")" && paren > 0) paren -= 1;
 
+    const topLevel = square === 0 && brace === 0 && paren === 0;
+    if (topLevel && character === ":") segmentHasColon = true;
+    if (topLevel && character === "=") segmentHasEquals = true;
+
+    const candidateDelimiter = topLevel && /\s/.test(character) ? beginsDeclaration(index) : null;
+    const beginsNext =
+      candidateDelimiter === ":" ||
+      (candidateDelimiter === "=" && (segmentHasEquals || !segmentHasColon));
+
     if (
-      square === 0 &&
-      brace === 0 &&
-      paren === 0 &&
+      topLevel &&
       /\s/.test(character) &&
       value.slice(start, index).trim() !== "@event" &&
-      beginsDeclaration(index)
+      beginsNext
     ) {
       const declaration = value.slice(start, index).trim();
       if (declaration) declarations.push(declaration);
       while (index < value.length && /\s/.test(value[index])) index += 1;
       start = index;
+      segmentHasColon = false;
+      segmentHasEquals = false;
       continue;
     }
 
@@ -97,6 +109,68 @@ function splitPropDeclarations(value) {
   return declarations;
 }
 
+function splitOutputDeclarations(value) {
+  const declarations = [];
+  let start = 0;
+  let paren = 0;
+  let angle = 0;
+  let square = 0;
+  let quote = null;
+  let escaped = false;
+  const startsOutput = (position) => {
+    let cursor = position;
+    while (cursor < value.length && /\s/.test(value[cursor])) cursor += 1;
+    if (!/[A-Za-z_$]/.test(value[cursor] || "")) return false;
+    cursor += 1;
+    while (cursor < value.length && /[A-Za-z0-9_$]/.test(value[cursor] || "")) cursor += 1;
+    while (cursor < value.length && /\s/.test(value[cursor])) cursor += 1;
+    return value[cursor] === "(";
+  };
+  for (let index = 0; index < value.length; index += 1) {
+    const character = value[index];
+    if (quote !== null) {
+      if (escaped) escaped = false;
+      else if (character === "\\") escaped = true;
+      else if (character === quote) quote = null;
+      continue;
+    }
+    if (character === '"' || character === "'" || character === "`") {
+      quote = character;
+      continue;
+    }
+    if (character === "(") paren += 1;
+    else if (character === ")" && paren > 0) paren -= 1;
+    else if (character === "[") square += 1;
+    else if (character === "]" && square > 0) square -= 1;
+    else if (character === "<") angle += 1;
+    else if (character === ">" && angle > 0) angle -= 1;
+    if (paren === 0 && square === 0 && angle === 0 && /\s/.test(character) && startsOutput(index)) {
+      const declaration = value.slice(start, index).trim();
+      if (declaration) declarations.push(declaration);
+      while (index < value.length && /\s/.test(value[index])) index += 1;
+      start = index;
+      index -= 1;
+    }
+  }
+  const finalDeclaration = value.slice(start).trim();
+  if (finalDeclaration) declarations.push(finalDeclaration);
+  return declarations;
+}
+
+function formatInlineDeclarationBlock(value, unit, depth) {
+  const match = /^(props|state|computed|outputs)\s*\{([\s\S]*)\}$/.exec(value.trim());
+  if (!match) return null;
+  const declarations =
+    match[1] === "outputs"
+      ? splitOutputDeclarations(match[2].trim())
+      : splitPropDeclarations(match[2].trim());
+  return [
+    `${unit.repeat(depth)}${match[1]} {`,
+    ...declarations.map((declaration) => `${unit.repeat(depth + 1)}${declaration}`),
+    `${unit.repeat(depth)}}`,
+  ];
+}
+
 function formatInlinePropsBlock(value, unit, depth) {
   const match = /^props\s*\{([\s\S]*)\}$/.exec(value.trim());
   if (!match) return null;
@@ -618,7 +692,9 @@ function formatWrn(source, options = {}) {
       index = collected.endIndex;
     }
 
-    const inlineProps = formatInlinePropsBlock(value, unit, codeDepth + htmlDepth);
+    const inlineDeclaration = formatInlineDeclarationBlock(value, unit, codeDepth + htmlDepth);
+    const inlineProps =
+      inlineDeclaration ?? formatInlinePropsBlock(value, unit, codeDepth + htmlDepth);
     if (inlineProps) {
       output.push(...inlineProps);
       index += 1;
@@ -696,5 +772,6 @@ module.exports = {
   formatWrn,
   parseAttributes,
   parseOpeningTag,
+  splitOutputDeclarations,
   splitPropDeclarations,
 };