@hadss/hmrouter-plugin 1.1.1-alpha.0 → 1.2.0-beta.2

package/dist/hmrouter_extension/HMRouterExtension.js

@@ -3,7 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HMRouterDefaultExtension = void 0;
 const framework_1 = require("../framework");
 const AnnotationAnalyzerRegistry_1 = require("./analyzer/AnnotationAnalyzerRegistry");
+const ConstantAnalyzer_1 = require("./analyzer/utils/ConstantAnalyzer");
 const processor_1 = require("./processor");
+const framework_2 = require("../framework");
 class HMRouterDefaultExtension extends framework_1.PluginExtension {
     get name() {
         return 'HMRouterExtension';
@@ -18,6 +20,59 @@ class HMRouterDefaultExtension extends framework_1.PluginExtension {
         for (const analyzer of analyzers) {
             analyzer.analyze(sourceFile, filePath, context);
         }
+        this.executeConstantParsing(filePath, context);
+    }
+    executeConstantParsing(filePath, context) {
+        try {
+            const contextImpl = context;
+            const analyzeResults = contextImpl.analyzeResults;
+            const currentView = contextImpl._currentView;
+            const currentFilePath = contextImpl._currentFilePath;
+            const currentFileResults = [];
+            analyzeResults.forEach((result) => {
+                if (result.sourceFilePath === currentFilePath) {
+                    currentFileResults.push(result);
+                }
+            });
+            if (currentFileResults.length === 0) {
+                return;
+            }
+            framework_2.Logger.debug(this.name, `Start constant parsing for ${currentFileResults.length} results in file: ${filePath}`);
+            const constantResolver = AnnotationAnalyzerRegistry_1.AnnotationAnalyzerRegistry.getInstance().getConstantResolver();
+            if (!constantResolver) {
+                framework_2.Logger.warn(this.name, `Constant resolver not available, skip constant parsing for file: ${filePath}`);
+                return;
+            }
+            const constantAnalyzer = new ConstantAnalyzer_1.ConstantAnalyzer(constantResolver);
+            const currentFileResultsCopy = currentFileResults.map((result) => ({ ...result }));
+            const resultsSet = new Set(currentFileResultsCopy);
+            constantAnalyzer.parseConstants(resultsSet);
+            const updatedResults = new Set();
+            analyzeResults.forEach((result) => {
+                if (result.sourceFilePath !== currentFilePath) {
+                    updatedResults.add(result);
+                }
+            });
+            resultsSet.forEach((parsedResult) => {
+                updatedResults.add(parsedResult);
+            });
+            contextImpl.analyzeResults = updatedResults;
+            for (let i = 0; i < currentView.length; i++) {
+                const viewResult = currentView[i];
+                if (viewResult.sourceFilePath === currentFilePath) {
+                    for (const parsedResult of resultsSet) {
+                        if (parsedResult.name === viewResult.name && parsedResult.sourceFilePath === viewResult.sourceFilePath) {
+                            currentView[i] = parsedResult;
+                            break;
+                        }
+                    }
+                }
+            }
+            framework_2.Logger.debug(this.name, `Constant parsing completed for file: ${filePath}`);
+        }
+        catch (error) {
+            framework_2.Logger.warn(this.name, `Failed to execute constant parsing for file ${filePath}: ${error}`);
+        }
     }
     afterCodeGeneration(context) {
         const generator = new processor_1.CodeGenerationProcessor(context);

package/dist/hmrouter_extension/analyzer/ComponentAnalyzer.js

@@ -20,7 +20,6 @@ class ComponentAnalyzer extends AbstractAnnotationAnalyzer_1.AbstractAnnotationA
     analyzeClassDecorators(cls, filePath, sourceFile, results) {
         cls.getDecorators().forEach((decorator) => {
             if ([
-                constants_1.AnnotationConstants.SERVICE_ANNOTATION,
                 constants_1.AnnotationConstants.INTERCEPTOR_ANNOTATION,
                 constants_1.AnnotationConstants.LIFECYCLE_ANNOTATION,
                 constants_1.AnnotationConstants.ANIMATOR_ANNOTATION,

package/dist/hmrouter_extension/analyzer/RouterAnalyzer.d.ts

@@ -8,4 +8,5 @@ export declare class RouterAnalyzer extends AbstractAnnotationAnalyzer {
     analyze(sourceFile: SourceFile, filePath: string, context: HMRouterExtensionContext): void;
     private addToResultSet;
     private checkNavDestinationUsage;
+    private extractComponentNameFromNode;
 }

package/dist/hmrouter_extension/analyzer/RouterAnalyzer.js

@@ -14,22 +14,20 @@ class RouterAnalyzer extends AbstractAnnotationAnalyzer_1.AbstractAnnotationAnal
     }
     analyze(sourceFile, filePath, context) {
         framework_1.Logger.debug('', `Start to analyze source file: ${filePath}`);
-        const viewNameArr = sourceFile
-            .getChildrenOfKind(ts_morph_1.SyntaxKind.ExpressionStatement)
-            .map((node) => node.getText())
-            .filter((text) => text !== 'struct');
-        sourceFile.getChildrenOfKind(ts_morph_1.SyntaxKind.MissingDeclaration).forEach((node, index) => {
+        sourceFile.getChildrenOfKind(ts_morph_1.SyntaxKind.MissingDeclaration).forEach((node) => {
+            const componentName = this.extractComponentNameFromNode(node);
             node.getChildrenOfKind(ts_morph_1.SyntaxKind.Decorator).forEach((decorator) => {
                 if (decorator.getName() === constants_1.AnnotationConstants.ROUTER_ANNOTATION) {
-                    const result = this.addToResultSet(decorator, viewNameArr[index], filePath, sourceFile);
+                    const result = this.addToResultSet(decorator, componentName, filePath, sourceFile);
                     context.addAnalyzeResults(result);
                 }
             });
         });
-        sourceFile.getExportAssignments().forEach((exportAssignment, index) => {
+        sourceFile.getExportAssignments().forEach((exportAssignment) => {
+            const componentName = exportAssignment.getNextSiblingIfKind(ts_morph_1.SyntaxKind.ExpressionStatement)?.getText() || '';
             exportAssignment.getDescendantsOfKind(ts_morph_1.SyntaxKind.Decorator).forEach((decorator) => {
                 if (decorator.getName() === constants_1.AnnotationConstants.ROUTER_ANNOTATION) {
-                    const result = this.addToResultSet(decorator, viewNameArr[index], filePath, sourceFile);
+                    const result = this.addToResultSet(decorator, componentName, filePath, sourceFile);
                     context.addAnalyzeResults(result);
                     context.addTemplateData(result.name, { isDefaultExport: 'true' });
                 }
@@ -75,5 +73,15 @@ class RouterAnalyzer extends AbstractAnnotationAnalyzer_1.AbstractAnnotationAnal
             }
         });
     }
+    extractComponentNameFromNode(node) {
+        const nextSibling = node.getNextSiblingIfKind(ts_morph_1.SyntaxKind.ExpressionStatement);
+        if (nextSibling && nextSibling.getText() === constants_1.PluginConstants.STRUCT_KEYWORD) {
+            const componentName = nextSibling.getNextSiblingIfKind(ts_morph_1.SyntaxKind.ExpressionStatement);
+            if (componentName) {
+                return componentName.getText();
+            }
+        }
+        return '';
+    }
 }
 exports.RouterAnalyzer = RouterAnalyzer;

package/dist/hmrouter_extension/config/HMRouterPluginConfig.js

@@ -48,11 +48,10 @@ class HMRouterPluginConfig {
         return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.RAWFILE_DIR);
     }
     getDefaultTplFilePath() {
-        let templateFilePath = framework_1.PluginFileUtil.pathResolve(this.configDir, this.defaultPageTemplate);
-        if (framework_1.PluginFileUtil.exist(templateFilePath)) {
-            return templateFilePath;
+        if (path_1.default.isAbsolute(this.defaultPageTemplate) && framework_1.PluginFileUtil.exist(this.defaultPageTemplate)) {
+            return this.defaultPageTemplate;
         }
-        return framework_1.PluginFileUtil.pathResolve(__dirname, constants_1.FilePathConstants.PARENT_DELIMITER.repeat(3) + this.defaultPageTemplate);
+        return framework_1.PluginFileUtil.pathResolve(__dirname, constants_1.FilePathConstants.PARENT_DELIMITER.repeat(3) + constants_1.TemplateConstants.VIEW_BUILDER_TEMPLATE);
     }
     getObfuscationFilePath() {
         return framework_1.PluginFileUtil.pathResolve(this.modulePath, constants_1.FilePathConstants.OBFUSCATION_FILE_NAME);

package/dist/hmrouter_extension/constants/PluginConstants.d.ts

@@ -3,4 +3,5 @@ export default class PluginConstants {
     static readonly HSP_PLUGIN_ID = "HSP_HMROUTER_PLUGIN";
     static readonly HAR_PLUGIN_ID = "HAR_HMROUTER_PLUGIN";
     static readonly HAR_MODULE_NAME = "har";
+    static readonly STRUCT_KEYWORD = "struct";
 }

package/dist/hmrouter_extension/constants/PluginConstants.js

@@ -7,3 +7,4 @@ PluginConstants.HAP_PLUGIN_ID = 'HAP_HMROUTER_PLUGIN';
 PluginConstants.HSP_PLUGIN_ID = 'HSP_HMROUTER_PLUGIN';
 PluginConstants.HAR_PLUGIN_ID = 'HAR_HMROUTER_PLUGIN';
 PluginConstants.HAR_MODULE_NAME = 'har';
+PluginConstants.STRUCT_KEYWORD = 'struct';

package/dist/hmrouter_extension/processor/CodeGenerationProcessor.js

@@ -33,7 +33,8 @@ class CodeGenerationProcessor {
         tempFilePath = this.determineTemplatePath(result, tempFilePath);
         const generatedFilePath = this.generateFile(templateModel, tempFilePath);
         framework_1.Logger.info(this.context.node.getNodeName(), `Builder ${templateModel.generatorViewName}.ets has been generated in ${generatedFilePath}`);
-        this.context.generatedPaths.set(result.name, generatedFilePath);
+        const uniqueKey = `${result.name}#${result.pageUrl}`;
+        this.context.generatedPaths.set(uniqueKey, generatedFilePath);
     }
     matchedPath(filePath, customPageTemplate, defaultTplFilePath) {
         for (const template of customPageTemplate) {

package/dist/hmrouter_extension/processor/InitializerProcessor.d.ts

@@ -9,6 +9,7 @@ export declare class InitializerProcessor {
     private readConfigFile;
     private readProjectConfig;
     private readModuleConfig;
+    private resolveConfigPaths;
     private mergeConfigs;
     private setupAppContext;
     private createConfigInstance;

package/dist/hmrouter_extension/processor/InitializerProcessor.js

@@ -52,12 +52,27 @@ class InitializerProcessor {
         return configParam;
     }
     readProjectConfig() {
-        const projectConfigFilePath = framework_1.PluginFileUtil.pathResolve(framework_1.PluginStore.getInstance().get('projectFilePath'), constants_1.FilePathConstants.CONFIG_FILE_NAME);
-        return this.readConfigFile(projectConfigFilePath);
+        const projectPath = framework_1.PluginStore.getInstance().get('projectFilePath');
+        const projectConfigFilePath = framework_1.PluginFileUtil.pathResolve(projectPath, constants_1.FilePathConstants.CONFIG_FILE_NAME);
+        const configParam = this.readConfigFile(projectConfigFilePath);
+        return this.resolveConfigPaths(configParam, projectPath);
     }
     readModuleConfig(node) {
-        const moduleConfigFilePath = framework_1.PluginFileUtil.pathResolve(node.getNodePath(), constants_1.FilePathConstants.CONFIG_FILE_NAME);
-        return this.readConfigFile(moduleConfigFilePath);
+        const modulePath = node.getNodePath();
+        const moduleConfigFilePath = framework_1.PluginFileUtil.pathResolve(modulePath, constants_1.FilePathConstants.CONFIG_FILE_NAME);
+        const configParam = this.readConfigFile(moduleConfigFilePath);
+        return this.resolveConfigPaths(configParam, modulePath);
+    }
+    resolveConfigPaths(configParam, basePath) {
+        if (configParam.defaultPageTemplate) {
+            configParam.defaultPageTemplate = framework_1.PluginFileUtil.pathResolve(basePath, configParam.defaultPageTemplate);
+        }
+        if (configParam.customPageTemplate) {
+            configParam.customPageTemplate.forEach((item) => {
+                item.templatePath = framework_1.PluginFileUtil.pathResolve(basePath, item.templatePath);
+            });
+        }
+        return configParam;
     }
     mergeConfigs(projectConfigParam, moduleConfigParam) {
         const defaultConfig = {
@@ -80,6 +95,7 @@ class InitializerProcessor {
         if (appContext) {
             framework_1.PluginStore.getInstance().set('projectFilePath', appContext.getProjectPath());
             framework_1.PluginStore.getInstance().set('appContext', appContext);
+            framework_1.PluginStore.getInstance().set('buildMode', appContext.getBuildMode());
         }
     }
     createConfigInstance(node, configParam) {
@@ -89,7 +105,16 @@ class InitializerProcessor {
             let packageJson = framework_1.PluginFileUtil.readJson5(framework_1.PluginFileUtil.pathResolve(node.getNodePath(), constants_1.FilePathConstants.OH_PACKAGE_FILE_NAME));
             nodeName = packageJson.name;
         }
-        return new HMRouterPluginConfig_1.HMRouterPluginConfig(nodeName, modulePath, modulePath, configParam);
+        let configDir = modulePath;
+        const moduleConfigPath = framework_1.PluginFileUtil.pathResolve(modulePath, constants_1.FilePathConstants.CONFIG_FILE_NAME);
+        const projectConfigPath = framework_1.PluginFileUtil.pathResolve(framework_1.PluginStore.getInstance().get('projectFilePath'), constants_1.FilePathConstants.CONFIG_FILE_NAME);
+        if (framework_1.PluginFileUtil.exist(moduleConfigPath)) {
+            configDir = modulePath;
+        }
+        else if (framework_1.PluginFileUtil.exist(projectConfigPath)) {
+            configDir = framework_1.PluginStore.getInstance().get('projectFilePath');
+        }
+        return new HMRouterPluginConfig_1.HMRouterPluginConfig(nodeName, modulePath, configDir, configParam);
     }
 }
 exports.InitializerProcessor = InitializerProcessor;

package/dist/hmrouter_extension/processor/ObfuscationProcessor.d.ts

@@ -3,7 +3,6 @@ export declare class ObfuscationProcessor {
     private context;
     constructor(context: HMRouterExtensionContext);
     execute(): void;
-    private checkObfuscationEnabled;
     private generateObfuscationRuleFile;
     private handleHarPackageLogic;
     private isEnableObfuscation;

package/dist/hmrouter_extension/processor/ObfuscationProcessor.js

@@ -9,15 +9,14 @@ class ObfuscationProcessor {
     }
     execute() {
         framework_1.Logger.debug(this.context.node.getNodeName(), `Start to obfuscation...`);
-        if (!this.checkObfuscationEnabled()) {
+        const buildProfileOpt = this.context.moduleContext?.getBuildProfileOpt();
+        if (!this.isEnableObfuscation(buildProfileOpt)) {
             framework_1.Logger.info(this.context.node.getNodeName(), 'This compilation does not turn on code obfuscation, skip hmrouter_obfuscation_rules.txt file generation');
             return;
         }
         const obfuscationString = this.generateObfuscationRuleFile();
         this.handleHarPackageLogic(obfuscationString);
-    }
-    checkObfuscationEnabled() {
-        return this.isEnableObfuscation();
+        this.context.moduleContext?.setBuildProfileOpt(buildProfileOpt);
     }
     generateObfuscationRuleFile() {
         const obfuscationFilePath = framework_1.PluginFileUtil.pathResolve(this.context.config.modulePath, constants_1.FilePathConstants.OBFUSCATION_FILE_NAME);
@@ -35,11 +34,9 @@ class ObfuscationProcessor {
             framework_1.PluginFileUtil.writeFileSync(consumerRulesPath, obfuscationString);
         }
     }
-    isEnableObfuscation() {
+    isEnableObfuscation(buildProfileOpt) {
         const currentBuildMode = framework_1.PluginStore.getInstance().get('buildMode');
-        const buildOption = this.context.moduleContext
-            ?.getBuildProfileOpt()
-            .buildOptionSet?.find((item) => item.name === currentBuildMode);
+        const buildOption = buildProfileOpt.buildOptionSet?.find((item) => item.name === currentBuildMode);
         if (!buildOption) {
             return false;
         }
@@ -89,7 +86,7 @@ class ObfuscationProcessor {
                 return routerInfo.name.includes('__');
             })
                 .map((routerInfo) => {
-                return routerInfo.customData.className;
+                return routerInfo.customData.name;
             })),
         ];
         let functionName = [

package/dist/hmrouter_extension/processor/ResourceProcessor.js

@@ -27,6 +27,20 @@ class ResourceProcessProcessor {
         let rawFileRouterMap = JSON.parse(framework_1.PluginFileUtil.readFileSync(rawFilePath).toString());
         rawFileRouterMap.hspModuleNames = [...new Set(framework_1.PluginStore.getInstance().get('hspModuleNames'))];
         rawFileRouterMap.hspModuleNames.push(...this.getRemoteHspModuleNames(this.context.node.getAllPluginIds()));
+        let hspModulesInfo = framework_1.PluginStore.getInstance().get('hspModulesInfo');
+        if (hspModulesInfo && hspModulesInfo.length > 0) {
+            rawFileRouterMap.hspModulesInfo = hspModulesInfo;
+        }
+        else {
+            rawFileRouterMap.hspModulesInfo = [];
+        }
+        let remoteHspModuleNames = this.getRemoteHspModuleNames(this.context.node.getAllPluginIds());
+        for (const remoteName of remoteHspModuleNames) {
+            rawFileRouterMap.hspModulesInfo.push({
+                moduleName: remoteName,
+                packageName: remoteName
+            });
+        }
         framework_1.PluginFileUtil.writeFileSync(rawFilePath, JSON.stringify(rawFileRouterMap));
     }
     getRemoteHspModuleNames(pluginIds) {

package/dist/hmrouter_extension/processor/RouterMapBuildingProcessor.js

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.RouterMapBuildingProcessor = void 0;
 const framework_1 = require("../../framework");
 const constants_1 = require("../constants");
-const AnnotationAnalyzerRegistry_1 = require("../analyzer/AnnotationAnalyzerRegistry");
-const ConstantAnalyzer_1 = require("../analyzer/utils/ConstantAnalyzer");
 const PluginError_1 = require("../error/PluginError");
 class RouterMapBuildingProcessor {
     constructor(context) {
@@ -13,9 +11,6 @@ class RouterMapBuildingProcessor {
     execute() {
         framework_1.Logger.debug(this.context.node.getNodeName(), `Start to build router map...`);
         this.readExistingRouterMap();
-        const constantResolver = AnnotationAnalyzerRegistry_1.AnnotationAnalyzerRegistry.getInstance().getConstantResolver();
-        const constantAnalyzer = new ConstantAnalyzer_1.ConstantAnalyzer(constantResolver);
-        constantAnalyzer.parseConstants(this.context.getAnalyzeResults());
         for (const result of this.context.getAnalyzeResults()) {
             this.buildRouterMap(result);
         }
@@ -30,7 +25,8 @@ class RouterMapBuildingProcessor {
             .replaceAll(constants_1.FilePathConstants.FILE_SEPARATOR, constants_1.FilePathConstants.DELIMITER);
         if (result.annotation === constants_1.AnnotationConstants.ROUTER_ANNOTATION) {
             let pageUrl = result.pageUrl;
-            let builderPath = this.context.generatedPaths.get(result.name) || '';
+            let uniqueKey = `${result.name}#${pageUrl}`;
+            let builderPath = this.context.generatedPaths.get(uniqueKey) || '';
             this.context.routerMap.push({
                 name: pageUrl,
                 pageSourceFile: builderPath,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hadss/hmrouter-plugin",
-  "version": "1.1.1-alpha.0",
+  "version": "1.2.0-beta.2",
   "description": "HMRouter Compiler Plugin",
   "main": "dist/Index.js",
   "scripts": {
@@ -37,6 +37,7 @@
     "ts-node": "^10.9.2"
   },
   "publishConfig": {
+    "access": "public",
     "registry": "https://registry.npmjs.org"
   },
   "homepage": "https://gitcode.com/openharmony-sig/ohrouter",

package/template/viewBuilder.ejs

@@ -39,7 +39,7 @@ export struct <%= componentName %>Generated {
     .gestureModifier(this.helper.gestureModifier)
     .onWillAppear(()=>{this.helper.onWillAppear()})
     .onAppear(() => {this.helper.onAppear()})
-    .onWillShow(()=>{this.helper.onWillAppear()})
+    .onWillShow(()=>{this.helper.onWillShow()})
     .onShown(()=>{this.helper.onShown()})
     .onWillHide(()=>{this.helper.onWillHide()})
     .onHidden(()=>{this.helper.onHidden()})

package/dist/HMRouterAnalyzer.d.ts

@@ -1,31 +0,0 @@
-import { AnalyzerResultLike } from './common/PluginModel';
-import { HMRouterPluginConfig } from './HMRouterPluginConfig';
-export declare class AnalyzerController {
-    private analyzeResult;
-    analyzeFile(sourceFilePath: string, config: HMRouterPluginConfig): void;
-    parseConstants(): void;
-    private parsePropertyValue;
-    getAnalyzeResultSet(): Set<AnalyzerResultLike>;
-    clearAnalyzeResultSet(): void;
-}
-export declare class AnalyzerService {
-    private readonly sourceFilePath;
-    private sourceFile;
-    private config;
-    private analyzerResultSet;
-    private importMap;
-    constructor(sourceFilePath: string, config: HMRouterPluginConfig);
-    start(): void;
-    getResult(): Set<AnalyzerResultLike>;
-    private analyzeImport;
-    private analyzeRouter;
-    private parseFileByLineOrder;
-    private analyzeComponent;
-    private addToResultSet;
-    private parseDecorator;
-    private parseDecoratorArguments;
-    private parseIdentifierPropertyValue;
-    private parsePrimitiveValue;
-    private getVariableFilePath;
-    private getOtherModuleVariableFilePath;
-}