@atomicservice/ascf-toolkit 1.0.14 → 1.0.16

package/lib/bin/ascf.js

@@ -1,2 +1,2 @@
 #!/usr/bin/env node
-var _require=require("../ascf-common"),Command=_require.Command,pkg=require("../../package.json"),_require2=require("../common/log4js.js"),setLoggerConfig=_require2.setLoggerConfig,convertCmd=require("../commands/convert"),compileCmd=require("../commands/compile"),buildNpmCmd=require("../commands/build-npm"),debuggerCmd=require("../commands/debugger"),ascfbuildCmd=require("../commands/ascfbuild"),quickserviceCmd=require("../commands/quickservice"),_require3=require("../common/constants.js"),BUILD_TARGET_QS=_require3.BUILD_TARGET_QS,hasArg=_require3.hasArg,programClass=(global._supportLegacyHos=(e=>hasArg(e,"--targets",BUILD_TARGET_QS)||hasArg(e,"--deviceType","legacy"))(process.argv.slice(2)),new Command),cmds=[convertCmd,compileCmd,buildNpmCmd,debuggerCmd,ascfbuildCmd,quickserviceCmd],program=programClass.version(pkg.version).description("ascf toolkit convert and compile ascf project").option("--logging [level]","Setting the log level, debug,info,warn,error,fatal","info").option("-d,--debug","enable debug logging",!1);program.hook("preAction",function(){var e;global._ascfDebug=!(null==(e=program.opts())||!e.debug),setLoggerConfig(global._ascfDebug?"debug":null==(e=program.opts())?void 0:e.logging),global._ascfCliProgram=program}),cmds.forEach(function(e){return null==e?void 0:e.install(program)}),program.parse(process.argv);
+var _require=require("../ascf-common"),Command=_require.Command,pkg=require("../../package.json"),_require2=require("../common/log4js.js"),setLoggerConfig=_require2.setLoggerConfig,convertCmd=require("../commands/convert"),compileCmd=require("../commands/compile"),buildNpmCmd=require("../commands/build-npm"),debuggerCmd=require("../commands/debugger"),generateCmd=require("../commands/generate"),ascfbuildCmd=require("../commands/ascfbuild"),quickserviceCmd=require("../commands/quickservice"),_require3=require("../common/constants.js"),LEGACY_DEVICE=_require3.LEGACY_DEVICE,ADB_CONNECTOR=_require3.ADB_CONNECTOR,hasArg=_require3.hasArg,programClass=(global._supportLegacyHos=(e=>hasArg(e,"--deviceType",LEGACY_DEVICE)||hasArg(e,"--connectorType",ADB_CONNECTOR)||hasArg(e,"-ct",ADB_CONNECTOR))(process.argv.slice(2)),new Command),cmds=[convertCmd,compileCmd,buildNpmCmd,debuggerCmd,generateCmd,ascfbuildCmd,quickserviceCmd],program=programClass.version(pkg.version).description("ascf toolkit convert and compile ascf project").option("--logging [level]","Setting the log level, debug,info,warn,error,fatal","info").option("-d,--debug","enable debug logging",!1);program.hook("preAction",function(){var e;global._ascfDebug=!(null==(e=program.opts())||!e.debug),setLoggerConfig(global._ascfDebug?"debug":null==(e=program.opts())?void 0:e.logging),global._ascfCliProgram=program}),cmds.forEach(function(e){return null==e?void 0:e.install(program)}),program.parse(process.argv);

package/lib/commands/ascfbuild/index.js

