@modern-js/utils 2.15.0 → 2.16.0

package/dist/esm/applyOptionsChain.js

@@ -1,5 +1,5 @@
 import { isFunction, logger, isPlainObject } from "./index";
-function applyOptionsChain(defaults, options, utils, mergeFn = Object.assign) {
+export function applyOptionsChain(defaults, options, utils, mergeFn = Object.assign) {
   if (!options) {
     return defaults;
   }
@@ -9,27 +9,15 @@ function applyOptionsChain(defaults, options, utils, mergeFn = Object.assign) {
     const ret = options(defaults, utils);
     if (ret) {
       if (!isPlainObject(ret)) {
-        logger.warn(
-          `${options.name}: Function should mutate the config and return nothing, Or return a cloned or merged version of config object.`
-        );
+        logger.warn(`${options.name}: Function should mutate the config and return nothing, Or return a cloned or merged version of config object.`);
       }
       return ret;
     }
   } else if (Array.isArray(options)) {
-    return options.reduce(
-      (memo, cur) => applyOptionsChain(memo, cur, utils, mergeFn),
-      defaults
-    );
+    return options.reduce((memo, cur) => applyOptionsChain(memo, cur, utils, mergeFn), defaults);
   } else {
-    throw new Error(
-      `applyOptionsChain error:
-default options is: ${JSON.stringify(
-        defaults
-      )}`
-    );
+    throw new Error(`applyOptionsChain error:
+default options is: ${JSON.stringify(defaults)}`);
   }
   return defaults;
 }
-export {
-  applyOptionsChain
-};

package/dist/esm/babel.js

@@ -64,15 +64,17 @@ const modifyPresetOptions = (presetName, options, presets = []) => {
         preset[1] = {
           ...preset[1] || {},
           ...options
-          // `options` is specific to different presets
         };
       }
     } else if (typeof preset === "string" && normalizeToPosixPath(preset).includes(presetName)) {
-      presets[index] = [preset, options];
+      presets[index] = [
+        preset,
+        options
+      ];
     }
   });
 };
