@lcap/nasl 3.9.3-rc.5 → 3.9.3-testing.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"incremental.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/incremental.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EAIJ,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAEL,eAAe,EAGhB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,2BAA2B,EAAwB,MAAM,SAAS,CAAC;AAG5E,WAAW;AACX,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,eAAe,EACjC,MAAM,oCAAiB,GACtB,OAAO,CAAC,2BAA2B,CAAC,CAyLtC"}
1
+ {"version":3,"file":"incremental.d.ts","sourceRoot":"","sources":["../../../src/generator/annotation/incremental.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,GAAG,EAIJ,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EAEL,eAAe,EAGhB,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,2BAA2B,EAAwB,MAAM,SAAS,CAAC;AAG5E,WAAW;AACX,wBAAsB,4BAA4B,CAChD,GAAG,EAAE,GAAG,EACR,MAAM,EAAE,UAAU,EAClB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,eAAe,EACjC,MAAM,oCAAiB,GACtB,OAAO,CAAC,2BAA2B,CAAC,CA4MtC"}
@@ -13,8 +13,13 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
13
13
  await logger.info(utils_1.LogEventName, '开始进行增量标注');
14
14
  // 这里因为没有调用 OpenApp 所以必须要手动添加
15
15
  app.naslServer = server;
16
+ console.time('生成模块图');
16
17
  const moduleGraph = nasl_language_server_core_1.ModuleGraph.fromNaslData(app);
18
+ console.timeEnd('生成模块图');
17
19
  const moduleGraphCacheMap = (0, utils_1.moduleGraphCacheToMap)(moduleGraphCache);
20
+ let useCacheTime = 0;
21
+ let annotationTime = 0;
22
+ let tsWorkerConnection = 0;
18
23
  await logger.info(utils_1.LogEventName, '生成模块图成功');
19
24
  const setAnnotationNode = async (node) => {
20
25
  const fullTsFile = await (0, nasl_utils_1.runGeneratorAsync)(node.toEmbeddedTSFile());
@@ -71,7 +76,7 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
71
76
  }
72
77
  });
73
78
  };
74
- await logger.info(utils_1.LogEventName, '增量标注开始,进度 0%...');
79
+ await logger.info(utils_1.LogEventName, '增量标注开始...');
75
80
  const typesMapCache = new Map();
76
81
  const allModules = moduleGraph.getModules();
77
82
  const totalModuleCount = allModules.reduce((ans, item) => ans + item.count, 0);
@@ -90,8 +95,8 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
90
95
  const { nodePath } = node;
91
96
  const nodeCache = getNaslNodeCache(node);
92
97
  const moduleCache = nodeCache ? getModuleCache(nodePath) : undefined;
98
+ const cacheLastModifyTime = nodeCache ? (0, service_1.getModuleSubTreeData)(nodeCache).lastModifyTime : -1;
93
99
  const modDepModules = mod.getDependencyModules().map((item) => item.dependency);
94
- const cacheLastModifyTime = (0, service_1.getModuleSubTreeData)(nodeCache).lastModifyTime;
95
100
  // 模块需要重新标注
96
101
  if (
97
102
  // 无节点缓存表示是新节点
@@ -104,21 +109,28 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
104
109
  !isSameDependency(moduleCache.dependency ?? [], modDepModules.map((item) => item.name)) ||
105
110
  // 有模块缓存,依赖也没变,但是有依赖的签名改变
106
111
  modDepModules.some((dep) => getModuleStatus(dep) === nasl_language_server_core_1.ModuleStatusInTopologicalSort.VisitedWithModify)) {
112
+ const start = Date.now();
107
113
  const data = await setAnnotationNode(node);
108
114
  tsFiles.push(data);
109
115
  annotationModules.push(mod);
116
+ annotationTime += Date.now() - start;
110
117
  }
111
118
  // 使用缓存
112
119
  else {
120
+ const start = Date.now();
113
121
  const tsFile = mod.node.getEmbeddedFilePath();
114
122
  const tsContent = moduleCache.signature;
115
123
  tsFiles.push({ file: tsFile, fileContent: tsContent });
116
124
  mod.updateSignature(tsContent);
117
125
  useCacheAnnotation(mod, nodeCache);
126
+ useCacheTime += Date.now() - start;
118
127
  }
119
128
  }
129
+ const workerStart = Date.now();
120
130
  await server.writeFiles(tsFiles);
131
+ tsWorkerConnection += Date.now() - workerStart;
121
132
  if (annotationModules.length > 0) {
133
+ const start = Date.now();
122
134
  const types = await server.annotationFiles(annotationModules
123
135
  .map(({ node }) => node)
124
136
  .filter((node) => !(0, service_1.isIgnoreAnnotationFileNode)(node)));
@@ -138,6 +150,7 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
138
150
  }
