initial commit

.eslintrc.js

@@ -32,5 +32,12 @@ module.exports = {
         "prettier/prettier": ["error"],
         "security/detect-non-literal-fs-filename": "off",
         "security/detect-object-injection": "off",
+        "sort-imports": [
+            "error",
+            {
+                allowSeparatedGroups: true,
+                ignoreCase: true,
+            },
+        ],
     },
 };

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
     "recommendations": [
-        "esbenp.prettier-vscode"
+        "dbaeumer.vscode-eslint",
+        "esbenp.prettier-vscode",
     ],
     "unwantedRecommendations": []
 }

src/example.ts

@@ -1,8 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
-/* tslint:disable:no-console */
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { FormatSettings, IndentationLiteral, NewlineLiteral, TFormatError, tryFormat } from ".";
 
 const text: string = `1 as number`;
@@ -13,6 +13,7 @@ const settings: FormatSettings = {
 };
 
 const triedFormat: PQP.Result<string, TFormatError> = tryFormat(settings, text);
+/* tslint:disable:no-console */
 if (PQP.ResultUtils.isOk(triedFormat)) {
     console.log("Your input was formatted as the following:");
     console.log(triedFormat.value);

src/powerquery-formatter/format.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import {
     CommentCollectionMap,
     IsMultilineMap,
@@ -9,7 +10,6 @@ import {
     tryTraverseComment,
     tryTraverseSerializeParameter,
 } from "./passes";
-import { tryTraverseIsMultiline } from "./passes/isMultiline/isMultiline";
 import {
     IndentationLiteral,
     NewlineLiteral,
@@ -17,6 +17,7 @@ import {
     SerializeSettings,
     trySerialize,
 } from "./serialize";
+import { tryTraverseIsMultiline } from "./passes/isMultiline/isMultiline";
 
 export type TriedFormat = PQP.Result<string, TFormatError>;
 

src/powerquery-formatter/passes/comment.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { CommentCollection, CommentCollectionMap, CommentState } from "./commonTypes";
 
 // TODO pass in leafIds instead for a big speed boost.

src/powerquery-formatter/passes/isMultiline/common.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { IsMultilineMap } from "../commonTypes";
 
 export function expectGetIsMultiline(isMultilineMap: IsMultilineMap, node: PQP.Language.Ast.TNode): boolean {

src/powerquery-formatter/passes/isMultiline/isMultiline.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { FormatTraceConstant } from "../../trace";
+
 import { CommentCollectionMap, IsMultilineMap } from "../commonTypes";
+import { FormatTraceConstant } from "../../trace";
 import { tryTraverseIsMultilineFirstPass } from "./isMultilineFirstPass";
 import { tryTraverseIsMultilineSecondPass } from "./isMultilineSecondPass";
 

src/powerquery-formatter/passes/isMultiline/isMultilineFirstPass.ts

@@ -2,7 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { FormatTraceConstant } from "../../trace";
+
 import {
     CommentCollection,
     CommentCollectionMap,
@@ -11,6 +11,7 @@ import {
     LinearLengthMap,
 } from "../commonTypes";
 import { expectGetIsMultiline, setIsMultiline } from "./common";
+import { FormatTraceConstant } from "../../trace";
 import { getLinearLength } from "./linearLength";
 
 export function tryTraverseIsMultilineFirstPass(

src/powerquery-formatter/passes/isMultiline/isMultilineSecondPass.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { FormatTraceConstant } from "../../trace";
-import { IsMultilineMap, IsMultilineSecondPassState } from "../commonTypes";
+
 import { expectGetIsMultiline, setIsMultiline } from "./common";
+import { IsMultilineMap, IsMultilineSecondPassState } from "../commonTypes";
+import { FormatTraceConstant } from "../../trace";
 
 export function tryTraverseIsMultilineSecondPass(
     locale: string,

src/powerquery-formatter/passes/isMultiline/linearLength.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { FormatTraceConstant } from "../../trace";
+
 import { LinearLengthMap, LinearLengthState } from "../commonTypes";
+import { FormatTraceConstant } from "../../trace";
 
 // Lazy evaluation of a potentially large PQP.Language.AST.
 // Returns the length of text if the node was formatted on a single line.

src/powerquery-formatter/passes/visitNode/visitArrayWrapper.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { IndentationChange, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
-import { expectGetIsMultiline } from "../isMultiline/common";
 import { isSectionMemeberSimilarScope, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { expectGetIsMultiline } from "../isMultiline/common";
 
 export function visitArrayWrapper(state: SerializeParameterState, node: PQP.Language.Ast.TArrayWrapper): void {
     const parent: PQP.Language.Ast.TNode = PQP.Parser.NodeIdMapUtils.assertUnboxParentAst(

src/powerquery-formatter/passes/visitNode/visitComments.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import {
     CommentCollection,
     SerializeCommentParameter,

src/powerquery-formatter/passes/visitNode/visitErrorHandlingExpression.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 export function visitErrorHandlingExpression(
     state: SerializeParameterState,

src/powerquery-formatter/passes/visitNode/visitErrorRaisingExpression.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 // TPairedConstant override
 export function visitErrorRaisingExpression(

src/powerquery-formatter/passes/visitNode/visitFieldSpecification.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { maybePropagateWriteKind, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { maybePropagateWriteKind, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 // TPairedConstant override
 export function visitFieldSpecification(

src/powerquery-formatter/passes/visitNode/visitFieldSpecificationList.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
 import { setWorkspace } from "./visitNodeUtils";

src/powerquery-formatter/passes/visitNode/visitFieldTypeSpecification.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
+
 import { getWorkspace, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 
 export function visitFieldTypeSpecification(
     state: SerializeParameterState,

src/powerquery-formatter/passes/visitNode/visitFunctionExpression.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 export function visitFunctionExpression(
     state: SerializeParameterState,

src/powerquery-formatter/passes/visitNode/visitFunctionType.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
+
 import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 
 export function visitFunctionType(state: SerializeParameterState, node: PQP.Language.Ast.FunctionType): void {
     propagateWriteKind(state, node, node.functionConstant);

src/powerquery-formatter/passes/visitNode/visitIdentifierExpression.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { DefaultSerializeParameter, SerializeParameterState } from "../commonTypes";
 import { maybePropagateWriteKind, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 

src/powerquery-formatter/passes/visitNode/visitIfExpression.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 export function visitIfExpression(state: SerializeParameterState, node: PQP.Language.Ast.IfExpression): void {
     propagateWriteKind(state, node, node.ifConstant);

src/powerquery-formatter/passes/visitNode/visitItemAccessExpression.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { IsMultilineMap, SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
 import { setWorkspace } from "./visitNodeUtils";

src/powerquery-formatter/passes/visitNode/visitLeaf.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { getWorkspace, maybeSetIndentationChange } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { visitComments } from "./visitComments";
-import { getWorkspace, maybeSetIndentationChange } from "./visitNodeUtils";
 
 export function visitLeaf(
     state: SerializeParameterState,

src/powerquery-formatter/passes/visitNode/visitLetExpression.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
+
 import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 
 export function visitLetExpression(state: SerializeParameterState, node: PQP.Language.Ast.LetExpression): void {
     propagateWriteKind(state, node, node.letConstant);

src/powerquery-formatter/passes/visitNode/visitListType.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
 import { setWorkspace } from "./visitNodeUtils";

src/powerquery-formatter/passes/visitNode/visitMetadataExpression.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 export function visitMetadataExpression(
     state: SerializeParameterState,

src/powerquery-formatter/passes/visitNode/visitNode.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { SerializeParameter, SerializeParameterState } from "../commonTypes";
-import { getWorkspace, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
+import { getWorkspace, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { SerializeParameter, SerializeParameterState } from "../commonTypes";
+import { FormatTraceConstant } from "../../trace";
 import { visitArrayWrapper } from "./visitArrayWrapper";
 import { visitErrorHandlingExpression } from "./visitErrorHandlingExpression";
 import { visitErrorRaisingExpression } from "./visitErrorRaisingExpression";
@@ -33,7 +34,6 @@ import { visitTParameter } from "./visitTParameter";
 import { visitTWrapped } from "./visitTWrapped";
 import { visitTypePrimaryType } from "./visitTypePrimaryType";
 import { visitUnaryExpression } from "./visitUnaryExpression";
-import { FormatTraceConstant } from "../../trace";
 
 export function visitNode(state: SerializeParameterState, node: PQP.Language.Ast.TNode): void {
     const trace: PQP.Trace.Trace = state.traceManager.entry(FormatTraceConstant.SerializeParameter, visitNode.name, {

src/powerquery-formatter/passes/visitNode/visitNodeUtils.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import {
     DefaultSerializeParameter,
     IndentationChange,

src/powerquery-formatter/passes/visitNode/visitParenthesizedExpression.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
 import { setWorkspace } from "./visitNodeUtils";

src/powerquery-formatter/passes/visitNode/visitRangeExpression.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
+
 import { getWorkspace, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 
 export function visitRangeExpression(state: SerializeParameterState, node: PQP.Language.Ast.RangeExpression): void {
     const workspace: SerializeParameter = getWorkspace(state, node);

src/powerquery-formatter/passes/visitNode/visitSection.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { IsMultilineMap, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
 import { setWorkspace } from "./visitNodeUtils";

src/powerquery-formatter/passes/visitNode/visitSectionMember.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { IsMultilineMap, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
-import { expectGetIsMultiline } from "../isMultiline/common";
 import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { expectGetIsMultiline } from "../isMultiline/common";
 
 export function visitSectionMember(state: SerializeParameterState, node: PQP.Language.Ast.SectionMember): void {
     const isMultilineMap: IsMultilineMap = state.isMultilineMap;

src/powerquery-formatter/passes/visitNode/visitTBinOpExpression.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 export function visitTBinOpExpression(state: SerializeParameterState, node: PQP.Language.Ast.TBinOpExpression): void {
     propagateWriteKind(state, node, node.left);

src/powerquery-formatter/passes/visitNode/visitTCsv.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
+
 import { getWorkspace, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 
 export function visitTCsv(state: SerializeParameterState, node: PQP.Language.Ast.TCsv): void {
     const workspace: SerializeParameter = getWorkspace(state, node);

src/powerquery-formatter/passes/visitNode/visitTKeyValuePair.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { IsMultilineMap, SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
-import { expectGetIsMultiline } from "../isMultiline/common";
 import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { expectGetIsMultiline } from "../isMultiline/common";
 
 export function visitTKeyValuePair(state: SerializeParameterState, node: PQP.Language.Ast.TKeyValuePair): void {
     const isMultilineMap: IsMultilineMap = state.isMultilineMap;

src/powerquery-formatter/passes/visitNode/visitTPairedConstant.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 export function visitTPairedConstant(state: SerializeParameterState, node: PQP.Language.Ast.TPairedConstant): void {
     propagateWriteKind(state, node, node.constant);

src/powerquery-formatter/passes/visitNode/visitTParameter.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { setWorkspace } from "./visitNodeUtils";
 

src/powerquery-formatter/passes/visitNode/visitTWrapped.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { getWorkspace, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { getWorkspace, propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 export function visitTWrapped(state: SerializeParameterState, node: PQP.Language.Ast.TWrapped): void {
     const isMultiline: boolean = expectGetIsMultiline(state.isMultilineMap, node);

src/powerquery-formatter/passes/visitNode/visitTableType.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
 
 export function visitTableType(state: SerializeParameterState, node: PQP.Language.Ast.TableType): void {
     propagateWriteKind(state, node, node.tableConstant);

src/powerquery-formatter/passes/visitNode/visitTypePrimaryType.ts

@@ -2,9 +2,10 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
+import { propagateWriteKind, setWorkspace, skipPrimaryTypeIndentation } from "./visitNodeUtils";
 import { SerializeParameter, SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 import { expectGetIsMultiline } from "../isMultiline/common";
-import { propagateWriteKind, setWorkspace, skipPrimaryTypeIndentation } from "./visitNodeUtils";
 
 export function visitTypePrimaryType(state: SerializeParameterState, node: PQP.Language.Ast.TypePrimaryType): void {
     propagateWriteKind(state, node, node.constant);

src/powerquery-formatter/passes/visitNode/visitUnaryExpression.ts

@@ -2,8 +2,9 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
-import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
+
 import { propagateWriteKind, setWorkspace } from "./visitNodeUtils";
+import { SerializeParameterState, SerializeWriteKind } from "../commonTypes";
 
 export function visitUnaryExpression(state: SerializeParameterState, node: PQP.Language.Ast.UnaryExpression): void {
     propagateWriteKind(state, node, node.operators);

src/powerquery-formatter/serialize.ts

@@ -2,6 +2,7 @@
 // Licensed under the MIT license.
 
 import * as PQP from "@microsoft/powerquery-parser";
+
 import {
     CommentCollectionMap,
     IndentationChange,

src/test/common.ts

@@ -1,9 +1,9 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+import "mocha";
 import * as PQP from "@microsoft/powerquery-parser";
 import { expect } from "chai";
-import "mocha";
 
 import { FormatSettings, IndentationLiteral, NewlineLiteral, TriedFormat, tryFormat } from "..";