dep-vcs 0.0.3 → 0.0.5

package/bin/dep.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
 /**
- * dep - Simple version control
- * CLI Binary (v0.0.1)
+ * dep - Efficient version control.
+ * CLI (v0.0.5)
  */
 
 const dep = require('../index.js');

package/branching/index.js

@@ -1,6 +1,6 @@
 /**
- * dep - Simple version control
- * Module: Branching (v0.0.1)
+ * dep - Efficient version control.
+ * Module: Branching (v0.0.5)
  */
 
 const fs = require('fs');
@@ -133,7 +133,7 @@ function merge (targetBranch) {
 }
 
 module.exports = {
-  __libraryVersion: '0.0.1',
+  __libraryVersion: '0.0.5',
   __libraryAPIName: 'Branching',
   branch,
   checkout,

package/caches/index.js

@@ -1,12 +1,12 @@
 /**
- * dep - Simple version control
- * Module: Caches (v0.0.1)
+ * dep - Efficient version control.
+ * Module: Caches (v0.0.5)
  */
 
 const fs = require('fs');
 const path = require('path');
 
-const { checkout } = require('../Branching/index.js');
+const { checkout } = require('../branching/index.js');
 
 /**
  * Moves stage.json to a cache folder, or restores the most recent stash.
@@ -154,7 +154,7 @@ function rm (filePath) {
 }
 
 module.exports = {
-  __libraryVersion: '0.0.1',
+  __libraryVersion: '0.0.5',
   __libraryAPIName: 'Caches',
   stash,
   reset,

package/changes/index.js

@@ -1,6 +1,6 @@
 /**
- * dep - Simple version control
- * Module: Changes (v0.0.1)
+ * dep - Efficient version control.
+ * Module: Changes (v0.0.5)
  */
 
 const fs = require('fs');
@@ -113,7 +113,7 @@ function diff () {
 }
 
 module.exports = {
-  __libraryVersion: '0.0.1',
+  __libraryVersion: '0.0.5',
   __libraryAPIName: 'Changes',
   log,
   diff

package/contributions/index.js

@@ -1,21 +1,19 @@
 /**
- * dep - Simple version control
- * Module: Contributions (v0.0.1)
+ * dep - Efficient version control.
+ * Module: Contributions (v0.0.5)
  */
 
 const fs = require('fs');
 const path = require('path');
-const pkg = require('../package.json');
 
-const { checkout } = require('../Branching/index.js');
+const pkg = require('../package.json');
+const { checkout } = require('../branching/index.js');
 
 const DEP_HOST = pkg.depConfig.host || 'http://localhost:1337';
 
 /**
  * Configures the single URL endpoint in dep.json for synchronization.
- * Supports full URLs or "userName/repoName" slugs.
- * @param {string} input - The remote endpoint or slug.
- * @returns {string} The current remote URL.
+ * Supports full URLs or "handle/repo" slugs.
  */
 
 function remote (input) {
@@ -31,7 +29,7 @@ function remote (input) {
     let finalUrl = input;
 
     if (input.includes('/') && !input.startsWith('http')) {
-      finalUrl = `${DEP_HOST}/code/${input}`;
+      finalUrl = `${DEP_HOST}/${input}`;
     }
 
     manifest.remote = finalUrl;
@@ -42,8 +40,7 @@ function remote (input) {
 }
 
 /**
- * Downloads JSON diff files from the remote server into history/remote.
- * @returns {Promise<string>} Result message.
+ * Downloads JSON diff files from the remote server via POST.
  */
 
 async function fetchRemote () {
@@ -55,20 +52,50 @@ async function fetchRemote () {
   }
 
   const branch = depJson.active.branch;
+  const token = depJson.configuration.personalAccessToken;
+
+  const remoteParts = depJson.remote.split('/');
+  const repo = remoteParts.pop();
+  const handle = remoteParts.pop();
+
   const remoteBranchPath = path.join(depPath, 'history/remote', branch);
 
   if (!fs.existsSync(remoteBranchPath)) {
     fs.mkdirSync(remoteBranchPath, { recursive: true });
   }
 
-  const response = await fetch(`${depJson.remote}/history/remote/${branch}/manifest.json`);
+  const response = await fetch(`${DEP_HOST}/manifest`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      type: 'history',
+      handle,
+      repo,
+      branch,
+
+      ...(token && { personalAccessToken: token })
+    })
+  });
+
   const remoteManifest = await response.json();
 
   for (const commitHash of remoteManifest.commits) {
     const commitFilePath = path.join(remoteBranchPath, `${commitHash}.json`);
 
     if (!fs.existsSync(commitFilePath)) {
-      const commitResponse = await fetch(`${depJson.remote}/history/remote/${branch}/${commitHash}.json`);
+      const commitResponse = await fetch(`${DEP_HOST}/commit`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          handle,
+          repo,
+          branch,
+          hash: commitHash,
+
+          ...(token && { personalAccessToken: token })
+        })
+      });
+
       const commitDiff = await commitResponse.json();
 
       fs.writeFileSync(commitFilePath, JSON.stringify(commitDiff, null, 2));
@@ -137,9 +164,27 @@ async function push () {
   }
 
   const branch = depJson.active.branch;
+  const token = depJson.configuration.personalAccessToken;
+
+  const remoteParts = depJson.remote.split('/');
+  const repo = remoteParts.pop();
+  const handle = remoteParts.pop();
+
   const localManifest = JSON.parse(fs.readFileSync(path.join(depPath, 'history/local', branch, 'manifest.json'), 'utf8'));
 
-  const response = await fetch(`${depJson.remote}/history/remote/${branch}/manifest.json`);
+  const response = await fetch(`${DEP_HOST}/manifest`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      type: 'history',
+      handle,
+      repo,
+      branch,
+
+      ...(token && { personalAccessToken: token })
+    })
+  });
+
   const remoteManifest = await response.json();
 
   const missingCommits = localManifest.commits.filter(hash => !remoteManifest.commits.includes(hash));
