fix: remove all unnecessary classes

madhur310 · madhur310 · commit 316f52df673f · 2025-09-10T22:59:00.000-07:00
diff --git a/packages/aura-language-server/src/aura-indexer/__tests__/__snapshots__/indexer.spec.ts.snap b/packages/aura-language-server/src/aura-indexer/__tests__/__snapshots__/indexer.spec.ts.snap
diff --git a/packages/aura-language-server/src/aura-indexer/__tests__/indexer.spec.ts b/packages/aura-language-server/src/aura-indexer/__tests__/indexer.spec.ts
@@ -4,7 +4,7 @@ import * as path from 'path';
 import mockFs from 'mock-fs';
 import URI from 'vscode-uri';
 
-function normalize(start: string, p: string): string {
+const normalize = (start: string, p: string): string => {
     // Fix relative paths on windows
     if (start.indexOf('\\') !== -1) {
         start = start.replace(/\\/g, '/');
@@ -18,10 +18,11 @@ function normalize(start: string, p: string): string {
         return p.slice(start.length + 1);
     }
     return p;
-}
-function uriToFile(uri: string): string {
+};
+
+const uriToFile = (uri: string): string => {
     return URI.parse(uri).fsPath;
-}
+};
 
 describe('indexer parsing content', () => {
     afterEach(() => {
diff --git a/packages/aura-language-server/src/aura-indexer/indexer.ts b/packages/aura-language-server/src/aura-indexer/indexer.ts
@@ -1,12 +1,11 @@
-import { Indexer, TagInfo, createTagInfo, createAttributeInfo, WorkspaceType, elapsedMillis } from '@salesforce/lightning-lsp-common';
+import { Indexer, TagInfo, createTagInfo, createAttributeInfo, WorkspaceType, elapsedMillis, TagType } from '@salesforce/lightning-lsp-common';
 import { componentFromFile, componentFromDirectory } from '../util/component-util';
 import { Location } from 'vscode-languageserver';
 import * as auraUtils from '../aura-utils';
 import * as fs from 'fs';
 import LineColumnFinder from 'line-column';
 import URI from 'vscode-uri';
 import EventsEmitter from 'events';
-import { TagType } from '@salesforce/lightning-lsp-common/lib/indexer/tagInfo';
 import { parse } from '../aura-utils';
 import { Node } from 'vscode-html-languageservice';
 import { AuraWorkspaceContext } from '../context/aura-context';
diff --git a/packages/aura-language-server/src/aura-server.ts b/packages/aura-language-server/src/aura-server.ts
@@ -23,13 +23,19 @@ import {
 import { getLanguageService, LanguageService, CompletionList } from 'vscode-html-languageservice';
 
 import URI from 'vscode-uri';
-import { utils, interceptConsoleLogger, TagInfo } from '@salesforce/lightning-lsp-common';
+import {
+    toResolvedPath,
+    WorkspaceType,
+    interceptConsoleLogger,
+    TagInfo,
+    elapsedMillis,
+    isAuraRootDirectoryCreated,
+    isAuraWatchedDirectory,
+} from '@salesforce/lightning-lsp-common';
 import { AuraWorkspaceContext } from './context/aura-context';
 import { startServer, addFile, delFile, onCompletion, onHover, onDefinition, onTypeDefinition, onReferences, onSignatureHelp } from './tern-server/tern-server';
 import AuraIndexer from './aura-indexer/indexer';
-import { toResolvedPath } from '@salesforce/lightning-lsp-common/lib/utils';
 import { setIndexer, getAuraTagProvider } from './markup/auraTags';
-import { WorkspaceType } from '@salesforce/lightning-lsp-common/lib/shared';
 import { getAuraBindingTemplateDeclaration, getAuraBindingValue } from './aura-utils';
 
 interface TagParams {
@@ -107,7 +113,7 @@ export default class Server {
             this.htmlLS = getLanguageService();
             this.htmlLS.setDataProviders(true, [getAuraTagProvider()]);
 
-            console.info('... language server started in ' + utils.elapsedMillis(startTime));
+            console.info('... language server started in ' + elapsedMillis(startTime));
 
             return {
                 capabilities: {
@@ -266,16 +272,16 @@ export default class Server {
         const changes = change.changes;
 
         try {
-            if (utils.isAuraRootDirectoryCreated(this.context, changes)) {
+            if (isAuraRootDirectoryCreated(this.context, changes)) {
                 await this.context.getIndexingProvider('aura').resetIndex();
                 await this.context.getIndexingProvider('aura').configureAndIndex();
                 // re-index everything on directory deletions as no events are reported for contents of deleted directories
                 const startTime = process.hrtime();
-                console.info('reindexed workspace in ' + utils.elapsedMillis(startTime) + ', directory was deleted:', changes);
+                console.info('reindexed workspace in ' + elapsedMillis(startTime) + ', directory was deleted:', changes);
                 return;
             } else {
                 for (const event of changes) {
-                    if (event.type === FileChangeType.Deleted && utils.isAuraWatchedDirectory(this.context, event.uri)) {
+                    if (event.type === FileChangeType.Deleted && isAuraWatchedDirectory(this.context, event.uri)) {
                         const dir = toResolvedPath(event.uri);
                         this.auraIndexer.clearTagsforDirectory(dir, this.context.type === WorkspaceType.SFDX);
                     } else {
diff --git a/packages/aura-language-server/src/tern-server/tern-server.ts b/packages/aura-language-server/src/tern-server/tern-server.ts
@@ -9,7 +9,7 @@ import URI from 'vscode-uri';
 import browser from '../tern/defs/browser.json';
 import ecmascript from '../tern/defs/ecmascript.json';
 
-import { memoize } from '@salesforce/lightning-lsp-common/lib/utils';
+import { memoize } from '@salesforce/lightning-lsp-common';
 import {
     TextDocumentPositionParams,
     CompletionList,
diff --git a/packages/lightning-lsp-common/package.json b/packages/lightning-lsp-common/package.json
@@ -36,6 +36,16 @@
       "import": "./lib/namespace-utils.js",
       "require": "./lib/namespace-utils.js",
       "types": "./lib/namespace-utils.d.ts"
+    },
+    "./indexer/attributeInfo": {
+      "import": "./lib/indexer/attributeInfo.js",
+      "require": "./lib/indexer/attributeInfo.js",
+      "types": "./lib/indexer/attributeInfo.d.ts"
+    },
+    "./indexer/tagInfo": {
+      "import": "./lib/indexer/tagInfo.js",
+      "require": "./lib/indexer/tagInfo.js",
+      "types": "./lib/indexer/tagInfo.d.ts"
     }
   },
   "license": "BSD-3-Clause",
diff --git a/packages/lightning-lsp-common/src/index.ts b/packages/lightning-lsp-common/src/index.ts
@@ -23,18 +23,23 @@ export {
     writeJsonSync,
 } from './utils';
 
-// Re-export utils as a namespace
-export * as utils from './utils';
-
 // Re-export from base-context
 export { BaseWorkspaceContext, Indexer, AURA_EXTENSIONS, processTemplate, getModulesDirs, updateForceIgnoreFile } from './base-context';
 
 // Re-export from shared
-export * from './shared';
-export * as shared from './shared';
+export { WorkspaceType, isLWC, getSfdxProjectFile, detectWorkspaceHelper, detectWorkspaceType } from './shared';
 
 // Re-export from indexer
-export { TagInfo, createTagInfo, getAttributeInfo, getHover, getComponentLibraryLink, getAttributeMarkdown, getMethodMarkdown } from './indexer/tagInfo';
+export {
+    TagInfo,
+    createTagInfo,
+    getAttributeInfo,
+    getHover,
+    getComponentLibraryLink,
+    getAttributeMarkdown,
+    getMethodMarkdown,
+    TagType,
+} from './indexer/tagInfo';
 export { AttributeInfo, createAttributeInfo, Decorator, MemberType } from './indexer/attributeInfo';
 
 // Re-export from other modules
diff --git a/packages/lightning-lsp-common/src/shared.ts b/packages/lightning-lsp-common/src/shared.ts
@@ -22,19 +22,19 @@ export enum WorkspaceType {
     UNKNOWN,
 }
 
-export function isLWC(type: WorkspaceType): boolean {
+export const isLWC = (type: WorkspaceType): boolean => {
     return type === WorkspaceType.SFDX || type === WorkspaceType.STANDARD_LWC || type === WorkspaceType.CORE_ALL || type === WorkspaceType.CORE_PARTIAL;
-}
+};
 
-export function getSfdxProjectFile(root: string): string {
+export const getSfdxProjectFile = (root: string): string => {
     return path.join(root, SFDX_PROJECT);
-}
+};
 
 /**
  * @param root
  * @returns WorkspaceType for singular root
  */
-export function detectWorkspaceHelper(root: string): WorkspaceType {
+export const detectWorkspaceHelper = (root: string): WorkspaceType => {
     if (fs.existsSync(getSfdxProjectFile(root))) {
         return WorkspaceType.SFDX;
     }
@@ -87,13 +87,13 @@ export function detectWorkspaceHelper(root: string): WorkspaceType {
 
     console.error('unknown workspace type:', root);
     return WorkspaceType.UNKNOWN;
-}
+};
 
 /**
  * @param workspaceRoots
  * @returns WorkspaceType, actively not supporting workspaces of mixed type
  */
-export function detectWorkspaceType(workspaceRoots: string[]): WorkspaceType {
+export const detectWorkspaceType = (workspaceRoots: string[]): WorkspaceType => {
     if (workspaceRoots.length === 1) {
         return detectWorkspaceHelper(workspaceRoots[0]);
     }
@@ -105,4 +105,4 @@ export function detectWorkspaceType(workspaceRoots: string[]): WorkspaceType {
         }
     }
     return WorkspaceType.CORE_PARTIAL;
-}
+};
diff --git a/packages/lwc-language-server/package.json b/packages/lwc-language-server/package.json
@@ -45,6 +45,21 @@
       "import": "./lib/typing.js",
       "require": "./lib/typing.js",
       "types": "./lib/typing.d.ts"
+    },
+    "./tag": {
+      "import": "./lib/tag.js",
+      "require": "./lib/tag.js",
+      "types": "./lib/tag.d.ts"
+    },
+    "./typing-indexer": {
+      "import": "./lib/typing-indexer.js",
+      "require": "./lib/typing-indexer.js",
+      "types": "./lib/typing-indexer.d.ts"
+    },
+    "./base-indexer": {
+      "import": "./lib/base-indexer.js",
+      "require": "./lib/base-indexer.js",
+      "types": "./lib/base-indexer.d.ts"
     }
   },
   "license": "BSD-3-Clause",
diff --git a/packages/lwc-language-server/src/__tests__/component-indexer.test.ts b/packages/lwc-language-server/src/__tests__/component-indexer.test.ts
@@ -3,11 +3,10 @@ import { Tag, createTag, getTagName } from '../tag';
 import { Entry } from 'fast-glob';
 import * as path from 'path';
 import { URI } from 'vscode-uri';
-import { shared } from '@salesforce/lightning-lsp-common';
+import { WorkspaceType } from '@salesforce/lightning-lsp-common';
 import { Stats, Dirent } from 'fs';
 import * as fs from 'fs';
 
-const { WorkspaceType } = shared;
 const workspaceRoot: string = path.resolve('../../test-workspaces/sfdx-workspace');
 const componentIndexer: ComponentIndexer = new ComponentIndexer({
     workspaceRoot,
diff --git a/packages/lwc-language-server/src/__tests__/typing-indexer.test.ts b/packages/lwc-language-server/src/__tests__/typing-indexer.test.ts
@@ -75,14 +75,9 @@ describe('TypingIndexer', () => {
         });
 
         it('should not create a customlabels typing file when a project has no custom labels', async () => {
-            const xmlDocument = `
-<?xml version="1.0" encoding="UTF-8"?>
-<CustomLabels xmlns="http://soap.sforce.com/2006/04/metadata"/>
-`;
-            jest.spyOn(fs, 'readFileSync').mockReturnValue(Buffer.from(xmlDocument));
-            jest.spyOn(typingIndexer, 'customLabelFiles', 'get').mockReturnValue([
-                '/foo/bar/test-workspaces/sfdx-workspace/utils/meta/labels/CustomLabels.labels-meta.xml',
-            ]);
+            // Mock the getCustomLabelFiles function to return empty array (no custom labels)
+            // eslint-disable-next-line @typescript-eslint/no-var-requires
+            jest.spyOn(require('../typing-indexer'), 'getCustomLabelFiles').mockReturnValue([]);
 
             const fileWriter = jest.spyOn(fs, 'writeFileSync');
             await typingIndexer.saveCustomLabelTypings();
diff --git a/packages/lwc-language-server/src/component-indexer.ts b/packages/lwc-language-server/src/component-indexer.ts
@@ -1,14 +1,13 @@
 import { Tag, createTag, createTagFromFile, getTagName, getTagUri } from './tag';
 import * as path from 'path';
-import { shared, utils } from '@salesforce/lightning-lsp-common';
+import { detectWorkspaceHelper, WorkspaceType, readJsonSync, writeJsonSync } from '@salesforce/lightning-lsp-common';
 import { Entry, sync } from 'fast-glob';
 import normalize from 'normalize-path';
 import * as fs from 'fs';
 import { snakeCase } from 'change-case';
 import camelcase from 'camelcase';
 import { getWorkspaceRoot, getSfdxConfig, getSfdxPackageDirsPattern } from './base-indexer';
 
-const { detectWorkspaceHelper, WorkspaceType } = shared;
 const CUSTOM_COMPONENT_INDEX_PATH = path.join('.sfdx', 'indexes', 'lwc');
 const CUSTOM_COMPONENT_INDEX_FILE = path.join(CUSTOM_COMPONENT_INDEX_PATH, 'custom-components.json');
 const componentPrefixRegex = new RegExp(/^(?<type>c|lightning|interop){0,1}(?<delimiter>:|-{0,1})(?<name>[\w\-]+)$/);
@@ -128,7 +127,7 @@ export default class ComponentIndexer {
         const sfdxTsConfigPath = normalize(`${this.workspaceRoot}/.sfdx/tsconfig.sfdx.json`);
         if (fs.existsSync(sfdxTsConfigPath)) {
             try {
-                const sfdxTsConfig = utils.readJsonSync(sfdxTsConfigPath);
+                const sfdxTsConfig = readJsonSync(sfdxTsConfigPath);
                 for (const filePath of filePaths) {
                     const { dir, name: fileName } = path.parse(filePath);
                     const componentName = `c/${fileName}`;
@@ -139,7 +138,7 @@ export default class ComponentIndexer {
                         tsConfigFilePaths.push(componentFilePath);
                     }
                 }
-                utils.writeJsonSync(sfdxTsConfigPath, sfdxTsConfig);
+                writeJsonSync(sfdxTsConfigPath, sfdxTsConfig);
             } catch (err) {
                 console.error(err);
             }
@@ -154,11 +153,11 @@ export default class ComponentIndexer {
         const sfdxTsConfigPath = normalize(`${this.workspaceRoot}/.sfdx/tsconfig.sfdx.json`);
         if (fs.existsSync(sfdxTsConfigPath)) {
             try {
-                const sfdxTsConfig = utils.readJsonSync(sfdxTsConfigPath);
+                const sfdxTsConfig = readJsonSync(sfdxTsConfigPath);
                 // The assumption here is that sfdxTsConfig will not be modified by the user as
                 // it is located in the .sfdx directory.
                 sfdxTsConfig.compilerOptions.paths = this.tsConfigPathMapping;
-                utils.writeJsonSync(sfdxTsConfigPath, sfdxTsConfig);
+                writeJsonSync(sfdxTsConfigPath, sfdxTsConfig);
             } catch (err) {
                 console.error(err);
             }
diff --git a/packages/lwc-language-server/src/lwc-server.ts b/packages/lwc-language-server/src/lwc-server.ts
@@ -32,7 +32,15 @@ import { basename, dirname, parse } from 'path';
 import { compileDocument as javascriptCompileDocument } from './javascript/compiler';
 import { AuraDataProvider } from './aura-data-provider';
 import { LWCDataProvider } from './lwc-data-provider';
-import { interceptConsoleLogger, utils, shared, isLWCWatchedDirectory } from '@salesforce/lightning-lsp-common';
+import {
+    interceptConsoleLogger,
+    WorkspaceType,
+    isLWCWatchedDirectory,
+    isLWCRootDirectoryCreated,
+    containsDeletedLwcWatchedDirectory,
+    toResolvedPath,
+    getBasename,
+} from '@salesforce/lightning-lsp-common';
 import { LWCWorkspaceContext } from './context/lwc-context';
 
 import ComponentIndexer from './component-indexer';
@@ -45,8 +53,6 @@ import { TYPESCRIPT_SUPPORT_SETTING } from './constants';
 const propertyRegex = new RegExp(/\{(?<property>\w+)\.*.*\}/);
 const iteratorRegex = new RegExp(/iterator:(?<name>\w+)/);
 
-const { WorkspaceType } = shared;
-
 export enum Token {
     Tag = 'tag',
     AttributeKey = 'attributeKey',
@@ -171,7 +177,7 @@ export default class Server {
             this.auraDataProvider.activated = false; // provide completions for lwc components in an Aura template
             this.lwcDataProvider.activated = true;
             if (this.shouldProvideBindingsInHTML(params)) {
-                const docBasename = utils.getBasename(doc);
+                const docBasename = getBasename(doc);
                 const customTags: CompletionItem[] = this.findBindItems(docBasename);
                 return {
                     isIncomplete: false,
@@ -292,12 +298,12 @@ export default class Server {
                 const hasTsEnabled = await this.isTsSupportEnabled();
                 if (hasTsEnabled) {
                     const { changes } = changeEvent;
-                    if (utils.isLWCRootDirectoryCreated(this.context, changes)) {
+                    if (isLWCRootDirectoryCreated(this.context, changes)) {
                         // LWC directory created
                         this.context.updateNamespaceRootTypeCache();
                         this.componentIndexer.updateSfdxTsConfigPath();
                     } else {
-                        const hasDeleteEvent = await utils.containsDeletedLwcWatchedDirectory(this.context, changes);
+                        const hasDeleteEvent = await containsDeletedLwcWatchedDirectory(this.context, changes);
                         if (hasDeleteEvent) {
                             // We need to scan the file system for deletion events as the change event does not include
                             // information about the files that were deleted.
@@ -308,7 +314,7 @@ export default class Server {
                                 const insideLwcWatchedDirectory = await isLWCWatchedDirectory(this.context, event.uri);
                                 if (event.type === FileChangeType.Created && insideLwcWatchedDirectory) {
                                     // File creation
-                                    const filePath = utils.toResolvedPath(event.uri);
+                                    const filePath = toResolvedPath(event.uri);
                                     const { dir, name: fileName, ext } = parse(filePath);
                                     const folderName = basename(dir);
                                     const parentFolder = basename(dirname(dir));
diff --git a/yarn.lock b/yarn.lock
