@gooddata/sdk-model - npm Package Compare versions

Comparing version 8.0.0-beta.13 to 8.0.0-beta.14

dist/execution/filter/factory.d.ts

 import { IAttributeElements, ComparisonConditionOperator, IAbsoluteDateFilter, IMeasureValueFilter, INegativeAttributeFilter, IPositiveAttributeFilter, IRelativeDateFilter, RangeConditionOperator } from "./index";
 import { IAttribute } from "../attribute";
-import { ObjRefInScope, ObjRef, Identifier } from "../../objRef";
+import { ObjRef, Identifier, UriRef, LocalIdRef } from "../../objRef";
 import { IMeasure } from "../measure";
@@ -53,3 +53,3 @@ /**
  */
-export declare function newMeasureValueFilter(measureOrRef: IMeasure | ObjRefInScope | string, operator: ComparisonConditionOperator, value: number, treatNullValuesAs?: number): IMeasureValueFilter;
+export declare function newMeasureValueFilter(measureOrRef: IMeasure | UriRef | LocalIdRef | string, operator: ComparisonConditionOperator, value: number, treatNullValuesAs?: number): IMeasureValueFilter;
 /**
@@ -67,2 +67,2 @@ * Creates a new measure value filter.
  */
-export declare function newMeasureValueFilter(measureOrRef: IMeasure | ObjRefInScope | string, operator: RangeConditionOperator, from: number, to: number, treatNullValuesAs?: number): IMeasureValueFilter;
+export declare function newMeasureValueFilter(measureOrRef: IMeasure | UriRef | LocalIdRef | string, operator: RangeConditionOperator, from: number, to: number, treatNullValuesAs?: number): IMeasureValueFilter;

dist/execution/filter/index.d.ts

@@ -1,2 +0,2 @@
-import { ObjRef, ObjRefInScope } from "../../objRef";
+import { ObjRef, ObjRefInScope, UriRef, LocalIdRef } from "../../objRef";
 /**
@@ -170,3 +170,3 @@ * Attribute elements specified by their URI.
     measureValueFilter: {
-        measure: ObjRefInScope;
+        measure: UriRef | LocalIdRef;
         condition?: MeasureValueFilterCondition;
@@ -173,0 +173,0 @@ };

package.json

 {
 	"name": "@gooddata/sdk-model",
-	"version": "8.0.0-beta.13",
+	"version": "8.0.0-beta.14",
 	"author": "GoodData",
@@ -5,0 +5,0 @@ "description": "GoodData Model definitions used by UI components and Backend SPI and its implementations",

src/execution/filter/factory.ts

@@ -15,3 +15,3 @@ // (C) 2019-2020 GoodData Corporation
 import { IAttribute, attributeDisplayFormRef } from "../attribute";
-import { ObjRefInScope, ObjRef, isObjRef, Identifier } from "../../objRef";
+import { ObjRef, isObjRef, Identifier, UriRef, LocalIdRef } from "../../objRef";
 import { IMeasure, isMeasure, measureLocalId } from "../measure";
@@ -139,3 +139,3 @@ import { idRef, localIdRef } from "../../objRef/factory";
 export function newMeasureValueFilter(
-    measureOrRef: IMeasure | ObjRefInScope | string,
+    measureOrRef: IMeasure | UriRef | LocalIdRef | string,
     operator: ComparisonConditionOperator,
@@ -159,3 +159,3 @@ value: number,
 export function newMeasureValueFilter(
-    measureOrRef: IMeasure | ObjRefInScope | string,
+    measureOrRef: IMeasure | UriRef | LocalIdRef | string,
     operator: RangeConditionOperator,
@@ -180,3 +180,3 @@ from: number,
 export function newMeasureValueFilter(
-    measureOrRef: IMeasure | ObjRefInScope | string,
+    measureOrRef: IMeasure | UriRef | LocalIdRef | string,
     operator: ComparisonConditionOperator | RangeConditionOperator,
@@ -187,3 +187,3 @@ val1: number,
 ): IMeasureValueFilter {
-    const ref: ObjRefInScope = isMeasure(measureOrRef)
+    const ref: UriRef | LocalIdRef = isMeasure(measureOrRef)
         ? { localIdentifier: measureLocalId(measureOrRef) }
@@ -190,0 +190,0 @@ : typeof measureOrRef === "string"

src/execution/filter/index.ts

 // (C) 2019-2020 GoodData Corporation
 import isEmpty = require("lodash/isEmpty");
 import invariant from "ts-invariant";
-import { ObjRef, ObjRefInScope } from "../../objRef";
+import { ObjRef, ObjRefInScope, UriRef, LocalIdRef } from "../../objRef";
 
@@ -197,3 +197,3 @@ /**
     measureValueFilter: {
-        measure: ObjRefInScope;
+        measure: UriRef | LocalIdRef; // keeping UriRef for the sake of legacy code
         condition?: MeasureValueFilterCondition;
@@ -200,0 +200,0 @@ };

src/execution/filter/tests/factory.test.ts

@@ -10,2 +10,3 @@ // (C) 2019-2020 GoodData Corporation
 } from "../factory";
+import { localIdRef } from "../../../objRef/factory";
 
@@ -63,8 +64,6 @@ describe("filter factory", () => {
         it("should generate comparison filter for measure identifier", () => {
-            expect(
-                newMeasureValueFilter({ identifier: "measureObjIdentifier" }, "EQUAL_TO", 11),
-            ).toMatchSnapshot();
+            expect(newMeasureValueFilter(localIdRef("measureObjLocalId"), "EQUAL_TO", 11)).toMatchSnapshot();
         });
         it("should generate comparison filter for measure local identifier", () => {
-            expect(newMeasureValueFilter("measureObjLocalId", "EQUAL_TO", 11)).toMatchSnapshot();
+            expect(newMeasureValueFilter(localIdRef("measureObjLocalId"), "EQUAL_TO", 11)).toMatchSnapshot();
         });
@@ -79,3 +78,3 @@ it("should generate comparison filter for measure object with treatNullValuesAs", () => {
             expect(
-                newMeasureValueFilter({ identifier: "measureObjIdentifier" }, "BETWEEN", 0, 100),
+                newMeasureValueFilter(localIdRef("measureObjLocalId"), "BETWEEN", 0, 100),
             ).toMatchSnapshot();
@@ -82,0 +81,0 @@ });

No alert changes

Improved metrics

Total package byte prevSize

977932

0.02%

Worsened metrics

Lines of code

23174

0

No dependency changes