139
151
  }
140
152
  }
153
+ annotationTime += Date.now() - start;
141
154
  }
142
155
  currentModuleCount += modules.reduce((ans, item) => ans + item.count, 0);
143
156
  await logger.info(utils_1.LogEventName, `增量标注进度:${(currentModuleCount / totalModuleCount * 100).toFixed(2)}%...`);
@@ -146,12 +159,17 @@ async function incrementalAnnotationByCache(app, server, naslCacheData, moduleGr
146
159
  });
147
160
  await logger.info(utils_1.LogEventName, '增量标注完成');
148
161
  await logger.info(utils_1.LogEventName, '生成标注数据开始');
162
+ console.time('生成全量标注数据');
149
163
  const annotationJson = app.toAnnotationJSON(typesMapCache);
164
+ console.timeEnd('生成全量标注数据');
150
165
  await logger.info(utils_1.LogEventName, '生成标注数据结束');
151
166
  // TODO: 导出源码才需要
152
167
  // await logger.info(LogEventName, '替换静态资源开始');
153
168
  // replaceAssets(app, annotationJson);
154
169
  // await logger.info(LogEventName, '替换静态资源结束');
170
+ console.log('使用缓存耗时', useCacheTime);
171
+ console.log('标注差异模块耗时', annotationTime);
172
+ console.log('TS Worker 通信耗时', tsWorkerConnection);
155
173
  return {
156
174
  isFull: modules.length === allModules.length,
157
175
  updatedModules: modules.map((item) => item.name),
@@ -1 +1 @@
1
- {"version":3,"file":"incremental.js","sourceRoot":"","sources":["../../../src/generator/annotation/incremental.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"incremental.js","sourceRoot":"","sources":["../../../src/generator/annotation/incremental.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@lcap/nasl",
3
3
  "description": "NetEase Application Specific Language",
4
- "version": "3.9.3-rc.5",
4
+ "version": "3.9.3-testing.0",
5
5
  "author": "Forrest <rainforest92@126.com>",
6
6
  "main": "./out",
7
7
  "types": "./out/index.d.ts",
@@ -70,16 +70,16 @@
70
70
  "socket.io-client": "2.4.0",
71
71
  "uuid": "8.3.2",
72
72
  "vue-template-compiler": "2.6.14",
73
- "@lcap/nasl-breakpoint": "3.9.3-rc.5",
74
- "@lcap/nasl-concepts": "3.9.3-rc.5",
75
- "@lcap/nasl-log": "3.9.3-rc.5",
76
- "@lcap/nasl-language-server-core": "3.9.3-rc.5",
77
- "@lcap/nasl-sentry": "3.9.3-rc.5",
78
- "@lcap/nasl-translator": "3.9.3-rc.5",
79
- "@lcap/nasl-types": "3.9.3-rc.5",
80
- "@lcap/nasl-typescript-worker": "3.9.3-rc.5",
81
- "@lcap/nasl-unified-frontend-generator": "3.9.3-rc.5",
82
- "@lcap/nasl-utils": "3.9.3-rc.5"
73
+ "@lcap/nasl-breakpoint": "3.9.3-beta.2",
74
+ "@lcap/nasl-language-server-core": "3.9.3-beta.2",
75
+ "@lcap/nasl-concepts": "3.9.3-beta.2",
76
+ "@lcap/nasl-log": "3.9.3-beta.2",
77
+ "@lcap/nasl-sentry": "3.9.3-beta.2",
78
+ "@lcap/nasl-translator": "3.9.3-beta.2",
79
+ "@lcap/nasl-types": "3.9.3-beta.2",
80
+ "@lcap/nasl-typescript-worker": "3.9.3-beta.2",
81
+ "@lcap/nasl-utils": "3.9.3-beta.2",
82
+ "@lcap/nasl-unified-frontend-generator": "3.9.3-beta.2"
83
83
  },
84
84
  "devDependencies": {
85
85
  "@types/babel__core": "7.20.1",
@@ -91,8 +91,8 @@
91
91
  "rimraf": "3.0.2",
92
92
  "typedoc": "0.25.13",
93
93
  "typescript": "5.4.4",
94
- "@lcap/nasl-test-toolkit": "1.0.0",
95
- "@lcap/nasl-tsconfig": "1.0.1"
94
+ "@lcap/nasl-tsconfig": "1.0.1",
95
+ "@lcap/nasl-test-toolkit": "1.0.0"
96
96
  },
97
97
  "scripts": {
98
98
  "clear": "rimraf ./out",