api -> objects

FeatherCMS · Mar 18, 2022 · 90013f6 · 90013f6
1 parent 593bfe2
commit 90013f6
Show file tree

Hide file tree

Showing 17 changed files with 42 additions and 44 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -28,21 +28,12 @@
           "version": "4.2.7"
         }
       },
-      {
-        "package": "feather-api",
-        "repositoryURL": "https://github.com/feathercms/feather-api",
-        "state": {
-          "branch": "main",
-          "revision": "52723c644a2f5b8b680f8b62f9fae2a8cf07cc6d",
-          "version": null
-        }
-      },
       {
         "package": "feather-core",
         "repositoryURL": "https://github.com/feathercms/feather-core",
         "state": {
           "branch": "dev",
-          "revision": "0855d9a322e692c06cd03133ba4fb29dffd6ddc4",
+          "revision": "a5df6b3986431e33663d294d0dee84814fccbd14",
           "version": null
         }
       },
@@ -55,6 +46,15 @@
           "version": null
         }
       },
+      {
+        "package": "feather-objects",
+        "repositoryURL": "https://github.com/feathercms/feather-objects",
+        "state": {
+          "branch": "main",
+          "revision": "169386ce3bf664fa768186467e4aec1caaee0fcf",
+          "version": null
+        }
+      },
       {
         "package": "fluent",
         "repositoryURL": "https://github.com/vapor/fluent",
@@ -69,8 +69,8 @@
         "repositoryURL": "https://github.com/vapor/fluent-kit.git",
         "state": {
           "branch": null,
-          "revision": "9c7fbdc931ef6afa2dcd45edf253d25cadbbd5fc",
-          "version": "1.22.0"
+          "revision": "19da0d91d0fa9a0cf93958d67823c0e94ef666f1",
+          "version": "1.23.0"
         }
       },
       {
@@ -159,8 +159,8 @@
         "repositoryURL": "https://github.com/binarybirds/swift-html",
         "state": {
           "branch": null,
-          "revision": "b2620a6747fd664c892cfd20ff38d4c445bfa0d3",
-          "version": "1.6.8"
+          "revision": "e07678a77d296e66fa891a9d4d08acc4471d1783",
+          "version": "1.6.11"
         }
       },
       {
@@ -177,8 +177,8 @@
         "repositoryURL": "https://github.com/apple/swift-metrics.git",
         "state": {
           "branch": null,
-          "revision": "3edd2f57afc4e68e23c3e4956bc8b65ca6b5b2ff",
-          "version": "2.2.0"
+          "revision": "eadb828f878fed144387e3845866225bb7082c56",
+          "version": "2.3.0"
         }
       },
       {
@@ -204,8 +204,8 @@
         "repositoryURL": "https://github.com/apple/swift-nio-http2.git",
         "state": {
           "branch": null,
-          "revision": "000ca94f9de92c95b9ac85d44600b7b0fe25a3e5",
-          "version": "1.19.2"
+          "revision": "ac2a5afce3dbb6795b4f78ec3f19726dc28f5617",
+          "version": "1.20.0"
         }
       },
       {
@@ -231,16 +231,16 @@
         "repositoryURL": "https://github.com/vapor/vapor",
         "state": {
           "branch": null,
-          "revision": "e0fd4f3d76469dd6a0efb2be5c0b2f96b7581187",
-          "version": "4.55.1"
+          "revision": "5861bf9e2cff2c4cb0dcfb0c15ecfaa8bc5630e0",
+          "version": "4.55.3"
         }
       },
       {
-        "package": "web-api",
-        "repositoryURL": "https://github.com/feathercms/web-api",
+        "package": "web-objects",
+        "repositoryURL": "https://github.com/feathercms/web-objects",
         "state": {
           "branch": "main",
-          "revision": "e3f6c517509b4a9c20b14feebfd47e7a2e7dc6d9",
+          "revision": "fef5a6fef17c4b0037405adff199afa47a0389dd",
           "version": null
         }
       },

