@lwc/lwc-dev-server 10.7.0 → 10.7.1

package/dist/server/bundler/lexBundler.d.ts

@@ -1,7 +1,7 @@
 import { type DevServerContext } from '../../types/index.js';
+import { ModulePart } from '../moduleGraph/module.js';
 import type { TransformOptions } from '@lwc/compiler';
-import type { Lifecycle, Logger } from '@salesforce/core';
-export declare function compile(ctx: DevServerContext, modulePath: string, options: TransformOptions, logger: Logger, lifecycle?: Lifecycle): Promise<{
+export declare function compile(ctx: DevServerContext, { module, part }: ModulePart, compileOptions: TransformOptions): Promise<{
     code: string | undefined;
-    warnings: string[];
+    warnings: import("@lwc/errors").CompilerDiagnostic[];
 }>;

package/dist/server/bundler/lexBundler.js

@@ -1,7 +1,7 @@
 import { compile as platformCompile } from '@lwc/sfdc-lwc-compiler';
 import { Workspace } from '../../types/index.js';
 import { measureOperationTime } from '../util/telemetry.js';
-function transformOptionsToPlatformCompileConfig(ctx, transformOptions, modulePath) {
+function transformOptionsToPlatformCompileConfig(ctx, transformOptions, files) {
     const { enableDynamicComponents, enableLightningWebSecurityTransforms, experimentalComplexExpressions, apiVersion, name, namespace, experimentalDynamicComponent, outputConfig, } = transformOptions;
     const options = {
         // variable options
@@ -17,17 +17,14 @@ function transformOptionsToPlatformCompileConfig(ctx, transformOptions, modulePa
         // Enable HMR always in dev server
         enableHmr: true,
     };
-    const getBundleType = () => {
-        if (ctx.config.workspace === Workspace.Internal || ctx.config.workspace === Workspace.Mrt) {
-            return 'internal';
-        }
-        return 'platform';
-    };
+    const bundleType = ctx.config.workspace === Workspace.Internal || ctx.config.workspace === Workspace.Mrt
+        ? 'internal'
+        : 'platform';
     const bundle = {
-        type: getBundleType(),
+        type: bundleType,
         name: name,
         namespace: namespace ?? 'c',
-        files: ctx.moduleGraph.getModuleFiles(name, namespace ?? '', modulePath),
+        files,
         options,
     };
     const compilerConfigs = [
@@ -41,16 +38,17 @@ function transformOptionsToPlatformCompileConfig(ctx, transformOptions, modulePa
         compilerConfigs,
     };
 }
-export async function compile(ctx, modulePath, options, logger, lifecycle) {
-    const compileConfig = transformOptionsToPlatformCompileConfig(ctx, options, modulePath);
-    const result = await measureOperationTime('compile-time', () => platformCompile(compileConfig), lifecycle);
+export async function compile(ctx, { module, part }, compileOptions) {
+    const sources = await module.getSources(part);
+    const compileConfig = transformOptionsToPlatformCompileConfig(ctx, compileOptions, sources);
+    const result = await measureOperationTime('compile-time', () => platformCompile(compileConfig), ctx.config.lifecycle);
     if (!result.success) {
-        logger.error(`Failed to compile ${modulePath}. \n\tDiagnostics: ${JSON.stringify(result.diagnostics)}`);
-        return { code: undefined, warnings: [result.diagnostics.toString()] };
+        ctx.logger.error(`Failed to compile ${part}. \n\tDiagnostics: ${JSON.stringify(result.diagnostics)}`);
+        return { code: undefined, warnings: result.diagnostics };
     }
     return {
         code: result.results?.[0].code,
-        warnings: result.diagnostics.length ? [result.diagnostics.toString()] : [],
+        warnings: result.diagnostics,
     };
 }
 //# sourceMappingURL=lexBundler.js.map

package/dist/server/bundler/lexBundler.js.map

@@ -1 +1 @@
-{"version":3,"file":"lexBundler.js","sourceRoot":"","sources":["../../../src/server/bundler/lexBundler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAyB,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAW5D,SAAS,uCAAuC,CAC5C,GAAqB,EACrB,gBAAkC,EAClC,UAAkB;IAElB,MAAM,EACF,uBAAuB,EACvB,oCAAoC,EACpC,8BAA8B,EAC9B,UAAU,EACV,IAAI,EACJ,SAAS,EACT,4BAA4B,EAC5B,YAAY,GACf,GAAG,gBAAgB,CAAC;IACrB,MAAM,OAAO,GAAkB;QAC3B,mBAAmB;QACnB,sBAAsB,EAAE,uBAAuB;QAC/C,oCAAoC,EAAE,oCAAoC;QAC1E,yBAAyB,EAAE,8BAA8B;QACzD,UAAU,EAAE,UAAU;QACtB,mBAAmB;QACnB,qBAAqB,EAAE,IAAI;QAC3B,aAAa,EAAE,SAAS;QACxB,iBAAiB,EAAE,IAAI;QACvB,wBAAwB,EAAE,IAAI;QAC9B,kCAAkC;QAClC,SAAS,EAAE,IAAI;KAClB,CAAC;IAEF,MAAM,aAAa,GAAG,GAAe,EAAE;QACnC,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,GAAG,EAAE,CAAC;YACxF,OAAO,UAAU,CAAC;QACtB,CAAC;QACD,OAAO,UAAU,CAAC;IACtB,CAAC,CAAC;IAEF,MAAM,MAAM,GAAiB;QACzB,IAAI,EAAE,aAAa,EAAE;QACrB,IAAI,EAAE,IAAK;QACX,SAAS,EAAE,SAAS,IAAI,GAAG;QAC3B,KAAK,EAAE,GAAG,CAAC,WAAW,CAAC,cAAc,CAAC,IAAK,EAAE,SAAS,IAAI,EAAE,EAAE,UAAU,CAAC;QACzE,OAAO;KACV,CAAC;IACF,MAAM,eAAe,GAAqB;QACtC;YACI,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,YAAY,EAAE,SAAS,EAAE;YACrE,4BAA4B,EAAE,4BAA4B;SAC7D;KACJ,CAAC;IACF,OAAO;QACH,MAAM;QACN,eAAe;KAClB,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CACzB,GAAqB,EACrB,UAAkB,EAClB,OAAyB,EACzB,MAAc,EACd,SAAqB;IAErB,MAAM,aAAa,GAAG,uCAAuC,CAAC,GAAG,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;IACxF,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACrC,cAAc,EACd,GAAG,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,EACpC,SAAS,CACZ,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAClB,MAAM,CAAC,KAAK,CACR,qBAAqB,UAAU,sBAAsB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAC5F,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,EAAE,CAAC;IAC1E,CAAC;IAED,OAAO;QACH,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;QAC9B,QAAQ,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE;KAC7E,CAAC;AACN,CAAC"}
+{"version":3,"file":"lexBundler.js","sourceRoot":"","sources":["../../../src/server/bundler/lexBundler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,EAAE,SAAS,EAAyB,MAAM,sBAAsB,CAAC;AACxE,OAAO,EAAE,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AAW5D,SAAS,uCAAuC,CAC5C,GAAqB,EACrB,gBAAkC,EAClC,KAAkB;IAElB,MAAM,EACF,uBAAuB,EACvB,oCAAoC,EACpC,8BAA8B,EAC9B,UAAU,EACV,IAAI,EACJ,SAAS,EACT,4BAA4B,EAC5B,YAAY,GACf,GAAG,gBAAgB,CAAC;IACrB,MAAM,OAAO,GAAkB;QAC3B,mBAAmB;QACnB,sBAAsB,EAAE,uBAAuB;QAC/C,oCAAoC,EAAE,oCAAoC;QAC1E,yBAAyB,EAAE,8BAA8B;QACzD,UAAU,EAAE,UAAU;QACtB,mBAAmB;QACnB,qBAAqB,EAAE,IAAI;QAC3B,aAAa,EAAE,SAAS;QACxB,iBAAiB,EAAE,IAAI;QACvB,wBAAwB,EAAE,IAAI;QAC9B,kCAAkC;QAClC,SAAS,EAAE,IAAI;KAClB,CAAC;IACF,MAAM,UAAU,GACZ,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,QAAQ,IAAI,GAAG,CAAC,MAAM,CAAC,SAAS,KAAK,SAAS,CAAC,GAAG;QACjF,CAAC,CAAC,UAAU;QACZ,CAAC,CAAC,UAAU,CAAC;IAErB,MAAM,MAAM,GAAiB;QACzB,IAAI,EAAE,UAAU;QAChB,IAAI,EAAE,IAAK;QACX,SAAS,EAAE,SAAS,IAAI,GAAG;QAC3B,KAAK;QACL,OAAO;KACV,CAAC;IACF,MAAM,eAAe,GAAqB;QACtC;YACI,YAAY,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC,YAAY,EAAE,SAAS,EAAE;YACrE,4BAA4B,EAAE,4BAA4B;SAC7D;KACJ,CAAC;IACF,OAAO;QACH,MAAM;QACN,eAAe;KAClB,CAAC;AACN,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO,CACzB,GAAqB,EACrB,EAAE,MAAM,EAAE,IAAI,EAAc,EAC5B,cAAgC;IAEhC,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,uCAAuC,CAAC,GAAG,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;IAC5F,MAAM,MAAM,GAAG,MAAM,oBAAoB,CACrC,cAAc,EACd,GAAG,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,EACpC,GAAG,CAAC,MAAM,CAAC,SAAS,CACvB,CAAC;IAEF,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC;QAClB,GAAG,CAAC,MAAM,CAAC,KAAK,CACZ,qBAAqB,IAAI,sBAAsB,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CACtF,CAAC;QACF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,CAAC,WAAW,EAAE,CAAC;IAC7D,CAAC;IAED,OAAO;QACH,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI;QAC9B,QAAQ,EAAE,MAAM,CAAC,WAAW;KAC/B,CAAC;AACN,CAAC"}

package/dist/server/bundler/lexBundler.spec.js

@@ -1,71 +1,113 @@
 import { compile as platformCompile } from '@lwc/sfdc-lwc-compiler';
-import { Workspace } from '../../types/index';
+import { Workspace } from '../../types/index.js';
 import { compile } from './lexBundler';
-vi.mock('@lwc/sfdc-lwc-compiler');
+// Mock dependencies
+vi.mock('@lwc/sfdc-lwc-compiler', () => ({
+    compile: vi.fn(),
+}));
+vi.mock('../util/telemetry.js', () => ({
+    measureOperationTime: vi.fn((name, fn) => fn()),
+}));
+const mockCompileOptions = {
+    enableDynamicComponents: true,
+    enableLightningWebSecurityTransforms: true,
+    experimentalComplexExpressions: true,
+    apiVersion: 50,
+    name: 'testModule',
+    namespace: 'c',
+    outputConfig: { sourcemap: true },
+};
 describe('compile', () => {
-    let mockCtx;
-    let mockLogger;
-    const mockModulePath = 'src/modules/myModule';
-    const mockTransformOptions = {
-        enableDynamicComponents: true,
-        enableLightningWebSecurityTransforms: true,
-        experimentalComplexExpressions: true,
-        apiVersion: 50,
-        name: 'myModule',
-        namespace: 'c',
-    };
-    beforeEach(() => {
-        mockLogger = {
-            error: vi.fn(),
-        };
-        mockCtx = {
+    it('should compile successfully', async () => {
+        const ctx = {
             config: {
                 workspace: Workspace.Internal,
             },
-            moduleGraph: {
-                getModuleFiles: vi.fn().mockReturnValue(['file1', 'file2']),
+            logger: {
+                error: vi.fn(),
             },
+            moduleGraph: {},
         };
-        vi.clearAllMocks();
-    });
-    it('should compile successfully and return code and warnings', async () => {
-        const mockResult = {
+        const module = {
+            getSources: vi.fn().mockResolvedValue({ 'test.js': 'console.log("test");' }),
+        };
+        const part = 'testPart';
+        vi.mocked(platformCompile).mockResolvedValue({
             success: true,
-            results: [
+            results: [{ code: 'compiled code' }],
+            diagnostics: [],
+            version: '1.0.0',
+            timings: {},
+        });
+        const result = await compile(ctx, { module, part }, mockCompileOptions);
+        expect(platformCompile).toHaveBeenCalledWith({
+            bundle: {
+                files: {
+                    'test.js': 'console.log("test");',
+                },
+                name: 'testModule',
+                namespace: 'c',
+                options: {
+                    allowDynamicComponents: true,
+                    apiVersion: 50,
+                    disableProcessNodeEnv: true,
+                    dynamicImport: 'allowed',
+                    enableHmr: true,
+                    enableLightningWebSecurityTransforms: true,
+                    enableTemplateExpressions: true,
+                    forceNamedExports: true,
+                    strictCSSTokenCollection: true,
+                },
+                type: 'internal',
+            },
+            compilerConfigs: [
                 {
-                    code: 'compiled code',
-                    map: '',
-                    imports: [],
-                    diagnostics: [],
                     outputConfig: {
                         minify: false,
-                        sourcemap: false,
-                        lockerConfig: {},
-                        env: { NODE_ENV: 'dev' },
+                        sourcemap: true,
                     },
-                    timings: {},
                 },
             ],
-            diagnostics: [],
-            timings: {},
-            version: '1',
-        };
-        vi.mocked(platformCompile).mockResolvedValue(mockResult);
-        const result = await compile(mockCtx, mockModulePath, mockTransformOptions, mockLogger);
-        expect(platformCompile).toHaveBeenCalledWith(expect.any(Object));
-        expect(result.code).toBe('compiled code');
-        expect(result.warnings).toEqual([]);
+        });
+        expect(result).toEqual({
+            code: 'compiled code',
+            warnings: [],
+        });
+        expect(ctx.logger.error).not.toHaveBeenCalledWith(expect.any(String));
     });
-    it('should return undefined code and warnings when compilation fails', async () => {
+    it('should handle compile errors', async () => {
+        const ctx = {
+            config: {
+                workspace: Workspace.Internal,
+            },
+            logger: {
+                error: vi.fn(),
+            },
+            moduleGraph: {},
+        };
+        const module = {
+            getSources: vi.fn().mockResolvedValue({ 'test.js': 'console.log("test");' }),
+        };
+        const part = 'testPart';
         vi.mocked(platformCompile).mockResolvedValue({
+            version: '1.0.0',
+            timings: {},
             success: false,
             results: [],
-            diagnostics: [],
-            version: '1',
-            timings: {},
+            diagnostics: [{ code: 1010, level: 1, message: 'Error message' }],
+        });
+        const result = await compile(ctx, { module, part }, mockCompileOptions);
+        expect(result).toEqual({
+            code: undefined,
+            warnings: [
+                {
+                    code: 1010,
+                    level: 1,
+                    message: 'Error message',
+                },
+            ],
         });
-        const result = await compile(mockCtx, mockModulePath, mockTransformOptions, mockLogger);
-        expect(result.code).toBeUndefined();
+        expect(ctx.logger.error).toHaveBeenCalledWith(`Failed to compile ${part}. \n\tDiagnostics: [{"code":1010,"level":1,"message":"Error message"}]`);
     });
 });
 //# sourceMappingURL=lexBundler.spec.js.map

package/dist/server/bundler/lexBundler.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"lexBundler.spec.js","sourceRoot":"","sources":["../../../src/server/bundler/lexBundler.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEpE,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAIvC,EAAE,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;AAElC,QAAQ,CAAC,SAAS,EAAE,GAAG,EAAE;IACrB,IAAI,OAAyB,CAAC;IAC9B,IAAI,UAAkB,CAAC;IACvB,MAAM,cAAc,GAAG,sBAAsB,CAAC;IAC9C,MAAM,oBAAoB,GAAqB;QAC3C,uBAAuB,EAAE,IAAI;QAC7B,oCAAoC,EAAE,IAAI;QAC1C,8BAA8B,EAAE,IAAI;QACpC,UAAU,EAAE,EAAE;QACd,IAAI,EAAE,UAAU;QAChB,SAAS,EAAE,GAAG;KACjB,CAAC;IAEF,UAAU,CAAC,GAAG,EAAE;QACZ,UAAU,GAAG;YACT,KAAK,EAAE,EAAE,CAAC,EAAE,EAAE;SACI,CAAC;QAEvB,OAAO,GAAG;YACN,MAAM,EAAE;gBACJ,SAAS,EAAE,SAAS,CAAC,QAAQ;aAChC;YACD,WAAW,EAAE;gBACT,cAAc,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;aAC9D;SAC2B,CAAC;QAEjC,EAAE,CAAC,aAAa,EAAE,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;QACtE,MAAM,UAAU,GAAG;YACf,OAAO,EAAE,IAAI;YACb,OAAO,EAAE;gBACL;oBACI,IAAI,EAAE,eAAe;oBACrB,GAAG,EAAE,EAAE;oBACP,OAAO,EAAE,EAAE;oBACX,WAAW,EAAE,EAAE;oBACf,YAAY,EAAE;wBACV,MAAM,EAAE,KAAK;wBACb,SAAS,EAAE,KAAK;wBAChB,YAAY,EAAE,EAAE;wBAChB,GAAG,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;qBAC3B;oBACD,OAAO,EAAE,EAAE;iBACd;aACJ;YACD,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,EAAE;YACX,OAAO,EAAE,GAAG;SACf,CAAC;QACF,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAEzD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,UAAU,CAAC,CAAC;QAExF,MAAM,CAAC,eAAe,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;QAC9E,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,iBAAiB,CAAC;YACzC,OAAO,EAAE,KAAK;YACd,OAAO,EAAE,EAAE;YACX,WAAW,EAAE,EAAE;YACf,OAAO,EAAE,GAAG;YACZ,OAAO,EAAE,EAAE;SACd,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,UAAU,CAAC,CAAC;QAExF,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,aAAa,EAAE,CAAC;IACxC,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
+{"version":3,"file":"lexBundler.spec.js","sourceRoot":"","sources":["../../../src/server/bundler/lexBundler.spec.ts"],"names":[],"mappings":"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"}

package/dist/server/connection/client.d.ts

@@ -1,7 +1,7 @@
+import { HMR_Data_Outbound, HMR_Data_Inbound } from '@lwc/lwc-dev-server-types';
+import { TransformOptions } from '@lwc/compiler';
 import { DevServerContext } from '../../types/devServer.js';
 import { Connection } from './connection.js';
-import type { HMR_Data } from '@lwc/lwc-dev-server-types';
-import type { TransformOptions } from '@lwc/compiler';
 /**
  * Class representing a client that has connected to the dev server.
  * This class represents a client that is connected and ready to receive hot module updates.
@@ -11,14 +11,12 @@ import type { TransformOptions } from '@lwc/compiler';
 export declare class Client {
     clientId: string;
     url: string;
-    activePaths: Map<string, TransformOptions>;
     connection: Connection;
     ctx: DevServerContext;
+    compileOptions: Map<string, TransformOptions>;
     constructor(clientId: string, url: string, connection: Connection, ctx: DevServerContext);
     onClose(callback: () => void): void;
-    removeStalePaths(paths: string[]): void;
-    getCompileOptions(path: string): TransformOptions | undefined;
-    send(data: HMR_Data): void;
-    messageCallback(data: HMR_Data): Promise<void>;
+    send(data: HMR_Data_Outbound): void;
+    messageCallback(data: HMR_Data_Inbound): Promise<void>;
     close(): void;
 }

package/dist/server/connection/client.js

@@ -1,12 +1,5 @@
 import { compile } from '../bundler/lexBundler.js';
-const ALLOWED_OUTBOUND_DATA_TYPES = new Set([
-    'update',
-    'module-update',
-    'module-delete',
-    'error',
-    'auth-response',
-]);
-const ALLOWED_INBOUND_DATA_TYPES = new Set(['fetch', 'register']);
+import { decodeModulePath } from '../util/module-util.js';
 /**
  * Class representing a client that has connected to the dev server.
  * This class represents a client that is connected and ready to receive hot module updates.
@@ -15,41 +8,27 @@ const ALLOWED_INBOUND_DATA_TYPES = new Set(['fetch', 'register']);
  */
 export class Client {
     constructor(clientId, url, connection, ctx) {
-        this.activePaths = new Map();
         this.clientId = clientId;
         this.url = url;
         this.connection = connection;
         this.connection.receive(this.messageCallback.bind(this));
         this.ctx = ctx;
+        this.compileOptions = new Map();
     }
     onClose(callback) {
         this.connection.onClose(callback);
     }
-    removeStalePaths(paths) {
-        paths.forEach((p) => this.activePaths.delete(p));
-    }
-    getCompileOptions(path) {
-        return this.activePaths.get(path);
-    }
     send(data) {
-        if (!ALLOWED_OUTBOUND_DATA_TYPES.has(data.type)) {
-            this.ctx.logger.debug(`[LWC Dev Server] Blocking unexpected type of data being sent from server to hmr-client '${data.type}'`);
-            return;
-        }
         this.connection.send(data);
     }
     async messageCallback(data) {
-        if (!ALLOWED_INBOUND_DATA_TYPES.has(data.type)) {
-            this.ctx.logger.debug(`[LWC Dev Server] Blocking unexpected type of data received from hmr-client '${data.type}'`);
-            return;
-        }
         const { ctx: { logger, moduleGraph, config: { lifecycle }, }, } = this;
         switch (data.type) {
             // In coming hot module
             case 'fetch': {
                 const { data: { modulePath }, } = data;
-                const moduleFilePath = moduleGraph.getFileByModulePath(modulePath);
-                if (!moduleFilePath) {
+                const modulePart = this.ctx.moduleGraph.getModulePart(modulePath);
+                if (!modulePart) {
                     const error = {
                         type: 'error',
                         data: {
@@ -57,16 +36,17 @@ export class Client {
                         },
                     };
                     this.connection.send(error);
-                }
-                const compileOptions = this.getCompileOptions(modulePath);
-                if (!compileOptions) {
-                    logger.debug(`Found no compile option for module path: ${modulePath}, check the __lwc_hmr_hot.register() call.`);
                     break;
                 }
                 logger.debug(`[LWC Dev Server] Compiling ${modulePath}`);
-                const result = await compile(this.ctx, modulePath, compileOptions, logger);
+                const compileOptions = this.compileOptions.get(modulePart.module.id());
+                if (!compileOptions) {
+                    logger.error(`Found no compile option for module path: ${modulePart.module.id()}, check the __lwc_hmr_hot.register() call.`);
+                    throw new Error(`No Compile Options for module path: ${modulePart.module.id()}`);
+                }
+                const result = await compile(this.ctx, modulePart, compileOptions);
                 if (!result.code) {
-                    logger.error(`Compiling ${moduleFilePath} failed and there are compiler warnings: ${JSON.stringify(result.warnings)}`);
+                    logger.error(`Compiling ${modulePath} failed and there are compiler warnings: ${JSON.stringify(result.warnings)}`);
                     break;
                 }
                 logger.debug(`[LWC Dev Server] Sending an updated ${modulePath}`);
@@ -81,17 +61,21 @@ export class Client {
                 break;
             }
             case 'register': {
-                const modules = data.data.modules;
-                for (const { modulePath, compileOptions } of modules) {
-                    this.activePaths.set(modulePath, compileOptions);
+                const moduleParts = [];
+                for (const { modulePath, hash, compileOptions } of data.data.modules) {
+                    const { id, part } = decodeModulePath(modulePath);
+                    moduleParts.push({ id, part, hash });
+                    this.compileOptions.set(id, compileOptions);
                 }
                 // Inform the hmr-client of available updates, this ensures that any local changes
                 // that haven't been deployed to the remote app are updated upon client registration.
-                const staleModules = moduleGraph.getStaleModules(modules);
-                this.send({
-                    type: 'update',
-                    data: Array.from(staleModules).map((modulePath) => ({ modulePath })),
-                });
+                const staleModules = moduleGraph.getStaleModules(moduleParts);
+                if (staleModules.size > 0) {
+                    this.send({
+                        type: 'update',
+                        data: Array.from(staleModules).map((modulePath) => ({ modulePath })),
+                    });
+                }
                 break;
             }
         }

package/dist/server/connection/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/server/connection/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/server/connection/client.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAG1D;;;;;GAKG;AACH,MAAM,OAAO,MAAM;IAMf,YAAY,QAAgB,EAAE,GAAW,EAAE,UAAsB,EAAE,GAAqB;QACpF,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAC;QACf,IAAI,CAAC,cAAc,GAAG,IAAI,GAAG,EAAE,CAAC;IACpC,CAAC;IAED,OAAO,CAAC,QAAoB;QACxB,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACtC,CAAC;IAED,IAAI,CAAC,IAAuB;QACxB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,eAAe,CAAC,IAAsB;QACxC,MAAM,EACF,GAAG,EAAE,EACD,MAAM,EACN,WAAW,EACX,MAAM,EAAE,EAAE,SAAS,EAAE,GACxB,GACJ,GAAG,IAAI,CAAC;QACT,QAAQ,IAAI,CAAC,IAAI,EAAE,CAAC;YAChB,uBAAuB;YACvB,KAAK,OAAO,CAAC,CAAC,CAAC;gBACX,MAAM,EACF,IAAI,EAAE,EAAE,UAAU,EAAE,GACvB,GAAG,IAAI,CAAC;gBACT,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,aAAa,CAAC,UAAU,CAAC,CAAC;gBAClE,IAAI,CAAC,UAAU,EAAE,CAAC;oBACd,MAAM,KAAK,GAAG;wBACV,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE;4BACF,OAAO,EAAE,YAAY,UAAU,sDAAsD;yBACxF;qBACK,CAAC;oBACX,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBAC5B,MAAM;gBACV,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,8BAA8B,UAAU,EAAE,CAAC,CAAC;gBAEzD,MAAM,cAAc,GAAG,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvE,IAAI,CAAC,cAAc,EAAE,CAAC;oBAClB,MAAM,CAAC,KAAK,CACR,4CAA4C,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,4CAA4C,CACjH,CAAC;oBACF,MAAM,IAAI,KAAK,CACX,uCAAuC,UAAU,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAClE,CAAC;gBACN,CAAC;gBACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;gBACnE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;oBACf,MAAM,CAAC,KAAK,CACR,aAAa,UAAU,4CAA4C,IAAI,CAAC,SAAS,CAC7E,MAAM,CAAC,QAAQ,CAClB,EAAE,CACN,CAAC;oBACF,MAAM;gBACV,CAAC;gBACD,MAAM,CAAC,KAAK,CAAC,uCAAuC,UAAU,EAAE,CAAC,CAAC;gBAClE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;oBACjB,IAAI,EAAE,eAAe;oBACrB,IAAI,EAAE,CAAC,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC;iBAC3C,CAAC,CAAC;gBAEH,SAAS,EAAE,aAAa,CAAC;oBACrB,SAAS,EAAE,iBAAiB;oBAC5B,MAAM,EAAE,UAAU;iBACrB,CAAC,CAAC;gBACH,MAAM;YACV,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBACd,MAAM,WAAW,GAAiD,EAAE,CAAC;gBACrE,KAAK,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,cAAc,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;oBACnE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;oBAClD,WAAW,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;oBACrC,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;gBAChD,CAAC;gBAED,kFAAkF;gBAClF,qFAAqF;gBACrF,MAAM,YAAY,GAAG,WAAW,CAAC,eAAe,CAAC,WAAW,CAAC,CAAC;gBAC9D,IAAI,YAAY,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;oBACxB,IAAI,CAAC,IAAI,CAAC;wBACN,IAAI,EAAE,QAAQ;wBACd,IAAI,EAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC;qBACvE,CAAC,CAAC;gBACP,CAAC;gBACD,MAAM;YACV,CAAC;QACL,CAAC;IACL,CAAC;IAED,KAAK;QACD,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;IAC5B,CAAC;CACJ"}

package/dist/server/connection/client.spec.js

@@ -1,87 +1,125 @@
-import { describe, it, expect, vi, beforeEach } from 'vitest';
-import { Workspace } from '../../types/serverConfig';
 import { compile } from '../bundler/lexBundler.js';
-import { Client } from './client';
-vi.mock('../bundler/lexBundler.js');
+import { Module } from '../moduleGraph/module.js';
+import { Client } from './client.js';
+// Mock dependencies
+vi.mock('../bundler/lexBundler.js', () => ({
+    compile: vi.fn(),
+}));
 describe('Client', () => {
+    let clientId;
+    let url;
+    let connection;
+    let ctx;
     let client;
-    let mockConnection;
-    let mockCtx;
-    let mockConfig;
-    const mockClientId = 'client-id';
-    const mockUrl = 'http://localhost';
-    const mockModuleGraph = {
-        getFileByModulePath: vi.fn(),
-        registerActivePaths: vi.fn(),
-        getModuleBoundary: vi.fn(),
-        getStaleModules: vi.fn().mockReturnValue(['stale-module']),
-    };
-    const mockLogger = {
-        debug: vi.fn(),
-    };
     beforeEach(() => {
-        mockConnection = {
-            send: vi.fn(),
+        clientId = 'test-client-id';
+        url = 'http://localhost';
+        connection = {
             receive: vi.fn(),
+            send: vi.fn(),
             onClose: vi.fn(),
             close: vi.fn(),
         };
-        mockConfig = {
-            paths: [],
-            port: 50182,
-            rootDir: '',
-            workspace: Workspace.Internal,
+        ctx = {
+            logger: {
+                debug: vi.fn(),
+            },
+            moduleGraph: {
+                getModulePart: vi.fn(),
+                getStaleModules: vi.fn(),
+            },
+            config: {
+                lifecycle: {
+                    emitTelemetry: vi.fn(),
+                },
+            },
         };
-        mockCtx = {
-            config: mockConfig,
-            logger: mockLogger,
-            moduleGraph: mockModuleGraph,
-        };
-        vi.mocked(compile).mockResolvedValue({ code: 'code', warnings: [] });
-        client = new Client(mockClientId, mockUrl, mockConnection, mockCtx);
+        client = new Client(clientId, url, connection, ctx);
+    });
+    it('should initialize with correct properties', () => {
+        expect(client.clientId).toBe(clientId);
+        expect(client.url).toBe(url);
+        expect(client.connection).toBe(connection);
+        expect(client.ctx).toBe(ctx);
+        expect(connection.receive).toHaveBeenCalledWith(expect.any(Function));
     });
-    it('should initialize correctly', () => {
-        expect(client.clientId).toBe(mockClientId);
-        expect(client.url).toBe(mockUrl);
-        expect(client.connection).toBe(mockConnection);
-        expect(client.ctx).toBe(mockCtx);
-        expect(mockConnection.receive).toHaveBeenCalled();
+    it('should handle onClose callback', () => {
+        const callback = vi.fn();
+        client.onClose(callback);
+        expect(connection.onClose).toHaveBeenCalledWith(callback);
     });
-    it('should send data when allowed', () => {
+    it('should send data', () => {
         const data = { type: 'update', data: [] };
         client.send(data);
-        expect(mockConnection.send).toHaveBeenCalledWith(data);
+        expect(connection.send).toHaveBeenCalledWith(data);
     });
-    it('should not send data when type is not allowed', () => {
-        const data = { type: 'not-allowed', data: [] };
-        client.send(data);
-        expect(mockCtx.logger.debug).toHaveBeenCalledWith(`[LWC Dev Server] Blocking unexpected type of data being sent from server to hmr-client 'not-allowed'`);
-        expect(mockConnection.send).not.toHaveBeenCalled();
+    it('should handle fetch message callbacks', async () => {
+        vi.mocked(ctx.moduleGraph.getStaleModules).mockReturnValue(new Set());
+        await client.messageCallback({
+            type: 'register',
+            data: {
+                modules: [{ compileOptions: {}, hash: 'hash1', modulePath: 'ns/name/cmp.js' }],
+            },
+        });
+        const data = {
+            type: 'fetch',
+            data: { modulePath: 'ns/name/cmp.js' },
+        };
+        const modulePart = { module: new Module('', 'ns', 'name', {}), part: 'cmp.js' };
+        vi.mocked(ctx.moduleGraph.getModulePart).mockReturnValue(modulePart);
+        vi.mocked(compile).mockResolvedValue({ code: 'compiled code', warnings: [] });
+        await client.messageCallback(data);
+        expect(ctx.logger.debug).toHaveBeenCalledWith(`[LWC Dev Server] Compiling ns/name/cmp.js`);
+        expect(compile).toHaveBeenCalledWith(ctx, modulePart, {});
+        expect(ctx.logger.debug).toHaveBeenCalledWith(`[LWC Dev Server] Sending an updated ns/name/cmp.js`);
+        expect(connection.send).toHaveBeenCalledWith({
+            type: 'module-update',
+            data: [{ modulePath: 'ns/name/cmp.js', src: 'compiled code' }],
+        });
+        expect(ctx.config.lifecycle.emitTelemetry).toHaveBeenCalledWith({
+            eventName: 'compile-success',
+            module: 'ns/name/cmp.js',
+        });
     });
-    it('should handle fetch message correctly', async () => {
-        const data = { type: 'fetch', data: { modulePath: 'path1' } };
-        mockModuleGraph.getFileByModulePath.mockReturnValue('file1');
-        client.getCompileOptions = vi.fn().mockReturnValue({});
+    it('should handle fetch message callback with error', async () => {
+        const data = {
+            type: 'fetch',
+            data: { modulePath: 'src/ns/name/cmp.js' },
+        };
+        vi.mocked(ctx.moduleGraph.getModulePart).mockReturnValue(undefined);
         await client.messageCallback(data);
-        expect(mockCtx.logger.debug).toHaveBeenCalledWith(`[LWC Dev Server] Compiling path1`);
-        expect(mockConnection.send).toHaveBeenCalled();
+        expect(connection.send).toHaveBeenCalledWith({
+            type: 'error',
+            data: {
+                message: `Fetch of src/ns/name/cmp.js failed as it does not exist in dev server workspace`,
+            },
+        });
     });
-    it('should handle register message correctly', async () => {
+    it('should handle register message callback', async () => {
         const data = {
             type: 'register',
-            data: { modules: [{ modulePath: 'path1', compileOptions: {}, hash: '0' }] },
+            data: {
+                modules: [{ modulePath: 'ns/name/cmp.js', hash: 'hash1', compileOptions: {} }],
+            },
         };
-        mockModuleGraph.registerActivePaths.mockReturnValue(['path1']);
+        const staleModules = new Set(['ns/name/cmp.js']);
+        vi.mocked(ctx.moduleGraph.getStaleModules).mockReturnValue(staleModules);
         await client.messageCallback(data);
-        expect(client.activePaths.get('path1')).toEqual({});
-        expect(mockConnection.send).toHaveBeenCalledWith({
+        expect(ctx.moduleGraph.getStaleModules).toHaveBeenCalledWith([
+            {
+                hash: 'hash1',
+                id: 'ns/name',
+                part: 'cmp.js',
+            },
+        ]);
+        expect(connection.send).toHaveBeenCalledWith({
             type: 'update',
-            data: [{ modulePath: 'stale-module' }],
+            data: Array.from(staleModules).map((modulePath) => ({ modulePath })),
         });
     });
     it('should close the connection', () => {
         client.close();
-        expect(mockConnection.close).toHaveBeenCalled();
+        expect(connection.close).toHaveBeenCalled();
     });
 });
 //# sourceMappingURL=client.spec.js.map