@tramvai/cli 4.34.4 → 4.36.0

package/src/library/babel/plugins/__snapshots__/fill-declare-action-name.spec.ts.snap

@@ -0,0 +1,266 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`fill-declare-action-name import: do nothing: import: do nothing 1`] = `
+
+import { declareAction } from '@tramvai/core';
+
+const action = declareAction({
+  name: 'action',
+  fn: () => {
+    console.log('action');
+  },
+});
+
+const secondAction = declareAction({
+  name: 'secondAction',
+  fn: () => {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+export default declareAction({
+  name: 'anonymousAction',
+  fn: () => {
+    console.log('anonymous action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+      ↓ ↓ ↓ ↓ ↓ ↓
+
+import { declareAction } from '@tramvai/core';
+var action = declareAction({
+  name: 'action',
+  fn: function fn() {
+    console.log('action');
+  },
+});
+var secondAction = declareAction({
+  name: 'secondAction',
+  fn: function fn() {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+export default declareAction({
+  name: 'anonymousAction',
+  fn: function fn() {
+    console.log('anonymous action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+
+`;
+
+exports[`fill-declare-action-name import: fill absent name: import: fill absent name 1`] = `
+
+import { declareAction } from '@tramvai/core';
+
+const action = declareAction({
+  name: 'action',
+  fn: () => {
+    console.log('action');
+  },
+});
+
+const secondAction = declareAction({
+  fn: () => {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+      ↓ ↓ ↓ ↓ ↓ ↓
+
+import { declareAction } from '@tramvai/core';
+var action = declareAction({
+  name: 'action',
+  fn: function fn() {
+    console.log('action');
+  },
+});
+var secondAction = declareAction({
+  name: 'secondAction__-5f0ssw',
+  fn: function fn() {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+
+`;
+
+exports[`fill-declare-action-name import: fill all actions: import: fill all actions 1`] = `
+
+import { declareAction } from '@tramvai/core';
+
+const action = declareAction({
+  fn: () => {
+    console.log('action');
+  },
+});
+
+const secondAction = declareAction({
+  fn: () => {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+export default declareAction({
+  fn: () => {
+    console.log('anonymous action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+      ↓ ↓ ↓ ↓ ↓ ↓
+
+import { declareAction } from '@tramvai/core';
+var action = declareAction({
+  name: 'action__n5c5ae',
+  fn: function fn() {
+    console.log('action');
+  },
+});
+var secondAction = declareAction({
+  name: 'secondAction__n5fz8b',
+  fn: function fn() {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+export default declareAction({
+  name: 'import-without-name.ts__797bng',
+  fn: function fn() {
+    console.log('anonymous action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+
+`;
+
+exports[`fill-declare-action-name require: do nothing: require: do nothing 1`] = `
+
+// @ts-ignore
+const { declareAction } = require('@tramvai/core');
+
+// @ts-ignore
+const action = declareAction({
+  name: 'action',
+  fn: () => {
+    console.log('action');
+  },
+});
+
+// @ts-ignore
+const secondAction = declareAction({
+  name: 'secondAction',
+  fn: () => {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+      ↓ ↓ ↓ ↓ ↓ ↓
+
+// @ts-ignore
+var _require = require('@tramvai/core'),
+  declareAction = _require.declareAction;
+
+// @ts-ignore
+var action = declareAction({
+  name: 'action',
+  fn: function fn() {
+    console.log('action');
+  },
+});
+
+// @ts-ignore
+var secondAction = declareAction({
+  name: 'secondAction',
+  fn: function fn() {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+
+`;
+
+exports[`fill-declare-action-name require: fill all actions: require: fill all actions 1`] = `
+
+// @ts-ignore
+const { declareAction } = require('@tramvai/core');
+
+// @ts-ignore
+const action = declareAction({
+  fn: () => {
+    console.log('action');
+  },
+});
+
+// @ts-ignore
+const secondAction = declareAction({
+  fn: () => {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+      ↓ ↓ ↓ ↓ ↓ ↓
+
+// @ts-ignore
+var _require = require('@tramvai/core'),
+  declareAction = _require.declareAction;
+
+// @ts-ignore
+var action = declareAction({
+  name: 'action__l6frq0',
+  fn: function fn() {
+    console.log('action');
+  },
+});
+
+// @ts-ignore
+var secondAction = declareAction({
+  name: 'secondAction__h789zd',
+  fn: function fn() {
+    console.log('second action');
+  },
+  conditions: {
+    onlyBrowser: true,
+  },
+});
+
+
+`;

