@kontur.candy/generator 4.250.0-sauron.8 → 4.251.0

package/dist/index.js

@@ -112518,8 +112518,7 @@ __webpack_require__.r(__webpack_exports__);
 /* harmony export */   "createRelativeFromTokens": () => (/* binding */ createRelativeFromTokens),
 /* harmony export */   "joinModelPaths": () => (/* binding */ joinModelPaths),
 /* harmony export */   "AbsoluteModelFieldPath": () => (/* binding */ AbsoluteModelFieldPath),
-/* harmony export */   "ModelPath": () => (/* binding */ ModelPath),
-/* harmony export */   "AbsoluteModelPath": () => (/* binding */ AbsoluteModelPath)
+/* harmony export */   "ModelPathImpl": () => (/* binding */ ModelPathImpl)
 /* harmony export */ });
 /* harmony import */ var _IterableUtils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ../IterableUtils */ "./Common/IterableUtils.ts");
 /* harmony import */ var _TypingUtils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ../TypingUtils */ "./Common/TypingUtils.ts");
@@ -112550,7 +112549,7 @@ class PathTokens {
 PathTokens.each = EachSymbol;
 PathTokens.current = CurrentSymbol;
 function isModelPath(path) {
-  return typeof path !== "string" && path instanceof ModelPath;
+  return typeof path !== "string" && path instanceof ModelPathImpl;
 }
 function convertToLegacyPath(path) {
   return isModelPath(path) ? path.toLegacyPath() : path;
@@ -112559,10 +112558,10 @@ function convertToAbsolutModelPath(path) {
   return isModelPath(path) ? path : createAbsoluteFromMask(path, PathTokens.each);
 }
 function emptyModelPath() {
-  return new ModelPath([], false);
+  return new ModelPathImpl([], false);
 }
 function emptyAbsoluteModelPath() {
-  return new AbsoluteModelPath([]);
+  return new ModelPathImpl([], true);
 }
 function createModelPath(path, absolute) {
   const partPartStrings = path.split("/");
@@ -112570,43 +112569,43 @@ function createModelPath(path, absolute) {
 
   if (absolute === "auto") {
     if (path.startsWith("/")) {
-      return new ModelPath(partPartStrings.slice(1), true);
+      return new ModelPathImpl(partPartStrings.slice(1), true);
     } else {
-      return new ModelPath(partPartStrings, false);
+      return new ModelPathImpl(partPartStrings, false);
     }
   }
 
   if (absolute && path.startsWith("/")) {
-    return new ModelPath(partPartStrings.slice(1), true);
+    return new ModelPathImpl(partPartStrings.slice(1), true);
   }
 
-  return new ModelPath(partPartStrings, absolute);
+  return new ModelPathImpl(partPartStrings, absolute);
 }
 function createFromMask(path, absolute, multiplicitySymbol) {
   const partPartStrings = path.split("/").map(x => x === "*" ? multiplicitySymbol : x);
 
   if (absolute === "auto") {
     if (path.startsWith("/")) {
-      return new ModelPath(partPartStrings.slice(1), true);
+      return new ModelPathImpl(partPartStrings.slice(1), true);
     } else {
-      return new ModelPath(partPartStrings, false);
+      return new ModelPathImpl(partPartStrings, false);
     }
   }
 
   if (absolute && path.startsWith("/")) {
-    return new ModelPath(partPartStrings.slice(1), true);
+    return new ModelPathImpl(partPartStrings.slice(1), true);
   }
 
-  return new ModelPath(partPartStrings, absolute);
+  return new ModelPathImpl(partPartStrings, absolute);
 }
 function createAbsoluteFromMask(path, multiplicitySymbol) {
   const partPartStrings = path.split("/").map(x => x === "*" ? multiplicitySymbol : x);
 
   if (path.startsWith("/")) {
-    return new AbsoluteModelPath(partPartStrings.slice(1));
+    return new ModelPathImpl(partPartStrings.slice(1), true);
   }
 
-  return new AbsoluteModelPath(partPartStrings);
+  return new ModelPathImpl(partPartStrings, true);
 }
 
 function ensurePlainPathPartsDoesNotContainMultiplicity(parts) {
@@ -112620,21 +112619,21 @@ function createAbsolute(path) {
   ensurePlainPathPartsDoesNotContainMultiplicity(partPartStrings);
 
   if (path.startsWith("/")) {
-    return new AbsoluteModelPath(partPartStrings.slice(1));
+    return new ModelPathImpl(partPartStrings.slice(1), true);
   }
 
-  return new AbsoluteModelPath(partPartStrings);
+  return new ModelPathImpl(partPartStrings, true);
 }
 function createRelativeResolvedModelPath(path) {
   const partPartStrings = path.split("/");
   ensurePlainPathPartsDoesNotContainMultiplicity(partPartStrings);
-  return new ModelPath(partPartStrings, false);
+  return new ModelPathImpl(partPartStrings, false);
 }
 function createAbsoluteFromTokens(tokens) {
-  return new ModelPath(tokens, true);
+  return new ModelPathImpl(tokens, true);
 }
 function createRelativeFromTokens(tokens) {
-  return new ModelPath(tokens, false);
+  return new ModelPathImpl(tokens, false);
 }
 function joinModelPaths(...parts) {
   let absolute = false;
@@ -112643,7 +112642,7 @@ function joinModelPaths(...parts) {
   for (const joinItem of parts) {
     if (typeof joinItem === "string") {
       resultParts.push(joinItem);
-    } else if (joinItem instanceof ModelPath) {
+    } else if (isModelPath(joinItem)) {
       if (joinItem.isAbsolute()) {
         absolute = true;
         resultParts = [...joinItem.getPathPartsAsArray()];
@@ -112657,7 +112656,7 @@ function joinModelPaths(...parts) {
     }
   }
 
-  return new ModelPath(resultParts, absolute);
+  return new ModelPathImpl(resultParts, absolute);
 }
 class AbsoluteModelFieldPath {
   constructor(path, fieldName) {
@@ -112696,7 +112695,14 @@ class AbsoluteModelFieldPath {
   }
 
 }
-class ModelPath {
+
+function isAllTokensResolved(tokens) {
+  // Я что-то немогу сообразить как тут всё строго написать...
+  // @ts-expect-error
+  return tokens.every(PathTokens.isSimpleToken);
+}
+
+class ModelPathImpl {
   constructor(pathParts, absolute) {
     this.tokens = void 0;
     this.absolute = void 0;
@@ -112705,6 +112711,10 @@ class ModelPath {
     this.absolute = absolute;
   }
 
+  get resolved() {
+    return isAllTokensResolved(this.tokens);
+  }
+
   getPathParts() {
     return this.tokens;
   }
@@ -112741,6 +112751,7 @@ class ModelPath {
   }
 
   isResolved() {
+    return isAllTokensResolved(this.tokens);
     return this.tokens.every(PathTokens.isSimpleToken);
   }
 
@@ -112752,7 +112763,7 @@ class ModelPath {
         return instance;
       }
     });
-    return new ModelPath(tokens, this.absolute);
+    return new ModelPathImpl(tokens, this.absolute);
   }
 
   isContainIteration() {
@@ -112828,13 +112839,15 @@ class ModelPath {
   }
 
   isIncludes(modelPath) {
-    if (this.tokens.length !== modelPath.tokens.length) {
+    const targetTokens = modelPath.getPathPartsAsArray();
+
+    if (this.tokens.length !== targetTokens.length) {
       return false;
     }
 
     for (let i = 0; i < this.tokens.length; i++) {
       const leftPart = this.tokens[i];
-      const rightPart = modelPath.tokens[i];
+      const rightPart = targetTokens[i];
 
       if (typeof leftPart === "string") {
         if (typeof rightPart === "string") {
@@ -112883,7 +112896,7 @@ class ModelPath {
       throw new Error(`Cannot match non absolute path '${modelPath.toString()}'`);
     }
 
-    return _PathMatcher__WEBPACK_IMPORTED_MODULE_4__.PathMatcher.match(this.tokens, modelPath.tokens);
+    return _PathMatcher__WEBPACK_IMPORTED_MODULE_4__.PathMatcher.match(this.tokens, modelPath.getPathPartsAsArray());
   }
 
   *splitByMultiplicity() {
@@ -112894,7 +112907,7 @@ class ModelPath {
         lastSimpleParts.append(token);
       } else {
         if (!lastSimpleParts.empty) {
-          yield lastSimpleParts.toPath();
+          yield lastSimpleParts.toResolvedPath();
           lastSimpleParts = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(false);
         }
 
@@ -112903,7 +112916,7 @@ class ModelPath {
     }
 
     if (!lastSimpleParts.empty) {
-      yield lastSimpleParts.toPath();
+      yield lastSimpleParts.toResolvedPath();
     }
   }
 
@@ -112930,7 +112943,7 @@ class ModelPath {
       resultTokens.push(pathPart);
     }
 
-    return new ModelPath(resultTokens, this.isAbsolute());
+    return new ModelPathImpl(resultTokens, this.absolute);
   }
   /**
    * @summary Спецификаторы множественности Each заменяет на Current
@@ -112938,11 +112951,25 @@ class ModelPath {
 
 
   toCurrentIteration() {
-    return new ModelPath(this.tokens.map(x => x === PathTokens.each ? PathTokens.current : x), this.isAbsolute());
+    if (this.isResolved()) {
+      return this;
+    } else {
+      // NOTE Тут не получается наложить дискриминатор
+      // @ts-expect-error
+      const pathParts = this.tokens.map(x => x === PathTokens.each ? PathTokens.current : x);
+      return new ModelPathImpl(pathParts, this.absolute);
+    }
   }
 
   toEachIteration() {
-    return new ModelPath(this.tokens.map(x => x === PathTokens.current ? PathTokens.each : x), this.isAbsolute());
+    if (this.isResolved()) {
+      return this;
+    } else {
+      // NOTE Тут не получается наложить дискриминатор
+      // @ts-expect-error
+      const pathParts = this.tokens.map(x => x === PathTokens.current ? PathTokens.each : x);
+      return new ModelPathImpl(pathParts, this.absolute);
+    }
   }
 
   toAbsolute() {
@@ -112950,7 +112977,7 @@ class ModelPath {
       throw new Error(`Path '${this.toLegacyPath()} is not absolute'`);
     }
 
-    return new AbsoluteModelPath(this.tokens);
+    return new ModelPathImpl(this.tokens, true);
   }
 
   *getAllParentPaths() {
@@ -112966,20 +112993,22 @@ class ModelPath {
     const lastItem = _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.last(this.tokens);
 
     if (lastItem != undefined && PathTokens.isMultiToken(lastItem)) {
-      return new ModelPath(this.tokens.slice(0, -1), this.absolute);
+      return new ModelPathImpl(this.tokens.slice(0, -1), this.absolute);
     }
 
     return this;
   }
 
   getParentPath() {
-    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(this.isAbsolute());
+    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(this.absolute);
 
     for (const token of _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.skipLast(this.getPathParts(), 1)) {
       result.append(token);
-    }
+    } // Тут получается так, что по другому никак
+    // @ts-expect-error
 
-    return result.toAbsolutePath();
+
+    return result.toPath();
   }
 
   applyInstancesDirty(instances) {
@@ -112988,7 +113017,7 @@ class ModelPath {
     }
 
     let instanceCounter = 0;
-    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(false);
+    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(true);
 
     for (const token of this.getPathParts()) {
       if (PathTokens.isMultiToken(token) && instanceCounter < instances.length) {
@@ -112999,9 +113028,11 @@ class ModelPath {
       } else {
         result.append(token);
       }
-    }
+    } // Тут получается так, что по другому никак
+    // @ts-expect-error
+
 
-    return result.toAbsolutePath();
+    return result.toPath();
   }
 
   pathPartToString(pathPart) {
@@ -113020,30 +113051,6 @@ class ModelPath {
     throw new Error(`Unknown path part specified: ${(0,_TypingUtils__WEBPACK_IMPORTED_MODULE_1__.ensureAndGetString)(pathPart)}`);
   }
 
-}
-class AbsoluteModelPath extends ModelPath {
-  constructor(pathParts) {
-    super(pathParts, true);
-  }
-
-  joinWith(...path) {
-    return super.joinWith(...path).toAbsolute();
-  }
-
-  getParentPath() {
-    const result = new _ModelPathBuilder__WEBPACK_IMPORTED_MODULE_3__.ModelPathBuilder(true);
-
-    for (const token of _IterableUtils__WEBPACK_IMPORTED_MODULE_0__.IterUtils.skipLast(this.getPathParts(), 1)) {
-      result.append(token);
-    }
-
-    return result.toAbsolutePath();
-  }
-
-  applyInstancesDirty(instances) {
-    return super.applyInstancesDirty(instances).toAbsolute();
-  }
-
 }
 
 /***/ }),
@@ -113085,6 +113092,16 @@ class ModelPathBuilder {
     return (0,_ModelPath__WEBPACK_IMPORTED_MODULE_0__.joinModelPaths)(...this.parts);
   }
 
+  toResolvedPath() {
+    const result = this.toPath();
+
+    if (!result.isResolved()) {
+      throw new Error("Path cannot be casted to resolved");
+    }
+
+    return result;
+  }
+
   toAbsolutePath() {
     return this.toPath().toAbsolute();
   }
@@ -146853,7 +146870,6 @@ class HeaderPanelConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MODULE_
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_1__.componentMarkupBuilder)("HeaderPanel");
     markupBuilder.appendChild(context.convertChildNodes(node.children));
     markupBuilder.prop(x => x.onBackButtonClick).set(context.generateHelperFunctionExpression(node, "onBackButtonClick", node.onBackButtonClick));
-    markupBuilder.prop(x => x.bindingPath).set(node.getFullPath());
     markupBuilder.prop(x => x.backButtonHint).set(node.backButtonHint);
     return markupBuilder.buildConverterResult();
   }

package/package.json

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