@blocklet/pages-kit 0.4.118 → 0.4.119

package/lib/esm/utils/property.js

@@ -8,6 +8,7 @@ export function mergeComponent({ componentId, getComponent, locale, defaultLocal
     if (!component)
         return null;
     let script;
+    let editComponent;
     const props = Object.fromEntries(Object.entries(parameters ?? {}).map(([id, { value }]) => {
         const property = component?.properties?.[id]?.data;
         if (!property)
@@ -23,6 +24,7 @@ export function mergeComponent({ componentId, getComponent, locale, defaultLocal
         ])));
         if (component.renderer?.type === 'react-component') {
             script = component.renderer?.script;
+            editComponent = component.renderer?.editComponent;
             break;
         }
         if (component.renderer?.type === 'web-component') {
@@ -51,7 +53,7 @@ export function mergeComponent({ componentId, getComponent, locale, defaultLocal
     }
     if (!script)
         return null;
-    return { script, props };
+    return { script, props, editComponent };
 }
 export const RenderNestedComponent = '__RENDER_NESTED_COMPONENT__';
 export function safeJSONParse(value) {

package/lib/esm/utils/typescript/builtin-module-transformer.js

@@ -1,3 +1,4 @@
+import { basename } from 'path';
 import { BuiltinModulesGlobalVariableName } from '../../types/builtin';
 export const isRelativeModule = (moduleSpecifier) => {
     if (!moduleSpecifier) {
@@ -11,22 +12,22 @@ export const isAsyncModule = (moduleSpecifier) => {
     }
     return ['@blocklet/pages-kit/builtin/async/ai-runtime'].includes(moduleSpecifier);
 };
+// check if the module is a target module
+export const isBuiltinModule = (moduleSpecifier) => {
+    if (!moduleSpecifier) {
+        return false;
+    }
+    return moduleSpecifier.startsWith('@blocklet/pages-kit/builtin/');
+};
 export const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     const { factory } = context;
     // 统一的模块导入收集器
     const imports = [];
-    // check if the module is a target module
-    const isTargetModule = (moduleSpecifier) => {
-        if (!moduleSpecifier) {
-            return false;
-        }
-        return moduleSpecifier.startsWith('@blocklet/pages-kit/builtin/') || isRelativeModule(moduleSpecifier);
-    };
     // filter and collect the import statements that need to be processed
     const statements = file.statements.filter((s) => {
         if (ts.isImportDeclaration(s) &&
             ts.isStringLiteral(s.moduleSpecifier) &&
-            isTargetModule(s.moduleSpecifier.text)) {
+            (isBuiltinModule(s.moduleSpecifier.text) || isRelativeModule(s.moduleSpecifier.text))) {
             const importInfo = {
                 moduleName: s.moduleSpecifier.text,
                 name: s.importClause?.name?.text,
@@ -55,11 +56,11 @@ export const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     statements.unshift(...imports.flatMap((importInfo) => {
         // call inject-global-components require method
         const requireCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier(BuiltinModulesGlobalVariableName), 'require'), undefined, [factory.createStringLiteral(importInfo.moduleName)]);
+        const isAsync = isRelativeModule(importInfo.moduleName) || isAsyncModule(importInfo.moduleName);
         // create await expression if the module is ../ or ./
-        const mod = isRelativeModule(importInfo.moduleName) || isAsyncModule(importInfo.moduleName)
-            ? factory.createAwaitExpression(requireCall)
-            : requireCall;
+        const mod = isAsync ? factory.createAwaitExpression(requireCall) : requireCall;
         return [
+            // handle default import
             importInfo.name
                 ? factory.createVariableStatement([], factory.createVariableDeclarationList([
                     factory.createVariableDeclaration(factory.createIdentifier(importInfo.name), undefined, undefined, factory.createPropertyAccessExpression(mod, 'default')),
@@ -72,12 +73,31 @@ export const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
                 ], ts.NodeFlags.Const))
                 : undefined,
             // handle named import
-            ...importInfo.members.map((member) => {
-                return factory.createVariableStatement([], factory.createVariableDeclarationList([
-                    factory.createVariableDeclaration(factory.createIdentifier(member.name), undefined, undefined, factory.createPropertyAccessExpression(mod, member.propertyName ?? member.name)),
-                ], ts.NodeFlags.Const));
-            }),
+            importInfo.members.length > 0
+                ? factory.createVariableStatement([], factory.createVariableDeclarationList([
+                    factory.createVariableDeclaration(factory.createObjectBindingPattern(importInfo.members.map((member) => {
+                        return factory.createBindingElement(undefined, member.propertyName ? factory.createIdentifier(member.propertyName) : undefined, factory.createIdentifier(member.name), undefined);
+                    })), undefined, undefined, mod),
+                ], ts.NodeFlags.Const))
+                : undefined,
         ].filter((i) => !!i);
     }));
     return factory.updateSourceFile(file, statements);
 };
+export const createWellKnownChunksTransformer = (ts) => (context) => (file) => {
+    const { factory } = context;
+    // 转换所有导入声明
+    const transformedStatements = file.statements.map((node) => {
+        if (ts.isImportDeclaration(node) &&
+            ts.isStringLiteral(node.moduleSpecifier) &&
+            isRelativeModule(node.moduleSpecifier.text)) {
+            const moduleSpecifier = node.moduleSpecifier.text;
+            const fileName = basename(moduleSpecifier);
+            const newPath = `/.well-known/chunks/${fileName}`;
+            // 创建新的导入声明
+            return factory.createImportDeclaration(node.modifiers, node.importClause, factory.createStringLiteral(newPath));
+        }
+        return node;
+    });
+    return factory.updateSourceFile(file, transformedStatements);
+};