Merge pull request #1672 from blittle/master

Properly propagate amdId to the compiler

src/cli/compile.ts

@@ -44,6 +44,11 @@ export function compile(input, opts) {
 		format: opts.format,
 		sourceMap: opts.sourcemap,
 		globals,
+		amd: opts.amdId
+			? {
+				id: opts.amdId,
+			}
+			: undefined,
 		css: opts.css !== false,
 		dev: opts.dev,
 		immutable: opts.immutable,

test/cli/samples/amd/command.sh

@@ -0,0 +1 @@
+svelte compile -f amd --amdId test src/Main.html > actual/Main.js

test/cli/samples/amd/expected/Main.js

@@ -0,0 +1,172 @@
+define("test", function() { "use strict";
+
+	function create_main_fragment(component, ctx) {
+		var p;
+
+		return {
+			c() {
+				p = createElement("p");
+				p.textContent = "Hello world!";
+			},
+
+			m(target, anchor) {
+				insert(target, p, anchor);
+			},
+
+			p: noop,
+
+			d(detach) {
+				if (detach) {
+					detachNode(p);
+				}
+			}
+		};
+	}
+
+	function Main(options) {
+		init(this, options);
+		this._state = assign({}, options.data);
+		this._intro = true;
+
+		this._fragment = create_main_fragment(this, this._state);
+
+		if (options.target) {
+			this._fragment.c();
+			this._mount(options.target, options.anchor);
+		}
+	}
+
+	assign(Main.prototype, {
+	 	destroy: destroy,
+	 	get: get,
+	 	fire: fire,
+	 	on: on,
+	 	set: set,
+	 	_set: _set,
+	 	_mount: _mount,
+	 	_differs: _differs
+	 });
+
+	Main.prototype._recompute = noop;
+
+	function createElement(name) {
+		return document.createElement(name);
+	}
+
+	function insert(target, node, anchor) {
+		target.insertBefore(node, anchor);
+	}
+
+	function noop() {}
+
+	function detachNode(node) {
+		node.parentNode.removeChild(node);
+	}
+
+	function init(component, options) {
+		component._handlers = blankObject();
+		component._bind = options._bind;
+
+		component.options = options;
+		component.root = options.root || component;
+		component.store = options.store || component.root.store;
+	}
+
+	function assign(tar, src) {
+		for (var k in src) tar[k] = src[k];
+		return tar;
+	}
+
+	function destroy(detach) {
+		this.destroy = noop;
+		this.fire('destroy');
+		this.set = noop;
+
+		this._fragment.d(detach !== false);
+		this._fragment = null;
+		this._state = {};
+	}
+
+	function get() {
+		return this._state;
+	}
+
+	function fire(eventName, data) {
+		var handlers =
+			eventName in this._handlers && this._handlers[eventName].slice();
+		if (!handlers) return;
+
+		for (var i = 0; i < handlers.length; i += 1) {
+			var handler = handlers[i];
+
+			if (!handler.__calling) {
+				try {
+					handler.__calling = true;
+					handler.call(this, data);
+				} finally {
+					handler.__calling = false;
+				}
+			}
+		}
+	}
+
+	function on(eventName, handler) {
+		var handlers = this._handlers[eventName] || (this._handlers[eventName] = []);
+		handlers.push(handler);
+
+		return {
+			cancel: function() {
+				var index = handlers.indexOf(handler);
+				if (~index) handlers.splice(index, 1);
+			}
+		};
+	}
+
+	function set(newState) {
+		this._set(assign({}, newState));
+		if (this.root._lock) return;
+		this.root._lock = true;
+		callAll(this.root._beforecreate);
+		callAll(this.root._oncreate);
+		callAll(this.root._aftercreate);
+		this.root._lock = false;
+	}
+
+	function _set(newState) {
+		var oldState = this._state,
+			changed = {},
+			dirty = false;
+
+		for (var key in newState) {
+			if (this._differs(newState[key], oldState[key])) changed[key] = dirty = true;
+		}
+		if (!dirty) return;
+
+		this._state = assign(assign({}, oldState), newState);
+		this._recompute(changed, this._state);
+		if (this._bind) this._bind(changed, this._state);
+
+		if (this._fragment) {
+			this.fire("state", { changed: changed, current: this._state, previous: oldState });
+			this._fragment.p(changed, this._state);
+			this.fire("update", { changed: changed, current: this._state, previous: oldState });
+		}
+	}
+
+	function _mount(target, anchor) {
+		this._fragment[this._fragment.i ? 'i' : 'm'](target, anchor || null);
+	}
+
+	function _differs(a, b) {
+		return a != a ? b == b : a !== b || ((a && typeof a === 'object') || typeof a === 'function');
+	}
+
+	function blankObject() {
+		return Object.create(null);
+	}
+
+	function callAll(fns) {
+		while (fns && fns.length) fns.shift()();
+	}
+	return Main;
+});

test/cli/samples/amd/src/Main.html

@@ -0,0 +1 @@
+<p>Hello world!</p>