@gooddata/data-layer - npm Package Compare versions

Comparing version 7.0.0-alpha2 to 7.0.0-alpha3

dist/adapters/ExecuteAfmAdapter.d.ts

@@ -6,6 +6,6 @@ import { ISdk } from 'gooddata';
 export declare class ExecuteAfmAdapter implements IAdapter<Execution.IExecutionResponses> {
+    private projectId;
     private sdk;
-    private projectId;
     constructor(sdk: ISdk, projectId: string);
     createDataSource(afm: AFM.IAfm, fingerprint?: string): Promise<IDataSource<Execution.IExecutionResponses>>;
 }

dist/adapters/ExecuteAfmAdapter.js

@@ -5,6 +5,8 @@ "use strict";
 var filters_1 = require("../helpers/filters");
+var package_json_1 = require("../../package.json");
 var ExecuteAfmAdapter = /** @class */ (function () {
     function ExecuteAfmAdapter(sdk, projectId) {
-        this.sdk = sdk;
         this.projectId = projectId;
+        this.sdk = sdk.clone();
+        this.sdk.config.setJsPackage(package_json_1.name, package_json_1.version);
     }
@@ -11,0 +13,0 @@ ExecuteAfmAdapter.prototype.createDataSource = function (afm, fingerprint) {

dist/adapters/UriAdapter.d.ts

@@ -7,5 +7,5 @@ import { Execution } from '@gooddata/typings';
 export declare class UriAdapter implements IAdapter<Execution.IExecutionResponses> {
-    private sdk;
     private projectId;
     private executeAdapterFactory;
+    private sdk;
     private uri;
@@ -12,0 +12,0 @@ private visualizationObject;

dist/adapters/UriAdapter.js

@@ -6,2 +6,3 @@ "use strict";
 var AfmUtils_1 = require("../utils/AfmUtils");
+var package_json_1 = require("../../package.json");
 function defaultExecuteAdapterFactory(sdk, projectId) {
@@ -13,5 +14,6 @@ return new ExecuteAfmAdapter_1.ExecuteAfmAdapter(sdk, projectId);
         if (executeAdapterFactory === void 0) { executeAdapterFactory = defaultExecuteAdapterFactory; }
-        this.sdk = sdk;
         this.projectId = projectId;
         this.executeAdapterFactory = executeAdapterFactory;
+        this.sdk = sdk.clone();
+        this.sdk.config.setJsPackage(package_json_1.name, package_json_1.version);
     }
@@ -18,0 +20,0 @@ UriAdapter.prototype.createDataSource = function (sourceParams) {

package.json

 {
   "name": "@gooddata/data-layer",
-  "version": "7.0.0-alpha2",
+  "version": "7.0.0-alpha3",
   "description": "",
@@ -25,3 +25,3 @@ "main": "dist/index.js",
     "@types/node": "7.0.8",
-    "gooddata": "6.0.0-alpha1",
+    "gooddata": "6.0.0-alpha2",
     "jest": "21.1.0",
@@ -28,0 +28,0 @@ "jest-junit": "3.0.0",

README.md

@@ -46,3 +46,3 @@ # gooddata-data-layer
 git checkout master && git pull upstream master --tags
-npm version patch -m "Release v%s"
+npm version patch -m "v%s"
 npm publish --tag alpha
@@ -49,0 +49,0 @@ git push upstream master --tags

src/adapters/ExecuteAfmAdapter.ts

@@ -7,6 +7,12 @@ import { ISdk } from 'gooddata';
 import { handleMeasureDateFilter } from '../helpers/filters';
+import { name as pkgName, version as pkgVersion } from '../../package.json';
 
 export class ExecuteAfmAdapter implements IAdapter<Execution.IExecutionResponses> {
-    constructor(private sdk: ISdk, private projectId: string) {}
+    private sdk: ISdk;
 
+    constructor(sdk: ISdk, private projectId: string) {
+        this.sdk = sdk.clone();
+        this.sdk.config.setJsPackage(pkgName, pkgVersion);
+    }
+
     public createDataSource(
@@ -13,0 +19,0 @@ afm: AFM.IAfm,

src/adapters/tests/UriAdapter.spec.ts

@@ -18,2 +18,3 @@ import { factory, ISdk } from 'gooddata';
         };
+        sdk.clone = () => sdk; // disable clone for spyOn to work
 
@@ -39,5 +40,5 @@ jest.spyOn(sdk.xhr, 'get')
     it('should handle fail of vis. obj. fetch', () => {
-        const DummySDK = createDummySDK();
-        const adapter = new UriAdapter(DummySDK, projectId);
-        DummySDK.xhr.get = jest.fn(() => Promise.reject('invalid URI'));
+        const dummySDK = createDummySDK();
+        const adapter = new UriAdapter(dummySDK, projectId);
+        dummySDK.xhr.get = jest.fn(() => Promise.reject('invalid URI'));
         return adapter.createDataSource({ uri }).catch((error) => {
@@ -49,10 +50,10 @@ expect(error).toBe('invalid URI');
     it('should request visualization object for consecutive createDataSource call only when uri changes', () => {
-        const DummySDK = createDummySDK();
-        const adapter = new UriAdapter(DummySDK, projectId);
+        const dummySDK = createDummySDK();
+        const adapter = new UriAdapter(dummySDK, projectId);
         return adapter.createDataSource({ uri }).then(() => {
-            expect(DummySDK.xhr.get).toHaveBeenCalledTimes(1);
+            expect(dummySDK.xhr.get).toHaveBeenCalledTimes(1);
             return adapter.createDataSource({ uri }).then(() => {
-                expect(DummySDK.xhr.get).toHaveBeenCalledTimes(1);
+                expect(dummySDK.xhr.get).toHaveBeenCalledTimes(1);
                 return adapter.createDataSource({ uri: uri2 }).then(() => {
-                    expect(DummySDK.xhr.get).toHaveBeenCalledTimes(2);
+                    expect(dummySDK.xhr.get).toHaveBeenCalledTimes(2);
                 });
@@ -59,0 +60,0 @@ });

src/adapters/UriAdapter.ts

@@ -10,2 +10,3 @@ import { AFM, Execution, VisualizationObject } from '@gooddata/typings';
 import { IDataSourceParams } from '../interfaces/DataSourceParams';
+import { name as pkgName, version as pkgVersion } from '../../package.json';
 
@@ -20,2 +21,3 @@ function defaultExecuteAdapterFactory(
 export class UriAdapter implements IAdapter<Execution.IExecutionResponses> {
+    private sdk: ISdk;
     private uri: string;
@@ -25,6 +27,9 @@ private visualizationObject: VisualizationObject.IVisualizationObjectResponse;
     constructor(
-        private sdk: ISdk,
+        sdk: ISdk,
         private projectId: string,
         private executeAdapterFactory: any = defaultExecuteAdapterFactory
-    ) {}
+    ) {
+        this.sdk = sdk.clone();
+        this.sdk.config.setJsPackage(pkgName, pkgVersion);
+    }
 
@@ -31,0 +36,0 @@ public createDataSource(sourceParams: IDataSourceParams): Promise<IDataSource<any>> {

No alert changes

Improved metrics

Total package byte prevSize

226110

6.27%

Number of package files

102

3.03%

Lines of code

5617

0.34%

No dependency changes