@hap-toolkit/dsl-xvm 2.1.0 → 2.1.1

package/device-json-template/config-tv.json

@@ -1,14 +1,14 @@
-{
-  "config": {
-    "designWidth": 1920
-  },
-  "display": {
-    "menu": false,
-    "fullScreen": true,
-    "titleBar": false,
-    "orientation": "landscape",
-    "menuBarData": {
-      "menuBar": false
-    }
-  }
-}
+{
+  "config": {
+    "designWidth": 1920
+  },
+  "display": {
+    "menu": false,
+    "fullScreen": true,
+    "titleBar": false,
+    "orientation": "landscape",
+    "menuBarData": {
+      "menuBar": false
+    }
+  }
+}

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

@@ -1,2 +1,2 @@
-"use strict";Object.defineProperty(exports,"__esModule",{value:!0}),exports.parseImportList=parseImportList,exports.processActionFrag=processActionFrag,exports.processCommandFrag=processCommandFrag,exports.processDataAppFrag=processDataAppFrag,exports.processDataFrag=processDataFrag,exports.processImportFrag=processImportFrag,exports.processPropsFrag=processPropsFrag,exports.processScriptFrag=processScriptFrag,exports.processStyleFrag=processStyleFrag,exports.processTemplateFrag=processTemplateFrag;var _resolve=require("resolve"),_path=_interopRequireDefault(require("path")),_sharedUtils=require("@hap-toolkit/shared-utils"),_packager=require("@hap-toolkit/packager"),_compiler=require("@hap-toolkit/compiler"),_utils=require("./common/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{validator:validator}=_compiler.templater,cwd=_path.default.resolve(_sharedUtils.globalConfig.projectPath),defaultLoaders={sass:(0,_resolve.sync)("sass-loader"),scss:(0,_resolve.sync)("sass-loader"),less:(0,_resolve.sync)("less-loader"),component:(0,_resolve.sync)("./ux-loader.js"),data:(0,_resolve.sync)("./data-loader.js"),action:(0,_resolve.sync)("./action-loader.js"),props:(0,_resolve.sync)("./props-loader.js"),fragment:(0,_resolve.sync)("./fragment-loader.js"),template:(0,_resolve.sync)("./template-loader.js"),style:(0,_resolve.sync)("./style-loader.js"),script:(0,_resolve.sync)("./script-loader.js"),module:(0,_resolve.sync)("@hap-toolkit/packager/lib/loaders/module-loader.js"),babel:(0,_resolve.sync)("babel-loader"),mainfest:(0,_resolve.sync)("@hap-toolkit/packager/lib/loaders/manifest-loader.js"),access:(0,_resolve.sync)("./access-loader.js"),"extract-css":(0,_resolve.sync)("./extract-css-loader.js"),datapp:(0,_resolve.sync)("./datapp-loader.js"),command:(0,_resolve.sync)("./command-loader.js")};function makeLoaderString(e,r,t,s){let a;if(r=r||{},e===_utils.FRAG_TYPE.IMPORT)return a=[{name:defaultLoaders.component,query:{cwd:cwd,type:_utils.FRAG_TYPE.IMPORT}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.TEMPLATE)return a=[{name:defaultLoaders.template}],r.alone||a.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.TEMPLATE}}),(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.DATA)return a=[{name:defaultLoaders.data},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.ACTIONS)return a=[{name:defaultLoaders.action},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.DATAPP)return a=[{name:defaultLoaders.datapp},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.COMMANDS)return a=[{name:defaultLoaders.command},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.PROPS)return a=[{name:defaultLoaders.props},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.STYLE){a=[{name:defaultLoaders.style,query:{index:0,type:_utils.FRAG_TYPE.STYLE}}],_sharedUtils.compileOptionsObject.enableExtractCss&&!t&&a.unshift({name:defaultLoaders["extract-css"]});let e=r.lang;return e&&"css"!==e&&a.push({name:defaultLoaders[e]}),r.alone||a.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.STYLE}}),(0,_utils.stringifyLoaders)(a)}if(e===_utils.FRAG_TYPE.SCRIPT){const e=(0,_packager.getBabelConfigJsPath)(cwd,!!_sharedUtils.globalConfig.useTreeShaking);return a=[],_sharedUtils.compileOptionsObject.enableIstanbul&&a.push({name:"istanbul-instrumenter-loader",query:{}}),a.push({name:defaultLoaders.script},{name:defaultLoaders.module}),s===_compiler.ENTRY_TYPE.APP?(a.push({name:defaultLoaders.mainfest,query:{path:_path.default.dirname(r.path)}},{name:defaultLoaders.babel,query:{cwd:cwd,cacheDirectory:!0,comments:!1,configFile:e}}),_sharedUtils.compileOptionsObject.enableDiagnosis&&a.push({name:(0,_resolve.sync)("@hap-toolkit/packager/lib/loaders/diagnosis-loader.js"),query:{pureScript:!0,hookName:"onCreate",hostName:_sharedUtils.compileOptionsObject.enableDiagnosis}})):(a.push({name:defaultLoaders.babel,query:{cwd:cwd,cacheDirectory:!0,plugins:[(0,_resolve.sync)("./babel-plugin-jsx.js")],comments:!1,configFile:e}}),(0,_utils.isUXRender)(s)&&a.push({name:defaultLoaders.access})),r.alone||a.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.SCRIPT}}),_sharedUtils.compileOptionsObject.enableE2e&&a.push({name:(0,_resolve.sync)("@hap-toolkit/packager/lib/loaders/inject-suite-loader.js"),query:{hookName:"onCreate"}}),(0,_utils.stringifyLoaders)(a)}}function processImportFrag(e,r,t,s={}){const{newJSCard:a,lite:o,cardEntry:n,minCardRuntimeVersion:i,isTargetVivo:l}=s;let u="";if(r.length){const s=a?`&newJSCard=${a}`:"",c=o?`&lite=${o}`:"",d=n?`&cardEntry=${n}`:"",p=i?`&minCardRuntimeVersion=${i}`:"",m=l?`&isTargetVivo=${l}`:"";for(let o=0;o<r.length;o++){const n=r[o];let i=n.attrs.src,l=n.attrs.name;if(!i)return e.emitWarning(new Error("导入组件需要设置属性 `src` ")),"";if(!n.isValid)return e.emitError(new Error(`导入组件resolve 出错 ${n.err}`)),"";i=n.srcPath,l||(l=(0,_utils.getNameByPath)(i)),l=l.toLowerCase(),validator.isReservedTag(l)&&e.emitWarning(new Error("导入组件的属性 `name` 不能使用保留字: "+l)),t.push(l),(0,_utils.print)({name:l,src:i});let _=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.IMPORT,null,a),`${i}?uxType=${_compiler.ENTRY_TYPE.COMP}&name=${l}${s}${c}${d}${p}${m}`);_sharedUtils.compileOptionsObject.stats&&(_=`console.time(\`PERF: require @app-component/${l}\`)\n${_}`,_+=`console.timeEnd(\`PERF: require @app-component/${l}\`)\n\n`),u+=_}}return u}function processTemplateFrag(e,r,t,s={}){const{uxType:a,newJSCard:o,lite:n,cardEntry:i,minCardRuntimeVersion:l,isTargetVivo:u}=s;let c="{}";if(r.length){const s=r[0];let d=e.resourcePath;const p=s.attrs.src;p&&(d=p);const m=o?`&newJSCard=${o}`:"",_=n?`&lite=${n}`:"",g=o?`&uxPath=${encodeURIComponent(d)}`:"",f=i?`&cardEntry=${encodeURIComponent(i)}`:"",y=l?`&minCardRuntimeVersion=${l}`:"",P=u?`&isTargetVivo=${u}`:"";t=t.map((e=>"importNames[]="+e)),c=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.TEMPLATE,{alone:!!p},o),`${d}?uxType=${a}&${t.join(",")}${m}${_}${g}${f}${y}${P}`)}else e.emitError(new Error("需要模板 <template> 片段"));return c}function processStyleFrag(e,r,t={}){const{uxType:s,newJSCard:a,lite:o,cardEntry:n}=t;let i="{}";if(r.length){const t=r[0];let l=e.resourcePath;const u=t.attrs.src,c=t.attrs.lang;u&&(l=u),(0,_utils.print)({style:l});const d=a?`&newJSCard=${a}`:"",p=o?`&lite=${o}`:"",m=a?`&uxPath=${encodeURIComponent(l)}`:"",_=n?`&cardEntry=${encodeURIComponent(n)}`:"";i=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.STYLE,{alone:!!u,lang:c},a),`${l}?uxType=${s}${d}${p}${m}${_}`)}return i}function processScriptFrag(e,r,t={}){const{uxType:s,newJSCard:a}=t;let o="null";if(r.length){const t=r[0];let n=e.resourcePath;const i=t.attrs.src;i&&(n=i),o=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.SCRIPT,{alone:!!i,path:e.resourcePath},a,s),`${n}?uxType=${s}`)}return o}function processDataFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.DATA,{},!0,t),`${o}?index=0&lite=1`)}return s}function processActionFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.ACTIONS,{},!0,t),`${o}?index=0&lite=1`)}return s}function processPropsFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.PROPS,{},!0,t),`${o}?index=0&lite=1`)}return s}function processDataAppFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.DATAPP,{},!0,t),`${o}?index=0&lite=1`)}return s}function processCommandFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.COMMANDS,{},!0,t),`${o}?index=0&lite=1`)}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):(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.processActionFrag=processActionFrag,exports.processCommandFrag=processCommandFrag,exports.processDataAppFrag=processDataAppFrag,exports.processDataFrag=processDataFrag,exports.processImportFrag=processImportFrag,exports.processPropsFrag=processPropsFrag,exports.processScriptFrag=processScriptFrag,exports.processStyleFrag=processStyleFrag,exports.processTemplateFrag=processTemplateFrag;var _resolve=require("resolve"),_path=_interopRequireDefault(require("path")),_sharedUtils=require("@hap-toolkit/shared-utils"),_packager=require("@hap-toolkit/packager"),_compiler=require("@hap-toolkit/compiler"),_utils=require("./common/utils");function _interopRequireDefault(e){return e&&e.__esModule?e:{default:e}}const{validator:validator}=_compiler.templater,cwd=_path.default.resolve(_sharedUtils.globalConfig.projectPath),defaultLoaders={sass:(0,_resolve.sync)("sass-loader"),scss:(0,_resolve.sync)("sass-loader"),less:(0,_resolve.sync)("less-loader"),component:(0,_resolve.sync)("./ux-loader.js"),data:(0,_resolve.sync)("./data-loader.js"),action:(0,_resolve.sync)("./action-loader.js"),props:(0,_resolve.sync)("./props-loader.js"),fragment:(0,_resolve.sync)("./fragment-loader.js"),template:(0,_resolve.sync)("./template-loader.js"),style:(0,_resolve.sync)("./style-loader.js"),script:(0,_resolve.sync)("./script-loader.js"),module:(0,_resolve.sync)("@hap-toolkit/packager/lib/loaders/module-loader.js"),babel:(0,_resolve.sync)("babel-loader"),mainfest:(0,_resolve.sync)("@hap-toolkit/packager/lib/loaders/manifest-loader.js"),access:(0,_resolve.sync)("./access-loader.js"),"extract-css":(0,_resolve.sync)("./extract-css-loader.js"),datapp:(0,_resolve.sync)("./datapp-loader.js"),command:(0,_resolve.sync)("./command-loader.js")};function makeLoaderString(e,r,t,s){let a;if(r=r||{},e===_utils.FRAG_TYPE.IMPORT)return a=[{name:defaultLoaders.component,query:{cwd:cwd,type:_utils.FRAG_TYPE.IMPORT}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.TEMPLATE)return a=[{name:defaultLoaders.template}],r.alone||a.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.TEMPLATE}}),(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.DATA)return a=[{name:defaultLoaders.data},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.ACTIONS)return a=[{name:defaultLoaders.action},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.DATAPP)return a=[{name:defaultLoaders.datapp},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.COMMANDS)return a=[{name:defaultLoaders.command},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.PROPS)return a=[{name:defaultLoaders.props},{name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.DATA}}],(0,_utils.stringifyLoaders)(a);if(e===_utils.FRAG_TYPE.STYLE){a=[{name:defaultLoaders.style,query:{index:0,type:_utils.FRAG_TYPE.STYLE}}],_sharedUtils.compileOptionsObject.enableExtractCss&&!t&&a.unshift({name:defaultLoaders["extract-css"]});let e=r.lang;return e&&"css"!==e&&a.push({name:defaultLoaders[e]}),r.alone||a.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.STYLE}}),(0,_utils.stringifyLoaders)(a)}if(e===_utils.FRAG_TYPE.SCRIPT){const e=(0,_packager.getBabelConfigJsPath)(cwd,!!_sharedUtils.globalConfig.useTreeShaking);return a=[],_sharedUtils.compileOptionsObject.enableIstanbul&&a.push({name:"istanbul-instrumenter-loader",query:{}}),a.push({name:defaultLoaders.script},{name:defaultLoaders.module}),s===_compiler.ENTRY_TYPE.APP?(a.push({name:defaultLoaders.mainfest,query:{path:_path.default.dirname(r.path)}},{name:defaultLoaders.babel,query:{cwd:cwd,cacheDirectory:!0,comments:!1,configFile:e}}),_sharedUtils.compileOptionsObject.enableDiagnosis&&a.push({name:(0,_resolve.sync)("@hap-toolkit/packager/lib/loaders/diagnosis-loader.js"),query:{pureScript:!0,hookName:"onCreate",hostName:_sharedUtils.compileOptionsObject.enableDiagnosis}})):(a.push({name:defaultLoaders.babel,query:{cwd:cwd,cacheDirectory:!0,plugins:[(0,_resolve.sync)("./babel-plugin-jsx.js")],comments:!1,configFile:e}}),(0,_utils.isUXRender)(s)&&a.push({name:defaultLoaders.access})),r.alone||a.push({name:defaultLoaders.fragment,query:{index:0,type:_utils.FRAG_TYPE.SCRIPT}}),_sharedUtils.compileOptionsObject.enableE2e&&a.push({name:(0,_resolve.sync)("@hap-toolkit/packager/lib/loaders/inject-suite-loader.js"),query:{hookName:"onCreate"}}),(0,_utils.stringifyLoaders)(a)}}function processImportFrag(e,r,t,s={}){const{newJSCard:a,lite:o,cardEntry:n,minCardRuntimeVersion:i,isTargetVivo:l}=s;let c="";if(r.length){const s=a?`&newJSCard=${a}`:"",u=o?`&lite=${o}`:"",d=n?`&cardEntry=${encodeURIComponent(n)}`:"",p=i?`&minCardRuntimeVersion=${i}`:"",m=l?`&isTargetVivo=${l}`:"";for(let o=0;o<r.length;o++){const n=r[o];let i=n.attrs.src,l=n.attrs.name;if(!i)return e.emitWarning(new Error("导入组件需要设置属性 `src` ")),"";if(!n.isValid)return e.emitError(new Error(`导入组件resolve 出错 ${n.err}`)),"";i=n.srcPath,l||(l=(0,_utils.getNameByPath)(i)),l=l.toLowerCase(),validator.isReservedTag(l)&&e.emitWarning(new Error("导入组件的属性 `name` 不能使用保留字: "+l)),t.push(l),(0,_utils.print)({name:l,src:i});let _=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.IMPORT,null,a),`${i}?uxType=${_compiler.ENTRY_TYPE.COMP}&name=${l}${s}${u}${d}${p}${m}`);_sharedUtils.compileOptionsObject.stats&&(_=`console.time(\`PERF: require @app-component/${l}\`)\n${_}`,_+=`console.timeEnd(\`PERF: require @app-component/${l}\`)\n\n`),c+=_}}return c}function processTemplateFrag(e,r,t,s={}){const{uxType:a,newJSCard:o,lite:n,cardEntry:i,minCardRuntimeVersion:l,isTargetVivo:c}=s;let u="{}";if(r.length){const s=r[0];let d=e.resourcePath;const p=s.attrs.src;p&&(d=p);const m=o?`&newJSCard=${o}`:"",_=n?`&lite=${n}`:"",g=o?`&uxPath=${encodeURIComponent(d)}`:"",f=i?`&cardEntry=${encodeURIComponent(i)}`:"",y=l?`&minCardRuntimeVersion=${l}`:"",P=c?`&isTargetVivo=${c}`:"";t=t.map((e=>"importNames[]="+e)),u=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.TEMPLATE,{alone:!!p},o),`${d}?uxType=${a}&${t.join(",")}${m}${_}${g}${f}${y}${P}`)}else e.emitError(new Error("需要模板 <template> 片段"));return u}function processStyleFrag(e,r,t={}){const{uxType:s,newJSCard:a,lite:o,cardEntry:n}=t;let i="{}";if(r.length){const t=r[0];let l=e.resourcePath;const c=t.attrs.src,u=t.attrs.lang;c&&(l=c),(0,_utils.print)({style:l});const d=a?`&newJSCard=${a}`:"",p=o?`&lite=${o}`:"",m=a?`&uxPath=${encodeURIComponent(l)}`:"",_=n?`&cardEntry=${encodeURIComponent(n)}`:"";i=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.STYLE,{alone:!!c,lang:u},a),`${l}?uxType=${s}${d}${p}${m}${_}`)}return i}function processScriptFrag(e,r,t={}){const{uxType:s,newJSCard:a,cardEntry:o}=t;let n="null";if(r.length){const t=r[0];let i=e.resourcePath;const l=t.attrs.src;l&&(i=l);const c=o?`&cardEntry=${encodeURIComponent(o)}`:"";n=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.SCRIPT,{alone:!!l,path:e.resourcePath},a,s),`${i}?uxType=${s}${c}`)}return n}function processDataFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.DATA,{},!0,t),`${o}?index=0&lite=1`)}return s}function processActionFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.ACTIONS,{},!0,t),`${o}?index=0&lite=1`)}return s}function processPropsFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.PROPS,{},!0,t),`${o}?index=0&lite=1`)}return s}function processDataAppFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.DATAPP,{},!0,t),`${o}?index=0&lite=1`)}return s}function processCommandFrag(e,r,t){let s="null";if(r.length){const a=r[0];let o=e.resourcePath;const n=a.attrs.src;n&&(o=n),s=(0,_utils.makeRequireString)(e,makeLoaderString(_utils.FRAG_TYPE.COMMANDS,{},!0,t),`${o}?index=0&lite=1`)}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):(r.isValid=!0,r.srcPath=s),t(r)}))})):(r.isValid=!1,Promise.resolve(r))}
 //# sourceMappingURL=ux-fragment-utils.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hap-toolkit/dsl-xvm",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "webpack {loader,plugin} for supporting xvm in quickapp",
   "engines": {
     "node": ">=14.0.0"
@@ -36,9 +36,9 @@
     "!**/.DS_Store"
   ],
   "dependencies": {
-    "@hap-toolkit/compiler": "2.1.0",
-    "@hap-toolkit/packager": "2.1.0",
-    "@hap-toolkit/shared-utils": "2.1.0",
+    "@hap-toolkit/compiler": "^2.1.1",
+    "@hap-toolkit/packager": "^2.1.1",
+    "@hap-toolkit/shared-utils": "^2.1.1",
     "@jayfate/path": "^0.0.13",
     "babel-loader": "^8.1.0",
     "css-loader": "^5.0.1",
@@ -51,5 +51,5 @@
     "url-loader": "^4.1.1",
     "webpack": "5.72.0"
   },
-  "gitHead": "b4e77281ac1c1ffd1c1425dd28c17b8a246576ce"
+  "gitHead": "9fbf8ec01cc7fbd44a4908ecdc407a5022e89e7e"
 }

