Skip to content

Commit 2a615e6

Browse files
committed
Update build and add missing definitions
1 parent 89c2c6a commit 2a615e6

File tree

7 files changed

+29
-18
lines changed

7 files changed

+29
-18
lines changed

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ This project contains experimental version of parser ftl to ast tree
5959
- `#stop`
6060
- `#t`
6161
- `#visit`
62+
- `#noparse`, `#noParse`

index.js

+2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

index.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "freemarker",
2+
"name": "freemarker-parser",
33
"version": "1.0.0",
44
"description": "Freemarker Parser is a javascript implementation of the Freemarker",
55
"scripts": {
@@ -23,6 +23,7 @@
2323
},
2424
"keywords": [
2525
"freemarker",
26+
"parser",
2627
"js",
2728
"ast",
2829
"ftl"

src/Names.ts

+2
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,6 @@ export const directives : IDirectivesTypes = {
9090
break: NodeNames.Break,
9191
// t: 't',
9292
// visit: 'visit',
93+
noparse: NodeNames.Text,
94+
noParse: NodeNames.Text,
9395
}

src/Tokenizer.ts

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ export class Tokenizer {
167167
while (this.cursorPos <= this.template.length) {
168168
const ch = this.charCodeAt(this.cursorPos)
169169
const char = this.charAt(this.cursorPos)
170+
// TODO: fix me "${"${""}"}"
170171
if (char === '"') {
171172
inString = !inString
172173
}

typings/line-column.d.ts

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,24 @@
1-
interface LineColumnType {
2-
line : number
3-
col : number
4-
}
5-
interface LineColumnOptions {
6-
origin : number
7-
}
8-
9-
declare class line_column {
10-
constructor(str: string, options: LineColumnOptions);
1+
declare module 'line-column' {
2+
export interface ILineColumnType {
3+
line : number
4+
col : number
5+
}
116

12-
fromIndex(index: number): LineColumnType | null;
13-
toIndex(line: number, column: number): number | -1;
14-
}
7+
export interface ILineColumnOptions {
8+
origin? : number
9+
}
1510

16-
declare function lineColumn(name: string): line_column;
11+
export interface ItoIndexObject {
12+
line : number
13+
col? : number
14+
column? : number
15+
}
1716

18-
declare module 'line-column' {
19-
export default lineColumn
17+
export default interface ILineColumnFinder {
18+
(str : string, options? : ILineColumnOptions | number) : ILineColumnFinder
19+
new (str : string, options? : ILineColumnOptions | number)
20+
fromIndex (index : number) : ILineColumnType | null
21+
toIndex (line : number, column : number) : number | -1
22+
toIndex (options : number[] | ItoIndexObject) : number | -1
23+
}
2024
}

0 commit comments

Comments
 (0)