-const getBabelUtils = (config) => {
+export const getBabelUtils = (config) => {
   const noop = () => {
   };
   return {
@@ -89,7 +91,7 @@ const getBabelUtils = (config) => {
     modifyPresetReactOptions: (options) => modifyPresetOptions("@babel/preset-react", options, config.presets || [])
   };
 };
-const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) => {
+export const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils) => {
   if (userBabelConfig) {
     const babelUtils = {
       ...getBabelUtils(defaultOptions),
@@ -99,7 +101,3 @@ const applyUserBabelConfig = (defaultOptions, userBabelConfig, extraBabelUtils)
   }
   return defaultOptions;
 };
-export {
-  applyUserBabelConfig,
-  getBabelUtils
-};

package/dist/esm/chainId.js

@@ -1,4 +1,4 @@
-const CHAIN_ID = {
+export const CHAIN_ID = {
   /** Predefined rules */
   RULE: {
     /** Rule for .mjs */
@@ -168,6 +168,3 @@ const CHAIN_ID = {
     TS_CONFIG_PATHS: "ts-config-paths"
   }
 };
-export {
-  CHAIN_ID
-};

package/dist/esm/clearConsole.js

@@ -1,8 +1,5 @@
-const clearConsole = () => {
+export const clearConsole = () => {
   if (process.stdout.isTTY && !process.env.DEBUG) {
     process.stdout.write("\x1B[H\x1B[2J");
   }
 };
-export {
-  clearConsole
-};

package/dist/esm/commands.js

@@ -1,22 +1,16 @@
-const getFullArgv = () => {
-  var _a;
-  return ((_a = process.env.MODERN_ARGV) == null ? void 0 : _a.split(" ")) || process.argv;
+export const getFullArgv = () => {
+  var _process_env_MODERN_ARGV;
+  return ((_process_env_MODERN_ARGV = process.env.MODERN_ARGV) === null || _process_env_MODERN_ARGV === void 0 ? void 0 : _process_env_MODERN_ARGV.split(" ")) || process.argv;
 };
-const getArgv = () => {
+export const getArgv = () => {
   return getFullArgv().slice(2);
 };
-const getCommand = () => {
+export const getCommand = () => {
   const args = getArgv();
   const command = args[0];
   return command;
 };
-const isDevCommand = () => {
+export const isDevCommand = () => {
   const command = getCommand();
   return command === "dev" || command === "start";
 };
-export {
-  getArgv,
-  getCommand,
-  getFullArgv,
-  isDevCommand
-};

package/dist/esm/compatRequire.js

@@ -1,16 +1,16 @@
 import { findExists } from "./findExists";
-const compatRequire = (filePath, interop = true) => {
+export const compatRequire = (filePath, interop = true) => {
   const mod = require(filePath);
-  const rtnESMDefault = interop && (mod == null ? void 0 : mod.__esModule);
+  const rtnESMDefault = interop && (mod === null || mod === void 0 ? void 0 : mod.__esModule);
   return rtnESMDefault ? mod.default : mod;
 };
-const dynamicImport = new Function(
-  "modulePath",
-  "return import(modulePath)"
-);
-const requireExistModule = (filename, opt) => {
+export const dynamicImport = new Function("modulePath", "return import(modulePath)");
+export const requireExistModule = (filename, opt) => {
   const final = {
-    extensions: [".ts", ".js"],
+    extensions: [
+      ".ts",
+      ".js"
+    ],
     interop: true,
     ...opt
   };
@@ -20,12 +20,12 @@ const requireExistModule = (filename, opt) => {
   }
   return compatRequire(exist, final.interop);
 };
-const cleanRequireCache = (filelist) => {
+export const cleanRequireCache = (filelist) => {
   filelist.forEach((filepath) => {
     delete require.cache[filepath];
   });
 };
-function deleteRequireCache(path) {
+export function deleteRequireCache(path) {
   if (require.cache[path]) {
     delete require.cache[path];
   }
@@ -33,10 +33,3 @@ function deleteRequireCache(path) {
     module.children = module.children.filter((item) => item.filename !== path);
   }
 }
-export {
-  cleanRequireCache,
-  compatRequire,
-  deleteRequireCache,
-  dynamicImport,
-  requireExistModule
-};

package/dist/esm/compiled.js

@@ -1,77 +1,33 @@
 import { Import } from "./import";
-import { default as default2 } from "../compiled/fs-extra";
-import { default as default3 } from "../compiled/ora";
-import { default as default4 } from "../compiled/glob";
-import { default as default5 } from "../compiled/js-yaml";
-import { default as default6 } from "../compiled/chalk";
-import { default as default7 } from "../compiled/debug";
-import { default as default8 } from "../compiled/slash";
-import { default as default9 } from "../compiled/execa";
-import { default as default10 } from "../compiled/json5";
-import { default as default11 } from "../compiled/upath";
-import { default as default12 } from "../compiled/pkg-up";
-import { nanoid } from "../compiled/nanoid";
-import { default as default13 } from "../compiled/semver";
-import { default as default14 } from "../compiled/dotenv";
-import { default as default15 } from "../compiled/lodash";
-import { default as default16 } from "../compiled/globby";
-import { default as default17 } from "../compiled/address";
-import { default as default18 } from "../compiled/signale";
-import { default as default19 } from "../compiled/url-join";
-import { default as default20 } from "../compiled/minimist";
-import { default as default21 } from "../compiled/fast-glob";
-import { default as default22 } from "../compiled/filesize";
-import { default as default23 } from "../compiled/gzip-size";
-import { default as default24 } from "../compiled/strip-ansi";
-import { default as default25 } from "../compiled/dotenv-expand";
-import { default as default26 } from "../compiled/browserslist";
-import { default as default27 } from "../compiled/recursive-readdir";
-import { program, Command } from "../compiled/commander";
-import { Signale } from "../compiled/signale";
-const mime = Import.lazy(
-  "../compiled/mime-types",
-  require
-);
-const chokidar = Import.lazy(
-  "../compiled/chokidar",
-  require
-);
-const inquirer = Import.lazy(
-  "../compiled/inquirer",
-  require
-);
-export {
-  Command,
-  Signale,
-  default17 as address,
-  default26 as browserslist,
-  default6 as chalk,
-  chokidar,
-  default7 as debug,
-  default14 as dotenv,
-  default25 as dotenvExpand,
-  default9 as execa,
-  default21 as fastGlob,
-  default22 as filesize,
-  default2 as fs,
-  default4 as glob,
-  default16 as globby,
-  default23 as gzipSize,
-  inquirer,
-  default10 as json5,
-  default15 as lodash,
-  mime,
-  default20 as minimist,
-  nanoid,
-  default3 as ora,
-  default12 as pkgUp,
-  program,
-  default27 as recursiveReaddir,
-  default13 as semver,
-  default18 as signale,
-  default8 as slash,
-  default24 as stripAnsi,
-  default11 as upath,
-  default19 as urlJoin,
-  default5 as yaml
-};
+export { default as fs } from "../compiled/fs-extra";
+export { default as ora } from "../compiled/ora";
+export { default as glob } from "../compiled/glob";
+export { default as yaml } from "../compiled/js-yaml";
+export { default as chalk } from "../compiled/chalk";
+export { default as debug } from "../compiled/debug";
+export { default as slash } from "../compiled/slash";
+export { default as execa } from "../compiled/execa";
+export { default as json5 } from "../compiled/json5";
+export { default as upath } from "../compiled/upath";
+export { default as pkgUp } from "../compiled/pkg-up";
+export { nanoid } from "../compiled/nanoid";
+export { default as semver } from "../compiled/semver";
+export { default as dotenv } from "../compiled/dotenv";
+export { default as lodash } from "../compiled/lodash";
+export { default as globby } from "../compiled/globby";
+export { default as address } from "../compiled/address";
+export { default as signale } from "../compiled/signale";
+export { default as urlJoin } from "../compiled/url-join";
+export { default as minimist } from "../compiled/minimist";
+export { default as fastGlob } from "../compiled/fast-glob";
+export { default as filesize } from "../compiled/filesize";
+export { default as gzipSize } from "../compiled/gzip-size";
+export { default as stripAnsi } from "../compiled/strip-ansi";
+export { default as dotenvExpand } from "../compiled/dotenv-expand";
+export { default as browserslist } from "../compiled/browserslist";
+export { default as recursiveReaddir } from "../compiled/recursive-readdir";
+export { program, Command } from "../compiled/commander";
+export { Signale } from "../compiled/signale";
+export const mime = Import.lazy("../compiled/mime-types", require);
+export const chokidar = Import.lazy("../compiled/chokidar", require);
+export const inquirer = Import.lazy("../compiled/inquirer", require);

package/dist/esm/constants.js

@@ -1,22 +1,26 @@
-const ROUTE_SPEC_FILE = "route.json";
-const MAIN_ENTRY_NAME = "main";
-const LAUNCH_EDITOR_ENDPOINT = "/__open-stack-frame-in-editor";
-const SERVER_BUNDLE_DIRECTORY = "bundles";
-const SERVER_WORKER_BUNDLE_DIRECTORY = "worker";
-const ENTRY_NAME_PATTERN = "^[a-zA-Z0-9_-]+$";
-const SERVER_RENDER_FUNCTION_NAME = "serverRender";
-const LOADABLE_STATS_FILE = "loadable-stats.json";
-const API_DIR = "api";
-const SERVER_DIR = "server";
-const SHARED_DIR = "shared";
-const CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
-const CONFIG_FILE_EXTENSIONS = [".js", ".ts", ".mjs"];
-const OUTPUT_CONFIG_FILE = "modern.config.json";
-const DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
-const ROUTE_MANIFEST_FILE = "routes-manifest.json";
-const LOADER_ROUTES_DIR = `loader-routes`;
-const DEFAULT_DEV_HOST = "0.0.0.0";
-const INTERNAL_APP_TOOLS_PLUGINS = {
+export const ROUTE_SPEC_FILE = "route.json";
+export const MAIN_ENTRY_NAME = "main";
+export const LAUNCH_EDITOR_ENDPOINT = "/__open-stack-frame-in-editor";
+export const SERVER_BUNDLE_DIRECTORY = "bundles";
+export const SERVER_WORKER_BUNDLE_DIRECTORY = "worker";
+export const ENTRY_NAME_PATTERN = "^[a-zA-Z0-9_-]+$";
+export const SERVER_RENDER_FUNCTION_NAME = "serverRender";
+export const LOADABLE_STATS_FILE = "loadable-stats.json";
+export const API_DIR = "api";
+export const SERVER_DIR = "server";
+export const SHARED_DIR = "shared";
+export const CONFIG_CACHE_DIR = "./node_modules/.cache/node-bundle-require";
+export const CONFIG_FILE_EXTENSIONS = [
+  ".js",
+  ".ts",
+  ".mjs"
+];
+export const OUTPUT_CONFIG_FILE = "modern.config.json";
+export const DEFAULT_SERVER_CONFIG = "modern.server-runtime.config";
+export const ROUTE_MANIFEST_FILE = "routes-manifest.json";
+export const LOADER_ROUTES_DIR = `loader-routes`;
+export const DEFAULT_DEV_HOST = "0.0.0.0";
+export const INTERNAL_APP_TOOLS_PLUGINS = {
   "@modern-js/app-tools": "@modern-js/app-tools/cli",
   "@modern-js/plugin-proxy": "@modern-js/plugin-proxy/cli",
   "@modern-js/plugin-ssg": "@modern-js/plugin-ssg/cli",
@@ -32,10 +36,10 @@ const INTERNAL_APP_TOOLS_PLUGINS = {
   // legacy router (inner react-router-dom v5)
   "@modern-js/plugin-router-v5": "@modern-js/plugin-router-v5/cli"
 };
-const INTERNAL_APP_TOOLS_RUNTIME_PLUGINS = {
+export const INTERNAL_APP_TOOLS_RUNTIME_PLUGINS = {
   "@modern-js/runtime": "@modern-js/runtime/cli"
 };
-const INTERNAL_MODULE_TOOLS_PLUGINS = {
+export const INTERNAL_MODULE_TOOLS_PLUGINS = {
   "@modern-js/module-tools": "@modern-js/module-tools",
   "@modern-js/doc-tools": "@modern-js/doc-tools",
   "@modern-js/runtime": "@modern-js/runtime/cli",
@@ -47,16 +51,16 @@ const INTERNAL_MODULE_TOOLS_PLUGINS = {
   // legacy router (inner react-router-dom v5)
   "@modern-js/plugin-router-legacy": "@modern-js/plugin-router-legacy/cli"
 };
-const INTERNAL_MONOREPO_TOOLS_PLUGINS = {
+export const INTERNAL_MONOREPO_TOOLS_PLUGINS = {
   "@modern-js/monorepo-tools": "@modern-js/monorepo-tools/cli",
   "@modern-js/plugin-testing": "@modern-js/plugin-testing/cli"
 };
-const INTERNAL_DOC_TOOLS_PLUGINS = {
+export const INTERNAL_DOC_TOOLS_PLUGINS = {
   "@modern-js/doc-tools": "@modern-js/doc-tools",
   "@modern-js/runtime": "@modern-js/runtime/cli",
   "@modern-js/plugin-testing": "@modern-js/plugin-testing/cli"
 };
-const INTERNAL_CLI_PLUGINS = {
+export const INTERNAL_CLI_PLUGINS = {
   "@modern-js/app-tools": "@modern-js/app-tools/cli",
   "@modern-js/monorepo-tools": "@modern-js/monorepo-tools/cli",
   "@modern-js/module-tools": "@modern-js/module-tools",
@@ -79,19 +83,19 @@ const INTERNAL_CLI_PLUGINS = {
   // legacy router (inner react-router-dom v5)
   "@modern-js/plugin-router-v5": "@modern-js/plugin-router-v5/cli"
 };
-const SERVER_PLUGIN_BFF = "@modern-js/plugin-bff";
-const SERVER_PLUGIN_EXPRESS = "@modern-js/plugin-express";
-const SERVER_PLUGIN_KOA = "@modern-js/plugin-koa";
-const SERVER_PLUGIN_SERVER = "@modern-js/plugin-server";
-const SERVER_PLUGIN_POLYFILL = "@modern-js/plugin-polyfill";
-const INTERNAL_SERVER_PLUGINS = {
+export const SERVER_PLUGIN_BFF = "@modern-js/plugin-bff";
+export const SERVER_PLUGIN_EXPRESS = "@modern-js/plugin-express";
+export const SERVER_PLUGIN_KOA = "@modern-js/plugin-koa";
+export const SERVER_PLUGIN_SERVER = "@modern-js/plugin-server";
+export const SERVER_PLUGIN_POLYFILL = "@modern-js/plugin-polyfill";
+export const INTERNAL_SERVER_PLUGINS = {
   [SERVER_PLUGIN_BFF]: "@modern-js/plugin-bff/server",
   [SERVER_PLUGIN_EXPRESS]: "@modern-js/plugin-express/server",
   [SERVER_PLUGIN_KOA]: "@modern-js/plugin-koa/server",
   [SERVER_PLUGIN_SERVER]: "@modern-js/plugin-server/server",
   [SERVER_PLUGIN_POLYFILL]: "@modern-js/plugin-polyfill/server"
 };
-const PLUGIN_SCHEMAS = {
+export const PLUGIN_SCHEMAS = {
   "@modern-js/runtime": [
     {
       target: "runtime",
@@ -104,7 +108,11 @@ const PLUGIN_SCHEMAS = {
       target: "runtimeByEntries",
       schema: {
         type: "object",
-        patternProperties: { [ENTRY_NAME_PATTERN]: { type: "object" } },
+        patternProperties: {
+          [ENTRY_NAME_PATTERN]: {
+            type: "object"
+          }
+        },
         additionalProperties: false
       }
     }
@@ -112,7 +120,11 @@ const PLUGIN_SCHEMAS = {
   "@modern-js/plugin-swc": [
     {
       target: "tools.swc",
-      schema: { typeof: ["object"] }
+      schema: {
+        typeof: [
+          "object"
+        ]
+      }
     }
   ],
   "@modern-js/plugin-bff": [
@@ -122,12 +134,23 @@ const PLUGIN_SCHEMAS = {
         type: "object",
         properties: {
           prefix: {
-            type: ["string", "array"],
-            items: { type: "string" }
+            type: [
+              "string",
+              "array"
+            ],
+            items: {
+              type: "string"
+            }
           },
-          fetcher: { type: "string" },
-          proxy: { type: "object" },
-          requestCreator: { type: "string" }
+          fetcher: {
+            type: "string"
+          },
+          proxy: {
+            type: "object"
+          },
+          requestCreator: {
+            type: "string"
+          }
         }
       }
     }
@@ -135,13 +158,23 @@ const PLUGIN_SCHEMAS = {
   "@modern-js/plugin-tailwindcss": [
     {
       target: "tools.tailwindcss",
-      schema: { typeof: ["object", "function"] }
+      schema: {
+        typeof: [
+          "object",
+          "function"
+        ]
+      }
     }
   ],
   "@modern-js/plugin-proxy": [
     {
       target: "dev.proxy",
-      schema: { typeof: ["string", "object"] }
+      schema: {
+        typeof: [
+          "string",
+          "object"
+        ]
+      }
     }
   ],
   "@modern-js/plugin-ssg": [
@@ -149,9 +182,15 @@ const PLUGIN_SCHEMAS = {
       target: "output.ssg",
       schema: {
         oneOf: [
-          { type: "boolean" },
-          { type: "object" },
-          { instanceof: "Function" }
+          {
+            type: "boolean"
+          },
+          {
+            type: "object"
+          },
+          {
+            instanceof: "Function"
+          }
         ]
       }
     }
@@ -159,63 +198,112 @@ const PLUGIN_SCHEMAS = {
   "@modern-js/plugin-state": [
     {
       target: "runtime.state",
-      schema: { type: ["boolean", "object"] }
+      schema: {
+        type: [
+          "boolean",
+          "object"
+        ]
+      }
     }
   ],
   "@modern-js/plugin-design-token": [
     // Legacy Features
     {
       target: "source.designSystem",
-      schema: { typeof: ["object"] }
+      schema: {
+        typeof: [
+          "object"
+        ]
+      }
     },
     {
       target: "source.designSystem.supportStyledComponents",
-      schema: { type: ["boolean"] }
+      schema: {
+        type: [
+          "boolean"
+        ]
+      }
     },
     {
       target: "designSystem",
-      schema: { typeof: ["object"] }
+      schema: {
+        typeof: [
+          "object"
+        ]
+      }
     }
   ],
   "@modern-js/plugin-router": [
     {
       target: "runtime.router",
-      schema: { type: ["boolean", "object"] }
+      schema: {
+        type: [
+          "boolean",
+          "object"
+        ]
+      }
     }
   ],
   "@modern-js/plugin-testing": [
     {
       target: "testing",
-      schema: { typeof: ["object"] }
+      schema: {
+        typeof: [
+          "object"
+        ]
+      }
     },
     {
       target: "tools.jest",
-      schema: { typeof: ["object", "function"] }
+      schema: {
+        typeof: [
+          "object",
+          "function"
+        ]
+      }
     }
   ],
   "@modern-js/plugin-garfish": [
     {
       target: "runtime.masterApp",
-      schema: { type: ["boolean", "object"] }
+      schema: {
+        type: [
+          "boolean",
+          "object"
+        ]
+      }
     },
     {
       target: "dev.withMasterApp",
-      schema: { type: ["object"] }
+      schema: {
+        type: [
+          "object"
+        ]
+      }
     },
     {
       target: "deploy.microFrontend",
-      schema: { type: ["boolean", "object"] }
+      schema: {
+        type: [
+          "boolean",
+          "object"
+        ]
+      }
     }
   ],
   "@modern-js/plugin-nocode": [],
   "@modern-js/plugin-worker": [
     {
       target: "deploy.worker.ssr",
-      schema: { type: ["boolean"] }
+      schema: {
+        type: [
+          "boolean"
+        ]
+      }
     }
   ]
 };
-const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
+export const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   allowNamespaces: true,
   allExtensions: true,
   allowDeclareFields: true,
@@ -224,37 +312,3 @@ const DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS = {
   optimizeConstEnums: true,
   isTSX: true
 };
-export {
-  API_DIR,
-  CONFIG_CACHE_DIR,
-  CONFIG_FILE_EXTENSIONS,
-  DEFAULT_BABEL_PRESET_TYPESCRIPT_OPTIONS,
-  DEFAULT_DEV_HOST,
-  DEFAULT_SERVER_CONFIG,
-  ENTRY_NAME_PATTERN,
-  INTERNAL_APP_TOOLS_PLUGINS,
-  INTERNAL_APP_TOOLS_RUNTIME_PLUGINS,
-  INTERNAL_CLI_PLUGINS,
-  INTERNAL_DOC_TOOLS_PLUGINS,
-  INTERNAL_MODULE_TOOLS_PLUGINS,
-  INTERNAL_MONOREPO_TOOLS_PLUGINS,
-  INTERNAL_SERVER_PLUGINS,
-  LAUNCH_EDITOR_ENDPOINT,
-  LOADABLE_STATS_FILE,
-  LOADER_ROUTES_DIR,
-  MAIN_ENTRY_NAME,
-  OUTPUT_CONFIG_FILE,
-  PLUGIN_SCHEMAS,
-  ROUTE_MANIFEST_FILE,
-  ROUTE_SPEC_FILE,
-  SERVER_BUNDLE_DIRECTORY,
-  SERVER_DIR,
-  SERVER_PLUGIN_BFF,
-  SERVER_PLUGIN_EXPRESS,
-  SERVER_PLUGIN_KOA,
-  SERVER_PLUGIN_POLYFILL,
-  SERVER_PLUGIN_SERVER,
-  SERVER_RENDER_FUNCTION_NAME,
-  SERVER_WORKER_BUNDLE_DIRECTORY,
-  SHARED_DIR
-};

package/dist/esm/debug.js

@@ -1,5 +1,2 @@
 import { debug } from "../compiled/debug";
-const createDebugger = (scope) => debug(`modern-js:${scope}`);
-export {
-  createDebugger
-};
+export const createDebugger = (scope) => debug(`modern-js:${scope}`);

package/dist/esm/emptyDir.js

@@ -1,9 +1,6 @@
 import { fs } from "./compiled";
-const emptyDir = async (dir) => {
+export const emptyDir = async (dir) => {
   if (await fs.pathExists(dir)) {
     await fs.emptyDir(dir);
   }
 };
-export {
-  emptyDir
-};