@@ -1 +1 @@
-function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,r){var t;if(e)return"string"==typeof e?_arrayLikeToArray(e,r):"Map"===(t="Object"===(t={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:t)||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?_arrayLikeToArray(e,r):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=Array(r);t<r;t++)n[t]=e[t];return n}function _regenerator(){var d,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",t=e.toStringTag||"@@toStringTag";function n(e,r,t,n){var o,a,i,c,u,l,s,f,p,r=r&&r.prototype instanceof b?r:b,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,a=t,s=n||[],f=!1,p={p:l=0,n:0,v:d,a:y,f:y.bind(d,4),d:function(e,r){return i=e,c=0,u=d,p.n=r,_}},function(e,r,t){if(1<l)throw TypeError("Generator is already running");for(f&&1===r&&y(r,t),c=r,u=t;(g=c<2?d:u)||!f;){i||(c?c<3?(1<c&&(p.n=-1),y(c,u)):p.n=u:p.v=u);try{if(l=2,i){if(g=i[e=c?e:"next"]){if(!(g=g.call(i,u)))throw TypeError("iterator result is not an object");if(!g.done)return g;u=g.value,c<2&&(c=0)}else 1===c&&(g=i.return)&&g.call(i),c<2&&(u=TypeError("The iterator does not provide a '"+e+"' method"),c=1);i=d}else if((g=(f=p.n<0)?u:o.call(a,p))!==_)break}catch(e){i=d,c=1,u=e}finally{l=1}}return{value:g,done:f}}),!0),r;function y(e,r){for(c=e,u=r,g=0;!f&&l&&!t&&g<s.length;g++){var t,n=s[g],o=p.p,a=n[2];3<e?(t=a===r)&&(u=n[(c=n[4])?5:c=3],n[4]=n[5]=d):n[0]<=o&&((t=e<2&&o<n[1])?(c=0,p.v=r,p.n=n[1]):o<a&&(t=e<3||n[0]>r||a<r)&&(n[4]=e,n[5]=r,p.n=a,c=0))}if(t||1<e)return _;throw f=!0,r}}var _={};function b(){}function o(){}function a(){}var g=Object.getPrototypeOf,e=[][r]?g(g([][r]())):(_regeneratorDefine2(g={},r,function(){return this}),g),i=a.prototype=b.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,_regeneratorDefine2(e,t,"GeneratorFunction")),e.prototype=Object.create(i),e}return _regeneratorDefine2(i,"constructor",o.prototype=a),_regeneratorDefine2(a,"constructor",o),_regeneratorDefine2(a,t,o.displayName="GeneratorFunction"),_regeneratorDefine2(i),_regeneratorDefine2(i,t,"Generator"),_regeneratorDefine2(i,r,function(){return this}),_regeneratorDefine2(i,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:n,m:c}})()}function _regeneratorDefine2(e,r,t,n){var a=Object.defineProperty;try{a({},"",{})}catch(e){a=0}(_regeneratorDefine2=function(e,r,t,n){function o(r,t){_regeneratorDefine2(e,r,function(e){return this._invoke(r,t,e)})}r?a?a(e,r,{value:t,enumerable:!n,configurable:!n,writable:!n}):e[r]=t:(o("next",0),o("throw",1),o("return",2))})(e,r,t,n)}function asyncGeneratorStep(e,r,t,n,o,a,i){try{var c=e[a](i),u=c.value}catch(e){return void t(e)}c.done?r(u):Promise.resolve(u).then(n,o)}function _asyncToGenerator(c){return function(){var e=this,i=arguments;return new Promise(function(r,t){var n=c.apply(e,i);function o(e){asyncGeneratorStep(n,r,t,o,a,"next",e)}function a(e){asyncGeneratorStep(n,r,t,o,a,"throw",e)}o(void 0)})}}var _require=require("@atomicservice/ascf-base"),BuildProcessFactory=_require.BuildProcessFactory,_require2=require("../../common/constants"),BUILD_TARGET_QS=_require2.BUILD_TARGET_QS,BUILD_TARGET_AS=_require2.BUILD_TARGET_AS,normalizeTargets=_require2.normalizeTargets;module.exports={install:function(e){var n=e.command("build").description("Build ASCF project"),a=["assembleHap","assembleApp","assembleAndInstallHap"],i=["installHap","assembleAndInstallHap","uninstall","start"];_toConsumableArray(new Set([].concat(["installDeps","clean"],a,i))).forEach(function(e){var o,t,r=n.command(e).description(e).option("-r, --projectRoot [projectRoot]","projectRoot");a.includes(e)&&r.option("-m, --buildMode [buildMode]","build mode: debug,release","debug").option("--targets [buildTarget]","Build targets, atomicservice and ".concat(BUILD_TARGET_QS),BUILD_TARGET_AS),i.includes(e)&&r.option("--deviceType [deviceType]","device type, hos | legacy","hos").option("-t, --deviceId [deviceId]","select a device"),r.action((o=e,t=_asyncToGenerator(_regenerator().m(function e(r,t){var n;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return n=Object.assign({},null==t||null==(n=t.parent)?void 0:n.opts(),r),global._ascfCliOptions=normalizeTargets(n),n.subCmd=o,n.projectRoot?process.chdir(n.projectRoot):n.projectRoot=process.cwd(),e.n=1,BuildProcessFactory.create(n);case 1:e.v.handle(o);case 2:return e.a(2)}},e)})),function(e,r){return t.apply(this,arguments)}))})}};
+function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,r){var t;if(e)return"string"==typeof e?_arrayLikeToArray(e,r):"Map"===(t="Object"===(t={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:t)||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?_arrayLikeToArray(e,r):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,n=Array(r);t<r;t++)n[t]=e[t];return n}function _regenerator(){var d,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",t=e.toStringTag||"@@toStringTag";function n(e,r,t,n){var o,a,i,c,u,s,l,p,f,r=r&&r.prototype instanceof _?r:_,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,a=t,l=n||[],p=!1,f={p:s=0,n:0,v:d,a:y,f:y.bind(d,4),d:function(e,r){return i=e,c=0,u=d,f.n=r,b}},function(e,r,t){if(1<s)throw TypeError("Generator is already running");for(p&&1===r&&y(r,t),c=r,u=t;(v=c<2?d:u)||!p;){i||(c?c<3?(1<c&&(f.n=-1),y(c,u)):f.n=u:f.v=u);try{if(s=2,i){if(v=i[e=c?e:"next"]){if(!(v=v.call(i,u)))throw TypeError("iterator result is not an object");if(!v.done)return v;u=v.value,c<2&&(c=0)}else 1===c&&(v=i.return)&&v.call(i),c<2&&(u=TypeError("The iterator does not provide a '"+e+"' method"),c=1);i=d}else if((v=(p=f.n<0)?u:o.call(a,f))!==b)break}catch(e){i=d,c=1,u=e}finally{s=1}}return{value:v,done:p}}),!0),r;function y(e,r){for(c=e,u=r,v=0;!p&&s&&!t&&v<l.length;v++){var t,n=l[v],o=f.p,a=n[2];3<e?(t=a===r)&&(u=n[(c=n[4])?5:c=3],n[4]=n[5]=d):n[0]<=o&&((t=e<2&&o<n[1])?(c=0,f.v=r,f.n=n[1]):o<a&&(t=e<3||n[0]>r||a<r)&&(n[4]=e,n[5]=r,f.n=a,c=0))}if(t||1<e)return b;throw p=!0,r}}var b={};function _(){}function o(){}function a(){}var v=Object.getPrototypeOf,e=[][r]?v(v([][r]())):(_regeneratorDefine2(v={},r,function(){return this}),v),i=a.prototype=_.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,_regeneratorDefine2(e,t,"GeneratorFunction")),e.prototype=Object.create(i),e}return _regeneratorDefine2(i,"constructor",o.prototype=a),_regeneratorDefine2(a,"constructor",o),_regeneratorDefine2(a,t,o.displayName="GeneratorFunction"),_regeneratorDefine2(i),_regeneratorDefine2(i,t,"Generator"),_regeneratorDefine2(i,r,function(){return this}),_regeneratorDefine2(i,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:n,m:c}})()}function _regeneratorDefine2(e,r,t,n){var a=Object.defineProperty;try{a({},"",{})}catch(e){a=0}(_regeneratorDefine2=function(e,r,t,n){function o(r,t){_regeneratorDefine2(e,r,function(e){return this._invoke(r,t,e)})}r?a?a(e,r,{value:t,enumerable:!n,configurable:!n,writable:!n}):e[r]=t:(o("next",0),o("throw",1),o("return",2))})(e,r,t,n)}function asyncGeneratorStep(e,r,t,n,o,a,i){try{var c=e[a](i),u=c.value}catch(e){return void t(e)}c.done?r(u):Promise.resolve(u).then(n,o)}function _asyncToGenerator(c){return function(){var e=this,i=arguments;return new Promise(function(r,t){var n=c.apply(e,i);function o(e){asyncGeneratorStep(n,r,t,o,a,"next",e)}function a(e){asyncGeneratorStep(n,r,t,o,a,"throw",e)}o(void 0)})}}var _require=require("@atomicservice/ascf-base"),BuildProcessFactory=_require.BuildProcessFactory,_require2=require("../../common/constants"),normalizeDeviceTypes=_require2.normalizeDeviceTypes;module.exports={install:function(a){var n=a.command("build").description("Build ASCF project"),i=["assembleHap","assembleApp","assembleAndInstallHap"],c=["installHap","assembleAndInstallHap","uninstall","start"];_toConsumableArray(new Set([].concat(["installDeps","clean"],i,c))).forEach(function(e){var o,t,r=n.command(e).description(e).option("-r, --projectRoot [projectRoot]","projectRoot");i.includes(e)&&r.option("-m, --buildMode [buildMode]","build mode: debug,release","debug").option("--targets [buildTarget]","deprecated"),c.includes(e)&&r.option("-t, --deviceId [deviceId]","select a device").option("--deviceType [deviceType]","device type, hos | legacy. deprecated, use connectorType instead","hos").option("-ct, --connectorType [connectorType]","connector type, hdc | adb","hdc"),r.action((o=e,t=_asyncToGenerator(_regenerator().m(function e(r,t){var n;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return n=Object.assign({},null==t||null==(n=t.parent)?void 0:n.opts(),r),global._ascfCliOptions=normalizeDeviceTypes(a.args,n),n.subCmd=o,n.projectRoot?process.chdir(n.projectRoot):n.projectRoot=process.cwd(),e.n=1,BuildProcessFactory.create(n);case 1:e.v.handle(o);case 2:return e.a(2)}},e)})),function(e,r){return t.apply(this,arguments)}))})}};

package/lib/commands/build-npm/index.js

@@ -1 +1 @@
-function _regenerator(){var d,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",n=e.toStringTag||"@@toStringTag";function t(e,r,n,t){var o,i,a,c,u,f,s,p,l,r=r&&r.prototype instanceof _?r:_,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,i=n,s=t||[],p=!1,l={p:f=0,n:0,v:d,a:g,f:g.bind(d,4),d:function(e,r){return a=e,c=0,u=d,l.n=r,m}},function(e,r,n){if(1<f)throw TypeError("Generator is already running");for(p&&1===r&&g(r,n),c=r,u=n;(y=c<2?d:u)||!p;){a||(c?c<3?(1<c&&(l.n=-1),g(c,u)):l.n=u:l.v=u);try{if(f=2,a){if(y=a[e=c?e:"next"]){if(!(y=y.call(a,u)))throw TypeError("iterator result is not an object");if(!y.done)return y;u=y.value,c<2&&(c=0)}else 1===c&&(y=a.return)&&y.call(a),c<2&&(u=TypeError("The iterator does not provide a '"+e+"' method"),c=1);a=d}else if((y=(p=l.n<0)?u:o.call(i,l))!==m)break}catch(e){a=d,c=1,u=e}finally{f=1}}return{value:y,done:p}}),!0),r;function g(e,r){for(c=e,u=r,y=0;!p&&f&&!n&&y<s.length;y++){var n,t=s[y],o=l.p,i=t[2];3<e?(n=i===r)&&(u=t[(c=t[4])?5:c=3],t[4]=t[5]=d):t[0]<=o&&((n=e<2&&o<t[1])?(c=0,l.v=r,l.n=t[1]):o<i&&(n=e<3||t[0]>r||i<r)&&(t[4]=e,t[5]=r,l.n=i,c=0))}if(n||1<e)return m;throw p=!0,r}}var m={};function _(){}function o(){}function i(){}var y=Object.getPrototypeOf,e=[][r]?y(y([][r]())):(_regeneratorDefine2(y={},r,function(){return this}),y),a=i.prototype=_.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,i):(e.__proto__=i,_regeneratorDefine2(e,n,"GeneratorFunction")),e.prototype=Object.create(a),e}return _regeneratorDefine2(a,"constructor",o.prototype=i),_regeneratorDefine2(i,"constructor",o),_regeneratorDefine2(i,n,o.displayName="GeneratorFunction"),_regeneratorDefine2(a),_regeneratorDefine2(a,n,"Generator"),_regeneratorDefine2(a,r,function(){return this}),_regeneratorDefine2(a,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:t,m:c}})()}function _regeneratorDefine2(e,r,n,t){var i=Object.defineProperty;try{i({},"",{})}catch(e){i=0}(_regeneratorDefine2=function(e,r,n,t){function o(r,n){_regeneratorDefine2(e,r,function(e){return this._invoke(r,n,e)})}r?i?i(e,r,{value:n,enumerable:!t,configurable:!t,writable:!t}):e[r]=n:(o("next",0),o("throw",1),o("return",2))})(e,r,n,t)}function asyncGeneratorStep(e,r,n,t,o,i,a){try{var c=e[i](a),u=c.value}catch(e){return void n(e)}c.done?r(u):Promise.resolve(u).then(t,o)}function _asyncToGenerator(c){return function(){var e=this,a=arguments;return new Promise(function(r,n){var t=c.apply(e,a);function o(e){asyncGeneratorStep(t,r,n,o,i,"next",e)}function i(e){asyncGeneratorStep(t,r,n,o,i,"throw",e)}o(void 0)})}}var _require=require("../../common/utils"),readJsonFile=_require.readJsonFile,hasHxml=_require.hasHxml,moveFiles=_require.moveFiles,path=require("path"),fs=require("fs"),log4js=require("../../common/log4js"),logger=log4js.getLogger("buildNpm");function buildMiniProgramNpm(e){var r=readJsonFile(path.join(e,"ascf","ascf_src","package.json"));if(null!=r&&r.dependencies)for(var n in r.dependencies)if(Object.prototype.hasOwnProperty.call(r.dependencies,n)){var t=path.join(e,"ascf","ascf_src","miniprogram_npm",n);if(!fs.existsSync(t)){var o=path.join(e,"ascf","ascf_src","node_modules",n);if(!fs.existsSync(o))return void logger.error("".concat(n," not found in node_modules, please run npm install ").concat(n,"."));hasHxml(o)&&(n=readJsonFile(path.join(o,"package.json")).miniprogram,moveFiles(n?path.join(o,n):o,t))}}logger.info("All npm dependencies has been built.")}function buildNpm(e){try{buildMiniProgramNpm(e)}catch(e){logger.error("Error: ascf buildNpm error: ".concat(e,"."))}}module.exports={buildNpm:buildNpm,install:function(e){var n;e.command("buildNpm <projectRoot>").description("Build ASCF npm dependencies to miniprogram_npm").action((n=_asyncToGenerator(_regenerator().m(function e(r,n){return _regenerator().w(function(e){for(;;)switch(e.n){case 0:buildNpm(r);case 1:return e.a(2)}},e)})),function(e,r){return n.apply(this,arguments)}))}};
+function _regenerator(){var d,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",n=e.toStringTag||"@@toStringTag";function t(e,r,n,t){var o,i,a,c,u,f,p,l,s,r=r&&r.prototype instanceof y?r:y,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,i=n,p=t||[],l=!1,s={p:f=0,n:0,v:d,a:g,f:g.bind(d,4),d:function(e,r){return a=e,c=0,u=d,s.n=r,m}},function(e,r,n){if(1<f)throw TypeError("Generator is already running");for(l&&1===r&&g(r,n),c=r,u=n;(_=c<2?d:u)||!l;){a||(c?c<3?(1<c&&(s.n=-1),g(c,u)):s.n=u:s.v=u);try{if(f=2,a){if(_=a[e=c?e:"next"]){if(!(_=_.call(a,u)))throw TypeError("iterator result is not an object");if(!_.done)return _;u=_.value,c<2&&(c=0)}else 1===c&&(_=a.return)&&_.call(a),c<2&&(u=TypeError("The iterator does not provide a '"+e+"' method"),c=1);a=d}else if((_=(l=s.n<0)?u:o.call(i,s))!==m)break}catch(e){a=d,c=1,u=e}finally{f=1}}return{value:_,done:l}}),!0),r;function g(e,r){for(c=e,u=r,_=0;!l&&f&&!n&&_<p.length;_++){var n,t=p[_],o=s.p,i=t[2];3<e?(n=i===r)&&(u=t[(c=t[4])?5:c=3],t[4]=t[5]=d):t[0]<=o&&((n=e<2&&o<t[1])?(c=0,s.v=r,s.n=t[1]):o<i&&(n=e<3||t[0]>r||i<r)&&(t[4]=e,t[5]=r,s.n=i,c=0))}if(n||1<e)return m;throw l=!0,r}}var m={};function y(){}function o(){}function i(){}var _=Object.getPrototypeOf,e=[][r]?_(_([][r]())):(_regeneratorDefine2(_={},r,function(){return this}),_),a=i.prototype=y.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,i):(e.__proto__=i,_regeneratorDefine2(e,n,"GeneratorFunction")),e.prototype=Object.create(a),e}return _regeneratorDefine2(a,"constructor",o.prototype=i),_regeneratorDefine2(i,"constructor",o),_regeneratorDefine2(i,n,o.displayName="GeneratorFunction"),_regeneratorDefine2(a),_regeneratorDefine2(a,n,"Generator"),_regeneratorDefine2(a,r,function(){return this}),_regeneratorDefine2(a,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:t,m:c}})()}function _regeneratorDefine2(e,r,n,t){var i=Object.defineProperty;try{i({},"",{})}catch(e){i=0}(_regeneratorDefine2=function(e,r,n,t){function o(r,n){_regeneratorDefine2(e,r,function(e){return this._invoke(r,n,e)})}r?i?i(e,r,{value:n,enumerable:!t,configurable:!t,writable:!t}):e[r]=n:(o("next",0),o("throw",1),o("return",2))})(e,r,n,t)}function asyncGeneratorStep(e,r,n,t,o,i,a){try{var c=e[i](a),u=c.value}catch(e){return void n(e)}c.done?r(u):Promise.resolve(u).then(t,o)}function _asyncToGenerator(c){return function(){var e=this,a=arguments;return new Promise(function(r,n){var t=c.apply(e,a);function o(e){asyncGeneratorStep(t,r,n,o,i,"next",e)}function i(e){asyncGeneratorStep(t,r,n,o,i,"throw",e)}o(void 0)})}}var _require=require("../../common/utils"),readJsonFile=_require.readJsonFile,hasHxml=_require.hasHxml,moveFiles=_require.moveFiles,getProjectInfo=_require.getProjectInfo,path=require("path"),fs=require("fs"),log4js=require("../../common/log4js"),logger=log4js.getLogger("buildNpm");function buildMiniProgramNpm(e){var r=getProjectInfo().ascfSrcPath,n=readJsonFile(path.join(r,"package.json"));if(null!=n&&n.dependencies)for(var t in n.dependencies)if(Object.prototype.hasOwnProperty.call(n.dependencies,t)){var o=path.join(r,"miniprogram_npm",t);if(!fs.existsSync(o)){var i=path.join(r,"node_modules",t);if(!fs.existsSync(i))return void logger.error("".concat(t," not found in node_modules, please run npm install ").concat(t,"."));hasHxml(i)&&(t=readJsonFile(path.join(i,"package.json")).miniprogram,moveFiles(t?path.join(i,t):i,o))}}logger.info("All npm dependencies has been built.")}function buildNpm(e){try{buildMiniProgramNpm(e)}catch(e){logger.error("Error: ascf buildNpm error: ".concat(e,"."))}}module.exports={buildNpm:buildNpm,install:function(e){var n;e.command("buildNpm <projectRoot>").description("Build ASCF npm dependencies to miniprogram_npm").action((n=_asyncToGenerator(_regenerator().m(function e(r,n){return _regenerator().w(function(e){for(;;)switch(e.n){case 0:buildNpm(r);case 1:return e.a(2)}},e)})),function(e,r){return n.apply(this,arguments)}))}};

package/lib/commands/compile.js

@@ -1 +1 @@
-function _regenerator(){var g,e="function"==typeof Symbol?Symbol:{},t=e.iterator||"@@iterator",r=e.toStringTag||"@@toStringTag";function o(e,t,r,o){var n,a,i,c,p,u,s,f,l,t=t&&t.prototype instanceof v?t:v,t=Object.create(t.prototype);return _regeneratorDefine2(t,"_invoke",(n=e,a=r,s=o||[],f=!1,l={p:u=0,n:0,v:g,a:d,f:d.bind(g,4),d:function(e,t){return i=e,c=0,p=g,l.n=t,_}},function(e,t,r){if(1<u)throw TypeError("Generator is already running");for(f&&1===t&&d(t,r),c=t,p=r;(y=c<2?g:p)||!f;){i||(c?c<3?(1<c&&(l.n=-1),d(c,p)):l.n=p:l.v=p);try{if(u=2,i){if(y=i[e=c?e:"next"]){if(!(y=y.call(i,p)))throw TypeError("iterator result is not an object");if(!y.done)return y;p=y.value,c<2&&(c=0)}else 1===c&&(y=i.return)&&y.call(i),c<2&&(p=TypeError("The iterator does not provide a '"+e+"' method"),c=1);i=g}else if((y=(f=l.n<0)?p:n.call(a,l))!==_)break}catch(e){i=g,c=1,p=e}finally{u=1}}return{value:y,done:f}}),!0),t;function d(e,t){for(c=e,p=t,y=0;!f&&u&&!r&&y<s.length;y++){var r,o=s[y],n=l.p,a=o[2];3<e?(r=a===t)&&(p=o[(c=o[4])?5:c=3],o[4]=o[5]=g):o[0]<=n&&((r=e<2&&n<o[1])?(c=0,l.v=t,l.n=o[1]):n<a&&(r=e<3||o[0]>t||a<t)&&(o[4]=e,o[5]=t,l.n=a,c=0))}if(r||1<e)return _;throw f=!0,t}}var _={};function v(){}function n(){}function a(){}var y=Object.getPrototypeOf,e=[][t]?y(y([][t]())):(_regeneratorDefine2(y={},t,function(){return this}),y),i=a.prototype=v.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,_regeneratorDefine2(e,r,"GeneratorFunction")),e.prototype=Object.create(i),e}return _regeneratorDefine2(i,"constructor",n.prototype=a),_regeneratorDefine2(a,"constructor",n),_regeneratorDefine2(a,r,n.displayName="GeneratorFunction"),_regeneratorDefine2(i),_regeneratorDefine2(i,r,"Generator"),_regeneratorDefine2(i,t,function(){return this}),_regeneratorDefine2(i,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:o,m:c}})()}function _regeneratorDefine2(e,t,r,o){var a=Object.defineProperty;try{a({},"",{})}catch(e){a=0}(_regeneratorDefine2=function(e,t,r,o){function n(t,r){_regeneratorDefine2(e,t,function(e){return this._invoke(t,r,e)})}t?a?a(e,t,{value:r,enumerable:!o,configurable:!o,writable:!o}):e[t]=r:(n("next",0),n("throw",1),n("return",2))})(e,t,r,o)}function asyncGeneratorStep(e,t,r,o,n,a,i){try{var c=e[a](i),p=c.value}catch(e){return void r(e)}c.done?t(p):Promise.resolve(p).then(o,n)}function _asyncToGenerator(c){return function(){var e=this,i=arguments;return new Promise(function(t,r){var o=c.apply(e,i);function n(e){asyncGeneratorStep(o,t,r,n,a,"next",e)}function a(e){asyncGeneratorStep(o,t,r,n,a,"throw",e)}n(void 0)})}}var _require=require("../common/constants.js"),BUILD_TARGET_QS=_require.BUILD_TARGET_QS,BUILD_TARGET_AS=_require.BUILD_TARGET_AS,normalizeTargets=_require.normalizeTargets;module.exports={install:function(e){var r,e=e.command("compile <projectRoot>").description("Compile ascf project").option("-p, --progress","Show build progress").option("-w, --watch","Watch run for changes").option("-m, --mode","Environment, empty is production, -m is development").option("-c, --clear","Clear build resource").option("-r, --run [command]","Run command on changes been watched").option("--swc","Use swc parser, default is babel parser").option("--devtool [type]","sourcemap type, default is eval-cheap-source-map").option("--disableSubpackages [true or false]","Disable subpackages, default is true for development, false for production").option("--analyzeBundle","analyze bundle",!1).option("--templateHoist","Hoist template to page scope, default is true when have base.hxml").option("--skipApiValidator [flag]","Skip API and components validator, default is true").option("--serve","Start dev-server").option("--deviceType [deviceType]","device type, hos | legacy","hos").option("--deviceId [deviceId]","select a device to start hot reload").option("--targets [buildTarget]","Build targets, atomicservice and ".concat(BUILD_TARGET_QS),BUILD_TARGET_AS);global._supportLegacyHos&&e.option("--qs-host-pkg [pkg]","Host package for ".concat(BUILD_TARGET_QS)).option("--sign-private-key-path [path]","Sign private key path for ".concat(BUILD_TARGET_QS)).option("--sign-public-key-path [path]","Sign public key path for ".concat(BUILD_TARGET_QS)).option("--sign-pwd [pwd]","Password of the p12 file for ".concat(BUILD_TARGET_QS)).option("--sign-profile-path [path]","p12 File Path for ".concat(BUILD_TARGET_QS)),e.action((r=_asyncToGenerator(_regenerator().m(function e(t,r){return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return global._ascfCliOptions=normalizeTargets(r),e.n=1,require("../index").compile(t,r);case 1:return e.a(2)}},e)})),function(e,t){return r.apply(this,arguments)}))}};
+function _regenerator(){var y,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",t=e.toStringTag||"@@toStringTag";function n(e,r,t,n){var o,a,i,c,p,u,s,f,l,r=r&&r.prototype instanceof g?r:g,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,a=t,s=n||[],f=!1,l={p:u=0,n:0,v:y,a:d,f:d.bind(y,4),d:function(e,r){return i=e,c=0,p=y,l.n=r,v}},function(e,r,t){if(1<u)throw TypeError("Generator is already running");for(f&&1===r&&d(r,t),c=r,p=t;(m=c<2?y:p)||!f;){i||(c?c<3?(1<c&&(l.n=-1),d(c,p)):l.n=p:l.v=p);try{if(u=2,i){if(m=i[e=c?e:"next"]){if(!(m=m.call(i,p)))throw TypeError("iterator result is not an object");if(!m.done)return m;p=m.value,c<2&&(c=0)}else 1===c&&(m=i.return)&&m.call(i),c<2&&(p=TypeError("The iterator does not provide a '"+e+"' method"),c=1);i=y}else if((m=(f=l.n<0)?p:o.call(a,l))!==v)break}catch(e){i=y,c=1,p=e}finally{u=1}}return{value:m,done:f}}),!0),r;function d(e,r){for(c=e,p=r,m=0;!f&&u&&!t&&m<s.length;m++){var t,n=s[m],o=l.p,a=n[2];3<e?(t=a===r)&&(p=n[(c=n[4])?5:c=3],n[4]=n[5]=y):n[0]<=o&&((t=e<2&&o<n[1])?(c=0,l.v=r,l.n=n[1]):o<a&&(t=e<3||n[0]>r||a<r)&&(n[4]=e,n[5]=r,l.n=a,c=0))}if(t||1<e)return v;throw f=!0,r}}var v={};function g(){}function o(){}function a(){}var m=Object.getPrototypeOf,e=[][r]?m(m([][r]())):(_regeneratorDefine2(m={},r,function(){return this}),m),i=a.prototype=g.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,_regeneratorDefine2(e,t,"GeneratorFunction")),e.prototype=Object.create(i),e}return _regeneratorDefine2(i,"constructor",o.prototype=a),_regeneratorDefine2(a,"constructor",o),_regeneratorDefine2(a,t,o.displayName="GeneratorFunction"),_regeneratorDefine2(i),_regeneratorDefine2(i,t,"Generator"),_regeneratorDefine2(i,r,function(){return this}),_regeneratorDefine2(i,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:n,m:c}})()}function _regeneratorDefine2(e,r,t,n){var a=Object.defineProperty;try{a({},"",{})}catch(e){a=0}(_regeneratorDefine2=function(e,r,t,n){function o(r,t){_regeneratorDefine2(e,r,function(e){return this._invoke(r,t,e)})}r?a?a(e,r,{value:t,enumerable:!n,configurable:!n,writable:!n}):e[r]=t:(o("next",0),o("throw",1),o("return",2))})(e,r,t,n)}function asyncGeneratorStep(e,r,t,n,o,a,i){try{var c=e[a](i),p=c.value}catch(e){return void t(e)}c.done?r(p):Promise.resolve(p).then(n,o)}function _asyncToGenerator(c){return function(){var e=this,i=arguments;return new Promise(function(r,t){var n=c.apply(e,i);function o(e){asyncGeneratorStep(n,r,t,o,a,"next",e)}function a(e){asyncGeneratorStep(n,r,t,o,a,"throw",e)}o(void 0)})}}var _require=require("../common/constants"),normalizeDeviceTypes=_require.normalizeDeviceTypes;module.exports={install:function(n){var t;n.command("compile <projectRoot>").description("Compile ascf project").option("-p, --progress","Show build progress").option("-w, --watch","Watch run for changes").option("-m, --mode","Environment, empty is production, -m is development").option("-c, --clear","Clear build resource").option("-r, --run [command]","Run command on changes been watched").option("--swc","Use swc parser, default is babel parser").option("--devtool [type]","sourcemap type, default is eval-cheap-source-map").option("--disableSubpackages [true or false]","Disable subpackages, default is true for development, false for production").option("--analyzeBundle","analyze bundle",!1).option("--templateHoist","Hoist template to page scope, default is true when have base.hxml").option("--skipApiValidator [flag]","Skip API and components validator, default is true").option("--serve","Start dev-server").option("--deviceId [deviceId]","select a device to start hot reload").option("--deviceType [deviceType]","device type, hos | legacy. deprecated, use connectorType instead","hos").option("-ct, --connectorType [connectorType]","connector type, hdc | adb","hdc").option("--targets [buildTarget]","deprecated").action((t=_asyncToGenerator(_regenerator().m(function e(r,t){return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return global._ascfCliOptions=normalizeDeviceTypes(n.args,t),e.n=1,require("../index").compile(r,t);case 1:return e.a(2)}},e)})),function(e,r){return t.apply(this,arguments)}))}};

package/lib/commands/debugger/index.js

@@ -1 +1 @@
-function _regenerator(){var d,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",t=e.toStringTag||"@@toStringTag";function n(e,r,t,n){var o,i,a,c,u,s,f,p,g,r=r&&r.prototype instanceof v?r:v,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,i=t,f=n||[],p=!1,g={p:s=0,n:0,v:d,a:l,f:l.bind(d,4),d:function(e,r){return a=e,c=0,u=d,g.n=r,_}},function(e,r,t){if(1<s)throw TypeError("Generator is already running");for(p&&1===r&&l(r,t),c=r,u=t;(y=c<2?d:u)||!p;){a||(c?c<3?(1<c&&(g.n=-1),l(c,u)):g.n=u:g.v=u);try{if(s=2,a){if(y=a[e=c?e:"next"]){if(!(y=y.call(a,u)))throw TypeError("iterator result is not an object");if(!y.done)return y;u=y.value,c<2&&(c=0)}else 1===c&&(y=a.return)&&y.call(a),c<2&&(u=TypeError("The iterator does not provide a '"+e+"' method"),c=1);a=d}else if((y=(p=g.n<0)?u:o.call(i,g))!==_)break}catch(e){a=d,c=1,u=e}finally{s=1}}return{value:y,done:p}}),!0),r;function l(e,r){for(c=e,u=r,y=0;!p&&s&&!t&&y<f.length;y++){var t,n=f[y],o=g.p,i=n[2];3<e?(t=i===r)&&(u=n[(c=n[4])?5:c=3],n[4]=n[5]=d):n[0]<=o&&((t=e<2&&o<n[1])?(c=0,g.v=r,g.n=n[1]):o<i&&(t=e<3||n[0]>r||i<r)&&(n[4]=e,n[5]=r,g.n=i,c=0))}if(t||1<e)return _;throw p=!0,r}}var _={};function v(){}function o(){}function i(){}var y=Object.getPrototypeOf,e=[][r]?y(y([][r]())):(_regeneratorDefine2(y={},r,function(){return this}),y),a=i.prototype=v.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,i):(e.__proto__=i,_regeneratorDefine2(e,t,"GeneratorFunction")),e.prototype=Object.create(a),e}return _regeneratorDefine2(a,"constructor",o.prototype=i),_regeneratorDefine2(i,"constructor",o),_regeneratorDefine2(i,t,o.displayName="GeneratorFunction"),_regeneratorDefine2(a),_regeneratorDefine2(a,t,"Generator"),_regeneratorDefine2(a,r,function(){return this}),_regeneratorDefine2(a,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:n,m:c}})()}function _regeneratorDefine2(e,r,t,n){var i=Object.defineProperty;try{i({},"",{})}catch(e){i=0}(_regeneratorDefine2=function(e,r,t,n){function o(r,t){_regeneratorDefine2(e,r,function(e){return this._invoke(r,t,e)})}r?i?i(e,r,{value:t,enumerable:!n,configurable:!n,writable:!n}):e[r]=t:(o("next",0),o("throw",1),o("return",2))})(e,r,t,n)}function asyncGeneratorStep(e,r,t,n,o,i,a){try{var c=e[i](a),u=c.value}catch(e){return void t(e)}c.done?r(u):Promise.resolve(u).then(n,o)}function _asyncToGenerator(c){return function(){var e=this,a=arguments;return new Promise(function(r,t){var n=c.apply(e,a);function o(e){asyncGeneratorStep(n,r,t,o,i,"next",e)}function i(e){asyncGeneratorStep(n,r,t,o,i,"throw",e)}o(void 0)})}}var _require=require("@atomicservice/ascf-base"),DebuggerProcessFactory=_require.DebuggerProcessFactory,_require2=require("../../common/constants"),BUILD_TARGET_QS=_require2.BUILD_TARGET_QS,BUILD_TARGET_AS=_require2.BUILD_TARGET_AS,normalizeTargets=_require2.normalizeTargets;module.exports={install:function(e){function r(o){return t=_asyncToGenerator(_regenerator().m(function e(r,t){var n;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return n=Object.assign({},null==t||null==(n=t.parent)?void 0:n.opts(),r),global._ascfCliOptions=normalizeTargets(n),e.n=1,DebuggerProcessFactory.create(n);case 1:e.v.handle(o);case 2:return e.a(2)}},e)})),function(e,r){return t.apply(this,arguments)};var t}var t=e.command("debugger").description("Start or stop debugger").option("-b, --bundleName [bundleName]","bundleName of debugging project").option("--deviceType [deviceType]","device type, hos | legacy","hos").option("--deviceId [deviceId]","select a device to debug").option("--targets [buildTarget]","Build targets, atomicservice and ".concat(BUILD_TARGET_QS),BUILD_TARGET_AS);["status"].forEach(function(e){t.command(e).description(e).action(r(e))}),["start","start-view","start-service"].forEach(function(e){t.command(e).description(e).option("-o, --open [browser]",'Open default browser, "default","chrome","edge"').action(r(e))}),["stop","stop-view","stop-service"].forEach(function(e){t.command(e).description(e).action(r(e))})}};
+function _regenerator(){var l,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",t=e.toStringTag||"@@toStringTag";function n(e,r,t,n){var o,i,a,c,u,s,f,p,d,r=r&&r.prototype instanceof v?r:v,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,i=t,f=n||[],p=!1,d={p:s=0,n:0,v:l,a:g,f:g.bind(l,4),d:function(e,r){return a=e,c=0,u=l,d.n=r,y}},function(e,r,t){if(1<s)throw TypeError("Generator is already running");for(p&&1===r&&g(r,t),c=r,u=t;(b=c<2?l:u)||!p;){a||(c?c<3?(1<c&&(d.n=-1),g(c,u)):d.n=u:d.v=u);try{if(s=2,a){if(b=a[e=c?e:"next"]){if(!(b=b.call(a,u)))throw TypeError("iterator result is not an object");if(!b.done)return b;u=b.value,c<2&&(c=0)}else 1===c&&(b=a.return)&&b.call(a),c<2&&(u=TypeError("The iterator does not provide a '"+e+"' method"),c=1);a=l}else if((b=(p=d.n<0)?u:o.call(i,d))!==y)break}catch(e){a=l,c=1,u=e}finally{s=1}}return{value:b,done:p}}),!0),r;function g(e,r){for(c=e,u=r,b=0;!p&&s&&!t&&b<f.length;b++){var t,n=f[b],o=d.p,i=n[2];3<e?(t=i===r)&&(u=n[(c=n[4])?5:c=3],n[4]=n[5]=l):n[0]<=o&&((t=e<2&&o<n[1])?(c=0,d.v=r,d.n=n[1]):o<i&&(t=e<3||n[0]>r||i<r)&&(n[4]=e,n[5]=r,d.n=i,c=0))}if(t||1<e)return y;throw p=!0,r}}var y={};function v(){}function o(){}function i(){}var b=Object.getPrototypeOf,e=[][r]?b(b([][r]())):(_regeneratorDefine2(b={},r,function(){return this}),b),a=i.prototype=v.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,i):(e.__proto__=i,_regeneratorDefine2(e,t,"GeneratorFunction")),e.prototype=Object.create(a),e}return _regeneratorDefine2(a,"constructor",o.prototype=i),_regeneratorDefine2(i,"constructor",o),_regeneratorDefine2(i,t,o.displayName="GeneratorFunction"),_regeneratorDefine2(a),_regeneratorDefine2(a,t,"Generator"),_regeneratorDefine2(a,r,function(){return this}),_regeneratorDefine2(a,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:n,m:c}})()}function _regeneratorDefine2(e,r,t,n){var i=Object.defineProperty;try{i({},"",{})}catch(e){i=0}(_regeneratorDefine2=function(e,r,t,n){function o(r,t){_regeneratorDefine2(e,r,function(e){return this._invoke(r,t,e)})}r?i?i(e,r,{value:t,enumerable:!n,configurable:!n,writable:!n}):e[r]=t:(o("next",0),o("throw",1),o("return",2))})(e,r,t,n)}function asyncGeneratorStep(e,r,t,n,o,i,a){try{var c=e[i](a),u=c.value}catch(e){return void t(e)}c.done?r(u):Promise.resolve(u).then(n,o)}function _asyncToGenerator(c){return function(){var e=this,a=arguments;return new Promise(function(r,t){var n=c.apply(e,a);function o(e){asyncGeneratorStep(n,r,t,o,i,"next",e)}function i(e){asyncGeneratorStep(n,r,t,o,i,"throw",e)}o(void 0)})}}var _require=require("@atomicservice/ascf-base"),DebuggerProcessFactory=_require.DebuggerProcessFactory,_require2=require("../../common/constants"),normalizeDeviceTypes=_require2.normalizeDeviceTypes;module.exports={install:function(i){function r(o){return t=_asyncToGenerator(_regenerator().m(function e(r,t){var n;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return n=Object.assign({},null==t||null==(n=t.parent)?void 0:n.opts(),r),global._ascfCliOptions=normalizeDeviceTypes(i.args,n),e.n=1,DebuggerProcessFactory.create(n);case 1:e.v.handle(o);case 2:return e.a(2)}},e)})),function(e,r){return t.apply(this,arguments)};var t}var t=i.command("debugger").description("Start or stop debugger").option("-b, --bundleName [bundleName]","bundleName of debugging project").option("--deviceId [deviceId]","select a device to debug").option("--deviceType [deviceType]","device type, hos | legacy. deprecated, use connectorType instead","hos").option("-ct, --connectorType [connectorType]","connector type, hdc | adb","hdc").option("--targets [buildTarget]","deprecated").option("-p, --progress","Enable progress output");["status"].forEach(function(e){t.command(e).description(e).action(r(e))}),["start","start-view","start-service"].forEach(function(e){t.command(e).description(e).option("-o, --open [browser]",'Open default browser, "default","chrome","edge"').action(r(e))}),["stop","stop-view","stop-service"].forEach(function(e){t.command(e).description(e).action(r(e))})}};

package/lib/commands/generate/index.js

@@ -0,0 +1 @@
+function _typeof(e){return(_typeof="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e})(e)}function _toConsumableArray(e){return _arrayWithoutHoles(e)||_iterableToArray(e)||_unsupportedIterableToArray(e)||_nonIterableSpread()}function _nonIterableSpread(){throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,t){var r;if(e)return"string"==typeof e?_arrayLikeToArray(e,t):"Map"===(r="Object"===(r={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:r)||"Set"===r?Array.from(e):"Arguments"===r||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(r)?_arrayLikeToArray(e,t):void 0}function _iterableToArray(e){if("undefined"!=typeof Symbol&&null!=e[Symbol.iterator]||null!=e["@@iterator"])return Array.from(e)}function _arrayWithoutHoles(e){if(Array.isArray(e))return _arrayLikeToArray(e)}function _arrayLikeToArray(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=Array(t);r<t;r++)n[r]=e[r];return n}function _regenerator(){var d,e="function"==typeof Symbol?Symbol:{},t=e.iterator||"@@iterator",r=e.toStringTag||"@@toStringTag";function n(e,t,r,n){var o,a,i,c,p,u,s,l,f,t=t&&t.prototype instanceof h?t:h,t=Object.create(t.prototype);return _regeneratorDefine2(t,"_invoke",(o=e,a=r,s=n||[],l=!1,f={p:u=0,n:0,v:d,a:y,f:y.bind(d,4),d:function(e,t){return i=e,c=0,p=d,f.n=t,m}},function(e,t,r){if(1<u)throw TypeError("Generator is already running");for(l&&1===t&&y(t,r),c=t,p=r;(g=c<2?d:p)||!l;){i||(c?c<3?(1<c&&(f.n=-1),y(c,p)):f.n=p:f.v=p);try{if(u=2,i){if(g=i[e=c?e:"next"]){if(!(g=g.call(i,p)))throw TypeError("iterator result is not an object");if(!g.done)return g;p=g.value,c<2&&(c=0)}else 1===c&&(g=i.return)&&g.call(i),c<2&&(p=TypeError("The iterator does not provide a '"+e+"' method"),c=1);i=d}else if((g=(l=f.n<0)?p:o.call(a,f))!==m)break}catch(e){i=d,c=1,p=e}finally{u=1}}return{value:g,done:l}}),!0),t;function y(e,t){for(c=e,p=t,g=0;!l&&u&&!r&&g<s.length;g++){var r,n=s[g],o=f.p,a=n[2];3<e?(r=a===t)&&(p=n[(c=n[4])?5:c=3],n[4]=n[5]=d):n[0]<=o&&((r=e<2&&o<n[1])?(c=0,f.v=t,f.n=n[1]):o<a&&(r=e<3||n[0]>t||a<t)&&(n[4]=e,n[5]=t,f.n=a,c=0))}if(r||1<e)return m;throw l=!0,t}}var m={};function h(){}function o(){}function a(){}var g=Object.getPrototypeOf,e=[][t]?g(g([][t]())):(_regeneratorDefine2(g={},t,function(){return this}),g),i=a.prototype=h.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,_regeneratorDefine2(e,r,"GeneratorFunction")),e.prototype=Object.create(i),e}return _regeneratorDefine2(i,"constructor",o.prototype=a),_regeneratorDefine2(a,"constructor",o),_regeneratorDefine2(a,r,o.displayName="GeneratorFunction"),_regeneratorDefine2(i),_regeneratorDefine2(i,r,"Generator"),_regeneratorDefine2(i,t,function(){return this}),_regeneratorDefine2(i,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:n,m:c}})()}function _regeneratorDefine2(e,t,r,n){var a=Object.defineProperty;try{a({},"",{})}catch(e){a=0}(_regeneratorDefine2=function(e,t,r,n){function o(t,r){_regeneratorDefine2(e,t,function(e){return this._invoke(t,r,e)})}t?a?a(e,t,{value:r,enumerable:!n,configurable:!n,writable:!n}):e[t]=r:(o("next",0),o("throw",1),o("return",2))})(e,t,r,n)}function _interopRequireWildcard(e,t){var i,c;return"function"==typeof WeakMap&&(i=new WeakMap,c=new WeakMap),(_interopRequireWildcard=function(e,t){if(!t&&e&&e.__esModule)return e;var r,n,o={__proto__:null,default:e};if(null!==e&&("object"==_typeof(e)||"function"==typeof e)){if(r=t?c:i){if(r.has(e))return r.get(e);r.set(e,o)}for(var a in e)"default"!==a&&{}.hasOwnProperty.call(e,a)&&((n=(r=Object.defineProperty)&&Object.getOwnPropertyDescriptor(e,a))&&(n.get||n.set)?r(o,a,n):o[a]=e[a])}return o})(e,t)}function asyncGeneratorStep(e,t,r,n,o,a,i){try{var c=e[a](i),p=c.value}catch(e){return void r(e)}c.done?t(p):Promise.resolve(p).then(n,o)}function _asyncToGenerator(c){return function(){var e=this,i=arguments;return new Promise(function(t,r){var n=c.apply(e,i);function o(e){asyncGeneratorStep(n,t,r,o,a,"next",e)}function a(e){asyncGeneratorStep(n,t,r,o,a,"throw",e)}o(void 0)})}}var path=require("path"),_require=require("@atomicservice/ascf-base"),createAscfProject=_require.createAscfProject,_require2=require("../../common/utils"),deepMerge=_require2.deepMerge,log4js=require("../../common/log4js"),logger=log4js.getLogger("generate");function getInquirerQuestions(e){var t=[],r=/^[A-Za-z][A-Za-z0-9_-]{0,199}$/,n=/^.{1,255}$/;return checkTid(e.tid,t),checkAppId(e.appId,t),checkAppName(e.appName,t,r),checkAppDesc(e.appDesc,t,n),checkAppNameEn(e.appNameEn,t,r),checkAppDescEn(e.appDescEn,t,n),checkDeviceTypes(e,t),t}function checkTid(e,t){e&&/^(HelloASCF|ASCFDemos)$/i.test(e)||t.push({type:"list",name:"tid",message:"Please select --tid",choices:["HelloASCF","ASCFDemos"]})}function checkAppId(e,t){var r=/^\d+$/;e&&r.test(e)||t.push({type:"input",name:"appId",message:"Please input --appId",validate:function(e){return!!r.test(e)||"This is invalid appid"}})}function checkAppName(e,t,r){e&&r.test(e)||t.push({type:"input",name:"appName",message:"Please input --appName",filter:function(e){return""===e?"HelloASCF":e},validate:function(e){return!(""!==e&&!r.test(e))||"The appName must contain 1 to 200 characters, start with a letter, and include only letters, digits and underscores (_), and a short horizontal line (-)"}})}function checkAppDesc(e,t,r){e&&r.test(e)||t.push({type:"input",name:"appDesc",message:"Please input --appDesc",filter:function(e){return""===e?"HelloASCF":e},validate:function(e){return!(""!==e&&!r.test(e))||"The appDesc must contain 1 to 255 characters"}})}function checkAppNameEn(e,t,r){e&&r.test(e)||t.push({type:"input",name:"appNameEn",message:"Please input --appNameEn",filter:function(e){return""===e?"HelloASCF":e},validate:function(e){return!(""!==e&&!r.test(e))||"The appNameEn must contain 1 to 200 characters, start with a letter, and include only letters, digits and underscores (_), and a short horizontal line (-)"}})}function checkAppDescEn(e,t,r){e&&r.test(e)||t.push({type:"input",name:"appDescEn",message:"Please input --appDescEn",filter:function(e){return""===e?"HelloASCF":e},validate:function(e){return!(""!==e&&!r.test(e))||"The appDescEn must contain 1 to 255 characters"}})}function checkDeviceTypes(e,t){var r=e.deviceTypes,n=[],o=(r&&!0!==r&&(r=r.split(","),n=_toConsumableArray(new Set(r))),new Set(["phone","tablet"]));0<n.length&&n.every(function(e){return o.has(e)})?e.deviceTypes=n:t.push({type:"checkbox",name:"deviceTypes",message:"Please select --deviceTypes",choices:["phone","tablet"],validate:function(e){return 0<e.length||"Select at least one option"}})}module.exports={install:function(e){var r;e.command("generate <projectRoot>").description("Create Ascf Project").option("--tid <tid>","Template id: HelloASCF or ASCFDemos").option("--appId <appId>","AppID").option("--appName <appName>","Project name").option("--appDesc <appDesc>","Project description").option("--appNameEn <appNameEn>","Project English name").option("--appDescEn <appDescEn>","Project English description").option("--deviceTypes <deviceTypes>",'Device type: phone, tablet, or "phone,tablet".').action((r=_asyncToGenerator(_regenerator().m(function e(t,r){var n,o,a;return _regenerator().w(function(e){for(;;)switch(e.p=e.n){case 0:return e.n=1,Promise.resolve().then(function(){return _interopRequireWildcard(require("inquirer"))});case 1:return o=e.v,e.p=2,e.n=3,o.default.prompt(getInquirerQuestions(r));case 3:n=e.v,e.n=5;break;case 4:return e.p=4,logger.info("exit"),e.a(2);case 5:return deepMerge(r,n),o=path.dirname(require.resolve("@atomicservice/ascf-base")),a=path.resolve(o,"templates"),e.n=6,createAscfProject(a,{rootOut:t,data:{tId:"ascfdemos"===r.tid.toLowerCase()?"2":"1",appId:r.appId,appName:r.appName,appDesc:r.appDesc,appNameEn:r.appNameEn,appDescEn:r.appDescEn,deviceTypes:r.deviceTypes}},{force:!1});case 6:return e.a(2)}},e,null,[[2,4]])})),function(e,t){return r.apply(this,arguments)}))}};

package/lib/common/config.js

@@ -1 +1 @@
-var configs={notaddtodo:!1,parser:"babel",devtool:void 0,componentList:["movable-area","movable-view","scroll-view","swiper","swiper-item","view","icon","progress","rich-text","text","button","checkbox","checkbox-group","form","input","label","picker","picker-view","picker-view-column","radio","radio-group","slider","switch","textarea","navigator","image","video","camera","Map","canvas","web-view"],templateHoist:!1,ascfLazyImportFiles:{},skipApiValidator:!0,serve:!1,deviceId:!1,isProd:function(){return"development"!==process.env.NODE_ENV},isInjectDebugTimer:function(){return!configs.isProd()},requiredComponents:[],tabBarUsingComponents:{},tabBarList:[],asyncJsList:{},jsLoaderList:new Set};exports.configs=configs;
+var configs={notaddtodo:!1,parser:"babel",devtool:void 0,componentList:["movable-area","movable-view","scroll-view","swiper","swiper-item","view","icon","progress","rich-text","text","button","checkbox","checkbox-group","form","input","label","picker","picker-view","picker-view-column","radio","radio-group","slider","switch","textarea","navigator","image","video","camera","Map","canvas","web-view"],templateHoist:!1,ascfLazyImportFiles:{},skipApiValidator:!0,serve:!1,deviceId:!1,isProd:function(){return"development"!==process.env.NODE_ENV},isInjectDebugTimer:function(){return!configs.isProd()},requiredComponents:[],tabBarUsingComponents:{},tabBarList:[],asyncJsList:{},jsLoaderList:new Set,compileMode:"ascf"};exports.configs=configs;

package/lib/common/constants.js

@@ -1 +1 @@
-var _require=require("@atomicservice/ascf-base"),HOS_DEVICE=_require.HOS_DEVICE,LEGACY_DEVICE=_require.LEGACY_DEVICE,BUILD_TARGET_AS=_require.BUILD_TARGET_AS,BUILD_TARGET_QS=_require.BUILD_TARGET_QS;function normalizeTargets(e){return(null==e?void 0:e.deviceType)===LEGACY_DEVICE&&(e.targets=BUILD_TARGET_QS),(null==e?void 0:e.targets)===BUILD_TARGET_AS&&(e.deviceType=HOS_DEVICE),e}var hasArg=function(e,E,_){E=e.indexOf(E);return-1!==E&&(null==(e=e[E+1])?void 0:e.includes(_))};module.exports={HOS_DEVICE:HOS_DEVICE,LEGACY_DEVICE:LEGACY_DEVICE,BUILD_TARGET_AS:BUILD_TARGET_AS,BUILD_TARGET_QS:BUILD_TARGET_QS,normalizeTargets:normalizeTargets,hasArg:hasArg};
+var _require=require("@atomicservice/ascf-base"),HOS_DEVICE=_require.HOS_DEVICE,LEGACY_DEVICE=_require.LEGACY_DEVICE,HDC_CONNECTOR=_require.HDC_CONNECTOR,ADB_CONNECTOR=_require.ADB_CONNECTOR;function normalizeDeviceTypes(e,C){return hasArg(e,"--deviceType",HOS_DEVICE)&&(C.connectorType=HDC_CONNECTOR),hasArg(e,"--deviceType",LEGACY_DEVICE)&&(C.connectorType=ADB_CONNECTOR),C.connectorType===HDC_CONNECTOR&&(C.deviceType=HOS_DEVICE),C.connectorType===ADB_CONNECTOR&&(C.deviceType=LEGACY_DEVICE),C}var hasArg=function(e,C,E){C=e.indexOf(C);return-1!==C&&(null==(e=e[C+1])?void 0:e.includes(E))};module.exports={HOS_DEVICE:HOS_DEVICE,LEGACY_DEVICE:LEGACY_DEVICE,HDC_CONNECTOR:HDC_CONNECTOR,ADB_CONNECTOR:ADB_CONNECTOR,normalizeDeviceTypes:normalizeDeviceTypes,hasArg:hasArg};

package/lib/common/utils.js

@@ -1 +1 @@
-function _createForOfIteratorHelper(e,r){var t,o,n,i,s="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(s)return n=!(o=!0),{s:function(){s=s.call(e)},n:function(){var e=s.next();return o=e.done,e},e:function(e){n=!0,t=e},f:function(){try{o||null==s.return||s.return()}finally{if(n)throw t}}};if(Array.isArray(e)||(s=_unsupportedIterableToArray(e))||r&&e&&"number"==typeof e.length)return s&&(e=s),i=0,{s:r=function(){},n:function(){return i>=e.length?{done:!0}:{done:!1,value:e[i++]}},e:function(e){throw e},f:r};throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,r){var t;if(e)return"string"==typeof e?_arrayLikeToArray(e,r):"Map"===(t="Object"===(t={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:t)||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?_arrayLikeToArray(e,r):void 0}function _arrayLikeToArray(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,o=Array(r);t<r;t++)o[t]=e[t];return o}var rimraf=require("rimraf"),fs=require("fs"),crypto=require("crypto"),path=require("path"),JSON5=require("json5"),os=require("os"),log4js=require("./log4js.js"),_require=require("./config"),configs=_require.configs,_require2=require("@atomicservice/ascf-base"),execSafe=_require2.execSafe,logger=log4js.getLogger("common-utils"),curProjectPath=null,curProjectInfo=null;function getProjectInfo(){var e,r,t,o;return process.env.projectRoot===curProjectPath&&curProjectInfo||(r=readProjectCfgJson(e=process.env.projectRoot||process.cwd())||{},t=path.resolve(e,"ascf/ascf_src"),t=r.ascfRoot?path.resolve(t,r.ascfRoot):t,o=path.resolve(e,"ascf","ascf_build"),curProjectInfo={projectPath:curProjectPath=e,projectCfg:r,ascfSrcPath:t,ascfBuildPath:o}),curProjectInfo}exports.getProjectInfo=getProjectInfo,exports.RAWFILE_DIR="src/main/resources/rawfile",exports.TOOLKIT_PATH=path.join(__dirname,"..","..");var SECURE_KEYS=["deviceId","deviceList","signPwd"];function logJsonStr(e){return JSON.stringify(e,function(e,r){return SECURE_KEYS.includes(e)?null!=r?"***":void 0:r})}exports.logJsonStr=logJsonStr;var notSpecified=function(e){return null==e||void 0===e||"undefined"===e};function initOptions(e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&("false"===e[r]&&(e[r]=!1),"true"===e[r])&&(e[r]=!0)}function readJsonFile(r){if(!fs.existsSync(r))return{};var e={};try{e=JSON5.parse(fs.readFileSync(r,"utf-8").toString()||"{}")}catch(e){throw new Error("parse json file error at ".concat(r,":").concat(e.lineNumber,":").concat(e.columnNumber," "))}return e}function writeJsonFile(e,r){try{fs.writeFileSync(e,JSON.stringify(r,null,2))}catch(e){throw"ERROR: Write JSON file failed: ".concat(e)}}function readProjectCfgJson(e){var r,e=path.join(e,"ascf","ascf_src","ascf.config.json");return r=fs.existsSync(e)?JSON.parse(fs.readFileSync(e).toString()):r}function isOSX(){return"darwin"===os.platform()}function hasHxml(e){try{var r,t=_createForOfIteratorHelper(fs.readdirSync(e,{withFileTypes:!0}));try{for(t.s();!(r=t.n()).done;){var o=r.value,n=path.join(e,o.name);if(o.isFile()&&o.name.endsWith(".hxml")||o.isDirectory()&&"node_modules"!==o.name&&hasHxml(n))return!0}}catch(e){t.e(e)}finally{t.f()}}catch(e){logger.error("find Hxml error:",e)}return!1}function moveFiles(o,n){try{fs.mkdirSync(n,{recursive:!0}),fs.readdirSync(o,{withFileTypes:!0}).forEach(function(e){var r=path.join(o,e.name),t=path.join(n,e.name);e.isFile()?fs.copyFileSync(r,t):e.isDirectory()&&"node_modules"!==e.name&&moveFiles(r,t)})}catch(e){logger.error("Moving files error:",e)}}function handleResolveAlias(e,r){var t,o=_createForOfIteratorHelper(Object.keys(r).sort(function(e,r){return r.length-e.length}));try{for(o.s();!(t=o.n()).done;){var n,i,s,a=t.value;if(a.endsWith("/*")&&r[a].endsWith("/*"))if(e.startsWith(a.slice(0,-1))||e===a.slice(0,-1))return n=r[a].slice(0,-1),i=e.slice(a.length-1),s=(s=path.join(n,i).replace(/\\/g,"/")).startsWith("/")?s:"/"+s}}catch(e){o.e(e)}finally{o.f()}return e}function getEntryPkgPath(){var e,r=getProjectInfo().projectPath,t=readJsonFile(path.resolve(r,"build-profile.json5"));if(0<(null==t||null==(e=t.modules)?void 0:e.length))return path.join(r,t.modules[0].srcPath);logger.fatal("getEntryPkgPath error, build-profile.json5 file modules is null")}function deepMerge(e){for(var r=arguments.length,t=new Array(1<r?r-1:0),o=1;o<r;o++)t[o-1]=arguments[o];if(!t.length)return e;var n=t.shift();if(n)for(var i=0,s=Object.keys(n);i<s.length;i++){var a=s[i],c=n[a];isObject(c)?(null==e[a]&&(e[a]={}),deepMerge(e[a],c)):void 0!==c&&(e[a]=c)}return deepMerge.apply(void 0,[e].concat(t))}function isObject(e){return"[object Object]"===Object.prototype.toString.call(e)}exports.getHvigorStartConfigs=function(e,r){var t=deepMerge({},r);return t.disableSubpackages=notSpecified(null==r?void 0:r.disableSubpackages)?"debug"===e:null==r?void 0:r.disableSubpackages,t},exports.initConfigs=function(e,r){initOptions(r);var t=getProjectInfo(),o=r.watch||r.serve||void 0!==r.mode&&"production"!==r.mode,t=(process.env.NODE_ENV&&!o||(process.env.NODE_ENV=o?"development":"production"),deepMerge({},t.projectCfg,r));deepMerge(configs,t),process.env.clearResource=o||configs.clear?"yes":"no",configs.parser=configs.swc?"swc":"babel";r=getProjectInfo().ascfSrcPath;void 0===t.templateHoist&&fs.existsSync(path.join(r,"base.hxml"))&&(configs.templateHoist=!0),configs.templateHoist=!!configs.templateHoist,configs.skipApiValidator=o||"false"!==configs.skipApiValidator&&configs.skipApiValidator,configs.disableSubpackages=configs.serve||(notSpecified(configs.disableSubpackages)?!!o:configs.disableSubpackages),logger.debug("configs is: ".concat(logJsonStr(configs)))},exports.rmSync=function(e){return!!fs.existsSync(e)&&rimraf.sync(e)},exports.clearResource=function(e){return Promise.all(e.map(function(r){if(fs.existsSync(r))return new Promise(function(e){rimraf.sync(r),e()})}))},exports.readJsonFile=readJsonFile,exports.writeJsonFile=writeJsonFile,exports.isOSX=isOSX,exports.hasHxml=hasHxml,exports.moveFiles=moveFiles,exports.handleResolveAlias=handleResolveAlias,exports.getEntryPkgPath=getEntryPkgPath,exports.deepMerge=deepMerge,exports.execSafe=execSafe,exports.getModuleNames=function(){var e,r,t=getEntryPkgPath(),t=path.join(t,"src","main","module.json5");if(fs.existsSync(t))return r=fs.readFileSync(t,"utf-8"),{name:null==(r=JSON5.parse(r))||null==(e=r.module)?void 0:e.name,entryAbility:null==r||null==(e=r.module)||null==(e=e.abilities)?void 0:e.map(function(e){return e.name})};throw new Error("".concat(t," is not found"))},exports.getBundleName=function(){var e,r=getProjectInfo().projectPath,r=path.join(r,"AppScope","app.json5");if(fs.existsSync(r))return e=fs.readFileSync(r,"utf-8"),null==(e=JSON5.parse(e))||null==(e=e.app)?void 0:e.bundleName;throw new Error("".concat(r," is not found"))},exports.md5=function(e){return crypto.createHash("md5").update(e).digest("hex")};
+function _createForOfIteratorHelper(e,r){var t,o,n,i,s="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(s)return n=!(o=!0),{s:function(){s=s.call(e)},n:function(){var e=s.next();return o=e.done,e},e:function(e){n=!0,t=e},f:function(){try{o||null==s.return||s.return()}finally{if(n)throw t}}};if(Array.isArray(e)||(s=_unsupportedIterableToArray(e))||r&&e&&"number"==typeof e.length)return s&&(e=s),i=0,{s:r=function(){},n:function(){return i>=e.length?{done:!0}:{done:!1,value:e[i++]}},e:function(e){throw e},f:r};throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function _unsupportedIterableToArray(e,r){var t;if(e)return"string"==typeof e?_arrayLikeToArray(e,r):"Map"===(t="Object"===(t={}.toString.call(e).slice(8,-1))&&e.constructor?e.constructor.name:t)||"Set"===t?Array.from(e):"Arguments"===t||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t)?_arrayLikeToArray(e,r):void 0}function _arrayLikeToArray(e,r){(null==r||r>e.length)&&(r=e.length);for(var t=0,o=Array(r);t<r;t++)o[t]=e[t];return o}var fs=require("fs"),crypto=require("crypto"),path=require("path"),JSON5=require("json5"),os=require("os"),_require=require("rimraf"),rimrafSync=_require.rimrafSync,log4js=require("./log4js.js"),_require2=require("./config"),configs=_require2.configs,_require3=require("@atomicservice/ascf-base"),execSafe=_require3.execSafe,_require4=require("../ascf-compiler/compile-mode-adapter.js"),getHtmlFileExt=_require4.getHtmlFileExt,SUPPORT_COMPILE_MODE=_require4.SUPPORT_COMPILE_MODE,logger=log4js.getLogger("common-utils"),curProjectPath=null,curProjectInfo=null;function getProjectInfo(){var e,r,t,o,n;return process.env.projectRoot===curProjectPath&&curProjectInfo||(r=readProjectCfgJson(e=process.env.projectRoot||process.cwd())||{},t=path.resolve(e,"ascf/ascf_src"),o=r.ascfRoot?path.resolve(t,r.ascfRoot):t,n=path.resolve(e,"ascf","ascf_build"),curProjectInfo={projectPath:curProjectPath=e,projectCfg:r,srcPath:t,ascfSrcPath:o,ascfBuildPath:n}),curProjectInfo}exports.getProjectInfo=getProjectInfo,exports.RAWFILE_DIR="src/main/resources/rawfile",exports.TOOLKIT_PATH=path.join(__dirname,"..","..");var SECURE_KEYS=["deviceId","deviceList","signPwd"];function logJsonStr(e){return JSON.stringify(e,function(e,r){return SECURE_KEYS.includes(e)?null!=r?"***":void 0:r})}exports.logJsonStr=logJsonStr;var notSpecified=function(e){return null==e||void 0===e||"undefined"===e};function initOptions(e){for(var r in e)Object.prototype.hasOwnProperty.call(e,r)&&("false"===e[r]&&(e[r]=!1),"true"===e[r])&&(e[r]=!0)}function readJsonFile(r){if(!fs.existsSync(r))return{};var e={};try{e=JSON5.parse(fs.readFileSync(r,"utf-8").toString()||"{}")}catch(e){throw new Error("parse json file error at ".concat(r,":").concat(e.lineNumber,":").concat(e.columnNumber," "))}return e}function writeJsonFile(e,r){try{fs.writeFileSync(e,JSON.stringify(r,null,2))}catch(e){throw"ERROR: Write JSON file failed: ".concat(e)}}function readProjectCfgJson(e){var r,e=path.join(e,"ascf","ascf_src","ascf.config.json");return r=fs.existsSync(e)?JSON.parse(fs.readFileSync(e).toString()):r}function isOSX(){return"darwin"===os.platform()}function hasHxml(e){try{var r,t=_createForOfIteratorHelper(fs.readdirSync(e,{withFileTypes:!0}));try{for(t.s();!(r=t.n()).done;){var o=r.value,n=path.join(e,o.name);if(o.isFile()&&o.name.endsWith(".hxml")||o.isDirectory()&&"node_modules"!==o.name&&hasHxml(n))return!0}}catch(e){t.e(e)}finally{t.f()}}catch(e){logger.error("find Hxml error:",e)}return!1}function moveFiles(o,n){try{fs.mkdirSync(n,{recursive:!0}),fs.readdirSync(o,{withFileTypes:!0}).forEach(function(e){var r=path.join(o,e.name),t=path.join(n,e.name);e.isFile()?fs.copyFileSync(r,t):e.isDirectory()&&"node_modules"!==e.name&&moveFiles(r,t)})}catch(e){logger.error("Moving files error:",e)}}function handleResolveAlias(e,r){var t,o=_createForOfIteratorHelper(Object.keys(r).sort(function(e,r){return r.length-e.length}));try{for(o.s();!(t=o.n()).done;){var n,i,s,a=t.value;if(a.endsWith("/*")&&r[a].endsWith("/*"))if(e.startsWith(a.slice(0,-1))||e===a.slice(0,-1))return n=r[a].slice(0,-1),i=e.slice(a.length-1),s=(s=path.join(n,i).replace(/\\/g,"/")).startsWith("/")?s:"/"+s}}catch(e){o.e(e)}finally{o.f()}return e}function getEntryPkgPath(){var e,r=getProjectInfo().projectPath,t=readJsonFile(path.resolve(r,"build-profile.json5"));if(0<(null==t||null==(e=t.modules)?void 0:e.length))return path.join(r,t.modules[0].srcPath);logger.fatal("getEntryPkgPath error, build-profile.json5 file modules is null")}function deepMerge(e){for(var r=arguments.length,t=new Array(1<r?r-1:0),o=1;o<r;o++)t[o-1]=arguments[o];if(!t.length)return e;var n=t.shift();if(n)for(var i=0,s=Object.keys(n);i<s.length;i++){var a=s[i],c=n[a];isObject(c)?(null==e[a]&&(e[a]={}),deepMerge(e[a],c)):void 0!==c&&(e[a]=c)}return deepMerge.apply(void 0,[e].concat(t))}function isObject(e){return"[object Object]"===Object.prototype.toString.call(e)}function getModuleJson5(){var e,r=getEntryPkgPath(),r=path.join(r,"src","main","module.json5");if(fs.existsSync(r))return e=fs.readFileSync(r,"utf-8"),JSON5.parse(e);throw new Error("".concat(r," is not found"))}exports.getHvigorStartConfigs=function(e,r){var t=deepMerge({},r);return t.disableSubpackages=notSpecified(null==r?void 0:r.disableSubpackages)?"debug"===e:null==r?void 0:r.disableSubpackages,t},exports.initConfigs=function(e,r){initOptions(r);var t=getProjectInfo(),o=r.watch||r.serve||void 0!==r.mode&&"production"!==r.mode,t=(process.env.NODE_ENV&&!o||(process.env.NODE_ENV=o?"development":"production"),deepMerge({},t.projectCfg,r));deepMerge(configs,t),process.env.clearResource=o||configs.clear?"yes":"no",configs.parser=configs.swc?"swc":"babel";r=getProjectInfo().ascfSrcPath;void 0===t.templateHoist&&fs.existsSync(path.join(r,"base".concat(getHtmlFileExt())))&&(configs.templateHoist=!0),configs.templateHoist=!!configs.templateHoist,configs.skipApiValidator=o||"false"!==configs.skipApiValidator&&configs.skipApiValidator,configs.disableSubpackages=configs.serve||(notSpecified(configs.disableSubpackages)?!!o:configs.disableSubpackages),SUPPORT_COMPILE_MODE.includes(configs.compileMode)||(configs.compileMode="ascf"),logger.debug("configs is: ".concat(logJsonStr(configs)))},exports.rmSync=function(e){return!!fs.existsSync(e)&&rimrafSync(e)},exports.clearResource=function(e){return Promise.all(e.map(function(r){if(fs.existsSync(r))return new Promise(function(e){rimrafSync(r),e()})}))},exports.readJsonFile=readJsonFile,exports.writeJsonFile=writeJsonFile,exports.isOSX=isOSX,exports.hasHxml=hasHxml,exports.moveFiles=moveFiles,exports.handleResolveAlias=handleResolveAlias,exports.getEntryPkgPath=getEntryPkgPath,exports.deepMerge=deepMerge,exports.execSafe=execSafe,exports.getModuleNames=function(){var e,r=getModuleJson5();return{name:null==r||null==(e=r.module)?void 0:e.name,entryAbility:null==r||null==(e=r.module)||null==(e=e.abilities)?void 0:e.map(function(e){return e.name})}},exports.getModuleJson5=getModuleJson5,exports.getBundleName=function(){var e,r=getProjectInfo().projectPath,r=path.join(r,"AppScope","app.json5");if(fs.existsSync(r))return e=fs.readFileSync(r,"utf-8"),null==(e=JSON5.parse(e))||null==(e=e.app)?void 0:e.bundleName;throw new Error("".concat(r," is not found"))},exports.md5=function(e){return crypto.createHash("md5").update(e).digest("hex")};

package/lib/common/version-check.js

@@ -1 +1 @@
-var utils=require("./utils"),path=require("path"),_require=require("semver"),satisfies=_require.satisfies,_require2=require("child_process"),execSync=_require2.execSync,log4js=require("./log4js.js"),fs=require("fs"),_require3=require("@atomicservice/ascf-base"),getDevEcoToolsDir=_require3.getDevEcoToolsDir,logger=log4js.getLogger("version-check"),_require4=require("./url.json"),runtimeUpdateUrl=_require4.runtimeUpdateUrl,MIN_SUPPORT_V3_ASCF_VERSION=10016300;function getProjectAscfapiVersion(){var e=path.join(utils.getEntryPkgPath(),"oh-package.json5");return utils.readJsonFile(e).dependencies["@atomicservice/ascfapi"]}function getLatestAscfApiVersion(){var e,r=getOhpmFile();if(fs.existsSync(r))return e=utils.isOSX()?r:'"'.concat(r,'"'),execSync("".concat(e," info @atomicservice/ascfapi"),{timeout:5e3}).toString().split("latest:")[1].split("\n")[0].trim();logger.warn("DevEco Studio ohpm ".concat(r," is not exists, please ensure DevEco Studio installed"))}function getOhpmFile(){return logger.debug("get ohpm from deveco dir."),path.join(getDevEcoToolsDir(),"..","tools","ohpm","bin","ohpm")}function convertRuntimeVersion(e){var r="1.0.6";return"number"==typeof e&&Number.isInteger(e)?8!==(e=e.toString()).length?(logger.warn("WARNING: runtime version length must be 8."),r):[e.substring(0,1),e.substring(1,3),e.substring(3,5)].map(function(e){return parseInt(e,10)}).join("."):(logger.warn("WARNING: runtime version type must be integer."),r)}exports.MIN_SUPPORT_V3_ASCF_VERSION=MIN_SUPPORT_V3_ASCF_VERSION,exports.isLatestAscfToolkit=function(){var e=0<arguments.length&&void 0!==arguments[0]&&arguments[0],r=utils.readJsonFile(path.join(utils.TOOLKIT_PATH,"package.json")).version,t=execSync("npm view @atomicservice/ascf-toolkit version",{timeout:5e3}).toString().trim();r!==t&&(e?logger.warn('WARNING: @atomicservice/ascf-toolkit can be upgraded, execute command "npm update -g @atomicservice/ascf-toolkit '.concat(t,'"')):logger.info('INFO: @atomicservice/ascf-toolkit can be upgraded, execute command "npm update -g @atomicservice/ascf-toolkit '.concat(t,'"')))},exports.isLatestAscfHar=function(){var e,r=0<arguments.length&&void 0!==arguments[0]&&arguments[0],t=getProjectAscfapiVersion();t?(e=getLatestAscfApiVersion(),satisfies(e,t)||"latest"===t.toLowerCase()||(r?logger.warn("WARNING: ASCF Shared Library can be upgraded."):logger.info("INFO: ASCF Shared Library can be upgraded."))):logger.warn("WARNING: ".concat(ohPkgFile," does not depend on ASCF Shared Library. Select a project that does, or create a new one."))},exports.isAscfHspSatisfied=function(e){var e=convertRuntimeVersion(e),r=getProjectAscfapiVersion();return!!satisfies(e,r)||(logger.fatal("ERROR: ASCF shared library version is too low,"+" update to ".concat(e," Reference: ").concat(runtimeUpdateUrl)),!1)};
+var utils=require("./utils"),path=require("path"),_require=require("semver"),satisfies=_require.satisfies,_require2=require("child_process"),execSync=_require2.execSync,log4js=require("./log4js.js"),fs=require("fs"),_require3=require("@atomicservice/ascf-base"),getOhpmPath=_require3.getOhpmPath,logger=log4js.getLogger("version-check"),_require4=require("./url.json"),runtimeUpdateUrl=_require4.runtimeUpdateUrl,MIN_SUPPORT_V3_ASCF_VERSION=10016300;function getProjectAscfapiVersion(){var e=path.join(utils.getEntryPkgPath(),"oh-package.json5");return utils.readJsonFile(e).dependencies["@atomicservice/ascfapi"]}function getLatestAscfApiVersion(){var e,t=getOhpmPath();if(fs.existsSync(t))return e=utils.isOSX()?t:'"'.concat(t,'"'),execSync("".concat(e," info @atomicservice/ascfapi"),{timeout:5e3}).toString().split("latest:")[1].split("\n")[0].trim();logger.warn("DevEco Studio ohpm ".concat(t," is not exists, please ensure DevEco Studio installed"))}function convertRuntimeVersion(e){var t="1.0.6";return"number"==typeof e&&Number.isInteger(e)?8!==(e=e.toString()).length?(logger.warn("WARNING: runtime version length must be 8."),t):[e.substring(0,1),e.substring(1,3),e.substring(3,5)].map(function(e){return parseInt(e,10)}).join("."):(logger.warn("WARNING: runtime version type must be integer."),t)}exports.MIN_SUPPORT_V3_ASCF_VERSION=MIN_SUPPORT_V3_ASCF_VERSION,exports.isLatestAscfToolkit=function(){var e=0<arguments.length&&void 0!==arguments[0]&&arguments[0],t=utils.readJsonFile(path.join(utils.TOOLKIT_PATH,"package.json")).version,r=execSync("npm view @atomicservice/ascf-toolkit version",{timeout:5e3}).toString().trim();t!==r&&(e?logger.warn('WARNING: @atomicservice/ascf-toolkit can be upgraded, execute command "npm update -g @atomicservice/ascf-toolkit '.concat(r,'"')):logger.info('INFO: @atomicservice/ascf-toolkit can be upgraded, execute command "npm update -g @atomicservice/ascf-toolkit '.concat(r,'"')))},exports.isLatestAscfHar=function(){var e,t=0<arguments.length&&void 0!==arguments[0]&&arguments[0],r=getProjectAscfapiVersion();r?(e=getLatestAscfApiVersion(),satisfies(e,r)||"latest"===r.toLowerCase()||(t?logger.warn("WARNING: ASCF Shared Library can be upgraded."):logger.info("INFO: ASCF Shared Library can be upgraded."))):logger.warn("WARNING: ".concat(ohPkgFile," does not depend on ASCF Shared Library. Select a project that does, or create a new one."))},exports.isAscfHspSatisfied=function(e){var e=convertRuntimeVersion(e),t=getProjectAscfapiVersion();return!!satisfies(e,t)||(logger.fatal("ERROR: ASCF shared library version is too low,"+" update to ".concat(e," Reference: ").concat(runtimeUpdateUrl)),!1)};

package/lib/index.js

@@ -1 +1 @@
-function _regenerator(){var v,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",n=e.toStringTag||"@@toStringTag";function t(e,r,n,t){var o,a,i,c,s,u,f,g,l,r=r&&r.prototype instanceof _?r:_,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,a=n,f=t||[],g=!1,l={p:u=0,n:0,v:v,a:p,f:p.bind(v,4),d:function(e,r){return i=e,c=0,s=v,l.n=r,m}},function(e,r,n){if(1<u)throw TypeError("Generator is already running");for(g&&1===r&&p(r,n),c=r,s=n;(d=c<2?v:s)||!g;){i||(c?c<3?(1<c&&(l.n=-1),p(c,s)):l.n=s:l.v=s);try{if(u=2,i){if(d=i[e=c?e:"next"]){if(!(d=d.call(i,s)))throw TypeError("iterator result is not an object");if(!d.done)return d;s=d.value,c<2&&(c=0)}else 1===c&&(d=i.return)&&d.call(i),c<2&&(s=TypeError("The iterator does not provide a '"+e+"' method"),c=1);i=v}else if((d=(g=l.n<0)?s:o.call(a,l))!==m)break}catch(e){i=v,c=1,s=e}finally{u=1}}return{value:d,done:g}}),!0),r;function p(e,r){for(c=e,s=r,d=0;!g&&u&&!n&&d<f.length;d++){var n,t=f[d],o=l.p,a=t[2];3<e?(n=a===r)&&(s=t[(c=t[4])?5:c=3],t[4]=t[5]=v):t[0]<=o&&((n=e<2&&o<t[1])?(c=0,l.v=r,l.n=t[1]):o<a&&(n=e<3||t[0]>r||a<r)&&(t[4]=e,t[5]=r,l.n=a,c=0))}if(n||1<e)return m;throw g=!0,r}}var m={};function _(){}function o(){}function a(){}var d=Object.getPrototypeOf,e=[][r]?d(d([][r]())):(_regeneratorDefine2(d={},r,function(){return this}),d),i=a.prototype=_.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,_regeneratorDefine2(e,n,"GeneratorFunction")),e.prototype=Object.create(i),e}return _regeneratorDefine2(i,"constructor",o.prototype=a),_regeneratorDefine2(a,"constructor",o),_regeneratorDefine2(a,n,o.displayName="GeneratorFunction"),_regeneratorDefine2(i),_regeneratorDefine2(i,n,"Generator"),_regeneratorDefine2(i,r,function(){return this}),_regeneratorDefine2(i,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:t,m:c}})()}function _regeneratorDefine2(e,r,n,t){var a=Object.defineProperty;try{a({},"",{})}catch(e){a=0}(_regeneratorDefine2=function(e,r,n,t){function o(r,n){_regeneratorDefine2(e,r,function(e){return this._invoke(r,n,e)})}r?a?a(e,r,{value:n,enumerable:!t,configurable:!t,writable:!t}):e[r]=n:(o("next",0),o("throw",1),o("return",2))})(e,r,n,t)}function asyncGeneratorStep(e,r,n,t,o,a,i){try{var c=e[a](i),s=c.value}catch(e){return void n(e)}c.done?r(s):Promise.resolve(s).then(t,o)}function _asyncToGenerator(c){return function(){var e=this,i=arguments;return new Promise(function(r,n){var t=c.apply(e,i);function o(e){asyncGeneratorStep(t,r,n,o,a,"next",e)}function a(e){asyncGeneratorStep(t,r,n,o,a,"throw",e)}o(void 0)})}}var path=require("path"),pkg=require("../package.json"),_require=require("./common/config"),configs=_require.configs,log4js=require("./common/log4js.js"),_require2=require("./commands/build-npm"),buildNpm=_require2.buildNpm,_require3=require("./common/constants.js"),BUILD_TARGET_QS=_require3.BUILD_TARGET_QS,_require4=require("./common/version-check.js"),isLatestAscfToolkit=_require4.isLatestAscfToolkit,isLatestAscfHar=_require4.isLatestAscfHar,isAscfHspSatisfied=_require4.isAscfHspSatisfied,MIN_SUPPORT_V3_ASCF_VERSION=_require4.MIN_SUPPORT_V3_ASCF_VERSION,_require5=require("./ascf-compiler/common/manifest-manager.js"),manifestManager=_require5.manifestManager,logger=log4js.getLogger("index");function convert(e){return _convert.apply(this,arguments)}function _convert(){return(_convert=_asyncToGenerator(_regenerator().m(function e(r){var n,t;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:if(configs.notaddtodo=!!r.notaddtodo,n=require("./ascf-converter/features/converter.js"),global._isMiniAppConvertMode=!0,global._isAscfMode=!0,process.env.clearResource=r.clear?"yes":"no",t=require("./ascf-converter/common/path-validator"),(0,t.pathValidator)(r.input,r.output),r.validate&&process.exit(0),n.checkInputPathFun(r.input),r.check){e.n=2;break}return e.n=1,n.confirmConverterFun({inputPath:r.input,outPath:r.output,confirmAddConfig:!0});case 1:(t=e.v).errorMessage?logger.error('"command":"'.concat(t.command,'","errorMessage":"').concat(t.errorMessage,'"')):logger.info('"command":"'.concat(t.command,'","folderUrl":"').concat(t.folderUrl,'"'));case 2:setTimeout(function(){var e=require("./common/version-check.js").isLatestAscfToolkit;try{e()}catch(e){logger.warn("WARNING: Get @atomicservice/ascf-toolkit version failed: ".concat(e,"."))}});case 3:return e.a(2)}},e)}))).apply(this,arguments)}function compile(e,r){return _compile.apply(this,arguments)}function _compile(){return(_compile=_asyncToGenerator(_regenerator().m(function e(a,i){var c,s,u,t,r,n,o,f,g,l,p;return _regenerator().w(function(e){for(;;)switch(e.p=e.n){case 0:return process.env.projectRoot=path.resolve(a),process.chdir(path.resolve(a,"ascf/ascf_src")),r=require("./common/utils"),(0,r.initConfigs)(a,i),c=require("webpack"),global.beginTime=(new Date).getTime(),s=require("./ascf-compiler/web.webpack.config.js"),u=i.targets===BUILD_TARGET_QS||"legacy"===i.deviceType,t=(()=>{var e=_asyncToGenerator(_regenerator().m(function e(){var r,n,t,o=arguments;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return r=0<o.length&&void 0!==o[0]&&o[0],e.n=1,s(r,i);case 1:return(r=e.v).plugins=r.plugins||[],r.plugins.push(new c.EnvironmentPlugin({projectRoot:a})),u&&(t=require("./ascf-compiler/plugin/quick-service-build-plugin"),n=i.disableSubpackages,i.mode&&void 0===n&&(n="true"),i.mode||void 0!==n||(n="false"),r.plugins.push(new t({projectRoot:a,disableSubpackages:n,signPrivateKeyPath:i.signPrivateKeyPath,signPublicKeyPath:i.signPublicKeyPath,signPwd:i.signPwd,signProfilePath:i.signProfilePath}))),i.progress&&r.plugins.push(new c.ProgressPlugin({})),i.watch&&(r.watch=!0),global._ascfDebug&&(r.infrastructureLogging={debug:!0,level:"verbose"}),t=c(r),e.a(2,{webpackCfg:r,compiler:t})}},e)}));return function(){return e.apply(this,arguments)}})(),e.p=1,e.n=2,t();case 2:if(r=e.v,n=r.webpackCfg,o=r.compiler,manifestManager.isVue3()&&!isAscfHspSatisfied(MIN_SUPPORT_V3_ASCF_VERSION))return e.a(2);e.n=3;break;case 3:if(configs.serve||i.watch)return p=require("./ascf-compiler/server/dev-server"),f=p.startServer,e.n=4,f(o,n.devServer,i);e.n=5;break;case 4:g=e.v,l=!1,global.restartDevServer=_asyncToGenerator(_regenerator().m(function e(){var r,n;return _regenerator().w(function(e){for(;;)switch(e.p=e.n){case 0:if(l)return e.a(2);e.n=1;break;case 1:if(l=!0,logger.info("restart dev server"),e.p=2,g)return e.n=3,g.stop();e.n=4;break;case 3:g=null;case 4:return e.n=5,t(!0);case 5:return n=e.v,r=n.webpackCfg,n=n.compiler,e.n=6,f(n,r.devServer,i);case 6:g=e.v,e.n=8;break;case 7:e.p=7,n=e.v,logger.error("restart dev server error:",n);case 8:l=!1;case 9:return e.a(2)}},e,null,[[2,7]])})),e.n=6;break;case 5:return e.n=6,run(o,u);case 6:e.n=8;break;case 7:e.p=7,p=e.v,logger.fatal(p),process.exit(1);case 8:return e.a(2)}},e,null,[[1,7]])}))).apply(this,arguments)}function getAscfToolkitDirname(){return __dirname}function run(o){var a=1<arguments.length&&void 0!==arguments[1]&&arguments[1];return new Promise(function(n,t){o.run(function(e,r){r&&logger.info(r.toString({all:!1,colors:!0,errors:!1,warnings:!1,assets:!0,logging:global._ascfDebug?"verbose":"info"})),e?(logger.error(e),t(e)):(a||setTimeout(function(){try{isLatestAscfHar(global.existsVerifyLog)}catch(e){logger.warn("WARNING: Get @atomicservice/ascfapi info failed: ".concat(e,"."))}try{isLatestAscfToolkit(global.existsVerifyLog)}catch(e){logger.warn("WARNING: Get @atomicservice/ascf-toolkit version failed: ".concat(e,"."))}}),n(r),o.close(function(e){e&&logger.error("compile close error :",e)}))})})}function quickGenerateSubpackage(e,r){return _quickGenerateSubpackage.apply(this,arguments)}function _quickGenerateSubpackage(){return(_quickGenerateSubpackage=_asyncToGenerator(_regenerator().m(function e(r,n){var t;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return t=require("./ascf-compiler/common/quick-generate-subpackage"),t=t.quickGenSub,e.n=1,t(r,n).catch(function(e){logger.error(e)});case 1:return e.a(2)}},e)}))).apply(this,arguments)}logger.debug("Using ".concat(pkg.name," ").concat(pkg.version,".")),global._isAscfMode=!0,process.on("uncaughtException",function(e){logger.error("ASCF uncaught error",e)}),process.on("unhandledRejection",function(e,r){logger.error("ASCF unhandled rejection at:",r,"reason:",e)}),module.exports={convert:convert,compile:compile,buildNpm:buildNpm,getAscfToolkitDirname:getAscfToolkitDirname,quickGenerateSubpackage:quickGenerateSubpackage};
+function _regenerator(){var v,e="function"==typeof Symbol?Symbol:{},r=e.iterator||"@@iterator",n=e.toStringTag||"@@toStringTag";function t(e,r,n,t){var o,a,i,c,s,u,f,g,l,r=r&&r.prototype instanceof _?r:_,r=Object.create(r.prototype);return _regeneratorDefine2(r,"_invoke",(o=e,a=n,f=t||[],g=!1,l={p:u=0,n:0,v:v,a:p,f:p.bind(v,4),d:function(e,r){return i=e,c=0,s=v,l.n=r,m}},function(e,r,n){if(1<u)throw TypeError("Generator is already running");for(g&&1===r&&p(r,n),c=r,s=n;(d=c<2?v:s)||!g;){i||(c?c<3?(1<c&&(l.n=-1),p(c,s)):l.n=s:l.v=s);try{if(u=2,i){if(d=i[e=c?e:"next"]){if(!(d=d.call(i,s)))throw TypeError("iterator result is not an object");if(!d.done)return d;s=d.value,c<2&&(c=0)}else 1===c&&(d=i.return)&&d.call(i),c<2&&(s=TypeError("The iterator does not provide a '"+e+"' method"),c=1);i=v}else if((d=(g=l.n<0)?s:o.call(a,l))!==m)break}catch(e){i=v,c=1,s=e}finally{u=1}}return{value:d,done:g}}),!0),r;function p(e,r){for(c=e,s=r,d=0;!g&&u&&!n&&d<f.length;d++){var n,t=f[d],o=l.p,a=t[2];3<e?(n=a===r)&&(s=t[(c=t[4])?5:c=3],t[4]=t[5]=v):t[0]<=o&&((n=e<2&&o<t[1])?(c=0,l.v=r,l.n=t[1]):o<a&&(n=e<3||t[0]>r||a<r)&&(t[4]=e,t[5]=r,l.n=a,c=0))}if(n||1<e)return m;throw g=!0,r}}var m={};function _(){}function o(){}function a(){}var d=Object.getPrototypeOf,e=[][r]?d(d([][r]())):(_regeneratorDefine2(d={},r,function(){return this}),d),i=a.prototype=_.prototype=Object.create(e);function c(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,a):(e.__proto__=a,_regeneratorDefine2(e,n,"GeneratorFunction")),e.prototype=Object.create(i),e}return _regeneratorDefine2(i,"constructor",o.prototype=a),_regeneratorDefine2(a,"constructor",o),_regeneratorDefine2(a,n,o.displayName="GeneratorFunction"),_regeneratorDefine2(i),_regeneratorDefine2(i,n,"Generator"),_regeneratorDefine2(i,r,function(){return this}),_regeneratorDefine2(i,"toString",function(){return"[object Generator]"}),(_regenerator=function(){return{w:t,m:c}})()}function _regeneratorDefine2(e,r,n,t){var a=Object.defineProperty;try{a({},"",{})}catch(e){a=0}(_regeneratorDefine2=function(e,r,n,t){function o(r,n){_regeneratorDefine2(e,r,function(e){return this._invoke(r,n,e)})}r?a?a(e,r,{value:n,enumerable:!t,configurable:!t,writable:!t}):e[r]=n:(o("next",0),o("throw",1),o("return",2))})(e,r,n,t)}function asyncGeneratorStep(e,r,n,t,o,a,i){try{var c=e[a](i),s=c.value}catch(e){return void n(e)}c.done?r(s):Promise.resolve(s).then(t,o)}function _asyncToGenerator(c){return function(){var e=this,i=arguments;return new Promise(function(r,n){var t=c.apply(e,i);function o(e){asyncGeneratorStep(t,r,n,o,a,"next",e)}function a(e){asyncGeneratorStep(t,r,n,o,a,"throw",e)}o(void 0)})}}var path=require("path"),pkg=require("../package.json"),_require=require("./common/config"),configs=_require.configs,log4js=require("./common/log4js.js"),_require2=require("./commands/build-npm"),buildNpm=_require2.buildNpm,_require3=require("./common/version-check.js"),isLatestAscfToolkit=_require3.isLatestAscfToolkit,isLatestAscfHar=_require3.isLatestAscfHar,isAscfHspSatisfied=_require3.isAscfHspSatisfied,MIN_SUPPORT_V3_ASCF_VERSION=_require3.MIN_SUPPORT_V3_ASCF_VERSION,_require4=require("./ascf-compiler/common/manifest-manager.js"),manifestManager=_require4.manifestManager,logger=log4js.getLogger("index");function convert(e){return _convert.apply(this,arguments)}function _convert(){return(_convert=_asyncToGenerator(_regenerator().m(function e(r){var n,t;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:if(configs.notaddtodo=!!r.notaddtodo,n=require("./ascf-converter/features/converter.js"),global._isMiniAppConvertMode=!0,global._isAscfMode=!0,process.env.clearResource=r.clear?"yes":"no",t=require("./ascf-converter/common/path-validator"),(0,t.pathValidator)(r.input,r.output),r.validate&&process.exit(0),n.checkInputPathFun(r.input),r.check){e.n=2;break}return e.n=1,n.confirmConverterFun({inputPath:r.input,outPath:r.output,confirmAddConfig:!0});case 1:(t=e.v).errorMessage?logger.error('"command":"'.concat(t.command,'","errorMessage":"').concat(t.errorMessage,'"')):logger.info('"command":"'.concat(t.command,'","folderUrl":"').concat(t.folderUrl,'"'));case 2:setTimeout(function(){var e=require("./common/version-check.js").isLatestAscfToolkit;try{e()}catch(e){logger.warn("WARNING: Get @atomicservice/ascf-toolkit version failed: ".concat(e,"."))}});case 3:return e.a(2)}},e)}))).apply(this,arguments)}function compile(e,r){return _compile.apply(this,arguments)}function _compile(){return(_compile=_asyncToGenerator(_regenerator().m(function e(o,a){var i,c,t,r,n,s,u,f,g,l;return _regenerator().w(function(e){for(;;)switch(e.p=e.n){case 0:return process.env.projectRoot=path.resolve(o),r=require("./common/utils"),(0,r.initConfigs)(o,a),i=require("webpack"),global.beginTime=(new Date).getTime(),c=require("./ascf-compiler/web.webpack.config.js"),t=(()=>{var e=_asyncToGenerator(_regenerator().m(function e(){var r,n,t=arguments;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return r=0<t.length&&void 0!==t[0]&&t[0],e.n=1,c(r,a);case 1:return(r=e.v).plugins=r.plugins||[],r.plugins.push(new i.EnvironmentPlugin({projectRoot:o})),a.progress&&r.plugins.push(new i.ProgressPlugin({})),a.watch&&(r.watch=!0),global._ascfDebug&&(r.infrastructureLogging={debug:!0,level:"verbose"}),n=i(r),e.a(2,{webpackCfg:r,compiler:n})}},e)}));return function(){return e.apply(this,arguments)}})(),e.p=1,e.n=2,t();case 2:if(r=e.v,n=r.webpackCfg,s=r.compiler,manifestManager.isVue3()&&!isAscfHspSatisfied(MIN_SUPPORT_V3_ASCF_VERSION))return e.a(2);e.n=3;break;case 3:if(configs.serve||a.watch)return l=require("./ascf-compiler/server/dev-server"),u=l.startServer,e.n=4,u(s,n.devServer,a);e.n=5;break;case 4:f=e.v,g=!1,global.restartDevServer=_asyncToGenerator(_regenerator().m(function e(){var r,n;return _regenerator().w(function(e){for(;;)switch(e.p=e.n){case 0:if(g)return e.a(2);e.n=1;break;case 1:if(g=!0,logger.info("restart dev server"),e.p=2,f)return e.n=3,f.stop();e.n=4;break;case 3:f=null;case 4:return e.n=5,t(!0);case 5:return n=e.v,r=n.webpackCfg,n=n.compiler,e.n=6,u(n,r.devServer,a);case 6:f=e.v,e.n=8;break;case 7:e.p=7,n=e.v,logger.error("restart dev server error:",n);case 8:g=!1;case 9:return e.a(2)}},e,null,[[2,7]])})),e.n=6;break;case 5:return e.n=6,run(s);case 6:e.n=8;break;case 7:e.p=7,l=e.v,logger.fatal(l),process.exit(1);case 8:return e.a(2)}},e,null,[[1,7]])}))).apply(this,arguments)}function getAscfToolkitDirname(){return __dirname}function run(o){return new Promise(function(n,t){o.run(function(e,r){r&&logger.info(r.toString({all:!1,colors:!0,errors:!1,warnings:!1,assets:!0,logging:global._ascfDebug?"verbose":"info"})),e?(logger.error(e),t(e)):(setTimeout(function(){try{isLatestAscfHar(global.existsVerifyLog)}catch(e){logger.warn("WARNING: Get @atomicservice/ascfapi info failed: ".concat(e,"."))}try{isLatestAscfToolkit(global.existsVerifyLog)}catch(e){logger.warn("WARNING: Get @atomicservice/ascf-toolkit version failed: ".concat(e,"."))}}),n(r),o.close(function(e){e&&logger.error("compile close error :",e)}))})})}function quickGenerateSubpackage(e,r){return _quickGenerateSubpackage.apply(this,arguments)}function _quickGenerateSubpackage(){return(_quickGenerateSubpackage=_asyncToGenerator(_regenerator().m(function e(r,n){var t;return _regenerator().w(function(e){for(;;)switch(e.n){case 0:return t=require("./ascf-compiler/common/quick-generate-subpackage"),t=t.quickGenSub,e.n=1,t(r,n).catch(function(e){logger.error(e)});case 1:return e.a(2)}},e)}))).apply(this,arguments)}logger.debug("Using ".concat(pkg.name," ").concat(pkg.version,".")),global._isAscfMode=!0,process.on("uncaughtException",function(e){logger.error("ASCF uncaught error",e)}),process.on("unhandledRejection",function(e,r){logger.error("ASCF unhandled rejection at:",r,"reason:",e)}),module.exports={convert:convert,compile:compile,buildNpm:buildNpm,getAscfToolkitDirname:getAscfToolkitDirname,quickGenerateSubpackage:quickGenerateSubpackage};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomicservice/ascf-toolkit",
-  "version": "1.0.14",
+  "version": "1.0.16",
   "author": "atomicservice",
   "title": "ASCF toolkit for atomicservice",
   "description": "ASCF toolkit for atomicservice",
@@ -11,41 +11,41 @@
     "webpack"
   ],
   "dependencies": {
-    "@atomicservice/ascf-base": "1.0.14",
-    "@babel/core": "7.25.9",
-    "@babel/generator": "7.25.9",
-    "@babel/parser": "7.25.9",
-    "@babel/plugin-transform-class-properties": "7.25.9",
-    "@babel/plugin-transform-modules-commonjs": "7.25.9",
-    "@babel/plugin-transform-runtime": "7.25.9",
-    "@babel/preset-env": "7.25.9",
-    "@babel/runtime": "7.25.9",
-    "@babel/traverse": "7.25.9",
-    "@rsdoctor/webpack-plugin": "1.1.2",
+    "@atomicservice/ascf-base": "1.0.16",
+    "@babel/core": "7.27.1",
+    "@babel/generator": "7.27.1",
+    "@babel/parser": "7.27.1",
+    "@babel/plugin-transform-class-properties": "7.27.1",
+    "@babel/plugin-transform-modules-commonjs": "7.27.1",
+    "@babel/plugin-transform-runtime": "7.27.1",
+    "@babel/preset-env": "7.27.1",
+    "@babel/runtime": "7.27.1",
+    "@babel/traverse": "7.27.1",
+    "@rsdoctor/webpack-plugin": "1.4.0",
     "@swc/core": "1.10.14",
     "@swc/helpers": "0.5.17",
     "adm-zip": "v0.5.16",
     "ajv": "8.17.1",
     "babel-loader": "10.0.0",
     "cachedir": "2.4.0",
-    "eslint": "8.31.0",
+    "eslint": "8.57.1",
     "express": "4.21.0",
     "js-base64": "3.7.7",
     "json5": "2.2.3",
     "jsrsasign": "11.0.0",
     "less": "4.2.1",
     "less-loader": "12.2.0",
-    "loader-utils": "2.0.4",
     "log4js": "6.9.1",
-    "minimatch": "5.1.6",
+    "minimatch": "10.1.1",
     "postcss": "8.4.39",
-    "rimraf": "4.4.0",
+    "rimraf": "6.1.2",
     "sass": "1.85.0",
     "sass-loader": "16.0.5",
     "semver": "7.5.4",
-    "tar": "7.4.3",
-    "webpack": "5.76.2",
-    "webpack-dev-server": "5.2.0"
+    "tar": "7.5.6",
+    "webpack": "5.104.1",
+    "webpack-dev-server": "5.2.0",
+    "inquirer": "12.6.3"
   },
   "devDependencies": {
     "del": "6.1.0",
@@ -54,7 +54,9 @@
     "gulp-javascript-obfuscator": "1.1.6",
     "gulp-plumber": "1.2.1",
     "gulp-uglify": "3.0.2",
-    "rollup-plugin-babel": "4.4.0"
+    "rollup-plugin-babel": "4.4.0",
+    "jest": "30.2.0",
+    "jest-html-reporter": "4.3.0"
   },
   "overrides": {
     "minipass": "3.3.6",
@@ -128,6 +130,7 @@
     "bep": "gulp dev && pnpm pack",
     "dev": "gulp dev",
     "build": "gulp release",
-    "release": "gulp release && pnpm pack"
+    "release": "gulp release && pnpm pack",
+    "test": "jest --coverage"
   }
 }