Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(release): pull main into develop post release v3.70.0 #1975

Merged
merged 14 commits into from
Dec 17, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@rudderstack/analytics-js-monorepo",
"version": "3.69.0",
"version": "3.70.0",
"private": true,
"description": "Monorepo for RudderStack Analytics JS SDK",
"workspaces": [
Expand Down
7 changes: 7 additions & 0 deletions packages/analytics-js-common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@

This file was generated using [@jscutlery/semver](https://github.com/jscutlery/semver).

## [3.14.14](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-12-17)


### Bug Fixes

* remove circular dependency in packages ([#1973](https://github.com/rudderlabs/rudder-sdk-js/issues/1973)) ([e525496](https://github.com/rudderlabs/rudder-sdk-js/commit/e5254964310c2c73baaf4d0655c3e4025c5e7d2b))

## [3.14.13](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected]...@rudderstack/[email protected]) (2024-12-06)


Expand Down
4 changes: 2 additions & 2 deletions packages/analytics-js-common/CHANGELOG_LATEST.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## [3.14.13](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].12...@rudderstack/[email protected].13) (2024-12-06)
## [3.14.14](https://github.com/rudderlabs/rudder-sdk-js/compare/@rudderstack/[email protected].13...@rudderstack/[email protected].14) (2024-12-17)


### Bug Fixes

* integration constants file type ([#1958](https://github.com/rudderlabs/rudder-sdk-js/issues/1958)) ([e0f6ff2](https://github.com/rudderlabs/rudder-sdk-js/commit/e0f6ff28f3b02d56e862e01d308653e2178eec43))
* remove circular dependency in packages ([#1973](https://github.com/rudderlabs/rudder-sdk-js/issues/1973)) ([e525496](https://github.com/rudderlabs/rudder-sdk-js/commit/e5254964310c2c73baaf4d0655c3e4025c5e7d2b))

Empty file.
10 changes: 10 additions & 0 deletions packages/analytics-js-common/__mocks__/BufferQueue.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class BufferQueue<T> {
items: T[] = [];
enqueue = jest.fn();
dequeue = jest.fn();
isEmpty = jest.fn();
size = jest.fn();
clear = jest.fn();
}

export { BufferQueue };
16 changes: 16 additions & 0 deletions packages/analytics-js-common/__mocks__/ErrorHandler.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import type { IErrorHandler, PreLoadErrorData } from '../src/types/ErrorHandler';
import { BufferQueue } from './BufferQueue';

// Mock all the methods of the ErrorHandler class
class ErrorHandler implements IErrorHandler {
onError = jest.fn();
leaveBreadcrumb = jest.fn();
notifyError = jest.fn();
init = jest.fn();
attachErrorListeners = jest.fn();
errorBuffer = new BufferQueue<PreLoadErrorData>();
}

const defaultErrorHandler = new ErrorHandler();

export { ErrorHandler, defaultErrorHandler };
18 changes: 18 additions & 0 deletions packages/analytics-js-common/__mocks__/Logger.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import type { ILogger } from '../src/types/Logger';

class Logger implements ILogger {
warn = jest.fn();
log = jest.fn();
error = jest.fn();
info = jest.fn();
debug = jest.fn();
minLogLevel = 0;
scope = 'test scope';
setMinLogLevel = jest.fn();
setScope = jest.fn();
logProvider = console;
}

const defaultLogger = new Logger();

export { Logger, defaultLogger };
116 changes: 116 additions & 0 deletions packages/analytics-js-common/__mocks__/Storage.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
import { cookie } from '../src/component-cookie';
import type { Nullable } from '../src/types/Nullable';
import type { IStorage } from '../src/types/Store';
import store from 'storejs';

class LocalStorage implements IStorage {
keys = () => {
return store.keys();
};
isEnabled = true;
getItem = (key: string) => {
return store.get(key) ?? null;
};
setItem = (key: string, value: any) => {
store.set(key, value);
};
removeItem = (key: string) => store.remove(key);
clear = () => {
store.clear();
};
length = store.len();
key = (idx: number): Nullable<string> => {
return this.keys()[idx] ?? null;
};
}

/**
* A storage utility to retain values in memory via Storage interface
*/
class InMemoryStorage implements IStorage {
isEnabled = true;
length = 0;
data: Record<string, any> = {};

setItem(key: string, value: any): any {
this.data[key] = value;
this.length = Object.keys(this.data).length;
return value;
}

getItem(key: string): any {
if (key in this.data) {
return this.data[key];
}
return null;
}

removeItem(key: string) {
if (key in this.data) {
delete this.data[key];
}
this.length = Object.keys(this.data).length;
return null;
}

clear() {
this.data = {};
this.length = 0;
}

key(index: number): Nullable<string> {
const curKeys = this.keys();
return curKeys[index] ?? null;
}

keys(): string[] {
return Object.keys(this.data);
}
}

class CookieStorage implements IStorage {
keys = () => {
return Object.keys(cookie());
};

isEnabled = true;

getItem = (key: string) => {
const value = cookie(key);
return value ?? null;
};

setItem = (key: string, value: any) => {
cookie(key, value);
this.length = Object.keys(cookie()).length;
};

removeItem = (key: string) => {
const result = this.setItem(key, null);
this.length = Object.keys(cookie()).length;
return result;
};

clear = () => {
// Not implemented
};

length = Object.keys(cookie()).length;

key = (idx: number): Nullable<string> => {
const curKeys = this.keys();
return curKeys[idx] ?? null;
};
}

const defaultCookieStorage = new CookieStorage();

export { CookieStorage, defaultCookieStorage };

const defaultInMemoryStorage = new InMemoryStorage();

export { InMemoryStorage, defaultInMemoryStorage };

const defaultLocalStorage = new LocalStorage();

export { LocalStorage, defaultLocalStorage };
56 changes: 56 additions & 0 deletions packages/analytics-js-common/__mocks__/Store.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
import type { IStore, IStoreConfig } from '../src/types/Store';
import { defaultInMemoryStorage, defaultLocalStorage } from './Storage';

// Mock all the methods of the Store class

class Store implements IStore {
constructor(config: IStoreConfig, engine?: any) {
this.id = config.id;
this.name = config.name;
this.isEncrypted = config.isEncrypted ?? false;
this.validKeys = config.validKeys ?? {};
this.engine = engine ?? defaultLocalStorage;
this.originalEngine = this.engine;
}
id = 'test';
name = 'test';
isEncrypted = false;
validKeys: Record<string, string>;
engine = defaultLocalStorage;
originalEngine = defaultLocalStorage;
createValidKey = (key: string) => {
return [this.name, this.id, key].join('.');
};
swapQueueStoreToInMemoryEngine = () => {
this.engine.keys().forEach((key: string) => {
const value = this.engine.getItem(key);
defaultInMemoryStorage.setItem(key, value);
});

this.engine = defaultInMemoryStorage;
};
set = (key: string, value: any) => {
const validKey = this.createValidKey(key);
this.engine.setItem(validKey, value);
};
get = (key: string) => {
const validKey = this.createValidKey(key);
return this.engine.getItem(validKey);
};
remove = (key: string) => {
const validKey = this.createValidKey(key);
this.engine.removeItem(validKey);
};
clear = () => {
this.engine.clear();
};
onError = jest.fn();
crypto = jest.fn();
encrypt = jest.fn();
decrypt = jest.fn();
getOriginalEngine = () => this.originalEngine;
}

const defaultStore = new Store({ id: 'test', name: 'test' });

export { Store, defaultStore };
32 changes: 32 additions & 0 deletions packages/analytics-js-common/__mocks__/StoreManager.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import type { IStoreConfig, IStoreManager } from '../src/types/Store';
import { defaultCookieStorage, defaultInMemoryStorage, defaultLocalStorage } from './Storage';
import { defaultStore, Store } from './Store';

// Mock all the methods of the StoreManager class

class StoreManager implements IStoreManager {
init = jest.fn();
setStore = (config: IStoreConfig) => {
let storageEngine;
switch (config.type) {
case 'localStorage':
storageEngine = defaultLocalStorage;
break;
case 'cookieStorage':
storageEngine = defaultCookieStorage;
break;
case 'memoryStorage':
default:
storageEngine = defaultInMemoryStorage;
break;
}

return new Store(config, storageEngine);
};
getStore = jest.fn(() => defaultStore);
initializeStorageState = jest.fn();
}

const defaultStoreManager = new StoreManager();

export { StoreManager, defaultStoreManager };
Loading
Loading