@kontur.candy/generator 5.97.0-optimize-engine.0 → 5.97.0-watch-normalizers.0

package/dist/index.js

@@ -47768,7 +47768,6 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   ensureArrayHasLength: () => (/* binding */ ensureArrayHasLength),
 /* harmony export */   ensureArrayIsNotEmpty: () => (/* binding */ ensureArrayIsNotEmpty),
 /* harmony export */   ensureArrayLengthGreaterThenOrEqual: () => (/* binding */ ensureArrayLengthGreaterThenOrEqual),
-/* harmony export */   ensureHasFunctionType: () => (/* binding */ ensureHasFunctionType),
 /* harmony export */   ensureIsArray: () => (/* binding */ ensureIsArray),
 /* harmony export */   ensureNever: () => (/* binding */ ensureNever),
 /* harmony export */   ensureNotNullOrUndefined: () => (/* binding */ ensureNotNullOrUndefined),
@@ -47796,14 +47795,9 @@ function stringifyUnknownError(error) {
   // eslint-disable-next-line @typescript-eslint/no-unsafe-return
   return typeof error === "object" && (error === null || error === void 0 ? void 0 : error["message"]);
 }
-function ensureNotNullOrUndefined(input, message) {
+function ensureNotNullOrUndefined(input) {
   if (!isNotNullOrUndefined(input)) {
-    throw new Error(message !== null && message !== void 0 ? message : `Value must be defined`);
-  }
-}
-function ensureHasFunctionType(input, message) {
-  if (typeof input !== "function") {
-    throw new Error(message !== null && message !== void 0 ? message : `Value must be defined`);
+    throw new Error(`Value must be defined`);
   }
 }
 function noop() {
@@ -72645,8 +72639,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_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 fs_extra__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! fs-extra */ "./node_modules/fs-extra/lib/index.js");
+/* harmony import */ var fs_extra__WEBPACK_IMPORTED_MODULE_12___default = /*#__PURE__*/__webpack_require__.n(fs_extra__WEBPACK_IMPORTED_MODULE_12__);
 /* 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");
@@ -72654,7 +72648,9 @@ __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");
+/* harmony import */ var _Common_WellKnownDirectories__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../../Common/WellKnownDirectories */ "./Common/WellKnownDirectories.ts");
+/* harmony import */ var _FsUtils__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! ./FsUtils */ "./Generator/src/generators/FsUtils.ts");
+
 
 
 
@@ -72680,7 +72676,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_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");
+    const legacyfetchfunctionsDirectory = (await (0,fs_extra__WEBPACK_IMPORTED_MODULE_12__.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 = {
@@ -72745,7 +72741,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_11__.pathExists)(directoryPath))) {
+  if (!(await (0,fs_extra__WEBPACK_IMPORTED_MODULE_12__.pathExists)(directoryPath))) {
     return [];
   }
   const files = await readdirAsync(directoryPath);
@@ -72760,7 +72756,7 @@ async function getAllFilePathsInDirectory(directoryPath, _filelist) {
   return filelist;
 }
 async function checkFileExists(filePath) {
-  if (!(await (0,fs_extra__WEBPACK_IMPORTED_MODULE_11__.pathExists)(filePath))) {
+  if (!(await (0,fs_extra__WEBPACK_IMPORTED_MODULE_12__.pathExists)(filePath))) {
     return [];
   }
   return [filePath];
@@ -72769,10 +72765,10 @@ 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_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");
+    const legacyfetchfunctionsDirectory = (await (0,fs_extra__WEBPACK_IMPORTED_MODULE_12__.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")))];
+  return [path__WEBPACK_IMPORTED_MODULE_1___default().resolve(formSourcesPath, _Common_WellKnownDirectories__WEBPACK_IMPORTED_MODULE_10__.WellKnownDirectories.FormJsonFileName), 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"))), ...(await getAllFilePathsInDirectory(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "normalizers")))];
 }
 async function getAllDependenciesHash(formSourcesPath, farmDirectory) {
   const allDeps = await getAllDependencies(formSourcesPath, farmDirectory);
@@ -72800,7 +72796,7 @@ async function readSugarFiles(formSugarDirectoryPath, references) {
   return result;
 }
 async function readCustomControlsFiles(formSugarDirectoryPath) {
-  if (!(await (0,_FsUtils__WEBPACK_IMPORTED_MODULE_10__.isDirectoryExists)(formSugarDirectoryPath))) {
+  if (!(await (0,_FsUtils__WEBPACK_IMPORTED_MODULE_11__.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.97.0-optimize-engine.0",
+  "version": "5.97.0-watch-normalizers.0",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,