tungsten 0.1.29 → 0.1.30

package/dist/babelPlugins/BabelTransformPackageImports.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"BabelTransformPackageImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformPackageImports.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"BabelTransformPackageImports.d.ts","sourceRoot":"","sources":["../../src/babelPlugins/BabelTransformPackageImports.ts"],"names":[],"mappings":"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"}

package/dist/babelPlugins/BabelTransformPackageImports.js

@@ -22,7 +22,7 @@ import { MakeBabelTransformDependencyImportsEsm } from "./BabelTransformDependen
 import { MakeBabelTransformDependencyImportsCjs } from "./BabelTransformDependencyImportsCjs.js";
 import { devBuildFolder, frameworkDistFolder, packageName as frameworkPackageName, packageName, packagesCacheFolder, packagesFolder /*, packagesCacheInfoName*/ } from "../settings.js";
 import { findProjectDir } from "../findProjectDir.js";
-import { cliError, cliWarn, cliNote } from "../cliOutput.js";
+import { cliError, cliWarn, cliNote, cliInfo } from "../cliOutput.js";
 import { isBareImport } from "./isBareImport.js";
 import { TungstenError } from "../TungstenError.js";
 import { throwError } from "../throwError.js";
@@ -347,7 +347,7 @@ export function MakeBabelTransformPackageImports(opts) {
       packageInfo
     };
   }
-  async function doProcessFile(fileInfo, sourceFilename) {
+  async function doProcessFile(fileInfo, sourceFilename, history) {
     const {
       file,
       cacheDest,
@@ -356,6 +356,8 @@ export function MakeBabelTransformPackageImports(opts) {
     } = fileInfo;
     try {
       const dependencies = getFileDependencies(fileInfo, packageInfo.packageDir, sourceFilename);
+      cliInfo(`deps for ${file}`);
+      cliInfo(dependencies);
       const dependenciesFull = dependencies.map(d => resolveFile(d));
       const nonEsmDependenciesFull = dependenciesFull.filter(fi => fi.type !== 'esm');
       //await recordFileInPackagesLog(relFile, packageInfo)
@@ -382,7 +384,7 @@ export function MakeBabelTransformPackageImports(opts) {
       addToDependencyGraphFromFileInfo(fileInfo, dependenciesFileIndentifiers);
       // add deps to dependencyGraph
       // returns the deps
-      await processDependencies(dependenciesFull /*, dependenciesMap*/, sourceFilename);
+      await processDependencies(dependenciesFull, sourceFilename, [...history, file]);
       //console.log('Files outstanding', filesNum)
       return processedFilesCache[file];
     } catch (e) {
@@ -419,7 +421,7 @@ export function MakeBabelTransformPackageImports(opts) {
     }
   }
   const processedFilesCache = {};
-  async function processFile(fileInfo /*, dependenciesMap*/, sourceFilename) {
+  async function processFile(fileInfo, sourceFilename, history) {
     const {
       file
     } = fileInfo;
@@ -427,7 +429,7 @@ export function MakeBabelTransformPackageImports(opts) {
       return processedFilesCache[file];
     } else {
       processedFilesCache[file] = fileInfo.packageInfo;
-      await doProcessFile(fileInfo, sourceFilename);
+      await doProcessFile(fileInfo, sourceFilename, history);
       return processedFilesCache[file];
     }
   }
@@ -459,7 +461,7 @@ export function MakeBabelTransformPackageImports(opts) {
       return processedJsonFilesCache[file] = packageInfo;
     }
   }
-  async function processDependencies(dependencies /*, dependenciesMap*/, sourceFilename) {
+  async function processDependencies(dependencies, sourceFilename, history) {
     for (const fileInfo of dependencies) {
       const file = fileInfo.file;
       if (file === '') {
@@ -468,7 +470,7 @@ export function MakeBabelTransformPackageImports(opts) {
       }
       // regex: ends with .js , .cjs or .mjs
       if (/\.(c|m)?js$/.test(file)) {
-        await processFile(fileInfo, sourceFilename);
+        await processFile(fileInfo, sourceFilename, history);
       } else if (file.endsWith('.json')) {
         await processJsonFile(fileInfo);
       } else {
@@ -479,11 +481,12 @@ export function MakeBabelTransformPackageImports(opts) {
   const importedPackageFiles = {};
   function processPackageFile(file, sourceFilename) {
     //console.log('processPackageFile', file)
-    if (file in importedPackageFiles) {
-      return importedPackageFiles[file];
+    const cachedFileInfo = importedPackageFiles[file];
+    if (cachedFileInfo) {
+      return cachedFileInfo;
     } else {
       const fileInfo = resolveFile(file);
-      opts.promises.push(processFile(fileInfo, sourceFilename));
+      opts.promises.push(processFile(fileInfo, sourceFilename, [sourceFilename]));
       return importedPackageFiles[file] = fileInfo;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tungsten",
-  "version": "0.1.29",
+  "version": "0.1.30",
   "description": "",
   "type": "module",
   "bin": {