@kontur.candy/generator 5.73.4 → 5.73.5

package/dist/index.js

@@ -47023,6 +47023,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   WellKnownDirectories: () => (/* binding */ WellKnownDirectories)
 /* harmony export */ });
 class WellKnownDirectories {}
+WellKnownDirectories.ExternFormsDefaultCheckoutDirectory = "extern.forms";
 WellKnownDirectories.FormsDirectory = "forms";
 WellKnownDirectories.CandyFarmDirectory = "candy.farm";
 WellKnownDirectories.CandySubdirectoryName = "Candy";
@@ -69405,6 +69406,44 @@ require('./webEntry')
 
 /***/ }),
 
+/***/ "./Generator/src/generators/FsUtils.ts":
+/*!*********************************************!*\
+  !*** ./Generator/src/generators/FsUtils.ts ***!
+  \*********************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   isDirectoryExists: () => (/* binding */ isDirectoryExists),
+/* harmony export */   isDirectoryExistsSync: () => (/* binding */ isDirectoryExistsSync)
+/* harmony export */ });
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! fs */ "fs");
+/* harmony import */ var fs__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(fs__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! util */ "util");
+/* harmony import */ var util__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_1__);
+
+
+const statAsync = (0,util__WEBPACK_IMPORTED_MODULE_1__.promisify)(fs__WEBPACK_IMPORTED_MODULE_0__.stat);
+async function isDirectoryExists(directoryPath) {
+  try {
+    const dirStat = await statAsync(directoryPath);
+    return dirStat.isDirectory();
+  } catch (ignoreError) {
+    return false;
+  }
+}
+function isDirectoryExistsSync(directoryPath) {
+  try {
+    const dirStat = fs__WEBPACK_IMPORTED_MODULE_0__.statSync(directoryPath);
+    return dirStat.isDirectory();
+  } catch (ignoreError) {
+    return false;
+  }
+}
+
+/***/ }),
+
 /***/ "./Generator/src/generators/HelperFunctionsGenerator/AstToExportStatement.ts":
 /*!***********************************************************************************!*\
   !*** ./Generator/src/generators/HelperFunctionsGenerator/AstToExportStatement.ts ***!
@@ -70769,8 +70808,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(crypto__WEBPACK_IMPORTED_MODULE_3__);
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! chalk */ "./node_modules/chalk/source/index.js");
 /* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var fs_extra__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! fs-extra */ "./node_modules/fs-extra/lib/index.js");
-/* harmony import */ var fs_extra__WEBPACK_IMPORTED_MODULE_10___default = /*#__PURE__*/__webpack_require__.n(fs_extra__WEBPACK_IMPORTED_MODULE_10__);
+/* harmony import */ var fs_extra__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! fs-extra */ "./node_modules/fs-extra/lib/index.js");
+/* harmony import */ var fs_extra__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(fs_extra__WEBPACK_IMPORTED_MODULE_11__);
 /* harmony import */ var md5__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! md5 */ "./node_modules/md5/md5.js");
 /* harmony import */ var md5__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(md5__WEBPACK_IMPORTED_MODULE_5__);
 /* harmony import */ var recursive_readdir__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! recursive-readdir */ "./node_modules/recursive-readdir/index.js");
@@ -70778,6 +70817,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var _common_ExtractSugarReferences__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../common/ExtractSugarReferences */ "./Generator/src/common/ExtractSugarReferences.ts");
 /* harmony import */ var _Common_GetRngSchemaFileExtension__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../../../Common/GetRngSchemaFileExtension */ "./Common/GetRngSchemaFileExtension.ts");
 /* harmony import */ var _Common_FormPathUtils__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../../Common/FormPathUtils */ "./Common/FormPathUtils.ts");
+/* harmony import */ var _FsUtils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ./FsUtils */ "./Generator/src/generators/FsUtils.ts");
+
 
 
 
