Skip to content

Commit 1c75f43

Browse files
robintownrobintown
committed
Organize imports
1 parent d5f1e0c commit 1c75f43

34 files changed

+147
-147
lines changed

‎src/bot/bot.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ import {
88
Interaction,
99
} from 'discord.js';
1010
import _ from 'lodash';
11+
import { toEnglish } from '../english/tree';
12+
import { parse } from '../modes/parse';
13+
import { pngGlossSentence } from '../modes/png-gloss';
1114
import { dictionary } from '../morphology/dictionary';
1215
import { ToaduaEntry, toadua } from '../morphology/toadua';
1316
import { drawTreeToCanvas } from '../tree/draw';
14-
import { parse } from '../modes/parse';
15-
import { pngGlossSentence } from '../modes/png-gloss';
16-
import { toEnglish } from '../english/tree';
1717
import { denotationRenderText } from '../tree/place';
1818

1919
const toaduaEntries = [...Object.values(toadua())];

‎src/bot/main.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { Events, REST, Routes } from 'discord.js';
22
import { Client, GatewayIntentBits } from 'discord.js';
3-
import { commands } from './commands';
43
import { KunaBot } from './bot';
4+
import { commands } from './commands';
55

66
const TOKEN = process.env.KUNA_TOKEN!;
77
const rest = new REST({ version: '10' }).setToken(TOKEN);

‎src/cli.ts

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
import { toDocument } from './modes/latex';
21
import * as fs from 'fs';
3-
import { Glosser } from './morphology/gloss';
4-
import yargs from 'yargs';
5-
import { pngGlossSentence } from './modes/png-gloss';
6-
import { Tree } from './tree';
7-
import { recover } from './syntax/recover';
8-
import { trimTree } from './tree/trim';
9-
import { drawTreeToCanvas } from './tree/draw';
10-
import { parse } from './modes/parse';
11-
import { textual_tree_from_json } from './modes/textual-tree';
122
import KDL from 'kdljs';
3+
import yargs from 'yargs';
4+
import { toEnglish } from './english/tree';
135
import { formatTreeAsKdl } from './modes/kdl';
6+
import { toDocument } from './modes/latex';
7+
import { parse } from './modes/parse';
8+
import { pngGlossSentence } from './modes/png-gloss';
149
import { testSentences } from './modes/test-sentences';
15-
import { denote } from './semantics/denote';
10+
import { textual_tree_from_json } from './modes/textual-tree';
11+
import { Glosser } from './morphology/gloss';
1612
import { ToaqTokenizer } from './morphology/tokenize';
17-
import { toEnglish } from './english/tree';
18-
import { denotationRenderText } from './tree/place';
13+
import { denote } from './semantics/denote';
1914
import { DTree } from './semantics/model';
2015
import {
21-
toPlainText,
22-
toLatex,
23-
toJson,
2416
jsonStringifyCompact,
17+
toJson,
18+
toLatex,
19+
toPlainText,
2520
} from './semantics/render';
21+
import { recover } from './syntax/recover';
22+
import { Tree } from './tree';
23+
import { drawTreeToCanvas } from './tree/draw';
24+
import { denotationRenderText } from './tree/place';
25+
import { trimTree } from './tree/trim';
2626

