@naturalcycles/dev-lib 13.37.0 → 13.38.0

package/cfg/eslint-rules.js

@@ -445,53 +445,5 @@ module.exports = {
     '@typescript-eslint/dot-notation': 0, // not always desireable
     '@typescript-eslint/consistent-indexed-object-style': 0, // Record looses the name of the key
     '@typescript-eslint/no-unsafe-enum-comparison': 0, // not practically helpful
-    // non-default vue rules
-    'vue/block-order': [
-      'error',
-      {
-        order: ['script', 'template', 'style'],
-      },
-    ],
-    'vue/component-api-style': [2, ['script-setup', 'composition', 'composition-vue2']],
-    'vue/component-name-in-template-casing': [
-      2,
-      'PascalCase',
-      {
-        registeredComponentsOnly: true,
-      },
-    ],
-    'vue/component-options-name-casing': [2, 'PascalCase'],
-    'vue/custom-event-name-casing': [2, 'camelCase'],
-    'vue/define-emits-declaration': [2, 'type-based'],
-    'vue/define-macros-order': 2,
-    'vue/define-props-declaration': 2,
-    'vue/html-comment-content-spacing': 2,
-    'vue/match-component-file-name': [
-      2,
-      {
-        extensions: ['vue', 'jsx'],
-        shouldMatchCase: true,
-      },
-    ],
-    'vue/match-component-import-name': 2,
-    'vue/no-boolean-default': 2,
-    'vue/no-deprecated-model-definition': 2,
-    'vue/no-multiple-objects-in-class': 2,
-    'vue/no-ref-object-destructure': 2,
-    'vue/no-required-prop-with-default': 2,
-    'vue/no-root-v-if': 2,
-    'vue/no-this-in-before-route-enter': 2,
-    'vue/padding-line-between-blocks': 2,
-    'vue/prefer-define-options': 2,
-    'vue/prefer-separate-static-class': 2,
-    'vue/require-direct-export': 2,
-    'vue/require-emit-validator': 2,
-    'vue/require-expose': 2,
-    'vue/require-macro-variable-name': 2,
-    'vue/require-typed-object-prop': 2,
-    'vue/require-typed-ref': 2,
-    'vue/v-for-delimiter-style': [2, 'of'],
-    'vue/valid-define-options': 2,
-    'vue/eqeqeq': 2,
   },
 }

package/cfg/eslint-vue-rules.js

@@ -0,0 +1,52 @@
+module.exports = {
+  rules: {
+    // non-default vue rules
+    'vue/block-order': [
+      'error',
+      {
+        order: ['script', 'template', 'style'],
+      },
+    ],
+    'vue/component-api-style': [2, ['script-setup', 'composition', 'composition-vue2']],
+    'vue/component-name-in-template-casing': [
+      2,
+      'PascalCase',
+      {
+        registeredComponentsOnly: true,
+      },
+    ],
+    'vue/component-options-name-casing': [2, 'PascalCase'],
+    'vue/custom-event-name-casing': [2, 'camelCase'],
+    'vue/define-emits-declaration': [2, 'type-based'],
+    'vue/define-macros-order': 2,
+    'vue/define-props-declaration': 2,
+    'vue/html-comment-content-spacing': 2,
+    'vue/match-component-file-name': [
+      2,
+      {
+        extensions: ['vue', 'jsx'],
+        shouldMatchCase: true,
+      },
+    ],
+    'vue/match-component-import-name': 2,
+    'vue/no-boolean-default': 2,
+    'vue/no-deprecated-model-definition': 2,
+    'vue/no-multiple-objects-in-class': 2,
+    'vue/no-ref-object-destructure': 2,
+    'vue/no-required-prop-with-default': 2,
+    'vue/no-root-v-if': 2,
+    'vue/no-this-in-before-route-enter': 2,
+    'vue/padding-line-between-blocks': 2,
+    'vue/prefer-define-options': 2,
+    'vue/prefer-separate-static-class': 2,
+    'vue/require-direct-export': 2,
+    'vue/require-emit-validator': 2,
+    'vue/require-expose': 2,
+    'vue/require-macro-variable-name': 2,
+    'vue/require-typed-object-prop': 2,
+    'vue/require-typed-ref': 2,
+    'vue/v-for-delimiter-style': [2, 'of'],
+    'vue/valid-define-options': 2,
+    'vue/eqeqeq': 2,
+  },
+}

