editorconfig 0.15.1 → 0.15.2

package/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.15.2
+- Fix publish.
+
 ## 0.15.1
 - Update dependencies.
 

package/package.json

@@ -1,59 +1,59 @@
-{
-  "name": "editorconfig",
-  "version": "0.15.1",
-  "description": "EditorConfig File Locator and Interpreter for Node.js",
-  "keywords": [
-    "editorconfig",
-    "core"
-  ],
-  "main": "src/index.js",
-  "contributors": [
-    "Hong Xu (topbug.net)",
-    "Jed Mao (https://github.com/jedmao/)",
-    "Trey Hunner (http://treyhunner.com)"
-  ],
-  "directories": {
-    "bin": "./bin",
-    "lib": "./lib"
-  },
-  "scripts": {
-    "clean": "rimraf dist",
-    "prebuild": "npm run clean",
-    "build": "tsc",
-    "pretest": "npm run lint && npm run build && npm run copy && cmake .",
-    "test": "ctest .",
-    "pretest:ci": "npm run pretest",
-    "test:ci": "ctest -VV --output-on-failure .",
-    "lint": "npm run eclint && npm run tslint",
-    "eclint": "eclint check --indent_size ignore \"src/**\"",
-    "tslint": "tslint --project tsconfig.json --exclude package.json",
-    "copy": "cpy .npmignore LICENSE README.md CHANGELOG.md dist && cpy bin/* dist/bin && cpy src/lib/fnmatch*.* dist/src/lib",
-    "prepub": "npm run lint && npm run build && npm run copy",
-    "pub": "npm publish ./dist"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git://github.com/editorconfig/editorconfig-core-js.git"
-  },
-  "bugs": "https://github.com/editorconfig/editorconfig-core-js/issues",
-  "author": "EditorConfig Team",
-  "license": "MIT",
-  "dependencies": {
-    "@types/node": "^10.11.7",
-    "@types/semver": "^5.5.0",
-    "commander": "^2.19.0",
-    "lru-cache": "^4.1.3",
-    "semver": "^5.6.0",
-    "sigmund": "^1.0.1"
-  },
-  "devDependencies": {
-    "@types/mocha": "^5.2.5",
-    "cpy-cli": "^2.0.0",
-    "eclint": "^2.8.0",
-    "mocha": "^5.2.0",
-    "rimraf": "^2.6.2",
-    "should": "^13.2.3",
-    "tslint": "^5.11.0",
-    "typescript": "^3.1.3"
-  }
-}
+{
+    "name": "editorconfig",
+    "version": "0.15.2",
+    "description": "EditorConfig File Locator and Interpreter for Node.js",
+    "keywords": [
+        "editorconfig",
+        "core"
+    ],
+    "main": "src/index.js",
+    "contributors": [
+        "Hong Xu (topbug.net)",
+        "Jed Mao (https://github.com/jedmao/)",
+        "Trey Hunner (http://treyhunner.com)"
+    ],
+    "directories": {
+        "bin": "./bin",
+        "lib": "./lib"
+    },
+    "scripts": {
+        "clean": "rimraf dist",
+        "prebuild": "npm run clean",
+        "build": "tsc",
+        "pretest": "npm run lint && npm run build && npm run copy && cmake .",
+        "test": "ctest .",
+        "pretest:ci": "npm run pretest",
+        "test:ci": "ctest -VV --output-on-failure .",
+        "lint": "npm run eclint && npm run tslint",
+        "eclint": "eclint check --indent_size ignore \"src/**\"",
+        "tslint": "tslint --project tsconfig.json --exclude package.json",
+        "copy": "cpy .npmignore LICENSE README.md CHANGELOG.md dist && cpy bin/* dist/bin && cpy src/lib/fnmatch*.* dist/src/lib",
+        "prepub": "npm run lint && npm run build && npm run copy",
+        "pub": "npm publish ./dist"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/editorconfig/editorconfig-core-js.git"
+    },
+    "bugs": "https://github.com/editorconfig/editorconfig-core-js/issues",
+    "author": "EditorConfig Team",
+    "license": "MIT",
+    "dependencies": {
+        "@types/node": "^10.11.7",
+        "@types/semver": "^5.5.0",
+        "commander": "^2.19.0",
+        "lru-cache": "^4.1.3",
+        "semver": "^5.6.0",
+        "sigmund": "^1.0.1"
+    },
+    "devDependencies": {
+        "@types/mocha": "^5.2.5",
+        "cpy-cli": "^2.0.0",
+        "eclint": "^2.8.0",
+        "mocha": "^5.2.0",
+        "rimraf": "^2.6.2",
+        "should": "^13.2.3",
+        "tslint": "^5.11.0",
+        "typescript": "^3.1.3"
+    }
+}