diff --git a/Package.swift b/Package.swift
@@ -11,14 +11,12 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/feathercms/feather-core", .branch("dev")),
-        .package(url: "https://github.com/feathercms/feather-api", .branch("main")),
-        .package(url: "https://github.com/feathercms/web-api", .branch("main")),
+        .package(url: "https://github.com/feathercms/web-objects", .branch("main")),
     ],
     targets: [
         .target(name: "WebModule", dependencies: [
-                .product(name: "FeatherApi", package: "feather-api"),
-                .product(name: "WebApi", package: "web-api"),
                 .product(name: "Feather", package: "feather-core"),
+                .product(name: "WebObjects", package: "web-objects"),
             ],
             resources: [
                 .copy("Bundle"),

diff --git a/Sources/WebModule/Controllers/Admin/WebMenuAdminController.swift b/Sources/WebModule/Controllers/Admin/WebMenuAdminController.swift
@@ -8,7 +8,7 @@
 import Vapor
 import Feather
 import Fluent
-import WebApi
+import WebObjects
 
 struct WebMenuAdminController: AdminController {
     typealias ApiModel = Web.Menu

diff --git a/Sources/WebModule/Controllers/Admin/WebMenuItemAdminController.swift b/Sources/WebModule/Controllers/Admin/WebMenuItemAdminController.swift
@@ -8,7 +8,7 @@
 import Vapor
 import Feather
 import Fluent
-import WebApi
+import WebObjects
 
 struct WebMenuItemAdminController: AdminController {
     typealias ApiModel = Web.MenuItem

diff --git a/Sources/WebModule/Controllers/Admin/WebPageAdminController.swift b/Sources/WebModule/Controllers/Admin/WebPageAdminController.swift
@@ -8,7 +8,7 @@
 import Vapor
 import Feather
 import Fluent
-import WebApi
+import WebObjects
 
 struct WebPageAdminController: AdminController {
     typealias ApiModel = Web.Page

diff --git a/Sources/WebModule/Controllers/Apis/WebMenuApiController.swift b/Sources/WebModule/Controllers/Apis/WebMenuApiController.swift
@@ -8,7 +8,7 @@
 import Vapor
 import Feather
 import Fluent
-import WebApi
+import WebObjects
 
 extension Web.Menu.List: Content {}
 extension Web.Menu.Detail: Content {}

diff --git a/Sources/WebModule/Controllers/Apis/WebMenuItemApiController.swift b/Sources/WebModule/Controllers/Apis/WebMenuItemApiController.swift
@@ -8,7 +8,7 @@
 import Vapor
 import Feather
 import Fluent
-import WebApi
+import WebObjects
 
 extension Web.MenuItem.List: Content {}
 extension Web.MenuItem.Detail: Content {}

diff --git a/Sources/WebModule/Controllers/Apis/WebPageApiController.swift b/Sources/WebModule/Controllers/Apis/WebPageApiController.swift
@@ -8,7 +8,7 @@
 import Vapor
 import Feather
 import Fluent
-import WebApi
+import WebObjects
 
 extension Web.Page.List: Content {}
 extension Web.Page.Detail: Content {}

diff --git a/Sources/WebModule/Database/Models/WebPageModel.swift b/Sources/WebModule/Database/Models/WebPageModel.swift
@@ -8,7 +8,7 @@
 import Foundation
 import Fluent
 import Feather
-import FeatherApi
+import FeatherObjects
 
 final class WebPageModel: FeatherDatabaseModel {
     typealias Module = WebModule

diff --git a/Sources/WebModule/Editors/WebMenuEditor.swift b/Sources/WebModule/Editors/WebMenuEditor.swift
@@ -8,7 +8,7 @@
 import Vapor
 import Feather
 import Fluent
-import WebApi
+import WebObjects
 
 struct WebMenuEditor: FeatherModelEditor {
     let model: WebMenuModel

diff --git a/Sources/WebModule/Editors/WebPageEditor.swift b/Sources/WebModule/Editors/WebPageEditor.swift
@@ -8,7 +8,7 @@
 import Vapor
 import Feather
 import Fluent
-import WebApi
+import WebObjects
 
 struct WebPageEditor: FeatherModelEditor {
     let model: WebPageModel

diff --git a/Sources/WebModule/Routers/WebRouter.swift b/Sources/WebModule/Routers/WebRouter.swift
@@ -7,8 +7,8 @@
 
 import Vapor
 import Feather
-import FeatherApi
-import WebApi
+import FeatherObjects
+import WebObjects
 
 
 struct WebRouter: FeatherRouter {

diff --git a/Sources/WebModule/Templates/Contexts/WebPageContext.swift b/Sources/WebModule/Templates/Contexts/WebPageContext.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 18..
 //
 
-import WebApi
+import WebObjects
 
 public struct WebPageContext {
     public var page: Web.Page.Detail

diff --git a/Sources/WebModule/Templates/Contexts/WebRssContext.swift b/Sources/WebModule/Templates/Contexts/WebRssContext.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 23..
 //
 
-import FeatherApi
+import FeatherObjects
 
 public struct WebRssContext {
 

diff --git a/Sources/WebModule/Templates/Contexts/WebSitemapContext.swift b/Sources/WebModule/Templates/Contexts/WebSitemapContext.swift
@@ -5,7 +5,7 @@
 //  Created by Tibor Bodecs on 2021. 12. 23..
 //
 
-import FeatherApi
+import FeatherObjects
 
 public struct WebSitemapContext {
 

diff --git a/Sources/WebModule/Templates/Html/WebAdminWidgetTemplate.swift b/Sources/WebModule/Templates/Html/WebAdminWidgetTemplate.swift
@@ -9,7 +9,7 @@ import Vapor
 import Feather
 import SwiftHtml
 import FeatherIcons
-import WebApi
+import WebObjects
 
 struct WebAdminWidgetTemplate: TemplateRepresentable {
 

diff --git a/Sources/WebModule/WebModule.swift b/Sources/WebModule/WebModule.swift
@@ -8,8 +8,8 @@
 import Vapor
 import Fluent
 import Feather
-import FeatherApi
-import WebApi
+import FeatherObjects
+import WebObjects
 
 struct WebModule: FeatherModule {