Rename libraries

ArcGraphModel.sln

@@ -3,12 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.0.31903.59
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ArcGraphModel", "src\ArcGraphModel\ArcGraphModel.fsproj", "{32B01B13-37E2-4C86-9612-4BD8F33313D3}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{2EB71559-9BE4-4E02-9763-9092876D1E4A}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ArcGraphModel.Tests", "tests\ArcGraphModel.Tests\ArcGraphModel.Tests.fsproj", "{81CE2F06-74BE-45F9-B2EB-2BFADD5B9C95}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{CE1B84FD-33DE-48E4-A97A-A4BDC34E08F0}"
 	ProjectSection(SolutionItems) = preProject
 		.gitignore = .gitignore
@@ -26,47 +22,59 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sln", "sln", "{CE1B84FD-33D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{67DA0DCC-75F4-4F30-91C3-309A48B13D49}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Build", "build\Build.fsproj", "{CAC69396-1A09-4D95-B552-78712A4DA166}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ControlledVocabulary", "src\ControlledVocabulary\ControlledVocabulary.fsproj", "{F8E5EFC0-C74B-4C3C-BC22-7A5286A31DF6}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ArcGraphModel", "src\ArcGraphModel\ArcGraphModel.fsproj", "{E80010AC-0AEE-4D7C-A85C-3A20C1FB7070}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ArcGraphModel.Tests", "tests\ArcGraphModel.Tests\ArcGraphModel.Tests.fsproj", "{5A2C8580-8D5E-4A90-A21F-2C45C672A259}"
+EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ControlledVocabulary.Tests", "tests\ControlledVocabulary.Tests\ControlledVocabulary.Tests.fsproj", "{2CBEE59D-07E4-460E-8B97-9267965D3F46}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ArcGraphModel.IO", "src\ArcGraphModel.IO\ArcGraphModel.IO.fsproj", "{30A760EF-FCB8-4454-811F-18983A9C076B}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{3DB2A5F4-23F6-4A06-9AE5-CEAC0707735B}"
+	ProjectSection(SolutionItems) = preProject
+		build.cmd = build.cmd
+		build.sh = build.sh
+		global.json = global.json
+	EndProjectSection
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ArcGraphModel.IO.Tests", "tests\ArcGraphModel.IO.Tests\ArcGraphModel.IO.Tests.fsproj", "{921A1AF1-4FB4-43FC-9B5E-B53D291EE610}"
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Build", "build\Build.fsproj", "{ED24D0E3-BA79-4F6D-9A30-D05FF4EBAFDB}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{32B01B13-37E2-4C86-9612-4BD8F33313D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{32B01B13-37E2-4C86-9612-4BD8F33313D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{32B01B13-37E2-4C86-9612-4BD8F33313D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{32B01B13-37E2-4C86-9612-4BD8F33313D3}.Release|Any CPU.Build.0 = Release|Any CPU
-		{81CE2F06-74BE-45F9-B2EB-2BFADD5B9C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{81CE2F06-74BE-45F9-B2EB-2BFADD5B9C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{81CE2F06-74BE-45F9-B2EB-2BFADD5B9C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{81CE2F06-74BE-45F9-B2EB-2BFADD5B9C95}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CAC69396-1A09-4D95-B552-78712A4DA166}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CAC69396-1A09-4D95-B552-78712A4DA166}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CAC69396-1A09-4D95-B552-78712A4DA166}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CAC69396-1A09-4D95-B552-78712A4DA166}.Release|Any CPU.Build.0 = Release|Any CPU
-		{30A760EF-FCB8-4454-811F-18983A9C076B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{30A760EF-FCB8-4454-811F-18983A9C076B}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{30A760EF-FCB8-4454-811F-18983A9C076B}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{30A760EF-FCB8-4454-811F-18983A9C076B}.Release|Any CPU.Build.0 = Release|Any CPU
-		{921A1AF1-4FB4-43FC-9B5E-B53D291EE610}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{921A1AF1-4FB4-43FC-9B5E-B53D291EE610}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{921A1AF1-4FB4-43FC-9B5E-B53D291EE610}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{921A1AF1-4FB4-43FC-9B5E-B53D291EE610}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F8E5EFC0-C74B-4C3C-BC22-7A5286A31DF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F8E5EFC0-C74B-4C3C-BC22-7A5286A31DF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F8E5EFC0-C74B-4C3C-BC22-7A5286A31DF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F8E5EFC0-C74B-4C3C-BC22-7A5286A31DF6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E80010AC-0AEE-4D7C-A85C-3A20C1FB7070}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E80010AC-0AEE-4D7C-A85C-3A20C1FB7070}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E80010AC-0AEE-4D7C-A85C-3A20C1FB7070}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E80010AC-0AEE-4D7C-A85C-3A20C1FB7070}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5A2C8580-8D5E-4A90-A21F-2C45C672A259}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5A2C8580-8D5E-4A90-A21F-2C45C672A259}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5A2C8580-8D5E-4A90-A21F-2C45C672A259}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5A2C8580-8D5E-4A90-A21F-2C45C672A259}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2CBEE59D-07E4-460E-8B97-9267965D3F46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2CBEE59D-07E4-460E-8B97-9267965D3F46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2CBEE59D-07E4-460E-8B97-9267965D3F46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2CBEE59D-07E4-460E-8B97-9267965D3F46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ED24D0E3-BA79-4F6D-9A30-D05FF4EBAFDB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ED24D0E3-BA79-4F6D-9A30-D05FF4EBAFDB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ED24D0E3-BA79-4F6D-9A30-D05FF4EBAFDB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ED24D0E3-BA79-4F6D-9A30-D05FF4EBAFDB}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{32B01B13-37E2-4C86-9612-4BD8F33313D3} = {67DA0DCC-75F4-4F30-91C3-309A48B13D49}
-		{81CE2F06-74BE-45F9-B2EB-2BFADD5B9C95} = {2EB71559-9BE4-4E02-9763-9092876D1E4A}
-		{30A760EF-FCB8-4454-811F-18983A9C076B} = {67DA0DCC-75F4-4F30-91C3-309A48B13D49}
-		{921A1AF1-4FB4-43FC-9B5E-B53D291EE610} = {2EB71559-9BE4-4E02-9763-9092876D1E4A}
+		{F8E5EFC0-C74B-4C3C-BC22-7A5286A31DF6} = {67DA0DCC-75F4-4F30-91C3-309A48B13D49}
+		{E80010AC-0AEE-4D7C-A85C-3A20C1FB7070} = {67DA0DCC-75F4-4F30-91C3-309A48B13D49}
+		{5A2C8580-8D5E-4A90-A21F-2C45C672A259} = {2EB71559-9BE4-4E02-9763-9092876D1E4A}
+		{2CBEE59D-07E4-460E-8B97-9267965D3F46} = {2EB71559-9BE4-4E02-9763-9092876D1E4A}
+		{ED24D0E3-BA79-4F6D-9A30-D05FF4EBAFDB} = {3DB2A5F4-23F6-4A06-9AE5-CEAC0707735B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {933E3470-7D09-4F22-A056-2407458B9600}

build/ProjectInfo.fs

@@ -6,8 +6,8 @@ let project = "ArcGraphModel"
 
 let testProjects = 
     [
+        "tests/ControlledVocabulary.Tests"
         "tests/ArcGraphModel.Tests"
-        "tests/ArcGraphModel.IO.Tests"
     ]
 
 let solutionFile  = $"{project}.sln"

playground.fsx

@@ -29,7 +29,7 @@ open System.Collections.Generic
 //#r @"C:\Repos\nfdi4plants\ArcGraphModel\src\ArcGraphModel.IO\bin\Debug\netstandard2.0\ArcGraphModel.IO.dll"
 //#r @"C:/Users/olive/.nuget/packages/fsharpaux/1.1.0/lib/net5.0/FSharpAux.dll"
 #r "src/ArcGraphModel/bin/Debug/netstandard2.0/ArcGraphModel.dll"
-#r "src/ArcGraphModel.IO/bin/Debug/netstandard2.0/ArcGraphModel.IO.dll"
+#r "src/ControlledVocabulary/bin/Debug/netstandard2.0/ControlledVocabulary.dll"
 
 open FsSpreadsheet
 open FsSpreadsheet.ExcelIO

src/ArcGraphModel.IO/Address.fs → src/ArcGraphModel/Address.fs

@@ -1,6 +1,6 @@
-namespace ArcGraphModel.IO
+namespace ArcGraphModel
 
-open ArcGraphModel
+open ControlledVocabulary
 
 module Address = 
 

src/ArcGraphModel/ArcGraphModel.fsproj

@@ -7,42 +7,51 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="arcstructuralontology\arc_structure.obo" />
-    <Compile Include="CvTokens\CvTerm.fs" />
-    <Compile Include="CvTokens\ParamValue.fs" />
-    <Compile Include="CvTokens\IParamBase.fs" />
-    <Compile Include="CvTokens\ICvBase.fs" />
-    <Compile Include="CvTokens\IParam.fs" />
-    <Compile Include="CvTokens\CvAttributeCollection.fs" />
-    <Compile Include="CvTokens\CvParam.fs" />
-    <Compile Include="CvTokens\UserParam.fs" />
-    <Compile Include="CvTokens\CvObject.fs" />
-    <Compile Include="CvTokens\CvContainer.fs" />
-    <Compile Include="TableTransform.fs" />
-    <Compile Include="Terms.fs" />
+    <None Include="ArcStructuralOntology/arc_structure.obo" />
+    <None Include="ArcStructuralOntology/arc_structure.yml" />
+    <Compile Include="Address.fs" />
+    <Compile Include="ISA\Terms.fs" />
+    <Compile Include="ISA\TableTransform.fs" />
+    <Compile Include="ISA\Regex.fs" />
+    <Compile Include="ISA\KeyParser.fs" />
+    <Compile Include="ISA\Tokenization.fs" />
+    <Compile Include="ISA\TokenAggregation.fs" />
+    <Compile Include="ISA\Worksheet.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="FSharp.FGL.ArrayAdjacencyGraph" Version="[0.0.2]" />
-    <PackageReference Include="FSharpAux.Core" Version="[2.0.0]" />
-    <PackageReference Include="FsSpreadsheet" Version="[3.1.0]" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="ArcStructuralOntology\" />
-  </ItemGroup>
 
-  <ItemGroup />
-
   <PropertyGroup>
     <Authors>Oliver Maus, Heinrich Lukas Weil, Timo Mühlhaus, Kevin Frey, Kevin Schneider</Authors>
-    <Description>Fsharp Library for working on ARCs as collection of controlled vocabulary token</Description>
-    <Summary>Fsharp Library for working on ARCs as collection of controlled vocabulary token</Summary>
+    <Description>Fsharp Library for tokenization of isa and cwl files into the ArcGraphModel</Description>
+    <Summary>Fsharp Library for tokenization of isa and cwl files into the ArcGraphModel</Summary>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <!--<PackageIcon>logo.png</PackageIcon>-->
-    <PackageTags>F# FSharp datascience rdm arc dataplant nfdi4plants fable fable-library fable-javascript</PackageTags>
+    <PackageTags>F# FSharp datascience rdm arc dataplant nfdi4plants xlsx io isa fable fable-library fable-javascript</PackageTags>
     <RepositoryUrl>https://github.com/nfdi4plants/ArcGraphModel</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\ControlledVocabulary\ControlledVocabulary.fsproj" PackageVersion="[0.0.0, 1.0.0)" />
+    <PackageReference Include="FSharp.FGL.ArrayAdjacencyGraph" Version="[0.0.2]" />
+    <PackageReference Include="FSharpAux.Core" Version="[2.0.0]" />
+    <PackageReference Include="FsSpreadsheet" Version="[3.1.1]" />
+    <PackageReference Include="FsSpreadsheet.ExcelIO" Version="[3.1.1]" />
+  </ItemGroup>
+
+  <Target Name="UseExplicitPackageVersions" BeforeTargets="GenerateNuspec">
+    <ItemGroup>
+      <_ProjectReferenceWithExplicitPackageVersion Include="@(ProjectReference->'%(FullPath)')" Condition="'%(ProjectReference.PackageVersion)' != ''" />
+      <_ProjectReferenceWithExactPackageVersion Include="@(ProjectReference->'%(FullPath)')" Condition="'%(ProjectReference.ExactVersion)' == 'true'" />
+      <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)" Condition="'%(Identity)' != '' And '@(_ProjectReferenceWithExplicitPackageVersion)' == '@(_ProjectReferencesWithVersions)'">
+        <ProjectVersion>@(_ProjectReferenceWithExplicitPackageVersion->'%(PackageVersion)')</ProjectVersion>
+      </_ProjectReferenceWithReassignedVersion>
+      <_ProjectReferenceWithReassignedVersion Include="@(_ProjectReferencesWithVersions)" Condition="'%(Identity)' != '' And '@(_ProjectReferenceWithExactPackageVersion)' == '@(_ProjectReferencesWithVersions)'">
+        <ProjectVersion>[@(_ProjectReferencesWithVersions->'%(ProjectVersion)')]</ProjectVersion>
+      </_ProjectReferenceWithReassignedVersion>
+      <_ProjectReferencesWithVersions Remove="@(_ProjectReferenceWithReassignedVersion)" />
+      <_ProjectReferencesWithVersions Include="@(_ProjectReferenceWithReassignedVersion)" />
+    </ItemGroup>
+  </Target>
+
 </Project>

src/ArcGraphModel.IO/ISA/KeyParser.fs → src/ArcGraphModel/ISA/KeyParser.fs

@@ -1,6 +1,6 @@
-namespace ArcGraphModel.IO
+namespace ArcGraphModel
 
-open ArcGraphModel
+open ControlledVocabulary
 open FSharpAux
 open FsSpreadsheet