package/.editorconfig

@@ -1,17 +0,0 @@
-; http://editorconfig.org
-
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-block_comment_start = /**
-block_comment = *
-block_comment_end = */
-
-[*.md]
-indent_size = 4

package/.gitattributes

@@ -1,2 +0,0 @@
-# Auto detect text files and perform LF normalization
-* text=lf

package/.gitmodules

@@ -1,4 +0,0 @@
-[submodule "tests"]
-	path = tests
-	url = git://github.com/editorconfig/editorconfig-core-test.git
-	ignore = untracked

package/.travis.yml

@@ -1,15 +0,0 @@
-sudo: false
-
-language: node_js
-
-node_js:
-  - "node"
-  - "8"
-
-script:
-  - npm run test:ci
-
-notifications:
-  email:
-    on_success: change
-    on_failure: always

package/CMakeLists.txt

@@ -1,16 +0,0 @@
-# This file is used for testing only
-
-# To perform the test, run `cmake .` at the root of the project tree followed
-# by `ctest .`
-
-cmake_minimum_required(VERSION 2.6)
-
-# Do not check any compiler
-project(editorconfig-core-js NONE)
-
-set(NODE node CACHE STRING "Node.js command")
-
-enable_testing()
-
-set(EDITORCONFIG_CMD ${NODE} ${PROJECT_SOURCE_DIR}/dist/bin/editorconfig)
-add_subdirectory(tests)

package/dist/package.json

@@ -1,59 +0,0 @@
-{
-    "name": "editorconfig",
-    "version": "0.15.1",
-    "description": "EditorConfig File Locator and Interpreter for Node.js",
-    "keywords": [
-        "editorconfig",
-        "core"
-    ],
-    "main": "src/index.js",
-    "contributors": [
-        "Hong Xu (topbug.net)",
-        "Jed Mao (https://github.com/jedmao/)",
-        "Trey Hunner (http://treyhunner.com)"
-    ],
-    "directories": {
-        "bin": "./bin",
-        "lib": "./lib"
-    },
-    "scripts": {
-        "clean": "rimraf dist",
-        "prebuild": "npm run clean",
-        "build": "tsc",
-        "pretest": "npm run lint && npm run build && npm run copy && cmake .",
-        "test": "ctest .",
-        "pretest:ci": "npm run pretest",
-        "test:ci": "ctest -VV --output-on-failure .",
-        "lint": "npm run eclint && npm run tslint",
-        "eclint": "eclint check --indent_size ignore \"src/**\"",
-        "tslint": "tslint --project tsconfig.json --exclude package.json",
-        "copy": "cpy .npmignore LICENSE README.md CHANGELOG.md dist && cpy bin/* dist/bin && cpy src/lib/fnmatch*.* dist/src/lib",
-        "prepub": "npm run lint && npm run build && npm run copy",
-        "pub": "npm publish ./dist"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/editorconfig/editorconfig-core-js.git"
-    },
-    "bugs": "https://github.com/editorconfig/editorconfig-core-js/issues",
-    "author": "EditorConfig Team",
-    "license": "MIT",
-    "dependencies": {
-        "@types/node": "^10.11.7",
-        "@types/semver": "^5.5.0",
-        "commander": "^2.19.0",
-        "lru-cache": "^4.1.3",
-        "semver": "^5.6.0",
-        "sigmund": "^1.0.1"
-    },
-    "devDependencies": {
-        "@types/mocha": "^5.2.5",
-        "cpy-cli": "^2.0.0",
-        "eclint": "^2.8.0",
-        "mocha": "^5.2.0",
-        "rimraf": "^2.6.2",
-        "should": "^13.2.3",
-        "tslint": "^5.11.0",
-        "typescript": "^3.1.3"
-    }
-}

