diff --git a/.idea/git_toolbox_prj.xml b/.idea/git_toolbox_prj.xml
deleted file mode 100644
index b3820067b..000000000
--- a/.idea/git_toolbox_prj.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
deleted file mode 100644
index 03d9549ea..000000000
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/jsLinters/eslint.xml b/.idea/jsLinters/eslint.xml
deleted file mode 100644
index 541945bb0..000000000
--- a/.idea/jsLinters/eslint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index ab48a0deb..000000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/prettier.xml b/.idea/prettier.xml
deleted file mode 100644
index b0ab31a95..000000000
--- a/.idea/prettier.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/spacedrive.iml b/.idea/spacedrive.iml
deleted file mode 100644
index 8b6c8b437..000000000
--- a/.idea/spacedrive.iml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4..000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
deleted file mode 100644
index 4ddd94e56..000000000
--- a/.idea/workspace.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1643985169569
-
-
- 1643985169569
-
-
-
-
-
-
-
-
-
-
-
-
- 1645422057851
-
-
-
- 1645422057851
-
-
- 1645489326191
-
-
-
- 1645489326191
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.npmrc b/.npmrc
deleted file mode 100644
index d1cdf2f06..000000000
--- a/.npmrc
+++ /dev/null
@@ -1 +0,0 @@
-engine-strict = true
\ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index e784b55a9..5cd2d58a0 100644
Binary files a/Cargo.lock and b/Cargo.lock differ
diff --git a/Cargo.toml b/Cargo.toml
index bfd5459cf..272882047 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,5 +2,5 @@
members = [
"apps/debug",
"apps/desktop/src-tauri",
- "packages/core"
+ "core"
]
diff --git a/README.md b/README.md
index 373095ce1..46cbb8fd3 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ This project is using what I'm calling the **"PRRTT"** stack (Prisma, Rust, Reac
- Tauri allows us to create a pure Rust native OS webview, without the overhead of your average Electron app. This brings the bundle size and average memory usage down dramatically. It also contributes to a more native feel, especially on macOS due to Safari's close integration with the OS.
- ...
-Spacedrive's core (`sdcorelib`) is written in pure Rust, using the Tauri framework to embed a React app in a native browser window for UI. The mobile app is React Native, with `sdcorelib` embedded as a native binary.
+Spacedrive's core (`sdcore`) is written in pure Rust, using the Tauri framework to embed a React app in a native browser window for UI. The mobile app is React Native, with `sdcore` embedded as a native binary.
## Apps
- `desktop`: a [Tauri](https://nextjs.org) app
@@ -93,11 +93,11 @@ Spacedrive's core (`sdcorelib`) is written in pure Rust, using the Tauri framewo
## Packages
All TypeScript packages are compiled automatically using Turborepo.
-- `core`: the [Rust]() core logic library, referred to internally as `sdcorelib`
+- `core`: the [Rust]() core logic library, referred to internally as `sdcore`
- `state`: the [TypeScript]() core logic library
- `ui`: a [React Native]() / [RNW]() component library
- `config`: `eslint` configurations (includes `eslint-config-next`, `eslint-config-prettier` and all `tsconfig.json` configs used throughout the monorepo
-- `native-macos`: a [Swift]() native binary
+- `macos`: a [Swift]() native binary
- `native-ios`: a [Swift]() native binary
- `native-windows`: a [C#]() native binary
- `native-android`: a [Kotlin]() native binary
diff --git a/apps/debug/Cargo.toml b/apps/debug/Cargo.toml
index 1a0c8a57d..94ddcf1ed 100644
--- a/apps/debug/Cargo.toml
+++ b/apps/debug/Cargo.toml
@@ -10,4 +10,4 @@ anyhow = "1.0.56"
data-encoding = "2.3.2"
ring = "0.16.20"
sha256 = "1.0.3"
-# sdcorelib = { path = "../../packages/core" }
\ No newline at end of file
+# sdcore = { path = "../../packages/core" }
\ No newline at end of file
diff --git a/apps/desktop/package.json b/apps/desktop/package.json
index 13039bac6..09abe2252 100644
--- a/apps/desktop/package.json
+++ b/apps/desktop/package.json
@@ -34,7 +34,7 @@
"@radix-ui/react-dialog": "^0.1.5",
"@radix-ui/react-slider": "^0.1.4",
"@sd/core": "*",
- "@sd/state": "*",
+ "@sd/client": "*",
"@sd/ui": "*",
"@tauri-apps/api": "^1.0.0-beta.5",
"@types/pretty-bytes": "^5.2.0",
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
index dc7f32c4f..9a713509b 100644
--- a/apps/desktop/src-tauri/Cargo.toml
+++ b/apps/desktop/src-tauri/Cargo.toml
@@ -16,7 +16,7 @@ swift-rs = "0.2.3"
[dependencies]
# Project dependencies
tauri = { version = "1.0.0-rc.6", features = ["api-all", "macos-private-api"] }
-sdcorelib = { path = "../../../packages/core" }
+sdcore = { path = "../../../core" }
# tauri-plugin-shadows = { git = "https://github.com/tauri-apps/tauri-plugin-shadows", features = ["tauri-impl"] }
# Universal Dependencies
diff --git a/apps/desktop/src-tauri/src/build.rs b/apps/desktop/src-tauri/src/build.rs
index 2959a1954..5e6666d8b 100644
--- a/apps/desktop/src-tauri/src/build.rs
+++ b/apps/desktop/src-tauri/src/build.rs
@@ -5,7 +5,7 @@ fn main() {
// std::env::set_var("CARGO_CFG_TARGET_ARCH", "arm64");
// link_swift();
- // link_swift_package("swift-lib", "../../../packages/native-macos/");
+ // link_swift_package("swift-lib", "../../../packages/macos/");
tauri_build::build();
}
diff --git a/apps/desktop/src-tauri/src/commands.rs b/apps/desktop/src-tauri/src/commands.rs
index b94364789..9b8013106 100644
--- a/apps/desktop/src-tauri/src/commands.rs
+++ b/apps/desktop/src-tauri/src/commands.rs
@@ -1,6 +1,6 @@
// // DEPRECATE EVERYTHING IN THIS FILE
// use anyhow::Result;
-// use sdcorelib::{
+// use sdcore::{
// file::{indexer, retrieve, retrieve::Directory, watcher::watch_dir},
// state::{client, client::ClientState},
// sys,
diff --git a/apps/desktop/src-tauri/src/main.rs b/apps/desktop/src-tauri/src/main.rs
index fa73167c7..42a1a4bfb 100644
--- a/apps/desktop/src-tauri/src/main.rs
+++ b/apps/desktop/src-tauri/src/main.rs
@@ -1,6 +1,6 @@
use std::time::{Duration, Instant};
-use sdcorelib::{ClientCommand, ClientQuery, Core, CoreController, CoreEvent, CoreResponse};
+use sdcore::{ClientCommand, ClientQuery, Core, CoreController, CoreEvent, CoreResponse};
use tauri::api::path;
use tauri::Manager;
mod menu;
diff --git a/apps/desktop/src/components/file/Sidebar.tsx b/apps/desktop/src/components/file/Sidebar.tsx
index d140ade39..d453de110 100644
--- a/apps/desktop/src/components/file/Sidebar.tsx
+++ b/apps/desktop/src/components/file/Sidebar.tsx
@@ -3,13 +3,13 @@ import { CogIcon, EyeOffIcon, PlusIcon, ServerIcon } from '@heroicons/react/soli
import { appWindow } from '@tauri-apps/api/window';
import clsx from 'clsx';
import { CirclesFour, EjectSimple, MonitorPlay, Planet } from 'phosphor-react';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
import { NavLink, NavLinkProps } from 'react-router-dom';
import { TrafficLights } from '../os/TrafficLights';
import { Button } from '../primitive';
import { Dropdown } from '../primitive/Dropdown';
import { DefaultProps } from '../primitive/types';
-import { useBridgeQuery } from '@sd/state';
+import { useBridgeQuery } from '@sd/client';
import { platform } from '@tauri-apps/api/os';
interface SidebarProps extends DefaultProps {}
diff --git a/apps/desktop/src/hooks/useCoreEvents.tsx b/apps/desktop/src/hooks/useCoreEvents.tsx
index 9fe46b1a5..5d03a5b9a 100644
--- a/apps/desktop/src/hooks/useCoreEvents.tsx
+++ b/apps/desktop/src/hooks/useCoreEvents.tsx
@@ -1,7 +1,7 @@
import { useEffect } from 'react';
import { emit, listen, Event } from '@tauri-apps/api/event';
// import { useExplorerStore } from '../store/explorer';
-import { CoreEvent } from '@sd/core';
+import { CoreEvent } from '../../../../core';
import { useQuery, useQueryClient } from 'react-query';
export function useCoreEvents() {
diff --git a/apps/desktop/src/index.tsx b/apps/desktop/src/index.tsx
index 68193059e..3a43fcb19 100644
--- a/apps/desktop/src/index.tsx
+++ b/apps/desktop/src/index.tsx
@@ -3,8 +3,8 @@ import ReactDOM from 'react-dom';
import App from './App';
import './style.css';
-import { ClientCommand, ClientQuery } from '@sd/core';
-import { BaseTransport, setTransport } from '@sd/state';
+import { ClientCommand, ClientQuery } from '../../../core';
+import { BaseTransport, setTransport } from '@sd/client';
import { invoke } from '@tauri-apps/api';
// bind state to core via Tauri
diff --git a/apps/desktop/src/screens/Spaces.tsx b/apps/desktop/src/screens/Spaces.tsx
index 4e785f7c1..a0962d1cb 100644
--- a/apps/desktop/src/screens/Spaces.tsx
+++ b/apps/desktop/src/screens/Spaces.tsx
@@ -1,4 +1,4 @@
-import { useBridgeQuery } from '@sd/state';
+import { useBridgeQuery } from '@sd/client';
import React from 'react';
import ReactJson from 'react-json-view';
import FileItem from '../components/file/FileItem';
diff --git a/apps/desktop/src/screens/settings/GeneralSettings.tsx b/apps/desktop/src/screens/settings/GeneralSettings.tsx
index bb12730b3..cf6d46eea 100644
--- a/apps/desktop/src/screens/settings/GeneralSettings.tsx
+++ b/apps/desktop/src/screens/settings/GeneralSettings.tsx
@@ -7,7 +7,7 @@ import Listbox from '../../components/primitive/Listbox';
import ReactJson from 'react-json-view';
import Slider from '../../components/primitive/Slider';
-import { useBridgeCommand, useBridgeQuery } from '@sd/state';
+import { useBridgeCommand, useBridgeQuery } from '@sd/client';
export default function GeneralSettings() {
const { data: volumes } = useBridgeQuery('SysGetVolumes');
diff --git a/packages/core/.gitignore b/core/.gitignore
similarity index 100%
rename from packages/core/.gitignore
rename to core/.gitignore
diff --git a/packages/core/.rustfmt.toml b/core/.rustfmt.toml
similarity index 100%
rename from packages/core/.rustfmt.toml
rename to core/.rustfmt.toml
diff --git a/packages/core/Cargo.toml b/core/Cargo.toml
similarity index 98%
rename from packages/core/Cargo.toml
rename to core/Cargo.toml
index 764122ed2..819fcb81b 100644
--- a/packages/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,5 +1,5 @@
[package]
-name = "sdcorelib"
+name = "sdcore"
version = "0.1.0"
description = "The next gen private virtual filesystem."
authors = ["NerdHouse, Inc.", "Jamie Pine"]
diff --git a/packages/core/bindings/ClientCommand.ts b/core/bindings/ClientCommand.ts
similarity index 100%
rename from packages/core/bindings/ClientCommand.ts
rename to core/bindings/ClientCommand.ts
diff --git a/packages/core/bindings/ClientQuery.ts b/core/bindings/ClientQuery.ts
similarity index 100%
rename from packages/core/bindings/ClientQuery.ts
rename to core/bindings/ClientQuery.ts
diff --git a/packages/core/bindings/ClientState.ts b/core/bindings/ClientState.ts
similarity index 100%
rename from packages/core/bindings/ClientState.ts
rename to core/bindings/ClientState.ts
diff --git a/packages/core/bindings/CoreEvent.ts b/core/bindings/CoreEvent.ts
similarity index 100%
rename from packages/core/bindings/CoreEvent.ts
rename to core/bindings/CoreEvent.ts
diff --git a/packages/core/bindings/CoreResource.ts b/core/bindings/CoreResource.ts
similarity index 100%
rename from packages/core/bindings/CoreResource.ts
rename to core/bindings/CoreResource.ts
diff --git a/packages/core/bindings/CoreResponse.ts b/core/bindings/CoreResponse.ts
similarity index 100%
rename from packages/core/bindings/CoreResponse.ts
rename to core/bindings/CoreResponse.ts
diff --git a/packages/core/bindings/Directory.ts b/core/bindings/Directory.ts
similarity index 100%
rename from packages/core/bindings/Directory.ts
rename to core/bindings/Directory.ts
diff --git a/packages/core/bindings/DirectoryWithContents.ts b/core/bindings/DirectoryWithContents.ts
similarity index 100%
rename from packages/core/bindings/DirectoryWithContents.ts
rename to core/bindings/DirectoryWithContents.ts
diff --git a/packages/core/bindings/EncryptionAlgorithm.ts b/core/bindings/EncryptionAlgorithm.ts
similarity index 100%
rename from packages/core/bindings/EncryptionAlgorithm.ts
rename to core/bindings/EncryptionAlgorithm.ts
diff --git a/packages/core/bindings/File.ts b/core/bindings/File.ts
similarity index 100%
rename from packages/core/bindings/File.ts
rename to core/bindings/File.ts
diff --git a/packages/core/bindings/FilePath.ts b/core/bindings/FilePath.ts
similarity index 100%
rename from packages/core/bindings/FilePath.ts
rename to core/bindings/FilePath.ts
diff --git a/packages/core/bindings/FileResource.ts b/core/bindings/FileResource.ts
similarity index 100%
rename from packages/core/bindings/FileResource.ts
rename to core/bindings/FileResource.ts
diff --git a/packages/core/bindings/FileType.ts b/core/bindings/FileType.ts
similarity index 100%
rename from packages/core/bindings/FileType.ts
rename to core/bindings/FileType.ts
diff --git a/packages/core/bindings/JobAction.ts b/core/bindings/JobAction.ts
similarity index 100%
rename from packages/core/bindings/JobAction.ts
rename to core/bindings/JobAction.ts
diff --git a/packages/core/bindings/JobMetadata.ts b/core/bindings/JobMetadata.ts
similarity index 100%
rename from packages/core/bindings/JobMetadata.ts
rename to core/bindings/JobMetadata.ts
diff --git a/packages/core/bindings/JobReport.ts b/core/bindings/JobReport.ts
similarity index 100%
rename from packages/core/bindings/JobReport.ts
rename to core/bindings/JobReport.ts
diff --git a/packages/core/bindings/JobResource.ts b/core/bindings/JobResource.ts
similarity index 100%
rename from packages/core/bindings/JobResource.ts
rename to core/bindings/JobResource.ts
diff --git a/packages/core/bindings/JobStatus.ts b/core/bindings/JobStatus.ts
similarity index 100%
rename from packages/core/bindings/JobStatus.ts
rename to core/bindings/JobStatus.ts
diff --git a/packages/core/bindings/LibraryState.ts b/core/bindings/LibraryState.ts
similarity index 100%
rename from packages/core/bindings/LibraryState.ts
rename to core/bindings/LibraryState.ts
diff --git a/packages/core/bindings/LocationResource.ts b/core/bindings/LocationResource.ts
similarity index 100%
rename from packages/core/bindings/LocationResource.ts
rename to core/bindings/LocationResource.ts
diff --git a/packages/core/bindings/Volume.ts b/core/bindings/Volume.ts
similarity index 100%
rename from packages/core/bindings/Volume.ts
rename to core/bindings/Volume.ts
diff --git a/packages/core/index.ts b/core/index.ts
similarity index 100%
rename from packages/core/index.ts
rename to core/index.ts
diff --git a/packages/core/package.json b/core/package.json
similarity index 100%
rename from packages/core/package.json
rename to core/package.json
diff --git a/packages/core/prisma/migrations/20220303102833_/migration.sql b/core/prisma/migrations/20220303102833_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220303102833_/migration.sql
rename to core/prisma/migrations/20220303102833_/migration.sql
diff --git a/packages/core/prisma/migrations/20220303120220_/migration.sql b/core/prisma/migrations/20220303120220_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220303120220_/migration.sql
rename to core/prisma/migrations/20220303120220_/migration.sql
diff --git a/packages/core/prisma/migrations/20220303131457_/migration.sql b/core/prisma/migrations/20220303131457_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220303131457_/migration.sql
rename to core/prisma/migrations/20220303131457_/migration.sql
diff --git a/packages/core/prisma/migrations/20220304090731_/migration.sql b/core/prisma/migrations/20220304090731_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220304090731_/migration.sql
rename to core/prisma/migrations/20220304090731_/migration.sql
diff --git a/packages/core/prisma/migrations/20220304104946_/migration.sql b/core/prisma/migrations/20220304104946_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220304104946_/migration.sql
rename to core/prisma/migrations/20220304104946_/migration.sql
diff --git a/packages/core/prisma/migrations/20220304120710_/migration.sql b/core/prisma/migrations/20220304120710_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220304120710_/migration.sql
rename to core/prisma/migrations/20220304120710_/migration.sql
diff --git a/packages/core/prisma/migrations/20220304124103_/migration.sql b/core/prisma/migrations/20220304124103_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220304124103_/migration.sql
rename to core/prisma/migrations/20220304124103_/migration.sql
diff --git a/packages/core/prisma/migrations/20220315120620_/migration.sql b/core/prisma/migrations/20220315120620_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220315120620_/migration.sql
rename to core/prisma/migrations/20220315120620_/migration.sql
diff --git a/packages/core/prisma/migrations/20220321193637_refactored_files/migration.sql b/core/prisma/migrations/20220321193637_refactored_files/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220321193637_refactored_files/migration.sql
rename to core/prisma/migrations/20220321193637_refactored_files/migration.sql
diff --git a/packages/core/prisma/migrations/20220321212645_/migration.sql b/core/prisma/migrations/20220321212645_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220321212645_/migration.sql
rename to core/prisma/migrations/20220321212645_/migration.sql
diff --git a/packages/core/prisma/migrations/20220321230705_/migration.sql b/core/prisma/migrations/20220321230705_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220321230705_/migration.sql
rename to core/prisma/migrations/20220321230705_/migration.sql
diff --git a/packages/core/prisma/migrations/20220325225157_/migration.sql b/core/prisma/migrations/20220325225157_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220325225157_/migration.sql
rename to core/prisma/migrations/20220325225157_/migration.sql
diff --git a/packages/core/prisma/migrations/20220326080900_/migration.sql b/core/prisma/migrations/20220326080900_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220326080900_/migration.sql
rename to core/prisma/migrations/20220326080900_/migration.sql
diff --git a/packages/core/prisma/migrations/20220327001019_/migration.sql b/core/prisma/migrations/20220327001019_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220327001019_/migration.sql
rename to core/prisma/migrations/20220327001019_/migration.sql
diff --git a/packages/core/prisma/migrations/20220327005808_/migration.sql b/core/prisma/migrations/20220327005808_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220327005808_/migration.sql
rename to core/prisma/migrations/20220327005808_/migration.sql
diff --git a/packages/core/prisma/migrations/20220329045012_/migration.sql b/core/prisma/migrations/20220329045012_/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/20220329045012_/migration.sql
rename to core/prisma/migrations/20220329045012_/migration.sql
diff --git a/packages/core/prisma/migrations/migration_lock.toml b/core/prisma/migrations/migration_lock.toml
similarity index 100%
rename from packages/core/prisma/migrations/migration_lock.toml
rename to core/prisma/migrations/migration_lock.toml
diff --git a/packages/core/prisma/migrations/migration_table/migration.sql b/core/prisma/migrations/migration_table/migration.sql
similarity index 100%
rename from packages/core/prisma/migrations/migration_table/migration.sql
rename to core/prisma/migrations/migration_table/migration.sql
diff --git a/packages/core/prisma/schema.prisma b/core/prisma/schema.prisma
similarity index 100%
rename from packages/core/prisma/schema.prisma
rename to core/prisma/schema.prisma
diff --git a/packages/core/scripts/bindingsIndex.ts b/core/scripts/bindingsIndex.ts
similarity index 100%
rename from packages/core/scripts/bindingsIndex.ts
rename to core/scripts/bindingsIndex.ts
diff --git a/packages/core/src/client/mod.rs b/core/src/client/mod.rs
similarity index 100%
rename from packages/core/src/client/mod.rs
rename to core/src/client/mod.rs
diff --git a/packages/core/src/crypto/encryption.rs b/core/src/crypto/encryption.rs
similarity index 100%
rename from packages/core/src/crypto/encryption.rs
rename to core/src/crypto/encryption.rs
diff --git a/packages/core/src/crypto/mod.rs b/core/src/crypto/mod.rs
similarity index 100%
rename from packages/core/src/crypto/mod.rs
rename to core/src/crypto/mod.rs
diff --git a/packages/core/src/db/migrate.rs b/core/src/db/migrate.rs
similarity index 100%
rename from packages/core/src/db/migrate.rs
rename to core/src/db/migrate.rs
diff --git a/packages/core/src/db/mod.rs b/core/src/db/mod.rs
similarity index 100%
rename from packages/core/src/db/mod.rs
rename to core/src/db/mod.rs
diff --git a/packages/core/src/encode/mod.rs b/core/src/encode/mod.rs
similarity index 100%
rename from packages/core/src/encode/mod.rs
rename to core/src/encode/mod.rs
diff --git a/packages/core/src/file/checksum.rs b/core/src/file/checksum.rs
similarity index 100%
rename from packages/core/src/file/checksum.rs
rename to core/src/file/checksum.rs
diff --git a/packages/core/src/file/explorer/mod.rs b/core/src/file/explorer/mod.rs
similarity index 100%
rename from packages/core/src/file/explorer/mod.rs
rename to core/src/file/explorer/mod.rs
diff --git a/packages/core/src/file/indexer.rs b/core/src/file/indexer.rs
similarity index 100%
rename from packages/core/src/file/indexer.rs
rename to core/src/file/indexer.rs
diff --git a/packages/core/src/file/mod.rs b/core/src/file/mod.rs
similarity index 100%
rename from packages/core/src/file/mod.rs
rename to core/src/file/mod.rs
diff --git a/packages/core/src/file/thumb.rs b/core/src/file/thumb.rs
similarity index 100%
rename from packages/core/src/file/thumb.rs
rename to core/src/file/thumb.rs
diff --git a/packages/core/src/file/watcher.rs b/core/src/file/watcher.rs
similarity index 100%
rename from packages/core/src/file/watcher.rs
rename to core/src/file/watcher.rs
diff --git a/packages/core/src/job/jobs.rs b/core/src/job/jobs.rs
similarity index 100%
rename from packages/core/src/job/jobs.rs
rename to core/src/job/jobs.rs
diff --git a/packages/core/src/job/mod.rs b/core/src/job/mod.rs
similarity index 100%
rename from packages/core/src/job/mod.rs
rename to core/src/job/mod.rs
diff --git a/packages/core/src/job/worker.rs b/core/src/job/worker.rs
similarity index 100%
rename from packages/core/src/job/worker.rs
rename to core/src/job/worker.rs
diff --git a/packages/core/src/lib.rs b/core/src/lib.rs
similarity index 100%
rename from packages/core/src/lib.rs
rename to core/src/lib.rs
diff --git a/packages/core/src/library/loader.rs b/core/src/library/loader.rs
similarity index 100%
rename from packages/core/src/library/loader.rs
rename to core/src/library/loader.rs
diff --git a/packages/core/src/library/mod.rs b/core/src/library/mod.rs
similarity index 100%
rename from packages/core/src/library/mod.rs
rename to core/src/library/mod.rs
diff --git a/packages/core/src/native/methods.rs b/core/src/native/methods.rs
similarity index 100%
rename from packages/core/src/native/methods.rs
rename to core/src/native/methods.rs
diff --git a/packages/core/src/native/mod.rs b/core/src/native/mod.rs
similarity index 100%
rename from packages/core/src/native/mod.rs
rename to core/src/native/mod.rs
diff --git a/packages/core/src/native/swift.rs b/core/src/native/swift.rs
similarity index 100%
rename from packages/core/src/native/swift.rs
rename to core/src/native/swift.rs
diff --git a/packages/core/src/p2p/discover.rs b/core/src/p2p/discover.rs
similarity index 100%
rename from packages/core/src/p2p/discover.rs
rename to core/src/p2p/discover.rs
diff --git a/packages/core/src/p2p/listener.rs b/core/src/p2p/listener.rs
similarity index 100%
rename from packages/core/src/p2p/listener.rs
rename to core/src/p2p/listener.rs
diff --git a/packages/core/src/p2p/mod.rs b/core/src/p2p/mod.rs
similarity index 100%
rename from packages/core/src/p2p/mod.rs
rename to core/src/p2p/mod.rs
diff --git a/packages/core/src/p2p/pool.rs b/core/src/p2p/pool.rs
similarity index 100%
rename from packages/core/src/p2p/pool.rs
rename to core/src/p2p/pool.rs
diff --git a/packages/core/src/prisma.rs b/core/src/prisma.rs
similarity index 100%
rename from packages/core/src/prisma.rs
rename to core/src/prisma.rs
diff --git a/packages/core/src/secret/keygen.rs b/core/src/secret/keygen.rs
similarity index 100%
rename from packages/core/src/secret/keygen.rs
rename to core/src/secret/keygen.rs
diff --git a/packages/core/src/secret/mod.rs b/core/src/secret/mod.rs
similarity index 100%
rename from packages/core/src/secret/mod.rs
rename to core/src/secret/mod.rs
diff --git a/packages/core/src/state/client.rs b/core/src/state/client.rs
similarity index 100%
rename from packages/core/src/state/client.rs
rename to core/src/state/client.rs
diff --git a/packages/core/src/state/mod.rs b/core/src/state/mod.rs
similarity index 100%
rename from packages/core/src/state/mod.rs
rename to core/src/state/mod.rs
diff --git a/packages/core/src/sync/mod.rs b/core/src/sync/mod.rs
similarity index 100%
rename from packages/core/src/sync/mod.rs
rename to core/src/sync/mod.rs
diff --git a/packages/core/src/sys/locations.rs b/core/src/sys/locations.rs
similarity index 100%
rename from packages/core/src/sys/locations.rs
rename to core/src/sys/locations.rs
diff --git a/packages/core/src/sys/mod.rs b/core/src/sys/mod.rs
similarity index 100%
rename from packages/core/src/sys/mod.rs
rename to core/src/sys/mod.rs
diff --git a/packages/core/src/sys/volumes.rs b/core/src/sys/volumes.rs
similarity index 100%
rename from packages/core/src/sys/volumes.rs
rename to core/src/sys/volumes.rs
diff --git a/packages/core/src/util/commit.rs b/core/src/util/commit.rs
similarity index 100%
rename from packages/core/src/util/commit.rs
rename to core/src/util/commit.rs
diff --git a/packages/core/src/util/mod.rs b/core/src/util/mod.rs
similarity index 100%
rename from packages/core/src/util/mod.rs
rename to core/src/util/mod.rs
diff --git a/packages/core/src/util/time.rs b/core/src/util/time.rs
similarity index 100%
rename from packages/core/src/util/time.rs
rename to core/src/util/time.rs
diff --git a/docs/Dataflow.md b/docs/architecture/Dataflow.md
similarity index 100%
rename from docs/Dataflow.md
rename to docs/architecture/Dataflow.md
diff --git a/docs/FileIndexing.md b/docs/architecture/FileIndexing.md
similarity index 100%
rename from docs/FileIndexing.md
rename to docs/architecture/FileIndexing.md
diff --git a/docs/FileProperties.md b/docs/architecture/FileProperties.md
similarity index 100%
rename from docs/FileProperties.md
rename to docs/architecture/FileProperties.md
diff --git a/docs/RustTypescriptData.md b/docs/architecture/RustTypescriptData.md
similarity index 100%
rename from docs/RustTypescriptData.md
rename to docs/architecture/RustTypescriptData.md
diff --git a/docs/Sync Architecture.md b/docs/architecture/Sync Architecture.md
similarity index 100%
rename from docs/Sync Architecture.md
rename to docs/architecture/Sync Architecture.md
diff --git a/.idea/.gitignore b/docs/product/introduction.md
similarity index 100%
rename from .idea/.gitignore
rename to docs/product/introduction.md
diff --git a/package.json b/package.json
index db5221406..66e62b34d 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"scripts": {
"build": "turbo run build",
"setup": "pnpm i && pnpm db:gen && pnpm dev",
- "dev": "turbo run dev --parallel --scope=@sd/desktop --scope=@sd/state --scope=@sd/ui",
+ "dev": "turbo run dev --parallel --scope=@sd/desktop --scope=@sd/client --scope=@sd/ui",
"db:migrate": "cd packages/core && prisma migrate dev",
"db:gen": "pnpm core prisma generate",
"lint": "turbo run lint",
@@ -33,7 +33,7 @@
"web": "pnpm --filter @sd/web -- ",
"core": "pnpm --filter @sd/core -- ",
"docs": "pnpm --filter @sd/docs -- ",
- "state": "pnpm --filter @sd/state -- ",
+ "state": "pnpm --filter @sd/client -- ",
"server": "pnpm --filter @sd/server -- "
},
"devDependencies": {
diff --git a/packages/state/.eslintrc.js b/packages/client/.eslintrc.js
similarity index 100%
rename from packages/state/.eslintrc.js
rename to packages/client/.eslintrc.js
diff --git a/packages/state/.gitignore b/packages/client/.gitignore
similarity index 100%
rename from packages/state/.gitignore
rename to packages/client/.gitignore
diff --git a/packages/native-macos/README.md b/packages/client/README.md
similarity index 100%
rename from packages/native-macos/README.md
rename to packages/client/README.md
diff --git a/packages/state/lib/bridge.ts b/packages/client/lib/bridge.ts
similarity index 100%
rename from packages/state/lib/bridge.ts
rename to packages/client/lib/bridge.ts
diff --git a/packages/state/lib/files/index.ts b/packages/client/lib/files/index.ts
similarity index 100%
rename from packages/state/lib/files/index.ts
rename to packages/client/lib/files/index.ts
diff --git a/packages/state/lib/files/query.ts b/packages/client/lib/files/query.ts
similarity index 100%
rename from packages/state/lib/files/query.ts
rename to packages/client/lib/files/query.ts
diff --git a/packages/state/lib/files/state.ts b/packages/client/lib/files/state.ts
similarity index 100%
rename from packages/state/lib/files/state.ts
rename to packages/client/lib/files/state.ts
diff --git a/packages/state/lib/index.ts b/packages/client/lib/index.ts
similarity index 100%
rename from packages/state/lib/index.ts
rename to packages/client/lib/index.ts
diff --git a/packages/state/package.json b/packages/client/package.json
similarity index 96%
rename from packages/state/package.json
rename to packages/client/package.json
index f298366d6..f157ce340 100644
--- a/packages/state/package.json
+++ b/packages/client/package.json
@@ -1,5 +1,5 @@
{
- "name": "@sd/state",
+ "name": "@sd/client",
"version": "0.0.0",
"main": "./dist/index.js",
"types": "./dist/index.d.ts",
diff --git a/packages/state/tsconfig.json b/packages/client/tsconfig.json
similarity index 100%
rename from packages/state/tsconfig.json
rename to packages/client/tsconfig.json
diff --git a/packages/native-macos/.gitignore b/packages/macos/.gitignore
similarity index 100%
rename from packages/native-macos/.gitignore
rename to packages/macos/.gitignore
diff --git a/packages/native-macos/.swiftpm/xcode/xcshareddata/xcschemes/swift-lib.xcscheme b/packages/macos/.swiftpm/xcode/xcshareddata/xcschemes/swift-lib.xcscheme
similarity index 100%
rename from packages/native-macos/.swiftpm/xcode/xcshareddata/xcschemes/swift-lib.xcscheme
rename to packages/macos/.swiftpm/xcode/xcshareddata/xcschemes/swift-lib.xcscheme
diff --git a/packages/native-macos/Package.resolved b/packages/macos/Package.resolved
similarity index 100%
rename from packages/native-macos/Package.resolved
rename to packages/macos/Package.resolved
diff --git a/packages/native-macos/Package.swift b/packages/macos/Package.swift
similarity index 100%
rename from packages/native-macos/Package.swift
rename to packages/macos/Package.swift
diff --git a/packages/state/README.md b/packages/macos/README.md
similarity index 100%
rename from packages/state/README.md
rename to packages/macos/README.md
diff --git a/packages/native-macos/TestPlan.xctestplan b/packages/macos/TestPlan.xctestplan
similarity index 100%
rename from packages/native-macos/TestPlan.xctestplan
rename to packages/macos/TestPlan.xctestplan
diff --git a/packages/native-macos/src/lib.swift b/packages/macos/src/lib.swift
similarity index 100%
rename from packages/native-macos/src/lib.swift
rename to packages/macos/src/lib.swift
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 21d5179d4..b5dfca18c 100644
Binary files a/pnpm-lock.yaml and b/pnpm-lock.yaml differ
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index fa0f9eed4..da3d18785 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,3 +1,4 @@
packages:
- 'packages/*'
- - 'apps/*'
\ No newline at end of file
+ - 'apps/*'
+ - 'core'