watchful-cli 1.7.21 → 1.7.22

package/bin/transpileFile.js

@@ -3,14 +3,14 @@
 const { combinePaths } = require("./utilities/path");
 
 function transpileFile(filePath, context, callback) {
-  const { transpileFileFunction, sourceDirectoryPath, targetDirectoryPath } = context,
-        sourceFilePath = combinePaths(sourceDirectoryPath, filePath),  ///
-        targetFilePath = combinePaths(targetDirectoryPath, filePath);  ///
+  const { transpileFileFunction, sourceDirectoryPath, targetDirectoryPath } = context;
 
-  transpileFileFunction(sourceFilePath, targetFilePath, (success) => {
+  transpileFileFunction(filePath, sourceDirectoryPath, targetDirectoryPath, (success) => {
     const { quietly } = context;
 
     if (!quietly) {
+      const sourceFilePath = combinePaths(sourceDirectoryPath, filePath);
+
       console.log(`Transpiled '${sourceFilePath}'.`);
     }
 

package/bin/utilities/path.js

@@ -1,11 +1,13 @@
 "use strict";
 
+const path = require("path");
+
 const { characters, pathUtilities } = require("necessary");
 
 const { EMPTY_STRING } = require("../constants");
 
-  const { FORWARD_SLASH_CHARACTER } = characters,
-      { isPathName, bottommostNameFromPath } = pathUtilities;
+const { FORWARD_SLASH_CHARACTER } = characters,
+      { combinePaths, pathWithoutBottommostNameFromPath } = pathUtilities;
 
 const currentWorkingDirectoryPath = process.cwd(),
       currentWorkingDirectoryPathLength = currentWorkingDirectoryPath.length;
@@ -32,22 +34,6 @@ function pathFromOption(option) {
   return path;
 }
 
-function fileNameFromFilePath(filePath) {
-  let fileName;
-
-  const filePathFileName = isPathName(filePath);
-
-  if (filePathFileName) {
-    fileName = filePath;  ///
-  } else {
-    const bottommostFileName = bottommostNameFromPath(filePath);
-
-    fileName = bottommostFileName;  ///
-  }
-
-  return fileName;
-}
-
 function isPathFullQualifiedPath(path) {
   const pathStartsWithCurrentWorkingDirectoryPath = path.startsWith(currentWorkingDirectoryPath),
         pathFullyQualifiedPath = pathStartsWithCurrentWorkingDirectoryPath; ///
@@ -69,10 +55,61 @@ function pathWithoutDirectoryPathFromPathAndDirectoryPath(path, directoryPath) {
   return pathWithoutDirectoryPath;
 }
 
+function sourceFilePathFromFilePathAndSourceDirectoryPath(filePath, sourceDirectoryPath) {
+  const sourceFilePath = combinePaths(sourceDirectoryPath, filePath);
+
+  return sourceFilePath;
+}
+
+function targetFilePathFromFilePathAndTargetDirectoryPath(filePath, targetDirectoryPath) {
+  const targetFilePath = combinePaths(targetDirectoryPath, filePath);
+
+  return targetFilePath;
+}
+
+function sourceFileNameFromSourceFilePathAndTargetFilePath(sourceFilePath, targetFilePath) {
+  const relativeSourceFilepath = relativeSourceFilePathFromSourceFilePathAndTargetFilePath(sourceFilePath, targetFilePath),
+      sourceFileName = relativeSourceFilepath;  ///
+
+  return sourceFileName;
+}
+
+function sourcesFromSourcesSourceDirectoryPathAndTargetDirectoryPath(sources, sourceDirectoryPath, targetDirectoryPath) {
+  sources = sources.map((source) => { ///
+    const sourceStartsWithTargetDirectoryPath = source.startsWith(targetDirectoryPath);
+
+    if (sourceStartsWithTargetDirectoryPath) {
+      const targetDirectoryPathLength = targetDirectoryPath.length,
+            start = targetDirectoryPathLength + 1,
+            filePath = source.substring(start),
+            targetFilePath = source,  ///
+            sourceFilePath = sourceFilePathFromFilePathAndSourceDirectoryPath(filePath, sourceDirectoryPath),
+            relativeSourceFilePath = relativeSourceFilePathFromSourceFilePathAndTargetFilePath(sourceFilePath, targetFilePath);
+
+      source = relativeSourceFilePath;  ///
+    }
+
+    return source;
+  });
+
+  return sources;
+}
+
 module.exports = Object.assign({}, pathUtilities, {
   pathFromOption,
-  fileNameFromFilePath,
   isPathFullQualifiedPath,
   pathFromFullyQualifiedPath,
-  pathWithoutDirectoryPathFromPathAndDirectoryPath
+  pathWithoutDirectoryPathFromPathAndDirectoryPath,
+  sourceFilePathFromFilePathAndSourceDirectoryPath,
+  targetFilePathFromFilePathAndTargetDirectoryPath,
+  sourceFileNameFromSourceFilePathAndTargetFilePath,
+  sourcesFromSourcesSourceDirectoryPathAndTargetDirectoryPath
 });
+
+function relativeSourceFilePathFromSourceFilePathAndTargetFilePath(sourceFilePath, targetFilePath) {
+  const targetFilePathWithoutBottommostName = pathWithoutBottommostNameFromPath(targetFilePath),
+        relativeSourceFilePath = path.relative(targetFilePathWithoutBottommostName, sourceFilePath);
+
+  return relativeSourceFilePath;
+}
+

package/bin/utilities/transpile.js

@@ -7,11 +7,11 @@ const { encodings } = require("necessary");
 const { SWC_CORE_PATH, BABEL_CORE_PATH } = require("../paths"),
       { readFile, writeFile, createParentDirectory } = require("../utilities/fileSystem"),
       { BABEL, INLINE, SOURCE_MAP_PREAMBLE } = require("../constants"),
-      { sourceFileNameFromSourceFilePathAndTargetFilePath } = require("../utilities/sourceMap"),
-      { SWC_FAILED_MESSAGE,
-        BABEL_FAILED_MESSAGE,
-        SWC_NOT_INSTALLED_MESSAGE,
-        BABEL_NOT_INSTALLED_MESSAGE } = require("../messages");
+      { SWC_FAILED_MESSAGE, BABEL_FAILED_MESSAGE, SWC_NOT_INSTALLED_MESSAGE, BABEL_NOT_INSTALLED_MESSAGE } = require("../messages"),
+      { sourceFilePathFromFilePathAndSourceDirectoryPath,
+        targetFilePathFromFilePathAndTargetDirectoryPath,
+        sourceFileNameFromSourceFilePathAndTargetFilePath,
+        sourcesFromSourcesSourceDirectoryPathAndTargetDirectoryPath } = require("../utilities/path");
 
 const { BASE64_ENCODING } = encodings;
 
@@ -36,9 +36,12 @@ function createBabelTranspileFileFunction(debug) {
           babel = require(babelCorePath),
           transpiler = babel; ///
 
-    babelTranspileFileFunction = (sourceFilePath, targetFilePath, callback) => {
+    babelTranspileFileFunction = (filePath, sourceDirectoryPath, targetDirectoryPath, callback) => {
       let options;
 
+      const sourceFilePath = sourceFilePathFromFilePathAndSourceDirectoryPath(filePath, sourceDirectoryPath),
+            targetFilePath = targetFilePathFromFilePathAndTargetDirectoryPath(filePath, targetDirectoryPath);
+
       if (debug) {
         const sourceMaps = INLINE,  ///
               sourceFileName = sourceFileNameFromSourceFilePathAndTargetFilePath(sourceFilePath, targetFilePath);
@@ -92,14 +95,16 @@ function createSWCTranspileFileFunction(debug) {
           swc = require(swcCorePath),
           transpiler = swc; ///
 
-    swcTranspileFileFunction = (sourceFilePath, targetFilePath, callback) => {
-      const sourceMaps = debug, ///
+    swcTranspileFileFunction = (filePath, sourceDirectoryPath, targetDirectoryPath, callback) => {
+      const sourceFilePath = sourceFilePathFromFilePathAndSourceDirectoryPath(filePath, sourceDirectoryPath),
+            targetFilePath = targetFilePathFromFilePathAndTargetDirectoryPath(filePath, targetDirectoryPath),
             filename = targetFilePath,  ///
+            sourceMaps = debug, ///
+            sourceFileContent = readFile(sourceFilePath),
             options = {
               filename,
               sourceMaps
-            },
-            sourceFileContent = readFile(sourceFilePath);
+            };
 
       transpiler.transform(sourceFileContent, options)
         .then((output) => {
@@ -109,20 +114,14 @@ function createSWCTranspileFileFunction(debug) {
 
           if (debug) {
             const { code, map } = output,
-                  mapJSON = JSON.parse(map),
-                  sourceFileName = sourceFileNameFromSourceFilePathAndTargetFilePath(sourceFilePath, targetFilePath),
-                  source = sourceFileName,  ///
-                  sources = [
-                    source
-                  ],
-                  sourceContent = sourceFileContent,  ///
-                  sourcesContent = [
-                    sourceContent
-                  ];
+                  mapJSON = JSON.parse(map);
+
+            let { sources } = mapJSON;
+
+            sources = sourcesFromSourcesSourceDirectoryPathAndTargetDirectoryPath(sources, sourceDirectoryPath, targetDirectoryPath);
 
             Object.assign(mapJSON, {
-              sources,
-              sourcesContent
+              sources
             });
 
             const mapJSONString = JSON.stringify(mapJSON),
@@ -157,3 +156,4 @@ ${error}`);
 
   return swcTranspileFileFunction;
 }
+

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "watchful-cli",
   "author": "James Smith",
-  "version": "1.7.21",
+  "version": "1.7.22",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/watchful-cli",
   "description": "Incremental transpilation with bundling.",

package/bin/utilities/sourceMap.js

@@ -1,17 +0,0 @@
-"use strict";
-
-const path = require("path");
-
-const { pathWithoutBottommostNameFromPath } = require("../utilities/path");
-
-function sourceFileNameFromSourceFilePathAndTargetFilePath(sourceFilePath, targetFilePath) {
-  const targetFilePathWithoutBottommostName = pathWithoutBottommostNameFromPath(targetFilePath),
-        relativeSourceFilePath = path.relative(targetFilePathWithoutBottommostName, sourceFilePath),
-        sourceFileName = relativeSourceFilePath;  ///
-
-  return sourceFileName;
-}
-
-module.exports = {
-  sourceFileNameFromSourceFilePathAndTargetFilePath
-};