diff --git a/src/src/app/services/app.service.ts b/src/src/app/services/app.service.ts index 43e8a3de..bbfba8fa 100644 --- a/src/src/app/services/app.service.ts +++ b/src/src/app/services/app.service.ts @@ -4,14 +4,14 @@ import { UUID } from 'angular2-uuid'; import { lastValueFrom } from 'rxjs'; import { moveItem, moveItemUpOrDown } from '../common/array-operations'; -import { BibleReference, Overlap,Section } from '../common/bible-reference'; -import { getFromCardCache,removeFromCardCache, updateInCardCache } from '../common/card-cache-operations'; +import { BibleReference, Overlap, Section } from '../common/bible-reference'; +import { getFromCardCache, removeFromCardCache, updateInCardCache } from '../common/card-cache-operations'; import { mergeCardList } from '../common/card-operations'; import { HashTable } from '../common/hashtable'; import { MoveDirection } from '../common/move-direction'; -import { createReducingService,IReducingAction } from '../common/state-service'; +import { createReducingService, IReducingAction } from '../common/state-service'; import { IStorable, Storable, StorableType } from '../common/storable'; -import { AppState, DisplaySettings, Error,PageSettings, Settings, User } from '../models/app-state'; +import { AppState, DisplaySettings, Error, PageSettings, Settings, User } from '../models/app-state'; import { CardItem, CardType, DataReference } from '../models/card-state'; import { NoteItem } from '../models/note-state'; import { SavedPage } from '../models/page-state'; @@ -31,7 +31,7 @@ import { StrongsDictionary, StrongsResult, } from '../models/strongs-state'; -import { IndexResult, WordLookupResult,WordToStem } from '../models/words-state'; +import { IndexResult, WordLookupResult, WordToStem } from '../models/words-state'; const initialState: AppState = { user: null, @@ -1491,8 +1491,8 @@ export class AppService extends createReducingService(initialState) { words.unshift('barbarian'); words.unshift('beard'); words.unshift('begettest'); - words.unshift('benefactor'); - words.unshift('bethel'); + words.unshift('beneath'); + words.unshift('bethabara'); words.unshift('bilshan'); words.unshift('blindeth'); words.unshift('booti'); @@ -1506,152 +1506,152 @@ export class AppService extends createReducingService(initialState) { words.unshift('chrysoprasus'); words.unshift('cloth'); words.unshift('common'); - words.unshift('confess'); - words.unshift('contendeth'); - words.unshift('coucheth'); - words.unshift('crept'); - words.unshift('curseth'); - words.unshift('darius'); - words.unshift('decketh'); - words.unshift('dema'); - words.unshift('devil'); - words.unshift('directeth'); - words.unshift('disposit'); - words.unshift('doth'); - words.unshift('drowsi'); - words.unshift('ebe'); - words.unshift('elead'); - words.unshift('elkoshit'); - words.unshift('encourag'); - words.unshift('entreat'); - words.unshift('eschew'); - words.unshift('ever'); - words.unshift('expert'); - words.unshift('fallest'); - words.unshift('feedeth'); - words.unshift('filthi'); - words.unshift('fleeth'); - words.unshift('forborn'); - words.unshift('forsookest'); - words.unshift('fretteth'); - words.unshift('gahar'); - words.unshift('gazzam'); - words.unshift('gibea'); - words.unshift('glister'); - words.unshift('got'); - words.unshift('grope'); - words.unshift('hadlai'); - words.unshift('hammon'); - words.unshift('harbona'); - words.unshift('hasrah'); - words.unshift('hazezon'); - words.unshift('heinous'); - words.unshift('herebi'); - words.unshift('highest'); - words.unshift('holdeth'); - words.unshift('hosanna'); - words.unshift('huri'); - words.unshift('ill'); - words.unshift('inexcus'); - words.unshift('intend'); - words.unshift('ishui'); - words.unshift('jaazaniah'); - words.unshift('jaminit'); - words.unshift('jecoliah'); - words.unshift('jeopard'); - words.unshift('jethro'); - words.unshift('joiarib'); - words.unshift('juda'); - words.unshift('kelaiah'); - words.unshift('kishion'); - words.unshift('laden'); - words.unshift('laughter'); - words.unshift('lehi'); - words.unshift('lift'); - words.unshift('loatheth'); - words.unshift('lucius'); - words.unshift('madmen'); - words.unshift('malachi'); - words.unshift('march'); - words.unshift('maul'); - words.unshift('melchizedek'); - words.unshift('merrili'); - words.unshift('midianit'); - words.unshift('miri'); - words.unshift('modest'); - words.unshift('move'); - words.unshift('naashon'); - words.unshift('nazareth'); - words.unshift('nephishesim'); - words.unshift('nisan'); - words.unshift('obadiah'); - words.unshift('oliveyard'); - words.unshift('oren'); - words.unshift('overrun'); - words.unshift('pallu'); - words.unshift('pas'); - words.unshift('peel'); - words.unshift('pernici'); - words.unshift('philip'); - words.unshift('pison'); - words.unshift('plucketh'); - words.unshift('pour'); - words.unshift('price'); - words.unshift('proport'); - words.unshift('purg'); - words.unshift('rabboni'); - words.unshift('ravish'); - words.unshift('redeemedst'); - words.unshift('remainest'); - words.unshift('reput'); - words.unshift('revers'); - words.unshift('rissah'); - words.unshift('ruddi'); - words.unshift('said'); - words.unshift('sapphir'); - words.unshift('scepter'); - words.unshift('secundus'); - words.unshift('separ'); - words.unshift('shachia'); - words.unshift('sharar'); - words.unshift('sheepshear'); - words.unshift('sheva'); - words.unshift('shishak'); - words.unshift('shroud'); - words.unshift('signifi'); - words.unshift('sittest'); - words.unshift('slow'); - words.unshift('soft'); - words.unshift('sowedst'); - words.unshift('spoil'); - words.unshift('station'); - words.unshift('stoop'); - words.unshift('strongest'); - words.unshift('sum'); - words.unshift('sweep'); - words.unshift('tahapan'); - words.unshift('tast'); - words.unshift('ten'); - words.unshift('thereat'); - words.unshift('threaten'); - words.unshift('timbrel'); - words.unshift('tongu'); - words.unshift('travailest'); - words.unshift('trust'); - words.unshift('uncircumcis'); - words.unshift('unprepar'); - words.unshift('urg'); - words.unshift('vat'); - words.unshift('visiteth'); - words.unshift('wash'); - words.unshift('wed'); - words.unshift('wherewith'); - words.unshift('winepress'); - words.unshift('won'); - words.unshift('written'); - words.unshift('zalmonah'); - words.unshift('zenan'); - words.unshift('ziphim'); + words.unshift('confer'); + words.unshift('contendest'); + words.unshift('couch'); + words.unshift('creepeth'); + words.unshift('cursest'); + words.unshift('dare'); + words.unshift('deckest'); + words.unshift('delus'); + words.unshift('devic'); + words.unshift('direct'); + words.unshift('dispos'); + words.unshift('dote'); + words.unshift('drown'); + words.unshift('ebal'); + words.unshift('eldest'); + words.unshift('elkanah'); + words.unshift('encount'); + words.unshift('entranc'); + words.unshift('escapeth'); + words.unshift('eventid'); + words.unshift('experi'); + words.unshift('fallen'); + words.unshift('feedest'); + words.unshift('filth'); + words.unshift('fleec'); + words.unshift('forbor'); + words.unshift('forsook'); + words.unshift('fret'); + words.unshift('gaham'); + words.unshift('gazit'); + words.unshift('gibbethon'); + words.unshift('glede'); + words.unshift('gospel'); + words.unshift('groaneth'); + words.unshift('hadid'); + words.unshift('hammoleketh'); + words.unshift('haraseth'); + words.unshift('hashupha'); + words.unshift('hazeroth'); + words.unshift('height'); + words.unshift('hereaft'); + words.unshift('higher'); + words.unshift('holdest'); + words.unshift('hosah'); + words.unshift('huram'); + words.unshift('ilai'); + words.unshift('indit'); + words.unshift('intellig'); + words.unshift('ishuai'); + words.unshift('jaasiel'); + words.unshift('jamin'); + words.unshift('jechoniah'); + words.unshift('jemuel'); + words.unshift('jethlah'); + words.unshift('joiakim'); + words.unshift('jucal'); + words.unshift('keilah'); + words.unshift('kishi'); + words.unshift('lade'); + words.unshift('laugheth'); + words.unshift('lehem'); + words.unshift('lifetim'); + words.unshift('loath'); + words.unshift('lucif'); + words.unshift('madmannah'); + words.unshift('maktesh'); + words.unshift('marcaboth'); + words.unshift('mattock'); + words.unshift('melchiah'); + words.unshift('merri'); + words.unshift('midian'); + words.unshift('mire'); + words.unshift('moder'); + words.unshift('movabl'); + words.unshift('naarath'); + words.unshift('nazaren'); + words.unshift('nephish'); + words.unshift('ninth'); + words.unshift('oath'); + words.unshift('olivet'); + words.unshift('oregim'); + words.unshift('overran'); + words.unshift('palet'); + words.unshift('parvaim'); + words.unshift('pedigre'); + words.unshift('permit'); + words.unshift('philetus'); + words.unshift('pisidia'); + words.unshift('pluck'); + words.unshift('pound'); + words.unshift('prey'); + words.unshift('propiti'); + words.unshift('purer'); + words.unshift('rabbith'); + words.unshift('ravin'); + words.unshift('redeem'); + words.unshift('remaind'); + words.unshift('reproveth'); + words.unshift('reverend'); + words.unshift('rishathaim'); + words.unshift('rudder'); + words.unshift('sahadutha'); + words.unshift('saphir'); + words.unshift('scent'); + words.unshift('sect'); + words.unshift('seorim'); + words.unshift('shabbethai'); + words.unshift('sharaim'); + words.unshift('sheepmast'); + words.unshift('shethar'); + words.unshift('shisha'); + words.unshift('shrine'); + words.unshift('signif'); + words.unshift('sitnah'); + words.unshift('sloth'); + words.unshift('soever'); + words.unshift('sow'); + words.unshift('spittl'); + words.unshift('state'); + words.unshift('stool'); + words.unshift('stronger'); + words.unshift('sukkiim'); + words.unshift('sweat'); + words.unshift('tahanit'); + words.unshift('taskmast'); + words.unshift('tempteth'); + words.unshift('thereabout'); + words.unshift('thread'); + words.unshift('timber'); + words.unshift('tong'); + words.unshift('travail'); + words.unshift('trumpet'); + words.unshift('unchang'); + words.unshift('unperfect'); + words.unshift('urban'); + words.unshift('vashti'); + words.unshift('visitest'); + words.unshift('warrior'); + words.unshift('web'); + words.unshift('whereupon'); + words.unshift('winebibb'); + words.unshift('womenserv'); + words.unshift('writeth'); + words.unshift('zalmon'); + words.unshift('zena'); + words.unshift('ziphah'); words.unshift('zuzim'); return words; diff --git a/src/tsconfig.json b/src/tsconfig.json index 1b20e0c3..d5531262 100644 --- a/src/tsconfig.json +++ b/src/tsconfig.json @@ -16,7 +16,8 @@ "lib": ["es2018", "dom"] }, "angularCompilerOptions": { - "strictTemplates": true + "strictTemplates": true, + "strictInjectionParameters": true, }, "include": ["src/**/*.ts"] } diff --git a/utils/DynamicBibleUtility/DataPreparation/BibleProcessor.cs b/utils/DynamicBibleUtility/DataPreparation/BibleProcessor.cs index 7166e700..3e95af80 100644 --- a/utils/DynamicBibleUtility/DataPreparation/BibleProcessor.cs +++ b/utils/DynamicBibleUtility/DataPreparation/BibleProcessor.cs @@ -442,7 +442,7 @@ public class BibleProcessor(ILogger? logger = null) if (i % 50 == 49 || i == idx.Count - 1) { tmp.Add(idx[i]); - logger?.LogInformation("words.unshift('" + idx[i].Word + "');\r\n"); + Console.WriteLine("words.unshift('" + idx[i].Word + "');"); var json = JSON.Serialize(tmp.ToArray()); File.WriteAllText($"index/{idx[i].Word}idx.json", json); diff --git a/utils/DynamicBibleUtility/DataPreparation/DataPreparation.csproj b/utils/DynamicBibleUtility/DataPreparation/DataPreparation.csproj index 02e2523a..2e1ca72d 100644 --- a/utils/DynamicBibleUtility/DataPreparation/DataPreparation.csproj +++ b/utils/DynamicBibleUtility/DataPreparation/DataPreparation.csproj @@ -16,6 +16,7 @@ + diff --git a/utils/DynamicBibleUtility/DataPreparation/Program.cs b/utils/DynamicBibleUtility/DataPreparation/Program.cs index 91b07bd2..d224a727 100644 --- a/utils/DynamicBibleUtility/DataPreparation/Program.cs +++ b/utils/DynamicBibleUtility/DataPreparation/Program.cs @@ -1,10 +1,14 @@ -namespace DynamicBible.DataPreparation; +using Microsoft.Extensions.Logging; + +namespace DynamicBible.DataPreparation; internal class Program { private static void Main() { - new BibleProcessor() + using ILoggerFactory factory = LoggerFactory.Create(builder => builder.AddConsole()); + var logger = factory.CreateLogger(); + new BibleProcessor(logger) .CreateText( Path.Combine( Environment.CurrentDirectory,