prettier-plugin-sh - npm Package Compare versions

Comparing version 0.12.3 to 0.12.4

lib/index.d.ts

@@ -1,14 +0,24 @@
-import { ParserOptions, Plugin } from 'prettier';
-import { File, Node, ShOptions } from 'sh-syntax';
-export interface Processor {
-    (text: string, options?: ShOptions): File;
-    (text: string, options?: ShOptions & {
-        print: true;
-    }): string;
-    (ast: File, options?: ShOptions & {
-        originalText: string;
-    }): string;
+import { LangVariant, Node, Pos } from 'mvdan-sh';
+import { ParserOptions, Plugin, RequiredOptions } from 'prettier';
+export interface ShOptions extends RequiredOptions {
+    keepComments: boolean;
+    stopAt: string;
+    variant: LangVariant;
+    indent: number;
+    binaryNextLine: boolean;
+    switchCaseIndent: boolean;
+    spaceRedirects: boolean;
+    keepPadding: boolean;
+    minify: boolean;
+    functionNextLine: boolean;
 }
 export declare type ShParserOptions = ParserOptions<Node> & ShOptions;
+export interface IShParseError extends Error {
+    Filename: string;
+    Pos: Pos;
+    Text: string;
+    Incomplete: boolean;
+    Error(): void;
+}
 declare const ShPlugin: Plugin<Node>;
 export default ShPlugin;

lib/index.js

@@ -1,18 +0,14 @@
-import path from 'node:path';
-import { fileURLToPath } from 'node:url';
-import { createSyncFn } from 'synckit';
+import sh from 'mvdan-sh';
 import { languages } from './languages.js';
-const _dirname = typeof __dirname === 'undefined'
-    ? path.dirname(fileURLToPath(import.meta.url))
-    : __dirname;
-const processor = createSyncFn(path.resolve(_dirname, 'worker.js'));
+const { syntax } = sh;
 class ShParseError extends SyntaxError {
     constructor(err) {
-        const error = err;
-        super(('Text' in error && error.Text) || error.message);
+        super(err.Text);
         this.cause = err;
-        // `error instanceof ParseError` won't not work because the error is thrown wrapped by `synckit`
-        if ('Pos' in error && error.Pos != null && typeof error.Pos === 'object') {
-            this.loc = { start: { column: error.Pos.Col, line: error.Pos.Line } };
-        }
+        this.loc = {
+            start: {
+                column: err.Pos.Col(),
+                line: err.Pos.Line(),
+            },
+        };
     }
@@ -25,9 +21,11 @@ }
             parse: (text, _parsers, { filepath, keepComments = true, stopAt, variant }) => {
+                const parserOptions = [syntax.KeepComments(keepComments)];
+                if (stopAt != null) {
+                    parserOptions.push(syntax.StopAt(stopAt));
+                }
+                if (variant != null) {
+                    parserOptions.push(syntax.Variant(variant));
+                }
                 try {
-                    return processor(text, {
-                        filepath,
-                        keepComments,
-                        stopAt,
-                        variant,
-                    });
+                    return syntax.NewParser(...parserOptions).Parse(text, filepath);
                 }
@@ -39,4 +37,4 @@ catch (err) {
             astFormat: 'sh',
-            locStart: node => node.Pos.Offset,
-            locEnd: node => node.End.Offset,
+            locStart: node => node.Pos().Offset(),
+            locEnd: node => node.End().Offset(),
         },
@@ -46,15 +44,5 @@ },
         sh: {
-            print: (path, { originalText, filepath, useTabs, tabWidth, indent = useTabs ? 0 : tabWidth, binaryNextLine = true, switchCaseIndent = true, spaceRedirects = true, keepPadding, minify, functionNextLine, }) => processor(path.getNode(), {
-                originalText,
-                filepath,
-                useTabs,
-                tabWidth,
-                indent,
-                binaryNextLine,
-                switchCaseIndent,
-                spaceRedirects,
-                keepPadding,
-                minify,
-                functionNextLine,
-            }),
+            print: (path, { useTabs, tabWidth, indent = useTabs ? 0 : tabWidth, binaryNextLine = true, switchCaseIndent = true, spaceRedirects = true, keepPadding, minify, functionNextLine, }) => syntax
+                .NewPrinter(syntax.Indent(indent), syntax.BinaryNextLine(binaryNextLine), syntax.SwitchCaseIndent(switchCaseIndent), syntax.SpaceRedirects(spaceRedirects), syntax.KeepPadding(keepPadding), syntax.Minify(minify), syntax.FunctionNextLine(functionNextLine))
+                .Print(path.getValue()),
         },
@@ -61,0 +49,0 @@ },