@@ -151,12 +196,16 @@ async function push () {
   for (const commitHash of missingCommits) {
     const commitData = JSON.parse(fs.readFileSync(path.join(depPath, 'history/local', branch, `${commitHash}.json`), 'utf8'));
 
-    await fetch(`${depJson.remote}/source/push`, {
+    await fetch(`${DEP_HOST}/push`, {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify({
-        branch: branch,
-        commit: commitData
+        handle,
+        repo,
+        branch,
+        commit: commitData,
+
+        ...(token && { personalAccessToken: token })
       })
     });
   }

package/index.js

@@ -1,6 +1,6 @@
 /**
- * dep - Simple version control
- * Core Library Entry Point (v0.0.1)
+ * dep - Efficient version control.
+ * Core Library Entry Point (v0.0.5)
  */
 
 const Setup = require('./setup');
@@ -50,7 +50,7 @@ const dep = {
 
   // Metadata
 
-  version: '0.0.1',
+  version: '0.0.5',
   modules: [
     Setup.__libraryAPIName,
     Workflow.__libraryAPIName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dep-vcs",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Efficient version control.",
   "main": "index.js",
   "bin": {

package/setup/index.js

@@ -1,18 +1,17 @@
 /**
- * dep - Simple version control
- * Module: Setup (v0.0.1)
+ * dep - Efficient version control.
+ * Module: Setup (v0.0.5)
  */
 
 const fs = require('fs');
 const path = require('path');
 
 const pkg = require('../package.json');
+
 const DEP_HOST = pkg.depConfig.host || 'http://localhost:1337';
 
 /**
  * Initializes the local .dep directory structure.
- * @param {string} directoryPath - The path where the repository should be initialized.
- * @returns {string} A message indicating the result of the operation.
  */
 
 function init (directoryPath = process.cwd()) {
@@ -20,7 +19,7 @@ function init (directoryPath = process.cwd()) {
 
   const folders = [
     '',
-    'data',
+    'root',
     'history',
     'history/local',
     'history/local/main',
@@ -41,15 +40,13 @@ function init (directoryPath = process.cwd()) {
   }
 
   const files = fs.readdirSync(directoryPath).filter(f => f !== '.dep');
-
-  const dataManifest = {
-    files: []
-  };
+  const rootManifest = { files: [] };
 
   for (const file of files) {
     const fullPath = path.join(directoryPath, file);
+
     if (fs.lstatSync(fullPath).isFile()) {
-      dataManifest.files.push({
+      rootManifest.files.push({
         path: file,
         content: fs.readFileSync(fullPath, 'utf8')
       });
@@ -57,28 +54,19 @@ function init (directoryPath = process.cwd()) {
   }
 
   fs.writeFileSync(
-    path.join(depDirectory, 'data/manifest.json'),
-    JSON.stringify(dataManifest, null, 2)
+    path.join(depDirectory, 'root/manifest.json'),
+    JSON.stringify(rootManifest, null, 2)
   );
 
-  const historyManifest = {
-    commits: []
-  };
-
   fs.writeFileSync(
     path.join(depDirectory, 'history/local/main/manifest.json'),
-    JSON.stringify(historyManifest, null, 2)
+    JSON.stringify({ commits: [] }, null, 2)
   );
 
   const depFile = {
-    active: {
-      branch: 'main',
-      parent: null
-    },
+    active: { branch: 'main', parent: null },
     remote: '',
-    configuration: {
-      userName: ''
-    }
+    configuration: { handle: '', personalAccessToken: '' }
   };
 
   fs.writeFileSync(
@@ -90,9 +78,7 @@ function init (directoryPath = process.cwd()) {
 }
 
 /**
- * Clones a repository, populates "data", and replays "history".
- * @param {string} repoSlug - The "userName/repoName" slug.
- * @returns {Promise<string>}
+ * Clones a repository by fetching manifests and commits via POST.
  */
 
 async function clone (repoSlug) {
@@ -100,8 +86,8 @@ async function clone (repoSlug) {
     throw new Error('A valid slug is required.');
   }
 
-  const [userName, repoName] = repoSlug.split('/');
-  const targetPath = path.join(process.cwd(), repoName);
+  const [handle, repo] = repoSlug.split('/');
+  const targetPath = path.join(process.cwd(), repo);
   const depPath = path.join(targetPath, '.dep');
 
   if (fs.existsSync(targetPath)) {
@@ -111,27 +97,65 @@ async function clone (repoSlug) {
   fs.mkdirSync(targetPath);
   init(targetPath);
 
-  const dataRes = await fetch(`${DEP_HOST}/${userName}/${repoName}/data/manifest.json`);
-  const dataManifest = await dataRes.json();
+  const depJson = JSON.parse(fs.readFileSync(path.join(depPath, 'dep.json'), 'utf8'));
+  const token = depJson.configuration.personalAccessToken;
+
+  const rootRes = await fetch(`${DEP_HOST}/manifest`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      type: 'root',
+      handle,
+      repo,
+      branch: 'main',
 
-  if (dataManifest.files) {
-    for (const file of dataManifest.files) {
-      const internalDataPath = path.join(depPath, 'data', file.path);
+      ...(token && { personalAccessToken: token })
+    })
+  });
+
+  const rootManifest = await rootRes.json();
+
+  if (rootManifest.files) {
+    for (const file of rootManifest.files) {
+      const internalRootPath = path.join(depPath, 'root', file.path);
       const workingPath = path.join(targetPath, file.path);
 
-      fs.mkdirSync(path.dirname(internalDataPath), { recursive: true });
-      fs.writeFileSync(internalDataPath, file.content);
+      fs.mkdirSync(path.dirname(internalRootPath), { recursive: true });
+      fs.writeFileSync(internalRootPath, file.content);
       fs.writeFileSync(workingPath, file.content);
     }
   }
 
-  const historyUrl = `${DEP_HOST}/${userName}/${repoName}/history/remote/main/manifest.json`;
-  const historyRes = await fetch(historyUrl);
+  const historyRes = await fetch(`${DEP_HOST}/manifest`, {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({
+      type: 'history',
+      handle,
+      repo,
+      branch: 'main',
+
+      ...(token && { personalAccessToken: token })
+    })
+  });
+
   const historyManifest = await historyRes.json();
 
   if (historyManifest.commits) {
     for (const commitHash of historyManifest.commits) {
-      const commitRes = await fetch(`${DEP_HOST}/${userName}/${repoName}/history/remote/main/${commitHash}.json`);
+      const commitRes = await fetch(`${DEP_HOST}/commit`, {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          handle,
+          repo,
+          branch: 'main',
+          hash: commitHash,
+
+          ...(token && { personalAccessToken: token })
+        })
+      });
+
       const commitDiff = await commitRes.json();
 
       for (const filePath of Object.keys(commitDiff.changes)) {
@@ -139,23 +163,19 @@ async function clone (repoSlug) {
         const changeSet = commitDiff.changes[filePath];
 
         if (Array.isArray(changeSet)) {
-          let currentContent = fs.existsSync(fullPath)
-            ? fs.readFileSync(fullPath, 'utf8')
-            : '';
+          let currentContent = fs.existsSync(fullPath) ? fs.readFileSync(fullPath, 'utf8') : '';
 
           for (const operation of changeSet) {
             if (operation.type === 'insert') {
-              currentContent = `${currentContent.slice(0, operation.position)}${operation.content}${currentContent.slice(operation.position)}`;
+              currentContent = currentContent.slice(0, operation.position) + operation.content + currentContent.slice(operation.position);
             } else if (operation.type === 'delete') {
-              currentContent = `${currentContent.slice(0, operation.position)}${currentContent.slice(operation.position + operation.length)}`;
+              currentContent = currentContent.slice(0, operation.position) + currentContent.slice(operation.position + operation.length);
             }
           }
 
           fs.writeFileSync(fullPath, currentContent);
         } else if (changeSet.type === 'deleteFile') {
-          if (fs.existsSync(fullPath)) {
-            fs.unlinkSync(fullPath);
-          }
+          if (fs.existsSync(fullPath)) fs.unlinkSync(fullPath);
         } else if (changeSet.type === 'createFile') {
           fs.writeFileSync(fullPath, changeSet.content || '');
         }
@@ -186,6 +206,7 @@ function config (key, value) {
 
   if (key && value !== undefined) {
     manifest.configuration[key] = value;
+
     fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2));
   }
 

package/utils/getStateByHash/index.js

@@ -1,6 +1,6 @@
 /**
- * dep - Simple version control
- * Module: Utils (v0.0.1)
+ * dep - Efficient version control.
+ * Module: Utils (v0.0.5)
  */
 
 const fs = require('fs');
@@ -12,36 +12,37 @@ const path = require('path');
 
 module.exports = (branchName, targetHash) => {
   const depPath = path.join(process.cwd(), '.dep');
-  const dataPath = path.join(depPath, 'data/manifest.json');
+  const rootPath = path.join(depPath, 'root/manifest.json');
 
-  if (!fs.existsSync(dataPath)) return {};
+  if (!fs.existsSync(rootPath)) return {};
 
-  const dataManifest = JSON.parse(fs.readFileSync(dataPath, 'utf8'));
+  const rootManifest = JSON.parse(fs.readFileSync(rootPath, 'utf8'));
   const branchPath = path.join(depPath, 'history/local', branchName);
   const manifestPath = path.join(branchPath, 'manifest.json');
 
   if (!fs.existsSync(manifestPath)) return {};
 
   const manifest = JSON.parse(fs.readFileSync(manifestPath, 'utf8'));
+
   let state = {};
 
-  for (const file of dataManifest.files) {
-   state[file.path] = file.content;
+  for (const file of rootManifest.files) {
+    state[file.path] = file.content;
   }
 
   for (const hash of manifest.commits) {
-   const commitPath = path.join(branchPath, `${hash}.json`);
-   const commit = JSON.parse(fs.readFileSync(commitPath, 'utf8'));
-
-   for (const [filePath, change] of Object.entries(commit.changes)) {
-     if (change.type === 'createFile' || change.type === 'update') {
-       state[filePath] = change.content;
-     } else if (change.type === 'deleteFile') {
-       delete state[filePath];
-     }
-   }
-
-   if (hash === targetHash) break;
+    const commitPath = path.join(branchPath, `${hash}.json`);
+    const commit = JSON.parse(fs.readFileSync(commitPath, 'utf8'));
+
+    for (const [filePath, change] of Object.entries(commit.changes)) {
+      if (change.type === 'createFile' || change.type === 'update') {
+        state[filePath] = change.content;
+      } else if (change.type === 'deleteFile') {
+        delete state[filePath];
+      }
+    }
+
+    if (hash === targetHash) break;
   }
 
   return state;

package/workflow/index.js

@@ -1,6 +1,6 @@
 /**
- * dep - Simple version control
- * Module: Workflow (v0.0.1)
+ * dep - Efficient version control.
+ * Module: Workflow (v0.0.5)
  */
 
 const fs = require('fs');
@@ -140,7 +140,7 @@ function commit (message) {
 }
 
 module.exports = {
-  __libraryVersion: '0.0.1',
+  __libraryVersion: '0.0.5',
   __libraryAPIName: 'Workflow',
   status,
   add,