kopytko-formatter 1.1.11 → 1.1.13
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/src/config.d.ts +2 -2
- package/dist/src/config.d.ts.map +1 -1
- package/dist/src/cst-passes/casingPass.d.ts.map +1 -1
- package/dist/src/cst-passes/casingPass.js +15 -1
- package/dist/src/cst-passes/casingPass.js.map +1 -1
- package/dist/src/cst-passes/elseOnNewLine.d.ts +1 -1
- package/dist/src/cst-passes/elseOnNewLine.d.ts.map +1 -1
- package/dist/src/cst-passes/elseOnNewLine.js +1 -3
- package/dist/src/cst-passes/elseOnNewLine.js.map +1 -1
- package/dist/src/cst-passes/paramAlignment.d.ts +1 -1
- package/dist/src/cst-passes/paramAlignment.d.ts.map +1 -1
- package/dist/src/cst-passes/paramAlignment.js +1 -3
- package/dist/src/cst-passes/paramAlignment.js.map +1 -1
- package/package.json +2 -2
package/dist/src/config.d.ts
CHANGED
|
@@ -95,8 +95,8 @@ export interface FormattingConfig {
|
|
|
95
95
|
printStatement: 'warn' | 'remove' | 'preserve';
|
|
96
96
|
/** Move trailing comments. 'above' puts them on the line above. */
|
|
97
97
|
lineCommentPosition: 'above' | 'inline' | 'preserve';
|
|
98
|
-
/** Enforce observeFieldScoped over observeField. 'always-scoped' converts to scoped, '
|
|
99
|
-
observeFieldStyle: 'always-scoped' | '
|
|
98
|
+
/** Enforce observeFieldScoped over observeField. 'always-scoped' converts to scoped, 'preserve' leaves as-is. */
|
|
99
|
+
observeFieldStyle: 'always-scoped' | 'preserve';
|
|
100
100
|
/** m-prefix field access style. 'dot' enforces m.field, 'bracket' enforces m["field"], 'preserve' leaves as-is. */
|
|
101
101
|
mPrefixStyle: 'dot' | 'bracket' | 'preserve';
|
|
102
102
|
/** Align = signs in consecutive assignment lines. */
|
package/dist/src/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casingPass.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/casingPass.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,
|
|
1
|
+
{"version":3,"file":"casingPass.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/casingPass.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,EAAE,UAAU,EAAoE,MAAM,6BAA6B,CAAC;AAE3H,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAC5C,OAAO,EAEL,YAAY,EACb,MAAM,6BAA6B,CAAC;AAarC,wBAAgB,UAAU,CACxB,YAAY,EAAE,YAAY,EAC1B,aAAa,GAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAa,GAC7C,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CA8BlD"}
|
|
@@ -101,11 +101,25 @@ function processToken(token, afterDot, afterAs, parent, edits, config, userFunct
|
|
|
101
101
|
return;
|
|
102
102
|
}
|
|
103
103
|
// Identifiers
|
|
104
|
+
// TypeName tokens — produced by the parser for every token after 'as'.
|
|
105
|
+
// Always apply type casing regardless of surrounding context.
|
|
106
|
+
if ((0, kopytko_brightscript_parser_1.isTypeKeyword)(token.kind)) {
|
|
107
|
+
const typeOption = (0, kopytko_brightscript_parser_2.resolveKeywordCasing)('type', config);
|
|
108
|
+
if (typeOption && typeOption !== 'preserve') {
|
|
109
|
+
const newText = (0, kopytko_brightscript_parser_2.applyCasing)(token.text, typeOption);
|
|
110
|
+
if (newText !== token.text) {
|
|
111
|
+
edits.push({ pos: token.pos, end: token.end, newText });
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
return;
|
|
115
|
+
}
|
|
104
116
|
if (token.kind === kopytko_brightscript_parser_1.TokenKind.Identifier) {
|
|
105
117
|
// After dot — don't apply user function casing (it's a property access)
|
|
106
118
|
if (afterDot)
|
|
107
119
|
return;
|
|
108
|
-
//
|
|
120
|
+
// The afterAs path is now unreachable for normal type names (the parser
|
|
121
|
+
// produces TypeName tokens there), but is kept as a safety net for any
|
|
122
|
+
// edge case where the parser could not re-classify (e.g. EOF after 'as').
|
|
109
123
|
if (afterAs) {
|
|
110
124
|
const typeOption = (0, kopytko_brightscript_parser_2.resolveKeywordCasing)('type', config);
|
|
111
125
|
if (typeOption && typeOption !== 'preserve') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"casingPass.js","sourceRoot":"","sources":["../../../src/cst-passes/casingPass.ts"],"names":[],"mappings":";AAAA;;;;;;GAMG;;AAqBH,gCAiCC;AApDD,
|
|
1
|
+
{"version":3,"file":"casingPass.js","sourceRoot":"","sources":["../../../src/cst-passes/casingPass.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { SyntaxNode } from 'kopytko-brightscript-parser';
|
|
2
2
|
import { TextEdit } from './infrastructure';
|
|
3
|
-
export declare function elseOnNewLinePass(
|
|
3
|
+
export declare function elseOnNewLinePass(_keepOnNewLine: boolean): (root: SyntaxNode, source: string) => TextEdit[];
|
|
4
4
|
//# sourceMappingURL=elseOnNewLine.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elseOnNewLine.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/elseOnNewLine.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"elseOnNewLine.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/elseOnNewLine.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,wBAAgB,iBAAiB,CAAC,cAAc,EAAE,OAAO,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAE3G"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.elseOnNewLinePass = elseOnNewLinePass;
|
|
4
|
-
function elseOnNewLinePass(
|
|
5
|
-
if (keepOnNewLine)
|
|
6
|
-
return () => [];
|
|
4
|
+
function elseOnNewLinePass(_keepOnNewLine) {
|
|
7
5
|
return () => [];
|
|
8
6
|
}
|
|
9
7
|
//# sourceMappingURL=elseOnNewLine.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"elseOnNewLine.js","sourceRoot":"","sources":["../../../src/cst-passes/elseOnNewLine.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"elseOnNewLine.js","sourceRoot":"","sources":["../../../src/cst-passes/elseOnNewLine.ts"],"names":[],"mappings":";;AAKA,8CAEC;AAFD,SAAgB,iBAAiB,CAAC,cAAuB;IACvD,OAAO,GAAe,EAAE,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import type { SyntaxNode } from 'kopytko-brightscript-parser';
|
|
2
2
|
import { TextEdit } from './infrastructure';
|
|
3
|
-
export declare function paramAlignmentPass(
|
|
3
|
+
export declare function paramAlignmentPass(_style: string): (root: SyntaxNode, source: string) => TextEdit[];
|
|
4
4
|
//# sourceMappingURL=paramAlignment.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paramAlignment.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/paramAlignment.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"paramAlignment.d.ts","sourceRoot":"","sources":["../../../src/cst-passes/paramAlignment.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,CAAC,IAAI,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,EAAE,CAEnG"}
|
|
@@ -1,9 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.paramAlignmentPass = paramAlignmentPass;
|
|
4
|
-
function paramAlignmentPass(
|
|
5
|
-
if (style === 'preserve')
|
|
6
|
-
return () => [];
|
|
4
|
+
function paramAlignmentPass(_style) {
|
|
7
5
|
return () => [];
|
|
8
6
|
}
|
|
9
7
|
//# sourceMappingURL=paramAlignment.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paramAlignment.js","sourceRoot":"","sources":["../../../src/cst-passes/paramAlignment.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"paramAlignment.js","sourceRoot":"","sources":["../../../src/cst-passes/paramAlignment.ts"],"names":[],"mappings":";;AAKA,gDAEC;AAFD,SAAgB,kBAAkB,CAAC,MAAc;IAC/C,OAAO,GAAe,EAAE,CAAC,EAAE,CAAC;AAC9B,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "kopytko-formatter",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.13",
|
|
4
4
|
"description": "BrightScript formatter and code style checker for the Kopytko ecosystem. Use as a CLI tool or import as a library.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "bchelkowski",
|
|
@@ -43,7 +43,7 @@
|
|
|
43
43
|
"prepublishOnly": "npm run clean && npm run build"
|
|
44
44
|
},
|
|
45
45
|
"dependencies": {
|
|
46
|
-
"kopytko-brightscript-parser": "^1.
|
|
46
|
+
"kopytko-brightscript-parser": "^1.2.0"
|
|
47
47
|
},
|
|
48
48
|
"devDependencies": {
|
|
49
49
|
"@types/mocha": "^10.0.10",
|