prettier-plugin-embed 0.0.5 → 0.0.6

package/dist/index.js

@@ -2,33 +2,34 @@ import Q from "prettier/parser-babel";
 import U from "prettier/parser-espree";
 import X from "prettier/parser-flow";
 import H from "prettier/parser-typescript";
+import V from "prettier/parser-meriyah";
 import { builders as q, utils as T } from "prettier/doc";
-import { parse as V } from "@xml-tools/parser";
-import { printers as J } from "prettier/plugins/estree.mjs";
-const P = "embeddedNoop", K = {
+import { parse as J } from "@xml-tools/parser";
+import { printers as K } from "prettier/plugins/estree.mjs";
+const M = "embeddedNoop", Y = {
   category: "Global",
   type: "string",
   array: !0,
   default: [{ value: [] }],
   description: "Specify embedded languages that will not be formatted."
-}, Y = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, Z = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  name: P,
-  option: K
-}, Symbol.toStringTag, { value: "Module" })), Z = "embeddedPhp", { group: ee, indent: te, softline: j, lineSuffixBoundary: ne } = q;
-function re(e, t) {
+  name: M,
+  option: Y
+}, Symbol.toStringTag, { value: "Module" })), ee = "embeddedPhp", { group: te, indent: ne, softline: j, lineSuffixBoundary: re } = q;
+function oe(e, t) {
   var r;
   const { node: n } = e;
   let o = t();
-  return (r = n == null ? void 0 : n.comments) != null && r.length && (o = ee([te([j, o]), j])), ["${", o, ne, "}"];
+  return (r = n == null ? void 0 : n.comments) != null && r.length && (o = te([ne([j, o]), j])), ["${", o, re, "}"];
 }
