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

package/gulpfile.mjs

@@ -0,0 +1,34 @@
+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),
+);

package/index.ts

@@ -1,7 +1,7 @@
-import { default as ascfPlugin } from './src/plugin/ascf-toolkit-hvigor-plugin';
+import { default as ascfPlugin } from './lib/plugin/ascf-toolkit-hvigor-plugin';
 
-export { default as signByBuildModePlugin } from './src/plugin/sign-by-build-mode-plugin';
-export { default as modifyShareInfoPlugin } from './src/plugin/modifyShareInfoPlugin';
-export { default as installAscfHspPlugin } from './src/plugin/installAscfHspPlugin';
+export { default as signByBuildModePlugin } from './lib/plugin/sign-by-build-mode-plugin';
+export { default as modifyShareInfoPlugin } from './lib/plugin/modifyShareInfoPlugin';
+export { default as installAscfHspPlugin } from './lib/plugin/installAscfHspPlugin';
 export { ascfPlugin };
 export default ascfPlugin;

package/lib/common/common-enum.js

@@ -0,0 +1 @@
+"use strict";var LogLevel,DevtoolEnum;Object.defineProperty(exports,"__esModule",{value:!0}),exports.DevtoolEnum=exports.LogLevel=void 0,function(e){e.DEBUG="debug",e.INFO="info",e.WARN="warn",e.ERROR="error"}(LogLevel||(exports.LogLevel=LogLevel={})),function(e){e.EVAL="eval",e.EVAL_CHEAP_SOURCE_MAP="eval-cheap-source-map",e.EVAL_CHEAP_MODULE_SOURCE_MAP="eval-cheap-module-source-map",e.EVAL_SOURCE_MAP="eval-source-map",e.CHEAP_SOURCE_MAP="cheap-source-map",e.CHEAP_MODULE_SOURCE_MAP="cheap-module-source-map",e.SOURCE_MAP="source-map",e.INLINE_CHEAP_SOURCE_MAP="inline-cheap-source-map",e.INLINE_CHEAP_MODULE_SOURCE_MAP="inline-cheap-module-source-map",e.INLINE_SOURCE_MAP="inline-source-map",e.EVAL_NOSOURCES_CHEAP_SOURCE_MAP="eval-nosources-cheap-source-map",e.EVAL_NOSOURCES_CHEAP_MODULE_SOURCE_MAP="eval-nosources-cheap-module-source-map",e.EVAL_NOSOURCES_SOURCE_MAP="eval-nosources-source-map",e.INLINE_NOSOURCES_CHEAP_SOURCE_MAP="inline-nosources-cheap-source-map",e.INLINE_NOSOURCES_CHEAP_MODULE_SOURCE_MAP="inline-nosources-cheap-module-source-map",e.INLINE_NOSOURCES_SOURCE_MAP="inline-nosources-source-map",e.NOSOURCES_CHEAP_SOURCE_MAP="nosources-cheap-source-map",e.NOSOURCES_CHEAP_MODULE_SOURCE_MAP="nosources-cheap-module-source-map",e.NOSOURCES_SOURCE_MAP="nosources-source-map",e.HIDDEN_NOSOURCES_CHEAP_SOURCE_MAP="hidden-nosources-cheap-source-map",e.HIDDEN_NOSOURCES_CHEAP_MODULE_SOURCE_MAP="hidden-nosources-cheap-module-source-map",e.HIDDEN_NOSOURCES_SOURCE_MAP="hidden-nosources-source-map",e.HIDDEN_CHEAP_SOURCE_MAP="hidden-cheap-source-map",e.HIDDEN_CHEAP_MODULE_SOURCE_MAP="hidden-cheap-module-source-map",e.HIDDEN_SOURCE_MAP="hidden-source-map"}(DevtoolEnum||(exports.DevtoolEnum=DevtoolEnum={}));

package/lib/common/common-utils.js

@@ -0,0 +1 @@
+"use strict";var __importDefault=this&&this.__importDefault||function(e){return e&&e.__esModule?e:{default:e}};Object.defineProperty(exports,"__esModule",{value:!0}),exports.writeJson=exports.readJson=void 0,exports.deepMerge=deepMerge;const fs_1=__importDefault(require("fs"));function deepMerge(e,...t){if(!t.length)return e;const r=t.shift();if(!r)return deepMerge(e,...t);for(const t of Object.keys(r)){const s=r[t],o=e[t];isObject(s)&&t in e&&isObject(o)?deepMerge(o,s):e[t]=s}return deepMerge(e,...t)}function isObject(e){return"[object Object]"===Object.prototype.toString.call(e)}const readJson=e=>JSON.parse(fs_1.default.readFileSync(e,"utf-8"));exports.readJson=readJson;const writeJson=(e,t)=>fs_1.default.writeFileSync(e,JSON.stringify(t),"utf-8");exports.writeJson=writeJson;

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