package/readme.md

@@ -1,3 +1,3 @@
-# @hap-toolkit/dsl-xvm
-
-`hap-toolkit` `xvm` 适配支持模块
+# @hap-toolkit/dsl-xvm
+
+`hap-toolkit` `xvm` 适配支持模块

package/templates/app/demo/.eslintignore

@@ -1,7 +1,7 @@
-/.nyc_output
-/coverage
-/node_modules
-/tests/fixtures
-/sign
-/dist
+/.nyc_output
+/coverage
+/node_modules
+/tests/fixtures
+/sign
+/dist
 /build

package/templates/app/demo/.eslintrc.json

@@ -1,67 +1,67 @@
-{
-  "root": true,
-  "env": {
-    "node": true,
-    "commonjs": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:ux/essential"
-  ],
-  "parserOptions": {
-    "parser": "babel-eslint",
-    "sourceType": "module",
-    "ecmaFeatures": {
-      "ecmaVersion": true,
-      "jsx": true
-    }
-  },
-  "globals": {
-    "loadData": false,
-    "saveData": false,
-    "history": false,
-    "console": false,
-    "setTimeout": false,
-    "clearTimeout": false,
-    "setInterval": false,
-    "clearInterval": false
-  },
-  "rules": {
-    "indent": [
-      "warn",
-      2
-    ],
-    "no-console": [
-      "warn",
-      {
-        "allow": [
-          "info",
-          "warn",
-          "error"
-        ]
-      }
-    ],
-    "no-unused-vars": [
-      "warn",
-      {
-        "varsIgnorePattern": "prompt"
-      }
-    ],
-    "quotes": [
-      "warn",
-      "single",
-      {
-        "avoidEscape": true,
-        "allowTemplateLiterals": true
-      }
-    ],
-    "linebreak-style": [
-      "warn",
-      "unix"
-    ],
-    "semi": [
-      "warn",
-      "never"
-    ]
-  }
+{
+  "root": true,
+  "env": {
+    "node": true,
+    "commonjs": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:ux/essential"
+  ],
+  "parserOptions": {
+    "parser": "babel-eslint",
+    "sourceType": "module",
+    "ecmaFeatures": {
+      "ecmaVersion": true,
+      "jsx": true
+    }
+  },
+  "globals": {
+    "loadData": false,
+    "saveData": false,
+    "history": false,
+    "console": false,
+    "setTimeout": false,
+    "clearTimeout": false,
+    "setInterval": false,
+    "clearInterval": false
+  },
+  "rules": {
+    "indent": [
+      "warn",
+      2
+    ],
+    "no-console": [
+      "warn",
+      {
+        "allow": [
+          "info",
+          "warn",
+          "error"
+        ]
+      }
+    ],
+    "no-unused-vars": [
+      "warn",
+      {
+        "varsIgnorePattern": "prompt"
+      }
+    ],
+    "quotes": [
+      "warn",
+      "single",
+      {
+        "avoidEscape": true,
+        "allowTemplateLiterals": true
+      }
+    ],
+    "linebreak-style": [
+      "warn",
+      "unix"
+    ],
+    "semi": [
+      "warn",
+      "never"
+    ]
+  }
 }

package/templates/app/demo/.prettierignore

@@ -1,6 +1,6 @@
-package.json
-manifest.json
-README.md
-
-# assets/js
-src/assets/js/*.js
+package.json
+manifest.json
+README.md
+
+# assets/js
+src/assets/js/*.js

package/templates/app/demo/README.md

@@ -1,11 +1,11 @@
-## 快速上手
-
-您可通过运行 `npm run start` 后，使用快应用引擎扫描二维码快速开发。
-
-## 了解更多
-
-你可以通过我们的[官方文档](https://doc.quickapp.cn/)熟悉和了解快应用。
-
-可以通过我们[快应用官方示例项目](https://github.com/quickappcn/sample)，快速掌握 api 和组件的用法
-
-对我们有什么意见，建议或者 bug，可以在这里反馈 https://github.com/quickappcn/issues
+## 快速上手
+
+您可通过运行 `npm run start` 后，使用快应用引擎扫描二维码快速开发。
+
+## 了解更多
+
+你可以通过我们的[官方文档](https://doc.quickapp.cn/)熟悉和了解快应用。
+
+可以通过我们[快应用官方示例项目](https://github.com/quickappcn/sample)，快速掌握 api 和组件的用法
+
+对我们有什么意见，建议或者 bug，可以在这里反馈 https://github.com/quickappcn/issues

package/templates/app/demo/_gitignore

@@ -1,16 +1,16 @@
-node_modules
-build
-dist
-
-.DS_Store
-Thumbs.db
-
-*.log
-*.iml
-.idea/
-.vscode/
-
-.nyc_output
-/coverage
-
-/logs
+node_modules
+build
+dist
+
+.DS_Store
+Thumbs.db
+
+*.log
+*.iml
+.idea/
+.vscode/
+
+.nyc_output
+/coverage
+
+/logs

package/templates/app/demo/package.json

@@ -1,54 +1,54 @@
-{
-  "name": "quickapp-sample-template",
-  "version": "2.0.0",
-  "description": "Quickapp Sample Template",
-  "scripts": {
-    "start": "hap server --watch",
-    "server": "hap server",
-    "build": "hap build",
-    "release": "hap release",
-    "watch": "hap watch",
-    "debug": "hap debug",
-    "gen": "node ./scripts/gen/index.js",
-    "precommit-msg": "echo '🚧 start pre-commit checks ...' && exit 0",
-    "prettier": "node ./scripts/selfCloseInputTag.js && prettier --write \"src/**/*.{js,ux,less,scss,css}\"",
-    "prettier-watcher": "onchange '**/*.md' \"src/**/**/*.{js,ux,less,scss,css}\" -- prettier --write {{changed}}"
-  },
-  "dependencies": {},
-  "devDependencies": {
-    "@babel/runtime": "^7.12.5",
-    "husky": "^4.3.0",
-    "lint-staged": "^10.5.1",
-    "onchange": "^5.2.0",
-    "prettier": "^1.15.3",
-    "prettier-plugin-ux": "^0.3.0",
-    "colors": "^1.4.0",
-    "hap-toolkit": "^{{ toolkitVersion }}"
-  },
-  "prettier": {
-    "singleQuote": true,
-    "semi": false,
-    "printWidth": 80,
-    "proseWrap": "never",
-    "tabWidth": 2
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "yarn run precommit-msg && lint-staged"
-    }
-  },
-  "lint-staged": {
-    "**/**.{ux,js,json,pcss,md}": [
-      "prettier --write",
-      "git add"
-    ]
-  },
-  "keywords": [
-    "快应用",
-    "快应用示例",
-    "快应用模版"
-  ],
-  "browserslist": [
-    "chrome 65"
-  ]
-}
+{
+  "name": "quickapp-sample-template",
+  "version": "2.0.0",
+  "description": "Quickapp Sample Template",
+  "scripts": {
+    "start": "hap server --watch",
+    "server": "hap server",
+    "build": "hap build",
+    "release": "hap release",
+    "watch": "hap watch",
+    "debug": "hap debug",
+    "gen": "node ./scripts/gen/index.js",
+    "precommit-msg": "echo '🚧 start pre-commit checks ...' && exit 0",
+    "prettier": "node ./scripts/selfCloseInputTag.js && prettier --write \"src/**/*.{js,ux,less,scss,css}\"",
+    "prettier-watcher": "onchange '**/*.md' \"src/**/**/*.{js,ux,less,scss,css}\" -- prettier --write {{changed}}"
+  },
+  "dependencies": {},
+  "devDependencies": {
+    "@babel/runtime": "^7.12.5",
+    "husky": "^4.3.0",
+    "lint-staged": "^10.5.1",
+    "onchange": "^5.2.0",
+    "prettier": "^1.15.3",
+    "prettier-plugin-ux": "^0.3.0",
+    "colors": "^1.4.0",
+    "hap-toolkit": "^{{ toolkitVersion }}"
+  },
+  "prettier": {
+    "singleQuote": true,
+    "semi": false,
+    "printWidth": 80,
+    "proseWrap": "never",
+    "tabWidth": 2
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "yarn run precommit-msg && lint-staged"
+    }
+  },
+  "lint-staged": {
+    "**/**.{ux,js,json,pcss,md}": [
+      "prettier --write",
+      "git add"
+    ]
+  },
+  "keywords": [
+    "快应用",
+    "快应用示例",
+    "快应用模版"
+  ],
+  "browserslist": [
+    "chrome 65"
+  ]
+}

