@hap-toolkit/dsl-xvm 1.9.10 → 1.9.11

package/lib/loaders/common/utils.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.FRAG_TYPE=exports.ENTRY_TYPE=void 0,exports.consumeMap=consumeMap,exports.convertPath=convertPath,exports.generateMap=generateMap,exports.getFileNameWithHash=getFileNameWithHash,exports.getNameByPath=getNameByPath,exports.getWebpackOptions=getWebpackOptions,exports.isPlainObject=isPlainObject,exports.isUXRender=isUXRender,exports.makeRequireString=makeRequireString,exports.print=print,exports.splitSourceLine=splitSourceLine,exports.stringifyLoaders=stringifyLoaders;var _path=_interopRequireDefault(require("path")),_loaderUtils=_interopRequireDefault(require("loader-utils")),_hashSum=_interopRequireDefault(require("hash-sum")),_sourceMap=require("source-map"),_config=_interopRequireDefault(require("@hap-toolkit/shared-utils/config"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getNameByPath(e){return _path.default.basename(e).replace(/\..*$/,"")}function getFileNameWithHash(e,t){const r=_path.default.relative(".",e);return`./${r}?${(0,_hashSum.default)(r+t)}`}const toString=Object.prototype.toString,OBJECT_STRING="[object Object]";function isPlainObject(e){return toString.call(e)===OBJECT_STRING}function makeRequireString(e,t,r){return print({loader:t,filepath:r}),"require("+_loaderUtils.default.stringifyRequest(e,t?`!${t}!${r}`:`${r}`)+")\n"}function stringifyLoaders(e){return e.map((e=>{if("string"==typeof e)return e;{const t=e.name,r=[];if(e.query)for(const t in e.query){const n=e.query[t];null!=n&&(!0===n?r.push(t):n instanceof Array?r.push(`${t}[]=${n.join(",")}`):r.push(`${t}=${n}`))}return`${t}${r.length?"?"+r.join("&"):""}`}})).join("!")}function generateMap(e,t,r){const n=getFileNameWithHash(e.resourcePath),o=_path.default.resolve("."),i=new _sourceMap.SourceMapGenerator({sourceRoot:o,skipValidation:!0});i.setSourceContent(n,t);for(const{original:e,generated:t}of r)i.addMapping({source:n,original:e,generated:t});return i}function consumeMap(e,t,r){const n=new _sourceMap.SourceMapConsumer(r);let o;const i=[],a=[],s={};return splitSourceLine(t).forEach(((e,t)=>{t+=1;const r=n.originalPositionFor({line:t,column:0});r.source&&(o=r.source,i.push({line:r.line,column:r.column}),a.push({line:t,column:0}),s[`line-${t}-column-0`]={line:r.line,column:r.column})})),{source:o,original:i,generated:a,mapping:s,sourcesContent:n.sourcesContent}}const REGEXP_LINE=/\r?\n/g;function splitSourceLine(e){return e.split(REGEXP_LINE)}const showLog=!1;function print(e){false}function getWebpackOptions(e){return e.options||{}}function isUXRender(e){return e===ENTRY_TYPE.PAGE||e===ENTRY_TYPE.CARD}function convertPath(e){let t=_path.default.join(_config.default.projectPath,"src");return/^[/\\]node_modules/.test(e)&&(t=_config.default.projectPath),_path.default.join(t,e)}const ENTRY_TYPE={APP:"app",PAGE:"page",COMP:"comp",CARD:"card",JS:"js"};exports.ENTRY_TYPE=ENTRY_TYPE;const FRAG_TYPE={IMPORT:"import",TEMPLATE:"template",STYLE:"style",SCRIPT:"script"};exports.FRAG_TYPE=FRAG_TYPE;
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.FRAG_TYPE=exports.ENTRY_TYPE=void 0,exports.consumeMap=consumeMap,exports.convertPath=convertPath,exports.generateMap=generateMap,exports.getFileNameWithHash=getFileNameWithHash,exports.getNameByPath=getNameByPath,exports.getWebpackOptions=getWebpackOptions,exports.isPlainObject=isPlainObject,exports.isUXRender=isUXRender,exports.makeRequireString=makeRequireString,exports.print=print,exports.splitSourceLine=splitSourceLine,exports.stringifyLoaders=stringifyLoaders;var _path=_interopRequireDefault(require("@jayfate/path")),_loaderUtils=_interopRequireDefault(require("loader-utils")),_hashSum=_interopRequireDefault(require("hash-sum")),_sourceMap=require("source-map"),_config=_interopRequireDefault(require("@hap-toolkit/shared-utils/config"));function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}function getNameByPath(e){return _path.default.basename(e).replace(/\..*$/,"")}function getFileNameWithHash(e,t){const r=_path.default.relative(".",e);return`./${r}?${(0,_hashSum.default)(r+t)}`}const toString=Object.prototype.toString,OBJECT_STRING="[object Object]";function isPlainObject(e){return toString.call(e)===OBJECT_STRING}function makeRequireString(e,t,r){return print({loader:t,filepath:r}),"require("+_loaderUtils.default.stringifyRequest(e,t?`!${t}!${r}`:`${r}`)+")\n"}function stringifyLoaders(e){return e.map((e=>{if("string"==typeof e)return e;{const t=e.name,r=[];if(e.query)for(const t in e.query){const n=e.query[t];null!=n&&(!0===n?r.push(t):n instanceof Array?r.push(`${t}[]=${n.join(",")}`):r.push(`${t}=${n}`))}return`${t}${r.length?"?"+r.join("&"):""}`}})).join("!")}function generateMap(e,t,r){const n=getFileNameWithHash(e.resourcePath),o=_path.default.resolve("."),i=new _sourceMap.SourceMapGenerator({sourceRoot:o,skipValidation:!0});i.setSourceContent(n,t);for(const{original:e,generated:t}of r)i.addMapping({source:n,original:e,generated:t});return i}function consumeMap(e,t,r){const n=new _sourceMap.SourceMapConsumer(r);let o;const i=[],a=[],s={};return splitSourceLine(t).forEach(((e,t)=>{t+=1;const r=n.originalPositionFor({line:t,column:0});r.source&&(o=r.source,i.push({line:r.line,column:r.column}),a.push({line:t,column:0}),s[`line-${t}-column-0`]={line:r.line,column:r.column})})),{source:o,original:i,generated:a,mapping:s,sourcesContent:n.sourcesContent}}const REGEXP_LINE=/\r?\n/g;function splitSourceLine(e){return e.split(REGEXP_LINE)}const showLog=!1;function print(e){false}function getWebpackOptions(e){return e.options||{}}function isUXRender(e){return e===ENTRY_TYPE.PAGE||e===ENTRY_TYPE.CARD}function convertPath(e){let t=_path.default.join(_config.default.projectPath,"src");return/^[/\\]node_modules/.test(e)&&(t=_config.default.projectPath),_path.default.join(t,e)}const ENTRY_TYPE={APP:"app",PAGE:"page",COMP:"comp",CARD:"card",JS:"js"};exports.ENTRY_TYPE=ENTRY_TYPE;const FRAG_TYPE={IMPORT:"import",TEMPLATE:"template",STYLE:"style",SCRIPT:"script"};exports.FRAG_TYPE=FRAG_TYPE;
 //# sourceMappingURL=utils.js.map

package/lib/loaders/manifest-loader.js

@@ -1,2 +1,2 @@
-"use strict";var _path=_interopRequireDefault(require("path")),_fs=_interopRequireDefault(require("fs")),_loaderUtils=_interopRequireDefault(require("loader-utils")),_sharedUtils=require("@hap-toolkit/shared-utils"),_utils=require("./common/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const REGEXP_INT=/^[-+]?[0-9]+$/,REGEXP_URL=/^['"]?([^()]+?)['"]?$/gi,REGEXP_NAME=/^[a-zA-Z_][a-zA-Z0-9]*$/,validator={integer:function(e){return(e=(e||"").toString()).match(REGEXP_INT)?{value:!0}:{value:!1,reason:function(e,t){return"ERROR: manifest.json的配置项 `"+e+"` 的值 `"+t+"` 无效(仅支持整数)"}}},object:function(e){const t=(0,_utils.isPlainObject)(e);return{value:(0,_utils.isPlainObject)(e),reason:t?null:function(e,t){return"ERROR: manifest.json的配置项 `"+e+"` 的值 `"+t+"` 无效(仅支持对象)"}}},url:function(e){return(e=(e||"").toString().trim()).match(REGEXP_URL)?{value:!0}:{value:!1,reason:function(e,t){return"ERROR: manifest.json的配置项 `"+e+"` 的值 `"+t+"` 必须是url"}}},name:function(e){return(e=(e||"").toString()).match(REGEXP_NAME)?{value:!0}:{value:!1,reason:function(e,t){return"ERROR: manifest.json的配置项 `"+e+"` 的值 `"+t+"` 格式不正确"}}}},validatorMap={package:{type:validator.string,require:!0},name:{type:validator.string,require:!0},versionCode:{type:validator.integer,require:!0},icon:{type:validator.url,require:!0},banner:{type:validator.url,require:!1},config:{type:validator.object,require:!0},router:{type:validator.object,require:!0}};function validate(e,t){let r,a;const n=validatorMap[e];return n&&"function"==typeof n.type?(r=n.type(t),r.reason&&(a={reason:r.reason(e,t)})):r={value:!0},{value:r.value,log:a}}const requireAttrMap=[];Object.keys(validatorMap).forEach((function(e){validatorMap[e].require&&requireAttrMap.push(e)})),module.exports=function(e,t){const r=_loaderUtils.default.getOptions(this).path,a=JSON.parse(_fs.default.readFileSync(_path.default.join(r,"manifest.json")).toString()),n=[];if(a){let e,t;requireAttrMap.forEach((function(e){a[e]||n.push({line:1,column:1,reason:"ERROR: manifest.json缺少配置项 `"+e+"`"})})),Object.keys(a).forEach((r=>{e=a[r],t=validate(r,e),t.log&&n.push({line:1,column:1,reason:t.log.reason})})),(0,_sharedUtils.logWarn)(this,n),global.framework.manifest=a}this.callback(null,e,t)};
+"use strict";var _path=_interopRequireDefault(require("@jayfate/path")),_fs=_interopRequireDefault(require("fs")),_loaderUtils=_interopRequireDefault(require("loader-utils")),_sharedUtils=require("@hap-toolkit/shared-utils"),_utils=require("./common/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const REGEXP_INT=/^[-+]?[0-9]+$/,REGEXP_URL=/^['"]?([^()]+?)['"]?$/gi,REGEXP_NAME=/^[a-zA-Z_][a-zA-Z0-9]*$/,validator={integer:function(e){return(e=(e||"").toString()).match(REGEXP_INT)?{value:!0}:{value:!1,reason:function(e,t){return"ERROR: manifest.json的配置项 `"+e+"` 的值 `"+t+"` 无效(仅支持整数)"}}},object:function(e){const t=(0,_utils.isPlainObject)(e);return{value:(0,_utils.isPlainObject)(e),reason:t?null:function(e,t){return"ERROR: manifest.json的配置项 `"+e+"` 的值 `"+t+"` 无效(仅支持对象)"}}},url:function(e){return(e=(e||"").toString().trim()).match(REGEXP_URL)?{value:!0}:{value:!1,reason:function(e,t){return"ERROR: manifest.json的配置项 `"+e+"` 的值 `"+t+"` 必须是url"}}},name:function(e){return(e=(e||"").toString()).match(REGEXP_NAME)?{value:!0}:{value:!1,reason:function(e,t){return"ERROR: manifest.json的配置项 `"+e+"` 的值 `"+t+"` 格式不正确"}}}},validatorMap={package:{type:validator.string,require:!0},name:{type:validator.string,require:!0},versionCode:{type:validator.integer,require:!0},icon:{type:validator.url,require:!0},banner:{type:validator.url,require:!1},config:{type:validator.object,require:!0},router:{type:validator.object,require:!0}};function validate(e,t){let r,a;const n=validatorMap[e];return n&&"function"==typeof n.type?(r=n.type(t),r.reason&&(a={reason:r.reason(e,t)})):r={value:!0},{value:r.value,log:a}}const requireAttrMap=[];Object.keys(validatorMap).forEach((function(e){validatorMap[e].require&&requireAttrMap.push(e)})),module.exports=function(e,t){const r=_loaderUtils.default.getOptions(this).path,a=JSON.parse(_fs.default.readFileSync(_path.default.join(r,"manifest.json")).toString()),n=[];if(a){let e,t;requireAttrMap.forEach((function(e){a[e]||n.push({line:1,column:1,reason:"ERROR: manifest.json缺少配置项 `"+e+"`"})})),Object.keys(a).forEach((r=>{e=a[r],t=validate(r,e),t.log&&n.push({line:1,column:1,reason:t.log.reason})})),(0,_sharedUtils.logWarn)(this,n),global.framework.manifest=a}this.callback(null,e,t)};
 //# sourceMappingURL=manifest-loader.js.map

package/lib/loaders/ux-fragment-utils.js

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.parseImportList=parseImportList,exports.processImportFrag=processImportFrag,exports.processScriptFrag=processScriptFrag,exports.processStyleFrag=processStyleFrag,exports.processTemplateFrag=processTemplateFrag;var _path=_interopRequireDefault(require("path")),_config=_interopRequireDefault(require("@hap-toolkit/shared-utils/config")),_compilationConfig=require("@hap-toolkit/shared-utils/compilation-config"),_validator=_interopRequireDefault(require("@hap-toolkit/compiler/lib/template/validator")),_lib=require("@hap-toolkit/packager/lib"),_utils=require("./common/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const cwd=_config.default.projectPath,defaultLoaders={component:require.resolve("./ux-loader.js"),fragment:require.resolve("./fragment-loader.js"),template:require.resolve("./template-loader.js"),style:require.resolve("./style-loader.js"),script:require.resolve("./script-loader.js"),module:require.resolve("./module-loader.js"),babel:require.resolve("babel-loader"),mainfest:require.resolve("./manifest-loader.js"),access:require.resolve("./access-loader.js"),"extract-css":require.resolve("./extract-css-loader.js")};function makeLoaderString(e,r,t){let s;if(r=r||{},e===_utils.FRAG_TYPE.IMPORT)return s=[{name:defaultLoaders.component,query:{cwd:cwd,type:_utils.FRAG_TYPE.IMPORT}}],(0,_utils.stringifyLoaders)(s);if(e===_utils.FRAG_TYPE.TEMPLATE)return s=[{name:defaultLoaders.template}],r.alone||s.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.TEMPLATE}}),(0,_utils.stringifyLoaders)(s);if(e===_utils.FRAG_TYPE.STYLE){s=[{name:defaultLoaders.style,query:{index:0,type:_utils.FRAG_TYPE.STYLE}}],_compilationConfig.compileOptionsObject.enableExtractCss&&s.unshift({name:defaultLoaders["extract-css"]});let e=r.lang;return e&&"css"!==e&&(e="scss"===e?"sass":e,s.push({name:`${e}-loader`})),r.alone||s.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.STYLE}}),(0,_utils.stringifyLoaders)(s)}if(e===_utils.FRAG_TYPE.SCRIPT){const e=(0,_lib.getBabelConfigJsPath)(cwd,!!_config.default.useTreeShaking);return s=[],_compilationConfig.compileOptionsObject.enableIstanbul&&s.push({name:"istanbul-instrumenter-loader",query:{}}),s.push({name:defaultLoaders.script},{name:defaultLoaders.module}),t===_utils.ENTRY_TYPE.APP?(s.push({name:defaultLoaders.mainfest,query:{path:_path.default.dirname(r.path)}},{name:require.resolve("babel-loader"),query:{cwd:cwd,cacheDirectory:!0,comments:!1,configFile:e}}),_compilationConfig.compileOptionsObject.enableDiagnosis&&s.push({name:require.resolve("@hap-toolkit/packager/lib/loaders/diagnosis-loader.js"),query:{pureScript:!0,hookName:"onCreate",hostName:_compilationConfig.compileOptionsObject.enableDiagnosis}})):(s.push({name:require.resolve("babel-loader"),query:{cwd:cwd,cacheDirectory:!0,plugins:[require.resolve("./babel-plugin-jsx.js")],comments:!1,configFile:e}}),(0,_utils.isUXRender)(t)&&s.push({name:defaultLoaders.access})),r.alone||s.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.SCRIPT}}),_compilationConfig.compileOptionsObject.enableE2e&&s.push({name:require.resolve("@hap-toolkit/packager/lib/loaders/inject-suite-loader.js"),query:{hookName:"onCreate"}}),(0,_utils.stringifyLoaders)(s)}}function processImportFrag(e,r,t){let s="";if(r.length)for(let a=0;a<r.length;a++){const o=r[a];let i=o.attrs.src,l=o.attrs.name;if(!i)return e.emitWarning(new Error("导入组件需要设置属性 `src` ")),"";if(!o.isValid)return e.emitError(new Error(`导入组件resolve 出错 ${o.err}`)),"";i=o.srcPath,l||(l=(0,_utils.getNameByPath)(i)),l=l.toLowerCase(),_validator.default.isReservedTag(l)&&e.emitWarning(new Error("导入组件的属性 `name` 不能使用保留字: "+l)),t.push(l),(0,_utils.print)({name:l,src:i});let n=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.IMPORT),`${i}?uxType=${_utils.ENTRY_TYPE.COMP}&name=${l}`);_compilationConfig.compileOptionsObject.stats&&(n=`console.time(\`PERF: require @app-component/${l}\`)\n${n}`,n+=`console.timeEnd(\`PERF: require @app-component/${l}\`)\n\n`),s+=n}return s}function processTemplateFrag(e,r,t,s){let a="{}";if(r.length){const o=r[0];let i=e.resourcePath;const l=o.attrs.src;l&&(i=l),s=s.map((e=>"importNames[]="+e)),a=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.TEMPLATE,{alone:!!l}),`${i}?uxType=${t}&${s.join(",")}`)}else e.emitError(new Error("需要模板 <template> 片段"));return a}function processStyleFrag(e,r,t){let s="{}";if(r.length){const a=r[0];let o=e.resourcePath;const i=a.attrs.src,l=a.attrs.lang;i&&(o=i),(0,_utils.print)({style:o}),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.STYLE,{alone:!!i,lang:l}),`${o}?uxType=${t}`)}return s}function processScriptFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const i=a.attrs.src;i&&(o=i),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.SCRIPT,{alone:!!i,path:e.resourcePath},t),`${o}?uxType=${t}`)}return s}function parseImportList(e,r){return Promise.all(r.map((r=>resolveImportItemSrc(e,r))))}function resolveImportItemSrc(e,r){return r.attrs.src?new Promise((t=>{e.resolve(e.context,r.attrs.src,(function(e,s){return e?(r.isValid=!1,r.err=e,t(r)):(r.isValid=!0,r.srcPath=s,t(r))}))})):(r.isValid=!1,Promise.resolve(r))}
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.parseImportList=parseImportList,exports.processImportFrag=processImportFrag,exports.processScriptFrag=processScriptFrag,exports.processStyleFrag=processStyleFrag,exports.processTemplateFrag=processTemplateFrag;var _path=_interopRequireDefault(require("@jayfate/path")),_config=_interopRequireDefault(require("@hap-toolkit/shared-utils/config")),_compilationConfig=require("@hap-toolkit/shared-utils/compilation-config"),_validator=_interopRequireDefault(require("@hap-toolkit/compiler/lib/template/validator")),_lib=require("@hap-toolkit/packager/lib"),_utils=require("./common/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const cwd=_path.default.resolve(_config.default.projectPath),defaultLoaders={component:require.resolve("./ux-loader.js"),fragment:require.resolve("./fragment-loader.js"),template:require.resolve("./template-loader.js"),style:require.resolve("./style-loader.js"),script:require.resolve("./script-loader.js"),module:require.resolve("./module-loader.js"),babel:require.resolve("babel-loader"),mainfest:require.resolve("./manifest-loader.js"),access:require.resolve("./access-loader.js"),"extract-css":require.resolve("./extract-css-loader.js")};function makeLoaderString(e,r,t){let s;if(r=r||{},e===_utils.FRAG_TYPE.IMPORT)return s=[{name:defaultLoaders.component,query:{cwd:cwd,type:_utils.FRAG_TYPE.IMPORT}}],(0,_utils.stringifyLoaders)(s);if(e===_utils.FRAG_TYPE.TEMPLATE)return s=[{name:defaultLoaders.template}],r.alone||s.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.TEMPLATE}}),(0,_utils.stringifyLoaders)(s);if(e===_utils.FRAG_TYPE.STYLE){s=[{name:defaultLoaders.style,query:{index:0,type:_utils.FRAG_TYPE.STYLE}}],_compilationConfig.compileOptionsObject.enableExtractCss&&s.unshift({name:defaultLoaders["extract-css"]});let e=r.lang;return e&&"css"!==e&&(e="scss"===e?"sass":e,s.push({name:`${e}-loader`})),r.alone||s.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.STYLE}}),(0,_utils.stringifyLoaders)(s)}if(e===_utils.FRAG_TYPE.SCRIPT){const e=(0,_lib.getBabelConfigJsPath)(cwd,!!_config.default.useTreeShaking);return s=[],_compilationConfig.compileOptionsObject.enableIstanbul&&s.push({name:"istanbul-instrumenter-loader",query:{}}),s.push({name:defaultLoaders.script},{name:defaultLoaders.module}),t===_utils.ENTRY_TYPE.APP?(s.push({name:defaultLoaders.mainfest,query:{path:_path.default.dirname(r.path)}},{name:require.resolve("babel-loader"),query:{cwd:cwd,cacheDirectory:!0,comments:!1,configFile:e}}),_compilationConfig.compileOptionsObject.enableDiagnosis&&s.push({name:require.resolve("@hap-toolkit/packager/lib/loaders/diagnosis-loader.js"),query:{pureScript:!0,hookName:"onCreate",hostName:_compilationConfig.compileOptionsObject.enableDiagnosis}})):(s.push({name:require.resolve("babel-loader"),query:{cwd:cwd,cacheDirectory:!0,plugins:[_path.default.resolve(require.resolve("./babel-plugin-jsx.js"))],comments:!1,configFile:e}}),(0,_utils.isUXRender)(t)&&s.push({name:defaultLoaders.access})),r.alone||s.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.SCRIPT}}),_compilationConfig.compileOptionsObject.enableE2e&&s.push({name:require.resolve("@hap-toolkit/packager/lib/loaders/inject-suite-loader.js"),query:{hookName:"onCreate"}}),(0,_utils.stringifyLoaders)(s)}}function processImportFrag(e,r,t){let s="";if(r.length)for(let a=0;a<r.length;a++){const o=r[a];let i=o.attrs.src,l=o.attrs.name;if(!i)return e.emitWarning(new Error("导入组件需要设置属性 `src` ")),"";if(!o.isValid)return e.emitError(new Error(`导入组件resolve 出错 ${o.err}`)),"";i=o.srcPath,l||(l=(0,_utils.getNameByPath)(i)),l=l.toLowerCase(),_validator.default.isReservedTag(l)&&e.emitWarning(new Error("导入组件的属性 `name` 不能使用保留字: "+l)),t.push(l),(0,_utils.print)({name:l,src:i});let n=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.IMPORT),`${i}?uxType=${_utils.ENTRY_TYPE.COMP}&name=${l}`);_compilationConfig.compileOptionsObject.stats&&(n=`console.time(\`PERF: require @app-component/${l}\`)\n${n}`,n+=`console.timeEnd(\`PERF: require @app-component/${l}\`)\n\n`),s+=n}return s}function processTemplateFrag(e,r,t,s){let a="{}";if(r.length){const o=r[0];let i=e.resourcePath;const l=o.attrs.src;l&&(i=l),s=s.map((e=>"importNames[]="+e)),a=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.TEMPLATE,{alone:!!l}),`${i}?uxType=${t}&${s.join(",")}`)}else e.emitError(new Error("需要模板 <template> 片段"));return a}function processStyleFrag(e,r,t){let s="{}";if(r.length){const a=r[0];let o=e.resourcePath;const i=a.attrs.src,l=a.attrs.lang;i&&(o=i),(0,_utils.print)({style:o}),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.STYLE,{alone:!!i,lang:l}),`${o}?uxType=${t}`)}return s}function processScriptFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const i=a.attrs.src;i&&(o=i),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.SCRIPT,{alone:!!i,path:e.resourcePath},t),`${o}?uxType=${t}`)}return s}function parseImportList(e,r){return Promise.all(r.map((r=>resolveImportItemSrc(e,r))))}function resolveImportItemSrc(e,r){return r.attrs.src?new Promise((t=>{e.resolve(e.context,r.attrs.src,(function(e,s){return e?(r.isValid=!1,r.err=e,t(r)):(r.isValid=!0,r.srcPath=s,t(r))}))})):(r.isValid=!1,Promise.resolve(r))}
 //# sourceMappingURL=ux-fragment-utils.js.map

package/lib/loaders/ux-loader.js

@@ -1,2 +1,2 @@
-"use strict";var _path=_interopRequireDefault(require("path")),_loaderUtils=_interopRequireDefault(require("loader-utils")),_compiler=require("@hap-toolkit/compiler"),_validator=_interopRequireDefault(require("@hap-toolkit/compiler/lib/template/validator")),_compilationConfig=require("@hap-toolkit/shared-utils/compilation-config"),_uxFragmentUtils=require("./ux-fragment-utils"),_utils=require("./common/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const globalConfig=require("@hap-toolkit/shared-utils/config");function assemble(e,o,p,t){const r=!!globalConfig.useTreeShaking,n=[],{enablePerformanceCheck:s}=_compilationConfig.compileOptionsObject,a=[];s&&n.push(`console.record('### App Performance ### 执行自定义组件模块[PERF:RPK:defineCustomCompModule(${p})]开始：' + new Date().toJSON())\n    console.time('PERF:RPK:defineCustomCompModule(${p})')\n    console.time('PERF:RPK:defineCustomCompImport(${p})')`),n.push((0,_uxFragmentUtils.processImportFrag)(e,o.import,a)),s&&n.push(`console.timeEnd('PERF:RPK:defineCustomCompImport(${p})')`),n.push(`var $app_style$ = ${(0,_uxFragmentUtils.processStyleFrag)(e,o.style,t)}`),s&&n.push(`console.time('PERF:RPK:defineCustomCompScript(${p})')`),n.push(`var $app_script$ = ${(0,_uxFragmentUtils.processScriptFrag)(e,o.script,t)}`),s&&n.push(`console.timeEnd('PERF:RPK:defineCustomCompScript(${p})')\n    onsole.record('### App Performance ### 定义自定义组件函数[PERF:RPK:appDefineCustomCompFn(${p})]开始：' + new Date().toJSON())\n    console.time('PERF:RPK:appDefineCustomCompFn(${p})')`),n.push(`$app_define$('@app-component/${p}', [], function($app_require$, $app_exports$, $app_module$) {`);let i="     $app_script$($app_module$, $app_exports$, $app_require$)\n         if ($app_exports$.__esModule && $app_exports$.default) {\n            $app_module$.exports = $app_exports$.default\n        }";return r&&(i="\n    if($app_script$.default) {\n      $app_module$.exports = $app_script$.default\n    }"),o.script.length>0&&n.push(i),n.push(`     $app_module$.exports.template = ${(0,_uxFragmentUtils.processTemplateFrag)(e,o.template,t,a)}`),o.style.length>0&&n.push("     $app_module$.exports.style = $app_style$"),n.push("})"),s&&n.push(`\n    console.record('### App Performance ### 定义自定义组件函数[PERF:RPK:appDefineCustomCompFn(${p})]结束：' + new Date().toJSON())\n    console.timeEnd('PERF:RPK:appDefineCustomCompFn(${p})')`),(0,_utils.isUXRender)(t)&&(s&&n.push(`console.record('### App Performance ### 启动页面自定义组件[PERF:RPK:appBootstrapCustomCompFn(${p})]开始：' + new Date().toJSON())\n      console.time('PERF:RPK:appBootstrapCustomCompFn(${p})')`),n.push(`$app_bootstrap$('@app-component/${p}',{ packagerVersion: QUICKAPP_TOOLKIT_VERSION })`),s&&n.push(`console.record('### App Performance ### 启动页面自定义组件[PERF:RPK:appBootstrapCustomCompFn(${p})]结束：' + new Date().toJSON())\n      console.timeEnd('PERF:RPK:appBootstrapCustomCompFn(${p})')`)),t===_utils.ENTRY_TYPE.COMP&&_compilationConfig.compileOptionsObject.enableLazyComponent&&(s&&n.push(`console.record('### App Performance ### 定义自定义组件封装[PERF:RPK:appDefineWrapCustomCompFn(${p})]开始：' + new Date().toJSON())\n      console.time('PERF:RPK:appDefineWrapCustomCompFn(${p})')`),n.unshift(`$app_define_wrap$('@app-component/${p}', function () {`),n.push("})"),s&&n.push(`\n      console.record('### App Performance ### 定义自定义组件封装[PERF:RPK:appDefineWrapCustomCompFn(${p})]结束：' + new Date().toJSON())\n      console.timeEnd('PERF:RPK:appDefineWrapCustomCompFn(${p})')`)),s&&n.push(`console.record('### App Performance ### 执行自定义组件模块[PERF:RPK:defineCustomCompModule(${p})]结束：' + new Date().toJSON())\n    console.timeEnd('PERF:RPK:defineCustomCompModule(${p})')`),n.join("\n")}function loader(e){const o=this.async(),p=this.resourcePath,{ext:t}=_path.default.parse(p);if(-1===[".mix",".ux"].indexOf(t))return void o(new Error(`未知文件格式：${t}`));const r=_loaderUtils.default.parseQuery(this.resourceQuery||"?"),n=r.uxType,s=r.name||(0,_utils.getNameByPath)(p);_validator.default.isReservedTag(s)&&this.emitWarning(new Error("脚本文件名不能使用保留字:"+s)),(0,_utils.print)({resourceQuery:this.resourceQuery,resourcePath:p,name:s});const a=(0,_compiler.parseFragmentsWithCache)(e,p);(0,_utils.print)(a),(0,_uxFragmentUtils.parseImportList)(this,a.import).then((()=>assemble(this,a,s,n))).then((e=>{o(null,e)})).catch((e=>{o(e,"")}))}module.exports=loader;
+"use strict";var _path=_interopRequireDefault(require("@jayfate/path")),_loaderUtils=_interopRequireDefault(require("loader-utils")),_compiler=require("@hap-toolkit/compiler"),_validator=_interopRequireDefault(require("@hap-toolkit/compiler/lib/template/validator")),_compilationConfig=require("@hap-toolkit/shared-utils/compilation-config"),_uxFragmentUtils=require("./ux-fragment-utils"),_utils=require("./common/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const globalConfig=require("@hap-toolkit/shared-utils/config");function assemble(e,o,p,t){const r=!!globalConfig.useTreeShaking,n=[],{enablePerformanceCheck:s}=_compilationConfig.compileOptionsObject,a=[];s&&n.push(`console.record('### App Performance ### 执行自定义组件模块[PERF:RPK:defineCustomCompModule(${p})]开始：' + new Date().toJSON())\n    console.time('PERF:RPK:defineCustomCompModule(${p})')\n    console.time('PERF:RPK:defineCustomCompImport(${p})')`),n.push((0,_uxFragmentUtils.processImportFrag)(e,o.import,a)),s&&n.push(`console.timeEnd('PERF:RPK:defineCustomCompImport(${p})')`),n.push(`var $app_style$ = ${(0,_uxFragmentUtils.processStyleFrag)(e,o.style,t)}`),s&&n.push(`console.time('PERF:RPK:defineCustomCompScript(${p})')`),n.push(`var $app_script$ = ${(0,_uxFragmentUtils.processScriptFrag)(e,o.script,t)}`),s&&n.push(`console.timeEnd('PERF:RPK:defineCustomCompScript(${p})')\n    onsole.record('### App Performance ### 定义自定义组件函数[PERF:RPK:appDefineCustomCompFn(${p})]开始：' + new Date().toJSON())\n    console.time('PERF:RPK:appDefineCustomCompFn(${p})')`),n.push(`$app_define$('@app-component/${p}', [], function($app_require$, $app_exports$, $app_module$) {`);let i="     $app_script$($app_module$, $app_exports$, $app_require$)\n         if ($app_exports$.__esModule && $app_exports$.default) {\n            $app_module$.exports = $app_exports$.default\n        }";return r&&(i="\n    if($app_script$.default) {\n      $app_module$.exports = $app_script$.default\n    }"),o.script.length>0&&n.push(i),n.push(`     $app_module$.exports.template = ${(0,_uxFragmentUtils.processTemplateFrag)(e,o.template,t,a)}`),o.style.length>0&&n.push("     $app_module$.exports.style = $app_style$"),n.push("})"),s&&n.push(`\n    console.record('### App Performance ### 定义自定义组件函数[PERF:RPK:appDefineCustomCompFn(${p})]结束：' + new Date().toJSON())\n    console.timeEnd('PERF:RPK:appDefineCustomCompFn(${p})')`),(0,_utils.isUXRender)(t)&&(s&&n.push(`console.record('### App Performance ### 启动页面自定义组件[PERF:RPK:appBootstrapCustomCompFn(${p})]开始：' + new Date().toJSON())\n      console.time('PERF:RPK:appBootstrapCustomCompFn(${p})')`),n.push(`$app_bootstrap$('@app-component/${p}',{ packagerVersion: QUICKAPP_TOOLKIT_VERSION })`),s&&n.push(`console.record('### App Performance ### 启动页面自定义组件[PERF:RPK:appBootstrapCustomCompFn(${p})]结束：' + new Date().toJSON())\n      console.timeEnd('PERF:RPK:appBootstrapCustomCompFn(${p})')`)),t===_utils.ENTRY_TYPE.COMP&&_compilationConfig.compileOptionsObject.enableLazyComponent&&(s&&n.push(`console.record('### App Performance ### 定义自定义组件封装[PERF:RPK:appDefineWrapCustomCompFn(${p})]开始：' + new Date().toJSON())\n      console.time('PERF:RPK:appDefineWrapCustomCompFn(${p})')`),n.unshift(`$app_define_wrap$('@app-component/${p}', function () {`),n.push("})"),s&&n.push(`\n      console.record('### App Performance ### 定义自定义组件封装[PERF:RPK:appDefineWrapCustomCompFn(${p})]结束：' + new Date().toJSON())\n      console.timeEnd('PERF:RPK:appDefineWrapCustomCompFn(${p})')`)),s&&n.push(`console.record('### App Performance ### 执行自定义组件模块[PERF:RPK:defineCustomCompModule(${p})]结束：' + new Date().toJSON())\n    console.timeEnd('PERF:RPK:defineCustomCompModule(${p})')`),n.join("\n")}function loader(e){const o=this.async(),p=this.resourcePath,{ext:t}=_path.default.parse(p);if(-1===[".mix",".ux"].indexOf(t))return void o(new Error(`未知文件格式：${t}`));const r=_loaderUtils.default.parseQuery(this.resourceQuery||"?"),n=r.uxType,s=r.name||(0,_utils.getNameByPath)(p);_validator.default.isReservedTag(s)&&this.emitWarning(new Error("脚本文件名不能使用保留字:"+s)),(0,_utils.print)({resourceQuery:this.resourceQuery,resourcePath:p,name:s});const a=(0,_compiler.parseFragmentsWithCache)(e,p);(0,_utils.print)(a),(0,_uxFragmentUtils.parseImportList)(this,a.import).then((()=>assemble(this,a,s,n))).then((e=>{o(null,e)})).catch((e=>{o(e,"")}))}module.exports=loader;
 //# sourceMappingURL=ux-loader.js.map