package.json

 {
   "name": "prettier-plugin-sh",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "type": "module",
@@ -39,4 +39,3 @@ "description": "An opinionated `shellscript` formatter plugin for Prettier, also support simple format of `Dockerfile`, `properties`, `gitignore`, `dotenv`, `hosts`, `jvmoptions`...",
   "dependencies": {
-    "sh-syntax": "^0.3.4",
-    "synckit": "^0.7.1"
+    "mvdan-sh": "^0.10.1"
   },
@@ -43,0 +42,0 @@ "publishConfig": {

No alert changes

Improved metrics

Dependency count

2

decreased by-33.33%

Worsened metrics

Total package byte prevSize

41801

decreased by-1.7%

Number of package files

10

decreased by-23.08%

Lines of code

1126

decreased by-1.66%

Dependency changes

• + Addedmvdan-sh@^0.10.1

• + Addedmvdan-sh@0.10.1(transitive)

• - Removedsh-syntax@^0.3.4

• - Removedsynckit@^0.7.1

• - Removed@nodelib/fs.scandir@2.1.5(transitive)

• - Removed@nodelib/fs.stat@2.0.5(transitive)

• - Removed@nodelib/fs.walk@1.2.8(transitive)

• - Removed@pkgr/utils@2.4.2(transitive)

• - Removedbig-integer@1.6.52(transitive)

• - Removedbplist-parser@0.2.0(transitive)

• - Removedbraces@3.0.3(transitive)

• - Removedbundle-name@3.0.0(transitive)

• - Removedcross-spawn@7.0.6(transitive)

• - Removeddefault-browser@4.0.0(transitive)

• - Removeddefault-browser-id@3.0.0(transitive)

• - Removeddefine-lazy-prop@3.0.0(transitive)

• - Removedexeca@5.1.17.2.0(transitive)

• - Removedfast-glob@3.3.3(transitive)

• - Removedfastq@1.18.0(transitive)

• - Removedfill-range@7.1.1(transitive)

• - Removedget-stream@6.0.1(transitive)

• - Removedglob-parent@5.1.2(transitive)

• - Removedhuman-signals@2.1.04.3.1(transitive)

• - Removedis-docker@2.2.13.0.0(transitive)

• - Removedis-extglob@2.1.1(transitive)

• - Removedis-glob@4.0.3(transitive)

• - Removedis-inside-container@1.0.0(transitive)

• - Removedis-number@7.0.0(transitive)

• - Removedis-stream@2.0.13.0.0(transitive)

• - Removedis-wsl@2.2.0(transitive)

• - Removedisexe@2.0.0(transitive)

• - Removedmerge-stream@2.0.0(transitive)

• - Removedmerge2@1.4.1(transitive)

• - Removedmicromatch@4.0.8(transitive)

• - Removedmimic-fn@2.1.04.0.0(transitive)

• - Removednpm-run-path@4.0.15.3.0(transitive)

• - Removedonetime@5.1.26.0.0(transitive)

• - Removedopen@9.1.0(transitive)

• - Removedpath-key@3.1.14.0.0(transitive)

• - Removedpicocolors@1.1.1(transitive)

• - Removedpicomatch@2.3.1(transitive)

• - Removedqueue-microtask@1.2.3(transitive)

• - Removedreusify@1.0.4(transitive)

• - Removedrun-applescript@5.0.0(transitive)

• - Removedrun-parallel@1.2.0(transitive)

• - Removedsh-syntax@0.3.7(transitive)

• - Removedshebang-command@2.0.0(transitive)

• - Removedshebang-regex@3.0.0(transitive)

• - Removedsignal-exit@3.0.7(transitive)

• - Removedstrip-final-newline@2.0.03.0.0(transitive)

• - Removedsynckit@0.7.3(transitive)

• - Removedtitleize@3.0.0(transitive)

• - Removedto-regex-range@5.0.1(transitive)

• - Removedtslib@2.8.1(transitive)

• - Removeduntildify@4.0.0(transitive)

• - Removedwhich@2.0.2(transitive)