package/cfg/eslint-vue2.config.js

@@ -13,6 +13,7 @@ module.exports = {
         'plugin:unicorn/recommended',
         'plugin:vue/recommended',
         './eslint-rules.js',
+        './eslint-vue-rules.js',
         'prettier', // must go last
       ],
       env: {

package/cfg/eslint-vue3.config.js

@@ -13,6 +13,7 @@ module.exports = {
         'plugin:unicorn/recommended',
         'plugin:vue/vue3-recommended',
         './eslint-rules.js',
+        './eslint-vue-rules.js',
         'prettier', // must go last
       ],
       env: {

package/dist/bin/bt.js

@@ -3,13 +3,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const script_1 = require("@naturalcycles/nodejs-lib/dist/script");
-const tsc_scripts_command_1 = require("../cmd/tsc-scripts.command");
 const jest_util_1 = require("../util/jest.util");
 const tsc_util_1 = require("../util/tsc.util");
-(0, script_1.runScript)(() => {
+(0, script_1.runScript)(async () => {
     (0, nodejs_lib_1._emptyDirSync)('./dist'); // it doesn't delete the dir itself, to prevent IDE jumping
     // fs.rmSync('./dist', { recursive: true, force: true })
-    (0, tsc_util_1.tsc)(true);
-    (0, tsc_scripts_command_1.tscScriptsCommand)();
+    await (0, tsc_util_1.tscMainAndScripts)(true);
     (0, jest_util_1.runJest)();
 });

package/dist/bin/btl.js

@@ -4,14 +4,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const script_1 = require("@naturalcycles/nodejs-lib/dist/script");
 const lint_all_command_1 = require("../cmd/lint-all.command");
-const tsc_scripts_command_1 = require("../cmd/tsc-scripts.command");
 const jest_util_1 = require("../util/jest.util");
 const tsc_util_1 = require("../util/tsc.util");
 (0, script_1.runScript)(async () => {
     await (0, lint_all_command_1.lintAllCommand)();
     (0, nodejs_lib_1._emptyDirSync)('./dist'); // it doesn't delete the dir itself, to prevent IDE jumping
     // fs.rmSync('./dist', { recursive: true, force: true })
-    (0, tsc_util_1.tsc)(true);
-    (0, tsc_scripts_command_1.tscScriptsCommand)();
+    await (0, tsc_util_1.tscMainAndScripts)(true);
     (0, jest_util_1.runJest)();
 });

package/dist/bin/build.js

@@ -3,11 +3,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const nodejs_lib_1 = require("@naturalcycles/nodejs-lib");
 const script_1 = require("@naturalcycles/nodejs-lib/dist/script");
-const tsc_scripts_command_1 = require("../cmd/tsc-scripts.command");
 const tsc_util_1 = require("../util/tsc.util");
-(0, script_1.runScript)(() => {
+(0, script_1.runScript)(async () => {
     (0, nodejs_lib_1._emptyDirSync)('./dist'); // it doesn't delete the dir itself, to prevent IDE jumping
     // fs.rmSync('./dist', { recursive: true, force: true })
-    (0, tsc_util_1.tsc)(true);
-    (0, tsc_scripts_command_1.tscScriptsCommand)();
+    await (0, tsc_util_1.tscMainAndScripts)(true);
 });

package/dist/bin/tsc-scripts.js

@@ -2,5 +2,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const script_1 = require("@naturalcycles/nodejs-lib/dist/script");
-const tsc_scripts_command_1 = require("../cmd/tsc-scripts.command");
-(0, script_1.runScript)(tsc_scripts_command_1.tscScriptsCommand);
+const tsc_util_1 = require("../util/tsc.util");
+(0, script_1.runScript)(tsc_util_1.tscScripts);

package/dist/util/tsc.util.d.ts

@@ -1,4 +1,8 @@
+export declare function tscMainAndScripts(noEmit?: boolean): Promise<void>;
 export declare function tsc(noEmit?: boolean): void;
+export declare function tscAsync(noEmit?: boolean): Promise<void>;
+export declare function tscScripts(): void;
+export declare function tscScriptsAsync(): Promise<void>;
 /**
  * Returns path to /scripts/tsconfig.json
  */

package/dist/util/tsc.util.js

@@ -1,12 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureProjectTsconfigScripts = exports.tsc = void 0;
+exports.ensureProjectTsconfigScripts = exports.tscScriptsAsync = exports.tscScripts = exports.tscAsync = exports.tsc = exports.tscMainAndScripts = void 0;
 const fs = require("node:fs");
 const js_lib_1 = require("@naturalcycles/js-lib");
 const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
 const fs_1 = require("@naturalcycles/nodejs-lib/dist/fs");
 const paths_cnst_1 = require("../cnst/paths.cnst");
 const exec_util_1 = require("./exec.util");
+async function tscMainAndScripts(noEmit = false) {
+    await Promise.all([tscAsync(noEmit), tscScriptsAsync()]);
+}
+exports.tscMainAndScripts = tscMainAndScripts;
 function tsc(noEmit = false) {
     const started = Date.now();
     const args = [noEmit && '--noEmit'].filter(js_lib_1._isTruthy);
@@ -14,6 +18,37 @@ function tsc(noEmit = false) {
     console.log(`${(0, colors_1.boldGrey)('tsc')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
 }
 exports.tsc = tsc;
+async function tscAsync(noEmit = false) {
+    const started = Date.now();
+    const args = [noEmit && '--noEmit'].filter(js_lib_1._isTruthy);
+    await (0, exec_util_1.execVoidCommand)('tsc', args);
+    console.log(`${(0, colors_1.boldGrey)('tsc')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+}
+exports.tscAsync = tscAsync;
+function tscScripts() {
+    if (!fs.existsSync('./scripts')) {
+        // ./scripts folder doesn't exist, skipping
+        return;
+    }
+    const projectTsconfigPath = ensureProjectTsconfigScripts();
+    const args = ['-P', projectTsconfigPath, '--noEmit'];
+    const started = Date.now();
+    (0, exec_util_1.execVoidCommandSync)(`tsc`, args);
+    console.log(`${(0, colors_1.boldGrey)('tsc scripts')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+}
+exports.tscScripts = tscScripts;
+async function tscScriptsAsync() {
+    if (!fs.existsSync('./scripts')) {
+        // ./scripts folder doesn't exist, skipping
+        return;
+    }
+    const projectTsconfigPath = ensureProjectTsconfigScripts();
+    const args = ['-P', projectTsconfigPath, '--noEmit'];
+    const started = Date.now();
+    await (0, exec_util_1.execVoidCommand)(`tsc`, args);
+    console.log(`${(0, colors_1.boldGrey)('tsc scripts')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
+}
+exports.tscScriptsAsync = tscScriptsAsync;
 /**
  * Returns path to /scripts/tsconfig.json
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/dev-lib",
-  "version": "13.37.0",
+  "version": "13.38.0",
   "scripts": {
     "prepare": "husky install",
     "tsn-debug": "tsn testScript.ts",

package/dist/cmd/tsc-scripts.command.d.ts

@@ -1 +0,0 @@
-export declare function tscScriptsCommand(): void;

package/dist/cmd/tsc-scripts.command.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.tscScriptsCommand = void 0;
-const fs = require("node:fs");
-const js_lib_1 = require("@naturalcycles/js-lib");
-const colors_1 = require("@naturalcycles/nodejs-lib/dist/colors");
-const exec_util_1 = require("../util/exec.util");
-const tsc_util_1 = require("../util/tsc.util");
-function tscScriptsCommand() {
-    if (!fs.existsSync('./scripts')) {
-        // ./scripts folder doesn't exist, skipping
-        return;
-    }
-    const projectTsconfigPath = (0, tsc_util_1.ensureProjectTsconfigScripts)();
-    const args = ['-P', projectTsconfigPath, '--noEmit'];
-    const started = Date.now();
-    (0, exec_util_1.execVoidCommandSync)(`tsc`, args);
-    console.log(`${(0, colors_1.boldGrey)('tsc scripts')} ${(0, colors_1.dimGrey)(`took ` + (0, js_lib_1._since)(started))}`);
-}
-exports.tscScriptsCommand = tscScriptsCommand;