package/lib/template.js

@@ -1,2 +1,2 @@
-"use strict";const path=require("path");module.exports={app:{demo:path.resolve(__dirname,"../templates/app/demo"),deviceJsonTemplate:path.resolve(__dirname,"../device-json-template")}};
+"use strict";const path=require("@jayfate/path");module.exports={app:{demo:path.resolve(__dirname,"../templates/app/demo"),deviceJsonTemplate:path.resolve(__dirname,"../device-json-template")}};
 //# sourceMappingURL=template.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hap-toolkit/dsl-xvm",
-  "version": "1.9.10",
+  "version": "1.9.11",
   "description": "webpack {loader,plugin} for supporting xvm in quickapp",
   "engines": {
     "node": ">=8.0.0"
@@ -33,14 +33,15 @@
     "!**/.DS_Store"
   ],
   "dependencies": {
-    "@hap-toolkit/compiler": "1.9.10",
-    "@hap-toolkit/packager": "1.9.10",
-    "@hap-toolkit/shared-utils": "1.9.10",
+    "@hap-toolkit/compiler": "1.9.11",
+    "@hap-toolkit/packager": "1.9.11",
+    "@hap-toolkit/shared-utils": "1.9.11",
+    "@jayfate/path": "^0.0.13",
     "babel-loader": "^8.1.0",
     "css-loader": "^5.0.1",
     "loader-utils": "2.0.2",
     "url-loader": "^4.1.1",
     "webpack": "5.72.0"
   },
-  "gitHead": "f922974c10e94fb516ad76c942797d2ac297b3af"
+  "gitHead": "ef7ee372fd393ca0e4495fd6daf18f969fd77eaa"
 }