webgal-parser 4.6.1 → 4.6.2
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.
- package/build/cjs/index.cjs +16 -1250
- package/build/es/index.js +16 -1250
- package/build/umd/index.global.js +16 -1250
- package/package.json +3 -13
- package/src/sceneParser.ts +16 -2
- package/src/scriptParser/scriptParser.ts +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "webgal-parser",
|
|
3
|
-
"version": "4.6.
|
|
3
|
+
"version": "4.6.2",
|
|
4
4
|
"description": "WebGAL script parser",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "vitest",
|
|
@@ -17,26 +17,16 @@
|
|
|
17
17
|
"main": "./build/cjs/index.cjs",
|
|
18
18
|
"author": "Mahiru <Mahiru_@outlook.com>",
|
|
19
19
|
"license": "MPL-2.0",
|
|
20
|
-
"dependencies": {
|
|
21
|
-
"chevrotain": "^10.5.0",
|
|
22
|
-
"cloudlogjs": "^1.0.11",
|
|
23
|
-
"lodash": "^4.17.23",
|
|
24
|
-
"tsx": "^3.12.7"
|
|
25
|
-
},
|
|
26
20
|
"devDependencies": {
|
|
27
21
|
"@rollup/plugin-commonjs": "^23.0.2",
|
|
28
|
-
"@rollup/plugin-json": "^5.0.1",
|
|
29
22
|
"@rollup/plugin-node-resolve": "^15.0.1",
|
|
30
|
-
"@rollup/plugin-typescript": "^9.0.2",
|
|
31
|
-
"@types/lodash": "^4.14.189",
|
|
32
23
|
"@types/node": "^18.14.0",
|
|
33
24
|
"@vitest/coverage-c8": "^0.28.5",
|
|
25
|
+
"rimraf": "^3.0.2",
|
|
34
26
|
"rollup": "^3.29.5",
|
|
35
|
-
"rollup-plugin-babel": "^4.4.0",
|
|
36
|
-
"rollup-plugin-terser": "^7.0.2",
|
|
37
27
|
"rollup-plugin-typescript2": "^0.34.1",
|
|
38
|
-
"ts-node": "^10.9.1",
|
|
39
28
|
"tslib": "^2.4.1",
|
|
29
|
+
"tsx": "^3.12.7",
|
|
40
30
|
"typescript": "^4.9.3",
|
|
41
31
|
"vitest": "^0.28.5"
|
|
42
32
|
},
|
package/src/sceneParser.ts
CHANGED
|
@@ -5,7 +5,6 @@ import {
|
|
|
5
5
|
ISentence,
|
|
6
6
|
} from './interface/sceneInterface';
|
|
7
7
|
import { scriptParser } from './scriptParser/scriptParser';
|
|
8
|
-
import uniqWith from 'lodash/uniqWith';
|
|
9
8
|
import { fileType } from './interface/assets';
|
|
10
9
|
import { ConfigMap } from './config/scriptConfig';
|
|
11
10
|
|
|
@@ -54,7 +53,7 @@ export const sceneParser = (
|
|
|
54
53
|
);
|
|
55
54
|
|
|
56
55
|
// 开始资源的预加载
|
|
57
|
-
assetsList =
|
|
56
|
+
assetsList = deduplicateAssets(assetsList);
|
|
58
57
|
assetsPrefetcher(assetsList);
|
|
59
58
|
|
|
60
59
|
return {
|
|
@@ -65,3 +64,18 @@ export const sceneParser = (
|
|
|
65
64
|
subSceneList: subSceneList, // 子场景列表
|
|
66
65
|
};
|
|
67
66
|
};
|
|
67
|
+
|
|
68
|
+
const deduplicateAssets = (assetsList: IAsset[]): IAsset[] => {
|
|
69
|
+
const seenAssets = new Set<string>();
|
|
70
|
+
return assetsList.filter((asset) => {
|
|
71
|
+
if (!asset || typeof asset.url !== 'string' || asset.url === '') {
|
|
72
|
+
return false;
|
|
73
|
+
}
|
|
74
|
+
const assetKey = `${asset.type}:${asset.url}`;
|
|
75
|
+
if (seenAssets.has(assetKey)) {
|
|
76
|
+
return false;
|
|
77
|
+
}
|
|
78
|
+
seenAssets.add(assetKey);
|
|
79
|
+
return true;
|
|
80
|
+
});
|
|
81
|
+
};
|
|
@@ -40,7 +40,7 @@ export const scriptParser = (
|
|
|
40
40
|
const commentSplit = sentenceRaw.split(/(?<!\\);/);
|
|
41
41
|
let newSentenceRaw = commentSplit[0];
|
|
42
42
|
newSentenceRaw = newSentenceRaw.replaceAll('\\;',';');
|
|
43
|
-
const sentenceComment = commentSplit
|
|
43
|
+
const sentenceComment = commentSplit.slice(1).join(';');
|
|
44
44
|
if (newSentenceRaw.trim() === '') {
|
|
45
45
|
// 注释提前返回
|
|
46
46
|
return {
|