prettier-plugin-sfmc 0.4.0 → 0.4.3

package/README.md

@@ -52,13 +52,15 @@ All options use the `ampscript` prefix — they control AMPscript formatting beh
 
 ## Supported File Types
 
-| Extension    | Parser             | What happens                                    |
-| ------------ | ------------------ | ----------------------------------------------- |
-| `.ampscript` | `ampscript-parse`  | Full AMPscript formatting                       |
-| `.amp`       | `ampscript-parse`  | Full AMPscript formatting                       |
-| `.html`      | `ampscript-parse`  | AMPscript formatted; HTML delegated to Prettier |
-| `.ssjs`      | `babel` (built-in) | Standard JavaScript formatting                  |
-| `.sql`       | `sql`              | SQL via composed `prettier-plugin-sql`          |
+| Extension    | VS Code language ID | Parser             | What happens                                                                    |
+| ------------ | ------------------- | ------------------ | ------------------------------------------------------------------------------- |
+| `.ampscript` | `ampscript`         | `ampscript-parse`  | Full AMPscript formatting                                                       |
+| `.amp`       | `ampscript`         | `ampscript-parse`  | Full AMPscript formatting                                                       |
+| `.html`      | `sfmc`              | `ampscript-parse`  | AMPscript formatted; HTML and `<script runat="server">` delegated to Prettier's built-in HTML formatter |
+| `.ssjs`      | `ssjs`              | `babel` (built-in) | Standard JavaScript formatting                                                  |
+| `.sql`       | —                   | `sql`              | SQL via composed `prettier-plugin-sql`                                          |
+
+`.html` files are auto-detected as `sfmc` by the `vscode-sfmc-language` extension (v1.6.0+) when they contain AMPscript or SSJS content. Plain HTML files (language ID `html`) are out of scope and handled by Prettier's built-in HTML formatter directly.
 
 ## Core Prettier defaults (AMPscript, HTML, SQL, JavaScript / SSJS)
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "prettier-plugin-sfmc",
-    "version": "0.4.0",
-    "description": "Prettier plugin for Salesforce Marketing Cloud — AMPscript, SSJS, and SQL formatting",
+    "version": "0.4.3",
+    "description": "Prettier plugin for Salesforce Marketing Cloud — AMPscript, SSJS, and SQL formatting",
     "type": "module",
     "main": "src/index.js",
     "exports": {
@@ -47,13 +47,13 @@
     "license": "MIT",
     "dependencies": {
         "ampscript-data": "^0.1.3",
-        "ampscript-parser": "^0.1.1",
+        "ampscript-parser": "^0.1.2",
         "prettier-plugin-sql": "^0.20.0",
         "ssjs-data": "^0.2.2"
     },
     "devDependencies": {
         "@eslint/js": "^10.0.1",
-        "@jest/globals": "^29.0.0",
+        "@jest/globals": "^30.3.0",
         "eslint": "^10.1.0",
         "eslint-config-prettier": "^10.1.8",
         "eslint-plugin-jsdoc": "^62.0.0",
@@ -61,7 +61,8 @@
         "eslint-plugin-unicorn": "^64.0.0",
         "globals": "^17.4.0",
         "husky": "^9.1.7",
-        "jest": "^29.0.0",
+        "jest": "^30.3.0",
+        "lint-staged": "^17.0.5",
         "prettier": "^3.8.1"
     },
     "peerDependencies": {
@@ -69,5 +70,10 @@
     },
     "engines": {
         "node": ">=18.0.0"
+    },
+    "lint-staged": {
+        "*.{js,mjs,cjs}": [
+            "eslint --fix"
+        ]
     }
 }

package/src/index.js

@@ -49,9 +49,15 @@ export const languages = [
     {
         name: 'AMPscript',
         parsers: ['ampscript-parse'],
-        extensions: ['.ampscript', '.amp', '.html'],
+        extensions: ['.ampscript', '.amp'],
         vscodeLanguageIds: ['ampscript'],
     },
+    {
+        name: 'SFMC (AMPscript / SSJS)',
+        parsers: ['ampscript-parse'],
+        extensions: ['.html'],
+        vscodeLanguageIds: ['sfmc'],
+    },
     {
         name: 'SSJS',
         parsers: ['babel'],

package/src/printer.js

@@ -370,7 +370,11 @@ function printAmpscriptNode(path, options, print) {
             for (const altDocument of altDocs) {
                 parts.push(altDocument);
             }
-            parts.push([hardline, kw('endif', okw.endif)]);
+            // Only emit endif when the parser saw it in this block (cross-block
+            // IF/ENDIF spans multiple %%[ ]%% segments; missing endif is intentional).
+            if ('endif' in okw) {
+                parts.push([hardline, kw('endif', okw.endif)]);
+            }
             return parts;
         }
 
@@ -426,7 +430,11 @@ function printAmpscriptNode(path, options, print) {
             if (node.body.length > 0) {
                 parts.push(indent([hardline, join(hardline, path.map(print, 'body'))]));
             }
-            parts.push([hardline, kw('next', okw.next), ' ', counterDocument]);
+            // Only emit next when the parser saw it in this block (cross-block
+            // FOR/NEXT spans multiple %%[ ]%% segments; missing next is intentional).
+            if ('next' in okw) {
+                parts.push([hardline, kw('next', okw.next), ' ', counterDocument]);
+            }
             return parts;
         }
 
@@ -492,7 +500,15 @@ function printAmpscriptNode(path, options, print) {
         }
 
         case 'RawStatement': {
-            return kw(node.value.toLowerCase(), node.keyword);
+            const doc = kw(node.value.toLowerCase(), node.keyword);
+            const extra = node.crossBlockIndentDepth || 0;
+            if (extra === 0) {
+                return doc;
+            }
+            // Nested `indent()` does not stack visible spaces on single-line string
+            // leaves; prefix each line so cross-block ENDIF aligns with its opening IF.
+            const oneLevel = options.useTabs ? '\t' : ' '.repeat(options.tabWidth || 4);
+            return [oneLevel.repeat(extra), doc];
         }
 
         case 'Raw': {