govuk_publishing_components 17.14.0 → 17.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1fae6c310eb63c511c044be1ee8cb28802b3c3d1d767d7e1878b03c819888483
-  data.tar.gz: 69ad960abde6fa565fe63c5a9e8bb2db1d82bd0b474d0403da0354923fbfa020
+  metadata.gz: 9efc12b3a7bac033538c37f639b3d445b7143048cef4cb79f023dcc0f2c73327
+  data.tar.gz: 8764534227e500e355d10106fa48207ef289eccb96ecb685167b7f8d1bdc2649
 SHA512:
-  metadata.gz: '09bbfe08788bac9d3add154ac0baae7de48a581e4923fa99442f4ac24de638d000aa85654a230bbb01c758661de30ad63af8b937ebfac8d684fb86bfc76f97dd'
-  data.tar.gz: eab47a1574c05fb21142babbd6c51d898cc8a8809a67d05be617dbe7575a43729462f9f904e3067303693acf2dddf45ffcf3fe4703fbe4b520f8ed332ea29a2d
+  metadata.gz: '06985cc2887f08e4689f82bf2611ca5a5697d80e81ca0bdbd4a39c7937806218a9d4d5a9837cb1f5a01f8bcf74989d9f49380cdc3f1a5f67fcac528bd7afb672'
+  data.tar.gz: 5f1956bf05209b2f62a3df019606d6ed44515da8a2d5fd731882dd2297bb235e51e78881ea0d326bb5755c127003921136d07e4eb239633aa88d545d9cb28745

data/app/assets/stylesheets/govuk_publishing_components/components/_document-list.scss

@@ -24,6 +24,12 @@
   display: inline-block;
 }
 
+.gem-c-document-list--no-underline {
+  .gem-c-document-list__item-title {
+    text-decoration: none;
+  }
+}
+
 .gem-c-document-list__item-title--context {
   margin-right: govuk-spacing(2);
 

data/app/views/govuk_publishing_components/components/_document_list.html.erb

@@ -1,9 +1,13 @@
 <%
   items ||= []
+
+  classes = "gem-c-document-list"
+  classes << " gem-c-document-list--top-margin" if local_assigns[:margin_top]
+  classes << " gem-c-document-list--bottom-margin" if local_assigns[:margin_bottom]
+  classes << " gem-c-document-list--no-underline" if local_assigns[:remove_underline]
+
   within_multitype_list ||= false
   within_multitype_list_class = " gem-c-document-list__multi-list" if within_multitype_list
-  margin_top_class = " gem-c-document-list--top-margin" if local_assigns[:margin_top]
-  margin_bottom_class = " gem-c-document-list--bottom-margin" if local_assigns[:margin_bottom]
   title_with_context_class = " gem-c-document-list__item-title--context"
 
   brand ||= false
@@ -11,7 +15,7 @@
 %>
 <% if items.any? %>
   <% unless within_multitype_list %>
-    <ol class="gem-c-document-list<%= margin_bottom_class %><%= margin_top_class %>">
+    <ol class="<%= classes %>">
   <% end %>
     <% items.each do |item| %>
       <% highlight_class = " gem-c-document-list__item--highlight" if item[:highlight] %>

data/app/views/govuk_publishing_components/components/docs/document_list.yml

@@ -156,6 +156,27 @@ examples:
           public_updated_at: 2017-07-19 15:01:48
           document_type: 'Statistical data set'
         subtext: 'First published during the 1996 Conservative Government'
+  without_underline:
+    description: The current search design does not include underlines on links and has been tested without underlines. Other uses will require further user testing.
+    data:
+      remove_underline: true
+      items:
+      - link:
+          text: 'Department for Education – Statistics at DfE'
+          path: '/government/organisations/department-for-education/about/statistics'
+          description: 'The Department for Education publishes official statistics on education and children.'
+        metadata:
+          public_updated_at: 2017-07-19 15:01:48
+          document_type: 'Corporate information'
+        subtext: 'First published during the 2007 Labour Government'
+      - link:
+          text: 'State-funded school inspections and outcomes: management information'
+          path: '/government/organisations/department-for-education/about/statistics'
+          description: 'Management information published monthly and a one-off publication of inspections and outcomes from 2005 to 2015.'
+        metadata:
+          public_updated_at: 2017-07-19 15:01:48
+          document_type: 'Statistical data set'
+        subtext: 'First published during the 1996 Conservative Government'
   highlighted_result:
     description: Highlight one or more of the items in the list. This is used on finders to provide a 'top result' for a search. The `highlight_text` parameter is optional.
     data:

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '17.14.0'.freeze
+  VERSION = '17.15.0'.freeze
 end

data/node_modules/accessible-autocomplete/package.json

@@ -49,7 +49,7 @@
     "/"
   ],
   "_resolved": "git://github.com/alphagov/accessible-autocomplete.git#3523dd9fffc70cbd9f6f555f75863c33a709f49e",
