From 01b580768bf2d81fb48551b6f58e26310768e392 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 17:45:58 -0500 Subject: [PATCH 01/57] Out With the Old --- .github/wiki-resources/xml-attribute.png | Bin 643 -> 0 bytes .github/wiki-resources/xml-tag.png | Bin 456 -> 0 bytes .github/wiki-resources/xml-text.png | Bin 143 -> 0 bytes .gitignore | 3 - .travis.yml | 10 - .vscode/launch.json | 15 - .vscode/settings.json | 11 - .vscode/tasks.json | 21 - .vscodeignore | 8 - CHANGELOG.md | 1 - CONTRIBUTING.md | 54 - LICENSE | 21 - README.md | 22 - gulpfile.js | 9 - languages/xquery/xquery.json | 11 - languages/xquery/xquery.tmLanguage | 1066 ----------- package.json | 148 -- resources/icons/attribute.dark.svg | 35 - resources/icons/attribute.light.svg | 56 - resources/icons/element.dark.svg | 42 - resources/icons/element.light.svg | 54 - resources/xml.png | Bin 3277 -> 0 bytes src/Commands.ts | 69 - src/Extension.ts | 76 - src/providers/Completion.ts | 44 - src/providers/Execution.ts | 127 -- src/providers/Formatting.ts | 33 - src/providers/Linting.ts | 32 - src/providers/XPath.ts | 120 -- src/providers/XmlTreeView.ts | 128 -- src/services/ChildProcess.ts | 30 - src/services/XPathEvaluator.ts | 63 - src/services/XQueryCompleter.ts | 41 - src/services/XQueryLinter.ts | 39 - src/services/XmlFormatter.ts | 192 -- src/utils/RangeUtil.ts | 11 - tsconfig.json | 13 - typings/node/node.d.ts | 2088 ---------------------- typings/thenable/thenable.d.ts | 3 - typings/xmldom/xmldom.d.ts | 4 - typings/xpath/xpath.d.ts | 197 -- 41 files changed, 4897 deletions(-) delete mode 100644 .github/wiki-resources/xml-attribute.png delete mode 100644 .github/wiki-resources/xml-tag.png delete mode 100644 .github/wiki-resources/xml-text.png delete mode 100644 .gitignore delete mode 100644 .travis.yml delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/settings.json delete mode 100644 .vscode/tasks.json delete mode 100644 .vscodeignore delete mode 100644 CHANGELOG.md delete mode 100644 CONTRIBUTING.md delete mode 100644 LICENSE delete mode 100644 README.md delete mode 100644 gulpfile.js delete mode 100644 languages/xquery/xquery.json delete mode 100644 languages/xquery/xquery.tmLanguage delete mode 100644 package.json delete mode 100644 resources/icons/attribute.dark.svg delete mode 100644 resources/icons/attribute.light.svg delete mode 100644 resources/icons/element.dark.svg delete mode 100644 resources/icons/element.light.svg delete mode 100644 resources/xml.png delete mode 100644 src/Commands.ts delete mode 100644 src/Extension.ts delete mode 100644 src/providers/Completion.ts delete mode 100644 src/providers/Execution.ts delete mode 100644 src/providers/Formatting.ts delete mode 100644 src/providers/Linting.ts delete mode 100644 src/providers/XPath.ts delete mode 100644 src/providers/XmlTreeView.ts delete mode 100644 src/services/ChildProcess.ts delete mode 100644 src/services/XPathEvaluator.ts delete mode 100644 src/services/XQueryCompleter.ts delete mode 100644 src/services/XQueryLinter.ts delete mode 100644 src/services/XmlFormatter.ts delete mode 100644 src/utils/RangeUtil.ts delete mode 100644 tsconfig.json delete mode 100644 typings/node/node.d.ts delete mode 100644 typings/thenable/thenable.d.ts delete mode 100644 typings/xmldom/xmldom.d.ts delete mode 100644 typings/xpath/xpath.d.ts diff --git a/.github/wiki-resources/xml-attribute.png b/.github/wiki-resources/xml-attribute.png deleted file mode 100644 index ed9c64760277eda41358492b607efdab11245df7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 643 zcmV-}0(||6P)Px%JxN4CR5%f>Q%z_SK@@&(c2}D;E77)6#nvQ^L6oW&Pl9++5HBLqgJ2Iz(WDfl z=uK~W5&xhjOS}jkJ$X^^Al8F7gO}#eLz`9~)08HedA`}Y+s5EYAI#48e!g#J z-pm60qv7B9`yNrq2-Oc72zwOD`5v(63fHjtXMKmj-aLi3%i4V|90P(fAbe*$z{BEk zyOgn~cn+*h;Ba;+vWlU%91NonWAoR$Klzo3tb2hFp0ViT(zt!kkGBaVa;~EQPAibd zzht82q3lXhqH)4ND$J$rnV93ALV|Zn%H-liw4_CZuawGHdkNqQA>GpCc+Q%`M)iVL3bmNR_jql|wNQNtqUW;Uy3%Jom?*Q&&UcMI9qat-)MnCqr&BywWjk z!7aqIwNXIIqtWbF(mKY8_na>?)g{0h`!@R)A84AJc}bJC1v{`z^@e>^%DSPx$f=NU{R5%f1U>Nd%k&q8mrhL}^!^E)i4EH$|8&XWnzc` z+9LSmCFgS+?=6B3q5FA|i7y}&w zwswQW;4T1h(82%z3}K9nK@|NsB7sPEJEc@C5f0}6oy4d?g*m_;cZjq!~HKHcXlQZ*}4$9|N|XCSBYUcxNu&C-`F0e+6;FC3koZ qtn5n??~yuiz(9)aglGPO8w}6pbBW*W(OUpCl)=;0&t;ucLK6V{pfRlg diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b1265b9..0000000 --- a/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -node_modules -src/**/*.js -**/*.vsix \ No newline at end of file diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f7e72ac..0000000 --- a/.travis.yml +++ /dev/null @@ -1,10 +0,0 @@ -notifications: - email: false - -sudo: false - -install: - - npm install - -script: - - gulp build \ No newline at end of file diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 5cd30fc..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "version": "0.2.0", - "configurations": [ - { - "name": "Launch Extension", - "type": "extensionHost", - "request": "launch", - "runtimeExecutable": "${execPath}", - "args": [ - "--extensionDevelopmentPath=${workspaceRoot}" - ], - "preLaunchTask": "build" - } - ] -} \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 5a3250e..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,11 +0,0 @@ -// Place your settings in this file to overwrite default and user settings. -{ - "files.exclude": { - "**/.git": true, - "**/.DS_Store": true, - "**/*.vsix": true, - "**/*.js": {"when": "$(basename).ts"} - } -, -"typescript.tsdk": "./node_modules/typescript/lib" -} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index b342ebd..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": "0.1.0", - "command": "gulp", - "isShellCommand": true, - "args": [ - "--no-color" - ], - "tasks": [ - { - "taskName": "build", - "args": [], - "isBuildCommand": true, - "isWatching": false, - "problemMatcher": [ - "$lessCompile", - "$tsc", - "$jshint" - ] - } - ] -} \ No newline at end of file diff --git a/.vscodeignore b/.vscodeignore deleted file mode 100644 index 425d15c..0000000 --- a/.vscodeignore +++ /dev/null @@ -1,8 +0,0 @@ -tsconfig.json -CONTRIBUTING.md -.gitignore -.vscode -resources/wiki-images -typings -**/*.ts -**/*.vsix \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 6e0befc..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1 +0,0 @@ -Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases). \ No newline at end of file diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index daa4f56..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,54 +0,0 @@ -# Contribution Guide -Thanks for helping out! This guide provides some guidelines on coding styles and architecture for this extension. -Keep in mind that these are guidelines, not rules. Use your best judgement and feel free to make suggestions! - -## Workflow -Please use the follow general workflow when making contributions to the code: - -1. Fork the repository. -2. Create a feature branch and make your changes. -3. Create a pull request to request that your commits be merged to `master`. - - -## Building the Extension -1. Clone the repository locally and run `npm install` from the vscode-xml directory. -2. Run the `build` task in VS Code (`CTRL + SHIFT + B`) or start extension debugging (`F5`), which will run the `build` task for you. - -## Style Guide -### Quotes -Use double quotes for strings whenever possible. - -### Imports -As a general rule, always import the `vscode` namespace using the `vsc` alias for consistency. - -### Static Classes -When possible, try to use a static class to wrap utility functions so you are importing the class, not just a function. -For libraries that do not follow this construct (such as the `xpath` module), *always* import the module using an alias (`import * as xpath from "xpath"). - -### Constants -Where applicable, try to use constants instead of inline strings and numbers. - -## Implicit Types -Moving forward, the compiler is instructed (via tsconfig.json) to throw warnings if any expressions imply an `any` type. In other words, always use type declarations where applicable so it is clear what type is being used. -There is an exception to this guideline. If you are using a thrid party library that does not have a *.d.ts file available, you do not need to write one. Just ensure the API is documented (either in this repo or in the library's repo). - -## Folder Structure -All TypeScript files should reside under the top `src` folder. Under this, there are several subfolders and top-level files defined below: - -### providers -This folder contains any classes that implement provider interfaces from the `vscode` namespace. This folder also contains any code that works directly with the -APIs exposed by the `vscode` namespace, such as user interaction or configuration access. Aside for the `vscode` module, no code in this folder should be directly dependent on -any external NodeJS modules or libraries. - -### services -This folder contains any classes that perform actions/logic required by the providers mentioned above. Services should not be dependent on the `vscode` namespace and *can* be -dependent on external Node modules and libraries. - -### utils -This folder contains any utility classes/functions. - -### Commands.ts -This file acts as an interface to all registered commands in the extension. If a substantial amount of code is required to implement a command, it should be moved to a provider and/or service. - -### Extension.ts -Previously named `main.ts`, this is the primary entry point to the extension. Anything that needs done on activation or deactivation of the extension is done here. Both the workspace and global `Memento` instances are exposed from this module, which can be used by providers as needed. diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7145ecc..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2015 Josh Johnson - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md deleted file mode 100644 index 1bf37c4..0000000 --- a/README.md +++ /dev/null @@ -1,22 +0,0 @@ -# XML Tools for Visual Studio Code -[![](https://img.shields.io/badge/gitter-join_chat-1dce73.svg?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB4PSIwIiB5PSI1IiBmaWxsPSIjZmZmIiB3aWR0aD0iMSIgaGVpZ2h0PSI1Ii8%2BPHJlY3QgeD0iMiIgeT0iNiIgZmlsbD0iI2ZmZiIgd2lkdGg9IjEiIGhlaWdodD0iNyIvPjxyZWN0IHg9IjQiIHk9IjYiIGZpbGw9IiNmZmYiIHdpZHRoPSIxIiBoZWlnaHQ9IjciLz48cmVjdCB4PSI2IiB5PSI2IiBmaWxsPSIjZmZmIiB3aWR0aD0iMSIgaGVpZ2h0PSI0Ii8%2BPC9zdmc%2B&logoWidth=8)](https://gitter.im/vscode-xml/vscode-xml) -[![Build Status](https://travis-ci.org/DotJoshJohnson/vscode-xml.svg?branch=master)](https://travis-ci.org/DotJoshJohnson/vscode-xml) - -## Features -* [XML Formatting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-formatting) -* [XML Tree View](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-tree-view) -* [XPath Evaluation](https://github.com/DotJoshJohnson/vscode-xml/wiki/xpath-evaluation) -* [XQuery Linting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-linting) -* [XQuery Execution](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-script-execution) -* [XQuery Code Completion](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-code-completion) - -## Release Notes -Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases). - -## Issues -Run into a bug? Report it [here](https://github.com/DotJoshJohnson/vscode-xml/issues). - -## Icon Credits -Icons used in the XML Tree View are used under the Creative Commons 3.0 BY license. -* "Code" icon by Dave Gandy from www.flaticon.com -* "At" icon by FreePik from www.flaticon.com \ No newline at end of file diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index e71a309..0000000 --- a/gulpfile.js +++ /dev/null @@ -1,9 +0,0 @@ -var gulp = require("gulp"); - -var shell = require("gulp-shell"); - -gulp.task("compile-typescript", function () { - gulp.src("package.json").pipe(shell("tsc")); -}); - -gulp.task("build", ["compile-typescript"]); \ No newline at end of file diff --git a/languages/xquery/xquery.json b/languages/xquery/xquery.json deleted file mode 100644 index b20de80..0000000 --- a/languages/xquery/xquery.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "comments": { - "lineComment": "//", - "blockComment": ["/*", "*/"] - }, - "brackets": [ - ["{", "}"], - ["[", "]"], - ["(", ")"] - ] -} \ No newline at end of file diff --git a/languages/xquery/xquery.tmLanguage b/languages/xquery/xquery.tmLanguage deleted file mode 100644 index 5558b95..0000000 --- a/languages/xquery/xquery.tmLanguage +++ /dev/null @@ -1,1066 +0,0 @@ - - - - - fileTypes - - xq - xql - xqm - xqy - xquery - - firstLineMatch - ^\bxquery version\b.* - foldingStartMarker - ^\s*(<[^!?%/](?!.+?(/>|</.+?>))|<[!%]--(?!.+?--%?>)|<%[!]?(?!.+?%>))|(declare|.*\{\s*(//.*)?$) - foldingStopMarker - ^\s*(</[^>]+>|[/%]>|-->)\s*$|(.*\}\s*;?\s*|.*;) - keyEquivalent - ^~X - name - XQuery - patterns - - - include - #Xml - - - include - #entity - - - include - #bare-ampersand - - - begin - (<\?)\s*([-_a-zA-Z0-9]+) - captures - - 1 - - name - punctuation.definition.tag.begin.xml - - 2 - - name - entity.name.tag.xml - - - end - (\?>) - name - meta.tag.preprocessor.xml - patterns - - - match - ([a-zA-Z-]+) - name - entity.other.attribute-name.xml - - - include - #doublequotedString - - - include - #singlequotedString - - - - - match - ^xquery version .*;$ - name - keyword.control.import.xquery - - - match - \b(?i:(\d+\.\d*(e[\-\+]?\d+)?))(?=[^a-zA-Z_]) - name - constant.numeric.float.xquery - - - match - (?<=[^0-9a-zA-Z_])(?i:(\.\d+(e[\-\+]?\d+)?)) - name - constant.numeric.float.xquery - - - match - \b(?i:(\d+e[\-\+]?\d+)) - name - constant.numeric.float.xquery - - - match - \b([1-9]+[0-9]*|0) - name - constant.numeric.integer.decimal.xquery - - - match - \b(import|module|schema)\b - name - keyword.control.import.xquery - - - begin - \(: - captures - - 0 - - name - punctuation.definition.comment.xquery - - - end - :\) - name - comment.block.xquery - patterns - - - include - #block_comment - - - - - comment - http://www.w3.org/TR/xpath-datamodel/#types - match - (?<![:\-_a-zA-Z0-9])((xs:)(string|boolean|decimal|float|double|duration|dateTime|time|date|gYearMonth|gYear|gMonthDay|gDay|gMonth|hexBinary|base64Binary|anyURI|QName|NOTATION|anyAtomicType|anyType|anySimpleType|untypedAtomic|dayTimeDuration|yearMonthDuration|integer|nonPositiveInteger|negativeInteger|long|int|short|byte|nonNegativeInteger|unsignedLong|unsignedInt|unsignedShort|unsignedByte|positiveInteger|ENTITY|ID|NMTOKEN|language|NCName|Name|token|normalizedString))(?![:\-_a-zA-Z0-9]) - name - support.type.xquery - - - captures - - 1 - - name - punctuation.definition.variable.xquery - - - match - ((\$)(?:([\-_a-zA-Z0-9]+)((:)))?([\-_a-zA-Z0-9]+)) - name - variable.other.xquery - - - match - /(child|descendant|attribute|self|descendant-or-self|following-sibling|following|parent|ancestor|preceding-sibling|preceding|ancestor-or-self):: - name - support.constant.xquery - - - name - meta.function.xquery - patterns - - - captures - - 1 - - name - storage.type.function.xquery - - 2 - - name - entity.name.function.xquery - - - match - (function)\s+((?:([\-_a-zA-Z0-9]+):)?([\-_a-zA-Z0-9]+))\s*\( - patterns - - - include - #function_parameters - - - include - $self - - - - - begin - \s*(function)\s+(?!namespace) - beginCaptures - - 1 - - name - storage.type.function.xquery - - - end - \( - patterns - - - captures - - 1 - - name - entity.name.function.xquery - - - match - ((?:([\-_a-zA-Z0-9]+):)?([\-_a-zA-Z0-9]+)) - - - include - #function_parameters - - - include - $self - - - - - - - captures - - 1 - - name - keyword.other.xquery - - 2 - - name - storage.type.variable.xquery - - 3 - - name - entity.name.function.variable.xquery - - - match - (declare)\s+(variable)\s+(\$(?:[\-_a-zA-Z0-9]+:)?[\-_a-zA-Z0-9]+) - name - meta.variable.xquery - - - begin - (declare)\s+(variable)\s* - captures - - 1 - - name - keyword.other.xquery - - 2 - - name - storage.type.variable.xquery - - - end - (\$(?:[\-_a-zA-Z0-9]+:)?[\-_a-zA-Z0-9]+) - endCaptures - - 1 - - name - entity.name.function.variable.xquery - - - name - meta.variable.xquery - - - match - \b(base-uri|boundary-space|collation|construction|copy-namespaces|declare|default|element|empty(?![-])|function|greatest|import|inherit|instance|least|module|namespace|no-inherit|no-preserve|option|order|ordered|ordering|preserve|strip|unordered|variable|xdmp:mapping|xdmp:transaction-mode)\b - name - keyword.other.prolog.xquery - - - match - (?<![:\-_a-zA-Z0-9])(of|as|by|in|at|or|and)(?![:\-_a-zA-Z0-9]) - name - keyword.operator.logical.xquery - - - captures - - 1 - - name - keyword.control.flow.xquery - - - match - (?<![:\-_a-zA-Z0-9])(for|let|return|where|if|then|else|order by|satisfies|every)(?![:\-_a-zA-Z0-9]) - - - captures - - 1 - - name - support.type.xquery - - - match - (?<![:\-_a-zA-Z0-9])(element|attribute|document|document-node\(\)|empty-sequence\(\)|schema-element|schema-attribute|processing-instruction|comment|text|node)(?![:\-_a-zA-Z0-9]) - - - match - := - name - keyword.operator.assignment.xquery - - - match - (?<![:\-_a-zA-Z0-9])(\+|-|<=?|>=?|eq|ne|lt|le|ge|gt|\*|div|idiv|mod)(?![:\-_a-zA-Z0-9]) - name - keyword.operator.arithmetic.xquery - - - match - (?<![:\-_a-zA-Z0-9])((fn:)?(abs|adjust-date-to-timezone|adjust-dateTime-to-timezone|adjust-time-to-timezone|analyze-string|avg|base-uri|boolean|ceiling|codepoint-equal|codepoints-to-string|collection|compare|concat|contains|count|current-date|current-dateTime|current-time|data|dateTime|day-from-date|day-from-dateTime|days-from-duration|deep-equal|default-collation|distinct-values|doc|doc-available|document|document-uri|empty|encode-for-uri|ends-with|error|escape-html-uri|escape-uri|exactly-one|exists|false|filter|floor|fold-left|fold-right|format-date|format-dateTime|format-number|format-time|function-arity|function-available|function-lookup|function-name|generate-id|head|hours-from-dateTime|hours-from-duration|hours-from-time|id|idref|implicit-timezone|in-scope-prefixes|index-of|insert-before|iri-to-uri|lang|last|local-name|local-name-from-QName|lower-case|map|map-pairs|matches|max|min|minutes-from-dateTime|minutes-from-duration|minutes-from-time|month-from-date|month-from-dateTime|months-from-duration|name|namespace-uri|namespace-uri-for-prefix|namespace-uri-from-QName|nilled|node-name|normalize-space|normalize-unicode|not|number|one-or-more|position|prefix-from-QName|QName|remove|replace|resolve-QName|resolve-uri|reverse|root|round|round-half-to-even|seconds-from-dateTime|seconds-from-duration|seconds-from-time|starts-with|static-base-uri|string|string-join|string-length|string-to-codepoints|subsequence|substring|substring-after|substring-before|sum|tail|timezone-from-date|timezone-from-dateTime|timezone-from-time|tokenize|trace|translate|true|type-available|unordered|unparsed-text|unparsed-text-available|upper-case|year-from-date|year-from-dateTime|years-from-duration|zero-or-one))(?=\s*\() - name - support.function.builtin.xquery - - - match - (?<![:\-_a-zA-Z0-9])(xdmp:(access|add-response-header|add64|address-bindable|amp|amp-roles|and64|annotation|apply|architecture|atomizable|audit|aws-url-encode|base64-decode|base64-encode|binary-decode|binary-is-external|binary-is-large|binary-is-small|binary-join|binary-key|binary-offset|binary-original-length|binary-size|cache-status|can-grant-roles|castable-as|cluster|cluster-name|collation-canonical-uri|collection-delete|collection-locks|collection-properties|commit|compressed-tree-cache-clear|compressed-tree-cache-partitions|compressed-tree-cache-size|configuration-timestamp|content-type|crypt|crypt2|customized-binary|data-directory|database|database-backup|database-backup-cancel|database-backup-purge|database-backup-status|database-backup-validate|database-forests|database-fragment-counts|database-global-nonblocking-timestamp|database-is-replica|database-maintain-last-modified|database-name|database-nonblocking-timestamp|database-partition-forests|database-path-namespaces|database-restore|database-restore-cancel|database-restore-status|database-restore-validate|databases|dayname-from-date|debug-print|decode-from-NCName|default-collections|default-in-memory-limit|default-in-memory-list-size|default-in-memory-range-index-size|default-in-memory-reverse-index-size|default-in-memory-tree-size|default-in-memory-triple-index-size|default-journal-count|default-journal-size|default-license-key|default-licensee|default-permissions|default-preallocate-journals|default-s3-domain|default-zone|delete-cluster-config-file|delete-host-config-file|describe|diacritic-less|directory|directory-create|directory-delete|directory-locks|directory-properties|disable-event|document-add-collections|document-add-permissions|document-add-properties|document-assign|document-delete|document-filter|document-forest|document-get|document-get-collections|document-get-events|document-get-permissions|document-get-properties|document-get-quality|document-insert|document-load|document-locks|document-properties|document-remove-collections|document-remove-permissions|document-remove-properties|document-set-collections|document-set-permissions|document-set-properties|document-set-property|document-set-quality|document-timestamp|dsa-generate|dump-paths|dump-xsd|duplicates|eager|ec2-host|ec2-product-code|elapsed-time|element-content-type|email|email-address|enable-event|encode-for-NCName|encoding-language-detect|estimate|eval|eval-in|excel-convert|exists|expanded-tree-cache-clear|expanded-tree-cache-partitions|expanded-tree-cache-size|external-binary|external-binary-path|external-security|filesystem-directory|filesystem-directory-create|filesystem-directory-delete|filesystem-file|filesystem-file-delete|filesystem-file-exists|filesystem-file-length|filesystem-file-rename|filesystem-filepath|foreign-cluster-status|foreign-clusters|forest|forest-backup|forest-clear|forest-combine|forest-compare|forest-copy|forest-counts|forest-databases|forest-delete|forest-directory-delete|forest-directory-exists|forest-docinfos|forest-get-readonly|forest-host|forest-name|forest-online|forest-open-replica|forest-rename|forest-restart|forest-restore|forest-rollback|forest-set-readonly|forest-status|forest-updates-allowed|forests|format-number|from-json|function|function-module|function-name|function-parameter-name|function-parameter-type|function-return-type|function-signature|functions|get|get-current-roles|get-current-user|get-current-userid|get-external-variable|get-hot-updates|get-invoked-path|get-ip|get-original-url|get-orphaned-binaries|get-request-body|get-request-client-address|get-request-client-certificate|get-request-field|get-request-field-content-type|get-request-field-filename|get-request-field-names|get-request-header|get-request-header-names|get-request-method|get-request-part-body|get-request-part-headers|get-request-path|get-request-port|get-request-protocol|get-request-url|get-request-user|get-request-username|get-response-code|get-response-encoding|get-server-field|get-server-field-names|get-session-field|get-session-field-names|get-transaction-by-xid|get-transaction-mode|get-url-rewriter-path|getenv|group|group-hosts|group-name|group-servers|groups|gss-server-negotiate|gunzip|gzip|has-privilege|hash32|hash64|hex-to-integer|hmac-md5|hmac-sha1|hmac-sha256|hmac-sha512|host|host-cores|host-cpus|host-forests|host-get-ssl-fips-enabled|host-name|host-size|host-status|hostname|hosts|http-delete|http-get|http-head|http-options|http-post|http-put|initcap|install-directory|integer-to-hex|integer-to-octal|invoke|invoke-function|invoke-in|jobject|key-from-QName|language-stemmer-normalization|language-tokenizer-normalization|lazy|ldap-lookup|ldap-search|license-key|license-key-agreement|license-key-cores|license-key-cpus|license-key-decode|license-key-encode|license-key-expires|license-key-options|license-key-size|license-key-valid|license-key-version|licensee|list-cache-clear|list-cache-partitions|list-cache-size|load|lock-acquire|lock-for-update|lock-release|log|log-level|login|logout|lshift64|match-priority|md5|merge|merge-cancel|merging|missing-directories|modules-database|modules-root|month-name-from-date|mul64|multipart-decode|multipart-encode|n3|n3-get|node-database|node-delete|node-insert-after|node-insert-before|node-insert-child|node-kind|node-output-definition|node-replace|node-uri|not64|nquad|nquad-get|octal-to-integer|or64|original-binary|parse-dateTime|parse-yymmdd|path|pdf-convert|permission|plan|plannable|platform|position|powerpoint-convert|pre-release-expires|pretty-print|privilege|privilege-roles|product-edition|product-environment|product-initials|product-name|QName-from-key|quality|quarter-from-date|query-forests|query-meters|query-trace|quote|random|read-cluster-config-file|read-host-config-file|redirect-response|remove-orphaned-binary|request|request-cancel|request-key|request-status|request-timestamp|resolve-uri|restart|rethrow|role|role-roles|rollback|rsa-generate|rshift64|save|schema-database|score|security-assert|security-database|security-version|server|server-backup|server-name|server-restore|server-status|servers|set|set-current-transaction|set-hot-updates|set-request-time-limit|set-response-code|set-response-content-type|set-response-encoding|set-server-field|set-server-field-privilege|set-session-field|set-transaction-mode|set-transaction-name|set-transaction-time-limit|sha1|sha256|sha384|sha512|shutdown|sleep|smtp-relay|spawn|spawn-function|spawn-in|sql|start-journal-archiving|step64|stop-journal-archiving|strftime|subbinary|test-future|test-lazy|test-skiplist|tidy|timestamp-to-wallclock|to-json|trace|transaction|transaction-commit|transaction-create|transaction-rollback|triggers-database|triple-cache-partitions|triple-cache-size|triple-value-cache-partitions|triple-value-cache-size|turtle|turtle-get|type|unpath|unquote|update|uri-content-type|uri-format|uri-is-file|url-decode|url-encode|user|user-external-security|user-last-login|user-roles|username|validate|value|version|wallclock-to-timestamp|week-from-date|weekday-from-date|word-convert|write-cluster-config-file|write-host-config-file|x509-certificate-extract|x509-certificate-generate|x509-crl-der2pem|x509-crl-extract|x509-crl-generate|x509-request-extract|x509-request-generate|xa-complete|xa-complete-xid|xa-complete1|xa-forget|xa-forget-xid|xa-prepare|xor64|xquery-version|xslt-eval|xslt-invoke|yearday-from-date|zip-create|zip-get|zip-manifest))(?=\s*\() - name - support.function.marklogic.xquery - - - match - (?<![:\-_a-zA-Z0-9])(cts:(aggregate|and-not-query|and-not-query-negative-query|and-not-query-positive-query|and-query|and-query-options|and-query-queries|approx-center|arc-intersection|avg|avg-aggregate|bearing|boost-query|boost-query-boosting-query|boost-query-matching-query|bounding-boxes|box|box-east|box-intersects|box-north|box-south|box-west|circle|circle-center|circle-intersects|circle-radius|classify|cluster|codepoint-tokenizer-class|collection-match|collection-query|collection-query-uris|collection-reference|collections|complex-polygon|complex-polygon-contains|complex-polygon-inner|complex-polygon-intersects|complex-polygon-outer|confidence|contains|correlation|count|count-aggregate|covariance|covariance-p|deregister|destination|directory-query|directory-query-depth|directory-query-uris|distance|distinctive-terms|document-fragment-query|document-fragment-query-query|document-query|document-query-uris|element-attribute-pair-geospatial-boxes|element-attribute-pair-geospatial-query|element-attribute-pair-geospatial-query-element-name|element-attribute-pair-geospatial-query-latitude-name|element-attribute-pair-geospatial-query-longitude-name|element-attribute-pair-geospatial-query-options|element-attribute-pair-geospatial-query-region|element-attribute-pair-geospatial-query-weight|element-attribute-pair-geospatial-value-match|element-attribute-pair-geospatial-values|element-attribute-range-query|element-attribute-range-query-attribute-name|element-attribute-range-query-element-name|element-attribute-range-query-operator|element-attribute-range-query-options|element-attribute-range-query-value|element-attribute-range-query-weight|element-attribute-reference|element-attribute-value-co-occurrences|element-attribute-value-geospatial-co-occurrences|element-attribute-value-match|element-attribute-value-query|element-attribute-value-query-attribute-name|element-attribute-value-query-element-name|element-attribute-value-query-options|element-attribute-value-query-text|element-attribute-value-query-weight|element-attribute-value-ranges|element-attribute-values|element-attribute-word-match|element-attribute-word-query|element-attribute-word-query-attribute-name|element-attribute-word-query-element-name|element-attribute-word-query-options|element-attribute-word-query-text|element-attribute-word-query-weight|element-attribute-words|element-child-geospatial-boxes|element-child-geospatial-query|element-child-geospatial-query-child-name|element-child-geospatial-query-element-name|element-child-geospatial-query-options|element-child-geospatial-query-region|element-child-geospatial-query-weight|element-child-geospatial-value-match|element-child-geospatial-values|element-geospatial-boxes|element-geospatial-query|element-geospatial-query-element-name|element-geospatial-query-options|element-geospatial-query-region|element-geospatial-query-weight|element-geospatial-value-match|element-geospatial-values|element-pair-geospatial-boxes|element-pair-geospatial-query|element-pair-geospatial-query-element-name|element-pair-geospatial-query-latitude-name|element-pair-geospatial-query-longitude-name|element-pair-geospatial-query-options|element-pair-geospatial-query-region|element-pair-geospatial-query-weight|element-pair-geospatial-value-match|element-pair-geospatial-values|element-query|element-query-element-name|element-query-query|element-range-query|element-range-query-element-name|element-range-query-operator|element-range-query-options|element-range-query-value|element-range-query-weight|element-reference|element-value-co-occurrences|element-value-geospatial-co-occurrences|element-value-match|element-value-query|element-value-query-element-name|element-value-query-options|element-value-query-text|element-value-query-weight|element-value-ranges|element-values|element-word-match|element-word-query|element-word-query-element-name|element-word-query-options|element-word-query-text|element-word-query-weight|element-words|field-range-query|field-range-query-field-name|field-range-query-operator|field-range-query-options|field-range-query-value|field-range-query-weight|field-reference|field-value-co-occurrences|field-value-match|field-value-query|field-value-query-field-name|field-value-query-options|field-value-query-text|field-value-query-weight|field-value-ranges|field-values|field-word-match|field-word-query|field-word-query-field-name|field-word-query-options|field-word-query-text|field-word-query-weight|field-words|fitness|frequency|geospatial-attribute-pair-reference|geospatial-co-occurrences|geospatial-element-attribute-pair-reference|geospatial-element-child-reference|geospatial-element-pair-reference|geospatial-element-reference|geospatial-path-reference|hash-terms|index-path-key|index-path-keys|index-path-ns-prefixes|linear-model|linestring|linestring-vertices|locks-query|locks-query-query|long-lat-point|matches|max|median|min|near-query|near-query-distance|near-query-options|near-query-queries|near-query-weight|not-in-query|not-in-query-negative-query|not-in-query-positive-query|not-query|not-query-query|not-query-weight|or-query|or-query-queries|parse|parse-wkt|path-geospatial-query|path-geospatial-query-options|path-geospatial-query-path-expression|path-geospatial-query-region|path-geospatial-query-weight|path-range-query|path-range-query-operator|path-range-query-options|path-range-query-path-name|path-range-query-value|path-range-query-weight|path-reference|percent-rank|percentile|point|point-latitude|point-longitude|polygon|polygon-contains|polygon-intersects|polygon-vertices|properties-query|properties-query-query|punctuation|quality|query|rank|reference|reference-parse|region|region-contains|region-intersects|register|registered-query|registered-query-ids|registered-query-options|registered-query-weight|relevance-info|remainder|reverse-query|reverse-query-nodes|reverse-query-weight|score|search|shortest-distance|show-get-query|similar-query|similar-query-nodes|similar-query-weight|space|special|stddev|stddev-p|stem|sum|sum-aggregate|term-query|term-query-term|term-query-weight|thresholds|time-series|timestamp-query|to-wkt|token|tokenize|train|triple-range-query|triple-range-query-object|triple-range-query-operator|triple-range-query-options|triple-range-query-predicate|triple-range-query-subject|triple-range-query-weight|triples|uri-match|uri-reference|uris|valid-index-path|value-co-occurrences|value-match|value-ranges|value-tuples|values|variance|variance-p|word|word-match|word-query|word-query-options|word-query-text|word-query-weight|words))(?=\s*\() - name - support.function.cts.xquery - - - match - (?<![:\-_a-zA-Z0-9])(xdmp:([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*:)?([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*))\s*\( - name - invalid.illegal.function.xdmp - - - match - (?<![:\-_a-zA-Z0-9])(cts:([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*:)?([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*))\s*\( - name - invalid.illegal.function.cts - - - include - #string - - - begin - (\() - beginCaptures - - 1 - - name - punctuation.definition.begin.xquery - - - end - (\)) - endCaptures - - 1 - - name - punctuation.definition.end.xquery - - - name - meta - patterns - - - include - $self - - - - - include - #function_call - - - repository - - EntityDecl - - begin - (<!)(ENTITY)\s+(%\s+)?([:a-zA-Z_][:a-zA-Z0-9_.-]*)(\s+(?:SYSTEM|PUBLIC)\s+)? - captures - - 1 - - name - punctuation.definition.tag.begin.xml - - 2 - - name - keyword.entity.xml - - 3 - - name - punctuation.definition.entity.xml - - 4 - - name - variable.entity.xml - - 5 - - name - keyword.entitytype.xml - - - end - (>) - patterns - - - include - #doublequotedStringXml - - - include - #singlequotedStringXml - - - - Xml - - patterns - - - begin - (<\?)\s*([-_a-zA-Z0-9]+) - captures - - 1 - - name - punctuation.definition.tag.begin.xml - - 2 - - name - entity.name.tag.xml - - - end - (\?>) - name - meta.tag.preprocessor.xml - patterns - - - match - ([a-zA-Z-]+) - name - entity.other.attribute-name.xml - - - include - #doublequotedString - - - include - #singlequotedString - - - - - begin - (<!)(DOCTYPE)\s+([:a-zA-Z_][:a-zA-Z0-9_.-]*) - captures - - 1 - - name - punctuation.definition.tag.begin.xml - - 2 - - name - keyword.doctype.xml - - 3 - - name - variable.documentroot.xml - - - end - \s*(>) - name - meta.tag.sgml.doctype.xml - patterns - - - include - #internalSubset - - - - - begin - <[!%]-- - captures - - 0 - - name - punctuation.definition.comment.xml - - - end - --%?> - name - comment.block.xml - - - begin - <\? - captures - - 0 - - name - punctuation.definition.processing-instruction.xml - - - end - \?> - name - comment.processing-instruction.xml - - - begin - (<)((?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+))(?=(\s[^>]*)?></\2>) - beginCaptures - - 1 - - name - punctuation.definition.tag.begin.xml - - 3 - - name - entity.name.tag.namespace.xml - - 4 - - name - entity.name.tag.xml - - 5 - - name - punctuation.separator.namespace.xml - - 6 - - name - entity.name.tag.localname.xml - - - end - (>)(<)(/)(?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+)(>) - endCaptures - - 1 - - name - punctuation.definition.tag.end.xml - - 2 - - name - punctuation.definition.tag.begin.xml meta.scope.between-tag-pair.xml - - 3 - - name - punctuation.definition.tag.begin.xml - - 4 - - name - entity.name.tag.namespace.xml - - 5 - - name - entity.name.tag.xml - - 6 - - name - punctuation.separator.namespace.xml - - 7 - - name - entity.name.tag.localname.xml - - 8 - - name - punctuation.definition.tag.end.xml - - - name - meta.tag.no-content.xml - patterns - - - include - #tagStuff - - - - - begin - (</?)(?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+) - captures - - 1 - - name - punctuation.definition.tag.begin.xml - - 2 - - name - entity.name.tag.namespace.xml - - 3 - - name - entity.name.tag.xml - - 4 - - name - punctuation.separator.namespace.xml - - 5 - - name - entity.name.tag.localname.xml - - - end - (/?>) - endCaptures - - 1 - - name - punctuation.definition.tag.end.xml - - - name - meta.tag.xml - patterns - - - include - #tagStuff - - - - - include - #entity - - - include - #bare-ampersand - - - begin - <!\[CDATA\[ - beginCaptures - - 0 - - name - punctuation.definition.string.begin.xml - - - end - ]]> - endCaptures - - 0 - - name - punctuation.definition.string.end.xml - - - name - string.unquoted.cdata.xml - - - - bare-ampersand - - match - & - name - invalid.illegal.bad-ampersand.xml - - block_comment - - begin - \(: - end - :\) - patterns - - - include - #block_comment - - - - code_block - - begin - \{ - end - \} - name - meta.code-block.xquery - patterns - - - include - $self - - - - doublequotedString - - begin - (?<![-_a-zA-Z0-9:]>)\s*"(?!\s*</[-_a-zA-Z0-9:]) - beginCaptures - - 0 - - name - punctuation.definition.string.begin.xquery - - - end - " - endCaptures - - 0 - - name - punctuation.definition.string.end.xquery - - - name - string.quoted.double.xquery - patterns - - - include - #entity - - - include - #bare-ampersand - - - - doublequotedStringXml - - begin - " - beginCaptures - - 0 - - name - punctuation.definition.string.begin.xml - - - end - " - endCaptures - - 0 - - name - punctuation.definition.string.end.xml - - - name - string.quoted.double.xml - patterns - - - include - #entity - - - include - #bare-ampersand - - - include - #code_block - - - - entity - - captures - - 1 - - name - punctuation.definition.constant.xml - - - match - (&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x[0-9a-fA-F]+)(;) - name - constant.character.entity.xml - - function_call - - captures - - 1 - - name - punctuation.definition.parameters.begin.xquery - - - match - [\-_a-zA-Z0-9]+:[\-_a-zA-Z0-9]+(?=\() - name - support.function.xquery - - function_parameters - - match - \$([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*:)?([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*) - name - variable.parameter.xquery - - internalSubset - - begin - (\[) - captures - - 1 - - name - punctuation.definition.constant.xml - - - end - (\]) - name - meta.internalsubset.xml - patterns - - - include - #EntityDecl - - - include - #parameterEntity - - - - parameterEntity - - captures - - 1 - - name - punctuation.definition.constant.xml - - 3 - - name - punctuation.definition.constant.xml - - - match - (%)([:a-zA-Z_][:a-zA-Z0-9_.-]*)(;) - name - constant.character.parameter-entity.xml - - singlequotedString - - begin - (?<![-_a-zA-Z0-9:]>)\s*'(?!\s*</[-_a-zA-Z0-9:]) - beginCaptures - - 0 - - name - punctuation.definition.string.begin.xquery - - - end - ' - endCaptures - - 0 - - name - punctuation.definition.string.end.xquery - - - name - string.quoted.single.xquery - patterns - - - include - #entity - - - include - #bare-ampersand - - - - singlequotedStringXml - - begin - ' - beginCaptures - - 0 - - name - punctuation.definition.string.begin.xml - - - end - ' - endCaptures - - 0 - - name - punctuation.definition.string.end.xml - - - name - string.quoted.single.xml - patterns - - - include - #entity - - - include - #bare-ampersand - - - include - #code_block - - - - string - - patterns - - - include - #singlequotedString - - - include - #doublequotedString - - - - tagStuff - - patterns - - - captures - - 1 - - name - entity.other.attribute-name.namespace.xml - - 2 - - name - entity.other.attribute-name.xml - - 3 - - name - punctuation.separator.namespace.xml - - 4 - - name - entity.other.attribute-name.localname.xml - - - match - (?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9]+)= - - - include - #doublequotedStringXml - - - include - #singlequotedStringXml - - - - - scopeName - source.xquery - uuid - cddd8a73-ed1e-4303-a649-a23e816fafa1 - - \ No newline at end of file diff --git a/package.json b/package.json deleted file mode 100644 index fbb6e8b..0000000 --- a/package.json +++ /dev/null @@ -1,148 +0,0 @@ -{ - "name": "xml", - "displayName": "XML Tools", - "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", - "version": "1.9.2", - "publisher": "DotJoshJohnson", - "author": { - "name": "Josh Johnson", - "url": "https://github.com/DotJoshJohnson" - }, - "icon": "resources/xml.png", - "galleryBanner": { - "color": "#FFFFFF", - "theme": "light" - }, - "homepage": "https://github.com/DotJoshJohnson/vscode-xml", - "repository": { - "type": "git", - "url": "https://github.com/DotJoshJohnson/vscode-xml.git" - }, - "bugs": { - "url": "https://github.com/DotJoshJohnson/vscode-xml/issues" - }, - "engines": { - "vscode": "^1.13.0", - "node": "^0.12.0" - }, - "categories": [ - "Languages", - "Linters", - "Other", - "Formatters" - ], - "main": "./src/Extension", - "contributes": { - "commands": [ - { - "command": "xmlTools.minifyXml", - "title": "XML Tools: Minify XML" - }, - { - "command": "xmlTools.evaluateXPath", - "title": "XML Tools: Evaluate XPath" - }, - { - "command": "xmlTools.executeXQuery", - "title": "XML Tools: Execute XQuery" - }, - { - "command": "xmlTools.formatAsXml", - "title": "XML Tools: Format as XML" - } - ], - "configuration": { - "title": "XML Tools Configuration", - "type": "object", - "properties": { - "xmlTools.persistXPathQuery": { - "type": "boolean", - "default": true, - "description": "Remember the last XPath query used." - }, - "xmlTools.removeCommentsOnMinify": { - "type": "boolean", - "default": false, - "description": "Remove XML comments when XML is minified." - }, - "xmlTools.splitXmlnsOnFormat": { - "type": "boolean", - "default": true, - "description": "Put each xmlns attribute on a new line when fromatting XML." - }, - "xmlTools.xqueryExecutionEngine": { - "type": "string", - "default": "", - "description": "The full path to the execution engine executable." - }, - "xmlTools.xqueryExecutionArguments": { - "type": "array", - "default": ["-xquery", "$(script)", "-in", "$(input)", "-out", "$(input).output.xml"], - "description": "Arguments to be passed to the execution engine. '$(script)' and '$(input)' refer to the XQuery script and input XML file, respectively." - }, - "xmlTools.ignoreDefaultNamespace": { - "type": "boolean", - "default": true, - "description": "Ignores default xmlns attribute when evaluating XPath." - } - } - }, - "keybindings": [ - { - "key": "ctrl+shift+alt+b", - "command": "xmlTools.formatXml" - }, - { - "key": "ctrl+shift+alt+x", - "command": "xmlTools.evaluateXPath" - } - ], - "languages": [ - { - "id": "xquery", - "aliases": ["XQuery", "xquery"], - "extensions": [".xq",".xql",".xqm",".xqy",".xquery"], - "configuration": "./languages/xquery/xquery.json" - } - ], - "grammars": [ - { - "language": "xquery", - "scopeName": "source.xquery", - "path": "./languages/xquery/xquery.tmLanguage" - } - ], - "views": { - "explorer": [ - { - "id": "xmlTreeView", - "name": "XML Document" - } - ] - } - }, - "activationEvents": [ - "onLanguage:xml", - "onLanguage:xsl", - "onLanguage:xquery", - "onCommand:xmlTools.minifyXml", - "onCommand:xmlTools.evaluateXPath", - "onCommand:xmlTools.executeXQuery", - "onCommand:xmlTools.formatAsXml" - ], - "devDependencies": { - "vscode": "^1.1.0", - "typescript": "^2.3.4", - "gulp": "^3.9.0", - "gulp-shell": "^0.5.1" - }, - "dependencies": { - "xmldom": "^0.1.22", - "xpath": "^0.0.9", - "xqlint": "^0.2.9" - }, - "scripts": { - "vscode:prepublish": "tsc", - "postinstall": "node ./node_modules/vscode/bin/install" - } -} diff --git a/resources/icons/attribute.dark.svg b/resources/icons/attribute.dark.svg deleted file mode 100644 index f208dc3..0000000 --- a/resources/icons/attribute.dark.svg +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/icons/attribute.light.svg b/resources/icons/attribute.light.svg deleted file mode 100644 index 2c5fc76..0000000 --- a/resources/icons/attribute.light.svg +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/icons/element.dark.svg b/resources/icons/element.dark.svg deleted file mode 100644 index 45eced5..0000000 --- a/resources/icons/element.dark.svg +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/icons/element.light.svg b/resources/icons/element.light.svg deleted file mode 100644 index 8e6cfd1..0000000 --- a/resources/icons/element.light.svg +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/xml.png b/resources/xml.png deleted file mode 100644 index 597979b04af928df27711a78d549a7e4b50bf819..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3277 zcmb`KS635=)`pW%3=$y;3IU`_J#+~{Kp;S9p(`9zx>BMdRZv*0cA!*1mjqysfqAh4Vt^0RX@Sb2H41vr7CY zz?^6Klb**Q001GGV+`z{&ThDHP5s+gP_$v#H`p8n8~8~K6cz5V@N^Wt#Kk$NmxDynkY|E zhND>Q;DE6ILr%6E61d~bSORpxtsq1$0Yd~;A7vNad0tzYPj|S*h%X4CM4v%4v8pgj z+E)+A-l$#A%kQE;!bc79CT-arz~bBmEi!7KRU)%aO6XXxxc9&xl- zSrs^Yiwjf^t}t?t0wEBlqYp@3(JQ=#5DuU#Plf3}kO+t|R*)DM9W{Va~MYJo+9NF+Nhi>=#x)GpvQdC#Q4ohNG5HoN$M6_e#HEazb#_ux(a( z*!AZ@%GAin!#oWuxBJLs0J%rRE{e@7=fPI$?H8X(t+h@`{YCSx(eFl!AhDNivhW{F zdS7*hKhm?29CFM8v$j#sE{!8V?w}`j;fwtlsR>onc=AApQ*x7F**VhC-V=?!ywvps z8)hPWqwz?pyU9x2FaYGf6lxT5o{GP;tOend`_bfcZ}M-2A6;U}I|TCj!=?%UirR&x zyiz3WZSD9c&MvUKqJQMlZ~jn^C`L5oF~e+Rdu~c?o7Uv)rf+&6Vc<3=kP6;2gcgK? z+zSsK!WX4snqfK5xw5?_`afU^J{Hx8dtwf2HdrD=>I;a}^sT*+XUYU%IR?b4Fe;Oq zb6&)24;sGBq!b^XoT?t$aG#nN{gEIJYcD~<$`7x3E#v~oWH!6pm$k2Gl_}lqO8itz zn`4o$GR``?%RTY*Zo%j`iuGfP*v%2M*x*QbmoQLOVh$P@{2ORv1nKW7zew$?%5#dP z?Y10SC>?tqlT&c+@WsfI`0d#Bkz76iUtskFcSlUz=YaqfnR^ep1qF9?jb|cd6Qd#$ z^fVogH^jAWWOPkFxBz3Wl--nNSFM`zUHteP2@H#byxNW`DEGe+UVwrlJ9ue+UkbL? z?UD}5b>ahnR9^v1wIuQO5wAj9)Ay0OCBYT+&MQUF6_ZDq)pU8p$q-M}Q9pSs7g1p)o0{8~{fXU5aI-Kai>RJs2CD|B(ZHVF&sWVgg)emxhni@CaA=T@}e&6;p19i!pw=lM~k!r{-{EoHLs zBP6TqLk=)0kY45JF|zOHSvjID=cx5wVy{X9PFT6??w(SvldYrC0XO2+Kw7 zF2I7+r<)r9!&8qP^1gje9!mp2!@2E0%Cm-+f6qu`ojO`E)95z_*a+rVK4b?^P*RB0 zIU5Pnf3?}nOvF`k%*E6?>F672g695s;Fi*zmRTRFwEgHXR=Iv+m>-qLPH$hmB?{lM zz4#UvDL8mlm2;81f;pZ6fNr-@m=wk>ZZX5mgj#U4F6}nmGEax}Hw8;yqesjZ`7-V- z2|q)zi|q}U68P4(Z|sQWg15cwEB%`nerxA-4@wMii(Y(G%B@-1A%Nt$9)7l1ew?7{32N1o78bm4SA(GCq=?Vf**m zmZ<#x;a>evNq|w7tP>Aa1b0Z~P1oer4Ko^=5?>GK)-T{$_X;93?qLn&TQXa$2B z|Lk}E!e)oNEWk?GBvi_DO#a+`pV(jOHYHz`mf3ejkABk*6*Bc`5J9zOuMW(rXQR#I zO0wMg8_HIOh67RjNH-3_d74vSbSv9yl-OP&*YpZ4!|!iv_IyBnBs~D9`tI%OgYd)6 zgE7LpPfzV9bRxXbAAYraDhy~j|N6m_l5WYaUWa10yr^PqN$$?YDG^h;b@aRqn#04I zv}JQIcF*SiqD@i?r}(?H@e<`4+l=1$vE`h9v(`)iocd$L8*xsrWI0TZ|6C|kA7Jv7 z=n~esv*v+Xt;WdA0h}^Jk4kWsX`|3yswE0iuf-sSv?jq$=lnEjN_91Y=*`bqSs(1! zVSG($oTx*eZNOqwHlAxlBv|xUZ)E$AIBXs7dDWHN@ix6Ewy?1W13f7UQmX;n`kZ+r z3B(>u0837i>-c{EFOg0EW>=2Ymj)_B*N#Iz@;c&A$(*9R|ZmV3B1ZqGY}vmO(^^nK+%_gqlMSn_Ds^HNtX zy)rjwLt@gOq^OwdPi9VB$0wekN@5IMy!1mrO7AU5sD^|sY`_P1TRdq3gP_&Uqud#t zQ>Y--=wE&X5R36DDR-ps_Y$@Wk;d)0xu8X{>Wv}OyWl;BdF*M_zCSv6*Q6pDgCo*-y@EXHGf*Q-}8ooXy@d3orK$D9!&ZN~8;e3y1CIYFJ zKbiKQg!cL$d0PfHcqO&e*W9e?^^tWmo)VE~7`fm*(@U+Jey+iWO%5~j(ra6j{Nc?3 zd8=K|SGC$lzogY)`pc5HbSDOLZEU=;YR~^3gxT|br<-|bLYR1eR}1xN+Ei;S!Q)5b zO0G-XC&eBP7(_)D##4KlK(HJ;Xu=B`_Hw<#sP28yE`D8C9PQfbd)J9O3K2ZeldP2v z5tBD`g&9ez{^_1$n;cK3ybn69$y+uIJgPUZiXZJORksLY&|YLj#5L(nbhH$3y}|6X zT1zHY$&FsLoGEnHcPu=n*d}f~BJA+dR7?&&pSN0Smns8WiceC_V`D6+8bW+eitby~ zDd-Z?%ja6gQ-oG9D)Eim zhM70h^K!88UQY>c4E>V8-5j5X*`4V)Mc`HP0++R-(xW*Mm7x}`9TpSoBV?`^@UgJ! zhsfaI@Y;P7QK10-Z7;Sbgo-D+=lB=_(L`z!a&O0rSztkyU3Fr z4MAP2GyjOft}@K`8~GF5mi^`%;BD4`?C*NLnn@K_YqvqSm?L5-9;exj3RS{wmVlM1 zc`0AKAU|thOdAP21EMv_{3t@w6?yM{DWD}q!>S`a-(nWd*TX*w-;QhiMeL_T4P!l`&|aKIg$NLH+? z6mh>##qan72*|v6Cr+k7fD4_O8Ff=*XU|@dDOj-VFBF~(h}Gh}8hlh&)*?&}44vH7 z-^r@x)HNqU#6iQItrjVIQ7=Mvw4bi@?uBbI+W|?s7FidcO(OS^K=|MPLj#{iV*yL{ WDt|&#&Yis}0CQt&Or@cF^nU@Uyb>4y diff --git a/src/Commands.ts b/src/Commands.ts deleted file mode 100644 index f09705f..0000000 --- a/src/Commands.ts +++ /dev/null @@ -1,69 +0,0 @@ -import * as vsc from "vscode"; -import * as ext from "./Extension"; -import * as xpath from "xpath"; -import { RangeUtil } from "./utils/RangeUtil"; -import { XmlFormatter } from "./services/XmlFormatter"; -import { XPathFeatureProvider } from "./providers/XPath"; -import { XQueryExecutionProvider } from "./providers/Execution"; -import { XmlFormattingEditProvider } from "./providers/Formatting"; - -const CFG_SECTION: string = "xmlTools"; -const CFG_REMOVE_COMMENTS: string = "removeCommentsOnMinify"; - -export class TextEditorCommands { - static minifyXml(editor: vsc.TextEditor, edit: vsc.TextEditorEdit): void { - let removeComments: boolean = vsc.workspace.getConfiguration(CFG_SECTION).get(CFG_REMOVE_COMMENTS, false); - - let range: vsc.Range = RangeUtil.getRangeForDocument(editor.document); - - let formatter: XmlFormatter = new XmlFormatter(); - let xml: string = formatter.minify(editor.document.getText()); - - edit.replace(range, xml); - } - - static evaluateXPath(editor: vsc.TextEditor, edit: vsc.TextEditorEdit): void { - XPathFeatureProvider.evaluateXPathAsync(editor, edit); - } - - static executeXQuery(editor: vsc.TextEditor, edit: vsc.TextEditorEdit): void { - XQueryExecutionProvider.executeXQueryAsync(editor); - } - - static formatAsXml(editor: vsc.TextEditor, edit: vsc.TextEditorEdit): void { - let edits: vsc.TextEdit[]; - let formattingEditProvider = new XmlFormattingEditProvider(); - let formattingOptions: vsc.FormattingOptions = { - insertSpaces: (editor.options.insertSpaces as boolean), - tabSize: (editor.options.tabSize as number) - }; - - // if the user has selected text, only format what is selected - // otherwise, attempt to format the entire document - if (!editor.selection.isEmpty) { - edits = formattingEditProvider.provideDocumentRangeFormattingEdits(editor.document, editor.selection, formattingOptions); - } - - else { - edits = formattingEditProvider.provideDocumentFormattingEdits(editor.document, formattingOptions); - } - - if (edits) { - for (let i = 0; i < edits.length; i++) { - editor.edit(async (editBuilder) => { - editBuilder.replace(edits[i].range, edits[i].newText); - - // wiggle the cursor to deselect the formatted XML (is there a non-hacky way to go about this?) - await vsc.commands.executeCommand("cursorMove", { - to: "left", - by: "character" - }); - await vsc.commands.executeCommand("cursorMove", { - to: "right", - by: "character" - }); - }); - } - } - } -} \ No newline at end of file diff --git a/src/Extension.ts b/src/Extension.ts deleted file mode 100644 index 2e600a9..0000000 --- a/src/Extension.ts +++ /dev/null @@ -1,76 +0,0 @@ -import * as vsc from "vscode"; -import { TextEditorCommands } from "./Commands"; -import { XmlFormattingEditProvider } from "./providers/Formatting"; -import { XQueryLintingFeatureProvider } from "./providers/Linting"; -import { XQueryCompletionItemProvider } from "./providers/Completion"; -import { XmlTreeViewDataProvider } from "./providers/XmlTreeView"; - -export var GlobalState: vsc.Memento; -export var WorkspaceState: vsc.Memento; - -const LANG_XML: string = "xml"; -const LANG_XSL: string = "xsl"; -const LANG_XQUERY: string = "xquery;" -const MEM_QUERY_HISTORY: string = "xpathQueryHistory"; - -export function activate(ctx: vsc.ExtensionContext) { - console.log("activate extension"); - // expose global and workspace state to the entire extension - GlobalState = ctx.globalState; - WorkspaceState = ctx.workspaceState; - - // register palette commands - ctx.subscriptions.push( - vsc.commands.registerTextEditorCommand("xmlTools.minifyXml", TextEditorCommands.minifyXml), - vsc.commands.registerTextEditorCommand("xmlTools.evaluateXPath", TextEditorCommands.evaluateXPath), - vsc.commands.registerTextEditorCommand("xmlTools.executeXQuery", TextEditorCommands.executeXQuery), - vsc.commands.registerTextEditorCommand("xmlTools.formatAsXml", TextEditorCommands.formatAsXml) - ); - - // register language feature providers - ctx.subscriptions.push( - vsc.languages.registerDocumentFormattingEditProvider([LANG_XML, LANG_XSL], new XmlFormattingEditProvider()), - vsc.languages.registerDocumentRangeFormattingEditProvider([LANG_XML, LANG_XSL], new XmlFormattingEditProvider()), - - vsc.languages.registerCompletionItemProvider(LANG_XQUERY, new XQueryCompletionItemProvider(), ":", "$") - ); - - // listen to editor events (for linting) - ctx.subscriptions.push( - vsc.window.onDidChangeActiveTextEditor(_handleChangeActiveTextEditor), - vsc.window.onDidChangeTextEditorSelection(_handleChangeTextEditorSelection) - ); - - // add views - ctx.subscriptions.push( - vsc.window.registerTreeDataProvider("xmlTreeView", new XmlTreeViewDataProvider(ctx)) - ); -} - -export function deactivate() { - // clean up xpath history - let memento: vsc.Memento = WorkspaceState || GlobalState; - let history = memento.get(MEM_QUERY_HISTORY, []); - history.splice(0); - memento.update(MEM_QUERY_HISTORY, history); -} - -function _handleContextChange(editor: vsc.TextEditor): void { - if (!editor || !editor.document) { - return; - } - - switch (editor.document.languageId) { - case "xquery": - XQueryLintingFeatureProvider.provideXQueryDiagnostics(editor); - break; - } -} - -function _handleChangeActiveTextEditor(editor: vsc.TextEditor): void { - _handleContextChange(editor); -} - -function _handleChangeTextEditorSelection(e: vsc.TextEditorSelectionChangeEvent): void { - _handleContextChange(e.textEditor); -} \ No newline at end of file diff --git a/src/providers/Completion.ts b/src/providers/Completion.ts deleted file mode 100644 index fcbad7c..0000000 --- a/src/providers/Completion.ts +++ /dev/null @@ -1,44 +0,0 @@ -import * as vsc from "vscode"; -import { XQueryCompleter, XQueryCompletionItem } from "../services/XQueryCompleter"; - -export class XQueryCompletionItemProvider implements vsc.CompletionItemProvider { - provideCompletionItems(document: vsc.TextDocument, position: vsc.Position): vsc.CompletionItem[] { - let items: vsc.CompletionItem[] = new Array(); - - let completer: XQueryCompleter = new XQueryCompleter(document.getText()); - let completions: XQueryCompletionItem[] = completer.getCompletions(position.line, position.character); - - completions.forEach((completion: XQueryCompletionItem) => { - let item: vsc.CompletionItem = new vsc.CompletionItem(completion.name); - item.insertText = completion.value; - - switch (completion.meta) { - // functions (always qualified with a colon) - case "function": - item.kind = vsc.CompletionItemKind.Function; - - let funcStart = (completion.value.indexOf(":") + 1); - let funcEnd = completion.value.indexOf("("); - - item.insertText = completion.value.substring(funcStart, funcEnd); - break; - - // variables and parameters (always qualified with a dollar sign) - case "Let binding": - case "Local variable": - case "Window variable": - case "Function parameter": - item.kind = vsc.CompletionItemKind.Variable; - item.insertText = completion.value.substring(1); - break; - - // everything else - default: item.kind = vsc.CompletionItemKind.Text; - } - - items.push(item); - }); - - return items; - } -} \ No newline at end of file diff --git a/src/providers/Execution.ts b/src/providers/Execution.ts deleted file mode 100644 index 1ac3dee..0000000 --- a/src/providers/Execution.ts +++ /dev/null @@ -1,127 +0,0 @@ -import * as vsc from "vscode"; -import { ChildProcess } from "../services/ChildProcess"; - -const CFG_SECTION: string = "xmlTools"; -const CFG_XQEXEC: string = "xqueryExecutionEngine"; -const CFG_XQARGS: string = "xqueryExecutionArguments"; - -export class XQueryExecutionProvider { - static async executeXQueryAsync(editor: vsc.TextEditor): Promise { - // this disposable will be used for creating status bar messages - let disposable: vsc.Disposable; - - if (editor.document.languageId !== "xquery") { - vsc.window.showErrorMessage("This action can only be performed on an XQuery file."); - return; - } - - let executable = vsc.workspace.getConfiguration(CFG_SECTION).get(CFG_XQEXEC, null); - let args = vsc.workspace.getConfiguration(CFG_SECTION).get(CFG_XQARGS, []); - - if (!executable || executable == "") { - let action = await vsc.window.showWarningMessage("An XQuery execution engine has not been defined.", "Define Now"); - - if (action == "Define Now") { - vsc.commands.executeCommand("workbench.action.openGlobalSettings"); - } - - return; - } - - let inputFile: vsc.Uri; - disposable = vsc.window.setStatusBarMessage("Searching for XML files in folder..."); - let files: vsc.Uri[] = await vsc.workspace.findFiles("**/*.xml", "", 100); - disposable.dispose(); - - // user does not have a folder open - prompt for file name - if (typeof files === "undefined") { - vsc.window.showErrorMessage("You must have a folder opened in VS Code to use this feature."); - return; - } - - // if there is only one XML file, default it - // otherwise, prompt the user to select one from the open folder - if (files.length > 1) { - let qpItems: any[] = new Array(); - - files.forEach((file) => { - let filename: string = file.fsPath.replace("\\", "/"); - - qpItems.push({ // must implement vscode.QuickPickItem - label: filename.substring(filename.lastIndexOf("/") + 1), - description: file.fsPath, - file: file - }); - }); - - let selection = await vsc.window.showQuickPick(qpItems, { placeHolder: "Please select an input file." }); - - if (!selection) { - return; - } - - inputFile = selection.file; - } - - else { - inputFile = files[0]; - } - - // prompt for output file name - let outputPath: string = null; - let outputPathPos: number = -1; - - for (let i = 0; i < args.length; i++) { - if (i > 0) { - if (args[i - 1].search(/out|result/)) { - outputPath = args[i]; - outputPathPos = i; - } - } - } - - if (outputPath) { - outputPath = await vsc.window.showInputBox({ - placeHolder: "ex. C:\\TEMP\XQueryOutput\\MyOutputFile.xml", - prompt: "Please specify the output file path. Existing file behavior is determined by the execution engine you have specified.", - value: outputPath - }); - - args[outputPathPos] = outputPath; - } - - // call out to the execution engine - disposable = vsc.window.setStatusBarMessage("Executing XQuery Script..."); - args = args.map((value: string) => { - return value - .replace("$(script)", editor.document.uri.fsPath) - .replace("$(input)", inputFile.fsPath) - .replace("$(project)", vsc.workspace.rootPath); - }); - - try { - await ChildProcess.spawnAsync(executable, args); - } - - catch (error) { - if (error.message.search(/[Ll]ine:?\s*\d+/gm) > -1) { - let match: RegExpExecArray = /[Ll]ine:?\s*\d+/gm.exec(error.message); - let line: number = (Number.parseInt(match[0].replace(/([Ll]ine:?\s*)|\s/, "")) - 1); - - let selection: string = await vsc.window.showErrorMessage(error.message, `Go to Line ${line}`); - - if (selection == `Go to Line ${line}`) { - editor.revealRange(new vsc.Range(line, 0, line, 0)); - } - } - - else { - vsc.window.showErrorMessage(error.message); - } - } - - finally { - disposable.dispose(); - } - } -} \ No newline at end of file diff --git a/src/providers/Formatting.ts b/src/providers/Formatting.ts deleted file mode 100644 index 5bc3faf..0000000 --- a/src/providers/Formatting.ts +++ /dev/null @@ -1,33 +0,0 @@ -import * as vsc from "vscode"; -import { RangeUtil } from "../utils/RangeUtil"; -import { XmlFormatter, IXmlFormatterOptions } from "../services/XmlFormatter"; - -const CFG_SECTION: string = "xmlTools"; -const CFG_SPLIT_NAMESPACES: string = "splitXmlnsOnFormat"; - -export class XmlFormattingEditProvider implements vsc.DocumentFormattingEditProvider, vsc.DocumentRangeFormattingEditProvider { - provideDocumentFormattingEdits(document: vsc.TextDocument, options: vsc.FormattingOptions): vsc.TextEdit[] { - let range = RangeUtil.getRangeForDocument(document); - - return this._provideFormattingEdits(document, range, options); - } - - provideDocumentRangeFormattingEdits(document: vsc.TextDocument, range: vsc.Range, options: vsc.FormattingOptions): vsc.TextEdit[] { - return this._provideFormattingEdits(document, range, options); - } - - private _provideFormattingEdits(document: vsc.TextDocument, range: vsc.Range, options: vsc.FormattingOptions): vsc.TextEdit[] { - let splitNamespaces: boolean = vsc.workspace.getConfiguration(CFG_SECTION).get(CFG_SPLIT_NAMESPACES, true); - - let formatterOptions: IXmlFormatterOptions = { - preferSpaces: options.insertSpaces, - tabSize: options.tabSize, - splitNamespaces: splitNamespaces - }; - - let formatter = new XmlFormatter(formatterOptions); - let xml = formatter.format(document.getText(range)); - - return [ vsc.TextEdit.replace(range, xml) ]; - } -} \ No newline at end of file diff --git a/src/providers/Linting.ts b/src/providers/Linting.ts deleted file mode 100644 index 2658554..0000000 --- a/src/providers/Linting.ts +++ /dev/null @@ -1,32 +0,0 @@ -import * as vsc from "vscode"; -import { XQueryLinter, XQueryDiagnostic } from "../services/XQueryLinter"; - -export class XQueryLintingFeatureProvider { - private static _coreDiagnostics: vsc.DiagnosticCollection; - - static get coreDiagnostics(): vsc.DiagnosticCollection { - if (!XQueryLintingFeatureProvider._coreDiagnostics) { - XQueryLintingFeatureProvider._coreDiagnostics = vsc.languages.createDiagnosticCollection("XQueryDiagnostics"); - } - - return XQueryLintingFeatureProvider._coreDiagnostics; - } - - static provideXQueryDiagnostics(editor: vsc.TextEditor): void { - let diagnostics: vsc.Diagnostic[] = new Array(); - let xqDiagnostics: XQueryDiagnostic[] = XQueryLinter.lint(editor.document.getText()); - - xqDiagnostics.forEach((xqd: XQueryDiagnostic) => { - let vSeverity: vsc.DiagnosticSeverity = (xqd.severity == 1) ? vsc.DiagnosticSeverity.Warning : vsc.DiagnosticSeverity.Error; - - let startPos: vsc.Position = new vsc.Position(xqd.startLine, xqd.startColumn); - let endPos: vsc.Position = new vsc.Position(xqd.endLine, xqd.endColumn); - let range: vsc.Range = new vsc.Range(startPos, endPos); - let diagnostic: vsc.Diagnostic = new vsc.Diagnostic(range, xqd.message, vSeverity); - - diagnostics.push(diagnostic); - }); - - XQueryLintingFeatureProvider.coreDiagnostics.set(editor.document.uri, diagnostics); - } -} \ No newline at end of file diff --git a/src/providers/XPath.ts b/src/providers/XPath.ts deleted file mode 100644 index b5ddd5e..0000000 --- a/src/providers/XPath.ts +++ /dev/null @@ -1,120 +0,0 @@ -import * as vsc from "vscode"; -import * as ext from "../Extension"; -import { XPathEvaluator, EvaluatorResult, EvaluatorResultType } from "../services/XPathEvaluator"; - -const CFG_SECTION: string = "xmlTools"; -const CFG_PERSIST_QUERY: string = "persistXPathQuery"; -const CFG_IGNORE_DEFAULT_XMLNS: string = "ignoreDefaultNamespace"; -const MEM_QUERY_HISTORY: string = "xpathQueryHistory"; -const MEM_QUERY_LAST: string = "xPathQueryLast"; -const OUTPUT_CHANNEL: string = "XPath Results"; - -export class XPathFeatureProvider { - static async evaluateXPathAsync(editor: vsc.TextEditor, edit: vsc.TextEditorEdit): Promise { - // if there is no workspace, we will track queries in the global Memento - let memento: vsc.Memento = ext.WorkspaceState || ext.GlobalState; - - // get the xpath persistence setting - let persistQueries: boolean = vsc.workspace.getConfiguration(CFG_SECTION).get(CFG_PERSIST_QUERY, true); - - // get the last query if there is one for this document - // if not, try pulling the last query ran, regardless of document - // NOTE: if the user has focus on the output channel when opening the xquery prompt, the channel is the "active" document - let history: HistoricQuery[] = memento.get(MEM_QUERY_HISTORY, new Array()); - let globalLastQuery: string = memento.get(MEM_QUERY_LAST, ""); - - let lastQuery: HistoricQuery = history.find((item: HistoricQuery) => { - if (item.uri == editor.document.uri.toString()) { - return true; - } - - return false; - }); - - // set the inital display value and prompt the user - let query: string = ""; - - if (persistQueries) { - if (lastQuery) { - query = lastQuery.query; - } - - else { - query = globalLastQuery; - } - } - - query = await vsc.window.showInputBox({ - placeHolder: "XPath Query", - prompt: "Please enter an XPath query to evaluate.", - value: query - }); - - // showInputBox() will return undefined if the user dimissed the prompt - if (query) { - - let ignoreDefaultNamespace: boolean = vsc.workspace.getConfiguration(CFG_SECTION).get(CFG_IGNORE_DEFAULT_XMLNS, true); - - // run the query - let xml: string = editor.document.getText(); - let evalResult: EvaluatorResult; - - try { - evalResult = XPathEvaluator.evaluate(query, xml, ignoreDefaultNamespace); - } - catch (error) { - console.error(error); - vsc.window.showErrorMessage(`Something went wrong while evaluating the XPath: ${error}`); - return; - } - - // show the results to the user - let outputChannel: vsc.OutputChannel = vsc.window.createOutputChannel(OUTPUT_CHANNEL); - outputChannel.clear(); - - outputChannel.appendLine(`XPath Query: ${query}`); - outputChannel.append("\n"); - - if (evalResult.type === EvaluatorResultType.NODE_COLLECTION) { - (evalResult.result as Node[]).forEach((node: XmlNode) => { - outputChannel.appendLine(`[Line ${node.lineNumber}] ${node.localName}: ${node.textContent}`); - }); - } else { - outputChannel.appendLine(`[Result]: ${evalResult.result}`); - } - outputChannel.show(vsc.ViewColumn.Three); - - // if persistence is enabled, save the query for later - if (persistQueries) { - lastQuery = new HistoricQuery(editor.document.uri.toString(), query); - - let affectedIndex: number = -1; - history = history.map((item: HistoricQuery, index: number) => { - if (item.uri == lastQuery.uri) { - item.query = query; - affectedIndex = index; - } - - return item; - }); - - if (affectedIndex == -1) { - history.push(lastQuery); - } - - memento.update(MEM_QUERY_HISTORY, history); - memento.update(MEM_QUERY_LAST, query); - } - } - } -} - -class HistoricQuery { - constructor(uri: string, query: string) { - this.uri = uri; - this.query = query; - } - - uri: string; - query: string; -} \ No newline at end of file diff --git a/src/providers/XmlTreeView.ts b/src/providers/XmlTreeView.ts deleted file mode 100644 index ed084e1..0000000 --- a/src/providers/XmlTreeView.ts +++ /dev/null @@ -1,128 +0,0 @@ -import * as vsc from "vscode"; -import * as path from "path"; - -let DOMParser = require("xmldom").DOMParser; - -export class XmlTreeViewDataProvider implements vsc.TreeDataProvider { - private _onDidChangeTreeData: vsc.EventEmitter = new vsc.EventEmitter(); - private _xmlDocument: Document; - - constructor(private _context: vsc.ExtensionContext) { - vsc.window.onDidChangeActiveTextEditor((editor) => { - this._refreshTree(); - }); - - vsc.workspace.onDidChangeTextDocument((e) => { - this._refreshTree(); - }); - } - - readonly onDidChangeTreeData: vsc.Event = this._onDidChangeTreeData.event; - - get activeEditor(): vsc.TextEditor | null { - return vsc.window.activeTextEditor || null; - } - - getChildren(element?: Node): Node[] { - if (!this._xmlDocument) { - this._refreshTree(); - } - - if (element) { - return [].concat(this._getChildAttributeArray(element), this._getChildElementArray(element)); - } - - else if (this._xmlDocument) { - return [ this._xmlDocument.lastChild ]; - } - - else { - return []; - } - } - - getTreeItem(element: Node): vsc.TreeItem { - let treeItem = new vsc.TreeItem(element.localName); - - if (this._getChildAttributeArray(element).length > 0) { - treeItem.collapsibleState = vsc.TreeItemCollapsibleState.Collapsed; - } - - if (this._getChildElementArray(element).length > 0) { - treeItem.collapsibleState = vsc.TreeItemCollapsibleState.Collapsed; - } - - treeItem.command = { - command: "revealLine", - title: "", - arguments: [{ - lineNumber: (element as any).lineNumber - 1, - at: "top" - }] - }; - - treeItem.iconPath = this._getIcon(element); - - return treeItem; - } - - private _getChildAttributeArray(node: Node): Node[] { - if (!node.attributes) { - return []; - } - - let array = new Array(); - - for (let i = 0; i < node.attributes.length; i++) { - array.push(node.attributes[i]); - } - - return array; - } - - private _getChildElementArray(node: Node): Node[] { - if (!node.childNodes) { - return []; - } - - let array = new Array(); - - for (let i = 0; i < node.childNodes.length; i++) { - let child = node.childNodes[i]; - - if ((child as any).tagName) { - array.push(child); - } - } - - return array; - } - - private _getIcon(element: Node): any { - let type = "element"; - - if (!(element as any).tagName) { - type = "attribute"; - } - - let icon = { - dark: this._context.asAbsolutePath(path.join("resources", "icons", `${type}.dark.svg`)), - light: this._context.asAbsolutePath(path.join("resources", "icons", `${type}.light.svg`)) - }; - - return icon; - } - - private _refreshTree(): void { - if (!this.activeEditor || this.activeEditor.document.languageId !== "xml") { - this._xmlDocument = null; - this._onDidChangeTreeData.fire(); - return; - } - - let xml = this.activeEditor.document.getText(); - this._xmlDocument = new DOMParser().parseFromString(xml, "text/xml"); - - this._onDidChangeTreeData.fire(); - } -} \ No newline at end of file diff --git a/src/services/ChildProcess.ts b/src/services/ChildProcess.ts deleted file mode 100644 index 53257eb..0000000 --- a/src/services/ChildProcess.ts +++ /dev/null @@ -1,30 +0,0 @@ -let child_process = require("child_process"); - -export class ChildProcess { - static async spawnAsync(executable: string, args: string[]): Promise { - return new Promise((resolve, reject) => { - - let output: string = ""; - let handle = child_process.spawn(executable, args); - - handle.stdout.on("data", (data: string) => { - output += data; - }); - - handle.stderr.on("data", (data: string) => { - output += data; - }); - - handle.on("close", (code: string) => { - if (code == "0") { - resolve(); - } - - else { - reject({ code: code, message: output }); - } - }); - - }); - } -} \ No newline at end of file diff --git a/src/services/XPathEvaluator.ts b/src/services/XPathEvaluator.ts deleted file mode 100644 index c67ee58..0000000 --- a/src/services/XPathEvaluator.ts +++ /dev/null @@ -1,63 +0,0 @@ -import * as xpath from "xpath"; - -let DOMParser = require("xmldom").DOMParser; - -export class EvaluatorResult { - type: EvaluatorResultType; - result: Node[]|number|string|boolean; -} - -export class EvaluatorResultType { - static SCALAR_TYPE: number = 0; - static NODE_COLLECTION: number = 1; -} - -export class XPathEvaluator { - static evaluate(query: string, xml: string, ignoreDefaultNamespace: boolean): EvaluatorResult { - if (ignoreDefaultNamespace) { - xml = xml.replace(/xmlns=".+"/g, (match: string) => { - return match.replace(/xmlns/g, "xmlns:default"); - }); - } - - let nodes: Node[] = new Array(); - - let xdoc: Document = new DOMParser().parseFromString(xml, "text/xml"); - - let resolver: xpath.XPathNSResolver = xpath.createNSResolver(xdoc); - let result: xpath.XPathResult = xpath.evaluate( - query, // xpathExpression - xdoc, // contextNode - resolver, // namespaceResolver - xpath.XPathResult.ANY_TYPE, // resultType - null // result - ) - - let evalResult = new EvaluatorResult(); - evalResult.type = EvaluatorResultType.SCALAR_TYPE; - - switch(result.resultType) { - case xpath.XPathResult.NUMBER_TYPE: - evalResult.result = result.numberValue; - break; - case xpath.XPathResult.STRING_TYPE: - evalResult.result = result.stringValue; - break; - case xpath.XPathResult.BOOLEAN_TYPE: - evalResult.result = result.booleanValue; - break; - case xpath.XPathResult.UNORDERED_NODE_ITERATOR_TYPE: - case xpath.XPathResult.ORDERED_NODE_ITERATOR_TYPE: - evalResult.result = result.booleanValue; - let node: Node; - while (node = result.iterateNext()) { - nodes.push(node); - } - evalResult.result = nodes; - evalResult.type = EvaluatorResultType.NODE_COLLECTION; - break; - } - - return evalResult; - } -} \ No newline at end of file diff --git a/src/services/XQueryCompleter.ts b/src/services/XQueryCompleter.ts deleted file mode 100644 index 463f864..0000000 --- a/src/services/XQueryCompleter.ts +++ /dev/null @@ -1,41 +0,0 @@ -let XQLint = require("xqlint").XQLint; - -export class XQueryCompleter { - constructor(script: string) { - this.script = script; - } - - private _script: string; - private _linter: any; - - get script(): string { - return this._script; - } - - set script(value: string) { - this._script = value; - this._linter = new XQLint(this._script); - } - - getCompletions(line: number, column: number): XQueryCompletionItem[] { - let items: XQueryCompletionItem[] = new Array(); - - this._linter.getCompletions({line: line, col: column}).forEach((completion: any) => { - items.push(new XQueryCompletionItem(completion.name, completion.value, completion.meta)); - }); - - return items; - } -} - -export class XQueryCompletionItem { - constructor(name: string, value: string, meta: string) { - this.name = name; - this.value = value; - this.meta = meta; - } - - name: string; - value: string; - meta: string; -} \ No newline at end of file diff --git a/src/services/XQueryLinter.ts b/src/services/XQueryLinter.ts deleted file mode 100644 index b893a0e..0000000 --- a/src/services/XQueryLinter.ts +++ /dev/null @@ -1,39 +0,0 @@ -let XQLint = require("xqlint").XQLint; - -export class XQueryLinter { - static SEVERITY_WARNING: number = 1; - static SEVERITY_ERROR: number = 2; - - static lint(text: string): XQueryDiagnostic[] { - let linter = new XQLint(text); - let diagnostics: XQueryDiagnostic[] = new Array(); - - linter.getErrors().forEach((error: any) => { - diagnostics.push(new XQueryDiagnostic(XQueryLinter.SEVERITY_ERROR, error.message, error.pos.sl, error.pos.sc, error.pos.el, error.pos.ec)); - }); - - linter.getWarnings().forEach((warning: any) => { - diagnostics.push(new XQueryDiagnostic(XQueryLinter.SEVERITY_WARNING, warning.message, warning.pos.sl, warning.pos.sc, warning.pos.el, warning.pos.ec)); - }); - - return diagnostics; - } -} - -export class XQueryDiagnostic { - constructor(severity: number, message: string, startLine: number, startColumn: number, endLine: number, endColumn: number) { - this.severity = severity; - this.message = message; - this.startLine = startLine; - this.startColumn = startColumn; - this.endLine = endLine; - this.endColumn = endColumn; - } - - severity: number; - message: string; - startLine: number; - startColumn: number; - endLine: number; - endColumn: number; -} \ No newline at end of file diff --git a/src/services/XmlFormatter.ts b/src/services/XmlFormatter.ts deleted file mode 100644 index f92692c..0000000 --- a/src/services/XmlFormatter.ts +++ /dev/null @@ -1,192 +0,0 @@ -// Based on pretty-data (https://github.com/vkiryukhin/pretty-data) -export class XmlFormatter { - constructor(options?: IXmlFormatterOptions) { - options = options || {}; - - if (typeof options.preferSpaces === "undefined") { - options.preferSpaces = false; - } - - if (typeof options.splitNamespaces === "undefined") { - options.splitNamespaces = true; - } - - options.tabSize = options.tabSize || 4; - options.newLine = options.newLine || "\n"; - - this.newLine = options.newLine || "\n"; - this.indentPattern = (options.preferSpaces) ? " ".repeat(options.tabSize) : "\t"; - this.splitNamespaces = options.splitNamespaces; - } - - newLine: string; - indentPattern: string; - splitNamespaces: boolean; - - format(xml: string): string { - xml = this.minify(xml, false); - xml = xml.replace(/ -1) { - output += this._getIndent(level, parts[i]); - inComment = true; - - // end /) > -1 || parts[i].search(/\]>/) > -1 || parts[i].search(/!DOCTYPE/) > -1) { - inComment = false; - } - } - - // end /) > -1 || parts[i].search(/\]>/) > -1) { - output += parts[i]; - inComment = false; - } - - // - else if (/^<(\w|:)/.test(parts[i - 1]) && /^<\/(\w|:)/.test(parts[i]) - && /^<[\w:\-\.\,\/]+/.exec(parts[i - 1])[0] == /^<\/[\w:\-\.\,]+/.exec(parts[i])[0].replace("/", "")) { - - output += parts[i]; - if (!inComment) level--; - } - - // - else if (parts[i].search(/<(\w|:)/) > -1 && parts[i].search(/<\//) == -1 && parts[i].search(/\/>/) == -1) { - output = (!inComment) ? output += this._getIndent(level++, parts[i]) : output += parts[i]; - } - - // ... - else if (parts[i].search(/<(\w|:)/) > -1 && parts[i].search(/<\//) > -1) { - output = (!inComment) ? output += this._getIndent(level, parts[i]) : output += parts[i]; - } - - // - else if (parts[i].search(/<\//) > -1) { - output = (!inComment) ? output += this._getIndent(--level, parts[i]) : output += parts[i]; - } - - // - else if (parts[i].search(/\/>/) > -1 && (!this.splitNamespaces || parts[i].search(/xmlns(:|=)/) == -1)) { - output = (!inComment) ? output += this._getIndent(level, parts[i]) : output += parts[i]; - } - - // xmlns /> - else if (parts[i].search(/\/>/) > -1 && parts[i].search(/xmlns(:|=)/) > -1 && this.splitNamespaces) { - output = (!inComment) ? output += this._getIndent(level--, parts[i]) : output += parts[i]; - } - - // - else if (parts[i].search(/<\?/) > -1) { - output += this._getIndent(level, parts[i]); - } - - // xmlns - else if (this.splitNamespaces && (parts[i].search(/xmlns\:/) > -1 || parts[i].search(/xmlns\=/) > -1)) { - output += this._getIndent(level, parts[i]); - } - - else { - output += parts[i]; - } - } - - // remove leading newline - if (output[0] == this.newLine) { - output = output.slice(1); - } - - else if (output.substring(0, 1) == this.newLine) { - output = output.slice(2); - } - - return output; - } - - minify(xml: string, removeComments?: boolean): string { - if (typeof removeComments === "undefined") { - removeComments = false; - } - - xml = this._stripLineBreaks(xml); // all line breaks outside of CDATA elements - xml = (removeComments) ? xml.replace(/\/g, "") : xml; - xml = xml.replace(/>\s{0,}<"); // insignificant whitespace between tags - xml = xml.replace(/"\s+(?=[^\s]+=)/g, "\" "); // spaces between attributes - xml = xml.replace(/"\s+(?=>)/g, "\""); // spaces between the last attribute and tag close (>) - xml = xml.replace(/"\s+(?=\/>)/g, "\" "); // spaces between the last attribute and tag close (/>) - xml = xml.replace(/[^ <>="]\s+[^ <>="]+=/g, (match: string) => { // spaces between the node name and the first attribute - return match.replace(/\s+/g, " "); - }); - - return xml; - } - - private _getIndent(level: number, trailingValue?: string): string { - trailingValue = trailingValue || ""; - - return `${this.newLine}${this.indentPattern.repeat(level)}${trailingValue}`; - } - - private _stripLineBreaks(xml: string): string { - let output: string = ""; - let inTag: boolean = false; - let inTagName: boolean = false; - let inCdata: boolean = false; - let inAttribute: boolean = false; - - for (let i = 0; i < xml.length; i++) { - let char: string = xml.charAt(i); - let prev: string = xml.charAt(i - 1); - let next: string = xml.charAt(i + 1); - - if (char == "!" && (xml.substr(i, 8) == "![CDATA[" || xml.substr(i, 3) == "!--")) { - inCdata = true; - } - - else if (char == "]" && (xml.substr(i, 3) == "]]>")) { - inCdata = false; - } - - else if (char == "-" && (xml.substr(i, 3) == "-->")) { - inCdata = false; - } - - else if (char.search(/[\r\n]/g) > -1 && !inCdata) { - if (/\r/.test(char) && /\S|\r|\n/.test(prev) && /\S|\r|\n/.test(xml.charAt(i + this.newLine.length))) { - output += char; - } - - else if (/\n/.test(char) && /\S|\r|\n/.test(xml.charAt(i - this.newLine.length)) && /\S|\r|\n/.test(next)) { - output += char; - } - - continue; - } - - output += char; - } - - return output; - } -} - -export interface IXmlFormatterOptions { - preferSpaces?: boolean; - tabSize?: number; - newLine?: string; - splitNamespaces?: boolean; -} \ No newline at end of file diff --git a/src/utils/RangeUtil.ts b/src/utils/RangeUtil.ts deleted file mode 100644 index b51b412..0000000 --- a/src/utils/RangeUtil.ts +++ /dev/null @@ -1,11 +0,0 @@ -import * as vsc from "vscode"; - -export class RangeUtil { - static getRangeForDocument(document: vsc.TextDocument): vsc.Range { - let lastLineIndex = (document.lineCount - 1); - let range = new vsc.Range(new vsc.Position(0, 0), new vsc.Position(lastLineIndex, Number.MAX_VALUE)); - - range = document.validateRange(range); - return range; - } -} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json deleted file mode 100644 index 86070fc..0000000 --- a/tsconfig.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "compilerOptions": { - "module": "commonjs", - "moduleResolution": "node", - "noImplicitAny": true, - "removeComments": true, - "target": "es6" - }, - - "exclude": [ - "node_modules" - ] -} \ No newline at end of file diff --git a/typings/node/node.d.ts b/typings/node/node.d.ts deleted file mode 100644 index 3cd67ca..0000000 --- a/typings/node/node.d.ts +++ /dev/null @@ -1,2088 +0,0 @@ -// Type definitions for Node.js v4.x -// Project: http://nodejs.org/ -// Definitions by: Microsoft TypeScript , DefinitelyTyped -// Definitions: https://github.com/borisyankov/DefinitelyTyped - -/************************************************ -* * -* Node.js v4.x API * -* * -************************************************/ - -interface Error { - stack?: string; -} - - -// compat for TypeScript 1.5.3 -// if you use with --target es3 or --target es5 and use below definitions, -// use the lib.es6.d.ts that is bundled with TypeScript 1.5.3. -interface MapConstructor {} -interface WeakMapConstructor {} -interface SetConstructor {} -interface WeakSetConstructor {} - -/************************************************ -* * -* GLOBAL * -* * -************************************************/ -declare var process: NodeJS.Process; -declare var global: NodeJS.Global; - -declare var __filename: string; -declare var __dirname: string; - -declare function setTimeout(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer; -declare function clearTimeout(timeoutId: NodeJS.Timer): void; -declare function setInterval(callback: (...args: any[]) => void, ms: number, ...args: any[]): NodeJS.Timer; -declare function clearInterval(intervalId: NodeJS.Timer): void; -declare function setImmediate(callback: (...args: any[]) => void, ...args: any[]): any; -declare function clearImmediate(immediateId: any): void; - -interface NodeRequireFunction { - (id: string): any; -} - -interface NodeRequire extends NodeRequireFunction { - resolve(id:string): string; - cache: any; - extensions: any; - main: any; -} - -declare var require: NodeRequire; - -interface NodeModule { - exports: any; - require: NodeRequireFunction; - id: string; - filename: string; - loaded: boolean; - parent: any; - children: any[]; -} - -declare var module: NodeModule; - -// Same as module.exports -declare var exports: any; -declare var SlowBuffer: { - new (str: string, encoding?: string): Buffer; - new (size: number): Buffer; - new (size: Uint8Array): Buffer; - new (array: any[]): Buffer; - prototype: Buffer; - isBuffer(obj: any): boolean; - byteLength(string: string, encoding?: string): number; - concat(list: Buffer[], totalLength?: number): Buffer; -}; - - -// Buffer class -interface Buffer extends NodeBuffer {} - -/** - * Raw data is stored in instances of the Buffer class. - * A Buffer is similar to an array of integers but corresponds to a raw memory allocation outside the V8 heap. A Buffer cannot be resized. - * Valid string encodings: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex' - */ -declare var Buffer: { - /** - * Allocates a new buffer containing the given {str}. - * - * @param str String to store in buffer. - * @param encoding encoding to use, optional. Default is 'utf8' - */ - new (str: string, encoding?: string): Buffer; - /** - * Allocates a new buffer of {size} octets. - * - * @param size count of octets to allocate. - */ - new (size: number): Buffer; - /** - * Allocates a new buffer containing the given {array} of octets. - * - * @param array The octets to store. - */ - new (array: Uint8Array): Buffer; - /** - * Allocates a new buffer containing the given {array} of octets. - * - * @param array The octets to store. - */ - new (array: any[]): Buffer; - prototype: Buffer; - /** - * Returns true if {obj} is a Buffer - * - * @param obj object to test. - */ - isBuffer(obj: any): obj is Buffer; - /** - * Returns true if {encoding} is a valid encoding argument. - * Valid string encodings in Node 0.12: 'ascii'|'utf8'|'utf16le'|'ucs2'(alias of 'utf16le')|'base64'|'binary'(deprecated)|'hex' - * - * @param encoding string to test. - */ - isEncoding(encoding: string): boolean; - /** - * Gives the actual byte length of a string. encoding defaults to 'utf8'. - * This is not the same as String.prototype.length since that returns the number of characters in a string. - * - * @param string string to test. - * @param encoding encoding used to evaluate (defaults to 'utf8') - */ - byteLength(string: string, encoding?: string): number; - /** - * Returns a buffer which is the result of concatenating all the buffers in the list together. - * - * If the list has no items, or if the totalLength is 0, then it returns a zero-length buffer. - * If the list has exactly one item, then the first item of the list is returned. - * If the list has more than one item, then a new Buffer is created. - * - * @param list An array of Buffer objects to concatenate - * @param totalLength Total length of the buffers when concatenated. - * If totalLength is not provided, it is read from the buffers in the list. However, this adds an additional loop to the function, so it is faster to provide the length explicitly. - */ - concat(list: Buffer[], totalLength?: number): Buffer; - /** - * The same as buf1.compare(buf2). - */ - compare(buf1: Buffer, buf2: Buffer): number; -}; - -/************************************************ -* * -* GLOBAL INTERFACES * -* * -************************************************/ -declare module NodeJS { - export interface ErrnoException extends Error { - errno?: number; - code?: string; - path?: string; - syscall?: string; - stack?: string; - } - - export interface EventEmitter { - addListener(event: string, listener: Function): EventEmitter; - on(event: string, listener: Function): EventEmitter; - once(event: string, listener: Function): EventEmitter; - removeListener(event: string, listener: Function): EventEmitter; - removeAllListeners(event?: string): EventEmitter; - setMaxListeners(n: number): void; - listeners(event: string): Function[]; - emit(event: string, ...args: any[]): boolean; - } - - export interface ReadableStream extends EventEmitter { - readable: boolean; - read(size?: number): string|Buffer; - setEncoding(encoding: string): void; - pause(): void; - resume(): void; - pipe(destination: T, options?: { end?: boolean; }): T; - unpipe(destination?: T): void; - unshift(chunk: string): void; - unshift(chunk: Buffer): void; - wrap(oldStream: ReadableStream): ReadableStream; - } - - export interface WritableStream extends EventEmitter { - writable: boolean; - write(buffer: Buffer|string, cb?: Function): boolean; - write(str: string, encoding?: string, cb?: Function): boolean; - end(): void; - end(buffer: Buffer, cb?: Function): void; - end(str: string, cb?: Function): void; - end(str: string, encoding?: string, cb?: Function): void; - } - - export interface ReadWriteStream extends ReadableStream, WritableStream {} - - export interface Process extends EventEmitter { - stdout: WritableStream; - stderr: WritableStream; - stdin: ReadableStream; - argv: string[]; - execPath: string; - abort(): void; - chdir(directory: string): void; - cwd(): string; - env: any; - exit(code?: number): void; - getgid(): number; - setgid(id: number): void; - setgid(id: string): void; - getuid(): number; - setuid(id: number): void; - setuid(id: string): void; - version: string; - versions: { - http_parser: string; - node: string; - v8: string; - ares: string; - uv: string; - zlib: string; - openssl: string; - }; - config: { - target_defaults: { - cflags: any[]; - default_configuration: string; - defines: string[]; - include_dirs: string[]; - libraries: string[]; - }; - variables: { - clang: number; - host_arch: string; - node_install_npm: boolean; - node_install_waf: boolean; - node_prefix: string; - node_shared_openssl: boolean; - node_shared_v8: boolean; - node_shared_zlib: boolean; - node_use_dtrace: boolean; - node_use_etw: boolean; - node_use_openssl: boolean; - target_arch: string; - v8_no_strict_aliasing: number; - v8_use_snapshot: boolean; - visibility: string; - }; - }; - kill(pid: number, signal?: string): void; - pid: number; - title: string; - arch: string; - platform: string; - memoryUsage(): { rss: number; heapTotal: number; heapUsed: number; }; - nextTick(callback: Function): void; - umask(mask?: number): number; - uptime(): number; - hrtime(time?:number[]): number[]; - - // Worker - send?(message: any, sendHandle?: any): void; - } - - export interface Global { - Array: typeof Array; - ArrayBuffer: typeof ArrayBuffer; - Boolean: typeof Boolean; - Buffer: typeof Buffer; - DataView: typeof DataView; - Date: typeof Date; - Error: typeof Error; - EvalError: typeof EvalError; - Float32Array: typeof Float32Array; - Float64Array: typeof Float64Array; - Function: typeof Function; - GLOBAL: Global; - Infinity: typeof Infinity; - Int16Array: typeof Int16Array; - Int32Array: typeof Int32Array; - Int8Array: typeof Int8Array; - Intl: typeof Intl; - JSON: typeof JSON; - Map: MapConstructor; - Math: typeof Math; - NaN: typeof NaN; - Number: typeof Number; - Object: typeof Object; - Promise: Function; - RangeError: typeof RangeError; - ReferenceError: typeof ReferenceError; - RegExp: typeof RegExp; - Set: SetConstructor; - String: typeof String; - Symbol: Function; - SyntaxError: typeof SyntaxError; - TypeError: typeof TypeError; - URIError: typeof URIError; - Uint16Array: typeof Uint16Array; - Uint32Array: typeof Uint32Array; - Uint8Array: typeof Uint8Array; - Uint8ClampedArray: Function; - WeakMap: WeakMapConstructor; - WeakSet: WeakSetConstructor; - clearImmediate: (immediateId: any) => void; - clearInterval: (intervalId: NodeJS.Timer) => void; - clearTimeout: (timeoutId: NodeJS.Timer) => void; - console: typeof console; - decodeURI: typeof decodeURI; - decodeURIComponent: typeof decodeURIComponent; - encodeURI: typeof encodeURI; - encodeURIComponent: typeof encodeURIComponent; - escape: (str: string) => string; - eval: typeof eval; - global: Global; - isFinite: typeof isFinite; - isNaN: typeof isNaN; - parseFloat: typeof parseFloat; - parseInt: typeof parseInt; - process: Process; - root: Global; - setImmediate: (callback: (...args: any[]) => void, ...args: any[]) => any; - setInterval: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer; - setTimeout: (callback: (...args: any[]) => void, ms: number, ...args: any[]) => NodeJS.Timer; - undefined: typeof undefined; - unescape: (str: string) => string; - gc: () => void; - v8debug?: any; - } - - export interface Timer { - ref() : void; - unref() : void; - } -} - -/** - * @deprecated - */ -interface NodeBuffer { - [index: number]: number; - write(string: string, offset?: number, length?: number, encoding?: string): number; - toString(encoding?: string, start?: number, end?: number): string; - toJSON(): any; - length: number; - equals(otherBuffer: Buffer): boolean; - compare(otherBuffer: Buffer): number; - copy(targetBuffer: Buffer, targetStart?: number, sourceStart?: number, sourceEnd?: number): number; - slice(start?: number, end?: number): Buffer; - writeUIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number; - writeUIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number; - writeIntLE(value: number, offset: number, byteLength: number, noAssert?: boolean): number; - writeIntBE(value: number, offset: number, byteLength: number, noAssert?: boolean): number; - readUIntLE(offset: number, byteLength: number, noAssert?: boolean): number; - readUIntBE(offset: number, byteLength: number, noAssert?: boolean): number; - readIntLE(offset: number, byteLength: number, noAssert?: boolean): number; - readIntBE(offset: number, byteLength: number, noAssert?: boolean): number; - readUInt8(offset: number, noAsset?: boolean): number; - readUInt16LE(offset: number, noAssert?: boolean): number; - readUInt16BE(offset: number, noAssert?: boolean): number; - readUInt32LE(offset: number, noAssert?: boolean): number; - readUInt32BE(offset: number, noAssert?: boolean): number; - readInt8(offset: number, noAssert?: boolean): number; - readInt16LE(offset: number, noAssert?: boolean): number; - readInt16BE(offset: number, noAssert?: boolean): number; - readInt32LE(offset: number, noAssert?: boolean): number; - readInt32BE(offset: number, noAssert?: boolean): number; - readFloatLE(offset: number, noAssert?: boolean): number; - readFloatBE(offset: number, noAssert?: boolean): number; - readDoubleLE(offset: number, noAssert?: boolean): number; - readDoubleBE(offset: number, noAssert?: boolean): number; - writeUInt8(value: number, offset: number, noAssert?: boolean): number; - writeUInt16LE(value: number, offset: number, noAssert?: boolean): number; - writeUInt16BE(value: number, offset: number, noAssert?: boolean): number; - writeUInt32LE(value: number, offset: number, noAssert?: boolean): number; - writeUInt32BE(value: number, offset: number, noAssert?: boolean): number; - writeInt8(value: number, offset: number, noAssert?: boolean): number; - writeInt16LE(value: number, offset: number, noAssert?: boolean): number; - writeInt16BE(value: number, offset: number, noAssert?: boolean): number; - writeInt32LE(value: number, offset: number, noAssert?: boolean): number; - writeInt32BE(value: number, offset: number, noAssert?: boolean): number; - writeFloatLE(value: number, offset: number, noAssert?: boolean): number; - writeFloatBE(value: number, offset: number, noAssert?: boolean): number; - writeDoubleLE(value: number, offset: number, noAssert?: boolean): number; - writeDoubleBE(value: number, offset: number, noAssert?: boolean): number; - fill(value: any, offset?: number, end?: number): Buffer; -} - -/************************************************ -* * -* MODULES * -* * -************************************************/ -declare module "buffer" { - export var INSPECT_MAX_BYTES: number; -} - -declare module "querystring" { - export function stringify(obj: any, sep?: string, eq?: string): string; - export function parse(str: string, sep?: string, eq?: string, options?: { maxKeys?: number; }): any; - export function escape(str: string): string; - export function unescape(str: string): string; -} - -declare module "events" { - export class EventEmitter implements NodeJS.EventEmitter { - static listenerCount(emitter: EventEmitter, event: string): number; - - addListener(event: string, listener: Function): EventEmitter; - on(event: string, listener: Function): EventEmitter; - once(event: string, listener: Function): EventEmitter; - removeListener(event: string, listener: Function): EventEmitter; - removeAllListeners(event?: string): EventEmitter; - setMaxListeners(n: number): void; - listeners(event: string): Function[]; - emit(event: string, ...args: any[]): boolean; - } -} - -declare module "http" { - import * as events from "events"; - import * as net from "net"; - import * as stream from "stream"; - - export interface RequestOptions { - protocol?: string; - host?: string; - hostname?: string; - family?: number; - port?: number - localAddress?: string; - socketPath?: string; - method?: string; - path?: string; - headers?: { [key: string]: any }; - auth?: string; - agent?: Agent; - } - - export interface Server extends events.EventEmitter { - listen(port: number, hostname?: string, backlog?: number, callback?: Function): Server; - listen(port: number, hostname?: string, callback?: Function): Server; - listen(path: string, callback?: Function): Server; - listen(handle: any, listeningListener?: Function): Server; - close(cb?: any): Server; - address(): { port: number; family: string; address: string; }; - maxHeadersCount: number; - } - /** - * @deprecated Use IncomingMessage - */ - export interface ServerRequest extends IncomingMessage { - connection: net.Socket; - } - export interface ServerResponse extends events.EventEmitter, stream.Writable { - // Extended base methods - write(buffer: Buffer): boolean; - write(buffer: Buffer, cb?: Function): boolean; - write(str: string, cb?: Function): boolean; - write(str: string, encoding?: string, cb?: Function): boolean; - write(str: string, encoding?: string, fd?: string): boolean; - - writeContinue(): void; - writeHead(statusCode: number, reasonPhrase?: string, headers?: any): void; - writeHead(statusCode: number, headers?: any): void; - statusCode: number; - statusMessage: string; - setHeader(name: string, value: string): void; - sendDate: boolean; - getHeader(name: string): string; - removeHeader(name: string): void; - write(chunk: any, encoding?: string): any; - addTrailers(headers: any): void; - - // Extended base methods - end(): void; - end(buffer: Buffer, cb?: Function): void; - end(str: string, cb?: Function): void; - end(str: string, encoding?: string, cb?: Function): void; - end(data?: any, encoding?: string): void; - } - export interface ClientRequest extends events.EventEmitter, stream.Writable { - // Extended base methods - write(buffer: Buffer): boolean; - write(buffer: Buffer, cb?: Function): boolean; - write(str: string, cb?: Function): boolean; - write(str: string, encoding?: string, cb?: Function): boolean; - write(str: string, encoding?: string, fd?: string): boolean; - - write(chunk: any, encoding?: string): void; - abort(): void; - setTimeout(timeout: number, callback?: Function): void; - setNoDelay(noDelay?: boolean): void; - setSocketKeepAlive(enable?: boolean, initialDelay?: number): void; - - // Extended base methods - end(): void; - end(buffer: Buffer, cb?: Function): void; - end(str: string, cb?: Function): void; - end(str: string, encoding?: string, cb?: Function): void; - end(data?: any, encoding?: string): void; - } - export interface IncomingMessage extends events.EventEmitter, stream.Readable { - httpVersion: string; - headers: any; - rawHeaders: string[]; - trailers: any; - rawTrailers: any; - setTimeout(msecs: number, callback: Function): NodeJS.Timer; - /** - * Only valid for request obtained from http.Server. - */ - method?: string; - /** - * Only valid for request obtained from http.Server. - */ - url?: string; - /** - * Only valid for response obtained from http.ClientRequest. - */ - statusCode?: number; - /** - * Only valid for response obtained from http.ClientRequest. - */ - statusMessage?: string; - socket: net.Socket; - } - /** - * @deprecated Use IncomingMessage - */ - export interface ClientResponse extends IncomingMessage { } - - export interface AgentOptions { - /** - * Keep sockets around in a pool to be used by other requests in the future. Default = false - */ - keepAlive?: boolean; - /** - * When using HTTP KeepAlive, how often to send TCP KeepAlive packets over sockets being kept alive. Default = 1000. - * Only relevant if keepAlive is set to true. - */ - keepAliveMsecs?: number; - /** - * Maximum number of sockets to allow per host. Default for Node 0.10 is 5, default for Node 0.12 is Infinity - */ - maxSockets?: number; - /** - * Maximum number of sockets to leave open in a free state. Only relevant if keepAlive is set to true. Default = 256. - */ - maxFreeSockets?: number; - } - - export class Agent { - maxSockets: number; - sockets: any; - requests: any; - - constructor(opts?: AgentOptions); - - /** - * Destroy any sockets that are currently in use by the agent. - * It is usually not necessary to do this. However, if you are using an agent with KeepAlive enabled, - * then it is best to explicitly shut down the agent when you know that it will no longer be used. Otherwise, - * sockets may hang open for quite a long time before the server terminates them. - */ - destroy(): void; - } - - export var METHODS: string[]; - - export var STATUS_CODES: { - [errorCode: number]: string; - [errorCode: string]: string; - }; - export function createServer(requestListener?: (request: IncomingMessage, response: ServerResponse) =>void ): Server; - export function createClient(port?: number, host?: string): any; - export function request(options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest; - export function get(options: any, callback?: (res: IncomingMessage) => void): ClientRequest; - export var globalAgent: Agent; -} - -declare module "cluster" { - import * as child from "child_process"; - import * as events from "events"; - - export interface ClusterSettings { - exec?: string; - args?: string[]; - silent?: boolean; - } - - export class Worker extends events.EventEmitter { - id: string; - process: child.ChildProcess; - suicide: boolean; - send(message: any, sendHandle?: any): void; - kill(signal?: string): void; - destroy(signal?: string): void; - disconnect(): void; - } - - export var settings: ClusterSettings; - export var isMaster: boolean; - export var isWorker: boolean; - export function setupMaster(settings?: ClusterSettings): void; - export function fork(env?: any): Worker; - export function disconnect(callback?: Function): void; - export var worker: Worker; - export var workers: Worker[]; - - // Event emitter - export function addListener(event: string, listener: Function): void; - export function on(event: string, listener: Function): any; - export function once(event: string, listener: Function): void; - export function removeListener(event: string, listener: Function): void; - export function removeAllListeners(event?: string): void; - export function setMaxListeners(n: number): void; - export function listeners(event: string): Function[]; - export function emit(event: string, ...args: any[]): boolean; -} - -declare module "zlib" { - import * as stream from "stream"; - export interface ZlibOptions { chunkSize?: number; windowBits?: number; level?: number; memLevel?: number; strategy?: number; dictionary?: any; } - - export interface Gzip extends stream.Transform { } - export interface Gunzip extends stream.Transform { } - export interface Deflate extends stream.Transform { } - export interface Inflate extends stream.Transform { } - export interface DeflateRaw extends stream.Transform { } - export interface InflateRaw extends stream.Transform { } - export interface Unzip extends stream.Transform { } - - export function createGzip(options?: ZlibOptions): Gzip; - export function createGunzip(options?: ZlibOptions): Gunzip; - export function createDeflate(options?: ZlibOptions): Deflate; - export function createInflate(options?: ZlibOptions): Inflate; - export function createDeflateRaw(options?: ZlibOptions): DeflateRaw; - export function createInflateRaw(options?: ZlibOptions): InflateRaw; - export function createUnzip(options?: ZlibOptions): Unzip; - - export function deflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void; - export function deflateSync(buf: Buffer, options?: ZlibOptions): any; - export function deflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void; - export function deflateRawSync(buf: Buffer, options?: ZlibOptions): any; - export function gzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void; - export function gzipSync(buf: Buffer, options?: ZlibOptions): any; - export function gunzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void; - export function gunzipSync(buf: Buffer, options?: ZlibOptions): any; - export function inflate(buf: Buffer, callback: (error: Error, result: any) =>void ): void; - export function inflateSync(buf: Buffer, options?: ZlibOptions): any; - export function inflateRaw(buf: Buffer, callback: (error: Error, result: any) =>void ): void; - export function inflateRawSync(buf: Buffer, options?: ZlibOptions): any; - export function unzip(buf: Buffer, callback: (error: Error, result: any) =>void ): void; - export function unzipSync(buf: Buffer, options?: ZlibOptions): any; - - // Constants - export var Z_NO_FLUSH: number; - export var Z_PARTIAL_FLUSH: number; - export var Z_SYNC_FLUSH: number; - export var Z_FULL_FLUSH: number; - export var Z_FINISH: number; - export var Z_BLOCK: number; - export var Z_TREES: number; - export var Z_OK: number; - export var Z_STREAM_END: number; - export var Z_NEED_DICT: number; - export var Z_ERRNO: number; - export var Z_STREAM_ERROR: number; - export var Z_DATA_ERROR: number; - export var Z_MEM_ERROR: number; - export var Z_BUF_ERROR: number; - export var Z_VERSION_ERROR: number; - export var Z_NO_COMPRESSION: number; - export var Z_BEST_SPEED: number; - export var Z_BEST_COMPRESSION: number; - export var Z_DEFAULT_COMPRESSION: number; - export var Z_FILTERED: number; - export var Z_HUFFMAN_ONLY: number; - export var Z_RLE: number; - export var Z_FIXED: number; - export var Z_DEFAULT_STRATEGY: number; - export var Z_BINARY: number; - export var Z_TEXT: number; - export var Z_ASCII: number; - export var Z_UNKNOWN: number; - export var Z_DEFLATED: number; - export var Z_NULL: number; -} - -declare module "os" { - export function tmpdir(): string; - export function hostname(): string; - export function type(): string; - export function platform(): string; - export function arch(): string; - export function release(): string; - export function uptime(): number; - export function loadavg(): number[]; - export function totalmem(): number; - export function freemem(): number; - export function cpus(): { model: string; speed: number; times: { user: number; nice: number; sys: number; idle: number; irq: number; }; }[]; - export function networkInterfaces(): any; - export var EOL: string; -} - -declare module "https" { - import * as tls from "tls"; - import * as events from "events"; - import * as http from "http"; - - export interface ServerOptions { - pfx?: any; - key?: any; - passphrase?: string; - cert?: any; - ca?: any; - crl?: any; - ciphers?: string; - honorCipherOrder?: boolean; - requestCert?: boolean; - rejectUnauthorized?: boolean; - NPNProtocols?: any; - SNICallback?: (servername: string) => any; - } - - export interface RequestOptions extends http.RequestOptions{ - pfx?: any; - key?: any; - passphrase?: string; - cert?: any; - ca?: any; - ciphers?: string; - rejectUnauthorized?: boolean; - secureProtocol?: string; - } - - export interface Agent { - maxSockets: number; - sockets: any; - requests: any; - } - export var Agent: { - new (options?: RequestOptions): Agent; - }; - export interface Server extends tls.Server { } - export function createServer(options: ServerOptions, requestListener?: Function): Server; - export function request(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest; - export function get(options: RequestOptions, callback?: (res: http.IncomingMessage) =>void ): http.ClientRequest; - export var globalAgent: Agent; -} - -declare module "punycode" { - export function decode(string: string): string; - export function encode(string: string): string; - export function toUnicode(domain: string): string; - export function toASCII(domain: string): string; - export var ucs2: ucs2; - interface ucs2 { - decode(string: string): number[]; - encode(codePoints: number[]): string; - } - export var version: any; -} - -declare module "repl" { - import * as stream from "stream"; - import * as events from "events"; - - export interface ReplOptions { - prompt?: string; - input?: NodeJS.ReadableStream; - output?: NodeJS.WritableStream; - terminal?: boolean; - eval?: Function; - useColors?: boolean; - useGlobal?: boolean; - ignoreUndefined?: boolean; - writer?: Function; - } - export function start(options: ReplOptions): events.EventEmitter; -} - -declare module "readline" { - import * as events from "events"; - import * as stream from "stream"; - - export interface ReadLine extends events.EventEmitter { - setPrompt(prompt: string): void; - prompt(preserveCursor?: boolean): void; - question(query: string, callback: Function): void; - pause(): void; - resume(): void; - close(): void; - write(data: any, key?: any): void; - } - export interface ReadLineOptions { - input: NodeJS.ReadableStream; - output: NodeJS.WritableStream; - completer?: Function; - terminal?: boolean; - } - export function createInterface(options: ReadLineOptions): ReadLine; -} - -declare module "vm" { - export interface Context { } - export interface Script { - runInThisContext(): void; - runInNewContext(sandbox?: Context): void; - } - export function runInThisContext(code: string, filename?: string): void; - export function runInNewContext(code: string, sandbox?: Context, filename?: string): void; - export function runInContext(code: string, context: Context, filename?: string): void; - export function createContext(initSandbox?: Context): Context; - export function createScript(code: string, filename?: string): Script; -} - -declare module "child_process" { - import * as events from "events"; - import * as stream from "stream"; - - export interface ChildProcess extends events.EventEmitter { - stdin: stream.Writable; - stdout: stream.Readable; - stderr: stream.Readable; - pid: number; - kill(signal?: string): void; - send(message: any, sendHandle?: any): void; - disconnect(): void; - unref(): void; - } - - export function spawn(command: string, args?: string[], options?: { - cwd?: string; - stdio?: any; - custom?: any; - env?: any; - detached?: boolean; - }): ChildProcess; - export function exec(command: string, options: { - cwd?: string; - stdio?: any; - customFds?: any; - env?: any; - encoding?: string; - timeout?: number; - maxBuffer?: number; - killSignal?: string; - }, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess; - export function exec(command: string, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess; - export function execFile(file: string, - callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess; - export function execFile(file: string, args?: string[], - callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess; - export function execFile(file: string, args?: string[], options?: { - cwd?: string; - stdio?: any; - customFds?: any; - env?: any; - encoding?: string; - timeout?: number; - maxBuffer?: number; - killSignal?: string; - }, callback?: (error: Error, stdout: Buffer, stderr: Buffer) =>void ): ChildProcess; - export function fork(modulePath: string, args?: string[], options?: { - cwd?: string; - env?: any; - encoding?: string; - }): ChildProcess; - export function spawnSync(command: string, args?: string[], options?: { - cwd?: string; - input?: string | Buffer; - stdio?: any; - env?: any; - uid?: number; - gid?: number; - timeout?: number; - maxBuffer?: number; - killSignal?: string; - encoding?: string; - }): { - pid: number; - output: string[]; - stdout: string | Buffer; - stderr: string | Buffer; - status: number; - signal: string; - error: Error; - }; - export function execSync(command: string, options?: { - cwd?: string; - input?: string|Buffer; - stdio?: any; - env?: any; - uid?: number; - gid?: number; - timeout?: number; - maxBuffer?: number; - killSignal?: string; - encoding?: string; - }): string | Buffer; - export function execFileSync(command: string, args?: string[], options?: { - cwd?: string; - input?: string|Buffer; - stdio?: any; - env?: any; - uid?: number; - gid?: number; - timeout?: number; - maxBuffer?: number; - killSignal?: string; - encoding?: string; - }): string | Buffer; -} - -declare module "url" { - export interface Url { - href?: string; - protocol?: string; - auth?: string; - hostname?: string; - port?: string; - host?: string; - pathname?: string; - search?: string; - query?: any; // string | Object - slashes?: boolean; - hash?: string; - path?: string; - } - - export function parse(urlStr: string, parseQueryString?: boolean , slashesDenoteHost?: boolean ): Url; - export function format(url: Url): string; - export function resolve(from: string, to: string): string; -} - -declare module "dns" { - export function lookup(domain: string, family: number, callback: (err: Error, address: string, family: number) =>void ): string; - export function lookup(domain: string, callback: (err: Error, address: string, family: number) =>void ): string; - export function resolve(domain: string, rrtype: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function resolve(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function resolve4(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function resolve6(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function resolveMx(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function resolveTxt(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function resolveSrv(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function resolveNs(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function resolveCname(domain: string, callback: (err: Error, addresses: string[]) =>void ): string[]; - export function reverse(ip: string, callback: (err: Error, domains: string[]) =>void ): string[]; -} - -declare module "net" { - import * as stream from "stream"; - - export interface Socket extends stream.Duplex { - // Extended base methods - write(buffer: Buffer): boolean; - write(buffer: Buffer, cb?: Function): boolean; - write(str: string, cb?: Function): boolean; - write(str: string, encoding?: string, cb?: Function): boolean; - write(str: string, encoding?: string, fd?: string): boolean; - - connect(port: number, host?: string, connectionListener?: Function): void; - connect(path: string, connectionListener?: Function): void; - bufferSize: number; - setEncoding(encoding?: string): void; - write(data: any, encoding?: string, callback?: Function): void; - destroy(): void; - pause(): void; - resume(): void; - setTimeout(timeout: number, callback?: Function): void; - setNoDelay(noDelay?: boolean): void; - setKeepAlive(enable?: boolean, initialDelay?: number): void; - address(): { port: number; family: string; address: string; }; - unref(): void; - ref(): void; - - remoteAddress: string; - remoteFamily: string; - remotePort: number; - localAddress: string; - localPort: number; - bytesRead: number; - bytesWritten: number; - - // Extended base methods - end(): void; - end(buffer: Buffer, cb?: Function): void; - end(str: string, cb?: Function): void; - end(str: string, encoding?: string, cb?: Function): void; - end(data?: any, encoding?: string): void; - } - - export var Socket: { - new (options?: { fd?: string; type?: string; allowHalfOpen?: boolean; }): Socket; - }; - - export interface Server extends Socket { - listen(port: number, host?: string, backlog?: number, listeningListener?: Function): Server; - listen(path: string, listeningListener?: Function): Server; - listen(handle: any, listeningListener?: Function): Server; - close(callback?: Function): Server; - address(): { port: number; family: string; address: string; }; - maxConnections: number; - connections: number; - } - export function createServer(connectionListener?: (socket: Socket) =>void ): Server; - export function createServer(options?: { allowHalfOpen?: boolean; }, connectionListener?: (socket: Socket) =>void ): Server; - export function connect(options: { port: number, host?: string, localAddress? : string, localPort? : string, family? : number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket; - export function connect(port: number, host?: string, connectionListener?: Function): Socket; - export function connect(path: string, connectionListener?: Function): Socket; - export function createConnection(options: { port: number, host?: string, localAddress? : string, localPort? : string, family? : number, allowHalfOpen?: boolean; }, connectionListener?: Function): Socket; - export function createConnection(port: number, host?: string, connectionListener?: Function): Socket; - export function createConnection(path: string, connectionListener?: Function): Socket; - export function isIP(input: string): number; - export function isIPv4(input: string): boolean; - export function isIPv6(input: string): boolean; -} - -declare module "dgram" { - import * as events from "events"; - - interface RemoteInfo { - address: string; - port: number; - size: number; - } - - interface AddressInfo { - address: string; - family: string; - port: number; - } - - export function createSocket(type: string, callback?: (msg: Buffer, rinfo: RemoteInfo) => void): Socket; - - interface Socket extends events.EventEmitter { - send(buf: Buffer, offset: number, length: number, port: number, address: string, callback?: (error: Error, bytes: number) => void): void; - bind(port: number, address?: string, callback?: () => void): void; - close(): void; - address(): AddressInfo; - setBroadcast(flag: boolean): void; - setMulticastTTL(ttl: number): void; - setMulticastLoopback(flag: boolean): void; - addMembership(multicastAddress: string, multicastInterface?: string): void; - dropMembership(multicastAddress: string, multicastInterface?: string): void; - } -} - -declare module "fs" { - import * as stream from "stream"; - import * as events from "events"; - - interface Stats { - isFile(): boolean; - isDirectory(): boolean; - isBlockDevice(): boolean; - isCharacterDevice(): boolean; - isSymbolicLink(): boolean; - isFIFO(): boolean; - isSocket(): boolean; - dev: number; - ino: number; - mode: number; - nlink: number; - uid: number; - gid: number; - rdev: number; - size: number; - blksize: number; - blocks: number; - atime: Date; - mtime: Date; - ctime: Date; - birthtime: Date; - } - - interface FSWatcher extends events.EventEmitter { - close(): void; - } - - export interface ReadStream extends stream.Readable { - close(): void; - } - export interface WriteStream extends stream.Writable { - close(): void; - bytesWritten: number; - } - - /** - * Asynchronous rename. - * @param oldPath - * @param newPath - * @param callback No arguments other than a possible exception are given to the completion callback. - */ - export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - /** - * Synchronous rename - * @param oldPath - * @param newPath - */ - export function renameSync(oldPath: string, newPath: string): void; - export function truncate(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function truncate(path: string, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function truncateSync(path: string, len?: number): void; - export function ftruncate(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function ftruncate(fd: number, len: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function ftruncateSync(fd: number, len?: number): void; - export function chown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function chownSync(path: string, uid: number, gid: number): void; - export function fchown(fd: number, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function fchownSync(fd: number, uid: number, gid: number): void; - export function lchown(path: string, uid: number, gid: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function lchownSync(path: string, uid: number, gid: number): void; - export function chmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function chmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function chmodSync(path: string, mode: number): void; - export function chmodSync(path: string, mode: string): void; - export function fchmod(fd: number, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function fchmod(fd: number, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function fchmodSync(fd: number, mode: number): void; - export function fchmodSync(fd: number, mode: string): void; - export function lchmod(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function lchmod(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function lchmodSync(path: string, mode: number): void; - export function lchmodSync(path: string, mode: string): void; - export function stat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void; - export function lstat(path: string, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void; - export function fstat(fd: number, callback?: (err: NodeJS.ErrnoException, stats: Stats) => any): void; - export function statSync(path: string): Stats; - export function lstatSync(path: string): Stats; - export function fstatSync(fd: number): Stats; - export function link(srcpath: string, dstpath: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function linkSync(srcpath: string, dstpath: string): void; - export function symlink(srcpath: string, dstpath: string, type?: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function symlinkSync(srcpath: string, dstpath: string, type?: string): void; - export function readlink(path: string, callback?: (err: NodeJS.ErrnoException, linkString: string) => any): void; - export function readlinkSync(path: string): string; - export function realpath(path: string, callback?: (err: NodeJS.ErrnoException, resolvedPath: string) => any): void; - export function realpath(path: string, cache: {[path: string]: string}, callback: (err: NodeJS.ErrnoException, resolvedPath: string) =>any): void; - export function realpathSync(path: string, cache?: { [path: string]: string }): string; - /* - * Asynchronous unlink - deletes the file specified in {path} - * - * @param path - * @param callback No arguments other than a possible exception are given to the completion callback. - */ - export function unlink(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - /* - * Synchronous unlink - deletes the file specified in {path} - * - * @param path - */ - export function unlinkSync(path: string): void; - /* - * Asynchronous rmdir - removes the directory specified in {path} - * - * @param path - * @param callback No arguments other than a possible exception are given to the completion callback. - */ - export function rmdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - /* - * Synchronous rmdir - removes the directory specified in {path} - * - * @param path - */ - export function rmdirSync(path: string): void; - /* - * Asynchronous mkdir - creates the directory specified in {path}. Parameter {mode} defaults to 0777. - * - * @param path - * @param callback No arguments other than a possible exception are given to the completion callback. - */ - export function mkdir(path: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - /* - * Asynchronous mkdir - creates the directory specified in {path}. Parameter {mode} defaults to 0777. - * - * @param path - * @param mode - * @param callback No arguments other than a possible exception are given to the completion callback. - */ - export function mkdir(path: string, mode: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - /* - * Asynchronous mkdir - creates the directory specified in {path}. Parameter {mode} defaults to 0777. - * - * @param path - * @param mode - * @param callback No arguments other than a possible exception are given to the completion callback. - */ - export function mkdir(path: string, mode: string, callback?: (err?: NodeJS.ErrnoException) => void): void; - /* - * Synchronous mkdir - creates the directory specified in {path}. Parameter {mode} defaults to 0777. - * - * @param path - * @param mode - * @param callback No arguments other than a possible exception are given to the completion callback. - */ - export function mkdirSync(path: string, mode?: number): void; - /* - * Synchronous mkdir - creates the directory specified in {path}. Parameter {mode} defaults to 0777. - * - * @param path - * @param mode - * @param callback No arguments other than a possible exception are given to the completion callback. - */ - export function mkdirSync(path: string, mode?: string): void; - export function readdir(path: string, callback?: (err: NodeJS.ErrnoException, files: string[]) => void): void; - export function readdirSync(path: string): string[]; - export function close(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function closeSync(fd: number): void; - export function open(path: string, flags: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void; - export function open(path: string, flags: string, mode: number, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void; - export function open(path: string, flags: string, mode: string, callback?: (err: NodeJS.ErrnoException, fd: number) => any): void; - export function openSync(path: string, flags: string, mode?: number): number; - export function openSync(path: string, flags: string, mode?: string): number; - export function utimes(path: string, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function utimes(path: string, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function utimesSync(path: string, atime: number, mtime: number): void; - export function utimesSync(path: string, atime: Date, mtime: Date): void; - export function futimes(fd: number, atime: number, mtime: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function futimes(fd: number, atime: Date, mtime: Date, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function futimesSync(fd: number, atime: number, mtime: number): void; - export function futimesSync(fd: number, atime: Date, mtime: Date): void; - export function fsync(fd: number, callback?: (err?: NodeJS.ErrnoException) => void): void; - export function fsyncSync(fd: number): void; - export function write(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void; - export function write(fd: number, buffer: Buffer, offset: number, length: number, callback?: (err: NodeJS.ErrnoException, written: number, buffer: Buffer) => void): void; - export function write(fd: number, data: any, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void; - export function write(fd: number, data: any, offset: number, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void; - export function write(fd: number, data: any, offset: number, encoding: string, callback?: (err: NodeJS.ErrnoException, written: number, str: string) => void): void; - export function writeSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number; - export function read(fd: number, buffer: Buffer, offset: number, length: number, position: number, callback?: (err: NodeJS.ErrnoException, bytesRead: number, buffer: Buffer) => void): void; - export function readSync(fd: number, buffer: Buffer, offset: number, length: number, position: number): number; - /* - * Asynchronous readFile - Asynchronously reads the entire contents of a file. - * - * @param fileName - * @param encoding - * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file. - */ - export function readFile(filename: string, encoding: string, callback: (err: NodeJS.ErrnoException, data: string) => void): void; - /* - * Asynchronous readFile - Asynchronously reads the entire contents of a file. - * - * @param fileName - * @param options An object with optional {encoding} and {flag} properties. If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer. - * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file. - */ - export function readFile(filename: string, options: { encoding: string; flag?: string; }, callback: (err: NodeJS.ErrnoException, data: string) => void): void; - /* - * Asynchronous readFile - Asynchronously reads the entire contents of a file. - * - * @param fileName - * @param options An object with optional {encoding} and {flag} properties. If {encoding} is specified, readFile returns a string; otherwise it returns a Buffer. - * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file. - */ - export function readFile(filename: string, options: { flag?: string; }, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void; - /* - * Asynchronous readFile - Asynchronously reads the entire contents of a file. - * - * @param fileName - * @param callback - The callback is passed two arguments (err, data), where data is the contents of the file. - */ - export function readFile(filename: string, callback: (err: NodeJS.ErrnoException, data: Buffer) => void): void; - /* - * Synchronous readFile - Synchronously reads the entire contents of a file. - * - * @param fileName - * @param encoding - */ - export function readFileSync(filename: string, encoding: string): string; - /* - * Synchronous readFile - Synchronously reads the entire contents of a file. - * - * @param fileName - * @param options An object with optional {encoding} and {flag} properties. If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer. - */ - export function readFileSync(filename: string, options: { encoding: string; flag?: string; }): string; - /* - * Synchronous readFile - Synchronously reads the entire contents of a file. - * - * @param fileName - * @param options An object with optional {encoding} and {flag} properties. If {encoding} is specified, readFileSync returns a string; otherwise it returns a Buffer. - */ - export function readFileSync(filename: string, options?: { flag?: string; }): Buffer; - export function writeFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void; - export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void; - export function writeFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void; - export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void; - export function writeFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void; - export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: number; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void; - export function appendFile(filename: string, data: any, options: { encoding?: string; mode?: string; flag?: string; }, callback?: (err: NodeJS.ErrnoException) => void): void; - export function appendFile(filename: string, data: any, callback?: (err: NodeJS.ErrnoException) => void): void; - export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: number; flag?: string; }): void; - export function appendFileSync(filename: string, data: any, options?: { encoding?: string; mode?: string; flag?: string; }): void; - export function watchFile(filename: string, listener: (curr: Stats, prev: Stats) => void): void; - export function watchFile(filename: string, options: { persistent?: boolean; interval?: number; }, listener: (curr: Stats, prev: Stats) => void): void; - export function unwatchFile(filename: string, listener?: (curr: Stats, prev: Stats) => void): void; - export function watch(filename: string, listener?: (event: string, filename: string) => any): FSWatcher; - export function watch(filename: string, options: { persistent?: boolean; }, listener?: (event: string, filename: string) => any): FSWatcher; - export function exists(path: string, callback?: (exists: boolean) => void): void; - export function existsSync(path: string): boolean; - /** Constant for fs.access(). File is visible to the calling process. */ - export var F_OK: number; - /** Constant for fs.access(). File can be read by the calling process. */ - export var R_OK: number; - /** Constant for fs.access(). File can be written by the calling process. */ - export var W_OK: number; - /** Constant for fs.access(). File can be executed by the calling process. */ - export var X_OK: number; - /** Tests a user's permissions for the file specified by path. */ - export function access(path: string, callback: (err: NodeJS.ErrnoException) => void): void; - export function access(path: string, mode: number, callback: (err: NodeJS.ErrnoException) => void): void; - /** Synchronous version of fs.access. This throws if any accessibility checks fail, and does nothing otherwise. */ - export function accessSync(path: string, mode ?: number): void; - export function createReadStream(path: string, options?: { - flags?: string; - encoding?: string; - fd?: number; - mode?: number; - autoClose?: boolean; - }): ReadStream; - export function createWriteStream(path: string, options?: { - flags?: string; - encoding?: string; - fd?: number; - mode?: number; - }): WriteStream; -} - -declare module "path" { - - /** - * A parsed path object generated by path.parse() or consumed by path.format(). - */ - export interface ParsedPath { - /** - * The root of the path such as '/' or 'c:\' - */ - root: string; - /** - * The full directory path such as '/home/user/dir' or 'c:\path\dir' - */ - dir: string; - /** - * The file name including extension (if any) such as 'index.html' - */ - base: string; - /** - * The file extension (if any) such as '.html' - */ - ext: string; - /** - * The file name without extension (if any) such as 'index' - */ - name: string; - } - - /** - * Normalize a string path, reducing '..' and '.' parts. - * When multiple slashes are found, they're replaced by a single one; when the path contains a trailing slash, it is preserved. On Windows backslashes are used. - * - * @param p string path to normalize. - */ - export function normalize(p: string): string; - /** - * Join all arguments together and normalize the resulting path. - * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown. - * - * @param paths string paths to join. - */ - export function join(...paths: any[]): string; - /** - * Join all arguments together and normalize the resulting path. - * Arguments must be strings. In v0.8, non-string arguments were silently ignored. In v0.10 and up, an exception is thrown. - * - * @param paths string paths to join. - */ - export function join(...paths: string[]): string; - /** - * The right-most parameter is considered {to}. Other parameters are considered an array of {from}. - * - * Starting from leftmost {from} paramter, resolves {to} to an absolute path. - * - * If {to} isn't already absolute, {from} arguments are prepended in right to left order, until an absolute path is found. If after using all {from} paths still no absolute path is found, the current working directory is used as well. The resulting path is normalized, and trailing slashes are removed unless the path gets resolved to the root directory. - * - * @param pathSegments string paths to join. Non-string arguments are ignored. - */ - export function resolve(...pathSegments: any[]): string; - /** - * Determines whether {path} is an absolute path. An absolute path will always resolve to the same location, regardless of the working directory. - * - * @param path path to test. - */ - export function isAbsolute(path: string): boolean; - /** - * Solve the relative path from {from} to {to}. - * At times we have two absolute paths, and we need to derive the relative path from one to the other. This is actually the reverse transform of path.resolve. - * - * @param from - * @param to - */ - export function relative(from: string, to: string): string; - /** - * Return the directory name of a path. Similar to the Unix dirname command. - * - * @param p the path to evaluate. - */ - export function dirname(p: string): string; - /** - * Return the last portion of a path. Similar to the Unix basename command. - * Often used to extract the file name from a fully qualified path. - * - * @param p the path to evaluate. - * @param ext optionally, an extension to remove from the result. - */ - export function basename(p: string, ext?: string): string; - /** - * Return the extension of the path, from the last '.' to end of string in the last portion of the path. - * If there is no '.' in the last portion of the path or the first character of it is '.', then it returns an empty string - * - * @param p the path to evaluate. - */ - export function extname(p: string): string; - /** - * The platform-specific file separator. '\\' or '/'. - */ - export var sep: string; - /** - * The platform-specific file delimiter. ';' or ':'. - */ - export var delimiter: string; - /** - * Returns an object from a path string - the opposite of format(). - * - * @param pathString path to evaluate. - */ - export function parse(pathString: string): ParsedPath; - /** - * Returns a path string from an object - the opposite of parse(). - * - * @param pathString path to evaluate. - */ - export function format(pathObject: ParsedPath): string; - - export module posix { - export function normalize(p: string): string; - export function join(...paths: any[]): string; - export function resolve(...pathSegments: any[]): string; - export function isAbsolute(p: string): boolean; - export function relative(from: string, to: string): string; - export function dirname(p: string): string; - export function basename(p: string, ext?: string): string; - export function extname(p: string): string; - export var sep: string; - export var delimiter: string; - export function parse(p: string): ParsedPath; - export function format(pP: ParsedPath): string; - } - - export module win32 { - export function normalize(p: string): string; - export function join(...paths: any[]): string; - export function resolve(...pathSegments: any[]): string; - export function isAbsolute(p: string): boolean; - export function relative(from: string, to: string): string; - export function dirname(p: string): string; - export function basename(p: string, ext?: string): string; - export function extname(p: string): string; - export var sep: string; - export var delimiter: string; - export function parse(p: string): ParsedPath; - export function format(pP: ParsedPath): string; - } -} - -declare module "string_decoder" { - export interface NodeStringDecoder { - write(buffer: Buffer): string; - detectIncompleteChar(buffer: Buffer): number; - } - export var StringDecoder: { - new (encoding: string): NodeStringDecoder; - }; -} - -declare module "tls" { - import * as crypto from "crypto"; - import * as net from "net"; - import * as stream from "stream"; - - var CLIENT_RENEG_LIMIT: number; - var CLIENT_RENEG_WINDOW: number; - - export interface TlsOptions { - pfx?: any; //string or buffer - key?: any; //string or buffer - passphrase?: string; - cert?: any; - ca?: any; //string or buffer - crl?: any; //string or string array - ciphers?: string; - honorCipherOrder?: any; - requestCert?: boolean; - rejectUnauthorized?: boolean; - NPNProtocols?: any; //array or Buffer; - SNICallback?: (servername: string) => any; - } - - export interface ConnectionOptions { - host?: string; - port?: number; - socket?: net.Socket; - pfx?: any; //string | Buffer - key?: any; //string | Buffer - passphrase?: string; - cert?: any; //string | Buffer - ca?: any; //Array of string | Buffer - rejectUnauthorized?: boolean; - NPNProtocols?: any; //Array of string | Buffer - servername?: string; - } - - export interface Server extends net.Server { - // Extended base methods - listen(port: number, host?: string, backlog?: number, listeningListener?: Function): Server; - listen(path: string, listeningListener?: Function): Server; - listen(handle: any, listeningListener?: Function): Server; - - listen(port: number, host?: string, callback?: Function): Server; - close(): Server; - address(): { port: number; family: string; address: string; }; - addContext(hostName: string, credentials: { - key: string; - cert: string; - ca: string; - }): void; - maxConnections: number; - connections: number; - } - - export interface ClearTextStream extends stream.Duplex { - authorized: boolean; - authorizationError: Error; - getPeerCertificate(): any; - getCipher: { - name: string; - version: string; - }; - address: { - port: number; - family: string; - address: string; - }; - remoteAddress: string; - remotePort: number; - } - - export interface SecurePair { - encrypted: any; - cleartext: any; - } - - export interface SecureContextOptions { - pfx?: any; //string | buffer - key?: any; //string | buffer - passphrase?: string; - cert?: any; // string | buffer - ca?: any; // string | buffer - crl?: any; // string | string[] - ciphers?: string; - honorCipherOrder?: boolean; - } - - export interface SecureContext { - context: any; - } - - export function createServer(options: TlsOptions, secureConnectionListener?: (cleartextStream: ClearTextStream) =>void ): Server; - export function connect(options: TlsOptions, secureConnectionListener?: () =>void ): ClearTextStream; - export function connect(port: number, host?: string, options?: ConnectionOptions, secureConnectListener?: () =>void ): ClearTextStream; - export function connect(port: number, options?: ConnectionOptions, secureConnectListener?: () =>void ): ClearTextStream; - export function createSecurePair(credentials?: crypto.Credentials, isServer?: boolean, requestCert?: boolean, rejectUnauthorized?: boolean): SecurePair; - export function createSecureContext(details: SecureContextOptions): SecureContext; -} - -declare module "crypto" { - export interface CredentialDetails { - pfx: string; - key: string; - passphrase: string; - cert: string; - ca: any; //string | string array - crl: any; //string | string array - ciphers: string; - } - export interface Credentials { context?: any; } - export function createCredentials(details: CredentialDetails): Credentials; - export function createHash(algorithm: string): Hash; - export function createHmac(algorithm: string, key: string): Hmac; - export function createHmac(algorithm: string, key: Buffer): Hmac; - interface Hash { - update(data: any, input_encoding?: string): Hash; - digest(encoding: 'buffer'): Buffer; - digest(encoding: string): any; - digest(): Buffer; - } - interface Hmac { - update(data: any, input_encoding?: string): Hmac; - digest(encoding: 'buffer'): Buffer; - digest(encoding: string): any; - digest(): Buffer; - } - export function createCipher(algorithm: string, password: any): Cipher; - export function createCipheriv(algorithm: string, key: any, iv: any): Cipher; - interface Cipher { - update(data: Buffer): Buffer; - update(data: string, input_encoding?: string, output_encoding?: string): string; - final(): Buffer; - final(output_encoding: string): string; - setAutoPadding(auto_padding: boolean): void; - } - export function createDecipher(algorithm: string, password: any): Decipher; - export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher; - interface Decipher { - update(data: Buffer): Buffer; - update(data: string, input_encoding?: string, output_encoding?: string): string; - final(): Buffer; - final(output_encoding: string): string; - setAutoPadding(auto_padding: boolean): void; - } - export function createSign(algorithm: string): Signer; - interface Signer extends NodeJS.WritableStream { - update(data: any): void; - sign(private_key: string, output_format: string): string; - } - export function createVerify(algorith: string): Verify; - interface Verify extends NodeJS.WritableStream { - update(data: any): void; - verify(object: string, signature: string, signature_format?: string): boolean; - } - export function createDiffieHellman(prime_length: number): DiffieHellman; - export function createDiffieHellman(prime: number, encoding?: string): DiffieHellman; - interface DiffieHellman { - generateKeys(encoding?: string): string; - computeSecret(other_public_key: string, input_encoding?: string, output_encoding?: string): string; - getPrime(encoding?: string): string; - getGenerator(encoding: string): string; - getPublicKey(encoding?: string): string; - getPrivateKey(encoding?: string): string; - setPublicKey(public_key: string, encoding?: string): void; - setPrivateKey(public_key: string, encoding?: string): void; - } - export function getDiffieHellman(group_name: string): DiffieHellman; - export function pbkdf2(password: string, salt: string, iterations: number, keylen: number, callback: (err: Error, derivedKey: Buffer) => any): void; - export function pbkdf2(password: string, salt: string, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void; - export function pbkdf2Sync(password: string, salt: string, iterations: number, keylen: number) : Buffer; - export function pbkdf2Sync(password: string, salt: string, iterations: number, keylen: number, digest: string) : Buffer; - export function randomBytes(size: number): Buffer; - export function randomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void; - export function pseudoRandomBytes(size: number): Buffer; - export function pseudoRandomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void; -} - -declare module "stream" { - import * as events from "events"; - - export interface Stream extends events.EventEmitter { - pipe(destination: T, options?: { end?: boolean; }): T; - } - - export interface ReadableOptions { - highWaterMark?: number; - encoding?: string; - objectMode?: boolean; - } - - export class Readable extends events.EventEmitter implements NodeJS.ReadableStream { - readable: boolean; - constructor(opts?: ReadableOptions); - _read(size: number): void; - read(size?: number): any; - setEncoding(encoding: string): void; - pause(): void; - resume(): void; - pipe(destination: T, options?: { end?: boolean; }): T; - unpipe(destination?: T): void; - unshift(chunk: any): void; - wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream; - push(chunk: any, encoding?: string): boolean; - } - - export interface WritableOptions { - highWaterMark?: number; - decodeStrings?: boolean; - objectMode?: boolean; - } - - export class Writable extends events.EventEmitter implements NodeJS.WritableStream { - writable: boolean; - constructor(opts?: WritableOptions); - _write(chunk: any, encoding: string, callback: Function): void; - write(chunk: any, cb?: Function): boolean; - write(chunk: any, encoding?: string, cb?: Function): boolean; - end(): void; - end(chunk: any, cb?: Function): void; - end(chunk: any, encoding?: string, cb?: Function): void; - } - - export interface DuplexOptions extends ReadableOptions, WritableOptions { - allowHalfOpen?: boolean; - } - - // Note: Duplex extends both Readable and Writable. - export class Duplex extends Readable implements NodeJS.ReadWriteStream { - writable: boolean; - constructor(opts?: DuplexOptions); - _write(chunk: any, encoding: string, callback: Function): void; - write(chunk: any, cb?: Function): boolean; - write(chunk: any, encoding?: string, cb?: Function): boolean; - end(): void; - end(chunk: any, cb?: Function): void; - end(chunk: any, encoding?: string, cb?: Function): void; - } - - export interface TransformOptions extends ReadableOptions, WritableOptions {} - - // Note: Transform lacks the _read and _write methods of Readable/Writable. - export class Transform extends events.EventEmitter implements NodeJS.ReadWriteStream { - readable: boolean; - writable: boolean; - constructor(opts?: TransformOptions); - _transform(chunk: any, encoding: string, callback: Function): void; - _flush(callback: Function): void; - read(size?: number): any; - setEncoding(encoding: string): void; - pause(): void; - resume(): void; - pipe(destination: T, options?: { end?: boolean; }): T; - unpipe(destination?: T): void; - unshift(chunk: any): void; - wrap(oldStream: NodeJS.ReadableStream): NodeJS.ReadableStream; - push(chunk: any, encoding?: string): boolean; - write(chunk: any, cb?: Function): boolean; - write(chunk: any, encoding?: string, cb?: Function): boolean; - end(): void; - end(chunk: any, cb?: Function): void; - end(chunk: any, encoding?: string, cb?: Function): void; - } - - export class PassThrough extends Transform {} -} - -declare module "util" { - export interface InspectOptions { - showHidden?: boolean; - depth?: number; - colors?: boolean; - customInspect?: boolean; - } - - export function format(format: any, ...param: any[]): string; - export function debug(string: string): void; - export function error(...param: any[]): void; - export function puts(...param: any[]): void; - export function print(...param: any[]): void; - export function log(string: string): void; - export function inspect(object: any, showHidden?: boolean, depth?: number, color?: boolean): string; - export function inspect(object: any, options: InspectOptions): string; - export function isArray(object: any): boolean; - export function isRegExp(object: any): boolean; - export function isDate(object: any): boolean; - export function isError(object: any): boolean; - export function inherits(constructor: any, superConstructor: any): void; - export function debuglog(key:string): (msg:string,...param: any[])=>void; -} - -declare module "assert" { - function internal (value: any, message?: string): void; - module internal { - export class AssertionError implements Error { - name: string; - message: string; - actual: any; - expected: any; - operator: string; - generatedMessage: boolean; - - constructor(options?: {message?: string; actual?: any; expected?: any; - operator?: string; stackStartFunction?: Function}); - } - - export function fail(actual?: any, expected?: any, message?: string, operator?: string): void; - export function ok(value: any, message?: string): void; - export function equal(actual: any, expected: any, message?: string): void; - export function notEqual(actual: any, expected: any, message?: string): void; - export function deepEqual(actual: any, expected: any, message?: string): void; - export function notDeepEqual(acutal: any, expected: any, message?: string): void; - export function strictEqual(actual: any, expected: any, message?: string): void; - export function notStrictEqual(actual: any, expected: any, message?: string): void; - export var throws: { - (block: Function, message?: string): void; - (block: Function, error: Function, message?: string): void; - (block: Function, error: RegExp, message?: string): void; - (block: Function, error: (err: any) => boolean, message?: string): void; - }; - - export var doesNotThrow: { - (block: Function, message?: string): void; - (block: Function, error: Function, message?: string): void; - (block: Function, error: RegExp, message?: string): void; - (block: Function, error: (err: any) => boolean, message?: string): void; - }; - - export function ifError(value: any): void; - } - - export = internal; -} - -declare module "tty" { - import * as net from "net"; - - export function isatty(fd: number): boolean; - export interface ReadStream extends net.Socket { - isRaw: boolean; - setRawMode(mode: boolean): void; - } - export interface WriteStream extends net.Socket { - columns: number; - rows: number; - } -} - -declare module "domain" { - import * as events from "events"; - - export class Domain extends events.EventEmitter { - run(fn: Function): void; - add(emitter: events.EventEmitter): void; - remove(emitter: events.EventEmitter): void; - bind(cb: (err: Error, data: any) => any): any; - intercept(cb: (data: any) => any): any; - dispose(): void; - - addListener(event: string, listener: Function): Domain; - on(event: string, listener: Function): Domain; - once(event: string, listener: Function): Domain; - removeListener(event: string, listener: Function): Domain; - removeAllListeners(event?: string): Domain; - } - - export function create(): Domain; -} - -declare module "constants" { - export var E2BIG: number; - export var EACCES: number; - export var EADDRINUSE: number; - export var EADDRNOTAVAIL: number; - export var EAFNOSUPPORT: number; - export var EAGAIN: number; - export var EALREADY: number; - export var EBADF: number; - export var EBADMSG: number; - export var EBUSY: number; - export var ECANCELED: number; - export var ECHILD: number; - export var ECONNABORTED: number; - export var ECONNREFUSED: number; - export var ECONNRESET: number; - export var EDEADLK: number; - export var EDESTADDRREQ: number; - export var EDOM: number; - export var EEXIST: number; - export var EFAULT: number; - export var EFBIG: number; - export var EHOSTUNREACH: number; - export var EIDRM: number; - export var EILSEQ: number; - export var EINPROGRESS: number; - export var EINTR: number; - export var EINVAL: number; - export var EIO: number; - export var EISCONN: number; - export var EISDIR: number; - export var ELOOP: number; - export var EMFILE: number; - export var EMLINK: number; - export var EMSGSIZE: number; - export var ENAMETOOLONG: number; - export var ENETDOWN: number; - export var ENETRESET: number; - export var ENETUNREACH: number; - export var ENFILE: number; - export var ENOBUFS: number; - export var ENODATA: number; - export var ENODEV: number; - export var ENOENT: number; - export var ENOEXEC: number; - export var ENOLCK: number; - export var ENOLINK: number; - export var ENOMEM: number; - export var ENOMSG: number; - export var ENOPROTOOPT: number; - export var ENOSPC: number; - export var ENOSR: number; - export var ENOSTR: number; - export var ENOSYS: number; - export var ENOTCONN: number; - export var ENOTDIR: number; - export var ENOTEMPTY: number; - export var ENOTSOCK: number; - export var ENOTSUP: number; - export var ENOTTY: number; - export var ENXIO: number; - export var EOPNOTSUPP: number; - export var EOVERFLOW: number; - export var EPERM: number; - export var EPIPE: number; - export var EPROTO: number; - export var EPROTONOSUPPORT: number; - export var EPROTOTYPE: number; - export var ERANGE: number; - export var EROFS: number; - export var ESPIPE: number; - export var ESRCH: number; - export var ETIME: number; - export var ETIMEDOUT: number; - export var ETXTBSY: number; - export var EWOULDBLOCK: number; - export var EXDEV: number; - export var WSAEINTR: number; - export var WSAEBADF: number; - export var WSAEACCES: number; - export var WSAEFAULT: number; - export var WSAEINVAL: number; - export var WSAEMFILE: number; - export var WSAEWOULDBLOCK: number; - export var WSAEINPROGRESS: number; - export var WSAEALREADY: number; - export var WSAENOTSOCK: number; - export var WSAEDESTADDRREQ: number; - export var WSAEMSGSIZE: number; - export var WSAEPROTOTYPE: number; - export var WSAENOPROTOOPT: number; - export var WSAEPROTONOSUPPORT: number; - export var WSAESOCKTNOSUPPORT: number; - export var WSAEOPNOTSUPP: number; - export var WSAEPFNOSUPPORT: number; - export var WSAEAFNOSUPPORT: number; - export var WSAEADDRINUSE: number; - export var WSAEADDRNOTAVAIL: number; - export var WSAENETDOWN: number; - export var WSAENETUNREACH: number; - export var WSAENETRESET: number; - export var WSAECONNABORTED: number; - export var WSAECONNRESET: number; - export var WSAENOBUFS: number; - export var WSAEISCONN: number; - export var WSAENOTCONN: number; - export var WSAESHUTDOWN: number; - export var WSAETOOMANYREFS: number; - export var WSAETIMEDOUT: number; - export var WSAECONNREFUSED: number; - export var WSAELOOP: number; - export var WSAENAMETOOLONG: number; - export var WSAEHOSTDOWN: number; - export var WSAEHOSTUNREACH: number; - export var WSAENOTEMPTY: number; - export var WSAEPROCLIM: number; - export var WSAEUSERS: number; - export var WSAEDQUOT: number; - export var WSAESTALE: number; - export var WSAEREMOTE: number; - export var WSASYSNOTREADY: number; - export var WSAVERNOTSUPPORTED: number; - export var WSANOTINITIALISED: number; - export var WSAEDISCON: number; - export var WSAENOMORE: number; - export var WSAECANCELLED: number; - export var WSAEINVALIDPROCTABLE: number; - export var WSAEINVALIDPROVIDER: number; - export var WSAEPROVIDERFAILEDINIT: number; - export var WSASYSCALLFAILURE: number; - export var WSASERVICE_NOT_FOUND: number; - export var WSATYPE_NOT_FOUND: number; - export var WSA_E_NO_MORE: number; - export var WSA_E_CANCELLED: number; - export var WSAEREFUSED: number; - export var SIGHUP: number; - export var SIGINT: number; - export var SIGILL: number; - export var SIGABRT: number; - export var SIGFPE: number; - export var SIGKILL: number; - export var SIGSEGV: number; - export var SIGTERM: number; - export var SIGBREAK: number; - export var SIGWINCH: number; - export var SSL_OP_ALL: number; - export var SSL_OP_ALLOW_UNSAFE_LEGACY_RENEGOTIATION: number; - export var SSL_OP_CIPHER_SERVER_PREFERENCE: number; - export var SSL_OP_CISCO_ANYCONNECT: number; - export var SSL_OP_COOKIE_EXCHANGE: number; - export var SSL_OP_CRYPTOPRO_TLSEXT_BUG: number; - export var SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS: number; - export var SSL_OP_EPHEMERAL_RSA: number; - export var SSL_OP_LEGACY_SERVER_CONNECT: number; - export var SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER: number; - export var SSL_OP_MICROSOFT_SESS_ID_BUG: number; - export var SSL_OP_MSIE_SSLV2_RSA_PADDING: number; - export var SSL_OP_NETSCAPE_CA_DN_BUG: number; - export var SSL_OP_NETSCAPE_CHALLENGE_BUG: number; - export var SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG: number; - export var SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG: number; - export var SSL_OP_NO_COMPRESSION: number; - export var SSL_OP_NO_QUERY_MTU: number; - export var SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION: number; - export var SSL_OP_NO_SSLv2: number; - export var SSL_OP_NO_SSLv3: number; - export var SSL_OP_NO_TICKET: number; - export var SSL_OP_NO_TLSv1: number; - export var SSL_OP_NO_TLSv1_1: number; - export var SSL_OP_NO_TLSv1_2: number; - export var SSL_OP_PKCS1_CHECK_1: number; - export var SSL_OP_PKCS1_CHECK_2: number; - export var SSL_OP_SINGLE_DH_USE: number; - export var SSL_OP_SINGLE_ECDH_USE: number; - export var SSL_OP_SSLEAY_080_CLIENT_DH_BUG: number; - export var SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG: number; - export var SSL_OP_TLS_BLOCK_PADDING_BUG: number; - export var SSL_OP_TLS_D5_BUG: number; - export var SSL_OP_TLS_ROLLBACK_BUG: number; - export var ENGINE_METHOD_DSA: number; - export var ENGINE_METHOD_DH: number; - export var ENGINE_METHOD_RAND: number; - export var ENGINE_METHOD_ECDH: number; - export var ENGINE_METHOD_ECDSA: number; - export var ENGINE_METHOD_CIPHERS: number; - export var ENGINE_METHOD_DIGESTS: number; - export var ENGINE_METHOD_STORE: number; - export var ENGINE_METHOD_PKEY_METHS: number; - export var ENGINE_METHOD_PKEY_ASN1_METHS: number; - export var ENGINE_METHOD_ALL: number; - export var ENGINE_METHOD_NONE: number; - export var DH_CHECK_P_NOT_SAFE_PRIME: number; - export var DH_CHECK_P_NOT_PRIME: number; - export var DH_UNABLE_TO_CHECK_GENERATOR: number; - export var DH_NOT_SUITABLE_GENERATOR: number; - export var NPN_ENABLED: number; - export var RSA_PKCS1_PADDING: number; - export var RSA_SSLV23_PADDING: number; - export var RSA_NO_PADDING: number; - export var RSA_PKCS1_OAEP_PADDING: number; - export var RSA_X931_PADDING: number; - export var RSA_PKCS1_PSS_PADDING: number; - export var POINT_CONVERSION_COMPRESSED: number; - export var POINT_CONVERSION_UNCOMPRESSED: number; - export var POINT_CONVERSION_HYBRID: number; - export var O_RDONLY: number; - export var O_WRONLY: number; - export var O_RDWR: number; - export var S_IFMT: number; - export var S_IFREG: number; - export var S_IFDIR: number; - export var S_IFCHR: number; - export var S_IFLNK: number; - export var O_CREAT: number; - export var O_EXCL: number; - export var O_TRUNC: number; - export var O_APPEND: number; - export var F_OK: number; - export var R_OK: number; - export var W_OK: number; - export var X_OK: number; - export var UV_UDP_REUSEADDR: number; -} \ No newline at end of file diff --git a/typings/thenable/thenable.d.ts b/typings/thenable/thenable.d.ts deleted file mode 100644 index afd2306..0000000 --- a/typings/thenable/thenable.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -declare class Thenable extends Promise { - // shim for vscode's Thenable -} \ No newline at end of file diff --git a/typings/xmldom/xmldom.d.ts b/typings/xmldom/xmldom.d.ts deleted file mode 100644 index 50d852f..0000000 --- a/typings/xmldom/xmldom.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -declare class XmlNode extends Node { - lineNumber: number; - columnNumber: number; -} \ No newline at end of file diff --git a/typings/xpath/xpath.d.ts b/typings/xpath/xpath.d.ts deleted file mode 100644 index 74c39c1..0000000 --- a/typings/xpath/xpath.d.ts +++ /dev/null @@ -1,197 +0,0 @@ -// Type definitions for xpath v0.0.7 -// Project: https://github.com/goto100/xpath -// Definitions by: Andrew Bradley -// Definitions: https://github.com/borisyankov/DefinitelyTyped - -// Some documentation prose is copied from the XPath documentation at https://developer.mozilla.org. - -declare module 'xpath' { - - // select1 can return any of: `Node`, `boolean`, `string`, `number`. - // select and selectWithResolver can return any of the above return types or `Array`. - // For this reason, their return types are `any`. - - interface SelectFn { - /** - * Evaluate an XPath expression against a DOM node. Returns the result as one of the following: - * * Array - * * Node - * * boolean - * * number - * * string - * @param xpathText - * @param contextNode - * @param single If true and the evaluation result is one or more Nodes, will return only the first Node instead of an Array - */ - (xpathText: string, contextNode: Node, single?: boolean): any; - } - - var select: SelectFn; - - /** - * Evaluate an xpath expression against a DOM node, returning the first result only. - * Equivalent to `select(xpathText, contextNode, true)` - * @param xpathText - * @param contextNode - */ - function select1(xpathText: string, contextNode: Node): any; - - /** - * Evaluate an XPath expression against a DOM node using a given namespace resolver. Returns the result as one of the following: - * * Array - * * Node - * * boolean - * * number - * * string - * @param xpathText - * @param contextNode - * @param resolver - * @param single If true and the evaluation result is one or more Nodes, will return only the first Node instead of an Array - */ - function selectWithResolver(xpathText: string, contextNode: Node, resolver: XPathNSResolver, single?: boolean): any; - - /** - * Evaluate an xpath expression against a DOM. - * @param xpathText xpath expression as a string. - * @param contextNode xpath expression is evaluated relative to this DOM node. - * @param resolver XML namespace resolver - * @param resultType - * @param result If non-null, xpath *may* reuse this XPathResult object instead of creating a new one. However, it is not required to do so. - * @return XPathResult object containing the result of the expression. - */ - function evaluate(xpathText: string, contextNode: Node, resolver: XPathNSResolver, resultType: number, result?: XPathResult): XPathResult; - - /** - * Creates a `select` function that uses the given namespace prefix to URI mappings when evaluating queries. - * @param namespaceMappings an object mapping namespace prefixes to namespace URIs. Each key is a prefix; each value is a URI. - * @return a function with the same signature as `xpath.select` - */ - function useNamespaces(namespaceMappings: NamespaceMap): typeof select; - interface NamespaceMap { - [namespacePrefix: string]: string; - } - - /** - * Compile an XPath expression into an XPathExpression which can be (repeatedly) evaluated against a DOM. - * @param xpathText XPath expression as a string - * @param namespaceURLMapper Namespace resolver - * @return compiled expression - */ - function createExpression(xpathText: string, namespaceURLMapper: XPathNSResolver): XPathExpression; - - /** - * Create an XPathNSResolver that resolves based on the information available in the context of a DOM node. - * @param node - */ - function createNSResolver(node: Node): XPathNSResolver; - - /** - * Result of evaluating an XPathExpression. - */ - class XPathResult { - /** - * A result set containing whatever type naturally results from evaluation of the expression. Note that if the result is a node-set then UNORDERED_NODE_ITERATOR_TYPE is always the resulting type. - */ - static ANY_TYPE: number; - /** - * A result containing a single number. This is useful for example, in an XPath expression using the count() function. - */ - static NUMBER_TYPE: number; - /** - * A result containing a single string. - */ - static STRING_TYPE: number; - /** - * A result containing a single boolean value. This is useful for example, in an XPath expression using the not() function. - */ - static BOOLEAN_TYPE: number; - /** - * A result node-set containing all the nodes matching the expression. The nodes may not necessarily be in the same order that they appear in the document. - */ - static UNORDERED_NODE_ITERATOR_TYPE: number; - /** - * A result node-set containing all the nodes matching the expression. The nodes in the result set are in the same order that they appear in the document. - */ - static ORDERED_NODE_ITERATOR_TYPE: number; - /** - * A result node-set containing snapshots of all the nodes matching the expression. The nodes may not necessarily be in the same order that they appear in the document. - */ - static UNORDERED_NODE_SNAPSHOT_TYPE: number; - /** - * A result node-set containing snapshots of all the nodes matching the expression. The nodes in the result set are in the same order that they appear in the document. - */ - static ORDERED_NODE_SNAPSHOT_TYPE: number; - /** - * A result node-set containing any single node that matches the expression. The node is not necessarily the first node in the document that matches the expression. - */ - static ANY_UNORDERED_NODE_TYPE: number; - /** - * A result node-set containing the first node in the document that matches the expression. - */ - static FIRST_ORDERED_NODE_TYPE: number; - - /** - * Type of this result. It is one of the enumerated result types. - */ - resultType: number; - - /** - * Returns the next node in this result, if this result is one of the _ITERATOR_ result types. - */ - iterateNext(): Node; - - /** - * returns the result node for a given index, if this result is one of the _SNAPSHOT_ result types. - * @param index - */ - snapshotItem(index: number): Node; - - /** - * Number of nodes in this result, if this result is one of the _SNAPSHOT_ result types. - */ - snapshotLength: number; - - /** - * Value of this result, if it is a BOOLEAN_TYPE result. - */ - booleanValue: boolean; - /** - * Value of this result, if it is a NUMBER_TYPE result. - */ - numberValue: number; - /** - * Value of this result, if it is a STRING_TYPE result. - */ - stringValue: string; - - /** - * Value of this result, if it is a FIRST_ORDERED_NODE_TYPE result. - */ - singleNodeValue: Node; - } - - /** - * A compiled XPath expression, ready to be (repeatedly) evaluated against a DOM node. - */ - interface XPathExpression { - /** - * evaluate this expression against a DOM node. - * @param contextNode - * @param resultType - * @param result - */ - evaluate(contextNode: Node, resultType: number, result?: XPathResult): XPathResult; - } - - /** - * Object that can resolve XML namespace prefixes to namespace URIs. - */ - interface XPathNSResolver { - /** - * Given an XML namespace prefix, returns the corresponding XML namespace URI. - * @param prefix XML namespace prefix - * @return XML namespace URI - */ - lookupNamespaceURI(prefix: string): string; - } -} \ No newline at end of file From 4bd8c9eddf12e346cf3f1f6787f9131dab3b94ee Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 17:50:50 -0500 Subject: [PATCH 02/57] Generate Extension Skeleton --- .gitignore | 4 + .vscode/launch.json | 28 + .vscode/settings.json | 9 + .vscode/tasks.json | 20 + .vscodeignore | 8 + CHANGELOG.md | 7 + README.md | 65 + package-lock.json | 2657 +++++++++++++++++++++++++++++++++++ package.json | 38 + src/extension.ts | 29 + src/test/extension.test.ts | 22 + src/test/index.ts | 22 + tsconfig.json | 16 + vsc-extension-quickstart.md | 33 + 14 files changed, 2958 insertions(+) create mode 100644 .gitignore create mode 100644 .vscode/launch.json create mode 100644 .vscode/settings.json create mode 100644 .vscode/tasks.json create mode 100644 .vscodeignore create mode 100644 CHANGELOG.md create mode 100644 README.md create mode 100644 package-lock.json create mode 100644 package.json create mode 100644 src/extension.ts create mode 100644 src/test/extension.test.ts create mode 100644 src/test/index.ts create mode 100644 tsconfig.json create mode 100644 vsc-extension-quickstart.md diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8c8220a --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +out +node_modules +.vscode-test/ +.vsix diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..759cf25 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,28 @@ +// A launch configuration that compiles the extension and then opens it inside a new window +{ + "version": "0.1.0", + "configurations": [ + { + "name": "Extension", + "type": "extensionHost", + "request": "launch", + "runtimeExecutable": "${execPath}", + "args": ["--extensionDevelopmentPath=${workspaceRoot}" ], + "stopOnEntry": false, + "sourceMaps": true, + "outFiles": [ "${workspaceRoot}/out/**/*.js" ], + "preLaunchTask": "npm: watch" + }, + { + "name": "Extension Tests", + "type": "extensionHost", + "request": "launch", + "runtimeExecutable": "${execPath}", + "args": ["--extensionDevelopmentPath=${workspaceRoot}", "--extensionTestsPath=${workspaceRoot}/out/test" ], + "stopOnEntry": false, + "sourceMaps": true, + "outFiles": [ "${workspaceRoot}/out/test/**/*.js" ], + "preLaunchTask": "npm: watch" + } + ] +} diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..d137133 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,9 @@ +// Place your settings in this file to overwrite default and user settings. +{ + "files.exclude": { + "out": false // set this to true to hide the "out" folder with the compiled JS files + }, + "search.exclude": { + "out": true // set this to false to include "out" folder in search results + } +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..604e38f --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,20 @@ +// See https://go.microsoft.com/fwlink/?LinkId=733558 +// for the documentation about the tasks.json format +{ + "version": "2.0.0", + "tasks": [ + { + "type": "npm", + "script": "watch", + "problemMatcher": "$tsc-watch", + "isBackground": true, + "presentation": { + "reveal": "never" + }, + "group": { + "kind": "build", + "isDefault": true + } + } + ] +} \ No newline at end of file diff --git a/.vscodeignore b/.vscodeignore new file mode 100644 index 0000000..ea75c67 --- /dev/null +++ b/.vscodeignore @@ -0,0 +1,8 @@ +.vscode/** +.vscode-test/** +out/test/** +out/**/*.map +src/** +.gitignore +tsconfig.json +vsc-extension-quickstart.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..c21ea17 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,7 @@ +# Change Log +All notable changes to the "xml" extension will be documented in this file. + +Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. + +## [Unreleased] +- Initial release \ No newline at end of file diff --git a/README.md b/README.md new file mode 100644 index 0000000..a2165ed --- /dev/null +++ b/README.md @@ -0,0 +1,65 @@ +# xml README + +This is the README for your extension "xml". After writing up a brief description, we recommend including the following sections. + +## Features + +Describe specific features of your extension including screenshots of your extension in action. Image paths are relative to this README file. + +For example if there is an image subfolder under your extension project workspace: + +\!\[feature X\]\(images/feature-x.png\) + +> Tip: Many popular extensions utilize animations. This is an excellent way to show off your extension! We recommend short, focused animations that are easy to follow. + +## Requirements + +If you have any requirements or dependencies, add a section describing those and how to install and configure them. + +## Extension Settings + +Include if your extension adds any VS Code settings through the `contributes.configuration` extension point. + +For example: + +This extension contributes the following settings: + +* `myExtension.enable`: enable/disable this extension +* `myExtension.thing`: set to `blah` to do something + +## Known Issues + +Calling out known issues can help limit users opening duplicate issues against your extension. + +## Release Notes + +Users appreciate release notes as you update your extension. + +### 1.0.0 + +Initial release of ... + +### 1.0.1 + +Fixed issue #. + +### 1.1.0 + +Added features X, Y, and Z. + +----------------------------------------------------------------------------------------------------------- + +## Working with Markdown + +**Note:** You can author your README using Visual Studio Code. Here are some useful editor keyboard shortcuts: + +* Split the editor (`Cmd+\` on OSX or `Ctrl+\` on Windows and Linux) +* Toggle preview (`Shift+CMD+V` on OSX or `Shift+Ctrl+V` on Windows and Linux) +* Press `Ctrl+Space` (Windows, Linux) or `Cmd+Space` (OSX) to see a list of Markdown snippets + +### For more information + +* [Visual Studio Code's Markdown Support](http://code.visualstudio.com/docs/languages/markdown) +* [Markdown Syntax Reference](https://help.github.com/articles/markdown-basics/) + +**Enjoy!** \ No newline at end of file diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..94751f7 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,2657 @@ +{ + "name": "xml", + "version": "0.0.1", + "lockfileVersion": 1, + "requires": true, + "dependencies": { + "@types/mocha": { + "version": "2.2.47", + "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-2.2.47.tgz", + "integrity": "sha512-v/lko8AvmTt1K8p+ebdhdiHJE7zpPBYsDKjJSNCl8GwPGkKe5xND7s6M36LKye/USbWSPA7gYCDL0+DZ5h0L6Q==", + "dev": true + }, + "@types/node": { + "version": "7.0.52", + "resolved": "https://registry.npmjs.org/@types/node/-/node-7.0.52.tgz", + "integrity": "sha512-jjpyQsKGsOF/wUElNjfPULk+d8PKvJOIXk3IUeBYYmNCy5dMWfrI+JiixYNw8ppKOlcRwWTXFl0B+i5oGrf95Q==", + "dev": true + }, + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", + "dev": true, + "requires": { + "co": "4.6.0", + "fast-deep-equal": "1.0.0", + "fast-json-stable-stringify": "2.0.0", + "json-schema-traverse": "0.3.1" + } + }, + "ansi-cyan": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", + "integrity": "sha1-U4rlKK+JgvKK4w2G8vF0VtJgmHM=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, + "ansi-gray": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz", + "integrity": "sha1-KWLPVOyXksSFEKPetSRDaGHvclE=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, + "ansi-red": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ansi-red/-/ansi-red-0.1.1.tgz", + "integrity": "sha1-jGOPnRCAgAo1PJwoyKgcpHBdlGw=", + "dev": true, + "requires": { + "ansi-wrap": "0.1.0" + } + }, + "ansi-regex": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true + }, + "ansi-styles": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", + "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", + "dev": true + }, + "ansi-wrap": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz", + "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", + "dev": true + }, + "arr-diff": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", + "integrity": "sha1-aHwydYFjWI/vfeezb6vklesaOZo=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0", + "array-slice": "0.2.3" + } + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", + "dev": true + }, + "arr-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-2.1.0.tgz", + "integrity": "sha1-IPnqtexw9cfSFbEHexw5Fh0pLH0=", + "dev": true + }, + "array-differ": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz", + "integrity": "sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=", + "dev": true + }, + "array-slice": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz", + "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=", + "dev": true + }, + "array-union": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", + "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", + "dev": true, + "requires": { + "array-uniq": "1.0.3" + } + }, + "array-uniq": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", + "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", + "dev": true + }, + "array-unique": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", + "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", + "dev": true + }, + "arrify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", + "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", + "dev": true + }, + "asn1": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz", + "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=", + "dev": true + }, + "assert-plus": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", + "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "dev": true + }, + "asynckit": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", + "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=", + "dev": true + }, + "aws-sign2": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", + "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "dev": true + }, + "aws4": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", + "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", + "dev": true + }, + "balanced-match": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", + "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", + "dev": true + }, + "bcrypt-pbkdf": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz", + "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=", + "dev": true, + "optional": true, + "requires": { + "tweetnacl": "0.14.5" + } + }, + "beeper": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz", + "integrity": "sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=", + "dev": true + }, + "block-stream": { + "version": "0.0.9", + "resolved": "https://registry.npmjs.org/block-stream/-/block-stream-0.0.9.tgz", + "integrity": "sha1-E+v+d4oDIFz+A3UUgeu0szAMEmo=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "boom": { + "version": "2.10.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", + "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "brace-expansion": { + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", + "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=", + "dev": true, + "requires": { + "balanced-match": "1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "1.8.5", + "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", + "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", + "dev": true, + "requires": { + "expand-range": "1.8.2", + "preserve": "0.2.0", + "repeat-element": "1.1.2" + } + }, + "browser-stdout": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", + "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", + "dev": true + }, + "buffer-crc32": { + "version": "0.2.13", + "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", + "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", + "dev": true + }, + "caseless": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", + "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", + "dev": true + }, + "chalk": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", + "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "dev": true, + "requires": { + "ansi-styles": "2.2.1", + "escape-string-regexp": "1.0.5", + "has-ansi": "2.0.0", + "strip-ansi": "3.0.1", + "supports-color": "2.0.0" + } + }, + "clone": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", + "integrity": "sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=", + "dev": true + }, + "clone-buffer": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-buffer/-/clone-buffer-1.0.0.tgz", + "integrity": "sha1-4+JbIHrE5wGvch4staFnksrD3Fg=", + "dev": true + }, + "clone-stats": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz", + "integrity": "sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=", + "dev": true + }, + "cloneable-readable": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz", + "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=", + "dev": true, + "requires": { + "inherits": "2.0.3", + "process-nextick-args": "1.0.7", + "through2": "2.0.3" + } + }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", + "dev": true + }, + "color-support": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", + "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", + "dev": true + }, + "combined-stream": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", + "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "dev": true, + "requires": { + "delayed-stream": "1.0.0" + } + }, + "commander": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", + "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", + "dev": true + }, + "convert-source-map": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", + "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", + "dev": true + }, + "core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "cryptiles": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", + "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", + "dev": true, + "requires": { + "boom": "2.10.1" + } + }, + "dashdash": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", + "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", + "dev": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } + } + }, + "dateformat": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz", + "integrity": "sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=", + "dev": true + }, + "debug": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", + "dev": true, + "requires": { + "ms": "2.0.0" + } + }, + "deep-assign": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/deep-assign/-/deep-assign-1.0.0.tgz", + "integrity": "sha1-sJJ0O+hCfcYh6gBnzex+cN0Z83s=", + "dev": true, + "requires": { + "is-obj": "1.0.1" + } + }, + "delayed-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", + "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=", + "dev": true + }, + "diff": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.3.1.tgz", + "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", + "dev": true + }, + "duplexer": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", + "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", + "dev": true + }, + "duplexer2": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz", + "integrity": "sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=", + "dev": true, + "requires": { + "readable-stream": "1.1.14" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz", + "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + } + } + }, + "duplexify": { + "version": "3.5.3", + "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", + "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", + "dev": true, + "requires": { + "end-of-stream": "1.4.1", + "inherits": "2.0.3", + "readable-stream": "2.3.3", + "stream-shift": "1.0.0" + } + }, + "ecc-jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz", + "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=", + "dev": true, + "optional": true, + "requires": { + "jsbn": "0.1.1" + } + }, + "end-of-stream": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", + "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dev": true, + "requires": { + "once": "1.4.0" + } + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", + "dev": true + }, + "event-stream": { + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", + "integrity": "sha1-SrTJoPWlTbkzi0w02Gv86PSzVXE=", + "dev": true, + "requires": { + "duplexer": "0.1.1", + "from": "0.1.7", + "map-stream": "0.1.0", + "pause-stream": "0.0.11", + "split": "0.3.3", + "stream-combiner": "0.0.4", + "through": "2.3.8" + } + }, + "expand-brackets": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", + "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", + "dev": true, + "requires": { + "is-posix-bracket": "0.1.1" + } + }, + "expand-range": { + "version": "1.8.2", + "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", + "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", + "dev": true, + "requires": { + "fill-range": "2.2.3" + } + }, + "extend": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz", + "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=", + "dev": true + }, + "extend-shallow": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-1.1.4.tgz", + "integrity": "sha1-Gda/lN/AnXa6cR85uHLSH/TdkHE=", + "dev": true, + "requires": { + "kind-of": "1.1.0" + } + }, + "extglob": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", + "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + } + } + }, + "extsprintf": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", + "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", + "dev": true + }, + "fancy-log": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.2.tgz", + "integrity": "sha1-9BEl49hPLn2JpD0G2VjI94vha+E=", + "dev": true, + "requires": { + "ansi-gray": "0.1.1", + "color-support": "1.1.3", + "time-stamp": "1.1.0" + } + }, + "fast-deep-equal": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", + "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", + "dev": true + }, + "fast-json-stable-stringify": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", + "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", + "dev": true + }, + "fd-slicer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz", + "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=", + "dev": true, + "requires": { + "pend": "1.2.0" + } + }, + "filename-regex": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", + "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", + "dev": true + }, + "fill-range": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.3.tgz", + "integrity": "sha1-ULd9/X5Gm8dJJHCWNpn+eoSFpyM=", + "dev": true, + "requires": { + "is-number": "2.1.0", + "isobject": "2.1.0", + "randomatic": "1.1.7", + "repeat-element": "1.1.2", + "repeat-string": "1.6.1" + } + }, + "first-chunk-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", + "integrity": "sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=", + "dev": true + }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", + "dev": true + }, + "for-own": { + "version": "0.1.5", + "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", + "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", + "dev": true, + "requires": { + "for-in": "1.0.2" + } + }, + "forever-agent": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", + "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", + "dev": true + }, + "form-data": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", + "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "dev": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "from": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", + "integrity": "sha1-g8YK/Fi5xWmXAH7Rp2izqzA6RP4=", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", + "dev": true + }, + "fstream": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", + "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=", + "dev": true, + "requires": { + "graceful-fs": "4.1.11", + "inherits": "2.0.3", + "mkdirp": "0.5.1", + "rimraf": "2.6.2" + } + }, + "generate-function": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", + "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", + "dev": true + }, + "generate-object-property": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", + "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", + "dev": true, + "requires": { + "is-property": "1.0.2" + } + }, + "getpass": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", + "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", + "dev": true, + "requires": { + "assert-plus": "1.0.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } + } + }, + "glob": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", + "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "dev": true, + "requires": { + "fs.realpath": "1.0.0", + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "glob-base": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", + "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", + "dev": true, + "requires": { + "glob-parent": "2.0.0", + "is-glob": "2.0.1" + }, + "dependencies": { + "glob-parent": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", + "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", + "dev": true, + "requires": { + "is-glob": "2.0.1" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "glob-parent": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", + "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", + "dev": true, + "requires": { + "is-glob": "3.1.0", + "path-dirname": "1.0.2" + } + }, + "glob-stream": { + "version": "5.3.5", + "resolved": "https://registry.npmjs.org/glob-stream/-/glob-stream-5.3.5.tgz", + "integrity": "sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=", + "dev": true, + "requires": { + "extend": "3.0.1", + "glob": "5.0.15", + "glob-parent": "3.1.0", + "micromatch": "2.3.11", + "ordered-read-streams": "0.3.0", + "through2": "0.6.5", + "to-absolute-glob": "0.1.1", + "unique-stream": "2.2.1" + }, + "dependencies": { + "glob": { + "version": "5.0.15", + "resolved": "https://registry.npmjs.org/glob/-/glob-5.0.15.tgz", + "integrity": "sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=", + "dev": true, + "requires": { + "inflight": "1.0.6", + "inherits": "2.0.3", + "minimatch": "3.0.4", + "once": "1.4.0", + "path-is-absolute": "1.0.1" + } + }, + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + } + } + }, + "glogg": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", + "integrity": "sha512-ynYqXLoluBKf9XGR1gA59yEJisIL7YHEH4xr3ZziHB5/yl4qWfaK8Js9jGe6gBGCSCKVqiyO30WnRZADvemUNw==", + "dev": true, + "requires": { + "sparkles": "1.0.0" + } + }, + "graceful-fs": { + "version": "4.1.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", + "dev": true + }, + "growl": { + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.3.tgz", + "integrity": "sha512-hKlsbA5Vu3xsh1Cg3J7jSmX/WaW6A5oBeqzM88oNbCRQFz+zUaXm6yxS4RVytp1scBoJzSYl4YAEOQIt6O8V1Q==", + "dev": true + }, + "gulp-chmod": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/gulp-chmod/-/gulp-chmod-2.0.0.tgz", + "integrity": "sha1-AMOQuSigeZslGsz2MaoJ4BzGKZw=", + "dev": true, + "requires": { + "deep-assign": "1.0.0", + "stat-mode": "0.2.2", + "through2": "2.0.3" + } + }, + "gulp-filter": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/gulp-filter/-/gulp-filter-5.1.0.tgz", + "integrity": "sha1-oF4Rr/sHz33PQafeHLe2OsN4PnM=", + "dev": true, + "requires": { + "multimatch": "2.1.0", + "plugin-error": "0.1.2", + "streamfilter": "1.0.7" + } + }, + "gulp-gunzip": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulp-gunzip/-/gulp-gunzip-1.0.0.tgz", + "integrity": "sha1-FbdBFF6Dqcb1CIYkG1fMWHHxUak=", + "dev": true, + "requires": { + "through2": "0.6.5", + "vinyl": "0.4.6" + }, + "dependencies": { + "isarray": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", + "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", + "dev": true + }, + "readable-stream": { + "version": "1.0.34", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", + "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "0.0.1", + "string_decoder": "0.10.31" + } + }, + "string_decoder": { + "version": "0.10.31", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", + "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", + "dev": true + }, + "through2": { + "version": "0.6.5", + "resolved": "https://registry.npmjs.org/through2/-/through2-0.6.5.tgz", + "integrity": "sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=", + "dev": true, + "requires": { + "readable-stream": "1.0.34", + "xtend": "4.0.1" + } + } + } + }, + "gulp-remote-src": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/gulp-remote-src/-/gulp-remote-src-0.4.3.tgz", + "integrity": "sha1-VyjP1kNDPdSEXd7wlp8PlxoqtKE=", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "node.extend": "1.1.6", + "request": "2.79.0", + "through2": "2.0.3", + "vinyl": "2.0.2" + }, + "dependencies": { + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, + "request": { + "version": "2.79.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", + "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", + "dev": true, + "requires": { + "aws-sign2": "0.6.0", + "aws4": "1.6.0", + "caseless": "0.11.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.1.4", + "har-validator": "2.0.6", + "hawk": "3.1.3", + "http-signature": "1.1.1", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "qs": "6.3.2", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.4.3", + "uuid": "3.2.1" + } + }, + "vinyl": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.0.2.tgz", + "integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=", + "dev": true, + "requires": { + "clone": "1.0.3", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "is-stream": "1.1.0", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" + } + } + } + }, + "gulp-sourcemaps": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz", + "integrity": "sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=", + "dev": true, + "requires": { + "convert-source-map": "1.5.1", + "graceful-fs": "4.1.11", + "strip-bom": "2.0.0", + "through2": "2.0.3", + "vinyl": "1.2.0" + }, + "dependencies": { + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "dev": true + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "dev": true + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.3", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } + } + }, + "gulp-symdest": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/gulp-symdest/-/gulp-symdest-1.1.0.tgz", + "integrity": "sha1-wWUyBzLRks5W/ZQnH/oSMjS/KuA=", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "mkdirp": "0.5.1", + "queue": "3.1.0", + "vinyl-fs": "2.4.4" + } + }, + "gulp-untar": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/gulp-untar/-/gulp-untar-0.0.6.tgz", + "integrity": "sha1-1r3v3n6ajgVMnxYjhaB4LEvnQAA=", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "gulp-util": "3.0.8", + "streamifier": "0.1.1", + "tar": "2.2.1", + "through2": "2.0.3" + } + }, + "gulp-util": { + "version": "3.0.8", + "resolved": "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz", + "integrity": "sha1-AFTh50RQLifATBh8PsxQXdVLu08=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-uniq": "1.0.3", + "beeper": "1.1.1", + "chalk": "1.1.3", + "dateformat": "2.2.0", + "fancy-log": "1.3.2", + "gulplog": "1.0.0", + "has-gulplog": "0.1.0", + "lodash._reescape": "3.0.0", + "lodash._reevaluate": "3.0.0", + "lodash._reinterpolate": "3.0.0", + "lodash.template": "3.6.2", + "minimist": "1.2.0", + "multipipe": "0.1.2", + "object-assign": "3.0.0", + "replace-ext": "0.0.1", + "through2": "2.0.3", + "vinyl": "0.5.3" + }, + "dependencies": { + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "dev": true + }, + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + }, + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=", + "dev": true + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "dev": true + }, + "vinyl": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz", + "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", + "dev": true, + "requires": { + "clone": "1.0.3", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } + } + }, + "gulp-vinyl-zip": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/gulp-vinyl-zip/-/gulp-vinyl-zip-2.1.0.tgz", + "integrity": "sha1-JOQGhdwFtxSZlSRQmeBZAmO+ja0=", + "dev": true, + "requires": { + "event-stream": "3.3.4", + "queue": "4.4.2", + "through2": "2.0.3", + "vinyl": "2.1.0", + "vinyl-fs": "2.4.4", + "yauzl": "2.9.1", + "yazl": "2.4.3" + }, + "dependencies": { + "clone": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.1.tgz", + "integrity": "sha1-0hfR6WERjjrJpLi7oyhVU79kfNs=", + "dev": true + }, + "clone-stats": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz", + "integrity": "sha1-s3gt/4u1R04Yuba/D9/ngvh3doA=", + "dev": true + }, + "queue": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/queue/-/queue-4.4.2.tgz", + "integrity": "sha512-fSMRXbwhMwipcDZ08enW2vl+YDmAmhcNcr43sCJL8DIg+CFOsoRLG23ctxA+fwNk1w55SePSiS7oqQQSgQoVJQ==", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "vinyl": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-2.1.0.tgz", + "integrity": "sha1-Ah+cLPlR1rk5lDyJ617lrdT9kkw=", + "dev": true, + "requires": { + "clone": "2.1.1", + "clone-buffer": "1.0.0", + "clone-stats": "1.0.0", + "cloneable-readable": "1.0.0", + "remove-trailing-separator": "1.1.0", + "replace-ext": "1.0.0" + } + } + } + }, + "gulplog": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz", + "integrity": "sha1-4oxNRdBey77YGDY86PnFkmIp/+U=", + "dev": true, + "requires": { + "glogg": "1.0.1" + } + }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true + }, + "har-validator": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", + "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "commander": "2.13.0", + "is-my-json-valid": "2.17.1", + "pinkie-promise": "2.0.1" + } + }, + "has-ansi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", + "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "has-flag": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", + "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", + "dev": true + }, + "has-gulplog": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz", + "integrity": "sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=", + "dev": true, + "requires": { + "sparkles": "1.0.0" + } + }, + "hawk": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", + "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", + "dev": true, + "requires": { + "boom": "2.10.1", + "cryptiles": "2.0.5", + "hoek": "2.16.3", + "sntp": "1.0.9" + } + }, + "he": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", + "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", + "dev": true + }, + "hoek": { + "version": "2.16.3", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", + "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", + "dev": true + }, + "http-signature": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", + "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "dev": true, + "requires": { + "assert-plus": "0.2.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, + "requires": { + "once": "1.4.0", + "wrappy": "1.0.2" + } + }, + "inherits": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true + }, + "is": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/is/-/is-3.2.1.tgz", + "integrity": "sha1-0Kwq1V63sL7JJqUmb2xmKqqD3KU=", + "dev": true + }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", + "dev": true + }, + "is-dotfile": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", + "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", + "dev": true + }, + "is-equal-shallow": { + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", + "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", + "dev": true, + "requires": { + "is-primitive": "2.0.0" + } + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", + "dev": true + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", + "dev": true + }, + "is-glob": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", + "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", + "dev": true, + "requires": { + "is-extglob": "2.1.1" + } + }, + "is-my-json-valid": { + "version": "2.17.1", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz", + "integrity": "sha512-Q2khNw+oBlWuaYvEEHtKSw/pCxD2L5Rc1C+UQme9X6JdRDh7m5D7HkozA0qa3DUkQ6VzCnEm8mVIQPyIRkI5sQ==", + "dev": true, + "requires": { + "generate-function": "2.0.0", + "generate-object-property": "1.2.0", + "jsonpointer": "4.0.1", + "xtend": "4.0.1" + } + }, + "is-number": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", + "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "is-obj": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", + "dev": true + }, + "is-posix-bracket": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", + "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", + "dev": true + }, + "is-primitive": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", + "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", + "dev": true + }, + "is-property": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", + "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", + "dev": true + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, + "is-typedarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", + "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", + "dev": true + }, + "is-utf8": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", + "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", + "dev": true + }, + "is-valid-glob": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-0.3.0.tgz", + "integrity": "sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=", + "dev": true + }, + "isarray": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "dev": true, + "requires": { + "isarray": "1.0.0" + } + }, + "isstream": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", + "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", + "dev": true + }, + "jsbn": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "dev": true, + "optional": true + }, + "json-schema": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", + "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true + }, + "json-stable-stringify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz", + "integrity": "sha1-mnWdOcXy/1A/1TAGRu1EX4jE+a8=", + "dev": true, + "requires": { + "jsonify": "0.0.0" + } + }, + "json-stringify-safe": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", + "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", + "dev": true + }, + "jsonify": { + "version": "0.0.0", + "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz", + "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=", + "dev": true + }, + "jsonpointer": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", + "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", + "dev": true + }, + "jsprim": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", + "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "extsprintf": "1.3.0", + "json-schema": "0.2.3", + "verror": "1.10.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } + } + }, + "kind-of": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-1.1.0.tgz", + "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", + "dev": true + }, + "lazystream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", + "integrity": "sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, + "lodash._basecopy": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", + "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", + "dev": true + }, + "lodash._basetostring": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz", + "integrity": "sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=", + "dev": true + }, + "lodash._basevalues": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz", + "integrity": "sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=", + "dev": true + }, + "lodash._getnative": { + "version": "3.9.1", + "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", + "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", + "dev": true + }, + "lodash._isiterateecall": { + "version": "3.0.9", + "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", + "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", + "dev": true + }, + "lodash._reescape": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz", + "integrity": "sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=", + "dev": true + }, + "lodash._reevaluate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz", + "integrity": "sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=", + "dev": true + }, + "lodash._reinterpolate": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz", + "integrity": "sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=", + "dev": true + }, + "lodash._root": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz", + "integrity": "sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=", + "dev": true + }, + "lodash.escape": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz", + "integrity": "sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=", + "dev": true, + "requires": { + "lodash._root": "3.0.1" + } + }, + "lodash.isarguments": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", + "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", + "dev": true + }, + "lodash.isarray": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", + "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", + "dev": true + }, + "lodash.isequal": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.isequal/-/lodash.isequal-4.5.0.tgz", + "integrity": "sha1-QVxEePK8wwEgwizhDtMib30+GOA=", + "dev": true + }, + "lodash.keys": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", + "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", + "dev": true, + "requires": { + "lodash._getnative": "3.9.1", + "lodash.isarguments": "3.1.0", + "lodash.isarray": "3.0.4" + } + }, + "lodash.restparam": { + "version": "3.6.1", + "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz", + "integrity": "sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=", + "dev": true + }, + "lodash.template": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz", + "integrity": "sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=", + "dev": true, + "requires": { + "lodash._basecopy": "3.0.1", + "lodash._basetostring": "3.0.1", + "lodash._basevalues": "3.0.0", + "lodash._isiterateecall": "3.0.9", + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0", + "lodash.keys": "3.1.2", + "lodash.restparam": "3.6.1", + "lodash.templatesettings": "3.1.1" + } + }, + "lodash.templatesettings": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz", + "integrity": "sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=", + "dev": true, + "requires": { + "lodash._reinterpolate": "3.0.0", + "lodash.escape": "3.2.0" + } + }, + "map-stream": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", + "integrity": "sha1-5WqpTEyAVaFkBKBnS3jyFffI4ZQ=", + "dev": true + }, + "merge-stream": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-1.0.1.tgz", + "integrity": "sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, + "micromatch": { + "version": "2.3.11", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", + "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", + "dev": true, + "requires": { + "arr-diff": "2.0.0", + "array-unique": "0.2.1", + "braces": "1.8.5", + "expand-brackets": "0.1.5", + "extglob": "0.3.2", + "filename-regex": "2.0.1", + "is-extglob": "1.0.0", + "is-glob": "2.0.1", + "kind-of": "3.2.2", + "normalize-path": "2.1.1", + "object.omit": "2.0.1", + "parse-glob": "3.0.4", + "regex-cache": "0.4.4" + }, + "dependencies": { + "arr-diff": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", + "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", + "dev": true, + "requires": { + "arr-flatten": "1.1.0" + } + }, + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "mime-db": { + "version": "1.30.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", + "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", + "dev": true + }, + "mime-types": { + "version": "2.1.17", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", + "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", + "dev": true, + "requires": { + "mime-db": "1.30.0" + } + }, + "minimatch": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", + "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", + "dev": true, + "requires": { + "brace-expansion": "1.1.8" + } + }, + "minimist": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true + }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, + "mocha": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-4.1.0.tgz", + "integrity": "sha512-0RVnjg1HJsXY2YFDoTNzcc1NKhYuXKRrBAG2gDygmJJA136Cs2QlRliZG1mA0ap7cuaT30mw16luAeln+4RiNA==", + "dev": true, + "requires": { + "browser-stdout": "1.3.0", + "commander": "2.11.0", + "debug": "3.1.0", + "diff": "3.3.1", + "escape-string-regexp": "1.0.5", + "glob": "7.1.2", + "growl": "1.10.3", + "he": "1.1.1", + "mkdirp": "0.5.1", + "supports-color": "4.4.0" + }, + "dependencies": { + "commander": { + "version": "2.11.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz", + "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==", + "dev": true + }, + "supports-color": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz", + "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "ms": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", + "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", + "dev": true + }, + "multimatch": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-2.1.0.tgz", + "integrity": "sha1-nHkGoi+0wCkZ4vX3UWG0zb1LKis=", + "dev": true, + "requires": { + "array-differ": "1.0.0", + "array-union": "1.0.2", + "arrify": "1.0.1", + "minimatch": "3.0.4" + } + }, + "multipipe": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz", + "integrity": "sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=", + "dev": true, + "requires": { + "duplexer2": "0.0.2" + } + }, + "node.extend": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", + "integrity": "sha1-p7iCyC1sk6SGOlUEvV3o7IYli5Y=", + "dev": true, + "requires": { + "is": "3.2.1" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "dev": true, + "requires": { + "remove-trailing-separator": "1.1.0" + } + }, + "oauth-sign": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", + "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=", + "dev": true + }, + "object-assign": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", + "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", + "dev": true + }, + "object.omit": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", + "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", + "dev": true, + "requires": { + "for-own": "0.1.5", + "is-extendable": "0.1.1" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, + "requires": { + "wrappy": "1.0.2" + } + }, + "ordered-read-streams": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz", + "integrity": "sha1-cTfmmzKYuzQiR6G77jiByA4v14s=", + "dev": true, + "requires": { + "is-stream": "1.1.0", + "readable-stream": "2.3.3" + } + }, + "parse-glob": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", + "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", + "dev": true, + "requires": { + "glob-base": "0.3.0", + "is-dotfile": "1.0.3", + "is-extglob": "1.0.0", + "is-glob": "2.0.1" + }, + "dependencies": { + "is-extglob": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", + "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", + "dev": true + }, + "is-glob": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", + "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", + "dev": true, + "requires": { + "is-extglob": "1.0.0" + } + } + } + }, + "path-dirname": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", + "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", + "dev": true + }, + "pause-stream": { + "version": "0.0.11", + "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", + "integrity": "sha1-/lo0sMvOErWqaitAPuLnO2AvFEU=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, + "pend": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", + "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=", + "dev": true + }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, + "pinkie": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true + }, + "pinkie-promise": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", + "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, + "requires": { + "pinkie": "2.0.4" + } + }, + "plugin-error": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/plugin-error/-/plugin-error-0.1.2.tgz", + "integrity": "sha1-O5uzM1zPAPQl4HQ34ZJ2ln2kes4=", + "dev": true, + "requires": { + "ansi-cyan": "0.1.1", + "ansi-red": "0.1.1", + "arr-diff": "1.1.0", + "arr-union": "2.1.0", + "extend-shallow": "1.1.4" + } + }, + "preserve": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", + "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", + "dev": true + }, + "process-nextick-args": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true + }, + "punycode": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", + "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", + "dev": true + }, + "qs": { + "version": "6.3.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", + "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", + "dev": true + }, + "querystringify": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz", + "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=", + "dev": true + }, + "queue": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/queue/-/queue-3.1.0.tgz", + "integrity": "sha1-bEnQHwCeIlZ4h4nyv/rGuLmZBYU=", + "dev": true, + "requires": { + "inherits": "2.0.3" + } + }, + "randomatic": { + "version": "1.1.7", + "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz", + "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==", + "dev": true, + "requires": { + "is-number": "3.0.0", + "kind-of": "4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "dev": true, + "requires": { + "kind-of": "3.2.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "dev": true, + "requires": { + "is-buffer": "1.1.6" + } + } + } + }, + "readable-stream": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", + "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "1.0.7", + "safe-buffer": "5.1.1", + "string_decoder": "1.0.3", + "util-deprecate": "1.0.2" + } + }, + "regex-cache": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", + "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", + "dev": true, + "requires": { + "is-equal-shallow": "0.1.3" + } + }, + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", + "dev": true + }, + "repeat-element": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", + "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", + "dev": true + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", + "dev": true + }, + "replace-ext": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz", + "integrity": "sha1-3mMSg3P8v3w8z6TeWkgMRaZ5WOs=", + "dev": true + }, + "request": { + "version": "2.83.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", + "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", + "dev": true, + "requires": { + "aws-sign2": "0.7.0", + "aws4": "1.6.0", + "caseless": "0.12.0", + "combined-stream": "1.0.5", + "extend": "3.0.1", + "forever-agent": "0.6.1", + "form-data": "2.3.1", + "har-validator": "5.0.3", + "hawk": "6.0.2", + "http-signature": "1.2.0", + "is-typedarray": "1.0.0", + "isstream": "0.1.2", + "json-stringify-safe": "5.0.1", + "mime-types": "2.1.17", + "oauth-sign": "0.8.2", + "performance-now": "2.1.0", + "qs": "6.5.1", + "safe-buffer": "5.1.1", + "stringstream": "0.0.5", + "tough-cookie": "2.3.3", + "tunnel-agent": "0.6.0", + "uuid": "3.2.1" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + }, + "aws-sign2": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", + "dev": true + }, + "boom": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/boom/-/boom-4.3.1.tgz", + "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", + "dev": true, + "requires": { + "hoek": "4.2.0" + } + }, + "caseless": { + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", + "dev": true + }, + "cryptiles": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz", + "integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=", + "dev": true, + "requires": { + "boom": "5.2.0" + }, + "dependencies": { + "boom": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz", + "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", + "dev": true, + "requires": { + "hoek": "4.2.0" + } + } + } + }, + "form-data": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", + "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", + "dev": true, + "requires": { + "asynckit": "0.4.0", + "combined-stream": "1.0.5", + "mime-types": "2.1.17" + } + }, + "har-validator": { + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", + "dev": true, + "requires": { + "ajv": "5.5.2", + "har-schema": "2.0.0" + } + }, + "hawk": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/hawk/-/hawk-6.0.2.tgz", + "integrity": "sha512-miowhl2+U7Qle4vdLqDdPt9m09K6yZhkLDTWGoUiUzrQCn+mHHSmfJgAyGaLRZbPmTqfFFjRV1QWCW0VWUJBbQ==", + "dev": true, + "requires": { + "boom": "4.3.1", + "cryptiles": "3.1.2", + "hoek": "4.2.0", + "sntp": "2.1.0" + } + }, + "hoek": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", + "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==", + "dev": true + }, + "http-signature": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "jsprim": "1.4.1", + "sshpk": "1.13.1" + } + }, + "qs": { + "version": "6.5.1", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", + "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", + "dev": true + }, + "sntp": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-2.1.0.tgz", + "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", + "dev": true, + "requires": { + "hoek": "4.2.0" + } + }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } + } + }, + "requires-port": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", + "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", + "dev": true + }, + "rimraf": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", + "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", + "dev": true, + "requires": { + "glob": "7.1.2" + } + }, + "safe-buffer": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", + "dev": true + }, + "semver": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", + "dev": true + }, + "sntp": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", + "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", + "dev": true, + "requires": { + "hoek": "2.16.3" + } + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-support": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz", + "integrity": "sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==", + "dev": true, + "requires": { + "source-map": "0.6.1" + } + }, + "sparkles": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/sparkles/-/sparkles-1.0.0.tgz", + "integrity": "sha1-Gsu/tZJDbRC76PeFt8xvgoFQEsM=", + "dev": true + }, + "split": { + "version": "0.3.3", + "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", + "integrity": "sha1-zQ7qXmOiEd//frDwkcQTPi0N0o8=", + "dev": true, + "requires": { + "through": "2.3.8" + } + }, + "sshpk": { + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", + "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "dev": true, + "requires": { + "asn1": "0.2.3", + "assert-plus": "1.0.0", + "bcrypt-pbkdf": "1.0.1", + "dashdash": "1.14.1", + "ecc-jsbn": "0.1.1", + "getpass": "0.1.7", + "jsbn": "0.1.1", + "tweetnacl": "0.14.5" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } + } + }, + "stat-mode": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/stat-mode/-/stat-mode-0.2.2.tgz", + "integrity": "sha1-5sgLYjEj19gM8TLOU480YokHJQI=", + "dev": true + }, + "stream-combiner": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", + "integrity": "sha1-TV5DPBhSYd3mI8o/RMWGvPXErRQ=", + "dev": true, + "requires": { + "duplexer": "0.1.1" + } + }, + "stream-shift": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", + "dev": true + }, + "streamfilter": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/streamfilter/-/streamfilter-1.0.7.tgz", + "integrity": "sha512-Gk6KZM+yNA1JpW0KzlZIhjo3EaBJDkYfXtYSbOwNIQ7Zd6006E6+sCFlW1NDvFG/vnXhKmw6TJJgiEQg/8lXfQ==", + "dev": true, + "requires": { + "readable-stream": "2.3.3" + } + }, + "streamifier": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/streamifier/-/streamifier-0.1.1.tgz", + "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=", + "dev": true + }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, + "stringstream": { + "version": "0.0.5", + "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", + "integrity": "sha1-TkhM1N5aC7vuGORjB3EKioFiGHg=", + "dev": true + }, + "strip-ansi": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", + "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, + "requires": { + "ansi-regex": "2.1.1" + } + }, + "strip-bom": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", + "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", + "dev": true, + "requires": { + "is-utf8": "0.2.1" + } + }, + "strip-bom-stream": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz", + "integrity": "sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=", + "dev": true, + "requires": { + "first-chunk-stream": "1.0.0", + "strip-bom": "2.0.0" + } + }, + "supports-color": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", + "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", + "dev": true + }, + "tar": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tar/-/tar-2.2.1.tgz", + "integrity": "sha1-jk0qJWwOIYXGsYrWlK7JaLg8sdE=", + "dev": true, + "requires": { + "block-stream": "0.0.9", + "fstream": "1.0.11", + "inherits": "2.0.3" + } + }, + "through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", + "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=", + "dev": true + }, + "through2": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", + "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", + "dev": true, + "requires": { + "readable-stream": "2.3.3", + "xtend": "4.0.1" + } + }, + "through2-filter": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/through2-filter/-/through2-filter-2.0.0.tgz", + "integrity": "sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=", + "dev": true, + "requires": { + "through2": "2.0.3", + "xtend": "4.0.1" + } + }, + "time-stamp": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz", + "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", + "dev": true + }, + "to-absolute-glob": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", + "integrity": "sha1-HN+kcqnvUMI57maZm2YsoOs5k38=", + "dev": true, + "requires": { + "extend-shallow": "2.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "dev": true, + "requires": { + "is-extendable": "0.1.1" + } + } + } + }, + "tough-cookie": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", + "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "dev": true, + "requires": { + "punycode": "1.4.1" + } + }, + "tunnel-agent": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", + "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "dev": true + }, + "tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", + "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", + "dev": true, + "optional": true + }, + "typescript": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.6.2.tgz", + "integrity": "sha1-PFtv1/beCRQmkCfwPAlGdY92c6Q=", + "dev": true + }, + "unique-stream": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/unique-stream/-/unique-stream-2.2.1.tgz", + "integrity": "sha1-WqADz76Uxf+GbE59ZouxxNuts2k=", + "dev": true, + "requires": { + "json-stable-stringify": "1.0.1", + "through2-filter": "2.0.0" + } + }, + "url-parse": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz", + "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==", + "dev": true, + "requires": { + "querystringify": "1.0.0", + "requires-port": "1.0.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true + }, + "uuid": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz", + "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==", + "dev": true + }, + "vali-date": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/vali-date/-/vali-date-1.0.0.tgz", + "integrity": "sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=", + "dev": true + }, + "verror": { + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", + "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", + "dev": true, + "requires": { + "assert-plus": "1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "1.3.0" + }, + "dependencies": { + "assert-plus": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", + "dev": true + } + } + }, + "vinyl": { + "version": "0.4.6", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz", + "integrity": "sha1-LzVsh6VQolVGHza76ypbqL94SEc=", + "dev": true, + "requires": { + "clone": "0.2.0", + "clone-stats": "0.0.1" + } + }, + "vinyl-fs": { + "version": "2.4.4", + "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-2.4.4.tgz", + "integrity": "sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=", + "dev": true, + "requires": { + "duplexify": "3.5.3", + "glob-stream": "5.3.5", + "graceful-fs": "4.1.11", + "gulp-sourcemaps": "1.6.0", + "is-valid-glob": "0.3.0", + "lazystream": "1.0.0", + "lodash.isequal": "4.5.0", + "merge-stream": "1.0.1", + "mkdirp": "0.5.1", + "object-assign": "4.1.1", + "readable-stream": "2.3.3", + "strip-bom": "2.0.0", + "strip-bom-stream": "1.0.0", + "through2": "2.0.3", + "through2-filter": "2.0.0", + "vali-date": "1.0.0", + "vinyl": "1.2.0" + }, + "dependencies": { + "clone": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", + "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "dev": true + }, + "replace-ext": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz", + "integrity": "sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=", + "dev": true + }, + "vinyl": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-1.2.0.tgz", + "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", + "dev": true, + "requires": { + "clone": "1.0.3", + "clone-stats": "0.0.1", + "replace-ext": "0.0.1" + } + } + } + }, + "vinyl-source-stream": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vinyl-source-stream/-/vinyl-source-stream-1.1.2.tgz", + "integrity": "sha1-YrU6E1YQqJbpjKlr7jqH8Aio54A=", + "dev": true, + "requires": { + "through2": "2.0.3", + "vinyl": "0.4.6" + } + }, + "vscode": { + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.10.tgz", + "integrity": "sha512-MvFXXSGuhw0Q6GC6dQrnRc0ES+63wpttGIoYGBMQnoS9JFCCNC/rWfX0lBCHJyuKL2Q8CYg0ROsMEHbHVwEtVw==", + "dev": true, + "requires": { + "glob": "7.1.2", + "gulp-chmod": "2.0.0", + "gulp-filter": "5.1.0", + "gulp-gunzip": "1.0.0", + "gulp-remote-src": "0.4.3", + "gulp-symdest": "1.1.0", + "gulp-untar": "0.0.6", + "gulp-vinyl-zip": "2.1.0", + "mocha": "4.1.0", + "request": "2.83.0", + "semver": "5.5.0", + "source-map-support": "0.5.3", + "url-parse": "1.2.0", + "vinyl-source-stream": "1.1.2" + } + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "xtend": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", + "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", + "dev": true + }, + "yauzl": { + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz", + "integrity": "sha1-qBmB6nCleUYTOIPwKcWCGok1mn8=", + "dev": true, + "requires": { + "buffer-crc32": "0.2.13", + "fd-slicer": "1.0.1" + } + }, + "yazl": { + "version": "2.4.3", + "resolved": "https://registry.npmjs.org/yazl/-/yazl-2.4.3.tgz", + "integrity": "sha1-7CblzIfVYBud+EMtvdPNLlFzoHE=", + "dev": true, + "requires": { + "buffer-crc32": "0.2.13" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..d7bf840 --- /dev/null +++ b/package.json @@ -0,0 +1,38 @@ +{ + "name": "xml", + "displayName": "XML Tools", + "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", + "version": "0.0.1", + "publisher": "DotJoshJohnson", + "engines": { + "vscode": "^1.19.0" + }, + "categories": [ + "Other" + ], + "activationEvents": [ + "onCommand:extension.sayHello" + ], + "main": "./out/extension", + "contributes": { + "commands": [ + { + "command": "extension.sayHello", + "title": "Hello World" + } + ] + }, + "scripts": { + "vscode:prepublish": "npm run compile", + "compile": "tsc -p ./", + "watch": "tsc -watch -p ./", + "postinstall": "node ./node_modules/vscode/bin/install", + "test": "npm run compile && node ./node_modules/vscode/bin/test" + }, + "devDependencies": { + "typescript": "^2.6.1", + "vscode": "^1.1.6", + "@types/node": "^7.0.43", + "@types/mocha": "^2.2.42" + } +} diff --git a/src/extension.ts b/src/extension.ts new file mode 100644 index 0000000..86ff993 --- /dev/null +++ b/src/extension.ts @@ -0,0 +1,29 @@ +'use strict'; +// The module 'vscode' contains the VS Code extensibility API +// Import the module and reference it with the alias vscode in your code below +import * as vscode from 'vscode'; + +// this method is called when your extension is activated +// your extension is activated the very first time the command is executed +export function activate(context: vscode.ExtensionContext) { + + // Use the console to output diagnostic information (console.log) and errors (console.error) + // This line of code will only be executed once when your extension is activated + console.log('Congratulations, your extension "xml" is now active!'); + + // The command has been defined in the package.json file + // Now provide the implementation of the command with registerCommand + // The commandId parameter must match the command field in package.json + let disposable = vscode.commands.registerCommand('extension.sayHello', () => { + // The code you place here will be executed every time your command is executed + + // Display a message box to the user + vscode.window.showInformationMessage('Hello World!'); + }); + + context.subscriptions.push(disposable); +} + +// this method is called when your extension is deactivated +export function deactivate() { +} \ No newline at end of file diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts new file mode 100644 index 0000000..fc71c5d --- /dev/null +++ b/src/test/extension.test.ts @@ -0,0 +1,22 @@ +// +// Note: This example test is leveraging the Mocha test framework. +// Please refer to their documentation on https://mochajs.org/ for help. +// + +// The module 'assert' provides assertion methods from node +import * as assert from 'assert'; + +// You can import and use all API from the 'vscode' module +// as well as import your extension to test it +import * as vscode from 'vscode'; +import * as myExtension from '../extension'; + +// Defines a Mocha test suite to group tests of similar kind together +suite("Extension Tests", () => { + + // Defines a Mocha unit test + test("Something 1", () => { + assert.equal(-1, [1, 2, 3].indexOf(5)); + assert.equal(-1, [1, 2, 3].indexOf(0)); + }); +}); \ No newline at end of file diff --git a/src/test/index.ts b/src/test/index.ts new file mode 100644 index 0000000..9fa2ea0 --- /dev/null +++ b/src/test/index.ts @@ -0,0 +1,22 @@ +// +// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING +// +// This file is providing the test runner to use when running extension tests. +// By default the test runner in use is Mocha based. +// +// You can provide your own test runner if you want to override it by exporting +// a function run(testRoot: string, clb: (error:Error) => void) that the extension +// host can call to run the tests. The test runner is expected to use console.log +// to report the results back to the caller. When the tests are finished, return +// a possible error to the callback or null if none. + +import * as testRunner from 'vscode/lib/testrunner'; + +// You can directly control Mocha options by uncommenting the following lines +// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info +testRunner.configure({ + ui: 'tdd', // the TDD UI is being used in extension.test.ts (suite, test, etc.) + useColors: true // colored output from test results +}); + +module.exports = testRunner; \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 0000000..8a1d847 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,16 @@ +{ + "compilerOptions": { + "module": "commonjs", + "target": "es6", + "outDir": "out", + "lib": [ + "es6" + ], + "sourceMap": true, + "rootDir": "src" + }, + "exclude": [ + "node_modules", + ".vscode-test" + ] +} \ No newline at end of file diff --git a/vsc-extension-quickstart.md b/vsc-extension-quickstart.md new file mode 100644 index 0000000..8a91f63 --- /dev/null +++ b/vsc-extension-quickstart.md @@ -0,0 +1,33 @@ +# Welcome to your VS Code Extension + +## What's in the folder +* This folder contains all of the files necessary for your extension. +* `package.json` - this is the manifest file in which you declare your extension and command. +The sample plugin registers a command and defines its title and command name. With this information +VS Code can show the command in the command palette. It doesn’t yet need to load the plugin. +* `src/extension.ts` - this is the main file where you will provide the implementation of your command. +The file exports one function, `activate`, which is called the very first time your extension is +activated (in this case by executing the command). Inside the `activate` function we call `registerCommand`. +We pass the function containing the implementation of the command as the second parameter to +`registerCommand`. + +## Get up and running straight away +* Press `F5` to open a new window with your extension loaded. +* Run your command from the command palette by pressing (`Ctrl+Shift+P` or `Cmd+Shift+P` on Mac) and typing `Hello World`. +* Set breakpoints in your code inside `src/extension.ts` to debug your extension. +* Find output from your extension in the debug console. + +## Make changes +* You can relaunch the extension from the debug toolbar after changing code in `src/extension.ts`. +* You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes. + +## Explore the API +* You can open the full set of our API when you open the file `node_modules/vscode/vscode.d.ts`. + +## Run tests +* Open the debug viewlet (`Ctrl+Shift+D` or `Cmd+Shift+D` on Mac) and from the launch configuration dropdown pick `Launch Tests`. +* Press `F5` to run the tests in a new window with your extension loaded. +* See the output of the test result in the debug console. +* Make changes to `test/extension.test.ts` or create new test files inside the `test` folder. + * By convention, the test runner will only consider files matching the name pattern `**.test.ts`. + * You can create folders inside the `test` folder to structure your tests any way you want. From 988fbe22c0f437c5ed706fc5a280b936425990d0 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 18:01:04 -0500 Subject: [PATCH 03/57] TSLint --- package-lock.json | 156 +++++++++++++++++++++++++++++++++++++ package.json | 12 +-- src/extension.ts | 12 +-- src/test/extension.test.ts | 8 +- src/test/index.ts | 6 +- tslint.json | 119 ++++++++++++++++++++++++++++ 6 files changed, 295 insertions(+), 18 deletions(-) create mode 100644 tslint.json diff --git a/package-lock.json b/package-lock.json index 94751f7..71cea45 100644 --- a/package-lock.json +++ b/package-lock.json @@ -73,6 +73,15 @@ "integrity": "sha1-qCJQ3bABXponyoLoLqYDu/pF768=", "dev": true }, + "argparse": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", + "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, + "requires": { + "sprintf-js": "1.0.3" + } + }, "arr-diff": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-1.1.0.tgz", @@ -164,6 +173,17 @@ "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", "dev": true }, + "babel-code-frame": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", + "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", + "dev": true, + "requires": { + "chalk": "1.1.3", + "esutils": "2.0.2", + "js-tokens": "3.0.2" + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", @@ -237,6 +257,12 @@ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "dev": true }, + "builtin-modules": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", + "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", + "dev": true + }, "caseless": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", @@ -291,6 +317,21 @@ "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", "dev": true }, + "color-convert": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", + "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", + "dev": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", + "dev": true + }, "color-support": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz", @@ -470,6 +511,18 @@ "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", "dev": true }, + "esprima": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true + }, + "esutils": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", + "dev": true + }, "event-stream": { "version": "3.3.4", "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", @@ -1399,6 +1452,22 @@ "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", "dev": true }, + "js-tokens": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", + "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", + "dev": true + }, + "js-yaml": { + "version": "3.10.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", + "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "dev": true, + "requires": { + "argparse": "1.0.9", + "esprima": "4.0.0" + } + }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", @@ -1877,6 +1946,12 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, + "path-parse": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", + "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", + "dev": true + }, "pause-stream": { "version": "0.0.11", "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", @@ -2213,6 +2288,15 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, + "resolve": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.5.0.tgz", + "integrity": "sha512-hgoSGrc3pjzAPHNBg+KnFcK2HwlHTs/YrAGUr6qgTVUZmXv1UEXXl0bZNBKMA9fud6lRYFdPGz0xXxycPzmmiw==", + "dev": true, + "requires": { + "path-parse": "1.0.5" + } + }, "rimraf": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", @@ -2273,6 +2357,12 @@ "through": "2.3.8" } }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true + }, "sshpk": { "version": "1.13.1", "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", @@ -2454,6 +2544,72 @@ "punycode": "1.4.1" } }, + "tslib": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz", + "integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==", + "dev": true + }, + "tslint": { + "version": "5.9.1", + "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.9.1.tgz", + "integrity": "sha1-ElX4ej/1frCw4fDmEKi0dIBGya4=", + "dev": true, + "requires": { + "babel-code-frame": "6.26.0", + "builtin-modules": "1.1.1", + "chalk": "2.3.0", + "commander": "2.13.0", + "diff": "3.3.1", + "glob": "7.1.2", + "js-yaml": "3.10.0", + "minimatch": "3.0.4", + "resolve": "1.5.0", + "semver": "5.5.0", + "tslib": "1.9.0", + "tsutils": "2.19.1" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz", + "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==", + "dev": true, + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.3.0.tgz", + "integrity": "sha512-Az5zJR2CBujap2rqXGaJKaPHyJ0IrUimvYNX+ncCy8PJP4ltOGTrHUIo097ZaL2zMeKYpiCdqDvS6zdrTFok3Q==", + "dev": true, + "requires": { + "ansi-styles": "3.2.0", + "escape-string-regexp": "1.0.5", + "supports-color": "4.5.0" + } + }, + "supports-color": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", + "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", + "dev": true, + "requires": { + "has-flag": "2.0.0" + } + } + } + }, + "tsutils": { + "version": "2.19.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.19.1.tgz", + "integrity": "sha512-1B3z4H4HddgzWptqLzwrJloDEsyBt8DvZhnFO14k7A4RsQL/UhEfQjD4hpcY5NpF3veBkjJhQJ8Bl7Xp96cN+A==", + "dev": true, + "requires": { + "tslib": "1.9.0" + } + }, "tunnel-agent": { "version": "0.4.3", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", diff --git a/package.json b/package.json index d7bf840..00d2870 100644 --- a/package.json +++ b/package.json @@ -24,15 +24,17 @@ }, "scripts": { "vscode:prepublish": "npm run compile", - "compile": "tsc -p ./", + "compile": "npm run lint && tsc -p ./", "watch": "tsc -watch -p ./", "postinstall": "node ./node_modules/vscode/bin/install", - "test": "npm run compile && node ./node_modules/vscode/bin/test" + "test": "npm run compile && node ./node_modules/vscode/bin/test", + "lint": "tslint -p tslint.json --fix" }, "devDependencies": { - "typescript": "^2.6.1", - "vscode": "^1.1.6", + "@types/mocha": "^2.2.42", "@types/node": "^7.0.43", - "@types/mocha": "^2.2.42" + "tslint": "^5.9.1", + "typescript": "^2.6.1", + "vscode": "^1.1.6" } } diff --git a/src/extension.ts b/src/extension.ts index 86ff993..15d78b0 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,7 +1,7 @@ -'use strict'; +"use strict"; // The module 'vscode' contains the VS Code extensibility API // Import the module and reference it with the alias vscode in your code below -import * as vscode from 'vscode'; +import * as vscode from "vscode"; // this method is called when your extension is activated // your extension is activated the very first time the command is executed @@ -9,16 +9,16 @@ export function activate(context: vscode.ExtensionContext) { // Use the console to output diagnostic information (console.log) and errors (console.error) // This line of code will only be executed once when your extension is activated - console.log('Congratulations, your extension "xml" is now active!'); + console.log("Congratulations, your extension \"xml\" is now active!"); // The command has been defined in the package.json file // Now provide the implementation of the command with registerCommand // The commandId parameter must match the command field in package.json - let disposable = vscode.commands.registerCommand('extension.sayHello', () => { + const disposable = vscode.commands.registerCommand("extension.sayHello", () => { // The code you place here will be executed every time your command is executed // Display a message box to the user - vscode.window.showInformationMessage('Hello World!'); + vscode.window.showInformationMessage("Hello World!"); }); context.subscriptions.push(disposable); @@ -26,4 +26,4 @@ export function activate(context: vscode.ExtensionContext) { // this method is called when your extension is deactivated export function deactivate() { -} \ No newline at end of file +} diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index fc71c5d..35bf33f 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -4,12 +4,12 @@ // // The module 'assert' provides assertion methods from node -import * as assert from 'assert'; +import * as assert from "assert"; // You can import and use all API from the 'vscode' module // as well as import your extension to test it -import * as vscode from 'vscode'; -import * as myExtension from '../extension'; +import * as vscode from "vscode"; +import * as myExtension from "../extension"; // Defines a Mocha test suite to group tests of similar kind together suite("Extension Tests", () => { @@ -19,4 +19,4 @@ suite("Extension Tests", () => { assert.equal(-1, [1, 2, 3].indexOf(5)); assert.equal(-1, [1, 2, 3].indexOf(0)); }); -}); \ No newline at end of file +}); diff --git a/src/test/index.ts b/src/test/index.ts index 9fa2ea0..edb6206 100644 --- a/src/test/index.ts +++ b/src/test/index.ts @@ -10,13 +10,13 @@ // to report the results back to the caller. When the tests are finished, return // a possible error to the callback or null if none. -import * as testRunner from 'vscode/lib/testrunner'; +import * as testRunner from "vscode/lib/testrunner"; // You can directly control Mocha options by uncommenting the following lines // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info testRunner.configure({ - ui: 'tdd', // the TDD UI is being used in extension.test.ts (suite, test, etc.) + ui: "tdd", // the TDD UI is being used in extension.test.ts (suite, test, etc.) useColors: true // colored output from test results }); -module.exports = testRunner; \ No newline at end of file +module.exports = testRunner; diff --git a/tslint.json b/tslint.json new file mode 100644 index 0000000..1b54217 --- /dev/null +++ b/tslint.json @@ -0,0 +1,119 @@ +{ + "rules": { + "arrow-return-shorthand": true, + "callable-types": true, + "class-name": true, + "comment-format": [ + true, + "check-space" + ], + "curly": true, + "deprecation": { + "severity": "warn" + }, + "eofline": true, + "forin": true, + "import-blacklist": [ + true, + "rxjs", + "rxjs/Rx" + ], + "import-spacing": true, + "indent": [ + true, + "spaces", + 4 + ], + "interface-over-type-literal": true, + "label-position": true, + "max-line-length": [ + true, + 140 + ], + "member-access": false, + "member-ordering": [ + true, + { + "order": [ + "static-field", + "instance-field", + "static-method", + "instance-method" + ] + } + ], + "no-arg": true, + "no-bitwise": true, + "no-console": [ + true, + "debug", + "info", + "time", + "timeEnd", + "trace" + ], + "no-construct": true, + "no-debugger": true, + "no-duplicate-super": true, + "no-empty": false, + "no-empty-interface": true, + "no-eval": true, + "no-inferrable-types": [ + true, + "ignore-params" + ], + "no-misused-new": true, + "no-non-null-assertion": true, + "no-shadowed-variable": true, + "no-string-literal": false, + "no-string-throw": true, + "no-switch-case-fall-through": true, + "no-trailing-whitespace": true, + "no-unnecessary-initializer": true, + "no-unused-expression": true, + "no-use-before-declare": true, + "no-var-keyword": true, + "object-literal-sort-keys": false, + "one-line": [ + true, + "check-open-brace", + "check-catch", + "check-else", + "check-whitespace" + ], + "prefer-const": true, + "quotemark": [ + true, + "double" + ], + "radix": true, + "semicolon": [ + true, + "always" + ], + "triple-equals": [ + true, + "allow-null-check" + ], + "typedef-whitespace": [ + true, + { + "call-signature": "nospace", + "index-signature": "nospace", + "parameter": "nospace", + "property-declaration": "nospace", + "variable-declaration": "nospace" + } + ], + "unified-signatures": true, + "variable-name": false, + "whitespace": [ + true, + "check-branch", + "check-decl", + "check-operator", + "check-separator", + "check-type" + ] + } +} \ No newline at end of file From a23393d631feb56ed87c4a10dfd184d65ac9397a Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 18:30:50 -0500 Subject: [PATCH 04/57] Update Package Manifest --- package.json | 98 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 94 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 00d2870..83c607a 100644 --- a/package.json +++ b/package.json @@ -2,23 +2,113 @@ "name": "xml", "displayName": "XML Tools", "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", - "version": "0.0.1", + "version": "2.0.0", "publisher": "DotJoshJohnson", + "author": { + "name": "Josh Johnson", + "url": "https://github.com/DotJoshJohnson" + }, + "galleryBanner": { + "color": "#FFFFFF", + "theme": "light" + }, + "homepage": "https://github.com/DotJoshJohnson/vscode-xml", + "repository": { + "type": "git", + "url": "https://github.com/DotJoshJohnson/vscode-xml.git" + }, + "bugs": { + "url": "https://github.com/DotJoshJohnson/vscode-xml/issues" + }, "engines": { "vscode": "^1.19.0" }, "categories": [ + "Formatters", + "Languages", + "Linters", "Other" ], "activationEvents": [ - "onCommand:extension.sayHello" + "onCommand:xmlTools.evaluateXPath", + "onCommand:xmlTools.executeXQuery", + "onCommand:xmlTools.formatAsXml", + "onCommand:xmlTools.minifyXml", + "onLanguage:xml", + "onLanguage:xquery", + "onLanguage:xsl" ], "main": "./out/extension", "contributes": { "commands": [ { - "command": "extension.sayHello", - "title": "Hello World" + "command": "xmlTools.evaluateXPath", + "title": "XML Tools: Evaluate XPath" + }, + { + "command": "xmlTools.executeXQuery", + "title": "XML Tools: Execute XQuery" + }, + { + "command": "xmlTools.formatAsXml", + "title": "XML Tools: Format as XML" + }, + { + "command": "xmlTools.minifyXml", + "title": "XML Tools: Minify XML" + } + ], + "configuration": { + "title": "XML Tools Configuration", + "type": "object", + "properties": { + "xmlTools.ignoreDefaultNamespace": { + "type": "boolean", + "default": true, + "description": "Ignore default xmlns attributes when evaluating XPath." + }, + "xmlTools.persistXPathQuery": { + "type": "boolean", + "default": true, + "description": "Remember the last XPath query used." + }, + "xmlTools.removeCommentsOnMinify": { + "type": "boolean", + "default": false, + "description": "Remove XML comments during minification." + }, + "xmlTools.splitXmlnsOnFormat": { + "type": "boolean", + "default": true, + "description": "Put each xmlns attribute on a new line when formatting XML." + }, + "xmlTools.xqueryExecutionArguments": { + "type": "array", + "default": ["-xquery", "$(script)", "-in", "$(input)", "-out", "$(input.output.xml"], + "description": "Arguments to be passed to the XQuery execution engine." + }, + "xmlTools.xqueryExecutionEngine": { + "type": "string", + "default": "", + "description": "The full path to the executable to run when executing XQuery scripts." + } + } + }, + "grammars": [ + { + "language": "xquery", + "path": "./languages/xquery/xquery.tmLanguage", + "scopeName": "source.xquery" + } + ], + "keybindings": [ + { + "key": "ctrl+shift+alt+x", + "command": "xmlTools.evaluateXPath" + }, + { + "key": "ctrl+shift+alt+b", + "command": "xmlTools.formatXml" } ] }, From 80dc78c574dba02ca91b92655ce2a985eae7b670 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 18:30:59 -0500 Subject: [PATCH 05/57] Add XQuery Grammar --- languages/xquery/xquery.json | 23 + languages/xquery/xquery.tmLanguage | 1066 ++++++++++++++++++++++++++++ 2 files changed, 1089 insertions(+) create mode 100644 languages/xquery/xquery.json create mode 100644 languages/xquery/xquery.tmLanguage diff --git a/languages/xquery/xquery.json b/languages/xquery/xquery.json new file mode 100644 index 0000000..17f4dc4 --- /dev/null +++ b/languages/xquery/xquery.json @@ -0,0 +1,23 @@ +{ + "comments": { + "lineComment": "//", + "blockComment": [ + "/*", + "*/" + ] + }, + "brackets": [ + [ + "{", + "}" + ], + [ + "[", + "]" + ], + [ + "(", + ")" + ] + ] +} \ No newline at end of file diff --git a/languages/xquery/xquery.tmLanguage b/languages/xquery/xquery.tmLanguage new file mode 100644 index 0000000..e4c5a42 --- /dev/null +++ b/languages/xquery/xquery.tmLanguage @@ -0,0 +1,1066 @@ + + + + + fileTypes + + xq + xql + xqm + xqy + xquery + + firstLineMatch + ^\bxquery version\b.* + foldingStartMarker + ^\s*(<[^!?%/](?!.+?(/>|</.+?>))|<[!%]--(?!.+?--%?>)|<%[!]?(?!.+?%>))|(declare|.*\{\s*(//.*)?$) + foldingStopMarker + ^\s*(</[^>]+>|[/%]>|-->)\s*$|(.*\}\s*;?\s*|.*;) + keyEquivalent + ^~X + name + XQuery + patterns + + + include + #Xml + + + include + #entity + + + include + #bare-ampersand + + + begin + (<\?)\s*([-_a-zA-Z0-9]+) + captures + + 1 + + name + punctuation.definition.tag.begin.xml + + 2 + + name + entity.name.tag.xml + + + end + (\?>) + name + meta.tag.preprocessor.xml + patterns + + + match + ([a-zA-Z-]+) + name + entity.other.attribute-name.xml + + + include + #doublequotedString + + + include + #singlequotedString + + + + + match + ^xquery version .*;$ + name + keyword.control.import.xquery + + + match + \b(?i:(\d+\.\d*(e[\-\+]?\d+)?))(?=[^a-zA-Z_]) + name + constant.numeric.float.xquery + + + match + (?<=[^0-9a-zA-Z_])(?i:(\.\d+(e[\-\+]?\d+)?)) + name + constant.numeric.float.xquery + + + match + \b(?i:(\d+e[\-\+]?\d+)) + name + constant.numeric.float.xquery + + + match + \b([1-9]+[0-9]*|0) + name + constant.numeric.integer.decimal.xquery + + + match + \b(import|module|schema)\b + name + keyword.control.import.xquery + + + begin + \(: + captures + + 0 + + name + punctuation.definition.comment.xquery + + + end + :\) + name + comment.block.xquery + patterns + + + include + #block_comment + + + + + comment + http://www.w3.org/TR/xpath-datamodel/#types + match + (?<![:\-_a-zA-Z0-9])((xs:)(string|boolean|decimal|float|double|duration|dateTime|time|date|gYearMonth|gYear|gMonthDay|gDay|gMonth|hexBinary|base64Binary|anyURI|QName|NOTATION|anyAtomicType|anyType|anySimpleType|untypedAtomic|dayTimeDuration|yearMonthDuration|integer|nonPositiveInteger|negativeInteger|long|int|short|byte|nonNegativeInteger|unsignedLong|unsignedInt|unsignedShort|unsignedByte|positiveInteger|ENTITY|ID|NMTOKEN|language|NCName|Name|token|normalizedString))(?![:\-_a-zA-Z0-9]) + name + support.type.xquery + + + captures + + 1 + + name + punctuation.definition.variable.xquery + + + match + ((\$)(?:([\-_a-zA-Z0-9]+)((:)))?([\-_a-zA-Z0-9]+)) + name + variable.other.xquery + + + match + /(child|descendant|attribute|self|descendant-or-self|following-sibling|following|parent|ancestor|preceding-sibling|preceding|ancestor-or-self):: + name + support.constant.xquery + + + name + meta.function.xquery + patterns + + + captures + + 1 + + name + storage.type.function.xquery + + 2 + + name + entity.name.function.xquery + + + match + (function)\s+((?:([\-_a-zA-Z0-9]+):)?([\-_a-zA-Z0-9]+))\s*\( + patterns + + + include + #function_parameters + + + include + $self + + + + + begin + \s*(function)\s+(?!namespace) + beginCaptures + + 1 + + name + storage.type.function.xquery + + + end + \( + patterns + + + captures + + 1 + + name + entity.name.function.xquery + + + match + ((?:([\-_a-zA-Z0-9]+):)?([\-_a-zA-Z0-9]+)) + + + include + #function_parameters + + + include + $self + + + + + + + captures + + 1 + + name + keyword.other.xquery + + 2 + + name + storage.type.variable.xquery + + 3 + + name + entity.name.function.variable.xquery + + + match + (declare)\s+(variable)\s+(\$(?:[\-_a-zA-Z0-9]+:)?[\-_a-zA-Z0-9]+) + name + meta.variable.xquery + + + begin + (declare)\s+(variable)\s* + captures + + 1 + + name + keyword.other.xquery + + 2 + + name + storage.type.variable.xquery + + + end + (\$(?:[\-_a-zA-Z0-9]+:)?[\-_a-zA-Z0-9]+) + endCaptures + + 1 + + name + entity.name.function.variable.xquery + + + name + meta.variable.xquery + + + match + \b(base-uri|boundary-space|collation|construction|copy-namespaces|declare|default|element|empty(?![-])|function|greatest|import|inherit|instance|least|module|namespace|no-inherit|no-preserve|option|order|ordered|ordering|preserve|strip|unordered|variable|xdmp:mapping|xdmp:transaction-mode)\b + name + keyword.other.prolog.xquery + + + match + (?<![:\-_a-zA-Z0-9])(of|as|by|in|at|or|and)(?![:\-_a-zA-Z0-9]) + name + keyword.operator.logical.xquery + + + captures + + 1 + + name + keyword.control.flow.xquery + + + match + (?<![:\-_a-zA-Z0-9])(for|let|return|where|if|then|else|order by|satisfies|every)(?![:\-_a-zA-Z0-9]) + + + captures + + 1 + + name + support.type.xquery + + + match + (?<![:\-_a-zA-Z0-9])(element|attribute|document|document-node\(\)|empty-sequence\(\)|schema-element|schema-attribute|processing-instruction|comment|text|node)(?![:\-_a-zA-Z0-9]) + + + match + := + name + keyword.operator.assignment.xquery + + + match + (?<![:\-_a-zA-Z0-9])(\+|-|<=?|>=?|eq|ne|lt|le|ge|gt|\*|div|idiv|mod)(?![:\-_a-zA-Z0-9]) + name + keyword.operator.arithmetic.xquery + + + match + (?<![:\-_a-zA-Z0-9])((fn:)?(abs|adjust-date-to-timezone|adjust-dateTime-to-timezone|adjust-time-to-timezone|analyze-string|avg|base-uri|boolean|ceiling|codepoint-equal|codepoints-to-string|collection|compare|concat|contains|count|current-date|current-dateTime|current-time|data|dateTime|day-from-date|day-from-dateTime|days-from-duration|deep-equal|default-collation|distinct-values|doc|doc-available|document|document-uri|empty|encode-for-uri|ends-with|error|escape-html-uri|escape-uri|exactly-one|exists|false|filter|floor|fold-left|fold-right|format-date|format-dateTime|format-number|format-time|function-arity|function-available|function-lookup|function-name|generate-id|head|hours-from-dateTime|hours-from-duration|hours-from-time|id|idref|implicit-timezone|in-scope-prefixes|index-of|insert-before|iri-to-uri|lang|last|local-name|local-name-from-QName|lower-case|map|map-pairs|matches|max|min|minutes-from-dateTime|minutes-from-duration|minutes-from-time|month-from-date|month-from-dateTime|months-from-duration|name|namespace-uri|namespace-uri-for-prefix|namespace-uri-from-QName|nilled|node-name|normalize-space|normalize-unicode|not|number|one-or-more|position|prefix-from-QName|QName|remove|replace|resolve-QName|resolve-uri|reverse|root|round|round-half-to-even|seconds-from-dateTime|seconds-from-duration|seconds-from-time|starts-with|static-base-uri|string|string-join|string-length|string-to-codepoints|subsequence|substring|substring-after|substring-before|sum|tail|timezone-from-date|timezone-from-dateTime|timezone-from-time|tokenize|trace|translate|true|type-available|unordered|unparsed-text|unparsed-text-available|upper-case|year-from-date|year-from-dateTime|years-from-duration|zero-or-one))(?=\s*\() + name + support.function.builtin.xquery + + + match + (?<![:\-_a-zA-Z0-9])(xdmp:(access|add-response-header|add64|address-bindable|amp|amp-roles|and64|annotation|apply|architecture|atomizable|audit|aws-url-encode|base64-decode|base64-encode|binary-decode|binary-is-external|binary-is-large|binary-is-small|binary-join|binary-key|binary-offset|binary-original-length|binary-size|cache-status|can-grant-roles|castable-as|cluster|cluster-name|collation-canonical-uri|collection-delete|collection-locks|collection-properties|commit|compressed-tree-cache-clear|compressed-tree-cache-partitions|compressed-tree-cache-size|configuration-timestamp|content-type|crypt|crypt2|customized-binary|data-directory|database|database-backup|database-backup-cancel|database-backup-purge|database-backup-status|database-backup-validate|database-forests|database-fragment-counts|database-global-nonblocking-timestamp|database-is-replica|database-maintain-last-modified|database-name|database-nonblocking-timestamp|database-partition-forests|database-path-namespaces|database-restore|database-restore-cancel|database-restore-status|database-restore-validate|databases|dayname-from-date|debug-print|decode-from-NCName|default-collections|default-in-memory-limit|default-in-memory-list-size|default-in-memory-range-index-size|default-in-memory-reverse-index-size|default-in-memory-tree-size|default-in-memory-triple-index-size|default-journal-count|default-journal-size|default-license-key|default-licensee|default-permissions|default-preallocate-journals|default-s3-domain|default-zone|delete-cluster-config-file|delete-host-config-file|describe|diacritic-less|directory|directory-create|directory-delete|directory-locks|directory-properties|disable-event|document-add-collections|document-add-permissions|document-add-properties|document-assign|document-delete|document-filter|document-forest|document-get|document-get-collections|document-get-events|document-get-permissions|document-get-properties|document-get-quality|document-insert|document-load|document-locks|document-properties|document-remove-collections|document-remove-permissions|document-remove-properties|document-set-collections|document-set-permissions|document-set-properties|document-set-property|document-set-quality|document-timestamp|dsa-generate|dump-paths|dump-xsd|duplicates|eager|ec2-host|ec2-product-code|elapsed-time|element-content-type|email|email-address|enable-event|encode-for-NCName|encoding-language-detect|estimate|eval|eval-in|excel-convert|exists|expanded-tree-cache-clear|expanded-tree-cache-partitions|expanded-tree-cache-size|external-binary|external-binary-path|external-security|filesystem-directory|filesystem-directory-create|filesystem-directory-delete|filesystem-file|filesystem-file-delete|filesystem-file-exists|filesystem-file-length|filesystem-file-rename|filesystem-filepath|foreign-cluster-status|foreign-clusters|forest|forest-backup|forest-clear|forest-combine|forest-compare|forest-copy|forest-counts|forest-databases|forest-delete|forest-directory-delete|forest-directory-exists|forest-docinfos|forest-get-readonly|forest-host|forest-name|forest-online|forest-open-replica|forest-rename|forest-restart|forest-restore|forest-rollback|forest-set-readonly|forest-status|forest-updates-allowed|forests|format-number|from-json|function|function-module|function-name|function-parameter-name|function-parameter-type|function-return-type|function-signature|functions|get|get-current-roles|get-current-user|get-current-userid|get-external-variable|get-hot-updates|get-invoked-path|get-ip|get-original-url|get-orphaned-binaries|get-request-body|get-request-client-address|get-request-client-certificate|get-request-field|get-request-field-content-type|get-request-field-filename|get-request-field-names|get-request-header|get-request-header-names|get-request-method|get-request-part-body|get-request-part-headers|get-request-path|get-request-port|get-request-protocol|get-request-url|get-request-user|get-request-username|get-response-code|get-response-encoding|get-server-field|get-server-field-names|get-session-field|get-session-field-names|get-transaction-by-xid|get-transaction-mode|get-url-rewriter-path|getenv|group|group-hosts|group-name|group-servers|groups|gss-server-negotiate|gunzip|gzip|has-privilege|hash32|hash64|hex-to-integer|hmac-md5|hmac-sha1|hmac-sha256|hmac-sha512|host|host-cores|host-cpus|host-forests|host-get-ssl-fips-enabled|host-name|host-size|host-status|hostname|hosts|http-delete|http-get|http-head|http-options|http-post|http-put|initcap|install-directory|integer-to-hex|integer-to-octal|invoke|invoke-function|invoke-in|jobject|key-from-QName|language-stemmer-normalization|language-tokenizer-normalization|lazy|ldap-lookup|ldap-search|license-key|license-key-agreement|license-key-cores|license-key-cpus|license-key-decode|license-key-encode|license-key-expires|license-key-options|license-key-size|license-key-valid|license-key-version|licensee|list-cache-clear|list-cache-partitions|list-cache-size|load|lock-acquire|lock-for-update|lock-release|log|log-level|login|logout|lshift64|match-priority|md5|merge|merge-cancel|merging|missing-directories|modules-database|modules-root|month-name-from-date|mul64|multipart-decode|multipart-encode|n3|n3-get|node-database|node-delete|node-insert-after|node-insert-before|node-insert-child|node-kind|node-output-definition|node-replace|node-uri|not64|nquad|nquad-get|octal-to-integer|or64|original-binary|parse-dateTime|parse-yymmdd|path|pdf-convert|permission|plan|plannable|platform|position|powerpoint-convert|pre-release-expires|pretty-print|privilege|privilege-roles|product-edition|product-environment|product-initials|product-name|QName-from-key|quality|quarter-from-date|query-forests|query-meters|query-trace|quote|random|read-cluster-config-file|read-host-config-file|redirect-response|remove-orphaned-binary|request|request-cancel|request-key|request-status|request-timestamp|resolve-uri|restart|rethrow|role|role-roles|rollback|rsa-generate|rshift64|save|schema-database|score|security-assert|security-database|security-version|server|server-backup|server-name|server-restore|server-status|servers|set|set-current-transaction|set-hot-updates|set-request-time-limit|set-response-code|set-response-content-type|set-response-encoding|set-server-field|set-server-field-privilege|set-session-field|set-transaction-mode|set-transaction-name|set-transaction-time-limit|sha1|sha256|sha384|sha512|shutdown|sleep|smtp-relay|spawn|spawn-function|spawn-in|sql|start-journal-archiving|step64|stop-journal-archiving|strftime|subbinary|test-future|test-lazy|test-skiplist|tidy|timestamp-to-wallclock|to-json|trace|transaction|transaction-commit|transaction-create|transaction-rollback|triggers-database|triple-cache-partitions|triple-cache-size|triple-value-cache-partitions|triple-value-cache-size|turtle|turtle-get|type|unpath|unquote|update|uri-content-type|uri-format|uri-is-file|url-decode|url-encode|user|user-external-security|user-last-login|user-roles|username|validate|value|version|wallclock-to-timestamp|week-from-date|weekday-from-date|word-convert|write-cluster-config-file|write-host-config-file|x509-certificate-extract|x509-certificate-generate|x509-crl-der2pem|x509-crl-extract|x509-crl-generate|x509-request-extract|x509-request-generate|xa-complete|xa-complete-xid|xa-complete1|xa-forget|xa-forget-xid|xa-prepare|xor64|xquery-version|xslt-eval|xslt-invoke|yearday-from-date|zip-create|zip-get|zip-manifest))(?=\s*\() + name + support.function.marklogic.xquery + + + match + (?<![:\-_a-zA-Z0-9])(cts:(aggregate|and-not-query|and-not-query-negative-query|and-not-query-positive-query|and-query|and-query-options|and-query-queries|approx-center|arc-intersection|avg|avg-aggregate|bearing|boost-query|boost-query-boosting-query|boost-query-matching-query|bounding-boxes|box|box-east|box-intersects|box-north|box-south|box-west|circle|circle-center|circle-intersects|circle-radius|classify|cluster|codepoint-tokenizer-class|collection-match|collection-query|collection-query-uris|collection-reference|collections|complex-polygon|complex-polygon-contains|complex-polygon-inner|complex-polygon-intersects|complex-polygon-outer|confidence|contains|correlation|count|count-aggregate|covariance|covariance-p|deregister|destination|directory-query|directory-query-depth|directory-query-uris|distance|distinctive-terms|document-fragment-query|document-fragment-query-query|document-query|document-query-uris|element-attribute-pair-geospatial-boxes|element-attribute-pair-geospatial-query|element-attribute-pair-geospatial-query-element-name|element-attribute-pair-geospatial-query-latitude-name|element-attribute-pair-geospatial-query-longitude-name|element-attribute-pair-geospatial-query-options|element-attribute-pair-geospatial-query-region|element-attribute-pair-geospatial-query-weight|element-attribute-pair-geospatial-value-match|element-attribute-pair-geospatial-values|element-attribute-range-query|element-attribute-range-query-attribute-name|element-attribute-range-query-element-name|element-attribute-range-query-operator|element-attribute-range-query-options|element-attribute-range-query-value|element-attribute-range-query-weight|element-attribute-reference|element-attribute-value-co-occurrences|element-attribute-value-geospatial-co-occurrences|element-attribute-value-match|element-attribute-value-query|element-attribute-value-query-attribute-name|element-attribute-value-query-element-name|element-attribute-value-query-options|element-attribute-value-query-text|element-attribute-value-query-weight|element-attribute-value-ranges|element-attribute-values|element-attribute-word-match|element-attribute-word-query|element-attribute-word-query-attribute-name|element-attribute-word-query-element-name|element-attribute-word-query-options|element-attribute-word-query-text|element-attribute-word-query-weight|element-attribute-words|element-child-geospatial-boxes|element-child-geospatial-query|element-child-geospatial-query-child-name|element-child-geospatial-query-element-name|element-child-geospatial-query-options|element-child-geospatial-query-region|element-child-geospatial-query-weight|element-child-geospatial-value-match|element-child-geospatial-values|element-geospatial-boxes|element-geospatial-query|element-geospatial-query-element-name|element-geospatial-query-options|element-geospatial-query-region|element-geospatial-query-weight|element-geospatial-value-match|element-geospatial-values|element-pair-geospatial-boxes|element-pair-geospatial-query|element-pair-geospatial-query-element-name|element-pair-geospatial-query-latitude-name|element-pair-geospatial-query-longitude-name|element-pair-geospatial-query-options|element-pair-geospatial-query-region|element-pair-geospatial-query-weight|element-pair-geospatial-value-match|element-pair-geospatial-values|element-query|element-query-element-name|element-query-query|element-range-query|element-range-query-element-name|element-range-query-operator|element-range-query-options|element-range-query-value|element-range-query-weight|element-reference|element-value-co-occurrences|element-value-geospatial-co-occurrences|element-value-match|element-value-query|element-value-query-element-name|element-value-query-options|element-value-query-text|element-value-query-weight|element-value-ranges|element-values|element-word-match|element-word-query|element-word-query-element-name|element-word-query-options|element-word-query-text|element-word-query-weight|element-words|field-range-query|field-range-query-field-name|field-range-query-operator|field-range-query-options|field-range-query-value|field-range-query-weight|field-reference|field-value-co-occurrences|field-value-match|field-value-query|field-value-query-field-name|field-value-query-options|field-value-query-text|field-value-query-weight|field-value-ranges|field-values|field-word-match|field-word-query|field-word-query-field-name|field-word-query-options|field-word-query-text|field-word-query-weight|field-words|fitness|frequency|geospatial-attribute-pair-reference|geospatial-co-occurrences|geospatial-element-attribute-pair-reference|geospatial-element-child-reference|geospatial-element-pair-reference|geospatial-element-reference|geospatial-path-reference|hash-terms|index-path-key|index-path-keys|index-path-ns-prefixes|linear-model|linestring|linestring-vertices|locks-query|locks-query-query|long-lat-point|matches|max|median|min|near-query|near-query-distance|near-query-options|near-query-queries|near-query-weight|not-in-query|not-in-query-negative-query|not-in-query-positive-query|not-query|not-query-query|not-query-weight|or-query|or-query-queries|parse|parse-wkt|path-geospatial-query|path-geospatial-query-options|path-geospatial-query-path-expression|path-geospatial-query-region|path-geospatial-query-weight|path-range-query|path-range-query-operator|path-range-query-options|path-range-query-path-name|path-range-query-value|path-range-query-weight|path-reference|percent-rank|percentile|point|point-latitude|point-longitude|polygon|polygon-contains|polygon-intersects|polygon-vertices|properties-query|properties-query-query|punctuation|quality|query|rank|reference|reference-parse|region|region-contains|region-intersects|register|registered-query|registered-query-ids|registered-query-options|registered-query-weight|relevance-info|remainder|reverse-query|reverse-query-nodes|reverse-query-weight|score|search|shortest-distance|show-get-query|similar-query|similar-query-nodes|similar-query-weight|space|special|stddev|stddev-p|stem|sum|sum-aggregate|term-query|term-query-term|term-query-weight|thresholds|time-series|timestamp-query|to-wkt|token|tokenize|train|triple-range-query|triple-range-query-object|triple-range-query-operator|triple-range-query-options|triple-range-query-predicate|triple-range-query-subject|triple-range-query-weight|triples|uri-match|uri-reference|uris|valid-index-path|value-co-occurrences|value-match|value-ranges|value-tuples|values|variance|variance-p|word|word-match|word-query|word-query-options|word-query-text|word-query-weight|words))(?=\s*\() + name + support.function.cts.xquery + + + match + (?<![:\-_a-zA-Z0-9])(xdmp:([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*:)?([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*))\s*\( + name + invalid.illegal.function.xdmp + + + match + (?<![:\-_a-zA-Z0-9])(cts:([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*:)?([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*))\s*\( + name + invalid.illegal.function.cts + + + include + #string + + + begin + (\() + beginCaptures + + 1 + + name + punctuation.definition.begin.xquery + + + end + (\)) + endCaptures + + 1 + + name + punctuation.definition.end.xquery + + + name + meta + patterns + + + include + $self + + + + + include + #function_call + + + repository + + EntityDecl + + begin + (<!)(ENTITY)\s+(%\s+)?([:a-zA-Z_][:a-zA-Z0-9_.-]*)(\s+(?:SYSTEM|PUBLIC)\s+)? + captures + + 1 + + name + punctuation.definition.tag.begin.xml + + 2 + + name + keyword.entity.xml + + 3 + + name + punctuation.definition.entity.xml + + 4 + + name + variable.entity.xml + + 5 + + name + keyword.entitytype.xml + + + end + (>) + patterns + + + include + #doublequotedStringXml + + + include + #singlequotedStringXml + + + + Xml + + patterns + + + begin + (<\?)\s*([-_a-zA-Z0-9]+) + captures + + 1 + + name + punctuation.definition.tag.begin.xml + + 2 + + name + entity.name.tag.xml + + + end + (\?>) + name + meta.tag.preprocessor.xml + patterns + + + match + ([a-zA-Z-]+) + name + entity.other.attribute-name.xml + + + include + #doublequotedString + + + include + #singlequotedString + + + + + begin + (<!)(DOCTYPE)\s+([:a-zA-Z_][:a-zA-Z0-9_.-]*) + captures + + 1 + + name + punctuation.definition.tag.begin.xml + + 2 + + name + keyword.doctype.xml + + 3 + + name + variable.documentroot.xml + + + end + \s*(>) + name + meta.tag.sgml.doctype.xml + patterns + + + include + #internalSubset + + + + + begin + <[!%]-- + captures + + 0 + + name + punctuation.definition.comment.xml + + + end + --%?> + name + comment.block.xml + + + begin + <\? + captures + + 0 + + name + punctuation.definition.processing-instruction.xml + + + end + \?> + name + comment.processing-instruction.xml + + + begin + (<)((?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+))(?=(\s[^>]*)?></\2>) + beginCaptures + + 1 + + name + punctuation.definition.tag.begin.xml + + 3 + + name + entity.name.tag.namespace.xml + + 4 + + name + entity.name.tag.xml + + 5 + + name + punctuation.separator.namespace.xml + + 6 + + name + entity.name.tag.localname.xml + + + end + (>)(<)(/)(?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+)(>) + endCaptures + + 1 + + name + punctuation.definition.tag.end.xml + + 2 + + name + punctuation.definition.tag.begin.xml meta.scope.between-tag-pair.xml + + 3 + + name + punctuation.definition.tag.begin.xml + + 4 + + name + entity.name.tag.namespace.xml + + 5 + + name + entity.name.tag.xml + + 6 + + name + punctuation.separator.namespace.xml + + 7 + + name + entity.name.tag.localname.xml + + 8 + + name + punctuation.definition.tag.end.xml + + + name + meta.tag.no-content.xml + patterns + + + include + #tagStuff + + + + + begin + (</?)(?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9:]+) + captures + + 1 + + name + punctuation.definition.tag.begin.xml + + 2 + + name + entity.name.tag.namespace.xml + + 3 + + name + entity.name.tag.xml + + 4 + + name + punctuation.separator.namespace.xml + + 5 + + name + entity.name.tag.localname.xml + + + end + (/?>) + endCaptures + + 1 + + name + punctuation.definition.tag.end.xml + + + name + meta.tag.xml + patterns + + + include + #tagStuff + + + + + include + #entity + + + include + #bare-ampersand + + + begin + <!\[CDATA\[ + beginCaptures + + 0 + + name + punctuation.definition.string.begin.xml + + + end + ]]> + endCaptures + + 0 + + name + punctuation.definition.string.end.xml + + + name + string.unquoted.cdata.xml + + + + bare-ampersand + + match + & + name + invalid.illegal.bad-ampersand.xml + + block_comment + + begin + \(: + end + :\) + patterns + + + include + #block_comment + + + + code_block + + begin + \{ + end + \} + name + meta.code-block.xquery + patterns + + + include + $self + + + + doublequotedString + + begin + (?<![-_a-zA-Z0-9:]>)\s*"(?!\s*</[-_a-zA-Z0-9:]) + beginCaptures + + 0 + + name + punctuation.definition.string.begin.xquery + + + end + " + endCaptures + + 0 + + name + punctuation.definition.string.end.xquery + + + name + string.quoted.double.xquery + patterns + + + include + #entity + + + include + #bare-ampersand + + + + doublequotedStringXml + + begin + " + beginCaptures + + 0 + + name + punctuation.definition.string.begin.xml + + + end + " + endCaptures + + 0 + + name + punctuation.definition.string.end.xml + + + name + string.quoted.double.xml + patterns + + + include + #entity + + + include + #bare-ampersand + + + include + #code_block + + + + entity + + captures + + 1 + + name + punctuation.definition.constant.xml + + + match + (&)([:a-zA-Z_][:a-zA-Z0-9_.-]*|#[0-9]+|#x[0-9a-fA-F]+)(;) + name + constant.character.entity.xml + + function_call + + captures + + 1 + + name + punctuation.definition.parameters.begin.xquery + + + match + [\-_a-zA-Z0-9]+:[\-_a-zA-Z0-9]+(?=\() + name + support.function.xquery + + function_parameters + + match + \$([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*:)?([\-_a-zA-Z0-9][\-\._a-zA-Z0-9]*) + name + variable.parameter.xquery + + internalSubset + + begin + (\[) + captures + + 1 + + name + punctuation.definition.constant.xml + + + end + (\]) + name + meta.internalsubset.xml + patterns + + + include + #EntityDecl + + + include + #parameterEntity + + + + parameterEntity + + captures + + 1 + + name + punctuation.definition.constant.xml + + 3 + + name + punctuation.definition.constant.xml + + + match + (%)([:a-zA-Z_][:a-zA-Z0-9_.-]*)(;) + name + constant.character.parameter-entity.xml + + singlequotedString + + begin + (?<![-_a-zA-Z0-9:]>)\s*'(?!\s*</[-_a-zA-Z0-9:]) + beginCaptures + + 0 + + name + punctuation.definition.string.begin.xquery + + + end + ' + endCaptures + + 0 + + name + punctuation.definition.string.end.xquery + + + name + string.quoted.single.xquery + patterns + + + include + #entity + + + include + #bare-ampersand + + + + singlequotedStringXml + + begin + ' + beginCaptures + + 0 + + name + punctuation.definition.string.begin.xml + + + end + ' + endCaptures + + 0 + + name + punctuation.definition.string.end.xml + + + name + string.quoted.single.xml + patterns + + + include + #entity + + + include + #bare-ampersand + + + include + #code_block + + + + string + + patterns + + + include + #singlequotedString + + + include + #doublequotedString + + + + tagStuff + + patterns + + + captures + + 1 + + name + entity.other.attribute-name.namespace.xml + + 2 + + name + entity.other.attribute-name.xml + + 3 + + name + punctuation.separator.namespace.xml + + 4 + + name + entity.other.attribute-name.localname.xml + + + match + (?:([-_a-zA-Z0-9]+)((:)))?([-_a-zA-Z0-9]+)= + + + include + #doublequotedStringXml + + + include + #singlequotedStringXml + + + + + scopeName + source.xquery + uuid + cddd8a73-ed1e-4303-a649-a23e816fafa1 + + \ No newline at end of file From 11d5034661aa70fbc1a10c6d63b2e60b8e377967 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 20:21:28 -0500 Subject: [PATCH 06/57] Add TravisCI Configuration --- .travis.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..523be16 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,10 @@ +notifications: + email: false + +sudo: false + +install: + - npm install + +script: + - npm run test \ No newline at end of file From e9a78f2f15758b86d69a7d184da46350788223d9 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 20:27:27 -0500 Subject: [PATCH 07/57] Update README --- README.md | 75 ++++++++++++++++--------------------------------------- 1 file changed, 21 insertions(+), 54 deletions(-) diff --git a/README.md b/README.md index a2165ed..d92e6f9 100644 --- a/README.md +++ b/README.md @@ -1,65 +1,32 @@ -# xml README - -This is the README for your extension "xml". After writing up a brief description, we recommend including the following sections. +# XML Tools for Visual Studio Code +[![](https://img.shields.io/badge/gitter-join_chat-1dce73.svg?logo=data%3Aimage%2Fsvg%2Bxml%3Bbase64%2CPD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4NCjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cmVjdCB4PSIwIiB5PSI1IiBmaWxsPSIjZmZmIiB3aWR0aD0iMSIgaGVpZ2h0PSI1Ii8%2BPHJlY3QgeD0iMiIgeT0iNiIgZmlsbD0iI2ZmZiIgd2lkdGg9IjEiIGhlaWdodD0iNyIvPjxyZWN0IHg9IjQiIHk9IjYiIGZpbGw9IiNmZmYiIHdpZHRoPSIxIiBoZWlnaHQ9IjciLz48cmVjdCB4PSI2IiB5PSI2IiBmaWxsPSIjZmZmIiB3aWR0aD0iMSIgaGVpZ2h0PSI0Ii8%2BPC9zdmc%2B&logoWidth=8)](https://gitter.im/vscode-xml/vscode-xml) +[![Build Status](https://travis-ci.org/DotJoshJohnson/vscode-xml.svg?branch=master)](https://travis-ci.org/DotJoshJohnson/vscode-xml) ## Features - -Describe specific features of your extension including screenshots of your extension in action. Image paths are relative to this README file. - -For example if there is an image subfolder under your extension project workspace: - -\!\[feature X\]\(images/feature-x.png\) - -> Tip: Many popular extensions utilize animations. This is an excellent way to show off your extension! We recommend short, focused animations that are easy to follow. +* [XML Formatting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-formatting) +* [XML Tree View](https://github.com/DotJoshJohnson/vscode-xml/wiki/xml-tree-view) +* [XPath Evaluation](https://github.com/DotJoshJohnson/vscode-xml/wiki/xpath-evaluation) +* [XQuery Linting](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-linting) +* [XQuery Execution](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-script-execution) +* [XQuery Code Completion](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-code-completion) ## Requirements - -If you have any requirements or dependencies, add a section describing those and how to install and configure them. +*In Progress* ## Extension Settings - -Include if your extension adds any VS Code settings through the `contributes.configuration` extension point. - -For example: - -This extension contributes the following settings: - -* `myExtension.enable`: enable/disable this extension -* `myExtension.thing`: set to `blah` to do something +* `xmlTools.ignoreDefaultNamespace`: Ignore default xmlns attributes when evaluating XPath. +* `xmlTools.persistXPathQuery`: Remember the last XPath query used. +* `xmlTools.removeCommentsOnMinify`: Remove XML comments during minification. +* `xmlTools.splitXmlnsOnFormat`: Put each xmlns attribute on a new line when formatting XML. +* `xmlTools.xmlFormatterImplementation`: Supported XML Formatters: `classic`. +* `xmlTools.xqueryExecutionArguments`: Arguments to be passed to the XQuery execution engine. +* `xmlTools.xqueryExecutionEngine`: The full path to the executable to run when executing XQuery scripts. ## Known Issues - -Calling out known issues can help limit users opening duplicate issues against your extension. +*In Progress* ## Release Notes +Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases). -Users appreciate release notes as you update your extension. - -### 1.0.0 - -Initial release of ... - -### 1.0.1 - -Fixed issue #. - -### 1.1.0 - -Added features X, Y, and Z. - ------------------------------------------------------------------------------------------------------------ - -## Working with Markdown - -**Note:** You can author your README using Visual Studio Code. Here are some useful editor keyboard shortcuts: - -* Split the editor (`Cmd+\` on OSX or `Ctrl+\` on Windows and Linux) -* Toggle preview (`Shift+CMD+V` on OSX or `Shift+Ctrl+V` on Windows and Linux) -* Press `Ctrl+Space` (Windows, Linux) or `Cmd+Space` (OSX) to see a list of Markdown snippets - -### For more information - -* [Visual Studio Code's Markdown Support](http://code.visualstudio.com/docs/languages/markdown) -* [Markdown Syntax Reference](https://help.github.com/articles/markdown-basics/) - -**Enjoy!** \ No newline at end of file +## Issues +Run into a bug? Report it [here](https://github.com/DotJoshJohnson/vscode-xml/issues). From ff15044855a6e2b26771e87d8ea180fedb2da49c Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 20:28:24 -0500 Subject: [PATCH 08/57] Add License --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..db94f28 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2015 Josh Johnson + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file From 394188a2046cc0f7fc552e38fb9a3f57b0453588 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 20:29:09 -0500 Subject: [PATCH 09/57] Update CHANGELOG --- CHANGELOG.md | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c21ea17..6e0befc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1 @@ -# Change Log -All notable changes to the "xml" extension will be documented in this file. - -Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how to structure this file. - -## [Unreleased] -- Initial release \ No newline at end of file +Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases). \ No newline at end of file From bedb87854972aa45632413c83f44182e01449cc0 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 20:30:03 -0500 Subject: [PATCH 10/57] Implement Classic XML Formatting --- package.json | 5 + src/extension.ts | 42 +++--- .../formatters/classic-xml-formatter.ts | 123 ++++++++++++++++++ src/formatting/xml-formatter.ts | 6 + .../xml-formatting-edit-provider.ts | 66 ++++++++++ src/formatting/xml-formatting-options.ts | 8 ++ src/test/extension.test.ts | 7 +- tsconfig.json | 4 +- tslint.json | 2 +- 9 files changed, 233 insertions(+), 30 deletions(-) create mode 100644 src/formatting/formatters/classic-xml-formatter.ts create mode 100644 src/formatting/xml-formatter.ts create mode 100644 src/formatting/xml-formatting-edit-provider.ts create mode 100644 src/formatting/xml-formatting-options.ts diff --git a/package.json b/package.json index 83c607a..55aa370 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,11 @@ "default": true, "description": "Put each xmlns attribute on a new line when formatting XML." }, + "xmlTools.xmlFormatterImplementation": { + "type": "string", + "default": "classic", + "description": "Supported XML Formatters: classic" + }, "xmlTools.xqueryExecutionArguments": { "type": "array", "default": ["-xquery", "$(script)", "-in", "$(input)", "-out", "$(input.output.xml"], diff --git a/src/extension.ts b/src/extension.ts index 15d78b0..720c780 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,29 +1,27 @@ -"use strict"; -// The module 'vscode' contains the VS Code extensibility API -// Import the module and reference it with the alias vscode in your code below -import * as vscode from "vscode"; +import { workspace } from "vscode"; +import { ExtensionContext, WorkspaceConfiguration } from "vscode"; -// this method is called when your extension is activated -// your extension is activated the very first time the command is executed -export function activate(context: vscode.ExtensionContext) { +const onActivateHandlers: OnActivateHandler[] = []; +const onDeactivateHandlers: OnDeactivateHandler[] = []; - // Use the console to output diagnostic information (console.log) and errors (console.error) - // This line of code will only be executed once when your extension is activated - console.log("Congratulations, your extension \"xml\" is now active!"); +export function activate(context: ExtensionContext) { + const workspaceConfiguration = workspace.getConfiguration("xmlTools"); - // The command has been defined in the package.json file - // Now provide the implementation of the command with registerCommand - // The commandId parameter must match the command field in package.json - const disposable = vscode.commands.registerCommand("extension.sayHello", () => { - // The code you place here will be executed every time your command is executed - - // Display a message box to the user - vscode.window.showInformationMessage("Hello World!"); - }); - - context.subscriptions.push(disposable); + onActivateHandlers.forEach(x => x(context, workspaceConfiguration)); } -// this method is called when your extension is deactivated export function deactivate() { + onDeactivateHandlers.forEach(x => x()); } + +export function onActivate(handler: OnActivateHandler): void { + onActivateHandlers.push(handler); +} + +export function onDeactivate(handler: OnDeactivateHandler): void { + onDeactivateHandlers.push(handler); +} + +export type OnActivateHandler = (context: ExtensionContext, config: WorkspaceConfiguration) => void; + +export type OnDeactivateHandler = () => void; diff --git a/src/formatting/formatters/classic-xml-formatter.ts b/src/formatting/formatters/classic-xml-formatter.ts new file mode 100644 index 0000000..12a10c9 --- /dev/null +++ b/src/formatting/formatters/classic-xml-formatter.ts @@ -0,0 +1,123 @@ +import { XmlFormatter } from "../xml-formatter"; +import { XmlFormattingOptions } from "../xml-formatting-options"; + +export class ClassicXmlFormatter implements XmlFormatter { + + formatXml(xml: string, options: XmlFormattingOptions): string { + xml = this.minifyXml(xml, options); + xml = xml.replace(/ -1) { + output += this._getIndent(options, level, parts[i]); + inComment = true; + + // end /) > -1 || parts[i].search(/\]>/) > -1 || parts[i].search(/!DOCTYPE/) > -1) { + inComment = false; + } + } else if (parts[i].search(/-->/) > -1 || parts[i].search(/\]>/) > -1) { + output += parts[i]; + inComment = false; + } else if (/^<(\w|:)/.test(parts[i - 1]) && /^<\/(\w|:)/.test(parts[i]) + && /^<[\w:\-\.\,\/]+/.exec(parts[i - 1])[0] === /^<\/[\w:\-\.\,]+/.exec(parts[i])[0].replace("/", "")) { + + output += parts[i]; + if (!inComment) { level--; } + } else if (parts[i].search(/<(\w|:)/) > -1 && parts[i].search(/<\//) === -1 && parts[i].search(/\/>/) === -1) { + output = (!inComment) ? output += this._getIndent(options, level++, parts[i]) : output += parts[i]; + } else if (parts[i].search(/<(\w|:)/) > -1 && parts[i].search(/<\//) > -1) { + output = (!inComment) ? output += this._getIndent(options, level, parts[i]) : output += parts[i]; + } else if (parts[i].search(/<\//) > -1) { + output = (!inComment) ? output += this._getIndent(options, --level, parts[i]) : output += parts[i]; + } else if (parts[i].search(/\/>/) > -1 && (!options.splitXmlnsOnFormat || parts[i].search(/xmlns(:|=)/) === -1)) { + output = (!inComment) ? output += this._getIndent(options, level, parts[i]) : output += parts[i]; + } else if (parts[i].search(/\/>/) > -1 && parts[i].search(/xmlns(:|=)/) > -1 && options.splitXmlnsOnFormat) { + output = (!inComment) ? output += this._getIndent(options, level--, parts[i]) : output += parts[i]; + } else if (parts[i].search(/<\?/) > -1) { + output += this._getIndent(options, level, parts[i]); + } else if (options.splitXmlnsOnFormat && (parts[i].search(/xmlns\:/) > -1 || parts[i].search(/xmlns\=/) > -1)) { + output += this._getIndent(options, level, parts[i]); + } else { + output += parts[i]; + } + } + + // remove leading newline + if (output[0] === options.newLine) { + output = output.slice(1); + } else if (output.substring(0, 1) === options.newLine) { + output = output.slice(2); + } + + return output; + } + + minifyXml(xml: string, options: XmlFormattingOptions): string { + xml = this._stripLineBreaks(options, xml); // all line breaks outside of CDATA elements + xml = (options.removeCommentsOnMinify) ? xml.replace(/\/g, "") : xml; + xml = xml.replace(/>\s{0,}<"); // insignificant whitespace between tags + xml = xml.replace(/"\s+(?=[^\s]+=)/g, "\" "); // spaces between attributes + xml = xml.replace(/"\s+(?=>)/g, "\""); // spaces between the last attribute and tag close (>) + xml = xml.replace(/"\s+(?=\/>)/g, "\" "); // spaces between the last attribute and tag close (/>) + xml = xml.replace(/[^ <>="]\s+[^ <>="]+=/g, (match: string) => { // spaces between the node name and the first attribute + return match.replace(/\s+/g, " "); + }); + + return xml; + } + + private _getIndent(options: XmlFormattingOptions, level: number, trailingValue?: string): string { + trailingValue = trailingValue || ""; + + const indentPattern = (options.editorOptions.preferSpaces) ? " ".repeat(options.editorOptions.tabSize) : "\t"; + + return `${options.newLine}${indentPattern.repeat(level)}${trailingValue}`; + } + + private _stripLineBreaks(options: XmlFormattingOptions, xml: string): string { + let output = ""; + const inTag = false; + const inTagName = false; + let inCdata = false; + const inAttribute = false; + + for (let i = 0; i < xml.length; i++) { + const char: string = xml.charAt(i); + const prev: string = xml.charAt(i - 1); + const next: string = xml.charAt(i + 1); + + if (char === "!" && (xml.substr(i, 8) === "![CDATA[" || xml.substr(i, 3) === "!--")) { + inCdata = true; + } else if (char === "]" && (xml.substr(i, 3) === "]]>")) { + inCdata = false; + } else if (char === "-" && (xml.substr(i, 3) === "-->")) { + inCdata = false; + } else if (char.search(/[\r\n]/g) > -1 && !inCdata) { + if (/\r/.test(char) && /\S|\r|\n/.test(prev) && /\S|\r|\n/.test(xml.charAt(i + options.newLine.length))) { + output += char; + } else if (/\n/.test(char) && /\S|\r|\n/.test(xml.charAt(i - options.newLine.length)) && /\S|\r|\n/.test(next)) { + output += char; + } + + continue; + } + + output += char; + } + + return output; + } +} diff --git a/src/formatting/xml-formatter.ts b/src/formatting/xml-formatter.ts new file mode 100644 index 0000000..2ad9111 --- /dev/null +++ b/src/formatting/xml-formatter.ts @@ -0,0 +1,6 @@ +import { XmlFormattingOptions } from "./xml-formatting-options"; + +export interface XmlFormatter { + formatXml(xml: string, options: XmlFormattingOptions): string; + minifyXml(xml: string, options: XmlFormattingOptions): string; +} diff --git a/src/formatting/xml-formatting-edit-provider.ts b/src/formatting/xml-formatting-edit-provider.ts new file mode 100644 index 0000000..a82c1b0 --- /dev/null +++ b/src/formatting/xml-formatting-edit-provider.ts @@ -0,0 +1,66 @@ +import { commands, languages } from "vscode"; +import { + CancellationToken, DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, ExtensionContext, + FormattingOptions, ProviderResult, Range, TextDocument, TextEdit, TextEditor, WorkspaceConfiguration +} from "vscode"; + +import * as extension from "../extension"; +import { XmlFormatter } from "./xml-formatter"; + +import { ClassicXmlFormatter } from "./formatters/classic-xml-formatter"; + +extension.onActivate((context: ExtensionContext, config: WorkspaceConfiguration) => { + const xmlFormatterImplementationSetting = config.get("xmlFormatterImplementation"); + let xmlFormatterImplementation: XmlFormatter; + + switch (xmlFormatterImplementationSetting) { + case "classic": + default: xmlFormatterImplementation = new ClassicXmlFormatter(); break; + } + + // tslint:disable-next-line:no-use-before-declare + const xmlFormattingEditProvider = new XmlFormattingEditProvider(config, xmlFormatterImplementation); + + const formatAsXmlCommand = commands.registerTextEditorCommand("xmlTools.formatAsXml", (textEditor) => { + // TODO: implement command + }); + + const minifyXmlCommand = commands.registerTextEditorCommand("xmlTools.minifyXml", (textEditor: TextEditor) => { + // TODO: implement command + }); + + context.subscriptions.push( + formatAsXmlCommand, + minifyXmlCommand, + languages.registerDocumentFormattingEditProvider("xml", xmlFormattingEditProvider), + languages.registerDocumentRangeFormattingEditProvider("xml", xmlFormattingEditProvider) + ); +}); + +export class XmlFormattingEditProvider implements DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider { + + constructor( + public workspaceConfiguration: WorkspaceConfiguration, + public xmlFormatter: XmlFormatter + ) { } + + provideDocumentFormattingEdits(document: TextDocument, options: FormattingOptions, token: CancellationToken): ProviderResult { + const lastLine = document.lineAt(document.lineCount - 1); + const documentRange = new Range(document.positionAt(0), lastLine.range.end); + + return this.provideDocumentRangeFormattingEdits(document, documentRange, options, token); + } + + provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult { + let xml = document.getText(range); + + xml = this.xmlFormatter.formatXml(xml, { + editorOptions: options, + newLine: document.eol.toString(), + removeCommentsOnMinify: this.workspaceConfiguration.get("removeCommentsOnMinify"), + splitXmlnsOnFormat: this.workspaceConfiguration.get("splitXmlnsOnFormat") + }); + + return [ TextEdit.replace(range, xml) ]; + } +} diff --git a/src/formatting/xml-formatting-options.ts b/src/formatting/xml-formatting-options.ts new file mode 100644 index 0000000..439bdba --- /dev/null +++ b/src/formatting/xml-formatting-options.ts @@ -0,0 +1,8 @@ +import { FormattingOptions } from "vscode"; + +export interface XmlFormattingOptions { + editorOptions: FormattingOptions; + newLine: string; + removeCommentsOnMinify: boolean; + splitXmlnsOnFormat: boolean; +} diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 35bf33f..d4c8a71 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -13,10 +13,5 @@ import * as myExtension from "../extension"; // Defines a Mocha test suite to group tests of similar kind together suite("Extension Tests", () => { - - // Defines a Mocha unit test - test("Something 1", () => { - assert.equal(-1, [1, 2, 3].indexOf(5)); - assert.equal(-1, [1, 2, 3].indexOf(0)); - }); + // TODO: implement tests }); diff --git a/tsconfig.json b/tsconfig.json index 8a1d847..c3e70b8 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,9 @@ "es6" ], "sourceMap": true, - "rootDir": "src" + "rootDir": "src", + "strict": true, + "strictNullChecks": false }, "exclude": [ "node_modules", diff --git a/tslint.json b/tslint.json index 1b54217..34d7b7b 100644 --- a/tslint.json +++ b/tslint.json @@ -28,7 +28,7 @@ "label-position": true, "max-line-length": [ true, - 140 + 165 ], "member-access": false, "member-ordering": [ From a204434a6e9fc702d3d78355df0b7cbb229844b7 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 20:43:29 -0500 Subject: [PATCH 11/57] Scope Commands to Resource From PR #129. #128 --- package.json | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 55aa370..daf103d 100644 --- a/package.json +++ b/package.json @@ -65,37 +65,44 @@ "xmlTools.ignoreDefaultNamespace": { "type": "boolean", "default": true, - "description": "Ignore default xmlns attributes when evaluating XPath." + "description": "Ignore default xmlns attributes when evaluating XPath.", + "scope": "resource" }, "xmlTools.persistXPathQuery": { "type": "boolean", "default": true, - "description": "Remember the last XPath query used." + "description": "Remember the last XPath query used.", + "scope": "resource" }, "xmlTools.removeCommentsOnMinify": { "type": "boolean", "default": false, - "description": "Remove XML comments during minification." + "description": "Remove XML comments during minification.", + "scope": "resource" }, "xmlTools.splitXmlnsOnFormat": { "type": "boolean", "default": true, - "description": "Put each xmlns attribute on a new line when formatting XML." + "description": "Put each xmlns attribute on a new line when formatting XML.", + "scope": "resource" }, "xmlTools.xmlFormatterImplementation": { "type": "string", "default": "classic", - "description": "Supported XML Formatters: classic" + "description": "Supported XML Formatters: classic", + "scope": "resource" }, "xmlTools.xqueryExecutionArguments": { "type": "array", "default": ["-xquery", "$(script)", "-in", "$(input)", "-out", "$(input.output.xml"], - "description": "Arguments to be passed to the XQuery execution engine." + "description": "Arguments to be passed to the XQuery execution engine.", + "scope": "resource" }, "xmlTools.xqueryExecutionEngine": { "type": "string", "default": "", - "description": "The full path to the executable to run when executing XQuery scripts." + "description": "The full path to the executable to run when executing XQuery scripts.", + "scope": "resource" } } }, From 552692377212ff9fbd14061da2a30d5424b39a30 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 27 Jan 2018 20:51:15 -0500 Subject: [PATCH 12/57] Override Global Configuration From PR #129 #128 --- src/constants.ts | 1 + src/extension.ts | 4 +++- src/formatting/xml-formatting-edit-provider.ts | 6 +++++- 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 src/constants.ts diff --git a/src/constants.ts b/src/constants.ts new file mode 100644 index 0000000..33b87fe --- /dev/null +++ b/src/constants.ts @@ -0,0 +1 @@ +export const extensionPrefix = "xmlTools"; diff --git a/src/extension.ts b/src/extension.ts index 720c780..f1ea7ae 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,11 +1,13 @@ import { workspace } from "vscode"; import { ExtensionContext, WorkspaceConfiguration } from "vscode"; +import * as constants from "./constants"; + const onActivateHandlers: OnActivateHandler[] = []; const onDeactivateHandlers: OnDeactivateHandler[] = []; export function activate(context: ExtensionContext) { - const workspaceConfiguration = workspace.getConfiguration("xmlTools"); + const workspaceConfiguration = workspace.getConfiguration(constants.extensionPrefix); onActivateHandlers.forEach(x => x(context, workspaceConfiguration)); } diff --git a/src/formatting/xml-formatting-edit-provider.ts b/src/formatting/xml-formatting-edit-provider.ts index a82c1b0..6ed9646 100644 --- a/src/formatting/xml-formatting-edit-provider.ts +++ b/src/formatting/xml-formatting-edit-provider.ts @@ -1,9 +1,10 @@ -import { commands, languages } from "vscode"; +import { commands, languages, workspace } from "vscode"; import { CancellationToken, DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, ExtensionContext, FormattingOptions, ProviderResult, Range, TextDocument, TextEdit, TextEditor, WorkspaceConfiguration } from "vscode"; +import * as constants from "../constants"; import * as extension from "../extension"; import { XmlFormatter } from "./xml-formatter"; @@ -52,6 +53,9 @@ export class XmlFormattingEditProvider implements DocumentFormattingEditProvider } provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult { + // override global configuration (issue #128) + this.workspaceConfiguration = workspace.getConfiguration(constants.extensionPrefix, document.uri); + let xml = document.getText(range); xml = this.xmlFormatter.formatXml(xml, { From 8f0bf58462d2713ce4ea16d3c5a487770087b6c3 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sun, 28 Jan 2018 01:19:06 -0500 Subject: [PATCH 13/57] Begin Implementing V2 Formatter --- package.json | 10 +- src/extension.ts | 42 +++-- src/formatting/formatters/v2-xml-formatter.ts | 174 ++++++++++++++++++ .../xml-formatting-edit-provider.ts | 39 +--- tslint.json | 2 - 5 files changed, 210 insertions(+), 57 deletions(-) create mode 100644 src/formatting/formatters/v2-xml-formatter.ts diff --git a/package.json b/package.json index daf103d..794e3ef 100644 --- a/package.json +++ b/package.json @@ -88,7 +88,7 @@ }, "xmlTools.xmlFormatterImplementation": { "type": "string", - "default": "classic", + "default": "v2", "description": "Supported XML Formatters: classic", "scope": "resource" }, @@ -122,6 +122,14 @@ "key": "ctrl+shift+alt+b", "command": "xmlTools.formatXml" } + ], + "languages": [ + { + "id": "xquery", + "aliases": ["XQuery", "xquery"], + "extensions": [".xq",".xql",".xqm",".xqy",".xquery"], + "configuration": "./languages/xquery/xquery.json" + } ] }, "scripts": { diff --git a/src/extension.ts b/src/extension.ts index f1ea7ae..6c9decf 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,29 +1,33 @@ -import { workspace } from "vscode"; +import { languages, workspace } from "vscode"; import { ExtensionContext, WorkspaceConfiguration } from "vscode"; +import { XmlFormatter } from "./formatting/xml-formatter"; +import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-provider"; +import { ClassicXmlFormatter } from "./formatting/formatters/classic-xml-formatter"; +import { V2XmlFormatter } from "./formatting/formatters/v2-xml-formatter"; + import * as constants from "./constants"; -const onActivateHandlers: OnActivateHandler[] = []; -const onDeactivateHandlers: OnDeactivateHandler[] = []; - export function activate(context: ExtensionContext) { - const workspaceConfiguration = workspace.getConfiguration(constants.extensionPrefix); + const config = workspace.getConfiguration(constants.extensionPrefix); - onActivateHandlers.forEach(x => x(context, workspaceConfiguration)); + /* Formatting Features */ + const xmlFormatterImplementationSetting = config.get("xmlFormatterImplementation"); + let xmlFormatterImplementation: XmlFormatter; + + switch (xmlFormatterImplementationSetting) { + case "v2": xmlFormatterImplementation = new V2XmlFormatter(); break; + case "classic": default: xmlFormatterImplementation = new ClassicXmlFormatter(); break; + } + + const xmlFormattingEditProvider = new XmlFormattingEditProvider(config, xmlFormatterImplementation); + + context.subscriptions.push( + languages.registerDocumentFormattingEditProvider("xml", xmlFormattingEditProvider), + languages.registerDocumentRangeFormattingEditProvider("xml", xmlFormattingEditProvider) + ); } export function deactivate() { - onDeactivateHandlers.forEach(x => x()); + // do nothing } - -export function onActivate(handler: OnActivateHandler): void { - onActivateHandlers.push(handler); -} - -export function onDeactivate(handler: OnDeactivateHandler): void { - onDeactivateHandlers.push(handler); -} - -export type OnActivateHandler = (context: ExtensionContext, config: WorkspaceConfiguration) => void; - -export type OnDeactivateHandler = () => void; diff --git a/src/formatting/formatters/v2-xml-formatter.ts b/src/formatting/formatters/v2-xml-formatter.ts new file mode 100644 index 0000000..5ce20fa --- /dev/null +++ b/src/formatting/formatters/v2-xml-formatter.ts @@ -0,0 +1,174 @@ +import { XmlFormatter } from "../xml-formatter"; +import { XmlFormattingOptions } from "../xml-formatting-options"; +import { ClassicXmlFormatter } from "./classic-xml-formatter"; + +/* tslint:disable no-use-before-declare */ +export class V2XmlFormatter implements XmlFormatter { + formatXml(xml: string, options: XmlFormattingOptions): string { + xml = this.minifyXml(xml, options); + + let output = ""; + + let indentLevel = 0; + let location = Location.Text; + let lastNonTextLocation = Location.Text; // hah + + // NOTE: all "exiting" checks should appear after their associated "entering" checks + for (let i = 0; i < xml.length; i++) { + const cc = xml[i]; + const nc = xml.charAt(i + 1); + const nnc = xml.charAt(i + 2); + const pc = xml.charAt(i - 1); + + // entering CData + if (location === Location.Text && cc === "<" && nc === "!" && nnc === "[") { + output += `${this._getIndent(options, indentLevel)}<`; + location = Location.CData; + } + + // exiting CData + else if (location === Location.CData && cc === "]" && nc === "]" && nnc === ">") { + output += "]]>"; + + i += 2; + lastNonTextLocation = location; + location = Location.Text; + } + + // entering Comment + else if (location === Location.Text && cc === "<" && nc === "!" && nnc === "-") { + output += `${this._getIndent(options, indentLevel)}<`; + location = Location.Comment; + } + + // exiting Comment + else if (location === Location.Comment && cc === "-" && nc === "-" && nnc === ">") { + output += "-->"; + + i += 2; + lastNonTextLocation = location; + location = Location.Text; + } + + // entering SpecialTag + else if (location === Location.Text && cc === "<" && (nc === "!" || nc === "?")) { + output += `${this._getIndent(options, indentLevel)}<`; + location = Location.SpecialTag; + } + + // exiting SpecialTag + else if (location === Location.SpecialTag && cc === ">") { + output += `>`; + lastNonTextLocation = location; + location = Location.Text; + } + + // entering StartTag.StartTagName + else if (location === Location.Text && cc === "<" && ["/", "!"].indexOf(nc) === -1) { + // if this occurs after another tag, prepend a line break + if (pc === ">") { + output += `${options.newLine}${this._getIndent(options, indentLevel)}<`; + } + + else { + output += `${this._getIndent(options, indentLevel)}<`; + } + + indentLevel++; + location = Location.StartTagName; + } + + // exiting StartTag.StartTagName, enter StartTag + else if (location === Location.StartTagName && cc === " ") { + output += " "; + lastNonTextLocation = location; + location = Location.StartTag; + } + + // entering StartTag.Attribute + else if (location === Location.StartTag && [" ", "/", ">"].indexOf(cc) === -1) { + output += cc; + lastNonTextLocation = location; + location = Location.Attribute; + } + + // entering StartTag.Attribute.AttributeValue + else if (location === Location.Attribute && cc === "\"") { + output += "\""; + lastNonTextLocation = location; + location = Location.AttributeValue; + } + + // exiting StartTag.Attribute.AttributeValue, entering StartTag + else if (location === Location.AttributeValue && cc === "\"") { + output += "\""; + lastNonTextLocation = location; + location = Location.StartTag; + } + + // exiting StartTag or StartTag.StartTagName, entering Text + else if ((location === Location.StartTag || location === Location.StartTagName) && cc === ">") { + // if this was a self-closing tag, we need to decrement the indent level + if (pc === "/") { + indentLevel--; + } + + output += ">"; + + lastNonTextLocation = location; + location = Location.Text; + } + + // entering EndTag + else if (location === Location.Text && cc === "<" && nc === "/") { + indentLevel--; + + // if the end tag immediately follows another end tag, add a line break and indent + // otherwise, this should be treated as a same-line end tag(ex. text) + if (lastNonTextLocation === Location.EndTag) { + output += `${options.newLine}${this._getIndent(options, indentLevel)}<`; + } + + else { + output += "<"; + } + + location = Location.EndTag; + } + + // exiting EndTag, entering Text + else if (location === Location.EndTag && cc === ">") { + output += ">"; + lastNonTextLocation = location; + location = Location.Text; + } + + // Text + else { + output += cc; + } + } + + return output; + } + + minifyXml(xml: string, options: XmlFormattingOptions): string { + return new ClassicXmlFormatter().minifyXml(xml, options); + } + + private _getIndent(options: XmlFormattingOptions, indentLevel: number): string { + return ((options.editorOptions.insertSpaces) ? " ".repeat(options.editorOptions.tabSize) : "\t").repeat(indentLevel); + } +} + +enum Location { + Attribute, + AttributeValue, + CData, + Comment, + EndTag, + SpecialTag, + StartTag, + StartTagName, + Text +} diff --git a/src/formatting/xml-formatting-edit-provider.ts b/src/formatting/xml-formatting-edit-provider.ts index 6ed9646..b744a01 100644 --- a/src/formatting/xml-formatting-edit-provider.ts +++ b/src/formatting/xml-formatting-edit-provider.ts @@ -1,43 +1,12 @@ -import { commands, languages, workspace } from "vscode"; +import { workspace } from "vscode"; import { - CancellationToken, DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, ExtensionContext, - FormattingOptions, ProviderResult, Range, TextDocument, TextEdit, TextEditor, WorkspaceConfiguration + CancellationToken, DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, EndOfLine, + FormattingOptions, ProviderResult, Range, TextDocument, TextEdit, WorkspaceConfiguration } from "vscode"; import * as constants from "../constants"; -import * as extension from "../extension"; import { XmlFormatter } from "./xml-formatter"; -import { ClassicXmlFormatter } from "./formatters/classic-xml-formatter"; - -extension.onActivate((context: ExtensionContext, config: WorkspaceConfiguration) => { - const xmlFormatterImplementationSetting = config.get("xmlFormatterImplementation"); - let xmlFormatterImplementation: XmlFormatter; - - switch (xmlFormatterImplementationSetting) { - case "classic": - default: xmlFormatterImplementation = new ClassicXmlFormatter(); break; - } - - // tslint:disable-next-line:no-use-before-declare - const xmlFormattingEditProvider = new XmlFormattingEditProvider(config, xmlFormatterImplementation); - - const formatAsXmlCommand = commands.registerTextEditorCommand("xmlTools.formatAsXml", (textEditor) => { - // TODO: implement command - }); - - const minifyXmlCommand = commands.registerTextEditorCommand("xmlTools.minifyXml", (textEditor: TextEditor) => { - // TODO: implement command - }); - - context.subscriptions.push( - formatAsXmlCommand, - minifyXmlCommand, - languages.registerDocumentFormattingEditProvider("xml", xmlFormattingEditProvider), - languages.registerDocumentRangeFormattingEditProvider("xml", xmlFormattingEditProvider) - ); -}); - export class XmlFormattingEditProvider implements DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider { constructor( @@ -60,7 +29,7 @@ export class XmlFormattingEditProvider implements DocumentFormattingEditProvider xml = this.xmlFormatter.formatXml(xml, { editorOptions: options, - newLine: document.eol.toString(), + newLine: (document.eol === EndOfLine.CRLF) ? "\r\n" : "\n", removeCommentsOnMinify: this.workspaceConfiguration.get("removeCommentsOnMinify"), splitXmlnsOnFormat: this.workspaceConfiguration.get("splitXmlnsOnFormat") }); diff --git a/tslint.json b/tslint.json index 34d7b7b..38f64fa 100644 --- a/tslint.json +++ b/tslint.json @@ -77,8 +77,6 @@ "one-line": [ true, "check-open-brace", - "check-catch", - "check-else", "check-whitespace" ], "prefer-const": true, From 9941bafa74d9e728a9bb13d33718d13803a7996a Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sun, 28 Jan 2018 12:09:57 -0500 Subject: [PATCH 14/57] Add Attribute Splitting #116 --- README.md | 3 ++- package.json | 6 ++++++ src/formatting/formatters/v2-xml-formatter.ts | 4 ++++ src/formatting/xml-formatting-edit-provider.ts | 1 + src/formatting/xml-formatting-options.ts | 1 + 5 files changed, 14 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d92e6f9..6bcb635 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,9 @@ * `xmlTools.ignoreDefaultNamespace`: Ignore default xmlns attributes when evaluating XPath. * `xmlTools.persistXPathQuery`: Remember the last XPath query used. * `xmlTools.removeCommentsOnMinify`: Remove XML comments during minification. +* `xmlTools.splitAttributesOnFormat`: Put each attribute on a new line when formatting XML. Overrides `xmlTools.splitXmlsOnFormat` if set to `true`. (V2 Formatter Only) * `xmlTools.splitXmlnsOnFormat`: Put each xmlns attribute on a new line when formatting XML. -* `xmlTools.xmlFormatterImplementation`: Supported XML Formatters: `classic`. +* `xmlTools.xmlFormatterImplementation`: Supported XML Formatters: `classic`, `v2`. * `xmlTools.xqueryExecutionArguments`: Arguments to be passed to the XQuery execution engine. * `xmlTools.xqueryExecutionEngine`: The full path to the executable to run when executing XQuery scripts. diff --git a/package.json b/package.json index 794e3ef..264d23b 100644 --- a/package.json +++ b/package.json @@ -80,6 +80,12 @@ "description": "Remove XML comments during minification.", "scope": "resource" }, + "xmlTools.splitAttributesOnFormat": { + "type": "boolean", + "default": false, + "description": "Put each attribute on a new line when formatting XML. Overrides `xmlTools.splitXmlsOnFormat` if set to `true`.", + "scope": "resource" + }, "xmlTools.splitXmlnsOnFormat": { "type": "boolean", "default": true, diff --git a/src/formatting/formatters/v2-xml-formatter.ts b/src/formatting/formatters/v2-xml-formatter.ts index 5ce20fa..52b5926 100644 --- a/src/formatting/formatters/v2-xml-formatter.ts +++ b/src/formatting/formatters/v2-xml-formatter.ts @@ -87,6 +87,10 @@ export class V2XmlFormatter implements XmlFormatter { // entering StartTag.Attribute else if (location === Location.StartTag && [" ", "/", ">"].indexOf(cc) === -1) { + if (lastNonTextLocation === Location.AttributeValue && ((options.splitXmlnsOnFormat && xml.substr(i, 5).toLowerCase() === "xmlns") || options.splitAttributesOnFormat)) { + output += `${options.newLine}${this._getIndent(options, indentLevel)}`; + } + output += cc; lastNonTextLocation = location; location = Location.Attribute; diff --git a/src/formatting/xml-formatting-edit-provider.ts b/src/formatting/xml-formatting-edit-provider.ts index b744a01..a6c117b 100644 --- a/src/formatting/xml-formatting-edit-provider.ts +++ b/src/formatting/xml-formatting-edit-provider.ts @@ -31,6 +31,7 @@ export class XmlFormattingEditProvider implements DocumentFormattingEditProvider editorOptions: options, newLine: (document.eol === EndOfLine.CRLF) ? "\r\n" : "\n", removeCommentsOnMinify: this.workspaceConfiguration.get("removeCommentsOnMinify"), + splitAttributesOnFormat: this.workspaceConfiguration.get("splitAttributesOnFormat"), splitXmlnsOnFormat: this.workspaceConfiguration.get("splitXmlnsOnFormat") }); diff --git a/src/formatting/xml-formatting-options.ts b/src/formatting/xml-formatting-options.ts index 439bdba..bafed99 100644 --- a/src/formatting/xml-formatting-options.ts +++ b/src/formatting/xml-formatting-options.ts @@ -4,5 +4,6 @@ export interface XmlFormattingOptions { editorOptions: FormattingOptions; newLine: string; removeCommentsOnMinify: boolean; + splitAttributesOnFormat: boolean; splitXmlnsOnFormat: boolean; } From e1d41f602521aff4a88935eaec7535c2d15d909a Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sun, 28 Jan 2018 12:17:06 -0500 Subject: [PATCH 15/57] Add NewLine After Self-Closing Tags #120 --- src/formatting/formatters/v2-xml-formatter.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/formatting/formatters/v2-xml-formatter.ts b/src/formatting/formatters/v2-xml-formatter.ts index 52b5926..8f60585 100644 --- a/src/formatting/formatters/v2-xml-formatter.ts +++ b/src/formatting/formatters/v2-xml-formatter.ts @@ -112,12 +112,15 @@ export class V2XmlFormatter implements XmlFormatter { // exiting StartTag or StartTag.StartTagName, entering Text else if ((location === Location.StartTag || location === Location.StartTagName) && cc === ">") { - // if this was a self-closing tag, we need to decrement the indent level + // if this was a self-closing tag, we need to decrement the indent level and add a newLine if (pc === "/") { indentLevel--; + output += `>${options.newLine}`; } - output += ">"; + else { + output += ">"; + } lastNonTextLocation = location; location = Location.Text; From b9b6aec52812e426f7b0c523c2ef5042c64b5dcf Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 30 Jan 2018 16:45:10 -0500 Subject: [PATCH 16/57] Add First Test --- src/formatting/formatters/v2-xml-formatter.ts | 53 +++++++++++++------ src/test/extension.test.ts | 51 +++++++++++++----- src/test/index.ts | 2 +- src/test/test-data/basic.formatted.xml | 3 ++ src/test/test-data/basic.unformatted.xml | 1 + src/test/test-utils/test-data-loader.ts | 7 +++ 6 files changed, 88 insertions(+), 29 deletions(-) create mode 100644 src/test/test-data/basic.formatted.xml create mode 100644 src/test/test-data/basic.unformatted.xml create mode 100644 src/test/test-utils/test-data-loader.ts diff --git a/src/formatting/formatters/v2-xml-formatter.ts b/src/formatting/formatters/v2-xml-formatter.ts index 8f60585..19b1dd1 100644 --- a/src/formatting/formatters/v2-xml-formatter.ts +++ b/src/formatting/formatters/v2-xml-formatter.ts @@ -25,7 +25,7 @@ export class V2XmlFormatter implements XmlFormatter { output += `${this._getIndent(options, indentLevel)}<`; location = Location.CData; } - + // exiting CData else if (location === Location.CData && cc === "]" && nc === "]" && nnc === ">") { output += "]]>"; @@ -34,13 +34,13 @@ export class V2XmlFormatter implements XmlFormatter { lastNonTextLocation = location; location = Location.Text; } - + // entering Comment else if (location === Location.Text && cc === "<" && nc === "!" && nnc === "-") { output += `${this._getIndent(options, indentLevel)}<`; location = Location.Comment; } - + // exiting Comment else if (location === Location.Comment && cc === "-" && nc === "-" && nnc === ">") { output += "-->"; @@ -49,20 +49,20 @@ export class V2XmlFormatter implements XmlFormatter { lastNonTextLocation = location; location = Location.Text; } - + // entering SpecialTag else if (location === Location.Text && cc === "<" && (nc === "!" || nc === "?")) { output += `${this._getIndent(options, indentLevel)}<`; location = Location.SpecialTag; } - + // exiting SpecialTag else if (location === Location.SpecialTag && cc === ">") { output += `>`; lastNonTextLocation = location; location = Location.Text; } - + // entering StartTag.StartTagName else if (location === Location.Text && cc === "<" && ["/", "!"].indexOf(nc) === -1) { // if this occurs after another tag, prepend a line break @@ -77,17 +77,20 @@ export class V2XmlFormatter implements XmlFormatter { indentLevel++; location = Location.StartTagName; } - + // exiting StartTag.StartTagName, enter StartTag else if (location === Location.StartTagName && cc === " ") { output += " "; lastNonTextLocation = location; location = Location.StartTag; } - + // entering StartTag.Attribute else if (location === Location.StartTag && [" ", "/", ">"].indexOf(cc) === -1) { - if (lastNonTextLocation === Location.AttributeValue && ((options.splitXmlnsOnFormat && xml.substr(i, 5).toLowerCase() === "xmlns") || options.splitAttributesOnFormat)) { + if (lastNonTextLocation === Location.AttributeValue + && ((options.splitXmlnsOnFormat + && xml.substr(i, 5).toLowerCase() === "xmlns") + || options.splitAttributesOnFormat)) { output += `${options.newLine}${this._getIndent(options, indentLevel)}`; } @@ -95,14 +98,14 @@ export class V2XmlFormatter implements XmlFormatter { lastNonTextLocation = location; location = Location.Attribute; } - + // entering StartTag.Attribute.AttributeValue else if (location === Location.Attribute && cc === "\"") { output += "\""; lastNonTextLocation = location; location = Location.AttributeValue; } - + // exiting StartTag.Attribute.AttributeValue, entering StartTag else if (location === Location.AttributeValue && cc === "\"") { output += "\""; @@ -118,6 +121,21 @@ export class V2XmlFormatter implements XmlFormatter { output += `>${options.newLine}`; } + // if this is an open tag followed by a line break, add an indent before the text (after the line break) + // TODO: there could be multiple lines of text here, so we'll need a less naive implementation at some point + else if (nc === "\r" || nc === "\n") { + output += `>${options.newLine}${this._getIndent(options, indentLevel)}`; + + // fast-forward based on what type of line break was used + if (nc === "\r") { + i += 2; + } + + else { + i++; + } + } + else { output += ">"; } @@ -125,31 +143,36 @@ export class V2XmlFormatter implements XmlFormatter { lastNonTextLocation = location; location = Location.Text; } - + // entering EndTag else if (location === Location.Text && cc === "<" && nc === "/") { indentLevel--; // if the end tag immediately follows another end tag, add a line break and indent + // if the end tag immediately follows a line break, just add an indentation // otherwise, this should be treated as a same-line end tag(ex. text) if (lastNonTextLocation === Location.EndTag) { output += `${options.newLine}${this._getIndent(options, indentLevel)}<`; } - + + else if (pc === "\n") { + output += `${this._getIndent(options, indentLevel)}<`; + } + else { output += "<"; } location = Location.EndTag; } - + // exiting EndTag, entering Text else if (location === Location.EndTag && cc === ">") { output += ">"; lastNonTextLocation = location; location = Location.Text; } - + // Text else { output += cc; diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index d4c8a71..e5de0ab 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -1,17 +1,42 @@ -// -// Note: This example test is leveraging the Mocha test framework. -// Please refer to their documentation on https://mochajs.org/ for help. -// - -// The module 'assert' provides assertion methods from node import * as assert from "assert"; +import { FormattingOptions } from "vscode"; -// You can import and use all API from the 'vscode' module -// as well as import your extension to test it -import * as vscode from "vscode"; -import * as myExtension from "../extension"; +import { TestDataLoader } from "./test-utils/test-data-loader"; + +import { XmlFormatter } from "../formatting/xml-formatter"; +import { XmlFormattingOptions } from "../formatting/xml-formatting-options"; +import { V2XmlFormatter } from "../formatting/formatters/v2-xml-formatter"; + +describe("V2XmlFormatter", () => { + + const xmlFormatter = new V2XmlFormatter(); + + describe("#formatXml(xml, options)", () => { + + const options = { + editorOptions: { + insertSpaces: true, + tabSize: 4 + }, + newLine: "\r\n", + removeCommentsOnMinify: false, + splitAttributesOnFormat: false, + splitXmlnsOnFormat: true + }; + + it("should handle basic XML", () => { + testFormatter(xmlFormatter, options, "basic"); + }); + + }); -// Defines a Mocha test suite to group tests of similar kind together -suite("Extension Tests", () => { - // TODO: implement tests }); + +function testFormatter(xmlFormatter: XmlFormatter, options: XmlFormattingOptions, fileLabel: string): void { + const expectedFormattedXml = TestDataLoader.load(`${fileLabel}.formatted.xml`); + const unformattedXml = TestDataLoader.load(`${fileLabel}.unformatted.xml`); + + const actualFormattedXml = xmlFormatter.formatXml(unformattedXml, options); + + assert.equal(actualFormattedXml, expectedFormattedXml, "Actual formatted XML does not match expected formatted XML."); +} diff --git a/src/test/index.ts b/src/test/index.ts index edb6206..f2ca26a 100644 --- a/src/test/index.ts +++ b/src/test/index.ts @@ -15,7 +15,7 @@ import * as testRunner from "vscode/lib/testrunner"; // You can directly control Mocha options by uncommenting the following lines // See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info testRunner.configure({ - ui: "tdd", // the TDD UI is being used in extension.test.ts (suite, test, etc.) + ui: "bdd", useColors: true // colored output from test results }); diff --git a/src/test/test-data/basic.formatted.xml b/src/test/test-data/basic.formatted.xml new file mode 100644 index 0000000..1bfeb09 --- /dev/null +++ b/src/test/test-data/basic.formatted.xml @@ -0,0 +1,3 @@ + + text + \ No newline at end of file diff --git a/src/test/test-data/basic.unformatted.xml b/src/test/test-data/basic.unformatted.xml new file mode 100644 index 0000000..cd114a6 --- /dev/null +++ b/src/test/test-data/basic.unformatted.xml @@ -0,0 +1 @@ +text \ No newline at end of file diff --git a/src/test/test-utils/test-data-loader.ts b/src/test/test-utils/test-data-loader.ts new file mode 100644 index 0000000..79707af --- /dev/null +++ b/src/test/test-utils/test-data-loader.ts @@ -0,0 +1,7 @@ +import * as fs from "fs"; + +export class TestDataLoader { + static load(fileName: string): string { + return fs.readFileSync(`${__dirname}/../../../src/test/test-data/${fileName}`, "UTF-8"); + } +} From 09fe37f04b2facfed97d019dff26b5e915d0ad7b Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 30 Jan 2018 16:55:44 -0500 Subject: [PATCH 17/57] Simplify Unit Tests This change means we can't use the harness provided by VS Code, but that's fine for now. I only intend to test service classes that generally don't have concrete dependencies on VS Code anyway. --- package.json | 2 +- src/test/index.ts | 22 ---------------------- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 src/test/index.ts diff --git a/package.json b/package.json index 264d23b..56900fb 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "compile": "npm run lint && tsc -p ./", "watch": "tsc -watch -p ./", "postinstall": "node ./node_modules/vscode/bin/install", - "test": "npm run compile && node ./node_modules/vscode/bin/test", + "test": "npm run compile && mocha ./out/test/**/*.js", "lint": "tslint -p tslint.json --fix" }, "devDependencies": { diff --git a/src/test/index.ts b/src/test/index.ts deleted file mode 100644 index f2ca26a..0000000 --- a/src/test/index.ts +++ /dev/null @@ -1,22 +0,0 @@ -// -// PLEASE DO NOT MODIFY / DELETE UNLESS YOU KNOW WHAT YOU ARE DOING -// -// This file is providing the test runner to use when running extension tests. -// By default the test runner in use is Mocha based. -// -// You can provide your own test runner if you want to override it by exporting -// a function run(testRoot: string, clb: (error:Error) => void) that the extension -// host can call to run the tests. The test runner is expected to use console.log -// to report the results back to the caller. When the tests are finished, return -// a possible error to the callback or null if none. - -import * as testRunner from "vscode/lib/testrunner"; - -// You can directly control Mocha options by uncommenting the following lines -// See https://github.com/mochajs/mocha/wiki/Using-mocha-programmatically#set-options for more info -testRunner.configure({ - ui: "bdd", - useColors: true // colored output from test results -}); - -module.exports = testRunner; From 27433b47cea84fcbff36311185e04bb98bad421b Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 30 Jan 2018 17:25:49 -0500 Subject: [PATCH 18/57] Add Tests for Fixed Issues This commit also changes the "fix" for text-only lines. We should be adjusting the text content as little as possible. In this case, we are still adding spaces (or tabs) after the last line break, but that is necessary to indent the closing element. I'll continue to adjust this as needed based on feedback and possibly add a setting to gate this behavior. #137 --- src/formatting/formatters/v2-xml-formatter.ts | 15 --------------- src/test/extension.test.ts | 12 ++++++++++++ src/test/test-data/self-closing.formatted.xml | 3 +++ src/test/test-data/self-closing.unformatted.xml | 1 + src/test/test-data/text-only-line.formatted.xml | 6 ++++++ src/test/test-data/text-only-line.unformatted.xml | 6 ++++++ src/test/test-data/unicode.formatted.xml | 4 ++++ src/test/test-data/unicode.unformatted.xml | 2 ++ 8 files changed, 34 insertions(+), 15 deletions(-) create mode 100644 src/test/test-data/self-closing.formatted.xml create mode 100644 src/test/test-data/self-closing.unformatted.xml create mode 100644 src/test/test-data/text-only-line.formatted.xml create mode 100644 src/test/test-data/text-only-line.unformatted.xml create mode 100644 src/test/test-data/unicode.formatted.xml create mode 100644 src/test/test-data/unicode.unformatted.xml diff --git a/src/formatting/formatters/v2-xml-formatter.ts b/src/formatting/formatters/v2-xml-formatter.ts index 19b1dd1..3f85734 100644 --- a/src/formatting/formatters/v2-xml-formatter.ts +++ b/src/formatting/formatters/v2-xml-formatter.ts @@ -121,21 +121,6 @@ export class V2XmlFormatter implements XmlFormatter { output += `>${options.newLine}`; } - // if this is an open tag followed by a line break, add an indent before the text (after the line break) - // TODO: there could be multiple lines of text here, so we'll need a less naive implementation at some point - else if (nc === "\r" || nc === "\n") { - output += `>${options.newLine}${this._getIndent(options, indentLevel)}`; - - // fast-forward based on what type of line break was used - if (nc === "\r") { - i += 2; - } - - else { - i++; - } - } - else { output += ">"; } diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index e5de0ab..7f51b01 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -28,6 +28,18 @@ describe("V2XmlFormatter", () => { testFormatter(xmlFormatter, options, "basic"); }); + it("should handle unicode element names", () => { + testFormatter(xmlFormatter, options, "unicode"); + }); + + it("should handle self-closing elements", () => { + testFormatter(xmlFormatter, options, "self-closing"); + }); + + it("should handle text-only lines", () => { + testFormatter(xmlFormatter, options, "text-only-line"); + }); + }); }); diff --git a/src/test/test-data/self-closing.formatted.xml b/src/test/test-data/self-closing.formatted.xml new file mode 100644 index 0000000..e37f362 --- /dev/null +++ b/src/test/test-data/self-closing.formatted.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/test/test-data/self-closing.unformatted.xml b/src/test/test-data/self-closing.unformatted.xml new file mode 100644 index 0000000..c24f1dd --- /dev/null +++ b/src/test/test-data/self-closing.unformatted.xml @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/test/test-data/text-only-line.formatted.xml b/src/test/test-data/text-only-line.formatted.xml new file mode 100644 index 0000000..8c8717d --- /dev/null +++ b/src/test/test-data/text-only-line.formatted.xml @@ -0,0 +1,6 @@ + + +Text1 +Text2 + + \ No newline at end of file diff --git a/src/test/test-data/text-only-line.unformatted.xml b/src/test/test-data/text-only-line.unformatted.xml new file mode 100644 index 0000000..43436ac --- /dev/null +++ b/src/test/test-data/text-only-line.unformatted.xml @@ -0,0 +1,6 @@ + + +Text1 +Text2 + + \ No newline at end of file diff --git a/src/test/test-data/unicode.formatted.xml b/src/test/test-data/unicode.formatted.xml new file mode 100644 index 0000000..a19a993 --- /dev/null +++ b/src/test/test-data/unicode.formatted.xml @@ -0,0 +1,4 @@ + +<Имя> + text + \ No newline at end of file diff --git a/src/test/test-data/unicode.unformatted.xml b/src/test/test-data/unicode.unformatted.xml new file mode 100644 index 0000000..098f43f --- /dev/null +++ b/src/test/test-data/unicode.unformatted.xml @@ -0,0 +1,2 @@ + +<Имя>text \ No newline at end of file From ea5416b5067c9e6a269c89370ed343af7844b879 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 1 Feb 2018 20:46:01 -0500 Subject: [PATCH 19/57] Preserve Line Breaks for Readability #59 --- src/formatting/formatters/v2-xml-formatter.ts | 23 ++++++++++++++----- src/test/extension.test.ts | 8 +++++++ src/test/test-data/preformatted.formatted.xml | 9 ++++++++ .../test-data/preformatted.unformatted.xml | 9 ++++++++ .../test-data/preserve-breaks.formatted.xml | 12 ++++++++++ .../test-data/preserve-breaks.unformatted.xml | 12 ++++++++++ 6 files changed, 67 insertions(+), 6 deletions(-) create mode 100644 src/test/test-data/preformatted.formatted.xml create mode 100644 src/test/test-data/preformatted.unformatted.xml create mode 100644 src/test/test-data/preserve-breaks.formatted.xml create mode 100644 src/test/test-data/preserve-breaks.unformatted.xml diff --git a/src/formatting/formatters/v2-xml-formatter.ts b/src/formatting/formatters/v2-xml-formatter.ts index 3f85734..e6d21b7 100644 --- a/src/formatting/formatters/v2-xml-formatter.ts +++ b/src/formatting/formatters/v2-xml-formatter.ts @@ -5,7 +5,18 @@ import { ClassicXmlFormatter } from "./classic-xml-formatter"; /* tslint:disable no-use-before-declare */ export class V2XmlFormatter implements XmlFormatter { formatXml(xml: string, options: XmlFormattingOptions): string { - xml = this.minifyXml(xml, options); + // remove whitespace from between tags, except for line breaks + xml = xml.replace(/>\s{0,} { // spaces between the node name and the first attribute + return match.replace(/[^\S\r\n]/g, ""); + }); + + // do some light minification to get rid of insignificant whitespace + xml = xml.replace(/"\s+(?=[^\s]+=)/g, "\" "); // spaces between attributes + xml = xml.replace(/"\s+(?=>)/g, "\""); // spaces between the last attribute and tag close (>) + xml = xml.replace(/"\s+(?=\/>)/g, "\" "); // spaces between the last attribute and tag close (/>) + xml = xml.replace(/[^ <>="]\s+[^ <>="]+=/g, (match: string) => { // spaces between the node name and the first attribute + return match.replace(/\s+/g, " "); + }); let output = ""; @@ -133,15 +144,15 @@ export class V2XmlFormatter implements XmlFormatter { else if (location === Location.Text && cc === "<" && nc === "/") { indentLevel--; - // if the end tag immediately follows another end tag, add a line break and indent // if the end tag immediately follows a line break, just add an indentation + // if the end tag immediately follows another end tag, add a line break and indent // otherwise, this should be treated as a same-line end tag(ex. text) - if (lastNonTextLocation === Location.EndTag) { - output += `${options.newLine}${this._getIndent(options, indentLevel)}<`; + if (pc === "\n") { + output += `${this._getIndent(options, indentLevel)}<`; } - else if (pc === "\n") { - output += `${this._getIndent(options, indentLevel)}<`; + else if (lastNonTextLocation === Location.EndTag) { + output += `${options.newLine}${this._getIndent(options, indentLevel)}<`; } else { diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 7f51b01..8d12984 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -40,6 +40,14 @@ describe("V2XmlFormatter", () => { testFormatter(xmlFormatter, options, "text-only-line"); }); + it("should handle preformatted xml", () => { + testFormatter(xmlFormatter, options, "preformatted"); + }); + + it ("should preserve line breaks between elements", () => { + testFormatter(xmlFormatter, options, "preserve-breaks"); + }); + }); }); diff --git a/src/test/test-data/preformatted.formatted.xml b/src/test/test-data/preformatted.formatted.xml new file mode 100644 index 0000000..6b3c12e --- /dev/null +++ b/src/test/test-data/preformatted.formatted.xml @@ -0,0 +1,9 @@ + + text + text + text + text + + text + + \ No newline at end of file diff --git a/src/test/test-data/preformatted.unformatted.xml b/src/test/test-data/preformatted.unformatted.xml new file mode 100644 index 0000000..6b3c12e --- /dev/null +++ b/src/test/test-data/preformatted.unformatted.xml @@ -0,0 +1,9 @@ + + text + text + text + text + + text + + \ No newline at end of file diff --git a/src/test/test-data/preserve-breaks.formatted.xml b/src/test/test-data/preserve-breaks.formatted.xml new file mode 100644 index 0000000..e8d02b4 --- /dev/null +++ b/src/test/test-data/preserve-breaks.formatted.xml @@ -0,0 +1,12 @@ + + text + text + + text + text + + + text + + + \ No newline at end of file diff --git a/src/test/test-data/preserve-breaks.unformatted.xml b/src/test/test-data/preserve-breaks.unformatted.xml new file mode 100644 index 0000000..e8d02b4 --- /dev/null +++ b/src/test/test-data/preserve-breaks.unformatted.xml @@ -0,0 +1,12 @@ + + text + text + + text + text + + + text + + + \ No newline at end of file From 2c6a5ceaa0b2b042291bfd7ff15c39e554130756 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 13 Feb 2018 22:52:19 -0500 Subject: [PATCH 20/57] Maintain Comment Formatting #118 --- src/formatting/formatters/v2-xml-formatter.ts | 51 ++++++++++++++++++- src/test/extension.test.ts | 4 ++ .../maintain-comment-formatting.formatted.xml | 13 +++++ ...aintain-comment-formatting.unformatted.xml | 13 +++++ 4 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 src/test/test-data/maintain-comment-formatting.formatted.xml create mode 100644 src/test/test-data/maintain-comment-formatting.unformatted.xml diff --git a/src/formatting/formatters/v2-xml-formatter.ts b/src/formatting/formatters/v2-xml-formatter.ts index e6d21b7..c462a9d 100644 --- a/src/formatting/formatters/v2-xml-formatter.ts +++ b/src/formatting/formatters/v2-xml-formatter.ts @@ -2,11 +2,17 @@ import { XmlFormatter } from "../xml-formatter"; import { XmlFormattingOptions } from "../xml-formatting-options"; import { ClassicXmlFormatter } from "./classic-xml-formatter"; +const MagicalStringOfWonders = "~::~MAAAGIC~::~"; + /* tslint:disable no-use-before-declare */ export class V2XmlFormatter implements XmlFormatter { formatXml(xml: string, options: XmlFormattingOptions): string { + // this replaces all "<" brackets inside of comments to a magical string + // so the following minification steps don't mess with comment formatting + xml = this._sanitizeComments(xml); + // remove whitespace from between tags, except for line breaks - xml = xml.replace(/>\s{0,} { // spaces between the node name and the first attribute + xml = xml.replace(/>\s{0,} { return match.replace(/[^\S\r\n]/g, ""); }); @@ -18,6 +24,9 @@ export class V2XmlFormatter implements XmlFormatter { return match.replace(/\s+/g, " "); }); + // the coast is clear - we can drop those "<" brackets back in + xml = this._unsanitizeComments(xml); + let output = ""; let indentLevel = 0; @@ -185,6 +194,46 @@ export class V2XmlFormatter implements XmlFormatter { private _getIndent(options: XmlFormattingOptions, indentLevel: number): string { return ((options.editorOptions.insertSpaces) ? " ".repeat(options.editorOptions.tabSize) : "\t").repeat(indentLevel); } + + private _sanitizeComments(xml: string): string { + let output = ""; + let inComment = false; + + for (let i = 0; i < xml.length; i++) { + const cc = xml[i]; + const nc = xml.charAt(i + 1); + const nnc = xml.charAt(i + 2); + const pc = xml.charAt(i - 1); + + if (!inComment && cc === "<" && nc === "!" && nnc === "-") { + inComment = true; + output += ""; + + i += 2; + } + + else { + output += cc; + } + } + + return output; + } + + private _unsanitizeComments(xml: string): string { + return xml.replace(new RegExp(MagicalStringOfWonders, "g"), "<"); + } } enum Location { diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 8d12984..0b14435 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -48,6 +48,10 @@ describe("V2XmlFormatter", () => { testFormatter(xmlFormatter, options, "preserve-breaks"); }); + it("should maintain comment formatting", () => { + testFormatter(xmlFormatter, options, "maintain-comment-formatting"); + }); + }); }); diff --git a/src/test/test-data/maintain-comment-formatting.formatted.xml b/src/test/test-data/maintain-comment-formatting.formatted.xml new file mode 100644 index 0000000..160f0c9 --- /dev/null +++ b/src/test/test-data/maintain-comment-formatting.formatted.xml @@ -0,0 +1,13 @@ + + text + + \ No newline at end of file diff --git a/src/test/test-data/maintain-comment-formatting.unformatted.xml b/src/test/test-data/maintain-comment-formatting.unformatted.xml new file mode 100644 index 0000000..160f0c9 --- /dev/null +++ b/src/test/test-data/maintain-comment-formatting.unformatted.xml @@ -0,0 +1,13 @@ + + text + + \ No newline at end of file From ace85c88419875316b2ae314a9145c21218f4d49 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 13 Feb 2018 23:25:07 -0500 Subject: [PATCH 21/57] Add XQuery Linting Feature --- package-lock.json | 389 +++++++++++++++++++++++++++++++---- package.json | 51 +++-- src/extension.ts | 32 ++- src/linting/xquery-linter.ts | 23 +++ 4 files changed, 434 insertions(+), 61 deletions(-) create mode 100644 src/linting/xquery-linter.ts diff --git a/package-lock.json b/package-lock.json index 71cea45..48eff04 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "xml", - "version": "0.0.1", + "version": "2.0.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -58,8 +58,7 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" }, "ansi-styles": { "version": "2.2.1", @@ -77,7 +76,6 @@ "version": "1.0.9", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", - "dev": true, "requires": { "sprintf-js": "1.0.3" } @@ -338,6 +336,11 @@ "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==", "dev": true }, + "colors": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz", + "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" + }, "combined-stream": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", @@ -359,6 +362,41 @@ "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", "dev": true }, + "configstore": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz", + "integrity": "sha1-JeTBbDdoq/dcWmW8YXYfSVBVtFk=", + "requires": { + "graceful-fs": "3.0.11", + "js-yaml": "3.10.0", + "mkdirp": "0.5.1", + "object-assign": "2.1.1", + "osenv": "0.1.4", + "user-home": "1.1.1", + "uuid": "2.0.3", + "xdg-basedir": "1.0.1" + }, + "dependencies": { + "graceful-fs": { + "version": "3.0.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", + "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", + "requires": { + "natives": "1.1.1" + } + }, + "object-assign": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", + "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=" + }, + "uuid": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", + "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" + } + } + }, "convert-source-map": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", @@ -368,8 +406,7 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" }, "cryptiles": { "version": "2.0.5", @@ -421,6 +458,11 @@ "is-obj": "1.0.1" } }, + "deep-extend": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", + "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -478,7 +520,6 @@ "version": "3.5.3", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", - "dev": true, "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", @@ -500,7 +541,6 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "dev": true, "requires": { "once": "1.4.0" } @@ -508,14 +548,12 @@ "escape-string-regexp": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true + "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, "esprima": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", - "dev": true + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==" }, "esutils": { "version": "2.0.2", @@ -645,6 +683,15 @@ "repeat-string": "1.6.1" } }, + "final-fs": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/final-fs/-/final-fs-1.6.1.tgz", + "integrity": "sha1-1tzZLvb+T+jAer1WjHE1YQ7eMjY=", + "requires": { + "node-fs": "0.1.7", + "when": "2.0.1" + } + }, "first-chunk-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz", @@ -873,6 +920,30 @@ "sparkles": "1.0.0" } }, + "got": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz", + "integrity": "sha1-5dDtSvVfw+701WAHdp2YGSvLLso=", + "requires": { + "duplexify": "3.5.3", + "infinity-agent": "2.0.3", + "is-redirect": "1.0.0", + "is-stream": "1.1.0", + "lowercase-keys": "1.0.0", + "nested-error-stacks": "1.0.2", + "object-assign": "3.0.0", + "prepend-http": "1.0.4", + "read-all-stream": "3.1.0", + "timed-out": "2.0.0" + }, + "dependencies": { + "object-assign": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", + "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" + } + } + }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", @@ -1287,6 +1358,11 @@ "sshpk": "1.13.1" } }, + "infinity-agent": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz", + "integrity": "sha1-ReDi/3qesDCyfWK3SzdEt6esQhY=" + }, "inflight": { "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", @@ -1300,8 +1376,12 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + }, + "ini": { + "version": "1.3.5", + "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz", + "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==" }, "is": { "version": "3.2.1", @@ -1363,6 +1443,11 @@ "xtend": "4.0.1" } }, + "is-npm": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz", + "integrity": "sha1-8vtjpl5JBbQGyGBydloaTceTufQ=" + }, "is-number": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", @@ -1407,11 +1492,15 @@ "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", "dev": true }, + "is-redirect": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", + "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, "is-typedarray": { "version": "1.0.0", @@ -1434,8 +1523,7 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, "isobject": { "version": "2.1.0", @@ -1462,7 +1550,6 @@ "version": "3.10.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", - "dev": true, "requires": { "argparse": "1.0.9", "esprima": "4.0.0" @@ -1540,6 +1627,14 @@ "integrity": "sha1-FAo9LUGjbS78+pN3tiwk+ElaXEQ=", "dev": true }, + "latest-version": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz", + "integrity": "sha1-cs/Ebj6NG+ZR4eu1Tqn26pbzdLs=", + "requires": { + "package-json": "1.2.0" + } + }, "lazystream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.0.tgz", @@ -1549,6 +1644,11 @@ "readable-stream": "2.3.3" } }, + "lodash": { + "version": "3.10.1", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-3.10.1.tgz", + "integrity": "sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=" + }, "lodash._basecopy": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", @@ -1674,6 +1774,11 @@ "lodash.escape": "3.2.0" } }, + "lowercase-keys": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", + "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=" + }, "map-stream": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", @@ -1772,14 +1877,12 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, "requires": { "minimist": "0.0.8" } @@ -1846,6 +1949,24 @@ "duplexer2": "0.0.2" } }, + "natives": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz", + "integrity": "sha512-8eRaxn8u/4wN8tGkhlc2cgwwvOLMLUMUn4IYTexMgWd+LyUDfeXVkk2ygQR0hvIHbJQXgHujia3ieUUDwNGkEA==" + }, + "nested-error-stacks": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz", + "integrity": "sha1-GfYZWRUZ8JZ2mlupqG5u7sgjw88=", + "requires": { + "inherits": "2.0.3" + } + }, + "node-fs": { + "version": "0.1.7", + "resolved": "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz", + "integrity": "sha1-MjI8zLRsn78PwRgS1FAhzDHTJbs=" + }, "node.extend": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/node.extend/-/node.extend-1.1.6.tgz", @@ -1890,7 +2011,6 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1.0.2" } @@ -1905,6 +2025,34 @@ "readable-stream": "2.3.3" } }, + "os-homedir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", + "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" + }, + "os-tmpdir": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", + "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" + }, + "osenv": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", + "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", + "requires": { + "os-homedir": "1.0.2", + "os-tmpdir": "1.0.2" + } + }, + "package-json": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz", + "integrity": "sha1-yOysCUInzfdqMWh07QXifMk5oOA=", + "requires": { + "got": "3.3.1", + "registry-url": "3.1.0" + } + }, "parse-glob": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", @@ -1976,14 +2124,12 @@ "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" }, "pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, "requires": { "pinkie": "2.0.4" } @@ -2001,6 +2147,11 @@ "extend-shallow": "1.1.4" } }, + "prepend-http": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", + "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=" + }, "preserve": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", @@ -2010,8 +2161,7 @@ "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", - "dev": true + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" }, "punycode": { "version": "1.4.1", @@ -2019,6 +2169,11 @@ "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", "dev": true }, + "q": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz", + "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ=" + }, "qs": { "version": "6.3.2", "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", @@ -2081,11 +2236,37 @@ } } }, + "rc": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz", + "integrity": "sha1-J1zWh/bjs2zHVrqibf7oCnkDAf0=", + "requires": { + "deep-extend": "0.4.2", + "ini": "1.3.5", + "minimist": "1.2.0", + "strip-json-comments": "2.0.1" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=" + } + } + }, + "read-all-stream": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", + "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", + "requires": { + "pinkie-promise": "2.0.1", + "readable-stream": "2.3.3" + } + }, "readable-stream": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", - "dev": true, "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", @@ -2105,6 +2286,14 @@ "is-equal-shallow": "0.1.3" } }, + "registry-url": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", + "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", + "requires": { + "rc": "1.2.5" + } + }, "remove-trailing-separator": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", @@ -2309,14 +2498,20 @@ "safe-buffer": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true + "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==" }, "semver": { "version": "5.5.0", "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true + "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==" + }, + "semver-diff": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz", + "integrity": "sha1-S7uEN8jTfksM8aaP1ybsbWRdbTY=", + "requires": { + "semver": "5.5.0" + } }, "sntp": { "version": "1.0.9", @@ -2360,8 +2555,7 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { "version": "1.13.1", @@ -2405,8 +2599,7 @@ "stream-shift": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", - "dev": true + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" }, "streamfilter": { "version": "1.0.7", @@ -2427,11 +2620,18 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, "requires": { "safe-buffer": "5.1.1" } }, + "string-length": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", + "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=", + "requires": { + "strip-ansi": "3.0.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -2442,7 +2642,6 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, "requires": { "ansi-regex": "2.1.1" } @@ -2466,6 +2665,11 @@ "strip-bom": "2.0.0" } }, + "strip-json-comments": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", + "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=" + }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -2515,6 +2719,11 @@ "integrity": "sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=", "dev": true }, + "timed-out": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz", + "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=" + }, "to-absolute-glob": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz", @@ -2639,6 +2848,64 @@ "through2-filter": "2.0.0" } }, + "update-notifier": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz", + "integrity": "sha1-5ps6eEtOaGoqzZj15mlEWRmW4Yc=", + "requires": { + "chalk": "0.5.1", + "configstore": "0.3.2", + "is-npm": "1.0.0", + "latest-version": "1.0.1", + "semver-diff": "2.1.0", + "string-length": "1.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", + "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" + }, + "ansi-styles": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", + "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" + }, + "chalk": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", + "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "requires": { + "ansi-styles": "1.1.0", + "escape-string-regexp": "1.0.5", + "has-ansi": "0.1.0", + "strip-ansi": "0.3.0", + "supports-color": "0.2.0" + } + }, + "has-ansi": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", + "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", + "requires": { + "ansi-regex": "0.2.1" + } + }, + "strip-ansi": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", + "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", + "requires": { + "ansi-regex": "0.2.1" + } + }, + "supports-color": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", + "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" + } + } + }, "url-parse": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz", @@ -2649,11 +2916,15 @@ "requires-port": "1.0.0" } }, + "user-home": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", + "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, "uuid": { "version": "3.2.1", @@ -2778,11 +3049,43 @@ "vinyl-source-stream": "1.1.2" } }, + "when": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/when/-/when-2.0.1.tgz", + "integrity": "sha1-jYcv4V5oQkyRtLck6EjggH2rZkI=" + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + }, + "xdg-basedir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz", + "integrity": "sha1-FP+PY6T9vLBdW27qIrNvMDO58E4=", + "requires": { + "user-home": "1.1.1" + } + }, + "xqlint": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/xqlint/-/xqlint-0.4.0.tgz", + "integrity": "sha1-W3METc+8VkFUN+OiQZssymUiuo8=", + "requires": { + "colors": "0.6.2", + "commander": "2.3.0", + "final-fs": "1.6.1", + "lodash": "3.10.1", + "q": "1.0.1", + "update-notifier": "0.2.2" + }, + "dependencies": { + "commander": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.3.0.tgz", + "integrity": "sha1-/UMOiJgy7DU7ms0d4hfBHLPu+HM=" + } + } }, "xtend": { "version": "4.0.1", diff --git a/package.json b/package.json index 56900fb..1aba915 100644 --- a/package.json +++ b/package.json @@ -5,21 +5,21 @@ "version": "2.0.0", "publisher": "DotJoshJohnson", "author": { - "name": "Josh Johnson", - "url": "https://github.com/DotJoshJohnson" + "name": "Josh Johnson", + "url": "https://github.com/DotJoshJohnson" }, "galleryBanner": { - "color": "#FFFFFF", - "theme": "light" - }, - "homepage": "https://github.com/DotJoshJohnson/vscode-xml", - "repository": { - "type": "git", - "url": "https://github.com/DotJoshJohnson/vscode-xml.git" - }, - "bugs": { - "url": "https://github.com/DotJoshJohnson/vscode-xml/issues" - }, + "color": "#FFFFFF", + "theme": "light" + }, + "homepage": "https://github.com/DotJoshJohnson/vscode-xml", + "repository": { + "type": "git", + "url": "https://github.com/DotJoshJohnson/vscode-xml.git" + }, + "bugs": { + "url": "https://github.com/DotJoshJohnson/vscode-xml/issues" + }, "engines": { "vscode": "^1.19.0" }, @@ -100,7 +100,14 @@ }, "xmlTools.xqueryExecutionArguments": { "type": "array", - "default": ["-xquery", "$(script)", "-in", "$(input)", "-out", "$(input.output.xml"], + "default": [ + "-xquery", + "$(script)", + "-in", + "$(input)", + "-out", + "$(input.output.xml" + ], "description": "Arguments to be passed to the XQuery execution engine.", "scope": "resource" }, @@ -132,8 +139,17 @@ "languages": [ { "id": "xquery", - "aliases": ["XQuery", "xquery"], - "extensions": [".xq",".xql",".xqm",".xqy",".xquery"], + "aliases": [ + "XQuery", + "xquery" + ], + "extensions": [ + ".xq", + ".xql", + ".xqm", + ".xqy", + ".xquery" + ], "configuration": "./languages/xquery/xquery.json" } ] @@ -152,5 +168,8 @@ "tslint": "^5.9.1", "typescript": "^2.6.1", "vscode": "^1.1.6" + }, + "dependencies": { + "xqlint": "^0.4.0" } } diff --git a/src/extension.ts b/src/extension.ts index 6c9decf..9885a66 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,10 +1,11 @@ -import { languages, workspace } from "vscode"; -import { ExtensionContext, WorkspaceConfiguration } from "vscode"; +import { languages, window, workspace } from "vscode"; +import { ExtensionContext, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; import { XmlFormatter } from "./formatting/xml-formatter"; import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-provider"; import { ClassicXmlFormatter } from "./formatting/formatters/classic-xml-formatter"; import { V2XmlFormatter } from "./formatting/formatters/v2-xml-formatter"; +import { XQueryLinter } from "./linting/xquery-linter"; import * as constants from "./constants"; @@ -26,8 +27,35 @@ export function activate(context: ExtensionContext) { languages.registerDocumentFormattingEditProvider("xml", xmlFormattingEditProvider), languages.registerDocumentRangeFormattingEditProvider("xml", xmlFormattingEditProvider) ); + + /* Linting Features */ + context.subscriptions.push( + window.onDidChangeActiveTextEditor(_handleChangeActiveTextEditor), + window.onDidChangeTextEditorSelection(_handleChangeTextEditorSelection) + ); } export function deactivate() { // do nothing } + + +function _handleContextChange(editor: TextEditor): void { + if (!editor || !editor.document) { + return; + } + + switch (editor.document.languageId) { + case "xquery": + languages.createDiagnosticCollection("XQueryDiagnostics").set(editor.document.uri, new XQueryLinter().lint(editor.document.getText())); + break; + } +} + +function _handleChangeActiveTextEditor(editor: TextEditor): void { + _handleContextChange(editor); +} + +function _handleChangeTextEditorSelection(e: TextEditorSelectionChangeEvent): void { + _handleContextChange(e.textEditor); +} diff --git a/src/linting/xquery-linter.ts b/src/linting/xquery-linter.ts new file mode 100644 index 0000000..193b04f --- /dev/null +++ b/src/linting/xquery-linter.ts @@ -0,0 +1,23 @@ +import { Diagnostic, DiagnosticSeverity, Position, Range } from "vscode"; + +const XQLint = require("xqlint").XQLint; + +export class XQueryLinter { + static SEVERITY_WARNING: number = 1; + static SEVERITY_ERROR: number = 2; + + lint(text: string): Diagnostic[] { + const linter = new XQLint(text); + const diagnostics = new Array(); + + linter.getErrors().forEach((error: any) => { + diagnostics.push(new Diagnostic(new Range(new Position(error.pos.sl, error.pos.sc), new Position(error.pos.el, error.pos.ec)), error.message, DiagnosticSeverity.Error)); + }); + + linter.getWarnings().forEach((warning: any) => { + diagnostics.push(new Diagnostic(new Range(new Position(warning.pos.sl, warning.pos.sc), new Position(warning.pos.el, warning.pos.ec)), warning.message, DiagnosticSeverity.Warning)); + }); + + return diagnostics; + } +} From 867198590fb7328502f44affbd478a553f4122b2 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Tue, 13 Feb 2018 23:30:01 -0500 Subject: [PATCH 22/57] Fix Line Lengths --- src/extension.ts | 2 +- src/linting/xquery-linter.ts | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/extension.ts b/src/extension.ts index 9885a66..706f351 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -44,7 +44,7 @@ function _handleContextChange(editor: TextEditor): void { if (!editor || !editor.document) { return; } - + switch (editor.document.languageId) { case "xquery": languages.createDiagnosticCollection("XQueryDiagnostics").set(editor.document.uri, new XQueryLinter().lint(editor.document.getText())); diff --git a/src/linting/xquery-linter.ts b/src/linting/xquery-linter.ts index 193b04f..9b5881f 100644 --- a/src/linting/xquery-linter.ts +++ b/src/linting/xquery-linter.ts @@ -3,19 +3,33 @@ import { Diagnostic, DiagnosticSeverity, Position, Range } from "vscode"; const XQLint = require("xqlint").XQLint; export class XQueryLinter { - static SEVERITY_WARNING: number = 1; - static SEVERITY_ERROR: number = 2; + static SEVERITY_WARNING = 1; + static SEVERITY_ERROR = 2; lint(text: string): Diagnostic[] { const linter = new XQLint(text); const diagnostics = new Array(); linter.getErrors().forEach((error: any) => { - diagnostics.push(new Diagnostic(new Range(new Position(error.pos.sl, error.pos.sc), new Position(error.pos.el, error.pos.ec)), error.message, DiagnosticSeverity.Error)); + diagnostics.push(new Diagnostic( + new Range( + new Position(error.pos.sl, error.pos.sc), + new Position(error.pos.el, error.pos.ec) + ), + error.message, + DiagnosticSeverity.Error + )); }); linter.getWarnings().forEach((warning: any) => { - diagnostics.push(new Diagnostic(new Range(new Position(warning.pos.sl, warning.pos.sc), new Position(warning.pos.el, warning.pos.ec)), warning.message, DiagnosticSeverity.Warning)); + diagnostics.push(new Diagnostic( + new Range( + new Position(warning.pos.sl, warning.pos.sc), + new Position(warning.pos.el, warning.pos.ec) + ), + warning.message, + DiagnosticSeverity.Warning + )); }); return diagnostics; From 33535163c1e297ffcdcb9cb864061bf595853fe9 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 1 Mar 2018 19:33:23 -0500 Subject: [PATCH 23/57] Correct formatAsXml Command Name #133 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1aba915..b59e51c 100644 --- a/package.json +++ b/package.json @@ -133,7 +133,7 @@ }, { "key": "ctrl+shift+alt+b", - "command": "xmlTools.formatXml" + "command": "xmlTools.formatAsXml" } ], "languages": [ From d37a8b70fd2bc62ebef8559fd160ac0c97dc4978 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 1 Mar 2018 21:22:53 -0500 Subject: [PATCH 24/57] Add Format As XML Command --- src/extension.ts | 18 ++----- src/formatting/commands/formatAsXml.ts | 53 +++++++++++++++++++ src/formatting/xml-formatter.ts | 26 +++++++++ .../xml-formatting-edit-provider.ts | 9 +--- src/formatting/xml-formatting-options.ts | 19 ++++++- 5 files changed, 104 insertions(+), 21 deletions(-) create mode 100644 src/formatting/commands/formatAsXml.ts diff --git a/src/extension.ts b/src/extension.ts index 706f351..3b35182 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,10 +1,9 @@ -import { languages, window, workspace } from "vscode"; +import { languages, window, workspace, commands } from "vscode"; import { ExtensionContext, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; -import { XmlFormatter } from "./formatting/xml-formatter"; +import { FormatAsXmlCommandName, formatAsXml } from "./formatting/commands/formatAsXml"; +import { XmlFormatterFactory } from "./formatting/xml-formatter"; import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-provider"; -import { ClassicXmlFormatter } from "./formatting/formatters/classic-xml-formatter"; -import { V2XmlFormatter } from "./formatting/formatters/v2-xml-formatter"; import { XQueryLinter } from "./linting/xquery-linter"; import * as constants from "./constants"; @@ -13,17 +12,10 @@ export function activate(context: ExtensionContext) { const config = workspace.getConfiguration(constants.extensionPrefix); /* Formatting Features */ - const xmlFormatterImplementationSetting = config.get("xmlFormatterImplementation"); - let xmlFormatterImplementation: XmlFormatter; - - switch (xmlFormatterImplementationSetting) { - case "v2": xmlFormatterImplementation = new V2XmlFormatter(); break; - case "classic": default: xmlFormatterImplementation = new ClassicXmlFormatter(); break; - } - - const xmlFormattingEditProvider = new XmlFormattingEditProvider(config, xmlFormatterImplementation); + const xmlFormattingEditProvider = new XmlFormattingEditProvider(config, XmlFormatterFactory.getXmlFormatter()); context.subscriptions.push( + commands.registerTextEditorCommand(FormatAsXmlCommandName, formatAsXml), languages.registerDocumentFormattingEditProvider("xml", xmlFormattingEditProvider), languages.registerDocumentRangeFormattingEditProvider("xml", xmlFormattingEditProvider) ); diff --git a/src/formatting/commands/formatAsXml.ts b/src/formatting/commands/formatAsXml.ts new file mode 100644 index 0000000..bd29f43 --- /dev/null +++ b/src/formatting/commands/formatAsXml.ts @@ -0,0 +1,53 @@ +import { commands, workspace } from "vscode"; +import { ProviderResult, Range, TextEdit, TextEditor, TextEditorEdit } from "vscode"; + +import * as constants from "../../constants"; + +import { XmlFormatterFactory } from "../xml-formatter"; +import { XmlFormattingEditProvider } from "../xml-formatting-edit-provider"; +import { XmlFormattingOptionsFactory } from "../xml-formatting-options"; + +export const FormatAsXmlCommandName = "formatAsXml"; + +export function formatAsXml(editor: TextEditor, edit: TextEditorEdit): void { + const xmlFormattingEditProvider = new XmlFormattingEditProvider(workspace.getConfiguration(constants.extensionPrefix), XmlFormatterFactory.getXmlFormatter()); + const formattingOptions = { + insertSpaces: editor.options.insertSpaces, + tabSize: editor.options.tabSize + }; + + let edits: ProviderResult; + + if (!editor.selection.isEmpty) { + edits = xmlFormattingEditProvider.provideDocumentRangeFormattingEdits( + editor.document, + new Range(editor.selection.start, editor.selection.end), + formattingOptions, + null); + } + + else { + edits = xmlFormattingEditProvider.provideDocumentFormattingEdits( + editor.document, + formattingOptions, + null); + } + + for (let i = 0; i < (edits as TextEdit[]).length; i++) { + const textEdit = (edits as TextEdit[])[i]; + + editor.edit(async (editBuilder) => { + editBuilder.replace(textEdit.range, textEdit.newText); + + // wiggle the cursor to deselect the formatted XML (is there a non-hacky way to go about this?) + await commands.executeCommand("cursorMove", { + to: "left", + by: "character" + }); + await commands.executeCommand("cursorMove", { + to: "right", + by: "character" + }); + }); + } +} diff --git a/src/formatting/xml-formatter.ts b/src/formatting/xml-formatter.ts index 2ad9111..2dd90d7 100644 --- a/src/formatting/xml-formatter.ts +++ b/src/formatting/xml-formatter.ts @@ -1,6 +1,32 @@ +import { workspace } from "vscode"; + +import * as constants from "../constants"; +import { ClassicXmlFormatter } from "./formatters/classic-xml-formatter"; +import { V2XmlFormatter } from "./formatters/v2-xml-formatter"; + import { XmlFormattingOptions } from "./xml-formatting-options"; export interface XmlFormatter { formatXml(xml: string, options: XmlFormattingOptions): string; minifyXml(xml: string, options: XmlFormattingOptions): string; } + +export class XmlFormatterFactory { + private static _xmlFormatter: XmlFormatter; + + static getXmlFormatter(): XmlFormatter { + if (XmlFormatterFactory._xmlFormatter) { + return XmlFormatterFactory._xmlFormatter; + } + + const xmlFormatterImplementationSetting = workspace.getConfiguration(constants.extensionPrefix).get("xmlFormatterImplementation"); + let xmlFormatterImplementation: XmlFormatter; + + switch (xmlFormatterImplementationSetting) { + case "classic": xmlFormatterImplementation = new ClassicXmlFormatter(); break; + case "v2": default: xmlFormatterImplementation = new V2XmlFormatter(); break; + } + + return (XmlFormatterFactory._xmlFormatter = xmlFormatterImplementation); + } +} \ No newline at end of file diff --git a/src/formatting/xml-formatting-edit-provider.ts b/src/formatting/xml-formatting-edit-provider.ts index a6c117b..2fd9007 100644 --- a/src/formatting/xml-formatting-edit-provider.ts +++ b/src/formatting/xml-formatting-edit-provider.ts @@ -6,6 +6,7 @@ import { import * as constants from "../constants"; import { XmlFormatter } from "./xml-formatter"; +import { XmlFormattingOptionsFactory } from "./xml-formatting-options"; export class XmlFormattingEditProvider implements DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider { @@ -27,13 +28,7 @@ export class XmlFormattingEditProvider implements DocumentFormattingEditProvider let xml = document.getText(range); - xml = this.xmlFormatter.formatXml(xml, { - editorOptions: options, - newLine: (document.eol === EndOfLine.CRLF) ? "\r\n" : "\n", - removeCommentsOnMinify: this.workspaceConfiguration.get("removeCommentsOnMinify"), - splitAttributesOnFormat: this.workspaceConfiguration.get("splitAttributesOnFormat"), - splitXmlnsOnFormat: this.workspaceConfiguration.get("splitXmlnsOnFormat") - }); + xml = this.xmlFormatter.formatXml(xml, XmlFormattingOptionsFactory.getXmlFormattingOptions(options, document.eol)); return [ TextEdit.replace(range, xml) ]; } diff --git a/src/formatting/xml-formatting-options.ts b/src/formatting/xml-formatting-options.ts index bafed99..fe4670c 100644 --- a/src/formatting/xml-formatting-options.ts +++ b/src/formatting/xml-formatting-options.ts @@ -1,4 +1,7 @@ -import { FormattingOptions } from "vscode"; +import { workspace } from "vscode"; +import { EndOfLine, FormattingOptions } from "vscode"; + +import * as constants from "../constants"; export interface XmlFormattingOptions { editorOptions: FormattingOptions; @@ -7,3 +10,17 @@ export interface XmlFormattingOptions { splitAttributesOnFormat: boolean; splitXmlnsOnFormat: boolean; } + +export class XmlFormattingOptionsFactory { + static getXmlFormattingOptions(formattingOptions: FormattingOptions, eol: EndOfLine): XmlFormattingOptions { + const config = workspace.getConfiguration(constants.extensionPrefix); + + return { + editorOptions: formattingOptions, + newLine: (eol === EndOfLine.CRLF) ? "\r\n" : "\n", + removeCommentsOnMinify: config.get("removeCommentsOnMinify"), + splitAttributesOnFormat: config.get("splitAttributesOnFormat"), + splitXmlnsOnFormat: config.get("splitXmlnsOnFormat") + }; + } +} \ No newline at end of file From 5318909fcfb8dfdd4c6b188e6808434cdd51a943 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 1 Mar 2018 21:31:14 -0500 Subject: [PATCH 25/57] Add Minify XML Command --- src/extension.ts | 2 ++ src/formatting/commands/formatAsXml.ts | 2 +- src/formatting/commands/minifyXml.ts | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/formatting/commands/minifyXml.ts diff --git a/src/extension.ts b/src/extension.ts index 3b35182..eb4fcb3 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -2,6 +2,7 @@ import { languages, window, workspace, commands } from "vscode"; import { ExtensionContext, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; import { FormatAsXmlCommandName, formatAsXml } from "./formatting/commands/formatAsXml"; +import { MinifyXmlCommandName, minifyXml } from "./formatting/commands/minifyXml"; import { XmlFormatterFactory } from "./formatting/xml-formatter"; import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-provider"; import { XQueryLinter } from "./linting/xquery-linter"; @@ -16,6 +17,7 @@ export function activate(context: ExtensionContext) { context.subscriptions.push( commands.registerTextEditorCommand(FormatAsXmlCommandName, formatAsXml), + commands.registerTextEditorCommand(MinifyXmlCommandName, minifyXml), languages.registerDocumentFormattingEditProvider("xml", xmlFormattingEditProvider), languages.registerDocumentRangeFormattingEditProvider("xml", xmlFormattingEditProvider) ); diff --git a/src/formatting/commands/formatAsXml.ts b/src/formatting/commands/formatAsXml.ts index bd29f43..cfec9ea 100644 --- a/src/formatting/commands/formatAsXml.ts +++ b/src/formatting/commands/formatAsXml.ts @@ -7,7 +7,7 @@ import { XmlFormatterFactory } from "../xml-formatter"; import { XmlFormattingEditProvider } from "../xml-formatting-edit-provider"; import { XmlFormattingOptionsFactory } from "../xml-formatting-options"; -export const FormatAsXmlCommandName = "formatAsXml"; +export const FormatAsXmlCommandName = "xmlTools.formatAsXml"; export function formatAsXml(editor: TextEditor, edit: TextEditorEdit): void { const xmlFormattingEditProvider = new XmlFormattingEditProvider(workspace.getConfiguration(constants.extensionPrefix), XmlFormatterFactory.getXmlFormatter()); diff --git a/src/formatting/commands/minifyXml.ts b/src/formatting/commands/minifyXml.ts new file mode 100644 index 0000000..4c8553f --- /dev/null +++ b/src/formatting/commands/minifyXml.ts @@ -0,0 +1,23 @@ +import { commands, workspace } from "vscode"; +import { ProviderResult, Range, TextEdit, TextEditor, TextEditorEdit } from "vscode"; + +import * as constants from "../../constants"; + +import { XmlFormatterFactory } from "../xml-formatter"; +import { XmlFormattingEditProvider } from "../xml-formatting-edit-provider"; +import { XmlFormattingOptionsFactory } from "../xml-formatting-options"; + +export const MinifyXmlCommandName = "xmlTools.minifyXml"; + +export function minifyXml(editor: TextEditor, edit: TextEditorEdit): void { + const xmlFormatter = XmlFormatterFactory.getXmlFormatter(); + const xmlFormattingOptions = XmlFormattingOptionsFactory.getXmlFormattingOptions({ + insertSpaces: editor.options.insertSpaces, + tabSize: editor.options.tabSize + }, editor.document.eol); + + const endPosition = editor.document.lineAt(editor.document.lineCount - 1).rangeIncludingLineBreak.end; + const range = new Range(editor.document.positionAt(0), endPosition); + + edit.replace(range, xmlFormatter.minifyXml(editor.document.getText(), xmlFormattingOptions)); +} \ No newline at end of file From 645aa7d6ec655879a741685aab8dee583462fa51 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 1 Mar 2018 21:50:18 -0500 Subject: [PATCH 26/57] Add XQuery Completion Provider --- .../xquery-completion-item-provider.ts | 51 +++++++++++++++++++ src/extension.ts | 6 +++ 2 files changed, 57 insertions(+) create mode 100644 src/completion/xquery-completion-item-provider.ts diff --git a/src/completion/xquery-completion-item-provider.ts b/src/completion/xquery-completion-item-provider.ts new file mode 100644 index 0000000..d9d9941 --- /dev/null +++ b/src/completion/xquery-completion-item-provider.ts @@ -0,0 +1,51 @@ +import { CompletionItem, CompletionItemKind, CompletionItemProvider, Position, TextDocument } from "vscode"; + +const XQLint = require("xqlint").XQLint; + +export class XQueryCompletionItemProvider implements CompletionItemProvider { + + provideCompletionItems(document: TextDocument, position: Position): CompletionItem[] { + const completionItems = new Array(); + const linter = new XQLint(document.getText()); + + linter.getCompletions({ line: position.line, col: position.character }).forEach((x: any) => { + completionItems.push(this._getCompletionItem(x)); + }); + + return completionItems; + } + + private _getCompletionItem(xqLintCompletionItem: any): CompletionItem { + const completionItem = new CompletionItem(xqLintCompletionItem.name); + completionItem.insertText = xqLintCompletionItem.value; + + switch (xqLintCompletionItem.meta) { + // functions (always qualified with a colon) + case "function": + completionItem.kind = CompletionItemKind.Function; + + const funcStart = (xqLintCompletionItem.value.indexOf(":") + 1); + const funcEnd = xqLintCompletionItem.value.indexOf("("); + + completionItem.insertText = xqLintCompletionItem.value.substring(funcStart, funcEnd); + break; + + // variables and parameters (always qualified with a dollar sign) + case "Let binding": + case "Local variable": + case "Window variable": + case "Function parameter": + completionItem.kind = CompletionItemKind.Variable; + completionItem.insertText = xqLintCompletionItem.value.substring(1); + break; + + // everything else + default: + completionItem.kind = CompletionItemKind.Text; + break; + } + + return completionItem; + } + +} \ No newline at end of file diff --git a/src/extension.ts b/src/extension.ts index eb4fcb3..834d097 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,6 +1,7 @@ import { languages, window, workspace, commands } from "vscode"; import { ExtensionContext, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; +import { XQueryCompletionItemProvider } from "./completion/xquery-completion-item-provider"; import { FormatAsXmlCommandName, formatAsXml } from "./formatting/commands/formatAsXml"; import { MinifyXmlCommandName, minifyXml } from "./formatting/commands/minifyXml"; import { XmlFormatterFactory } from "./formatting/xml-formatter"; @@ -12,6 +13,11 @@ import * as constants from "./constants"; export function activate(context: ExtensionContext) { const config = workspace.getConfiguration(constants.extensionPrefix); + /* Completion Features */ + context.subscriptions.push( + languages.registerCompletionItemProvider("xquery", new XQueryCompletionItemProvider(), ":", "$") + ); + /* Formatting Features */ const xmlFormattingEditProvider = new XmlFormattingEditProvider(config, XmlFormatterFactory.getXmlFormatter()); From fb6d5ef75a37afd173bb9bcda16b63493441d84f Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 1 Mar 2018 21:53:00 -0500 Subject: [PATCH 27/57] Set Preview Flag --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index b59e51c..3e8c452 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "displayName": "XML Tools", "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", "version": "2.0.0", + "preview": true, "publisher": "DotJoshJohnson", "author": { "name": "Josh Johnson", From dab5b0c072d5fe299cfff7c49e1a58c320c745c5 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 1 Mar 2018 22:09:17 -0500 Subject: [PATCH 28/57] v2.0.0-preview.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3e8c452..3b303db 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "xml", "displayName": "XML Tools", "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", - "version": "2.0.0", + "version": "2.0.0-preview.1", "preview": true, "publisher": "DotJoshJohnson", "author": { From c37ac45e80611fb22dda8032544cddf7e71bc355 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Fri, 27 Apr 2018 23:10:55 -0400 Subject: [PATCH 29/57] Add XML Tree View --- package-lock.json | 29 +++-- package.json | 19 ++- resources/icons/attribute.dark.svg | 35 ++++++ resources/icons/attribute.light.svg | 56 +++++++++ resources/icons/element.dark.svg | 42 +++++++ resources/icons/element.light.svg | 54 +++++++++ src/constants.ts | 12 ++ src/extension.ts | 6 + src/formatting/xml-formatting-options.ts | 4 +- src/tree-view/xml-tree-data-provider.ts | 142 +++++++++++++++++++++++ tsconfig.json | 1 + 11 files changed, 388 insertions(+), 12 deletions(-) create mode 100644 resources/icons/attribute.dark.svg create mode 100644 resources/icons/attribute.light.svg create mode 100644 resources/icons/element.dark.svg create mode 100644 resources/icons/element.light.svg create mode 100644 src/tree-view/xml-tree-data-provider.ts diff --git a/package-lock.json b/package-lock.json index 48eff04..8b3ac2b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "xml", - "version": "2.0.0", + "version": "2.0.0-preview.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -16,6 +16,12 @@ "integrity": "sha512-jjpyQsKGsOF/wUElNjfPULk+d8PKvJOIXk3IUeBYYmNCy5dMWfrI+JiixYNw8ppKOlcRwWTXFl0B+i5oGrf95Q==", "dev": true }, + "@types/xmldom": { + "version": "0.1.29", + "resolved": "https://registry.npmjs.org/@types/xmldom/-/xmldom-0.1.29.tgz", + "integrity": "sha1-xEKLDKhtO4gUdXJv2UmAs4onw4E=", + "dev": true + }, "ajv": { "version": "5.5.2", "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", @@ -2616,14 +2622,6 @@ "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=", "dev": true }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "requires": { - "safe-buffer": "5.1.1" - } - }, "string-length": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", @@ -2632,6 +2630,14 @@ "strip-ansi": "3.0.1" } }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "requires": { + "safe-buffer": "5.1.1" + } + }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", @@ -3067,6 +3073,11 @@ "user-home": "1.1.1" } }, + "xmldom": { + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", + "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" + }, "xqlint": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/xqlint/-/xqlint-0.4.0.tgz", diff --git a/package.json b/package.json index 3b303db..f96e064 100644 --- a/package.json +++ b/package.json @@ -63,6 +63,12 @@ "title": "XML Tools Configuration", "type": "object", "properties": { + "xmlTools.enableXmlTreeView": { + "type": "boolean", + "default": true, + "description": "Enables the XML Document view in the explorer for XML documents.", + "scope": "window" + }, "xmlTools.ignoreDefaultNamespace": { "type": "boolean", "default": true, @@ -153,7 +159,16 @@ ], "configuration": "./languages/xquery/xquery.json" } - ] + ], + "views": { + "explorer": [ + { + "id": "xmlTreeView", + "name": "XML Document", + "when": "xmlTreeViewEnabled" + } + ] + } }, "scripts": { "vscode:prepublish": "npm run compile", @@ -166,11 +181,13 @@ "devDependencies": { "@types/mocha": "^2.2.42", "@types/node": "^7.0.43", + "@types/xmldom": "^0.1.29", "tslint": "^5.9.1", "typescript": "^2.6.1", "vscode": "^1.1.6" }, "dependencies": { + "xmldom": "^0.1.27", "xqlint": "^0.4.0" } } diff --git a/resources/icons/attribute.dark.svg b/resources/icons/attribute.dark.svg new file mode 100644 index 0000000..f208dc3 --- /dev/null +++ b/resources/icons/attribute.dark.svg @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/icons/attribute.light.svg b/resources/icons/attribute.light.svg new file mode 100644 index 0000000..2c5fc76 --- /dev/null +++ b/resources/icons/attribute.light.svg @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/icons/element.dark.svg b/resources/icons/element.dark.svg new file mode 100644 index 0000000..45eced5 --- /dev/null +++ b/resources/icons/element.dark.svg @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/icons/element.light.svg b/resources/icons/element.light.svg new file mode 100644 index 0000000..8e6cfd1 --- /dev/null +++ b/resources/icons/element.light.svg @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/constants.ts b/src/constants.ts index 33b87fe..552a47f 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1 +1,13 @@ export const extensionPrefix = "xmlTools"; + +export namespace commands { + export const setContext = "setContext"; +} + +export namespace contextKeys { + export const xmlTreeViewEnabled = "xmlTreeViewEnabled"; +} + +export namespace configKeys { + export const enableXmlTreeView = "enableXmlTreeView"; +} diff --git a/src/extension.ts b/src/extension.ts index 834d097..7b34170 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -7,6 +7,7 @@ import { MinifyXmlCommandName, minifyXml } from "./formatting/commands/minifyXml import { XmlFormatterFactory } from "./formatting/xml-formatter"; import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-provider"; import { XQueryLinter } from "./linting/xquery-linter"; +import { XmlTreeDataProvider } from "./tree-view/xml-tree-data-provider"; import * as constants from "./constants"; @@ -33,6 +34,11 @@ export function activate(context: ExtensionContext) { window.onDidChangeActiveTextEditor(_handleChangeActiveTextEditor), window.onDidChangeTextEditorSelection(_handleChangeTextEditorSelection) ); + + /* Tree View Features */ + context.subscriptions.push( + window.registerTreeDataProvider("xmlTreeView", new XmlTreeDataProvider(context)) + ); } export function deactivate() { diff --git a/src/formatting/xml-formatting-options.ts b/src/formatting/xml-formatting-options.ts index fe4670c..bcaf173 100644 --- a/src/formatting/xml-formatting-options.ts +++ b/src/formatting/xml-formatting-options.ts @@ -14,7 +14,7 @@ export interface XmlFormattingOptions { export class XmlFormattingOptionsFactory { static getXmlFormattingOptions(formattingOptions: FormattingOptions, eol: EndOfLine): XmlFormattingOptions { const config = workspace.getConfiguration(constants.extensionPrefix); - + return { editorOptions: formattingOptions, newLine: (eol === EndOfLine.CRLF) ? "\r\n" : "\n", @@ -23,4 +23,4 @@ export class XmlFormattingOptionsFactory { splitXmlnsOnFormat: config.get("splitXmlnsOnFormat") }; } -} \ No newline at end of file +} diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts new file mode 100644 index 0000000..4012321 --- /dev/null +++ b/src/tree-view/xml-tree-data-provider.ts @@ -0,0 +1,142 @@ +import { commands, window, workspace } from "vscode"; +import { + Event, EventEmitter, ExtensionContext, TextEditor, TreeDataProvider, + TreeItem, TreeItemCollapsibleState +} from "vscode"; + +import * as path from "path"; +import { DOMParser } from "xmldom"; + +import * as constants from "../constants"; + +export class XmlTreeDataProvider implements TreeDataProvider { + private _onDidChangeTreeData: EventEmitter = new EventEmitter(); + private _xmlDocument: any; + + constructor(private _context: ExtensionContext) { + window.onDidChangeActiveTextEditor(() => { + this._refreshTree(); + }); + + workspace.onDidChangeTextDocument(() => { + this._refreshTree(); + }); + } + + onDidChangeTreeData = this._onDidChangeTreeData.event; + + get activeEditor(): TextEditor { + return window.activeTextEditor || null; + } + + getTreeItem(element: any): TreeItem | Thenable { + const treeItem = new TreeItem(element.localName); + + if (this._getChildAttributeArray(element).length > 0) { + treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; + } + + if (this._getChildElementArray(element).length > 0) { + treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; + } + + treeItem.command = { + command: "revealLine", + title: "", + arguments: [{ + lineNumber: element.lineNumber - 1, + at: "top" + }] + }; + + treeItem.iconPath = this._getIcon(element); + + return treeItem; + } + + getChildren(element?: any): any[] | Thenable { + if (!this._xmlDocument) { + this._refreshTree(); + } + + if (element) { + return [].concat(this._getChildAttributeArray(element), this._getChildElementArray(element)); + } + + else if (this._xmlDocument) { + return [this._xmlDocument.lastChild]; + } + + else { + return []; + } + } + + private _getChildAttributeArray(node: any): any[] { + if (!node.attributes) { + return []; + } + + const array = new Array(); + + for (let i = 0; i < node.attributes.length; i++) { + array.push(node.attributes[i]); + } + + return array; + } + + private _getChildElementArray(node: any): any[] { + if (!node.childNodes) { + return []; + } + + const array = new Array(); + + for (let i = 0; i < node.childNodes.length; i++) { + let child = node.childNodes[i]; + + if (child.tagName) { + array.push(child); + } + } + + return array; + } + + private _getIcon(element: any): any { + let type = "element"; + + if (!element.tagName) { + type = "attribute"; + } + + const icon = { + dark: this._context.asAbsolutePath(path.join("resources", "icons", `${type}.dark.svg`)), + light: this._context.asAbsolutePath(path.join("resources", "icons", `${type}.light.svg`)) + }; + + return icon; + } + + private _refreshTree(): void { + if (!this.activeEditor || this.activeEditor.document.languageId !== "xml") { + commands.executeCommand(constants.commands.setContext, constants.contextKeys.xmlTreeViewEnabled, false); + + this._xmlDocument = null; + this._onDidChangeTreeData.fire(); + return; + } + + const config = workspace.getConfiguration(constants.extensionPrefix); + const enableTreeView = config.get(constants.configKeys.enableXmlTreeView, true); + + commands.executeCommand(constants.commands.setContext, constants.contextKeys.xmlTreeViewEnabled, enableTreeView); + + const xml = this.activeEditor.document.getText(); + this._xmlDocument = new DOMParser().parseFromString(xml, "text/xml"); + + this._onDidChangeTreeData.fire(); + } + +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index c3e70b8..b75f03e 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,6 +4,7 @@ "target": "es6", "outDir": "out", "lib": [ + "dom", "es6" ], "sourceMap": true, From 6f0bbe3ed72fa46db979ccb5e3ba910441edcf08 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Fri, 27 Apr 2018 23:15:05 -0400 Subject: [PATCH 30/57] Lint Fix --- src/completion/xquery-completion-item-provider.ts | 2 +- src/formatting/commands/minifyXml.ts | 2 +- src/formatting/xml-formatter.ts | 2 +- src/tree-view/xml-tree-data-provider.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/completion/xquery-completion-item-provider.ts b/src/completion/xquery-completion-item-provider.ts index d9d9941..4beb7ef 100644 --- a/src/completion/xquery-completion-item-provider.ts +++ b/src/completion/xquery-completion-item-provider.ts @@ -48,4 +48,4 @@ export class XQueryCompletionItemProvider implements CompletionItemProvider { return completionItem; } -} \ No newline at end of file +} diff --git a/src/formatting/commands/minifyXml.ts b/src/formatting/commands/minifyXml.ts index 4c8553f..a73ea87 100644 --- a/src/formatting/commands/minifyXml.ts +++ b/src/formatting/commands/minifyXml.ts @@ -20,4 +20,4 @@ export function minifyXml(editor: TextEditor, edit: TextEditorEdit): void { const range = new Range(editor.document.positionAt(0), endPosition); edit.replace(range, xmlFormatter.minifyXml(editor.document.getText(), xmlFormattingOptions)); -} \ No newline at end of file +} diff --git a/src/formatting/xml-formatter.ts b/src/formatting/xml-formatter.ts index 2dd90d7..ee16c1d 100644 --- a/src/formatting/xml-formatter.ts +++ b/src/formatting/xml-formatter.ts @@ -29,4 +29,4 @@ export class XmlFormatterFactory { return (XmlFormatterFactory._xmlFormatter = xmlFormatterImplementation); } -} \ No newline at end of file +} diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index 4012321..347b8f8 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -94,7 +94,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { const array = new Array(); for (let i = 0; i < node.childNodes.length; i++) { - let child = node.childNodes[i]; + const child = node.childNodes[i]; if (child.tagName) { array.push(child); @@ -139,4 +139,4 @@ export class XmlTreeDataProvider implements TreeDataProvider { this._onDidChangeTreeData.fire(); } -} \ No newline at end of file +} From 1c083d15e3ffa8d59bf5d3c88736d16fdbdecfae Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 00:10:51 -0400 Subject: [PATCH 31/57] Add XPath Evaluation --- README.md | 1 + package-lock.json | 5 ++ package.json | 1 + src/constants.ts | 8 +++ src/extension.ts | 13 +++- src/xpath/commands/evaluateXPath.ts | 104 ++++++++++++++++++++++++++++ src/xpath/xpath-evaluator.ts | 59 ++++++++++++++++ 7 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 src/xpath/commands/evaluateXPath.ts create mode 100644 src/xpath/xpath-evaluator.ts diff --git a/README.md b/README.md index 6bcb635..57924bc 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ *In Progress* ## Extension Settings +* `xmlTools.enableXmlTreeView`: Enables the XML Tree View for XML documents. * `xmlTools.ignoreDefaultNamespace`: Ignore default xmlns attributes when evaluating XPath. * `xmlTools.persistXPathQuery`: Remember the last XPath query used. * `xmlTools.removeCommentsOnMinify`: Remove XML comments during minification. diff --git a/package-lock.json b/package-lock.json index 8b3ac2b..5752668 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3078,6 +3078,11 @@ "resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz", "integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk=" }, + "xpath": { + "version": "0.0.27", + "resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz", + "integrity": "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==" + }, "xqlint": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/xqlint/-/xqlint-0.4.0.tgz", diff --git a/package.json b/package.json index f96e064..31b0fbd 100644 --- a/package.json +++ b/package.json @@ -188,6 +188,7 @@ }, "dependencies": { "xmldom": "^0.1.27", + "xpath": "0.0.27", "xqlint": "^0.4.0" } } diff --git a/src/constants.ts b/src/constants.ts index 552a47f..9616133 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,6 +1,7 @@ export const extensionPrefix = "xmlTools"; export namespace commands { + export const evaluateXPath = "xmlTools.evaluateXPath"; export const setContext = "setContext"; } @@ -10,4 +11,11 @@ export namespace contextKeys { export namespace configKeys { export const enableXmlTreeView = "enableXmlTreeView"; + export const ignoreDefaultNamespace = "ignoreDefaultNamespace"; + export const persistXPathQuery = "persistXPathQuery"; +} + +export namespace stateKeys { + export const xpathQueryHistory = "xpathQueryHistory"; + export const xPathQueryLast = "xPathQueryLast"; } diff --git a/src/extension.ts b/src/extension.ts index 7b34170..4aacf73 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,5 +1,5 @@ import { languages, window, workspace, commands } from "vscode"; -import { ExtensionContext, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; +import { ExtensionContext, Memento, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; import { XQueryCompletionItemProvider } from "./completion/xquery-completion-item-provider"; import { FormatAsXmlCommandName, formatAsXml } from "./formatting/commands/formatAsXml"; @@ -8,10 +8,16 @@ import { XmlFormatterFactory } from "./formatting/xml-formatter"; import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-provider"; import { XQueryLinter } from "./linting/xquery-linter"; import { XmlTreeDataProvider } from "./tree-view/xml-tree-data-provider"; +import { evaluateXPath } from "./xpath/commands/evaluateXPath"; import * as constants from "./constants"; +export const ExtensionState: { global?: Memento, workspace?: Memento } = { }; + export function activate(context: ExtensionContext) { + ExtensionState.global = context.globalState; + ExtensionState.workspace = context.workspaceState; + const config = workspace.getConfiguration(constants.extensionPrefix); /* Completion Features */ @@ -39,6 +45,11 @@ export function activate(context: ExtensionContext) { context.subscriptions.push( window.registerTreeDataProvider("xmlTreeView", new XmlTreeDataProvider(context)) ); + + /* XPath Features */ + context.subscriptions.push( + commands.registerTextEditorCommand(constants.commands.evaluateXPath, evaluateXPath) + ); } export function deactivate() { diff --git a/src/xpath/commands/evaluateXPath.ts b/src/xpath/commands/evaluateXPath.ts new file mode 100644 index 0000000..4262467 --- /dev/null +++ b/src/xpath/commands/evaluateXPath.ts @@ -0,0 +1,104 @@ +import { window, workspace } from "vscode"; +import { TextEditor, TextEditorEdit, ViewColumn } from "vscode"; + +import * as constants from "../../constants"; +import { ExtensionState } from "../../extension"; + +import { EvaluatorResult, EvaluatorResultType, XPathEvaluator } from "../xpath-evaluator"; + +export async function evaluateXPath(editor: TextEditor, edit: TextEditorEdit): Promise { + const config = workspace.getConfiguration(constants.extensionPrefix); + + // if there is no workspace, we will track queries in the global Memento + const memento = ExtensionState.workspace || ExtensionState.global; + + // get the xpath persistence setting + const persistQueries = config.get(constants.configKeys.persistXPathQuery, true); + + // get the last query if there is one for this document + // if not, try pulling the last query ran, regardless of document + // NOTE: if the user has focus on the output channel when opening the xquery prompt, the channel is the "active" document + const history = memento.get(constants.stateKeys.xpathQueryHistory, new Array()); + const globalLastQuery = memento.get(constants.stateKeys.xPathQueryLast, ""); + + const lastQuery = history.find(x => { + return (x.uri === editor.document.uri.toString()); + }); + + // set the inital display value and prompt the user + let query = (lastQuery) ? lastQuery.query : globalLastQuery; + + query = await window.showInputBox({ + placeHolder: "XPath Query", + prompt: "Please enter an XPath query to evaluate.", + value: query + }); + + // showInputBox() will return undefined if the user dimissed the prompt + if (!query) { + return; + } + + const ignoreDefaultNamespace = config.get(constants.configKeys.ignoreDefaultNamespace, true); + + // run the query + const xml = editor.document.getText(); + let evalResult: EvaluatorResult; + + try { + evalResult = XPathEvaluator.evaluate(query, xml, ignoreDefaultNamespace); + } + + catch (error) { + console.error(error); + window.showErrorMessage(`Something went wrong while evaluating the XPath: ${error}`); + return; + } + + // show the results to the user + const outputChannel = window.createOutputChannel("XPath Results"); + + outputChannel.clear(); + + outputChannel.appendLine(`XPath Query: ${query}`); + outputChannel.append("\n"); + + if (evalResult.type === EvaluatorResultType.NODE_COLLECTION) { + (evalResult.result as Node[]).forEach((node: any) => { + outputChannel.appendLine(`[Line ${node.lineNumber}] ${node.localName}: ${node.textContent}`); + }); + } + + else { + outputChannel.appendLine(`[Result]: ${evalResult.result}`); + } + + outputChannel.show(ViewColumn.Three); + + if (persistQueries) { + const historicQuery = new HistoricQuery(editor.document.uri.toString(), query); + + const affectedIndex = history.findIndex(x => x.uri === historicQuery.uri); + + if (affectedIndex === -1) { + history.push(historicQuery); + } + + else { + history[affectedIndex].query = query; + } + + memento.update(constants.stateKeys.xpathQueryHistory, history); + memento.update(constants.stateKeys.xPathQueryLast, query); + } +} + +class HistoricQuery { + constructor(uri: string, query: string) { + this.uri = uri; + this.query = query; + } + + uri: string; + query: string; +} diff --git a/src/xpath/xpath-evaluator.ts b/src/xpath/xpath-evaluator.ts new file mode 100644 index 0000000..ae05414 --- /dev/null +++ b/src/xpath/xpath-evaluator.ts @@ -0,0 +1,59 @@ +import * as xpath from "xpath"; +import { SelectedValue, XPathSelect } from "xpath"; +import { DOMParser } from "xmldom"; + +export class EvaluatorResult { + type: EvaluatorResultType; + result: Node[] | number | string | boolean; +} + +export class EvaluatorResultType { + static SCALAR_TYPE = 0; + static NODE_COLLECTION = 1; +} + +export class XPathEvaluator { + static evaluate(query: string, xml: string, ignoreDefaultNamespace: boolean): EvaluatorResult { + if (ignoreDefaultNamespace) { + xml = xml.replace(/xmlns=".+"/g, (match: string) => { + return match.replace(/xmlns/g, "xmlns:default"); + }); + } + + const nodes = new Array(); + const xdoc: Document = new DOMParser().parseFromString(xml, "text/xml"); + const resolver = (xpath as any).createNSResolver(xdoc); + const xPathResult = xpath.evaluate(query, xdoc, resolver, 0, null); + + const evaluatorResult = new EvaluatorResult(); + evaluatorResult.type = EvaluatorResultType.SCALAR_TYPE; + + switch (xPathResult.resultType) { + case xPathResult.NUMBER_TYPE: + evaluatorResult.result = xPathResult.numberValue; + break; + case xPathResult.STRING_TYPE: + evaluatorResult.result = xPathResult.stringValue; + break; + case xPathResult.BOOLEAN_TYPE: + evaluatorResult.result = xPathResult.booleanValue; + break; + case xPathResult.UNORDERED_NODE_ITERATOR_TYPE: + case xPathResult.ORDERED_NODE_ITERATOR_TYPE: + evaluatorResult.result = xPathResult.booleanValue; + + let node: Node; + + while (node = xPathResult.iterateNext()) { + nodes.push(node); + } + + evaluatorResult.result = nodes; + evaluatorResult.type = EvaluatorResultType.NODE_COLLECTION; + break; + } + + + return evaluatorResult; + } +} From 06e6ace24159c771e2e58ddbec294cf393ce0c9c Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 00:20:57 -0400 Subject: [PATCH 32/57] Satisfy Lint Error --- src/xpath/commands/evaluateXPath.ts | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/xpath/commands/evaluateXPath.ts b/src/xpath/commands/evaluateXPath.ts index 4262467..fb9ff19 100644 --- a/src/xpath/commands/evaluateXPath.ts +++ b/src/xpath/commands/evaluateXPath.ts @@ -6,6 +6,16 @@ import { ExtensionState } from "../../extension"; import { EvaluatorResult, EvaluatorResultType, XPathEvaluator } from "../xpath-evaluator"; +class HistoricQuery { + constructor(uri: string, query: string) { + this.uri = uri; + this.query = query; + } + + uri: string; + query: string; +} + export async function evaluateXPath(editor: TextEditor, edit: TextEditorEdit): Promise { const config = workspace.getConfiguration(constants.extensionPrefix); @@ -92,13 +102,3 @@ export async function evaluateXPath(editor: TextEditor, edit: TextEditorEdit): P memento.update(constants.stateKeys.xPathQueryLast, query); } } - -class HistoricQuery { - constructor(uri: string, query: string) { - this.uri = uri; - this.query = query; - } - - uri: string; - query: string; -} From bce1b3dd87daf976a55df2b131e10969a722df51 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 00:21:34 -0400 Subject: [PATCH 33/57] Remove Deprecated Method Call --- src/xpath/commands/evaluateXPath.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/xpath/commands/evaluateXPath.ts b/src/xpath/commands/evaluateXPath.ts index fb9ff19..8f78a11 100644 --- a/src/xpath/commands/evaluateXPath.ts +++ b/src/xpath/commands/evaluateXPath.ts @@ -83,7 +83,7 @@ export async function evaluateXPath(editor: TextEditor, edit: TextEditorEdit): P outputChannel.appendLine(`[Result]: ${evalResult.result}`); } - outputChannel.show(ViewColumn.Three); + outputChannel.show(false); if (persistQueries) { const historicQuery = new HistoricQuery(editor.document.uri.toString(), query); From df45b8008503cc00a625c1b9aa4b42dc34580c69 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 20:08:28 -0400 Subject: [PATCH 34/57] Consolidate Constants --- src/constants.ts | 30 +++++++++++++++++++++++- src/extension.ts | 22 +++++++++-------- src/formatting/commands/formatAsXml.ts | 6 ++--- src/formatting/commands/minifyXml.ts | 2 -- src/formatting/xml-formatter.ts | 5 ++-- src/formatting/xml-formatting-options.ts | 6 ++--- src/tree-view/xml-tree-data-provider.ts | 8 +++---- 7 files changed, 53 insertions(+), 26 deletions(-) diff --git a/src/constants.ts b/src/constants.ts index 9616133..a97ec0b 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -2,7 +2,8 @@ export const extensionPrefix = "xmlTools"; export namespace commands { export const evaluateXPath = "xmlTools.evaluateXPath"; - export const setContext = "setContext"; + export const formatAsXml = "xmlTools.formatAsXml"; + export const minifyXml = "xmlTools.minifyXml"; } export namespace contextKeys { @@ -13,9 +14,36 @@ export namespace configKeys { export const enableXmlTreeView = "enableXmlTreeView"; export const ignoreDefaultNamespace = "ignoreDefaultNamespace"; export const persistXPathQuery = "persistXPathQuery"; + export const removeCommentsOnMinify = "removeCommentsOnMinify"; + export const splitAttributesOnFormat = "splitAttributesOnFormat"; + export const splitXmlnsOnFormat = "splitXmlnsOnFormat"; +} + +export namespace diagnosticCollections { + export const xquery = "XQueryDiagnostics"; +} + +export namespace languageIds { + export const xml = "xml"; + export const xquery = "xquery"; +} + +export namespace nativeCommands { + export const cursorMove = "cursorMove"; + export const revealLine = "revealLine"; + export const setContext = "setContext"; } export namespace stateKeys { export const xpathQueryHistory = "xpathQueryHistory"; export const xPathQueryLast = "xPathQueryLast"; } + +export namespace views { + export const xmlTreeView = "xmlTreeView"; +} + +export namespace xmlFormatterImplementations { + export const classic = "classic"; + export const v2 = "v2"; +} diff --git a/src/extension.ts b/src/extension.ts index 4aacf73..54c1dc7 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -2,8 +2,8 @@ import { languages, window, workspace, commands } from "vscode"; import { ExtensionContext, Memento, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; import { XQueryCompletionItemProvider } from "./completion/xquery-completion-item-provider"; -import { FormatAsXmlCommandName, formatAsXml } from "./formatting/commands/formatAsXml"; -import { MinifyXmlCommandName, minifyXml } from "./formatting/commands/minifyXml"; +import { formatAsXml } from "./formatting/commands/formatAsXml"; +import { minifyXml } from "./formatting/commands/minifyXml"; import { XmlFormatterFactory } from "./formatting/xml-formatter"; import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-provider"; import { XQueryLinter } from "./linting/xquery-linter"; @@ -22,17 +22,17 @@ export function activate(context: ExtensionContext) { /* Completion Features */ context.subscriptions.push( - languages.registerCompletionItemProvider("xquery", new XQueryCompletionItemProvider(), ":", "$") + languages.registerCompletionItemProvider(constants.languageIds.xquery, new XQueryCompletionItemProvider(), ":", "$") ); /* Formatting Features */ const xmlFormattingEditProvider = new XmlFormattingEditProvider(config, XmlFormatterFactory.getXmlFormatter()); context.subscriptions.push( - commands.registerTextEditorCommand(FormatAsXmlCommandName, formatAsXml), - commands.registerTextEditorCommand(MinifyXmlCommandName, minifyXml), - languages.registerDocumentFormattingEditProvider("xml", xmlFormattingEditProvider), - languages.registerDocumentRangeFormattingEditProvider("xml", xmlFormattingEditProvider) + commands.registerTextEditorCommand(constants.commands.formatAsXml, formatAsXml), + commands.registerTextEditorCommand(constants.commands.minifyXml, minifyXml), + languages.registerDocumentFormattingEditProvider(constants.languageIds.xml, xmlFormattingEditProvider), + languages.registerDocumentRangeFormattingEditProvider(constants.languageIds.xml, xmlFormattingEditProvider) ); /* Linting Features */ @@ -43,7 +43,7 @@ export function activate(context: ExtensionContext) { /* Tree View Features */ context.subscriptions.push( - window.registerTreeDataProvider("xmlTreeView", new XmlTreeDataProvider(context)) + window.registerTreeDataProvider(constants.views.xmlTreeView, new XmlTreeDataProvider(context)) ); /* XPath Features */ @@ -63,8 +63,10 @@ function _handleContextChange(editor: TextEditor): void { } switch (editor.document.languageId) { - case "xquery": - languages.createDiagnosticCollection("XQueryDiagnostics").set(editor.document.uri, new XQueryLinter().lint(editor.document.getText())); + case constants.languageIds.xquery: + languages + .createDiagnosticCollection(constants.diagnosticCollections.xquery) + .set(editor.document.uri, new XQueryLinter().lint(editor.document.getText())); break; } } diff --git a/src/formatting/commands/formatAsXml.ts b/src/formatting/commands/formatAsXml.ts index cfec9ea..a1b589e 100644 --- a/src/formatting/commands/formatAsXml.ts +++ b/src/formatting/commands/formatAsXml.ts @@ -7,8 +7,6 @@ import { XmlFormatterFactory } from "../xml-formatter"; import { XmlFormattingEditProvider } from "../xml-formatting-edit-provider"; import { XmlFormattingOptionsFactory } from "../xml-formatting-options"; -export const FormatAsXmlCommandName = "xmlTools.formatAsXml"; - export function formatAsXml(editor: TextEditor, edit: TextEditorEdit): void { const xmlFormattingEditProvider = new XmlFormattingEditProvider(workspace.getConfiguration(constants.extensionPrefix), XmlFormatterFactory.getXmlFormatter()); const formattingOptions = { @@ -40,11 +38,11 @@ export function formatAsXml(editor: TextEditor, edit: TextEditorEdit): void { editBuilder.replace(textEdit.range, textEdit.newText); // wiggle the cursor to deselect the formatted XML (is there a non-hacky way to go about this?) - await commands.executeCommand("cursorMove", { + await commands.executeCommand(constants.nativeCommands.cursorMove, { to: "left", by: "character" }); - await commands.executeCommand("cursorMove", { + await commands.executeCommand(constants.nativeCommands.cursorMove, { to: "right", by: "character" }); diff --git a/src/formatting/commands/minifyXml.ts b/src/formatting/commands/minifyXml.ts index a73ea87..7be0078 100644 --- a/src/formatting/commands/minifyXml.ts +++ b/src/formatting/commands/minifyXml.ts @@ -7,8 +7,6 @@ import { XmlFormatterFactory } from "../xml-formatter"; import { XmlFormattingEditProvider } from "../xml-formatting-edit-provider"; import { XmlFormattingOptionsFactory } from "../xml-formatting-options"; -export const MinifyXmlCommandName = "xmlTools.minifyXml"; - export function minifyXml(editor: TextEditor, edit: TextEditorEdit): void { const xmlFormatter = XmlFormatterFactory.getXmlFormatter(); const xmlFormattingOptions = XmlFormattingOptionsFactory.getXmlFormattingOptions({ diff --git a/src/formatting/xml-formatter.ts b/src/formatting/xml-formatter.ts index ee16c1d..b87b2b1 100644 --- a/src/formatting/xml-formatter.ts +++ b/src/formatting/xml-formatter.ts @@ -23,8 +23,9 @@ export class XmlFormatterFactory { let xmlFormatterImplementation: XmlFormatter; switch (xmlFormatterImplementationSetting) { - case "classic": xmlFormatterImplementation = new ClassicXmlFormatter(); break; - case "v2": default: xmlFormatterImplementation = new V2XmlFormatter(); break; + case constants.xmlFormatterImplementations.classic: xmlFormatterImplementation = new ClassicXmlFormatter(); break; + case constants.xmlFormatterImplementations.v2: + default: xmlFormatterImplementation = new V2XmlFormatter(); break; } return (XmlFormatterFactory._xmlFormatter = xmlFormatterImplementation); diff --git a/src/formatting/xml-formatting-options.ts b/src/formatting/xml-formatting-options.ts index bcaf173..4e37c24 100644 --- a/src/formatting/xml-formatting-options.ts +++ b/src/formatting/xml-formatting-options.ts @@ -18,9 +18,9 @@ export class XmlFormattingOptionsFactory { return { editorOptions: formattingOptions, newLine: (eol === EndOfLine.CRLF) ? "\r\n" : "\n", - removeCommentsOnMinify: config.get("removeCommentsOnMinify"), - splitAttributesOnFormat: config.get("splitAttributesOnFormat"), - splitXmlnsOnFormat: config.get("splitXmlnsOnFormat") + removeCommentsOnMinify: config.get(constants.configKeys.removeCommentsOnMinify), + splitAttributesOnFormat: config.get(constants.configKeys.splitAttributesOnFormat), + splitXmlnsOnFormat: config.get(constants.configKeys.splitXmlnsOnFormat) }; } } diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index 347b8f8..c21d3a6 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -41,7 +41,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { } treeItem.command = { - command: "revealLine", + command: constants.nativeCommands.revealLine, title: "", arguments: [{ lineNumber: element.lineNumber - 1, @@ -120,8 +120,8 @@ export class XmlTreeDataProvider implements TreeDataProvider { } private _refreshTree(): void { - if (!this.activeEditor || this.activeEditor.document.languageId !== "xml") { - commands.executeCommand(constants.commands.setContext, constants.contextKeys.xmlTreeViewEnabled, false); + if (!this.activeEditor || this.activeEditor.document.languageId !== constants.languageIds.xml) { + commands.executeCommand(constants.nativeCommands.setContext, constants.contextKeys.xmlTreeViewEnabled, false); this._xmlDocument = null; this._onDidChangeTreeData.fire(); @@ -131,7 +131,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { const config = workspace.getConfiguration(constants.extensionPrefix); const enableTreeView = config.get(constants.configKeys.enableXmlTreeView, true); - commands.executeCommand(constants.commands.setContext, constants.contextKeys.xmlTreeViewEnabled, enableTreeView); + commands.executeCommand(constants.nativeCommands.setContext, constants.contextKeys.xmlTreeViewEnabled, enableTreeView); const xml = this.activeEditor.document.getText(); this._xmlDocument = new DOMParser().parseFromString(xml, "text/xml"); From 29756e3f97d43cb94ce8d8f3efebd4f97aeab96a Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 20:36:58 -0400 Subject: [PATCH 35/57] Add XQuery Execution --- package.json | 12 ++ src/constants.ts | 6 + src/extension.ts | 6 + src/xquery-execution/child-process.ts | 30 ++++ .../commands/executeXQuery.ts | 132 ++++++++++++++++++ 5 files changed, 186 insertions(+) create mode 100644 src/xquery-execution/child-process.ts create mode 100644 src/xquery-execution/commands/executeXQuery.ts diff --git a/package.json b/package.json index 31b0fbd..efade7d 100644 --- a/package.json +++ b/package.json @@ -123,6 +123,18 @@ "default": "", "description": "The full path to the executable to run when executing XQuery scripts.", "scope": "resource" + }, + "xmlTools.xqueryExecutionInputLimit": { + "type": "integer", + "default": 100, + "description": "The maximum number of input files to enumerate when executing XQuery scripts.", + "scope": "resource" + }, + "xmlTools.xqueryExecutionInputSearchPattern": { + "type": "string", + "default": "**/*.xml", + "description": "The pattern used to search for input XML files when executing XQuery scripts.", + "scope": "resource" } } }, diff --git a/src/constants.ts b/src/constants.ts index a97ec0b..fd53f46 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -2,6 +2,7 @@ export const extensionPrefix = "xmlTools"; export namespace commands { export const evaluateXPath = "xmlTools.evaluateXPath"; + export const executeXQuery = "xmlTools.executeXQuery"; export const formatAsXml = "xmlTools.formatAsXml"; export const minifyXml = "xmlTools.minifyXml"; } @@ -17,6 +18,10 @@ export namespace configKeys { export const removeCommentsOnMinify = "removeCommentsOnMinify"; export const splitAttributesOnFormat = "splitAttributesOnFormat"; export const splitXmlnsOnFormat = "splitXmlnsOnFormat"; + export const xqueryExecutionArguments = "xqueryExecutionArguments"; + export const xqueryExecutionEngine = "xqueryExecutionEngine"; + export const xqueryExecutionInputLimit = "xqueryExecutionInputLimit"; + export const xqueryExecutionInputSearchPattern = "xqueryExecutionInputSearchPattern"; } export namespace diagnosticCollections { @@ -30,6 +35,7 @@ export namespace languageIds { export namespace nativeCommands { export const cursorMove = "cursorMove"; + export const openGlobalSettings = "workbench.action.openGlobalSettings"; export const revealLine = "revealLine"; export const setContext = "setContext"; } diff --git a/src/extension.ts b/src/extension.ts index 54c1dc7..8fcd255 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -9,6 +9,7 @@ import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-prov import { XQueryLinter } from "./linting/xquery-linter"; import { XmlTreeDataProvider } from "./tree-view/xml-tree-data-provider"; import { evaluateXPath } from "./xpath/commands/evaluateXPath"; +import { executeXQuery } from "./xquery-execution/commands/executeXQuery"; import * as constants from "./constants"; @@ -50,6 +51,11 @@ export function activate(context: ExtensionContext) { context.subscriptions.push( commands.registerTextEditorCommand(constants.commands.evaluateXPath, evaluateXPath) ); + + /* XQuery Features */ + context.subscriptions.push( + commands.registerTextEditorCommand(constants.commands.executeXQuery, executeXQuery) + ); } export function deactivate() { diff --git a/src/xquery-execution/child-process.ts b/src/xquery-execution/child-process.ts new file mode 100644 index 0000000..161f963 --- /dev/null +++ b/src/xquery-execution/child-process.ts @@ -0,0 +1,30 @@ +const child_process = require("child_process"); + +export class ChildProcess { + static async spawn(executable: string, args: string[]): Promise { + return new Promise((resolve, reject) => { + + let output = ""; + const handle = child_process.spawn(executable, args); + + handle.stdout.on("data", (data: string) => { + output += data; + }); + + handle.stderr.on("data", (data: string) => { + output += data; + }); + + handle.on("close", (code: string) => { + if (code === "0") { + resolve(); + } + + else { + reject({ code: code, message: output }); + } + }); + + }); + } +} diff --git a/src/xquery-execution/commands/executeXQuery.ts b/src/xquery-execution/commands/executeXQuery.ts new file mode 100644 index 0000000..a209e3d --- /dev/null +++ b/src/xquery-execution/commands/executeXQuery.ts @@ -0,0 +1,132 @@ +import { commands, window, workspace } from "vscode"; +import { Disposable, Range, TextEditor, TextEditorEdit, Uri } from "vscode"; + +import * as constants from "../../constants"; + +import { ChildProcess } from "../child-process"; + +export async function executeXQuery(editor: TextEditor, edit: TextEditorEdit): Promise { + const config = workspace.getConfiguration(constants.extensionPrefix); + + // this disposable will be used for creating status bar messages + let disposable: Disposable; + + if (editor.document.languageId !== constants.languageIds.xquery) { + window.showErrorMessage("This action can only be performed on an XQuery file."); + return; + } + + const executable = config.get(constants.configKeys.xqueryExecutionEngine, null); + let args = config.get(constants.configKeys.xqueryExecutionArguments, []); + + if (!executable || executable === "") { + const action = await window.showWarningMessage("An XQuery execution engine has not been defined.", "Define Now"); + + if (action === "Define Now") { + commands.executeCommand(constants.nativeCommands.openGlobalSettings); + } + + return; + } + + let inputFile: Uri; + disposable = window.setStatusBarMessage("Searching for XML files in folder..."); + + const searchPattern = config.get(constants.configKeys.xqueryExecutionInputSearchPattern); + const inputLimit = config.get(constants.configKeys.xqueryExecutionInputLimit); + + const files = await workspace.findFiles(searchPattern, "", inputLimit); + + disposable.dispose(); + + // user does not have a folder open - prompt for file name + if (typeof files === "undefined") { + window.showErrorMessage("You must have a folder opened in VS Code to use this feature."); + return; + } + + // if there is only one XML file, default it + // otherwise, prompt the user to select one from the open folder + if (files.length > 1) { + const qpItems = new Array(); + + files.forEach((file) => { + const filename = file.fsPath.replace("\\", "/"); + + qpItems.push({ // must implement vscode.QuickPickItem + label: filename.substring(filename.lastIndexOf("/") + 1), + description: file.fsPath, + file: file + }); + }); + + const selection = await window.showQuickPick(qpItems, { placeHolder: "Please select an input file." }); + + if (!selection) { + return; + } + + inputFile = selection.file; + } + + else { + inputFile = files[0]; + } + + // prompt for output file name + let outputPath: string = null; + let outputPathPos = -1; + + for (let i = 0; i < args.length; i++) { + if (i > 0) { + if (args[i - 1].search(/out|result/)) { + outputPath = args[i]; + outputPathPos = i; + } + } + } + + if (outputPath) { + outputPath = await window.showInputBox({ + placeHolder: "ex. C:\\TEMP\XQueryOutput\\MyOutputFile.xml", + prompt: "Please specify the output file path. Existing file behavior is determined by the execution engine you have specified.", + value: outputPath + }); + + args[outputPathPos] = outputPath; + } + + // call out to the execution engine + disposable = window.setStatusBarMessage("Executing XQuery Script..."); + args = args.map((value: string) => { + return value + .replace("$(script)", editor.document.uri.fsPath) + .replace("$(input)", inputFile.fsPath) + .replace("$(project)", workspace.rootPath); + }); + + try { + await ChildProcess.spawn(executable, args); + } + + catch (error) { + if (error.message.search(/[Ll]ine:?\s*\d+/gm) > -1) { + const match: RegExpExecArray = /[Ll]ine:?\s*\d+/gm.exec(error.message); + const line: number = (Number.parseInt(match[0].replace(/([Ll]ine:?\s*)|\s/, "")) - 1); + + const selection: string = await window.showErrorMessage(error.message, `Go to Line ${line}`); + + if (selection === `Go to Line ${line}`) { + editor.revealRange(new Range(line, 0, line, 0)); + } + } + + else { + window.showErrorMessage(error.message); + } + } + + finally { + disposable.dispose(); + } +} From 9e47281d9111433a61190fffe9ea17cf655ce283 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 21:15:20 -0400 Subject: [PATCH 36/57] Support LiveShare Implements the changes from #154. Co-Authored-By: Jonathan Carter --- src/common/create-document-selector.ts | 8 ++++++++ src/constants.ts | 6 ++++++ src/extension.ts | 14 ++++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 src/common/create-document-selector.ts diff --git a/src/common/create-document-selector.ts b/src/common/create-document-selector.ts new file mode 100644 index 0000000..69d3ba6 --- /dev/null +++ b/src/common/create-document-selector.ts @@ -0,0 +1,8 @@ +import { DocumentFilter } from "vscode"; + +export function createDocumentSelector(language: string): DocumentFilter[] { + return [ + { language, scheme: "file" }, + { language, scheme: "untitled" }, + ]; +} diff --git a/src/constants.ts b/src/constants.ts index fd53f46..c3af374 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -30,6 +30,7 @@ export namespace diagnosticCollections { export namespace languageIds { export const xml = "xml"; + export const xsd = "xsd"; export const xquery = "xquery"; } @@ -45,6 +46,11 @@ export namespace stateKeys { export const xPathQueryLast = "xPathQueryLast"; } +export namespace uriSchemes { + export const file = "file"; + export const untitled = "untitled"; +} + export namespace views { export const xmlTreeView = "xmlTreeView"; } diff --git a/src/extension.ts b/src/extension.ts index 8fcd255..24a6885 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,6 +1,7 @@ import { languages, window, workspace, commands } from "vscode"; import { ExtensionContext, Memento, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; +import { createDocumentSelector } from "./common/create-document-selector"; import { XQueryCompletionItemProvider } from "./completion/xquery-completion-item-provider"; import { formatAsXml } from "./formatting/commands/formatAsXml"; import { minifyXml } from "./formatting/commands/minifyXml"; @@ -21,9 +22,12 @@ export function activate(context: ExtensionContext) { const config = workspace.getConfiguration(constants.extensionPrefix); + const xmlXsdDocSelector = [...createDocumentSelector(constants.languageIds.xml), ...createDocumentSelector(constants.languageIds.xsd)]; + const xqueryDocSelector = createDocumentSelector(constants.languageIds.xquery); + /* Completion Features */ context.subscriptions.push( - languages.registerCompletionItemProvider(constants.languageIds.xquery, new XQueryCompletionItemProvider(), ":", "$") + languages.registerCompletionItemProvider(xqueryDocSelector, new XQueryCompletionItemProvider(), ":", "$") ); /* Formatting Features */ @@ -32,8 +36,8 @@ export function activate(context: ExtensionContext) { context.subscriptions.push( commands.registerTextEditorCommand(constants.commands.formatAsXml, formatAsXml), commands.registerTextEditorCommand(constants.commands.minifyXml, minifyXml), - languages.registerDocumentFormattingEditProvider(constants.languageIds.xml, xmlFormattingEditProvider), - languages.registerDocumentRangeFormattingEditProvider(constants.languageIds.xml, xmlFormattingEditProvider) + languages.registerDocumentFormattingEditProvider(xmlXsdDocSelector, xmlFormattingEditProvider), + languages.registerDocumentRangeFormattingEditProvider(xmlXsdDocSelector, xmlFormattingEditProvider) ); /* Linting Features */ @@ -64,7 +68,9 @@ export function deactivate() { function _handleContextChange(editor: TextEditor): void { - if (!editor || !editor.document) { + const supportedSchemes = [constants.uriSchemes.file, constants.uriSchemes.untitled]; + + if (!editor || !editor.document || supportedSchemes.indexOf(editor.document.uri.scheme) === -1) { return; } From 6b059c192eb3f336414e7787905908f107813d3a Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 21:26:14 -0400 Subject: [PATCH 37/57] v2.0.0-preview.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index efade7d..f70c9f1 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "xml", "displayName": "XML Tools", "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", - "version": "2.0.0-preview.1", + "version": "2.0.0-preview.2", "preview": true, "publisher": "DotJoshJohnson", "author": { From c0d1bb5486c555d32092eb66fdca1571c2efd399 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 22:27:54 -0400 Subject: [PATCH 38/57] Improve Typing --- src/tree-view/xml-tree-data-provider.ts | 38 ++++++++++++++++--------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index c21d3a6..afc2ba2 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -29,14 +29,14 @@ export class XmlTreeDataProvider implements TreeDataProvider { return window.activeTextEditor || null; } - getTreeItem(element: any): TreeItem | Thenable { + getTreeItem(element: Node): TreeItem | Thenable { const treeItem = new TreeItem(element.localName); - if (this._getChildAttributeArray(element).length > 0) { + if (this._isElement(element) && this._getChildAttributeArray(element).length > 0) { treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; } - if (this._getChildElementArray(element).length > 0) { + if (this._isElement(element) && this._getChildElementArray(element).length > 0) { treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; } @@ -44,7 +44,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { command: constants.nativeCommands.revealLine, title: "", arguments: [{ - lineNumber: element.lineNumber - 1, + lineNumber: (element as any).lineNumber - 1, at: "top" }] }; @@ -54,13 +54,13 @@ export class XmlTreeDataProvider implements TreeDataProvider { return treeItem; } - getChildren(element?: any): any[] | Thenable { + getChildren(element?: Node): any[] | Thenable { if (!this._xmlDocument) { this._refreshTree(); } - if (element) { - return [].concat(this._getChildAttributeArray(element), this._getChildElementArray(element)); + if (this._isElement(element)) { + return [].concat(this._getChildAttributeArray(element), this._getChildElementArray(element)); } else if (this._xmlDocument) { @@ -72,7 +72,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { } } - private _getChildAttributeArray(node: any): any[] { + private _getChildAttributeArray(node: Element): any[] { if (!node.attributes) { return []; } @@ -86,7 +86,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { return array; } - private _getChildElementArray(node: any): any[] { + private _getChildElementArray(node: Element): any[] { if (!node.childNodes) { return []; } @@ -96,7 +96,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { for (let i = 0; i < node.childNodes.length; i++) { const child = node.childNodes[i]; - if (child.tagName) { + if (this._isElement(child)) { array.push(child); } } @@ -104,10 +104,10 @@ export class XmlTreeDataProvider implements TreeDataProvider { return array; } - private _getIcon(element: any): any { + private _getIcon(element: Node): any { let type = "element"; - if (!element.tagName) { + if (!this._isElement(element)) { type = "attribute"; } @@ -119,6 +119,10 @@ export class XmlTreeDataProvider implements TreeDataProvider { return icon; } + private _isElement(node: Node): boolean { + return (!!node && !!(node as Element).tagName); + } + private _refreshTree(): void { if (!this.activeEditor || this.activeEditor.document.languageId !== constants.languageIds.xml) { commands.executeCommand(constants.nativeCommands.setContext, constants.contextKeys.xmlTreeViewEnabled, false); @@ -134,9 +138,15 @@ export class XmlTreeDataProvider implements TreeDataProvider { commands.executeCommand(constants.nativeCommands.setContext, constants.contextKeys.xmlTreeViewEnabled, enableTreeView); const xml = this.activeEditor.document.getText(); - this._xmlDocument = new DOMParser().parseFromString(xml, "text/xml"); - this._onDidChangeTreeData.fire(); + try { + this._xmlDocument = new DOMParser().parseFromString(xml, "text/xml"); + this._onDidChangeTreeData.fire(); + } + + catch { + this._xmlDocument = new DOMParser().parseFromString("", "text/xml"); + } } } From 3bd730355e987108d8b7e04f8d67aaee5c4a1acf Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 22:32:41 -0400 Subject: [PATCH 39/57] Display Attribute Values #117 --- src/tree-view/xml-tree-data-provider.ts | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index afc2ba2..40e0988 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -32,6 +32,10 @@ export class XmlTreeDataProvider implements TreeDataProvider { getTreeItem(element: Node): TreeItem | Thenable { const treeItem = new TreeItem(element.localName); + if (!this._isElement(element)) { + treeItem.label = `${element.localName} = "${element.nodeValue}"`; + } + if (this._isElement(element) && this._getChildAttributeArray(element).length > 0) { treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; } From 76fba19c0b363abe7c49ce91709d9b37e59b20be Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sat, 28 Apr 2018 22:49:24 -0400 Subject: [PATCH 40/57] Add Child Node Counts #117 --- src/tree-view/xml-tree-data-provider.ts | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index 40e0988..e711a77 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -36,12 +36,27 @@ export class XmlTreeDataProvider implements TreeDataProvider { treeItem.label = `${element.localName} = "${element.nodeValue}"`; } - if (this._isElement(element) && this._getChildAttributeArray(element).length > 0) { - treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; - } + else { + const childAttributes = this._getChildAttributeArray(element); + const childElements = this._getChildElementArray(element); + const totalChildren = (childAttributes.length + childElements.length); - if (this._isElement(element) && this._getChildElementArray(element).length > 0) { - treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; + if (totalChildren > 0) { + treeItem.label += " ("; + + if (childAttributes.length > 0) { + treeItem.label += `attributes: ${childAttributes.length}, `; + treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; + } + + if (childElements.length > 0) { + treeItem.label += `children: ${childElements.length}, `; + treeItem.collapsibleState = TreeItemCollapsibleState.Collapsed; + } + + treeItem.label = treeItem.label.substr(0, treeItem.label.length - 2); + treeItem.label += ")"; + } } treeItem.command = { From 323c5c310c4f192d0157e80530074d03fa59752c Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sun, 29 Apr 2018 00:47:12 -0400 Subject: [PATCH 41/57] Add Cursor Sync #121 --- package-lock.json | 236 ++++++++++++++---------- package.json | 16 +- src/constants.ts | 2 + src/extension.ts | 20 +- src/tree-view/xml-tree-data-provider.ts | 73 +++++++- 5 files changed, 240 insertions(+), 107 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5752668..8fbb14b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "xml", - "version": "2.0.0-preview.1", + "version": "2.0.0-preview.2", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -29,7 +29,7 @@ "dev": true, "requires": { "co": "4.6.0", - "fast-deep-equal": "1.0.0", + "fast-deep-equal": "1.1.0", "fast-json-stable-stringify": "2.0.0", "json-schema-traverse": "0.3.1" } @@ -172,9 +172,9 @@ "dev": true }, "aws4": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz", - "integrity": "sha1-g+9cqGCysy5KDe7e6MdxudtXRx4=", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz", + "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==", "dev": true }, "babel-code-frame": { @@ -261,6 +261,12 @@ "integrity": "sha1-DTM+PwDqxQqhRUq9MO+MKl2ackI=", "dev": true }, + "buffer-from": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz", + "integrity": "sha512-83apNb8KK0Se60UE1+4Ukbe3HbfELJ6UlI4ldtOGs7So4KD26orJM8hIY9lxdzP+UpItH1Yh/Y8GUvNFWFFRxA==", + "dev": true + }, "builtin-modules": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", @@ -305,14 +311,46 @@ "dev": true }, "cloneable-readable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.0.0.tgz", - "integrity": "sha1-pikNQT8hemEjL5XkWP84QYz7ARc=", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/cloneable-readable/-/cloneable-readable-1.1.2.tgz", + "integrity": "sha512-Bq6+4t+lbM8vhTs/Bef5c5AdEMtapp/iFb6+s4/Hh9MVTt8OLKH7ZOOZSCT+Ys7hsHvqv0GuMPJ1lnQJVHvxpg==", "dev": true, "requires": { "inherits": "2.0.3", - "process-nextick-args": "1.0.7", - "through2": "2.0.3" + "process-nextick-args": "2.0.0", + "readable-stream": "2.3.6" + }, + "dependencies": { + "process-nextick-args": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", + "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", + "dev": true + }, + "readable-stream": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", + "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", + "dev": true, + "requires": { + "core-util-is": "1.0.2", + "inherits": "2.0.3", + "isarray": "1.0.0", + "process-nextick-args": "2.0.0", + "safe-buffer": "5.1.1", + "string_decoder": "1.1.1", + "util-deprecate": "1.0.2" + } + }, + "string_decoder": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", + "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + } } }, "co": { @@ -348,9 +386,9 @@ "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=" }, "combined-stream": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz", - "integrity": "sha1-k4NwpXtKUd6ix3wV1cX9+JUWQAk=", + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "dev": true, "requires": { "delayed-stream": "1.0.0" @@ -650,9 +688,9 @@ } }, "fast-deep-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.0.0.tgz", - "integrity": "sha1-liVqO8l1WV6zbYLpkp0GDYk0Of8=", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", "dev": true }, "fast-json-stable-stringify": { @@ -732,8 +770,8 @@ "dev": true, "requires": { "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" + "combined-stream": "1.0.6", + "mime-types": "2.1.18" } }, "from": { @@ -1044,9 +1082,9 @@ }, "dependencies": { "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true }, "clone-stats": { @@ -1062,9 +1100,9 @@ "dev": true, "requires": { "aws-sign2": "0.6.0", - "aws4": "1.6.0", + "aws4": "1.7.0", "caseless": "0.11.0", - "combined-stream": "1.0.5", + "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", "form-data": "2.1.4", @@ -1074,11 +1112,11 @@ "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "oauth-sign": "0.8.2", "qs": "6.3.2", "stringstream": "0.0.5", - "tough-cookie": "2.3.3", + "tough-cookie": "2.3.4", "tunnel-agent": "0.4.3", "uuid": "3.2.1" } @@ -1089,10 +1127,10 @@ "integrity": "sha1-CjcT2NTpIhxY8QyhbAEWyeJe2nw=", "dev": true, "requires": { - "clone": "1.0.3", + "clone": "1.0.4", "clone-buffer": "1.0.0", "clone-stats": "1.0.0", - "cloneable-readable": "1.0.0", + "cloneable-readable": "1.1.2", "is-stream": "1.1.0", "remove-trailing-separator": "1.1.0", "replace-ext": "1.0.0" @@ -1114,9 +1152,9 @@ }, "dependencies": { "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true }, "replace-ext": { @@ -1131,7 +1169,7 @@ "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", "dev": true, "requires": { - "clone": "1.0.3", + "clone": "1.0.4", "clone-stats": "0.0.1", "replace-ext": "0.0.1" } @@ -1190,9 +1228,9 @@ }, "dependencies": { "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true }, "minimist": { @@ -1219,7 +1257,7 @@ "integrity": "sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=", "dev": true, "requires": { - "clone": "1.0.3", + "clone": "1.0.4", "clone-stats": "0.0.1", "replace-ext": "0.0.1" } @@ -1271,7 +1309,7 @@ "clone": "2.1.1", "clone-buffer": "1.0.0", "clone-stats": "1.0.0", - "cloneable-readable": "1.0.0", + "cloneable-readable": "1.1.2", "remove-trailing-separator": "1.1.0", "replace-ext": "1.0.0" } @@ -1301,7 +1339,7 @@ "requires": { "chalk": "1.1.3", "commander": "2.13.0", - "is-my-json-valid": "2.17.1", + "is-my-json-valid": "2.17.2", "pinkie-promise": "2.0.1" } }, @@ -1361,7 +1399,7 @@ "requires": { "assert-plus": "0.2.0", "jsprim": "1.4.1", - "sshpk": "1.13.1" + "sshpk": "1.14.1" } }, "infinity-agent": { @@ -1437,14 +1475,21 @@ "is-extglob": "2.1.1" } }, + "is-my-ip-valid": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", + "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==", + "dev": true + }, "is-my-json-valid": { - "version": "2.17.1", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz", - "integrity": "sha512-Q2khNw+oBlWuaYvEEHtKSw/pCxD2L5Rc1C+UQme9X6JdRDh7m5D7HkozA0qa3DUkQ6VzCnEm8mVIQPyIRkI5sQ==", + "version": "2.17.2", + "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", + "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", "dev": true, "requires": { "generate-function": "2.0.0", "generate-object-property": "1.2.0", + "is-my-ip-valid": "1.0.0", "jsonpointer": "4.0.1", "xtend": "4.0.1" } @@ -1857,18 +1902,18 @@ } }, "mime-db": { - "version": "1.30.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.30.0.tgz", - "integrity": "sha1-dMZD2i3Z1qRTmZY0ZbJtXKfXHwE=", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", + "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", "dev": true }, "mime-types": { - "version": "2.1.17", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.17.tgz", - "integrity": "sha1-Cdejk/A+mVp5+K+Fe3Cp4KsWVXo=", + "version": "2.1.18", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", + "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", "dev": true, "requires": { - "mime-db": "1.30.0" + "mime-db": "1.33.0" } }, "minimatch": { @@ -2187,9 +2232,9 @@ "dev": true }, "querystringify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-1.0.0.tgz", - "integrity": "sha1-YoYkIRLFtxL6ZU5SZlK/ahP/Bcs=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz", + "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==", "dev": true }, "queue": { @@ -2325,31 +2370,31 @@ "dev": true }, "request": { - "version": "2.83.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.83.0.tgz", - "integrity": "sha512-lR3gD69osqm6EYLk9wB/G1W/laGWjzH90t1vEa2xuxHD5KUrSzp9pUSfTm+YC5Nxt2T8nMPEvKlhbQayU7bgFw==", + "version": "2.85.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.85.0.tgz", + "integrity": "sha512-8H7Ehijd4js+s6wuVPLjwORxD4zeuyjYugprdOXlPSqaApmL/QOy+EB/beICHVCHkGMKNh5rvihb5ov+IDw4mg==", "dev": true, "requires": { "aws-sign2": "0.7.0", - "aws4": "1.6.0", + "aws4": "1.7.0", "caseless": "0.12.0", - "combined-stream": "1.0.5", + "combined-stream": "1.0.6", "extend": "3.0.1", "forever-agent": "0.6.1", - "form-data": "2.3.1", + "form-data": "2.3.2", "har-validator": "5.0.3", "hawk": "6.0.2", "http-signature": "1.2.0", "is-typedarray": "1.0.0", "isstream": "0.1.2", "json-stringify-safe": "5.0.1", - "mime-types": "2.1.17", + "mime-types": "2.1.18", "oauth-sign": "0.8.2", "performance-now": "2.1.0", "qs": "6.5.1", "safe-buffer": "5.1.1", "stringstream": "0.0.5", - "tough-cookie": "2.3.3", + "tough-cookie": "2.3.4", "tunnel-agent": "0.6.0", "uuid": "3.2.1" }, @@ -2372,7 +2417,7 @@ "integrity": "sha1-T4owBctKfjiJ90kDD9JbluAdLjE=", "dev": true, "requires": { - "hoek": "4.2.0" + "hoek": "4.2.1" } }, "caseless": { @@ -2396,20 +2441,20 @@ "integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==", "dev": true, "requires": { - "hoek": "4.2.0" + "hoek": "4.2.1" } } } }, "form-data": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.1.tgz", - "integrity": "sha1-b7lPvXGIUwbXPRXMSX/kzE7NRL8=", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "dev": true, "requires": { "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.17" + "combined-stream": "1.0.6", + "mime-types": "2.1.18" } }, "har-validator": { @@ -2430,14 +2475,14 @@ "requires": { "boom": "4.3.1", "cryptiles": "3.1.2", - "hoek": "4.2.0", + "hoek": "4.2.1", "sntp": "2.1.0" } }, "hoek": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.0.tgz", - "integrity": "sha512-v0XCLxICi9nPfYrS9RL8HbYnXi9obYAeLbSP00BmnZwCK9+Ih9WOjoZ8YoHCoav2csqn4FOz4Orldsy2dmDwmQ==", + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz", + "integrity": "sha512-QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA==", "dev": true }, "http-signature": { @@ -2448,7 +2493,7 @@ "requires": { "assert-plus": "1.0.0", "jsprim": "1.4.1", - "sshpk": "1.13.1" + "sshpk": "1.14.1" } }, "qs": { @@ -2463,7 +2508,7 @@ "integrity": "sha512-FL1b58BDrqS3A11lJ0zEdnJ3UOKqVxawAkF3k7F0CVN7VQ34aZrV+G8BZ1WC9ZL7NyrwsW0oviwsWDgRuVYtJg==", "dev": true, "requires": { - "hoek": "4.2.0" + "hoek": "4.2.1" } }, "tunnel-agent": { @@ -2535,11 +2580,12 @@ "dev": true }, "source-map-support": { - "version": "0.5.3", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.3.tgz", - "integrity": "sha512-eKkTgWYeBOQqFGXRfKabMFdnWepo51vWqEdoeikaEPFiJC7MCU5j2h4+6Q8npkZTeLGbSyecZvRxiSoWl3rh+w==", + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.5.tgz", + "integrity": "sha512-mR7/Nd5l1z6g99010shcXJiNEaf3fEtmLhRB/sBcQVJGodcHCULPp2y4Sfa43Kv2zq7T+Izmfp/WHCR6dYkQCA==", "dev": true, "requires": { + "buffer-from": "1.0.0", "source-map": "0.6.1" } }, @@ -2564,9 +2610,9 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" }, "sshpk": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.13.1.tgz", - "integrity": "sha1-US322mKHFEMW3EwY/hzx2UBzm+M=", + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz", + "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=", "dev": true, "requires": { "asn1": "0.2.3", @@ -2751,9 +2797,9 @@ } }, "tough-cookie": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.3.tgz", - "integrity": "sha1-C2GKVWW23qkL80JdBNVe3EdadWE=", + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", + "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==", "dev": true, "requires": { "punycode": "1.4.1" @@ -2913,12 +2959,12 @@ } }, "url-parse": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.2.0.tgz", - "integrity": "sha512-DT1XbYAfmQP65M/mE6OALxmXzZ/z1+e5zk2TcSKe/KiYbNGZxgtttzC0mR/sjopbpOXcbniq7eIKmocJnUWlEw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.0.tgz", + "integrity": "sha512-ERuGxDiQ6Xw/agN4tuoCRbmwRuZP0cJ1lJxJubXr5Q/5cDa78+Dc4wfvtxzhzhkm5VvmW6Mf8EVj9SPGN4l8Lg==", "dev": true, "requires": { - "querystringify": "1.0.0", + "querystringify": "2.0.0", "requires-port": "1.0.0" } }, @@ -2999,9 +3045,9 @@ }, "dependencies": { "clone": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.3.tgz", - "integrity": "sha1-KY1+IjFmD0DAA8LtMUDezz9TCF8=", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", + "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", "dev": true }, "replace-ext": { @@ -3016,7 +3062,7 @@ "integrity": "sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=", "dev": true, "requires": { - "clone": "1.0.3", + "clone": "1.0.4", "clone-stats": "0.0.1", "replace-ext": "0.0.1" } @@ -3034,9 +3080,9 @@ } }, "vscode": { - "version": "1.1.10", - "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.10.tgz", - "integrity": "sha512-MvFXXSGuhw0Q6GC6dQrnRc0ES+63wpttGIoYGBMQnoS9JFCCNC/rWfX0lBCHJyuKL2Q8CYg0ROsMEHbHVwEtVw==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/vscode/-/vscode-1.1.16.tgz", + "integrity": "sha512-nNsfYANLqqNfa2+flHyrIrqSIumIoV7R+R9H3gn0SAzZL3RGPEy8db3EYjXKPW5NEfssj/HZhSMI3J3pMNmhPA==", "dev": true, "requires": { "glob": "7.1.2", @@ -3048,10 +3094,10 @@ "gulp-untar": "0.0.6", "gulp-vinyl-zip": "2.1.0", "mocha": "4.1.0", - "request": "2.83.0", + "request": "2.85.0", "semver": "5.5.0", - "source-map-support": "0.5.3", - "url-parse": "1.2.0", + "source-map-support": "0.5.5", + "url-parse": "1.4.0", "vinyl-source-stream": "1.1.2" } }, diff --git a/package.json b/package.json index f70c9f1..5cab1f2 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "url": "https://github.com/DotJoshJohnson/vscode-xml/issues" }, "engines": { - "vscode": "^1.19.0" + "vscode": "^1.22.2" }, "categories": [ "Formatters", @@ -69,6 +69,18 @@ "description": "Enables the XML Document view in the explorer for XML documents.", "scope": "window" }, + "xmlTools.enableXmlTreeViewMetadata": { + "type": "boolean", + "default": true, + "description": "Enables attribute and child element counts in the XML Document view.", + "scope": "window" + }, + "xmlTools.enableXmlTreeViewCursorSync": { + "type": "boolean", + "default": true, + "description": "Enables auto-reveal of elements in the XML Document view when a start tag is clicked in the editor.", + "scope": "window" + }, "xmlTools.ignoreDefaultNamespace": { "type": "boolean", "default": true, @@ -196,7 +208,7 @@ "@types/xmldom": "^0.1.29", "tslint": "^5.9.1", "typescript": "^2.6.1", - "vscode": "^1.1.6" + "vscode": "^1.1.16" }, "dependencies": { "xmldom": "^0.1.27", diff --git a/src/constants.ts b/src/constants.ts index c3af374..8f1237d 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -13,6 +13,8 @@ export namespace contextKeys { export namespace configKeys { export const enableXmlTreeView = "enableXmlTreeView"; + export const enableXmlTreeViewMetadata = "enableXmlTreeViewMetadata"; + export const enableXmlTreeViewCursorSync = "enableXmlTreeViewCursorSync"; export const ignoreDefaultNamespace = "ignoreDefaultNamespace"; export const persistXPathQuery = "persistXPathQuery"; export const removeCommentsOnMinify = "removeCommentsOnMinify"; diff --git a/src/extension.ts b/src/extension.ts index 24a6885..5e4f3a7 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,5 +1,8 @@ import { languages, window, workspace, commands } from "vscode"; -import { ExtensionContext, Memento, TextEditor, TextEditorSelectionChangeEvent, WorkspaceConfiguration } from "vscode"; +import { + ExtensionContext, Memento, TextEditor, TextEditorSelectionChangeEvent, + TextEditorSelectionChangeKind, WorkspaceConfiguration +} from "vscode"; import { createDocumentSelector } from "./common/create-document-selector"; import { XQueryCompletionItemProvider } from "./completion/xquery-completion-item-provider"; @@ -47,8 +50,21 @@ export function activate(context: ExtensionContext) { ); /* Tree View Features */ + const treeViewDataProvider = new XmlTreeDataProvider(context); + const treeView = window.createTreeView(constants.views.xmlTreeView, { + treeDataProvider: treeViewDataProvider + }); + + if (config.get(constants.configKeys.enableXmlTreeViewCursorSync)) { + window.onDidChangeTextEditorSelection(x => { + if (x.kind === TextEditorSelectionChangeKind.Mouse && x.selections.length > 0) { + treeView.reveal(treeViewDataProvider.getNodeAtPosition(x.selections[0].start)); + } + }); + } + context.subscriptions.push( - window.registerTreeDataProvider(constants.views.xmlTreeView, new XmlTreeDataProvider(context)) + treeView ); /* XPath Features */ diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index e711a77..1cce499 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -1,7 +1,7 @@ import { commands, window, workspace } from "vscode"; import { - Event, EventEmitter, ExtensionContext, TextEditor, TreeDataProvider, - TreeItem, TreeItemCollapsibleState + Event, EventEmitter, ExtensionContext, Position, TextEditor, TreeDataProvider, + TreeItem, TreeItemCollapsibleState, WorkspaceConfiguration } from "vscode"; import * as path from "path"; @@ -10,10 +10,13 @@ import { DOMParser } from "xmldom"; import * as constants from "../constants"; export class XmlTreeDataProvider implements TreeDataProvider { + private _config: WorkspaceConfiguration; private _onDidChangeTreeData: EventEmitter = new EventEmitter(); - private _xmlDocument: any; + private _xmlDocument: Document; constructor(private _context: ExtensionContext) { + this._config = workspace.getConfiguration(constants.extensionPrefix); + window.onDidChangeActiveTextEditor(() => { this._refreshTree(); }); @@ -30,13 +33,16 @@ export class XmlTreeDataProvider implements TreeDataProvider { } getTreeItem(element: Node): TreeItem | Thenable { + const enableMetadata = this._config.get(constants.configKeys.enableXmlTreeViewMetadata); + const enableSync = this._config.get(constants.configKeys.enableXmlTreeViewCursorSync); + const treeItem = new TreeItem(element.localName); if (!this._isElement(element)) { treeItem.label = `${element.localName} = "${element.nodeValue}"`; } - else { + else if (enableMetadata) { const childAttributes = this._getChildAttributeArray(element); const childElements = this._getChildElementArray(element); const totalChildren = (childAttributes.length + childElements.length); @@ -57,6 +63,10 @@ export class XmlTreeDataProvider implements TreeDataProvider { treeItem.label = treeItem.label.substr(0, treeItem.label.length - 2); treeItem.label += ")"; } + + if (this._hasSimilarSiblings(element) && enableSync) { + treeItem.label += ` [line ${(element as any).lineNumber}]`; + } } treeItem.command = { @@ -73,7 +83,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { return treeItem; } - getChildren(element?: Node): any[] | Thenable { + getChildren(element?: Node): Node[] | Thenable { if (!this._xmlDocument) { this._refreshTree(); } @@ -91,6 +101,43 @@ export class XmlTreeDataProvider implements TreeDataProvider { } } + getParent(element: Node): Node { + if (!element || !element.parentNode || !element.parentNode.parentNode) { + return undefined; + } + + return element.parentNode; + } + + getNodeAtPosition(position: Position): Node { + return this._getNodeAtPositionCore(position, this._xmlDocument.documentElement); + } + + private _getNodeAtPositionCore(position: Position, contextElement: Element): Node { + if (!contextElement) { + return undefined; + } + + if (((contextElement as any).lineNumber - 1) === position.line) { + return contextElement; + } + + const children = this._getChildElementArray(contextElement); + let result: Node; + + for (let i = 0; i < children.length; i++) { + const child = children[i]; + + result = this._getNodeAtPositionCore(position, child); + + if (result) { + return result; + } + } + + return undefined; + } + private _getChildAttributeArray(node: Element): any[] { if (!node.attributes) { return []; @@ -138,6 +185,16 @@ export class XmlTreeDataProvider implements TreeDataProvider { return icon; } + private _hasSimilarSiblings(element: Element): boolean { + if (!element || !element.parentNode) { + return false; + } + + const siblings = this._getChildElementArray(element.parentNode); + + return (siblings.filter(x => x.tagName === element.tagName).length > 1); + } + private _isElement(node: Node): boolean { return (!!node && !!(node as Element).tagName); } @@ -151,8 +208,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { return; } - const config = workspace.getConfiguration(constants.extensionPrefix); - const enableTreeView = config.get(constants.configKeys.enableXmlTreeView, true); + const enableTreeView = this._config.get(constants.configKeys.enableXmlTreeView, true); commands.executeCommand(constants.nativeCommands.setContext, constants.contextKeys.xmlTreeViewEnabled, enableTreeView); @@ -160,12 +216,13 @@ export class XmlTreeDataProvider implements TreeDataProvider { try { this._xmlDocument = new DOMParser().parseFromString(xml, "text/xml"); - this._onDidChangeTreeData.fire(); } catch { this._xmlDocument = new DOMParser().parseFromString("", "text/xml"); } + + this._onDidChangeTreeData.fire(); } } From 64d3d3ad1a2246aa8292c3066a536d869f93ff50 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Sun, 29 Apr 2018 01:20:55 -0400 Subject: [PATCH 42/57] Add Minify Command to Context Menu #151 --- package.json | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/package.json b/package.json index 5cab1f2..634594d 100644 --- a/package.json +++ b/package.json @@ -184,6 +184,15 @@ "configuration": "./languages/xquery/xquery.json" } ], + "menus": { + "editor/context": [ + { + "command": "xmlTools.minifyXml", + "group": "1_modification@100", + "when": "editorLangId == 'xml'" + } + ] + }, "views": { "explorer": [ { From 08ef6c436536140f294d37a63a5a85a947185b31 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 2 May 2018 20:30:42 -0400 Subject: [PATCH 43/57] Fix Unnecessary Newline fixes #147 --- src/formatting/formatters/v2-xml-formatter.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/formatting/formatters/v2-xml-formatter.ts b/src/formatting/formatters/v2-xml-formatter.ts index c462a9d..daa7994 100644 --- a/src/formatting/formatters/v2-xml-formatter.ts +++ b/src/formatting/formatters/v2-xml-formatter.ts @@ -138,7 +138,12 @@ export class V2XmlFormatter implements XmlFormatter { // if this was a self-closing tag, we need to decrement the indent level and add a newLine if (pc === "/") { indentLevel--; - output += `>${options.newLine}`; + output += ">"; + + // only add a newline here if one doesn't already exist (issue #147) + if (nc !== "\r" && nc !== "\n") { + output += options.newLine; + } } else { From 2d68ab4aebb36f84846cbffce5483d771ef7a2c8 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 2 May 2018 21:53:39 -0400 Subject: [PATCH 44/57] Propagate Parser Errors Perhaps we can implement a full linter using a proper error handler at some point. For now, I just want it to be clear when the tree can't be rendered due to an invalid XML document. --- src/tree-view/xml-tree-data-provider.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index 1cce499..f79205e 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -215,7 +215,11 @@ export class XmlTreeDataProvider implements TreeDataProvider { const xml = this.activeEditor.document.getText(); try { - this._xmlDocument = new DOMParser().parseFromString(xml, "text/xml"); + this._xmlDocument = new DOMParser({ + errorHandler: () => { + throw new Error("Invalid Document"); + } + }).parseFromString(xml, "text/xml"); } catch { From 914ba972652c95d8295f1c0aaac24a6c89528c24 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 2 May 2018 22:18:28 -0400 Subject: [PATCH 45/57] Remove Quickstart Guide --- vsc-extension-quickstart.md | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 vsc-extension-quickstart.md diff --git a/vsc-extension-quickstart.md b/vsc-extension-quickstart.md deleted file mode 100644 index 8a91f63..0000000 --- a/vsc-extension-quickstart.md +++ /dev/null @@ -1,33 +0,0 @@ -# Welcome to your VS Code Extension - -## What's in the folder -* This folder contains all of the files necessary for your extension. -* `package.json` - this is the manifest file in which you declare your extension and command. -The sample plugin registers a command and defines its title and command name. With this information -VS Code can show the command in the command palette. It doesn’t yet need to load the plugin. -* `src/extension.ts` - this is the main file where you will provide the implementation of your command. -The file exports one function, `activate`, which is called the very first time your extension is -activated (in this case by executing the command). Inside the `activate` function we call `registerCommand`. -We pass the function containing the implementation of the command as the second parameter to -`registerCommand`. - -## Get up and running straight away -* Press `F5` to open a new window with your extension loaded. -* Run your command from the command palette by pressing (`Ctrl+Shift+P` or `Cmd+Shift+P` on Mac) and typing `Hello World`. -* Set breakpoints in your code inside `src/extension.ts` to debug your extension. -* Find output from your extension in the debug console. - -## Make changes -* You can relaunch the extension from the debug toolbar after changing code in `src/extension.ts`. -* You can also reload (`Ctrl+R` or `Cmd+R` on Mac) the VS Code window with your extension to load your changes. - -## Explore the API -* You can open the full set of our API when you open the file `node_modules/vscode/vscode.d.ts`. - -## Run tests -* Open the debug viewlet (`Ctrl+Shift+D` or `Cmd+Shift+D` on Mac) and from the launch configuration dropdown pick `Launch Tests`. -* Press `F5` to run the tests in a new window with your extension loaded. -* See the output of the test result in the debug console. -* Make changes to `test/extension.test.ts` or create new test files inside the `test` folder. - * By convention, the test runner will only consider files matching the name pattern `**.test.ts`. - * You can create folders inside the `test` folder to structure your tests any way you want. From 2fa3c900fecc1c77543d7496a2a7588e0f12f477 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Wed, 2 May 2018 22:37:40 -0400 Subject: [PATCH 46/57] Update README --- README.md | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 57924bc..99ea817 100644 --- a/README.md +++ b/README.md @@ -11,21 +11,20 @@ * [XQuery Code Completion](https://github.com/DotJoshJohnson/vscode-xml/wiki/xquery-code-completion) ## Requirements -*In Progress* +* VS Code `1.22.2` or higher ## Extension Settings -* `xmlTools.enableXmlTreeView`: Enables the XML Tree View for XML documents. -* `xmlTools.ignoreDefaultNamespace`: Ignore default xmlns attributes when evaluating XPath. -* `xmlTools.persistXPathQuery`: Remember the last XPath query used. -* `xmlTools.removeCommentsOnMinify`: Remove XML comments during minification. -* `xmlTools.splitAttributesOnFormat`: Put each attribute on a new line when formatting XML. Overrides `xmlTools.splitXmlsOnFormat` if set to `true`. (V2 Formatter Only) -* `xmlTools.splitXmlnsOnFormat`: Put each xmlns attribute on a new line when formatting XML. -* `xmlTools.xmlFormatterImplementation`: Supported XML Formatters: `classic`, `v2`. -* `xmlTools.xqueryExecutionArguments`: Arguments to be passed to the XQuery execution engine. -* `xmlTools.xqueryExecutionEngine`: The full path to the executable to run when executing XQuery scripts. - -## Known Issues -*In Progress* +* **`xmlTools.enableXmlTreeView`:** Enables the XML Tree View for XML documents. +* **`xmlTools.enableXmlTreeViewMetadata`:** Enables attribute and child element counts in the XML Document view. +* **`xmlTools.enableXmlTreeViewCursorSync`:** Enables auto-reveal of elements in the XML Document view when a start tag is clicked in the editor. +* **`xmlTools.ignoreDefaultNamespace`:** Ignore default xmlns attributes when evaluating XPath. +* **`xmlTools.persistXPathQuery`:** Remember the last XPath query used. +* **`xmlTools.removeCommentsOnMinify`:** Remove XML comments during minification. +* **`xmlTools.splitAttributesOnFormat`:** Put each attribute on a new line when formatting XML. Overrides `xmlTools.splitXmlsOnFormat` if set to `true`. (V2 Formatter Only) +* **`xmlTools.splitXmlnsOnFormat`:** Put each xmlns attribute on a new line when formatting XML. +* **`xmlTools.xmlFormatterImplementation`:** Supported XML Formatters: `classic`, `v2`. +* **`xmlTools.xqueryExecutionArguments`:** Arguments to be passed to the XQuery execution engine. +* **`xmlTools.xqueryExecutionEngine`:** The full path to the executable to run when executing XQuery scripts. ## Release Notes Detailed release notes are available [here](https://github.com/DotJoshJohnson/vscode-xml/releases). From 7a5df9f3875cfdec89fe98f9e1e67ed5653aa0c2 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 3 May 2018 22:01:29 -0400 Subject: [PATCH 47/57] Use Barrels --- src/common/index.ts | 1 + src/completion/index.ts | 1 + src/extension.ts | 25 +++++++++++-------------- src/formatting/commands/index.ts | 2 ++ src/formatting/formatters/index.ts | 2 ++ src/formatting/index.ts | 3 +++ src/linting/index.ts | 1 + src/test/extension.test.ts | 5 ++--- src/tree-view/index.ts | 1 + src/xpath/commands/index.ts | 1 + src/xpath/index.ts | 1 + src/xquery-execution/commands/index.ts | 1 + src/xquery-execution/index.ts | 1 + 13 files changed, 28 insertions(+), 17 deletions(-) create mode 100644 src/common/index.ts create mode 100644 src/completion/index.ts create mode 100644 src/formatting/commands/index.ts create mode 100644 src/formatting/formatters/index.ts create mode 100644 src/formatting/index.ts create mode 100644 src/linting/index.ts create mode 100644 src/tree-view/index.ts create mode 100644 src/xpath/commands/index.ts create mode 100644 src/xpath/index.ts create mode 100644 src/xquery-execution/commands/index.ts create mode 100644 src/xquery-execution/index.ts diff --git a/src/common/index.ts b/src/common/index.ts new file mode 100644 index 0000000..6a9e980 --- /dev/null +++ b/src/common/index.ts @@ -0,0 +1 @@ +export * from "./create-document-selector"; diff --git a/src/completion/index.ts b/src/completion/index.ts new file mode 100644 index 0000000..38a1ea0 --- /dev/null +++ b/src/completion/index.ts @@ -0,0 +1 @@ +export * from "./xquery-completion-item-provider"; diff --git a/src/extension.ts b/src/extension.ts index 5e4f3a7..265594f 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -1,19 +1,16 @@ -import { languages, window, workspace, commands } from "vscode"; import { - ExtensionContext, Memento, TextEditor, TextEditorSelectionChangeEvent, - TextEditorSelectionChangeKind, WorkspaceConfiguration -} from "vscode"; + commands, languages, window, workspace, ExtensionContext, Memento, + TextEditor, TextEditorSelectionChangeEvent, TextEditorSelectionChangeKind + } from "vscode"; -import { createDocumentSelector } from "./common/create-document-selector"; -import { XQueryCompletionItemProvider } from "./completion/xquery-completion-item-provider"; -import { formatAsXml } from "./formatting/commands/formatAsXml"; -import { minifyXml } from "./formatting/commands/minifyXml"; -import { XmlFormatterFactory } from "./formatting/xml-formatter"; -import { XmlFormattingEditProvider } from "./formatting/xml-formatting-edit-provider"; -import { XQueryLinter } from "./linting/xquery-linter"; -import { XmlTreeDataProvider } from "./tree-view/xml-tree-data-provider"; -import { evaluateXPath } from "./xpath/commands/evaluateXPath"; -import { executeXQuery } from "./xquery-execution/commands/executeXQuery"; +import { createDocumentSelector } from "./common"; +import { XQueryCompletionItemProvider } from "./completion"; +import { XmlFormatterFactory, XmlFormattingEditProvider } from "./formatting"; +import { formatAsXml, minifyXml } from "./formatting/commands"; +import { XQueryLinter } from "./linting"; +import { XmlTreeDataProvider } from "./tree-view"; +import { evaluateXPath } from "./xpath/commands"; +import { executeXQuery } from "./xquery-execution/commands"; import * as constants from "./constants"; diff --git a/src/formatting/commands/index.ts b/src/formatting/commands/index.ts new file mode 100644 index 0000000..3e12b40 --- /dev/null +++ b/src/formatting/commands/index.ts @@ -0,0 +1,2 @@ +export * from "./formatAsXml"; +export * from "./minifyXml"; diff --git a/src/formatting/formatters/index.ts b/src/formatting/formatters/index.ts new file mode 100644 index 0000000..2628d02 --- /dev/null +++ b/src/formatting/formatters/index.ts @@ -0,0 +1,2 @@ +export * from "./classic-xml-formatter"; +export * from "./v2-xml-formatter"; diff --git a/src/formatting/index.ts b/src/formatting/index.ts new file mode 100644 index 0000000..d5956c4 --- /dev/null +++ b/src/formatting/index.ts @@ -0,0 +1,3 @@ +export * from "./xml-formatter"; +export * from "./xml-formatting-edit-provider"; +export * from "./xml-formatting-options"; diff --git a/src/linting/index.ts b/src/linting/index.ts new file mode 100644 index 0000000..4ab4df0 --- /dev/null +++ b/src/linting/index.ts @@ -0,0 +1 @@ +export * from "./xquery-linter"; diff --git a/src/test/extension.test.ts b/src/test/extension.test.ts index 0b14435..ce6f035 100644 --- a/src/test/extension.test.ts +++ b/src/test/extension.test.ts @@ -3,9 +3,8 @@ import { FormattingOptions } from "vscode"; import { TestDataLoader } from "./test-utils/test-data-loader"; -import { XmlFormatter } from "../formatting/xml-formatter"; -import { XmlFormattingOptions } from "../formatting/xml-formatting-options"; -import { V2XmlFormatter } from "../formatting/formatters/v2-xml-formatter"; +import { XmlFormatter, XmlFormattingOptions } from "../formatting"; +import { V2XmlFormatter } from "../formatting/formatters"; describe("V2XmlFormatter", () => { diff --git a/src/tree-view/index.ts b/src/tree-view/index.ts new file mode 100644 index 0000000..72d21e4 --- /dev/null +++ b/src/tree-view/index.ts @@ -0,0 +1 @@ +export * from "./xml-tree-data-provider"; diff --git a/src/xpath/commands/index.ts b/src/xpath/commands/index.ts new file mode 100644 index 0000000..d25f558 --- /dev/null +++ b/src/xpath/commands/index.ts @@ -0,0 +1 @@ +export * from "./evaluateXPath"; diff --git a/src/xpath/index.ts b/src/xpath/index.ts new file mode 100644 index 0000000..81dfa2a --- /dev/null +++ b/src/xpath/index.ts @@ -0,0 +1 @@ +export * from "./xpath-evaluator"; diff --git a/src/xquery-execution/commands/index.ts b/src/xquery-execution/commands/index.ts new file mode 100644 index 0000000..d97f33e --- /dev/null +++ b/src/xquery-execution/commands/index.ts @@ -0,0 +1 @@ +export * from "./executeXQuery"; diff --git a/src/xquery-execution/index.ts b/src/xquery-execution/index.ts new file mode 100644 index 0000000..9633bbb --- /dev/null +++ b/src/xquery-execution/index.ts @@ -0,0 +1 @@ +export * from "./child-process"; From 907fa7139412405e62a2dc2a183b3339dc899ccd Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 3 May 2018 22:08:12 -0400 Subject: [PATCH 48/57] Move Extension Context --- src/common/extension-state.ts | 17 +++++++++++++++++ src/common/index.ts | 1 + src/extension.ts | 7 ++----- src/xpath/commands/evaluateXPath.ts | 2 +- 4 files changed, 21 insertions(+), 6 deletions(-) create mode 100644 src/common/extension-state.ts diff --git a/src/common/extension-state.ts b/src/common/extension-state.ts new file mode 100644 index 0000000..c4fb213 --- /dev/null +++ b/src/common/extension-state.ts @@ -0,0 +1,17 @@ +import { ExtensionContext, Memento } from "vscode"; + +export class ExtensionState { + private static _context: ExtensionContext; + + static get global(): Memento { + return this._context.globalState; + } + + static get workspace(): Memento { + return this._context.workspaceState; + } + + static configure(context: ExtensionContext): void { + this._context = context; + } +} diff --git a/src/common/index.ts b/src/common/index.ts index 6a9e980..b322d14 100644 --- a/src/common/index.ts +++ b/src/common/index.ts @@ -1 +1,2 @@ export * from "./create-document-selector"; +export * from "./extension-state"; diff --git a/src/extension.ts b/src/extension.ts index 265594f..2cad6cf 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -3,7 +3,7 @@ import { TextEditor, TextEditorSelectionChangeEvent, TextEditorSelectionChangeKind } from "vscode"; -import { createDocumentSelector } from "./common"; +import { createDocumentSelector, ExtensionState } from "./common"; import { XQueryCompletionItemProvider } from "./completion"; import { XmlFormatterFactory, XmlFormattingEditProvider } from "./formatting"; import { formatAsXml, minifyXml } from "./formatting/commands"; @@ -14,11 +14,8 @@ import { executeXQuery } from "./xquery-execution/commands"; import * as constants from "./constants"; -export const ExtensionState: { global?: Memento, workspace?: Memento } = { }; - export function activate(context: ExtensionContext) { - ExtensionState.global = context.globalState; - ExtensionState.workspace = context.workspaceState; + ExtensionState.configure(context); const config = workspace.getConfiguration(constants.extensionPrefix); diff --git a/src/xpath/commands/evaluateXPath.ts b/src/xpath/commands/evaluateXPath.ts index 8f78a11..a22d10a 100644 --- a/src/xpath/commands/evaluateXPath.ts +++ b/src/xpath/commands/evaluateXPath.ts @@ -1,8 +1,8 @@ import { window, workspace } from "vscode"; import { TextEditor, TextEditorEdit, ViewColumn } from "vscode"; +import { ExtensionState } from "../../common"; import * as constants from "../../constants"; -import { ExtensionState } from "../../extension"; import { EvaluatorResult, EvaluatorResultType, XPathEvaluator } from "../xpath-evaluator"; From a4366a5061bf98ced7ea7fc887b400c1687b161e Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 3 May 2018 22:36:54 -0400 Subject: [PATCH 49/57] Add Configuration Service --- package.json | 14 ++-- src/common/configuration.ts | 65 +++++++++++++++++++ src/common/index.ts | 1 + src/constants.ts | 15 ----- src/extension.ts | 8 +-- src/formatting/commands/formatAsXml.ts | 2 +- src/formatting/commands/minifyXml.ts | 2 +- src/formatting/xml-formatter.ts | 3 +- .../xml-formatting-edit-provider.ts | 8 +-- src/formatting/xml-formatting-options.ts | 16 ++--- src/tree-view/xml-tree-data-provider.ts | 12 ++-- src/xpath/commands/evaluateXPath.ts | 10 ++- .../commands/executeXQuery.ts | 11 ++-- 13 files changed, 103 insertions(+), 64 deletions(-) create mode 100644 src/common/configuration.ts diff --git a/package.json b/package.json index 634594d..26187d8 100644 --- a/package.json +++ b/package.json @@ -85,13 +85,13 @@ "type": "boolean", "default": true, "description": "Ignore default xmlns attributes when evaluating XPath.", - "scope": "resource" + "scope": "window" }, "xmlTools.persistXPathQuery": { "type": "boolean", "default": true, "description": "Remember the last XPath query used.", - "scope": "resource" + "scope": "window" }, "xmlTools.removeCommentsOnMinify": { "type": "boolean", @@ -115,7 +115,7 @@ "type": "string", "default": "v2", "description": "Supported XML Formatters: classic", - "scope": "resource" + "scope": "window" }, "xmlTools.xqueryExecutionArguments": { "type": "array", @@ -128,25 +128,25 @@ "$(input.output.xml" ], "description": "Arguments to be passed to the XQuery execution engine.", - "scope": "resource" + "scope": "window" }, "xmlTools.xqueryExecutionEngine": { "type": "string", "default": "", "description": "The full path to the executable to run when executing XQuery scripts.", - "scope": "resource" + "scope": "window" }, "xmlTools.xqueryExecutionInputLimit": { "type": "integer", "default": 100, "description": "The maximum number of input files to enumerate when executing XQuery scripts.", - "scope": "resource" + "scope": "window" }, "xmlTools.xqueryExecutionInputSearchPattern": { "type": "string", "default": "**/*.xml", "description": "The pattern used to search for input XML files when executing XQuery scripts.", - "scope": "resource" + "scope": "window" } } }, diff --git a/src/common/configuration.ts b/src/common/configuration.ts new file mode 100644 index 0000000..0a3ef1c --- /dev/null +++ b/src/common/configuration.ts @@ -0,0 +1,65 @@ +import { workspace, Uri } from "vscode"; + +const ExtensionTopLevelSection = "xmlTools"; + +export class Configuration { + static get enableXmlTreeView(): boolean { + return this._getForWindow("enableXmlTreeView"); + } + + static get enableXmlTreeViewMetadata(): boolean { + return this._getForWindow("enableXmlTreeViewMetadata"); + } + + static get enableXmlTreeViewCursorSync(): boolean { + return this._getForWindow("enableXmlTreeViewCursorSync"); + } + + static get ignoreDefaultNamespace(): boolean { + return this._getForWindow("ignoreDefaultNamespace"); + } + + static get persistXPathQuery(): boolean { + return this._getForWindow("persistXPathQuery"); + } + + static get xmlFormatterImplementation(): string { + return this._getForWindow("xmlFormatterImplementation"); + } + + static get xqueryExecutionArguments(): string[] { + return this._getForWindow("xqueryExecutionArguments"); + } + + static get xqueryExecutionEngine(): string { + return this._getForWindow("xqueryExecutionEngine"); + } + + static get xqueryExecutionInputLimit(): number { + return this._getForWindow("xqueryExecutionInputLimit"); + } + + static get xqueryExecutionInputSearchPattern(): string { + return this._getForWindow("xqueryExecutionInputSearchPattern"); + } + + static removeCommentsOnMinify(resource: Uri): boolean { + return this._getForResource("removeCommentsOnMinify", resource); + } + + static splitAttributesOnFormat(resource: Uri): boolean { + return this._getForResource("splitAttributesOnFormat", resource); + } + + static splitXmlnsOnFormat(resource: Uri): boolean { + return this._getForResource("splitXmlnsOnFormat", resource); + } + + private static _getForResource(section: string, resource: Uri): T { + return workspace.getConfiguration(ExtensionTopLevelSection, resource).get(section); + } + + private static _getForWindow(section: string): T { + return workspace.getConfiguration(ExtensionTopLevelSection).get(section); + } +} diff --git a/src/common/index.ts b/src/common/index.ts index b322d14..ead1cdb 100644 --- a/src/common/index.ts +++ b/src/common/index.ts @@ -1,2 +1,3 @@ +export * from "./configuration"; export * from "./create-document-selector"; export * from "./extension-state"; diff --git a/src/constants.ts b/src/constants.ts index 8f1237d..5732939 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -11,21 +11,6 @@ export namespace contextKeys { export const xmlTreeViewEnabled = "xmlTreeViewEnabled"; } -export namespace configKeys { - export const enableXmlTreeView = "enableXmlTreeView"; - export const enableXmlTreeViewMetadata = "enableXmlTreeViewMetadata"; - export const enableXmlTreeViewCursorSync = "enableXmlTreeViewCursorSync"; - export const ignoreDefaultNamespace = "ignoreDefaultNamespace"; - export const persistXPathQuery = "persistXPathQuery"; - export const removeCommentsOnMinify = "removeCommentsOnMinify"; - export const splitAttributesOnFormat = "splitAttributesOnFormat"; - export const splitXmlnsOnFormat = "splitXmlnsOnFormat"; - export const xqueryExecutionArguments = "xqueryExecutionArguments"; - export const xqueryExecutionEngine = "xqueryExecutionEngine"; - export const xqueryExecutionInputLimit = "xqueryExecutionInputLimit"; - export const xqueryExecutionInputSearchPattern = "xqueryExecutionInputSearchPattern"; -} - export namespace diagnosticCollections { export const xquery = "XQueryDiagnostics"; } diff --git a/src/extension.ts b/src/extension.ts index 2cad6cf..276d9df 100644 --- a/src/extension.ts +++ b/src/extension.ts @@ -3,7 +3,7 @@ import { TextEditor, TextEditorSelectionChangeEvent, TextEditorSelectionChangeKind } from "vscode"; -import { createDocumentSelector, ExtensionState } from "./common"; +import { createDocumentSelector, ExtensionState, Configuration } from "./common"; import { XQueryCompletionItemProvider } from "./completion"; import { XmlFormatterFactory, XmlFormattingEditProvider } from "./formatting"; import { formatAsXml, minifyXml } from "./formatting/commands"; @@ -17,8 +17,6 @@ import * as constants from "./constants"; export function activate(context: ExtensionContext) { ExtensionState.configure(context); - const config = workspace.getConfiguration(constants.extensionPrefix); - const xmlXsdDocSelector = [...createDocumentSelector(constants.languageIds.xml), ...createDocumentSelector(constants.languageIds.xsd)]; const xqueryDocSelector = createDocumentSelector(constants.languageIds.xquery); @@ -28,7 +26,7 @@ export function activate(context: ExtensionContext) { ); /* Formatting Features */ - const xmlFormattingEditProvider = new XmlFormattingEditProvider(config, XmlFormatterFactory.getXmlFormatter()); + const xmlFormattingEditProvider = new XmlFormattingEditProvider(XmlFormatterFactory.getXmlFormatter()); context.subscriptions.push( commands.registerTextEditorCommand(constants.commands.formatAsXml, formatAsXml), @@ -49,7 +47,7 @@ export function activate(context: ExtensionContext) { treeDataProvider: treeViewDataProvider }); - if (config.get(constants.configKeys.enableXmlTreeViewCursorSync)) { + if (Configuration.enableXmlTreeViewCursorSync) { window.onDidChangeTextEditorSelection(x => { if (x.kind === TextEditorSelectionChangeKind.Mouse && x.selections.length > 0) { treeView.reveal(treeViewDataProvider.getNodeAtPosition(x.selections[0].start)); diff --git a/src/formatting/commands/formatAsXml.ts b/src/formatting/commands/formatAsXml.ts index a1b589e..c0d64a1 100644 --- a/src/formatting/commands/formatAsXml.ts +++ b/src/formatting/commands/formatAsXml.ts @@ -8,7 +8,7 @@ import { XmlFormattingEditProvider } from "../xml-formatting-edit-provider"; import { XmlFormattingOptionsFactory } from "../xml-formatting-options"; export function formatAsXml(editor: TextEditor, edit: TextEditorEdit): void { - const xmlFormattingEditProvider = new XmlFormattingEditProvider(workspace.getConfiguration(constants.extensionPrefix), XmlFormatterFactory.getXmlFormatter()); + const xmlFormattingEditProvider = new XmlFormattingEditProvider(XmlFormatterFactory.getXmlFormatter()); const formattingOptions = { insertSpaces: editor.options.insertSpaces, tabSize: editor.options.tabSize diff --git a/src/formatting/commands/minifyXml.ts b/src/formatting/commands/minifyXml.ts index 7be0078..f75e8f3 100644 --- a/src/formatting/commands/minifyXml.ts +++ b/src/formatting/commands/minifyXml.ts @@ -12,7 +12,7 @@ export function minifyXml(editor: TextEditor, edit: TextEditorEdit): void { const xmlFormattingOptions = XmlFormattingOptionsFactory.getXmlFormattingOptions({ insertSpaces: editor.options.insertSpaces, tabSize: editor.options.tabSize - }, editor.document.eol); + }, editor.document); const endPosition = editor.document.lineAt(editor.document.lineCount - 1).rangeIncludingLineBreak.end; const range = new Range(editor.document.positionAt(0), endPosition); diff --git a/src/formatting/xml-formatter.ts b/src/formatting/xml-formatter.ts index b87b2b1..ddfa361 100644 --- a/src/formatting/xml-formatter.ts +++ b/src/formatting/xml-formatter.ts @@ -1,5 +1,6 @@ import { workspace } from "vscode"; +import { Configuration } from "../common"; import * as constants from "../constants"; import { ClassicXmlFormatter } from "./formatters/classic-xml-formatter"; import { V2XmlFormatter } from "./formatters/v2-xml-formatter"; @@ -19,7 +20,7 @@ export class XmlFormatterFactory { return XmlFormatterFactory._xmlFormatter; } - const xmlFormatterImplementationSetting = workspace.getConfiguration(constants.extensionPrefix).get("xmlFormatterImplementation"); + const xmlFormatterImplementationSetting = Configuration.xmlFormatterImplementation; let xmlFormatterImplementation: XmlFormatter; switch (xmlFormatterImplementationSetting) { diff --git a/src/formatting/xml-formatting-edit-provider.ts b/src/formatting/xml-formatting-edit-provider.ts index 2fd9007..6a7f9f2 100644 --- a/src/formatting/xml-formatting-edit-provider.ts +++ b/src/formatting/xml-formatting-edit-provider.ts @@ -1,7 +1,7 @@ import { workspace } from "vscode"; import { CancellationToken, DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider, EndOfLine, - FormattingOptions, ProviderResult, Range, TextDocument, TextEdit, WorkspaceConfiguration + FormattingOptions, ProviderResult, Range, TextDocument, TextEdit } from "vscode"; import * as constants from "../constants"; @@ -11,7 +11,6 @@ import { XmlFormattingOptionsFactory } from "./xml-formatting-options"; export class XmlFormattingEditProvider implements DocumentFormattingEditProvider, DocumentRangeFormattingEditProvider { constructor( - public workspaceConfiguration: WorkspaceConfiguration, public xmlFormatter: XmlFormatter ) { } @@ -23,12 +22,9 @@ export class XmlFormattingEditProvider implements DocumentFormattingEditProvider } provideDocumentRangeFormattingEdits(document: TextDocument, range: Range, options: FormattingOptions, token: CancellationToken): ProviderResult { - // override global configuration (issue #128) - this.workspaceConfiguration = workspace.getConfiguration(constants.extensionPrefix, document.uri); - let xml = document.getText(range); - xml = this.xmlFormatter.formatXml(xml, XmlFormattingOptionsFactory.getXmlFormattingOptions(options, document.eol)); + xml = this.xmlFormatter.formatXml(xml, XmlFormattingOptionsFactory.getXmlFormattingOptions(options, document)); return [ TextEdit.replace(range, xml) ]; } diff --git a/src/formatting/xml-formatting-options.ts b/src/formatting/xml-formatting-options.ts index 4e37c24..bcfdffd 100644 --- a/src/formatting/xml-formatting-options.ts +++ b/src/formatting/xml-formatting-options.ts @@ -1,6 +1,6 @@ -import { workspace } from "vscode"; -import { EndOfLine, FormattingOptions } from "vscode"; +import { EndOfLine, FormattingOptions, TextDocument } from "vscode"; +import { Configuration } from "../common"; import * as constants from "../constants"; export interface XmlFormattingOptions { @@ -12,15 +12,13 @@ export interface XmlFormattingOptions { } export class XmlFormattingOptionsFactory { - static getXmlFormattingOptions(formattingOptions: FormattingOptions, eol: EndOfLine): XmlFormattingOptions { - const config = workspace.getConfiguration(constants.extensionPrefix); - + static getXmlFormattingOptions(formattingOptions: FormattingOptions, document: TextDocument): XmlFormattingOptions { return { editorOptions: formattingOptions, - newLine: (eol === EndOfLine.CRLF) ? "\r\n" : "\n", - removeCommentsOnMinify: config.get(constants.configKeys.removeCommentsOnMinify), - splitAttributesOnFormat: config.get(constants.configKeys.splitAttributesOnFormat), - splitXmlnsOnFormat: config.get(constants.configKeys.splitXmlnsOnFormat) + newLine: (document.eol === EndOfLine.CRLF) ? "\r\n" : "\n", + removeCommentsOnMinify: Configuration.removeCommentsOnMinify(document.uri), + splitAttributesOnFormat: Configuration.splitAttributesOnFormat(document.uri), + splitXmlnsOnFormat: Configuration.splitXmlnsOnFormat(document.uri) }; } } diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index f79205e..5986d6d 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -1,22 +1,20 @@ import { commands, window, workspace } from "vscode"; import { Event, EventEmitter, ExtensionContext, Position, TextEditor, TreeDataProvider, - TreeItem, TreeItemCollapsibleState, WorkspaceConfiguration + TreeItem, TreeItemCollapsibleState } from "vscode"; import * as path from "path"; import { DOMParser } from "xmldom"; +import { Configuration } from "../common"; import * as constants from "../constants"; export class XmlTreeDataProvider implements TreeDataProvider { - private _config: WorkspaceConfiguration; private _onDidChangeTreeData: EventEmitter = new EventEmitter(); private _xmlDocument: Document; constructor(private _context: ExtensionContext) { - this._config = workspace.getConfiguration(constants.extensionPrefix); - window.onDidChangeActiveTextEditor(() => { this._refreshTree(); }); @@ -33,8 +31,8 @@ export class XmlTreeDataProvider implements TreeDataProvider { } getTreeItem(element: Node): TreeItem | Thenable { - const enableMetadata = this._config.get(constants.configKeys.enableXmlTreeViewMetadata); - const enableSync = this._config.get(constants.configKeys.enableXmlTreeViewCursorSync); + const enableMetadata = Configuration.enableXmlTreeViewMetadata; + const enableSync = Configuration.enableXmlTreeViewCursorSync; const treeItem = new TreeItem(element.localName); @@ -208,7 +206,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { return; } - const enableTreeView = this._config.get(constants.configKeys.enableXmlTreeView, true); + const enableTreeView = Configuration.enableXmlTreeView; commands.executeCommand(constants.nativeCommands.setContext, constants.contextKeys.xmlTreeViewEnabled, enableTreeView); diff --git a/src/xpath/commands/evaluateXPath.ts b/src/xpath/commands/evaluateXPath.ts index a22d10a..bc22d97 100644 --- a/src/xpath/commands/evaluateXPath.ts +++ b/src/xpath/commands/evaluateXPath.ts @@ -1,7 +1,7 @@ -import { window, workspace } from "vscode"; +import { window } from "vscode"; import { TextEditor, TextEditorEdit, ViewColumn } from "vscode"; -import { ExtensionState } from "../../common"; +import { Configuration, ExtensionState } from "../../common"; import * as constants from "../../constants"; import { EvaluatorResult, EvaluatorResultType, XPathEvaluator } from "../xpath-evaluator"; @@ -17,13 +17,11 @@ class HistoricQuery { } export async function evaluateXPath(editor: TextEditor, edit: TextEditorEdit): Promise { - const config = workspace.getConfiguration(constants.extensionPrefix); - // if there is no workspace, we will track queries in the global Memento const memento = ExtensionState.workspace || ExtensionState.global; // get the xpath persistence setting - const persistQueries = config.get(constants.configKeys.persistXPathQuery, true); + const persistQueries = Configuration.persistXPathQuery; // get the last query if there is one for this document // if not, try pulling the last query ran, regardless of document @@ -49,7 +47,7 @@ export async function evaluateXPath(editor: TextEditor, edit: TextEditorEdit): P return; } - const ignoreDefaultNamespace = config.get(constants.configKeys.ignoreDefaultNamespace, true); + const ignoreDefaultNamespace = Configuration.ignoreDefaultNamespace; // run the query const xml = editor.document.getText(); diff --git a/src/xquery-execution/commands/executeXQuery.ts b/src/xquery-execution/commands/executeXQuery.ts index a209e3d..da61812 100644 --- a/src/xquery-execution/commands/executeXQuery.ts +++ b/src/xquery-execution/commands/executeXQuery.ts @@ -4,10 +4,9 @@ import { Disposable, Range, TextEditor, TextEditorEdit, Uri } from "vscode"; import * as constants from "../../constants"; import { ChildProcess } from "../child-process"; +import { Configuration } from "../../common"; export async function executeXQuery(editor: TextEditor, edit: TextEditorEdit): Promise { - const config = workspace.getConfiguration(constants.extensionPrefix); - // this disposable will be used for creating status bar messages let disposable: Disposable; @@ -16,8 +15,8 @@ export async function executeXQuery(editor: TextEditor, edit: TextEditorEdit): P return; } - const executable = config.get(constants.configKeys.xqueryExecutionEngine, null); - let args = config.get(constants.configKeys.xqueryExecutionArguments, []); + const executable = Configuration.xqueryExecutionEngine; + let args = Configuration.xqueryExecutionArguments || []; if (!executable || executable === "") { const action = await window.showWarningMessage("An XQuery execution engine has not been defined.", "Define Now"); @@ -32,8 +31,8 @@ export async function executeXQuery(editor: TextEditor, edit: TextEditorEdit): P let inputFile: Uri; disposable = window.setStatusBarMessage("Searching for XML files in folder..."); - const searchPattern = config.get(constants.configKeys.xqueryExecutionInputSearchPattern); - const inputLimit = config.get(constants.configKeys.xqueryExecutionInputLimit); + const searchPattern = Configuration.xqueryExecutionInputSearchPattern; + const inputLimit = Configuration.xqueryExecutionInputLimit; const files = await workspace.findFiles(searchPattern, "", inputLimit); From b9d6659a26140eb30d23193b2deb3f44510b459d Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 3 May 2018 22:47:41 -0400 Subject: [PATCH 50/57] Add NativeCommands Service --- src/common/index.ts | 1 + src/common/native-commands.ts | 18 ++++++++++++++++++ src/constants.ts | 5 ----- src/formatting/commands/formatAsXml.ts | 13 ++++--------- src/formatting/commands/minifyXml.ts | 2 +- src/tree-view/xml-tree-data-provider.ts | 8 ++++---- src/xquery-execution/commands/executeXQuery.ts | 6 +++--- 7 files changed, 31 insertions(+), 22 deletions(-) create mode 100644 src/common/native-commands.ts diff --git a/src/common/index.ts b/src/common/index.ts index ead1cdb..3089050 100644 --- a/src/common/index.ts +++ b/src/common/index.ts @@ -1,3 +1,4 @@ export * from "./configuration"; export * from "./create-document-selector"; export * from "./extension-state"; +export * from "./native-commands"; diff --git a/src/common/native-commands.ts b/src/common/native-commands.ts new file mode 100644 index 0000000..7703cbc --- /dev/null +++ b/src/common/native-commands.ts @@ -0,0 +1,18 @@ +import { commands } from "vscode"; + +export class NativeCommands { + static async cursorMove(to: string, by: string): Promise { + await commands.executeCommand("cursorMove", { + to: to, + by: by + }); + } + + static openGlobalSettings(): void { + commands.executeCommand("workbench.action.openGlobalSettings"); + } + + static setContext(key: string, value: any): void { + commands.executeCommand("setContext", key, value); + } +} diff --git a/src/constants.ts b/src/constants.ts index 5732939..28ac902 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,5 +1,3 @@ -export const extensionPrefix = "xmlTools"; - export namespace commands { export const evaluateXPath = "xmlTools.evaluateXPath"; export const executeXQuery = "xmlTools.executeXQuery"; @@ -22,10 +20,7 @@ export namespace languageIds { } export namespace nativeCommands { - export const cursorMove = "cursorMove"; - export const openGlobalSettings = "workbench.action.openGlobalSettings"; export const revealLine = "revealLine"; - export const setContext = "setContext"; } export namespace stateKeys { diff --git a/src/formatting/commands/formatAsXml.ts b/src/formatting/commands/formatAsXml.ts index c0d64a1..643df5c 100644 --- a/src/formatting/commands/formatAsXml.ts +++ b/src/formatting/commands/formatAsXml.ts @@ -1,6 +1,7 @@ -import { commands, workspace } from "vscode"; +import { workspace } from "vscode"; import { ProviderResult, Range, TextEdit, TextEditor, TextEditorEdit } from "vscode"; +import { NativeCommands } from "../../common"; import * as constants from "../../constants"; import { XmlFormatterFactory } from "../xml-formatter"; @@ -38,14 +39,8 @@ export function formatAsXml(editor: TextEditor, edit: TextEditorEdit): void { editBuilder.replace(textEdit.range, textEdit.newText); // wiggle the cursor to deselect the formatted XML (is there a non-hacky way to go about this?) - await commands.executeCommand(constants.nativeCommands.cursorMove, { - to: "left", - by: "character" - }); - await commands.executeCommand(constants.nativeCommands.cursorMove, { - to: "right", - by: "character" - }); + await NativeCommands.cursorMove("left", "character"); + await NativeCommands.cursorMove("right", "character"); }); } } diff --git a/src/formatting/commands/minifyXml.ts b/src/formatting/commands/minifyXml.ts index f75e8f3..f6ee759 100644 --- a/src/formatting/commands/minifyXml.ts +++ b/src/formatting/commands/minifyXml.ts @@ -1,4 +1,4 @@ -import { commands, workspace } from "vscode"; +import { workspace } from "vscode"; import { ProviderResult, Range, TextEdit, TextEditor, TextEditorEdit } from "vscode"; import * as constants from "../../constants"; diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index 5986d6d..1adf469 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -1,4 +1,4 @@ -import { commands, window, workspace } from "vscode"; +import { window, workspace } from "vscode"; import { Event, EventEmitter, ExtensionContext, Position, TextEditor, TreeDataProvider, TreeItem, TreeItemCollapsibleState @@ -7,7 +7,7 @@ import { import * as path from "path"; import { DOMParser } from "xmldom"; -import { Configuration } from "../common"; +import { Configuration, NativeCommands } from "../common"; import * as constants from "../constants"; export class XmlTreeDataProvider implements TreeDataProvider { @@ -199,7 +199,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { private _refreshTree(): void { if (!this.activeEditor || this.activeEditor.document.languageId !== constants.languageIds.xml) { - commands.executeCommand(constants.nativeCommands.setContext, constants.contextKeys.xmlTreeViewEnabled, false); + NativeCommands.setContext(constants.contextKeys.xmlTreeViewEnabled, false); this._xmlDocument = null; this._onDidChangeTreeData.fire(); @@ -208,7 +208,7 @@ export class XmlTreeDataProvider implements TreeDataProvider { const enableTreeView = Configuration.enableXmlTreeView; - commands.executeCommand(constants.nativeCommands.setContext, constants.contextKeys.xmlTreeViewEnabled, enableTreeView); + NativeCommands.setContext(constants.contextKeys.xmlTreeViewEnabled, enableTreeView); const xml = this.activeEditor.document.getText(); diff --git a/src/xquery-execution/commands/executeXQuery.ts b/src/xquery-execution/commands/executeXQuery.ts index da61812..90c0525 100644 --- a/src/xquery-execution/commands/executeXQuery.ts +++ b/src/xquery-execution/commands/executeXQuery.ts @@ -1,10 +1,10 @@ -import { commands, window, workspace } from "vscode"; +import { window, workspace } from "vscode"; import { Disposable, Range, TextEditor, TextEditorEdit, Uri } from "vscode"; import * as constants from "../../constants"; import { ChildProcess } from "../child-process"; -import { Configuration } from "../../common"; +import { Configuration, NativeCommands } from "../../common"; export async function executeXQuery(editor: TextEditor, edit: TextEditorEdit): Promise { // this disposable will be used for creating status bar messages @@ -22,7 +22,7 @@ export async function executeXQuery(editor: TextEditor, edit: TextEditorEdit): P const action = await window.showWarningMessage("An XQuery execution engine has not been defined.", "Define Now"); if (action === "Define Now") { - commands.executeCommand(constants.nativeCommands.openGlobalSettings); + NativeCommands.openGlobalSettings(); } return; From dda624c3870cdb72ee88b3907f620a010d5f5098 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 3 May 2018 22:48:44 -0400 Subject: [PATCH 51/57] Use Constants --- src/common/create-document-selector.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/common/create-document-selector.ts b/src/common/create-document-selector.ts index 69d3ba6..3d9bd3e 100644 --- a/src/common/create-document-selector.ts +++ b/src/common/create-document-selector.ts @@ -1,8 +1,10 @@ import { DocumentFilter } from "vscode"; +import * as constants from "../constants"; + export function createDocumentSelector(language: string): DocumentFilter[] { return [ - { language, scheme: "file" }, - { language, scheme: "untitled" }, + { language, scheme: constants.uriSchemes.file }, + { language, scheme: constants.uriSchemes.untitled }, ]; } From 1c3d8bc05302ba0d4c7dede5b47e86eeedb8608d Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 3 May 2018 22:50:42 -0400 Subject: [PATCH 52/57] Update xqlint Removes "natives" from dependency tree. fixes #153 --- package-lock.json | 666 ++++++++++++++++++++++++++++++++-------------- package.json | 2 +- 2 files changed, 472 insertions(+), 196 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8fbb14b..d971c4d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34,6 +34,14 @@ "json-schema-traverse": "0.3.1" } }, + "ansi-align": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz", + "integrity": "sha1-w2rsy6VjuJzrVW82kPCx2eNUf38=", + "requires": { + "string-width": "2.1.1" + } + }, "ansi-cyan": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/ansi-cyan/-/ansi-cyan-0.1.1.tgz", @@ -64,7 +72,8 @@ "ansi-regex": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=" + "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", + "dev": true }, "ansi-styles": { "version": "2.2.1", @@ -82,6 +91,7 @@ "version": "1.0.9", "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.9.tgz", "integrity": "sha1-c9g7wmP4bpf4zE9rrhsOkKfSLIY=", + "dev": true, "requires": { "sprintf-js": "1.0.3" } @@ -228,6 +238,53 @@ "hoek": "2.16.3" } }, + "boxen": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/boxen/-/boxen-1.3.0.tgz", + "integrity": "sha512-TNPjfTr432qx7yOjQyaXm3dSR0MH9vXp7eT1BFSl/C51g+EFnOR9hTg1IreahGBmDNCehscshe45f+C1TBZbLw==", + "requires": { + "ansi-align": "2.0.0", + "camelcase": "4.1.0", + "chalk": "2.4.1", + "cli-boxes": "1.0.0", + "string-width": "2.1.1", + "term-size": "1.2.0", + "widest-line": "2.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "1.9.1" + } + }, + "chalk": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", + "requires": { + "ansi-styles": "3.2.1", + "escape-string-regexp": "1.0.5", + "supports-color": "5.4.0" + } + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" + }, + "supports-color": { + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "requires": { + "has-flag": "3.0.0" + } + } + } + }, "brace-expansion": { "version": "1.1.8", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz", @@ -273,6 +330,16 @@ "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", "dev": true }, + "camelcase": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", + "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=" + }, + "capture-stack-trace": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz", + "integrity": "sha1-Sm+gc5nCa7pH8LJJa00PtAjFVQ0=" + }, "caseless": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", @@ -292,6 +359,16 @@ "supports-color": "2.0.0" } }, + "ci-info": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-1.1.3.tgz", + "integrity": "sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==" + }, + "cli-boxes": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz", + "integrity": "sha1-T6kXw+WclKAEzWH47lCdplFocUM=" + }, "clone": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/clone/-/clone-0.2.0.tgz", @@ -363,7 +440,6 @@ "version": "1.9.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz", "integrity": "sha512-mjGanIiwQJskCC18rPR6OmrZ6fm2Lc7PeGFYwCmy5J34wC6F1PzdGL6xeMfmgicfYcNLGuVFA3WzXtIDCQSZxQ==", - "dev": true, "requires": { "color-name": "1.1.3" } @@ -371,8 +447,7 @@ "color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true + "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=" }, "color-support": { "version": "1.1.3", @@ -407,38 +482,16 @@ "dev": true }, "configstore": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz", - "integrity": "sha1-JeTBbDdoq/dcWmW8YXYfSVBVtFk=", + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/configstore/-/configstore-3.1.2.tgz", + "integrity": "sha512-vtv5HtGjcYUgFrXc6Kx747B83MRRVS5R1VTEQoXvuP+kMI+if6uywV0nDGoiydJRy4yk7h9od5Og0kxx4zUXmw==", "requires": { - "graceful-fs": "3.0.11", - "js-yaml": "3.10.0", - "mkdirp": "0.5.1", - "object-assign": "2.1.1", - "osenv": "0.1.4", - "user-home": "1.1.1", - "uuid": "2.0.3", - "xdg-basedir": "1.0.1" - }, - "dependencies": { - "graceful-fs": { - "version": "3.0.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz", - "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=", - "requires": { - "natives": "1.1.1" - } - }, - "object-assign": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz", - "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=" - }, - "uuid": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz", - "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=" - } + "dot-prop": "4.2.0", + "graceful-fs": "4.1.11", + "make-dir": "1.2.0", + "unique-string": "1.0.0", + "write-file-atomic": "2.3.0", + "xdg-basedir": "3.0.0" } }, "convert-source-map": { @@ -450,7 +503,26 @@ "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=" + "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", + "dev": true + }, + "create-error-class": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/create-error-class/-/create-error-class-3.0.2.tgz", + "integrity": "sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=", + "requires": { + "capture-stack-trace": "1.0.0" + } + }, + "cross-spawn": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", + "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", + "requires": { + "lru-cache": "4.1.2", + "shebang-command": "1.2.0", + "which": "1.3.0" + } }, "cryptiles": { "version": "2.0.5", @@ -461,6 +533,11 @@ "boom": "2.10.1" } }, + "crypto-random-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz", + "integrity": "sha1-ojD2T1aDEOFJgAmUB5DsmVRbyn4=" + }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -503,9 +580,9 @@ } }, "deep-extend": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.4.2.tgz", - "integrity": "sha1-SLaZwn4zS/ifEIkr5DL25MfTSn8=" + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==" }, "delayed-stream": { "version": "1.0.0", @@ -519,6 +596,14 @@ "integrity": "sha512-MKPHZDMB0o6yHyDryUOScqZibp914ksXwAMYMTHj6KO8UeKsRYNJD3oNCKjTqZon+V488P7N/HzXF8t7ZR95ww==", "dev": true }, + "dot-prop": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz", + "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==", + "requires": { + "is-obj": "1.0.1" + } + }, "duplexer": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", @@ -560,10 +645,16 @@ } } }, + "duplexer3": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz", + "integrity": "sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=" + }, "duplexify": { "version": "3.5.3", "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.5.3.tgz", "integrity": "sha512-g8ID9OroF9hKt2POf8YLayy+9594PzmM3scI00/uBXocX3TWNgoB67hjzkFe9ITAbQOne/lLdBxHXvYUM4ZgGA==", + "dev": true, "requires": { "end-of-stream": "1.4.1", "inherits": "2.0.3", @@ -585,6 +676,7 @@ "version": "1.4.1", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", + "dev": true, "requires": { "once": "1.4.0" } @@ -597,7 +689,8 @@ "esprima": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz", - "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==" + "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==", + "dev": true }, "esutils": { "version": "2.0.2", @@ -620,6 +713,20 @@ "through": "2.3.8" } }, + "execa": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", + "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", + "requires": { + "cross-spawn": "5.1.0", + "get-stream": "3.0.0", + "is-stream": "1.1.0", + "npm-run-path": "2.0.2", + "p-finally": "1.0.0", + "signal-exit": "3.0.2", + "strip-eof": "1.0.0" + } + }, "expand-brackets": { "version": "0.1.5", "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", @@ -813,6 +920,11 @@ "is-property": "1.0.2" } }, + "get-stream": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", + "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=" + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -955,6 +1067,14 @@ } } }, + "global-dirs": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/global-dirs/-/global-dirs-0.1.1.tgz", + "integrity": "sha1-sxnA3UYH81PzvpzKTHL8FIxJ9EU=", + "requires": { + "ini": "1.3.5" + } + }, "glogg": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/glogg/-/glogg-1.0.1.tgz", @@ -965,34 +1085,27 @@ } }, "got": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/got/-/got-3.3.1.tgz", - "integrity": "sha1-5dDtSvVfw+701WAHdp2YGSvLLso=", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/got/-/got-6.7.1.tgz", + "integrity": "sha1-JAzQV4WpoY5WHcG0S0HHY+8ejbA=", "requires": { - "duplexify": "3.5.3", - "infinity-agent": "2.0.3", + "create-error-class": "3.0.2", + "duplexer3": "0.1.4", + "get-stream": "3.0.0", "is-redirect": "1.0.0", + "is-retry-allowed": "1.1.0", "is-stream": "1.1.0", - "lowercase-keys": "1.0.0", - "nested-error-stacks": "1.0.2", - "object-assign": "3.0.0", - "prepend-http": "1.0.4", - "read-all-stream": "3.1.0", - "timed-out": "2.0.0" - }, - "dependencies": { - "object-assign": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz", - "integrity": "sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=" - } + "lowercase-keys": "1.0.1", + "safe-buffer": "5.1.1", + "timed-out": "4.0.1", + "unzip-response": "2.0.1", + "url-parse-lax": "1.0.0" } }, "graceful-fs": { "version": "4.1.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true + "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=" }, "growl": { "version": "1.10.3", @@ -1402,10 +1515,15 @@ "sshpk": "1.14.1" } }, - "infinity-agent": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/infinity-agent/-/infinity-agent-2.0.3.tgz", - "integrity": "sha1-ReDi/3qesDCyfWK3SzdEt6esQhY=" + "import-lazy": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", + "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=" + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" }, "inflight": { "version": "1.0.6", @@ -1420,7 +1538,8 @@ "inherits": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=" + "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", + "dev": true }, "ini": { "version": "1.3.5", @@ -1439,6 +1558,14 @@ "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", "dev": true }, + "is-ci": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-1.1.0.tgz", + "integrity": "sha512-c7TnwxLePuqIlxHgr7xtxzycJPegNHFuIrBkwbf8hc58//+Op1CqFkyS+xnIMkwn9UsJIwc174BIjkyBmSpjKg==", + "requires": { + "ci-info": "1.1.3" + } + }, "is-dotfile": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", @@ -1466,6 +1593,11 @@ "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", "dev": true }, + "is-fullwidth-code-point": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", + "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=" + }, "is-glob": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", @@ -1475,6 +1607,15 @@ "is-extglob": "2.1.1" } }, + "is-installed-globally": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-0.1.0.tgz", + "integrity": "sha1-Df2Y9akRFxbdU13aZJL2e/PSWoA=", + "requires": { + "global-dirs": "0.1.1", + "is-path-inside": "1.0.1" + } + }, "is-my-ip-valid": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", @@ -1522,8 +1663,15 @@ "is-obj": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz", - "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=", - "dev": true + "integrity": "sha1-PkcprB9f3gJc19g6iW2rn09n2w8=" + }, + "is-path-inside": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", + "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", + "requires": { + "path-is-inside": "1.0.2" + } }, "is-posix-bracket": { "version": "0.1.1", @@ -1548,6 +1696,11 @@ "resolved": "https://registry.npmjs.org/is-redirect/-/is-redirect-1.0.0.tgz", "integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=" }, + "is-retry-allowed": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz", + "integrity": "sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=" + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", @@ -1574,7 +1727,13 @@ "isarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" + "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", + "dev": true + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" }, "isobject": { "version": "2.1.0", @@ -1601,6 +1760,7 @@ "version": "3.10.0", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.10.0.tgz", "integrity": "sha512-O2v52ffjLa9VeM43J4XocZE//WT9N0IiwDa3KSHH7Tu8CtH+1qM8SIZvnsTh6v+4yFy5KUY3BHUVwjpfAWsjIA==", + "dev": true, "requires": { "argparse": "1.0.9", "esprima": "4.0.0" @@ -1679,11 +1839,11 @@ "dev": true }, "latest-version": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-1.0.1.tgz", - "integrity": "sha1-cs/Ebj6NG+ZR4eu1Tqn26pbzdLs=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-3.1.0.tgz", + "integrity": "sha1-ogU4P+oyKzO1rjsYq+4NwvNW7hU=", "requires": { - "package-json": "1.2.0" + "package-json": "4.0.1" } }, "lazystream": { @@ -1826,9 +1986,26 @@ } }, "lowercase-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.0.tgz", - "integrity": "sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=" + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", + "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==" + }, + "lru-cache": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz", + "integrity": "sha512-wgeVXhrDwAWnIF/yZARsFnMBtdFXOg1b8RIrhilp+0iDYN4mdQcNZElDZ0e4B64BhaxeQ5zN7PMyvu7we1kPeQ==", + "requires": { + "pseudomap": "1.0.2", + "yallist": "2.1.2" + } + }, + "make-dir": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.2.0.tgz", + "integrity": "sha512-aNUAa4UMg/UougV25bbrU4ZaaKNjJ/3/xnvg/twpmKROPdKZPZ9wGgI0opdZzO8q/zUFawoUuixuOv33eZ61Iw==", + "requires": { + "pify": "3.0.0" + } }, "map-stream": { "version": "0.1.0", @@ -1928,12 +2105,14 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, "requires": { "minimist": "0.0.8" } @@ -2000,19 +2179,6 @@ "duplexer2": "0.0.2" } }, - "natives": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.1.tgz", - "integrity": "sha512-8eRaxn8u/4wN8tGkhlc2cgwwvOLMLUMUn4IYTexMgWd+LyUDfeXVkk2ygQR0hvIHbJQXgHujia3ieUUDwNGkEA==" - }, - "nested-error-stacks": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-1.0.2.tgz", - "integrity": "sha1-GfYZWRUZ8JZ2mlupqG5u7sgjw88=", - "requires": { - "inherits": "2.0.3" - } - }, "node-fs": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz", @@ -2036,6 +2202,14 @@ "remove-trailing-separator": "1.1.0" } }, + "npm-run-path": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", + "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", + "requires": { + "path-key": "2.0.1" + } + }, "oauth-sign": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz", @@ -2062,6 +2236,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, "requires": { "wrappy": "1.0.2" } @@ -2076,32 +2251,20 @@ "readable-stream": "2.3.3" } }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=" - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=" - }, - "osenv": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.4.tgz", - "integrity": "sha1-Qv5tWVPfBsgGS+bxdsPQWqqjRkQ=", - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" }, "package-json": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-1.2.0.tgz", - "integrity": "sha1-yOysCUInzfdqMWh07QXifMk5oOA=", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/package-json/-/package-json-4.0.1.tgz", + "integrity": "sha1-iGmgQBJTZhxMTKPabCEh7VVfXu0=", "requires": { - "got": "3.3.1", - "registry-url": "3.1.0" + "got": "6.7.1", + "registry-auth-token": "3.3.2", + "registry-url": "3.1.0", + "semver": "5.5.0" } }, "parse-glob": { @@ -2145,6 +2308,16 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", "dev": true }, + "path-is-inside": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", + "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=" + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + }, "path-parse": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", @@ -2172,15 +2345,22 @@ "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", "dev": true }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=" + }, "pinkie": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=" + "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", + "dev": true }, "pinkie-promise": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", + "dev": true, "requires": { "pinkie": "2.0.4" } @@ -2212,7 +2392,13 @@ "process-nextick-args": { "version": "1.0.7", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz", - "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=" + "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=", + "dev": true + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=" }, "punycode": { "version": "1.4.1", @@ -2288,11 +2474,11 @@ } }, "rc": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.5.tgz", - "integrity": "sha1-J1zWh/bjs2zHVrqibf7oCnkDAf0=", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.7.tgz", + "integrity": "sha512-LdLD8xD4zzLsAT5xyushXDNscEjB7+2ulnl8+r1pnESlYtlJtVSoCMBGr30eDRJ3+2Gq89jK9P9e4tCEH1+ywA==", "requires": { - "deep-extend": "0.4.2", + "deep-extend": "0.5.1", "ini": "1.3.5", "minimist": "1.2.0", "strip-json-comments": "2.0.1" @@ -2305,19 +2491,11 @@ } } }, - "read-all-stream": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz", - "integrity": "sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=", - "requires": { - "pinkie-promise": "2.0.1", - "readable-stream": "2.3.3" - } - }, "readable-stream": { "version": "2.3.3", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz", "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==", + "dev": true, "requires": { "core-util-is": "1.0.2", "inherits": "2.0.3", @@ -2337,12 +2515,21 @@ "is-equal-shallow": "0.1.3" } }, + "registry-auth-token": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz", + "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==", + "requires": { + "rc": "1.2.7", + "safe-buffer": "5.1.1" + } + }, "registry-url": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz", "integrity": "sha1-PU74cPc93h138M+aOBQyRE4XSUI=", "requires": { - "rc": "1.2.5" + "rc": "1.2.7" } }, "remove-trailing-separator": { @@ -2564,6 +2751,24 @@ "semver": "5.5.0" } }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "requires": { + "shebang-regex": "1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + }, + "signal-exit": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", + "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=" + }, "sntp": { "version": "1.0.9", "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", @@ -2607,7 +2812,8 @@ "sprintf-js": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", + "dev": true }, "sshpk": { "version": "1.14.1", @@ -2651,7 +2857,8 @@ "stream-shift": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=" + "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", + "dev": true }, "streamfilter": { "version": "1.0.7", @@ -2668,18 +2875,35 @@ "integrity": "sha1-l+mNj6TRBdYqJpHR3AfoINuN/E8=", "dev": true }, - "string-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-1.0.1.tgz", - "integrity": "sha1-VpcPscOFWOnnC3KL894mmsRa36w=", + "string-width": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", + "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", "requires": { - "strip-ansi": "3.0.1" + "is-fullwidth-code-point": "2.0.0", + "strip-ansi": "4.0.0" + }, + "dependencies": { + "ansi-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", + "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=" + }, + "strip-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", + "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", + "requires": { + "ansi-regex": "3.0.0" + } + } } }, "string_decoder": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, "requires": { "safe-buffer": "5.1.1" } @@ -2694,6 +2918,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", + "dev": true, "requires": { "ansi-regex": "2.1.1" } @@ -2717,6 +2942,11 @@ "strip-bom": "2.0.0" } }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + }, "strip-json-comments": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", @@ -2739,6 +2969,14 @@ "inherits": "2.0.3" } }, + "term-size": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/term-size/-/term-size-1.2.0.tgz", + "integrity": "sha1-RYuDiH8oj8Vtb/+/rSYuJmOO+mk=", + "requires": { + "execa": "0.7.0" + } + }, "through": { "version": "2.3.8", "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -2772,9 +3010,9 @@ "dev": true }, "timed-out": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-2.0.0.tgz", - "integrity": "sha1-84sK6B03R9YoAB9B2vxlKs5nHAo=" + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/timed-out/-/timed-out-4.0.1.tgz", + "integrity": "sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=" }, "to-absolute-glob": { "version": "0.1.1", @@ -2900,61 +3138,66 @@ "through2-filter": "2.0.0" } }, - "update-notifier": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz", - "integrity": "sha1-5ps6eEtOaGoqzZj15mlEWRmW4Yc=", + "unique-string": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz", + "integrity": "sha1-nhBXzKhRq7kzmPizOuGHuZyuwRo=", "requires": { - "chalk": "0.5.1", - "configstore": "0.3.2", + "crypto-random-string": "1.0.0" + } + }, + "unzip-response": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/unzip-response/-/unzip-response-2.0.1.tgz", + "integrity": "sha1-0vD3N9FrBhXnKmk17QQhRXLVb5c=" + }, + "update-notifier": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-2.5.0.tgz", + "integrity": "sha512-gwMdhgJHGuj/+wHJJs9e6PcCszpxR1b236igrOkUofGhqJuG+amlIKwApH1IW1WWl7ovZxsX49lMBWLxSdm5Dw==", + "requires": { + "boxen": "1.3.0", + "chalk": "2.4.1", + "configstore": "3.1.2", + "import-lazy": "2.1.0", + "is-ci": "1.1.0", + "is-installed-globally": "0.1.0", "is-npm": "1.0.0", - "latest-version": "1.0.1", + "latest-version": "3.1.0", "semver-diff": "2.1.0", - "string-length": "1.0.1" + "xdg-basedir": "3.0.0" }, "dependencies": { - "ansi-regex": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz", - "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=" - }, "ansi-styles": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz", - "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=" + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "requires": { + "color-convert": "1.9.1" + } }, "chalk": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz", - "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=", + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", + "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", "requires": { - "ansi-styles": "1.1.0", + "ansi-styles": "3.2.1", "escape-string-regexp": "1.0.5", - "has-ansi": "0.1.0", - "strip-ansi": "0.3.0", - "supports-color": "0.2.0" + "supports-color": "5.4.0" } }, - "has-ansi": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz", - "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=", - "requires": { - "ansi-regex": "0.2.1" - } - }, - "strip-ansi": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz", - "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=", - "requires": { - "ansi-regex": "0.2.1" - } + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, "supports-color": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz", - "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=" + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", + "requires": { + "has-flag": "3.0.0" + } } } }, @@ -2968,15 +3211,19 @@ "requires-port": "1.0.0" } }, - "user-home": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz", - "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=" + "url-parse-lax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-1.0.0.tgz", + "integrity": "sha1-evjzA2Rem9eaJy56FKxovAYJ2nM=", + "requires": { + "prepend-http": "1.0.4" + } }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" + "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", + "dev": true }, "uuid": { "version": "3.2.1", @@ -3106,18 +3353,42 @@ "resolved": "https://registry.npmjs.org/when/-/when-2.0.1.tgz", "integrity": "sha1-jYcv4V5oQkyRtLck6EjggH2rZkI=" }, + "which": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz", + "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==", + "requires": { + "isexe": "2.0.0" + } + }, + "widest-line": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-2.0.0.tgz", + "integrity": "sha1-AUKk6KJD+IgsAjOqDgKBqnYVInM=", + "requires": { + "string-width": "2.1.1" + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true + }, + "write-file-atomic": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-2.3.0.tgz", + "integrity": "sha512-xuPeK4OdjWqtfi59ylvVL0Yn35SF3zgcAcv7rBPFHVaEapaDr4GdGgm3j7ckTwH9wHL7fGmgfAnb0+THrHb8tA==", + "requires": { + "graceful-fs": "4.1.11", + "imurmurhash": "0.1.4", + "signal-exit": "3.0.2" + } }, "xdg-basedir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz", - "integrity": "sha1-FP+PY6T9vLBdW27qIrNvMDO58E4=", - "requires": { - "user-home": "1.1.1" - } + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-3.0.0.tgz", + "integrity": "sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ=" }, "xmldom": { "version": "0.1.27", @@ -3130,16 +3401,16 @@ "integrity": "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ==" }, "xqlint": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/xqlint/-/xqlint-0.4.0.tgz", - "integrity": "sha1-W3METc+8VkFUN+OiQZssymUiuo8=", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/xqlint/-/xqlint-0.4.1.tgz", + "integrity": "sha1-2Tvnrui6JGmCyDobmZlscjQEW/k=", "requires": { "colors": "0.6.2", "commander": "2.3.0", "final-fs": "1.6.1", "lodash": "3.10.1", "q": "1.0.1", - "update-notifier": "0.2.2" + "update-notifier": "2.5.0" }, "dependencies": { "commander": { @@ -3155,6 +3426,11 @@ "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", "dev": true }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=" + }, "yauzl": { "version": "2.9.1", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.9.1.tgz", diff --git a/package.json b/package.json index 26187d8..3f4160f 100644 --- a/package.json +++ b/package.json @@ -222,6 +222,6 @@ "dependencies": { "xmldom": "^0.1.27", "xpath": "0.0.27", - "xqlint": "^0.4.0" + "xqlint": "^0.4.1" } } From a7c60b1932e48f298fa82a5dee75143261085bcc Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 3 May 2018 22:53:05 -0400 Subject: [PATCH 53/57] Add Icon Credits --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 99ea817..f5faf90 100644 --- a/README.md +++ b/README.md @@ -31,3 +31,8 @@ Detailed release notes are available [here](https://github.com/DotJoshJohnson/vs ## Issues Run into a bug? Report it [here](https://github.com/DotJoshJohnson/vscode-xml/issues). + +## Icon Credits +Icons used in the XML Tree View are used under the Creative Commons 3.0 BY license. +* "Code" icon by Dave Gandy from www.flaticon.com +* "At" icon by FreePik from www.flaticon.com From b6261c0d02298469da0db057792330ac0175d751 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 3 May 2018 22:55:10 -0400 Subject: [PATCH 54/57] v2.0.0-preview.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 3f4160f..ebe2446 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "xml", "displayName": "XML Tools", "description": "XML Formatting, XQuery, and XPath Tools for Visual Studio Code", - "version": "2.0.0-preview.2", + "version": "2.0.0-preview.3", "preview": true, "publisher": "DotJoshJohnson", "author": { From d77e74589724dfc10b35d8d7637af2092242ab65 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 24 May 2018 23:22:38 -0400 Subject: [PATCH 55/57] Perform Initial Tree Refresh --- src/tree-view/xml-tree-data-provider.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index 1adf469..cf4305f 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -22,6 +22,8 @@ export class XmlTreeDataProvider implements TreeDataProvider { workspace.onDidChangeTextDocument(() => { this._refreshTree(); }); + + this._refreshTree(); } onDidChangeTreeData = this._onDidChangeTreeData.event; From f6456579bdb0d16827975f1009e08ec829a72893 Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Thu, 24 May 2018 23:43:40 -0400 Subject: [PATCH 56/57] Fix Cursor Sync Regression There is a weird quirk with the DOMParser constructor. If we pass in any options, we need to ensure the locator is defined. --- src/tree-view/xml-tree-data-provider.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tree-view/xml-tree-data-provider.ts b/src/tree-view/xml-tree-data-provider.ts index cf4305f..82d25ae 100644 --- a/src/tree-view/xml-tree-data-provider.ts +++ b/src/tree-view/xml-tree-data-provider.ts @@ -218,7 +218,8 @@ export class XmlTreeDataProvider implements TreeDataProvider { this._xmlDocument = new DOMParser({ errorHandler: () => { throw new Error("Invalid Document"); - } + }, + locator: {} }).parseFromString(xml, "text/xml"); } From 8d5f9b605560460367a7fec8cf131d98a9e49f1d Mon Sep 17 00:00:00 2001 From: Josh Johnson Date: Fri, 25 May 2018 00:16:07 -0400 Subject: [PATCH 57/57] Add New Formatter Notice --- src/formatting/xml-formatter.ts | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/formatting/xml-formatter.ts b/src/formatting/xml-formatter.ts index ddfa361..01fb9ae 100644 --- a/src/formatting/xml-formatter.ts +++ b/src/formatting/xml-formatter.ts @@ -1,6 +1,6 @@ -import { workspace } from "vscode"; +import { window, workspace } from "vscode"; -import { Configuration } from "../common"; +import { Configuration, ExtensionState } from "../common"; import * as constants from "../constants"; import { ClassicXmlFormatter } from "./formatters/classic-xml-formatter"; import { V2XmlFormatter } from "./formatters/v2-xml-formatter"; @@ -29,6 +29,17 @@ export class XmlFormatterFactory { default: xmlFormatterImplementation = new V2XmlFormatter(); break; } + // warn users about the new formatter + const formatterWarningKey = "xmlTools.v2FormatterWarning.shown"; + + if (!ExtensionState.global.get(formatterWarningKey) && xmlFormatterImplementation instanceof V2XmlFormatter) { + // tslint:disable-next-line:max-line-length + window.showInformationMessage("Heads up! We've rewritten the XML formatter. If you liked the old one better, it's still there. Just set the 'xmlTools.xmlFormatterImplementation' setting to 'classic'.") + .then(() => { + ExtensionState.global.update(formatterWarningKey, true); + }); + } + return (XmlFormatterFactory._xmlFormatter = xmlFormatterImplementation); } }