Fix templates copying and export SafeExpression

json-builder/typescript/generator_config.json

@@ -1,4 +1,4 @@
 {
   "lang": "typescript",
-  "header": "// Generated code. Do not modify.\n\nimport { Exact, IntBoolean, NonEmptyArray } from '../helper';\nimport { TemplateBlock, Type } from '../template';\nimport { DivExpression } from '../expression';\n"
+  "header": "// Generated code. Do not modify.\n\nimport { Exact, IntBoolean, NonEmptyArray } from '../helper';\nimport { TemplateBlock, Type } from '../template';\nimport { DivExpression } from '../safe-expression';\n"
 }

json-builder/typescript/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@divkitframework/jsonbuilder",
-    "version": "1.3.0",
+    "version": "1.4.0",
     "description": "DivKit TypeScript JSON Builder",
     "main": "./dist/jsonbuilder.js",
     "module": "./dist/es/jsonbuilder.js",

json-builder/typescript/src/expression.ts

@@ -1,7 +1,7 @@
-import { DivExpression, UnsafeDivExpression } from './unsafe-expression';
+import { DivExpression, SafeDivExpression } from './safe-expression';
 
 export function expression(expression: string): DivExpression {
-    return new UnsafeDivExpression(expression);
+    return new SafeDivExpression(expression);
 }
 
 const replacer: Record<string, string> = {
@@ -14,5 +14,3 @@ export function escapeExpression(str: string): string {
         return replacer[full];
     });
 }
-
-export { DivExpression };

json-builder/typescript/src/generated/BooleanVariable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * A Boolean variable in binary format.

json-builder/typescript/src/generated/ColorVariable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Variable — HEX color as a string.

json-builder/typescript/src/generated/Div.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivContainer,

json-builder/typescript/src/generated/DivAccessibility.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Accessibility for disabled people.

json-builder/typescript/src/generated/DivAction.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     IDivDownloadCallbacks,

json-builder/typescript/src/generated/DivAlignmentHorizontal.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivAlignmentHorizontal =
     | 'left'

json-builder/typescript/src/generated/DivAlignmentVertical.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivAlignmentVertical =
     | 'top'

json-builder/typescript/src/generated/DivAnimation.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAnimationInterpolator,

json-builder/typescript/src/generated/DivAnimationInterpolator.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivAnimationInterpolator =
     | 'linear'

json-builder/typescript/src/generated/DivAppearanceSetTransition.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAppearanceTransition,

json-builder/typescript/src/generated/DivAppearanceTransition.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAppearanceSetTransition,

json-builder/typescript/src/generated/DivAspect.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Size with a fixed aspect ratio. It counts height from width and ignores other specified height

json-builder/typescript/src/generated/DivBackground.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivImageBackground,

json-builder/typescript/src/generated/DivBase.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivBorder.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     IDivCornersRadius,

json-builder/typescript/src/generated/DivChangeBoundsTransition.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAnimationInterpolator,

json-builder/typescript/src/generated/DivChangeSetTransition.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivChangeTransition,

json-builder/typescript/src/generated/DivChangeTransition.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivChangeBoundsTransition,

json-builder/typescript/src/generated/DivContainer.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivCornersRadius.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Sets corner rounding.

json-builder/typescript/src/generated/DivCount.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivFixedCount,

json-builder/typescript/src/generated/DivCustom.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivData.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivDimension.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivSizeUnit,

json-builder/typescript/src/generated/DivDownloadCallbacks.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     IDivAction,

json-builder/typescript/src/generated/DivDrawable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivShapeDrawable,

json-builder/typescript/src/generated/DivEdgeInsets.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivSizeUnit,

json-builder/typescript/src/generated/DivExtension.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Extension that affects an element.

json-builder/typescript/src/generated/DivFadeTransition.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAnimationInterpolator,

json-builder/typescript/src/generated/DivFixedCount.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Fixed number of repetitions.

json-builder/typescript/src/generated/DivFixedSize.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivSizeUnit,

json-builder/typescript/src/generated/DivFocus.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivBackground,

json-builder/typescript/src/generated/DivFontFamily.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivFontFamily =
     | 'text'

json-builder/typescript/src/generated/DivFontWeight.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivFontWeight =
     | 'light'

json-builder/typescript/src/generated/DivGallery.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivGifImage.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivGrid.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivImage.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivImageBackground.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivImageScale.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivImageScale =
     | 'fill'

json-builder/typescript/src/generated/DivIndicator.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivInfinityCount.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Infinite number of repetitions.

json-builder/typescript/src/generated/DivInput.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivLineStyle.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivLineStyle =
     | 'none'

