fix: use loader component with mark external

baidu · Jun 1, 2022 · ee53d66 · ee53d66
1 parent d30ca64
commit ee53d66
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/parsers/component-class-parser.ts b/src/parsers/component-class-parser.ts
@@ -99,7 +99,7 @@ export class ComponentClassParser {
 
         const components: { [key: string]: Component<{}> | undefined } =
             getMemberFromClass(parentComponentClass, 'components', {})
-        for (const [tagName, componentClass] of Object.entries(components)) {
+        for (let [tagName, componentClass] of Object.entries(components)) {
             if (!componentClass) {
                 continue
             }
@@ -115,6 +115,10 @@ export class ComponentClassParser {
                 continue
             }
 
+            if (isComponentLoader(componentClass) && componentClass.placeholder) {
+                componentClass = componentClass.placeholder
+            }
+
             // 外部组件
             if (componentClass[COMPONENT_REFERENCE]) {
                 children.set(tagName, componentClass[COMPONENT_REFERENCE])
@@ -124,7 +128,7 @@ export class ComponentClassParser {
             // 可能是空，例如 var Foo = defineComponent({components: {foo: Foo}})
             children.set(tagName, new DynamicComponentReference(
                 '.',
-                componentID(componentClass === this.root, () => this.getOrSetID(componentClass)),
+                componentID(componentClass === this.root, () => this.getOrSetID(componentClass as Component<{}>)),
                 componentClass
             ))
         }

diff --git a/test/cases/external-placeholder/component.js b/test/cases/external-placeholder/component.js
@@ -1,5 +1,5 @@
 const san = require('san')
-const ChildA = require('./childA.san.js')
+const ChildA = require('./childA.san')
 
 const MyComponent = san.defineComponent({
     components: {

diff --git a/test/cases/external-placeholder/expected.html b/test/cases/external-placeholder/expected.html
@@ -0,0 +1 @@
+<div><div>aaa</div></div>