sh3-core 0.20.2 → 0.20.3

package/dist/shell-shard/verbs/xfer.test.js

@@ -1,7 +1,7 @@
 import { describe, it, expect, vi } from 'vitest';
 import { xferVerb } from './xfer';
 function makeDocs(overrides = {}) {
-    return Object.assign({ listDocuments: vi.fn(async () => []), listShards: vi.fn(async () => []), watchDocuments: vi.fn(() => () => { }), transferToScope: vi.fn(async () => { }) }, overrides);
+    return Object.assign({ listDocuments: vi.fn(async () => []), listShards: vi.fn(async () => []), watchDocuments: vi.fn(() => () => { }), transferToScope: vi.fn(async () => { }), listDocumentsIn: vi.fn(async () => []), transferBetweenScopes: vi.fn(async () => { }) }, overrides);
 }
 function makeSh3(scope) {
     return {
@@ -32,13 +32,15 @@ describe('xfer verb', () => {
         const err = pushed.find((e) => e.kind === 'status' && e.level === 'error');
         expect(err).toBeDefined();
     });
-    it('emits error when active scope is not a project', async () => {
+    it('works from personal (non-project) scope', async () => {
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
         const sh3 = makeSh3(personalScope);
-        const { ctx, pushed } = makeCtx(makeDocs(), sh3);
-        await xferVerb.run(ctx, ['notes/draft.md', '@me:notes/draft.md']);
-        const err = pushed.find((e) => e.kind === 'status' && e.level === 'error');
-        expect(err).toBeDefined();
-        expect(err.text).toMatch(/project/i);
+        const { ctx, pushed } = makeCtx(docs, sh3);
+        await xferVerb.run(ctx, ['@me:notes/draft.md', '@project-proj-abc:notes/draft.md']);
+        expect(transferBetweenScopes).toHaveBeenCalledWith('user-me', 'notes', 'draft.md', 'proj-abc', 'notes', 'draft.md', expect.objectContaining({ delete: true }));
+        const ok = pushed.find((e) => e.kind === 'status' && e.level === 'info');
+        expect(ok).toBeDefined();
     });
     it('emits usage error when fewer than two args', async () => {
         const sh3 = makeSh3(projectScope);
@@ -47,50 +49,59 @@ describe('xfer verb', () => {
         const err = pushed.find((e) => e.kind === 'status' && e.level === 'error');
         expect(err.text).toMatch(/usage/i);
     });
-    it('moves (default) a doc from project to personal scope', async () => {
-        const transferToScope = vi.fn(async () => { });
-        const docs = makeDocs({ transferToScope });
+    it('moves a doc from project to personal scope', async () => {
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
         const sh3 = makeSh3(projectScope);
         const { ctx, pushed } = makeCtx(docs, sh3);
         await xferVerb.run(ctx, ['@project-proj-abc:notes/draft.md', '@me:notes/draft.md']);
-        expect(transferToScope).toHaveBeenCalledWith('notes', 'draft.md', 'user-me', expect.objectContaining({ delete: true }));
+        expect(transferBetweenScopes).toHaveBeenCalledWith('proj-abc', 'notes', 'draft.md', 'user-me', 'notes', 'draft.md', expect.objectContaining({ delete: true }));
         const ok = pushed.find((e) => e.kind === 'status' && e.level === 'info');
         expect(ok).toBeDefined();
     });
     it('-C flag copies without deleting source', async () => {
-        const transferToScope = vi.fn(async () => { });
-        const docs = makeDocs({ transferToScope });
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
         const sh3 = makeSh3(projectScope);
         const { ctx } = makeCtx(docs, sh3);
         await xferVerb.run(ctx, ['-C', '@project-proj-abc:notes/draft.md', '@me:notes/draft.md']);
-        expect(transferToScope).toHaveBeenCalledWith('notes', 'draft.md', 'user-me', expect.objectContaining({ delete: false }));
+        expect(transferBetweenScopes).toHaveBeenCalledWith('proj-abc', 'notes', 'draft.md', 'user-me', 'notes', 'draft.md', expect.objectContaining({ delete: false }));
     });
-    it('rejects when src scope is not the active project (v1 limitation)', async () => {
-        const transferToScope = vi.fn(async () => { });
-        const docs = makeDocs({ transferToScope });
+    it('allows @me as source when project scope is active', async () => {
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
         const sh3 = makeSh3(projectScope);
         const { ctx, pushed } = makeCtx(docs, sh3);
-        // @me src while project is active → src tenant differs from active
         await xferVerb.run(ctx, ['@me:notes/draft.md', '@project-proj-abc:notes/draft.md']);
-        expect(transferToScope).not.toHaveBeenCalled();
+        expect(transferBetweenScopes).toHaveBeenCalledWith('user-me', 'notes', 'draft.md', 'proj-abc', 'notes', 'draft.md', expect.objectContaining({ delete: true }));
+        const ok = pushed.find((e) => e.kind === 'status' && e.level === 'info');
+        expect(ok).toBeDefined();
+    });
+    it('emits error when source and destination are identical', async () => {
+        const transferBetweenScopes = vi.fn(async () => { });
+        const docs = makeDocs({ transferBetweenScopes });
+        const sh3 = makeSh3(projectScope);
+        const { ctx, pushed } = makeCtx(docs, sh3);
+        await xferVerb.run(ctx, ['@project-proj-abc:notes/draft.md', '@project-proj-abc:notes/draft.md']);
+        expect(transferBetweenScopes).not.toHaveBeenCalled();
         const err = pushed.find((e) => e.kind === 'status' && e.level === 'error');
-        expect(err).toBeDefined();
+        expect(err.text).toMatch(/same/i);
     });
     it('-R flag recurses over all docs matching src prefix', async () => {
-        const transferToScope = vi.fn(async () => { });
+        const transferBetweenScopes = vi.fn(async () => { });
         const allDocs = [
             { shardId: 'notes', path: 'ideas/a.md', size: 1, lastModified: 0 },
             { shardId: 'notes', path: 'ideas/b.md', size: 1, lastModified: 0 },
             { shardId: 'notes', path: 'other.md', size: 1, lastModified: 0 },
         ];
         const docs = makeDocs({
-            transferToScope,
-            listDocuments: vi.fn(async () => allDocs),
+            transferBetweenScopes,
+            listDocumentsIn: vi.fn(async () => allDocs),
         });
         const sh3 = makeSh3(projectScope);
         const { ctx } = makeCtx(docs, sh3);
         await xferVerb.run(ctx, ['-R', '@project-proj-abc:notes/ideas', '@me:notes/ideas']);
-        // Only the two docs under ideas/ should be transferred
-        expect(transferToScope).toHaveBeenCalledTimes(2);
+        expect(transferBetweenScopes).toHaveBeenCalledTimes(2);
+        expect(transferBetweenScopes).toHaveBeenCalledWith('proj-abc', 'notes', 'ideas/a.md', 'user-me', 'notes', 'ideas/a.md', expect.objectContaining({ delete: true }));
     });
 });

package/dist/version.d.ts

@@ -1,2 +1,2 @@
 /** Auto-generated from package.json — do not edit manually. */
-export declare const VERSION = "0.20.2";
+export declare const VERSION = "0.20.3";

package/dist/version.js

@@ -1,2 +1,2 @@
 /** Auto-generated from package.json — do not edit manually. */
-export const VERSION = '0.20.2';
+export const VERSION = '0.20.3';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sh3-core",
-  "version": "0.20.2",
+  "version": "0.20.3",
   "type": "module",
   "files": [
     "dist"