Start using eslint

This commit is contained in:
Greg Shuflin 2021-09-12 00:55:17 -07:00
parent 4de6e718ff
commit e8c53cda2f
5 changed files with 5207 additions and 4550 deletions

23
.eslintrc.js Normal file
View File

@ -0,0 +1,23 @@
module.exports = {
env: {
browser: true,
es2021: true,
},
extends: [
'plugin:react/recommended',
'xo',
],
parserOptions: {
ecmaFeatures: {
jsx: true,
},
ecmaVersion: 12,
sourceType: 'module',
},
plugins: [
'react',
],
rules: {
"arrow-parens": ["error", "always"]
},
};

View File

@ -13,6 +13,9 @@
"devDependencies": {
"@parcel/transformer-image": "2.0.0-rc.0",
"@parcel/transformer-sass": "2.0.0-rc.0",
"eslint": "^7.32.0",
"eslint-config-xo": "^0.38.0",
"eslint-plugin-react": "^7.25.1",
"parcel": "^2.0.0-rc.0"
},
"dependencies": {

View File

@ -1,70 +1,72 @@
import React, { Component } from "react";
import React, {Component} from 'react';
import './App.scss';
import { declineSaimiar } from './saimiar_morphology.js';
import {declineSaimiar} from './saimiar_morphology.js';
const backendUrl = "https://kucinakobackend.ichigo.everydayimshuflin.com";
const backendUrl = 'https://kucinakobackend.ichigo.everydayimshuflin.com';
function makeRequest(queryString, jsonHandler) {
const effectiveUrl = `${backendUrl}/${queryString}`
fetch(`${effectiveUrl}`)
.then((resp) => {
return resp.json()
})
.then((json) => {
jsonHandler(json);
});
const effectiveUrl = `${backendUrl}/${queryString}`;
fetch(`${effectiveUrl}`)
.then((resp) => resp.json())
.then((json) => {
jsonHandler(json);
});
}
function renderConlangName(name) {
if (name == "saimiar") {
return "Saimiar";
}
if (name == "elesu") {
return "Elésu";
}
if (name === 'saimiar') {
return 'Saimiar';
}
if (name === "juteyuji") {
return "Juteyuji";
}
if (name === "tukvaysi") {
return "Tukvaysi";
}
if (name === 'elesu') {
return 'Elésu';
}
if (name === 'juteyuji') {
return 'Juteyuji';
}
if (name === 'tukvaysi') {
return 'Tukvaysi';
}
}
function Entry(props) {
const conlang = props.conlang;
if (conlang === "saimiar") {
return <SaiEntry entry={ props.entry } />;
}
return <div>Unknown entry type for { conlang }</div>;
const {conlang} = props;
if (conlang === 'saimiar') {
return <SaiEntry entry={ props.entry } />;
}
return <div>Unknown entry type for { conlang }</div>;
}
function SaiEntry(props) {
const entry = props.entry;
const synCategory = entry.syn_category;
const isNominal = synCategory == 'nominal';
console.log(isNominal);
return (
<div className="searchResult" key={ entry.id }>
<b>{ entry.sai }</b> - { entry.eng }
<br />
<span className="synclass">
<i>{ entry.syn_category }</i>
{ entry.morph_type ? `\t\t${entry.morph_type}` : null }
<br/>
{ isNominal ? formatMorphology(entry) : null }
</span>
</div>
);
const {entry} = props;
const synCategory = entry.syn_category;
const isNominal = synCategory === 'nominal';
console.log(isNominal);
return (
<div className="searchResult" key={ entry.id }>
<b>{ entry.sai }</b> - { entry.eng }
<br />
<span className="synclass">
<i>{ entry.syn_category }</i>
{ entry.morph_type ? `\t\t${entry.morph_type}` : null }
<br/>
{ isNominal ? formatMorphology(entry) : null }
</span>
</div>
);
}
function formatMorphology(entry) {
const decl = declineSaimiar(entry);
if (!decl) {
return '';
}
return (<span style={ {fontSize: 'medium', color: '#6a3131'} } >
const decl = declineSaimiar(entry);
if (!decl) {
return '';
}
return (<span style={ {fontSize: 'medium', color: '#6a3131'} } >
Abs: <i>{decl.abs}</i>, Erg: <i>{decl.erg}</i>,
Adp: <i>{decl.adp}</i>,
All: <i>{decl.all}</i>,
@ -72,118 +74,115 @@ function formatMorphology(entry) {
Ell: <i>{decl.ell}</i>,
Inst: <i>{decl.inst}</i>,
Rel: <i>{decl.rel}</i>
</span>);
</span>);
}
class Results extends Component {
constructor(props) {
super(props);
this.content = this.content.bind(this);
}
constructor(props) {
super(props);
this.content = this.content.bind(this);
}
content() {
const conlang = this.props.conlang;
const num = this.props.searchResults.length;
const renderedName = renderConlangName(conlang);
const searchType = (this.props.direction === "toConlang") ? `English -> ${renderedName}` : `${renderedName} -> English`;
const header = (
<div className="searchResultHeader" key="header">
content() {
const {conlang} = this.props;
const num = this.props.searchResults.length;
const renderedName = renderConlangName(conlang);
const searchType = (this.props.direction === 'toConlang') ? `English -> ${renderedName}` : `${renderedName} -> English`;
const header = (
<div className="searchResultHeader" key="header">
Searched for <b>{ this.props.searchTerm }</b>, { searchType }, found { num } result(s)
</div>);
const entries = this.props.searchResults.map(
(entry, idx) => <Entry entry={ entry } key= { entry.id } conlang={ conlang } />
);
return [header].concat(entries);
}
</div>);
const entries = this.props.searchResults.map(
(entry, _idx) => <Entry entry={ entry } key= { entry.id } conlang={ conlang } />,
);
return [header].concat(entries);
}
render() {
const results = this.props.searchResults;
return(
<div className='results'>
{ results ? this.content() : "No search" }
</div>
);
}
render() {
const results = this.props.searchResults;
return (
<div className="results">
{ results ? this.content() : 'No search' }
</div>
);
}
}
class App extends Component {
constructor(props) {
super(props);
this.input = React.createRef();
this.handleLangChange = this.handleLangChange.bind(this);
constructor(props) {
super(props);
this.input = React.createRef();
this.handleLangChange = this.handleLangChange.bind(this);
this.searchEng = this.searchEng.bind(this);
this.searchSaimiar = this.searchSaimiar.bind(this);
this.searchEng = this.searchEng.bind(this);
this.searchSaimiar = this.searchSaimiar.bind(this);
this.state = {
searchResults: null,
conlang: "saimiar",
direction: null,
searchTerm: null
};
}
this.state = {
searchResults: null,
conlang: 'saimiar',
direction: null,
searchTerm: null,
};
}
searchSaimiar(evt) {
const searchTerm = this.input.current.value;
const request = `saimiar?sai=like.*${searchTerm}*`
if (searchTerm === "") {
this.setState({ searchResults: null, searchTerm: null, direction: null });
} else {
makeRequest(request, (json) => {
this.setState({ searchResults: json, searchTerm, direction: "toEnglish" });
});
}
}
searchSaimiar(_evt) {
const searchTerm = this.input.current.value;
const request = `saimiar?sai=like.*${searchTerm}*`;
if (searchTerm === '') {
this.setState({searchResults: null, searchTerm: null, direction: null});
} else {
makeRequest(request, (json) => {
this.setState({searchResults: json, searchTerm, direction: 'toEnglish'});
});
}
}
searchEng(evt) {
const searchTerm = this.input.current.value;
const request = `saimiar?eng=like.*${searchTerm}*`
if (searchTerm === "") {
this.setState({ searchResults: null, searchTerm: null, });
} else {
makeRequest(request, (json) => {
this.setState({ searchResults: json, searchTerm, direction: "toConlang" });
});
}
}
searchEng(_evt) {
const searchTerm = this.input.current.value;
const request = `saimiar?eng=like.*${searchTerm}*`;
if (searchTerm === '') {
this.setState({searchResults: null, searchTerm: null});
} else {
makeRequest(request, (json) => {
this.setState({searchResults: json, searchTerm, direction: 'toConlang'});
});
}
}
handleLangChange(evt) {
const conlang = evt.target.value;
this.setState({ conlang });
}
handleLangChange(evt) {
const conlang = evt.target.value;
this.setState({conlang});
}
render() {
return(
<main>
<div className='container'>
<div className='search'>
<h1>Kucinako</h1>
<div className='textInput'>
<input className='textInput' type="text" ref={ this.input } />
</div>
<br/>
<select ref={ this.langSelection } onChange={ this.handleLangChange } defaultValue="saimiar">
<option value="saimiar">Saimiar</option>
<option value="elesu">Elesu</option>
<option value="tukvaysi">Tukvaysi</option>
<option value="juteyuji">Juteyuji</option>
</select>
<button onClick={ this.searchSaimiar } className="searchButton">Saimiar</button>
<button onClick={ this.searchEng } className="searchButton">English</button>
</div>
<Results
searchResults={ this.state.searchResults }
searchTerm= { this.state.searchTerm }
conlang={ this.state.conlang }
direction={ this.state.direction }
/>
</div>
</main>
);
}
render() {
return (
<main>
<div className="container">
<div className="search">
<h1>Kucinako</h1>
<div className="textInput">
<input className="textInput" type="text" ref={ this.input } />
</div>
<br/>
<select ref={ this.langSelection } onChange={ this.handleLangChange } defaultValue="saimiar">
<option value="saimiar">Saimiar</option>
<option value="elesu">Elesu</option>
<option value="tukvaysi">Tukvaysi</option>
<option value="juteyuji">Juteyuji</option>
</select>
<button onClick={ this.searchSaimiar } className="searchButton">Saimiar</button>
<button onClick={ this.searchEng } className="searchButton">English</button>
</div>
<Results
searchResults={ this.state.searchResults }
searchTerm= { this.state.searchTerm }
conlang={ this.state.conlang }
direction={ this.state.direction }
/>
</div>
</main>
);
}
}
export default App;

View File

@ -1,96 +1,99 @@
const rootEndingPair = (str) => {
return { root: str.slice(0, -1), ending: str.slice(-1) };
};
const rootEndingPair = (str) => ({root: str.slice(0, -1), ending: str.slice(-1)});
function declineSaimiar(entry) {
const split = entry.sai.split(" ");
const sai = split.at(-1);
const morph = entry.morph_type;
const split = entry.sai.split(' ');
const sai = split.at(-1);
const morph = entry.morph_type;
let declined;
if (morph == '-V') {
return vowelDeclension(sai);
} else if (morph == '-a/i') {
return aiDeclension(sai)
} else if (morph == "e-") {
return initalDeclension(sai);
} else if (morph == "-C") {
return consonantDeclension(sai);
} else {
console.warn(`Can't decline entry '${entry.sai}'`);
console.log(entry)
return null;
}
if (morph === '-V') {
return vowelDeclension(sai);
}
if (morph === '-a/i') {
return aiDeclension(sai);
}
if (morph === 'e-') {
return initalDeclension(sai);
}
if (morph === '-C') {
return consonantDeclension(sai);
}
console.warn(`Can't decline entry '${entry.sai}'`);
console.log(entry);
return null;
}
function vowelDeclension(sai) {
const { root, ending } = rootEndingPair(sai);
const adpEnding = ending == "u" ? "ys" : `${ending}s`;
const {root, ending} = rootEndingPair(sai);
const adpEnding = ending === 'u' ? 'ys' : `${ending}s`;
return {
"abs": `${root}${ending}`,
"erg": `${root}${ending}na`,
"adp": `${root}${adpEnding}`,
"all": `so${root}${adpEnding}`,
"loc": `${root}${ending}xa`,
"ell": `tlê${root}${adpEnding}`,
"inst": `${root}${ending}ŕa`,
"rel": `${root}${ending}źi`
};
return {
abs: `${root}${ending}`,
erg: `${root}${ending}na`,
adp: `${root}${adpEnding}`,
all: `so${root}${adpEnding}`,
loc: `${root}${ending}xa`,
ell: `tlê${root}${adpEnding}`,
inst: `${root}${ending}ŕa`,
rel: `${root}${ending}źi`,
};
}
function aiDeclension(sai) {
const { root, ending } = rootEndingPair(sai);
return {
"abs": `${root}${ending}`,
"erg": `${root}iad`,
"adp": `${root}i`,
"all": `so${root}i`,
"loc": `${root}iath`,
"ell": `tlê${root}i`,
"inst": `${root}iar`,
"rel": `${root}iai`
};
const {root, ending} = rootEndingPair(sai);
return {
abs: `${root}${ending}`,
erg: `${root}iad`,
adp: `${root}i`,
all: `so${root}i`,
loc: `${root}iath`,
ell: `tlê${root}i`,
inst: `${root}iar`,
rel: `${root}iai`,
};
}
function consonantDeclension(sai) {
const split = rootEndingPair(sai);
const root = split.ending == 'ø' ? split.root : sai;
const absFinal = split.ending == 'ø' ? 'ø' : '';
const split = rootEndingPair(sai);
const root = split.ending === 'ø' ? split.root : sai;
const absFinal = split.ending === 'ø' ? 'ø' : '';
return {
"abs": `${root}${absFinal}`,
"erg": `${root}ad`,
"adp": `${root}e`,
"all": `so${root}i`,
"loc": `${root}ak`,
"ell": `tlê${root}i`,
"inst": `${root}ar`,
"rel": `${root}ai`
};
return {
abs: `${root}${absFinal}`,
erg: `${root}ad`,
adp: `${root}e`,
all: `so${root}i`,
loc: `${root}ak`,
ell: `tlê${root}i`,
inst: `${root}ar`,
rel: `${root}ai`,
};
}
const vowels = ['a', 'e', 'ê', 'i', 'o', 'ô', 'u', 'y'];
function initalDeclension(sai) {
const initial = sai.slice(0,1);
const root = sai.slice(1);
const initial = sai.slice(0, 1);
const root = sai.slice(1);
const finalRootSound = root.slice(-1);
const finalVowel = vowels.includes(finalRootSound);
const instEnding = finalVowel ? "ŕø" : "ar";
const relEnding = finalVowel ? "źi" : "ai";
const finalRootSound = root.slice(-1);
const finalVowel = vowels.includes(finalRootSound);
const instEnding = finalVowel ? 'ŕø' : 'ar';
const relEnding = finalVowel ? 'źi' : 'ai';
return {
"abs": `${initial}${root}`,
"erg": `da${root}`,
"adp": `i${root}`,
"all": `so${root}`,
"loc": `xa${root}`,
"ell": `tlê${root}`,
"inst": `i${root}${instEnding}`,
"rel": `${initial}${root}${relEnding}`,
};
return {
abs: `${initial}${root}`,
erg: `da${root}`,
adp: `i${root}`,
all: `so${root}`,
loc: `xa${root}`,
ell: `tlê${root}`,
inst: `i${root}${instEnding}`,
rel: `${initial}${root}${relEnding}`,
};
}
export { declineSaimiar };
export {declineSaimiar};

9291
yarn.lock

File diff suppressed because it is too large Load Diff