fix: address PR feedback - clearer error messages, path.sep for separators

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: lesya7

src/resolve/adapters/webApplicationsSourceAdapter.ts

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { join } from 'node:path';
+import { join, sep } from 'node:path';
 import { Messages } from '@salesforce/core/messages';
 import { SfError } from '@salesforce/core/sfError';
 import { SourcePath } from '../../common/types';
@@ -92,14 +92,17 @@ export class WebApplicationsSourceAdapter extends BundleSourceAdapter {
     const distPath = join(contentPath, 'dist');
     const indexPath = join(distPath, 'index.html');
 
+    const missingDistIndexMessage =
+      "If a webapplication.json file does not exist, you are required to include a 'dist/index.html' file. This will be the entry point for your web application.";
+
     if (!this.tree.exists(distPath) || !this.tree.isDirectory(distPath)) {
-      this.expectedSourceError(distPath);
+      throw new SfError(missingDistIndexMessage, 'ExpectedSourceFilesError');
     }
     if (!this.tree.exists(indexPath)) {
-      this.expectedSourceError(indexPath);
+      throw new SfError(missingDistIndexMessage, 'ExpectedSourceFilesError');
     }
     if (this.tree.readFileSync(indexPath).length === 0) {
-      this.expectedSourceError(indexPath);
+      throw new SfError(missingDistIndexMessage, 'ExpectedSourceFilesError');
     }
   }
 
@@ -141,16 +144,22 @@ export class WebApplicationsSourceAdapter extends BundleSourceAdapter {
       );
     }
 
-    const fallbackPath = join(outputDirPath, config.routing.fallback.replace(/^\//, ''));
+    // Strip leading path separator (path.sep and / for URL-style paths)
+    const sepChar = sep.replace(/\\/g, '\\\\');
+    const stripLeadingSep = (p: string) => p.replace(new RegExp(`^[${sepChar}/]`), '');
+    const fallbackPath = join(outputDirPath, stripLeadingSep(config.routing.fallback));
     if (!this.tree.exists(fallbackPath)) {
-      this.expectedSourceError(fallbackPath);
+      throw new SfError(
+        "The filepath defined in the webapplication.json -> routing.fallback was not found. Ensure this file exists at the location defined.",
+        'ExpectedSourceFilesError'
+      );
     }
 
     // rewrites are optional, but every target must resolve
     if (Array.isArray(config.routing.rewrites)) {
       for (const { rewrite } of config.routing.rewrites) {
         if (rewrite) {
-          const rewritePath = join(outputDirPath, rewrite.replace(/^\//, ''));
+          const rewritePath = join(outputDirPath, stripLeadingSep(rewrite));
           if (!this.tree.exists(rewritePath)) {
             this.expectedSourceError(rewritePath);
           }

test/resolve/adapters/webApplicationsSourceAdapter.test.ts

@@ -113,15 +113,14 @@ describe('WebApplicationsSourceAdapter', () => {
     expect(metadataAdapter.getComponent(META_FILE, false)).to.deep.equal(expected);
   });
 
+  const DIST_INDEX_MESSAGE =
+    "If a webapplication.json file does not exist, you are required to include a 'dist/index.html' file. This will be the entry point for your web application.";
+
   describe('without webapplication.json (dist fallback)', () => {
     it('should throw when the dist folder does not exist', () => {
       const t = VirtualTreeContainer.fromFilePaths([META_FILE, CONTENT_FILE]);
       const a = new WebApplicationsSourceAdapter(registry.types.webapplication, registryAccess, forceIgnore, t);
-      assert.throws(
-        () => a.getComponent(APP_PATH),
-        SfError,
-        messages.getMessage('error_expected_source_files', [DIST_PATH, registry.types.webapplication.name])
-      );
+      assert.throws(() => a.getComponent(APP_PATH), SfError, DIST_INDEX_MESSAGE);
     });
 
     it('should throw when dist exists but index.html is missing', () => {
@@ -131,14 +130,7 @@ describe('WebApplicationsSourceAdapter', () => {
       ];
       const t = new VirtualTreeContainer(vfs);
       const a = new WebApplicationsSourceAdapter(registry.types.webapplication, registryAccess, forceIgnore, t);
-      assert.throws(
-        () => a.getComponent(APP_PATH),
-        SfError,
-        messages.getMessage('error_expected_source_files', [
-          join(DIST_PATH, 'index.html'),
-          registry.types.webapplication.name,
-        ])
-      );
+      assert.throws(() => a.getComponent(APP_PATH), SfError, DIST_INDEX_MESSAGE);
     });
 
     it('should throw when dist/index.html is empty', () => {
@@ -148,14 +140,7 @@ describe('WebApplicationsSourceAdapter', () => {
       ];
       const t = new VirtualTreeContainer(vfs);
       const a = new WebApplicationsSourceAdapter(registry.types.webapplication, registryAccess, forceIgnore, t);
-      assert.throws(
-        () => a.getComponent(APP_PATH),
-        SfError,
-        messages.getMessage('error_expected_source_files', [
-          join(DIST_PATH, 'index.html'),
-          registry.types.webapplication.name,
-        ])
-      );
+      assert.throws(() => a.getComponent(APP_PATH), SfError, DIST_INDEX_MESSAGE);
     });
 
     it('should succeed when dist/index.html exists and is non-empty', () => {
@@ -296,10 +281,7 @@ describe('WebApplicationsSourceAdapter', () => {
       assert.throws(
         () => a.getComponent(APP_PATH),
         SfError,
-        messages.getMessage('error_expected_source_files', [
-          join(DIST_PATH, 'missing.html'),
-          registry.types.webapplication.name,
-        ])
+        "The filepath defined in the webapplication.json -> routing.fallback was not found. Ensure this file exists at the location defined."
       );
     });