package/templates/app/demo/scripts/gen/index.js

@@ -1,92 +1,92 @@
-/*
- * Copyright (c) 2021-present, the hapjs-platform Project Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/**
- * @desc: gen script command，make a new page generated by one click.
- * @author: nicejade
- */
-
-const fs = require('fs')
-const path = require('path')
-const colors = require('colors')
-
-const newFolderName = process.argv[2]
-
-String.prototype.firstUpperCase = function () {
-  return this.replace(/\b(\w)/g, ($1) => {
-    return $1.toLowerCase()
-  })
-}
-const resolve = (dir) => {
-  return path.join(__dirname, '../..', dir)
-}
-
-const successExecPrint = (msg) => {
-  console.log(
-    colors.green(`✓ `) +
-      colors.cyan(`${msg} `) +
-      colors.green('task has been successfully executed.')
-  )
-}
-
-function createNewPage(newFolderPath) {
-  const mReg = new RegExp('@PAGE_CLASS_NAME', 'g')
-  const pageContent = fs.readFileSync(`${__dirname}/template.ux`, 'UTF-8')
-  const rootClassName = newFolderName
-    .firstUpperCase()
-    .replace(/([A-Z])/g, '-$1')
-    .toLowerCase()
-  const newContent = pageContent.replace(mReg, rootClassName)
-
-  fs.mkdirSync(newFolderPath, 0777)
-  fs.writeFile(`${newFolderPath}/index.ux`, newContent, (error) => {
-    if (error) throw `Something went wrong: ${error}`
-  })
-  successExecPrint('Create New Page')
-}
-
-function saveRouter2Manifest() {
-  const manifestPath = resolve('/src/manifest.json')
-  let manifestConf = fs.readFileSync(manifestPath, 'UTF-8')
-  manifestConf = JSON.parse(manifestConf)
-  const routerPages = manifestConf.router.pages
-  routerPages[`pages/${newFolderName}`] = {
-    component: 'index',
-  }
-  manifestConf = JSON.stringify(manifestConf, null, 2)
-  fs.writeFile(manifestPath, manifestConf, (error) => {
-    if (error) throw `Something went wrong[@saveRouter2Manifest]: ${error}`
-  })
-  successExecPrint('Save Router Into Manifest')
-}
-
-function main() {
-  if (!newFolderName) {
-    return console.warn(
-      `⚠️  Please enter the name of the page you want to create.`.underline.red
-    )
-  }
-
-  const folderNameReg = /^[A-Z][[A-Za-z0-9]+$/
-  if (!folderNameReg.test(newFolderName)) {
-    return console.warn(
-      `⚠️  Please enter the standard Folder name. Eg: XyzAbcde.`.underline.red
-    )
-  }
-
-  const newFolderPath = path.join(__dirname, `../../src/pages/${newFolderName}`)
-  const isExist = fs.existsSync(newFolderPath)
-
-  if (isExist) {
-    return console.warn(
-      `⚠️  ${newFolderName} already exists in the /src/pages/ directory.`
-        .underline.red
-    )
-  }
-  createNewPage(newFolderPath)
-  saveRouter2Manifest()
-}
-
-main()
+/*
+ * Copyright (c) 2021-present, the hapjs-platform Project Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+/**
+ * @desc: gen script command，make a new page generated by one click.
+ * @author: nicejade
+ */
+
+const fs = require('fs')
+const path = require('path')
+const colors = require('colors')
+
+const newFolderName = process.argv[2]
+
+String.prototype.firstUpperCase = function () {
+  return this.replace(/\b(\w)/g, ($1) => {
+    return $1.toLowerCase()
+  })
+}
+const resolve = (dir) => {
+  return path.join(__dirname, '../..', dir)
+}
+
+const successExecPrint = (msg) => {
+  console.log(
+    colors.green(`✓ `) +
+      colors.cyan(`${msg} `) +
+      colors.green('task has been successfully executed.')
+  )
+}
+
+function createNewPage(newFolderPath) {
+  const mReg = new RegExp('@PAGE_CLASS_NAME', 'g')
+  const pageContent = fs.readFileSync(`${__dirname}/template.ux`, 'UTF-8')
+  const rootClassName = newFolderName
+    .firstUpperCase()
+    .replace(/([A-Z])/g, '-$1')
+    .toLowerCase()
+  const newContent = pageContent.replace(mReg, rootClassName)
+
+  fs.mkdirSync(newFolderPath, 0777)
+  fs.writeFile(`${newFolderPath}/index.ux`, newContent, (error) => {
+    if (error) throw `Something went wrong: ${error}`
+  })
+  successExecPrint('Create New Page')
+}
+
+function saveRouter2Manifest() {
+  const manifestPath = resolve('/src/manifest.json')
+  let manifestConf = fs.readFileSync(manifestPath, 'UTF-8')
+  manifestConf = JSON.parse(manifestConf)
+  const routerPages = manifestConf.router.pages
+  routerPages[`pages/${newFolderName}`] = {
+    component: 'index',
+  }
+  manifestConf = JSON.stringify(manifestConf, null, 2)
+  fs.writeFile(manifestPath, manifestConf, (error) => {
+    if (error) throw `Something went wrong[@saveRouter2Manifest]: ${error}`
+  })
+  successExecPrint('Save Router Into Manifest')
+}
+
+function main() {
+  if (!newFolderName) {
+    return console.warn(
+      `⚠️  Please enter the name of the page you want to create.`.underline.red
+    )
+  }
+
+  const folderNameReg = /^[A-Z][[A-Za-z0-9]+$/
+  if (!folderNameReg.test(newFolderName)) {
+    return console.warn(
+      `⚠️  Please enter the standard Folder name. Eg: XyzAbcde.`.underline.red
+    )
+  }
+
+  const newFolderPath = path.join(__dirname, `../../src/pages/${newFolderName}`)
+  const isExist = fs.existsSync(newFolderPath)
+
+  if (isExist) {
+    return console.warn(
+      `⚠️  ${newFolderName} already exists in the /src/pages/ directory.`
+        .underline.red
+    )
+  }
+  createNewPage(newFolderPath)
+  saveRouter2Manifest()
+}
+
+main()