implement amd.autoId/amd.basePath options

cli/help.md

@@ -20,6 +20,7 @@ Basic options:
 -v, --version               Show version number
 -w, --watch                 Watch files in bundle and rebuild on changes
 --amd.id <id>               ID for AMD module (default is anonymous)
+--amd.idFromChunkName       Make the ID the chunk file name (appended to `amd.id` if present)
 --amd.define <name>         Function to use in place of `define`
 --assetFileNames <pattern>  Name pattern for emitted assets
 --banner <text>             Code to insert at top of bundle (outside wrapper)

docs/01-command-line-reference.md

@@ -278,6 +278,7 @@ Many options have command line equivalents. In those cases, any arguments passed
 -v, --version               Show version number
 -w, --watch                 Watch files in bundle and rebuild on changes
 --amd.id <id>               ID for AMD module (default is anonymous)
+--amd.idFromChunkName       Make the ID the chunk file name (appended to `amd.id` if present)
 --amd.define <name>         Function to use in place of `define`
 --assetFileNames <pattern>  Name pattern for emitted assets
 --banner <text>             Code to insert at top of bundle (outside wrapper)

docs/999-big-list-of-options.md

@@ -1053,7 +1053,7 @@ Type: `((id: string) => string) | { [id: string]: string }`<br>
 Same as [`context`](guide/en/#context), but per-module – can either be an object of `id: context` pairs, or an `id => context` function.
 
 #### output.amd
-Type: `{ id?: string, define?: string}`
+Type: `{ id?: string, idFromChunkName?: boolean, define?: string}`
 
 An object that can contain the following properties:
 
@@ -1076,6 +1076,27 @@ export default {
 // -> define('my-bundle', ['dependency'], ...
 ```
 
+**output.amd.idFromChunkName**<br>
+Type: `boolean`<br>
+CLI: `--amd.idFromChunkName`
+
+Make the ID the chunk file name (appended to `amd.id` if present). This is useful with the `output.dir` option when code splitting occurs.
+
+```js
+// rollup.config.js
+export default {
+  ...,
+  format: 'amd',
+  amd: {
+    id: 'somewhere/',
+    idFromChunkName: true
+  }
+};
+
+// -> define('somewhere/main', ['dependency'], ...
+// -> define('somewhere/chunk1-44b1f428', ['dependency'], ...
+```
+
 **output.amd.define**<br>
 Type: `string`<br>
 CLI: `--amd.define <defineFunctionName>`

src/Chunk.ts

@@ -719,6 +719,7 @@ export default class Chunk {
 				dependencies: [...this.renderedDependencies!.values()],
 				exports: this.renderedExports!,
 				hasExports,
+				id: this.id as string,
 				indentString: this.indentString,
 				intro: addons.intro!,
 				isEntryFacade:

src/finalisers/amd.ts

@@ -5,12 +5,19 @@ import { getExportBlock, getNamespaceMarkers } from './shared/getExportBlock';
 import getInteropBlock from './shared/getInteropBlock';
 import warnOnBuiltins from './shared/warnOnBuiltins';
 
+function removeExtension(name: string) {
+	if (name.endsWith('.js')) {
+		return name.slice(0, -3);
+	}
+	return name;
+}
+
 // AMD resolution will only respect the AMD baseUrl if the .js extension is omitted.
 // The assumption is that this makes sense for all relative ids:
 // https://requirejs.org/docs/api.html#jsfiles
 function removeExtensionFromRelativeAmdId(id: string) {
-	if (id[0] === '.' && id.endsWith('.js')) {
-		return id.slice(0, -3);
+	if (id[0] === '.') {
+		return removeExtension(id);
 	}
 	return id;
 }
@@ -22,6 +29,7 @@ export default function amd(
 		dependencies,
 		exports,
 		hasExports,
+		id,
 		indentString: t,
 		intro,
 		isEntryFacade,
@@ -32,7 +40,7 @@ export default function amd(
 		warn
 	}: FinaliserOptions,
 	{
-		amd: { define: amdDefine, id: amdId },
+		amd: { define: amdDefine, id: amdId, idFromChunkName: amdIdFromChunkName },
 		compact,
 		esModule,
 		externalLiveBindings,
@@ -64,8 +72,18 @@ export default function amd(
 		deps.unshift(`'module'`);
 	}
 
+	let completeAmdId = '';
+	if (amdId) {
+		completeAmdId += amdId;
+	}
+
+	if (amdIdFromChunkName) {
+		completeAmdId += removeExtension(id);
+	}
+
 	const params =
-		(amdId ? `'${amdId}',${_}` : ``) + (deps.length ? `[${deps.join(`,${_}`)}],${_}` : ``);
+		(completeAmdId ? `'${completeAmdId}',${_}` : ``) +
+		(deps.length ? `[${deps.join(`,${_}`)}],${_}` : ``);
 	const useStrict = strict ? `${_}'use strict';` : '';
 
 	magicString.prepend(

src/finalisers/index.ts

@@ -13,6 +13,7 @@ export interface FinaliserOptions {
 	dependencies: ChunkDependencies;
 	exports: ChunkExports;
 	hasExports: boolean;
+	id: string;
 	indentString: string;
 	intro: string;
 	isEntryFacade: boolean;

src/rollup/types.d.ts

@@ -320,8 +320,12 @@ export type ResolveFileUrlHook = (
 export type AddonHookFunction = (this: PluginContext) => string | Promise<string>;
 export type AddonHook = string | AddonHookFunction;
 
-export type ChangeEvent = 'create' | 'update' | 'delete'
-export type WatchChangeHook = (this: PluginContext, id: string, change: {event: ChangeEvent}) => void
+export type ChangeEvent = 'create' | 'update' | 'delete';
+export type WatchChangeHook = (
+	this: PluginContext,
+	id: string,
+	change: { event: ChangeEvent }
+) => void;
 
 /**
  * use this type for plugin annotation
@@ -576,6 +580,7 @@ export interface OutputOptions {
 	amd?: {
 		define?: string;
 		id?: string;
+		idFromChunkName?: boolean;
 	};
 	assetFileNames?: string | ((chunkInfo: PreRenderedAsset) => string);
 	banner?: string | (() => string | Promise<string>);
@@ -794,7 +799,7 @@ export interface RollupWatchOptions extends InputOptions {
 	watch?: WatcherOptions | false;
 }
 
-interface TypedEventEmitter<T extends {[event: string]: (...args: any) => any}> {
+interface TypedEventEmitter<T extends { [event: string]: (...args: any) => any }> {
 	addListener<K extends keyof T>(event: K, listener: T[K]): this;
 	emit<K extends keyof T>(event: K, ...args: Parameters<T[K]>): boolean;
 	eventNames(): Array<keyof T>;
@@ -827,7 +832,7 @@ export type RollupWatcherEvent =
 
 export interface RollupWatcher
 	extends TypedEventEmitter<{
-		change: (id: string, change: {event: ChangeEvent}) => void;
+		change: (id: string, change: { event: ChangeEvent }) => void;
 		close: () => void;
 		event: (event: RollupWatcherEvent) => void;
 		restart: () => void;

src/utils/options/normalizeOutputOptions.ts

@@ -186,9 +186,11 @@ const getAmd = (
 	id?: string;
 } => ({
 	define: 'define',
+	idFromChunkName: false,
 	...(config.amd as {
 		define?: string;
 		id?: string;
+		idFromChunkName?: boolean;
 	})
 });
 

test/cli/samples/amd-code-splitting-id-from-chunk-name-with-id/_config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	description:
+		'sets AMD module ID for each chunk appended with chunk id when there is code splitting and `idFromChunkName` option',
+	command: 'rollup -i main.js -f amd --amd.id "foo/" --amd.idFromChunkName'
+};

test/cli/samples/amd-code-splitting-id-from-chunk-name-with-id/_expected.js

@@ -0,0 +1,21 @@
+//→ main.js:
+define('foo/main', ['require', 'exports'], function (require, exports) { 'use strict';
+
+  function getA() {
+    return new Promise(function (resolve, reject) { require(['./a-44b1f428'], resolve, reject) });
+  }
+
+  exports.getA = getA;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+});
+
+//→ a-44b1f428.js:
+define('foo/a-44b1f428', ['exports'], function (exports) { 'use strict';
+
+	const something = 42;
+
+	exports.something = something;
+
+});

test/cli/samples/amd-code-splitting-id-from-chunk-name-with-id/a.js

@@ -0,0 +1 @@
+export const something = 42;

test/cli/samples/amd-code-splitting-id-from-chunk-name-with-id/main.js

@@ -0,0 +1,3 @@
+export function getA() {
+  return import('./a');
+}

test/cli/samples/amd-code-splitting-id-from-chunk-name-without-id/_config.js

@@ -0,0 +1,5 @@
+module.exports = {
+	description:
+		'sets AMD module ID for each chunk as the chunk id when there is code splitting and `idFromChunkName` option',
+	command: 'rollup -i main.js -f amd --amd.idFromChunkName'
+};

test/cli/samples/amd-code-splitting-id-from-chunk-name-without-id/_expected.js

@@ -0,0 +1,21 @@
+//→ main.js:
+define('main', ['require', 'exports'], function (require, exports) { 'use strict';
+
+  function getA() {
+    return new Promise(function (resolve, reject) { require(['./a-44b1f428'], resolve, reject) });
+  }
+
+  exports.getA = getA;
+
+  Object.defineProperty(exports, '__esModule', { value: true });
+
+});
+
+//→ a-44b1f428.js:
+define('a-44b1f428', ['exports'], function (exports) { 'use strict';
+
+	const something = 42;
+
+	exports.something = something;
+
+});

test/cli/samples/amd-code-splitting-id-from-chunk-name-without-id/a.js

@@ -0,0 +1 @@
+export const something = 42;

test/cli/samples/amd-code-splitting-id-from-chunk-name-without-id/main.js

@@ -0,0 +1,3 @@
+export function getA() {
+  return import('./a');
+}