importer stuff will be the nuget

specklesystems · Jan 14, 2025 · 28fa248 · 28fa248
1 parent a299679
commit 28fa248
Show file tree

Hide file tree

Showing 47 changed files with 212 additions and 101 deletions.
diff --git a/Build/Program.cs b/Build/Program.cs
@@ -198,6 +198,8 @@ void RemoveDirectory(string d)
       "dotnet",
       $"build {file} -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
     );
+
+    RunAsync("dotnet", $"pack {file} -c Release -o output --no-build");
   }
 );
 

diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs b/Importers/Ifc/Speckle.Importers.Ifc.Tester/Program.cs
@@ -3,11 +3,11 @@
 using Ara3D.Utils;
 //using JetBrains.Profiler.SelfApi;
 using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Ifc;
-using Speckle.Connectors.Ifc.Ara3D.IfcParser;
-using Speckle.Connectors.Ifc.Converters;
-using Speckle.Connectors.Ifc.Types;
+using Speckle.Importers.Ifc;
+using Speckle.Importers.Ifc.Ara3D.IfcParser;
+using Speckle.Importers.Ifc.Converters;
 using Speckle.Importers.Ifc.Tester;
+using Speckle.Importers.Ifc.Types;
 using Speckle.Sdk.Serialisation.V2.Send;
 using Speckle.Sdk.SQLite;
 

diff --git a/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json b/Importers/Ifc/Speckle.Importers.Ifc.Tester/packages.lock.json
@@ -217,8 +217,7 @@
           "Ara3D.Utils": "[1.4.5, )",
           "Microsoft.Extensions.DependencyInjection": "[2.2.0, )",
           "Speckle.Objects": "[3.1.0-dev.227, )",
-          "Speckle.Sdk": "[3.1.0-dev.227, )",
-          "Speckle.WebIfc": "[0.0.64-speckle1, )"
+          "Speckle.Sdk": "[3.1.0-dev.227, )"
         }
       },
       "Ara3D.Buffers": {
@@ -302,12 +301,6 @@
         "requested": "[3.1.0-dev.227, )",
         "resolved": "3.1.0-dev.227",
         "contentHash": "pdfBEvgXUHcZ2uCxTJ7bRt0Xs60iIvPvwzjUo3RaSYcHpcljPrOG0Ki1JRR844ZON66KPp7yesByjLvI0Ttujw=="
-      },
-      "Speckle.WebIfc": {
-        "type": "CentralTransitive",
-        "requested": "[0.0.64-speckle1, )",
-        "resolved": "0.0.64-speckle1",
-        "contentHash": "oJgPu/LCypQLelDrtV6+dk0Qm+3VSEYWXCjeXHs2/ekOZEKwpFKhcKVOd1uMjtVLh+n3CZ/6tMgO1nZq9FpwMw=="
       }
     }
   }

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/Extensions.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/Extensions.cs
@@ -1,8 +1,8 @@
 using System.Text;
 using Ara3D.Buffers;
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 public static class IfcExtensions
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcEntity.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcEntity.cs
@@ -1,6 +1,6 @@
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 /// <summary>
 /// It represents an entity definition. It is usually a single line in a STEP file.

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcGraph.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcGraph.cs
@@ -1,9 +1,9 @@
 using System.Diagnostics;
 using Ara3D.Logging;
 using Ara3D.Utils;
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 /// <summary>
 /// This is a high-level representation of an IFC model as a graph of nodes and relations.

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcNode.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcNode.cs
@@ -1,6 +1,6 @@
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 public class IfcNode : IfcEntity
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcProp.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcProp.cs
@@ -1,6 +1,6 @@
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 public class IfcProp : IfcNode
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcPropSet.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcPropSet.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 // This merges two separate entity types: IfcPropertySet and IfcElementQuantity.
 // Both of which are derived from IfcPropertySetDefinition.

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcPropSetRelation.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcPropSetRelation.cs
@@ -1,6 +1,6 @@
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 // https://standards.buildingsmart.org/IFC/RELEASE/IFC2x3/TC1/HTML/ifckernel/lexical/ifcreldefinesbyproperties.htm
 public class IfcPropSetRelation : IfcRelation

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcRelation.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcRelation.cs
@@ -1,6 +1,6 @@
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 /// <summary>
 /// Always express a 1-to-many relation

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcRelationAggregate.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcRelationAggregate.cs
@@ -1,6 +1,6 @@
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 public class IfcRelationAggregate : IfcRelation
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcRelationSpatial.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcRelationSpatial.cs
@@ -1,6 +1,6 @@
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 public class IfcRelationSpatial : IfcRelation
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcRelationType.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.IfcParser/IfcRelationType.cs
@@ -1,6 +1,6 @@
-using Speckle.Connectors.Ifc.Ara3D.StepParser;
+using Speckle.Importers.Ifc.Ara3D.StepParser;
 
