arui-scripts 14.4.0 → 14.5.0-feat-modules.1

package/build/configs/app-configs/get-defaults.js

@@ -3,17 +3,57 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefaults = void 0;
+exports.getDefaultAppContext = exports.getDefaultAppConfig = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
 const resolve_1 = require("../util/resolve");
-function getDefaults() {
-    const CWD = process.cwd();
+const CWD = process.cwd();
+const absoluteSrcPath = path_1.default.resolve(CWD, 'src');
+function getDefaultAppConfig() {
+    return {
+        /// general settings
+        clientServerPort: 8080,
+        serverPort: 3000,
+        debug: false,
+        devSourceMaps: 'eval',
+        useServerHMR: false,
+        presets: null,
+        // paths
+        buildPath: '.build',
+        assetsPath: 'assets',
+        additionalBuildPath: ['config'],
+        statsOutputFilename: 'stats.json',
+        serverEntry: path_1.default.resolve(absoluteSrcPath, 'server/index'),
+        serverOutput: 'server.js',
+        clientPolyfillsEntry: null,
+        clientEntry: path_1.default.resolve(absoluteSrcPath, 'index'),
+        // docker compilation configs
+        dockerRegistry: '',
+        baseDockerImage: 'alfabankui/arui-scripts:latest',
+        nginxRootPath: '/src',
+        runFromNonRootUser: true,
+        removeDevDependenciesDuringDockerBuild: true,
+        // archive compilation configs
+        archiveName: 'build.tar',
+        // build tuning
+        keepPropTypes: false,
+        useTscLoader: false,
+        webpack4Compatibility: false,
+        installServerSourceMaps: false,
+        // CSS
+        componentsTheme: undefined,
+        keepCssVars: false,
+        // Modules
+        embeddedModules: null,
+        mfModules: null,
+    };
+}
+exports.getDefaultAppConfig = getDefaultAppConfig;
+function getDefaultAppContext() {
     const appPackage = JSON.parse(fs_1.default.readFileSync(path_1.default.join(CWD, 'package.json'), 'utf8'));
     if (appPackage['arui-scripts']) {
         throw Error('arui-scripts in package.json is not supported. Use aruiScripts instead.');
     }
-    const absoluteSrcPath = path_1.default.resolve(CWD, 'src');
     const absoluteNodeModulesPath = path_1.default.resolve(CWD, 'node_modules');
     const absoluteNodeModulesBinPath = path_1.default.resolve(absoluteNodeModulesPath, '.bin');
     const projectTsConfigPath = path_1.default.join(CWD, 'tsconfig.json');
@@ -25,47 +65,22 @@ function getDefaults() {
     return {
         appPackage,
         name: appPackage.name,
+        normalizedName: appPackage.name.replace(/-/g, '_'),
         version: appPackage.version,
-        dockerRegistry: '',
-        baseDockerImage: 'alfabankui/arui-scripts:latest',
         // general paths
         cwd: CWD,
         appSrc: absoluteSrcPath,
         appNodeModules: absoluteNodeModulesPath,
         appNodeModulesBin: absoluteNodeModulesBinPath,
-        buildPath: '.build',
-        assetsPath: 'assets',
-        additionalBuildPath: ['config'],
-        nginxRootPath: '/src',
-        runFromNonRootUser: true,
-        archiveName: 'build.tar',
+        overridesPath: overridesPath ? [overridesPath] : [],
+        // tools availability
         babelRuntimeVersion: '7.0.0-beta.0',
-        // server compilation configs
-        serverEntry: path_1.default.resolve(absoluteSrcPath, 'server/index'),
-        serverOutput: 'server.js',
-        // client compilation configs
-        clientPolyfillsEntry: null,
-        clientEntry: path_1.default.resolve(absoluteSrcPath, 'index'),
-        keepPropTypes: false,
+        useYarn: fs_1.default.existsSync(yarnLockFilePath),
         // compilation configs locations
         tsconfig: fs_1.default.existsSync(projectTsConfigPath) ? projectTsConfigPath : null,
         localNginxConf: fs_1.default.existsSync(nginxConfFilePath) ? nginxConfFilePath : null,
         localDockerfile: fs_1.default.existsSync(dockerfileFilePath) ? dockerfileFilePath : null,
         localStartScript: fs_1.default.existsSync(startScriptFilePath) ? startScriptFilePath : null,
-        devSourceMaps: 'eval',
-        useTscLoader: false,
-        useServerHMR: false,
-        webpack4Compatibility: false,
-        useYarn: fs_1.default.existsSync(yarnLockFilePath),
-        clientServerPort: 8080,
-        serverPort: 3000,
-        installServerSourceMaps: false,
-        debug: false,
-        overridesPath: overridesPath ? [overridesPath] : [],
-        statsOutputFilename: 'stats.json',
-        removeDevDependenciesDuringDockerBuild: true,
-        componentsTheme: undefined,
-        keepCssVars: false,
         // Эти пути зависят от других настроек, которые могут быть переопределены пользователем
         publicPath: '',
         serverOutputPath: '',
@@ -80,4 +95,4 @@ function getDefaults() {
         changelogBreakingChangesPath: path_1.default.resolve(CWD, './changelog_breaking_changes.tmp'),
     };
 }
-exports.getDefaults = getDefaults;
+exports.getDefaultAppContext = getDefaultAppContext;

package/build/configs/app-configs/index.d.ts

@@ -1,4 +1,6 @@
 import '../util/register-ts-node';
-import { AppConfigs } from './types';
-declare let config: AppConfigs;
-export default config;
+import { AppConfigs, AppContext, AppContextWithConfigs } from './types';
+export declare const appContext: AppContext;
+export declare const appConfigs: AppConfigs;
+export declare const configs: AppContextWithConfigs;
+export default configs;

package/build/configs/app-configs/index.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.configs = exports.appConfigs = exports.appContext = void 0;
 require("../util/register-ts-node");
 const get_defaults_1 = require("./get-defaults");
 const update_with_env_1 = require("./update-with-env");
@@ -7,10 +8,15 @@ const update_with_package_1 = require("./update-with-package");
 const update_with_presets_1 = require("./update-with-presets");
 const calculate_dependent_config_1 = require("./calculate-dependent-config");
 const update_with_config_file_1 = require("./update-with-config-file");
-let config = (0, get_defaults_1.getDefaults)();
-config = (0, update_with_presets_1.updateWithPresets)(config);
-config = (0, update_with_package_1.updateWithPackage)(config);
-config = (0, update_with_config_file_1.updateWithConfigFile)(config);
-config = (0, update_with_env_1.updateWithEnv)(config);
-config = (0, calculate_dependent_config_1.calculateDependentConfig)(config);
-exports.default = config;
+let tmpConfig = (0, get_defaults_1.getDefaultAppConfig)();
+let tmpContext = (0, get_defaults_1.getDefaultAppContext)();
+tmpConfig = (0, update_with_presets_1.updateWithPresets)(tmpConfig, tmpContext);
+tmpConfig = (0, update_with_package_1.updateWithPackage)(tmpConfig, tmpContext);
+tmpConfig = (0, update_with_config_file_1.updateWithConfigFile)(tmpConfig, tmpContext);
+tmpConfig = (0, update_with_env_1.updateWithEnv)(tmpConfig);
+tmpConfig = (0, calculate_dependent_config_1.calculateDependentConfig)(tmpConfig);
+tmpContext = (0, calculate_dependent_config_1.calculateDependentContext)(tmpConfig, tmpContext);
+exports.appContext = tmpContext;
+exports.appConfigs = tmpConfig;
+exports.configs = Object.assign(Object.assign({}, exports.appConfigs), exports.appContext);
+exports.default = exports.configs;

package/build/configs/app-configs/types.d.ts

@@ -1,43 +1,74 @@
+/**
+ * Конфигурация arui-scripts, которая может быть переопределена приложением
+ */
 export type AppConfigs = {
-    appPackage: any;
-    name: string;
-    version: string;
-    dockerRegistry: string;
-    baseDockerImage: string;
-    cwd: string;
-    appSrc: string;
-    appNodeModules: string;
-    appNodeModulesBin: string;
+    clientServerPort: number;
+    serverPort: number;
+    debug: boolean;
+    devSourceMaps: string;
+    useServerHMR: boolean;
+    presets: string | null;
     buildPath: string;
     assetsPath: string;
     additionalBuildPath: string[];
-    nginxRootPath: string;
-    runFromNonRootUser: boolean;
-    archiveName: string;
-    babelRuntimeVersion: string;
+    statsOutputFilename: string;
     serverEntry: string | string[] | Record<string, string | string[]>;
     serverOutput: string;
     clientPolyfillsEntry: null | string | string[];
     clientEntry: string;
+    dockerRegistry: string;
+    baseDockerImage: string;
+    nginxRootPath: string;
+    runFromNonRootUser: boolean;
+    removeDevDependenciesDuringDockerBuild: boolean;
+    archiveName: string;
     keepPropTypes: boolean;
-    tsconfig: string | null;
-    localNginxConf: string | null;
-    localDockerfile: string | null;
-    localStartScript: string | null;
-    devSourceMaps: string;
     useTscLoader: boolean;
-    useServerHMR: boolean;
     webpack4Compatibility: boolean;
-    useYarn: boolean;
-    clientServerPort: number;
-    serverPort: number;
     installServerSourceMaps: boolean;
-    debug: boolean;
-    overridesPath: string[];
-    statsOutputFilename: string;
-    removeDevDependenciesDuringDockerBuild: boolean;
     componentsTheme: string | undefined;
     keepCssVars: boolean;
+    embeddedModules: {
+        shared?: {
+            [libraryName: string]: string;
+        };
+        exposes?: {
+            [moduleId: string]: EmbeddedModuleConfigBase;
+        };
+    } | null;
+    mfModules: {
+        name?: string;
+        shared: any;
+        exposes?: Record<string, string>;
+    } | null;
+};
+type EmbeddedModuleConfigBase = {
+    entry: string;
+    embeddedConfig?: Record<string, string>;
+    cssPrefix?: false | string;
+};
+export type EmbeddedModuleConfig = EmbeddedModuleConfigBase & {
+    name: string;
+};
+/**
+ * Внутренний контекст arui-scripts
+ */
+export type AppContext = {
+    appPackage: any;
+    name: string;
+    normalizedName: string;
+    version: string;
+    cwd: string;
+    appSrc: string;
+    appNodeModules: string;
+    appNodeModulesBin: string;
+    babelRuntimeVersion: string;
+    useYarn: boolean;
+    tsconfig: string | null;
+    localNginxConf: string | null;
+    localDockerfile: string | null;
+    localStartScript: string | null;
+    overridesPath: string[];
     publicPath: string;
     serverOutputPath: string;
     clientOutputPath: string;
@@ -49,3 +80,6 @@ export type AppConfigs = {
     changelogBugfixesPath: string;
     changelogBreakingChangesPath: string;
 };
+export type AppContextWithConfigs = AppContext & AppConfigs;
+export type PackageSettings = Partial<AppConfigs>;
+export {};

package/build/configs/app-configs/update-with-config-file.d.ts

@@ -1,2 +1,2 @@
-import { AppConfigs } from './types';
-export declare function updateWithConfigFile(config: AppConfigs): AppConfigs;
+import { AppConfigs, AppContext } from './types';
+export declare function updateWithConfigFile(config: AppConfigs, context: AppContext): any;

package/build/configs/app-configs/update-with-config-file.js

@@ -5,20 +5,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithConfigFile = void 0;
 const path_1 = __importDefault(require("path"));
-const lodash_merge_1 = __importDefault(require("lodash.merge"));
 const resolve_1 = require("../util/resolve");
-const validate_settings_keys_1 = __importDefault(require("./validate-settings-keys"));
-const available_package_settings_1 = require("./available-package-settings");
-function updateWithConfigFile(config) {
-    const appConfigPath = (0, resolve_1.tryResolve)(path_1.default.join(config.cwd, '/arui-scripts.config'));
+const validate_settings_keys_1 = require("./validate-settings-keys");
+function updateWithConfigFile(config, context) {
+    const appConfigPath = (0, resolve_1.tryResolve)(path_1.default.join(context.cwd, '/arui-scripts.config'));
     if (appConfigPath) {
         let appSettings = require(appConfigPath);
         if (appSettings.__esModule) {
             // ts-node импортирует esModules, из них надо вытягивать default именно так
             appSettings = appSettings.default;
         }
-        (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, appSettings);
-        config = (0, lodash_merge_1.default)(config, appSettings);
+        (0, validate_settings_keys_1.validateSettingsKeys)(config, appSettings, appConfigPath);
+        return Object.assign(Object.assign({}, config), appSettings);
     }
     return config;
 }

package/build/configs/app-configs/update-with-env.js

@@ -1,12 +1,7 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithEnv = void 0;
-const lodash_merge_1 = __importDefault(require("lodash.merge"));
-const validate_settings_keys_1 = __importDefault(require("./validate-settings-keys"));
-const available_package_settings_1 = require("./available-package-settings");
+const validate_settings_keys_1 = require("./validate-settings-keys");
 function updateWithEnv(config) {
     if (!process.env.ARUI_SCRIPTS_CONFIG) {
         return config;
@@ -14,8 +9,8 @@ function updateWithEnv(config) {
     try {
         console.warn('Используйте ARUI_SCRIPTS_CONFIG только для отладки');
         const envSettings = JSON.parse(process.env.ARUI_SCRIPTS_CONFIG);
-        (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, envSettings);
-        return (0, lodash_merge_1.default)(config, envSettings);
+        (0, validate_settings_keys_1.validateSettingsKeys)(config, envSettings, 'ENV');
+        return Object.assign(Object.assign({}, config), envSettings);
     }
     catch (e) {
         console.error(e);

package/build/configs/app-configs/update-with-package.d.ts

@@ -1,2 +1,2 @@
-import { AppConfigs } from './types';
-export declare function updateWithPackage(config: AppConfigs): any;
+import { AppConfigs, AppContext } from './types';
+export declare function updateWithPackage(config: AppConfigs, context: AppContext): any;

package/build/configs/app-configs/update-with-package.js

@@ -1,15 +1,10 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithPackage = void 0;
-const lodash_merge_1 = __importDefault(require("lodash.merge"));
-const validate_settings_keys_1 = __importDefault(require("./validate-settings-keys"));
-const available_package_settings_1 = require("./available-package-settings");
-function updateWithPackage(config) {
-    const packageSettings = config.appPackage.aruiScripts || {};
-    (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, packageSettings);
-    return (0, lodash_merge_1.default)(config, packageSettings);
+const validate_settings_keys_1 = require("./validate-settings-keys");
+function updateWithPackage(config, context) {
+    const packageSettings = context.appPackage.aruiScripts || {};
+    (0, validate_settings_keys_1.validateSettingsKeys)(config, packageSettings, 'package.json');
+    return Object.assign(Object.assign({}, config), packageSettings);
 }
 exports.updateWithPackage = updateWithPackage;

package/build/configs/app-configs/update-with-presets.d.ts

@@ -1,2 +1,2 @@
-import { AppConfigs } from './types';
-export declare function updateWithPresets(config: AppConfigs): AppConfigs;
+import { AppConfigs, AppContext } from './types';
+export declare function updateWithPresets(config: AppConfigs, context: AppContext): AppConfigs;

package/build/configs/app-configs/update-with-presets.js

@@ -1,33 +1,26 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateWithPresets = void 0;
-const lodash_merge_1 = __importDefault(require("lodash.merge"));
 const resolve_1 = require("../util/resolve");
-const validate_settings_keys_1 = __importDefault(require("./validate-settings-keys"));
-const available_package_settings_1 = require("./available-package-settings");
-function updateWithPresets(config) {
-    const packageSettings = config.appPackage.aruiScripts || {};
-    if (!packageSettings.presets) {
+const validate_settings_keys_1 = require("./validate-settings-keys");
+function updateWithPresets(config, context) {
+    if (!config.presets) {
         return config;
     }
-    const presetsConfigPath = (0, resolve_1.tryResolve)(`${packageSettings.presets}/arui-scripts.config`, { paths: [config.cwd] });
-    const presetsOverridesPath = (0, resolve_1.tryResolve)(`${packageSettings.presets}/arui-scripts.overrides`, { paths: [config.cwd] });
+    const presetsConfigPath = (0, resolve_1.tryResolve)(`${config.presets}/arui-scripts.config`, { paths: [context.cwd] });
+    const presetsOverridesPath = (0, resolve_1.tryResolve)(`${config.presets}/arui-scripts.overrides`, { paths: [context.cwd] });
     if (presetsConfigPath) {
         let presetsSettings = require(presetsConfigPath);
         if (presetsSettings.__esModule) {
             // ts-node импортирует esModules, из них надо вытягивать default именно так
             presetsSettings = presetsSettings.default;
         }
-        (0, validate_settings_keys_1.default)(available_package_settings_1.availablePackageSettings, presetsSettings);
-        config = (0, lodash_merge_1.default)(config, presetsSettings);
+        (0, validate_settings_keys_1.validateSettingsKeys)(config, presetsSettings, presetsConfigPath);
+        config = Object.assign(Object.assign({}, config), presetsSettings);
     }
     if (presetsOverridesPath) {
-        config.overridesPath.unshift(presetsOverridesPath);
+        context.overridesPath.unshift(presetsOverridesPath);
     }
-    delete packageSettings.presets;
     return config;
 }
 exports.updateWithPresets = updateWithPresets;

package/build/configs/app-configs/validate-settings-keys.d.ts

@@ -1,7 +1,4 @@
 /**
- * Функция проверяет что все ключи объекта settingsObject есть в массиве availableKeys
- * @param {string[]} availableKeys Массив допустимых настроек
- * @param settingsObject Объект с настройками
+ * Функция проверяет что все ключи объекта settingsObject есть в уже существующей конфигурации
  */
-declare function validateSettingsKeys(availableKeys: ReadonlyArray<string>, settingsObject: Record<string, unknown>): void;
-export default validateSettingsKeys;
+export declare function validateSettingsKeys(existingConfig: Record<string, unknown>, settingsObject: Record<string, unknown>, source?: string): void;

package/build/configs/app-configs/validate-settings-keys.js

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateSettingsKeys = void 0;
 /**
- * Функция проверяет что все ключи объекта settingsObject есть в массиве availableKeys
- * @param {string[]} availableKeys Массив допустимых настроек
- * @param settingsObject Объект с настройками
+ * Функция проверяет что все ключи объекта settingsObject есть в уже существующей конфигурации
  */
-function validateSettingsKeys(availableKeys, settingsObject) {
+function validateSettingsKeys(existingConfig, settingsObject, source) {
     Object.keys(settingsObject).forEach((setting) => {
-        if (!availableKeys.includes(setting)) {
-            console.warn('\x1b[33m', `Setting`, '\x1b[31m', setting, '\x1b[33m', 'is not supported!');
+        if (typeof existingConfig[setting] === 'undefined') {
+            console.warn(`Неизвестная настройка "${setting}" в ${source || 'конфигурации'}`);
         }
     });
 }
-exports.default = validateSettingsKeys;
+exports.validateSettingsKeys = validateSettingsKeys;

package/build/configs/babel-client.d.ts

@@ -1,2 +1,34 @@
-declare const babelClientConfig: any;
+declare const babelClientConfig: {
+    presets: (string | false | (string | {
+        targets: {
+            browsers: string[];
+        };
+        loose: boolean;
+        useBuiltIns: string;
+        corejs: number;
+        exclude: string[];
+    })[])[];
+    plugins: (string | (string | {
+        legacy: boolean;
+    })[] | (string | {
+        loose: boolean;
+    })[] | (string | {
+        useBuiltIns: boolean;
+    })[] | (string | {
+        corejs: boolean;
+        helpers: boolean;
+        version: string;
+        regenerator: boolean;
+    })[])[];
+    env: {
+        production: {
+            plugins: (string | (string | {
+                removeImport: boolean;
+            })[])[];
+        };
+        test: {
+            plugins: string[];
+        };
+    };
+};
 export default babelClientConfig;

package/build/configs/babel-dependencies.d.ts

@@ -1 +1,14 @@
-export declare const babelDependencies: any;
+export declare const babelDependencies: {
+    sourceType: string;
+    presets: (string | {
+        useBuiltIns: string;
+        corejs: number;
+        exclude: string[];
+    })[][];
+    plugins: (string | {
+        corejs: boolean;
+        helpers: boolean;
+        version: string;
+        regenerator: boolean;
+    })[][];
+};

package/build/configs/babel-server.d.ts

@@ -1,2 +1,27 @@
-declare const config: any;
+declare const config: {
+    presets: (string | false | (string | {
+        modules: boolean;
+        targets: {
+            node: string;
+        };
+        loose: boolean;
+    })[])[];
+    plugins: (string | (string | {
+        legacy: boolean;
+    })[] | (string | {
+        loose: boolean;
+    })[] | (string | {
+        useBuiltIns: boolean;
+    })[] | (string | {
+        helpers: boolean;
+    })[])[];
+    env: {
+        production: {
+            plugins: string[];
+        };
+        test: {
+            plugins: string[];
+        };
+    };
+};
 export default config;

package/build/configs/dev-server.d.ts

@@ -1,3 +1,16 @@
-/// <reference types="webpack-dev-server" />
-declare const devServerConfig: import("webpack-dev-server").Configuration;
+declare const devServerConfig: {
+    port: number;
+    liveReload: boolean;
+    client: {
+        overlay: {
+            errors: boolean;
+            warnings: boolean;
+        };
+    };
+    devMiddleware: {
+        publicPath: string;
+    };
+    static: string[];
+    proxy: any;
+};
 export default devServerConfig;

package/build/configs/jest/index.d.ts

@@ -14,6 +14,38 @@ export const snapshotSerializers: string[];
 export const globals: {
     'ts-jest': {
         tsconfig: string | null;
-        babelConfig: any;
+        babelConfig: {
+            presets: (string | false | (string | {
+                targets: {
+                    browsers: string[];
+                };
+                loose: boolean;
+                useBuiltIns: string;
+                corejs: number;
+                exclude: string[];
+            })[])[];
+            plugins: (string | (string | {
+                legacy: boolean;
+            })[] | (string | {
+                loose: boolean;
+            })[] | (string | {
+                useBuiltIns: boolean;
+            })[] | (string | {
+                corejs: boolean;
+                helpers: boolean;
+                version: string;
+                regenerator: boolean;
+            })[])[];
+            env: {
+                production: {
+                    plugins: (string | (string | {
+                        removeImport: boolean;
+                    })[])[];
+                };
+                test: {
+                    plugins: string[];
+                };
+            };
+        };
     };
 };

package/build/configs/modules.d.ts

@@ -0,0 +1,15 @@
+import { Assets } from 'assets-webpack-plugin';
+import { EmbeddedModuleConfig } from './app-configs/types';
+export declare function processAssetsPluginOutput(assets: Assets): string;
+export declare function haveExposedMfModules(): Record<string, string> | undefined;
+export declare function getCssPrefixForModule(module: EmbeddedModuleConfig): string | undefined;
+export declare function getChunkNamePrefix(module?: EmbeddedModuleConfig): string;
+export declare function getExposeLoadersFormEmbeddedModules(module?: EmbeddedModuleConfig): {
+    test: string;
+    use: {
+        loader: string;
+        options: {
+            exposes: string[];
+        };
+    }[];
+}[];