json-builder/typescript/src/generated/DivLinearGradient.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Linear gradient.

json-builder/typescript/src/generated/DivMatchParentSize.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Element size adjusts to a parent element.

json-builder/typescript/src/generated/DivNeighbourPageSize.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivFixedSize,

json-builder/typescript/src/generated/DivPageSize.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivPercentageSize,

json-builder/typescript/src/generated/DivPager.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivPagerLayoutMode.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivNeighbourPageSize,

json-builder/typescript/src/generated/DivPatch.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivPercentageSize.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Percentage value of the element size.

json-builder/typescript/src/generated/DivPivot.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivPivotFixed,

json-builder/typescript/src/generated/DivPivotFixed.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivSizeUnit,

json-builder/typescript/src/generated/DivPivotPercentage.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Location of the coordinate of the axis of rotation as a percentage relative to the element.

json-builder/typescript/src/generated/DivPoint.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     IDivDimension,

json-builder/typescript/src/generated/DivRadialGradient.ts

@@ -2,7 +2,12 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
+
+import {
+    DivRadialGradientCenter,
+    DivRadialGradientRadius,
+} from './';
 
 /**
  * Radial gradient.
@@ -12,23 +17,21 @@ export class DivRadialGradient<T extends DivRadialGradientProps = DivRadialGradi
 
     readonly type = 'radial_gradient';
     /**
-     * Shift of the central point of the gradient relative to the left edge along the X axis in the
-     * range `0..1`.
+     * Shift of the central point of the gradient relative to the left edge along the X axis.
      */
-    center_x?: Type<number | DivExpression>;
+    center_x?: Type<DivRadialGradientCenter>;
     /**
-     * Shift of the central point of the gradient relative to the upper edge along the Y axis in the
-     * range `0..1`.
+     * Shift of the central point of the gradient relative to the upper edge along the Y axis.
      */
-    center_y?: Type<number | DivExpression>;
+    center_y?: Type<DivRadialGradientCenter>;
     /**
      * Colors. Gradient points will be located at an equal distance from each other.
      */
     colors: Type<NonEmptyArray<string | DivExpression>>;
     /**
-     * Radius of the gradient transition in `dp`.
+     * Radius of the gradient transition.
      */
