@tma.js/sdk 1.0.0 → 1.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tma.js/sdk",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "TypeScript Source Development Kit for Telegram Mini Apps client application.",
   "author": "Vladislav Kibenko <wolfram.deus@gmail.com>",
   "homepage": "https://github.com/Telegram-Mini-Apps/tma.js#readme",

package/src/cloud-storage/CloudStorage.ts

@@ -24,8 +24,6 @@ interface Methods {
   saveStorageValue: { key: string; value: string };
 }
 
-const stringArray = array().of(string());
-
 function objectFromKeys<K extends string, V>(keys: K[], value: V): Record<K, V> {
   return keys.reduce<Record<K, V>>((acc, key) => {
     acc[key] = value;
@@ -93,7 +91,7 @@ export class CloudStorage {
   async getKeys(options?: WiredRequestOptions): Promise<string[]> {
     const result = await this.invokeCustomMethod('getStorageKeys', {}, options);
 
-    return stringArray.parse(result);
+    return array().of(string()).parse(result);
   }
 
   /**

package/src/init/init.ts

@@ -30,96 +30,103 @@ export function init<O extends InitOptions>(options: O): ComputedInitResult<O> {
     acceptCustomStyles = false,
   } = options;
 
-  // Retrieve launch data.
-  const {
-    launchParams: {
-      initData,
-      initDataRaw,
-      version,
-      platform,
-      themeParams,
-      botInline = false,
-    },
-    isPageReload,
-  } = retrieveLaunchData();
+  try {
+    // Retrieve launch data.
+    const {
+      launchParams: {
+        initData,
+        initDataRaw,
+        version,
+        platform,
+        themeParams,
+        botInline = false,
+      },
+      isPageReload,
+    } = retrieveLaunchData();
 
-  const createRequestId = createRequestIdGenerator();
-  const postEvent = createPostEvent(version);
+    const createRequestId = createRequestIdGenerator();
+    const postEvent = createPostEvent(version);
 
-  // In Telegram web version we should listen to special event sent from the Telegram application
-  // to know, when we should reload the Mini App.
-  if (isIframe()) {
-    if (acceptCustomStyles) {
-      catchCustomStyles();
-    }
+    // In Telegram web version we should listen to special event sent from the Telegram application
+    // to know, when we should reload the Mini App.
+    if (isIframe()) {
+      if (acceptCustomStyles) {
+        catchCustomStyles();
+      }
 
-    // Notify Telegram, iframe is ready. This will result in sending style tag html from native
-    // application which is used in catchCustomStyles function. We should call this method also
-    // to start receiving "reload_iframe" events from the Telegram application.
-    postEvent('iframe_ready', { reload_supported: true });
-    on('reload_iframe', () => window.location.reload());
-  }
+      // Notify Telegram, iframe is ready. This will result in sending style tag html from native
+      // application which is used in catchCustomStyles function. We should call this method also
+      // to start receiving "reload_iframe" events from the Telegram application.
+      postEvent('iframe_ready', { reload_supported: true });
+      on('reload_iframe', () => window.location.reload());
+    }
 
-  const result: Omit<InitResult, 'viewport'> = {
-    backButton: createBackButton(isPageReload, version, postEvent),
-    closingBehavior: createClosingBehavior(isPageReload, postEvent),
-    cloudStorage: new CloudStorage(version, createRequestId, postEvent),
-    createRequestId,
-    hapticFeedback: new HapticFeedback(version, postEvent),
-    invoice: new Invoice(version, postEvent),
-    mainButton: createMainButton(
-      isPageReload,
-      themeParams.buttonColor || '#000000',
-      themeParams.buttonTextColor || '#ffffff',
+    const result: Omit<InitResult, 'viewport'> = {
+      backButton: createBackButton(isPageReload, version, postEvent),
+      closingBehavior: createClosingBehavior(isPageReload, postEvent),
+      cloudStorage: new CloudStorage(version, createRequestId, postEvent),
+      createRequestId,
+      hapticFeedback: new HapticFeedback(version, postEvent),
+      invoice: new Invoice(version, postEvent),
+      mainButton: createMainButton(
+        isPageReload,
+        themeParams.buttonColor || '#000000',
+        themeParams.buttonTextColor || '#ffffff',
+        postEvent,
+      ),
+      miniApp: createMiniApp(
+        isPageReload,
+        themeParams.backgroundColor || '#ffffff',
+        version,
+        botInline,
+        postEvent,
+      ),
+      popup: new Popup(version, postEvent),
       postEvent,
-    ),
-    miniApp: createMiniApp(
-      isPageReload,
-      themeParams.backgroundColor || '#ffffff',
-      version,
-      botInline,
-      postEvent,
-    ),
-    popup: new Popup(version, postEvent),
-    postEvent,
-    qrScanner: new QRScanner(version, postEvent),
-    themeParams: createThemeParams(themeParams),
-    utils: new Utils(version, createRequestId, postEvent),
-    ...(initData
-      // Init data could be missing in case, application was launched via InlineKeyboardButton.
-      ? {
-        initData: new InitData(initData),
-        initDataRaw,
-      }
-      : {}),
-  };
+      qrScanner: new QRScanner(version, postEvent),
+      themeParams: createThemeParams(themeParams),
+      utils: new Utils(version, createRequestId, postEvent),
+      ...(initData
+        // Init data could be missing in case, application was launched via InlineKeyboardButton.
+        ? {
+          initData: new InitData(initData),
+          initDataRaw,
+        }
+        : {}),
+    };
 
-  const viewport = async
-    ? createViewportAsync(isPageReload, platform, postEvent)
-    : createViewportSync(isPageReload, platform, postEvent);
+    const viewport = async
+      ? createViewportAsync(isPageReload, platform, postEvent)
+      : createViewportSync(isPageReload, platform, postEvent);
 
-  if (viewport instanceof Promise) {
-    return viewport.then((vp) => {
-      processCSSVars(
-        cssVars,
-        result.miniApp,
-        result.themeParams,
-        vp,
-      );
+    if (viewport instanceof Promise) {
+      return viewport.then((vp) => {
+        processCSSVars(
+          cssVars,
+          result.miniApp,
+          result.themeParams,
+          vp,
+        );
 
-      return {
-        ...result,
-        viewport: vp,
-      };
-    }) as ComputedInitResult<O>;
-  }
+        return {
+          ...result,
+          viewport: vp,
+        };
+      }) as ComputedInitResult<O>;
+    }
 
-  processCSSVars(
-    cssVars,
-    result.miniApp,
-    result.themeParams,
-    viewport,
-  );
+    processCSSVars(
+      cssVars,
+      result.miniApp,
+      result.themeParams,
+      viewport,
+    );
 
-  return { ...result, viewport } as ComputedInitResult<O>;
+    return { ...result, viewport } as ComputedInitResult<O>;
+  } catch (e) {
+    if (async) {
+      return Promise.reject(e) as unknown as ComputedInitResult<O>;
+    }
+    throw e;
+  }
 }

package/src/parsing/parsers/date.ts

@@ -1,13 +1,11 @@
 import { number } from './number.js';
 import { createValueParserGenerator } from '../createValueParserGenerator.js';
 
-const num = number();
-
 /**
  * Returns parser to parse value as Date.
  */
 export const date = createValueParserGenerator<Date>((value) => (
   value instanceof Date
     ? value
-    : new Date(num.parse(value) * 1000)
+    : new Date(number().parse(value) * 1000)
 ), 'Date');

package/src/parsing/parsers/rgb.ts

@@ -4,9 +4,7 @@ import type { RGB } from '~/colors/index.js';
 import { string } from './string.js';
 import { createValueParserGenerator } from '../createValueParserGenerator.js';
 
-const str = string();
-
 /**
  * Returns parser to parse value as RGB color.
  */
-export const rgb = createValueParserGenerator<RGB>((value) => toRGB(str.parse(value)), 'rgb');
+export const rgb = createValueParserGenerator<RGB>((value) => toRGB(string().parse(value)), 'rgb');

package/src/theme-params/themeParamsParser.ts

@@ -7,14 +7,16 @@ import {
 import { keyToLocal } from './keys.js';
 import type { ThemeParamsParsed } from './types.js';
 
-const rgbOptional = rgb().optional();
-
 export const themeParamsParser = createValueParserGenerator<ThemeParamsParsed>(
-  (value) => Object
-    .entries(toRecord(value))
-    .reduce<ThemeParamsParsed>((acc, [k, v]) => {
-    acc[keyToLocal(k)] = rgbOptional.parse(v);
-    return acc;
-  }, {}),
+  (value) => {
+    const rgbOptional = rgb().optional();
+
+    return Object
+      .entries(toRecord(value))
+      .reduce<ThemeParamsParsed>((acc, [k, v]) => {
+        acc[keyToLocal(k)] = rgbOptional.parse(v);
+        return acc;
+      }, {});
+  },
   'ThemeParams',
 );