@marsx-dev/launcher 0.0.31 → 0.0.33
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/dist/loader.d.ts.map +1 -1
- package/dist/loader.js +18 -7
- package/package.json +1 -1
- package/src/loader.ts +19 -6
package/dist/loader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAQA,OAAO,EAA0B,QAAQ,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAQA,OAAO,EAA0B,QAAQ,EAAE,MAAM,aAAa,CAAC;AA2K/D,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,uBASrD;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAKzD"}
|
package/dist/loader.js
CHANGED
|
@@ -17,6 +17,15 @@ const fileUtils_1 = require("./utils/fileUtils");
|
|
|
17
17
|
const v3_1 = require("./utils/v3");
|
|
18
18
|
const IMPORTED_BLOCKS_DIR = '_imported';
|
|
19
19
|
let downloadedExternalBlockNames = new Set();
|
|
20
|
+
function isSfcBlock(block) {
|
|
21
|
+
return 'path' in block;
|
|
22
|
+
}
|
|
23
|
+
function getExternalBlockKey(block) {
|
|
24
|
+
const folder = isSfcBlock(block) ? block.path.folder : block.Folder;
|
|
25
|
+
const name = isSfcBlock(block) ? block.path.name : block.Name;
|
|
26
|
+
const blockTypeName = isSfcBlock(block) ? block.path.blockTypeName : block.Type;
|
|
27
|
+
return blockTypeName === 'settings' ? `${folder}/${name}.${blockTypeName}` : name;
|
|
28
|
+
}
|
|
20
29
|
function getImportedBlocksRoot() {
|
|
21
30
|
return path_1.default.join(configuration_1.config.blocksDir, IMPORTED_BLOCKS_DIR);
|
|
22
31
|
}
|
|
@@ -34,15 +43,16 @@ function isSettingsBlockFile(filePath) {
|
|
|
34
43
|
}
|
|
35
44
|
function rememberExternalBlocks(blocks) {
|
|
36
45
|
for (const block of blocks) {
|
|
37
|
-
downloadedExternalBlockNames.add(block
|
|
46
|
+
downloadedExternalBlockNames.add(getExternalBlockKey(block));
|
|
38
47
|
}
|
|
39
48
|
}
|
|
40
49
|
function filterFreshExternalBlocks(blocks) {
|
|
41
50
|
const result = [];
|
|
42
51
|
for (const block of blocks) {
|
|
43
|
-
|
|
52
|
+
const blockKey = getExternalBlockKey(block);
|
|
53
|
+
if (downloadedExternalBlockNames.has(blockKey))
|
|
44
54
|
continue;
|
|
45
|
-
downloadedExternalBlockNames.add(
|
|
55
|
+
downloadedExternalBlockNames.add(blockKey);
|
|
46
56
|
result.push(block);
|
|
47
57
|
}
|
|
48
58
|
return result;
|
|
@@ -60,10 +70,11 @@ async function downloadFromExternal(externalImport) {
|
|
|
60
70
|
}
|
|
61
71
|
const v3Resp = await axios_1.default.get(`${url}/api/GetExportedAppBlocks`, { params });
|
|
62
72
|
const v3Blocks = [];
|
|
63
|
-
for (const block of v3Resp.data
|
|
64
|
-
|
|
73
|
+
for (const block of v3Resp.data) {
|
|
74
|
+
const blockKey = getExternalBlockKey(block);
|
|
75
|
+
if (downloadedExternalBlockNames.has(blockKey))
|
|
65
76
|
continue;
|
|
66
|
-
downloadedExternalBlockNames.add(
|
|
77
|
+
downloadedExternalBlockNames.add(blockKey);
|
|
67
78
|
v3Blocks.push((0, v3_1.convertV3ToSfc)(block));
|
|
68
79
|
}
|
|
69
80
|
return { commit: '', hash: '', blocks: v3Blocks };
|
|
@@ -159,4 +170,4 @@ async function loadAllBlocks() {
|
|
|
159
170
|
return [...externalBlocks, ...localBlocks];
|
|
160
171
|
}
|
|
161
172
|
exports.loadAllBlocks = loadAllBlocks;
|
|
162
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
173
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/loader.ts
CHANGED
|
@@ -14,6 +14,17 @@ type V4Response = { commit: string; hash: string; blocks: SfcBlock[] };
|
|
|
14
14
|
const IMPORTED_BLOCKS_DIR = '_imported';
|
|
15
15
|
let downloadedExternalBlockNames = new Set<string>();
|
|
16
16
|
|
|
17
|
+
function isSfcBlock(block: SfcBlock | V3MongoBlock): block is SfcBlock {
|
|
18
|
+
return 'path' in block;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
function getExternalBlockKey(block: SfcBlock | V3MongoBlock) {
|
|
22
|
+
const folder = isSfcBlock(block) ? block.path.folder : block.Folder;
|
|
23
|
+
const name = isSfcBlock(block) ? block.path.name : block.Name;
|
|
24
|
+
const blockTypeName = isSfcBlock(block) ? block.path.blockTypeName : block.Type;
|
|
25
|
+
return blockTypeName === 'settings' ? `${folder}/${name}.${blockTypeName}` : name;
|
|
26
|
+
}
|
|
27
|
+
|
|
17
28
|
function getImportedBlocksRoot() {
|
|
18
29
|
return path.join(config.blocksDir, IMPORTED_BLOCKS_DIR);
|
|
19
30
|
}
|
|
@@ -35,7 +46,7 @@ function isSettingsBlockFile(filePath: string) {
|
|
|
35
46
|
|
|
36
47
|
function rememberExternalBlocks(blocks: SfcBlock[]) {
|
|
37
48
|
for (const block of blocks) {
|
|
38
|
-
downloadedExternalBlockNames.add(block
|
|
49
|
+
downloadedExternalBlockNames.add(getExternalBlockKey(block));
|
|
39
50
|
}
|
|
40
51
|
}
|
|
41
52
|
|
|
@@ -43,9 +54,10 @@ function filterFreshExternalBlocks(blocks: SfcBlock[]) {
|
|
|
43
54
|
const result: SfcBlock[] = [];
|
|
44
55
|
|
|
45
56
|
for (const block of blocks) {
|
|
46
|
-
|
|
57
|
+
const blockKey = getExternalBlockKey(block);
|
|
58
|
+
if (downloadedExternalBlockNames.has(blockKey)) continue;
|
|
47
59
|
|
|
48
|
-
downloadedExternalBlockNames.add(
|
|
60
|
+
downloadedExternalBlockNames.add(blockKey);
|
|
49
61
|
result.push(block);
|
|
50
62
|
}
|
|
51
63
|
|
|
@@ -67,10 +79,11 @@ async function downloadFromExternal(externalImport: ImportProjectConfig): Promis
|
|
|
67
79
|
const v3Resp = await axios.get<V3MongoBlock[]>(`${url}/api/GetExportedAppBlocks`, { params });
|
|
68
80
|
const v3Blocks: SfcBlock[] = [];
|
|
69
81
|
|
|
70
|
-
for (const block of v3Resp.data
|
|
71
|
-
|
|
82
|
+
for (const block of v3Resp.data) {
|
|
83
|
+
const blockKey = getExternalBlockKey(block);
|
|
84
|
+
if (downloadedExternalBlockNames.has(blockKey)) continue;
|
|
72
85
|
|
|
73
|
-
downloadedExternalBlockNames.add(
|
|
86
|
+
downloadedExternalBlockNames.add(blockKey);
|
|
74
87
|
v3Blocks.push(convertV3ToSfc(block));
|
|
75
88
|
}
|
|
76
89
|
|