package/src/cli.ts

@@ -1,47 +0,0 @@
-// tslint:disable:no-console
-import program from 'commander'
-
-import * as editorconfig from './'
-
-import pkg from '../package.json'
-
-export default function cli(args: string[]) {
-  program.version('EditorConfig Node.js Core Version ' + pkg.version)
-
-  program
-    .usage([
-        '[OPTIONS] FILEPATH1 [FILEPATH2 FILEPATH3 ...]',
-        program._version,
-        'FILEPATH can be a hyphen (-) if you want path(s) to be read from stdin.',
-      ].join('\n\n  '))
-    .option('-f <path>',     'Specify conf filename other than \'.editorconfig\'')
-    .option('-b <version>',  'Specify version (used by devs to test compatibility)')
-    .option('-v, --version', 'Display version information')
-    .parse(args)
-
-  // Throw away the native -V flag in lieu of the one we've manually specified
-  // to adhere to testing requirements
-  program.options.shift()
-
-  const files = program.args
-
-  if (!files.length) {
-    program.help()
-  }
-
-  files
-    .map((filePath) => editorconfig.parse(filePath, {
-      config: program.F,
-      version: program.B,
-    }))
-    .forEach((parsing, i, { length }) => {
-      parsing.then((parsed) => {
-        if (length > 1) {
-          console.log(`[${files[i]}]`)
-        }
-        Object.keys(parsed).forEach((key) => {
-          console.log(`${key}=${parsed[key]}`)
-        })
-      })
-    })
-}

package/src/index.ts