@@ -70802,7 +70843,7 @@ async function readFormSources(formSourcesPath, farmDirectory) {
   if (sugarReferences.fetchFunctionFiles.length === 0) {
     // eslint-disable-next-line no-console
     console.warn(chalk__WEBPACK_IMPORTED_MODULE_4___default().yellow(`[WARN] Форма не содержит ссылок на fetch-функции. Будут автоматически подключены функции из каталога legacyfetchfuctions\n` + `[WARN] В будущем необходимо явно прописывать ссылки на используемые fetch-функции`));
-    const legacyfetchfunctionsDirectory = (await (0,fs_extra__WEBPACK_IMPORTED_MODULE_10__.pathExists)(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions"))) ? path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions") : path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "candy.farm", "legacyfetchfunctions");
+    const legacyfetchfunctionsDirectory = (await (0,fs_extra__WEBPACK_IMPORTED_MODULE_11__.pathExists)(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions"))) ? path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions") : path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "candy.farm", "legacyfetchfunctions");
     sugarReferences.fetchFunctionFiles = (await readdirAsync(legacyfetchfunctionsDirectory)).map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(legacyfetchfunctionsDirectory, x));
   }
   const result = {
@@ -70858,14 +70899,6 @@ function evalModule(moduleCode) {
 	    return module.exports;
     })()`);
 }
-async function isDirectoryExists(directoryPath) {
-  try {
-    const dirStat = await statAsync(directoryPath);
-    return dirStat.isDirectory();
-  } catch (ignoreError) {
-    return false;
-  }
-}
 async function readFiles(filePaths) {
   const result = [];
   for (const filePath of filePaths) {
@@ -70878,7 +70911,7 @@ async function extractReferences(formSugarDirectoryPath) {
   return (0,_common_ExtractSugarReferences__WEBPACK_IMPORTED_MODULE_7__.extractSugarReferences)(indexContent, filePath => readFileAsync(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSugarDirectoryPath, filePath), "utf-8"));
 }
 async function getAllFilePathsInDirectory(directoryPath, _filelist) {
-  if (!(await (0,fs_extra__WEBPACK_IMPORTED_MODULE_10__.pathExists)(directoryPath))) {
+  if (!(await (0,fs_extra__WEBPACK_IMPORTED_MODULE_11__.pathExists)(directoryPath))) {
     return [];
   }
   const files = await readdirAsync(directoryPath);
@@ -70893,7 +70926,7 @@ async function getAllFilePathsInDirectory(directoryPath, _filelist) {
   return filelist;
 }
 async function checkFileExists(filePath) {
-  if (!(await (0,fs_extra__WEBPACK_IMPORTED_MODULE_10__.pathExists)(filePath))) {
+  if (!(await (0,fs_extra__WEBPACK_IMPORTED_MODULE_11__.pathExists)(filePath))) {
     return [];
   }
   return [filePath];
@@ -70902,7 +70935,7 @@ async function getAllDependencies(formSourcesPath, farmDirectory) {
   const formSugarDirectoryPath = path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "sugar");
   const sugarReferences = await extractReferences(formSugarDirectoryPath);
   if (sugarReferences.fetchFunctionFiles.length === 0) {
-    const legacyfetchfunctionsDirectory = (await (0,fs_extra__WEBPACK_IMPORTED_MODULE_10__.pathExists)(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions"))) ? path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions") : path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "candy.farm", "legacyfetchfunctions");
+    const legacyfetchfunctionsDirectory = (await (0,fs_extra__WEBPACK_IMPORTED_MODULE_11__.pathExists)(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions"))) ? path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "legacyfetchfunctions") : path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "candy.farm", "legacyfetchfunctions");
     sugarReferences.fetchFunctionFiles = (await readdirAsync(legacyfetchfunctionsDirectory)).map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(legacyfetchfunctionsDirectory, x));
   }
   return [path__WEBPACK_IMPORTED_MODULE_1___default().join(formSugarDirectoryPath, "index.sugar.xml"), ...sugarReferences.fetchFunctionFiles.map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSugarDirectoryPath, x)), ...sugarReferences.sugarFiles.map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSugarDirectoryPath, x + ".sugar.xml")), ...sugarReferences.resourceFiles.map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSugarDirectoryPath, x)), ...(await checkFileExists(path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSourcesPath, "settings.json"))), ...(await checkFileExists(path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSourcesPath, "hooks.js"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "autocalc"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "helpers"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "converters"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "mergers"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "jsHelpers"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "xsltTemplates"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "validations"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "schemas"))), ...(await checkFileExists(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "tour", "tour.js"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "controls"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "localization")))];
@@ -70933,7 +70966,7 @@ async function readSugarFiles(formSugarDirectoryPath, references) {
   return result;
 }
 async function readCustomControlsFiles(formSugarDirectoryPath) {
-  if (!(await isDirectoryExists(formSugarDirectoryPath))) {
+  if (!(await (0,_FsUtils__WEBPACK_IMPORTED_MODULE_10__.isDirectoryExists)(formSugarDirectoryPath))) {
     return {};
   }
   const fileNames = await recursive_readdir__WEBPACK_IMPORTED_MODULE_6___default()(formSugarDirectoryPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.73.4",
+  "version": "5.73.5",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,