@fangzhongya/page 0.0.24 → 0.0.25

package/dist/render/common.cjs

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const vue = require("vue");
 const lineToLargeHump = require("@fangzhongya/utils/name/lineToLargeHump");
+const shared = require("../utils/shared.cjs");
 const humpToLine = require("@fangzhongya/utils/name/humpToLine");
 const isObject = require("@fangzhongya/utils/basic/object/isObject");
 const render = require("../utils/render.cjs");
@@ -28,20 +29,18 @@ function setComponString(name, attarObj, obj = {}, compons = {}) {
   if (name === "Template") {
     return vue.h(vue.Fragment, null, setSlots(obj).default?.());
   }
-  const rs = vue.resolveComponent(name);
-  if (typeof rs === "string") {
-    compons = vue.inject("components", compons);
-    const tcom = humpToLine.humpToLine(name);
-    const cms = Object.keys(compons);
-    if (cms.includes(name)) {
-      return vue.h(compons[name], attarObj, setSlots(obj));
-    } else if (cms.includes(tcom)) {
-      return vue.h(compons[tcom], attarObj, setSlots(obj));
-    }
+  compons = vue.inject("components", compons);
+  const tcom = humpToLine.humpToLine(name);
+  const cms = Object.keys(compons);
+  if (cms.includes(name)) {
+    return vue.h(compons[name], attarObj, setSlots(obj));
+  } else if (cms.includes(tcom)) {
+    return vue.h(compons[tcom], attarObj, setSlots(obj));
+  }
+  if (shared.isHTMLTag(tcom) || shared.isSVGTag(tcom)) {
     return vue.h(tcom, attarObj, setSlots(obj).default?.());
-  } else {
-    return vue.h(rs, attarObj, setSlots(obj));
   }
+  return vue.h(vue.resolveComponent(name), attarObj, setSlots(obj));
 }
 function useGetCompon(name, attarObj, obj = {}, compons) {
   if (typeof name == "string") {

package/dist/render/common.js

@@ -1,5 +1,6 @@
-import { isVNode, h, Fragment, resolveComponent, inject } from "vue";
+import { isVNode, h, Fragment, inject, resolveComponent } from "vue";
 import { lineToLargeHump } from "@fangzhongya/utils/name/lineToLargeHump";
+import { isHTMLTag, isSVGTag } from "../utils/shared.js";
 import { humpToLine } from "@fangzhongya/utils/name/humpToLine";
 import { isObject } from "@fangzhongya/utils/basic/object/isObject";
 import { getRenderSlots, getClassId } from "../utils/render.js";
@@ -26,20 +27,18 @@ function setComponString(name, attarObj, obj = {}, compons = {}) {
   if (name === "Template") {
     return h(Fragment, null, setSlots(obj).default?.());
   }
-  const rs = resolveComponent(name);
-  if (typeof rs === "string") {
-    compons = inject("components", compons);
-    const tcom = humpToLine(name);
-    const cms = Object.keys(compons);
-    if (cms.includes(name)) {
-      return h(compons[name], attarObj, setSlots(obj));
-    } else if (cms.includes(tcom)) {
-      return h(compons[tcom], attarObj, setSlots(obj));
-    }
+  compons = inject("components", compons);
+  const tcom = humpToLine(name);
+  const cms = Object.keys(compons);
+  if (cms.includes(name)) {
+    return h(compons[name], attarObj, setSlots(obj));
+  } else if (cms.includes(tcom)) {
+    return h(compons[tcom], attarObj, setSlots(obj));
+  }
+  if (isHTMLTag(tcom) || isSVGTag(tcom)) {
     return h(tcom, attarObj, setSlots(obj).default?.());
-  } else {
-    return h(rs, attarObj, setSlots(obj));
   }
+  return h(resolveComponent(name), attarObj, setSlots(obj));
 }
 function useGetCompon(name, attarObj, obj = {}, compons) {
   if (typeof name == "string") {

package/dist/render/render.cjs

@@ -26,7 +26,7 @@ function createRender(obj, imports = {}, callback = (id) => id, components = {})
     props,
     emits: obj.emits || [],
     expose: obj.expose || [],
-    components: coms,
+    // components: coms,
     setup(prs, ctx) {
       vue.provide("components", coms);
       const temps = [];

package/dist/render/render.js

@@ -24,7 +24,7 @@ function createRender(obj, imports = {}, callback = (id) => id, components = {})
     props,
     emits: obj.emits || [],
     expose: obj.expose || [],
-    components: coms,
+    // components: coms,
     setup(prs, ctx) {
       provide("components", coms);
       const temps = [];

package/dist/utils/shared.cjs

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+function makeMap(str) {
+  const map = /* @__PURE__ */ Object.create(null);
+  for (const key of str.split(",")) map[key] = 1;
+  return (val) => val in map;
+}
+const HTML_TAGS = "html,body,base,head,link,meta,style,title,address,article,aside,footer,header,hgroup,h1,h2,h3,h4,h5,h6,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,summary,template,blockquote,iframe,tfoot";
+const SVG_TAGS = "svg,animate,animateMotion,animateTransform,circle,clipPath,color-profile,defs,desc,discard,ellipse,feBlend,feColorMatrix,feComponentTransfer,feComposite,feConvolveMatrix,feDiffuseLighting,feDisplacementMap,feDistantLight,feDropShadow,feFlood,feFuncA,feFuncB,feFuncG,feFuncR,feGaussianBlur,feImage,feMerge,feMergeNode,feMorphology,feOffset,fePointLight,feSpecularLighting,feSpotLight,feTile,feTurbulence,filter,foreignObject,g,hatch,hatchpath,image,line,linearGradient,marker,mask,mesh,meshgradient,meshpatch,meshrow,metadata,mpath,path,pattern,polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,text,textPath,title,tspan,unknown,use,view";
+const MATH_TAGS = "annotation,annotation-xml,maction,maligngroup,malignmark,math,menclose,merror,mfenced,mfrac,mfraction,mglyph,mi,mlabeledtr,mlongdiv,mmultiscripts,mn,mo,mover,mpadded,mphantom,mprescripts,mroot,mrow,ms,mscarries,mscarry,msgroup,msline,mspace,msqrt,msrow,mstack,mstyle,msub,msubsup,msup,mtable,mtd,mtext,mtr,munder,munderover,none,semantics";
+const VOID_TAGS = "area,base,br,col,embed,hr,img,input,link,meta,param,source,track,wbr";
+const isHTMLTag = makeMap(HTML_TAGS);
+const isSVGTag = makeMap(SVG_TAGS);
+const isMathMLTag = makeMap(MATH_TAGS);
+const isVoidTag = makeMap(VOID_TAGS);
+exports.isHTMLTag = isHTMLTag;
+exports.isMathMLTag = isMathMLTag;
+exports.isSVGTag = isSVGTag;
+exports.isVoidTag = isVoidTag;

package/dist/utils/shared.js

@@ -0,0 +1,19 @@
+function makeMap(str) {
+  const map = /* @__PURE__ */ Object.create(null);
+  for (const key of str.split(",")) map[key] = 1;
+  return (val) => val in map;
+}
+const HTML_TAGS = "html,body,base,head,link,meta,style,title,address,article,aside,footer,header,hgroup,h1,h2,h3,h4,h5,h6,nav,section,div,dd,dl,dt,figcaption,figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,data,dfn,em,i,kbd,mark,q,rp,rt,ruby,s,samp,small,span,strong,sub,sup,time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,option,output,progress,select,textarea,details,dialog,menu,summary,template,blockquote,iframe,tfoot";
+const SVG_TAGS = "svg,animate,animateMotion,animateTransform,circle,clipPath,color-profile,defs,desc,discard,ellipse,feBlend,feColorMatrix,feComponentTransfer,feComposite,feConvolveMatrix,feDiffuseLighting,feDisplacementMap,feDistantLight,feDropShadow,feFlood,feFuncA,feFuncB,feFuncG,feFuncR,feGaussianBlur,feImage,feMerge,feMergeNode,feMorphology,feOffset,fePointLight,feSpecularLighting,feSpotLight,feTile,feTurbulence,filter,foreignObject,g,hatch,hatchpath,image,line,linearGradient,marker,mask,mesh,meshgradient,meshpatch,meshrow,metadata,mpath,path,pattern,polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,text,textPath,title,tspan,unknown,use,view";
+const MATH_TAGS = "annotation,annotation-xml,maction,maligngroup,malignmark,math,menclose,merror,mfenced,mfrac,mfraction,mglyph,mi,mlabeledtr,mlongdiv,mmultiscripts,mn,mo,mover,mpadded,mphantom,mprescripts,mroot,mrow,ms,mscarries,mscarry,msgroup,msline,mspace,msqrt,msrow,mstack,mstyle,msub,msubsup,msup,mtable,mtd,mtext,mtr,munder,munderover,none,semantics";
+const VOID_TAGS = "area,base,br,col,embed,hr,img,input,link,meta,param,source,track,wbr";
+const isHTMLTag = makeMap(HTML_TAGS);
+const isSVGTag = makeMap(SVG_TAGS);
+const isMathMLTag = makeMap(MATH_TAGS);
+const isVoidTag = makeMap(VOID_TAGS);
+export {
+  isHTMLTag,
+  isMathMLTag,
+  isSVGTag,
+  isVoidTag
+};

package/package.json

@@ -2,7 +2,7 @@
   "name": "@fangzhongya/page",
   "private": false,
   "type": "module",
-  "version": "0.0.24",
+  "version": "0.0.25",
   "description ": "个人组件设计",
   "author": "fangzhongya ",
   "license": "MIT",