@ms-cloudpack/path-utilities 2.7.39 → 2.7.40

package/lib/intermediateToSourcePath.d.ts

@@ -1,6 +1,6 @@
 /**
  * Takes a relative intermediate content path (e.g. "lib/foo/bar.js") and resolves it to a source content path
- * (e.g. "/src/foo/foo.tsx"). Note: source files must exist so that the utility can resolve the source.
+ * (e.g. "./src/foo/foo.tsx"). Note: source files must exist so that the utility can resolve the source.
  */
 export declare function intermediateToSourcePath(relativeIntermediatePath: string, rootPath: string): string | undefined;
 //# sourceMappingURL=intermediateToSourcePath.d.ts.map

package/lib/intermediateToSourcePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"intermediateToSourcePath.d.ts","sourceRoot":"","sources":["../src/intermediateToSourcePath.ts"],"names":[],"mappings":"AAQA;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,wBAAwB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAsD/G"}
+{"version":3,"file":"intermediateToSourcePath.d.ts","sourceRoot":"","sources":["../src/intermediateToSourcePath.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,wBAAwB,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA4C/G"}

package/lib/intermediateToSourcePath.js

@@ -1,51 +1,45 @@
 import path from 'path';
 import { isFileSync } from './isFileSync.js';
-import { slash } from '@ms-cloudpack/path-string-parsing';
+import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
 import { sourceExtensions } from './sourceExtensions.js';
+// TODO: this assumption won't work for all repos (tracked by https://github.com/microsoft/cloudpack/issues/2366)
 const intermediateFolderNames = ['lib', 'lib-amd', 'lib-esm', 'lib-commonjs', 'dist'];
 const sourceFolderName = 'src';
 /**
  * Takes a relative intermediate content path (e.g. "lib/foo/bar.js") and resolves it to a source content path
- * (e.g. "/src/foo/foo.tsx"). Note: source files must exist so that the utility can resolve the source.
+ * (e.g. "./src/foo/foo.tsx"). Note: source files must exist so that the utility can resolve the source.
  */
 export function intermediateToSourcePath(relativeIntermediatePath, rootPath) {
-    const candidates = [];
     const originalExt = path.extname(relativeIntermediatePath);
-    const originalPath = path.dirname(relativeIntermediatePath);
+    const originalDir = path.dirname(relativeIntermediatePath);
     const basename = path.basename(relativeIntermediatePath, sourceExtensions.includes(originalExt) ? originalExt : undefined);
-    // Find first non "." or ".." folder in relative path
-    const parts = slash(originalPath).split('/');
-    // Iterate through parts until we find the first folder name. If the folder name
-    // is a known intermediate folder name, then we can replace it with the source folder name
-    // and push all candidates to the candidates array.
-    for (let i = 0; i < parts.length; i++) {
-        const part = parts[i];
-        if (part !== '.' && part !== '..') {
-            if (intermediateFolderNames.includes(part)) {
-                // Join the parts back together, replacing the part with the source folder name.
-                const newPath = parts.map((v, j) => (j === i ? sourceFolderName : v)).join('/');
-                // Push all possible source extensions.
-                candidates.push(...sourceExtensions.map((ext) => path.join(newPath, basename + ext)));
-                // Push the original.
-                candidates.push(path.join(newPath, basename));
-            }
-            break;
-        }
+    // Normalize to get rid of leading ./ or any other extra segments, then split into parts.
+    const dirParts = path.normalize(originalDir).split(/[\\/]/g);
+    if (dirParts[0] === sourceFolderName && isFileSync(path.resolve(rootPath, relativeIntermediatePath))) {
+        // This is already a complete source path. Use it as-is.
+        return normalizeRelativePath(relativeIntermediatePath);
+    }
+    const candidates = [];
+    // Find the first non-'..' folder name. If it's a known intermediate folder name, then we can
+    // replace it with the source folder name and add candidate paths for all extensions.
+    const firstDirIndex = dirParts.findIndex((part) => part !== '..');
+    if (firstDirIndex !== -1 && intermediateFolderNames.includes(dirParts[firstDirIndex])) {
+        // Join the parts back together, replacing the part with the source folder name.
+        dirParts[firstDirIndex] = sourceFolderName;
+        const newDir = dirParts.join('/');
+        // Push all possible source extensions.
+        candidates.push(...sourceExtensions.map((ext) => path.join(newDir, basename + ext)));
+        // Push the original.
+        candidates.push(path.join(newDir, basename));
     }
     // Push the original path with all supported source extensions.
-    candidates.push(...sourceExtensions.map((ext) => path.join(originalPath, basename + ext)));
-    // And finally push the original path with the original extension in case it wasn't
-    // covered.
+    candidates.push(...sourceExtensions.map((ext) => path.join(originalDir, basename + ext)));
+    // And finally push the original path with the original extension in case it wasn't covered.
     candidates.push(relativeIntermediatePath);
-    let match = candidates.find((candidate) => isFileSync(path.resolve(rootPath, candidate)));
-    // Ensure correct path direction.
+    const match = candidates.find((candidate) => isFileSync(path.resolve(rootPath, candidate)));
     if (match) {
-        match = slash(match);
-    }
-    // Re-add the leading period.
-    if (match && !match.startsWith('./')) {
-        match = './' + match;
+        return normalizeRelativePath(match);
     }
-    return match;
+    return undefined;
 }
 //# sourceMappingURL=intermediateToSourcePath.js.map

package/lib/intermediateToSourcePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"intermediateToSourcePath.js","sourceRoot":"","sources":["../src/intermediateToSourcePath.ts"],"names":[],"mappings":"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","sourcesContent":["import path from 'path';\nimport { isFileSync } from './isFileSync.js';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\nimport { sourceExtensions } from './sourceExtensions.js';\n\nconst intermediateFolderNames = ['lib', 'lib-amd', 'lib-esm', 'lib-commonjs', 'dist'];\nconst sourceFolderName = 'src';\n\n/**\n * Takes a relative intermediate content path (e.g. \"lib/foo/bar.js\") and resolves it to a source content path\n * (e.g. \"/src/foo/foo.tsx\"). Note: source files must exist so that the utility can resolve the source.\n */\nexport function intermediateToSourcePath(relativeIntermediatePath: string, rootPath: string): string | undefined {\n  const candidates = [];\n  const originalExt = path.extname(relativeIntermediatePath);\n  const originalPath = path.dirname(relativeIntermediatePath);\n  const basename = path.basename(\n    relativeIntermediatePath,\n    sourceExtensions.includes(originalExt) ? originalExt : undefined,\n  );\n\n  // Find first non \".\" or \"..\" folder in relative path\n  const parts = slash(originalPath).split('/');\n\n  // Iterate through parts until we find the first folder name. If the folder name\n  // is a known intermediate folder name, then we can replace it with the source folder name\n  // and push all candidates to the candidates array.\n  for (let i = 0; i < parts.length; i++) {\n    const part = parts[i];\n\n    if (part !== '.' && part !== '..') {\n      if (intermediateFolderNames.includes(part)) {\n        // Join the parts back together, replacing the part with the source folder name.\n        const newPath = parts.map((v, j) => (j === i ? sourceFolderName : v)).join('/');\n\n        // Push all possible source extensions.\n        candidates.push(...sourceExtensions.map((ext) => path.join(newPath, basename + ext)));\n\n        // Push the original.\n        candidates.push(path.join(newPath, basename));\n      }\n\n      break;\n    }\n  }\n\n  // Push the original path with all supported source extensions.\n  candidates.push(...sourceExtensions.map((ext) => path.join(originalPath, basename + ext)));\n\n  // And finally push the original path with the original extension in case it wasn't\n  // covered.\n  candidates.push(relativeIntermediatePath);\n\n  let match = candidates.find((candidate) => isFileSync(path.resolve(rootPath, candidate)));\n\n  // Ensure correct path direction.\n  if (match) {\n    match = slash(match);\n  }\n\n  // Re-add the leading period.\n  if (match && !match.startsWith('./')) {\n    match = './' + match;\n  }\n\n  return match;\n}\n"]}
+{"version":3,"file":"intermediateToSourcePath.js","sourceRoot":"","sources":["../src/intermediateToSourcePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC7C,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,iHAAiH;AACjH,MAAM,uBAAuB,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;AACtF,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAE/B;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,wBAAgC,EAAE,QAAgB;IACzF,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC3D,MAAM,WAAW,GAAG,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC3D,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAC5B,wBAAwB,EACxB,gBAAgB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS,CACjE,CAAC;IAEF,yFAAyF;IACzF,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC7D,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,gBAAgB,IAAI,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,wBAAwB,CAAC,CAAC,EAAE,CAAC;QACrG,wDAAwD;QACxD,OAAO,qBAAqB,CAAC,wBAAwB,CAAC,CAAC;IACzD,CAAC;IAED,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,6FAA6F;IAC7F,qFAAqF;IACrF,MAAM,aAAa,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAClE,IAAI,aAAa,KAAK,CAAC,CAAC,IAAI,uBAAuB,CAAC,QAAQ,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,EAAE,CAAC;QACtF,gFAAgF;QAChF,QAAQ,CAAC,aAAa,CAAC,GAAG,gBAAgB,CAAC;QAC3C,MAAM,MAAM,GAAG,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAElC,uCAAuC;QACvC,UAAU,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;QAErF,qBAAqB;QACrB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,CAAC;IAC/C,CAAC;IAED,+DAA+D;IAC/D,UAAU,CAAC,IAAI,CAAC,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC;IAE1F,4FAA4F;IAC5F,UAAU,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAE1C,MAAM,KAAK,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;IAC5F,IAAI,KAAK,EAAE,CAAC;QACV,OAAO,qBAAqB,CAAC,KAAK,CAAC,CAAC;IACtC,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC","sourcesContent":["import path from 'path';\nimport { isFileSync } from './isFileSync.js';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\nimport { sourceExtensions } from './sourceExtensions.js';\n\n// TODO: this assumption won't work for all repos (tracked by https://github.com/microsoft/cloudpack/issues/2366)\nconst intermediateFolderNames = ['lib', 'lib-amd', 'lib-esm', 'lib-commonjs', 'dist'];\nconst sourceFolderName = 'src';\n\n/**\n * Takes a relative intermediate content path (e.g. \"lib/foo/bar.js\") and resolves it to a source content path\n * (e.g. \"./src/foo/foo.tsx\"). Note: source files must exist so that the utility can resolve the source.\n */\nexport function intermediateToSourcePath(relativeIntermediatePath: string, rootPath: string): string | undefined {\n  const originalExt = path.extname(relativeIntermediatePath);\n  const originalDir = path.dirname(relativeIntermediatePath);\n  const basename = path.basename(\n    relativeIntermediatePath,\n    sourceExtensions.includes(originalExt) ? originalExt : undefined,\n  );\n\n  // Normalize to get rid of leading ./ or any other extra segments, then split into parts.\n  const dirParts = path.normalize(originalDir).split(/[\\\\/]/g);\n  if (dirParts[0] === sourceFolderName && isFileSync(path.resolve(rootPath, relativeIntermediatePath))) {\n    // This is already a complete source path. Use it as-is.\n    return normalizeRelativePath(relativeIntermediatePath);\n  }\n\n  const candidates: string[] = [];\n\n  // Find the first non-'..' folder name. If it's a known intermediate folder name, then we can\n  // replace it with the source folder name and add candidate paths for all extensions.\n  const firstDirIndex = dirParts.findIndex((part) => part !== '..');\n  if (firstDirIndex !== -1 && intermediateFolderNames.includes(dirParts[firstDirIndex])) {\n    // Join the parts back together, replacing the part with the source folder name.\n    dirParts[firstDirIndex] = sourceFolderName;\n    const newDir = dirParts.join('/');\n\n    // Push all possible source extensions.\n    candidates.push(...sourceExtensions.map((ext) => path.join(newDir, basename + ext)));\n\n    // Push the original.\n    candidates.push(path.join(newDir, basename));\n  }\n\n  // Push the original path with all supported source extensions.\n  candidates.push(...sourceExtensions.map((ext) => path.join(originalDir, basename + ext)));\n\n  // And finally push the original path with the original extension in case it wasn't covered.\n  candidates.push(relativeIntermediatePath);\n\n  const match = candidates.find((candidate) => isFileSync(path.resolve(rootPath, candidate)));\n  if (match) {\n    return normalizeRelativePath(match);\n  }\n\n  return undefined;\n}\n"]}

package/lib/sourceToIntermediatePath.d.ts

@@ -1,6 +1,6 @@
 /**
  * Takes a relative source path (e.g. "src/foo/bar.ts") and resolves it to an intermediate content path
- * (e.g. "/lib/foo/bar.js").
+ * (e.g. "./lib/foo/bar.js").
  */
 export declare function sourceToIntermediatePath(sourcePath: string): string;
 //# sourceMappingURL=sourceToIntermediatePath.d.ts.map

package/lib/sourceToIntermediatePath.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sourceToIntermediatePath.d.ts","sourceRoot":"","sources":["../src/sourceToIntermediatePath.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAwBnE"}
+{"version":3,"file":"sourceToIntermediatePath.d.ts","sourceRoot":"","sources":["../src/sourceToIntermediatePath.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAiBnE"}

package/lib/sourceToIntermediatePath.js

@@ -1,30 +1,23 @@
 import path from 'path';
-import { slash } from '@ms-cloudpack/path-string-parsing';
+import { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';
 /**
  * Takes a relative source path (e.g. "src/foo/bar.ts") and resolves it to an intermediate content path
- * (e.g. "/lib/foo/bar.js").
+ * (e.g. "./lib/foo/bar.js").
  */
 export function sourceToIntermediatePath(sourcePath) {
     let ext = path.extname(sourcePath);
     const basename = path.basename(sourcePath, ext);
-    const pathParts = slash(path.dirname(sourcePath)).split('/');
-    if (pathParts[0] === '.') {
-        pathParts.shift();
-    }
-    if (pathParts[0] === 'src') {
-        pathParts[0] = 'lib';
-    }
-    if (['.ts', '.tsx', '.jsx'].includes(ext)) {
-        // Handle js replacement extensions
-        ext = '.js';
-    }
-    else if (ext === '.mts') {
-        ext = '.mjs';
+    // TODO: this assumption won't work for all repos (tracked by https://github.com/microsoft/cloudpack/issues/2366)
+    const newDir = path.normalize(path.dirname(sourcePath)).replace(/^src([\\/]|$)/, 'lib/');
+    // Handle js replacement extensions (keep the c or m if present)
+    const jsMatch = ext.match(/\.([cm])?[jt]sx?$/);
+    if (jsMatch) {
+        ext = `.${jsMatch[1] || ''}js`;
     }
     else if (ext === '.scss') {
         // Handle js appends
         ext += '.js';
     }
-    return './' + slash(path.join(...pathParts, basename + ext));
+    return normalizeRelativePath(path.join(newDir, basename + ext));
 }
 //# sourceMappingURL=sourceToIntermediatePath.js.map

package/lib/sourceToIntermediatePath.js.map

@@ -1 +1 @@
-{"version":3,"file":"sourceToIntermediatePath.js","sourceRoot":"","sources":["../src/sourceToIntermediatePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,KAAK,EAAE,MAAM,mCAAmC,CAAC;AAE1D;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,UAAkB;IACzD,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAChD,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAE7D,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;QACzB,SAAS,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,SAAS,CAAC,CAAC,CAAC,KAAK,KAAK,EAAE,CAAC;QAC3B,SAAS,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;IACvB,CAAC;IAED,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1C,mCAAmC;QACnC,GAAG,GAAG,KAAK,CAAC;IACd,CAAC;SAAM,IAAI,GAAG,KAAK,MAAM,EAAE,CAAC;QAC1B,GAAG,GAAG,MAAM,CAAC;IACf,CAAC;SAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;QAC3B,oBAAoB;QACpB,GAAG,IAAI,KAAK,CAAC;IACf,CAAC;IAED,OAAO,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,SAAS,EAAE,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC;AAC/D,CAAC","sourcesContent":["import path from 'path';\nimport { slash } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * Takes a relative source path (e.g. \"src/foo/bar.ts\") and resolves it to an intermediate content path\n * (e.g. \"/lib/foo/bar.js\").\n */\nexport function sourceToIntermediatePath(sourcePath: string): string {\n  let ext = path.extname(sourcePath);\n  const basename = path.basename(sourcePath, ext);\n  const pathParts = slash(path.dirname(sourcePath)).split('/');\n\n  if (pathParts[0] === '.') {\n    pathParts.shift();\n  }\n\n  if (pathParts[0] === 'src') {\n    pathParts[0] = 'lib';\n  }\n\n  if (['.ts', '.tsx', '.jsx'].includes(ext)) {\n    // Handle js replacement extensions\n    ext = '.js';\n  } else if (ext === '.mts') {\n    ext = '.mjs';\n  } else if (ext === '.scss') {\n    // Handle js appends\n    ext += '.js';\n  }\n\n  return './' + slash(path.join(...pathParts, basename + ext));\n}\n"]}
+{"version":3,"file":"sourceToIntermediatePath.js","sourceRoot":"","sources":["../src/sourceToIntermediatePath.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAE1E;;;GAGG;AACH,MAAM,UAAU,wBAAwB,CAAC,UAAkB;IACzD,IAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IACnC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;IAEhD,iHAAiH;IACjH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,OAAO,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;IAEzF,gEAAgE;IAChE,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;IAC/C,IAAI,OAAO,EAAE,CAAC;QACZ,GAAG,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC;IACjC,CAAC;SAAM,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;QAC3B,oBAAoB;QACpB,GAAG,IAAI,KAAK,CAAC;IACf,CAAC;IAED,OAAO,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC;AAClE,CAAC","sourcesContent":["import path from 'path';\nimport { normalizeRelativePath } from '@ms-cloudpack/path-string-parsing';\n\n/**\n * Takes a relative source path (e.g. \"src/foo/bar.ts\") and resolves it to an intermediate content path\n * (e.g. \"./lib/foo/bar.js\").\n */\nexport function sourceToIntermediatePath(sourcePath: string): string {\n  let ext = path.extname(sourcePath);\n  const basename = path.basename(sourcePath, ext);\n\n  // TODO: this assumption won't work for all repos (tracked by https://github.com/microsoft/cloudpack/issues/2366)\n  const newDir = path.normalize(path.dirname(sourcePath)).replace(/^src([\\\\/]|$)/, 'lib/');\n\n  // Handle js replacement extensions (keep the c or m if present)\n  const jsMatch = ext.match(/\\.([cm])?[jt]sx?$/);\n  if (jsMatch) {\n    ext = `.${jsMatch[1] || ''}js`;\n  } else if (ext === '.scss') {\n    // Handle js appends\n    ext += '.js';\n  }\n\n  return normalizeRelativePath(path.join(newDir, basename + ext));\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ms-cloudpack/path-utilities",
-  "version": "2.7.39",
+  "version": "2.7.40",
   "description": "Utilities for resolving paths between source/intermediate/output locations in Cloudpack.",
   "license": "MIT",
   "type": "module",
@@ -28,7 +28,7 @@
     "fast-glob": "^3.2.12"
   },
   "devDependencies": {
-    "@ms-cloudpack/common-types": "^0.19.2",
+    "@ms-cloudpack/common-types": "^0.19.3",
     "@ms-cloudpack/eslint-plugin-internal": "^0.0.1",
     "@ms-cloudpack/scripts": "^0.0.1",
     "@ms-cloudpack/test-utilities": "^0.5.0"