@blocklet/pages-kit 0.6.45 → 0.6.47

package/lib/cjs/utils/builtin.js

@@ -60,7 +60,6 @@ exports.BuiltinModules = {
     '@blocklet/pages-kit/builtin/async/react-markdown': {},
     '@blocklet/pages-kit/builtin/async/react-syntax-highlighter': {},
     '@blocklet/pages-kit/builtin/async/image-preview': {},
-    '@blocklet/pages-kit/builtin/async/ai-runtime': {},
     '@blocklet/pages-kit/builtin/uploader': {},
     '@blocklet/pages-kit/builtin/color-picker': {},
     '@blocklet/pages-kit/builtin/markdown/index': {},

package/lib/cjs/utils/inject-global-components-dump-json.js

@@ -1028,51 +1028,6 @@ export default () =>
             examples: [],
         },
     },
-    // '@blocklet/pages-kit/builtin/async/ai-runtime'
-    {
-        name: '@blocklet/pages-kit/builtin/async/ai-runtime',
-        description: 'A ai-runtime component for pages-kit builtin package',
-        docs: {
-            components: [
-                'CurrentAgent',
-                'CurrentAgentProvider',
-                'CurrentMessage',
-                'CurrentMessageProvider',
-                'Runtime',
-                'ChatBotButton',
-                'SimplePage',
-                'SimpleChat',
-                'PhotoGallery',
-                'AutoForm',
-                'SimpleOutput',
-                'ChatOutput',
-                'PhotoGalleryItem',
-            ],
-            import: "import * as AiRuntime from '@blocklet/pages-kit/builtin/async/ai-runtime'",
-            export: `
-export * from './contexts/CurrentAgent';
-export { default as CurrentAgentProvider } from './contexts/CurrentAgent';
-
-export * from './contexts/CurrentMessage';
-export { default as CurrentMessageProvider } from './contexts/CurrentMessage';
-
-export * from './state/runtime';
-export * from './state/session';
-
-export { default as Runtime } from './runtime/Runtime';
-export { default as ChatBotButton } from './runtime/ChatBotButton';
-
-export { default as SimplePage } from './runtime-components/SimplePage';
-export { default as SimpleChat } from './runtime-components/SimpleChat';
-export { default as PhotoGallery } from './runtime-components/PhotoGallery';
-export { default as AutoForm } from './runtime-components/AutoForm';
-export { default as SimpleOutput } from './runtime-components/SimpleOutput';
-export { default as ChatOutput } from './runtime-components/ChatOutput';
-export { default as PhotoGalleryItem } from './runtime-components/PhotoGalleryItem';
-`,
-            examples: [],
-        },
-    },
     // '@blocklet/pages-kit/builtin/pages-kit'
     {
         name: '@blocklet/pages-kit/builtin/pages-kit',

package/lib/cjs/utils/inject-global-components.js

@@ -111,7 +111,6 @@ function injectGlobalComponents() {
         '@blocklet/pages-kit/builtin/async/react-markdown': reactMarkdown,
         '@blocklet/pages-kit/builtin/async/react-syntax-highlighter': reactSyntaxHighlighter,
         '@blocklet/pages-kit/builtin/async/image-preview': imagePreview,
-        '@blocklet/pages-kit/builtin/async/ai-runtime': Promise.resolve().then(() => __importStar(require('../builtin/async/ai-runtime'))),
         '@blocklet/pages-kit/builtin/event-bus': eventBus,
         '@blocklet/pages-kit/builtin/zod': zod,
     };
@@ -238,7 +237,7 @@ function injectGlobalComponents() {
                 : [];
             // create module code
             const moduleCode = `// GENERATED FILE. DO NOT EDIT.
-const moduleSource = window['${builtin_1.BuiltinModulesGlobalVariableName}'].modules['${modulePath}'];       
+const moduleSource = window['${builtin_1.BuiltinModulesGlobalVariableName}'].modules['${modulePath}'];
 ${namedExports.map((name) => `export const ${name} = moduleSource['${name}'];`).join('\n')}
 ${defaultExports.map((name) => `export const ${name} = moduleSource.default['${name}'];`).join('\n')}
 export default ${hasDefaultExport ? 'moduleSource.default' : 'moduleSource'};

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

@@ -13,7 +13,7 @@ const isAsyncModule = (moduleSpecifier) => {
     if (!moduleSpecifier) {
         return false;
     }
-    return ['@blocklet/pages-kit/builtin/async/ai-runtime'].includes(moduleSpecifier);
+    return false;
 };
 exports.isAsyncModule = isAsyncModule;
 // check if the module is a target module
@@ -28,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))) {
@@ -57,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;