@naturalcycles/dev-lib 12.14.0 → 12.15.1

package/cfg/jest.config.js

@@ -107,10 +107,12 @@ module.exports = {
     '!**/*.component.ts',
     '!**/*.modal.ts',
   ],
+  // default: ["clover", "json", "lcov", "text"]
+  coverageReporters: ['clover', 'json', 'lcov', !CI && 'text'].filter(Boolean),
   // CI: only jest-junit reporter (no default)
   // not-CI: only default reporter, but not jest-junit
   reporters: [
-    !CI && 'default',
+    'default',
     CI && [
       'jest-junit',
       {

package/cfg/jest.integration-test.config.js

@@ -4,6 +4,7 @@
  */
 
 const fs = require('fs')
+const { CI } = process.env
 const cwd = process.cwd()
 
 // Set 'setupFilesAfterEnv' only if it exists
@@ -21,10 +22,9 @@ module.exports = {
   testMatch: ['<rootDir>/src/**/*.integration.test.ts'],
   testPathIgnorePatterns: ['<rootDir>/.*/__exclude/'],
   setupFilesAfterEnv,
-  coverageDirectory: 'tmp/coverage-integration',
   reporters: [
     'default',
-    [
+    CI && [
       'jest-junit',
       {
         suiteName: 'jest tests',
@@ -36,5 +36,5 @@ module.exports = {
         ancestorSeparator: ' ',
       },
     ],
-  ],
+  ].filter(Boolean),
 }

package/cfg/jest.manual-test.config.js

@@ -21,7 +21,5 @@ module.exports = {
   testMatch: ['<rootDir>/src/**/*.manual.test.ts'],
   testPathIgnorePatterns: ['<rootDir>/.*/__exclude/'],
   setupFilesAfterEnv,
-  // Should never need coverage or reporters, but anyway
-  coverageDirectory: 'tmp/coverage-manual',
   reporters: ['default'],
 }

package/cfg/lint-staged.config.js

@@ -79,7 +79,14 @@ const linters = {
   '**/*.{kt,kts}': match => {
     const filesList = micromatch.not(match, lintExclude).join(' ')
     if (!filesList) return []
-    return [`ktlint -F ${filesList}`]
+    const dir = './node_modules/@naturalcycles/ktlint'
+
+    if (!fs.existsSync(dir)) {
+      console.log(`!!\n!! Please install @naturalcycles/ktlint to lint *.kt files\n!!\n`, filesList)
+      return []
+    }
+
+    return [`${dir}/resources/ktlint -F ${filesList}`]
   },
 }
 

package/cfg/overwrite/.editorconfig

@@ -14,35 +14,39 @@ end_of_line = lf
 trim_trailing_whitespace = true
 insert_final_newline = true
 
-[**.md]
+[*.md]
 trim_trailing_whitespace = false
 indent_size = 4
 
-[**.html]
+[*.html]
 indent_size = 2
 
-[**.{css,scss}]
+[*.{css,scss}]
 indent_size = 2
 
-[**.{js,ts}]
+[*.{js,ts}]
 indent_size = 2
 
-[**.json]
+[*.json]
 indent_size = 2
 
-[**.xml]
-indent_size = 2
-
-[**.java]
+[*.java]
 indent_size = 4
 
-[**.sql]
+[*.{kt,kts}]
+disabled_rules=no-wildcard-imports
+ij_kotlin_imports_layout=*,java.**,javax.**,kotlin.**,^ # default IntelliJ IDEA style, same as alphabetical, but with "java", "javax", "kotlin" and alias imports in the end of the imports list
+
+[*.xml]
+indent_size = 2
+
+[*.sql]
 indent_size = 2
 
 [.eslintrc]
 indent_size = 2
 
-[**.min.*]
+[*.min.*]
 indent_style = ignore
 trim_trailing_whitespace = false
 insert_final_newline = ignore

package/dist/cmd/lint-all.command.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintAllCommand = void 0;
+const fs = require("fs");
 const yargs = require("yargs");
 const git_util_1 = require("../util/git.util");
 const prettier_util_1 = require("../util/prettier.util");
@@ -21,10 +22,14 @@ async function lintAllCommand() {
         },
     }).argv;
     const hadChangesBefore = await (0, git_util_1.gitHasUncommittedChanges)();
-    // Currently we position ESLint before TSLint, but let's monitor if it's ok
     await (0, eslint_all_command_1.eslintAllCommand)();
     await (0, stylelint_util_1.stylelintAll)();
     await (0, prettier_util_1.runPrettier)();
+    // Running ktlintAll (experimental!)
+    if (fs.existsSync(`node_modules/@naturalcycles/ktlint`)) {
+        const ktlintLib = require('@naturalcycles/ktlint');
+        await ktlintLib.ktlintAll();
+    }
     if (commitOnChanges || failOnChanges) {
         // detect changes
         const hasChanges = await (0, git_util_1.gitHasUncommittedChanges)();
@@ -33,9 +38,7 @@ async function lintAllCommand() {
                 console.log(`lint-all: there are changes before running lint-all, will not commit`);
             }
             else {
-                const msg = 'style(lint-all): ' +
-                    (0, git_util_1.commitMessageToTitleMessage)(await (0, git_util_1.getLastGitCommitMsg)()) +
-                    '\n\n[skip ci]';
+                const msg = 'style(ci): ' + (0, git_util_1.commitMessageToTitleMessage)(await (0, git_util_1.getLastGitCommitMsg)()) + '\n\n[skip ci]';
                 // pull, commit, push changes
                 await (0, git_util_1.gitPull)();
                 await (0, git_util_1.gitCommitAll)(msg);

package/dist/util/jest.util.js

@@ -67,8 +67,14 @@ async function runJest(opt = {}) {
         DEBUG_COLORS: '1',
     };
     if (CI) {
-        args.push('--ci', '--coverage');
-        maxWorkers || (maxWorkers = '--maxWorkers=2');
+        args.push('--ci');
+        if (!integration && !manual) {
+            // Coverage only makes sense for unit tests, not for integration/manual
+            args.push('--coverage');
+        }
+        // We used to default to 2, but due to memory being an issue for Jest - now we default to 1,
+        // as it's the most memory-efficient way
+        maxWorkers || (maxWorkers = '--maxWorkers=1');
     }
     // Running all tests - will use `--silent` to suppress console-logs, will also set process.env.JEST_SILENT=1
     if (CI || isRunningAllTests()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "12.14.0",
+  "version": "12.15.1",
   "scripts": {
     "prepare": "husky install",
     "tsn-debug": "tsn testScript.ts",
@@ -38,7 +38,7 @@
     "@naturalcycles/time-lib": "^3.0.1",
     "@types/fs-extra": "^9.0.0",
     "@types/jest": "^27.0.0",
-    "@types/node": "^16.0.0",
+    "@types/node": "^17.0.0",
     "@types/yargs": "^16.0.0",
     "@typescript-eslint/eslint-plugin": "^5.0.0",
     "@typescript-eslint/parser": "^5.0.0",

package/readme.md

@@ -149,11 +149,10 @@ Pass `--ext` (e.g `--ext ts,html`) to override the list of ESLint extensions (de
 
 `ktlint` will be used by lint-staged for all `**/*.{kt,kts}` files.
 
-Please install it with `brew install ktlint`.
+~~Please install it with `brew install ktlint`.~~
 
-Currently `ktlint` has a bug of not supporting absolute paths, to work around it use
-[this instruction](https://github.com/pinterest/ktlint/issues/1131#issuecomment-947570851) to
-install a working version.
+Install it **locally** in you project by adding
+[`@naturalcycles/ktlint`](https://github.com/NaturalCycles/ktlint) to your **dev**Dependencies.
 
 #### Other commands