@kontur.candy/generator 5.115.1-enhanced-server-filters.1 → 5.115.1-enhanced-server-filters.3

package/dist/index.js

@@ -47494,6 +47494,26 @@ class ModelPathImpl {
     // @ts-expect-error
     return result.toPath();
   }
+  applyCommonInstancesFromAnotherPath(modelPath) {
+    const anotherTokens = modelPath.getPathPartsAsArray();
+    const updatedTokens = this.tokens.reduce((acc, token, index) => {
+      const anotherToken = anotherTokens[index];
+      const nextTokenInfo = acc.matching && (PathTokens.isMultiToken(token) && PathTokens.isInstanceToken(anotherToken) || PathTokens.isSimpleToken(token) && PathTokens.isSimpleToken(anotherToken) && token === anotherToken) ? {
+        nextToken: anotherToken,
+        matching: true
+      } : {
+        nextToken: token,
+        matching: false
+      };
+      acc.matching = nextTokenInfo.matching;
+      acc.tokens[index] = nextTokenInfo.nextToken;
+      return acc;
+    }, {
+      tokens: Array.from(this.tokens),
+      matching: true
+    }).tokens;
+    return new ModelPathImpl(updatedTokens, this.absolute);
+  }
   pathPartToString(pathPart) {
     if (typeof pathPart === "string") {
       return pathPart;
@@ -92154,7 +92174,9 @@ class FilterDateRangeConverter extends _SugarNodeConverter__WEBPACK_IMPORTED_MOD
     const markupBuilder = (0,_ComponentMarkupBuilder_ComponentMarkupBuilder__WEBPACK_IMPORTED_MODULE_2__.componentMarkupBuilder)("FilterDateRange");
     markupBuilder.prop(x => x.dataPath).set(dataPath);
     markupBuilder.prop(x => x.filteredUniqKey).set(node.filteredUniqKey);
-    markupBuilder.prop(x => x.convertDateToTicksInFilterExpression).set(useServerFilters);
+    if (useServerFilters) {
+      markupBuilder.prop(x => x.convertDateToTicksInFilterExpression).set(useServerFilters);
+    }
     return markupBuilder.buildConverterResult();
   }
 }
@@ -105349,8 +105371,8 @@ class KCLangCalculationsBuildContext {
   getFirstAcceptedParent(schemaNode) {
     let parentNode = schemaNode === null || schemaNode === void 0 ? void 0 : schemaNode.parent;
     while (parentNode != undefined) {
-      if (parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_28__.FormSchemaRngElement) {
-        if (parentNode.isOptional() && !parentNode.multiple) {
+      if (parentNode instanceof _common_SchemaRng_FormSchemaRng__WEBPACK_IMPORTED_MODULE_28__.FormSchemaRngElement && !parentNode.multiple) {
+        if (parentNode.isOptional()) {
           return parentNode;
         }
         parentNode = parentNode.parent;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kontur.candy/generator",
-  "version": "5.115.1-enhanced-server-filters.1",
+  "version": "5.115.1-enhanced-server-filters.3",
   "description": "Candy forms generator",
   "author": "SKBKontur Candy Team",
   "private": false,