-namespace Speckle.Connectors.Ifc.Ara3D.IfcParser;
+namespace Speckle.Importers.Ifc.Ara3D.IfcParser;
 
 public class IfcRelationType : IfcRelation
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/AlignedMemoryReader.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/AlignedMemoryReader.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using Ara3D.Buffers;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public static class AlignedMemoryReader
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/ByteSpanExtensions.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/ByteSpanExtensions.cs
@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 using Ara3D.Buffers;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public static class ByteSpanExtensions
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepDocument.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepDocument.cs
@@ -3,7 +3,7 @@
 using Ara3D.Logging;
 using Ara3D.Utils;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public sealed unsafe class StepDocument : IDisposable
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepFactory.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepFactory.cs
@@ -1,4 +1,4 @@
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public static unsafe class StepFactory
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepGraph.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepGraph.cs
@@ -1,7 +1,7 @@
 using Ara3D.Utils;
 using Speckle.Sdk.Common;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public class StepGraph
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepInstance.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepInstance.cs
@@ -1,4 +1,4 @@
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public class StepInstance
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepLineParser.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepLineParser.cs
@@ -3,7 +3,7 @@
 using System.Runtime.Intrinsics.X86;
 using Ara3D.Buffers;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public static class StepLineParser
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepNode.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepNode.cs
@@ -1,6 +1,6 @@
 using Ara3D.Utils;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public class StepNode
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepRawInstance.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepRawInstance.cs
@@ -2,7 +2,7 @@
 using System.Runtime.InteropServices;
 using Ara3D.Buffers;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 /// <summary>
 /// Contains information about where an instance is within a file.

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepToken.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepToken.cs
@@ -1,7 +1,7 @@
 using System.Diagnostics;
 using Ara3D.Buffers;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public readonly struct StepToken
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepTokenType.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepTokenType.cs
@@ -1,4 +1,4 @@
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public enum StepTokenType : byte
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepTokenizer.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepTokenizer.cs
@@ -2,7 +2,7 @@
 using System.Runtime.CompilerServices;
 using Ara3D.Buffers;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 public static class StepTokenizer
 {

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepValue.cs b/Importers/Ifc/Speckle.Importers.Ifc/Ara3D.StepParser/StepValue.cs
@@ -2,7 +2,7 @@
 using Ara3D.Buffers;
 using Ara3D.Utils;
 
-namespace Speckle.Connectors.Ifc.Ara3D.StepParser;
+namespace Speckle.Importers.Ifc.Ara3D.StepParser;
 
 /// <summary>
 /// The base class of the different type of value items that can be found in a STEP file.

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Converters/GeometryConverter.cs b/Importers/Ifc/Speckle.Importers.Ifc/Converters/GeometryConverter.cs
@@ -1,8 +1,8 @@
-using Speckle.Connectors.Ifc.Types;
+using Speckle.Importers.Ifc.Types;
 using Speckle.InterfaceGenerator;
 using Speckle.Sdk.Models.Collections;
 
-namespace Speckle.Connectors.Ifc.Converters;
+namespace Speckle.Importers.Ifc.Converters;
 
 [GenerateAutoInterface]
 public class GeometryConverter(IMeshConverter meshConverter) : IGeometryConverter

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Converters/GraphConverter.cs b/Importers/Ifc/Speckle.Importers.Ifc/Converters/GraphConverter.cs
@@ -1,10 +1,10 @@
-using Speckle.Connectors.Ifc.Ara3D.IfcParser;
-using Speckle.Connectors.Ifc.Types;
+using Speckle.Importers.Ifc.Ara3D.IfcParser;
+using Speckle.Importers.Ifc.Types;
 using Speckle.InterfaceGenerator;
 using Speckle.Sdk.Models;
 using Speckle.Sdk.Models.Collections;
 
-namespace Speckle.Connectors.Ifc.Converters;
+namespace Speckle.Importers.Ifc.Converters;
 
 [GenerateAutoInterface]
 public class GraphConverter(INodeConverter nodeConverter) : IGraphConverter

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Converters/MeshConverter.cs b/Importers/Ifc/Speckle.Importers.Ifc/Converters/MeshConverter.cs
@@ -1,8 +1,8 @@
-using Speckle.Connectors.Ifc.Types;
+using Speckle.Importers.Ifc.Types;
 using Speckle.InterfaceGenerator;
 using Speckle.Objects.Geometry;
 
-namespace Speckle.Connectors.Ifc.Converters;
+namespace Speckle.Importers.Ifc.Converters;
 
 [GenerateAutoInterface]
 public class MeshConverter : IMeshConverter

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Converters/NodeConverter.cs b/Importers/Ifc/Speckle.Importers.Ifc/Converters/NodeConverter.cs
@@ -1,10 +1,10 @@
 using System.Reflection;
-using Speckle.Connectors.Ifc.Ara3D.IfcParser;
-using Speckle.Connectors.Ifc.Types;
+using Speckle.Importers.Ifc.Ara3D.IfcParser;
+using Speckle.Importers.Ifc.Types;
 using Speckle.InterfaceGenerator;
 using Speckle.Sdk.Models;
 
-namespace Speckle.Connectors.Ifc.Converters;
+namespace Speckle.Importers.Ifc.Converters;
 
 [GenerateAutoInterface]
 public class NodeConverter(IGeometryConverter geometryConverter) : INodeConverter

diff --git a/Importers/Ifc/Speckle.Importers.Ifc/Import.cs b/Importers/Ifc/Speckle.Importers.Ifc/Import.cs
@@ -2,9 +2,9 @@
 using System.Reflection;
 using Ara3D.Utils;
 using Microsoft.Extensions.DependencyInjection;
-using Speckle.Connectors.Ifc.Ara3D.IfcParser;
-using Speckle.Connectors.Ifc.Converters;
-using Speckle.Connectors.Ifc.Types;
+using Speckle.Importers.Ifc.Ara3D.IfcParser;
+using Speckle.Importers.Ifc.Converters;
+using Speckle.Importers.Ifc.Types;
 using Speckle.Objects.Geometry;
 using Speckle.Sdk;
 using Speckle.Sdk.Api;
@@ -17,7 +17,7 @@
 using Speckle.Sdk.Serialisation.V2.Send;
 using Speckle.Sdk.Transports;
 
-namespace Speckle.Connectors.Ifc;
+namespace Speckle.Importers.Ifc;
 
 public static class Import
 {
-Original file line number
+Diff line change
@@ Expand Up / @@ -198,6 +198,8 @@ void RemoveDirectory(string d) @@
           "dotnet",
           $"build {file} -c Release --no-restore -warnaserror -p:Version={version} -p:FileVersion={fileVersion} -v:m"
         );
+        RunAsync("dotnet", $"pack {file} -c Release -o output --no-build");
       }
     );
@@ Expand Down @@