-  "_shasum": "79f5e7901599aa4ed0f96da79e43f9958232ba9d",
+  "_shasum": "e90b620884c34d12eeb583d4639556727b4bb978",
   "_shrinkwrap": null,
   "_spec": "accessible-autocomplete@git://github.com/alphagov/accessible-autocomplete.git#add-multiselect-support",
   "_where": "/var/lib/jenkins/workspace/ublishing_components_master-N4FWJIUY4CIFHKGZOAAEVVXODRY3YBORQOPIBBXWX72VUPSGJRRQ",

data/node_modules/eslint-utils/index.js

@@ -3,6 +3,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
+
+var evk = _interopDefault(require('eslint-visitor-keys'));
+
 /**
  * Get the innermost scope which contains a given location.
  * @param {Scope} initialScope The initial scope to search.
@@ -742,12 +746,291 @@ function getFunctionNameWithKind(node) {
     return tokens.join(" ")
 }
 
+const typeConversionBinaryOps = Object.freeze(
+    new Set([
+        "==",
+        "!=",
+        "<",
+        "<=",
+        ">",
+        ">=",
+        "<<",
+        ">>",
+        ">>>",
+        "+",
+        "-",
+        "*",
+        "/",
+        "%",
+        "|",
+        "^",
+        "&",
+        "in",
+    ])
+);
+const typeConversionUnaryOps = Object.freeze(new Set(["-", "+", "!", "~"]));
+const visitor = Object.freeze(
+    Object.assign(Object.create(null), {
+        $visit(node, options, visitorKeys) {
+            const { type } = node;
+
+            if (typeof this[type] === "function") {
+                return this[type](node, options, visitorKeys)
+            }
+
+            return this.$visitChildren(node, options, visitorKeys)
+        },
+
+        $visitChildren(node, options, visitorKeys) {
+            const { type } = node;
+
+            for (const key of visitorKeys[type] || evk.getKeys(node)) {
+                const value = node[key];
+
+                if (Array.isArray(value)) {
+                    for (const element of value) {
+                        if (
+                            element &&
+                            this.$visit(element, options, visitorKeys)
+                        ) {
+                            return true
+                        }
+                    }
+                } else if (value && this.$visit(value, options, visitorKeys)) {
+                    return true
+                }
+            }
+
+            return false
+        },
+
+        ArrowFunctionExpression() {
+            return false
+        },
+        AssignmentExpression() {
+            return true
+        },
+        AwaitExpression() {
+            return true
+        },
+        BinaryExpression(node, options, visitorKeys) {
+            if (
+                options.considerImplicitTypeConversion &&
+                typeConversionBinaryOps.has(node.operator) &&
+                (node.left.type !== "Literal" || node.right.type !== "Literal")
+            ) {
+                return true
+            }
+            return this.$visitChildren(node, options, visitorKeys)
+        },
+        CallExpression() {
+            return true
+        },
+        FunctionExpression() {
+            return false
+        },
+        ImportExpression() {
+            return true
+        },
+        MemberExpression(node, options, visitorKeys) {
+            if (options.considerGetters) {
+                return true
+            }
+            if (
+                options.considerImplicitTypeConversion &&
+                node.computed &&
+                node.property.type !== "Literal"
+            ) {
+                return true
+            }
+            return this.$visitChildren(node, options, visitorKeys)
+        },
+        MethodDefinition(node, options, visitorKeys) {
+            if (
+                options.considerImplicitTypeConversion &&
+                node.computed &&
+                node.key.type !== "Literal"
+            ) {
+                return true
+            }
+            return this.$visitChildren(node, options, visitorKeys)
+        },
+        NewExpression() {
+            return true
+        },
+        Property(node, options, visitorKeys) {
+            if (
+                options.considerImplicitTypeConversion &&
+                node.computed &&
+                node.key.type !== "Literal"
+            ) {
+                return true
+            }
+            return this.$visitChildren(node, options, visitorKeys)
+        },
+        UnaryExpression(node, options, visitorKeys) {
+            if (node.operator === "delete") {
+                return true
+            }
+            if (
+                options.considerImplicitTypeConversion &&
+                typeConversionUnaryOps.has(node.operator) &&
+                node.argument.type !== "Literal"
+            ) {
+                return true
+            }
+            return this.$visitChildren(node, options, visitorKeys)
+        },
+        UpdateExpression() {
+            return true
+        },
+        YieldExpression() {
+            return true
+        },
+    })
+);
+
+/**
+ * Check whether a given node has any side effect or not.
+ * @param {Node} node The node to get.
+ * @param {SourceCode} sourceCode The source code object.
+ * @param {object} [options] The option object.
+ * @param {boolean} [options.considerGetters=false] If `true` then it considers member accesses as the node which has side effects.
+ * @param {boolean} [options.considerImplicitTypeConversion=false] If `true` then it considers implicit type conversion as the node which has side effects.
+ * @param {object} [options.visitorKeys=evk.KEYS] The keys to traverse nodes. Use `context.getSourceCode().visitorKeys`.
+ * @returns {boolean} `true` if the node has a certain side effect.
+ */
+function hasSideEffect(
+    node,
+    sourceCode,
+    { considerGetters = false, considerImplicitTypeConversion = false } = {}
+) {
+    return visitor.$visit(
+        node,
+        { considerGetters, considerImplicitTypeConversion },
+        sourceCode.visitorKeys || evk.KEYS
+    )
+}
+
+/**
+ * Get the left parenthesis of the parent node syntax if it exists.
+ * E.g., `if (a) {}` then the `(`.
+ * @param {Node} node The AST node to check.
+ * @param {SourceCode} sourceCode The source code object to get tokens.
+ * @returns {Token|null} The left parenthesis of the parent node syntax
+ */
+function getParentSyntaxParen(node, sourceCode) {
+    const parent = node.parent;
+
+    switch (parent.type) {
+        case "CallExpression":
+        case "NewExpression":
+            if (parent.arguments.length === 1 && parent.arguments[0] === node) {
+                return sourceCode.getTokenAfter(
+                    parent.callee,
+                    isOpeningParenToken
+                )
+            }
+            return null
+
+        case "DoWhileStatement":
+            if (parent.test === node) {
+                return sourceCode.getTokenAfter(
+                    parent.body,
+                    isOpeningParenToken
+                )
+            }
+            return null
+
+        case "IfStatement":
+        case "WhileStatement":
+            if (parent.test === node) {
+                return sourceCode.getFirstToken(parent, 1)
+            }
+            return null
+
+        case "ImportExpression":
+            if (parent.source === node) {
+                return sourceCode.getFirstToken(parent, 1)
+            }
+            return null
+
+        case "SwitchStatement":
+            if (parent.discriminant === node) {
+                return sourceCode.getFirstToken(parent, 1)
+            }
+            return null
+
+        case "WithStatement":
+            if (parent.object === node) {
+                return sourceCode.getFirstToken(parent, 1)
+            }
+            return null
+
+        default:
+            return null
+    }
+}
+
+/**
+ * Check whether a given node is parenthesized or not.
+ * @param {number} times The number of parantheses.
+ * @param {Node} node The AST node to check.
+ * @param {SourceCode} sourceCode The source code object to get tokens.
+ * @returns {boolean} `true` if the node is parenthesized the given times.
+ */
+/**
+ * Check whether a given node is parenthesized or not.
+ * @param {Node} node The AST node to check.
+ * @param {SourceCode} sourceCode The source code object to get tokens.
+ * @returns {boolean} `true` if the node is parenthesized.
+ */
+function isParenthesized(
+    timesOrNode,
+    nodeOrSourceCode,
+    optionalSourceCode
+) {
+    let times, node, sourceCode, maybeLeftParen, maybeRightParen;
+    if (typeof timesOrNode === "number") {
+        times = timesOrNode | 0;
+        node = nodeOrSourceCode;
+        sourceCode = optionalSourceCode;
+        if (!(times >= 1)) {
+            throw new TypeError("'times' should be a positive integer.")
+        }
+    } else {
+        times = 1;
+        node = timesOrNode;
+        sourceCode = nodeOrSourceCode;
+    }
+
+    if (node == null) {
+        return false
+    }
+
+    maybeLeftParen = maybeRightParen = node;
+    do {
+        maybeLeftParen = sourceCode.getTokenBefore(maybeLeftParen);
+        maybeRightParen = sourceCode.getTokenAfter(maybeRightParen);
+    } while (
+        maybeLeftParen != null &&
+        maybeRightParen != null &&
+        isOpeningParenToken(maybeLeftParen) &&
+        isClosingParenToken(maybeRightParen) &&
+        // Avoid false positive such as `if (a) {}`
+        maybeLeftParen !== getParentSyntaxParen(node, sourceCode) &&
+        --times > 0
+    )
+
+    return times === 0
+}
+
 /**
  * @author Toru Nagashima <https://github.com/mysticatea>
  * See LICENSE file in root directory for full license.
  */
 
