@taiga-ui/prettier-config 0.1.3 → 0.2.0

package/CHANGELOG.md

@@ -3,17 +3,11 @@
 All notable changes to this project will be documented in this file. See
 [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-## [0.1.3](https://github.com/taiga-family/taiga-ui/compare/@taiga-ui/prettier-config@0.1.1...@taiga-ui/prettier-config@0.1.3) (2023-08-14)
-
-**Note:** Version bump only for package @taiga-ui/prettier-config
-
-# Change Log
-
-All notable changes to this project will be documented in this file. See
-[Conventional Commits](https://conventionalcommits.org) for commit guidelines.
-
-## 0.1.1 (2023-08-14)
+# [0.2.0](https://github.com/taiga-family/taiga-ui/compare/@taiga-ui/prettier-config@0.1.3...@taiga-ui/prettier-config@0.2.0) (2023-08-20)
 
 ### Features
 
-- add linters ([b35e525](https://github.com/taiga-family/taiga-ui/commit/b35e5252a2bac063696f0fd1b5accc1ac0d34a66))
+- add cspell config
+  ([268b3fb](https://github.com/taiga-family/taiga-ui/commit/268b3fbf38a679204c1a3f16bf6f0e62c83e7b82))
+- support prettier 3.x ([#2](https://github.com/taiga-family/taiga-ui/issues/2))
+  ([9a0aa41](https://github.com/taiga-family/taiga-ui/commit/9a0aa41bba5a343d3ca237b6793806aa3f3c9f14))

package/index.js

@@ -1,3 +1,19 @@
+const attributeOptions = {
+    attributeGroups: [
+        '$ANGULAR_STRUCTURAL_DIRECTIVE',
+        '$ANGULAR_ELEMENT_REF',
+        '$ID',
+        '$DEFAULT',
+        '$CLASS',
+        '$ANGULAR_ANIMATION',
+        '$ANGULAR_ANIMATION_INPUT',
+        '$ANGULAR_INPUT',
+        '$ANGULAR_TWO_WAY_BINDING',
+        '$ANGULAR_OUTPUT',
+    ],
+    attributeSort: 'ASC',
+};
+
 module.exports = {
     $schema: 'https://json.schemastore.org/prettierrc',
     htmlWhitespaceSensitivity: 'ignore',
@@ -13,18 +29,6 @@ module.exports = {
     arrowParens: 'avoid',
     singleAttributePerLine: true,
     plugins: [require.resolve('prettier-plugin-organize-attributes')],
-    attributeGroups: [
-        '$ANGULAR_STRUCTURAL_DIRECTIVE',
-        '$ANGULAR_ELEMENT_REF',
-        '$ID',
-        '$DEFAULT',
-        '$CLASS',
-        '$ANGULAR_ANIMATION',
-        '$ANGULAR_ANIMATION_INPUT',
-        '$ANGULAR_INPUT',
-        '$ANGULAR_TWO_WAY_BINDING',
-        '$ANGULAR_OUTPUT',
-    ],
     overrides: [
         {
             files: ['*.json', '.prettierrc', '.stylelintrc'],
@@ -77,6 +81,13 @@ module.exports = {
             options: {
                 parser: 'angular',
                 printWidth: 120,
+                ...attributeOptions,
+            },
+        },
+        {
+            files: ['*.ts'],
+            options: {
+                ...attributeOptions,
             },
         },
         {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@taiga-ui/prettier-config",
-    "version": "0.1.3",
+    "version": "0.2.0",
     "description": "Taiga-ui prettier config",
     "keywords": [
         "prettier",
@@ -13,11 +13,11 @@
     "license": "Apache-2.0",
     "main": "index.js",
     "dependencies": {
-        "@prettier/plugin-xml": "2.2.0",
-        "@types/prettier": "2.7.3",
+        "@prettier/plugin-xml": "3.2.0",
+        "@types/prettier": "3.0.0",
         "prettier-package-json": "2.8.0",
-        "prettier-plugin-organize-attributes": "0.0.5",
-        "sort-package-json": "1.57.0"
+        "prettier-plugin-organize-attributes": "1.0.0",
+        "sort-package-json": "2.5.1"
     },
     "publishConfig": {
         "access": "public"

package/plugins/prettier-plugin-sort-package.js

@@ -1,4 +1,5 @@
-const sortPackageJson = require('sort-package-json');
+const prettier = import('prettier');
+const sortPackageJson = import('sort-package-json');
 const {parsers} = require('prettier/parser-babel');
 
 const parser = parsers['json-stringify'];
@@ -6,31 +7,38 @@ const parser = parsers['json-stringify'];
 exports.parsers = {
     'json-stringify': {
         ...parser,
-        preprocess(text, options) {
-            const processed = parser.preprocess ? parser.preprocess(text, options) : text;
-
+        async parse(text, options) {
             const isPackageJson =
                 options.filepath &&
                 /package\.json$|ng-package\.json$/.test(options.filepath);
 
-            if (isPackageJson) {
-                const json = JSON.parse(processed);
-                const unsortedScripts = deepClone((json && json.scripts) || {});
-                const sorted = sortPackageJson(json);
-
-                /**
-                 * @note: add the scripts field if it's provided
-                 * the scripts must be unsorted
-                 */
-                // eslint-disable-next-line no-prototype-builtins
-                if (json && json.hasOwnProperty('scripts')) {
-                    sorted.scripts = unsortedScripts;
-                }
-
-                return JSON.stringify(sorted);
+            if (!isPackageJson) {
+                return parser.parse(text, options);
+            }
+
+            // To avoid parsing errors
+            text = await (await prettier).format(text, {filepath: options.filepath});
+
+            if (parser.preprocess) {
+                text = parser.preprocess(text, options);
             }
 
-            return processed;
+            const json = JSON.parse(text);
+            const unsortedScripts = deepClone((json && json.scripts) || {});
+            const sorted = (await sortPackageJson).default(json);
+
+            /**
+             * @note: add the scripts field if it's provided
+             * the scripts must be unsorted
+             */
+            // eslint-disable-next-line no-prototype-builtins
+            if (json && json.hasOwnProperty('scripts')) {
+                sorted.scripts = unsortedScripts;
+            }
+
+            text = JSON.stringify(sorted);
+
+            return parser.parse(text, options);
         },
     },
 };