@kontur.candy/generator 5.54.1-crlfhash.0 → 5.54.1-crlfhash.2

package/dist/index.js

@@ -67742,14 +67742,14 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var path__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(path__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! util */ "util");
 /* harmony import */ var util__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(util__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! chalk */ "./node_modules/chalk/source/index.js");
-/* harmony import */ var chalk__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(chalk__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var crypto__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! crypto */ "crypto");
+/* 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 md5__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! md5 */ "./node_modules/md5/md5.js");
-/* harmony import */ var md5__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(md5__WEBPACK_IMPORTED_MODULE_4__);
-/* harmony import */ var md5_file__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! md5-file */ "./node_modules/md5-file/index.js");
-/* harmony import */ var md5_file__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(md5_file__WEBPACK_IMPORTED_MODULE_5__);
+/* 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");
 /* harmony import */ var recursive_readdir__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(recursive_readdir__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var _common_ExtractSugarReferences__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../common/ExtractSugarReferences */ "./Generator/src/common/ExtractSugarReferences.ts");
@@ -67778,7 +67778,7 @@ async function readFormSources(formSourcesPath, farmDirectory) {
   const sugarContent = await readSugarFiles(formSugarDirectoryPath, sugarReferences);
   if (sugarReferences.fetchFunctionFiles.length === 0) {
     // eslint-disable-next-line no-console
-    console.warn(chalk__WEBPACK_IMPORTED_MODULE_3___default().yellow(`[WARN] Форма не содержит ссылок на fetch-функции. Будут автоматически подключены функции из каталога legacyfetchfuctions\n` + `[WARN] В будущем необходимо явно прописывать ссылки на используемые fetch-функции`));
+    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");
     sugarReferences.fetchFunctionFiles = (await readdirAsync(legacyfetchfunctionsDirectory)).map(x => path__WEBPACK_IMPORTED_MODULE_1___default().resolve(legacyfetchfunctionsDirectory, x));
   }
@@ -67886,8 +67886,22 @@ async function getAllDependencies(formSourcesPath, farmDirectory) {
 }
 async function getAllDependenciesHash(formSourcesPath, farmDirectory) {
   const allDeps = await getAllDependencies(formSourcesPath, farmDirectory);
-  const hashes = await Promise.all(allDeps.map(async depFilePath => md5_file__WEBPACK_IMPORTED_MODULE_5___default()(depFilePath)));
-  return md5__WEBPACK_IMPORTED_MODULE_4___default()(hashes.join(""));
+  const hashes = await Promise.all(allDeps.map(async depFilePath => hashFile(depFilePath)));
+  console.log("hashes", hashes);
+  console.log("md5(hashes.join())", md5__WEBPACK_IMPORTED_MODULE_5___default()(hashes.join()));
+  return md5__WEBPACK_IMPORTED_MODULE_5___default()(hashes.join());
+}
+function normalizeLineEndings(content) {
+  return content.replace(/\r/gi, "");
+}
+async function hashFile(filePath) {
+  const fileBuffer = await readFileAsync(filePath, "utf-8");
+  const clearedCRLF = normalizeLineEndings(fileBuffer);
+  const hashBuffer = (0,crypto__WEBPACK_IMPORTED_MODULE_3__.createHash)("sha256");
+  hashBuffer.update(clearedCRLF);
+  const a = hashBuffer.digest("hex");
+  console.log(filePath, a);
+  return a;
 }
 async function readSugarFiles(formSugarDirectoryPath, references) {
   const result = {
@@ -67950,7 +67964,7 @@ async function readAdditionalNormalizersFiles(rootPath) {
     return normalizerFiles;
   } catch (error) {
     // eslint-disable-next-line no-console
-    console.warn(chalk__WEBPACK_IMPORTED_MODULE_3___default().yellow(`Error while reading normalizers at ${rootPath}`, error));
+    console.warn(chalk__WEBPACK_IMPORTED_MODULE_4___default().yellow(`Error while reading normalizers at ${rootPath}`, error));
     return [];
   }
 }
@@ -130479,59 +130493,6 @@ const forEachStep = (self, fn, node, thisp) => {
 module.exports = LRUCache
 
 
-/***/ }),
-
-/***/ "./node_modules/md5-file/index.js":
-/*!****************************************!*\
-  !*** ./node_modules/md5-file/index.js ***!
-  \****************************************/
-/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
-
-const crypto = __webpack_require__(/*! crypto */ "crypto")
-const fs = __webpack_require__(/*! fs */ "fs")
-
-const BUFFER_SIZE = 8192
-
-function md5FileSync (path) {
-  const fd = fs.openSync(path, 'r')
-  const hash = crypto.createHash('md5')
-  const buffer = Buffer.alloc(BUFFER_SIZE)
-
-  try {
-    let bytesRead
-
-    do {
-      bytesRead = fs.readSync(fd, buffer, 0, BUFFER_SIZE)
-      hash.update(buffer.slice(0, bytesRead))
-    } while (bytesRead === BUFFER_SIZE)
-  } finally {
-    fs.closeSync(fd)
-  }
-
-  return hash.digest('hex')
-}
-
-function md5File (path) {
-  return new Promise((resolve, reject) => {
-    const output = crypto.createHash('md5')
-    const input = fs.createReadStream(path)
-
-    input.on('error', (err) => {
-      reject(err)
-    })
-
-    output.once('readable', () => {
-      resolve(output.read().toString('hex'))
-    })
-
-    input.pipe(output)
-  })
-}
-
-module.exports = md5File
-module.exports.sync = md5FileSync
-
-
 /***/ }),
 
 /***/ "./node_modules/md5/md5.js":

package/package.json

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