package/src/library/babel/plugins/fill-declare-action-name.spec.ts

@@ -0,0 +1,37 @@
+import path from 'path';
+import pluginTester from 'babel-plugin-tester';
+import babelConfig from '../index';
+
+pluginTester({
+  plugin: {}, // плагин уже есть в основном конфиге, если подключить ещё тут то babel упадёт
+  pluginName: 'fill-declare-action-name',
+  filename: path.join(__dirname, '__fixtures__', 'fill-declare-action-name', 'test'),
+  babelOptions: babelConfig({
+    typescript: true,
+    generateDataQaTag: false,
+    loader: false,
+    enableFillDeclareActionNamePlugin: true,
+  }),
+  tests: {
+    'import: fill absent name': {
+      fixture: 'import-mixed.ts',
+      snapshot: true,
+    },
+    'import: do nothing': {
+      fixture: 'import-with-name.ts',
+      snapshot: true,
+    },
+    'import: fill all actions': {
+      fixture: 'import-without-name.ts',
+      snapshot: true,
+    },
+    'require: do nothing': {
+      fixture: 'require-with-name.ts',
+      snapshot: true,
+    },
+    'require: fill all actions': {
+      fixture: 'require-without-name.ts',
+      snapshot: true,
+    },
+  },
+});

package/src/library/babel/plugins/fill-declare-action-name.ts

@@ -0,0 +1,110 @@
+import type { Plugin } from './types.h';
+
+function hashCode(s: string) {
+  let h = 0;
+  let i = 0;
+  // eslint-disable-next-line no-bitwise
+  if (s.length > 0) while (i < s.length) h = ((h << 5) - h + s.charCodeAt(i++)) | 0;
+  return h.toString(36);
+}
+
+export const fillDeclareActionName: Plugin<{ declareActionName: string | null }> = (babel) => {
+  const { types: t } = babel;
+
+  return {
+    pre() {
+      this.declareActionName = null;
+    },
+    visitor: {
+      Program: {
+        enter(enterPath) {
+          enterPath.traverse({
+            ImportDeclaration: (path) => {
+              if (this.declareActionName) return; // нет смысла идти дальше
+              if (path.node.source.value !== '@tramvai/core') return;
+
+              const specifier = path.node.specifiers.find(
+                (s) =>
+                  t.isImportSpecifier(s) &&
+                  'name' in s.imported &&
+                  s.imported.name === 'declareAction'
+              );
+
+              if (specifier) {
+                this.declareActionName = specifier.local.name;
+              }
+            },
+            // тут смотрим на const {declareAction} = require('@tramvai/core')
+            VariableDeclarator: (path) => {
+              if (this.declareActionName) return; // нет смысла идти дальше
+
+              if (
+                !t.isCallExpression(path.node.init) ||
+                !t.isIdentifier(path.node.init.callee) ||
+                path.node.init.callee.name !== 'require'
+              ) {
+                return;
+              }
+
+              const [argument] = path.node.init.arguments;
+
+              if (!argument || ('value' in argument && argument.value !== '@tramvai/core')) return;
+              if (!t.isObjectPattern(path.node.id)) return;
+
+              const declareActionNameProperty = path.node.id.properties.find(
+                (p) => 'key' in p && 'name' in p.key && p.key.name === 'declareAction'
+              );
+
+              if (
+                declareActionNameProperty &&
+                'value' in declareActionNameProperty &&
+                'name' in declareActionNameProperty.value
+              ) {
+                this.declareActionName = declareActionNameProperty.value.name;
+              }
+            },
+          });
+        },
+      },
+      CallExpression(path) {
+        if (!this.declareActionName) return;
+        if ('name' in path.node.callee && path.node.callee.name !== this.declareActionName) return;
+
+        const args = path.node.arguments;
+
+        if (args.length !== 1) return;
+        if (!t.isObjectExpression(args[0])) return;
+
+        const nameProperty = args[0].properties.find(
+          (p) => 'key' in p && 'name' in p.key && p.key.name === 'name'
+        );
+
+        if (nameProperty) return;
+
+        let additionalDebugName: string;
+
+        // @ts-expect-error easier to write this rather than adding if statements and type assertions
+        const potentialVariableName = path.parentPath.node.id?.name as string | undefined;
+
+        if (!potentialVariableName) {
+          additionalDebugName = this.file.opts.generatorOpts.sourceFileName ?? '';
+        } else {
+          additionalDebugName = potentialVariableName;
+        }
+
+        const filePath = this.file.opts.filename;
+        const cwd = this.file.opts.cwd ?? '';
+        const projectFilePath = filePath.replace(cwd, '');
+        const { line, column } = path.node.loc.start;
+
+        const sid = hashCode(`${projectFilePath}:${line}:${column}`);
+
+        const name = `${additionalDebugName}__${sid}`;
+
+        args[0].properties.unshift(t.objectProperty(t.identifier('name'), t.stringLiteral(name)));
+      },
+    },
+  };
+};
+
+export default fillDeclareActionName;