@@ -1,279 +0,0 @@
-import * as fs from 'fs'
-import * as path from 'path'
-import * as semver from 'semver'
-
-import minimatch from './lib/fnmatch'
-import { parseString, ParseStringResult } from './lib/ini'
-
-export { parseString }
-
-import pkg from '../package.json'
-
-export interface KnownProps {
-  end_of_line?: 'lf' | 'crlf' | 'unset'
-  indent_style?: 'tab' | 'space' | 'unset'
-  indent_size?: number | 'tab' | 'unset'
-  insert_final_newline?: true | false | 'unset'
-  tab_width?: number | 'unset'
-  trim_trailing_whitespace?: true | false | 'unset'
-  charset?: string | 'unset'
-}
-
-export interface ECFile {
-  name: string
-  contents: string | Buffer
-}
-
-export interface FileConfig {
-  name: string
-  contents: ParseStringResult
-}
-
-export interface ParseOptions {
-  config?: string
-  version?: string
-  root?: string
-}
-
-const knownProps = {
-  end_of_line: true,
-  indent_style: true,
-  indent_size: true,
-  insert_final_newline: true,
-  trim_trailing_whitespace: true,
-  charset: true,
-}
-
-function fnmatch(filepath: string, glob: string) {
-  const matchOptions = { matchBase: true, dot: true, noext: true }
-  glob = glob.replace(/\*\*/g, '{*,**/**/**}')
-  return minimatch(filepath, glob, matchOptions)
-}
-
-function getConfigFileNames(filepath: string, options: ParseOptions) {
-  const paths = []
-  do {
-    filepath = path.dirname(filepath)
-    paths.push(path.join(filepath, options.config as string))
-  } while (filepath !== options.root)
-  return paths
-}
-
-function processMatches(matches: KnownProps, version: string) {
-  // Set indent_size to 'tab' if indent_size is unspecified and
-  // indent_style is set to 'tab'.
-  if (
-    'indent_style' in matches
-    && matches.indent_style === 'tab'
-    && !('indent_size' in matches)
-    && semver.gte(version, '0.10.0')
-  ) {
-    matches.indent_size = 'tab'
-  }
-
-  // Set tab_width to indent_size if indent_size is specified and
-  // tab_width is unspecified
-  if (
-    'indent_size' in matches
-    && !('tab_width' in matches)
-    && matches.indent_size !== 'tab'
-  ) {
-    matches.tab_width = matches.indent_size
-  }
-
-  // Set indent_size to tab_width if indent_size is 'tab'
-  if (
-    'indent_size' in matches
-    && 'tab_width' in matches
-    && matches.indent_size === 'tab'
-  ) {
-    matches.indent_size = matches.tab_width
-  }
-
-  return matches
-}
-
-function processOptions(options: ParseOptions = {}, filepath: string) {
-  return {
-    config: options.config || '.editorconfig',
-    version: options.version || pkg.version,
-    root: path.resolve(options.root || path.parse(filepath).root),
-  }
-}
-
-function buildFullGlob(pathPrefix: string, glob: string) {
-  switch (glob.indexOf('/')) {
-    case -1:
-      glob = '**/' + glob
-      break
-    case 0:
-      glob = glob.substring(1)
-      break
-    default:
-      break
-  }
-  return path.join(pathPrefix, glob)
-}
-
-function extendProps(props: {} = {}, options: {} = {}) {
-  for (const key in options) {
-    if (options.hasOwnProperty(key)) {
-      const value = options[key]
-      const key2 = key.toLowerCase()
-      let value2 = value
-      if (knownProps[key2]) {
-        value2 = value.toLowerCase()
-      }
-      try {
-        value2 = JSON.parse(value)
-      } catch (e) {}
-      if (typeof value === 'undefined' || value === null) {
-        // null and undefined are values specific to JSON (no special meaning
-        // in editorconfig) & should just be returned as regular strings.
-        value2 = String(value)
-      }
-      props[key2] = value2
-    }
-  }
-  return props
-}
-
-function parseFromConfigs(
-  configs: FileConfig[],
-  filepath: string,
-  options: ParseOptions,
-) {
-  return processMatches(
-    configs
-      .reverse()
-      .reduce(
-        (matches: KnownProps, file) => {
-          const pathPrefix = path.dirname(file.name)
-          file.contents.forEach((section) => {
-            const glob = section[0]
-            const options2 = section[1]
-            if (!glob) {
-              return
-            }
-            const fullGlob = buildFullGlob(pathPrefix, glob)
-            if (!fnmatch(filepath, fullGlob)) {
-              return
-            }
-            matches = extendProps(matches, options2)
-          })
-          return matches
-        },
-        {},
-      ),
-    options.version as string,
-  )
-}
-
-function getConfigsForFiles(files: ECFile[]) {
-  const configs = []
-  for (const i in files) {
-    if (files.hasOwnProperty(i)) {
-      const file = files[i]
-      const contents = parseString(file.contents as string)
-      configs.push({
-        name: file.name,
-        contents,
-      })
-      if ((contents[0][1].root || '').toLowerCase() === 'true') {
-        break
-      }
-    }
-  }
-  return configs
-}
-
-async function readConfigFiles(filepaths: string[]) {
-  return Promise.all(
-    filepaths.map((name) => new Promise((resolve) => {
-      fs.readFile(name, 'utf8', (err, data) => {
-        resolve({
-          name,
-          contents: err ? '' : data,
-        })
-      })
-    })),
-  )
-}
-
-function readConfigFilesSync(filepaths: string[]) {
-  const files: ECFile[] = []
-  let file: string | number | Buffer
-  filepaths.forEach((filepath) => {
-    try {
-      file = fs.readFileSync(filepath, 'utf8')
-    } catch (e) {
-      file = ''
-    }
-    files.push({
-      name: filepath,
-      contents: file,
-    })
-  })
-  return files
-}
-
-function opts(filepath: string, options: ParseOptions = {}): [
-  string,
-  ParseOptions
-] {
-  const resolvedFilePath = path.resolve(filepath)
-  return [
-    resolvedFilePath,
-    processOptions(options, resolvedFilePath),
-  ]
-}
-
-export async function parseFromFiles(
-  filepath: string,
-  files: Promise<ECFile[]>,
-  options: ParseOptions = {},
-) {
-  const [resolvedFilePath, processedOptions] = opts(filepath, options)
-  return files.then(getConfigsForFiles)
-    .then((configs) => parseFromConfigs(
-      configs,
-      resolvedFilePath,
-      processedOptions,
-    ))
-}
-
-export function parseFromFilesSync(
-  filepath: string,
-  files: ECFile[],
-  options: ParseOptions = {},
-) {
-  const [resolvedFilePath, processedOptions] = opts(filepath, options)
-  return parseFromConfigs(
-    getConfigsForFiles(files),
-    resolvedFilePath,
-    processedOptions,
-  )
-}
-
-export async function parse(_filepath: string, _options: ParseOptions = {}) {
-  const [resolvedFilePath, processedOptions] = opts(_filepath, _options)
-  const filepaths = getConfigFileNames(resolvedFilePath, processedOptions)
-  return readConfigFiles(filepaths)
-    .then(getConfigsForFiles)
-    .then((configs) => parseFromConfigs(
-      configs,
-      resolvedFilePath,
-      processedOptions,
-    ))
-}
-
-export function parseSync(_filepath: string, _options: ParseOptions = {}) {
-  const [resolvedFilePath, processedOptions] = opts(_filepath, _options)
-  const filepaths = getConfigFileNames(resolvedFilePath, processedOptions)
-  const files = readConfigFilesSync(filepaths)
-  return parseFromConfigs(
-    getConfigsForFiles(files),
-    resolvedFilePath,
-    processedOptions,
-  )
-}

