@adaptabletools/adaptable-plugin-ipushpull-cjs 22.0.1 → 22.0.3

package/src/View/IPushPullViewPanel.js

@@ -8,7 +8,7 @@ const React = tslib_1.__importStar(require("react"));
 const ObjectFactory_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable-cjs/src/Utilities/ObjectFactory"));
 const StringExtensions_1 = require("@adaptabletools/adaptable-cjs/src/Utilities/Extensions/StringExtensions");
 const Flex_1 = require("@adaptabletools/adaptable-cjs/src/components/Flex");
-const DropdownButton_1 = tslib_1.__importDefault(require("@adaptabletools/adaptable-cjs/src/components/DropdownButton"));
+const Select_1 = require("@adaptabletools/adaptable-cjs/src/components/Select");
 const ButtonExport_1 = require("@adaptabletools/adaptable-cjs/src/View/Components/Buttons/ButtonExport");
 const ButtonPause_1 = require("@adaptabletools/adaptable-cjs/src/View/Components/Buttons/ButtonPause");
 const ButtonPlay_1 = require("@adaptabletools/adaptable-cjs/src/View/Components/Buttons/ButtonPlay");
@@ -66,58 +66,42 @@ const IPushPullViewPanelComponent = (props) => {
     let allReports = systemReports
         .filter((s) => props.api.exportApi.internalApi.isSystemReportActive(s))
         .concat(props.Reports.map((r) => r.Name));
-    let availableReports = allReports.map((report) => {
-        return {
-            label: report,
-            value: report,
-            onClick: () => onSelectedReportChanged(report),
-        };
-    });
-    let availableFolders = props.IPushPullDomainsPages?.map((iPushPullDomain) => {
-        return {
-            label: iPushPullDomain.Name,
-            value: iPushPullDomain.Name,
-            onClick: () => onFolderChanged(iPushPullDomain.Name),
-        };
-    }) ?? [];
-    let availablePages = props.CurrentIPushPullAvailablePages?.map((page) => {
-        return {
-            label: page,
-            value: page,
-            onClick: () => onPageChanged(page),
-        };
-    }) ?? [];
-    // this is clearly ridiculous!
-    // im getting tired...
-    let isCompletedReport = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName) &&
-        StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder) &&
-        StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage);
+    let availableReports = allReports.map((report) => ({
+        label: report,
+        value: report,
+    }));
+    let availableFolders = props.IPushPullDomainsPages?.map((iPushPullDomain) => ({
+        label: iPushPullDomain.Name,
+        value: iPushPullDomain.Name,
+    })) ?? [];
+    let availablePages = props.CurrentIPushPullAvailablePages?.map((page) => ({
+        label: page,
+        value: page,
+    })) ?? [];
+    let hasReport = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName);
+    let hasFolder = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder);
+    let hasPage = StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage);
+    let isCompletedReport = hasReport && hasFolder && hasPage;
     let isLiveIPushPullReport = isCompletedReport &&
         props.CurrentLiveIPushPullReport &&
         props.CurrentIPushPullReportName == props.CurrentLiveIPushPullReport.ReportName &&
         props.CurrentIPushPullFolder == props.CurrentLiveIPushPullReport.Folder &&
         props.CurrentIPushPullPage == props.CurrentLiveIPushPullReport.Page;
     const elementType = props.viewType === 'Toolbar' ? 'DashboardToolbar' : 'ToolPanel';
