diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..1ff0c42 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,63 @@ +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto + +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitconfig b/.gitconfig new file mode 100644 index 0000000..da0d9b5 --- /dev/null +++ b/.gitconfig @@ -0,0 +1,415 @@ +# Output from release +lib/* + +# globs +Makefile.in +*.userprefs +*.usertasks +config.make +config.status +aclocal.m4 +install-sh +autom4te.cache/ +*.tar.gz +tarballs/ +test-results/ + +# Mac bundle stuff +*.dmg +*.app + +# content below from: https://github.com/github/gitignore/blob/master/Global/macOS.gitignore +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# content below from: https://github.com/github/gitignore/blob/master/Global/Windows.gitignore +# Windows thumbnail cache files +Thumbs.db +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# content below from: https://github.com/github/gitignore/blob/master/VisualStudio.gitignore +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +.vscode +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUNIT +*.VisualState.xml +TestResult.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# JustCode is a .NET coding add-in +.JustCode + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# JetBrains Rider +.idea/ +*.sln.iml + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + + +NuGetScratch/ +VBCSCompiler/ +.dotnet/ +release/ \ No newline at end of file diff --git a/ApplicationTests/ApplicationTests.csproj b/ApplicationTests/ApplicationTests.csproj index 20e63c0..ddc52a4 100644 --- a/ApplicationTests/ApplicationTests.csproj +++ b/ApplicationTests/ApplicationTests.csproj @@ -8,6 +8,7 @@ + runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/ApplicationTests/DeleteModuleInproject.cs b/ApplicationTests/DeleteModuleInproject.cs index 362a14b..8fa9cd5 100644 --- a/ApplicationTests/DeleteModuleInproject.cs +++ b/ApplicationTests/DeleteModuleInproject.cs @@ -14,7 +14,7 @@ public class DeleteModuleInproject : BaseFileWatcherTest public DeleteModuleInproject(ITestOutputHelper output) : base(output, "DeleteModuleInproject") { } [Fact] - public async Task CreateModule() + public async Task DeleteModule() { try { @@ -29,7 +29,6 @@ public async Task CreateModule() var deleteResult = await project.DeleteModule("Test"); - await Task.Delay(100); Assert.True(deleteResult); Assert.False(File.Exists(filePath)); Assert.False(Directory.Exists(outPath)); diff --git a/ApplicationTests/SchoolExampleTest.cs b/ApplicationTests/SchoolExampleTest.cs index 1e6a51f..c0bfc66 100644 --- a/ApplicationTests/SchoolExampleTest.cs +++ b/ApplicationTests/SchoolExampleTest.cs @@ -62,6 +62,8 @@ public async Task RenameSchoolModule() Assert.Null(project.FindModule("School")); Assert.NotNull(project.FindModule("Foo.Bar")); + + await Task.Run(() => Task.Delay(100)); } [Fact] diff --git a/CLI/CLI.csproj b/CLI/CLI.csproj index 58b5caf..aa4ac91 100644 --- a/CLI/CLI.csproj +++ b/CLI/CLI.csproj @@ -12,7 +12,6 @@ - @@ -21,6 +20,7 @@ + diff --git a/CLI/wwwroot/build/bundle.css b/CLI/wwwroot/build/bundle.css index 52ba88f..3a00b60 100644 --- a/CLI/wwwroot/build/bundle.css +++ b/CLI/wwwroot/build/bundle.css @@ -1,12 +1,12 @@ -main.svelte-1kds1eb{text-align:center;padding:1em;max-width:240px;margin:0 auto}@media(min-width: 640px){main.svelte-1kds1eb{max-width:none}} -.result-list.svelte-jpwv5m{overflow:auto;height:400px} -tr.svelte-1aug0lv:hover{cursor:pointer} -textarea.svelte-nhavks{width:750px;min-height:250px} -.errors.svelte-1l9twu{position:fixed;right:1rem;top:6rem}.error.svelte-1l9twu{min-width:300px;max-width:700px}.error.svelte-1l9twu pre.svelte-1l9twu{overflow-wrap:break-word}.editor-container.svelte-1l9twu{margin-top:1rem}.editor-container.svelte-1l9twu,#editor.svelte-1l9twu{height:calc(100% - 4rem)} -.topology.svelte-sq8u03{height:calc(100% - 4rem)}#topology.svelte-sq8u03{height:100%}#topology>.svelte-sq8u03:focus{outline:none !important}.options-form.svelte-sq8u03{position:fixed;right:10px;bottom:10px} -.preview.svelte-1crxzpc{height:calc(100% - 60px)}iframe.svelte-1crxzpc{width:100%;height:100%;border:none} -ul.svelte-wjec8i{list-style:none;text-align:left} -.descriptor.svelte-1jlx0wv{border:1px solid lightgray;font-size:14px;padding:1;margin:0;width:450px;margin-bottom:1rem;margin-left:50%;transform:translateX(-50%);background:white}.descriptor.svelte-1jlx0wv:hover{cursor:pointer}.descriptor.svelte-1jlx0wv h2.svelte-1jlx0wv{background:#3083db;color:white;padding:0.5em;font-size:1em;margin:0;position:relative}.descriptor.svelte-1jlx0wv .description.svelte-1jlx0wv{color:gray;padding:0 1rem}.pill.svelte-1jlx0wv{background:orange;border:1 px solid rgb(172, 114, 6);color:white;border-radius:50%;font-size:10px;text-transform:lowercase;padding:0.5em 1em 0.6em 1em;position:absolute;left:10px;top:50%;transform:translateY(-50%)}.pill.type.svelte-1jlx0wv{background:purple}.pill.field.svelte-1jlx0wv{background:darkgreen} -.overlay.svelte-yjqhyw{position:fixed;top:0;left:0;right:0;bottom:0;height:100%;width:100%;background:rgba(0, 0, 0, 0.4);visibility:hidden}.overlay.show.svelte-yjqhyw{visibility:visible}.overlay.svelte-yjqhyw .window.svelte-yjqhyw{background:#313338;border:1px solid 616265;border-radius:5px;position:absolute;top:10%;width:300px;left:50%;transform:translateX(-50%);font-size:2em;color:white} +main.svelte-ef4iw5{text-align:center;padding:1em;max-width:240px;margin:0 auto}@media(min-width: 640px){main.svelte-ef4iw5{max-width:none}} +.result-list.svelte-zo2n0k{overflow:auto;height:400px} +tr.svelte-144iqrx:hover{cursor:pointer} +.errors.svelte-hqtu9d{position:fixed;right:1rem;top:6rem}.error.svelte-hqtu9d{min-width:300px;max-width:700px}.error.svelte-hqtu9d pre.svelte-hqtu9d{overflow-wrap:break-word}.editor-container.svelte-hqtu9d{margin-top:1rem}.editor-container.svelte-hqtu9d,#editor.svelte-hqtu9d{height:calc(100% - 4rem)} +.preview.svelte-c5wrcb{height:calc(100% - 60px)}iframe.svelte-c5wrcb{width:100%;height:100%;border:none} +textarea.svelte-1ofk8jh{width:750px;min-height:250px} +.topology.svelte-lx22li{height:calc(100% - 4rem)}#topology.svelte-lx22li{height:100%}#topology>.svelte-lx22li:focus{outline:none !important}.options-form.svelte-lx22li{position:fixed;right:10px;bottom:10px} +ul.svelte-1hu7oxr{list-style:none;text-align:left} +.descriptor.svelte-e3h9x9{border:1px solid lightgray;font-size:14px;padding:1;margin:0;width:450px;margin-bottom:1rem;margin-left:50%;transform:translateX(-50%);background:white}.descriptor.svelte-e3h9x9:hover{cursor:pointer}.descriptor.svelte-e3h9x9 h2.svelte-e3h9x9{background:#3083db;color:white;padding:0.5em;font-size:1em;margin:0;position:relative}.descriptor.svelte-e3h9x9 .description.svelte-e3h9x9{color:gray;padding:0 1rem}.pill.svelte-e3h9x9{background:orange;border:1 px solid rgb(172, 114, 6);color:white;border-radius:50%;font-size:10px;text-transform:lowercase;padding:0.5em 1em 0.6em 1em;position:absolute;left:10px;top:50%;transform:translateY(-50%)}.pill.type.svelte-e3h9x9{background:purple}.pill.field.svelte-e3h9x9{background:darkgreen} +.overlay.svelte-ue0rrz{position:fixed;top:0;left:0;right:0;bottom:0;height:100%;width:100%;background:rgba(0, 0, 0, 0.4);visibility:hidden}.overlay.show.svelte-ue0rrz{visibility:visible}.overlay.svelte-ue0rrz .window.svelte-ue0rrz{background:#313338;border:1px solid 616265;border-radius:5px;position:absolute;top:10%;width:300px;left:50%;transform:translateX(-50%);font-size:2em;color:white} /*# sourceMappingURL=bundle.css.map */ \ No newline at end of file diff --git a/CLI/wwwroot/build/bundle.css.map b/CLI/wwwroot/build/bundle.css.map index b6211f4..e4b48e1 100644 --- a/CLI/wwwroot/build/bundle.css.map +++ b/CLI/wwwroot/build/bundle.css.map @@ -2,29 +2,29 @@ "version": 3, "file": "bundle.css", "sources": [ - "../../../web/src/App.svelte", - "../../../web/src/Home.svelte", - "../../../web/src/Lexicon.svelte", - "../../../web/src/LexiconAdmin.svelte", - "../../../web/src/Editor.svelte", - "../../../web/src/ModuleTopology.svelte", - "../../../web/src/Preview.svelte", - "../../../web/src/FileTree.svelte", - "../../../web/src/SearchResult.svelte", - "../../../web/src/Controls/Overlay.svelte" + "..\\..\\..\\web\\src\\App.svelte", + "..\\..\\..\\web\\src\\Home.svelte", + "..\\..\\..\\web\\src\\Lexicon.svelte", + "..\\..\\..\\web\\src\\Editor.svelte", + "..\\..\\..\\web\\src\\Preview.svelte", + "..\\..\\..\\web\\src\\LexiconAdmin.svelte", + "..\\..\\..\\web\\src\\ModuleTopology.svelte", + "..\\..\\..\\web\\src\\FileTree.svelte", + "..\\..\\..\\web\\src\\SearchResult.svelte", + "..\\..\\..\\web\\src\\Controls\\Overlay.svelte" ], "sourcesContent": [ - "\n\n\n\n
\n\n navigator.navigate('index')}>\n Home\n \n navigator.navigate('module-topology')}>\n Topology\n \n navigator.navigate('lexicon')}>\n Lexicon\n \n {#if navigator.module}\n navigator.navigate('editor')}>\n Editor\n \n navigator.navigate('preview')}>\n Preview\n \n {/if}\n
\n\n{#if route === 'index'}\n \n{:else if route === 'lexicon'}\n \n{:else if route === 'add-lexicon'}\n \n{:else if route === 'edit-lexicon'}\n \n{:else if route === 'lexicon-admin'}\n \n{:else if route === 'preview'}\n \n{:else if route === 'editor'}\n \n{:else if route === 'config'}\n \n{:else if route === 'module-topology'}\n \n{:else if route === 'module-create'}\n \n{:else}\n \n{/if}\n", - "\n\n\n\n
\n
\n

Welcome to ZDragon!

\n\n
\n

Search your models:

\n \n
\n\n
\n {#if data && data.length > 0}\n {#each data as d}\n \n {/each}\n {:else}\n
Your query returned no results.
\n {/if}\n
\n
\n\n", - "\n\n\n\n
\n

Search your lexicon!

\n
\n {\n navigator.navigate('add-lexicon');\n }}>\n Create\n \n

Search your lexicon:

\n e.code === 'Enter' && onkeyup(e.target.value)}\n on:change={e => findData(e.target.value)} />\n
\n
\n\n \n \n \n \n \n \n {#each data as d}\n navigator.navigate('edit-lexicon', d.id)}>\n \n \n \n \n {/each}\n \n
DomainNameDescription
{d.domain}{d.name}{d.description}
\n", - "\n\n\n\n

Domains

\n

Please give the domains you would like to restrict your lexicon to.

\n