@marsx-dev/launcher 0.0.31 → 0.0.32

package/dist/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"AAQA,OAAO,EAA0B,QAAQ,EAAE,MAAM,aAAa,CAAC;AA8J/D,wBAAsB,cAAc,CAAC,SAAS,EAAE,MAAM,uBASrD;AAED,wBAAsB,aAAa,IAAI,OAAO,CAAC,QAAQ,EAAE,CAAC,CAKzD"}
+{"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

@@ -17,6 +17,15 @@ const fileUtils_1 = require("./utils/fileUtils");
 const v3_1 = require("./utils/v3");
 const IMPORTED_BLOCKS_DIR = '_imported';
 let downloadedExternalBlockNames = new Set();
+function isSfcBlock(block) {
+    return 'path' in block;
+}
+function getExternalBlockKey(block) {
+    const folder = isSfcBlock(block) ? block.path.folder : block.Folder;
+    const name = isSfcBlock(block) ? block.path.name : block.Name;
+    const blockTypeName = isSfcBlock(block) ? block.path.blockTypeName : block.Type;
+    return blockTypeName === 'settings' ? `${folder}/${name}.${blockTypeName}` : name;
+}
 function getImportedBlocksRoot() {
     return path_1.default.join(configuration_1.config.blocksDir, IMPORTED_BLOCKS_DIR);
 }
@@ -34,15 +43,16 @@ function isSettingsBlockFile(filePath) {
 }
 function rememberExternalBlocks(blocks) {
     for (const block of blocks) {
-        downloadedExternalBlockNames.add(block.path.name);
+        downloadedExternalBlockNames.add(getExternalBlockKey(block));
     }
 }
 function filterFreshExternalBlocks(blocks) {
     const result = [];
     for (const block of blocks) {
-        if (downloadedExternalBlockNames.has(block.path.name))
+        const blockKey = getExternalBlockKey(block);
+        if (downloadedExternalBlockNames.has(blockKey))
             continue;
-        downloadedExternalBlockNames.add(block.path.name);
+        downloadedExternalBlockNames.add(blockKey);
         result.push(block);
     }
     return result;
@@ -61,9 +71,10 @@ async function downloadFromExternal(externalImport) {
     const v3Resp = await axios_1.default.get(`${url}/api/GetExportedAppBlocks`, { params });
     const v3Blocks = [];
     for (const block of v3Resp.data.reverse()) {
-        if (downloadedExternalBlockNames.has(block.Name))
+        const blockKey = getExternalBlockKey(block);
+        if (downloadedExternalBlockNames.has(blockKey))
             continue;
-        downloadedExternalBlockNames.add(block.Name);
+        downloadedExternalBlockNames.add(blockKey);
         v3Blocks.push((0, v3_1.convertV3ToSfc)(block));
     }
     return { commit: '', hash: '', blocks: v3Blocks };
@@ -159,4 +170,4 @@ async function loadAllBlocks() {
     return [...externalBlocks, ...localBlocks];
 }
 exports.loadAllBlocks = loadAllBlocks;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"loader.js","sourceRoot":"","sources":["../src/loader.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marsx-dev/launcher",
-  "version": "0.0.31",
+  "version": "0.0.32",
   "description": "MarsX launcher",
   "author": "MarsX team <team@marsx.dev>",
   "homepage": "https://marsx.dev/",

package/src/loader.ts

@@ -14,6 +14,17 @@ type V4Response = { commit: string; hash: string; blocks: SfcBlock[] };
 const IMPORTED_BLOCKS_DIR = '_imported';
 let downloadedExternalBlockNames = new Set<string>();
 
+function isSfcBlock(block: SfcBlock | V3MongoBlock): block is SfcBlock {
+  return 'path' in block;
+}
+
+function getExternalBlockKey(block: SfcBlock | V3MongoBlock) {
+  const folder = isSfcBlock(block) ? block.path.folder : block.Folder;
+  const name = isSfcBlock(block) ? block.path.name : block.Name;
+  const blockTypeName = isSfcBlock(block) ? block.path.blockTypeName : block.Type;
+  return blockTypeName === 'settings' ? `${folder}/${name}.${blockTypeName}` : name;
+}
+
 function getImportedBlocksRoot() {
   return path.join(config.blocksDir, IMPORTED_BLOCKS_DIR);
 }
@@ -35,7 +46,7 @@ function isSettingsBlockFile(filePath: string) {
 
 function rememberExternalBlocks(blocks: SfcBlock[]) {
   for (const block of blocks) {
-    downloadedExternalBlockNames.add(block.path.name);
+    downloadedExternalBlockNames.add(getExternalBlockKey(block));
   }
 }
 
@@ -43,9 +54,10 @@ function filterFreshExternalBlocks(blocks: SfcBlock[]) {
   const result: SfcBlock[] = [];
 
   for (const block of blocks) {
-    if (downloadedExternalBlockNames.has(block.path.name)) continue;
+    const blockKey = getExternalBlockKey(block);
+    if (downloadedExternalBlockNames.has(blockKey)) continue;
 
-    downloadedExternalBlockNames.add(block.path.name);
+    downloadedExternalBlockNames.add(blockKey);
     result.push(block);
   }
 
@@ -68,9 +80,10 @@ async function downloadFromExternal(externalImport: ImportProjectConfig): Promis
   const v3Blocks: SfcBlock[] = [];
 
   for (const block of v3Resp.data.reverse()) {
-    if (downloadedExternalBlockNames.has(block.Name)) continue;
+    const blockKey = getExternalBlockKey(block);
+    if (downloadedExternalBlockNames.has(blockKey)) continue;
 
-    downloadedExternalBlockNames.add(block.Name);
+    downloadedExternalBlockNames.add(blockKey);
     v3Blocks.push(convertV3ToSfc(block));
   }