@kontur.candy/generator 5.32.0-RPN2721v2.0 → 5.32.0

package/dist/index.js

@@ -58544,6 +58544,30 @@ function isContextualActionName(handlerName) {
 
 /***/ }),
 
+/***/ "./Common/FormPathUtils.ts":
+/*!*********************************!*\
+  !*** ./Common/FormPathUtils.ts ***!
+  \*********************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   extractGfvFromFormPath: () => (/* binding */ extractGfvFromFormPath)
+/* harmony export */ });
+/* harmony import */ var _TypingUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./TypingUtils */ "./Common/TypingUtils.ts");
+/* harmony import */ var _WellKnownDirectories__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./WellKnownDirectories */ "./Common/WellKnownDirectories.ts");
+
+
+function extractGfvFromFormPath(formPath) {
+  var _ref, _match$groups$gfv, _match$groups, _match$groups2;
+  const regexp = new RegExp(`([\\/\\\\](?<gfv1>\\d{6,})[\\/\\\\]${_WellKnownDirectories__WEBPACK_IMPORTED_MODULE_1__.WellKnownDirectories.CandySubdirectoryName})|(((\\.farm)|(${_WellKnownDirectories__WEBPACK_IMPORTED_MODULE_1__.WellKnownDirectories.TestFarmDir}))[\\/\\\\]forms[\\/\\\\](?<gfv2>\\d{6,}))`);
+  const match = regexp.exec(formPath);
+  return (_ref = (_match$groups$gfv = match === null || match === void 0 ? void 0 : (_match$groups = match.groups) === null || _match$groups === void 0 ? void 0 : _match$groups["gfv1"]) !== null && _match$groups$gfv !== void 0 ? _match$groups$gfv : match === null || match === void 0 ? void 0 : (_match$groups2 = match.groups) === null || _match$groups2 === void 0 ? void 0 : _match$groups2["gfv2"]) !== null && _ref !== void 0 ? _ref : (0,_TypingUtils__WEBPACK_IMPORTED_MODULE_0__.reject)(`Unable to determine gfv from path: ${formPath}`);
+}
+
+/***/ }),
+
 /***/ "./Common/IndentString.ts":
 /*!********************************!*\
   !*** ./Common/IndentString.ts ***!
@@ -60312,6 +60336,25 @@ function assertIs(value) {
 
 /***/ }),
 
+/***/ "./Common/WellKnownDirectories.ts":
+/*!****************************************!*\
+  !*** ./Common/WellKnownDirectories.ts ***!
+  \****************************************/
+/***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
+
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   WellKnownDirectories: () => (/* binding */ WellKnownDirectories)
+/* harmony export */ });
+class WellKnownDirectories {}
+WellKnownDirectories.CandySubdirectoryName = "Candy";
+WellKnownDirectories.FormJsonFileName = "form.json";
+WellKnownDirectories.GeneratedFormSubdirectory = "form";
+WellKnownDirectories.TestFarmDir = "TestFarm";
+
+/***/ }),
+
 /***/ "./Common/getRngSchemaFilename.ts":
 /*!****************************************!*\
   !*** ./Common/getRngSchemaFilename.ts ***!
@@ -80228,6 +80271,8 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony import */ var recursive_readdir__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(recursive_readdir__WEBPACK_IMPORTED_MODULE_7__);
 /* harmony import */ var _common_ExtractSugarReferences__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! ../common/ExtractSugarReferences */ "./Generator/src/common/ExtractSugarReferences.ts");
 /* harmony import */ var _Common_getRngSchemaFilename__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! ../../../Common/getRngSchemaFilename */ "./Common/getRngSchemaFilename.ts");
+/* harmony import */ var _Common_FormPathUtils__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! ../../../Common/FormPathUtils */ "./Common/FormPathUtils.ts");
+
 
 
 
@@ -80244,7 +80289,7 @@ const readdirAsync = (0,util__WEBPACK_IMPORTED_MODULE_2__.promisify)(fs__WEBPACK
 async function readFormSources(formSourcesPath, farmDirectory) {
   var _JSON$parse$settings;
   const rootPath = farmDirectory;
-  const formName = path__WEBPACK_IMPORTED_MODULE_1___default().basename(formSourcesPath);
+  const gfv = (0,_Common_FormPathUtils__WEBPACK_IMPORTED_MODULE_10__.extractGfvFromFormPath)(formSourcesPath);
   const formSugarDirectoryPath = path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "sugar");
   const sugarReferences = await extractReferences(formSugarDirectoryPath);
   const sugarContent = await readSugarFiles(formSugarDirectoryPath, sugarReferences);
@@ -80257,7 +80302,7 @@ async function readFormSources(formSourcesPath, farmDirectory) {
   const result = {
     sugarContent: sugarContent,
     resources: {
-      gfv: path__WEBPACK_IMPORTED_MODULE_1___default().basename(formSourcesPath),
+      gfv: gfv,
       formSourcesPath: formSourcesPath,
       formJsonSettings: (_JSON$parse$settings = JSON.parse(await readFileSource(formSourcesPath, "form.json", "{}"))["settings"]) !== null && _JSON$parse$settings !== void 0 ? _JSON$parse$settings : {},
       additionalSettings: await readFileSource(formSourcesPath, "settings.json", "{}"),
@@ -80265,9 +80310,9 @@ async function readFormSources(formSourcesPath, farmDirectory) {
       helpersContent: await readJavaScriptFilesWithNames(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "helpers")),
       commonHelpersContent: await readJavaScriptFilesWithNames(path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "jsHelpers")),
       validationsContent: await readJavaScriptFilesWithNames(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "validations")),
-      schemaRngContent: await readSchemaRngFile(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "schemas"), formName),
-      kcJsXmlContent: (await readFileSource(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "autocalc"), `${formName}.КС.candy.js.xml`, "<dummy/>")) || "",
-      kcLangContent: (await readFileSource(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "autocalc"), `${formName}.КС.candy.js.kclang`, "")) || "",
+      schemaRngContent: await readSchemaRngFile(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "schemas"), gfv),
+      kcJsXmlContent: (await readFileSource(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "autocalc"), `${gfv}.КС.candy.js.xml`, "<dummy/>")) || "",
+      kcLangContent: (await readFileSource(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "autocalc"), `${gfv}.КС.candy.js.kclang`, "")) || "",
       tourSteps: await readFileSource(path__WEBPACK_IMPORTED_MODULE_1___default().join(rootPath, "tour"), "tour.js", "{}"),
       hooksContent: await readHooksFile(formSourcesPath),
       customControlsContent: await readCustomControlsFiles(path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "controls")),
@@ -80277,8 +80322,8 @@ async function readFormSources(formSourcesPath, farmDirectory) {
       additionalNormalizers: await readAdditionalNormalizersFiles(formSourcesPath)
     }
   };
-  if (formName.startsWith("4")) {
-    const commonResourcesPath = path__WEBPACK_IMPORTED_MODULE_1___default().join(formSourcesPath, "..", "..", "commonResources");
+  if (gfv.startsWith("4")) {
+    const commonResourcesPath = path__WEBPACK_IMPORTED_MODULE_1___default().join(farmDirectory, "commonResources");
     // tslint:disable-next-line no-unsafe-any
     const {
       elements

package/package.json

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