Remove support for passing space directly

Author: wooorm

lib/index.js

@@ -30,25 +30,21 @@ import {h, s} from 'hastscript'
 
 const cssSelectorParse = createParser({syntax: 'selectors-4'})
 
-// To do: remove `space` shortcut.
+/** @type {Options} */
+const emptyOptions = {}
+
 /**
  * Create one or more `Element`s from a CSS selector.
  *
  * @param {string | null | undefined} [selector='']
  *   CSS selector (default: `''`).
- * @param {Options | Space | null | undefined} [options]
+ * @param {Options | null | undefined} [options]
  *   Configuration (optional).
  * @returns {HastElement}
  *   Built tree.
  */
 export function fromSelector(selector, options) {
-  /** @type {State} */
-  const state = {
-    space:
-      (options && typeof options === 'object' && options.space) ||
-      (typeof options === 'string' && options) ||
-      'html'
-  }
+  const settings = options || emptyOptions
 
   const query = cssSelectorParse(selector || '*')
 
@@ -70,7 +66,7 @@ export function fromSelector(selector, options) {
     )
   }
 
-  const result = rule(head, state)
+  const result = rule(head, {space: settings.space || 'html'})
 
   return result[0]
 }

readme.md

@@ -17,7 +17,7 @@
 *   [Install](#install)
 *   [Use](#use)
 *   [API](#api)
-    *   [`fromSelector(selector?[, options|space])`](#fromselectorselector-optionsspace)
+    *   [`fromSelector(selector?[, options])`](#fromselectorselector-options)
     *   [`Options`](#options)
     *   [`Space`](#space)
 *   [Support](#support)
@@ -68,7 +68,7 @@ In browsers with [`esm.sh`][esmsh]:
 ```js
 import {fromSelector} from 'hast-util-from-selector'
 
-console.log(fromSelector('p svg[viewbox=0 0 10 10] circle[cx=10][cy=10][r=10]'))
+console.log(fromSelector('p svg[viewbox="0 0 10 10"] circle[cx=10][cy=10][r=10]'))
 ```
 
 Yields:
@@ -101,7 +101,7 @@ Yields:
 This package exports the identifier [`fromSelector`][fromselector].
 There is no default export.
 
-### `fromSelector(selector?[, options|space])`
+### `fromSelector(selector?[, options])`
 
 Create one or more [`Element`][element]s from a CSS selector.
 
@@ -111,8 +111,6 @@ Create one or more [`Element`][element]s from a CSS selector.
     — CSS selector
 *   `options` ([`Options`][options], optional)
     — configuration
-*   `space` ([`Space`][space], optional)
-    — treated as `options.space`
 
 ###### Returns
 
@@ -252,7 +250,7 @@ abide by its terms.
 
 [hastscript]: https://github.com/syntax-tree/hastscript
 
-[fromselector]: #fromselectorselector-optionsspace
+[fromselector]: #fromselectorselector-options
 
 [options]: #options
 

test.js

@@ -150,28 +150,24 @@ test('fromSelector', async function (t) {
   })
 
   await t.test('should support space (#2)', async function () {
-    assert.equal(fromSelector('altGlyph', 'svg').tagName, 'altGlyph')
-  })
-
-  await t.test('should support space (#3)', async function () {
     assert.equal(fromSelector('altGlyph', {space: 'svg'}).tagName, 'altGlyph')
   })
 
-  await t.test('should support space (#4)', async function () {
+  await t.test('should support space (#3)', async function () {
     const result = fromSelector('svg altGlyph')
     const child = result.children[0]
     assert(child.type === 'element')
     assert.equal(child.tagName, 'altGlyph')
   })
 
-  await t.test('should support space (#5)', async function () {
+  await t.test('should support space (#4)', async function () {
     const result = fromSelector('div svg + altGlyph')
     const child = result.children[1]
     assert(child.type === 'element')
     assert.equal(child.tagName, 'altglyph')
   })
 
-  await t.test('should support space (#6)', async function () {
+  await t.test('should support space (#5)', async function () {
     assert.deepEqual(
       fromSelector(
         'p svg[viewbox="0 0 10 10"] circle[cx=10][cy=10][r=10] altGlyph'