@blocklet/pages-kit 0.6.46 → 0.6.47

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

@@ -13,8 +13,6 @@ const isAsyncModule = (moduleSpecifier) => {
     if (!moduleSpecifier) {
         return false;
     }
-    // return ['@blocklet/pages-kit/builtin/async/ai-runtime'].includes(moduleSpecifier);
-    // FIXME 看起来原来的条件像是有问题，目前已经没有 ai-runtime 了，暂时先注释掉，直接返回 false
     return false;
 };
 exports.isAsyncModule = isAsyncModule;
@@ -30,8 +28,23 @@ const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
     const { factory } = context;
     // 统一的模块导入收集器
     const imports = [];
+    // Transform dynamic imports in expressions
+    const transformNode = (node) => {
+        // Handle import() calls
+        if (ts.isCallExpression(node) && node.expression.kind === ts.SyntaxKind.ImportKeyword) {
+            const arg = node.arguments[0];
+            if (arg && ts.isStringLiteral(arg) && ((0, exports.isBuiltinModule)(arg.text) || (0, exports.isRelativeModule)(arg.text))) {
+                const requireCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier(builtin_1.BuiltinModulesGlobalVariableName), 'require'), undefined, [factory.createStringLiteral(arg.text)]);
+                // For dynamic imports, we don't add await - they should return Promise
+                // The calling code (like .then()) will handle the Promise
+                return requireCall;
+            }
+        }
+        return ts.visitEachChild(node, transformNode, context);
+    };
     // filter and collect the import statements that need to be processed
-    const statements = file.statements.filter((s) => {
+    const statements = file.statements
+        .filter((s) => {
         if (ts.isImportDeclaration(s) &&
             ts.isStringLiteral(s.moduleSpecifier) &&
             ((0, exports.isBuiltinModule)(s.moduleSpecifier.text) || (0, exports.isRelativeModule)(s.moduleSpecifier.text))) {
@@ -59,10 +72,12 @@ const createBuiltinModuleTransformer = (ts) => (context) => (file) => {
             return false;
         }
         return true;
-    });
+    })
+        .map((statement) => transformNode(statement)); // Transform dynamic imports in remaining statements
     statements.unshift(...imports.flatMap((importInfo) => {
         // call inject-global-components require method
         const requireCall = factory.createCallExpression(factory.createPropertyAccessExpression(factory.createIdentifier(builtin_1.BuiltinModulesGlobalVariableName), 'require'), undefined, [factory.createStringLiteral(importInfo.moduleName)]);
+        // Only static imports should be async, dynamic imports return Promise
         const isAsync = (0, exports.isRelativeModule)(importInfo.moduleName) || (0, exports.isAsyncModule)(importInfo.moduleName);
         // create await expression if the module is ../ or ./
         const mod = isAsync ? factory.createAwaitExpression(requireCall) : requireCall;