package/src/library/babel/plugins/types.h.ts

@@ -1,8 +1,8 @@
-import type { PluginObj, template, types } from '@babel/core';
+import type { PluginObj, PluginPass, template, types } from '@babel/core';
 
 export interface Babel {
   types: typeof types;
   template: typeof template;
 }
 
-export type Plugin<PluginOptions = void> = (babel: Babel) => PluginObj<PluginOptions>;
+export type Plugin<PluginOptions = void> = (babel: Babel) => PluginObj<PluginPass & PluginOptions>;

package/src/library/webpack/utils/transpiler.ts

@@ -14,6 +14,7 @@ export type TranspilerConfig = {
   isServer: boolean;
   generateDataQaTag: boolean;
   enableFillActionNamePlugin: boolean;
+  enableFillDeclareActionNamePlugin: boolean;
   typescript: boolean;
   modules: 'es6' | 'commonjs' | false;
   loader: boolean;
@@ -50,7 +51,13 @@ export const getTranspilerConfig = (
   configManager: ConfigManager<CliConfigEntry>,
   overrideOptions: Partial<TranspilerConfig> = {}
 ): TranspilerConfig => {
-  const { generateDataQaTag, alias, enableFillActionNamePlugin, excludesPresetEnv } = configManager;
+  const {
+    generateDataQaTag,
+    alias,
+    enableFillActionNamePlugin,
+    excludesPresetEnv,
+    experiments: { enableFillDeclareActionNamePlugin },
+  } = configManager;
   const { env, modern } = configManager;
 
   if (alias) {
@@ -74,5 +81,6 @@ Just check or add configuration to your tsconfig file and remove alias from tram
     modules: false,
     typescript: false,
     ...overrideOptions,
+    enableFillDeclareActionNamePlugin,
   };
 };

package/src/models/config.spec.ts

@@ -39,6 +39,7 @@ it('should populate defaults for config', () => {
           "enableFillActionNamePlugin": false,
           "experiments": {
             "autoResolveSharedRequiredVersions": false,
+            "enableFillDeclareActionNamePlugin": false,
             "minicss": {
               "useImportModule": true,
             },
@@ -140,6 +141,7 @@ it('should populate defaults for config', () => {
           "enableFillActionNamePlugin": false,
           "experiments": {
             "autoResolveSharedRequiredVersions": false,
+            "enableFillDeclareActionNamePlugin": false,
             "minicss": {
               "useImportModule": true,
             },
@@ -280,6 +282,7 @@ it('should populate defaults for overridable options', () => {
           "enableFillActionNamePlugin": false,
           "experiments": {
             "autoResolveSharedRequiredVersions": false,
+            "enableFillDeclareActionNamePlugin": false,
             "minicss": {
               "useImportModule": true,
             },
@@ -399,6 +402,7 @@ it('should populate defaults for overridable options', () => {
           "enableFillActionNamePlugin": false,
           "experiments": {
             "autoResolveSharedRequiredVersions": false,
+            "enableFillDeclareActionNamePlugin": false,
             "minicss": {
               "useImportModule": true,
             },

package/src/schema/autogeneratedSchema.json

@@ -935,6 +935,11 @@
               "title": "automatically resolve [requiredVersion](https://webpack.js.org/plugins/module-federation-plugin/#requiredversion) for shared dependencies",
               "default": false,
               "type": "boolean"
+            },
+            "enableFillDeclareActionNamePlugin": {
+              "title": "Включает использование плагина fill-declare-action-name",
+              "default": false,
+              "type": "boolean"
             }
           },
           "additionalProperties": false
@@ -1183,23 +1188,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7107": {
+                        "__@match@7211": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7109": {
+                        "__@replace@7213": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7112": {
+                        "__@search@7216": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7114": {
+                        "__@split@7218": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7116": {
+                        "__@matchAll@7220": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -1705,6 +1710,11 @@
               "title": "automatically resolve [requiredVersion](https://webpack.js.org/plugins/module-federation-plugin/#requiredversion) for shared dependencies",
               "default": false,
               "type": "boolean"
+            },
+            "enableFillDeclareActionNamePlugin": {
+              "title": "Включает использование плагина fill-declare-action-name",
+              "default": false,
+              "type": "boolean"
             }
           },
           "additionalProperties": false
@@ -1891,23 +1901,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7107": {
+                        "__@match@7211": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7109": {
+                        "__@replace@7213": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7112": {
+                        "__@search@7216": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7114": {
+                        "__@split@7218": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7116": {
+                        "__@matchAll@7220": {
                           "type": "object",
                           "additionalProperties": false
                         }
@@ -2413,6 +2423,11 @@
               "title": "automatically resolve [requiredVersion](https://webpack.js.org/plugins/module-federation-plugin/#requiredversion) for shared dependencies",
               "default": false,
               "type": "boolean"
+            },
+            "enableFillDeclareActionNamePlugin": {
+              "title": "Включает использование плагина fill-declare-action-name",
+              "default": false,
+              "type": "boolean"
             }
           },
           "additionalProperties": false
@@ -2599,23 +2614,23 @@
                         "dotAll": {
                           "type": "boolean"
                         },
-                        "__@match@7107": {
+                        "__@match@7211": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@replace@7109": {
+                        "__@replace@7213": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@search@7112": {
+                        "__@search@7216": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@split@7114": {
+                        "__@split@7218": {
                           "type": "object",
                           "additionalProperties": false
                         },
-                        "__@matchAll@7116": {
+                        "__@matchAll@7220": {
                           "type": "object",
                           "additionalProperties": false
                         }

package/src/schema/tramvai.spec.ts

@@ -68,6 +68,7 @@ describe('JSON schema для tramvai.json', () => {
             "enableFillActionNamePlugin": false,
             "experiments": {
               "autoResolveSharedRequiredVersions": false,
+              "enableFillDeclareActionNamePlugin": false,
               "minicss": {
                 "useImportModule": true,
               },
@@ -169,6 +170,7 @@ describe('JSON schema для tramvai.json', () => {
             "enableFillActionNamePlugin": false,
             "experiments": {
               "autoResolveSharedRequiredVersions": false,
+              "enableFillDeclareActionNamePlugin": false,
               "minicss": {
                 "useImportModule": true,
               },

package/src/typings/configEntry/cli.ts

@@ -80,6 +80,11 @@ export interface Experiments {
    * @default false
    */
   autoResolveSharedRequiredVersions: boolean;
+  /**
+   * @title Включает использование плагина fill-declare-action-name
+   * @default false
+   */
+  enableFillDeclareActionNamePlugin: boolean;
 }
 
 /**

package/src/utils/dev-app/request.ts

@@ -1,15 +1,17 @@
 import propOr from '@tinkoff/utils/object/propOr';
+import type { Request } from '@tinkoff/request-core';
 import createRequest from '@tinkoff/request-core';
 import http from '@tinkoff/request-plugin-protocol-http';
+import retry from '@tinkoff/request-plugin-retry';
 import type { ConfigManager } from '../../config/configManager';
 
-const request = createRequest([http()]);
+const request = createRequest([retry(), http()]);
 
-export const appRequest = <T>(configManager: ConfigManager, path: string) => {
+export const appRequest = <T>(configManager: ConfigManager, path: string, options?: Request) => {
   const { host, port } = configManager;
   const serverPath = `http://${host}:${port}`;
 
-  return request<T>({ url: `${serverPath}${path}` });
+  return request<T>({ url: `${serverPath}${path}`, ...options });
 };
 
 interface BundleInfoResponse {
@@ -20,7 +22,10 @@ interface BundleInfoResponse {
 export const appBundleInfo = async (configManager: ConfigManager) => {
   const { name } = configManager;
 
-  const response = await appRequest<BundleInfoResponse>(configManager, `/${name}/papi/bundleInfo`);
+  const response = await appRequest<BundleInfoResponse>(configManager, `/${name}/papi/bundleInfo`, {
+    timeout: 5000,
+    retry: 3,
+  });
 
   return propOr('payload', [], response);
 };