@nasl/cli 0.3.4 → 0.3.5

package/dist/index.mjs

@@ -39,7 +39,18 @@ const DEFAULT_CONFIG = {
 const CONFIG_FILE_NAME = 'nasl.config.json';
 
 function createSorter() {
-    const priorityOrder = ['app.dataSources', 'app.enums', 'app.structures', 'app.logics', 'app.frontendTypes'];
+    const priorityOrder = [
+        'extensions',
+        'apis',
+        'connectors',
+        'app.backend.variables',
+        'app.roles',
+        'app.enums',
+        'app.dataSources',
+        'app.structures',
+        'app.logics',
+        'app.frontendTypes',
+    ];
     // 获取优先级索引
     const getPriority = (str) => {
         const prefixIndex = priorityOrder.findIndex((p) => str.startsWith(p));
@@ -53,13 +64,11 @@ function createSorter() {
             return aPriority - bPriority;
         }
         // 如果是frontendTypes，按字母顺序排序
-        if (aPriority === 4) {
+        if (a.startsWith('app.frontendTypes') && b.startsWith('app.frontendTypes')) {
             return a.localeCompare(b);
         }
-        else {
-            // 其他情况保持原顺序
-            return 0;
-        }
+        // 其他情况保持原顺序
+        return 0;
     };
 }
 const sorter = createSorter();
@@ -127,11 +136,15 @@ function composeToString(files, options) {
         const isVariablesFile = nameFromPath === 'variables';
         const isExtensionsFile = arr[0] === 'extensions';
         const isThemeCss = ext === 'css' && nameFromPath === 'theme';
-        const isSpecialFile = isVariablesFile || isExtensionsFile || isThemeCss;
+        const isRolesJson = file.path === 'app.roles.json';
+        const isSpecialFile = isVariablesFile || isExtensionsFile || isThemeCss || isRolesJson;
         // 特殊文件的 namespace ${包含文件名，普通文件不包含
         const namespace = isSpecialFile ? [...arr, nameFromPath].join('.') : arr.join('.');
         let content = file.content;
-        if (['ts', 'tsx'].includes(ext)) {
+        if (isRolesJson) {
+            content = `  $roles(${content});`;
+        }
+        else if (['ts', 'tsx'].includes(ext)) {
             if (isVariablesFile) {
                 validateVariablesFile(file, errors);
             }
@@ -13754,6 +13767,13 @@ function writeFileWithLog(filePath, content, logger) {
  * NASL 支持的所有文件类型配置
  */
 const NASL_FILE_TYPES = [
+    {
+        name: 'roles',
+        description: '角色',
+        fileNamePattern: 'app\\.roles\\.json',
+        codeRefPattern: '',
+        extension: 'json',
+    },
     {
         name: 'theme-css',
         description: '主题样式',
@@ -13850,7 +13870,7 @@ const fileNamePatterns = getFileNamePatterns();
  * 获取用于提取代码引用的正则表达式数组
  */
 function getCodeRefPatterns() {
-    return NASL_FILE_TYPES.map((type) => new RegExp(type.codeRefPattern, 'g'));
+    return NASL_FILE_TYPES.filter((type) => type.codeRefPattern).map((type) => new RegExp(type.codeRefPattern, 'g'));
 }
 const codeRefPatterns = getCodeRefPatterns();
 /**
@@ -13885,7 +13905,7 @@ function shouldSkipDependencyTraversal(depPath) {
 async function scanNASLFiles(srcDir, representation, logger) {
     try {
         const pattern = representation === 'NaturalTS' ? '**/*.{ts,tsx}' : '**/*.nasl';
-        const files = await globby([pattern, '**/app.frontendTypes.pc.frontends.pc.theme.css'], {
+        const files = await globby([pattern, 'app.frontendTypes.pc.frontends.pc.theme.css', 'app.roles.json'], {
             cwd: srcDir,
             onlyFiles: true,
             absolute: false,
@@ -14119,9 +14139,9 @@ function buildExternalDependencies(refs, mergedDeps, logger) {
 function replaceViewAsSignature(content, hasSubViews = false) {
     if (hasSubViews) {
         // 如果有子页面，替换为返回 ElRouterView 的函数
-        return content.replace(/export function ((\w+)\([^)]*\)) \{[\s\S]+$/, 'export function $1 {\n    return <ElRouterView />\n}');
+        return content.replace(/export function ((\w+)\([\s\S]*?\)) \{[\s\S]+$/, 'export function $1 {\n    return <ElRouterView />\n}');
     }
-    return content.replace(/export function ((\w+)\([^)]*\)) \{[\s\S]+$/, 'export declare function $1;');
+    return content.replace(/export function ((\w+)\([\s\S]*?\)) \{[\s\S]+$/, 'export declare function $1;');
 }
 /**
  * 处理单个文件的依赖
@@ -14163,8 +14183,10 @@ function processFileDeps(pathRelativeToSrc, srcDir, matchedFileSet, processedFil
     processedFileMap.set(pathRelativeToSrc, fileInfo);
     // 提取依赖
     // extensions/connectors/apis/uilibs 作为叶子节点，不再向下递归查找依赖
+    // JSON 文件（如 app.roles.json）无代码引用，跳过依赖分析
     const isExternalDep = shouldSkipDependencyTraversal(pathRelativeToSrc);
-    const deps = isExternalDep ? [] : extractDeps(fileInfo.content);
+    const isRolesJson = pathRelativeToSrc === 'app.roles.json';
+    const deps = isExternalDep || isRolesJson ? [] : extractDeps(fileInfo.content);
     // 查找依赖文件
     if (isView) {
         const pathArr = pathRelativeToSrc.split('.');
@@ -14290,7 +14312,7 @@ async function resolveNASLFiles(entry, logger, depMode, verbose) {
     }
     let externalRefs = null;
     if (!entry && depMode)
-        entry = 'src/**/app.*.{ts,tsx,css}';
+        entry = ['src/**/app.*.{ts,tsx,css}', 'src/app.roles.json'];
     if (entry) {
         // 检查入口路径是否在源代码目录外面
         // if (entry.startsWith('..')) throw new Error('入口路径不能在源代码目录外面');