@blocklet/pages-kit-block-studio 0.4.32 → 0.4.33

package/lib/esm/utils/generate-wrapper-code.js

@@ -1,69 +1,61 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-export function generateWrapperCode(_a) {
-    return __awaiter(this, arguments, void 0, function* ({ project, state, version }) {
-        const projectName = (project.name || project.id).toLowerCase().replaceAll(/[^a-z0-9]/g, '-');
-        const packageName = `@pages-kit-project/${projectName}`;
-        const packageJson = JSON.stringify({
-            name: packageName,
-            version: version || '0.0.1',
-            main: 'index.cjs',
-            module: 'index.js',
-            types: 'index.d.ts',
-            peerDependencies: {
-                '@blocklet/pages-kit-runtime': 'latest',
-                '@blocklet/pages-kit-inner-components': 'latest',
-                '@blocklet/pages-kit': 'latest',
-                '@blocklet/uploader-server': 'latest',
-                '@arcblock/ux': 'latest',
-                '@mui/material': '5.16.14',
+export async function generateWrapperCode({ project, state, version }) {
+    const projectName = (project.name || project.id).toLowerCase().replaceAll(/[^a-z0-9]/g, '-');
+    const packageName = `@pages-kit-project/${projectName}`;
+    const packageJson = JSON.stringify({
+        name: packageName,
+        version: version || '0.0.1',
+        main: 'index.cjs',
+        module: 'index.js',
+        types: 'index.d.ts',
+        peerDependencies: {
+            '@blocklet/pages-kit-runtime': 'latest',
+            '@blocklet/pages-kit-inner-components': 'latest',
+            '@blocklet/pages-kit': 'latest',
+            '@blocklet/uploader-server': 'latest',
+            '@arcblock/ux': 'latest',
+            '@mui/material': '5.16.14',
+        },
+        dependencies: {
+            '@blocklet/pages-kit-runtime': 'latest',
+            '@blocklet/pages-kit-inner-components': 'latest',
+            '@blocklet/pages-kit': 'latest',
+            '@blocklet/uploader-server': 'latest',
+            '@arcblock/ux': 'latest',
+            '@mui/material': '5.16.14',
+        },
+        exports: {
+            '.': {
+                require: './index.cjs',
+                import: './index.js',
+                types: './index.d.ts',
             },
-            dependencies: {
-                '@blocklet/pages-kit-runtime': 'latest',
-                '@blocklet/pages-kit-inner-components': 'latest',
-                '@blocklet/pages-kit': 'latest',
-                '@blocklet/uploader-server': 'latest',
-                '@arcblock/ux': 'latest',
-                '@mui/material': '5.16.14',
+            './client': {
+                require: './client.cjs',
+                import: './client.js',
+                types: './client.d.ts',
             },
-            exports: {
-                '.': {
-                    require: './index.cjs',
-                    import: './index.js',
-                    types: './index.d.ts',
-                },
-                './client': {
-                    require: './client.cjs',
-                    import: './client.js',
-                    types: './client.d.ts',
-                },
-                './middleware': {
-                    require: './middleware.cjs',
-                    import: './middleware.js',
-                    types: './middleware.d.ts',
-                },
-                './data.json': './data.json',
+            './middleware': {
+                require: './middleware.cjs',
+                import: './middleware.js',
+                types: './middleware.d.ts',
             },
-        }, null, 2);
-        const client = `\
+            './data.json': './data.json',
+        },
+    }, null, 2);
+    const client = `\
 import PageRenderComponent, { RuntimeProps, RuntimeType } from '@blocklet/pages-kit-runtime/client';
 
 export type { RuntimeProps, RuntimeType };
 
 ${generatePageDataTypes(state)}
 
+${generatePageDataJsonSchemas(state)}
+
 export default PageRenderComponent;
 `;
-        const index = client;
-        const middleware = `
+    const index = client;
+    const middleware = `
 import { Router } from 'express';
 import axios from 'axios';
 import { Component } from '@blocklet/sdk';
@@ -186,66 +178,71 @@ router.post('/api/components/preload', async (req, res) => {
 
 export default router;
 `;
-        const data = JSON.stringify({
-            project,
-            state,
-        }, null, 2);
-        const tsFiles = [
-            { fileName: 'index.ts', content: index },
-            { fileName: 'client.ts', content: client },
-            { fileName: 'middleware.ts', content: middleware },
-            { fileName: 'data.json', content: data },
-        ];
-        const ts = yield import('typescript');
-        const compilerOptions = {
-            jsx: ts.JsxEmit.React,
-            esModuleInterop: true,
-            skipLibCheck: true,
-            declaration: true,
-        };
-        const result = (yield Promise.all(tsFiles.map((_a) => __awaiter(this, [_a], void 0, function* ({ fileName, content }) {
-            if (fileName === 'data.json') {
-                return [
-                    {
-                        fileName: 'data.json',
-                        content: data,
-                    },
-                ];
-            }
-            const cjs = ts.transpileModule(content, {
-                fileName,
-                compilerOptions: Object.assign(Object.assign({}, compilerOptions), { module: ts.ModuleKind.CommonJS }),
-            });
-            const esm = ts.transpileModule(content, {
-                fileName,
-                compilerOptions: Object.assign(Object.assign({}, compilerOptions), { module: ts.ModuleKind.ESNext }),
-            });
-            // Generate proper type declarations
-            // const dts = ts.transpileModule(content, {
-            //   fileName,
-            //   compilerOptions: {
-            //     ...compilerOptions,
-            //     declaration: true,
-            //     emitDeclarationOnly: true,
-            //   },
-            // });
+    const data = JSON.stringify({
+        project,
+        state,
+    }, null, 2);
+    const tsFiles = [
+        { fileName: 'index.ts', content: index },
+        { fileName: 'client.ts', content: client },
+        { fileName: 'middleware.ts', content: middleware },
+        { fileName: 'data.json', content: data },
+    ];
+    const ts = await import('typescript');
+    const compilerOptions = {
+        jsx: ts.JsxEmit.React,
+        esModuleInterop: true,
+        skipLibCheck: true,
+        declaration: true,
+    };
+    const result = (await Promise.all(tsFiles.map(async ({ fileName, content }) => {
+        if (fileName === 'data.json') {
             return [
                 {
-                    fileName: fileName.replace(/\.ts$/, '.cjs'),
-                    content: cjs.outputText,
-                },
-                {
-                    fileName: fileName.replace(/\.ts$/, '.js'),
-                    content: esm.outputText,
-                },
-                {
-                    fileName: fileName.replace(/\.ts$/, '.d.ts'),
-                    content, // Fallback to original content if declaration fails
+                    fileName: 'data.json',
+                    content: data,
                 },
             ];
-        })))).flat();
-        return [...result, { fileName: 'package.json', content: packageJson }];
-    });
+        }
+        const cjs = ts.transpileModule(content, {
+            fileName,
+            compilerOptions: {
+                ...compilerOptions,
+                module: ts.ModuleKind.CommonJS,
+            },
+        });
+        const esm = ts.transpileModule(content, {
+            fileName,
+            compilerOptions: {
+                ...compilerOptions,
+                module: ts.ModuleKind.ESNext,
+            },
+        });
+        // Generate proper type declarations
+        // const dts = ts.transpileModule(content, {
+        //   fileName,
+        //   compilerOptions: {
+        //     ...compilerOptions,
+        //     declaration: true,
+        //     emitDeclarationOnly: true,
+        //   },
+        // });
+        return [
+            {
+                fileName: fileName.replace(/\.ts$/, '.cjs'),
+                content: cjs.outputText,
+            },
+            {
+                fileName: fileName.replace(/\.ts$/, '.js'),
+                content: esm.outputText,
+            },
+            {
+                fileName: fileName.replace(/\.ts$/, '.d.ts'),
+                content, // Fallback to original content if declaration fails
+            },
+        ];
+    }))).flat();
+    return [...result, { fileName: 'package.json', content: packageJson }];
 }
 const basicComponentSectionTypes = {
     iframe: `
@@ -289,6 +286,44 @@ function getCustomComponentPropertyType(type) {
 }
 const ALLOWED_PROPERTY_TYPES = ['string', 'multiline', 'url', 'json', 'yaml'];
 function generatePageDataTypes(state) {
+    // 递归生成TypeScript类型属性
+    function generateTsTypeProperties(properties) {
+        return Object.entries(properties)
+            .map(([, prop]) => {
+            if (!prop.data)
+                return null;
+            // 如果key未定义，使用id
+            const key = prop.data.key || prop.data.id;
+            if (!key)
+                return null;
+            // 根据属性类型设置TypeScript类型
+            let typeStr = 'string';
+            if (prop.data.type === 'string' || prop.data.type === 'multiline') {
+                typeStr = 'string';
+            }
+            else if (prop.data.type === 'number') {
+                typeStr = 'number';
+            }
+            else if (prop.data.type === 'url') {
+                typeStr = '{ url: string; mediaKitUrl?: string; width?: number; height?: number }';
+            }
+            else if (prop.data.type === 'json' || prop.data.type === 'yaml') {
+                // 处理json类型和嵌套subProperties
+                if (prop.data.subProperties && Object.keys(prop.data.subProperties).length > 0) {
+                    const subProps = generateTsTypeProperties(prop.data.subProperties).filter(Boolean).join('\n      ');
+                    typeStr = `{\n      ${subProps}\n    }`;
+                }
+                else {
+                    typeStr = 'any';
+                }
+            }
+            else {
+                typeStr = 'any';
+            }
+            return `    "${key}"?: ${typeStr};`;
+        })
+            .filter(Boolean);
+    }
     const pageTypeDefinitions = Object.values(state.pages)
         .map((page) => {
         if (!page.isTemplate)
@@ -302,7 +337,6 @@ function generatePageDataTypes(state) {
         // 收集所有 section 的配置信息
         const sectionTypes = page.sectionIds
             .map((sectionId) => {
-            var _a, _b, _c, _d;
             const section = page.sections[sectionId];
             if (!section)
                 return null;
@@ -310,24 +344,30 @@ function generatePageDataTypes(state) {
             if (!section.isTemplateSection)
                 return null;
             if (section.component === 'custom-component') {
-                const componentId = (_a = section.config) === null || _a === void 0 ? void 0 : _a.componentId;
+                const componentId = section.config?.componentId;
                 if (!componentId)
                     return null;
-                const component = ((_b = state.components[componentId]) === null || _b === void 0 ? void 0 : _b.data) || ((_d = (_c = state.resources.components) === null || _c === void 0 ? void 0 : _c[componentId]) === null || _d === void 0 ? void 0 : _d.component);
+                const component = state.components[componentId]?.data || state.resources.components?.[componentId]?.component;
                 if (!component)
                     return null;
                 // 为自定义组件生成属性类型
                 const properties = Object.entries(component.properties || {})
                     .map(([, prop]) => {
-                    var _a, _b, _c, _d, _e;
                     // check if the property type is allowed
-                    if (((_a = prop.data) === null || _a === void 0 ? void 0 : _a.type) && !ALLOWED_PROPERTY_TYPES.includes((_b = prop.data) === null || _b === void 0 ? void 0 : _b.type))
+                    if (prop.data?.type && !ALLOWED_PROPERTY_TYPES.includes(prop.data?.type))
                         return null;
                     // if key is undefined, use id
-                    const key = ((_c = prop.data) === null || _c === void 0 ? void 0 : _c.key) || ((_d = prop.data) === null || _d === void 0 ? void 0 : _d.id);
+                    const key = prop.data?.key || prop.data?.id;
                     if (!key)
                         return null;
-                    return `    "${key}"?: ${getCustomComponentPropertyType((_e = prop.data) === null || _e === void 0 ? void 0 : _e.type)};`;
+                    // 处理JSON类型属性，如果有subProperties则递归生成类型
+                    if ((prop.data?.type === 'json' || prop.data?.type === 'yaml') &&
+                        prop.data?.subProperties &&
+                        Object.keys(prop.data.subProperties).length > 0) {
+                        const subProps = generateTsTypeProperties(prop.data.subProperties).filter(Boolean).join('\n      ');
+                        return `    "${key}"?: {\n      ${subProps}\n    };`;
+                    }
+                    return `    "${key}"?: ${getCustomComponentPropertyType(prop.data?.type)};`;
                 })
                     .filter(Boolean)
                     .join('\n');
@@ -358,13 +398,13 @@ ${sectionTypes}
     })
         .filter(Boolean);
     // Generate type definitions string
-    const typeDefinitions = pageTypeDefinitions.map((def) => `export ${def === null || def === void 0 ? void 0 : def.typeDefinition}`).join('\n\n');
+    const typeDefinitions = pageTypeDefinitions.map((def) => `export ${def?.typeDefinition}`).join('\n\n');
     // Generate string literals for each type
     const typeStrings = pageTypeDefinitions
-        .map((def) => `export const ${def === null || def === void 0 ? void 0 : def.typeName}String = \`${def === null || def === void 0 ? void 0 : def.typeDefinition}\`;`)
+        .map((def) => `export const ${def?.typeName}String = \`${def?.typeDefinition}\`;`)
         .join('\n\n');
     // Generate union type
-    const pageUnionTypes = pageTypeDefinitions.map((def) => def === null || def === void 0 ? void 0 : def.typeName).join(' | ');
+    const pageUnionTypes = pageTypeDefinitions.map((def) => def?.typeName).join(' | ');
     return `
 // Page data type definitions
 ${typeDefinitions}
@@ -375,4 +415,210 @@ ${typeStrings}
 // Union type of all page data types
 export type PageDataUnion = ${pageUnionTypes || 'never'};`;
 }
+// 为每个页面数据类型生成JSONSchema
+function generatePageDataJsonSchemas(state) {
+    // 递归生成JSON Schema属性
+    function generateJsonSchemaProperties(properties) {
+        const schemaProperties = {};
+        Object.entries(properties).forEach(([, prop]) => {
+            if (!prop.data)
+                return;
+            // 如果key未定义，使用id
+            const key = prop.data.key || prop.data.id;
+            if (!key)
+                return;
+            // 根据属性类型设置Schema
+            if (prop.data.type === 'string' || prop.data.type === 'multiline') {
+                schemaProperties[key] = { type: 'string' };
+            }
+            else if (prop.data.type === 'number') {
+                schemaProperties[key] = { type: 'number' };
+            }
+            else if (prop.data.type === 'url') {
+                schemaProperties[key] = {
+                    type: 'object',
+                    properties: {
+                        url: { type: 'string' },
+                        mediaKitUrl: { type: 'string' },
+                        width: { type: 'number' },
+                        height: { type: 'number' },
+                    },
+                };
+            }
+            else if (prop.data.type === 'json' || prop.data.type === 'yaml') {
+                // 处理json类型和嵌套subProperties
+                if (prop.data.subProperties && Object.keys(prop.data.subProperties).length > 0) {
+                    schemaProperties[key] = {
+                        type: 'object',
+                        properties: generateJsonSchemaProperties(prop.data.subProperties),
+                    };
+                }
+                else {
+                    schemaProperties[key] = {};
+                }
+            }
+            else {
+                schemaProperties[key] = { type: 'string' };
+            }
+        });
+        return schemaProperties;
+    }
+    const pageSchemaDefinitions = Object.values(state.pages)
+        .map((page) => {
+        if (!page.isTemplate)
+            return null;
+        const typeName = `Page${page.slug
+            .replace(/^\//, '')
+            .split('/')
+            .map((s) => s.charAt(0).toUpperCase() + s.slice(1))
+            .join('')
+            .replace(/[^a-zA-Z0-9]/g, '')}Data`;
+        // 收集所有 section 的配置信息
+        const sectionProperties = {};
+        page.sectionIds.forEach((sectionId) => {
+            const section = page.sections[sectionId];
+            if (!section || !section.isTemplateSection)
+                return;
+            const sectionName = section.name || section.id;
+            if (section.component === 'custom-component') {
+                const componentId = section.config?.componentId;
+                if (!componentId)
+                    return;
+                const component = state.components[componentId]?.data || state.resources.components?.[componentId]?.component;
+                if (!component)
+                    return;
+                // 为自定义组件生成属性Schema
+                const properties = {};
+                Object.entries(component.properties || {}).forEach(([, prop]) => {
+                    // 检查属性类型是否允许
+                    if (prop.data?.type && !ALLOWED_PROPERTY_TYPES.includes(prop.data?.type))
+                        return;
+                    // 如果key未定义，使用id
+                    const key = prop.data?.key || prop.data?.id;
+                    if (!key)
+                        return;
+                    // 设置属性的Schema类型
+                    if (prop.data?.type === 'string' || prop.data?.type === 'multiline') {
+                        properties[key] = { type: 'string' };
+                    }
+                    else if (prop.data?.type === 'url') {
+                        properties[key] = {
+                            type: 'object',
+                            properties: {
+                                url: { type: 'string' },
+                                mediaKitUrl: { type: 'string' },
+                                width: { type: 'number' },
+                                height: { type: 'number' },
+                            },
+                        };
+                    }
+                    else if (prop.data?.type === 'json' || prop.data?.type === 'yaml') {
+                        // 处理json类型的属性
+                        if (prop.data?.subProperties && Object.keys(prop.data.subProperties).length > 0) {
+                            properties[key] = {
+                                type: 'object',
+                                properties: generateJsonSchemaProperties(prop.data.subProperties),
+                            };
+                        }
+                        else {
+                            properties[key] = {};
+                        }
+                    }
+                    else {
+                        properties[key] = { type: 'string' };
+                    }
+                });
+                if (Object.keys(properties).length > 0) {
+                    sectionProperties[sectionName] = {
+                        type: 'object',
+                        properties,
+                        description: section.templateDescription,
+                    };
+                }
+            }
+            else if (basicComponentSectionTypes[section.component]) {
+                // 处理基本组件section类型
+                const schemaProperties = {};
+                // 将类型字符串转换为JSONSchema格式
+                if (section.component === 'iframe') {
+                    schemaProperties.src = { type: 'string' };
+                    schemaProperties.title = { type: 'string' };
+                    schemaProperties.description = { type: 'string' };
+                }
+                else if (section.component === 'section') {
+                    schemaProperties.title = { type: 'string' };
+                    schemaProperties.description = { type: 'string' };
+                    schemaProperties.image = { type: 'string' };
+                    schemaProperties.imageMeta = {
+                        type: 'object',
+                        properties: {
+                            naturalWidth: { type: 'number' },
+                            naturalHeight: { type: 'number' },
+                            filename: { type: 'string' },
+                        },
+                    };
+                }
+                else if (section.component === 'section-card-list') {
+                    schemaProperties.title = { type: 'string' };
+                    schemaProperties.description = { type: 'string' };
+                    schemaProperties.list = {
+                        type: 'array',
+                        items: {
+                            type: 'object',
+                            properties: {
+                                id: { type: 'string' },
+                                title: { type: 'string' },
+                                description: { type: 'string' },
+                                image: { type: 'string' },
+                            },
+                        },
+                    };
+                }
+                else if (section.component === 'toc') {
+                    schemaProperties.title = { type: 'string' };
+                    schemaProperties.description = { type: 'string' };
+                }
+                sectionProperties[sectionName] = {
+                    type: 'object',
+                    properties: schemaProperties,
+                    description: section.templateDescription,
+                };
+            }
+            else {
+                // 其他类型的section
+                sectionProperties[sectionName] = {
+                    type: 'object',
+                    properties: {},
+                    description: section.templateDescription,
+                };
+            }
+        });
+        // 创建页面的JSONSchema定义
+        const schema = {
+            type: 'object',
+            properties: {
+                title: { type: 'string' },
+                image: { type: 'string' },
+                description: { type: 'string' },
+                sectionsData: {
+                    type: 'object',
+                    properties: sectionProperties,
+                    description: '包含页面的所有部分数据',
+                },
+            },
+        };
+        return {
+            typeName: `${typeName}Schema`,
+            schema,
+        };
+    })
+        .filter(Boolean);
+    // 生成Schema导出代码
+    const schemaExports = pageSchemaDefinitions
+        .map((def) => `export const ${def?.typeName} = ${JSON.stringify(def?.schema, null, 2)};`)
+        .join('\n\n');
+    return `
+// JSONSchema definitions for page data types
+${schemaExports}`;
+}
 export default generateWrapperCode;

package/lib/esm/utils/helper.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { call } from '@blocklet/sdk/lib/component';
 import config from '@blocklet/sdk/lib/config';
 import fs from 'fs';
@@ -49,7 +40,7 @@ export function findComponentFiles(options = {}) {
             metadata,
         };
     })
-        .filter(({ blockName }) => !(filter === null || filter === void 0 ? void 0 : filter.length) || filter.includes(blockName || ''));
+        .filter(({ blockName }) => !filter?.length || filter.includes(blockName || ''));
 }
 export function getBlockName(entry) {
     // First try to match index.{ts,tsx,html} pattern
@@ -75,7 +66,7 @@ export const isDev = process.env.BLOCKLET_MODE === 'development';
 export const isMetadataFile = (filePath) => {
     return filePath.endsWith(METADATA_FILE_NAME);
 };
-export const downloadAsset = (_a) => __awaiter(void 0, [_a], void 0, function* ({ asset, savePath, componentDid, }) {
+export const downloadAsset = async ({ asset, savePath, componentDid, }) => {
     if (!componentDid || !isDev || !asset || !savePath) {
         throw new Error('Invalid params');
     }
@@ -85,9 +76,9 @@ export const downloadAsset = (_a) => __awaiter(void 0, [_a], void 0, function* (
     }
     const fileName = basename(asset);
     // Ensure target directory exists
-    yield mkdir(path.dirname(savePath), { recursive: true });
+    await mkdir(path.dirname(savePath), { recursive: true });
     // download asset from pages-kit's /uploads
-    const res = yield call({
+    const res = await call({
         name: process.env.BLOCKLET_COMPONENT_DID,
         path: joinURL('/uploads', fileName),
         responseType: 'stream',
@@ -95,12 +86,12 @@ export const downloadAsset = (_a) => __awaiter(void 0, [_a], void 0, function* (
     });
     if (res.status >= 200 && res.status < 400) {
         const file = fs.createWriteStream(savePath);
-        yield pipeline(res.data, file);
+        await pipeline(res.data, file);
     }
     else {
         throw new Error(`download asset failed ${res.status}`);
     }
-});
+};
 export const getPreviewImageRelativePath = (name) => {
     return path.join(PREVIEW_IMAGE_DIR, name);
 };
@@ -122,7 +113,7 @@ export function initializeMetadata(tempFilePath) {
         try {
             metadata = JSON.parse(content);
         }
-        catch (_a) {
+        catch {
             // If parsing fails, use empty object
         }
     }
@@ -155,7 +146,6 @@ export function getBlockStudioInfo() {
 }
 export const isPagesKitBlockStudio = process.env.BLOCKLET_COMPONENT_DID === PAGES_KIT_BLOCK_STUDIO_DID;
 export const getBlockCode = (filePath) => {
-    var _a;
     // Check path safety first
     if (!isPathSafe(filePath)) {
         throw new Error('Invalid file path: path traversal detected');
@@ -166,7 +156,7 @@ export const getBlockCode = (filePath) => {
     if (!files.length) {
         throw new Error(`No code file found for block: ${blockName}`);
     }
-    const codeFile = (_a = files[0]) === null || _a === void 0 ? void 0 : _a.fullPath;
+    const codeFile = files[0]?.fullPath;
     if (!codeFile) {
         throw new Error(`No code file found for block: ${blockName}`);
     }
@@ -176,7 +166,7 @@ export const safeParse = (text) => {
     try {
         return JSON.parse(text);
     }
-    catch (_a) {
+    catch {
         return null;
     }
 };