diff --git a/.eslintignore b/.eslintignore deleted file mode 100644 index 0f760a71..00000000 --- a/.eslintignore +++ /dev/null @@ -1,5 +0,0 @@ -node_modules -lib -schemas -!/.vscode -!/.github \ No newline at end of file diff --git a/eslint.config.js b/eslint.config.js index b8a6ccf9..e45289bd 100644 --- a/eslint.config.js +++ b/eslint.config.js @@ -1,11 +1,9 @@ +import sharedRules from "@schoero/configs/eslint"; +import eslintPluginTypeScript from "@typescript-eslint/eslint-plugin"; import eslintPluginJsonc from "eslint-plugin-jsonc"; import eslintPluginSortExports from "eslint-plugin-sort-exports"; import eslintPluginVitest from "eslint-plugin-vitest"; -import eslintPluginTypeScript from "@typescript-eslint/eslint-plugin"; - -import sharedRules from "@schoero/configs/eslint"; - const indexImports = [ { diff --git a/package-lock.json b/package-lock.json index 3654ae99..6254910d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,16 +18,16 @@ "unwritten": "lib/node/bin/index.js" }, "devDependencies": { - "@schoero/configs": "^1.0.34", + "@schoero/configs": "^1.0.39", "@types/minimatch": "^5.1.2", - "@types/node": "^22.3.0", + "@types/node": "^22.5.0", "changelogen": "^0.5.5", - "cspell": "^8.13.3", + "cspell": "^8.14.2", "eslint-plugin-jsonc": "^2.16.0", "eslint-plugin-sort-exports": "^0.9.1", "rollup-plugin-preserve-shebang": "^1.0.1", "ts-json-schema-generator": "^2.3.0", - "vite": "^5.4.0", + "vite": "^5.4.2", "vite-plugin-dts": "^4.0.3", "vite-plugin-no-bundle": "^4.0.0", "vitest": "^2.0.5" @@ -230,9 +230,9 @@ } }, "node_modules/@cspell/cspell-bundled-dicts": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.13.3.tgz", - "integrity": "sha512-OfCxUBMyayxKyeDaUZG3LQpiyH8MFUbg9nbIZCGh2x8U6N0fHaP9uR6R+gPzdi/bJp32Kr+RC/Yebojd+AQCGA==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-bundled-dicts/-/cspell-bundled-dicts-8.14.2.tgz", + "integrity": "sha512-Kv2Utj/RTSxfufGXkkoTZ/3ErCsYWpCijtDFr/FwSsM7mC0PzLpdlcD9xjtgrJO5Kwp7T47iTG21U4Mwddyi8Q==", "dev": true, "license": "MIT", "dependencies": { @@ -243,7 +243,7 @@ "@cspell/dict-cpp": "^5.1.12", "@cspell/dict-cryptocurrencies": "^5.0.0", "@cspell/dict-csharp": "^4.0.2", - "@cspell/dict-css": "^4.0.12", + "@cspell/dict-css": "^4.0.13", "@cspell/dict-dart": "^2.0.3", "@cspell/dict-django": "^4.1.0", "@cspell/dict-docker": "^1.1.7", @@ -294,22 +294,22 @@ } }, "node_modules/@cspell/cspell-json-reporter": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.13.3.tgz", - "integrity": "sha512-QrHxWkm0cfD+rTjFOxm5lpE4+wBANDzMIM8NOeQC6v8Dc1L8PUkm6hF6CsEv2tKmuwvdVr+jy6GilDMkPXalCg==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-json-reporter/-/cspell-json-reporter-8.14.2.tgz", + "integrity": "sha512-TZavcnNIZKX1xC/GNj80RgFVKHCT4pHT0qm9jCsQFH2QJfyCrUlkEvotKGSQ04lAyCwWg6Enq95qhouF8YbKUQ==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-types": "8.13.3" + "@cspell/cspell-types": "8.14.2" }, "engines": { "node": ">=18" } }, "node_modules/@cspell/cspell-pipe": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.13.3.tgz", - "integrity": "sha512-6a9Zd+fDltgXoJ0fosWqEMx0UdXBXZ7iakhslMNPRmv7GhVAoHBoIXzMVilOE4kYT2Mh/9NM/QW/NbNEpneZIQ==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-pipe/-/cspell-pipe-8.14.2.tgz", + "integrity": "sha512-aWMoXZAXEre0/M9AYWOW33YyOJZ06i4vvsEpWBDWpHpWQEmsR/7cMMgld8Pp3wlEjIUclUAKTYmrZ61PFWU/og==", "dev": true, "license": "MIT", "engines": { @@ -317,9 +317,9 @@ } }, "node_modules/@cspell/cspell-resolver": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.13.3.tgz", - "integrity": "sha512-vlwtMTEWsPPtWfktzT75eGQ0n+0M+9kN+89eSvUUYdCfvY9XAS6z+bTmhS2ULJgntgWtX6gUjABQK0PYYVedOg==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-resolver/-/cspell-resolver-8.14.2.tgz", + "integrity": "sha512-pSyBsAvslaN0dx0pHdvECJEuFDDBJGAD6G8U4BVbIyj2OPk0Ox0HrZIj6csYxxoJERAgNO/q7yCPwa4j9NNFXg==", "dev": true, "license": "MIT", "dependencies": { @@ -330,9 +330,9 @@ } }, "node_modules/@cspell/cspell-service-bus": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.13.3.tgz", - "integrity": "sha512-mFkeWXwGQSDxRiN6Kez77GaMNGNgG7T6o9UE42jyXEgf/bLJTpefbUy4fY5pU3p2mA0eoMzmnJX8l+TC5YJpbA==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-service-bus/-/cspell-service-bus-8.14.2.tgz", + "integrity": "sha512-WUF7xf3YgXYIqjmBwLcVugYIrYL4WfXchgSo9rmbbnOcAArzsK+HKfzb4AniZAJ1unxcIQ0JnVlRmnCAKPjjLg==", "dev": true, "license": "MIT", "engines": { @@ -340,9 +340,9 @@ } }, "node_modules/@cspell/cspell-types": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.13.3.tgz", - "integrity": "sha512-lA5GbhLOL6FlKCWNMbooRFgNGfTsM6NJnHz60+EEN7XD9OgpFc7w+MBcK4aHsVCxcrIvnejIc8xQDqPnrdmN3w==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/cspell-types/-/cspell-types-8.14.2.tgz", + "integrity": "sha512-MRY8MjBNOKGMDSkxAKueYAgVL43miO+lDcLCBBP+7cNXqHiUFMIZteONcGp3kJT0dWS04dN6lKAXvaNF0aWcng==", "dev": true, "license": "MIT", "engines": { @@ -357,16 +357,16 @@ "license": "MIT" }, "node_modules/@cspell/dict-aws": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.3.tgz", - "integrity": "sha512-0C0RQ4EM29fH0tIYv+EgDQEum0QI6OrmjENC9u98pB8UcnYxGG/SqinuPxo+TgcEuInj0Q73MsBpJ1l5xUnrsw==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-aws/-/dict-aws-4.0.4.tgz", + "integrity": "sha512-6AWI/Kkf+RcX/J81VX8+GKLeTgHWEr/OMhGk3dHQzWK66RaqDJCGDqi7494ghZKcBB7dGa3U5jcKw2FZHL/u3w==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-bash": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.1.3.tgz", - "integrity": "sha512-tOdI3QVJDbQSwPjUkOiQFhYcu2eedmX/PtEpVWg0aFps/r6AyjUQINtTgpqMYnYuq8O1QUIQqnpx21aovcgZCw==", + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@cspell/dict-bash/-/dict-bash-4.1.4.tgz", + "integrity": "sha512-W/AHoQcJYn3Vn/tUiXX2+6D/bhfzdDshwcbQWv9TdiNlXP9P6UJjDKWbxyA5ogJCsR2D0X9Kx11oV8E58siGKQ==", "dev": true, "license": "MIT" }, @@ -378,9 +378,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-cpp": { - "version": "5.1.12", - "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.12.tgz", - "integrity": "sha512-6lXLOFIa+k/qBcu0bjaE/Kc6v3sh9VhsDOXD1Dalm3zgd0QIMjp5XBmkpSdCAK3pWCPV0Se7ysVLDfCea1BuXg==", + "version": "5.1.16", + "resolved": "https://registry.npmjs.org/@cspell/dict-cpp/-/dict-cpp-5.1.16.tgz", + "integrity": "sha512-32fU5RkuOM55IRcxjByiSoKbjr+C4danDfYjHaQNRWdvjzJzci3fLDGA2wTXiclkgDODxGiV8LCTUwCz+3TNWA==", "dev": true, "license": "MIT" }, @@ -441,9 +441,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-dotnet": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.2.tgz", - "integrity": "sha512-UD/pO2A2zia/YZJ8Kck/F6YyDSpCMq0YvItpd4YbtDVzPREfTZ48FjZsbYi4Jhzwfvc6o8R56JusAE58P+4sNQ==", + "version": "5.0.5", + "resolved": "https://registry.npmjs.org/@cspell/dict-dotnet/-/dict-dotnet-5.0.5.tgz", + "integrity": "sha512-gjg0L97ee146wX47dnA698cHm85e7EOpf9mVrJD8DmEaqoo/k1oPy2g7c7LgKxK9XnqwoXxhLNnngPrwXOoEtQ==", "dev": true, "license": "MIT" }, @@ -525,9 +525,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-golang": { - "version": "6.0.9", - "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.9.tgz", - "integrity": "sha512-etDt2WQauyEQDA+qPS5QtkYTb2I9l5IfQftAllVoB1aOrT6bxxpHvMEpJ0Hsn/vezxrCqa/BmtUbRxllIxIuSg==", + "version": "6.0.12", + "resolved": "https://registry.npmjs.org/@cspell/dict-golang/-/dict-golang-6.0.12.tgz", + "integrity": "sha512-LEPeoqd+4O+vceHF73S7D7+LYfrAjOvp4Dqzh4MT30ruzlQ77yHRSuYOJtrFN1GK5ntAt/ILSVOKg9sgsz1Llg==", "dev": true, "license": "MIT" }, @@ -637,37 +637,37 @@ "license": "MIT" }, "node_modules/@cspell/dict-npm": { - "version": "5.0.18", - "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.0.18.tgz", - "integrity": "sha512-weMTyxWpzz19q4wv9n183BtFvdD5fCjtze+bFKpl+4rO/YlPhHL2cXLAeexJz/VDSBecwX4ybTZYoknd1h2J4w==", + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/@cspell/dict-npm/-/dict-npm-5.1.0.tgz", + "integrity": "sha512-731gE9lO8hWb4gUytUk4kycEkAmSf0p8YejB4ZWoyQRvdNcu8p4U5S/yMS+uBPohHtxhSDq0K/vi/QaPm5HYFA==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-php": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.8.tgz", - "integrity": "sha512-TBw3won4MCBQ2wdu7kvgOCR3dY2Tb+LJHgDUpuquy3WnzGiSDJ4AVelrZdE1xu7mjFJUr4q48aB21YT5uQqPZA==", + "version": "4.0.10", + "resolved": "https://registry.npmjs.org/@cspell/dict-php/-/dict-php-4.0.10.tgz", + "integrity": "sha512-NfTZdp6kcZDF1PvgQ6cY0zE4FUO5rSwNmBH/iwCBuaLfJAFQ97rgjxo+D2bic4CFwNjyHutnHPtjJBRANO5XQw==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-powershell": { - "version": "5.0.5", - "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.5.tgz", - "integrity": "sha512-3JVyvMoDJesAATYGOxcUWPbQPUvpZmkinV3m8HL1w1RrjeMVXXuK7U1jhopSneBtLhkU+9HKFwgh9l9xL9mY2Q==", + "version": "5.0.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-powershell/-/dict-powershell-5.0.6.tgz", + "integrity": "sha512-BSi9tmnT7jgNsH5SaHSg70aw+4YwTjkkZBfhHtin0r6AMV2RaiLzsBPvzZGXOcm0yTvl975HYoKMqflXIlk2RA==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-public-licenses": { - "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.7.tgz", - "integrity": "sha512-KlBXuGcN3LE7tQi/GEqKiDewWGGuopiAD0zRK1QilOx5Co8XAvs044gk4MNIQftc8r0nHeUI+irJKLGcR36DIQ==", + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/@cspell/dict-public-licenses/-/dict-public-licenses-2.0.8.tgz", + "integrity": "sha512-Sup+tFS7cDV0fgpoKtUqEZ6+fA/H+XUgBiqQ/Fbs6vUE3WCjJHOIVsP+udHuyMH7iBfJ4UFYOYeORcY4EaKdMg==", "dev": true, "license": "MIT" }, "node_modules/@cspell/dict-python": { - "version": "4.2.4", - "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.4.tgz", - "integrity": "sha512-sCtLBqMreb+8zRW2bXvFsfSnRUVU6IFm4mT6Dc4xbz0YajprbaPPh/kOUTw5IJRP8Uh+FFb7Xp2iH03CNWRq/A==", + "version": "4.2.6", + "resolved": "https://registry.npmjs.org/@cspell/dict-python/-/dict-python-4.2.6.tgz", + "integrity": "sha512-Hkz399qDGEbfXi9GYa2hDl7GahglI86JmS2F1KP8sfjLXofUgtnknyC5NWc86nzHcP38pZiPqPbTigyDYw5y8A==", "dev": true, "license": "MIT", "dependencies": { @@ -682,9 +682,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-ruby": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.2.tgz", - "integrity": "sha512-cIh8KTjpldzFzKGgrqUX4bFyav5lC52hXDKo4LbRuMVncs3zg4hcSf4HtURY+f2AfEZzN6ZKzXafQpThq3dl2g==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@cspell/dict-ruby/-/dict-ruby-5.0.3.tgz", + "integrity": "sha512-V1xzv9hN6u8r6SM4CkYdsxs4ov8gjXXo0Twfx5kWhLXbEVxTXDMt7ohLTqpy2XlF5mutixZdbHMeFiAww8v+Ug==", "dev": true, "license": "MIT" }, @@ -703,9 +703,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-software-terms": { - "version": "4.0.6", - "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-4.0.6.tgz", - "integrity": "sha512-UDhUzNSf7GN529a0Ip9hlSoGbpscz0YlUYBEJmZBXi8otpkrbCJqs50T74Ppd+SWqNil04De8urv4af2c6SY5Q==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-software-terms/-/dict-software-terms-4.1.1.tgz", + "integrity": "sha512-JkXkULoOWYwtdsQ+/6dPtGi2pcrjDQ0NYsTkKt1uFCiITDb+QZkQhAG0kOP69jK6vhSQwUAH3z7jiYWqoK5TKw==", "dev": true, "license": "MIT" }, @@ -731,9 +731,9 @@ "license": "MIT" }, "node_modules/@cspell/dict-terraform": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.0.0.tgz", - "integrity": "sha512-Ak+vy4HP/bOgzf06BAMC30+ZvL9mzv21xLM2XtfnBLTDJGdxlk/nK0U6QT8VfFLqJ0ZZSpyOxGsUebWDCTr/zQ==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@cspell/dict-terraform/-/dict-terraform-1.0.1.tgz", + "integrity": "sha512-29lmUUnZgPh+ieZ5hunick8hzNIpNRtiJh9vAusNskPCrig3RTW6u7F+GG1a8uyslbzSw+Irjf40PTOan1OJJA==", "dev": true, "license": "MIT" }, @@ -752,9 +752,9 @@ "license": "MIT" }, "node_modules/@cspell/dynamic-import": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.13.3.tgz", - "integrity": "sha512-YN83CFWnMkt9B0q0RBadfEoptUaDRqBikh8b91MOQ0haEnUo6t57j4jAaLnbIEP4ynzMhgruWFKpIC/QaEtCuA==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/dynamic-import/-/dynamic-import-8.14.2.tgz", + "integrity": "sha512-5MbqtIligU7yPwHWU/5yFCgMvur4i1bRAF1Cy8y2dDtHsa204S/w/SaXs+51EFLp2eNbCiBisCBrwJFT7R1RxA==", "dev": true, "license": "MIT", "dependencies": { @@ -764,10 +764,20 @@ "node": ">=18.0" } }, + "node_modules/@cspell/filetypes": { + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/filetypes/-/filetypes-8.14.2.tgz", + "integrity": "sha512-ZevArA0mWeVTTqHicxCPZIAeCibpY3NwWK/x6d1Lgu7RPk/daoGAM546Q2SLChFu+r10tIH7pRG212A6Q9ihPA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=18" + } + }, "node_modules/@cspell/strong-weak-map": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.13.3.tgz", - "integrity": "sha512-/QYUEthesPuDarOHa6kcWKJmVq0HIotjPrmAWQ5QpH+dDik1Qin4G/9QdnWX75ueR4DC4WFjBNBU14C4TVSwHQ==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/strong-weak-map/-/strong-weak-map-8.14.2.tgz", + "integrity": "sha512-7sRzJc392CQYNNrtdPEfOHJdRqsqf6nASCtbS5A9hL2UrdWQ4uN7r/D+Y1HpuizwY9eOkZvarcFfsYt5wE0Pug==", "dev": true, "license": "MIT", "engines": { @@ -775,9 +785,9 @@ } }, "node_modules/@cspell/url": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/@cspell/url/-/url-8.13.3.tgz", - "integrity": "sha512-hsxoTnZHwtdR2x9QEE6yfDBB1LUwAj67o1GyKTvI8A2OE/AfzAttirZs+9sxgOGWoBdTOxM9sMLtqB3SxtDB3A==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/@cspell/url/-/url-8.14.2.tgz", + "integrity": "sha512-YmWW+B/2XQcCynLpiAQF77Bitm5Cynw3/BICZkbdveKjJkUzEmXB+U2qWuwXOyU8xUYuwkP63YM8McnI567rUA==", "dev": true, "license": "MIT", "engines": { @@ -2072,13 +2082,13 @@ } }, "node_modules/@schoero/configs": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/@schoero/configs/-/configs-1.0.34.tgz", - "integrity": "sha512-ct/+E2yfI1Hsf0HbZYI1y+vPOX38glRRsnS5Xcj4E8aq+4NYVa8x2BHDX4E98zn52424szDPfBoVuQn9P0p+dg==", + "version": "1.0.39", + "resolved": "https://registry.npmjs.org/@schoero/configs/-/configs-1.0.39.tgz", + "integrity": "sha512-UJnnb91/jMx9kLuvsMdrcaoIQdiYjYlOlxijLSF2Fw/k7NsFnTRzu8ClTbeoUYanHa2zZoC46qyHDU/6M3flig==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/dict-bash": "^4.1.3", + "@cspell/dict-bash": "^4.1.4", "@cspell/dict-companies": "^3.1.4", "@cspell/dict-css": "^4.0.13", "@cspell/dict-de-ch": "^1.2.0", @@ -2091,29 +2101,28 @@ "@cspell/dict-lorem-ipsum": "^4.0.0", "@cspell/dict-markdown": "^2.0.2", "@cspell/dict-node": "^5.0.1", - "@cspell/dict-npm": "^5.0.18", - "@cspell/dict-public-licenses": "^2.0.7", - "@cspell/dict-software-terms": "^4.0.6", + "@cspell/dict-npm": "^5.1.0", + "@cspell/dict-public-licenses": "^2.0.8", + "@cspell/dict-software-terms": "^4.1.1", "@cspell/dict-typescript": "^3.1.6", - "@stylistic/eslint-plugin-js": "^2.6.2", - "@stylistic/eslint-plugin-jsx": "^2.6.2", - "@stylistic/eslint-plugin-plus": "^2.6.2", - "@stylistic/eslint-plugin-ts": "^2.6.2", - "cspell-lib": "^8.13.3", + "@stylistic/eslint-plugin-js": "^2.6.4", + "@stylistic/eslint-plugin-jsx": "^2.6.4", + "@stylistic/eslint-plugin-plus": "^2.6.4", + "@stylistic/eslint-plugin-ts": "^2.6.4", + "@typescript-eslint/eslint-plugin": "^8.3.0", + "@typescript-eslint/parser": "^8.3.0", + "cspell-lib": "^8.14.2", "eslint-plugin-import-newlines": "^1.4.0", - "eslint-plugin-import-x": "^3.1.0", + "eslint-plugin-import-x": "^4.1.0", "eslint-plugin-jsdoc": "^50.2.2", "eslint-plugin-jsonc": "^2.16.0", "eslint-plugin-markdown": "^5.1.0", - "eslint-plugin-simple-import-sort": "^12.1.1", - "eslint-plugin-sort-destructure-keys": "^2.0.0", - "eslint-plugin-sort-keys": "^2.3.5", + "eslint-plugin-perfectionist": "^3.3.0", "eslint-plugin-unicorn": "^55.0.0", "eslint-plugin-unused-imports": "^4.1.3", "eslint-plugin-vitest": "^0.5.4", "eslint-plugin-yml": "^1.14.0", "markdownlint-cli2": "^0.13.0", - "typescript-eslint": "^8.1.0", "vite-tsconfig-paths": "^5.0.1", "vitest-github-actions-reporter": "^0.11.1" }, @@ -2172,9 +2181,9 @@ } }, "node_modules/@stylistic/eslint-plugin-js": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-2.6.2.tgz", - "integrity": "sha512-wCr/kVctAPayMU3pcOI1MKR7MoKIh6VKZU89lPklAqtJoxT+Em6RueiiARbpznUYG5eg3LymiU+aMD+aIZXdqA==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-js/-/eslint-plugin-js-2.6.4.tgz", + "integrity": "sha512-kx1hS3xTvzxZLdr/DCU/dLBE++vcP97sHeEFX2QXhk1Ipa4K1rzPOLw1HCbf4mU3s+7kHP5eYpDe+QteEOFLug==", "dev": true, "license": "MIT", "dependencies": { @@ -2191,14 +2200,16 @@ } }, "node_modules/@stylistic/eslint-plugin-jsx": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-jsx/-/eslint-plugin-jsx-2.6.2.tgz", - "integrity": "sha512-dSXK/fSPA938J1fBi10QmhzLKtZ/2TuyVNHQMk8jUhWfKJDleAogaSqcWNAbN8fwcoe9UWmt/3StiIf2oYC1aQ==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-jsx/-/eslint-plugin-jsx-2.6.4.tgz", + "integrity": "sha512-bIvVhdtjmyu3S10V7QRIuawtCZSq9gRmzAX23ucjCOdSFzEwlq+di0IM0riBAvvQerrJL4SM6G3xgyPs8BSXIA==", "dev": true, "license": "MIT", "dependencies": { - "@stylistic/eslint-plugin-js": "^2.6.2", + "@stylistic/eslint-plugin-js": "^2.6.4", "@types/eslint": "^9.6.0", + "eslint-visitor-keys": "^4.0.0", + "espree": "^10.1.0", "estraverse": "^5.3.0", "picomatch": "^4.0.2" }, @@ -2210,29 +2221,28 @@ } }, "node_modules/@stylistic/eslint-plugin-plus": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-plus/-/eslint-plugin-plus-2.6.2.tgz", - "integrity": "sha512-cANcPASfRvq3VTbbQCrSIXq+2AI0IW68PNYaZoXXS0ENlp7HDB8dmrsJnOgWCcoEvdCB8z/eWcG/eq/v5Qcl+Q==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-plus/-/eslint-plugin-plus-2.6.4.tgz", + "integrity": "sha512-EuRvtxhf7Hv8OoMIePulP/6rBJIgPTu1l5GAm1780WcF1Cl8bOZXIn84Pdac5pNv6lVlzCOFm8MD3VE+2YROuA==", "dev": true, "license": "MIT", "dependencies": { - "@types/eslint": "^9.6.0", - "@typescript-eslint/utils": "^8.0.0" + "@types/eslint": "^9.6.0" }, "peerDependencies": { "eslint": "*" } }, "node_modules/@stylistic/eslint-plugin-ts": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.6.2.tgz", - "integrity": "sha512-6OEN3VtUNxjgOvWPavnC10MByr1H4zsgwNND3rQXr5lDFv93MLUnTsH+/SH15OkuqdyJgrQILI6b9lYecb1vIg==", + "version": "2.6.4", + "resolved": "https://registry.npmjs.org/@stylistic/eslint-plugin-ts/-/eslint-plugin-ts-2.6.4.tgz", + "integrity": "sha512-yxL8Hj6WkObw1jfiLpBzKy5yfxY6vwlwO4miq34ySErUjUecPV5jxfVbOe4q1QDPKemQGPq93v7sAQS5PzM8lA==", "dev": true, "license": "MIT", "dependencies": { - "@stylistic/eslint-plugin-js": "2.6.2", + "@stylistic/eslint-plugin-js": "2.6.4", "@types/eslint": "^9.6.0", - "@typescript-eslint/utils": "^8.0.0" + "@typescript-eslint/utils": "^8.1.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2249,9 +2259,9 @@ "license": "MIT" }, "node_modules/@types/eslint": { - "version": "9.6.0", - "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.0.tgz", - "integrity": "sha512-gi6WQJ7cHRgZxtkQEoyHMppPjq9Kxo5Tjn2prSKDSmZrCz8TZ3jSRCeTJm+WoM+oB0WG37bRqLzaaU3q7JypGg==", + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz", + "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==", "dev": true, "license": "MIT", "dependencies": { @@ -2291,13 +2301,13 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.3.0", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.3.0.tgz", - "integrity": "sha512-nrWpWVaDZuaVc5X84xJ0vNrLvomM205oQyLsRt7OHNZbSHslcWsvgFR7O7hire2ZonjLrWBbedmotmIlJDVd6g==", + "version": "22.5.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.5.0.tgz", + "integrity": "sha512-DkFrJOe+rfdHTqqMg0bSNlGlQ85hSoh2TPzZyhHsXnMtligRWpxUySiyw8FY14ITt24HVCiQPWxS3KO/QlGmWg==", "dev": true, "license": "MIT", "dependencies": { - "undici-types": "~6.18.2" + "undici-types": "~6.19.2" } }, "node_modules/@types/normalize-package-data": { @@ -2315,17 +2325,17 @@ "license": "MIT" }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.1.0.tgz", - "integrity": "sha512-LlNBaHFCEBPHyD4pZXb35mzjGkuGKXU5eeCA1SxvHfiRES0E82dOounfVpL4DCqYvJEKab0bZIA0gCRpdLKkCw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.3.0.tgz", + "integrity": "sha512-FLAIn63G5KH+adZosDYiutqkOkYEx0nvcwNNfJAf+c7Ae/H35qWwTYvPZUKFj5AS+WfHG/WJJfWnDnyNUlp8UA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.10.0", - "@typescript-eslint/scope-manager": "8.1.0", - "@typescript-eslint/type-utils": "8.1.0", - "@typescript-eslint/utils": "8.1.0", - "@typescript-eslint/visitor-keys": "8.1.0", + "@typescript-eslint/scope-manager": "8.3.0", + "@typescript-eslint/type-utils": "8.3.0", + "@typescript-eslint/utils": "8.3.0", + "@typescript-eslint/visitor-keys": "8.3.0", "graphemer": "^1.4.0", "ignore": "^5.3.1", "natural-compare": "^1.4.0", @@ -2349,16 +2359,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.1.0.tgz", - "integrity": "sha512-U7iTAtGgJk6DPX9wIWPPOlt1gO57097G06gIcl0N0EEnNw8RGD62c+2/DiP/zL7KrkqnnqF7gtFGR7YgzPllTA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.3.0.tgz", + "integrity": "sha512-h53RhVyLu6AtpUzVCYLPhZGL5jzTD9fZL+SYf/+hYOx2bDkyQXztXSc4tbvKYHzfMXExMLiL9CWqJmVz6+78IQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/scope-manager": "8.1.0", - "@typescript-eslint/types": "8.1.0", - "@typescript-eslint/typescript-estree": "8.1.0", - "@typescript-eslint/visitor-keys": "8.1.0", + "@typescript-eslint/scope-manager": "8.3.0", + "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/typescript-estree": "8.3.0", + "@typescript-eslint/visitor-keys": "8.3.0", "debug": "^4.3.4" }, "engines": { @@ -2378,14 +2388,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.1.0.tgz", - "integrity": "sha512-DsuOZQji687sQUjm4N6c9xABJa7fjvfIdjqpSIIVOgaENf2jFXiM9hIBZOL3hb6DHK9Nvd2d7zZnoMLf9e0OtQ==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.3.0.tgz", + "integrity": "sha512-mz2X8WcN2nVu5Hodku+IR8GgCOl4C0G/Z1ruaWN4dgec64kDBabuXyPAr+/RgJtumv8EEkqIzf3X2U5DUKB2eg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.1.0", - "@typescript-eslint/visitor-keys": "8.1.0" + "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/visitor-keys": "8.3.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2396,14 +2406,14 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.1.0.tgz", - "integrity": "sha512-oLYvTxljVvsMnldfl6jIKxTaU7ok7km0KDrwOt1RHYu6nxlhN3TIx8k5Q52L6wR33nOwDgM7VwW1fT1qMNfFIA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.3.0.tgz", + "integrity": "sha512-wrV6qh//nLbfXZQoj32EXKmwHf4b7L+xXLrP3FZ0GOUU72gSvLjeWUl5J5Ue5IwRxIV1TfF73j/eaBapxx99Lg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/typescript-estree": "8.1.0", - "@typescript-eslint/utils": "8.1.0", + "@typescript-eslint/typescript-estree": "8.3.0", + "@typescript-eslint/utils": "8.3.0", "debug": "^4.3.4", "ts-api-utils": "^1.3.0" }, @@ -2421,9 +2431,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.1.0.tgz", - "integrity": "sha512-q2/Bxa0gMOu/2/AKALI0tCKbG2zppccnRIRCW6BaaTlRVaPKft4oVYPp7WOPpcnsgbr0qROAVCVKCvIQ0tbWog==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.3.0.tgz", + "integrity": "sha512-y6sSEeK+facMaAyixM36dQ5NVXTnKWunfD1Ft4xraYqxP0lC0POJmIaL/mw72CUMqjY9qfyVfXafMeaUj0noWw==", "dev": true, "license": "MIT", "engines": { @@ -2435,16 +2445,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.1.0.tgz", - "integrity": "sha512-NTHhmufocEkMiAord/g++gWKb0Fr34e9AExBRdqgWdVBaKoei2dIyYKD9Q0jBnvfbEA5zaf8plUFMUH6kQ0vGg==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.3.0.tgz", + "integrity": "sha512-Mq7FTHl0R36EmWlCJWojIC1qn/ZWo2YiWYc1XVtasJ7FIgjo0MVv9rZWXEE7IK2CGrtwe1dVOxWwqXUdNgfRCA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "@typescript-eslint/types": "8.1.0", - "@typescript-eslint/visitor-keys": "8.1.0", + "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/visitor-keys": "8.3.0", "debug": "^4.3.4", - "globby": "^11.1.0", + "fast-glob": "^3.3.2", "is-glob": "^4.0.3", "minimatch": "^9.0.4", "semver": "^7.6.0", @@ -2480,16 +2490,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.1.0.tgz", - "integrity": "sha512-ypRueFNKTIFwqPeJBfeIpxZ895PQhNyH4YID6js0UoBImWYoSjBsahUn9KMiJXh94uOjVBgHD9AmkyPsPnFwJA==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.3.0.tgz", + "integrity": "sha512-F77WwqxIi/qGkIGOGXNBLV7nykwfjLsdauRB/DOFPdv6LTF3BHHkBpq81/b5iMPSF055oO2BiivDJV4ChvNtXA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "8.1.0", - "@typescript-eslint/types": "8.1.0", - "@typescript-eslint/typescript-estree": "8.1.0" + "@typescript-eslint/scope-manager": "8.3.0", + "@typescript-eslint/types": "8.3.0", + "@typescript-eslint/typescript-estree": "8.3.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2503,13 +2513,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.1.0.tgz", - "integrity": "sha512-ba0lNI19awqZ5ZNKh6wCModMwoZs457StTebQ0q1NP58zSi2F6MOZRXwfKZy+jB78JNJ/WH8GSh2IQNzXX8Nag==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.3.0.tgz", + "integrity": "sha512-RmZwrTbQ9QveF15m/Cl28n0LXD6ea2CjkhH5rQ55ewz3H24w+AMCJHPVYaZ8/0HoG8Z3cLLFFycRXxeO2tz9FA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.1.0", + "@typescript-eslint/types": "8.3.0", "eslint-visitor-keys": "^3.4.3" }, "engines": { @@ -3548,25 +3558,25 @@ } }, "node_modules/cspell": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell/-/cspell-8.13.3.tgz", - "integrity": "sha512-2wv4Eby7g8wDB553fI8IoZjyitoKrD2kmtdeoYUN2EjVs3RMpIOver3fL+0VaFAaN0uLfAoeAAIB5xJEakvZYQ==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell/-/cspell-8.14.2.tgz", + "integrity": "sha512-ii/W7fwO4chNQVYl1C/8k7RW8EXzLb69rvg08p8mSJx8B2UasVJ9tuJpTH2Spo1jX6N3H0dKPWUbd1fAmdAhPg==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-json-reporter": "8.13.3", - "@cspell/cspell-pipe": "8.13.3", - "@cspell/cspell-types": "8.13.3", - "@cspell/dynamic-import": "8.13.3", - "@cspell/url": "8.13.3", + "@cspell/cspell-json-reporter": "8.14.2", + "@cspell/cspell-pipe": "8.14.2", + "@cspell/cspell-types": "8.14.2", + "@cspell/dynamic-import": "8.14.2", + "@cspell/url": "8.14.2", "chalk": "^5.3.0", "chalk-template": "^1.1.0", "commander": "^12.1.0", - "cspell-dictionary": "8.13.3", - "cspell-gitignore": "8.13.3", - "cspell-glob": "8.13.3", - "cspell-io": "8.13.3", - "cspell-lib": "8.13.3", + "cspell-dictionary": "8.14.2", + "cspell-gitignore": "8.14.2", + "cspell-glob": "8.14.2", + "cspell-io": "8.14.2", + "cspell-lib": "8.14.2", "fast-glob": "^3.3.2", "fast-json-stable-stringify": "^2.1.0", "file-entry-cache": "^9.0.0", @@ -3586,13 +3596,13 @@ } }, "node_modules/cspell-config-lib": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.13.3.tgz", - "integrity": "sha512-dzVdar8Kenwxho0PnUxOxwjUvyFYn6Q9mQAMHcQNXQrvo32bdpoF+oNtWC/5FfrQgUgyl19CVQ607bRigYWoOQ==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell-config-lib/-/cspell-config-lib-8.14.2.tgz", + "integrity": "sha512-yHP1BdcH5dbjb8qiZr6+bxEnJ+rxTULQ00wBz3eBPWCghJywEAYYvMWoYuxVtPpndlkKYC1wJAHsyNkweQyepA==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-types": "8.13.3", + "@cspell/cspell-types": "8.14.2", "comment-json": "^4.2.5", "yaml": "^2.5.0" }, @@ -3601,15 +3611,15 @@ } }, "node_modules/cspell-dictionary": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.13.3.tgz", - "integrity": "sha512-DQ3Tee7LIoy+9Mu52ht32O/MNBZ6i4iUeSTY2sMDDwogno3361BLRyfEjyiYNo3Fqf0Pcnt5MqY2DqIhrF/H/Q==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell-dictionary/-/cspell-dictionary-8.14.2.tgz", + "integrity": "sha512-gWuAvf6queGGUvGbfAxxUq55cZ0OevWPbjnCrSB0PpJ4tqdFd8dLcvVrIKzoE2sBXKPw2NDkmoEngs6iGavC0w==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-pipe": "8.13.3", - "@cspell/cspell-types": "8.13.3", - "cspell-trie-lib": "8.13.3", + "@cspell/cspell-pipe": "8.14.2", + "@cspell/cspell-types": "8.14.2", + "cspell-trie-lib": "8.14.2", "fast-equals": "^5.0.1" }, "engines": { @@ -3617,15 +3627,15 @@ } }, "node_modules/cspell-gitignore": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.13.3.tgz", - "integrity": "sha512-0OZXuP33CXV4P95ySHGNqhq3VR5RaLwpyo0nGvLHOjPm3mCsQSjURLBKHvyQ3r2M7LWsGV1Xc81FfTx30FBZLg==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell-gitignore/-/cspell-gitignore-8.14.2.tgz", + "integrity": "sha512-lrO/49NaKBpkR7vFxv4OOY+oHmsG5+gNQejrBBWD9Nv9vvjJtz/G36X/rcN6M6tFcQQMWwa01kf04nxz8Ejuhg==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/url": "8.13.3", - "cspell-glob": "8.13.3", - "cspell-io": "8.13.3", + "@cspell/url": "8.14.2", + "cspell-glob": "8.14.2", + "cspell-io": "8.14.2", "find-up-simple": "^1.0.0" }, "bin": { @@ -3636,13 +3646,13 @@ } }, "node_modules/cspell-glob": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.13.3.tgz", - "integrity": "sha512-+jGIMYyKDLmoOJIxNPXRdI7utcvw+9FMSmj1ApIdEff5dCkehi0gtzK4H7orXGYEvRdKQvfaXiyduVi79rXsZQ==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell-glob/-/cspell-glob-8.14.2.tgz", + "integrity": "sha512-9Q1Kgoo1ev3fKTpp9y5n8M4RLxd8B0f5o4y5FQe4dBU0j/bt+/YDrLZNWDm77JViV606XQ6fimG1FTTq6pT9/g==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/url": "8.13.3", + "@cspell/url": "8.14.2", "micromatch": "^4.0.7" }, "engines": { @@ -3650,14 +3660,14 @@ } }, "node_modules/cspell-grammar": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.13.3.tgz", - "integrity": "sha512-xPSgKk9HY5EsI8lkMPC9hiZCeAUs+RY/IVliUBW1xEicAJhP4RZIGRdIwtDNNJGwKfNXazjqYhcS4LS0q7xPAQ==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell-grammar/-/cspell-grammar-8.14.2.tgz", + "integrity": "sha512-eYwceVP80FGYVJenE42ALnvEKOXaXjq4yVbb1Ni1umO/9qamLWNCQ1RP6rRACy5e/cXviAbhrQ5Mtw6n+pyPEQ==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-pipe": "8.13.3", - "@cspell/cspell-types": "8.13.3" + "@cspell/cspell-pipe": "8.14.2", + "@cspell/cspell-types": "8.14.2" }, "bin": { "cspell-grammar": "bin.mjs" @@ -3667,41 +3677,42 @@ } }, "node_modules/cspell-io": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-8.13.3.tgz", - "integrity": "sha512-AeMIkz7+4VuJaPKO/v1pUpyUSOOTyLOAfzeTRRAXEt+KRKOUe36MyUmBMza6gzNcX2yD04VgJukRL408TY9ntw==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell-io/-/cspell-io-8.14.2.tgz", + "integrity": "sha512-uaKpHiY3DAgfdzgKMQml6U8F8o9udMuYxGqYa5FVfN7D5Ap7B2edQzSLTUYwxrFEn4skSfp6XY73+nzJvxzH4Q==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-service-bus": "8.13.3", - "@cspell/url": "8.13.3" + "@cspell/cspell-service-bus": "8.14.2", + "@cspell/url": "8.14.2" }, "engines": { "node": ">=18" } }, "node_modules/cspell-lib": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.13.3.tgz", - "integrity": "sha512-aEqxIILeqDtNoCa47/oSl5c926b50ue3PobYs4usn0Ymf0434RopCP+DCGsF7BPtog4j4XWnEmvkcJs57DYWDg==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell-lib/-/cspell-lib-8.14.2.tgz", + "integrity": "sha512-d2oiIXHXnADmnhIuFLOdNE63L7OUfzgpLbYaqAWbkImCUDkevfGrOgnX8TJ03fUgZID4nvQ+3kgu/n2j4eLZjQ==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-bundled-dicts": "8.13.3", - "@cspell/cspell-pipe": "8.13.3", - "@cspell/cspell-resolver": "8.13.3", - "@cspell/cspell-types": "8.13.3", - "@cspell/dynamic-import": "8.13.3", - "@cspell/strong-weak-map": "8.13.3", - "@cspell/url": "8.13.3", + "@cspell/cspell-bundled-dicts": "8.14.2", + "@cspell/cspell-pipe": "8.14.2", + "@cspell/cspell-resolver": "8.14.2", + "@cspell/cspell-types": "8.14.2", + "@cspell/dynamic-import": "8.14.2", + "@cspell/filetypes": "8.14.2", + "@cspell/strong-weak-map": "8.14.2", + "@cspell/url": "8.14.2", "clear-module": "^4.1.2", "comment-json": "^4.2.5", - "cspell-config-lib": "8.13.3", - "cspell-dictionary": "8.13.3", - "cspell-glob": "8.13.3", - "cspell-grammar": "8.13.3", - "cspell-io": "8.13.3", - "cspell-trie-lib": "8.13.3", + "cspell-config-lib": "8.14.2", + "cspell-dictionary": "8.14.2", + "cspell-glob": "8.14.2", + "cspell-grammar": "8.14.2", + "cspell-io": "8.14.2", + "cspell-trie-lib": "8.14.2", "env-paths": "^3.0.0", "fast-equals": "^5.0.1", "gensequence": "^7.0.0", @@ -3716,14 +3727,14 @@ } }, "node_modules/cspell-trie-lib": { - "version": "8.13.3", - "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.13.3.tgz", - "integrity": "sha512-Z0iLGi9HI+Vf+WhVVeru6dYgQdtaYCKWRlc1SayLfAZhw9BcjrXL8KTXDfAfv/lUgnRu6xwP1isLlDNZECsKVQ==", + "version": "8.14.2", + "resolved": "https://registry.npmjs.org/cspell-trie-lib/-/cspell-trie-lib-8.14.2.tgz", + "integrity": "sha512-rZMbaEBGoyy4/zxKECaMyVyGLbuUxYmZ5jlEgiA3xPtEdWwJ4iWRTo5G6dWbQsXoxPYdAXXZ0/q0GQ2y6Jt0kw==", "dev": true, "license": "MIT", "dependencies": { - "@cspell/cspell-pipe": "8.13.3", - "@cspell/cspell-types": "8.13.3", + "@cspell/cspell-pipe": "8.14.2", + "@cspell/cspell-types": "8.14.2", "gensequence": "^7.0.0" }, "engines": { @@ -4204,143 +4215,29 @@ } }, "node_modules/eslint-plugin-import-x": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-3.1.0.tgz", - "integrity": "sha512-/UbPA+bYY7nIxcjL3kpcDY3UNdoLHFhyBFzHox2M0ypcUoueTn6woZUUmzzi5et/dXChksasYYFeKE2wshOrhg==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-import-x/-/eslint-plugin-import-x-4.1.0.tgz", + "integrity": "sha512-1BYJU0C5NBJLY4qukmwDbFrf2w8fLGEU9zZV3viWa7gNnbn4o4meQy5O4LVXn56eFh9Y4fQxu3udhIqQuVITvw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/utils": "^7.4.0", + "@typescript-eslint/typescript-estree": "^8.1.0", + "@typescript-eslint/utils": "^8.1.0", "debug": "^4.3.4", "doctrine": "^3.0.0", "eslint-import-resolver-node": "^0.3.9", "get-tsconfig": "^4.7.3", "is-glob": "^4.0.3", "minimatch": "^9.0.3", - "semver": "^7.6.0", + "semver": "^7.6.3", "stable-hash": "^0.0.4", - "tslib": "^2.6.2" - }, - "engines": { - "node": ">=16" - }, - "peerDependencies": { - "eslint": "^8.56.0 || ^9.0.0-0" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/scope-manager": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz", - "integrity": "sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/types": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-7.18.0.tgz", - "integrity": "sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/typescript-estree": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz", - "integrity": "sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA==", - "dev": true, - "license": "BSD-2-Clause", - "dependencies": { - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/visitor-keys": "7.18.0", - "debug": "^4.3.4", - "globby": "^11.1.0", - "is-glob": "^4.0.3", - "minimatch": "^9.0.4", - "semver": "^7.6.0", - "ts-api-utils": "^1.3.0" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/utils": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-7.18.0.tgz", - "integrity": "sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@eslint-community/eslint-utils": "^4.4.0", - "@typescript-eslint/scope-manager": "7.18.0", - "@typescript-eslint/types": "7.18.0", - "@typescript-eslint/typescript-estree": "7.18.0" + "tslib": "^2.6.3" }, "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" + "node": "^18.18.0 || ^20.9.0 || >=21.1.0" }, "peerDependencies": { - "eslint": "^8.56.0" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/@typescript-eslint/visitor-keys": { - "version": "7.18.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz", - "integrity": "sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/types": "7.18.0", - "eslint-visitor-keys": "^3.4.3" - }, - "engines": { - "node": "^18.18.0 || >=20.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - } - }, - "node_modules/eslint-plugin-import-x/node_modules/eslint-visitor-keys": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^12.22.0 || ^14.17.0 || >=16.0.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" + "eslint": "^8.57.0 || ^9.0.0" } }, "node_modules/eslint-plugin-import-x/node_modules/minimatch": { @@ -4470,6 +4367,43 @@ "eslint": ">=8" } }, + "node_modules/eslint-plugin-perfectionist": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-perfectionist/-/eslint-plugin-perfectionist-3.3.0.tgz", + "integrity": "sha512-sGgShkEqDBqIZ3WlenGHwLe1cl3vHKTfeh9b1XXAamaxSC7AY4Os0jdNCXnGJW4l0TlpismT5t2r7CXY7sfKlw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@typescript-eslint/types": "^8.3.0", + "@typescript-eslint/utils": "^8.3.0", + "minimatch": "^10.0.1", + "natural-compare-lite": "^1.4.0" + }, + "engines": { + "node": "^18.0.0 || >=20.0.0" + }, + "peerDependencies": { + "astro-eslint-parser": "^1.0.2", + "eslint": ">=8.0.0", + "svelte": ">=3.0.0", + "svelte-eslint-parser": "^0.41.0", + "vue-eslint-parser": ">=9.0.0" + }, + "peerDependenciesMeta": { + "astro-eslint-parser": { + "optional": true + }, + "svelte": { + "optional": true + }, + "svelte-eslint-parser": { + "optional": true + }, + "vue-eslint-parser": { + "optional": true + } + } + }, "node_modules/eslint-plugin-readable-tailwind": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/eslint-plugin-readable-tailwind/-/eslint-plugin-readable-tailwind-1.7.0.tgz", @@ -4485,32 +4419,6 @@ "tailwindcss": ">=3.3.0" } }, - "node_modules/eslint-plugin-simple-import-sort": { - "version": "12.1.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-simple-import-sort/-/eslint-plugin-simple-import-sort-12.1.1.tgz", - "integrity": "sha512-6nuzu4xwQtE3332Uz0to+TxDQYRLTKRESSc2hefVT48Zc8JthmN23Gx9lnYhu0FtkRSL1oxny3kJ2aveVhmOVA==", - "dev": true, - "license": "MIT", - "peerDependencies": { - "eslint": ">=5.0.0" - } - }, - "node_modules/eslint-plugin-sort-destructure-keys": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-sort-destructure-keys/-/eslint-plugin-sort-destructure-keys-2.0.0.tgz", - "integrity": "sha512-4w1UQCa3o/YdfWaLr9jY8LfGowwjwjmwClyFLxIsToiyIdZMq3x9Ti44nDn34DtTPP7PWg96tUONKVmATKhYGQ==", - "dev": true, - "license": "ISC", - "dependencies": { - "natural-compare-lite": "^1.4.0" - }, - "engines": { - "node": ">=12" - }, - "peerDependencies": { - "eslint": "5 - 9" - } - }, "node_modules/eslint-plugin-sort-exports": { "version": "0.9.1", "resolved": "https://registry.npmjs.org/eslint-plugin-sort-exports/-/eslint-plugin-sort-exports-0.9.1.tgz", @@ -4540,16 +4448,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/eslint-plugin-sort-keys": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/eslint-plugin-sort-keys/-/eslint-plugin-sort-keys-2.3.5.tgz", - "integrity": "sha512-2j/XKQ9sNJwK8kIp/U0EvuF6stS6/8aIc53/NskE4C5NRNh4dt3xzbZyOdrVC11cTH6Zo59/pdzA0Kb+2fQGWg==", - "dev": true, - "license": "ISC", - "dependencies": { - "natural-compare": "1.4.0" - } - }, "node_modules/eslint-plugin-tailwindcss": { "version": "3.17.4", "resolved": "https://registry.npmjs.org/eslint-plugin-tailwindcss/-/eslint-plugin-tailwindcss-3.17.4.tgz", @@ -8604,30 +8502,6 @@ "node": ">=14.17" } }, - "node_modules/typescript-eslint": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.1.0.tgz", - "integrity": "sha512-prB2U3jXPJLpo1iVLN338Lvolh6OrcCZO+9Yv6AR+tvegPPptYCDBIHiEEUdqRi8gAv2bXNKfMUrgAd2ejn/ow==", - "dev": true, - "license": "MIT", - "dependencies": { - "@typescript-eslint/eslint-plugin": "8.1.0", - "@typescript-eslint/parser": "8.1.0", - "@typescript-eslint/utils": "8.1.0" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/typescript-eslint" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, "node_modules/uc.micro": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", @@ -8656,9 +8530,9 @@ } }, "node_modules/undici-types": { - "version": "6.18.2", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.18.2.tgz", - "integrity": "sha512-5ruQbENj95yDYJNS3TvcaxPMshV7aizdv/hWYjGIKoANWKjhWNBsr2YEuYZKodQulB1b8l7ILOuDQep3afowQQ==", + "version": "6.19.8", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz", + "integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==", "dev": true, "license": "MIT" }, @@ -8792,15 +8666,15 @@ } }, "node_modules/vite": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.0.tgz", - "integrity": "sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==", + "version": "5.4.2", + "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.2.tgz", + "integrity": "sha512-dDrQTRHp5C1fTFzcSaMxjk6vdpKvT+2/mIdE07Gw2ykehT49O0z/VHS3zZ8iV/Gh8BJJKHWOe5RjaNrW5xf/GA==", "dev": true, "license": "MIT", "dependencies": { "esbuild": "^0.21.3", - "postcss": "^8.4.40", - "rollup": "^4.13.0" + "postcss": "^8.4.41", + "rollup": "^4.20.0" }, "bin": { "vite": "bin/vite.js" diff --git a/package.json b/package.json index 298d1178..1d577198 100644 --- a/package.json +++ b/package.json @@ -69,16 +69,16 @@ "typescript": "^5.5.4" }, "devDependencies": { - "@schoero/configs": "^1.0.34", + "@schoero/configs": "^1.0.39", "@types/minimatch": "^5.1.2", - "@types/node": "^22.3.0", + "@types/node": "^22.5.0", "changelogen": "^0.5.5", - "cspell": "^8.13.3", + "cspell": "^8.14.2", "eslint-plugin-jsonc": "^2.16.0", "eslint-plugin-sort-exports": "^0.9.1", "rollup-plugin-preserve-shebang": "^1.0.1", "ts-json-schema-generator": "^2.3.0", - "vite": "^5.4.0", + "vite": "^5.4.2", "vite-plugin-dts": "^4.0.3", "vite-plugin-no-bundle": "^4.0.0", "vitest": "^2.0.5" diff --git a/src/api/browser.entry.ts b/src/api/browser.entry.ts index 33bf25dd..62aeb326 100644 --- a/src/api/browser.entry.ts +++ b/src/api/browser.entry.ts @@ -2,9 +2,9 @@ import ts from "typescript"; import { convertDiagnostics, reportCompilerDiagnostics } from "unwritten:compiler/shared"; import { createConfig } from "unwritten:config/config"; -import { interpret } from "unwritten:interpreter/ast/symbol"; import { createContext as createInterpreterContext } from "unwritten:interpreter:utils/context"; import { getEntryFileSymbolsFromProgram } from "unwritten:interpreter:utils/ts"; +import { interpret } from "unwritten:interpreter/ast/symbol"; import os from "unwritten:platform/os/browser"; import path from "unwritten:platform/path/browser"; import process from "unwritten:platform/process/browser"; diff --git a/src/api/node.entry.ts b/src/api/node.entry.ts index 684fc98b..6e411153 100644 --- a/src/api/node.entry.ts +++ b/src/api/node.entry.ts @@ -1,11 +1,11 @@ import ts from "typescript"; -import { convertDiagnostics, reportCompilerDiagnostics } from "unwritten:compiler/shared"; import { compile } from "unwritten:compiler:node"; +import { convertDiagnostics, reportCompilerDiagnostics } from "unwritten:compiler/shared"; import { createConfig } from "unwritten:config/config"; -import { interpret } from "unwritten:interpreter/ast/symbol"; import { createContext as createInterpreterContext } from "unwritten:interpreter:utils/context"; import { getEntryFileSymbolsFromProgram } from "unwritten:interpreter:utils/ts"; +import { interpret } from "unwritten:interpreter/ast/symbol"; import fs, { existsSync, mkdirSync, writeFileSync } from "unwritten:platform/file-system/node"; import os from "unwritten:platform/os/node"; import path from "unwritten:platform/path/node"; diff --git a/src/config/config.ts b/src/config/config.ts index 9d0c2d04..d0412d5c 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -1,9 +1,9 @@ -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { defaultJSONRenderConfig } from "unwritten:renderer:json:config/default"; import { defaultHTMLRenderConfig, defaultMarkdownRenderConfig } from "unwritten:renderer:markup/config/default"; -import { isNodeContext } from "unwritten:utils/context"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { findFile } from "unwritten:utils:finder"; import { override } from "unwritten:utils:override"; +import { isNodeContext } from "unwritten:utils/context"; import { defaultExternalTypes, defaultInterpreterConfig, defaultOutputPath } from "./default"; @@ -172,9 +172,9 @@ export function getDefaultConfig(): CompleteNodeConfig { interpreterConfig: defaultInterpreterConfig, outputDir: defaultOutputPath, renderConfig: { - [BuiltInRenderers.Markdown]: defaultMarkdownRenderConfig, [BuiltInRenderers.HTML]: defaultHTMLRenderConfig, - [BuiltInRenderers.JSON]: defaultJSONRenderConfig + [BuiltInRenderers.JSON]: defaultJSONRenderConfig, + [BuiltInRenderers.Markdown]: defaultMarkdownRenderConfig } }; diff --git a/src/config/default.ts b/src/config/default.ts index 57b3e28a..5d3becf3 100644 --- a/src/config/default.ts +++ b/src/config/default.ts @@ -1,4 +1,4 @@ -/* eslint-disable eslint-plugin-sort-keys/sort-keys-fix */ +/* eslint-disable eslint-plugin-perfectionist/sort-objects */ /* eslint-disable eslint-plugin-typescript/naming-convention */ import { TypeKind } from "unwritten:interpreter/enums/type"; diff --git a/src/interpreter/ast/entities/circular.test.ts b/src/interpreter/ast/entities/circular.test.ts index af6b5d4a..e81c5909 100644 --- a/src/interpreter/ast/entities/circular.test.ts +++ b/src/interpreter/ast/entities/circular.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createInterfaceEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createInterfaceEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/entities/circular.ts b/src/interpreter/ast/entities/circular.ts index 9d302e28..8c87832d 100644 --- a/src/interpreter/ast/entities/circular.ts +++ b/src/interpreter/ast/entities/circular.ts @@ -1,7 +1,7 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; import { getPositionBySymbol } from "unwritten:interpreter:ast/shared/position"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/entities/class.test.ts b/src/interpreter/ast/entities/class.test.ts index e114b578..63c82932 100644 --- a/src/interpreter/ast/entities/class.test.ts +++ b/src/interpreter/ast/entities/class.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createClassEntity } from "unwritten:interpreter:ast/entities/index"; import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/class.ts b/src/interpreter/ast/entities/class.ts index 2bedf874..26592b00 100644 --- a/src/interpreter/ast/entities/class.ts +++ b/src/interpreter/ast/entities/class.ts @@ -1,6 +1,3 @@ -import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; import { createConstructorEntity, createGetterEntity, @@ -22,6 +19,9 @@ import { isPropertyDeclaration, isSetterDeclaration } from "unwritten:interpreter:typeguards/declarations"; +import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; import { isExpressionType } from "unwritten:typeguards/types"; import { assert } from "unwritten:utils:general"; diff --git a/src/interpreter/ast/entities/constructor.test.ts b/src/interpreter/ast/entities/constructor.test.ts index 2c8d16c4..d59e5e86 100644 --- a/src/interpreter/ast/entities/constructor.test.ts +++ b/src/interpreter/ast/entities/constructor.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createClassEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/constructor.ts b/src/interpreter/ast/entities/constructor.ts index 2db5a089..cce28541 100644 --- a/src/interpreter/ast/entities/constructor.ts +++ b/src/interpreter/ast/entities/constructor.ts @@ -1,5 +1,5 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createFunctionLikeEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/entities/enum.test.ts b/src/interpreter/ast/entities/enum.test.ts index c702ab91..319fb0ea 100644 --- a/src/interpreter/ast/entities/enum.test.ts +++ b/src/interpreter/ast/entities/enum.test.ts @@ -1,9 +1,9 @@ import { assert, expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createEnumEntity } from "unwritten:interpreter:ast/entities/index"; import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/enum.ts b/src/interpreter/ast/entities/enum.ts index 55cb156e..4d64e31e 100644 --- a/src/interpreter/ast/entities/enum.ts +++ b/src/interpreter/ast/entities/enum.ts @@ -1,15 +1,15 @@ -import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; import { getDeclarationId, getSymbolId, getSymbolIdByDeclaration } from "unwritten:interpreter:ast/shared/id"; import { getNameByDeclaration, getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import { isEnumDeclaration } from "unwritten:interpreter:typeguards/declarations"; +import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import { getTypeByDeclaration } from "../type"; -import type { EnumDeclaration, EnumMember as TSEnumMember, Symbol } from "typescript"; +import type { EnumDeclaration, Symbol, EnumMember as TSEnumMember } from "typescript"; import type { EnumEntity, EnumMemberEntity, MergedEnumEntity } from "unwritten:interpreter:type-definitions/entities"; import type { InterpreterContext } from "unwritten:type-definitions/context"; diff --git a/src/interpreter/ast/entities/export-assignment.test.ts b/src/interpreter/ast/entities/export-assignment.test.ts index 5e08f1f7..14bfdcb9 100644 --- a/src/interpreter/ast/entities/export-assignment.test.ts +++ b/src/interpreter/ast/entities/export-assignment.test.ts @@ -1,8 +1,7 @@ -/* eslint-disable eslint-plugin-typescript/naming-convention */ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createExportAssignmentEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isExportAssignmentEntity } from "unwritten:typeguards/entities"; diff --git a/src/interpreter/ast/entities/function-like.test.ts b/src/interpreter/ast/entities/function-like.test.ts index 6d230f8e..ed9bce25 100644 --- a/src/interpreter/ast/entities/function-like.test.ts +++ b/src/interpreter/ast/entities/function-like.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createFunctionLikeEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/entities/function-like.ts b/src/interpreter/ast/entities/function-like.ts index 7e10597a..4012635a 100644 --- a/src/interpreter/ast/entities/function-like.ts +++ b/src/interpreter/ast/entities/function-like.ts @@ -1,5 +1,3 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity.js"; -import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; import { createSignatureEntity } from "unwritten:interpreter:ast/entities/index"; import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; @@ -10,6 +8,8 @@ import { isMethodSignatureDeclaration } from "unwritten:interpreter:typeguards/declarations"; import { functionOverloadDeclarationFilter } from "unwritten:interpreter:utils/filter"; +import { EntityKind } from "unwritten:interpreter/enums/entity.js"; +import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils/general"; import type { Symbol } from "typescript"; @@ -51,9 +51,9 @@ export const createFunctionLikeEntity = (c })); const signatureKindMap = { + [EntityKind.Constructor]: EntityKind.ConstructSignature, [EntityKind.Function]: EntityKind.FunctionSignature, - [EntityKind.Method]: EntityKind.MethodSignature, - [EntityKind.Setter]: EntityKind.SetterSignature, [EntityKind.Getter]: EntityKind.GetterSignature, - [EntityKind.Constructor]: EntityKind.ConstructSignature + [EntityKind.Method]: EntityKind.MethodSignature, + [EntityKind.Setter]: EntityKind.SetterSignature } as const; diff --git a/src/interpreter/ast/entities/function.test.ts b/src/interpreter/ast/entities/function.test.ts index 9428e98d..246a3f09 100644 --- a/src/interpreter/ast/entities/function.test.ts +++ b/src/interpreter/ast/entities/function.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/function.ts b/src/interpreter/ast/entities/function.ts index 1e9bdc9a..1c5dc58e 100644 --- a/src/interpreter/ast/entities/function.ts +++ b/src/interpreter/ast/entities/function.ts @@ -1,5 +1,5 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createFunctionLikeEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/entities/getter.test.ts b/src/interpreter/ast/entities/getter.test.ts index 8b0fd491..2aa651e2 100644 --- a/src/interpreter/ast/entities/getter.test.ts +++ b/src/interpreter/ast/entities/getter.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createClassEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/getter.ts b/src/interpreter/ast/entities/getter.ts index d7d30500..bb03f412 100644 --- a/src/interpreter/ast/entities/getter.ts +++ b/src/interpreter/ast/entities/getter.ts @@ -1,5 +1,5 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createFunctionLikeEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/entities/interface.test.ts b/src/interpreter/ast/entities/interface.test.ts index 1ad144d8..83c15ea6 100644 --- a/src/interpreter/ast/entities/interface.test.ts +++ b/src/interpreter/ast/entities/interface.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createInterfaceEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createInterfaceEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/interface.ts b/src/interpreter/ast/entities/interface.ts index 45302cbe..d361dad4 100644 --- a/src/interpreter/ast/entities/interface.ts +++ b/src/interpreter/ast/entities/interface.ts @@ -1,6 +1,3 @@ -import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; import { createPropertyEntity, createSignatureEntity, @@ -19,6 +16,9 @@ import { isPropertySignatureDeclaration, isSetterDeclaration } from "unwritten:interpreter:typeguards/declarations"; +import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; import { isExpressionType } from "unwritten:typeguards/types"; import { assert } from "unwritten:utils:general"; diff --git a/src/interpreter/ast/entities/method.test.ts b/src/interpreter/ast/entities/method.test.ts index a0a7e239..512c512d 100644 --- a/src/interpreter/ast/entities/method.test.ts +++ b/src/interpreter/ast/entities/method.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createClassEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/method.ts b/src/interpreter/ast/entities/method.ts index 71f73eaf..0e8faf05 100644 --- a/src/interpreter/ast/entities/method.ts +++ b/src/interpreter/ast/entities/method.ts @@ -1,5 +1,5 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createFunctionLikeEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/entities/module.test.ts b/src/interpreter/ast/entities/module.test.ts index 314a0ecb..0310613c 100644 --- a/src/interpreter/ast/entities/module.test.ts +++ b/src/interpreter/ast/entities/module.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createModuleEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/module.ts b/src/interpreter/ast/entities/module.ts index 1e7f5e0c..466df2eb 100644 --- a/src/interpreter/ast/entities/module.ts +++ b/src/interpreter/ast/entities/module.ts @@ -1,9 +1,9 @@ +import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; import { getDeclarationId } from "unwritten:interpreter/ast/shared/id"; import { getNameBySymbol } from "unwritten:interpreter/ast/shared/name"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; -import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import { createSourceFileEntity } from "./source-file"; diff --git a/src/interpreter/ast/entities/namespace.test.ts b/src/interpreter/ast/entities/namespace.test.ts index fd93e908..8327aefd 100644 --- a/src/interpreter/ast/entities/namespace.test.ts +++ b/src/interpreter/ast/entities/namespace.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createNamespaceEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/namespace.ts b/src/interpreter/ast/entities/namespace.ts index 7183b821..9893a139 100644 --- a/src/interpreter/ast/entities/namespace.ts +++ b/src/interpreter/ast/entities/namespace.ts @@ -1,11 +1,11 @@ +import { createSourceFileEntity } from "unwritten:interpreter:ast/entities/index"; +import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; import { getDeclarationId, getSymbolId } from "unwritten:interpreter/ast/shared/id"; import { getNameByDeclaration, getNameBySymbol } from "unwritten:interpreter/ast/shared/name"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { isNamespaceExport } from "unwritten:interpreter/typeguards/declarations"; import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; -import { createSourceFileEntity } from "unwritten:interpreter:ast/entities/index"; -import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import { assert } from "unwritten:utils/general"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/entities/parameter.test.ts b/src/interpreter/ast/entities/parameter.test.ts index 16d55325..83b624e4 100644 --- a/src/interpreter/ast/entities/parameter.test.ts +++ b/src/interpreter/ast/entities/parameter.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/parameter.ts b/src/interpreter/ast/entities/parameter.ts index bfc68a0e..10fc7cc5 100644 --- a/src/interpreter/ast/entities/parameter.ts +++ b/src/interpreter/ast/entities/parameter.ts @@ -1,11 +1,11 @@ -import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { isParameterDeclaration } from "unwritten:interpreter/typeguards/declarations"; -import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { getDeclarationId, getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { getInitializerByDeclaration } from "unwritten:interpreter:ast/shared/initializer"; import { getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; +import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { isParameterDeclaration } from "unwritten:interpreter/typeguards/declarations"; +import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import { getTypeBySymbol } from "../type"; diff --git a/src/interpreter/ast/entities/property.test.ts b/src/interpreter/ast/entities/property.test.ts index d47190b5..62598e86 100644 --- a/src/interpreter/ast/entities/property.test.ts +++ b/src/interpreter/ast/entities/property.test.ts @@ -1,12 +1,12 @@ import { assert, expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createClassEntity, createTypeAliasEntity, createVariableEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/property.ts b/src/interpreter/ast/entities/property.ts index b9d80e24..35c5d2cb 100644 --- a/src/interpreter/ast/entities/property.ts +++ b/src/interpreter/ast/entities/property.ts @@ -1,6 +1,3 @@ -import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { getDeclarationId, getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { getInitializerByDeclaration } from "unwritten:interpreter:ast/shared/initializer"; import { getModifiersByDeclaration } from "unwritten:interpreter:ast/shared/modifiers"; @@ -13,6 +10,9 @@ import { isPropertySignatureDeclaration, isShorthandPropertyAssignment } from "unwritten:interpreter:typeguards/declarations"; +import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import { getTypeByDeclaration, getTypeBySymbol } from "../type"; diff --git a/src/interpreter/ast/entities/setter.test.ts b/src/interpreter/ast/entities/setter.test.ts index a1ad773a..08075047 100644 --- a/src/interpreter/ast/entities/setter.test.ts +++ b/src/interpreter/ast/entities/setter.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createClassEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/setter.ts b/src/interpreter/ast/entities/setter.ts index 9e6c1b8f..262563f5 100644 --- a/src/interpreter/ast/entities/setter.ts +++ b/src/interpreter/ast/entities/setter.ts @@ -1,5 +1,5 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity"; import { createFunctionLikeEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/entities/signature.test.ts b/src/interpreter/ast/entities/signature.test.ts index 9412a0b4..ff74d78b 100644 --- a/src/interpreter/ast/entities/signature.test.ts +++ b/src/interpreter/ast/entities/signature.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createClassEntity, createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createClassEntity, createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/signature.ts b/src/interpreter/ast/entities/signature.ts index 4dd9422b..530b25f7 100644 --- a/src/interpreter/ast/entities/signature.ts +++ b/src/interpreter/ast/entities/signature.ts @@ -1,4 +1,3 @@ -import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; import { createParameterEntity, createTypeParameterEntityByTypeParameter @@ -7,6 +6,7 @@ import { getDeclarationId, getSymbolIdByDeclaration } from "unwritten:interprete import { getModifiersByDeclaration } from "unwritten:interpreter:ast/shared/modifiers"; import { getNameByDeclaration } from "unwritten:interpreter:ast/shared/name"; import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; +import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; import { assert } from "unwritten:utils:general"; import { @@ -16,7 +16,7 @@ import { getTypeByResolvedAndDeclaredType } from "../type"; -import type { Signature as TSSignature, SignatureDeclaration } from "typescript"; +import type { SignatureDeclaration, Signature as TSSignature } from "typescript"; import type { SignatureEntity, SignatureEntityKinds } from "unwritten:interpreter:type-definitions/entities"; import type { InterpreterContext } from "unwritten:type-definitions/context"; diff --git a/src/interpreter/ast/entities/source-file.test.ts b/src/interpreter/ast/entities/source-file.test.ts index e9292977..13111721 100644 --- a/src/interpreter/ast/entities/source-file.test.ts +++ b/src/interpreter/ast/entities/source-file.test.ts @@ -1,10 +1,10 @@ /* eslint-disable eslint-plugin-typescript/naming-convention */ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createSourceFileEntity } from "unwritten:interpreter:ast/entities/index"; import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isNamespaceEntity, isVariableEntity } from "unwritten:typeguards/entities"; diff --git a/src/interpreter/ast/entities/source-file.ts b/src/interpreter/ast/entities/source-file.ts index 772cd1b4..8cfa23d4 100644 --- a/src/interpreter/ast/entities/source-file.ts +++ b/src/interpreter/ast/entities/source-file.ts @@ -1,7 +1,7 @@ +import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { interpretSymbol } from "unwritten:interpreter/ast/symbol"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; -import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { isExportableEntity } from "unwritten:typeguards/entities"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/entities/type-alias.test.ts b/src/interpreter/ast/entities/type-alias.test.ts index 9ceb6f39..a6e27950 100644 --- a/src/interpreter/ast/entities/type-alias.test.ts +++ b/src/interpreter/ast/entities/type-alias.test.ts @@ -1,9 +1,9 @@ import { assert, expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/type-alias.ts b/src/interpreter/ast/entities/type-alias.ts index d842d378..38f6731f 100644 --- a/src/interpreter/ast/entities/type-alias.ts +++ b/src/interpreter/ast/entities/type-alias.ts @@ -1,11 +1,11 @@ +import { getDeclarationId, getSymbolId } from "unwritten:interpreter:ast/shared/id"; +import { getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; +import { isTypeAliasDeclaration } from "unwritten:interpreter:typeguards/declarations"; import { createTypeParameterEntityByDeclaration } from "unwritten:interpreter/ast/entities/index"; import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; import { getPositionByDeclaration } from "unwritten:interpreter/ast/shared/position"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { withCachedEntity, withLockedSymbol } from "unwritten:interpreter/utils/ts"; -import { getDeclarationId, getSymbolId } from "unwritten:interpreter:ast/shared/id"; -import { getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; -import { isTypeAliasDeclaration } from "unwritten:interpreter:typeguards/declarations"; import { assert } from "unwritten:utils:general"; import { getTypeByTypeNode } from "../type"; diff --git a/src/interpreter/ast/entities/type-parameter.test.ts b/src/interpreter/ast/entities/type-parameter.test.ts index 27e18984..3ce7f9bc 100644 --- a/src/interpreter/ast/entities/type-parameter.test.ts +++ b/src/interpreter/ast/entities/type-parameter.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/type-parameter.ts b/src/interpreter/ast/entities/type-parameter.ts index 7c82ec50..60b97ce0 100644 --- a/src/interpreter/ast/entities/type-parameter.ts +++ b/src/interpreter/ast/entities/type-parameter.ts @@ -1,10 +1,10 @@ -import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { getDeclarationId, getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import { isTypeParameterDeclaration } from "unwritten:interpreter:typeguards/declarations"; +import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import { getTypeByTypeNode } from "../type"; diff --git a/src/interpreter/ast/entities/unresolved.test.ts b/src/interpreter/ast/entities/unresolved.test.ts index 6fb9892a..2a48a260 100644 --- a/src/interpreter/ast/entities/unresolved.test.ts +++ b/src/interpreter/ast/entities/unresolved.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/entities/unresolved.ts b/src/interpreter/ast/entities/unresolved.ts index 6787a16c..ff15bf8c 100644 --- a/src/interpreter/ast/entities/unresolved.ts +++ b/src/interpreter/ast/entities/unresolved.ts @@ -1,8 +1,8 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; import { getPositionBySymbol } from "unwritten:interpreter:ast/shared/position"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/entities/variable.test.ts b/src/interpreter/ast/entities/variable.test.ts index b7a93b6f..83a030b8 100644 --- a/src/interpreter/ast/entities/variable.test.ts +++ b/src/interpreter/ast/entities/variable.test.ts @@ -1,9 +1,9 @@ import { expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createVariableEntity } from "unwritten:interpreter:ast/entities/index"; import { getSymbolId } from "unwritten:interpreter:ast/shared/id"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/entities/variable.ts b/src/interpreter/ast/entities/variable.ts index 9e7184a9..1603e750 100644 --- a/src/interpreter/ast/entities/variable.ts +++ b/src/interpreter/ast/entities/variable.ts @@ -1,11 +1,11 @@ -import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { getDeclarationId, getSymbolId } from "unwritten:interpreter:ast/shared/id"; import { getModifiersByDeclaration } from "unwritten:interpreter:ast/shared/modifiers"; import { getNameBySymbol } from "unwritten:interpreter:ast/shared/name"; import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import { isVariableDeclaration } from "unwritten:interpreter:typeguards/declarations"; +import { getJSDocProperties } from "unwritten:interpreter/ast/jsdoc"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { withCachedEntity } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import { getTypeByDeclaration } from "../type"; diff --git a/src/interpreter/ast/jsdoc.ts b/src/interpreter/ast/jsdoc.ts index d3406abe..54e42aed 100644 --- a/src/interpreter/ast/jsdoc.ts +++ b/src/interpreter/ast/jsdoc.ts @@ -12,7 +12,7 @@ import { isJSDocThrowsTag } from "unwritten:interpreter/typeguards/jsdoc"; -import type { Declaration, JSDoc, JSDocComment, JSDocTag as TSJSDocTag, NodeArray } from "typescript"; +import type { Declaration, JSDoc, JSDocComment, NodeArray, JSDocTag as TSJSDocTag } from "typescript"; import type { JSDocProperties, JSDocTag, JSDocTags } from "unwritten:interpreter:type-definitions/jsdoc"; import type { InterpreterContext } from "unwritten:type-definitions/context"; diff --git a/src/interpreter/ast/jsdoc/generic.test.ts b/src/interpreter/ast/jsdoc/generic.test.ts index 05dcaa99..ca9f32bd 100644 --- a/src/interpreter/ast/jsdoc/generic.test.ts +++ b/src/interpreter/ast/jsdoc/generic.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/jsdoc/link.test.ts b/src/interpreter/ast/jsdoc/link.test.ts index 778935dc..d0db4b69 100644 --- a/src/interpreter/ast/jsdoc/link.test.ts +++ b/src/interpreter/ast/jsdoc/link.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/jsdoc/link.ts b/src/interpreter/ast/jsdoc/link.ts index e5c8ccbe..32b459c4 100644 --- a/src/interpreter/ast/jsdoc/link.ts +++ b/src/interpreter/ast/jsdoc/link.ts @@ -5,7 +5,7 @@ import { interpretSymbol } from "unwritten:interpreter/ast/symbol"; import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import type { EntityName, JSDocLink as TSJSDocLink, JSDocMemberName } from "typescript"; +import type { EntityName, JSDocMemberName, JSDocLink as TSJSDocLink } from "typescript"; import type { JSDocLink } from "unwritten:interpreter:type-definitions/jsdoc"; import type { TypeReferenceType } from "unwritten:interpreter:type-definitions/types"; diff --git a/src/interpreter/ast/jsdoc/reference.test.ts b/src/interpreter/ast/jsdoc/reference.test.ts index cf95496d..402f12e8 100644 --- a/src/interpreter/ast/jsdoc/reference.test.ts +++ b/src/interpreter/ast/jsdoc/reference.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/jsdoc/see.test.ts b/src/interpreter/ast/jsdoc/see.test.ts index 7266a2e3..815769bc 100644 --- a/src/interpreter/ast/jsdoc/see.test.ts +++ b/src/interpreter/ast/jsdoc/see.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/jsdoc/text.test.ts b/src/interpreter/ast/jsdoc/text.test.ts index 8a951e18..95173da5 100644 --- a/src/interpreter/ast/jsdoc/text.test.ts +++ b/src/interpreter/ast/jsdoc/text.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/jsdoc/throws.test.ts b/src/interpreter/ast/jsdoc/throws.test.ts index 2c9cec44..bb117a2b 100644 --- a/src/interpreter/ast/jsdoc/throws.test.ts +++ b/src/interpreter/ast/jsdoc/throws.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it } from "vitest"; +import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/jsdoc/type.test.ts b/src/interpreter/ast/jsdoc/type.test.ts index 3d123347..c1bffa2f 100644 --- a/src/interpreter/ast/jsdoc/type.test.ts +++ b/src/interpreter/ast/jsdoc/type.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it } from "vitest"; +import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/symbol.ts b/src/interpreter/ast/symbol.ts index 99f93f06..7b21298f 100644 --- a/src/interpreter/ast/symbol.ts +++ b/src/interpreter/ast/symbol.ts @@ -1,13 +1,3 @@ -import { - createCircularEntity, - createGetterEntity, - createMethodEntity, - createPropertyEntity, - createSetterEntity, - createUnresolvedEntity -} from "unwritten:interpreter/ast/entities/index"; -import { getPositionBySymbol } from "unwritten:interpreter/ast/shared/position"; -import { isSymbolLocked, isSymbolUnresolved, resolveSymbolInCaseOfImport } from "unwritten:interpreter/utils/ts"; import { createClassEntity, createEnumEntity, @@ -41,8 +31,18 @@ import { isTypeParameterSymbol, isVariableSymbol } from "unwritten:interpreter:typeguards/symbols"; -import { isSymbolExcluded } from "unwritten:utils/exclude"; +import { + createCircularEntity, + createGetterEntity, + createMethodEntity, + createPropertyEntity, + createSetterEntity, + createUnresolvedEntity +} from "unwritten:interpreter/ast/entities/index"; +import { getPositionBySymbol } from "unwritten:interpreter/ast/shared/position"; +import { isSymbolLocked, isSymbolUnresolved, resolveSymbolInCaseOfImport } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; +import { isSymbolExcluded } from "unwritten:utils/exclude"; import type { Symbol } from "typescript"; diff --git a/src/interpreter/ast/type.ts b/src/interpreter/ast/type.ts index 2ee2bf98..a5fd11c9 100644 --- a/src/interpreter/ast/type.ts +++ b/src/interpreter/ast/type.ts @@ -1,4 +1,3 @@ -import { isSymbolLocked, isTypeLocked } from "unwritten:interpreter/utils/ts"; import { getNameByType } from "unwritten:interpreter:ast/shared/name"; import { createAnyType, @@ -85,10 +84,11 @@ import { isUnknownType, isVoidType } from "unwritten:interpreter:typeguards/types"; +import { isSymbolLocked, isTypeLocked } from "unwritten:interpreter/utils/ts"; import { isTypeReferenceType } from "unwritten:typeguards/types"; import { isSymbolExcluded } from "unwritten:utils/exclude"; -import type { Declaration, ObjectType as TSObjectType, Symbol, Type as TSType, TypeNode } from "typescript"; +import type { Declaration, Symbol, ObjectType as TSObjectType, Type as TSType, TypeNode } from "typescript"; import type { DeclaredType, diff --git a/src/interpreter/ast/types/any.test.ts b/src/interpreter/ast/types/any.test.ts index db7a4551..53030b86 100644 --- a/src/interpreter/ast/types/any.test.ts +++ b/src/interpreter/ast/types/any.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/any.ts b/src/interpreter/ast/types/any.ts index 4a7af334..1f66d9fc 100644 --- a/src/interpreter/ast/types/any.ts +++ b/src/interpreter/ast/types/any.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isAnyType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/array.test.ts b/src/interpreter/ast/types/array.test.ts index 49c0d2dd..13a10dd2 100644 --- a/src/interpreter/ast/types/array.test.ts +++ b/src/interpreter/ast/types/array.test.ts @@ -1,14 +1,12 @@ -/* eslint-disable eslint-plugin-typescript/array-type */ - import { assert, describe, expect, it } from "vitest"; -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createInterfaceEntity, createTypeAliasEntity, createVariableEntity } from "unwritten:interpreter:ast/entities/index"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/array.ts b/src/interpreter/ast/types/array.ts index fff340a5..d684fa2e 100644 --- a/src/interpreter/ast/types/array.ts +++ b/src/interpreter/ast/types/array.ts @@ -1,8 +1,7 @@ -/* eslint-disable eslint-plugin-typescript/array-type */ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType, withLockedType } from "unwritten:interpreter/utils/ts.js"; import { getIdByTypeNode, getTypeId } from "unwritten:interpreter:ast/shared/id"; import { getPositionByNode, getPositionByType } from "unwritten:interpreter:ast/shared/position"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType, withLockedType } from "unwritten:interpreter/utils/ts.js"; import { getTypeByType, getTypeByTypeNode } from "../type"; diff --git a/src/interpreter/ast/types/bigint-literal.test.ts b/src/interpreter/ast/types/bigint-literal.test.ts index 947d5868..cb02c141 100644 --- a/src/interpreter/ast/types/bigint-literal.test.ts +++ b/src/interpreter/ast/types/bigint-literal.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/bigint-literal.ts b/src/interpreter/ast/types/bigint-literal.ts index b157bef8..2f473c60 100644 --- a/src/interpreter/ast/types/bigint-literal.ts +++ b/src/interpreter/ast/types/bigint-literal.ts @@ -1,6 +1,6 @@ +import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { withCachedType } from "unwritten:interpreter/utils/ts"; -import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import type { BigIntLiteralType as TSBigIntLiteralType } from "typescript"; diff --git a/src/interpreter/ast/types/bigint.test.ts b/src/interpreter/ast/types/bigint.test.ts index dc783772..ce37fa26 100644 --- a/src/interpreter/ast/types/bigint.test.ts +++ b/src/interpreter/ast/types/bigint.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/bigint.ts b/src/interpreter/ast/types/bigint.ts index 8c5cba93..7ae3ca6b 100644 --- a/src/interpreter/ast/types/bigint.ts +++ b/src/interpreter/ast/types/bigint.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isBigIntType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/boolean-literal.test.ts b/src/interpreter/ast/types/boolean-literal.test.ts index 1590248c..83ae5452 100644 --- a/src/interpreter/ast/types/boolean-literal.test.ts +++ b/src/interpreter/ast/types/boolean-literal.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/boolean-literal.ts b/src/interpreter/ast/types/boolean-literal.ts index ba7d1493..ea10aace 100644 --- a/src/interpreter/ast/types/boolean-literal.ts +++ b/src/interpreter/ast/types/boolean-literal.ts @@ -1,6 +1,6 @@ +import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { withCachedType } from "unwritten:interpreter/utils/ts"; -import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import type { LiteralType } from "typescript"; diff --git a/src/interpreter/ast/types/boolean.test.ts b/src/interpreter/ast/types/boolean.test.ts index d3e78b95..e8eb180f 100644 --- a/src/interpreter/ast/types/boolean.test.ts +++ b/src/interpreter/ast/types/boolean.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/boolean.ts b/src/interpreter/ast/types/boolean.ts index dc570d94..ce971d8a 100644 --- a/src/interpreter/ast/types/boolean.ts +++ b/src/interpreter/ast/types/boolean.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isBooleanType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/circular.test.ts b/src/interpreter/ast/types/circular.test.ts index 2e4a36e4..3b36ad79 100644 --- a/src/interpreter/ast/types/circular.test.ts +++ b/src/interpreter/ast/types/circular.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createInterfaceEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/circular.ts b/src/interpreter/ast/types/circular.ts index 0965003c..54992d55 100644 --- a/src/interpreter/ast/types/circular.ts +++ b/src/interpreter/ast/types/circular.ts @@ -1,8 +1,8 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getSymbolId, getTypeId } from "unwritten:interpreter:ast/shared/id"; import { getNameByType } from "unwritten:interpreter:ast/shared/name"; import { getPositionBySymbol } from "unwritten:interpreter:ast/shared/position"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/class.test.ts b/src/interpreter/ast/types/class.test.ts index 351758fe..2d4849bb 100644 --- a/src/interpreter/ast/types/class.test.ts +++ b/src/interpreter/ast/types/class.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/types/class.ts b/src/interpreter/ast/types/class.ts index e7208bcf..45da4016 100644 --- a/src/interpreter/ast/types/class.ts +++ b/src/interpreter/ast/types/class.ts @@ -1,6 +1,6 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createObjectLikeType } from "unwritten:interpreter:ast/types/index"; import { withCachedType, withLockedType } from "unwritten:interpreter:utils/ts"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import type { ObjectType } from "typescript"; diff --git a/src/interpreter/ast/types/conditional.test.ts b/src/interpreter/ast/types/conditional.test.ts index ed5216e0..b13f5101 100644 --- a/src/interpreter/ast/types/conditional.test.ts +++ b/src/interpreter/ast/types/conditional.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/conditional.ts b/src/interpreter/ast/types/conditional.ts index f7d66f30..e29a8011 100644 --- a/src/interpreter/ast/types/conditional.ts +++ b/src/interpreter/ast/types/conditional.ts @@ -1,10 +1,10 @@ +import { getIdByTypeNode, getTypeId } from "unwritten:interpreter:ast/shared/id"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { withCachedType, withLockedType } from "unwritten:interpreter/utils/ts.js"; -import { getIdByTypeNode, getTypeId } from "unwritten:interpreter:ast/shared/id"; import { getTypeByTypeNode } from "../type"; -import type { ConditionalType as TSConditionalType, ConditionalTypeNode } from "typescript"; +import type { ConditionalTypeNode, ConditionalType as TSConditionalType } from "typescript"; import type { ConditionalType } from "unwritten:interpreter:type-definitions/types"; import type { InterpreterContext } from "unwritten:type-definitions/context"; diff --git a/src/interpreter/ast/types/expression.test.ts b/src/interpreter/ast/types/expression.test.ts index 9f16c557..1a466690 100644 --- a/src/interpreter/ast/types/expression.test.ts +++ b/src/interpreter/ast/types/expression.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createClassEntity, createInterfaceEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/expression.ts b/src/interpreter/ast/types/expression.ts index 11dabc31..66d031bb 100644 --- a/src/interpreter/ast/types/expression.ts +++ b/src/interpreter/ast/types/expression.ts @@ -1,6 +1,6 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; import { getIdByTypeNode } from "unwritten:interpreter:ast/shared/id"; import { getNameByTypeNode } from "unwritten:interpreter:ast/shared/name"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { getTypeByType, getTypeByTypeNode } from "../type"; diff --git a/src/interpreter/ast/types/function.test.ts b/src/interpreter/ast/types/function.test.ts index d2fed7d2..ca25fd42 100644 --- a/src/interpreter/ast/types/function.test.ts +++ b/src/interpreter/ast/types/function.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/function.ts b/src/interpreter/ast/types/function.ts index f41a23d7..0a4ac0ab 100644 --- a/src/interpreter/ast/types/function.ts +++ b/src/interpreter/ast/types/function.ts @@ -1,8 +1,8 @@ +import { createSignatureEntity } from "unwritten:interpreter:ast/entities/index"; +import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { EntityKind } from "unwritten:interpreter/enums/entity.js"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { withCachedType, withLockedType } from "unwritten:interpreter/utils/ts.js"; -import { createSignatureEntity } from "unwritten:interpreter:ast/entities/index"; -import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import type { ObjectType } from "typescript"; diff --git a/src/interpreter/ast/types/indexed-access.ts b/src/interpreter/ast/types/indexed-access.ts index bb51121d..3e3e2ecb 100644 --- a/src/interpreter/ast/types/indexed-access.ts +++ b/src/interpreter/ast/types/indexed-access.ts @@ -4,7 +4,7 @@ import { withCachedType, withLockedType } from "unwritten:interpreter/utils/ts"; import { getTypeByType, getTypeByTypeNode } from "../type"; -import type { IndexedAccessType as TSIndexedAccessType, IndexedAccessTypeNode } from "typescript"; +import type { IndexedAccessTypeNode, IndexedAccessType as TSIndexedAccessType } from "typescript"; import type { IndexedAccessType } from "unwritten:interpreter:type-definitions/types"; import type { InterpreterContext } from "unwritten:type-definitions/context"; diff --git a/src/interpreter/ast/types/interface.test.ts b/src/interpreter/ast/types/interface.test.ts index cee29127..8e75a89e 100644 --- a/src/interpreter/ast/types/interface.test.ts +++ b/src/interpreter/ast/types/interface.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createInterfaceEntity, createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createInterfaceEntity, createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isJSDocText } from "unwritten:typeguards/jsdoc"; diff --git a/src/interpreter/ast/types/interface.ts b/src/interpreter/ast/types/interface.ts index 8cc531b5..9e733628 100644 --- a/src/interpreter/ast/types/interface.ts +++ b/src/interpreter/ast/types/interface.ts @@ -1,6 +1,6 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createObjectLikeType } from "unwritten:interpreter:ast/types/index"; import { withCachedType, withLockedType } from "unwritten:interpreter:utils/ts"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { getTypeByType } from "../type"; diff --git a/src/interpreter/ast/types/intersection.test.ts b/src/interpreter/ast/types/intersection.test.ts index 54d353fa..10752669 100644 --- a/src/interpreter/ast/types/intersection.test.ts +++ b/src/interpreter/ast/types/intersection.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/intersection.ts b/src/interpreter/ast/types/intersection.ts index c048df50..33784b4b 100644 --- a/src/interpreter/ast/types/intersection.ts +++ b/src/interpreter/ast/types/intersection.ts @@ -1,6 +1,6 @@ +import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { withCachedType, withLockedType } from "unwritten:interpreter/utils/ts.js"; -import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { getTypeByType } from "../type"; diff --git a/src/interpreter/ast/types/mapped.test.ts b/src/interpreter/ast/types/mapped.test.ts index b16153fc..6ec4b1fc 100644 --- a/src/interpreter/ast/types/mapped.test.ts +++ b/src/interpreter/ast/types/mapped.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/mapped.ts b/src/interpreter/ast/types/mapped.ts index 5b4a1950..a7bb800f 100644 --- a/src/interpreter/ast/types/mapped.ts +++ b/src/interpreter/ast/types/mapped.ts @@ -1,3 +1,5 @@ +import { getIdByTypeNode } from "unwritten:interpreter:ast/shared/id"; +import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import { createTypeParameterEntityByDeclaration } from "unwritten:interpreter/ast/entities/index"; import { getResolvedTypeByTypeNode, @@ -5,8 +7,6 @@ import { getTypeByTypeNode } from "unwritten:interpreter/ast/type"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getIdByTypeNode } from "unwritten:interpreter:ast/shared/id"; -import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; import type { MappedTypeNode } from "typescript"; diff --git a/src/interpreter/ast/types/never.test.ts b/src/interpreter/ast/types/never.test.ts index 1c30161c..c9c28815 100644 --- a/src/interpreter/ast/types/never.test.ts +++ b/src/interpreter/ast/types/never.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/never.ts b/src/interpreter/ast/types/never.ts index c085e371..e65a59da 100644 --- a/src/interpreter/ast/types/never.ts +++ b/src/interpreter/ast/types/never.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isNeverType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/null.test.ts b/src/interpreter/ast/types/null.test.ts index f6df097c..f1f2efcd 100644 --- a/src/interpreter/ast/types/null.test.ts +++ b/src/interpreter/ast/types/null.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/null.ts b/src/interpreter/ast/types/null.ts index 21bba9e7..4f226bb8 100644 --- a/src/interpreter/ast/types/null.ts +++ b/src/interpreter/ast/types/null.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isNullType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/number-literal.test.ts b/src/interpreter/ast/types/number-literal.test.ts index 9aeb64fe..33aff1e3 100644 --- a/src/interpreter/ast/types/number-literal.test.ts +++ b/src/interpreter/ast/types/number-literal.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/number-literal.ts b/src/interpreter/ast/types/number-literal.ts index f1d42124..bd56804d 100644 --- a/src/interpreter/ast/types/number-literal.ts +++ b/src/interpreter/ast/types/number-literal.ts @@ -1,6 +1,6 @@ +import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { withCachedType } from "unwritten:interpreter/utils/ts"; -import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import type { NumberLiteralType as TSNumberLiteralType } from "typescript"; diff --git a/src/interpreter/ast/types/number.test.ts b/src/interpreter/ast/types/number.test.ts index 59c737de..93334a89 100644 --- a/src/interpreter/ast/types/number.test.ts +++ b/src/interpreter/ast/types/number.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/number.ts b/src/interpreter/ast/types/number.ts index 782c3f9a..0880546c 100644 --- a/src/interpreter/ast/types/number.ts +++ b/src/interpreter/ast/types/number.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isNumberType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/object-literal.test.ts b/src/interpreter/ast/types/object-literal.test.ts index 5ea24412..d75259d8 100644 --- a/src/interpreter/ast/types/object-literal.test.ts +++ b/src/interpreter/ast/types/object-literal.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createVariableEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/object-literal.ts b/src/interpreter/ast/types/object-literal.ts index 91c45b79..3df42b56 100644 --- a/src/interpreter/ast/types/object-literal.ts +++ b/src/interpreter/ast/types/object-literal.ts @@ -1,6 +1,6 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createObjectLikeType } from "unwritten:interpreter:ast/types/index"; import { withCachedType, withLockedType } from "unwritten:interpreter:utils/ts"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import type { ObjectType } from "typescript"; diff --git a/src/interpreter/ast/types/object.test.ts b/src/interpreter/ast/types/object.test.ts index 2396a66b..79e6dd09 100644 --- a/src/interpreter/ast/types/object.test.ts +++ b/src/interpreter/ast/types/object.test.ts @@ -1,9 +1,9 @@ import { expect, it } from "vitest"; -import { createTypeAliasEntity } from "unwritten:interpreter/ast/entities/index"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createObjectLikeType } from "unwritten:interpreter:ast/types/index"; import { isObjectType } from "unwritten:interpreter:typeguards/types"; +import { createTypeAliasEntity } from "unwritten:interpreter/ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/types/object.ts b/src/interpreter/ast/types/object.ts index 5b8202c2..c8963c96 100644 --- a/src/interpreter/ast/types/object.ts +++ b/src/interpreter/ast/types/object.ts @@ -1,5 +1,3 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity.js"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createGetterEntity, createMethodEntity, @@ -18,6 +16,8 @@ import { } from "unwritten:interpreter:typeguards/symbols"; import { isThisType } from "unwritten:interpreter:typeguards/types"; import { withCachedType, withLockedType } from "unwritten:interpreter:utils/ts"; +import { EntityKind } from "unwritten:interpreter/enums/entity.js"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { isSymbolExcluded } from "unwritten:utils/exclude"; import type { ObjectType as TSObjectType } from "typescript"; diff --git a/src/interpreter/ast/types/string-literal.test.ts b/src/interpreter/ast/types/string-literal.test.ts index 3f840eff..23c25012 100644 --- a/src/interpreter/ast/types/string-literal.test.ts +++ b/src/interpreter/ast/types/string-literal.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/string-literal.ts b/src/interpreter/ast/types/string-literal.ts index 81f3bab1..0cf37024 100644 --- a/src/interpreter/ast/types/string-literal.ts +++ b/src/interpreter/ast/types/string-literal.ts @@ -1,6 +1,6 @@ +import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { withCachedType } from "unwritten:interpreter/utils/ts"; -import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import type { StringLiteralType as TSStringLiteralType } from "typescript"; diff --git a/src/interpreter/ast/types/string.test.ts b/src/interpreter/ast/types/string.test.ts index 8957a3e4..90cdd64a 100644 --- a/src/interpreter/ast/types/string.test.ts +++ b/src/interpreter/ast/types/string.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/string.ts b/src/interpreter/ast/types/string.ts index d5640995..e8e51890 100644 --- a/src/interpreter/ast/types/string.ts +++ b/src/interpreter/ast/types/string.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isStringType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/symbol.test.ts b/src/interpreter/ast/types/symbol.test.ts index 29580bde..a52a094e 100644 --- a/src/interpreter/ast/types/symbol.test.ts +++ b/src/interpreter/ast/types/symbol.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/symbol.ts b/src/interpreter/ast/types/symbol.ts index 9a3656e5..e33f139e 100644 --- a/src/interpreter/ast/types/symbol.ts +++ b/src/interpreter/ast/types/symbol.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isSymbolType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/template-literal.test.ts b/src/interpreter/ast/types/template-literal.test.ts index de5249a6..9ae3c23b 100644 --- a/src/interpreter/ast/types/template-literal.test.ts +++ b/src/interpreter/ast/types/template-literal.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/interpreter/ast/types/template-literal.ts b/src/interpreter/ast/types/template-literal.ts index e6d63285..c54b3d88 100644 --- a/src/interpreter/ast/types/template-literal.ts +++ b/src/interpreter/ast/types/template-literal.ts @@ -1,5 +1,5 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; import { getIdByTypeNode } from "unwritten:interpreter:ast/shared/id"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { getTypeByTypeNode } from "../type"; diff --git a/src/interpreter/ast/types/tuple.test.ts b/src/interpreter/ast/types/tuple.test.ts index 5b30804c..a93af985 100644 --- a/src/interpreter/ast/types/tuple.test.ts +++ b/src/interpreter/ast/types/tuple.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/tuple.ts b/src/interpreter/ast/types/tuple.ts index ac39f045..63022957 100644 --- a/src/interpreter/ast/types/tuple.ts +++ b/src/interpreter/ast/types/tuple.ts @@ -1,11 +1,11 @@ -import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { isOptionalTypeNode, isRestTypeNode } from "unwritten:interpreter/typeguards/type-nodes"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getSymbolId, getTypeId } from "unwritten:interpreter:ast/shared/id"; import { getNameByDeclaration, getNameByTypeNode } from "unwritten:interpreter:ast/shared/name"; import { getPositionByNode, getPositionByType } from "unwritten:interpreter:ast/shared/position"; import { isNamedTupleMember, isTupleTypeReferenceType } from "unwritten:interpreter:typeguards/types"; +import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { isOptionalTypeNode, isRestTypeNode } from "unwritten:interpreter/typeguards/type-nodes"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import { getTypeByType, getTypeByTypeNode } from "../type"; @@ -27,13 +27,12 @@ export const createTupleTypeByTypeReference = (ctx: InterpreterContext, typeRefe const type = getTypeByType(ctx, typeArgument); - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition const symbolId = typeArgument.symbol && getSymbolId(ctx, typeArgument.symbol); const typeId = getTypeId(ctx, typeArgument); const elementFlag = typeReference.target.elementFlags[index]; - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition + const optional = (elementFlag && elementFlag & ts.ElementFlags.Optional) !== 0; - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition + const rest = (elementFlag && elementFlag & ts.ElementFlags.Rest) !== 0; const labelDeclaration = typeReference.target.labeledElementDeclarations?.[index]; const name = labelDeclaration && getNameByDeclaration(ctx, labelDeclaration); diff --git a/src/interpreter/ast/types/type-literal.test.ts b/src/interpreter/ast/types/type-literal.test.ts index 0ccd978f..c22def45 100644 --- a/src/interpreter/ast/types/type-literal.test.ts +++ b/src/interpreter/ast/types/type-literal.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/interpreter/ast/types/type-literal.ts b/src/interpreter/ast/types/type-literal.ts index f3879efa..32af91d0 100644 --- a/src/interpreter/ast/types/type-literal.ts +++ b/src/interpreter/ast/types/type-literal.ts @@ -1,6 +1,6 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createObjectLikeType } from "unwritten:interpreter:ast/types/index"; import { withLockedType } from "unwritten:interpreter:utils/ts"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import type { ObjectType } from "typescript"; diff --git a/src/interpreter/ast/types/type-parameter.test.ts b/src/interpreter/ast/types/type-parameter.test.ts index 5f8a713a..3fc0ee70 100644 --- a/src/interpreter/ast/types/type-parameter.test.ts +++ b/src/interpreter/ast/types/type-parameter.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/type-parameter.ts b/src/interpreter/ast/types/type-parameter.ts index b626409c..024e2bf2 100644 --- a/src/interpreter/ast/types/type-parameter.ts +++ b/src/interpreter/ast/types/type-parameter.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; import { getSymbolIdByType, getTypeId } from "unwritten:interpreter:ast/shared/id"; import { getNameByType } from "unwritten:interpreter:ast/shared/name"; import { withLockedType } from "unwritten:interpreter:utils/ts"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { getTypeByType } from "../type"; diff --git a/src/interpreter/ast/types/type-query.test.ts b/src/interpreter/ast/types/type-query.test.ts index 9a315c47..1e637593 100644 --- a/src/interpreter/ast/types/type-query.test.ts +++ b/src/interpreter/ast/types/type-query.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createTypeAliasEntity, createVariableEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createTypeAliasEntity, createVariableEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/type-query.ts b/src/interpreter/ast/types/type-query.ts index ada3469c..83932990 100644 --- a/src/interpreter/ast/types/type-query.ts +++ b/src/interpreter/ast/types/type-query.ts @@ -1,7 +1,7 @@ +import { getIdByTypeNode } from "unwritten:interpreter:ast/shared/id"; import { interpretSymbol } from "unwritten:interpreter/ast/symbol"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { resolveSymbolInCaseOfImport } from "unwritten:interpreter/utils/ts"; -import { getIdByTypeNode } from "unwritten:interpreter:ast/shared/id"; import { getResolvedTypeByTypeNode, getTypeByResolvedAndDeclaredType, getTypeByTypeNode } from "../type"; diff --git a/src/interpreter/ast/types/type-reference.test.ts b/src/interpreter/ast/types/type-reference.test.ts index 7d7c60b3..8a9fa819 100644 --- a/src/interpreter/ast/types/type-reference.test.ts +++ b/src/interpreter/ast/types/type-reference.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/type-reference.ts b/src/interpreter/ast/types/type-reference.ts index 1f31de7b..63bbd1ac 100644 --- a/src/interpreter/ast/types/type-reference.ts +++ b/src/interpreter/ast/types/type-reference.ts @@ -1,13 +1,13 @@ -import { interpretSymbol } from "unwritten:interpreter/ast/symbol"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { getIdByTypeNode } from "unwritten:interpreter:ast/shared/id"; import { getNameByTypeNode } from "unwritten:interpreter:ast/shared/name"; import { createExpressionType } from "unwritten:interpreter:ast/types/index"; import { isTypeReferenceNode } from "unwritten:interpreter:typeguards/type-nodes"; +import { interpretSymbol } from "unwritten:interpreter/ast/symbol"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { getResolvedTypeByTypeNode, getTypeByTypeNode } from "../type"; -import type { TypeReferenceNode, TypeReferenceType as TSTypeReferenceType } from "typescript"; +import type { TypeReferenceType as TSTypeReferenceType, TypeReferenceNode } from "typescript"; import type { ExpressionType, TypeReferenceType } from "unwritten:interpreter:type-definitions/types"; import type { InterpreterContext } from "unwritten:type-definitions/context"; diff --git a/src/interpreter/ast/types/undefined.test.ts b/src/interpreter/ast/types/undefined.test.ts index f192b77d..a819acb8 100644 --- a/src/interpreter/ast/types/undefined.test.ts +++ b/src/interpreter/ast/types/undefined.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/undefined.ts b/src/interpreter/ast/types/undefined.ts index 97f0b587..4043a866 100644 --- a/src/interpreter/ast/types/undefined.ts +++ b/src/interpreter/ast/types/undefined.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isUndefinedType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/union.test.ts b/src/interpreter/ast/types/union.test.ts index e5a28ea8..913baecf 100644 --- a/src/interpreter/ast/types/union.test.ts +++ b/src/interpreter/ast/types/union.test.ts @@ -1,8 +1,8 @@ import { assert, expect, it } from "vitest"; +import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/union.ts b/src/interpreter/ast/types/union.ts index fa4b7f1c..d8f0683b 100644 --- a/src/interpreter/ast/types/union.ts +++ b/src/interpreter/ast/types/union.ts @@ -1,6 +1,6 @@ +import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { TypeKind } from "unwritten:interpreter/enums/type"; import { withCachedType, withLockedType } from "unwritten:interpreter/utils/ts.js"; -import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { getTypeByType, getTypeByTypeNode } from "../type"; diff --git a/src/interpreter/ast/types/unknown.test.ts b/src/interpreter/ast/types/unknown.test.ts index caf2ea51..aa560410 100644 --- a/src/interpreter/ast/types/unknown.test.ts +++ b/src/interpreter/ast/types/unknown.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/unknown.ts b/src/interpreter/ast/types/unknown.ts index 5afc83a4..a3a85689 100644 --- a/src/interpreter/ast/types/unknown.ts +++ b/src/interpreter/ast/types/unknown.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isUnknownType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/ast/types/unresolved.test.ts b/src/interpreter/ast/types/unresolved.test.ts index dd24712b..2049c2db 100644 --- a/src/interpreter/ast/types/unresolved.test.ts +++ b/src/interpreter/ast/types/unresolved.test.ts @@ -1,7 +1,7 @@ import { assert, expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createFunctionEntity, createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isNumberLiteralType, isUnionType, isUnresolvedType } from "unwritten:typeguards/types"; diff --git a/src/interpreter/ast/types/unresolved.ts b/src/interpreter/ast/types/unresolved.ts index c462bdf8..617d5289 100644 --- a/src/interpreter/ast/types/unresolved.ts +++ b/src/interpreter/ast/types/unresolved.ts @@ -1,9 +1,9 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { isTypeReferenceType } from "unwritten:interpreter/typeguards/types"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getSymbolId, getTypeId } from "unwritten:interpreter:ast/shared/id"; import { getNameByType } from "unwritten:interpreter:ast/shared/name"; import { getPositionByType } from "unwritten:interpreter:ast/shared/position"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { isTypeReferenceType } from "unwritten:interpreter/typeguards/types"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeByType } from "../type"; @@ -17,7 +17,6 @@ export const createUnresolvedType = (ctx: InterpreterContext, type: Type): Unres const kind = TypeKind.Unresolved; - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition const symbolId = type.symbol ? getSymbolId(ctx, type.symbol) : undefined; const typeId = getTypeId(ctx, type); const position = getPositionByType(ctx, type); diff --git a/src/interpreter/ast/types/void.test.ts b/src/interpreter/ast/types/void.test.ts index 097f0615..e8acae21 100644 --- a/src/interpreter/ast/types/void.test.ts +++ b/src/interpreter/ast/types/void.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { ts } from "unwritten:utils/template"; diff --git a/src/interpreter/ast/types/void.ts b/src/interpreter/ast/types/void.ts index 3243cd2a..5d95847b 100644 --- a/src/interpreter/ast/types/void.ts +++ b/src/interpreter/ast/types/void.ts @@ -1,7 +1,7 @@ -import { TypeKind } from "unwritten:interpreter/enums/type"; -import { withCachedType } from "unwritten:interpreter/utils/ts"; import { getTypeId } from "unwritten:interpreter:ast/shared/id"; import { isVoidType } from "unwritten:interpreter:typeguards/types"; +import { TypeKind } from "unwritten:interpreter/enums/type"; +import { withCachedType } from "unwritten:interpreter/utils/ts"; import { assert } from "unwritten:utils:general"; import type { Type } from "typescript"; diff --git a/src/interpreter/enums/entity.ts b/src/interpreter/enums/entity.ts index e6071c32..23dbdac2 100644 --- a/src/interpreter/enums/entity.ts +++ b/src/interpreter/enums/entity.ts @@ -2,8 +2,8 @@ export enum EntityKind { CallSignature = "CallSignatureEntity", Circular = "CircularEntity", Class = "ClassEntity", - ConstructSignature = "ConstructSignatureEntity", Constructor = "ConstructorEntity", + ConstructSignature = "ConstructSignatureEntity", Enum = "EnumEntity", EnumMember = "EnumMemberEntity", ExportAssignment = "ExportAssignmentEntity", diff --git a/src/interpreter/type-definitions/entities.ts b/src/interpreter/type-definitions/entities.ts index 3732248e..a8218a2f 100644 --- a/src/interpreter/type-definitions/entities.ts +++ b/src/interpreter/type-definitions/entities.ts @@ -1,6 +1,6 @@ -import type { EntityKind } from "unwritten:interpreter/enums/entity"; import type { Modifiers, Position } from "unwritten:interpreter:type-definitions/shared"; import type { ExpressionType, Type } from "unwritten:interpreter:type-definitions/types"; +import type { EntityKind } from "unwritten:interpreter/enums/entity"; import type { PartialByKey } from "unwritten:type-definitions/utils"; import type { Description, ID, JSDocProperties, Name } from "./jsdoc"; diff --git a/src/interpreter/type-definitions/jsdoc.ts b/src/interpreter/type-definitions/jsdoc.ts index 08953bbc..91f968cb 100644 --- a/src/interpreter/type-definitions/jsdoc.ts +++ b/src/interpreter/type-definitions/jsdoc.ts @@ -1,7 +1,7 @@ -import type { JSDocKind, JSDocTagNames } from "unwritten:interpreter/enums/jsdoc"; import type { Entity } from "unwritten:interpreter:type-definitions/entities"; import type { Position } from "unwritten:interpreter:type-definitions/shared"; import type { Type } from "unwritten:interpreter:type-definitions/types"; +import type { JSDocKind, JSDocTagNames } from "unwritten:interpreter/enums/jsdoc"; type JSDocBase = { @@ -81,15 +81,15 @@ export type Param = [] | [JSDocGenericTag]; export interface JSDocProperties { [JSDocTagNames.Alpha]?: Alpha; [JSDocTagNames.Beta]?: Beta; - [JSDocTagNames.See]?: See; [JSDocTagNames.Deprecated]?: Deprecated; [JSDocTagNames.Description]?: Description; [JSDocTagNames.EventProperty]?: EventProperty; [JSDocTagNames.Example]?: Example; + [JSDocTagNames.Internal]?: Internal; [JSDocTagNames.Param]?: Param; - [JSDocTagNames.Returns]?: Returns; [JSDocTagNames.Remarks]?: Remark; - [JSDocTagNames.Throws]?: Throws; - [JSDocTagNames.Internal]?: Internal; + [JSDocTagNames.Returns]?: Returns; + [JSDocTagNames.See]?: See; [JSDocTagNames.Template]?: Template; + [JSDocTagNames.Throws]?: Throws; } diff --git a/src/interpreter/type-definitions/shared.ts b/src/interpreter/type-definitions/shared.ts index 1d973c24..29a76114 100644 --- a/src/interpreter/type-definitions/shared.ts +++ b/src/interpreter/type-definitions/shared.ts @@ -7,16 +7,7 @@ export type Rest = { }; export type Modifiers = - | NativeModifiers - | "abstract" - | "accessor" - | "async" - | "override" - | "private" - | "protected" - | "public" - | "readonly" - | "static"; + "abstract" | "accessor" | "async" | "override" | "private" | "protected" | "public" | "readonly" | "static" | NativeModifiers; export type NativeModifiers = | "nativePrivate"; diff --git a/src/interpreter/type-definitions/types.ts b/src/interpreter/type-definitions/types.ts index c0fe65e6..79c64943 100644 --- a/src/interpreter/type-definitions/types.ts +++ b/src/interpreter/type-definitions/types.ts @@ -1,4 +1,3 @@ -import type { TypeKind } from "unwritten:interpreter/enums/type"; import type { Entity, GetterEntity, @@ -10,6 +9,7 @@ import type { TypeParameterEntity } from "unwritten:interpreter:type-definitions/entities"; import type { Modifiers, Position } from "unwritten:interpreter:type-definitions/shared"; +import type { TypeKind } from "unwritten:interpreter/enums/type"; import type { ID, Name } from "./jsdoc"; diff --git a/src/interpreter/utils/ts.ts b/src/interpreter/utils/ts.ts index 2299f69f..a24bf3d2 100644 --- a/src/interpreter/utils/ts.ts +++ b/src/interpreter/utils/ts.ts @@ -1,3 +1,4 @@ +import * as locker from "unwritten:interpreter:utils/locker"; import { getSymbolId, getTypeId } from "unwritten:interpreter/ast/shared/id"; import { isAliasedSymbol, @@ -5,7 +6,6 @@ import { isImportClauseSymbol, isImportSpecifierSymbol } from "unwritten:interpreter/typeguards/symbols"; -import * as locker from "unwritten:interpreter:utils/locker"; import { assert } from "unwritten:utils:general"; import type { Program, Symbol, Type as TSType } from "typescript"; diff --git a/src/platform/file-system/node.ts b/src/platform/file-system/node.ts index cc19e19c..b6c20040 100644 --- a/src/platform/file-system/node.ts +++ b/src/platform/file-system/node.ts @@ -13,8 +13,8 @@ import type { FileSystem } from "unwritten:type-definitions/platform"; const fileSystem: FileSystem = { existsSync: nodeExistsSync, mkdirSync: nodeMkdirSync, - readFileSync: (path: string) => nodeReadFileSync(path, "utf-8"), readdirSync: (path: string, options) => nodeReaddirSync(path, { encoding: "utf-8", ...options }), + readFileSync: (path: string) => nodeReadFileSync(path, "utf-8"), rmSync: nodeRmSync, writeFileSync: nodeWriteFileSync }; @@ -22,8 +22,8 @@ const fileSystem: FileSystem = { export const { existsSync, mkdirSync, - readFileSync, readdirSync, + readFileSync, rmSync, writeFileSync } = fileSystem; diff --git a/src/platform/logger/browser.ts b/src/platform/logger/browser.ts index d1809a3a..637b330a 100644 --- a/src/platform/logger/browser.ts +++ b/src/platform/logger/browser.ts @@ -69,7 +69,7 @@ export module logger { console.log({ renderer: formattedRenderer, - // eslint-disable-next-line eslint-plugin-sort-keys/sort-keys-fix + /* eslint-disable eslint-plugin-perfectionist/sort-objects */ entryPoints: formattedEntryPoints, tsconfig: formattedTSConfigPath, unwritten: formattedUnwrittenPath diff --git a/src/platform/logger/node.ts b/src/platform/logger/node.ts index 2e52e34e..b9034625 100644 --- a/src/platform/logger/node.ts +++ b/src/platform/logger/node.ts @@ -121,7 +121,7 @@ export namespace logger { const table = simpleTable({ // eslint-disable-next-line eslint-plugin-typescript/naming-convention "renderer:": formattedRenderer, - // eslint-disable-next-line eslint-plugin-typescript/naming-convention, eslint-plugin-sort-keys/sort-keys-fix + // eslint-disable-next-line eslint-plugin-typescript/naming-convention, eslint-plugin-perfectionist/sort-objects "entry points:": formattedEntryPoints, // eslint-disable-next-line eslint-plugin-typescript/naming-convention "tsconfig:": formattedTSConfigPath, diff --git a/src/platform/os/node.ts b/src/platform/os/node.ts index 94460bd8..542cf219 100644 --- a/src/platform/os/node.ts +++ b/src/platform/os/node.ts @@ -1,4 +1,4 @@ -import { EOL as nodeEOL, homedir } from "node:os"; +import { homedir, EOL as nodeEOL } from "node:os"; import type { OS } from "unwritten:type-definitions/platform"; diff --git a/src/platform/path/shared.ts b/src/platform/path/shared.ts index faefafc9..332ae187 100644 --- a/src/platform/path/shared.ts +++ b/src/platform/path/shared.ts @@ -1,7 +1,7 @@ interface Dependencies { - cwd(): string; - homeDirectory(): string; - isAbsolute(path: string): boolean; + cwd: () => string; + homeDirectory: () => string; + isAbsolute: (path: string) => boolean; separator: string; } @@ -131,7 +131,6 @@ const path = { const [fullDos, dosRoot] = path.match(/^\\?([A-Za-z]:\\|^\\)/) ?? []; const [fullPosix, posixRoot] = path.match(/^\/?(\/)/) ?? []; - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition const root = uncRoot ?? dosRoot ?? posixRoot ?? ""; const fullRoot = fullUnc ?? fullDos ?? fullPosix ?? ""; diff --git a/src/renderer/index.ts b/src/renderer/index.ts index a894a517..fd2e370f 100644 --- a/src/renderer/index.ts +++ b/src/renderer/index.ts @@ -1,6 +1,6 @@ -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { isHTMLRenderContext, renderNode as renderNodeAsHTML } from "unwritten:renderer:markup/html/index"; import { renderNode as renderNodeAsMarkdown } from "unwritten:renderer:markup/markdown/index"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { assert } from "unwritten:utils:general"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/entities/circular.ts b/src/renderer/markup/ast-converter/entities/circular.ts index b615be40..165ac942 100644 --- a/src/renderer/markup/ast-converter/entities/circular.ts +++ b/src/renderer/markup/ast-converter/entities/circular.ts @@ -1,8 +1,8 @@ import { createAnchorNode } from "unwritten:renderer:markup/utils/nodes"; import type { CircularEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertCircularEntityToAnchor(ctx: MarkupRenderContext, circularEntity: CircularEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/class.test.ts b/src/renderer/markup/ast-converter/entities/class.test.ts index 505d16e3..629adb9b 100644 --- a/src/renderer/markup/ast-converter/entities/class.test.ts +++ b/src/renderer/markup/ast-converter/entities/class.test.ts @@ -2,7 +2,6 @@ import { expect, it } from "vitest"; import { createClassEntity } from "unwritten:interpreter/ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { renderNode } from "unwritten:renderer/markup/html/index"; import { convertClassEntityForDocumentation, convertClassEntityForTableOfContents @@ -13,6 +12,7 @@ import { isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; +import { renderNode } from "unwritten:renderer/markup/html/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/class.ts b/src/renderer/markup/ast-converter/entities/class.ts index cc3105de..93ef2eaf 100644 --- a/src/renderer/markup/ast-converter/entities/class.ts +++ b/src/renderer/markup/ast-converter/entities/class.ts @@ -1,13 +1,3 @@ -import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; -import { renderMemberContext, withMemberContext } from "unwritten:renderer/markup/utils/context"; -import { - implicitSignatureFilter, - internalMemberFilter, - privateMemberFilter -} from "unwritten:renderer/markup/utils/filter"; -import { isRenderObjectMemberTitlesEnabled, renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertEventPropertyEntityForDocumentation, convertEventPropertyEntityForTableOfContents, @@ -35,14 +25,24 @@ import { extendClassEntityConstructorsWithHeritage, extendClassEntityEntitiesWithHeritage } from "unwritten:renderer:utils/heritage"; +import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; +import { renderMemberContext, withMemberContext } from "unwritten:renderer/markup/utils/context"; +import { + implicitSignatureFilter, + internalMemberFilter, + privateMemberFilter +} from "unwritten:renderer/markup/utils/filter"; +import { isRenderObjectMemberTitlesEnabled, renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { ClassEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedClassEntityForDocumentation, ConvertedClassEntityForTableOfContents } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertClassEntityToAnchor(ctx: MarkupRenderContext, classEntity: ClassEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/enum.test.ts b/src/renderer/markup/ast-converter/entities/enum.test.ts index d6390460..32e3215f 100644 --- a/src/renderer/markup/ast-converter/entities/enum.test.ts +++ b/src/renderer/markup/ast-converter/entities/enum.test.ts @@ -2,12 +2,12 @@ import { expect, it } from "vitest"; import { createEnumEntity } from "unwritten:interpreter/ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { renderNode } from "unwritten:renderer/index"; import { convertEnumEntityForDocumentation, convertEnumEntityForTableOfContents } from "unwritten:renderer:markup/ast-converter/entities/index"; import { isParagraphNode, isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; +import { renderNode } from "unwritten:renderer/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/enum.ts b/src/renderer/markup/ast-converter/entities/enum.ts index 59a3d2b7..1324d629 100644 --- a/src/renderer/markup/ast-converter/entities/enum.ts +++ b/src/renderer/markup/ast-converter/entities/enum.ts @@ -1,8 +1,3 @@ -import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; -import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; -import { renderEntityPrefix, spaceBetween } from "unwritten:renderer/markup/utils/renderer"; import { convertDescriptionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/description"; import { convertExamplesForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/example"; import { convertPositionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/position"; @@ -16,14 +11,19 @@ import { createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; +import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; +import { renderEntityPrefix, spaceBetween } from "unwritten:renderer/markup/utils/renderer"; import type { EnumEntity, EnumMemberEntity, MergedEnumEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedEnumEntityForDocumentation, ConvertedEnumEntityForTableOfContents } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertEnumEntityToAnchor(ctx: MarkupRenderContext, enumEntity: EnumEntity | MergedEnumEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/event.test.ts b/src/renderer/markup/ast-converter/entities/event.test.ts index bc2d32cf..d11e4369 100644 --- a/src/renderer/markup/ast-converter/entities/event.test.ts +++ b/src/renderer/markup/ast-converter/entities/event.test.ts @@ -2,12 +2,12 @@ import { expect, it } from "vitest"; import { createInterfaceEntity } from "unwritten:interpreter/ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; +import { isAnchorNode, isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; import { renderNode } from "unwritten:renderer/index"; import { convertEventPropertyEntityForDocumentation, convertEventPropertyEntityForTableOfContents } from "unwritten:renderer/markup/ast-converter/entities/event"; -import { isAnchorNode, isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/event.ts b/src/renderer/markup/ast-converter/entities/event.ts index cf7723f2..e62d2ad5 100644 --- a/src/renderer/markup/ast-converter/entities/event.ts +++ b/src/renderer/markup/ast-converter/entities/event.ts @@ -1,10 +1,3 @@ -import { - convertSeeTagsForDocumentation, - convertSeeTagsForType -} from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { getSectionType } from "unwritten:renderer/markup/types-definitions/sections.js"; -import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; import { convertDescriptionForDocumentation, convertDescriptionForType @@ -25,15 +18,22 @@ import { createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { renderEntityPrefix, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; +import { + convertSeeTagsForDocumentation, + convertSeeTagsForType +} from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { getSectionType } from "unwritten:renderer/markup/types-definitions/sections.js"; +import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; import type { PropertyEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedEventPropertyEntityForDocumentation, ConvertedEventPropertyEntityForTableOfContents, ConvertedEventPropertyEntityForType } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertEventPropertyEntityToAnchor(ctx: MarkupRenderContext, propertyEntity: PropertyEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/export-assignment.test.ts b/src/renderer/markup/ast-converter/entities/export-assignment.test.ts index aac97bc4..09eb4648 100644 --- a/src/renderer/markup/ast-converter/entities/export-assignment.test.ts +++ b/src/renderer/markup/ast-converter/entities/export-assignment.test.ts @@ -2,7 +2,6 @@ import { expect, it } from "vitest"; import { createExportAssignmentEntity } from "unwritten:interpreter/ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { renderNode } from "unwritten:renderer/index"; import { convertExportAssignmentEntityForDocumentation, convertExportAssignmentEntityForTableOfContents @@ -14,6 +13,7 @@ import { isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; +import { renderNode } from "unwritten:renderer/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/export-assignment.ts b/src/renderer/markup/ast-converter/entities/export-assignment.ts index e86f7228..ce7f5a13 100644 --- a/src/renderer/markup/ast-converter/entities/export-assignment.ts +++ b/src/renderer/markup/ast-converter/entities/export-assignment.ts @@ -1,7 +1,3 @@ -import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; -import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; import { convertDescriptionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/description"; import { convertExamplesForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/example"; import { convertPositionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/position"; @@ -10,6 +6,10 @@ import { convertTagsForDocumentation } from "unwritten:renderer:markup/ast-conve import { convertTypeForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/type"; import { getSectionType } from "unwritten:renderer:markup/types-definitions/sections"; import { createAnchorNode, createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; +import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; import type { ExportAssignmentEntity } from "unwritten:interpreter:type-definitions/entities"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/entities/function-like.ts b/src/renderer/markup/ast-converter/entities/function-like.ts index 8ae4f230..5a4b229c 100644 --- a/src/renderer/markup/ast-converter/entities/function-like.ts +++ b/src/renderer/markup/ast-converter/entities/function-like.ts @@ -1,9 +1,9 @@ -import { implicitSignatureFilter } from "unwritten:renderer/markup/utils/filter"; import { convertSignatureEntityForDocumentation, convertSignatureEntityForTableOfContents, convertSignatureEntityForType } from "unwritten:renderer:markup/ast-converter/entities/index"; +import { implicitSignatureFilter } from "unwritten:renderer/markup/utils/filter"; import type { FunctionLikeEntity } from "unwritten:interpreter:type-definitions/entities"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/entities/interface.test.ts b/src/renderer/markup/ast-converter/entities/interface.test.ts index 9787606c..5ab79cef 100644 --- a/src/renderer/markup/ast-converter/entities/interface.test.ts +++ b/src/renderer/markup/ast-converter/entities/interface.test.ts @@ -2,7 +2,6 @@ import { expect, it } from "vitest"; import { createInterfaceEntity } from "unwritten:interpreter/ast/entities/index"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { renderNode } from "unwritten:renderer/index"; import { convertInterfaceEntityForDocumentation, convertInterfaceEntityForTableOfContents @@ -15,6 +14,7 @@ import { isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; +import { renderNode } from "unwritten:renderer/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/interface.ts b/src/renderer/markup/ast-converter/entities/interface.ts index c4b51884..ab0dfe38 100644 --- a/src/renderer/markup/ast-converter/entities/interface.ts +++ b/src/renderer/markup/ast-converter/entities/interface.ts @@ -1,15 +1,3 @@ -import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; -import { - implicitSignatureFilter, - internalMemberFilter, - internalSignatureFilter, - privateMemberFilter, - privateSignatureFilter -} from "unwritten:renderer/markup/utils/filter"; -import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertEventPropertyEntityForType, convertPropertyEntityForType, @@ -32,14 +20,26 @@ import { extendInterfaceEntityPropertiesWithHeritage, extendInterfaceEntitySignaturesWithHeritage } from "unwritten:renderer:utils/heritage"; +import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; +import { + implicitSignatureFilter, + internalMemberFilter, + internalSignatureFilter, + privateMemberFilter, + privateSignatureFilter +} from "unwritten:renderer/markup/utils/filter"; +import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { InterfaceEntity, MergedInterfaceEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedInterfaceEntityForDocumentation, ConvertedInterfaceEntityForTableOfContents } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertInterfaceEntityToAnchor(ctx: MarkupRenderContext, interfaceEntity: InterfaceEntity | MergedInterfaceEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/module.test.ts b/src/renderer/markup/ast-converter/entities/module.test.ts index 914f543b..b241be1c 100644 --- a/src/renderer/markup/ast-converter/entities/module.test.ts +++ b/src/renderer/markup/ast-converter/entities/module.test.ts @@ -2,7 +2,6 @@ import { expect, it } from "vitest"; import { createModuleEntity } from "unwritten:interpreter/ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { renderNode } from "unwritten:renderer/index"; import { convertModuleEntityForDocumentation, convertModuleEntityForTableOfContents @@ -13,6 +12,7 @@ import { isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; +import { renderNode } from "unwritten:renderer/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/module.ts b/src/renderer/markup/ast-converter/entities/module.ts index 63cf3318..5bb0d6c3 100644 --- a/src/renderer/markup/ast-converter/entities/module.ts +++ b/src/renderer/markup/ast-converter/entities/module.ts @@ -1,8 +1,3 @@ -import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { getSectionType } from "unwritten:renderer/markup/types-definitions/sections.js"; -import { renderMemberContext, withMemberContext } from "unwritten:renderer/markup/utils/context"; -import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; import { convertEntityForDocumentation, createTableOfContents } from "unwritten:renderer:markup/ast-converter/index"; import { convertDescriptionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/description"; import { convertExamplesForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/example"; @@ -10,14 +5,19 @@ import { convertPositionForDocumentation } from "unwritten:renderer:markup/ast-c import { convertRemarksForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/remarks"; import { convertTagsForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/tags"; import { createAnchorNode, createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { getSectionType } from "unwritten:renderer/markup/types-definitions/sections.js"; +import { renderMemberContext, withMemberContext } from "unwritten:renderer/markup/utils/context"; +import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; import type { ModuleEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedModuleEntityForDocumentation, ConvertedModuleEntityForTableOfContents } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertModuleEntityToAnchor(ctx: MarkupRenderContext, moduleEntity: ModuleEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/namespace.test.ts b/src/renderer/markup/ast-converter/entities/namespace.test.ts index 0121f2ac..6d443b05 100644 --- a/src/renderer/markup/ast-converter/entities/namespace.test.ts +++ b/src/renderer/markup/ast-converter/entities/namespace.test.ts @@ -2,7 +2,6 @@ import { expect, it } from "vitest"; import { createNamespaceEntity } from "unwritten:interpreter/ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { renderNode } from "unwritten:renderer/index"; import { convertNamespaceEntityForDocumentation, convertNamespaceEntityForTableOfContents @@ -13,6 +12,7 @@ import { isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; +import { renderNode } from "unwritten:renderer/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/namespace.ts b/src/renderer/markup/ast-converter/entities/namespace.ts index 6b00d779..033ebda2 100644 --- a/src/renderer/markup/ast-converter/entities/namespace.ts +++ b/src/renderer/markup/ast-converter/entities/namespace.ts @@ -1,8 +1,3 @@ -import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { getSectionType } from "unwritten:renderer/markup/types-definitions/sections.js"; -import { renderMemberContext, withMemberContext } from "unwritten:renderer/markup/utils/context"; -import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; import { convertEntityForDocumentation, createTableOfContents } from "unwritten:renderer:markup/ast-converter/index"; import { convertDescriptionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/description"; import { convertExamplesForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/example"; @@ -10,14 +5,19 @@ import { convertPositionForDocumentation } from "unwritten:renderer:markup/ast-c import { convertRemarksForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/remarks"; import { convertTagsForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/tags"; import { createAnchorNode, createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { getSectionType } from "unwritten:renderer/markup/types-definitions/sections.js"; +import { renderMemberContext, withMemberContext } from "unwritten:renderer/markup/utils/context"; +import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; import type { NamespaceEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedNamespaceEntityForDocumentation, ConvertedNamespaceEntityForTableOfContents } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertNamespaceEntityToAnchor(ctx: MarkupRenderContext, namespaceEntity: NamespaceEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/parameter.test.ts b/src/renderer/markup/ast-converter/entities/parameter.test.ts index ba6b2ffa..e47a5bac 100644 --- a/src/renderer/markup/ast-converter/entities/parameter.test.ts +++ b/src/renderer/markup/ast-converter/entities/parameter.test.ts @@ -2,13 +2,13 @@ import { expect, it } from "vitest"; import { createFunctionEntity } from "unwritten:interpreter/ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; -import { renderNode } from "unwritten:renderer/index"; import { convertParameterEntitiesForDocumentation, convertParameterEntitiesForSignature } from "unwritten:renderer:markup/ast-converter/entities/index"; import { isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; +import { renderNode } from "unwritten:renderer/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/parameter.ts b/src/renderer/markup/ast-converter/entities/parameter.ts index 5ccea6fd..441e3ae8 100644 --- a/src/renderer/markup/ast-converter/entities/parameter.ts +++ b/src/renderer/markup/ast-converter/entities/parameter.ts @@ -1,8 +1,3 @@ -import { convertDescriptionForType } from "unwritten:renderer/markup/ast-converter/shared/description"; -import { convertInitializerForType } from "unwritten:renderer/markup/ast-converter/shared/initializer"; -import { isMarkdownRenderContext } from "unwritten:renderer/markup/markdown/index"; -import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; import { createAnchorNode, @@ -15,15 +10,20 @@ import { } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { convertDescriptionForType } from "unwritten:renderer/markup/ast-converter/shared/description"; +import { convertInitializerForType } from "unwritten:renderer/markup/ast-converter/shared/initializer"; +import { isMarkdownRenderContext } from "unwritten:renderer/markup/markdown/index"; +import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { ParameterEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedParameterEntitiesForDocumentation, ConvertedParameterEntitiesForSignature, ConvertedParameterEntitiesForType } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertParameterEntityToAnchor(ctx: MarkupRenderContext, parameterEntity: ParameterEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/property.ts b/src/renderer/markup/ast-converter/entities/property.ts index aecd744e..a5ebcae4 100644 --- a/src/renderer/markup/ast-converter/entities/property.ts +++ b/src/renderer/markup/ast-converter/entities/property.ts @@ -1,11 +1,3 @@ -import { - convertSeeTagsForDocumentation, - convertSeeTagsForType -} from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { getSectionType } from "unwritten:renderer/markup/types-definitions/sections.js"; -import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertDescriptionForDocumentation, convertDescriptionForType @@ -28,15 +20,23 @@ import { createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate, renderEntityPrefix, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; +import { + convertSeeTagsForDocumentation, + convertSeeTagsForType +} from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { getSectionType } from "unwritten:renderer/markup/types-definitions/sections.js"; +import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { PropertyEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedPropertyEntityForDocumentation, ConvertedPropertyEntityForTableOfContents, ConvertedPropertyEntityForType } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertPropertyEntityToAnchor(ctx: MarkupRenderContext, propertyEntity: PropertyEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/signature.test.ts b/src/renderer/markup/ast-converter/entities/signature.test.ts index 7d839b79..43fc31ef 100644 --- a/src/renderer/markup/ast-converter/entities/signature.test.ts +++ b/src/renderer/markup/ast-converter/entities/signature.test.ts @@ -1,7 +1,6 @@ import { assert, expect, it } from "vitest"; import { createFunctionEntity, createVariableEntity } from "unwritten:interpreter/ast/entities/index"; -import { implicitSignatureFilter } from "unwritten:renderer/markup/utils/filter"; import { convertSignatureEntityForDocumentation, convertSignatureEntityForTableOfContents @@ -16,6 +15,7 @@ import { isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; import { getSectionType } from "unwritten:renderer:markup/types-definitions/sections"; +import { implicitSignatureFilter } from "unwritten:renderer/markup/utils/filter"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/signature.ts b/src/renderer/markup/ast-converter/entities/signature.ts index 146da930..7306a761 100644 --- a/src/renderer/markup/ast-converter/entities/signature.ts +++ b/src/renderer/markup/ast-converter/entities/signature.ts @@ -1,16 +1,3 @@ -import { renderNode } from "unwritten:renderer/index"; -import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; -import { - convertSeeTagsForDocumentation, - convertSeeTagsForType -} from "unwritten:renderer/markup/ast-converter/shared/see"; -import { - convertThrowsForDocumentation, - convertThrowsForType -} from "unwritten:renderer/markup/ast-converter/shared/throws"; -import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; -import { isRenderParentNamesEnabled, renderMemberContext } from "unwritten:renderer/markup/utils/context"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertParameterEntitiesForDocumentation, convertParameterEntitiesForSignature, @@ -45,6 +32,19 @@ import { } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate, renderEntityPrefix, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { renderNode } from "unwritten:renderer/index"; +import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; +import { + convertSeeTagsForDocumentation, + convertSeeTagsForType +} from "unwritten:renderer/markup/ast-converter/shared/see"; +import { + convertThrowsForDocumentation, + convertThrowsForType +} from "unwritten:renderer/markup/ast-converter/shared/throws"; +import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; +import { isRenderParentNamesEnabled, renderMemberContext } from "unwritten:renderer/markup/utils/context"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { ExplicitSignatureEntity, SignatureEntity } from "unwritten:interpreter:type-definitions/entities"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/entities/type-alias.ts b/src/renderer/markup/ast-converter/entities/type-alias.ts index ff03fe1d..e3b4de08 100644 --- a/src/renderer/markup/ast-converter/entities/type-alias.ts +++ b/src/renderer/markup/ast-converter/entities/type-alias.ts @@ -1,8 +1,3 @@ -import { renderNode } from "unwritten:renderer/index"; -import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertTypeParameterEntitiesForDocumentation, convertTypeParameterEntitiesForSignature @@ -16,14 +11,19 @@ import { convertTypeForDocumentation } from "unwritten:renderer:markup/ast-conve import { getSectionType } from "unwritten:renderer:markup/types-definitions/sections"; import { createAnchorNode, createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate, renderEntityPrefix } from "unwritten:renderer:markup/utils/renderer"; +import { renderNode } from "unwritten:renderer/index"; +import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { TypeAliasEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedTypeAliasEntityForDocumentation, ConvertedTypeAliasEntityForTableOfContents } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertTypeAliasEntityToAnchor(ctx: MarkupRenderContext, typeAliasEntity: TypeAliasEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/type-parameter.ts b/src/renderer/markup/ast-converter/entities/type-parameter.ts index 87ae57cc..83408727 100644 --- a/src/renderer/markup/ast-converter/entities/type-parameter.ts +++ b/src/renderer/markup/ast-converter/entities/type-parameter.ts @@ -1,10 +1,3 @@ -import { renderNode } from "unwritten:renderer/index"; -import { convertConstraintForType } from "unwritten:renderer/markup/ast-converter/shared/constraint"; -import { convertInitializerForType } from "unwritten:renderer/markup/ast-converter/shared/initializer"; -import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; -import { isMarkdownRenderContext } from "unwritten:renderer/markup/markdown/index"; -import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createAnchorNode, createInlineTitleNode, @@ -16,9 +9,15 @@ import { } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { renderNode } from "unwritten:renderer/index"; +import { convertConstraintForType } from "unwritten:renderer/markup/ast-converter/shared/constraint"; +import { convertInitializerForType } from "unwritten:renderer/markup/ast-converter/shared/initializer"; +import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; +import { isMarkdownRenderContext } from "unwritten:renderer/markup/markdown/index"; +import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { TypeParameterEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedTypeParameterEntitiesForDocumentation, @@ -26,6 +25,7 @@ import type { ConvertedTypeParameterEntitiesForType, ConvertedTypeParameterEntityForDocumentation } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertTypeParameterEntityToAnchor(ctx: MarkupRenderContext, typeParameterEntity: TypeParameterEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/entities/variable.test.ts b/src/renderer/markup/ast-converter/entities/variable.test.ts index fad275be..8d5cf96b 100644 --- a/src/renderer/markup/ast-converter/entities/variable.test.ts +++ b/src/renderer/markup/ast-converter/entities/variable.test.ts @@ -2,7 +2,6 @@ import { expect, it } from "vitest"; import { createVariableEntity } from "unwritten:interpreter/ast/entities/index"; import { EntityKind } from "unwritten:interpreter/enums/entity"; -import { renderNode } from "unwritten:renderer/index"; import { convertVariableEntityForDocumentation, convertVariableEntityForTableOfContents @@ -13,6 +12,7 @@ import { isSectionNode, isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; +import { renderNode } from "unwritten:renderer/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/entities/variable.ts b/src/renderer/markup/ast-converter/entities/variable.ts index 1608f858..43fbdf10 100644 --- a/src/renderer/markup/ast-converter/entities/variable.ts +++ b/src/renderer/markup/ast-converter/entities/variable.ts @@ -1,7 +1,3 @@ -import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; -import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; import { convertDescriptionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/description"; import { convertExamplesForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/example"; import { convertPositionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/position"; @@ -10,14 +6,18 @@ import { convertTagsForDocumentation } from "unwritten:renderer:markup/ast-conve import { convertTypeForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/type"; import { getSectionType } from "unwritten:renderer:markup/types-definitions/sections"; import { createAnchorNode, createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { convertSeeTagsForDocumentation } from "unwritten:renderer/markup/ast-converter/shared/see"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; +import { renderMemberContext } from "unwritten:renderer/markup/utils/context"; +import { renderEntityPrefix } from "unwritten:renderer/markup/utils/renderer.js"; import type { VariableEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedVariableEntityForDocumentation, ConvertedVariableEntityForTableOfContents } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { AnchorNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertVariableEntityToAnchor(ctx: MarkupRenderContext, variableEntity: VariableEntity, displayName?: string): AnchorNode { diff --git a/src/renderer/markup/ast-converter/index.ts b/src/renderer/markup/ast-converter/index.ts index 8438347f..2e83de70 100644 --- a/src/renderer/markup/ast-converter/index.ts +++ b/src/renderer/markup/ast-converter/index.ts @@ -1,7 +1,3 @@ -import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; -import { getSectionType, pluralizeEntityKind } from "unwritten:renderer/markup/types-definitions/sections.js"; -import { filterExportableEntities } from "unwritten:renderer/markup/utils/filter"; -import { sortExportableEntities } from "unwritten:renderer/markup/utils/sort"; import { convertCircularEntityToAnchor, convertClassEntityForDocumentation, @@ -37,6 +33,10 @@ import { } from "unwritten:renderer:markup/ast-converter/entities/index"; import { createListNode, createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { renderCategoryName } from "unwritten:renderer:markup/utils/renderer"; +import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; +import { getSectionType, pluralizeEntityKind } from "unwritten:renderer/markup/types-definitions/sections.js"; +import { filterExportableEntities } from "unwritten:renderer/markup/utils/filter"; +import { sortExportableEntities } from "unwritten:renderer/markup/utils/sort"; import { isCircularEntity, isClassEntity, diff --git a/src/renderer/markup/ast-converter/jsdoc/link.test.ts b/src/renderer/markup/ast-converter/jsdoc/link.test.ts index b95f01c0..4bc8e8fe 100644 --- a/src/renderer/markup/ast-converter/jsdoc/link.test.ts +++ b/src/renderer/markup/ast-converter/jsdoc/link.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { convertJSDocLink } from "unwritten:renderer/markup/ast-converter/jsdoc/index"; import { isAnchorNode, isConditionalNode, isLinkNode } from "unwritten:renderer/markup/typeguards/renderer"; import { compile } from "unwritten:tests:utils/compile"; diff --git a/src/renderer/markup/ast-converter/jsdoc/see.test.ts b/src/renderer/markup/ast-converter/jsdoc/see.test.ts index da133829..cb45411e 100644 --- a/src/renderer/markup/ast-converter/jsdoc/see.test.ts +++ b/src/renderer/markup/ast-converter/jsdoc/see.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { createTypeAliasEntity } from "unwritten:interpreter:ast/entities/index"; +import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { convertJSDocSeeTag } from "unwritten:renderer/markup/ast-converter/jsdoc/see"; import { isConditionalNode } from "unwritten:renderer/markup/typeguards/renderer"; import { compile } from "unwritten:tests:utils/compile"; diff --git a/src/renderer/markup/ast-converter/jsdoc/throws.test.ts b/src/renderer/markup/ast-converter/jsdoc/throws.test.ts index 65265885..683de998 100644 --- a/src/renderer/markup/ast-converter/jsdoc/throws.test.ts +++ b/src/renderer/markup/ast-converter/jsdoc/throws.test.ts @@ -1,8 +1,8 @@ import { describe, expect, it } from "vitest"; +import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/renderer/markup/ast-converter/jsdoc/type.test.ts b/src/renderer/markup/ast-converter/jsdoc/type.test.ts index f11af404..382fd60e 100644 --- a/src/renderer/markup/ast-converter/jsdoc/type.test.ts +++ b/src/renderer/markup/ast-converter/jsdoc/type.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it } from "vitest"; -import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { createFunctionEntity } from "unwritten:interpreter:ast/entities/index"; +import { JSDocKind } from "unwritten:interpreter/enums/jsdoc"; import { convertJSDocType } from "unwritten:renderer/markup/ast-converter/jsdoc/index"; import { isAnchorNode, isConditionalNode } from "unwritten:renderer/markup/typeguards/renderer"; import { compile } from "unwritten:tests:utils/compile"; diff --git a/src/renderer/markup/ast-converter/shared/description.ts b/src/renderer/markup/ast-converter/shared/description.ts index 6cebca2c..0ce3a1a0 100644 --- a/src/renderer/markup/ast-converter/shared/description.ts +++ b/src/renderer/markup/ast-converter/shared/description.ts @@ -1,8 +1,8 @@ +import { createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { getTranslator } from "unwritten:renderer:markup/utils/translations"; import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { spaceBetween } from "unwritten:renderer/markup/utils/renderer"; -import { createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; -import { getTranslator } from "unwritten:renderer:markup/utils/translations"; import type { Description } from "unwritten:interpreter:type-definitions/jsdoc"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/shared/example.ts b/src/renderer/markup/ast-converter/shared/example.ts index b6abc60d..819dd595 100644 --- a/src/renderer/markup/ast-converter/shared/example.ts +++ b/src/renderer/markup/ast-converter/shared/example.ts @@ -1,7 +1,7 @@ -import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; -import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { createInlineTitleNode, createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; +import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import type { Example } from "unwritten:interpreter:type-definitions/jsdoc"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/shared/jsdoc.test.ts b/src/renderer/markup/ast-converter/shared/jsdoc.test.ts index f9210207..4d31cc7b 100644 --- a/src/renderer/markup/ast-converter/shared/jsdoc.test.ts +++ b/src/renderer/markup/ast-converter/shared/jsdoc.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { RenderableJSDocKeyTags } from "unwritten:renderer:markup/enums/jsdoc"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/shared/jsdoc.ts b/src/renderer/markup/ast-converter/shared/jsdoc.ts index 255a4fe9..a8679ef8 100644 --- a/src/renderer/markup/ast-converter/shared/jsdoc.ts +++ b/src/renderer/markup/ast-converter/shared/jsdoc.ts @@ -1,3 +1,5 @@ +import { RenderableJSDocKeyTags, RenderableJSDocValueTags } from "unwritten:renderer:markup/enums/jsdoc"; +import { encapsulate, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; import { renderNode } from "unwritten:renderer/index"; import { convertJSDocGenericTag, @@ -8,8 +10,6 @@ import { convertJSDocType } from "unwritten:renderer/markup/ast-converter/jsdoc/index"; import { convertJSDocText } from "unwritten:renderer/markup/ast-converter/jsdoc/text"; -import { RenderableJSDocKeyTags, RenderableJSDocValueTags } from "unwritten:renderer:markup/enums/jsdoc"; -import { encapsulate, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; import { isJSDocGenericTag, isJSDocLink, diff --git a/src/renderer/markup/ast-converter/shared/modifiers.test.ts b/src/renderer/markup/ast-converter/shared/modifiers.test.ts index b9c13315..adf98f78 100644 --- a/src/renderer/markup/ast-converter/shared/modifiers.test.ts +++ b/src/renderer/markup/ast-converter/shared/modifiers.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { convertModifiers } from "unwritten:renderer:markup/ast-converter/shared/modifiers"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { assert } from "unwritten:utils/general"; diff --git a/src/renderer/markup/ast-converter/shared/modifiers.ts b/src/renderer/markup/ast-converter/shared/modifiers.ts index 8f6ba2ad..9959844a 100644 --- a/src/renderer/markup/ast-converter/shared/modifiers.ts +++ b/src/renderer/markup/ast-converter/shared/modifiers.ts @@ -1,5 +1,5 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { encapsulate, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ASTNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/ast-converter/shared/optional.ts b/src/renderer/markup/ast-converter/shared/optional.ts index 0c232666..8beb8dd2 100644 --- a/src/renderer/markup/ast-converter/shared/optional.ts +++ b/src/renderer/markup/ast-converter/shared/optional.ts @@ -1,6 +1,6 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { Optional } from "unwritten:interpreter:type-definitions/shared"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/shared/position.test.ts b/src/renderer/markup/ast-converter/shared/position.test.ts index 22d5e883..21cba2d6 100644 --- a/src/renderer/markup/ast-converter/shared/position.test.ts +++ b/src/renderer/markup/ast-converter/shared/position.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { convertPositionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/position"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { renderNode } from "unwritten:renderer/index"; -import { convertPositionForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/position"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/ast-converter/shared/position.ts b/src/renderer/markup/ast-converter/shared/position.ts index 86227dcb..f0e7f4f1 100644 --- a/src/renderer/markup/ast-converter/shared/position.ts +++ b/src/renderer/markup/ast-converter/shared/position.ts @@ -1,4 +1,3 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config.js"; import { createLinkNode, createPaddedNode, @@ -6,6 +5,7 @@ import { createSmallNode } from "unwritten:renderer:markup/utils/nodes"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { getRenderConfig } from "unwritten:renderer/utils/config.js"; import type { Position } from "unwritten:interpreter:type-definitions/shared"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/shared/remarks.ts b/src/renderer/markup/ast-converter/shared/remarks.ts index 217d6c7d..0d5495c4 100644 --- a/src/renderer/markup/ast-converter/shared/remarks.ts +++ b/src/renderer/markup/ast-converter/shared/remarks.ts @@ -1,7 +1,7 @@ -import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; -import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { createInlineTitleNode, createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; +import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import type { Remark } from "unwritten:interpreter:type-definitions/jsdoc"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/shared/rest.ts b/src/renderer/markup/ast-converter/shared/rest.ts index 77fff1a6..65f00df2 100644 --- a/src/renderer/markup/ast-converter/shared/rest.ts +++ b/src/renderer/markup/ast-converter/shared/rest.ts @@ -1,6 +1,6 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { Rest } from "unwritten:interpreter:type-definitions/shared"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/shared/see.ts b/src/renderer/markup/ast-converter/shared/see.ts index b61e2c1a..0f43fe04 100644 --- a/src/renderer/markup/ast-converter/shared/see.ts +++ b/src/renderer/markup/ast-converter/shared/see.ts @@ -1,12 +1,12 @@ +import { createInlineTitleNode, createListNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { getTranslator } from "unwritten:renderer:markup/utils/translations"; import { convertJSDocReference } from "unwritten:renderer/markup/ast-converter/jsdoc/reference"; import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; -import { createInlineTitleNode, createListNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; -import { getTranslator } from "unwritten:renderer:markup/utils/translations"; import type { See } from "unwritten:interpreter:type-definitions/jsdoc"; -import type { ConvertedSeeTags, ConvertedSeeTagsForType } from "unwritten:renderer/markup/types-definitions/renderer"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; +import type { ConvertedSeeTags, ConvertedSeeTagsForType } from "unwritten:renderer/markup/types-definitions/renderer"; export function convertSeeTagsForDocumentation(ctx: MarkupRenderContext, seeTags: See): ConvertedSeeTags { diff --git a/src/renderer/markup/ast-converter/shared/tags.test.ts b/src/renderer/markup/ast-converter/shared/tags.test.ts index c1d51531..e850a345 100644 --- a/src/renderer/markup/ast-converter/shared/tags.test.ts +++ b/src/renderer/markup/ast-converter/shared/tags.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { convertTagsForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/tags"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { renderNode } from "unwritten:renderer/markup/markdown/index"; -import { convertTagsForDocumentation } from "unwritten:renderer:markup/ast-converter/shared/tags"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/shared/tags.ts b/src/renderer/markup/ast-converter/shared/tags.ts index 0ee7a855..8c0054cb 100644 --- a/src/renderer/markup/ast-converter/shared/tags.ts +++ b/src/renderer/markup/ast-converter/shared/tags.ts @@ -1,9 +1,9 @@ -import { convertJSDocTags } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; -import { convertRest } from "unwritten:renderer/markup/ast-converter/shared/rest"; import { convertModifiers } from "unwritten:renderer:markup/ast-converter/shared/modifiers"; import { convertOptional } from "unwritten:renderer:markup/ast-converter/shared/optional"; import { createParagraphNode } from "unwritten:renderer:markup/utils/nodes"; import { spaceBetween } from "unwritten:renderer:markup/utils/renderer"; +import { convertJSDocTags } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; +import { convertRest } from "unwritten:renderer/markup/ast-converter/shared/rest"; import type { Entity } from "unwritten:interpreter:type-definitions/entities"; import type { JSDocProperties } from "unwritten:interpreter:type-definitions/jsdoc"; diff --git a/src/renderer/markup/ast-converter/shared/throws.ts b/src/renderer/markup/ast-converter/shared/throws.ts index 01ab1d04..b12187ba 100644 --- a/src/renderer/markup/ast-converter/shared/throws.ts +++ b/src/renderer/markup/ast-converter/shared/throws.ts @@ -1,8 +1,8 @@ +import { createInlineTitleNode, createListNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { convertJSDocType } from "unwritten:renderer/markup/ast-converter/jsdoc/index"; import { convertJSDocNodes } from "unwritten:renderer/markup/ast-converter/shared/jsdoc"; import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { getTranslator } from "unwritten:renderer/markup/utils/translations"; -import { createInlineTitleNode, createListNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import type { Throws } from "unwritten:interpreter:type-definitions/jsdoc"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/shared/type.ts b/src/renderer/markup/ast-converter/shared/type.ts index b0331556..86e384a6 100644 --- a/src/renderer/markup/ast-converter/shared/type.ts +++ b/src/renderer/markup/ast-converter/shared/type.ts @@ -1,4 +1,3 @@ -import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { convertAnyTypeInline, convertArrayTypeInline, @@ -50,6 +49,7 @@ import { import { createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; import { isMultilineType, isMultilineUnionType } from "unwritten:renderer:markup/utils/types"; +import { registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { isAnyType, isArrayType, diff --git a/src/renderer/markup/ast-converter/types/any.ts b/src/renderer/markup/ast-converter/types/any.ts index 4521a1e0..7fb5f117 100644 --- a/src/renderer/markup/ast-converter/types/any.ts +++ b/src/renderer/markup/ast-converter/types/any.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { AnyType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/array.test.ts b/src/renderer/markup/ast-converter/types/array.test.ts index b24e03c5..cb3989a7 100644 --- a/src/renderer/markup/ast-converter/types/array.test.ts +++ b/src/renderer/markup/ast-converter/types/array.test.ts @@ -2,11 +2,11 @@ import { expect, it } from "vitest"; import { createTypeAliasEntity } from "unwritten:interpreter/ast/entities/index"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { isMultilineNode } from "unwritten:renderer/markup/typeguards/renderer"; import { convertArrayTypeInline, convertArrayTypeMultiline } from "unwritten:renderer:markup/ast-converter/types/index"; +import { isMultilineNode } from "unwritten:renderer/markup/typeguards/renderer"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/types/array.ts b/src/renderer/markup/ast-converter/types/array.ts index f534509a..48f9b6ec 100644 --- a/src/renderer/markup/ast-converter/types/array.ts +++ b/src/renderer/markup/ast-converter/types/array.ts @@ -1,8 +1,8 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; +import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; import { createLinkNode, createListNode, createMultilineNode } from "unwritten:renderer/markup/utils/nodes"; import { encapsulate } from "unwritten:renderer/markup/utils/renderer"; import { getRenderConfig } from "unwritten:renderer/utils/config"; -import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; import type { ArrayType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/bigint-literal.ts b/src/renderer/markup/ast-converter/types/bigint-literal.ts index 4c8f6d43..84a7f19e 100644 --- a/src/renderer/markup/ast-converter/types/bigint-literal.ts +++ b/src/renderer/markup/ast-converter/types/bigint-literal.ts @@ -1,5 +1,5 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { BigIntLiteralType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/bigint.ts b/src/renderer/markup/ast-converter/types/bigint.ts index 574005b8..e441096e 100644 --- a/src/renderer/markup/ast-converter/types/bigint.ts +++ b/src/renderer/markup/ast-converter/types/bigint.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { BigIntType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/boolean-literal.ts b/src/renderer/markup/ast-converter/types/boolean-literal.ts index ce8a271c..e48cae97 100644 --- a/src/renderer/markup/ast-converter/types/boolean-literal.ts +++ b/src/renderer/markup/ast-converter/types/boolean-literal.ts @@ -1,5 +1,5 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { BooleanLiteralType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/boolean.ts b/src/renderer/markup/ast-converter/types/boolean.ts index 1724c950..0ffb3240 100644 --- a/src/renderer/markup/ast-converter/types/boolean.ts +++ b/src/renderer/markup/ast-converter/types/boolean.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { BooleanType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/circular.test.ts b/src/renderer/markup/ast-converter/types/circular.test.ts index a9636da7..48d0d4a4 100644 --- a/src/renderer/markup/ast-converter/types/circular.test.ts +++ b/src/renderer/markup/ast-converter/types/circular.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { TypeKind } from "unwritten:interpreter/enums/type"; import { createInterfaceEntity } from "unwritten:interpreter:ast/entities/index"; +import { TypeKind } from "unwritten:interpreter/enums/type"; import { compile } from "unwritten:tests:utils/compile"; import { scope } from "unwritten:tests:utils/scope"; import { isCircularEntity } from "unwritten:typeguards/entities"; diff --git a/src/renderer/markup/ast-converter/types/class.ts b/src/renderer/markup/ast-converter/types/class.ts index 6e4a2d71..1e4cc85c 100644 --- a/src/renderer/markup/ast-converter/types/class.ts +++ b/src/renderer/markup/ast-converter/types/class.ts @@ -1,6 +1,6 @@ +import { convertObjectTypeMultiline } from "unwritten:renderer:markup/ast-converter/types/index"; import { encapsulate } from "unwritten:renderer/markup/utils/renderer.js"; import { getRenderConfig } from "unwritten:renderer/utils/config.js"; -import { convertObjectTypeMultiline } from "unwritten:renderer:markup/ast-converter/types/index"; import type { ClassType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/conditional.test.ts b/src/renderer/markup/ast-converter/types/conditional.test.ts index 733d57e6..84e46d77 100644 --- a/src/renderer/markup/ast-converter/types/conditional.test.ts +++ b/src/renderer/markup/ast-converter/types/conditional.test.ts @@ -2,11 +2,11 @@ import { expect, it } from "vitest"; import { createTypeAliasEntity } from "unwritten:interpreter/ast/entities/index"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { isAnchorNode, isConditionalNode } from "unwritten:renderer/markup/typeguards/renderer"; import { convertConditionalTypeInline, convertConditionalTypeMultiline } from "unwritten:renderer:markup/ast-converter/types/index"; +import { isAnchorNode, isConditionalNode } from "unwritten:renderer/markup/typeguards/renderer"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/types/conditional.ts b/src/renderer/markup/ast-converter/types/conditional.ts index 08ee90e9..ab41213f 100644 --- a/src/renderer/markup/ast-converter/types/conditional.ts +++ b/src/renderer/markup/ast-converter/types/conditional.ts @@ -1,9 +1,9 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { convertType } from "unwritten:renderer/markup/ast-converter/shared/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode, createListNode, createMultilineNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { convertType } from "unwritten:renderer/markup/ast-converter/shared/type"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { ConditionalType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/function.ts b/src/renderer/markup/ast-converter/types/function.ts index 260623ce..1d5f391c 100644 --- a/src/renderer/markup/ast-converter/types/function.ts +++ b/src/renderer/markup/ast-converter/types/function.ts @@ -1,9 +1,9 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertSignatureEntityForType } from "unwritten:renderer:markup/ast-converter/entities/index"; import { createLinkNode, createListNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { FunctionType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/intersection.ts b/src/renderer/markup/ast-converter/types/intersection.ts index c973a83d..4f04b74e 100644 --- a/src/renderer/markup/ast-converter/types/intersection.ts +++ b/src/renderer/markup/ast-converter/types/intersection.ts @@ -1,9 +1,9 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; +import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; import { createLinkNode, createListNode, createMultilineNode } from "unwritten:renderer/markup/utils/nodes"; import { encapsulate } from "unwritten:renderer/markup/utils/renderer"; import { getTranslator } from "unwritten:renderer/markup/utils/translations"; import { getRenderConfig } from "unwritten:renderer/utils/config"; -import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; import type { IntersectionType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/mapped.test.ts b/src/renderer/markup/ast-converter/types/mapped.test.ts index 2aadc83c..a9c32166 100644 --- a/src/renderer/markup/ast-converter/types/mapped.test.ts +++ b/src/renderer/markup/ast-converter/types/mapped.test.ts @@ -2,11 +2,11 @@ import { expect, it } from "vitest"; import { createTypeAliasEntity } from "unwritten:interpreter/ast/entities/index"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { renderNode } from "unwritten:renderer/markup/html/index"; import { convertMappedTypeInline, convertMappedTypeMultiline } from "unwritten:renderer:markup/ast-converter/types/index"; +import { renderNode } from "unwritten:renderer/markup/html/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/types/mapped.ts b/src/renderer/markup/ast-converter/types/mapped.ts index ebb839a5..b6c2f737 100644 --- a/src/renderer/markup/ast-converter/types/mapped.ts +++ b/src/renderer/markup/ast-converter/types/mapped.ts @@ -1,9 +1,9 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { convertType } from "unwritten:renderer/markup/ast-converter/shared/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode, createListNode, createMultilineNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { convertType } from "unwritten:renderer/markup/ast-converter/shared/type"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import { assert } from "unwritten:utils/general"; import type { MappedType } from "unwritten:interpreter:type-definitions/types"; diff --git a/src/renderer/markup/ast-converter/types/never.ts b/src/renderer/markup/ast-converter/types/never.ts index a45c535b..680302d1 100644 --- a/src/renderer/markup/ast-converter/types/never.ts +++ b/src/renderer/markup/ast-converter/types/never.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { NeverType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/null.ts b/src/renderer/markup/ast-converter/types/null.ts index 4cbab67d..28746704 100644 --- a/src/renderer/markup/ast-converter/types/null.ts +++ b/src/renderer/markup/ast-converter/types/null.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { NullType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/number-literal.ts b/src/renderer/markup/ast-converter/types/number-literal.ts index cc687b09..e1dcd0c4 100644 --- a/src/renderer/markup/ast-converter/types/number-literal.ts +++ b/src/renderer/markup/ast-converter/types/number-literal.ts @@ -1,5 +1,5 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { NumberLiteralType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/number.ts b/src/renderer/markup/ast-converter/types/number.ts index d710cf2d..7ea66244 100644 --- a/src/renderer/markup/ast-converter/types/number.ts +++ b/src/renderer/markup/ast-converter/types/number.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { NumberType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/object.test.ts b/src/renderer/markup/ast-converter/types/object.test.ts index 4bdd7efb..36c37041 100644 --- a/src/renderer/markup/ast-converter/types/object.test.ts +++ b/src/renderer/markup/ast-converter/types/object.test.ts @@ -2,11 +2,11 @@ import { expect, it } from "vitest"; import { createClassEntity, createTypeAliasEntity } from "unwritten:interpreter/ast/entities/index"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { renderNode } from "unwritten:renderer/index"; import { convertObjectTypeMultiline, convertTypeLiteralTypeMultiline } from "unwritten:renderer:markup/ast-converter/types/index"; +import { renderNode } from "unwritten:renderer/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/types/object.ts b/src/renderer/markup/ast-converter/types/object.ts index e8616024..037a3227 100644 --- a/src/renderer/markup/ast-converter/types/object.ts +++ b/src/renderer/markup/ast-converter/types/object.ts @@ -1,11 +1,4 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { - internalMemberFilter, - internalSignatureFilter, - privateMemberFilter, - privateSignatureFilter -} from "unwritten:renderer/markup/utils/filter"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertEventPropertyEntityForType, convertFunctionLikeEntityForType, @@ -15,6 +8,13 @@ import { import { createLinkNode, createListNode, createMultilineNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; import { getTranslator } from "unwritten:renderer:markup/utils/translations"; +import { + internalMemberFilter, + internalSignatureFilter, + privateMemberFilter, + privateSignatureFilter +} from "unwritten:renderer/markup/utils/filter"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { ObjectLikeTypes } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/string-literal.ts b/src/renderer/markup/ast-converter/types/string-literal.ts index debb0abe..91ae07c1 100644 --- a/src/renderer/markup/ast-converter/types/string-literal.ts +++ b/src/renderer/markup/ast-converter/types/string-literal.ts @@ -1,5 +1,5 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { StringLiteralType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/string.ts b/src/renderer/markup/ast-converter/types/string.ts index eae3888c..3222a46e 100644 --- a/src/renderer/markup/ast-converter/types/string.ts +++ b/src/renderer/markup/ast-converter/types/string.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { StringType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/symbol.ts b/src/renderer/markup/ast-converter/types/symbol.ts index 393c0938..8c36b72e 100644 --- a/src/renderer/markup/ast-converter/types/symbol.ts +++ b/src/renderer/markup/ast-converter/types/symbol.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { SymbolType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/type-parameter.test.ts b/src/renderer/markup/ast-converter/types/type-parameter.test.ts index d0b19cda..1c925c2d 100644 --- a/src/renderer/markup/ast-converter/types/type-parameter.test.ts +++ b/src/renderer/markup/ast-converter/types/type-parameter.test.ts @@ -2,8 +2,8 @@ import { expect, it } from "vitest"; import { createTypeAliasEntity } from "unwritten:interpreter/ast/entities/index"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { isAnchorNode, isConditionalNode } from "unwritten:renderer/markup/typeguards/renderer"; import { convertTypeReferenceTypeInline } from "unwritten:renderer:markup/ast-converter/types/index"; +import { isAnchorNode, isConditionalNode } from "unwritten:renderer/markup/typeguards/renderer"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/types/type-reference.ts b/src/renderer/markup/ast-converter/types/type-reference.ts index 296e4235..5b6b6b9d 100644 --- a/src/renderer/markup/ast-converter/types/type-reference.ts +++ b/src/renderer/markup/ast-converter/types/type-reference.ts @@ -1,11 +1,11 @@ +import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; +import { createConditionalNode } from "unwritten:renderer:markup/utils/nodes"; +import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; import { renderNode } from "unwritten:renderer/index"; import { convertEntityToAnchor } from "unwritten:renderer/markup/ast-converter/index"; import { getAnchorLink } from "unwritten:renderer/markup/registry/registry"; import { getRenderConfig } from "unwritten:renderer/utils/config"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; -import { createConditionalNode } from "unwritten:renderer:markup/utils/nodes"; -import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; import { isFunctionLikeEntity, isLinkableEntity, isSignatureEntity } from "unwritten:typeguards/entities"; import type { TypeReferenceType } from "unwritten:interpreter:type-definitions/types"; diff --git a/src/renderer/markup/ast-converter/types/undefined.ts b/src/renderer/markup/ast-converter/types/undefined.ts index 14b1d797..26966e90 100644 --- a/src/renderer/markup/ast-converter/types/undefined.ts +++ b/src/renderer/markup/ast-converter/types/undefined.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { UndefinedType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/union.ts b/src/renderer/markup/ast-converter/types/union.ts index 27feed1e..a7d701a7 100644 --- a/src/renderer/markup/ast-converter/types/union.ts +++ b/src/renderer/markup/ast-converter/types/union.ts @@ -1,18 +1,18 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; +import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; import { createLinkNode, createListNode, createMultilineNode } from "unwritten:renderer/markup/utils/nodes"; import { encapsulate } from "unwritten:renderer/markup/utils/renderer"; import { getTranslator } from "unwritten:renderer/markup/utils/translations"; import { isMultilineUnionType } from "unwritten:renderer/markup/utils/types"; import { getRenderConfig } from "unwritten:renderer/utils/config"; -import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; import type { UnionType } from "unwritten:interpreter:type-definitions/types"; -import type { ASTNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConvertedUnionTypeInline, ConvertedUnionTypeMultiline } from "unwritten:renderer:markup/types-definitions/renderer"; +import type { ASTNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function convertUnionTypeInline(ctx: MarkupRenderContext, unionType: UnionType): ConvertedUnionTypeInline { diff --git a/src/renderer/markup/ast-converter/types/unknown.ts b/src/renderer/markup/ast-converter/types/unknown.ts index 9ad9646e..04802605 100644 --- a/src/renderer/markup/ast-converter/types/unknown.ts +++ b/src/renderer/markup/ast-converter/types/unknown.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { UnknownType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/unresolved.test.ts b/src/renderer/markup/ast-converter/types/unresolved.test.ts index 86f3a69e..691a3eda 100644 --- a/src/renderer/markup/ast-converter/types/unresolved.test.ts +++ b/src/renderer/markup/ast-converter/types/unresolved.test.ts @@ -2,9 +2,9 @@ import { expect, it } from "vitest"; import { createTypeAliasEntity } from "unwritten:interpreter/ast/entities/index"; import { TypeKind } from "unwritten:interpreter/enums/type"; +import { convertTypeReferenceTypeInline } from "unwritten:renderer:markup/ast-converter/types/index"; import { renderNode } from "unwritten:renderer/index"; import { isLinkNode } from "unwritten:renderer/markup/typeguards/renderer"; -import { convertTypeReferenceTypeInline } from "unwritten:renderer:markup/ast-converter/types/index"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/ast-converter/types/unresolved.ts b/src/renderer/markup/ast-converter/types/unresolved.ts index 0a9ab8a2..800584d1 100644 --- a/src/renderer/markup/ast-converter/types/unresolved.ts +++ b/src/renderer/markup/ast-converter/types/unresolved.ts @@ -1,7 +1,7 @@ -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { convertType } from "unwritten:renderer:markup/ast-converter/shared/type"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate, spaceBetween } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { Type, UnresolvedType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/ast-converter/types/void.ts b/src/renderer/markup/ast-converter/types/void.ts index c2ce7483..f8a8c176 100644 --- a/src/renderer/markup/ast-converter/types/void.ts +++ b/src/renderer/markup/ast-converter/types/void.ts @@ -1,7 +1,7 @@ import { TypeKind } from "unwritten:interpreter/enums/type"; -import { getRenderConfig } from "unwritten:renderer/utils/config"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; import { encapsulate } from "unwritten:renderer:markup/utils/renderer"; +import { getRenderConfig } from "unwritten:renderer/utils/config"; import type { VoidType } from "unwritten:interpreter:type-definitions/types"; import type { MarkupRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; diff --git a/src/renderer/markup/config/config.test.ts b/src/renderer/markup/config/config.test.ts index 5f67f7e5..d3b39cb5 100644 --- a/src/renderer/markup/config/config.test.ts +++ b/src/renderer/markup/config/config.test.ts @@ -2,13 +2,13 @@ import { describe, expect, it } from "vitest"; import { createClassEntity } from "unwritten:interpreter/ast/entities/index"; import { TypeKind } from "unwritten:interpreter/enums/type"; -import { isSectionNode, isTitleNode } from "unwritten:renderer/markup/typeguards/renderer.js"; import { convertClassEntityForDocumentation } from "unwritten:renderer:markup/ast-converter/entities/index"; import { convertStringLiteralTypeInline, convertStringTypeInline } from "unwritten:renderer:markup/ast-converter/types/index"; import { renderNode } from "unwritten:renderer:markup/html/index"; +import { isSectionNode, isTitleNode } from "unwritten:renderer/markup/typeguards/renderer.js"; import { compile } from "unwritten:tests:utils/compile"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/config/default.ts b/src/renderer/markup/config/default.ts index 13992ee2..b7da5c5e 100644 --- a/src/renderer/markup/config/default.ts +++ b/src/renderer/markup/config/default.ts @@ -100,13 +100,13 @@ const defaultRenderConfig: Complete = { static: "static", throws: "throws", trueType: "true type", + type_many: "types", + type_one: "type", typeAlias_many: "type aliases", typeAlias_one: "type alias", typeLiteral: "type literal", typeParameter_many: "type parameters", typeParameter_one: "type parameter", - type_many: "types", - type_one: "type", union: "union", valueType: "value type", variable_many: "variables", diff --git a/src/renderer/markup/html/ast/anchor.test.ts b/src/renderer/markup/html/ast/anchor.test.ts index 3dfe1843..ce211102 100644 --- a/src/renderer/markup/html/ast/anchor.test.ts +++ b/src/renderer/markup/html/ast/anchor.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; import { createAnchorNode } from "unwritten:renderer:markup/utils/nodes"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { html } from "unwritten:utils/template"; diff --git a/src/renderer/markup/html/ast/conditional.test.ts b/src/renderer/markup/html/ast/conditional.test.ts index 72670fba..38163826 100644 --- a/src/renderer/markup/html/ast/conditional.test.ts +++ b/src/renderer/markup/html/ast/conditional.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { renderNode } from "unwritten:renderer/index"; import { createConditionalNode } from "unwritten:renderer:markup/utils/nodes"; +import { renderNode } from "unwritten:renderer/index"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/html/ast/conditional.ts b/src/renderer/markup/html/ast/conditional.ts index ce3207e6..cd073f02 100644 --- a/src/renderer/markup/html/ast/conditional.ts +++ b/src/renderer/markup/html/ast/conditional.ts @@ -1,5 +1,5 @@ -import { evaluateCondition } from "unwritten:renderer/markup/utils/condition"; import { renderNode } from "unwritten:renderer:html:index"; +import { evaluateCondition } from "unwritten:renderer/markup/utils/condition"; import type { HTMLRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConditionalNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/html/ast/inline-title.test.ts b/src/renderer/markup/html/ast/inline-title.test.ts index f3eb78e0..afaef54b 100644 --- a/src/renderer/markup/html/ast/inline-title.test.ts +++ b/src/renderer/markup/html/ast/inline-title.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { createRenderContext } from "unwritten:tests:utils/context"; import { attachTestRegistry } from "unwritten:tests:utils/registry"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/html/ast/list.ts b/src/renderer/markup/html/ast/list.ts index 43f938a5..15450823 100644 --- a/src/renderer/markup/html/ast/list.ts +++ b/src/renderer/markup/html/ast/list.ts @@ -1,5 +1,3 @@ -import { withIndentation } from "unwritten:renderer/markup/utils/context"; -import { renderNewLine } from "unwritten:renderer/utils/new-line"; import { isInlineTitleNode, isListNode, @@ -8,6 +6,8 @@ import { isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; import { renderWithIndentation } from "unwritten:renderer:utils/indentation"; +import { withIndentation } from "unwritten:renderer/markup/utils/context"; +import { renderNewLine } from "unwritten:renderer/utils/new-line"; import { renderNode } from "../index"; diff --git a/src/renderer/markup/html/ast/multiline.test.ts b/src/renderer/markup/html/ast/multiline.test.ts index 9ae0a9fc..6b5b5fbc 100644 --- a/src/renderer/markup/html/ast/multiline.test.ts +++ b/src/renderer/markup/html/ast/multiline.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createMultilineNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/html/ast/multiline.ts b/src/renderer/markup/html/ast/multiline.ts index 70594259..84e5e3a1 100644 --- a/src/renderer/markup/html/ast/multiline.ts +++ b/src/renderer/markup/html/ast/multiline.ts @@ -1,6 +1,6 @@ +import { renderNode } from "unwritten:renderer:html:index"; import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { renderNode } from "unwritten:renderer:html:index"; import type { HTMLRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { MultilineNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/html/ast/padded.test.ts b/src/renderer/markup/html/ast/padded.test.ts index 65602836..da16e1bf 100644 --- a/src/renderer/markup/html/ast/padded.test.ts +++ b/src/renderer/markup/html/ast/padded.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createPaddedNode } from "unwritten:renderer:markup/utils/nodes"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { renderPaddedNode } from "unwritten:renderer/markup/markdown/ast/padded"; -import { createPaddedNode } from "unwritten:renderer:markup/utils/nodes"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/html/ast/padded.ts b/src/renderer/markup/html/ast/padded.ts index ef3493bd..898aba80 100644 --- a/src/renderer/markup/html/ast/padded.ts +++ b/src/renderer/markup/html/ast/padded.ts @@ -1,7 +1,7 @@ import { renderNode } from "unwritten:renderer/markup/html/index"; -import type { PaddedNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { HTMLRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; +import type { PaddedNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function renderPaddedNode(ctx: HTMLRenderContext, paddedNode: PaddedNode): string { diff --git a/src/renderer/markup/html/ast/paragraph.ts b/src/renderer/markup/html/ast/paragraph.ts index 5e295cab..894c7741 100644 --- a/src/renderer/markup/html/ast/paragraph.ts +++ b/src/renderer/markup/html/ast/paragraph.ts @@ -1,5 +1,5 @@ -import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; import { renderNode } from "unwritten:renderer:html:index"; +import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; import type { HTMLRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ParagraphNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/html/ast/section.ts b/src/renderer/markup/html/ast/section.ts index e20ba1a7..b259aa65 100644 --- a/src/renderer/markup/html/ast/section.ts +++ b/src/renderer/markup/html/ast/section.ts @@ -1,8 +1,8 @@ +import { renderNode } from "unwritten:renderer:html:index"; import { withIndentation } from "unwritten:renderer/markup/utils/context"; import { getRenderConfig } from "unwritten:renderer/utils/config"; import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { renderNode } from "unwritten:renderer:html:index"; import type { HTMLRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { SectionNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/html/ast/span.test.ts b/src/renderer/markup/html/ast/span.test.ts index bb8e6125..a887d68b 100644 --- a/src/renderer/markup/html/ast/span.test.ts +++ b/src/renderer/markup/html/ast/span.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; import { createSpanNode } from "unwritten:renderer:markup/utils/nodes"; +import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { html } from "unwritten:utils/template"; diff --git a/src/renderer/markup/html/ast/span.ts b/src/renderer/markup/html/ast/span.ts index d756a873..6a472774 100644 --- a/src/renderer/markup/html/ast/span.ts +++ b/src/renderer/markup/html/ast/span.ts @@ -1,5 +1,5 @@ -import { getAnchorId, hasAnchor } from "unwritten:renderer/markup/registry/registry"; import { renderNode } from "unwritten:renderer:html:index"; +import { getAnchorId, hasAnchor } from "unwritten:renderer/markup/registry/registry"; import type { HTMLRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { SpanNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/html/ast/title.test.ts b/src/renderer/markup/html/ast/title.test.ts index e42d04fc..5348b129 100644 --- a/src/renderer/markup/html/ast/title.test.ts +++ b/src/renderer/markup/html/ast/title.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; +import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; import { createRenderContext } from "unwritten:tests:utils/context"; import { attachTestRegistry } from "unwritten:tests:utils/registry"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/html/ast/title.ts b/src/renderer/markup/html/ast/title.ts index 977961ae..998eb5b0 100644 --- a/src/renderer/markup/html/ast/title.ts +++ b/src/renderer/markup/html/ast/title.ts @@ -1,8 +1,8 @@ +import { renderNode } from "unwritten:renderer:html:index"; import { getAnchorId, hasAnchor, unregisterAnchor } from "unwritten:renderer/markup/registry/registry"; import { withNesting } from "unwritten:renderer/markup/utils/context"; import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { renderNode } from "unwritten:renderer:html:index"; import type { HTMLRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { TitleNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/html/index.ts b/src/renderer/markup/html/index.ts index 989c86b0..b7000551 100644 --- a/src/renderer/markup/html/index.ts +++ b/src/renderer/markup/html/index.ts @@ -1,19 +1,3 @@ -/* eslint-disable arrow-body-style */ -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; -import { renderConditionalNode } from "unwritten:renderer/markup/html/ast/conditional"; -import { renderInlineTitleNode } from "unwritten:renderer/markup/html/ast/inline-title"; -import { renderMultilineNode } from "unwritten:renderer/markup/html/ast/multiline"; -import { renderPaddedNode } from "unwritten:renderer/markup/html/ast/padded"; -import { - createCurrentSourceFile, - registerAnonymousAnchor, - setCurrentSourceFile -} from "unwritten:renderer/markup/registry/registry"; -import { getDestinationFilePath } from "unwritten:renderer/markup/utils/file"; -import { createSectionNode, createTitleNode } from "unwritten:renderer/markup/utils/nodes"; -import { capitalize } from "unwritten:renderer/markup/utils/translations"; -import { getRenderConfig } from "unwritten:renderer/utils/config.js"; -import { renderNewLine } from "unwritten:renderer/utils/new-line"; import { renderAnchorNode } from "unwritten:renderer:html:ast/anchor"; import { renderBoldNode } from "unwritten:renderer:html:ast/bold"; import { renderItalicNode } from "unwritten:renderer:html:ast/italic"; @@ -43,13 +27,28 @@ import { isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; import { minMax } from "unwritten:renderer:markup/utils/renderer"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; +import { renderConditionalNode } from "unwritten:renderer/markup/html/ast/conditional"; +import { renderInlineTitleNode } from "unwritten:renderer/markup/html/ast/inline-title"; +import { renderMultilineNode } from "unwritten:renderer/markup/html/ast/multiline"; +import { renderPaddedNode } from "unwritten:renderer/markup/html/ast/padded"; +import { + createCurrentSourceFile, + registerAnonymousAnchor, + setCurrentSourceFile +} from "unwritten:renderer/markup/registry/registry"; +import { getDestinationFilePath } from "unwritten:renderer/markup/utils/file"; +import { createSectionNode, createTitleNode } from "unwritten:renderer/markup/utils/nodes"; +import { capitalize } from "unwritten:renderer/markup/utils/translations"; +import { getRenderConfig } from "unwritten:renderer/utils/config.js"; +import { renderNewLine } from "unwritten:renderer/utils/new-line"; import { renderTitleNode } from "./ast/title"; import type { SourceFileEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorTarget } from "unwritten:renderer/markup/registry/registry"; import type { HTMLRenderContext, HTMLRenderer } from "unwritten:renderer:markup/types-definitions/markup"; import type { ASTNode } from "unwritten:renderer:markup/types-definitions/nodes"; +import type { AnchorTarget } from "unwritten:renderer/markup/registry/registry"; import type { RenderContext } from "unwritten:type-definitions/context"; import type { RenderOutput } from "unwritten:type-definitions/renderer"; @@ -75,7 +74,6 @@ const htmlRenderer: HTMLRenderer = { fileExtension: ".html", name: BuiltInRenderers.HTML, - // eslint-disable-next-line eslint-plugin-sort-keys/sort-keys-fix initializeContext: (ctx: HTMLRenderContext) => { ctx.links = []; diff --git a/src/renderer/markup/markdown/ast/anchor.test.ts b/src/renderer/markup/markdown/ast/anchor.test.ts index 27c04888..a5520df4 100644 --- a/src/renderer/markup/markdown/ast/anchor.test.ts +++ b/src/renderer/markup/markdown/ast/anchor.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createAnchorNode } from "unwritten:renderer:markup/utils/nodes"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { createAnchorNode } from "unwritten:renderer:markup/utils/nodes"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/anchor.ts b/src/renderer/markup/markdown/ast/anchor.ts index cdfd2982..19eabc1e 100644 --- a/src/renderer/markup/markdown/ast/anchor.ts +++ b/src/renderer/markup/markdown/ast/anchor.ts @@ -1,6 +1,6 @@ +import { renderLinkNode } from "unwritten:renderer:markdown:ast/link"; import { getAnchorLink } from "unwritten:renderer/markup/registry/registry"; import { createLinkNode } from "unwritten:renderer/markup/utils/nodes"; -import { renderLinkNode } from "unwritten:renderer:markdown:ast/link"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { AnchorNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/markdown/ast/bold.test.ts b/src/renderer/markup/markdown/ast/bold.test.ts index 1a1d60e2..b23c8724 100644 --- a/src/renderer/markup/markdown/ast/bold.test.ts +++ b/src/renderer/markup/markdown/ast/bold.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createBoldNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/conditional.test.ts b/src/renderer/markup/markdown/ast/conditional.test.ts index 72670fba..38163826 100644 --- a/src/renderer/markup/markdown/ast/conditional.test.ts +++ b/src/renderer/markup/markdown/ast/conditional.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { renderNode } from "unwritten:renderer/index"; import { createConditionalNode } from "unwritten:renderer:markup/utils/nodes"; +import { renderNode } from "unwritten:renderer/index"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/markdown/ast/conditional.ts b/src/renderer/markup/markdown/ast/conditional.ts index ff244dc0..24c23c8b 100644 --- a/src/renderer/markup/markdown/ast/conditional.ts +++ b/src/renderer/markup/markdown/ast/conditional.ts @@ -1,5 +1,5 @@ -import { evaluateCondition } from "unwritten:renderer/markup/utils/condition"; import { renderNode } from "unwritten:renderer:markdown:index"; +import { evaluateCondition } from "unwritten:renderer/markup/utils/condition"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ConditionalNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/markdown/ast/inline-title.test.ts b/src/renderer/markup/markdown/ast/inline-title.test.ts index 927e6180..ff1f9271 100644 --- a/src/renderer/markup/markdown/ast/inline-title.test.ts +++ b/src/renderer/markup/markdown/ast/inline-title.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createInlineTitleNode, createParagraphNode } from "unwritten:renderer:markup/utils/nodes"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; -import { createInlineTitleNode, createParagraphNode } from "unwritten:renderer:markup/utils/nodes"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/inline-title.ts b/src/renderer/markup/markdown/ast/inline-title.ts index 2a5c5523..7500a9db 100644 --- a/src/renderer/markup/markdown/ast/inline-title.ts +++ b/src/renderer/markup/markdown/ast/inline-title.ts @@ -1,10 +1,10 @@ +import { renderEmptyLine, startsWithEmptyLine } from "unwritten:renderer:markdown:utils/empty-line"; import { renderMultilineArray } from "unwritten:renderer/markup/markdown/ast/multiline"; import { renderNode } from "unwritten:renderer/markup/markdown/index"; import { encapsulate } from "unwritten:renderer/markup/utils/renderer"; import { getRenderConfig } from "unwritten:renderer/utils/config"; import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { renderEmptyLine, startsWithEmptyLine } from "unwritten:renderer:markdown:utils/empty-line"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { InlineTitleNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/markdown/ast/italic.test.ts b/src/renderer/markup/markdown/ast/italic.test.ts index 82f922da..7f05ee85 100644 --- a/src/renderer/markup/markdown/ast/italic.test.ts +++ b/src/renderer/markup/markdown/ast/italic.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createItalicNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/link.test.ts b/src/renderer/markup/markdown/ast/link.test.ts index e0f6f577..38a1917f 100644 --- a/src/renderer/markup/markdown/ast/link.test.ts +++ b/src/renderer/markup/markdown/ast/link.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createLinkNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/list.test.ts b/src/renderer/markup/markdown/ast/list.test.ts index 5e751675..65ac3fc3 100644 --- a/src/renderer/markup/markdown/ast/list.test.ts +++ b/src/renderer/markup/markdown/ast/list.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createListNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/list.ts b/src/renderer/markup/markdown/ast/list.ts index 03b88aeb..9fb4fa1a 100644 --- a/src/renderer/markup/markdown/ast/list.ts +++ b/src/renderer/markup/markdown/ast/list.ts @@ -1,11 +1,11 @@ -import { renderEmptyLine } from "unwritten:renderer/markup/markdown/utils/empty-line"; -import { withIndentation } from "unwritten:renderer/markup/utils/context"; -import { renderNewLine } from "unwritten:renderer/utils/new-line"; import { isListNode } from "unwritten:renderer:markup/typeguards/renderer"; import { renderIndentation, renderWithIndentation as renderWithIndentationOriginal } from "unwritten:renderer:utils/indentation"; +import { renderEmptyLine } from "unwritten:renderer/markup/markdown/utils/empty-line"; +import { withIndentation } from "unwritten:renderer/markup/utils/context"; +import { renderNewLine } from "unwritten:renderer/utils/new-line"; import { renderNode } from "../index"; diff --git a/src/renderer/markup/markdown/ast/multiline.test.ts b/src/renderer/markup/markdown/ast/multiline.test.ts index aad4ded6..5744e3ae 100644 --- a/src/renderer/markup/markdown/ast/multiline.test.ts +++ b/src/renderer/markup/markdown/ast/multiline.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createMultilineNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/multiline.ts b/src/renderer/markup/markdown/ast/multiline.ts index 608e4c63..e4c6b61b 100644 --- a/src/renderer/markup/markdown/ast/multiline.ts +++ b/src/renderer/markup/markdown/ast/multiline.ts @@ -1,7 +1,7 @@ +import { renderNode } from "unwritten:renderer:markdown:index"; import { renderEmptyLine, startsWithEmptyLine } from "unwritten:renderer/markup/markdown/utils/empty-line"; import { renderWithIndentation } from "unwritten:renderer/utils/indentation.js"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { renderNode } from "unwritten:renderer:markdown:index"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ASTNode, MultilineNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/markdown/ast/padded.test.ts b/src/renderer/markup/markdown/ast/padded.test.ts index 65602836..da16e1bf 100644 --- a/src/renderer/markup/markdown/ast/padded.test.ts +++ b/src/renderer/markup/markdown/ast/padded.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createPaddedNode } from "unwritten:renderer:markup/utils/nodes"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { renderPaddedNode } from "unwritten:renderer/markup/markdown/ast/padded"; -import { createPaddedNode } from "unwritten:renderer:markup/utils/nodes"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/padded.ts b/src/renderer/markup/markdown/ast/padded.ts index 0b785b4b..b3126c8f 100644 --- a/src/renderer/markup/markdown/ast/padded.ts +++ b/src/renderer/markup/markdown/ast/padded.ts @@ -1,9 +1,9 @@ +import { renderEmptyLine } from "unwritten:renderer:markdown:utils/empty-line"; import { renderNode } from "unwritten:renderer/markup/markdown/index"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { renderEmptyLine } from "unwritten:renderer:markdown:utils/empty-line"; -import type { PaddedNode } from "unwritten:renderer/markup/types-definitions/nodes"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; +import type { PaddedNode } from "unwritten:renderer/markup/types-definitions/nodes"; export function renderPaddedNode(ctx: MarkdownRenderContext, paddedNode: PaddedNode): string { diff --git a/src/renderer/markup/markdown/ast/paragraph.test.ts b/src/renderer/markup/markdown/ast/paragraph.test.ts index cbb28c20..6be40d6d 100644 --- a/src/renderer/markup/markdown/ast/paragraph.test.ts +++ b/src/renderer/markup/markdown/ast/paragraph.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createParagraphNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/paragraph.ts b/src/renderer/markup/markdown/ast/paragraph.ts index 87df1ce8..71b6e0f2 100644 --- a/src/renderer/markup/markdown/ast/paragraph.ts +++ b/src/renderer/markup/markdown/ast/paragraph.ts @@ -1,5 +1,5 @@ -import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; import { renderNode } from "unwritten:renderer:markdown:index"; +import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { ParagraphNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/markdown/ast/section.test.ts b/src/renderer/markup/markdown/ast/section.test.ts index c36965cd..de242ee2 100644 --- a/src/renderer/markup/markdown/ast/section.test.ts +++ b/src/renderer/markup/markdown/ast/section.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { registerAnchor } from "unwritten:renderer/markup/registry/registry.js"; -import { createSectionNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/section.ts b/src/renderer/markup/markdown/ast/section.ts index 50ed7dd7..94a2b1c5 100644 --- a/src/renderer/markup/markdown/ast/section.ts +++ b/src/renderer/markup/markdown/ast/section.ts @@ -1,9 +1,9 @@ +import { renderEmptyLine, startsWithEmptyLine } from "unwritten:renderer:markdown:utils/empty-line"; import { renderMultilineArray } from "unwritten:renderer/markup/markdown/ast/multiline"; import { renderTitle, renderTitleChildren, renderTitleNode } from "unwritten:renderer/markup/markdown/ast/title.js"; import { isSectionNode } from "unwritten:renderer/markup/typeguards/renderer.js"; import { getRenderConfig } from "unwritten:renderer/utils/config"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { renderEmptyLine, startsWithEmptyLine } from "unwritten:renderer:markdown:utils/empty-line"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { SectionNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/markdown/ast/small.test.ts b/src/renderer/markup/markdown/ast/small.test.ts index b8db9ab9..06834e85 100644 --- a/src/renderer/markup/markdown/ast/small.test.ts +++ b/src/renderer/markup/markdown/ast/small.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createSmallNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/span.test.ts b/src/renderer/markup/markdown/ast/span.test.ts index b981c993..e884f594 100644 --- a/src/renderer/markup/markdown/ast/span.test.ts +++ b/src/renderer/markup/markdown/ast/span.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createSpanNode } from "unwritten:renderer:markup/utils/nodes"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { registerAnchor } from "unwritten:renderer/markup/registry/registry"; -import { createSpanNode } from "unwritten:renderer:markup/utils/nodes"; import { createRenderContext } from "unwritten:tests:utils/context"; import { attachTestRegistry } from "unwritten:tests:utils/registry"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/renderer/markup/markdown/ast/span.ts b/src/renderer/markup/markdown/ast/span.ts index 3cab83db..9a2d1573 100644 --- a/src/renderer/markup/markdown/ast/span.ts +++ b/src/renderer/markup/markdown/ast/span.ts @@ -1,6 +1,6 @@ +import { renderNode } from "unwritten:renderer:markdown:index"; import { getAnchorId, hasAnchor } from "unwritten:renderer/markup/registry/registry"; import { getRenderConfig } from "unwritten:renderer/utils/config"; -import { renderNode } from "unwritten:renderer:markdown:index"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { SpanNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/markdown/ast/strikethrough.test.ts b/src/renderer/markup/markdown/ast/strikethrough.test.ts index c3baebcb..fcb99202 100644 --- a/src/renderer/markup/markdown/ast/strikethrough.test.ts +++ b/src/renderer/markup/markdown/ast/strikethrough.test.ts @@ -1,7 +1,7 @@ import { expect, it } from "vitest"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createStrikethroughNode } from "unwritten:renderer:markup/utils/nodes"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/title.test.ts b/src/renderer/markup/markdown/ast/title.test.ts index 2e662fe2..51a88528 100644 --- a/src/renderer/markup/markdown/ast/title.test.ts +++ b/src/renderer/markup/markdown/ast/title.test.ts @@ -1,8 +1,8 @@ import { expect, it } from "vitest"; +import { createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { registerAnchor, registerAnonymousAnchor } from "unwritten:renderer/markup/registry/registry"; -import { createParagraphNode, createTitleNode } from "unwritten:renderer:markup/utils/nodes"; import { createRenderContext } from "unwritten:tests:utils/context"; import { scope } from "unwritten:tests:utils/scope"; import { md } from "unwritten:utils/template"; diff --git a/src/renderer/markup/markdown/ast/title.ts b/src/renderer/markup/markdown/ast/title.ts index b82eda57..84d55bc9 100644 --- a/src/renderer/markup/markdown/ast/title.ts +++ b/src/renderer/markup/markdown/ast/title.ts @@ -1,9 +1,9 @@ +import { renderEmptyLine, startsWithEmptyLine } from "unwritten:renderer:markdown:utils/empty-line"; import { renderMultilineArray } from "unwritten:renderer/markup/markdown/ast/multiline"; import { renderNode } from "unwritten:renderer/markup/markdown/index"; import { hasAnchor, unregisterAnchor } from "unwritten:renderer/markup/registry/registry"; import { withNesting } from "unwritten:renderer/markup/utils/context"; import { renderNewLine } from "unwritten:renderer/utils/new-line"; -import { renderEmptyLine, startsWithEmptyLine } from "unwritten:renderer:markdown:utils/empty-line"; import type { MarkdownRenderContext } from "unwritten:renderer:markup/types-definitions/markup"; import type { TitleNode } from "unwritten:renderer:markup/types-definitions/nodes"; diff --git a/src/renderer/markup/markdown/index.ts b/src/renderer/markup/markdown/index.ts index 1678c55f..86c495e0 100644 --- a/src/renderer/markup/markdown/index.ts +++ b/src/renderer/markup/markdown/index.ts @@ -1,23 +1,3 @@ -/* eslint-disable arrow-body-style */ - -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; -import { renderConditionalNode } from "unwritten:renderer/markup/markdown/ast/conditional"; -import { renderInlineTitleNode } from "unwritten:renderer/markup/markdown/ast/inline-title"; -import { renderMultilineNode } from "unwritten:renderer/markup/markdown/ast/multiline"; -import { renderPaddedNode } from "unwritten:renderer/markup/markdown/ast/padded"; -import { renderEmptyLine } from "unwritten:renderer/markup/markdown/utils/empty-line"; -import { escapeMarkdown } from "unwritten:renderer/markup/markdown/utils/escape"; -import { - createCurrentSourceFile, - registerAnonymousAnchor, - setCurrentSourceFile -} from "unwritten:renderer/markup/registry/registry"; -import { getDestinationFilePath } from "unwritten:renderer/markup/utils/file"; -import { createSectionNode, createTitleNode } from "unwritten:renderer/markup/utils/nodes"; -import { capitalize } from "unwritten:renderer/markup/utils/translations"; -import { getRenderConfig } from "unwritten:renderer/utils/config.js"; -import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; -import { renderNewLine } from "unwritten:renderer/utils/new-line"; import { renderAnchorNode } from "unwritten:renderer:markdown:ast/anchor"; import { renderBoldNode } from "unwritten:renderer:markdown:ast/bold"; import { renderItalicNode } from "unwritten:renderer:markdown:ast/italic"; @@ -47,13 +27,31 @@ import { isTitleNode } from "unwritten:renderer:markup/typeguards/renderer"; import { minMax } from "unwritten:renderer:markup/utils/renderer"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; +import { renderConditionalNode } from "unwritten:renderer/markup/markdown/ast/conditional"; +import { renderInlineTitleNode } from "unwritten:renderer/markup/markdown/ast/inline-title"; +import { renderMultilineNode } from "unwritten:renderer/markup/markdown/ast/multiline"; +import { renderPaddedNode } from "unwritten:renderer/markup/markdown/ast/padded"; +import { renderEmptyLine } from "unwritten:renderer/markup/markdown/utils/empty-line"; +import { escapeMarkdown } from "unwritten:renderer/markup/markdown/utils/escape"; +import { + createCurrentSourceFile, + registerAnonymousAnchor, + setCurrentSourceFile +} from "unwritten:renderer/markup/registry/registry"; +import { getDestinationFilePath } from "unwritten:renderer/markup/utils/file"; +import { createSectionNode, createTitleNode } from "unwritten:renderer/markup/utils/nodes"; +import { capitalize } from "unwritten:renderer/markup/utils/translations"; +import { getRenderConfig } from "unwritten:renderer/utils/config.js"; +import { renderWithIndentation } from "unwritten:renderer/utils/indentation"; +import { renderNewLine } from "unwritten:renderer/utils/new-line"; import { renderTitleNode } from "./ast/title"; import type { SourceFileEntity } from "unwritten:interpreter:type-definitions/entities"; -import type { AnchorTarget } from "unwritten:renderer/markup/registry/registry"; import type { MarkdownRenderContext, MarkdownRenderer } from "unwritten:renderer:markup/types-definitions/markup"; import type { ASTNode } from "unwritten:renderer:markup/types-definitions/nodes"; +import type { AnchorTarget } from "unwritten:renderer/markup/registry/registry"; import type { RenderContext } from "unwritten:type-definitions/context"; import type { RenderOutput } from "unwritten:type-definitions/renderer"; @@ -79,8 +77,6 @@ const markdownRenderer: MarkdownRenderer = { fileExtension: ".md", name: BuiltInRenderers.Markdown, - - // eslint-disable-next-line eslint-plugin-sort-keys/sort-keys-fix initializeContext: (ctx: MarkdownRenderContext) => { ctx.links = []; diff --git a/src/renderer/markup/markdown/utils/escape.ts b/src/renderer/markup/markdown/utils/escape.ts index 3cb5d14c..b0e56f73 100644 --- a/src/renderer/markup/markdown/utils/escape.ts +++ b/src/renderer/markup/markdown/utils/escape.ts @@ -8,7 +8,7 @@ function escapeString(text: string): string { return escapedText; } -export function escapeCodeBlocks(text: string): string | false { +export function escapeCodeBlocks(text: string): false | string { const codeSpanRegex = /(.*?)(`)(.*?)(`)(.*?)/gms; const splittedCodeBlocks = Array.from(text.matchAll(codeSpanRegex)); @@ -19,7 +19,7 @@ export function escapeCodeBlocks(text: string): string | false { } -export function escapeCodeFences(text: string): string | false { +export function escapeCodeFences(text: string): false | string { const codeBlockRegex = /(.*?)(```\w*\s*\n)(.*?)(```\s*\n?)(.*?$)/gms; const splittedCodeFences = Array.from(text.matchAll(codeBlockRegex)); diff --git a/src/renderer/markup/registry/registry.ts b/src/renderer/markup/registry/registry.ts index 1ccf56ba..3e5af03a 100644 --- a/src/renderer/markup/registry/registry.ts +++ b/src/renderer/markup/registry/registry.ts @@ -1,11 +1,11 @@ import { assert } from "unwritten:utils/general"; -import type { MarkupRenderContext } from "../types-definitions/markup"; - import type { SourceFileEntity } from "unwritten:interpreter:type-definitions/entities"; import type { ID, Name } from "unwritten:interpreter:type-definitions/jsdoc"; import type { FilePath } from "unwritten:type-definitions/platform"; +import type { MarkupRenderContext } from "../types-definitions/markup"; + export const MAX_ANONYMOUS_ID = -10; export interface AnchorLink { @@ -159,7 +159,6 @@ export function isAnchor(input: any): input is AnchorTarget { export function createCurrentSourceFile(ctx: MarkupRenderContext, sourceFileEntity: SourceFileEntity, destination: FilePath): void { - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition const index = ctx.links.findIndex(sourceFile => sourceFile.id === sourceFileEntity.symbolId); const sourceFile: SourceFile = { @@ -181,7 +180,6 @@ export function createCurrentSourceFile(ctx: MarkupRenderContext, sourceFileEnti export function setCurrentSourceFile(ctx: MarkupRenderContext, sourceFileEntity: SourceFileEntity): void { - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition const index = ctx.links.findIndex(sourceFile => sourceFile.id === sourceFileEntity.symbolId); assert(index !== -1, `Source file ${sourceFileEntity.path} is not registered`); @@ -190,7 +188,7 @@ export function setCurrentSourceFile(ctx: MarkupRenderContext, sourceFileEntity: } -function findRegisteredAnchorData(ctx: MarkupRenderContext, id: ID | ID[]): { anchorId: AnchorID; index: number; sourceFile: SourceFile; } | undefined { +function findRegisteredAnchorData(ctx: MarkupRenderContext, id: ID | ID[]): undefined | { anchorId: AnchorID; index: number; sourceFile: SourceFile; } { const ids = Array.isArray(id) ? id : [id]; diff --git a/src/renderer/markup/types-definitions/config.ts b/src/renderer/markup/types-definitions/config.ts index 79f2f110..858b8ff6 100644 --- a/src/renderer/markup/types-definitions/config.ts +++ b/src/renderer/markup/types-definitions/config.ts @@ -7,19 +7,19 @@ export interface MarkupRenderConfig { indentation?: string; /** Defines how inline titles should be encapsulated in the rendered output. */ - inlineTitleEncapsulation?: Encapsulation | false; + inlineTitleEncapsulation?: false | Encapsulation; /** Newline character. */ newLine?: "\n" | "\r\n" | "os"; /** Defines how parameters should be encapsulated in the rendered output. */ - parameterEncapsulation?: Encapsulation | false; + parameterEncapsulation?: false | Encapsulation; /** Defines how properties should be encapsulated in the rendered output. */ - propertyEncapsulation?: Encapsulation | false; + propertyEncapsulation?: false | Encapsulation; /** Defines whether the renderer should render titles for object members. */ - renderClassMemberTitles?: boolean | "documentation" | "tableOfContents"; + renderClassMemberTitles?: "documentation" | "tableOfContents" | boolean; /** Defines whether the renderer should render an additional optional tag for default values. */ renderDefaultValuesAsOptional?: boolean; @@ -30,7 +30,10 @@ export interface MarkupRenderConfig { * @example * Class: MyClass instead of just MyClass */ - renderEntityPrefixes?: boolean | "documentation" | "tableOfContents"; + renderEntityPrefixes?: "documentation" | "tableOfContents" | boolean; + + /** Defines whether entities marked with an `@internal` tag should appear in the rendered output. */ + renderInternalEntities?: boolean; /** Defines the order in which entities should be rendered. */ renderOrder?: ExportableEntityKinds[]; @@ -41,14 +44,11 @@ export interface MarkupRenderConfig { * @example * Class.method() instead of method() */ - renderParentNames?: boolean | "documentation" | "tableOfContents"; + renderParentNames?: "documentation" | "tableOfContents" | boolean; /** Defines whether the renderer should render private members. */ renderPrivateMembers?: boolean; - /** Defines whether entities marked with an `@internal` tag should appear in the rendered output. */ - renderInternalEntities?: boolean; - /** Defines whether the renderer should render links to the source code. */ renderSourceCodeLinks?: boolean; @@ -56,10 +56,10 @@ export interface MarkupRenderConfig { renderTableOfContents?: boolean; /** Defines how string literal type annotations should be encapsulated in the rendered output. */ - stringLiteralEncapsulation?: Encapsulation | false; + stringLiteralEncapsulation?: false | Encapsulation; /** Defines how tags like `@beta` or `@deprecated` should be encapsulated in the rendered output. */ - tagEncapsulation?: Encapsulation | false; + tagEncapsulation?: false | Encapsulation; /** Translations for otherwise hardcoded labels. */ translations?: { @@ -140,18 +140,18 @@ export interface MarkupRenderConfig { }; /** Defines how type annotations should be encapsulated in the rendered output. */ - typeEncapsulation?: Encapsulation | false; + typeEncapsulation?: false | Encapsulation; /** Defines how type parameters should be encapsulated in the rendered output.*/ - typeParameterEncapsulation?: Encapsulation | false; + typeParameterEncapsulation?: false | Encapsulation; } export interface MarkdownRenderConfig extends MarkupRenderConfig { /** Defines which HTML tags are allowed in the rendered output. Will be used in the future to render anchor nodes. */ - allowedHTMLTags?: string[] | false; + allowedHTMLTags?: false | string[]; /** Defines the string that should be used to separate sections in the rendered output. */ - sectionSeparator?: string | false; + sectionSeparator?: false | string; } export interface HTMLRenderConfig extends MarkupRenderConfig { diff --git a/src/renderer/markup/types-definitions/markup.ts b/src/renderer/markup/types-definitions/markup.ts index 2c50bbd1..5daa807f 100644 --- a/src/renderer/markup/types-definitions/markup.ts +++ b/src/renderer/markup/types-definitions/markup.ts @@ -7,18 +7,18 @@ import type { Renderer } from "unwritten:type-definitions/renderer"; // Markup interface BaseMarkupRenderer extends Renderer { fileExtension: ".html" | ".md"; - initializeContext(ctx: MarkupRenderContext): void; + initializeContext: (ctx: MarkupRenderContext) => void; name: BuiltInRenderers.HTML | BuiltInRenderers.Markdown; } interface BaseMarkupRenderContext { currentFile: SourceFile; - set indentation(value: number); get indentation(): number; + get nesting(): number; links: LinkRegistry; memberContext: string[]; + set indentation(value: number); set nesting(value: number); - get nesting(): number; _indentation?: number; _nesting?: number; } diff --git a/src/renderer/markup/types-definitions/nodes.ts b/src/renderer/markup/types-definitions/nodes.ts index f545b04f..f200b5a3 100644 --- a/src/renderer/markup/types-definitions/nodes.ts +++ b/src/renderer/markup/types-definitions/nodes.ts @@ -1,7 +1,7 @@ -import type { ASTNodeKinds } from "../enums/nodes"; - -import type { AnchorLink, AnchorTarget } from "unwritten:renderer/markup/registry/registry"; import type { SectionType } from "unwritten:renderer:markup/types-definitions/sections"; +import type { AnchorLink, AnchorTarget } from "unwritten:renderer/markup/registry/registry"; + +import type { ASTNodeKinds } from "../enums/nodes"; export type Empty = false | null | undefined; diff --git a/src/renderer/markup/types-definitions/renderer.ts b/src/renderer/markup/types-definitions/renderer.ts index 3c6ca3f6..520b54c8 100644 --- a/src/renderer/markup/types-definitions/renderer.ts +++ b/src/renderer/markup/types-definitions/renderer.ts @@ -1,7 +1,6 @@ -import type { RenderCategories } from "../enums/renderer"; - import type { Alpha, Beta, Deprecated, Example, Internal } from "unwritten:interpreter:type-definitions/jsdoc"; +import type { RenderCategories } from "../enums/renderer"; import type { AnchorNode, ASTNode, diff --git a/src/renderer/markup/types-definitions/sections.ts b/src/renderer/markup/types-definitions/sections.ts index 2ef7eb86..ab79abf7 100644 --- a/src/renderer/markup/types-definitions/sections.ts +++ b/src/renderer/markup/types-definitions/sections.ts @@ -2,26 +2,26 @@ import { EntityKind } from "unwritten:interpreter/enums/entity"; const ENTITY_SECTIONS = { - [EntityKind.FunctionSignature]: "signature", - [EntityKind.MethodSignature]: "signature", - [EntityKind.SetterSignature]: "signature", - [EntityKind.GetterSignature]: "signature", [EntityKind.CallSignature]: "signature", - [EntityKind.ConstructSignature]: "signature", - [EntityKind.Namespace]: "namespace", - [EntityKind.Module]: "module", [EntityKind.Class]: "class", - [EntityKind.Property]: "property", + [EntityKind.Constructor]: "constructor", + [EntityKind.ConstructSignature]: "signature", [EntityKind.Enum]: "enum", [EntityKind.ExportAssignment]: "export-assignment", - [EntityKind.Constructor]: "constructor", - [EntityKind.Variable]: "variable", - [EntityKind.TypeAlias]: "type", - [EntityKind.Interface]: "interface", [EntityKind.Function]: "function", + [EntityKind.FunctionSignature]: "signature", [EntityKind.Getter]: "getter", + [EntityKind.GetterSignature]: "signature", + [EntityKind.Interface]: "interface", + [EntityKind.Method]: "method", + [EntityKind.MethodSignature]: "signature", + [EntityKind.Module]: "module", + [EntityKind.Namespace]: "namespace", + [EntityKind.Property]: "property", [EntityKind.Setter]: "setter", - [EntityKind.Method]: "method" + [EntityKind.SetterSignature]: "signature", + [EntityKind.TypeAlias]: "type", + [EntityKind.Variable]: "variable" } as const; diff --git a/src/renderer/markup/utils/file.ts b/src/renderer/markup/utils/file.ts index 5080adb9..2689ffcb 100644 --- a/src/renderer/markup/utils/file.ts +++ b/src/renderer/markup/utils/file.ts @@ -15,7 +15,6 @@ export function getAvailableFileName(ctx: RenderContext, usedFilePaths: FilePath const fileExtension = getFileExtension(filePath); const fileNameWithoutExtension = getFileName(filePath).replace(fileExtension, ""); - // eslint-disable-next-line no-control-regex const invalidCharsRegex = /[\s\x00-\x1F"*/:<>?\\|]/g; const validFileNameWithoutExtension = fileNameWithoutExtension.replace(invalidCharsRegex, "-") diff --git a/src/renderer/markup/utils/nodes.ts b/src/renderer/markup/utils/nodes.ts index 2b792626..90f4a948 100644 --- a/src/renderer/markup/utils/nodes.ts +++ b/src/renderer/markup/utils/nodes.ts @@ -3,6 +3,10 @@ import { isTitleNode } from "unwritten:renderer/markup/typeguards/renderer.js"; import { ASTNodeKinds } from "../enums/nodes"; +import type { ID, Name } from "unwritten:interpreter:type-definitions/jsdoc"; +import type { SectionType } from "unwritten:renderer:markup/types-definitions/sections"; +import type { AnchorTarget } from "unwritten:renderer/markup/registry/registry"; + import type { AnchorNode, ASTNode, @@ -23,10 +27,6 @@ import type { TitleNode } from "../types-definitions/nodes"; -import type { ID, Name } from "unwritten:interpreter:type-definitions/jsdoc"; -import type { AnchorTarget } from "unwritten:renderer/markup/registry/registry"; -import type { SectionType } from "unwritten:renderer:markup/types-definitions/sections"; - export function createAnchorNode(name: Name, id: ID, displayName = name): AnchorNode { return { diff --git a/src/renderer/markup/utils/renderer.ts b/src/renderer/markup/utils/renderer.ts index 20d5e85e..3e86355c 100644 --- a/src/renderer/markup/utils/renderer.ts +++ b/src/renderer/markup/utils/renderer.ts @@ -3,12 +3,12 @@ import { getTranslator } from "unwritten:renderer/markup/utils/translations.js"; import { getRenderConfig } from "unwritten:renderer/utils/config.js"; import type { ExportableEntity, ExportableEntityKinds } from "unwritten:interpreter:type-definitions/entities"; -import type { MarkupRenderContext } from "unwritten:renderer/markup/types-definitions/markup.js"; import type { Encapsulation } from "unwritten:renderer:markup/types-definitions/config"; import type { ASTNode } from "unwritten:renderer:markup/types-definitions/nodes"; +import type { MarkupRenderContext } from "unwritten:renderer/markup/types-definitions/markup.js"; -export function encapsulate(node: ASTNode, encapsulation: Encapsulation | string[] | false | undefined) { +export function encapsulate(node: ASTNode, encapsulation: false | Encapsulation | string[] | undefined) { if(encapsulation === undefined || encapsulation === false){ return node; diff --git a/src/renderer/markup/utils/translations.ts b/src/renderer/markup/utils/translations.ts index c7006382..6c502360 100644 --- a/src/renderer/markup/utils/translations.ts +++ b/src/renderer/markup/utils/translations.ts @@ -45,7 +45,6 @@ function translate(ctx: MarkupRenderContext, key: TranslationKeys, options?: Tra translationKey = getTranslationKey(key); } - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition -- Purposefully returning the key const translation = translations[translationKey] ?? key; if(options?.capitalize){ diff --git a/src/renderer/utils/config.ts b/src/renderer/utils/config.ts index 60324846..510209ed 100644 --- a/src/renderer/utils/config.ts +++ b/src/renderer/utils/config.ts @@ -1,3 +1,9 @@ +import type { JSONRenderConfig } from "unwritten:renderer:json:type-definitions/config"; +import type { JSONRenderContext } from "unwritten:renderer:json:type-definitions/renderer"; +import type { RenderConfig } from "unwritten:type-definitions/config"; +import type { RenderContext } from "unwritten:type-definitions/context"; +import type { Complete } from "unwritten:type-definitions/utils"; + import type { HTMLRenderConfig, MarkdownRenderConfig, MarkupRenderConfig } from "../markup/types-definitions/config"; import type { HTMLRenderContext, @@ -5,12 +11,6 @@ import type { MarkupRenderContext } from "../markup/types-definitions/markup"; -import type { JSONRenderConfig } from "unwritten:renderer:json:type-definitions/config"; -import type { JSONRenderContext } from "unwritten:renderer:json:type-definitions/renderer"; -import type { RenderConfig } from "unwritten:type-definitions/config"; -import type { RenderContext } from "unwritten:type-definitions/context"; -import type { Complete } from "unwritten:type-definitions/utils"; - export function getRenderConfig(ctx: MarkdownRenderContext): Complete; export function getRenderConfig(ctx: HTMLRenderContext): Complete; diff --git a/src/renderer/utils/heritage.ts b/src/renderer/utils/heritage.ts index bbda2abe..d3b733be 100644 --- a/src/renderer/utils/heritage.ts +++ b/src/renderer/utils/heritage.ts @@ -139,7 +139,7 @@ export function extendInterfaceEntitySignaturesWithHeritage { if(isSignatureEntity(entity)){ - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition -- Bug in eslint rule + result[entity.name ?? key] ??= []; result[entity.name ?? key].push(entity); } else { @@ -153,7 +153,6 @@ export function extendInterfaceEntitySignaturesWithHeritage((result, signatureEntity) => { - // eslint-disable-next-line eslint-plugin-typescript/no-unnecessary-condition -- Bug in eslint rule result[signatureEntity.name ?? key] ??= []; result[signatureEntity.name ?? key].push(signatureEntity); return result; diff --git a/src/type-definitions/config.ts b/src/type-definitions/config.ts index 78ab4199..2000d95b 100644 --- a/src/type-definitions/config.ts +++ b/src/type-definitions/config.ts @@ -1,9 +1,8 @@ -import type { BuiltInRenderers } from "../renderer/enums/renderer"; - import type { TypeKind } from "unwritten:interpreter/enums/type"; import type { JSONRenderConfig } from "unwritten:renderer:json:type-definitions/config"; import type { HTMLRenderConfig, MarkdownRenderConfig } from "unwritten:renderer:markup/types-definitions/config"; +import type { BuiltInRenderers } from "../renderer/enums/renderer"; import type { Complete, PartialByKey } from "./utils"; @@ -38,9 +37,9 @@ export interface CompleteBrowserConfig extends Required { export type CompleteConfig = CompleteBrowserConfig | CompleteNodeConfig; export interface CompleteRenderConfig { - [BuiltInRenderers.Markdown]: Complete; [BuiltInRenderers.HTML]: Complete; [BuiltInRenderers.JSON]: Complete; + [BuiltInRenderers.Markdown]: Complete; [key: string]: { [key: string]: any; }; @@ -56,9 +55,9 @@ export interface ConfigForSchema extends NodeConfig { $schema?: string; interpreterConfig?: InterpreterConfig; renderConfig?: { - [BuiltInRenderers.Markdown]?: MarkdownRenderConfig; [BuiltInRenderers.HTML]?: HTMLRenderConfig; [BuiltInRenderers.JSON]?: JSONRenderConfig; + [BuiltInRenderers.Markdown]?: MarkdownRenderConfig; } & { [key: string]: { [key: string]: any; @@ -69,10 +68,10 @@ export interface ConfigForSchema extends NodeConfig { export interface InterpreterConfig { /** An array or object of excluded directories. */ exclude?: string[] | { - [key: string]: string[] | "*"; + [key: string]: "*" | string[]; }; } export type ExternalTypes = { - [Key in TypeKind | (string & {}) ]?: string; + [Key in string & {} | TypeKind ]?: string; }; diff --git a/src/type-definitions/options.ts b/src/type-definitions/options.ts index f31ce7b9..03eb6342 100644 --- a/src/type-definitions/options.ts +++ b/src/type-definitions/options.ts @@ -1,8 +1,8 @@ -import type { BuiltInRenderers } from "../renderer/enums/renderer"; import type ts from "typescript"; import type { Renderer } from "unwritten:type-definitions/renderer"; +import type { BuiltInRenderers } from "../renderer/enums/renderer"; import type { Config } from "./config"; diff --git a/src/type-definitions/platform.ts b/src/type-definitions/platform.ts index 35b2b7ad..f2e95b0a 100644 --- a/src/type-definitions/platform.ts +++ b/src/type-definitions/platform.ts @@ -5,14 +5,14 @@ export type Platform = "browser" | "node"; // os export interface OS { - homeDirectory(): string; + homeDirectory: () => string; lineEndings: string; } // process export interface Process { /** Returns the current working directory. */ - cwd(): string; + cwd: () => string; env: { /** Enables verbose logging. */ DEBUG?: string; @@ -21,58 +21,52 @@ export interface Process { // path export interface Path { - /** Resolves the absolute path based on the base path. */ - absolute(to: string): string; - absolute(from: string, to: string): string; + absolute: ((from: string, to: string) => string) & ((to: string) => string); /** Returns the directory including a trailing slash. */ - getDirectory(path: string): string; + getDirectory: (path: string) => string; /** * Returns the file extension including the period. * Returns an empty string if the path doesn't contain a file. */ - getFileExtension(path: string): string; + getFileExtension: (path: string) => string; /** * Returns the file name including the extension by default. * Returns an empty string if the path doesn't contain a file. */ - getFileName(path: string, includeExtension?: boolean): string; + getFileName: (path: string, includeExtension?: boolean) => string; /** Joins multiple segments. */ - join(...segments: string[]): string; + join: (...segments: string[]) => string; /** Strips file protocol prefix and converts windows style paths to posix style paths. */ - normalize(path: string): string; + normalize: (path: string) => string; /** Returns the relative path from one path to the other. */ - relative(from: string, to: string): string; + relative: (from: string, to: string) => string; } // logger export type Logger = { - bgGreen(message: string): string; - bgRed(message: string): string; - bgYellow(message: string): string; - blue(message: string): string; - bold(message: string): string; - cyan(message: string): string; - debug(message: string): void; - dim(message: string): string; - filePath(path: string): string; - gray(message: string): string; - green(message: string): string; - info(message: string[] | string): void; - info(title: string, message: string[] | string): void; - info(title: string, label: string, message: string[] | string): void; - inverse(message: string): string; - italic(message: string): string; - log(message: string): void; - magenta(message: string): string; - red(message: string): string; - stats(ctx: DefaultContext, stats: Logger["_stats"]): void; - strikethrough(message: string): string; - underline(message: string): string; - warn(title: string, message: string[] | string): void; - warn(title: string, label: string, message: string[] | string): void; - warn(message: string[] | string): void; - white(message: string): string; - yellow(message: string): string; + bgGreen: (message: string) => string; + bgRed: (message: string) => string; + bgYellow: (message: string) => string; + blue: (message: string) => string; + bold: (message: string) => string; + cyan: (message: string) => string; + debug: (message: string) => void; + dim: (message: string) => string; + filePath: (path: string) => string; + gray: (message: string) => string; + green: (message: string) => string; + info: ((message: string[] | string) => void) & ((title: string, label: string, message: string[] | string) => void) & ((title: string, message: string[] | string) => void); + inverse: (message: string) => string; + italic: (message: string) => string; + log: (message: string) => void; + magenta: (message: string) => string; + red: (message: string) => string; + stats: (ctx: DefaultContext, stats: Logger["_stats"]) => void; + strikethrough: (message: string) => string; + underline: (message: string) => string; + warn: ((message: string[] | string) => void) & ((title: string, label: string, message: string[] | string) => void) & ((title: string, message: string[] | string) => void); + white: (message: string) => string; + yellow: (message: string) => string; _stats?: { entryPoints?: string[]; renderer?: string; @@ -88,10 +82,10 @@ export type FilePath = `${Directory}${FileName}` | `${FileName}`; export type Directory = `${string}/`; export interface FileSystem { - existsSync(path: string): boolean; - mkdirSync(path: string, options?: { recursive: boolean; }): void; - readFileSync(path: string): string; - readdirSync(path: string, options?: { recursive: boolean; }): string[]; - rmSync(path: string, options?: { recursive: boolean; }): void; - writeFileSync(path: string, data: string): void; + existsSync: (path: string) => boolean; + mkdirSync: (path: string, options?: { recursive: boolean; }) => void; + readdirSync: (path: string, options?: { recursive: boolean; }) => string[]; + readFileSync: (path: string) => string; + rmSync: (path: string, options?: { recursive: boolean; }) => void; + writeFileSync: (path: string, data: string) => void; } diff --git a/src/type-definitions/renderer.ts b/src/type-definitions/renderer.ts index 5e1f4507..78a53468 100644 --- a/src/type-definitions/renderer.ts +++ b/src/type-definitions/renderer.ts @@ -14,5 +14,5 @@ export interface Renderer { /** The name of the render extension. */ name: string; /** The render function. */ - render(ctx: RenderContext, sourceFileEntities: SourceFileEntity[]): RenderOutput; + render: (ctx: RenderContext, sourceFileEntities: SourceFileEntity[]) => RenderOutput; } diff --git a/src/utils/exclude.test.ts b/src/utils/exclude.test.ts index 80607e51..b4297024 100644 --- a/src/utils/exclude.test.ts +++ b/src/utils/exclude.test.ts @@ -1,4 +1,4 @@ -/* eslint-disable eslint-plugin-sort-keys/sort-keys-fix */ +/* eslint-disable eslint-plugin-perfectionist/sort-objects */ /* eslint-disable eslint-plugin-typescript/naming-convention */ import { describe, expect, it } from "vitest"; diff --git a/src/utils/exclude.ts b/src/utils/exclude.ts index 37f4e538..a989b154 100644 --- a/src/utils/exclude.ts +++ b/src/utils/exclude.ts @@ -1,7 +1,7 @@ import { minimatch } from "minimatch"; -import { getNameByDeclaration } from "unwritten:interpreter/ast/shared/name"; import { getPositionByDeclaration } from "unwritten:interpreter:ast/shared/position"; +import { getNameByDeclaration } from "unwritten:interpreter/ast/shared/name"; import type { Declaration, Symbol } from "typescript"; diff --git a/src/utils/general.test.ts b/src/utils/general.test.ts index 0a0590c1..15256322 100644 --- a/src/utils/general.test.ts +++ b/src/utils/general.test.ts @@ -1,4 +1,4 @@ -/* eslint-disable eslint-plugin-sort-keys/sort-keys-fix */ +/* eslint-disable eslint-plugin-perfectionist/sort-objects */ import { describe, expect, it } from "vitest"; import { scope } from "unwritten:tests:utils/scope"; diff --git a/src/utils/package-json.entry.ts b/src/utils/package-json.entry.ts index 9608a43e..edb6cd38 100644 --- a/src/utils/package-json.entry.ts +++ b/src/utils/package-json.entry.ts @@ -1,6 +1,5 @@ -import { assert } from "unwritten:utils:general"; - import packageJson from "unwritten:root:package.json"; +import { assert } from "unwritten:utils:general"; const author: string = packageJson.author; diff --git a/tests/utils/compile.ts b/tests/utils/compile.ts index f64ff482..ca5e4583 100644 --- a/tests/utils/compile.ts +++ b/tests/utils/compile.ts @@ -9,9 +9,9 @@ import os from "unwritten:platform/os/node"; import path from "unwritten:platform/path/browser"; import process from "unwritten:platform/process/browser"; import * as fs from "unwritten:tests:utils/virtual-fs"; +import { assert } from "unwritten:utils:general"; import { createContext as createDefaultContext } from "unwritten:utils/context"; import { override } from "unwritten:utils/override"; -import { assert } from "unwritten:utils:general"; import type { Config } from "unwritten:type-definitions/config"; diff --git a/tests/utils/context.ts b/tests/utils/context.ts index a4a36769..8cf64fdf 100644 --- a/tests/utils/context.ts +++ b/tests/utils/context.ts @@ -5,15 +5,15 @@ import { logger } from "unwritten:platform/logger/node"; import os from "unwritten:platform/os/node"; import path from "unwritten:platform/path/browser"; import process from "unwritten:platform/process/browser"; -import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import jsonRenderer from "unwritten:renderer:json:index"; import htmlRenderer, { isHTMLRenderContext } from "unwritten:renderer:markup/html/index"; import markdownRenderer, { isMarkdownRenderContext } from "unwritten:renderer:markup/markdown/index"; +import { BuiltInRenderers } from "unwritten:renderer/enums/renderer"; import { attachTestRegistry } from "unwritten:tests:utils/registry"; import * as fs from "unwritten:tests:utils/virtual-fs"; +import { override } from "unwritten:utils:override"; import { createContext as createDefaultContext } from "unwritten:utils/context"; import { assert } from "unwritten:utils/general"; -import { override } from "unwritten:utils:override"; import type { JSONRenderContext } from "unwritten:renderer:json:type-definitions/renderer"; import type { diff --git a/vite.config.browser.ts b/vite.config.browser.ts index ede70ed8..0215377f 100644 --- a/vite.config.browser.ts +++ b/vite.config.browser.ts @@ -1,8 +1,7 @@ +import { config, defineConfig } from "@schoero/configs/vite"; import dts from "vite-plugin-dts"; import noBundlePlugin from "vite-plugin-no-bundle"; -import { config, defineConfig } from "@schoero/configs/vite"; - import type { UserConfig } from "vitest"; diff --git a/vite.config.ts b/vite.config.ts index 19cc50c6..e05a9077 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -1,9 +1,8 @@ +import { config, defineConfig } from "@schoero/configs/vite"; import shebang from "rollup-plugin-preserve-shebang"; import dts from "vite-plugin-dts"; import noBundlePlugin from "vite-plugin-no-bundle"; -import { config, defineConfig } from "@schoero/configs/vite"; - import type { UserConfig } from "vitest";