2727
function getTrees(argv: {
2828
sentence: string | undefined;

‎src/english/clause-translator.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { Impossible, Unimplemented } from '../core/error';
22
import { clean } from '../morphology/tokenize';
33
import { Leaf, Tree, assertBranch } from '../tree';
4+
import { leafText } from '../tree/functions';
45
import {
56
VerbForm,
67
conjugate,
@@ -11,7 +12,6 @@ import {
1112
realizeTense,
1213
} from './conjugation';
1314
import { serialToEnglish, treeToEnglish } from './tree';
14-
import { leafText } from '../tree/functions';
1515

1616
// @ts-ignore
1717
import { Tagger } from 'pos';

‎src/english/english.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { test, expect } from 'vitest';
1+
import { expect, test } from 'vitest';
22
import { toEnglish } from './tree';
33

44
test('it translates Toaq to English', () => {

‎src/english/tree.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { Impossible, Unimplemented } from '../core/error';
22
import { parse } from '../modes/parse';
33
import { bare, clean } from '../morphology/tokenize';
44
import { Branch, Leaf, Tree, assertBranch, isQuestion } from '../tree';
5+
import { leafText } from '../tree/functions';
56
import { ClauseTranslator, Constituent } from './clause-translator';
67
import { VerbForm } from './conjugation';
78
import { leafTextToEnglish, leafToEnglish } from './leaf';
8-
import { leafText } from '../tree/functions';
99

1010
/**
1111
* Translate one verb (part of a *Serial) to English.

‎src/modes/boxes.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
import { Impossible, Ungrammatical, Unimplemented } from '../core/error';
12
import { inTone } from '../morphology/tokenize';
3+
import { Tone } from '../morphology/tone';
24
import {
35
Tree,
46
assertBranch,
@@ -7,8 +9,6 @@ import {
79
treeChildren,
810
treeText,
911
} from '../tree';
10-
import { Tone } from '../morphology/tone';
11-
import { Impossible, Ungrammatical, Unimplemented } from '../core/error';
1212

1313
export interface PostField {
1414
earlyAdjuncts: Tree[];

‎src/modes/png-gloss.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { loadImage, createCanvas, registerFont } from 'canvas';
1+
import { createCanvas, loadImage, registerFont } from 'canvas';
22
import { Glosser } from '../morphology/gloss';
33

44
export function pngGlossSentence(

‎src/morphology/frame.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { test, expect } from 'vitest';
1+
import { expect, test } from 'vitest';
22
import { guessFrameFromDefinition } from './frame';
33

44
test('it makes frames from Toadua definitions', () => {

‎src/morphology/gloss.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { test, expect } from 'vitest';
1+
import { expect, test } from 'vitest';
22
import { Glosser } from './gloss';
33

44
test('it glosses Toaq words', () => {

‎src/morphology/gloss.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1+
import toaduaGlossesJson from '../../data/toadua/toadua.json';
12
import { Entry, dictionary } from './dictionary';
23
import { bare, clean, splitPrefixes, tone } from './tokenize';
34
import { Tone } from './tone';
4-
import toaduaGlossesJson from '../../data/toadua/toadua.json';
55

66
interface Gloss {
77
toaq: string;

‎src/morphology/tokenize.test.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
import { test, expect } from 'vitest';
1+
import { expect, test } from 'vitest';
22
import {
3-
clean,
3+
ToaqTokenizer,
44
bare,
55
baseForm,
6+
clean,
67
inTone,
7-
tone,
88
splitIntoRaku,
99
splitPrefixes,
10-
ToaqTokenizer,
10+
tone,
1111
} from './tokenize';
1212
import { Tone } from './tone';
1313

‎src/morphology/tokenize.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { dictionary, underscoredWordTypes } from './dictionary';
21
import { Impossible, Ungrammatical } from '../core/error';
2+
import { dictionary, underscoredWordTypes } from './dictionary';
33
import { Tone } from './tone';
44

55
/**

‎src/scripts/build-data.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as fs from 'fs';
2-
import { guessFrameFromDefinition } from '../morphology/frame';
32
import https from 'https';
3+
import { guessFrameFromDefinition } from '../morphology/frame';
44

55
async function post(
66
hostname: string,

‎src/scripts/grammar-preprocessor.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { test, expect } from 'vitest';
1+
import { expect, test } from 'vitest';
22
import { preprocess } from './grammar-preprocessor';
33

44
test('it expands generics', () => {

‎src/semantics/compose.ts

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ import { Impossible, Unimplemented } from '../core/error';
22
import { some } from '../core/misc';
33
import { Branch, StrictTree, effectiveLabel } from '../tree';
44
import {
5-
and,
6-
app,
5+
Binding,
6+
Bindings,
77
DTree,
88
Expr,
99
ExprType,
10-
Bindings,
10+
and,
11+
app,
12+
subtype,
1113
v,
1214
λ,
13-
subtype,
14-
Binding,
1515
} from './model';
1616
import {
1717
bindTimeIntervals,

‎src/semantics/data.ts

+37-37
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,65 @@
11
import { SubjectType } from '../morphology/dictionary';
22
import { CovertValue, Label } from '../tree';
33
import {
4+
assert,
5+
AnimacyClass,
6+
Bindings,
7+
Expr,
8+
ExprType,
9+
abstract,
410
after,
511
afterNear,
612
agent,
13+
alternative,
14+
ama,
715
and,
16+
animate,
817
app,
918
before,
1019
beforeNear,
20+
coevent,
21+
content,
1122
equals,
1223
every,
24+
everyCuml,
25+
everySing,
1326
expectedEnd,
1427
expectedStart,
15-
Expr,
16-
ExprType,
28+
gen,
29+
ime,
30+
implies,
31+
inanimate,
32+
indeed,
1733
inertiaWorlds,
1834
ji,
35+
le,
36+
nhana,
37+
nhao,
38+
noBindings,
39+
not,
40+
or,
41+
perform,
42+
permit,
1943
presuppose,
44+
promise,
2045
realWorld,
21-
Bindings,
46+
roi,
47+
she,
2248
some,
2349
speechTime,
2450
subinterval,
51+
subject,
52+
suna,
53+
suo,
54+
suq,
2555
temporalTrace,
56+
topic as topicWorld,
57+
umo,
2658
v,
2759
verb,
28-
λ,
29-
animate,
30-
inanimate,
31-
abstract,
32-
AnimacyClass,
33-
not,
34-
everySing,
35-
everyCuml,
36-
gen,
37-
indeed,
38-
noBindings,
39-
suq,
40-
nhao,
41-
suna,
42-
nhana,
43-
umo,
44-
ime,
45-
suo,
46-
ama,
47-
coevent,
48-
subject,
49-
or,
50-
she,
51-
alternative,
52-
roi,
53-
assert,
54-
perform,
55-
wish,
56-
promise,
57-
permit,
5860
warn,
59-
content,
60-
topic as topicWorld,
61-
le,
62-
implies,
61+
wish,
62+
λ,
6363
} from './model';
6464
import { lift, reduce } from './operations';
6565

‎src/semantics/denote.test.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { test, expect } from 'vitest';
1+
import { expect, test } from 'vitest';
2+
import { Impossible } from '../core/error';
23
import { parse } from '../modes/parse';
34
import { recover } from '../syntax/recover';
45
import { denote } from './denote';
5-
import { toPlainText } from './render';
6-
import { Impossible } from '../core/error';
76
import { freeVariableUsages } from './operations';
7+
import { toPlainText } from './render';
88

99
function d(sentence: string): string {
1010
try {

0 commit comments

Comments
 (0)