prettier-plugin-embed 0.4.2 → 0.4.4

package/dist/embedded/register.d.ts

@@ -16,8 +16,8 @@ import * as __glob__0_9 from "./noop/index.js";
 import * as __glob__0_10 from "./php/index.js";
 import * as __glob__0_11 from "./properties/index.js";
 import * as __glob__0_12 from "./ruby/index.js";
-import * as __glob__0_13 from "./sh/index.js";
-import * as __glob__0_14 from "./sql/index.js";
+import * as __glob__0_13 from "./sql/index.js";
+import * as __glob__0_14 from "./sh/index.js";
 import * as __glob__0_15 from "./toml/index.js";
 import * as __glob__0_16 from "./ts/index.js";
 import * as __glob__0_17 from "./xml/index.js";

package/dist/index.js

@@ -9,11 +9,11 @@ import { readFile as Ct } from "node:fs/promises";
 import { isAbsolute as Wt, dirname as Gt, resolve as qt, extname as zt } from "node:path";
 import { Worker as Kt } from "node:worker_threads";
 import { resolveConfigFile as Ht } from "prettier";
-const { group: Jt, indent: Xt, softline: ie, lineSuffixBoundary: Yt } = I, { mapDoc: Qt } = X;
+const { group: Jt, indent: Xt, softline: ce, lineSuffixBoundary: Yt } = I, { mapDoc: Qt } = X;
 function Vt(t, n) {
   const { node: r } = t;
   let e = n();
-  return r?.comments?.length && (e = Jt([Xt([ie, e]), ie])), ["${", e, Yt, "}"];
+  return r?.comments?.length && (e = Jt([Xt([ce, e]), ce])), ["${", e, Yt, "}"];
 }
 function x(t, n) {
   return t.map(
@@ -42,7 +42,9 @@ function T(t, n, r) {
 }
 function M(t, n, r) {
   if (!(n.plugins?.some(
-    (e) => e.name?.endsWith(t) ?? !1
+    (e) => e.name?.match(
+      new RegExp("(^|/)" + te(t) + "($|/)")
+    ) ?? !1
   ) ?? !1))
     throw new Error(
       `Cannot format embedded language identified by "${r}", because plugin "${t}" is not loaded.`
@@ -74,16 +76,16 @@ const Y = (() => {
   };
 })();
 function L(t = "p", n = "") {
-  const r = Y(), e = Y(), o = ce(t), s = ce(n), l = (p) => `${t}${r}${p}${e}${n}`, d = new RegExp(
+  const r = Y(), e = Y(), o = te(t), s = te(n), l = (p) => `${t}${r}${p}${e}${n}`, d = new RegExp(
     `${o}${r}(\\d+)${e}${s}`,
-    "g"
+    "ig"
   );
   return {
     createPlaceholder: l,
     placeholderRegex: d
   };
 }
-function ce(t) {
+function te(t) {
   return t.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, "\\$&");
 }
 function S(t) {
@@ -166,7 +168,7 @@ const { line: ae, group: k, indent: de, softline: le } = I, tn = async (t, n, r,
     v,
     "`"
   ]);
-}, te = "embeddedEs", an = [
+}, ne = "embeddedEs", an = [
   "js",
   "jsx",
   "es",
@@ -182,7 +184,7 @@ const { line: ae, group: k, indent: de, softline: le } = I, tn = async (t, n, r,
   "espree",
   "flow",
   "meriyah"
-], ln = S(te), un = V(te), gn = {
+], ln = S(ne), un = V(ne), gn = {
   [ln]: {
     category: "Embed",
     type: "string",
@@ -203,7 +205,7 @@ const { line: ae, group: k, indent: de, softline: le } = I, tn = async (t, n, r,
 }, pn = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   embedder: cn,
-  language: te,
+  language: ne,
   options: gn
 }, Symbol.toStringTag, { value: "Module" })), { line: me, group: A, indent: he, softline: fe } = I, mn = async (t, n, r, e, { identifier: o, embeddedOverrideOptions: s }) => {
   M("prettier-plugin-glsl", e, o), e = {
@@ -421,13 +423,16 @@ const { line: ae, group: k, indent: de, softline: le } = I, tn = async (t, n, r,
   ]);
 };
 function jn() {
-  const t = Y(), n = Y(), r = (o) => `'0${t}${o}${n}'`, e = new RegExp(`["']?0${t}(\\d+)${n}['"]?`, "g");
+  const t = Y(), n = Y(), r = (o) => `'0${t}${o}${n}'`, e = new RegExp(
+    `["']?0${t}(\\d+)${n}['"]?`,
+    "ig"
+  );
   return {
     createPlaceholder: r,
     placeholderRegex: e
   };
 }
-const ne = "embeddedJson", Fn = ["json", "jsonl"], wn = ["json", "json-stringify", "json5"], Bn = V(ne), Un = S(ne), Cn = {
+const re = "embeddedJson", Fn = ["json", "jsonl"], wn = ["json", "json-stringify", "json5"], Bn = V(re), Un = S(re), Cn = {
   [Un]: {
     category: "Embed",
     type: "string",
@@ -448,7 +453,7 @@ const ne = "embeddedJson", Fn = ["json", "jsonl"], wn = ["json", "json-stringify
 }, Wn = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   embedder: Rn,
-  language: ne,
+  language: re,
   options: Cn
 }, Symbol.toStringTag, { value: "Module" })), { line: Oe, group: w, indent: Me, softline: ke } = I, Gn = async (t, n, r, e, { identifier: o, embeddedOverrideOptions: s }) => {
   M("prettier-plugin-latex", e, o), e = {
@@ -544,7 +549,7 @@ const ne = "embeddedJson", Fn = ["json", "jsonl"], wn = ["json", "json-stringify
   embedder: Jn,
   language: bt,
   options: Qn
-}, Symbol.toStringTag, { value: "Module" })), re = "embeddedNoop", Zn = S(re), er = {
+}, Symbol.toStringTag, { value: "Module" })), oe = "embeddedNoop", Zn = S(oe), er = {
   [Zn]: {
     category: "Embed",
     type: "string",
@@ -554,7 +559,7 @@ const ne = "embeddedJson", Fn = ["json", "jsonl"], wn = ["json", "json-stringify
   }
 }, tr = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
-  language: re,
+  language: oe,
   options: er
 }, Symbol.toStringTag, { value: "Module" })), { line: Re, group: U, indent: je, softline: Fe } = I, nr = async (t, n, r, e, { identifier: o, embeddedOverrideOptions: s }) => {
   M("@prettier/plugin-php", e, o), e = {
@@ -1014,7 +1019,7 @@ const { hardline: Mr, group: q, line: Xe, softline: Ye, indent: Qe } = I, { mapD
     v,
     "`"
   ]);
-}, oe = "embeddedTs", Xr = ["ts", "tsx", "cts", "mts", "typescript"], Yr = ["typescript", "babel-ts"], Qr = V(oe), Vr = S(oe), Zr = {
+}, se = "embeddedTs", Xr = ["ts", "tsx", "cts", "mts", "typescript"], Yr = ["typescript", "babel-ts"], Qr = V(se), Vr = S(se), Zr = {
   [Vr]: {
     category: "Embed",
     type: "string",
@@ -1035,9 +1040,9 @@ const { hardline: Mr, group: q, line: Xe, softline: Ye, indent: Qe } = I, { mapD
 }, eo = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   embedder: Jr,
-  language: oe,
+  language: se,
   options: Zr
-}, Symbol.toStringTag, { value: "Module" })), se = "embeddedXml", { line: ot, group: H, indent: st, softline: ee } = I, to = async (t, n, r, e, { identifier: o, embeddedOverrideOptions: s }) => {
+}, Symbol.toStringTag, { value: "Module" })), ie = "embeddedXml", { line: ot, group: H, indent: st, softline: ee } = I, to = async (t, n, r, e, { identifier: o, embeddedOverrideOptions: s }) => {
   M("@prettier/plugin-xml", e, o), e = {
     ...e,
     ...s
@@ -1059,7 +1064,7 @@ const { hardline: Mr, group: q, line: Xe, softline: Ye, indent: Qe } = I, { mapD
     );
     let f = await t(g, {
       ...e,
-      parser: se
+      parser: ie
     });
     const [$, _] = e.__embeddedXmlFragmentRecoverIndex ?? [];
     $ === void 0 ? i = void 0 : _ === void 0 ? i += $ : (f = g.slice($, _ + 1), i += _ + 1), E.push(f);
@@ -1080,7 +1085,7 @@ const { hardline: Mr, group: q, line: Xe, softline: Ye, indent: Qe } = I, { mapD
     m,
     "`"
   ]);
-}, no = ["xml", "opml", "rss", "svg"], ro = S(se), oo = {
+}, no = ["xml", "opml", "rss", "svg"], ro = S(ie), oo = {
   [ro]: {
     category: "Embed",
     type: "string",
@@ -1216,7 +1221,7 @@ function co(t) {
 const ao = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   embedder: to,
-  language: se,
+  language: ie,
   options: oo,
   parser: io
 }, Symbol.toStringTag, { value: "Module" })), { line: ct, group: J, indent: at, softline: dt } = I, lo = async (t, n, r, e, { identifier: o, embeddedOverrideOptions: s }) => {
@@ -1283,7 +1288,7 @@ const ao = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   "./yaml/index.ts": mo
 });
 Object.values(ho).forEach(({ language: t, parser: n, embedder: r, options: e }) => {
-  Zt(Lt, t, re), n && (Tt[t] = n), r && (Ot[t] = r), Object.assign(Mt, e);
+  Zt(Lt, t, oe), n && (Tt[t] = n), r && (Ot[t] = r), Object.assign(Mt, e);
 });
 const fo = "noEmbeddedIdentificationByComment", Eo = "noEmbeddedIdentificationByTag", bo = "preserveEmbeddedExteriorWhitespaces", yo = "noEmbeddedMultiLineIndentation", _o = "embeddedOverrides", Ho = {
   ...Mt,

package/package.json

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