jscrambler-metro-plugin 8.4.2 → 8.4.4

package/lib/index.js

@@ -192,12 +192,24 @@ async function obfuscateBundle(
       return [`${chunks[0]}${globalThisPolyfill}`, ...chunks.slice(1)].join('\n');
     }
 
+    let showSource = addShowSource;
+    let startAtFirstColumn = requireStartAtFirstColumn;
+
     const obfuscatedCode = obfusctedUserFiles[i - 1];
+    const sourceFileIgnored = metroUserFilesOnly[i - 1] === obfuscatedCode;
+
+    if (sourceFileIgnored) {
+      // restore excluded files
+      showSource = false;
+      startAtFirstColumn = false;
+      debug && console.log(`debug Jscrambler File ${fileNames[i - 1]} was excluded`);
+    }
+
     const tillCodeEnd = c.substr(
       c.indexOf(JSCRAMBLER_END_ANNOTATION),
       c.length
     );
-    return `${acc}${JSCRAMBLER_BEG_ANNOTATION}${addShowSource ? '"show source";' : ''}${requireStartAtFirstColumn ? '\n' : ''}${obfuscatedCode}${tillCodeEnd}`;
+    return `${acc}${JSCRAMBLER_BEG_ANNOTATION}${showSource ? '"show source";' : ''}${startAtFirstColumn ? '\n' : ''}${obfuscatedCode}${tillCodeEnd}`;
   }, '');
 
   await writeFile(bundlePath, stripJscramblerTags(finalBundle));

package/lib/sourceMaps.js

@@ -36,9 +36,20 @@ module.exports = async function generateSourceMaps(payload) {
   await jscrambler.downloadSourceMaps(Object.assign({protectionId}, config));
 
   // read obfuscated source-map from filesystem
-  const obfuscatedSourceMaps = await Promise.all(metroUserFilesOnly.map((c, i) =>
-    readFile(`${JSCRAMBLER_SOURCE_MAPS_TEMP_FOLDER}/${fileNames[i]}.map`, 'utf8')
-  ));
+  const obfuscatedSourceMaps = await Promise.all(
+    metroUserFilesOnly.map((c, i) =>
+      readFile(
+        `${JSCRAMBLER_SOURCE_MAPS_TEMP_FOLDER}/${fileNames[i]}.map`,
+        'utf8',
+      ).catch((e) => {
+        if (e.code === 'ENOENT') {
+          // when a source file is excluded, the sourcemap is not produced
+          return null;
+        }
+        throw e;
+      }),
+    ),
+  );
 
   // read metro source-map
   const metroSourceMap = await readFile(bundleSourceMapPath, 'utf8');
@@ -46,7 +57,10 @@ module.exports = async function generateSourceMaps(payload) {
 
   const metroSourceMapConsumer = new sourceMap.SourceMapConsumer(metroSourceMap);
   const finalSourceMapGenerator = new sourceMap.SourceMapGenerator({file: bundlePath});
-  const ofuscatedSourceMapConsumers = obfuscatedSourceMaps.map(map => new sourceMap.SourceMapConsumer(map));
+  const ofuscatedSourceMapConsumers = obfuscatedSourceMaps.map((map) =>
+    // when a source file is excluded, the sourcemap is not produced
+    map ? new sourceMap.SourceMapConsumer(map) : null,
+  );
 
   // add all original sources and sourceContents
   metroSourceMapConsumer.sources.forEach(function (sourceFile) {
@@ -80,14 +94,22 @@ module.exports = async function generateSourceMaps(payload) {
       shiftLines = tmpShiftLine;
     }
 
-    if (fileNamesIndex !== -1) {
+    if (
+      fileNamesIndex !== -1 &&
+      /* check if sourceMap was loaded */
+      ofuscatedSourceMapConsumers[fileNamesIndex]
+    ) {
       /* jscrambler obfuscated files */
       const {lineStart, lineEnd, columnStart} = metroBundleLocs[fileNamesIndex];
       const {lineStart: finalLineStart, lineEnd: finalLineEnd} = finalBundleLocs[fileNamesIndex];
       const allGeneratedPositionsFor = ofuscatedSourceMapConsumers[fileNamesIndex].allGeneratedPositionsFor({
         source: normalizePath,
         line: mapping.generatedLine - lineStart + 1 /* avoid line=0 */,
-        column: mapping.generatedColumn - columnStart
+        column:
+          mapping.generatedColumn -
+          (mapping.generatedLine === lineStart
+            ? columnStart /* column start should be applied only to the first line */
+            : 0),
       });
 
       if (allGeneratedPositionsFor.length === 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jscrambler-metro-plugin",
-  "version": "8.4.2",
+  "version": "8.4.4",
   "description": "A plugin to use metro with Jscrambler",
   "exports": "./lib/index.js",
   "peerDependencies": {