@estiva-app/interop 0.84.0 → 0.85.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +15 -0
- package/README.md +6 -0
- package/dist/folders.d.ts +4 -0
- package/dist/folders.d.ts.map +1 -1
- package/dist/folders.js +11 -2
- package/dist/folders.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/projection.d.ts +16 -0
- package/dist/projection.d.ts.map +1 -1
- package/dist/projection.js +45 -0
- package/dist/projection.js.map +1 -1
- package/dist/references.d.ts.map +1 -1
- package/dist/references.js +5 -3
- package/dist/references.js.map +1 -1
- package/package.json +1 -1
- package/src/folders.ts +22 -3
- package/src/index.ts +1 -0
- package/src/projection.ts +53 -0
- package/src/references.ts +5 -3
package/dist/references.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAML,KAAK,kBAAkB,EACvB,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAKL,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,OAAO,EACb,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAgB,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAMvF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAKxE,CAAA;
|
|
1
|
+
{"version":3,"file":"references.d.ts","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EAML,KAAK,kBAAkB,EACvB,KAAK,aAAa,EACnB,MAAM,0BAA0B,CAAA;AACjC,OAAO,EAKL,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,OAAO,EACb,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAgB,KAAK,WAAW,EAAE,KAAK,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAMvF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAKxE,CAAA;AA4BD,MAAM,WAAW,qBAAqB;IACpC,KAAK,CAAC,EAAE,eAAe,CAAA;IACvB,0FAA0F;IAC1F,EAAE,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;IAChC,6GAA6G;IAC7G,OAAO,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAC3B,mJAAmJ;IACnJ,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,uIAAuI;IACvI,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB;AAED,+GAA+G;AAC/G,eAAO,MAAM,WAAW,4BAA4B,CAAA;AAEpD;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,OAAO,EAAE,MAAM,EACf,EAAE,OAAY,EAAE,aAA2B,EAAE,GAAE,IAAI,CAAC,qBAAqB,EAAE,SAAS,GAAG,eAAe,CAAM,GAC3G,MAAM,CAGR;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,cAAc,CAClC,OAAO,EAAE,SAAS,CAAC,aAAa,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,EACtD,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,EAAE,KAAK,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAE,qBAA0B,GAC1E,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAgC/B;AAED,4GAA4G;AAC5G,MAAM,MAAM,aAAa,GAAG,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,OAAO,CAAC;IAAE,MAAM,EAAE,WAAW,EAAE,CAAC;IAAC,OAAO,EAAE,SAAS,WAAW,EAAE,CAAA;CAAE,CAAC,CAAA;AAEvI,MAAM,WAAW,2BAA4B,SAAQ,IAAI,CAAC,qBAAqB,EAAE,IAAI,CAAC;IACpF,2FAA2F;IAC3F,KAAK,CAAC,EAAE,MAAM,CAAA;IACd;;;;;OAKG;IACH,QAAQ,CAAC,EAAE;QACT,KAAK,EAAE,SAAS,MAAM,EAAE,CAAA;QACxB,KAAK,EAAE,aAAa,CAAA;QACpB,sGAAsG;QACtG,KAAK,CAAC,EAAE,MAAM,CAAA;KACf,CAAA;CACF;AAWD;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EACZ,KAAK,EAAE,OAAO,EACd,EAAE,KAAU,EAAE,QAAQ,EAAE,GAAG,OAAO,EAAE,GAAE,2BAAgC,GACrE,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAS/B"}
|
package/dist/references.js
CHANGED
|
@@ -36,10 +36,11 @@ const summaryOf = (object) => {
|
|
|
36
36
|
return slot && !slot.format ? slot.value.replace(/\s+/g, ' ').trim() || undefined : undefined;
|
|
37
37
|
};
|
|
38
38
|
const typeOf = (kind) => REFERENCE_FILE_TYPES[kind];
|
|
39
|
-
/** An object `[` may offer: a file kind it knows, resolved, with a title. */
|
|
39
|
+
/** An object `[` may offer: a file kind it knows, resolved, not deleted (SPEC §6.5), with a title. */
|
|
40
40
|
const offerable = (object) => !!object &&
|
|
41
41
|
!!object.address &&
|
|
42
42
|
!object.unreachable &&
|
|
43
|
+
!object.deleted &&
|
|
43
44
|
typeOf(object.kind) !== undefined &&
|
|
44
45
|
!!object.slots.title?.value.trim();
|
|
45
46
|
/**
|
|
@@ -74,8 +75,9 @@ export function pickedFileUri(address, { inOrder = [], projectOrigin = SHIP_ORIG
|
|
|
74
75
|
export async function fileCandidates(objects, tier, query, { cache, at, inOrder, projectOrigin, listRead } = {}) {
|
|
75
76
|
const files = objects.filter(offerable);
|
|
76
77
|
const parents = new Map();
|
|
78
|
+
// A deleted project names no issue's caption: it is found nowhere else either (SPEC §6.5).
|
|
77
79
|
for (const o of objects)
|
|
78
|
-
if (o?.address && !o.unreachable)
|
|
80
|
+
if (o?.address && !o.unreachable && !o.deleted)
|
|
79
81
|
parents.set(o.address, o);
|
|
80
82
|
const missing = [
|
|
81
83
|
...new Set(files.flatMap((o) => (o.kind === KIND_ISSUE && o.parentRef && !parents.has(o.parentRef) ? [o.parentRef] : []))),
|
|
@@ -83,7 +85,7 @@ export async function fileCandidates(objects, tier, query, { cache, at, inOrder,
|
|
|
83
85
|
if (missing.length) {
|
|
84
86
|
const read = await resolveForeignRoots(missing, query, cache, { listRead }).catch(() => []);
|
|
85
87
|
for (const parent of read)
|
|
86
|
-
if (parent.address)
|
|
88
|
+
if (parent.address && !parent.deleted)
|
|
87
89
|
parents.set(parent.address, parent);
|
|
88
90
|
}
|
|
89
91
|
return files.map((o) => {
|
package/dist/references.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"references.js","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,EACL,SAAS,EACT,aAAa,EACb,WAAW,EACX,cAAc,EACd,QAAQ,GAGT,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACL,cAAc,EACd,cAAc,EACd,kBAAkB,EAClB,mBAAmB,GAIpB,MAAM,iBAAiB,CAAA;AACxB,OAAO,EAAE,YAAY,EAAsC,MAAM,sBAAsB,CAAA;AAEvF,MAAM,YAAY,GAAG,KAAK,CAAA;AAC1B,MAAM,UAAU,GAAG,KAAK,CAAA;AACxB,MAAM,aAAa,GAAG,KAAK,CAAA;AAE3B;;;;GAIG;AACH,MAAM,CAAC,MAAM,oBAAoB,GAA4C;IAC3E,CAAC,YAAY,CAAC,EAAE,SAAS;IACzB,CAAC,UAAU,CAAC,EAAE,OAAO;IACrB,CAAC,cAAc,CAAC,EAAE,OAAO;IACzB,CAAC,aAAa,CAAC,EAAE,UAAU;CAC5B,CAAA;AAED,gGAAgG;AAChG,MAAM,SAAS,GAAG,CAAC,MAAqB,EAAsB,EAAE;IAC9D,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAA;IAClC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAA;AAC/F,CAAC,CAAA;AAED,MAAM,MAAM,GAAG,CAAC,IAAY,EAA6B,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAA;AAItF,
|
|
1
|
+
{"version":3,"file":"references.js","sourceRoot":"","sources":["../src/references.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@estiva-app/interop",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.85.0",
|
|
4
4
|
"description": "Render and act on another app's objects from its published NIP-89 manifest. The owner defines the projection; the consumer decides how it looks.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|
package/src/folders.ts
CHANGED
|
@@ -430,7 +430,15 @@ export function listedBeneath<T extends MovableFile>(listing: readonly T[], file
|
|
|
430
430
|
export function planMoveFile(
|
|
431
431
|
pubkey: string,
|
|
432
432
|
createdAtMs: number,
|
|
433
|
-
args: {
|
|
433
|
+
args: {
|
|
434
|
+
file: MovableFile
|
|
435
|
+
from: FolderRef
|
|
436
|
+
to: FolderRef
|
|
437
|
+
listing: readonly MovableFile[] | null
|
|
438
|
+
keepSpace?: boolean
|
|
439
|
+
/** The types the relay keeps in order: a moved file of one is named by its id, as {@link planPlaceFile} names it. */
|
|
440
|
+
inOrder?: readonly string[]
|
|
441
|
+
},
|
|
434
442
|
): MovePlan {
|
|
435
443
|
if (args.from.id === args.to.id) return { ok: true, events: [], moved: [] }
|
|
436
444
|
if (!args.from.hasState) return { ok: false, reason: 'source-has-no-state' }
|
|
@@ -446,7 +454,15 @@ export function planMoveFile(
|
|
|
446
454
|
const kept = args.keepSpace && file.address && moved.includes(file.address) ? [file.address] : []
|
|
447
455
|
return {
|
|
448
456
|
ok: true,
|
|
449
|
-
events: [
|
|
457
|
+
events: [
|
|
458
|
+
buildFolderCommand(pubkey, createdAtMs, {
|
|
459
|
+
folder: args.to.id,
|
|
460
|
+
op: 'move',
|
|
461
|
+
from: args.from.id,
|
|
462
|
+
addresses: moved.map((address) => listedAs(address, args.inOrder)),
|
|
463
|
+
spaces: kept.map((address) => listedAs(address, args.inOrder)),
|
|
464
|
+
}),
|
|
465
|
+
],
|
|
450
466
|
moved,
|
|
451
467
|
}
|
|
452
468
|
}
|
|
@@ -510,6 +526,8 @@ export function planMoveFromFolders(
|
|
|
510
526
|
listings: ReadonlyMap<string, readonly MovableFile[] | null>
|
|
511
527
|
/** The mover ticked "Keep it a space in <team>": the target's entry for the file carries the `space` role ({@link planMoveFile}). */
|
|
512
528
|
keepSpace?: boolean
|
|
529
|
+
/** The types the relay keeps in order: a moved or placed file of one is named by its id ({@link planMoveFile}). */
|
|
530
|
+
inOrder?: readonly string[]
|
|
513
531
|
},
|
|
514
532
|
): MoveFromFoldersPlan {
|
|
515
533
|
const { file, to } = args
|
|
@@ -528,6 +546,7 @@ export function planMoveFromFolders(
|
|
|
528
546
|
// By its address, so the walk finds what the listing draws beneath it.
|
|
529
547
|
listing: unresolved ? [{ ...file, ref: file.address! }, ...listing] : listing,
|
|
530
548
|
keepSpace: args.keepSpace,
|
|
549
|
+
inOrder: args.inOrder,
|
|
531
550
|
})
|
|
532
551
|
if (!plan.ok) return plan
|
|
533
552
|
for (const address of plan.moved) moved.add(address)
|
|
@@ -540,7 +559,7 @@ export function planMoveFromFolders(
|
|
|
540
559
|
// A topic on no list goes home: its `h` team, or the Company team when its `h` is no team. Which `h`
|
|
541
560
|
// is a team is the relay's to know, so the Company team is let through here and the relay decides.
|
|
542
561
|
if (file.address.startsWith(`${KIND.FILE}:`) &&file.scopedTo !== to.id && !to.company) return { ok: false, reason: 'target-is-not-home' }
|
|
543
|
-
return { ok: true, events: planPlaceFile(pubkey, createdAtMs, { folder: to.id, address: file.address, hasState: true }), moved: [file.address] }
|
|
562
|
+
return { ok: true, events: planPlaceFile(pubkey, createdAtMs, { folder: to.id, address: file.address, hasState: true, inOrder: args.inOrder }), moved: [file.address] }
|
|
544
563
|
}
|
|
545
564
|
return { ok: true, events, moved: [...moved] }
|
|
546
565
|
}
|
package/src/index.ts
CHANGED
package/src/projection.ts
CHANGED
|
@@ -7501,6 +7501,59 @@ export async function resolveFolderContents(
|
|
|
7501
7501
|
}
|
|
7502
7502
|
}
|
|
7503
7503
|
|
|
7504
|
+
/**
|
|
7505
|
+
* The deleted files a Folder lists, each with its `deleted` (SPEC §6.5): what
|
|
7506
|
+
* an Archive's Deleted filter draws, with who deleted each and when. A deleted
|
|
7507
|
+
* file stays listed in its Folder and every list leaves it out
|
|
7508
|
+
* ({@link resolveFolderContents}), so this is a read of its own, made where it
|
|
7509
|
+
* is drawn and nowhere else.
|
|
7510
|
+
*
|
|
7511
|
+
* With `listRead`, the Folder's files of the relay's file kinds are listed by
|
|
7512
|
+
* their fields first, in one request, and only the ones that answer nothing —
|
|
7513
|
+
* deleted, or not this reader's — are read whole: a deleted file is in no read
|
|
7514
|
+
* by its fields (§6.13), but stays readable by its id. Without it, each is read
|
|
7515
|
+
* whole, as every read was before.
|
|
7516
|
+
*/
|
|
7517
|
+
export async function resolveDeletedFiles(
|
|
7518
|
+
folder: string,
|
|
7519
|
+
query: QueryFn,
|
|
7520
|
+
lookupPeople?: PeopleFn,
|
|
7521
|
+
cache?: ProjectionCache,
|
|
7522
|
+
options: { listRead?: boolean } = {},
|
|
7523
|
+
): Promise<ForeignObject[]> {
|
|
7524
|
+
const [state] = await query([{ kinds: [KIND_FOLDER_STATE], '#d': [folder], limit: 1 }])
|
|
7525
|
+
const everyAddress =
|
|
7526
|
+
state && tagValue(state, 'd') === folder
|
|
7527
|
+
? await listedAddressesOf(state, query)
|
|
7528
|
+
: (await addressesByContainment(folder, query)).addresses
|
|
7529
|
+
const files = everyAddress.flatMap((address) => {
|
|
7530
|
+
const pointer = addressPointerOf(address)
|
|
7531
|
+
return pointer && FILE_KINDS.includes(pointer.kind) ? [{ address, pointer }] : []
|
|
7532
|
+
})
|
|
7533
|
+
let asked = files.map(({ address }) => address)
|
|
7534
|
+
if (options.listRead && files.length) {
|
|
7535
|
+
const groups = new Map<string, { pointer: AddressPointer; ds: string[] }>()
|
|
7536
|
+
for (const { pointer } of files) {
|
|
7537
|
+
const key = `${pointer.kind}:${pointer.pubkey}`
|
|
7538
|
+
const group = groups.get(key)
|
|
7539
|
+
if (group) group.ds.push(pointer.identifier)
|
|
7540
|
+
else groups.set(key, { pointer, ds: [pointer.identifier] })
|
|
7541
|
+
}
|
|
7542
|
+
const listed = await queryChunked(
|
|
7543
|
+
[...groups.values()].map(({ pointer, ds }) => ({ kinds: [pointer.kind], authors: [pointer.pubkey], '#d': ds, limit: ds.length, fields: 'newest' })),
|
|
7544
|
+
query,
|
|
7545
|
+
)
|
|
7546
|
+
const answered = new Set(listed.filter((e) => FILE_KINDS.includes(e.kind)).map((e) => `${e.kind}:${e.pubkey}:${tagValue(e, 'd') ?? ''}`))
|
|
7547
|
+
asked = asked.filter((address) => !answered.has(address))
|
|
7548
|
+
}
|
|
7549
|
+
if (!asked.length) return []
|
|
7550
|
+
const objects = await resolveForeignObjects(asked, query, lookupPeople, cache)
|
|
7551
|
+
return asked.flatMap((address) => {
|
|
7552
|
+
const object = objects[address]
|
|
7553
|
+
return object && !object.unreachable && object.deleted ? [object] : []
|
|
7554
|
+
})
|
|
7555
|
+
}
|
|
7556
|
+
|
|
7504
7557
|
/**
|
|
7505
7558
|
* A Folder state's files as addresses, in its order, each once (SPEC §3.3).
|
|
7506
7559
|
*
|
package/src/references.ts
CHANGED
|
@@ -59,11 +59,12 @@ const typeOf = (kind: number): ReferenceType | undefined => REFERENCE_FILE_TYPES
|
|
|
59
59
|
|
|
60
60
|
type Addressed = ForeignObject & { address: string }
|
|
61
61
|
|
|
62
|
-
/** An object `[` may offer: a file kind it knows, resolved, with a title. */
|
|
62
|
+
/** An object `[` may offer: a file kind it knows, resolved, not deleted (SPEC §6.5), with a title. */
|
|
63
63
|
const offerable = (object: ForeignObject | null | undefined): object is Addressed =>
|
|
64
64
|
!!object &&
|
|
65
65
|
!!object.address &&
|
|
66
66
|
!object.unreachable &&
|
|
67
|
+
!object.deleted &&
|
|
67
68
|
typeOf(object.kind) !== undefined &&
|
|
68
69
|
!!object.slots.title?.value.trim()
|
|
69
70
|
|
|
@@ -123,13 +124,14 @@ export async function fileCandidates(
|
|
|
123
124
|
): Promise<ReferenceCandidate[]> {
|
|
124
125
|
const files = objects.filter(offerable)
|
|
125
126
|
const parents = new Map<string, ForeignObject>()
|
|
126
|
-
|
|
127
|
+
// A deleted project names no issue's caption: it is found nowhere else either (SPEC §6.5).
|
|
128
|
+
for (const o of objects) if (o?.address && !o.unreachable && !o.deleted) parents.set(o.address, o)
|
|
127
129
|
const missing = [
|
|
128
130
|
...new Set(files.flatMap((o) => (o.kind === KIND_ISSUE && o.parentRef && !parents.has(o.parentRef) ? [o.parentRef] : []))),
|
|
129
131
|
]
|
|
130
132
|
if (missing.length) {
|
|
131
133
|
const read = await resolveForeignRoots(missing, query, cache, { listRead }).catch(() => [])
|
|
132
|
-
for (const parent of read) if (parent.address) parents.set(parent.address, parent)
|
|
134
|
+
for (const parent of read) if (parent.address && !parent.deleted) parents.set(parent.address, parent)
|
|
133
135
|
}
|
|
134
136
|
return files.map((o) => {
|
|
135
137
|
const parent = o.kind === KIND_ISSUE && o.parentRef ? parents.get(o.parentRef) : undefined
|