prettier-plugin-embed 0.3.0-rc.0 → 0.3.0-rc.2

package/dist/options.d.ts

@@ -1,4 +1,4 @@
-import { PrettierPluginEmbedOptions, EmbeddedDefaultIdentifier, AutocompleteStringList } from "./embedded/index.js";
+import { type AutocompleteStringList, type EmbeddedDefaultIdentifier, type PrettierPluginEmbedOptions } from "./embedded/index.js";
 type EmbeddedIdentifiers = AutocompleteStringList<EmbeddedDefaultIdentifier[]>;
 declare const NO_EMBEDDED_IDENTIFICATION_BY_COMMENT = "noEmbeddedIdentificationByComment";
 declare const NO_EMBEDDED_IDENTIFICATION_BY_TAG = "noEmbeddedIdentificationByTag";

package/dist/types.d.ts

@@ -1,6 +1,6 @@
-import type { Options, Doc, AstPath } from "prettier";
-import type { Node as EsTreeNode, TemplateLiteral, Comment } from "estree";
-import { type EmbeddedDefaultIdentifier, type AutocompleteStringList, type PrettierPluginEmbedOptions, makeIdentifiersOptionName, EmbeddedLanguage } from "./embedded/index.js";
+import type { Comment, Node as EsTreeNode, TemplateLiteral } from "estree";
+import type { AstPath, Doc, Options } from "prettier";
+import { makeIdentifiersOptionName, type AutocompleteStringList, type EmbeddedDefaultIdentifier, type EmbeddedLanguage, type PrettierPluginEmbedOptions } from "./embedded/index.js";
 import type { PrettierPluginGlobalOptions } from "./options.js";
 export type PrettierNode = EsTreeNode & {
     comments?: (Comment & {
@@ -10,7 +10,12 @@ export type PrettierNode = EsTreeNode & {
     })[];
 };
 export type InternalPrintFun = (selector?: string | number | (string | number)[] | AstPath<TemplateLiteral>) => Doc;
-export type Embedder<T extends Options = Options> = (textToDoc: (text: string, options: T) => Promise<Doc>, print: InternalPrintFun, path: AstPath<TemplateLiteral>, options: T, identifier: string, identifiers: string[]) => Promise<Doc>;
+export interface EmbedderPayload {
+    identifier: string;
+    identifiers: string[];
+    embeddedOverrideOptions: EmbeddedOverride["options"] | undefined;
+}
+export type Embedder<T extends Options = Options> = (textToDoc: (text: string, options: T) => Promise<Doc>, print: InternalPrintFun, path: AstPath<TemplateLiteral>, options: T, embedderPayload: EmbedderPayload) => Promise<Doc>;
 export interface EmbeddedOverride {
     identifiers: AutocompleteStringList<EmbeddedDefaultIdentifier[]>;
     options: Omit<Omit<Options, keyof PrettierPluginEmbedOptions> & Omit<PrettierPluginEmbedOptions, keyof PrettierPluginGlobalOptions | ReturnType<typeof makeIdentifiersOptionName<EmbeddedLanguage>>>, "printWidth" | "endOfLine" | "useTabs" | "tabWidth" | "parser" | "filepath" | "embeddedLanguageFormatting" | `__${string}`>;

package/dist/utils.d.ts

@@ -0,0 +1,5 @@
+import { type AstPath } from "prettier";
+import type { PrettierNode } from "./types.js";
+export declare const resolveEmbeddedOverrideOptions: (embeddedOverridesString: string | undefined, identifier: string, sourceFilePath?: string) => Promise<Omit<Omit<import("prettier").Options, keyof import("./index.js").PrettierPluginEmbedOptions> & Omit<import("./index.js").PrettierPluginEmbedOptions, "embeddedNoopIdentifiers" | "embeddedCssIdentifiers" | "embeddedEsIdentifiers" | "embeddedGlslIdentifiers" | "embeddedHtmlIdentifiers" | "embeddedMarkdownIdentifiers" | "embeddedPhpIdentifiers" | "embeddedRubyIdentifiers" | "embeddedSqlIdentifiers" | "embeddedTsIdentifiers" | "embeddedXmlIdentifiers" | keyof import("./options.js").PrettierPluginGlobalOptions>, "parser" | "filepath" | "endOfLine" | "embeddedLanguageFormatting" | "printWidth" | "tabWidth" | "useTabs" | `__${string}`> | undefined>;
+export declare function getIdentifierFromComment({ node, parent }: AstPath<PrettierNode>, comments: string[], noIdentificationList: string[]): string | undefined;
+export declare function getIdentifierFromTag({ node, parent }: AstPath<PrettierNode>, tags: string[], noIdentificationList: string[]): string | undefined;

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.3.0-rc.0",
+  "version": "0.3.0-rc.2",
   "type": "module",
   "files": [
     "./dist"
@@ -57,7 +57,7 @@
     "restore-readme": "tsx ./scripts/restore-readme",
     "prepublishOnly": "npm run build && npm run process-readme",
     "postpublish": "npm run restore-readme",
-    "ncu": "npx npm-check-updates -u",
+    "ncu": "npx ncu",
     "postncu": "npm i"
   },
   "devDependencies": {
@@ -65,23 +65,24 @@
     "@commitlint/config-conventional": "^18.4.3",
     "@semantic-release/git": "^10.0.1",
     "@types/estree": "^1.0.5",
+    "@types/node": "^20.10.0",
     "@typescript-eslint/eslint-plugin": "^6.12.0",
     "@typescript-eslint/parser": "^6.12.0",
     "@vitest/browser": "^0.34.6",
     "@vitest/coverage-istanbul": "^0.34.6",
     "@vitest/ui": "^0.34.6",
     "code-tag": "^1.1.0",
+    "esbuild": "^0.19.8",
     "eslint": "^8.54.0",
     "fast-glob": "^3.3.2",
     "npm-check-updates": "^16.14.11",
     "playwright": "^1.40.0",
+    "prettier-plugin-organize-imports": "^3.2.4",
     "semantic-release": "^22.0.8",
-    "tsx": "^4.2.0",
+    "tsx": "^4.5.0",
     "typescript": "^5.3.2",
-    "vite": "^5.0.0",
-    "vitest": "^0.34.6"
-  },
-  "peerDependencies": {
+    "vite": "^5.0.2",
+    "vitest": "^0.34.6",
     "@prettier/plugin-php": ">=0.20.1 <1",
     "@prettier/plugin-ruby": "^4.0.0",
     "@prettier/plugin-xml": "^3.1.0",
@@ -92,6 +93,7 @@
     "prettier-plugin-sql": ">=0.15.0 <1"
   },
   "dependencies": {
-    "micro-memoize": "^4.1.2"
+    "micro-memoize": "^4.1.2",
+    "package-up": "^5.0.0"
   }
 }