 # * expands are combined (include both expansions), and this recurses down.
 #   * That means $expands within expands are combined
 #   * And $selects within expands override
-# * Any unknown options 'extra' options throw an error. Unknown 'default' options are ignored.
+# * Any unknown 'extra' options throw an error. Unknown 'default' options are ignored.
 exports.mergePineOptions = (defaults, extras) ->
 	if not extras
 		return defaults


			when 'filter'
				if defaults.filter
					result.filter = $and: [defaults.filter, value]
				else
					result.filter = value


		if extraExpandOptions.$expand
			expandOptions.$expand = mergeExpandOptions(expandOptions.$expand, extraExpandOptions.$expand)

	return defaultExpand

# Converts a valid expand object in any format into a new object
# containing (at most) a $expand and a $select key