-const placeholder = /\$(?:[$&`']|[1-9][0-9]?)/g;
+const placeholder = /\$(?:[$&`']|[1-9][0-9]?)/gu;
 
 /** @type {WeakMap<PatternMatcher, {pattern:RegExp,escaped:boolean}>} */
 const internal = new WeakMap();
@@ -814,7 +1097,6 @@ function replaceS(matcher, str, replacement) {
     return chunks.join("")
 }
 
-//eslint-disable-next-line valid-jsdoc
 /**
  * Replace a given string by a given matcher.
  * @param {PatternMatcher} matcher The pattern matcher.
@@ -890,7 +1172,6 @@ class PatternMatcher {
         return !ret.done
     }
 
-    //eslint-disable-next-line valid-jsdoc
     /**
      * Replace a given string.
      * @param {string} str The string to be replaced.
@@ -904,8 +1185,8 @@ class PatternMatcher {
     }
 }
 
-const SENTINEL_TYPE = /^(?:.+?Statement|.+?Declaration|(?:Array|ArrowFunction|Assignment|Call|Class|Function|Member|New|Object)Expression|AssignmentPattern|Program|VariableDeclarator)$/;
-const IMPORT_TYPE = /^(?:Import|Export(?:All|Default|Named))Declaration$/;
+const SENTINEL_TYPE = /^(?:.+?Statement|.+?Declaration|(?:Array|ArrowFunction|Assignment|Call|Class|Function|Member|New|Object)Expression|AssignmentPattern|Program|VariableDeclarator)$/u;
+const IMPORT_TYPE = /^(?:Import|Export(?:All|Default|Named))Declaration$/u;
 const has = Function.call.bind(Object.hasOwnProperty);
 
 const READ = Symbol("read");
@@ -1126,7 +1407,7 @@ class ReferenceTracker {
      * @param {object} traceMap The trace map.
      * @returns {IterableIterator<{node:Node,path:string[],type:symbol,info:any}>} The iterator to iterate references.
      */
-    //eslint-disable-next-line complexity, require-jsdoc
+    //eslint-disable-next-line complexity
     *_iteratePropertyReferences(rootNode, path, traceMap) {
         let node = rootNode;
         while (!SENTINEL_TYPE.test(node.parent.type)) {
@@ -1342,6 +1623,7 @@ var index = {
     getPropertyName,
     getStaticValue,
     getStringIfConstant,
+    hasSideEffect,
     isArrowToken,
     isClosingBraceToken,
     isClosingBracketToken,
@@ -1363,16 +1645,20 @@ var index = {
     isOpeningBraceToken,
     isOpeningBracketToken,
     isOpeningParenToken,
+    isParenthesized,
     isSemicolonToken,
     PatternMatcher,
     READ,
     ReferenceTracker,
 };
 
-exports.default = index;
 exports.CALL = CALL;
 exports.CONSTRUCT = CONSTRUCT;
 exports.ESM = ESM;
+exports.PatternMatcher = PatternMatcher;
+exports.READ = READ;
+exports.ReferenceTracker = ReferenceTracker;
+exports.default = index;
 exports.findVariable = findVariable;
 exports.getFunctionHeadLocation = getFunctionHeadLocation;
 exports.getFunctionNameWithKind = getFunctionNameWithKind;
@@ -1380,6 +1666,7 @@ exports.getInnermostScope = getInnermostScope;
 exports.getPropertyName = getPropertyName;
 exports.getStaticValue = getStaticValue;
 exports.getStringIfConstant = getStringIfConstant;
+exports.hasSideEffect = hasSideEffect;
 exports.isArrowToken = isArrowToken;
 exports.isClosingBraceToken = isClosingBraceToken;
 exports.isClosingBracketToken = isClosingBracketToken;
@@ -1401,8 +1688,6 @@ exports.isNotSemicolonToken = isNotSemicolonToken;
 exports.isOpeningBraceToken = isOpeningBraceToken;
 exports.isOpeningBracketToken = isOpeningBracketToken;
 exports.isOpeningParenToken = isOpeningParenToken;
+exports.isParenthesized = isParenthesized;
 exports.isSemicolonToken = isSemicolonToken;
-exports.PatternMatcher = PatternMatcher;
-exports.READ = READ;
-exports.ReferenceTracker = ReferenceTracker;
 //# sourceMappingURL=index.js.map