W-18851407 fix: delete forked code dependency and cleanup #611

madhur310 · 2025-08-06T00:27:25Z

What does this PR do?

Deleting forked code and using dependency instead, refactoring and moving code out of LS-common package where its not needed.

What issues does this PR fix or reference?

@W-18851407@

mshanemc

always review the AI

mshanemc · 2025-08-06T13:04:06Z

packages/lwc-language-server/tsconfig.json

@@ -1,12 +1,12 @@
 {
    "compilerOptions": {
-        "target": "es2017",
+        "target": "es2018",


why did you go with 2018?

https://github.com/microsoft/TypeScript/wiki/Node-Target-Mapping#node-20

mshanemc · 2025-08-06T13:05:21Z

packages/lwc-language-server/src/lwc-server.ts

@@ -454,7 +463,7 @@ export default class Server {
                const match = findDynamicContent(content, relativeOffset);

                if (match) {
-                    const item = iterators.find(i => i.name === match) || null;
+                    const item = iterators.find((i) => i.name === match) || null;


I know this is pretty far behind, eslint-wise, but prefer ?? over ||.

It doesn't matter until it does (falsy 0, etc) so it's a good rule/habit.

mshanemc · 2025-08-06T13:09:00Z

package.json

@@ -78,5 +79,11 @@
    "commitizen": {
      "path": "./node_modules/cz-conventional-changelog"
    }
+  },
+  "dependencies": {


I can't see that any of these were uesd. AI slop?

mshanemc · 2025-08-06T13:09:21Z

packages/aura-language-server/package.json

@@ -31,6 +31,7 @@
    "acorn": "^6.0.0",
    "acorn-loose": "^6.0.0",
    "acorn-walk": "^6.0.0",
+    "bs-logger": "^0.2.6",


also check this one?

Thanks for the catch.

mshanemc · 2025-08-06T13:09:53Z

packages/aura-language-server/package.json

    "vscode-nls": "^4.1.2",
    "vscode-uri": "1.0.6"
  },
  "devDependencies": {
    "@jest/reporters": "^29.7.0",
    "@types/babel-types": "^7.0.8",
    "@types/fs-extra": "^11.0.4",
-    "@types/glob": "^7.1.3",
+    "@types/glob": "^8.0.0",


glob isn't used...why do you need types?

Glob is being used:
packages/lightning-lsp-common/src/utils.ts
packages/lightning-lsp-common/src/context.ts

in meant in this package/package.json.

weird to see types in devDependencies but the actual glob package nowhere in aura-language-server?

mshanemc · 2025-08-06T13:34:03Z

packages/aura-language-server/src/markup/auraTags.ts

-                collector(info.name, info, info.type);
-            }
-        }
+function getAttributesData(tag: string): any[] {


are they really any ? Seems to be expecting a very specific set of props.

Thanks for the catch!

mshanemc · 2025-08-06T13:35:30Z

packages/aura-language-server/src/markup/auraTags.ts

-        }
+function getTagsData(): { name: string; description?: string; attributes: any[] }[] {
+    const tags: { name: string; description?: string; attributes: any[] }[] = [];
+    for (const [tag, tagInfo] of getAuraTags()) {


you could just return an array from mapping getAuraTags instead of mutating an array

mshanemc · 2025-08-06T13:40:40Z

packages/aura-language-server/package.json

@@ -31,6 +31,7 @@
    "acorn": "^6.0.0",
    "acorn-loose": "^6.0.0",
    "acorn-walk": "^6.0.0",
+    "bs-logger": "^0.2.6",
    "change-case": "^3.1.0",
    "enhanced-resolve": "^2.2.2",
    "fs-extra": "^11.3.0",


can we get rid of fs-extra and use native?

it seems very extensively used, i will create a follow up to do that.

mshanemc · 2025-08-06T13:42:07Z

packages/lightning-lsp-common/src/utils.ts

            if (
                // LWC component
-                (/.*(.ts|.js)$/.test(ext) && folder === name && parentFolder === 'lwc') || 
+                (/.*(.ts|.js)$/.test(ext) && folder === name && parentFolder === 'lwc') ||


mshanemc · 2025-08-06T13:48:51Z

packages/lwc-language-server/src/lwc-data-provider.ts

@@ -30,7 +30,7 @@ export class LWCDataProvider implements IHTMLDataProvider {
    }

    provideTags(): ITagData[] {
-        const customTags = this.indexer.customData.map(tag => {
+        const customTags = this.indexer.customData.map((tag) => {


fyi, you can omit the extra curlies+return by

.map((tag) => ({name:, etc})

yep, I just auto fixed the issues - will update it.

madhur310 · 2025-08-08T20:09:42Z

packages/aura-language-server/src/__tests__/aura-utils.test.ts

+    }
+
+    describe('basic functionality', () => {
+        it('should extract property from v binding in attribute', () => {


cursor was really bad at writing these unit tests, so had to do them manually (hence the helper function :)).

mshanemc · 2025-08-08T22:34:39Z

packages/aura-language-server/scripts/transform-aura-system.js

@@ -1,5 +1,11 @@
+// NOTE: This script is not used in the build process, but needs to be run manually to update the aura-system.json file


when does that happen? We should have a doc explaining when you need to do steps like that.

I am not sure if anyone has done this step in years, the aura-system.json file seems quite old. I didn't feel like deleting the script was right thing. I will bring it up in stand up to see if others have ideas too.

About doing this step - I guess we could do it, but source of this file seems unknown so we would end up generating the same content.

mshanemc · 2025-08-08T22:38:49Z

packages/lwc-language-server/src/build-time-resources/lwc-standard.json

does that move/rename somehow keep it out of the compiled code? If not, maybe a tsconfig change could?

yeah it does, I see only transformed-lwc-standard.json in the lib folder.

mshanemc · 2025-08-08T22:46:02Z

packages/lwc-language-server/src/__tests__/lwc-server.test.ts

@@ -189,7 +189,7 @@ describe('handlers', () => {

            await server.onInitialize(initializeParams);
            const completions = await server.onCompletion(params);
-            const labels = completions.items.map(item => item.label);
+            const labels = completions.items.map((item) => item.label);


creating a getLabels(initializeParams) =>
might save you a lot of clutter

mshanemc · 2025-08-08T22:55:06Z

packages/lightning-lsp-common/src/__tests__/component-util.test.ts

-            expect(value).toBe('c-my-card');
-        });
-
-        it('treats interop as lightning', () => {


what was bad about these tests?

The code they were testing was dead code - I removed the code for tagFromFile, tagFromDirectory

mshanemc · 2025-08-08T22:55:44Z

packages/lightning-lsp-common/package.json

    "mock-fs": "^5.5.0",
    "prettier": "^2.0.5",
    "shelljs": "^0.8.5",
    "tmp": "^0.0.33",
    "ts-jest": "^29.2.6",
-    "typescript": "5.0.4"
+    "typescript": "5.0.4",
+    "xregexp": "^4.0.0"


what's that?

maybe go through all the deps and make sure they're used/needed?

fix: delete forked code dependency and cleanup

2c432c7

madhur310 requested a review from a team as a code owner August 6, 2025 00:27

madhur310 requested review from diyer and mshanemc and removed request for diyer August 6, 2025 00:27

mshanemc requested changes Aug 6, 2025

View reviewed changes

madhur310 added 12 commits August 6, 2025 13:22

fix: address review feedback

56841fb

fix: try loop to see if windows works

1a5b6fa

fix: try loop to see if windows works

00a1484

fix: await

80b3308

fix: locally working

5710746

fix: try windows fix

bf0ebdd

chore: add logging to debug windows

bfebf9d

fix: try full path

fd4d4e1

fix: remove debug logs

afab85f

fix: refactor resources files folders

9f220e9

fix: spliting and adding comments

5bfc75d

fix: update tests and match functionality

fc0752a

madhur310 commented Aug 8, 2025

View reviewed changes

mshanemc reviewed Aug 8, 2025

View reviewed changes

fix: pr feedback and removing unnecessary dependencies.

e09d25a

madhur310 requested a review from mshanemc August 10, 2025 22:17

		@@ -1,5 +1,11 @@
		// NOTE: This script is not used in the build process, but needs to be run manually to update the aura-system.json file

W-18851407 fix: delete forked code dependency and cleanup #611

Are you sure you want to change the base?

W-18851407 fix: delete forked code dependency and cleanup #611

Conversation

madhur310 commented Aug 6, 2025

What does this PR do?

What issues does this PR fix or reference?

Uh oh!

mshanemc left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

madhur310 Aug 10, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

madhur310 Aug 10, 2025 •

edited

Loading