@atomicservice/ascf-toolkit-hvigor-plugin 1.0.5-beta.4 → 1.0.6-beta.4

package/lib/plugin/ascf-toolkit-hvigor-plugin.js

@@ -1 +1 @@
-"use strict";var __awaiter=this&&this.__awaiter||function(e,o,t,i){return new(t||(t=Promise))((function(r,n){function s(e){try{g(i.next(e))}catch(e){n(e)}}function l(e){try{g(i.throw(e))}catch(e){n(e)}}function g(e){var o;e.done?r(e.value):(o=e.value,o instanceof t?o:new t((function(e){e(o)}))).then(s,l)}g((i=i.apply(e,o||[])).next())}))},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=ascfToolkitHvigorPlugin;const hvigor_ohos_plugin_1=require("@ohos/hvigor-ohos-plugin"),property_get_1=require("@ohos/hvigor-ohos-plugin/src/sdk/lib/property-get"),property_const_1=require("@ohos/hvigor-ohos-plugin/src/const/property-const"),hvigor_1=require("@ohos/hvigor"),ascf_toolkit_1=__importDefault(require("@atomicservice/ascf-toolkit")),child_process_1=require("child_process"),path_1=__importDefault(require("path")),fs_1=__importDefault(require("fs")),os_1=__importDefault(require("os")),common_enum_1=require("../common/common-enum"),common_utils_1=require("../common/common-utils"),modifyShareInfoPlugin_1=require("./modifyShareInfoPlugin"),installAscfHspPlugin_1=require("./installAscfHspPlugin"),logger=hvigor_1.HvigorLogger.getLogger("ascfPlugin"),DEFAULT_OPTIONS={fixSharedHsp:!0,installAscfHsp:!0,debug:!0,compilerOptions:{swc:!1},skipAscfCompile:!1,skipApiValidator:!0};function ascfToolkitHvigorBuildNpm(e){e.registerTask({name:"buildNpm",run(){logger.info("start exec ascf buildNpm");const o=e.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN);ascf_toolkit_1.default.buildNpm(o.getProjectPath()),logger.info("ascf buildNpm completed")}})}function ascfToolkitHvigorCli(e){e.registerTask({name:"ascf",run(){return __awaiter(this,void 0,void 0,(function*(){var e,o,t;const i=`${getNodeExe()} ${getAscfScript()} ${null!==(t=null===(o=null===(e=hvigor_1.hvigor.getParameter())||void 0===e?void 0:e.getExtParams())||void 0===o?void 0:o.args)&&void 0!==t?t:""}`;logger.info(`start exec ascf cli: ${i}`);try{yield executeCommand(i,logger.getLevel().levelStr.toLowerCase()),logger.info("ascf cli completed")}catch(e){logger.error("ascf cli error",e)}}))}})}function ascfToolkitHvigorPlugin(e){return{pluginId:"ascfToolkitHvigorPlugin",apply(o){const t=hvigor_1.hvigor.getParameter(),i=null==t?void 0:t.getExtParams(),r=getProjectConfigJson(o.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN).getProjectPath()),n=(0,common_utils_1.deepMerge)(DEFAULT_OPTIONS,r,e,i);logger.debug(`ascfToolkitHvigorPlugin options: ${JSON.stringify(n)}`),hvigor_1.hvigor.nodesEvaluated((()=>__awaiter(this,void 0,void 0,(function*(){var e;yield execPlugin(n,o);try{if(hvigor_1.hvigor.isCommandEntryTask("GetHvigorDepsCachesDir"))o.registerTask({name:"GetHvigorDepsCachesDir",run(){console.log("ASCF_GET_HVIGOR_DEPS_CACHES_DIR="+ascf_toolkit_1.default.getAscfToolkitDirname())}});else if(hvigor_1.hvigor.isCommandEntryTask("buildNpm"))ascfToolkitHvigorBuildNpm(o);else if(hvigor_1.hvigor.isCommandEntryTask("ascf"))ascfToolkitHvigorCli(o);else{if(n.skipAscfCompile)return void logger.debug("skipAscfCompile");(null===(e=hvigor_1.hvigor.getCommandEntryTask())||void 0===e?void 0:e.length)||(logger.debug("start exec ascf quickGenSub"),yield ascf_toolkit_1.default.quickGenerateSubpackage(),logger.debug("ascf quickGenSub completed"));const t=o.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN);o.subNodes((e=>{const o=e.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN);o&&"entry"===o.getModuleType()&&e.registerTask({name:"ascfCompile",run(){return __awaiter(this,void 0,void 0,(function*(){var e;logger.debug("start exec ascf compile");const o=t.getBuildMode();let i=`${getNodeExe()} ${getAscfScript()} compile -c ${"debug"===o?"-m":""} ${t.getProjectPath()}`;const r=logger.getLevel().levelStr.toLowerCase();n.debug&&r===common_enum_1.LogLevel.DEBUG&&(i+=" --debug"),n.compilerOptions.swc&&(i+=" --swc");const s=null===(e=n.devtool)||void 0===e?void 0:e.toLowerCase();s&&(i+=` --devtool=${s}`);i+=` --logging=${(n.logging?n.logging:r).toLowerCase()}`,n.templateHoist&&(i+=" --templateHoist"),i+=` --skipApiValidator=${n.skipApiValidator}`,i+=` --disableSubpackages=${n.disableSubpackages}`,logger.debug(i),yield executeCommand(i,r),logger.debug("ascf compile completed")}))},dependencies:["default@PreBuild"],postDependencies:["assembleHap"]})}))}}catch(e){logger.errorExit(new Error(String(e)))}}))))}}}function execPlugin(e,o){return __awaiter(this,void 0,void 0,(function*(){const t=hvigor_1.hvigor.getNodeByName("entry");t&&e.fixSharedHsp&&(yield(0,modifyShareInfoPlugin_1.doModifyShareInfoPlugin)(t).catch((e=>logger.error(e)))),t&&e.installAscfHsp&&(yield(0,installAscfHspPlugin_1.doInstallAscfHspPlugin)(o).catch((e=>logger.error(e))))}))}function getProjectConfigJson(e){const o=path_1.default.join(e,"ascf","ascf_src","ascf.config.json");if(fs_1.default.existsSync(o)){const e=(0,common_utils_1.readJson)(o);return logger.debug(`project json is ${JSON.stringify(e)}`),e}return logger.debug(`${o} is not Exists`),{}}function executeCommand(e,o){return new Promise(((t,i)=>{var r,n;const s=(0,child_process_1.exec)(e);null===(r=s.stdout)||void 0===r||r.on("data",(e=>{printLogger(e,o)})),null===(n=s.stderr)||void 0===n||n.on("error",(e=>{i(e)})),s.on("close",(e=>{t(e)}))}))}function printLogger(e,o){0!==e.length&&(o===common_enum_1.LogLevel.INFO?logger.info(`ASCF compiler log:\n${e}`):o===common_enum_1.LogLevel.WARN?logger.warn(`ASCF compiler log:\n${e}`):o===common_enum_1.LogLevel.ERROR?logger.error(`ASCF compiler log:\n${e}`):logger.debug(`ASCF compiler log:\n${e}`))}function getNodeExe(){const e=(new property_get_1.Property).getProperty(property_const_1.PropertyConst.NPM_DIR),o=os_1.default.platform();let t="node";return"win32"===o?t=path_1.default.join(e,"node.exe"):"darwin"!==o&&"linux"!==o||(t=path_1.default.join(e,"node")),fs_1.default.existsSync(t)?adjustPathByPlatform(t):"node"}function getAscfScript(){return adjustPathByPlatform(path_1.default.join(ascf_toolkit_1.default.getAscfToolkitDirname(),"bin","ascf.js"))}function adjustPathByPlatform(e){return"win32"===os_1.default.platform()?`"${e}"`:e}
+"use strict";var __awaiter=this&&this.__awaiter||function(e,o,t,i){return new(t||(t=Promise))(function(r,n){function s(e){try{g(i.next(e))}catch(e){n(e)}}function l(e){try{g(i.throw(e))}catch(e){n(e)}}function g(e){var o;e.done?r(e.value):(o=e.value,o instanceof t?o:new t(function(e){e(o)})).then(s,l)}g((i=i.apply(e,o||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.default=ascfToolkitHvigorPlugin;const hvigor_ohos_plugin_1=require("@ohos/hvigor-ohos-plugin"),property_get_1=require("@ohos/hvigor-ohos-plugin/src/sdk/lib/property-get"),property_const_1=require("@ohos/hvigor-ohos-plugin/src/const/property-const"),hvigor_1=require("@ohos/hvigor"),ascf_toolkit_1=__importDefault(require("@atomicservice/ascf-toolkit")),child_process_1=require("child_process"),path_1=__importDefault(require("path")),fs_1=__importDefault(require("fs")),os_1=__importDefault(require("os")),common_enum_1=require("../common/common-enum"),common_utils_1=require("../common/common-utils"),modifyShareInfoPlugin_1=require("./modifyShareInfoPlugin"),installAscfHspPlugin_1=require("./installAscfHspPlugin"),logger=hvigor_1.HvigorLogger.getLogger("ascfPlugin"),DEFAULT_OPTIONS={fixSharedHsp:!0,installAscfHsp:!0,debug:!0,compilerOptions:{swc:!1},skipAscfCompile:!1,skipApiValidator:!0};function ascfToolkitHvigorBuildNpm(e){e.registerTask({name:"buildNpm",run(){logger.info("start exec ascf buildNpm");const o=e.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN);ascf_toolkit_1.default.buildNpm(o.getProjectPath()),logger.info("ascf buildNpm completed")}})}function ascfToolkitHvigorCli(e){e.registerTask({name:"ascf",run(){return __awaiter(this,void 0,void 0,function*(){var e,o,t;const i=`${getNodeExe()} ${getAscfScript()} ${null!==(t=null===(o=null===(e=hvigor_1.hvigor.getParameter())||void 0===e?void 0:e.getExtParams())||void 0===o?void 0:o.args)&&void 0!==t?t:""}`;logger.info(`start exec ascf cli: ${i}`);try{yield executeCommand(i,logger.getLevel().levelStr.toLowerCase()),logger.info("ascf cli completed")}catch(e){logger.error("ascf cli error",e)}})}})}function initOptions(e){for(const o in e)Object.prototype.hasOwnProperty.call(e,o)&&("false"===e[o]&&(e[o]=!1),"true"===e[o]&&(e[o]=!0))}function ascfToolkitHvigorPlugin(e){return{pluginId:"ascfToolkitHvigorPlugin",apply(o){((null==e?void 0:e.hvigor)||hvigor_1.hvigor).nodesEvaluated(t=>__awaiter(this,void 0,void 0,function*(){var i;const r=t.getParameter(),n=null==r?void 0:r.getExtParams();if((null==n?void 0:n.isOhosTest)||"true"===(null==n?void 0:n.isOhosTest))return void logger.info("isOhosTest is true");const s=getProjectConfigJson(o.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN).getProjectPath());let l=(0,common_utils_1.deepMerge)(DEFAULT_OPTIONS,s,e,n);initOptions(l),logger.debug(`ascfToolkitHvigorPlugin options: extParams=${n} ${JSON.stringify(l)}`),yield execPlugin(l,o,t);try{if(t.isCommandEntryTask("GetHvigorDepsCachesDir"))o.registerTask({name:"GetHvigorDepsCachesDir",run(){console.log("ASCF_GET_HVIGOR_DEPS_CACHES_DIR="+ascf_toolkit_1.default.getAscfToolkitDirname())}});else if(t.isCommandEntryTask("buildNpm"))ascfToolkitHvigorBuildNpm(o);else if(t.isCommandEntryTask("ascf"))ascfToolkitHvigorCli(o);else{if(l.skipAscfCompile)return void logger.debug("skipAscfCompile");(null===(i=t.getCommandEntryTask())||void 0===i?void 0:i.length)||(logger.debug("start exec ascf quickGenSub"),yield ascf_toolkit_1.default.quickGenerateSubpackage(),logger.debug("ascf quickGenSub completed"));const e=o.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN);o.subNodes(o=>{const t=o.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN);t&&"entry"===t.getModuleType()&&o.registerTask({name:"ascfCompile",run(){return __awaiter(this,void 0,void 0,function*(){var o;logger.debug("start exec ascf compile");const t=e.getBuildMode();let i=`${getNodeExe()} ${getAscfScript()} compile -c ${"debug"===t?"-m":""} ${e.getProjectPath()}`;const r=logger.getLevel().levelStr.toLowerCase();l.debug&&r===common_enum_1.LogLevel.DEBUG&&(i+=" --debug"),l.compilerOptions.swc&&(i+=" --swc");const n=null===(o=l.devtool)||void 0===o?void 0:o.toLowerCase();n&&(i+=` --devtool=${n}`);i+=` --logging=${(l.logging?l.logging:r).toLowerCase()}`,l.templateHoist&&(i+=" --templateHoist"),i+=` --skipApiValidator=${l.skipApiValidator}`,i+=` --disableSubpackages=${l.disableSubpackages}`,logger.debug(i),yield executeCommand(i,r),logger.debug("ascf compile completed")})},dependencies:["default@PreBuild"],postDependencies:["assembleHap"]})})}}catch(e){logger.errorExit(new Error(String(e)))}}))}}}function execPlugin(e,o,t){return __awaiter(this,void 0,void 0,function*(){const i=t.getNodeByName("entry");i&&e.fixSharedHsp&&(yield(0,modifyShareInfoPlugin_1.doModifyShareInfoPlugin)(i).catch(e=>logger.error(e))),o&&e.installAscfHsp&&!e.skipAscfCompile&&(yield(0,installAscfHspPlugin_1.doInstallAscfHspPlugin)(o,t).catch(e=>logger.error(e)))})}function getProjectConfigJson(e){const o=path_1.default.join(e,"ascf","ascf_src","ascf.config.json");if(fs_1.default.existsSync(o)){const e=(0,common_utils_1.readJson)(o);return logger.debug(`project json is ${JSON.stringify(e)}`),e}return logger.debug(`${o} is not Exists`),{}}function executeCommand(e,o){return new Promise((t,i)=>{var r,n;const s=(0,child_process_1.exec)(e);null===(r=s.stdout)||void 0===r||r.on("data",e=>{printLogger(e,o)}),null===(n=s.stderr)||void 0===n||n.on("error",e=>{i(e)}),s.on("close",e=>{t(e)})})}function printLogger(e,o){0!==e.length&&(o===common_enum_1.LogLevel.INFO?logger.info(`ASCF compiler log:\n${e}`):o===common_enum_1.LogLevel.WARN?logger.warn(`ASCF compiler log:\n${e}`):o===common_enum_1.LogLevel.ERROR?logger.error(`ASCF compiler log:\n${e}`):logger.debug(`ASCF compiler log:\n${e}`))}function getNodeExe(){const e=(new property_get_1.Property).getProperty(property_const_1.PropertyConst.NPM_DIR),o=os_1.default.platform();let t="node";return"win32"===o?t=path_1.default.join(e,"node.exe"):"darwin"!==o&&"linux"!==o||(t=path_1.default.join(e,"node")),fs_1.default.existsSync(t)?adjustPathByPlatform(t):"node"}function getAscfScript(){return adjustPathByPlatform(path_1.default.join(ascf_toolkit_1.default.getAscfToolkitDirname(),"bin","ascf.js"))}function adjustPathByPlatform(e){return"win32"===os_1.default.platform()?`"${e}"`:e}

package/lib/plugin/installAscfHspPlugin.js

@@ -1 +1 @@
-"use strict";var __awaiter=this&&this.__awaiter||function(e,t,n,o){return new(n||(n=Promise))((function(s,r){function l(e){try{a(o.next(e))}catch(e){r(e)}}function i(e){try{a(o.throw(e))}catch(e){r(e)}}function a(e){var t;e.done?s(e.value):(t=e.value,t instanceof n?t:new n((function(e){e(t)}))).then(l,i)}a((o=o.apply(e,t||[])).next())}))},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.doInstallAscfHspPlugin=doInstallAscfHspPlugin,exports.default=installAscfHspPlugin;const hvigor_1=require("@ohos/hvigor"),hvigor_ohos_plugin_1=require("@ohos/hvigor-ohos-plugin"),child_process_1=require("child_process"),path_1=__importDefault(require("path")),fs_1=__importDefault(require("fs")),logger=hvigor_1.HvigorLogger.getLogger("installAscfHspPlugin");function execSafe(e){var t;try{return null===(t=(0,child_process_1.execSync)(e))||void 0===t?void 0:t.toString("utf8")}catch(e){logger.warn("exec cmd error",e)}}function checkProjectAscfVer(){var e;logger.debug("Check project ascf dependency version.");const t=hvigor_1.hvigor.getNodeByName("entry");let n=path_1.default.resolve(null==t?void 0:t.getNodePath(),"./oh-package.json");if(!fs_1.default.existsSync(n)&&(n+="5",!fs_1.default.existsSync(n)))return logger.warn(`Check oh-package failed. Not found ${n}.`),!1;const o=null===(e=JSON.parse(fs_1.default.readFileSync(n).toString()))||void 0===e?void 0:e.dependencies;return logger.debug(`ohPkgDeps: ${JSON.stringify(o)}`),!!Object.prototype.hasOwnProperty.call(o,"@atomicservice/ascf")}function checkAscfHsp(e){var t;logger.debug(`Check and install ${e} for local development`);const n=null!==(t=execSafe("hdc shell bm dump-shared -a"))&&void 0!==t?t:"";if(new RegExp(`${e}(\\r?\\n|$)`).test(n)){const t=execSafe(`hdc shell "bm dump-shared -n ${e} | grep versionName"`);return logger.debug(`found ${e} ${t}`),!0}return!1}function doInstallAscfHsp(e,t){const n=checkProjectAscfVer(),o=n?"com.huawei.hms.ascf":"com.huawei.hms.ascfruntime",s=`${o} install failed, please open helloUniapp manually.`;if(checkAscfHsp(o))return void e();logger.debug(`trying to install ${o}`);const r=path_1.default.resolve(__dirname,"../config.json"),l=JSON.parse(fs_1.default.readFileSync(r).toString()),i=execSafe(`hdc shell aa start -b com.huawei.hmos.browser -a MainAbility -A ohos.want.action.viewData -U "${n?l.ascfHspUrl:l.ascfRuntimeHspUrl}"`);if(!(null==i?void 0:i.includes("successfully")))return logger.warn(`${s} errorInfo=${i}`),void t(s);logger.debug("begin to wait install hsp");let a=0,c=setInterval((()=>{const n=checkAscfHsp(o);if(a++,n||a>5)return clearInterval(c),void(n?e():(logger.warn(s),t(s)))}),1e3)}function doInstallAscfHspPlugin(e){return __awaiter(this,void 0,void 0,(function*(){logger.debug("start exec install ascf hsp plugin");const t=e.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN),n=hvigor_1.hvigor.getNodeByName("entry"),o=n.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN);"debug"===(null==t?void 0:t.getBuildMode())&&(null==o||o.targets((e=>{const t=e.getTargetName();logger.debug(`installAscfHspPlugin targetName:${t}`),n.registerTask({name:"installAscfHspTask",run:()=>new Promise(doInstallAscfHsp).catch((e=>logger.error(e))),dependencies:[`${t}@CompileArkTS`],postDependencies:[`${t}@PackageHap`]})})),logger.debug("exec install ascf hsp plugin completed"))}))}function installAscfHspPlugin(){return{pluginId:"installAscfHspPlugin",apply:doInstallAscfHspPlugin}}
+"use strict";var __awaiter=this&&this.__awaiter||function(e,t,n,o){return new(n||(n=Promise))(function(s,r){function l(e){try{a(o.next(e))}catch(e){r(e)}}function i(e){try{a(o.throw(e))}catch(e){r(e)}}function a(e){var t;e.done?s(e.value):(t=e.value,t instanceof n?t:new n(function(e){e(t)})).then(l,i)}a((o=o.apply(e,t||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.doInstallAscfHspPlugin=doInstallAscfHspPlugin,exports.default=installAscfHspPlugin;const hvigor_1=require("@ohos/hvigor"),hvigor_ohos_plugin_1=require("@ohos/hvigor-ohos-plugin"),child_process_1=require("child_process"),path_1=__importDefault(require("path")),fs_1=__importDefault(require("fs")),logger=hvigor_1.HvigorLogger.getLogger("installAscfHspPlugin");function execSafe(e){var t;try{return null===(t=(0,child_process_1.execSync)(e))||void 0===t?void 0:t.toString("utf8")}catch(e){logger.warn("exec cmd error",e)}}function checkProjectAscfVer(e){var t;logger.debug("Check project ascf dependency version.");let n=path_1.default.resolve(e,"./oh-package.json");if(!fs_1.default.existsSync(n)&&(n+="5",!fs_1.default.existsSync(n)))return logger.warn(`Check oh-package failed. Not found ${n}.`),!1;const o=null===(t=JSON.parse(fs_1.default.readFileSync(n).toString()))||void 0===t?void 0:t.dependencies;return logger.debug(`ohPkgDeps: ${JSON.stringify(o)}`),!!Object.prototype.hasOwnProperty.call(o,"@atomicservice/ascf")}function checkAscfHsp(e){var t;logger.debug(`Check and install ${e} for local development`);const n=null!==(t=execSafe("hdc shell bm dump-shared -a"))&&void 0!==t?t:"";if(new RegExp(`${e}(\\r?\\n|$)`).test(n)){const t=execSafe(`hdc shell "bm dump-shared -n ${e} | grep versionName"`);return logger.debug(`found ${e} ${t}`),!0}return!1}function doInstallAscfHsp(e,t,n){var o;const s=checkProjectAscfVer(null===(o=e.getNodeByName("entry"))||void 0===o?void 0:o.getNodePath()),r=s?"com.huawei.hms.ascf":"com.huawei.hms.ascfruntime",l=`${r} install failed, please open helloUniapp manually.`;if(checkAscfHsp(r))return void t();logger.debug(`trying to install ${r}`);const i=path_1.default.resolve(__dirname,"../config.json"),a=JSON.parse(fs_1.default.readFileSync(i).toString()),c=execSafe(`hdc shell aa start -b com.huawei.hmos.browser -a MainAbility -A ohos.want.action.viewData -U "${s?a.ascfHspUrl:a.ascfRuntimeHspUrl}"`);if(!(null==c?void 0:c.includes("successfully")))return logger.warn(`${l} errorInfo=${c}`),void n(l);logger.debug("begin to wait install hsp");let u=0,g=setInterval(()=>{const e=checkAscfHsp(r);if(u++,e||u>5)return clearInterval(g),void(e?t():(logger.warn(l),n(l)))},1e3)}function doInstallAscfHspPlugin(e,t){return __awaiter(this,void 0,void 0,function*(){logger.debug("start exec install ascf hsp plugin");const n=e.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN),o=t.getNodeByName("entry"),s=o.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN);"debug"===(null==n?void 0:n.getBuildMode())&&(null==s||s.targets(e=>{const n=e.getTargetName();logger.debug(`installAscfHspPlugin targetName:${n}`),o.registerTask({name:"installAscfHspTask",run:()=>new Promise((e,n)=>doInstallAscfHsp(t,e,n)).catch(e=>logger.error(e)),dependencies:[`${n}@CompileArkTS`],postDependencies:[`${n}@PackageHap`]})}),logger.debug("exec install ascf hsp plugin completed"))})}function installAscfHspPlugin(){return{pluginId:"installAscfHspPlugin",apply:e=>doInstallAscfHspPlugin(e,hvigor_1.hvigor)}}

package/lib/plugin/modifyShareInfoPlugin.js

@@ -1 +1 @@
-"use strict";var __awaiter=this&&this.__awaiter||function(e,o,n,t){return new(n||(n=Promise))((function(l,d){function i(e){try{a(t.next(e))}catch(e){d(e)}}function u(e){try{a(t.throw(e))}catch(e){d(e)}}function a(e){var o;e.done?l(e.value):(o=e.value,o instanceof n?o:new n((function(e){e(o)}))).then(i,u)}a((t=t.apply(e,o||[])).next())}))},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.doModifyShareInfoPlugin=doModifyShareInfoPlugin,exports.default=modifyShareInfoPlugin;const hvigor_1=require("@ohos/hvigor"),hvigor_ohos_plugin_1=require("@ohos/hvigor-ohos-plugin"),path_1=__importDefault(require("path")),fs_1=__importDefault(require("fs")),common_utils_1=require("../common/common-utils"),logger=hvigor_1.HvigorLogger.getLogger("modifyShareInfoPlugin");function addShareInfo(e,o){var n,t,l,d,i,u,a,r;logger.debug(`addShareInfo srcPath ${o}`);let s=path_1.default.resolve(o,"src/main/module.json");if(!fs_1.default.existsSync(s)&&(s+="5",!fs_1.default.existsSync(s)))return;logger.debug(`addShareInfo modulePath ${s}`);const f=(0,common_utils_1.readJson)(s);logger.debug(`addShareInfo srcModuleJson ${JSON.stringify(f,null,"  ")}`);const g=null!==(t=null===(n=null==f?void 0:f.app)||void 0===n?void 0:n.bundleName)&&void 0!==t?t:"",m=null!==(d=null===(l=null==f?void 0:f.app)||void 0===l?void 0:l.versionCode)&&void 0!==d?d:0,h=null!==(u=null===(i=null==f?void 0:f.module)||void 0===i?void 0:i.name)&&void 0!==u?u:"",c=null!==(r=null===(a=null==f?void 0:f.module)||void 0===a?void 0:a.type)&&void 0!==r?r:"";if("shared"===c&&g&&0!==m&&h){const o={bundleName:g,moduleName:h,versionCode:m};e.push(o)}else if("shared"===c&&!g&&0===m&&h){const o={moduleName:h};e.push(o)}}function getSharedInfos(e){const o=[],n=path_1.default.resolve(e,"oh_modules"),t=fs_1.default.readdirSync(n);return logger.debug(`moduleFileNames=${t}`),t.filter((e=>e&&!e.startsWith("."))).forEach((t=>{if(logger.debug(`moduleFileName=${t}`),t.startsWith("@")){const n=path_1.default.resolve(e,`oh_modules/${t}`),l=fs_1.default.readdirSync(n);logger.debug(`cloudModuleFileNames=${l}`),l.forEach((e=>{logger.debug(`cloudModuleFileName=${e}`),addShareInfo(o,path_1.default.resolve(n,`${e}`))}))}else addShareInfo(o,path_1.default.resolve(n,`${t}`))})),o}function updateSharedInfo(e){const o=path_1.default.resolve(e,"build");if(!fs_1.default.existsSync(o))return void logger.debug("buildFilePath:"+o);const n=getSharedInfos(e);if(!(null==n?void 0:n.length))return void logger.debug("dependencies is empty");const t=fs_1.default.readdirSync(o);logger.debug("buildFileNames:"+t),t.filter((e=>e)).forEach((e=>{logger.debug("productName: "+e);const t=path_1.default.resolve(o,`${e}/intermediates/res/${e}/module.json`);if(logger.debug("module.json filePath: "+t),fs_1.default.existsSync(t)){const e=(0,common_utils_1.readJson)(t);e.module.dependencies=n,(0,common_utils_1.writeJson)(t,e),logger.debug(`final moduleJson ${JSON.stringify(e,null,"  ")}`)}else logger.debug("module.json filePath: "+t+" is not Exists");const l=path_1.default.resolve(o,`${e}/intermediates/hap_metadata/${e}/output_metadata.json`);if(logger.debug("output_metadata.json filePath: "+l),fs_1.default.existsSync(l)){const e=(0,common_utils_1.readJson)(l);null==e||e.forEach((e=>{var o;const n=null===(o=e.dependRemoteHsps)||void 0===o?void 0:o.findIndex((e=>{var o;return null===(o=e.hspName)||void 0===o?void 0:o.includes("ascf")}));e.dependRemoteHsps&&-1!==n&&e.dependRemoteHsps.splice(n,1)})),(0,common_utils_1.writeJson)(l,e),logger.debug(`final metadataJson ${JSON.stringify(e,null,"  ")}`)}}))}function doModifyShareInfoPlugin(e){return __awaiter(this,void 0,void 0,(function*(){logger.debug("start exec modify share info plugin");const o=e.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN);null==o||o.targets((o=>{const n=o.getTargetName();logger.debug(`targetName:${n}`),e.registerTask({name:"modifyShareInfoTask",run:e=>{logger.debug("moduleName="+e.moduleName+" modulePath="+e.modulePath),updateSharedInfo(e.modulePath)},dependencies:[`${n}@CompileArkTS`],postDependencies:[`${n}@PackageHap`]})})),logger.debug("exec modify share info plugin completed")}))}function modifyShareInfoPlugin(){return{pluginId:"modifyShareInfoPlugin",apply:doModifyShareInfoPlugin}}
+"use strict";var __awaiter=this&&this.__awaiter||function(e,o,n,t){return new(n||(n=Promise))(function(l,d){function i(e){try{a(t.next(e))}catch(e){d(e)}}function u(e){try{a(t.throw(e))}catch(e){d(e)}}function a(e){var o;e.done?l(e.value):(o=e.value,o instanceof n?o:new n(function(e){e(o)})).then(i,u)}a((t=t.apply(e,o||[])).next())})},__importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.doModifyShareInfoPlugin=doModifyShareInfoPlugin,exports.default=modifyShareInfoPlugin;const hvigor_1=require("@ohos/hvigor"),hvigor_ohos_plugin_1=require("@ohos/hvigor-ohos-plugin"),path_1=__importDefault(require("path")),fs_1=__importDefault(require("fs")),common_utils_1=require("../common/common-utils"),logger=hvigor_1.HvigorLogger.getLogger("modifyShareInfoPlugin");function addShareInfo(e,o){var n,t,l,d,i,u,a,r;logger.debug(`addShareInfo srcPath ${o}`);let s=path_1.default.resolve(o,"src/main/module.json");if(!fs_1.default.existsSync(s)&&(s+="5",!fs_1.default.existsSync(s)))return;logger.debug(`addShareInfo modulePath ${s}`);const f=(0,common_utils_1.readJson)(s);logger.debug(`addShareInfo srcModuleJson ${JSON.stringify(f,null,"  ")}`);const g=null!==(t=null===(n=null==f?void 0:f.app)||void 0===n?void 0:n.bundleName)&&void 0!==t?t:"",m=null!==(d=null===(l=null==f?void 0:f.app)||void 0===l?void 0:l.versionCode)&&void 0!==d?d:0,h=null!==(u=null===(i=null==f?void 0:f.module)||void 0===i?void 0:i.name)&&void 0!==u?u:"",c=null!==(r=null===(a=null==f?void 0:f.module)||void 0===a?void 0:a.type)&&void 0!==r?r:"";if("shared"===c&&g&&0!==m&&h){const o={bundleName:g,moduleName:h,versionCode:m};e.push(o)}else if("shared"===c&&!g&&0===m&&h){const o={moduleName:h};e.push(o)}}function getSharedInfos(e){const o=[],n=path_1.default.resolve(e,"oh_modules"),t=fs_1.default.readdirSync(n);return logger.debug(`moduleFileNames=${t}`),t.filter(e=>e&&!e.startsWith(".")).forEach(t=>{if(logger.debug(`moduleFileName=${t}`),t.startsWith("@")){const n=path_1.default.resolve(e,`oh_modules/${t}`),l=fs_1.default.readdirSync(n);logger.debug(`cloudModuleFileNames=${l}`),l.forEach(e=>{logger.debug(`cloudModuleFileName=${e}`),addShareInfo(o,path_1.default.resolve(n,`${e}`))})}else addShareInfo(o,path_1.default.resolve(n,`${t}`))}),o}function updateSharedInfo(e){const o=path_1.default.resolve(e,"build");if(!fs_1.default.existsSync(o))return void logger.debug("buildFilePath:"+o);const n=getSharedInfos(e);if(!(null==n?void 0:n.length))return void logger.debug("dependencies is empty");const t=fs_1.default.readdirSync(o);logger.debug("buildFileNames:"+t),t.filter(e=>e).forEach(e=>{logger.debug("productName: "+e);const t=path_1.default.resolve(o,`${e}/intermediates/res/${e}/module.json`);if(logger.debug("module.json filePath: "+t),fs_1.default.existsSync(t)){const e=(0,common_utils_1.readJson)(t);e.module.dependencies=n,(0,common_utils_1.writeJson)(t,e),logger.debug(`final moduleJson ${JSON.stringify(e,null,"  ")}`)}else logger.debug("module.json filePath: "+t+" is not Exists");const l=path_1.default.resolve(o,`${e}/intermediates/hap_metadata/${e}/output_metadata.json`);if(logger.debug("output_metadata.json filePath: "+l),fs_1.default.existsSync(l)){const e=(0,common_utils_1.readJson)(l);null==e||e.forEach(e=>{var o;const n=null===(o=e.dependRemoteHsps)||void 0===o?void 0:o.findIndex(e=>{var o;return null===(o=e.hspName)||void 0===o?void 0:o.includes("ascf")});e.dependRemoteHsps&&-1!==n&&e.dependRemoteHsps.splice(n,1)}),(0,common_utils_1.writeJson)(l,e),logger.debug(`final metadataJson ${JSON.stringify(e,null,"  ")}`)}})}function doModifyShareInfoPlugin(e){return __awaiter(this,void 0,void 0,function*(){logger.debug("start exec modify share info plugin");const o=e.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_HAP_PLUGIN);null==o||o.targets(o=>{const n=o.getTargetName();logger.debug(`targetName:${n}`),e.registerTask({name:"modifyShareInfoTask",run:e=>{logger.debug("moduleName="+e.moduleName+" modulePath="+e.modulePath),updateSharedInfo(e.modulePath)},dependencies:[`${n}@CompileArkTS`],postDependencies:[`${n}@PackageHap`]})}),logger.debug("exec modify share info plugin completed")})}function modifyShareInfoPlugin(){return{pluginId:"modifyShareInfoPlugin",apply:doModifyShareInfoPlugin}}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atomicservice/ascf-toolkit-hvigor-plugin",
-  "version": "1.0.5-beta.4",
+  "version": "1.0.6-beta.4",
   "title": "ASCF toolkit hvigor plugin for atomicservice",
   "description": "ASCF toolkit hvigor plugin for atomicservice",
   "main": "index.ts",
@@ -15,13 +15,7 @@
     "gulp-terser": "2.1.0"
   },
   "dependencies": {
-    "@atomicservice/ascf-toolkit": "1.0.5-beta.4"
-  },
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "gulp dev",
-    "build": "gulp release",
-    "release": "gulp release && npm pack"
+    "@atomicservice/ascf-toolkit": "1.0.6-beta.4"
   },
   "overrides": {
     "minipass": "3.3.6",
@@ -116,5 +110,11 @@
     "@swc/types": "0.1.17"
   },
   "license": "Apache-2.0",
-  "licenseFilename": "LICENSE"
-}
+  "licenseFilename": "LICENSE",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "gulp dev",
+    "build": "gulp release",
+    "release": "gulp release && pnpm pack"
+  }
+}

package/gulpfile.mjs

@@ -1,34 +0,0 @@
-import gulp from 'gulp';
-import ts from 'gulp-typescript';
-import terser from 'gulp-terser';
-import del from 'del';
-
-const tsProject = ts.createProject('tsconfig.json');
-
-function clean() {
-  return del(["./*ascf-toolkit*.tgz", "./lib"]);
-}
-
-function dev() {
-  return gulp
-      .src("src/**/*.ts")
-      .pipe(gulp.dest("./lib"));
-}
-
-function releaseTs() {
-  return gulp.src('src/**/*.ts')
-    .pipe(tsProject())
-    .pipe(terser())
-    .pipe(gulp.dest('./lib'));
-}
-
-function addResourse() {
-  return gulp.src("src/**/*.{png,jpg,jpeg,json,json5,ets,txt}").pipe(gulp.dest("./lib"));
-}
-
-gulp.task("dev", gulp.series(clean, dev, addResourse));
-
-gulp.task(
-    "release",
-    gulp.series(clean, releaseTs, addResourse),
-);