@@ -0,0 +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}

package/lib/plugin/installAscfHspPlugin.js

@@ -0,0 +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}}

package/lib/plugin/modifyShareInfoPlugin.js

@@ -0,0 +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}}

package/lib/plugin/sign-by-build-mode-plugin.js

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,"__esModule",{value:!0});const hvigor_1=require("@ohos/hvigor"),hvigor_ohos_plugin_1=require("@ohos/hvigor-ohos-plugin"),logger=hvigor_1.HvigorLogger.getLogger("signByBuildModePlugin");function signByBuildMode(e,g){return{pluginId:"signByBuildMode",apply(o){try{logger.debug("start exec sign by build mode");const i=o.getContext(hvigor_ohos_plugin_1.OhosPluginId.OHOS_APP_PLUGIN),r="debug"===i.getBuildMode()?e:g;logger.debug("signByBuildMode change signingConfig="+r);const n=i.getBuildProfileOpt();n.app.products[0].signingConfig=r,i.setBuildProfileOpt(n),logger.debug("sign by build mode completed")}catch(e){logger.errorExit(new Error(String(e)))}}}}exports.default=signByBuildMode;

package/package.json

@@ -1,20 +1,27 @@
 {
   "name": "@atomicservice/ascf-toolkit-hvigor-plugin",
-  "version": "1.0.3",
+  "version": "1.0.5-beta.4",
   "title": "ASCF toolkit hvigor plugin for atomicservice",
   "description": "ASCF toolkit hvigor plugin for atomicservice",
   "main": "index.ts",
   "author": "atomicservice",
-  "type": "module",
+  "type": "commonjs",
   "devDependencies": {
     "@ohos/hvigor": "5.8.9",
-    "@ohos/hvigor-ohos-plugin": "5.8.9"
+    "@ohos/hvigor-ohos-plugin": "5.8.9",
+    "del": "6.1.0",
+    "gulp": "4.0.0",
+    "gulp-typescript": "5.0.1",
+    "gulp-terser": "2.1.0"
   },
   "dependencies": {
-    "@atomicservice/ascf-toolkit": "1.0.3"
+    "@atomicservice/ascf-toolkit": "1.0.5-beta.4"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "dev": "gulp dev",
+    "build": "gulp release",
+    "release": "gulp release && npm pack"
   },
   "overrides": {
     "minipass": "3.3.6",

package/src/common/common-enum.ts

@@ -1,33 +0,0 @@
-export enum LogLevel {
-  DEBUG = 'debug',
-  INFO = 'info',
-  WARN = 'warn',
-  ERROR = 'error'
-}
-export enum DevtoolEnum {
-  EVAL = 'eval',
-  EVAL_CHEAP_SOURCE_MAP = 'eval-cheap-source-map',
-  EVAL_CHEAP_MODULE_SOURCE_MAP = 'eval-cheap-module-source-map',
-  EVAL_SOURCE_MAP = 'eval-source-map',
-  CHEAP_SOURCE_MAP = 'cheap-source-map',
-  CHEAP_MODULE_SOURCE_MAP = 'cheap-module-source-map',
-  SOURCE_MAP = 'source-map',
-  INLINE_CHEAP_SOURCE_MAP = 'inline-cheap-source-map',
-  INLINE_CHEAP_MODULE_SOURCE_MAP = 'inline-cheap-module-source-map',
-  INLINE_SOURCE_MAP = 'inline-source-map',
-  EVAL_NOSOURCES_CHEAP_SOURCE_MAP = 'eval-nosources-cheap-source-map',
-  EVAL_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = 'eval-nosources-cheap-module-source-map',
-  EVAL_NOSOURCES_SOURCE_MAP = 'eval-nosources-source-map',
-  INLINE_NOSOURCES_CHEAP_SOURCE_MAP = 'inline-nosources-cheap-source-map',
-  INLINE_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = 'inline-nosources-cheap-module-source-map',
-  INLINE_NOSOURCES_SOURCE_MAP = 'inline-nosources-source-map',
-  NOSOURCES_CHEAP_SOURCE_MAP = 'nosources-cheap-source-map',
-  NOSOURCES_CHEAP_MODULE_SOURCE_MAP = 'nosources-cheap-module-source-map',
-  NOSOURCES_SOURCE_MAP = 'nosources-source-map',
-  HIDDEN_NOSOURCES_CHEAP_SOURCE_MAP = 'hidden-nosources-cheap-source-map',
-  HIDDEN_NOSOURCES_CHEAP_MODULE_SOURCE_MAP = 'hidden-nosources-cheap-module-source-map',
-  HIDDEN_NOSOURCES_SOURCE_MAP = 'hidden-nosources-source-map',
-  HIDDEN_CHEAP_SOURCE_MAP = 'hidden-cheap-source-map',
-  HIDDEN_CHEAP_MODULE_SOURCE_MAP = 'hidden-cheap-module-source-map',
-  HIDDEN_SOURCE_MAP = 'hidden-source-map',
-}

package/src/common/common-utils.ts

@@ -1,26 +0,0 @@
-type DeepPartial<T> = {
-  [P in keyof T]?: T[P] extends object ? DeepPartial<T[P]> : T[P];
-};
-
-function deepMerge<T extends object>(target: T, source?: DeepPartial<T>): T {
-  if (!source) {
-    return target;
-  }
-  for (const key of Object.keys(source) as Array<keyof T>) {
-    const sourceValue = source[key];
-    const targetValue = target[key];
-    
-    if (isObject(sourceValue) && key in target && isObject(targetValue)) {
-      deepMerge(targetValue as Object, sourceValue as DeepPartial<typeof targetValue>);
-    } else {
-      target[key] = sourceValue as T[keyof T];
-    }
-  }
-  return target;
-}
-
-function isObject(target: any) {
-  return Object.prototype.toString.call(target) === '[object Object]';
-}
-
-export { deepMerge };

package/src/plugin/ascf-toolkit-hvigor-plugin.ts

@@ -1,165 +0,0 @@
-import {OhosAppContext, OhosHapContext, OhosPluginId} from '@ohos/hvigor-ohos-plugin';
-import { Property } from '@ohos/hvigor-ohos-plugin/src/sdk/lib/property-get';
-import { PropertyConst } from '@ohos/hvigor-ohos-plugin/src/const/property-const';
-import { hvigor, HvigorLogger, HvigorNode, HvigorPlugin, Level } from '@ohos/hvigor';
-import ascf from '@atomicservice/ascf-toolkit';
-import { exec } from 'child_process';
-import path from 'path';
-import fs from 'fs';
-import os from 'os';
-import { DevtoolEnum, LogLevel } from '../common/common-enum';
-import { deepMerge } from '../common/common-utils';
-
-import { doModifyShareInfoPlugin } from './modifyShareInfoPlugin';
-import { doInstallAscfHspPlugin } from './installAscfHspPlugin';
-
-const logger = HvigorLogger.getLogger('ascfPlugin');
-
-export interface AscfPluginOptions {
-  fixSharedHsp: boolean,
-  installAscfHsp: boolean,
-  debug: boolean,
-  logging?: LogLevel,
-  devtool?: DevtoolEnum,
-  compilerOptions: {
-    swc: boolean,
-  }
-}
-
-const DEFAULT_OPTIONS: AscfPluginOptions = {
-  fixSharedHsp: true,
-  installAscfHsp: true,
-  debug: true,
-  compilerOptions: {
-    swc: false,
-  }
-};
-
-export default function ascfToolkitHvigorPlugin(options?: AscfPluginOptions): HvigorPlugin {
-  return {
-    pluginId: 'ascfToolkitHvigorPlugin',
-    apply(node: HvigorNode) {
-      const opts = deepMerge(DEFAULT_OPTIONS, options);
-      hvigor.nodesEvaluated(async () => {
-        await execPlugin(opts, node);
-
-        try {
-          if (hvigor.isCommandEntryTask('GetHvigorDepsCachesDir')) {
-            node.registerTask({
-              name: 'GetHvigorDepsCachesDir',
-              run() {
-                console.log('ASCF_GET_HVIGOR_DEPS_CACHES_DIR=' + ascf.getAscfToolkitDirname());
-              },
-            });
-          } else {
-            logger.debug('start exec ascf quickGenSub');
-            await ascf.quickGenerateSubpackage();
-            logger.debug('ascf quickGenSub completed');
-            const appContext = node.getContext(OhosPluginId.OHOS_APP_PLUGIN) as OhosAppContext;
-            node.subNodes((subNode: HvigorNode) => {
-              const hapContext = subNode.getContext(OhosPluginId.OHOS_HAP_PLUGIN) as OhosHapContext;
-              if(hapContext && hapContext.getModuleType() === 'entry') {
-                subNode.registerTask({
-                  // 任务名称
-                  name: 'quickGenerateSubpackage',
-                  // 任务执行逻辑主体函数
-                  async run() {
-                    logger.debug('start exec ascf compile');
-                    const buildMode = appContext.getBuildMode();
-                    const nodeExe = getNodeExe();
-                    const ascfScript = getAscfScript();
-                    let cmd = `${nodeExe} ${ascfScript} compile -c ${buildMode === 'debug' ? '-m' : ''} ${appContext.getProjectPath()}`;
-
-                    const hvigorLevelStr = (logger.getLevel() as Level).levelStr.toLowerCase();
-                    if (opts.debug && hvigorLevelStr === LogLevel.DEBUG) {
-                      cmd += ' --debug';
-                    }
-                    if (opts.compilerOptions.swc) {
-                      cmd += ' --swc';
-                    }
-                    const devtool = opts.devtool?.toLowerCase();
-                    if (devtool) {
-                      cmd += ` --devtool=${devtool}`;
-                    }
-                    const logLevel = (opts.logging ? opts.logging : hvigorLevelStr).toLowerCase();
-                    cmd += ` --logging=${logLevel}`;
-                    logger.debug(cmd);
-                    await executeCommand(cmd, hvigorLevelStr);
-                    logger.debug('ascf compile completed');
-                  },
-                  // 配置前置任务依赖
-                  dependencies: ['default@PreBuild'],
-                  // 配置任务的后置任务依赖
-                  postDependencies: ['assembleHap']
-                });
-              }
-            });
-          }
-        } catch (err: any) {
-          logger.errorExit(new Error(err));
-        }
-      });
-    }
-  };
-}
-
-async function execPlugin(opts: AscfPluginOptions, node: HvigorNode) {
-  const entryNode = hvigor.getNodeByName('entry');
-  if (entryNode && opts.fixSharedHsp) {
-    await doModifyShareInfoPlugin(entryNode).catch(err => logger.error(err));
-  }
-  if (entryNode && opts.installAscfHsp) {
-    await doInstallAscfHspPlugin(node).catch(err => logger.error(err));
-  }
-}
-
-function executeCommand(command: string, levelStr: string) {
-  return new Promise((resolve, reject) => {
-    exec(command, (error: any, stdout: string, stderr: string) => {
-      printLogger(stdout, levelStr);
-      if (error) {
-        reject(error);
-      } else {
-        resolve(stdout);
-      }
-    });
-  });
-}
-
-function printLogger(stdout: string, levelStr: string) {
-  if (stdout.length === 0) {
-    return;
-  }
-  if (levelStr === LogLevel.INFO) {
-    logger.info(stdout);
-  } else if (levelStr === LogLevel.WARN) {
-    logger.warn(stdout);
-  } else if (levelStr === LogLevel.ERROR) {
-    logger.error(stdout);
-  } else {
-    logger.debug(stdout);
-  }
-}
-
-function getNodeExe() {
-  const property: Property = new Property();
-  const nodeDir = property.getProperty(PropertyConst.NPM_DIR);
-  const platform = os.platform();
-  let got = 'node';
-
-  if (platform === 'win32') {
-    got = path.join(nodeDir, 'node.exe');
-  } else if (platform === 'darwin' || platform === 'linux') {
-    got = path.join(nodeDir, 'node');
-  }
-
-  return fs.existsSync(got) ? adjustPathByPlatform(got) : 'node';
-}
-
-function getAscfScript() {
-  return adjustPathByPlatform(path.join(ascf.getAscfToolkitDirname(), 'bin', 'ascf.js'));
-}
-
-function adjustPathByPlatform(path: string) {
-  return os.platform() === 'win32' ? `\"${path}\"` : path;
-}

package/src/plugin/installAscfHspPlugin.ts

@@ -1,112 +0,0 @@
-import type { HvigorNode, HvigorPlugin } from '@ohos/hvigor';
-import { hvigor, HvigorLogger } from '@ohos/hvigor';
-import { OhosAppContext, OhosHapContext, OhosPluginId, Target } from '@ohos/hvigor-ohos-plugin';
-import { execSync } from 'child_process';
-import path from 'path';
-import fs from 'fs';
-
-const logger = HvigorLogger.getLogger('installAscfHspPlugin');
-
-function execSafe(cmd: string) {
-  try {
-    return execSync(cmd)?.toString('utf8');
-  } catch (e) {
-    logger.warn('exec cmd error', e);
-  }
-}
-
-function checkProjectAscfVer() {
-  logger.debug(`Check project ascf dependency version.`);
-  const node = hvigor.getNodeByName('entry');
-  let ohPkgFile = path.resolve(node?.getNodePath(), './oh-package.json');
-  if (!fs.existsSync(ohPkgFile)) {
-    ohPkgFile += '5'; // trying module.json5
-    if (!fs.existsSync(ohPkgFile)) {
-      logger.warn(`Check oh-package failed. Not found ${ohPkgFile}.`);
-      return false;
-    }
-  }
-  const ohPkgDeps = JSON.parse(fs.readFileSync(ohPkgFile).toString())?.dependencies;
-  logger.debug(`ohPkgDeps: ${JSON.stringify(ohPkgDeps)}`);
-  return !!Object.prototype.hasOwnProperty.call(ohPkgDeps, '@atomicservice/ascf');
-}
-
-function checkAscfHsp(ascfBundleName: string) {
-  logger.debug(`Check and install ${ascfBundleName} for local development`);
-  const sharedInfo: string = execSafe(`hdc shell bm dump-shared -a`) ?? '';
-  if (new RegExp(`${ascfBundleName}(\\r?\\n|$)`).test(sharedInfo)) {
-    const verInfo = execSafe(`hdc shell "bm dump-shared -n ${ascfBundleName} | grep versionName"`);
-    logger.debug(`found ${ascfBundleName} ${verInfo}`);
-    return true;
-  }
-  return false;
-}
-
-function doInstallAscfHsp(resolve: any, reject: any) {
-  const isDepOldAscf: boolean = checkProjectAscfVer();
-  const ascfBundleName: string = isDepOldAscf ? 'com.huawei.hms.ascf' : 'com.huawei.hms.ascfruntime';
-  const errMsg: string = `${ascfBundleName} install failed, please open helloUniapp manually.`;
-
-  if (checkAscfHsp(ascfBundleName)) {
-    resolve();
-    return;
-  }
-
-  logger.debug(`trying to install ${ascfBundleName}`);
-  const configJsonPath = path.resolve(__dirname, '../config.json');
-  const configJson = JSON.parse(fs.readFileSync(configJsonPath).toString());
-  const hspUrl = isDepOldAscf ? configJson.ascfHspUrl : configJson.ascfRuntimeHspUrl;
-  const startInfo = execSafe(`hdc shell aa start -b com.huawei.hmos.browser -a MainAbility -A ohos.want.action.viewData -U "${hspUrl}"`);
-  if (!startInfo?.includes('successfully')) {
-    logger.warn(`${errMsg} errorInfo=${startInfo}`);
-    reject(errMsg);
-    return;
-  }
-
-  logger.debug(`begin to wait install hsp`);
-  let needWait = 0;
-  let timer = setInterval(() => {
-    const found = checkAscfHsp(ascfBundleName);
-    needWait++;
-
-    if (found || needWait > 5) {
-      clearInterval(timer);
-      if (found) {
-        resolve();
-      } else {
-        logger.warn(errMsg);
-        reject(errMsg);
-      }
-      return;
-    }
-  }, 1000);
-}
-
-export async function doInstallAscfHspPlugin(rootNode: HvigorNode): Promise<void> {
-  logger.debug('start exec install ascf hsp plugin');
-  const appContext = rootNode.getContext(OhosPluginId.OHOS_APP_PLUGIN) as OhosAppContext;
-  const currentNode = hvigor.getNodeByName('entry')!;
-  const hapContext = currentNode.getContext(OhosPluginId.OHOS_HAP_PLUGIN) as OhosHapContext;
-  if (appContext?.getBuildMode() !== 'debug') {
-    return;
-  }
-
-  hapContext?.targets((target: Target) => {
-    const targetName = target.getTargetName();
-    logger.debug(`installAscfHspPlugin targetName:${targetName}`);
-    currentNode.registerTask({
-      name: 'installAscfHspTask',
-      run: () => new Promise<void>(doInstallAscfHsp).catch((err) => logger.error(err)),
-      dependencies: [`${targetName}@CompileArkTS`],
-      postDependencies: [`${targetName}@PackageHap`]
-    });
-  });
-  logger.debug('exec install ascf hsp plugin completed');
-}
-
-export default function installAscfHspPlugin(): HvigorPlugin {
-  return {
-    pluginId: 'installAscfHspPlugin',
-    apply: doInstallAscfHspPlugin,
-  };
-}

package/src/plugin/modifyShareInfoPlugin.ts

@@ -1,138 +0,0 @@
-import type { HvigorNode, HvigorPlugin, HvigorTaskContext } from '@ohos/hvigor';
-import { HvigorLogger } from '@ohos/hvigor';
-import { OhosHapContext, OhosPluginId, Target } from '@ohos/hvigor-ohos-plugin';
-import path from 'path';
-import fs from 'fs';
-
-const logger = HvigorLogger.getLogger('modifyShareInfoPlugin');
-
-const readJson = (filepath: string) => JSON.parse(fs.readFileSync(filepath, 'utf-8'));
-const writeJson = (filepath: string, str: any) => fs.writeFileSync(filepath, JSON.stringify(str), 'utf-8');
-
-function addShareInfo(sharedInfos: any, srcPath: string) {
-  logger.debug(`addShareInfo srcPath ${srcPath}`);
-  let modulePath = path.resolve(srcPath, 'src/main/module.json');
-  if (!fs.existsSync(modulePath)) {
-    modulePath += '5'; // trying module.json5
-    if (!fs.existsSync(modulePath)) {
-      return;
-    }
-  }
-  logger.debug(`addShareInfo modulePath ${modulePath}`);
-  const srcModuleJson = readJson(modulePath);
-  logger.debug(`addShareInfo srcModuleJson ${JSON.stringify(srcModuleJson, null, '  ')}`);
-  const srcBundleName = srcModuleJson?.app?.bundleName ?? '';
-  const srcVersionCode = srcModuleJson?.app?.versionCode ?? 0;
-  const srcModuleName = srcModuleJson?.module?.name ?? '';
-  const srcModuleType = srcModuleJson?.module?.type ?? '';
-  if (srcModuleType === 'shared' && srcBundleName && srcVersionCode !== 0 && srcModuleName) {
-    const shareInfo = {
-      'bundleName': srcBundleName,
-      'moduleName': srcModuleName,
-      'versionCode': srcVersionCode
-    };
-    sharedInfos.push(shareInfo);
-  } else if (srcModuleType === 'shared' && !srcBundleName && srcVersionCode === 0 && srcModuleName) {
-    const shareInfo = {
-      'moduleName': srcModuleName,
-    };
-    sharedInfos.push(shareInfo);
-  }
-};
-
-function getSharedInfos(modulePath: string): Array<object> {
-  const sharedInfos: any = [];
-  const moduleFilePath = path.resolve(modulePath, `oh_modules`);
-  const moduleFileNames = fs.readdirSync(moduleFilePath);
-  logger.debug(`moduleFileNames=${moduleFileNames}`);
-
-  moduleFileNames.filter(v => v && !v.startsWith('.')).forEach((moduleFileName) => {
-    logger.debug(`moduleFileName=${moduleFileName}`);
-
-    if (moduleFileName.startsWith('@')) {
-      const cloudModuleFilePath = path.resolve(modulePath, `oh_modules/${moduleFileName}`);
-      const cloudModuleFileNames = fs.readdirSync(cloudModuleFilePath);
-      logger.debug(`cloudModuleFileNames=${cloudModuleFileNames}`);
-
-      cloudModuleFileNames.forEach((cloudModuleFileName) => {
-        logger.debug(`cloudModuleFileName=${cloudModuleFileName}`);
-        addShareInfo(sharedInfos, path.resolve(cloudModuleFilePath, `${cloudModuleFileName}`));
-      });
-    } else {
-      addShareInfo(sharedInfos, path.resolve(moduleFilePath, `${moduleFileName}`));
-    }
-  });
-  return sharedInfos;
-}
-
-function updateSharedInfo(modulePath: string): void {
-  const buildFilePath = path.resolve(modulePath, `build`);
-  if (!fs.existsSync(buildFilePath)) {
-    logger.debug('buildFilePath:' + buildFilePath);
-    return;
-  }
-
-  const dependencies = getSharedInfos(modulePath);
-  if (!dependencies?.length) {
-    logger.debug('dependencies is empty');
-    return;
-  }
-
-  const buildFileNames = fs.readdirSync(buildFilePath);
-  logger.debug('buildFileNames:' + buildFileNames);
-  buildFileNames.filter(v => v).forEach((productName) => {
-    logger.debug('productName: ' + productName);
-    const filePath = path.resolve(buildFilePath, `${productName}/intermediates/res/${productName}/module.json`);
-    logger.debug('module.json filePath: ' + filePath);
-    if (fs.existsSync(filePath)) {
-      const moduleJson = readJson(filePath);
-      moduleJson.module.dependencies = dependencies;
-      writeJson(filePath, moduleJson);
-      logger.debug(`final moduleJson ${JSON.stringify(moduleJson, null, '  ')}`);
-    } else {
-      logger.debug('module.json filePath: ' + filePath + ' is not Exists');
-    }
-
-    const metadataPath = path.resolve(buildFilePath,
-      `${productName}/intermediates/hap_metadata/${productName}/output_metadata.json`);
-    logger.debug('output_metadata.json filePath: ' + metadataPath);
-    if (fs.existsSync(metadataPath)) {
-      const metadataJson = readJson(metadataPath);
-      metadataJson?.forEach((v: any) => {
-        const found = v.dependRemoteHsps?.findIndex((x: any) => x.hspName?.includes('ascf'));
-        if (v.dependRemoteHsps && found !== -1) {
-          v.dependRemoteHsps.splice(found, 1);
-        }
-      });
-      writeJson(metadataPath, metadataJson);
-      logger.debug(`final metadataJson ${JSON.stringify(metadataJson, null, '  ')}`);
-    }
-  });
-}
-
-export async function doModifyShareInfoPlugin(currentNode: HvigorNode): Promise<void> {
-  logger.debug('start exec modify share info plugin');
-  const hapContext = currentNode.getContext(OhosPluginId.OHOS_HAP_PLUGIN) as OhosHapContext;
-
-  hapContext?.targets((target: Target) => {
-    const targetName = target.getTargetName();
-    logger.debug(`targetName:${targetName}`);
-    currentNode.registerTask({
-      name: 'modifyShareInfoTask',
-      run: (taskContext: HvigorTaskContext) => {
-        logger.debug('moduleName=' + taskContext.moduleName + ' modulePath=' + taskContext.modulePath);
-        updateSharedInfo(taskContext.modulePath);
-      },
-      dependencies: [`${targetName}@CompileArkTS`],
-      postDependencies: [`${targetName}@PackageHap`]
-    });
-  });
-  logger.debug('exec modify share info plugin completed');
-}
-
-export default function modifyShareInfoPlugin(): HvigorPlugin {
-  return {
-    pluginId: 'modifyShareInfoPlugin',
-    apply: doModifyShareInfoPlugin,
-  };
-}

package/src/plugin/sign-by-build-mode-plugin.ts

@@ -1,27 +0,0 @@
-import { HvigorLogger, HvigorNode, HvigorPlugin } from '@ohos/hvigor';
-import { OhosAppContext, OhosPluginId } from '@ohos/hvigor-ohos-plugin';
-
-const logger = HvigorLogger.getLogger('signByBuildModePlugin');
-
-function signByBuildMode(debugSignName: string, releaseSignName: string): HvigorPlugin {
-  return {
-    pluginId: 'signByBuildMode',
-    apply(node: HvigorNode) {
-      try {
-        logger.debug('start exec sign by build mode');
-        const appContext = node.getContext(OhosPluginId.OHOS_APP_PLUGIN) as OhosAppContext;
-        const signingConfig = appContext.getBuildMode() === 'debug' ? debugSignName : releaseSignName;
-        logger.debug('signByBuildMode change signingConfig=' + signingConfig);
-
-        const bpOpt = appContext.getBuildProfileOpt();
-        bpOpt.app.products![0].signingConfig = signingConfig;
-        appContext.setBuildProfileOpt(bpOpt);
-        logger.debug('sign by build mode completed');
-      } catch (err: any) {
-        logger.errorExit(new Error(err));
-      }
-    },
-  };
-}
-
-export default signByBuildMode;