-    radius: Type<number | DivExpression>;
+    radius?: Type<DivRadialGradientRadius>;
 
     constructor(props: Exact<DivRadialGradientProps, T>) {
         this.center_x = props.center_x;
@@ -40,21 +43,19 @@ export class DivRadialGradient<T extends DivRadialGradientProps = DivRadialGradi
 
 export interface DivRadialGradientProps {
     /**
-     * Shift of the central point of the gradient relative to the left edge along the X axis in the
-     * range `0..1`.
+     * Shift of the central point of the gradient relative to the left edge along the X axis.
      */
-    center_x?: Type<number | DivExpression>;
+    center_x?: Type<DivRadialGradientCenter>;
     /**
-     * Shift of the central point of the gradient relative to the upper edge along the Y axis in the
-     * range `0..1`.
+     * Shift of the central point of the gradient relative to the upper edge along the Y axis.
      */
-    center_y?: Type<number | DivExpression>;
+    center_y?: Type<DivRadialGradientCenter>;
     /**
      * Colors. Gradient points will be located at an equal distance from each other.
      */
     colors: Type<NonEmptyArray<string | DivExpression>>;
     /**
-     * Radius of the gradient transition in `dp`.
+     * Radius of the gradient transition.
      */
-    radius: Type<number | DivExpression>;
+    radius?: Type<DivRadialGradientRadius>;
 }

json-builder/typescript/src/generated/DivRadialGradientCenter.ts

@@ -0,0 +1,14 @@
+// Generated code. Do not modify.
+
+import { Exact, IntBoolean, NonEmptyArray } from '../helper';
+import { TemplateBlock, Type } from '../template';
+import { DivExpression } from '../safe-expression';
+
+import {
+    DivRadialGradientFixedCenter,
+    DivRadialGradientRelativeCenter,
+} from './';
+
+export type DivRadialGradientCenter =
+    | DivRadialGradientFixedCenter
+    | DivRadialGradientRelativeCenter;

json-builder/typescript/src/generated/DivRadialGradientFixedCenter.ts

@@ -0,0 +1,44 @@
+// Generated code. Do not modify.
+
+import { Exact, IntBoolean, NonEmptyArray } from '../helper';
+import { TemplateBlock, Type } from '../template';
+import { DivExpression } from '../safe-expression';
+
+import {
+    DivSizeUnit,
+} from './';
+
+/**
+ * Fixed central point of the gradient.
+ */
+export class DivRadialGradientFixedCenter<T extends DivRadialGradientFixedCenterProps = DivRadialGradientFixedCenterProps> {
+    readonly _props?: Exact<DivRadialGradientFixedCenterProps, T>;
+
+    readonly type = 'fixed';
+    /**
+     * Unit of measurement. To learn more about units of size measurement, see [Layout inside the
+     * card](../../layout.dita).
+     */
+    unit?: Type<DivSizeUnit | DivExpression>;
+    /**
+     * Shift value of the fixed central point of the gradient.
+     */
+    value: Type<number | DivExpression>;
+
+    constructor(props: Exact<DivRadialGradientFixedCenterProps, T>) {
+        this.unit = props.unit;
+        this.value = props.value;
+    }
+}
+
+export interface DivRadialGradientFixedCenterProps {
+    /**
+     * Unit of measurement. To learn more about units of size measurement, see [Layout inside the
+     * card](../../layout.dita).
+     */
+    unit?: Type<DivSizeUnit | DivExpression>;
+    /**
+     * Shift value of the fixed central point of the gradient.
+     */
+    value: Type<number | DivExpression>;
+}

json-builder/typescript/src/generated/DivRadialGradientRadius.ts

@@ -0,0 +1,14 @@
+// Generated code. Do not modify.
+
+import { Exact, IntBoolean, NonEmptyArray } from '../helper';
+import { TemplateBlock, Type } from '../template';
+import { DivExpression } from '../safe-expression';
+
+import {
+    DivFixedSize,
+    DivRadialGradientRelativeRadius,
+} from './';
+
+export type DivRadialGradientRadius =
+    | DivFixedSize
+    | DivRadialGradientRelativeRadius;

json-builder/typescript/src/generated/DivRadialGradientRelativeCenter.ts

@@ -0,0 +1,29 @@
+// Generated code. Do not modify.
+
+import { Exact, IntBoolean, NonEmptyArray } from '../helper';
+import { TemplateBlock, Type } from '../template';
+import { DivExpression } from '../safe-expression';
+
+/**
+ * Relative central point of the gradient.
+ */
+export class DivRadialGradientRelativeCenter<T extends DivRadialGradientRelativeCenterProps = DivRadialGradientRelativeCenterProps> {
+    readonly _props?: Exact<DivRadialGradientRelativeCenterProps, T>;
+
+    readonly type = 'relative';
+    /**
+     * Shift value of the central relative point of the gradient in the range `0..1`.
+     */
+    value: Type<number | DivExpression>;
+
+    constructor(props: Exact<DivRadialGradientRelativeCenterProps, T>) {
+        this.value = props.value;
+    }
+}
+
+export interface DivRadialGradientRelativeCenterProps {
+    /**
+     * Shift value of the central relative point of the gradient in the range `0..1`.
+     */
+    value: Type<number | DivExpression>;
+}

json-builder/typescript/src/generated/DivRadialGradientRelativeRadius.ts

@@ -0,0 +1,35 @@
+// Generated code. Do not modify.
+
+import { Exact, IntBoolean, NonEmptyArray } from '../helper';
+import { TemplateBlock, Type } from '../template';
+import { DivExpression } from '../safe-expression';
+
+/**
+ * Relative radius of the gradient transition.
+ */
+export class DivRadialGradientRelativeRadius<T extends DivRadialGradientRelativeRadiusProps = DivRadialGradientRelativeRadiusProps> {
+    readonly _props?: Exact<DivRadialGradientRelativeRadiusProps, T>;
+
+    readonly type = 'relative';
+    /**
+     * Type of relative radius of the gradient transition.
+     */
+    value: Type<DivRadialGradientRelativeRadiusValue | DivExpression>;
+
+    constructor(props: Exact<DivRadialGradientRelativeRadiusProps, T>) {
+        this.value = props.value;
+    }
+}
+
+export interface DivRadialGradientRelativeRadiusProps {
+    /**
+     * Type of relative radius of the gradient transition.
+     */
+    value: Type<DivRadialGradientRelativeRadiusValue | DivExpression>;
+}
+
+export type DivRadialGradientRelativeRadiusValue =
+    | 'nearest_corner'
+    | 'farthest_corner'
+    | 'nearest_side'
+    | 'farthest_side';

json-builder/typescript/src/generated/DivRoundedRectangleShape.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivFixedSize,

json-builder/typescript/src/generated/DivScaleTransition.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAnimationInterpolator,

json-builder/typescript/src/generated/DivSeparator.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivShadow.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     IDivPoint,

json-builder/typescript/src/generated/DivShape.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivRoundedRectangleShape,

json-builder/typescript/src/generated/DivShapeDrawable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivShape,

json-builder/typescript/src/generated/DivSize.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivFixedSize,

json-builder/typescript/src/generated/DivSizeUnit.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivSizeUnit =
     | 'dp'

json-builder/typescript/src/generated/DivSlideTransition.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAnimationInterpolator,

json-builder/typescript/src/generated/DivSlider.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivSolidBackground.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Solid background color.

json-builder/typescript/src/generated/DivState.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivStroke.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivSizeUnit,

json-builder/typescript/src/generated/DivTabs.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivText.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAlignmentHorizontal,

json-builder/typescript/src/generated/DivTextGradient.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivLinearGradient,

json-builder/typescript/src/generated/DivTooltip.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     Div,

json-builder/typescript/src/generated/DivTransform.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivPivot,

json-builder/typescript/src/generated/DivTransitionBase.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     DivAnimationInterpolator,

json-builder/typescript/src/generated/DivTransitionSelector.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivTransitionSelector =
     | 'none'

json-builder/typescript/src/generated/DivTransitionTrigger.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivTransitionTrigger =
     | 'data_change'

json-builder/typescript/src/generated/DivTrigger.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     IDivAction,

json-builder/typescript/src/generated/DivVariable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     BooleanVariable,

json-builder/typescript/src/generated/DivVisibility.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 export type DivVisibility =
     | 'visible'

json-builder/typescript/src/generated/DivVisibilityAction.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 import {
     IDivDownloadCallbacks,

json-builder/typescript/src/generated/DivWrapContentSize.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * The size of an element adjusts to its contents.

json-builder/typescript/src/generated/IntegerVariable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * An integer variable.

json-builder/typescript/src/generated/NumberVariable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * A floating-point variable.

json-builder/typescript/src/generated/StringVariable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * A string variable.

json-builder/typescript/src/generated/UrlVariable.ts

@@ -2,7 +2,7 @@
 
 import { Exact, IntBoolean, NonEmptyArray } from '../helper';
 import { TemplateBlock, Type } from '../template';
-import { DivExpression } from '../expression';
+import { DivExpression } from '../safe-expression';
 
 /**
  * Variable — URL as a string.

json-builder/typescript/src/generated/index.ts

@@ -57,6 +57,11 @@ export * from './DivPivotFixed';
 export * from './DivPivotPercentage';
 export * from './DivPoint';
 export * from './DivRadialGradient';
+export * from './DivRadialGradientCenter';
+export * from './DivRadialGradientFixedCenter';
+export * from './DivRadialGradientRadius';
+export * from './DivRadialGradientRelativeCenter';
+export * from './DivRadialGradientRelativeRadius';
 export * from './DivRoundedRectangleShape';
 export * from './DivScaleTransition';
 export * from './DivSeparator';

json-builder/typescript/src/helper.ts

@@ -1,4 +1,5 @@
 import { ITemplates } from './template';
+import { SafeDivExpression } from './safe-expression';
 
 export type NonEmptyArray<T> = T[];
 
@@ -37,7 +38,7 @@ export function copyTemplates<T extends ITemplates>(templates: T): T {
     const copy: ITemplates = {};
 
     const placeHolder = (node: unknown): unknown => {
-        if (!node || ['string', 'number'].includes(typeof node)) {
+        if (!node || ['string', 'number', 'boolean'].includes(typeof node) || node instanceof SafeDivExpression) {
             return node;
         }
 

json-builder/typescript/src/index.ts

@@ -3,6 +3,7 @@ export * from './div-utils';
 export * from './expression';
 export * from './generated';
 export * from './helper';
+export * from './safe-expression';
 export * from './template';
 export * from './template-helper';
 export * from './template-helper-deps';

json-builder/typescript/src/safe-expression.ts

@@ -4,7 +4,7 @@ export interface DivExpression {
     [expr]: string;
 }
 
-export class UnsafeDivExpression implements DivExpression {
+export class SafeDivExpression implements DivExpression {
     public [expr]: string;
 
     public constructor(expression: string) {

json-builder/typescript/src/template.ts

@@ -2,7 +2,7 @@
 
 import { Div } from './generated/Div';
 import { IDivData } from './generated/DivData';
-import { UnsafeDivExpression } from './unsafe-expression';
+import { SafeDivExpression } from './safe-expression';
 import { escapeExpression } from './expression';
 
 export interface ITemplates {
@@ -50,7 +50,7 @@ export function template<T extends string = any, U = object>(type: T, props?: U)
 export function escapeCard(obj: unknown): unknown {
     if (typeof obj === 'string') {
         return escapeExpression(obj);
-    } else if (obj instanceof UnsafeDivExpression) {
+    } else if (obj instanceof SafeDivExpression) {
         return obj.toJSON();
     } else if (obj && typeof obj === 'object') {
         if (Array.isArray(obj)) {