-function D(e, t) {
+function k(e, t) {
   return e.map(
-    (n) => re(n, t),
+    (n) => oe(n, t),
     "expressions"
   );
 }
-function N(e, t, n) {
+function D(e, t, n) {
   var o;
   if (!(((o = t.plugins) == null ? void 0 : o.some(
     (r) => {
@@ -40,7 +41,7 @@ function N(e, t, n) {
       `Cannot format embedded language "${n}" because plugin "${e}" is not loaded.`
     );
 }
-function oe(e, t, n) {
+function se(e, t, n) {
   if (t === n) {
     e.unshift(t);
     return;
@@ -56,7 +57,7 @@ function oe(e, t, n) {
   }
   e.splice(o, 0, t);
 }
-function k() {
+function N() {
   function e(n) {
     return t(Math.random() * (1 << (n << 2)) ^ Date.now()).slice(-n);
   }
@@ -75,20 +76,20 @@ function k() {
     // Use timestamp to avoid collisions
   ].join("-");
 }
-const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc: ce } = T, ue = async (e, t, n, o, r) => {
+const { label: ie, hardline: le, line: ae, group: E, indent: ce } = q, { mapDoc: ue } = T, de = async (e, t, n, o, r) => {
   try {
-    N("@prettier/plugin-php", o, r);
-    const s = "$p" + k().replaceAll("-", ""), { node: a } = n, g = a.quasis.map(
+    D("@prettier/plugin-php", o, r);
+    const s = "$p" + N().replaceAll("-", ""), { node: a } = n, g = a.quasis.map(
       (i, l, { length: p }) => l === p - 1 ? i.value.cooked : i.value.cooked + `${s}${l}`
     ).join("");
     let u = "", b = 0;
     const f = /^\s+/.exec(g);
     f && (b = f.index + f[0].length, u = " ");
-    const $ = /\s$/.test(g) ? " " : "", _ = D(n, t), v = await e(g.slice(b), {
+    const $ = /\s$/.test(g) ? " " : "", _ = k(n, t), v = await e(g.slice(b), {
       parser: "php"
     });
     let h = !1;
-    const y = ce(v, (i) => {
+    const y = ue(v, (i) => {
       if (typeof i != "string")
         return Array.isArray(i) || (i.type === "group" && i.break || i.type === "line" && (i.hard || i.literal)) && (h = !0), i;
       const l = [], p = i.split(new RegExp("\\" + s + "(\\d+)", "g"));
@@ -104,13 +105,13 @@ const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc:
         }
       }
       return l;
-    }), d = h ? ie : u && $ ? le : null;
+    }), d = h ? le : u && $ ? ae : null;
     return d ? E([
       "`",
-      ae([d, E(y)]),
+      ce([d, E(y)]),
       d,
       "`"
-    ]) : se(
+    ]) : ie(
       { hug: !1 },
       E([
         "`",
@@ -123,24 +124,24 @@ const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc:
   } catch (s) {
     throw console.error(s), s;
   }
-}, de = {
+}, pe = {
   category: "Global",
   type: "string",
   array: !0,
   default: [{ value: ["php"] }],
   description: "Specify embedded PHP languages. This requires @prettier/plugin-php"
-}, pe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, fe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  embedder: ue,
-  name: Z,
-  option: de
-}, Symbol.toStringTag, { value: "Module" })), fe = "embeddedSql", me = {
+  embedder: de,
+  name: ee,
+  option: pe
+}, Symbol.toStringTag, { value: "Module" })), me = "embeddedSql", ge = {
   category: "Global",
   type: "string",
   array: !0,
   default: [{ value: ["sql"] }],
   description: "Specify embedded SQL languages. This requires prettier-plugin-sql"
-}, C = [
+}, P = [
   "sql",
   "bigquery",
   "hive",
@@ -157,7 +158,7 @@ const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc:
   "transactsql",
   "tsql",
   "trino"
-], G = [
+], C = [
   "bigquery",
   "db2",
   "hive",
@@ -166,12 +167,12 @@ const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc:
   "postgresql",
   "transactsql",
   "flinksql"
-], { label: ge, hardline: A, group: S, line: be, indent: he } = q, { mapDoc: ye } = T, $e = async (e, t, n, o, r, s) => {
+], { label: be, hardline: L, group: S, line: he, indent: ye } = q, { mapDoc: $e } = T, _e = async (e, t, n, o, r, s) => {
   try {
-    N("prettier-plugin-sql", o, r);
-    const a = "p" + k().replaceAll("-", ""), { node: g } = n, u = g.quasis.map(
+    D("prettier-plugin-sql", o, r);
+    const a = "p" + N().replaceAll("-", ""), { node: g } = n, u = g.quasis.map(
       (i, l, { length: p }) => l === p - 1 ? i.value.cooked : i.value.cooked + `${a}${l}`
-    ).join(""), b = /^\s/.test(u) ? " " : "", f = /\s$/.test(u) ? " " : "", $ = D(n, t), _ = xe(o, r, s);
+    ).join(""), b = /^\s/.test(u) ? " " : "", f = /\s$/.test(u) ? " " : "", $ = k(n, t), _ = ve(o, r, s);
     if (typeof _ > "u")
       throw new SyntaxError(`Unrecognized language: ${r}`);
     const v = await e(u, {
@@ -179,7 +180,7 @@ const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc:
       ..._
     });
     let h = !1;
-    const y = ye(v, (i) => {
+    const y = $e(v, (i) => {
       if (typeof i != "string")
         return i;
       const l = [], p = i.split(new RegExp(a + "(\\d+)", "g"));
@@ -190,7 +191,7 @@ const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc:
             continue;
           m = m.replaceAll(/([\\`]|\${)/g, "\\$1"), m.split(/(\n)/).forEach(
             (x) => x === `
-` ? (h = !0, l.push(A)) : l.push(x)
+` ? (h = !0, l.push(L)) : l.push(x)
           );
         } else {
           const x = Number(m);
@@ -198,13 +199,13 @@ const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc:
         }
       }
       return l;
-    }), d = h ? A : b && f ? be : null;
+    }), d = h ? L : b && f ? he : null;
     return d ? S([
       "`",
-      he([d, S(y)]),
+      ye([d, S(y)]),
       d,
       "`"
-    ]) : ge(
+    ]) : be(
       { hug: !1 },
       S([
         "`",
@@ -217,28 +218,28 @@ const { label: se, hardline: ie, line: le, group: E, indent: ae } = q, { mapDoc:
   } catch (a) {
     throw console.error(a), a;
   }
-}, _e = {
-  "sql-formatter": (e) => C.includes(e),
-  "node-sql-parser": (e) => G.includes(e)
+}, xe = {
+  "sql-formatter": (e) => P.includes(e),
+  "node-sql-parser": (e) => C.includes(e)
 };
-function L(e, t) {
+function A(e, t) {
   for (const n of t)
-    if (_e[n](e))
+    if (xe[n](e))
       return {
         formatter: n,
         language: e
       };
 }
 function B(e, t, n) {
-  let o = L(e, n);
+  let o = A(e, n);
   if (o)
     return o;
   const r = t.indexOf(e);
   for (let s = r - 1; s >= 0; --s)
-    if (o = L(t[s], n), o)
+    if (o = A(t[s], n), o)
       return o;
 }
-function xe(e, t, n) {
+function ve(e, t, n) {
   return e.formatter === "sql-formatter" ? B(t, n, [
     "sql-formatter",
     "node-sql-parser"
@@ -247,23 +248,23 @@ function xe(e, t, n) {
     "sql-formatter"
   ]);
 }
-const ve = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const qe = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  NODE_SQL_PARSER_DATABASES: G,
-  SQL_FORMATTER_LANGUAGES: C,
-  embedder: $e,
-  name: fe,
-  option: me
-}, Symbol.toStringTag, { value: "Module" })), I = "embeddedXml";
+  NODE_SQL_PARSER_DATABASES: C,
+  SQL_FORMATTER_LANGUAGES: P,
+  embedder: _e,
+  name: me,
+  option: ge
+}, Symbol.toStringTag, { value: "Module" })), G = "embeddedXml";
 function F(e, t) {
   const n = new SyntaxError(
     e + " (" + t.loc.start.line + ":" + t.loc.start.column + ")"
   );
   return Object.assign(n, t);
 }
-const qe = {
+const Ee = {
   parse(e) {
-    const { lexErrors: t, parseErrors: n, cst: o } = V(e);
+    const { lexErrors: t, parseErrors: n, cst: o } = J(e);
     if (t.length > 0) {
       const r = t[0];
       throw F(r.message, {
@@ -300,18 +301,18 @@ const qe = {
   locEnd(e) {
     return e.location.endOffset ?? NaN;
   }
-}, { label: Ee, hardline: Se, line: we, group: w, indent: Oe } = q, { mapDoc: Te } = T, De = async (e, t, n, o, r) => {
+}, { label: Se, hardline: we, line: Oe, group: w, indent: Te } = q, { mapDoc: ke } = T, De = async (e, t, n, o, r) => {
   try {
-    N("@prettier/plugin-xml", o, r);
-    const s = k(), { node: a } = n, g = a.quasis.map(
+    D("@prettier/plugin-xml", o, r);
+    const s = N(), { node: a } = n, g = a.quasis.map(
       (d, i, { length: l }) => i === l - 1 ? d.value.cooked : d.value.cooked + `${s}-${i}`
     ).join("");
     let u = "", b = 0;
     const f = /^\s+/.exec(g);
     f && (b = f.index + f[0].length, u = " ");
-    const $ = /\s$/.test(g) ? " " : "", _ = D(n, t), v = await e(g.slice(b), {
-      parser: I
-    }), h = Te(v, (d) => {
+    const $ = /\s$/.test(g) ? " " : "", _ = k(n, t), v = await e(g.slice(b), {
+      parser: G
+    }), h = ke(v, (d) => {
       if (typeof d != "string")
         return d;
       const i = [], l = d.split(new RegExp(s + "-(\\d+)", "g"));
@@ -327,13 +328,13 @@ const qe = {
         }
       }
       return i;
-    }), y = o.xmlWhitespaceSensitivity === "ignore" ? Se : u && $ ? we : null;
+    }), y = o.xmlWhitespaceSensitivity === "ignore" ? we : u && $ ? Oe : null;
     return y ? w([
       "`",
-      Oe([y, w(h)]),
+      Te([y, w(h)]),
       y,
       "`"
-    ]) : Ee(
+    ]) : Se(
       { hug: !1 },
       w([
         "`",
@@ -352,44 +353,45 @@ const qe = {
   array: !0,
   default: [{ value: ["xml", "svg"] }],
   description: "Specify embedded XML languages. This requires @prettier/plugin-xml"
-}, ke = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+}, je = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   embedder: De,
-  name: I,
+  name: G,
   option: Ne,
-  parser: qe
-}, Symbol.toStringTag, { value: "Module" })), M = [], W = {}, R = {}, z = {}, je = /* @__PURE__ */ Object.assign({
-  "./noop/index.ts": Y,
-  "./php/index.ts": pe,
-  "./sql/index.ts": ve,
-  "./xml/index.ts": ke
+  parser: Ee
+}, Symbol.toStringTag, { value: "Module" })), I = [], W = {}, R = {}, z = {}, Le = /* @__PURE__ */ Object.assign({
+  "./noop/index.ts": Z,
+  "./php/index.ts": fe,
+  "./sql/index.ts": qe,
+  "./xml/index.ts": je
 });
-Object.values(je).forEach(({ name: e, parser: t, embedder: n, option: o }) => {
-  oe(M, e, P), t && (W[e] = t), n && (R[e] = n), z[e] = o;
+Object.values(Le).forEach(({ name: e, parser: t, embedder: n, option: o }) => {
+  se(I, e, M), t && (W[e] = t), n && (R[e] = n), z[e] = o;
 });
-const Re = {
+const Qe = {
   // parsers from internal
   // TODO: find out which parsers are required and which are optional
   ...Q.parsers,
   ...U.parsers,
   ...X.parsers,
   ...H.parsers,
+  ...V.parsers,
   // parsers from this plugin
   ...W
-}, { estree: O } = J, Ae = function(e, t) {
+}, { estree: O } = K, Ae = function(e, t) {
   var o;
   const { node: n } = e;
   if (n.type !== "TemplateLiteral" || n.quasis.some(({ value: { cooked: r } }) => r === null))
     return null;
-  for (const r of M) {
+  for (const r of I) {
     const s = t[r];
     if (!s)
       continue;
-    const a = Le(
+    const a = Be(
       e,
       s,
       t.noEmbeddedDetectionByComment ?? []
-    ) ?? Be(e, s, t.noEmbeddedDetectionByTag ?? []);
+    ) ?? Fe(e, s, t.noEmbeddedDetectionByTag ?? []);
     if (a === void 0)
       continue;
     const g = R[r];
@@ -406,32 +408,39 @@ const Re = {
   }
   return ((o = O.embed) == null ? void 0 : o.call(O, e, t)) ?? null;
 };
-function Le({ node: e, parent: t }, n, o) {
+function Be({ node: e, parent: t }, n, o) {
   if (n.length === 0 || e.type !== "TemplateLiteral")
     return;
   const r = e.comments ?? (t == null ? void 0 : t.comments);
   if (!r)
     return;
   const s = r[r.length - 1];
-  if (!(s.type !== "Block" || !s.leading)) {
+  if (!(![
+    "MultiLine",
+    // meriyah
+    "Block",
+    // typescript, acorn, espree, flow
+    "CommentBlock"
+    // babel, babel-flow, babel-ts
+  ].includes(s.type) || !s.leading)) {
     for (const a of n)
       if (` ${a} ` === s.value && !o.includes(a))
         return a;
   }
 }
-function Be({ node: e, parent: t }, n, o) {
+function Fe({ node: e, parent: t }, n, o) {
   if (n.length !== 0 && !(e.type !== "TemplateLiteral" || (t == null ? void 0 : t.type) !== "TaggedTemplateExpression" || t.tag.type !== "Identifier")) {
     for (const r of n)
       if (t.tag.name === r && !o.includes(r))
         return r;
   }
 }
-const ze = {
+const Ue = {
   estree: {
     ...O,
     embed: Ae
   }
-}, Qe = {
+}, Xe = {
   ...z,
   noEmbeddedDetectionByComment: {
     category: "Global",
@@ -450,10 +459,10 @@ const ze = {
 };
 export {
   R as embeddedEmbedders,
-  M as embeddedNames,
+  I as embeddedNames,
   z as embeddedOptions,
   W as embeddedParsers,
-  Qe as options,
-  Re as parsers,
-  ze as printers
+  Xe as options,
+  Qe as parsers,
+  Ue as printers
 };

package/dist/parsers.d.ts

@@ -1,5 +1,6 @@
 export declare const parsers: {
     embeddedXml: import("prettier").Parser<any>;
+    meriyah: import("prettier").Parser<any>;
     typescript: import("prettier").Parser<any>;
     flow: import("prettier").Parser<any>;
     acorn: import("prettier").Parser<any>;

package/package.json

@@ -2,7 +2,7 @@
   "name": "prettier-plugin-embed",
   "description": "A prettier plugin to format embedded languages in js/ts files.",
   "private": false,
-  "version": "0.0.5",
+  "version": "0.0.6",
   "type": "module",
   "files": [
     "./dist"