-    return props.IsIPushPullRunning ? (React.createElement(Flex_1.Flex, { flexDirection: "row", className: `ab-${elementType}__IPushPull__wrap`, flexWrap: props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
-        React.createElement(Flex_1.Flex, null,
-            React.createElement(DropdownButton_1.default, { disabled: allReports.length == 0 || isLiveIPushPullReport, items: availableReports, columns: ['label'], className: `ab-${elementType}__IPushPull__select twa:min-w-[140px] twa:text-0 twa:mr-2`, onClear: () => onSelectedReportChanged(''), showClearButton: StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName), variant: "outlined" }, StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullReportName)
-                ? props.CurrentIPushPullReportName
-                : 'Select Report')),
-        React.createElement(Flex_1.Flex, null,
-            React.createElement(DropdownButton_1.default, { disabled: allReports.length == 0 || isLiveIPushPullReport, items: availableFolders, columns: ['label'], className: `ab-${elementType}__IPushPull__select twa:min-w-[140px] twa:text-0 twa:mr-2`, onClear: () => onFolderChanged(''), showClearButton: StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder), variant: "outlined" }, StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullFolder)
-                ? props.CurrentIPushPullFolder
-                : 'Select Folder')),
-        React.createElement(Flex_1.Flex, null,
-            React.createElement(DropdownButton_1.default, { disabled: allReports.length == 0 || isLiveIPushPullReport, items: availablePages, columns: ['label'], className: `ab-${elementType}__IPushPull__select twa:min-w-[140px] twa:text-0 twa:mr-2`, onClear: () => onPageChanged(''), showClearButton: StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage), variant: "outlined" }, StringExtensions_1.StringExtensions.IsNotNullOrEmpty(props.CurrentIPushPullPage)
-                ? props.CurrentIPushPullPage
-                : 'Select Page')),
-        React.createElement(Flex_1.Flex, { className: "twa:min-w-[148px]" },
-            React.createElement(ButtonExport_1.ButtonExport, { className: `ab-${elementType}__IPushPull__export twa:ml-1`, onClick: () => onIPushPullSendSnapshot(), tooltip: "Send Snapshot to ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel }),
-            true ? (React.createElement(ButtonPause_1.ButtonPause, { className: `ab-${elementType}__IPushPull__pause twa:ml-1 twa:fill-red-500`, onClick: () => props.onIPushPullStopLiveData(), tooltip: "Stop sync with ipushpull", disabled: !isLiveIPushPullReport, accessLevel: props.accessLevel })) : (React.createElement(ButtonPlay_1.ButtonPlay, { className: `ab-${elementType}__IPushPull__play twa:ml-1`, onClick: () => onIPushPullStartLiveData(), tooltip: "Start sync with ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })),
-            isCompletedReport && (React.createElement(Flex_1.Flex, { className: (0, join_1.default)(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__IPushPull__controls`), alignItems: "stretch" }, props.api.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule_1.ButtonSchedule, { className: `ab-${elementType}__IPushPull__schedule twa:ml-1`, onClick: () => onNewIPushPullSchedule(), tooltip: "Schedule", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })))),
-            ' ',
-            React.createElement(ButtonNewPage_1.ButtonNewPage, { className: `ab-${elementType}__IPushPull__newpage twa:ml-1`, onClick: () => props.onShowAddIPushPullPage(), tooltip: "New Page", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel }),
-            React.createElement(ButtonLogout_1.ButtonLogout, { className: `ab-${elementType}__IPushPull__logout twa:ml-1`, onClick: () => getIPPApi().logoutFromIPushPull(), tooltip: "Logout", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel })))) : (React.createElement(ButtonLogin_1.ButtonLogin, { className: `ab-${elementType}__IPushPull__login twa:ml-1`, onClick: () => props.onShowIPushPullLogin(), tooltip: "Login to ipushpull", accessLevel: props.accessLevel },
+    return props.IsIPushPullRunning ? (React.createElement(Flex_1.Flex, { flexDirection: "row", className: `ab-${elementType}__IPushPull__wrap twa:gap-1`, flexWrap: props.viewType === 'ToolPanel' ? 'wrap' : 'nowrap' },
+        React.createElement(Flex_1.Flex, { className: "twa:min-w-[140px]" },
+            React.createElement(Select_1.Select, { disabled: allReports.length == 0 || isLiveIPushPullReport, options: availableReports, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Report", onChange: (reportName) => onSelectedReportChanged(reportName), value: props.CurrentIPushPullReportName, isClearable: true })),
+        React.createElement(Flex_1.Flex, { className: "twa:min-w-[140px]" },
+            React.createElement(Select_1.Select, { disabled: !hasReport || isLiveIPushPullReport, options: availableFolders, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Folder", onChange: (folder) => onFolderChanged(folder), value: props.CurrentIPushPullFolder, isClearable: true })),
+        React.createElement(Flex_1.Flex, { className: "twa:min-w-[140px]" },
+            React.createElement(Select_1.Select, { disabled: !hasFolder || isLiveIPushPullReport, options: availablePages, className: `ab-${elementType}__IPushPull__select twa:w-full`, placeholder: "Select Page", onChange: (page) => onPageChanged(page), value: props.CurrentIPushPullPage, isClearable: true })),
+        React.createElement(Flex_1.Flex, { className: (0, join_1.default)(props.accessLevel == 'ReadOnly' ? GeneralConstants.READ_ONLY_STYLE : '', `ab-${elementType}__IPushPull__controls twa:w-full`) },
+            React.createElement(Flex_1.Flex, null,
+                React.createElement(ButtonExport_1.ButtonExport, { className: `ab-${elementType}__IPushPull__export`, onClick: () => onIPushPullSendSnapshot(), tooltip: "Send Snapshot to ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel }),
+                isLiveIPushPullReport ? (React.createElement(ButtonPause_1.ButtonPause, { className: `ab-${elementType}__IPushPull__pause twa:fill-red-500`, onClick: () => props.onIPushPullStopLiveData(), tooltip: "Stop sync with ipushpull", disabled: !isLiveIPushPullReport, accessLevel: props.accessLevel })) : (React.createElement(ButtonPlay_1.ButtonPlay, { className: `ab-${elementType}__IPushPull__play`, onClick: () => onIPushPullStartLiveData(), tooltip: "Start sync with ipushpull", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })),
+                props.api.entitlementApi.isModuleFullEntitlement('Schedule') && (React.createElement(ButtonSchedule_1.ButtonSchedule, { className: `ab-${elementType}__IPushPull__schedule`, onClick: () => onNewIPushPullSchedule(), tooltip: "Schedule", disabled: isLiveIPushPullReport || !isCompletedReport, accessLevel: props.accessLevel })),
+                React.createElement(ButtonNewPage_1.ButtonNewPage, { className: `ab-${elementType}__IPushPull__newpage`, onClick: () => props.onShowAddIPushPullPage(), tooltip: "New Page", disabled: !hasFolder || isLiveIPushPullReport, accessLevel: props.accessLevel }),
+                React.createElement(ButtonLogout_1.ButtonLogout, { className: `ab-${elementType}__IPushPull__logout`, onClick: () => getIPPApi().logoutFromIPushPull(), tooltip: "Logout", disabled: isLiveIPushPullReport, accessLevel: props.accessLevel }))))) : (React.createElement(ButtonLogin_1.ButtonLogin, { className: `ab-${elementType}__IPushPull__login twa:ml-1`, onClick: () => props.onShowIPushPullLogin(), tooltip: "Login to ipushpull", accessLevel: props.accessLevel },
         ' ',
         "Login"));
 };

package/src/index.d.ts

@@ -1,9 +1,9 @@
-import { AdaptablePlugin } from "@adaptabletools/adaptable-cjs";
+import { AdaptablePlugin } from "@adaptabletools/adaptable-cjs/types";
 import type { Middleware } from 'redux';
 import * as Redux from 'redux';
 import { IPushPullState } from "@adaptabletools/adaptable-cjs/src/AdaptableState/IPushPullState";
 import { IPushPullApi } from "@adaptabletools/adaptable-cjs/src/Api/IPushPullApi";
-import { IPushPullPluginOptions } from "@adaptabletools/adaptable-cjs/src/AdaptableOptions/IPushPullPluginOptions";
+import { IPushPullPluginOptions } from './IPushPullPluginOptions';
 import { IAdaptable } from "@adaptabletools/adaptable-cjs/src/AdaptableInterfaces/IAdaptable";
 declare class IPushPullPlugin extends AdaptablePlugin {
     options: IPushPullPluginOptions;
@@ -13,10 +13,11 @@ declare class IPushPullPlugin extends AdaptablePlugin {
     constructor(options?: IPushPullPluginOptions);
     afterInitApi(adaptable: IAdaptable): void;
     rootReducer: (rootReducer: any) => {
-        System: (state: IPushPullState, action: Redux.Action) => IPushPullState;
+        Internal: (state: IPushPullState, action: Redux.Action) => IPushPullState;
     };
     reduxMiddleware: (adaptable: IAdaptable) => Middleware;
     afterInitStore(adaptable: IAdaptable): void;
 }
-declare const _default: (options?: IPushPullPluginOptions) => IPushPullPlugin;
-export default _default;
+export type { IPushPullPluginOptions, IPushPullConfig } from './IPushPullPluginOptions';
+export declare const ipushpullPlugin: (options?: IPushPullPluginOptions) => IPushPullPlugin;
+export default ipushpullPlugin;

package/src/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ipushpullPlugin = void 0;
 const tslib_1 = require("tslib");
-const adaptable_1 = require("@adaptabletools/adaptable-cjs");
+const types_1 = require("@adaptabletools/adaptable-cjs/types");
 const env_1 = tslib_1.__importDefault(require("./env"));
 const package_json_1 = tslib_1.__importDefault(require("../package.json"));
 const package_json_2 = tslib_1.__importDefault(require("@adaptabletools/adaptable-cjs/package.json"));
@@ -11,8 +12,8 @@ const PopupRedux = tslib_1.__importStar(require("@adaptabletools/adaptable-cjs/s
 const AdaptableViewFactory_1 = require("@adaptabletools/adaptable-cjs/src/View/AdaptableViewFactory");
 const PushPullModule_1 = require("./Module/PushPullModule");
 const IPushPullApiImpl_1 = require("./IPushPullApiImpl");
-const PushPullService_1 = require("./Utilities/Services/PushPullService");
-const ipushpull_js_1 = tslib_1.__importDefault(require("ipushpull-js"));
+const IPushPullService_1 = require("./Utilities/Services/IPushPullService");
+const ipushpull_client_1 = require("./ipushpull-client");
 const IPushPullRedux_1 = require("./Redux/ActionReducers/IPushPullRedux");
 const IPushPullLoginPopup_1 = require("./View/IPushPullLoginPopup");
 const IPushPullAddPagePopup_1 = require("./View/IPushPullAddPagePopup");
@@ -25,70 +26,60 @@ const suffix = name.endsWith('-cjs') ? '-cjs' : '';
 if (version !== coreVersion) {
     console.warn(`Version mismatch: "@adaptabletools/adaptable-plugin-ipushpull${suffix}" (v${version}) and "@adaptabletools/adaptable${suffix}" (v${coreVersion}) have different versions. They should be the exact same version.`);
 }
+const DEFAULT_API_URL = 'https://test.ipushpull.com/api/1.0';
 const getApiKey = () => {
-    let key = env_1.default.IPUSHPULL_API_KEY; // need to make sure that is always there
-    return key;
+    return env_1.default.IPUSHPULL_API_KEY || '';
 };
 const getApiSecret = () => {
-    let secret = env_1.default.IPUSHPULL_API_SECRET; // need to make sure that is always there
-    return secret;
+    return env_1.default.IPUSHPULL_API_SECRET || '';
 };
 const defaultOptions = {
     ippConfig: {
-        api_secret: getApiSecret() || '',
-        api_key: getApiKey() || '',
-        api_url: 'https://www.ipushpull.com/api/1.0',
-        ws_url: 'https://www.ipushpull.com',
-        web_url: 'https://www.ipushpull.com',
-        docs_url: 'https://docs.ipushpull.com',
-        storage_prefix: 'ipp_local',
-        transport: 'polling',
-        hsts: false, // strict cors policy
+        api_key: getApiKey(),
+        api_secret: getApiSecret(),
+        api_url: DEFAULT_API_URL,
     },
     autoLogin: false,
     throttleTime: 2000,
     includeSystemReports: true,
 };
-class IPushPullPlugin extends adaptable_1.AdaptablePlugin {
+class IPushPullPlugin extends types_1.AdaptablePlugin {
     pluginId = 'ipushpull';
     iPushPullApi;
     PushPullService;
     constructor(options) {
         super(options);
+        const defaults = defaultOptions.ippConfig;
+        const userConfig = options?.ippConfig;
         const ippConfig = {
-            ...defaultOptions.ippConfig,
-            ...(options || {}).ippConfig,
+            api_url: userConfig?.api_url ?? defaults.api_url ?? DEFAULT_API_URL,
+            api_key: userConfig?.api_key || defaults.api_key,
+            api_secret: userConfig?.api_secret || defaults.api_secret,
         };
-        if (!ippConfig.api_key) {
-            ippConfig.api_key = defaultOptions.ippConfig.api_key;
-        }
-        if (!ippConfig.api_secret) {
-            ippConfig.api_secret = defaultOptions.ippConfig.api_secret;
-        }
         this.options = {
             ...defaultOptions,
             ...options,
             ippConfig,
         };
-        /**
-         * Contains the objects required to export (snapshot or live) data to ipushpull from AdapTable.
-         *
-         * Includes ipushpull config and objects and, optionally, any ipushpull Reports (including schedules).
-         */
-        // IPushPull?: IPushPullState;
-        ipushpull_js_1.default.config.set(this.options.ippConfig);
     }
     afterInitApi(adaptable) {
+        const config = this.options.ippConfig;
+        const client = new ipushpull_client_1.IPushPullClient({
+            api_url: config.api_url ?? DEFAULT_API_URL,
+            api_key: config.api_key,
+            api_secret: config.api_secret,
+        });
         this.iPushPullApi = new IPushPullApiImpl_1.IPushPullApiImpl(adaptable, this.options);
-        this.PushPullService = new PushPullService_1.PushPullService(adaptable);
-        this.iPushPullApi.setIPushPullInstance(ipushpull_js_1.default);
+        this.PushPullService = new IPushPullService_1.IPushPullService(adaptable, this.options.cellStyles);
+        this.iPushPullApi.setIPushPullInstance(client);
         this.registerProperty('api', () => this.iPushPullApi);
         this.registerProperty('service', () => this.PushPullService);
     }
+    // FIXME AFL improve typing
     rootReducer = (rootReducer) => {
         return {
-            System: (state, action) => {
-                let augmentedState = rootReducer.System(state, action);
+            Internal: (state, action) => {
+                let augmentedState = rootReducer.Internal(state, action);
                 if (!state) {
                     // required for store initialization
                     // (idiomatic way of default parameter value in reducer is not feasible because the passed argument is already initialized by the System reducer)
@@ -145,7 +136,7 @@ class IPushPullPlugin extends adaptable_1.AdaptablePlugin {
                         return next(action);
                     }
                     case PluginsRedux_1.IPUSHPULL_DOMAIN_PAGES_SET: {
-                        //refresh the available pages
+                        const result = next(action);
                         const currentFolder = middlewareAPI.getState().Internal.IPushPullCurrentFolder;
                         const isFolderValid = StringExtensions_1.default.IsNotNullOrEmpty(currentFolder);
                         if (isFolderValid) {
@@ -154,7 +145,7 @@ class IPushPullPlugin extends adaptable_1.AdaptablePlugin {
                                 .getPagesForIPushPullDomain(currentFolder);
                             middlewareAPI.dispatch((0, IPushPullRedux_1.IPushPullSetCurrentAvailablePages)(availablePages));
                         }
-                        return next(action);
+                        return result;
                     }
                     default: {
                         return next(action);
@@ -170,4 +161,6 @@ class IPushPullPlugin extends adaptable_1.AdaptablePlugin {
         AdaptableViewFactory_1.AdaptableViewPanelFactory.set(ModuleConstants_1.IPushPullModuleId, IPushPullViewPanel_1.IPushPullViewPanelControl);
     }
 }
-exports.default = (options) => new IPushPullPlugin(options);
+const ipushpullPlugin = (options) => new IPushPullPlugin(options);
+exports.ipushpullPlugin = ipushpullPlugin;
+exports.default = exports.ipushpullPlugin;

package/src/ipushpull-client/IPushPullClient.d.ts

@@ -0,0 +1,28 @@
+import { IPushPullClientConfig, IPushPullTokens, IPushPullDomainAccessInfo, IPushPullPageContentPayload, IPushPullPageContentResponse, IPushPullCellStyle } from './types';
+export declare class IPushPullClient {
+    private config;
+    private tokens;
+    private refreshPromise;
+    constructor(config: IPushPullClientConfig);
+    private getBasicAuthHeader;
+    private buildOAuthBody;
+    login(username: string, password: string): Promise<IPushPullTokens>;
+    refreshToken(): Promise<IPushPullTokens>;
+    private doRefreshToken;
+    logout(): Promise<void>;
+    getDomainsAndPages(): Promise<IPushPullDomainAccessInfo[]>;
+    getPageContent(folderId: number, pageId: number): Promise<any>;
+    updatePageContent(folderId: number, pageId: number, payload: IPushPullPageContentPayload): Promise<IPushPullPageContentResponse>;
+    createPage(folderId: number, pageName: string, description?: string): Promise<any>;
+    isAuthenticated(): boolean;
+    private fetchWithAuth;
+}
+/**
+ * Converts per-cell data (array of rows, each cell being { value, formatted_value, style })
+ * into the official ipushpull page content format with deduplicated styles.
+ */
+export declare function buildPageContentPayload(cellData: Array<Array<{
+    value: any;
+    formatted_value: any;
+    style: IPushPullCellStyle;
+}>>): IPushPullPageContentPayload;

package/src/ipushpull-client/IPushPullClient.js

@@ -0,0 +1,203 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.IPushPullClient = void 0;
+exports.buildPageContentPayload = buildPageContentPayload;
+class IPushPullClient {
+    config;
+    tokens = null;
+    refreshPromise = null;
+    constructor(config) {
+        this.config = config;
+    }
+    getBasicAuthHeader() {
+        const credentials = `${this.config.api_key}:${this.config.api_secret}`;
+        return `Basic ${btoa(credentials)}`;
+    }
+    buildOAuthBody(params) {
+        return Object.entries(params)
+            .map(([k, v]) => `${encodeURIComponent(k)}=${encodeURIComponent(v)}`)
+            .join('&');
+    }
+    async login(username, password) {
+        const url = `${this.config.api_url}/oauth/token/`;
+        const body = this.buildOAuthBody({
+            grant_type: 'password',
+            username,
+            password,
+        });
+        const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                Authorization: this.getBasicAuthHeader(),
+            },
+            body,
+        });
+        if (!response.ok) {
+            const errorData = await response.json().catch(() => ({}));
+            const message = errorData.error_description || errorData.error || response.statusText;
+            const err = new Error(message);
+            err.data = errorData;
+            throw err;
+        }
+        this.tokens = await response.json();
+        return this.tokens;
+    }
+    async refreshToken() {
+        if (!this.tokens?.refresh_token) {
+            throw new Error('No refresh token available. Please login first.');
+        }
+        // Deduplicate concurrent refresh attempts
+        if (this.refreshPromise) {
+            return this.refreshPromise;
+        }
+        this.refreshPromise = this.doRefreshToken();
+        try {
+            const result = await this.refreshPromise;
+            return result;
+        }
+        finally {
+            this.refreshPromise = null;
+        }
+    }
+    async doRefreshToken() {
+        const url = `${this.config.api_url}/oauth/token/`;
+        const body = this.buildOAuthBody({
+            grant_type: 'refresh_token',
+            refresh_token: this.tokens.refresh_token,
+        });
+        const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                Authorization: this.getBasicAuthHeader(),
+            },
+            body,
+        });
+        if (!response.ok) {
+            this.tokens = null;
+            const errorData = await response.json().catch(() => ({}));
+            throw new Error(errorData.error_description || errorData.error || 'Token refresh failed');
+        }
+        this.tokens = await response.json();
+        return this.tokens;
+    }
+    async logout() {
+        if (!this.tokens?.access_token) {
+            return;
+        }
+        const url = `${this.config.api_url}/oauth/logout/`;
+        await fetch(url, {
+            method: 'POST',
+            headers: {
+                Authorization: `Bearer ${this.tokens.access_token}`,
+            },
+        });
+        this.tokens = null;
+    }
+    async getDomainsAndPages() {
+        const url = `${this.config.api_url}/domain_page_access`;
+        const response = await this.fetchWithAuth(url);
+        const data = await response.json();
+        return (data.domains ?? data).map((domain) => ({
+            id: domain.id,
+            name: domain.name,
+            pages: (domain.current_user_domain_page_access?.pages ?? domain.pages ?? []).map((page) => ({
+                id: page.id,
+                name: page.name,
+                special_page_type: page.special_page_type ?? 0,
+                write_access: page.write_access ?? false,
+            })),
+        }));
+    }
+    async getPageContent(folderId, pageId) {
+        const baseUrl = this.config.api_url.replace(/\/api\/1\.0\/?$/, '');
+        const url = `${baseUrl}/api/2.0/domains/id/${folderId}/page_content/id/${pageId}/`;
+        const response = await this.fetchWithAuth(url);
+        return response.json();
+    }
+    async updatePageContent(folderId, pageId, payload) {
+        const baseUrl = this.config.api_url.replace(/\/api\/1\.0\/?$/, '');
+        const url = `${baseUrl}/api/2.0/domains/id/${folderId}/page_content/id/${pageId}/`;
+        const response = await this.fetchWithAuth(url, {
+            method: 'PUT',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify(payload),
+        });
+        return response.json();
+    }
+    async createPage(folderId, pageName, description) {
+        const url = `${this.config.api_url}/domains/${folderId}/pages/`;
+        const response = await this.fetchWithAuth(url, {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                name: pageName,
+                description: description ?? '',
+            }),
+        });
+        return response.json();
+    }
+    isAuthenticated() {
+        return this.tokens != null;
+    }
+    async fetchWithAuth(url, options = {}) {
+        if (!this.tokens?.access_token) {
+            throw new Error('Not authenticated. Please login first.');
+        }
+        const headers = new Headers(options.headers);
+        headers.set('Authorization', `Bearer ${this.tokens.access_token}`);
+        let response = await fetch(url, { ...options, headers });
+        if (response.status === 401) {
+            await this.refreshToken();
+            headers.set('Authorization', `Bearer ${this.tokens.access_token}`);
+            response = await fetch(url, { ...options, headers });
+        }
+        if (!response.ok) {
+            const errorData = await response.json().catch(() => ({}));
+            const message = errorData.detail || errorData.error || response.statusText;
+            throw new Error(message);
+        }
+        return response;
+    }
+}
+exports.IPushPullClient = IPushPullClient;
+/**
+ * Converts per-cell data (array of rows, each cell being { value, formatted_value, style })
+ * into the official ipushpull page content format with deduplicated styles.
+ */
+function buildPageContentPayload(cellData) {
+    const values = [];
+    const formattedValues = [];
+    const uniqueStyles = [];
+    const cellStyles = [];
+    const styleIndex = new Map();
+    for (const row of cellData) {
+        const rowValues = [];
+        const rowFormattedValues = [];
+        const rowStyleIndices = [];
+        for (const cell of row) {
+            rowValues.push(cell.value);
+            rowFormattedValues.push(cell.formatted_value);
+            const styleKey = JSON.stringify(cell.style);
+            let idx = styleIndex.get(styleKey);
+            if (idx === undefined) {
+                idx = uniqueStyles.length;
+                uniqueStyles.push(cell.style);
+                styleIndex.set(styleKey, idx);
+            }
+            rowStyleIndices.push(idx);
+        }
+        values.push(rowValues);
+        formattedValues.push(rowFormattedValues);
+        cellStyles.push(rowStyleIndices);
+    }
+    return {
+        content: {
+            values,
+            formatted_values: formattedValues,
+            unique_styles: uniqueStyles,
+            cell_styles: cellStyles,
+        },
+    };
+}

package/src/ipushpull-client/index.d.ts

@@ -0,0 +1,4 @@
+export { IPushPullClient, buildPageContentPayload } from './IPushPullClient';
+export { getThemeStyles } from './themes';
+export type { IPushPullTheme, IPushPullThemeStyles } from './themes';
+export type { IPushPullClientConfig, IPushPullTokens, IPushPullPageAccessInfo, IPushPullDomainAccessInfo, IPushPullCellStyle, IPushPullPageContentPayload, IPushPullPageContentResponse, } from './types';

package/src/ipushpull-client/index.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getThemeStyles = exports.buildPageContentPayload = exports.IPushPullClient = void 0;
+var IPushPullClient_1 = require("./IPushPullClient");
+Object.defineProperty(exports, "IPushPullClient", { enumerable: true, get: function () { return IPushPullClient_1.IPushPullClient; } });
+Object.defineProperty(exports, "buildPageContentPayload", { enumerable: true, get: function () { return IPushPullClient_1.buildPageContentPayload; } });
+var themes_1 = require("./themes");
+Object.defineProperty(exports, "getThemeStyles", { enumerable: true, get: function () { return themes_1.getThemeStyles; } });

package/src/ipushpull-client/themes.d.ts

@@ -0,0 +1,8 @@
+import { IPushPullCellStyle } from './types';
+export type IPushPullTheme = 'lightTheme' | 'darkTheme';
+export interface IPushPullThemeStyles {
+    headerStyle: IPushPullCellStyle;
+    rowStyle: IPushPullCellStyle;
+    altRowStyle: IPushPullCellStyle;
+}
+export declare function getThemeStyles(theme: IPushPullTheme): IPushPullThemeStyles;