@sisense/sdk-modeling 1.10.0 → 1.11.0

package/dist/typescript/writers/base.d.ts

@@ -2,6 +2,7 @@
 import { Writer } from './interfaces.js';
 export declare const NEWLINE = "\n";
 export declare function writeIndented(stream: NodeJS.WritableStream, s: string, idnt: number): void;
+export declare function escapeSpecialChars(expression: string): string;
 export declare function template(strings: TemplateStringsArray, ...keys: string[]): any;
 export declare function rnt(idnt: number): string;
 export declare function indent(ident: number): string;

package/dist/typescript/writers/base.js

@@ -7,6 +7,9 @@ export function writeIndented(stream, s, idnt) {
     }
     stream.write(s);
 }
+export function escapeSpecialChars(expression) {
+    return expression.replace(/'/g, "\\'");
+}
 // export function ident(stream:WriteStream, ident:number) {
 //     if (ident > 0) {
 //         stream.write("\t".repeat(ident));

package/dist/typescript/writers/dimensions.js

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import { MetadataTypes, DateLevels, normalizeName, } from '@sisense/sdk-data';
-import { ElementWriter, NEWLINE, rnt, writeIndented } from './base.js';
+import { ElementWriter, NEWLINE, escapeSpecialChars, rnt, writeIndented } from './base.js';
 import { prepareDescription } from '../utils/prepare-description.js';
 export class DimensionWriter extends ElementWriter {
     constructor(dimension, isNested) {
@@ -95,7 +95,7 @@ export class DateDimensionWriter extends ElementWriter {
     writeDef(stream, ident) {
         writeIndented(stream, `createDateDimension({${NEWLINE}`, 0);
         writeIndented(stream, `name: '${this.element.name}',${NEWLINE}`, ident + 1);
-        writeIndented(stream, `expression: '${this.element.expression}',`, ident + 1);
+        writeIndented(stream, `expression: '${escapeSpecialChars(this.element.expression)}',`, ident + 1);
         if (this.element.description) {
             writeIndented(stream, `description: ${prepareDescription(this.element.description)},`, ident + 1);
         }
@@ -123,7 +123,7 @@ export class AttributeWriter extends ElementWriter {
         writeIndented(stream, `createAttribute({\
 ${rnt(ident + 2)}name: '${this.element.name}',\
 ${rnt(ident + 2)}type: '${this.element.type}',\
-${rnt(ident + 2)}expression: '${this.element.expression}',\
+${rnt(ident + 2)}expression: '${escapeSpecialChars(this.element.expression)}',\
 ${this.element.description ? `${rnt(ident + 2)}description: ${prepareDescription(this.element.description)},` : ''}\
 ${rnt(ident + 1)}}),`, ident);
     }
@@ -133,6 +133,6 @@ export class LevelWriter extends ElementWriter {
         super(level, normalizeName(level.name));
     }
     write(stream, ident) {
-        writeIndented(stream, `createAttribute({name: '${this.name}', expression: '${this.element.expression}', granularity: '${this.element.granularity}'}),`, ident);
+        writeIndented(stream, `createAttribute({name: '${this.name}', expression: '${escapeSpecialChars(this.element.expression)}', granularity: '${this.element.granularity}'}),`, ident);
     }
 }

package/package.json

@@ -11,7 +11,7 @@
     "Sisense",
     "Compose SDK"
   ],
-  "version": "1.10.0",
+  "version": "1.11.0",
   "author": "Sisense",
   "license": "SEE LICENSE IN LICENSE.md",
   "type": "module",
@@ -20,7 +20,7 @@
   "module": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {
-    "@sisense/sdk-data": "^1.10.0",
+    "@sisense/sdk-data": "^1.11.0",
     "prettier": "^3.2.5",
     "typescript": "4.8.4"
   },