package/src/lib/ini.ts

@@ -1,66 +0,0 @@
-// Based on iniparser by shockie <https://npmjs.org/package/iniparser>
-
-import * as fs from 'fs'
-import { URL } from 'url'
-
-/**
- * define the possible values:
- * section: [section]
- * param: key=value
- * comment: ;this is a comment
- */
-const regex = {
-  section: /^\s*\[(([^#;]|\\#|\\;)+)\]\s*([#;].*)?$/,
-  param: /^\s*([\w\.\-\_]+)\s*[=:]\s*(.*?)\s*([#;].*)?$/,
-  comment: /^\s*[#;].*$/,
-}
-
-/**
- * Parses an .ini file
- * @param file The location of the .ini file
- */
-export async function parse(file: string | number | Buffer | URL) {
-  return new Promise<ParseStringResult>(
-    (resolve, reject) => {
-      fs.readFile(file, 'utf8', (err, data) => {
-        if (err) {
-          reject(err)
-          return
-        }
-        resolve(parseString(data))
-      })
-    },
-  )
-}
-
-export function parseSync(file: string | number | Buffer | URL) {
-  return parseString(fs.readFileSync(file, 'utf8'))
-}
-
-export type SectionName = string | null
-export interface SectionBody { [key: string]: string }
-export type ParseStringResult = Array<[SectionName, SectionBody]>
-
-export function parseString(data: string): ParseStringResult {
-  let sectionBody: SectionBody = {}
-  let sectionName: SectionName = null
-  const value: ParseStringResult = [[sectionName, sectionBody]]
-  const lines = data.split(/\r\n|\r|\n/)
-  lines.forEach((line) => {
-    let match: RegExpMatchArray | null
-    if (regex.comment.test(line)) {
-      return
-    }
-    if (regex.param.test(line)) {
-      match = line.match(regex.param)
-      sectionBody[(match as RegExpMatchArray)[1]] =
-        (match as RegExpMatchArray)[2]
-    } else if (regex.section.test(line)) {
-      match = line.match(regex.section)
-      sectionName = (match as RegExpMatchArray)[1]
-      sectionBody = {}
-      value.push([sectionName, sectionBody])
-    }
-  })
-  return value
-}

package/tests/.editorconfig

@@ -1,11 +0,0 @@
-[CMakeLists.txt]
-trim_trailing_whitespace = false
-indent_style = space
-indent_size = 4
-
-[*.in]
-trim_trailing_whitespace = false
-
-[*.md]
-indent_style = space
-indent_size = 4

package/tests/.git

@@ -1 +0,0 @@
-gitdir: ../.git/modules/tests