fix: one more alias resolution fix (#14462)

* fix: handle import/export name, { ... } when resolving aliases * enforce valid identifiers Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com> --------- Co-authored-by: Simon H <5968653+dummdidumm@users.noreply.github.com>

Author: etiennearl

.changeset/shiny-schools-slide.md

@@ -0,0 +1,5 @@
+---
+'@sveltejs/package': patch
+---
+
+fix: handle `import/export name, { ... }` when resolving aliases

packages/package/src/utils.js

@@ -42,13 +42,13 @@ export function resolve_aliases(input, file, content, aliases) {
 // 4. ( - Start of specifier group
 // (?:(?:\*\s+as\s+)?\p{L}[\p{L}0-9]*\s+) - default import/export, e.g. 'name', or named star import/export, e.g. '* as name '
 // | (?:\*\s+) - e.g. star import/export, e.g. '* '
-// | (?:\{[^}]*\}\s*)  - e.g. named imports/exports, e.g. '{ ... }'
+// | (?:(?:\p{L}[\p{L}0-9]*\s*,\s*)?\{[^}]*\}\s*) - e.g. named imports/exports with optional default import/export, e.g. 'name, { ... }' or '{ ... }'
 // )
 // 5. from\s* - Match 'from' with optional whitespace
 // 6. (['"]) - Capture quote
 // 7. ([^'";]+) - Capture import path
 // 8. \3 - Match the same quote as before
-/\b(import|export)(?:\s+type)?\s+((?:(?:\*\s+as\s+)?\p{L}[\p{L}0-9]*\s+)|(?:\*\s+)|(?:\{[^}]*\}\s*))from\s*(['"])([^'";]+)\3/gmu,
+/\b(import|export)(?:\s+type)?\s+((?:(?:\*\s+as\s+)?\p{L}[\p{L}0-9]*\s+)|(?:\*\s+)|(?:(?:\p{L}[\p{L}0-9]*\s*,\s*)?\{[^}]*\}\s*))from\s*(['"])([^'";]+)\3/gmu,
 (match, _keyword, _specifier, quote, import_path) =>
 replace_import_path(match, quote, import_path)
 );

packages/package/test/fixtures/resolve-alias/expected/baz.d.ts

@@ -2,3 +2,4 @@ export interface Baz {
 baz: string;
 }
 export declare const baz: Baz;
+export default baz;

packages/package/test/fixtures/resolve-alias/expected/baz.js

@@ -1 +1,2 @@
 export const baz = { baz: 'baz' };
+export default baz;

packages/package/test/fixtures/resolve-alias/expected/index.d.ts

@@ -3,4 +3,8 @@ export * from "./sub/foo";
 export type * from "./sub/bar";
 import * as Utils from "./utils/index";
 export { Utils };
+import baz1, { baz } from './baz';
+import { type Baz } from './baz';
+import baz2, { type Baz as Bz } from './baz';
+export { baz, baz1, baz2, type Baz, type Bz };
 export { X } from '$libre';

packages/package/test/fixtures/resolve-alias/expected/index.js

@@ -1,6 +1,9 @@
 export { default as Test } from './Test.svelte';
 export * from "./sub/foo";
 import * as Utils from "./utils/index";
-export { Utils}
+export { Utils };
+import baz1, { baz } from './baz';
+import baz2 from './baz';
+export { baz, baz1, baz2 };
 // @ts-expect-error
 export { X } from '$libre';

packages/package/test/fixtures/resolve-alias/src/lib/baz.ts

@@ -3,3 +3,5 @@ export interface Baz {
 }
 
 export const baz: Baz = { baz: 'baz' };
+
+export default baz;

packages/package/test/fixtures/resolve-alias/src/lib/index.ts

@@ -3,5 +3,9 @@ export * from '$lib/sub/foo';
 export type * from '$lib/sub/bar';
 import * as Utils from '$lib/utils/index';
 export { Utils };
+import baz1, { baz } from '$lib/baz';
+import { type Baz } from '$lib/baz';
+import baz2, { type Baz as Bz } from '$lib/baz';
+export { baz, baz1, baz2, type Baz, type Bz };
 // @ts-expect-error
 export { X } from '$libre';