@estiva-app/interop 0.51.0 → 0.52.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 +14 -0
- 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/objectUrl.d.ts +24 -0
- package/dist/objectUrl.d.ts.map +1 -1
- package/dist/objectUrl.js +76 -5
- package/dist/objectUrl.js.map +1 -1
- package/package.json +1 -1
- package/src/index.ts +1 -0
- package/src/objectUrl.ts +85 -4
package/CHANGELOG.md
CHANGED
|
@@ -6,6 +6,20 @@ how a declaration is read, is a MAJOR — in `0.x`, a MINOR — even when no
|
|
|
6
6
|
TypeScript signature moved. A consumer upgrading must be able to tell whether
|
|
7
7
|
manifests already published still mean what they meant.
|
|
8
8
|
|
|
9
|
+
## 0.52.0 — 2026-10-07
|
|
10
|
+
|
|
11
|
+
**Manifest: a `urls` pattern may declare a `<block>` in its fragment** (COM-2,
|
|
12
|
+
SPEC §7.7). Manifests already published mean what they meant: a pattern with
|
|
13
|
+
no `<block>` ignores the fragment exactly as before, and a consumer on an older
|
|
14
|
+
version reads a pattern with one as the same shape without the block.
|
|
15
|
+
|
|
16
|
+
- `matchObjectUrl` returns `block` when the pattern declares
|
|
17
|
+
`#…<block>…` and the URL fills it; the block is optional, so the pattern
|
|
18
|
+
still claims the URL without it.
|
|
19
|
+
- New: `blockUrlOf(patterns, { kind, d, title, block })` builds the link that
|
|
20
|
+
opens one block, from the same shape — not from `web`, whose NIP-89 template
|
|
21
|
+
has only `<bech32>`.
|
|
22
|
+
|
|
9
23
|
## 0.51.0 — 2026-10-06
|
|
10
24
|
|
|
11
25
|
**Manifests: nothing changes.** No declaration is read differently.
|
package/dist/index.d.ts
CHANGED
|
@@ -50,5 +50,5 @@ export { planCreateFolder, planRenameFolder, planDeleteFolder, planPlaceFile, pl
|
|
|
50
50
|
* question: those resolve an object you already hold, these turn a string
|
|
51
51
|
* somebody pasted into one you can hold.
|
|
52
52
|
*/
|
|
53
|
-
export { slugify, objectRef, identifierFromRef, eventIdFromRef, urlPatternsOf, matchObjectUrl, type UrlPattern, type MatchedObjectUrl, } from './objectUrl.js';
|
|
53
|
+
export { slugify, objectRef, identifierFromRef, eventIdFromRef, urlPatternsOf, matchObjectUrl, blockUrlOf, type UrlPattern, type MatchedObjectUrl, } from './objectUrl.js';
|
|
54
54
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,cAAc,EACd,UAAU,EACV,cAAc,EACd,aAAa,EACb,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,YAAY,EACZ,0BAA0B,EAC1B,OAAO,EACP,KAAK,MAAM,EACX,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,KAAK,mBAAmB,EACxB,SAAS,EACT,KAAK,OAAO,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,eAAe,EACpB,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EACrB,KAAK,aAAa,EAClB,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,cAAc,EACd,KAAK,mBAAmB,GACzB,MAAM,iBAAiB,CAAA;AAExB;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,cAAc,CAAA;AAErE;;;GAGG;AACH,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,GACjC,MAAM,iBAAiB,CAAA;AAExB;;;;;GAKG;AACH,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,EACb,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACxB,KAAK,WAAW,GACjB,MAAM,cAAc,CAAA;AAErB;;;;;;;GAOG;AACH,OAAO,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,cAAc,EACd,KAAK,UAAU,EACf,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAA"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,cAAc,EACd,UAAU,EACV,cAAc,EACd,aAAa,EACb,KAAK,OAAO,EACZ,KAAK,aAAa,EAClB,KAAK,kBAAkB,EACvB,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,YAAY,EACZ,0BAA0B,EAC1B,OAAO,EACP,KAAK,MAAM,EACX,cAAc,EACd,oBAAoB,EACpB,eAAe,EACf,KAAK,mBAAmB,EACxB,SAAS,EACT,KAAK,OAAO,EACZ,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,KAAK,eAAe,EACpB,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EACrB,KAAK,aAAa,EAClB,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EACnB,KAAK,WAAW,EAChB,KAAK,kBAAkB,EACvB,KAAK,eAAe,EACpB,KAAK,gBAAgB,EACrB,KAAK,OAAO,EACZ,KAAK,QAAQ,EACb,KAAK,MAAM,EACX,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,cAAc,EACnB,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,WAAW,EAChB,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,cAAc,EACd,KAAK,mBAAmB,GACzB,MAAM,iBAAiB,CAAA;AAExB;;;GAGG;AACH,OAAO,EAAE,SAAS,EAAE,KAAK,QAAQ,EAAE,KAAK,OAAO,EAAE,MAAM,cAAc,CAAA;AAErE;;;GAGG;AACH,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,oBAAoB,EACpB,KAAK,qBAAqB,EAC1B,KAAK,2BAA2B,GACjC,MAAM,iBAAiB,CAAA;AAExB;;;;;GAKG;AACH,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,EACb,KAAK,SAAS,EACd,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,mBAAmB,EACxB,KAAK,WAAW,GACjB,MAAM,cAAc,CAAA;AAErB;;;;;;;GAOG;AACH,OAAO,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,cAAc,EACd,UAAU,EACV,KAAK,UAAU,EACf,KAAK,gBAAgB,GACtB,MAAM,gBAAgB,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -50,5 +50,5 @@ export { planCreateFolder, planRenameFolder, planDeleteFolder, planPlaceFile, pl
|
|
|
50
50
|
* question: those resolve an object you already hold, these turn a string
|
|
51
51
|
* somebody pasted into one you can hold.
|
|
52
52
|
*/
|
|
53
|
-
export { slugify, objectRef, identifierFromRef, eventIdFromRef, urlPatternsOf, matchObjectUrl, } from './objectUrl.js';
|
|
53
|
+
export { slugify, objectRef, identifierFromRef, eventIdFromRef, urlPatternsOf, matchObjectUrl, blockUrlOf, } from './objectUrl.js';
|
|
54
54
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,cAAc,EACd,UAAU,EACV,cAAc,EACd,aAAa,EAIb,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,YAAY,EACZ,0BAA0B,EAC1B,OAAO,EAEP,cAAc,EACd,oBAAoB,EACpB,eAAe,EAEf,SAAS,EAET,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EAEjB,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EAErB,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EAkBnB,cAAc,GAEf,MAAM,iBAAiB,CAAA;AAExB;;;GAGG;AACH,OAAO,EAAE,SAAS,EAA+B,MAAM,cAAc,CAAA;AAErE;;;GAGG;AACH,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,oBAAoB,GAGrB,MAAM,iBAAiB,CAAA;AAExB;;;;;GAKG;AACH,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,GAMd,MAAM,cAAc,CAAA;AAErB;;;;;;;GAOG;AACH,OAAO,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,cAAc,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EACpB,qBAAqB,EACrB,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,mBAAmB,EACnB,oBAAoB,EACpB,qBAAqB,EACrB,WAAW,EACX,eAAe,EACf,cAAc,EACd,UAAU,EACV,cAAc,EACd,aAAa,EAIb,iBAAiB,EACjB,qBAAqB,EACrB,cAAc,EACd,YAAY,EACZ,0BAA0B,EAC1B,OAAO,EAEP,cAAc,EACd,oBAAoB,EACpB,eAAe,EAEf,SAAS,EAET,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EAEjB,UAAU,EACV,kBAAkB,EAClB,cAAc,EACd,QAAQ,EACR,sBAAsB,EACtB,cAAc,EACd,eAAe,EACf,SAAS,EACT,kBAAkB,EAClB,qBAAqB,EAErB,cAAc,EACd,qBAAqB,EACrB,iBAAiB,EACjB,eAAe,EACf,kBAAkB,EAClB,mBAAmB,EAkBnB,cAAc,GAEf,MAAM,iBAAiB,CAAA;AAExB;;;GAGG;AACH,OAAO,EAAE,SAAS,EAA+B,MAAM,cAAc,CAAA;AAErE;;;GAGG;AACH,OAAO,EACL,cAAc,EACd,oBAAoB,EACpB,oBAAoB,GAGrB,MAAM,iBAAiB,CAAA;AAExB;;;;;GAKG;AACH,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,aAAa,EACb,cAAc,EACd,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,aAAa,GAMd,MAAM,cAAc,CAAA;AAErB;;;;;;;GAOG;AACH,OAAO,EACL,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,cAAc,EACd,aAAa,EACb,cAAc,EACd,UAAU,GAGX,MAAM,gBAAgB,CAAA"}
|
package/dist/objectUrl.d.ts
CHANGED
|
@@ -119,6 +119,14 @@ export interface MatchedObjectUrl {
|
|
|
119
119
|
identifier: string;
|
|
120
120
|
by: 'd' | 'id';
|
|
121
121
|
};
|
|
122
|
+
/**
|
|
123
|
+
* One block of the object, when the pattern declares a `<block>` in its
|
|
124
|
+
* fragment and the URL carries one (SPEC §7.7, COM-2): Ship's block menu
|
|
125
|
+
* copies `…/issue/<slug>-<d>#block-<id>`. The block is optional — the same
|
|
126
|
+
* pattern still claims the URL without its fragment — so an app adds it to a
|
|
127
|
+
* shape it already declares rather than declaring a second one.
|
|
128
|
+
*/
|
|
129
|
+
block?: string;
|
|
122
130
|
}
|
|
123
131
|
/**
|
|
124
132
|
* Match a pasted URL against one app's declared shapes.
|
|
@@ -144,4 +152,20 @@ export interface MatchedObjectUrl {
|
|
|
144
152
|
* says such a URL renders as a plain link, because it is one.
|
|
145
153
|
*/
|
|
146
154
|
export declare function matchObjectUrl(url: string, patterns: UrlPattern[]): MatchedObjectUrl | null;
|
|
155
|
+
/**
|
|
156
|
+
* The link that opens one block of an object, built from the app's own `urls`
|
|
157
|
+
* shape for its kind — the outbound half of {@link matchObjectUrl}'s `block`.
|
|
158
|
+
*
|
|
159
|
+
* Built from `urls` rather than `web` because NIP-89's `web` template has one
|
|
160
|
+
* placeholder, `<bech32>`, and an app's `/o/<naddr>` redirect is not obliged to
|
|
161
|
+
* carry a fragment through. Returns undefined when the app declares no path
|
|
162
|
+
* shape for that kind with a `<block>` fragment; the caller then opens the
|
|
163
|
+
* object without the block, which is still the right object.
|
|
164
|
+
*/
|
|
165
|
+
export declare function blockUrlOf(patterns: UrlPattern[], target: {
|
|
166
|
+
kind: number;
|
|
167
|
+
d: string;
|
|
168
|
+
title?: string;
|
|
169
|
+
block: string;
|
|
170
|
+
}): string | undefined;
|
|
147
171
|
//# sourceMappingURL=objectUrl.d.ts.map
|
package/dist/objectUrl.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectUrl.d.ts","sourceRoot":"","sources":["../src/objectUrl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AA2BH;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAS7C;AAED,qFAAqF;AACrF,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG5D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU;IACzB,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAA;IACf;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,mDAAmD;AACnD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAA;CAAE,GAAG,UAAU,EAAE,CAQvE;AAED,4CAA4C;AAC5C,MAAM,WAAW,gBAAgB;IAC/B,uEAAuE;IACvE,UAAU,EAAE,MAAM,CAAA;IAClB;;;;;;;OAOG;IACH,EAAE,EAAE,GAAG,GAAG,IAAI,CAAA;IACd,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;;;OAKG;IACH,MAAM,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,GAAG,GAAG,IAAI,CAAA;KAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"objectUrl.d.ts","sourceRoot":"","sources":["../src/objectUrl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AA2BH;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAS7C;AAED,qFAAqF;AACrF,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG5D;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGzD;AAED;;;;;;;;GAQG;AACH,MAAM,WAAW,UAAU;IACzB,sDAAsD;IACtD,OAAO,EAAE,MAAM,CAAA;IACf;;;;;;;;;OASG;IACH,IAAI,CAAC,EAAE,MAAM,CAAA;CACd;AAED,mDAAmD;AACnD,wBAAgB,aAAa,CAAC,KAAK,EAAE;IAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAA;CAAE,GAAG,UAAU,EAAE,CAQvE;AAED,4CAA4C;AAC5C,MAAM,WAAW,gBAAgB;IAC/B,uEAAuE;IACvE,UAAU,EAAE,MAAM,CAAA;IAClB;;;;;;;OAOG;IACH,EAAE,EAAE,GAAG,GAAG,IAAI,CAAA;IACd,uDAAuD;IACvD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb;;;;;OAKG;IACH,MAAM,CAAC,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,GAAG,GAAG,IAAI,CAAA;KAAE,CAAA;IAC/C;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAKD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,gBAAgB,GAAG,IAAI,CA8D3F;AA2BD;;;;;;;;;GASG;AACH,wBAAgB,UAAU,CACxB,QAAQ,EAAE,UAAU,EAAE,EACtB,MAAM,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACjE,MAAM,GAAG,SAAS,CAqBpB"}
|
package/dist/objectUrl.js
CHANGED
|
@@ -117,6 +117,8 @@ export function urlPatternsOf(event) {
|
|
|
117
117
|
}
|
|
118
118
|
return out;
|
|
119
119
|
}
|
|
120
|
+
/** The placeholder a pattern's fragment uses for a block id. */
|
|
121
|
+
const BLOCK_PLACEHOLDER = '<block>';
|
|
120
122
|
/**
|
|
121
123
|
* Match a pasted URL against one app's declared shapes.
|
|
122
124
|
*
|
|
@@ -193,14 +195,82 @@ export function matchObjectUrl(url, patterns) {
|
|
|
193
195
|
}
|
|
194
196
|
if (!satisfied)
|
|
195
197
|
continue;
|
|
196
|
-
const
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
198
|
+
const block = readBlock(shape.hash, target.hash);
|
|
199
|
+
const match = {
|
|
200
|
+
...(query ? { ...query, within: path } : path),
|
|
201
|
+
...(kind === undefined ? {} : { kind }),
|
|
202
|
+
...(block === undefined ? {} : { block }),
|
|
203
|
+
};
|
|
204
|
+
// A filled `<block>` breaks a tie, so an app that declares the block shape
|
|
205
|
+
// beside its older shape loses no block to declaration order.
|
|
206
|
+
const specificity = declared.length * 2 + (block === undefined ? 0 : 1);
|
|
207
|
+
if (!best || specificity > best.specificity)
|
|
208
|
+
best = { specificity, match };
|
|
201
209
|
}
|
|
202
210
|
return best?.match ?? null;
|
|
203
211
|
}
|
|
212
|
+
/**
|
|
213
|
+
* The block a URL's fragment names, by the pattern's `#…<block>…`; undefined
|
|
214
|
+
* when the pattern declares none, the URL has no fragment, or it does not fit.
|
|
215
|
+
* A fragment cut mid-escape names no block rather than throwing — the object
|
|
216
|
+
* still resolves, which is what the link was mostly for.
|
|
217
|
+
*/
|
|
218
|
+
function readBlock(pattern, value) {
|
|
219
|
+
const at = pattern.indexOf(BLOCK_PLACEHOLDER);
|
|
220
|
+
if (at === -1)
|
|
221
|
+
return undefined;
|
|
222
|
+
const before = pattern.slice(0, at);
|
|
223
|
+
const after = pattern.slice(at + BLOCK_PLACEHOLDER.length);
|
|
224
|
+
if (value.length <= before.length + after.length || !value.startsWith(before) || !value.endsWith(after)) {
|
|
225
|
+
return undefined;
|
|
226
|
+
}
|
|
227
|
+
try {
|
|
228
|
+
const block = decodeURIComponent(value.slice(before.length, value.length - after.length));
|
|
229
|
+
return BLOCK_ID.test(block) ? block : undefined;
|
|
230
|
+
}
|
|
231
|
+
catch {
|
|
232
|
+
return undefined;
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
/** The ids a reader takes from a URL — protocol's `partsOf` takes the same. */
|
|
236
|
+
const BLOCK_ID = /^[A-Za-z0-9_-]{1,64}$/;
|
|
237
|
+
/**
|
|
238
|
+
* The link that opens one block of an object, built from the app's own `urls`
|
|
239
|
+
* shape for its kind — the outbound half of {@link matchObjectUrl}'s `block`.
|
|
240
|
+
*
|
|
241
|
+
* Built from `urls` rather than `web` because NIP-89's `web` template has one
|
|
242
|
+
* placeholder, `<bech32>`, and an app's `/o/<naddr>` redirect is not obliged to
|
|
243
|
+
* carry a fragment through. Returns undefined when the app declares no path
|
|
244
|
+
* shape for that kind with a `<block>` fragment; the caller then opens the
|
|
245
|
+
* object without the block, which is still the right object.
|
|
246
|
+
*/
|
|
247
|
+
export function blockUrlOf(patterns, target) {
|
|
248
|
+
// A `d` that is not a clean identifier would be spliced into the path raw
|
|
249
|
+
// (`../settings`), and `matchObjectUrl` could never read the link back.
|
|
250
|
+
if (identifierFromRef(target.d) !== target.d || !BLOCK_ID.test(target.block))
|
|
251
|
+
return undefined;
|
|
252
|
+
for (const { pattern, kind } of patterns) {
|
|
253
|
+
if (kind !== target.kind)
|
|
254
|
+
continue;
|
|
255
|
+
const hashAt = pattern.indexOf('#');
|
|
256
|
+
if (hashAt === -1)
|
|
257
|
+
continue;
|
|
258
|
+
const path = pattern.slice(0, hashAt);
|
|
259
|
+
const hash = pattern.slice(hashAt + 1);
|
|
260
|
+
// A fragment route (`/#/issue/<d>`) is the legacy shape, never written.
|
|
261
|
+
if (hash.startsWith('/') || !hash.includes(BLOCK_PLACEHOLDER) || !path.includes('<d>'))
|
|
262
|
+
continue;
|
|
263
|
+
// Only `<d>` and `<block>` are known here; a shape with any other
|
|
264
|
+
// placeholder (`?thread=<id>`) would be emitted half-filled.
|
|
265
|
+
if (/<(?!slug>|d>)[^>]*>/.test(path))
|
|
266
|
+
continue;
|
|
267
|
+
const ref = path.includes('<slug>-<d>') ? objectRef(target.d, target.title) : target.d;
|
|
268
|
+
// Replacer functions, so a `$&` in an identifier is not a replacement pattern.
|
|
269
|
+
const base = path.replace(/<slug>-<d>|<d>/, () => ref);
|
|
270
|
+
return `${base}#${hash.replace(BLOCK_PLACEHOLDER, () => encodeURIComponent(target.block))}`;
|
|
271
|
+
}
|
|
272
|
+
return undefined;
|
|
273
|
+
}
|
|
204
274
|
/** The identity a placeholder declares, read off the value in that position. */
|
|
205
275
|
function readPlaceholder(placeholder, value) {
|
|
206
276
|
const wantsEventId = placeholder.includes('<id>');
|
|
@@ -255,6 +325,7 @@ function splitUrl(raw) {
|
|
|
255
325
|
segments: [...(path ?? '').split('/'), ...fragmentPath.split('/')].filter(Boolean),
|
|
256
326
|
fragmented: fragmentPath !== '',
|
|
257
327
|
query: parseQuery(search ?? ''),
|
|
328
|
+
hash: fragmentPath === '' ? (fragment ?? '') : '',
|
|
258
329
|
};
|
|
259
330
|
}
|
|
260
331
|
/**
|
package/dist/objectUrl.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"objectUrl.js","sourceRoot":"","sources":["../src/objectUrl.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AAEH;;;;;;GAMG;AACH,MAAM,gBAAgB,GAAG,gEAAgE,CAAA;AAEzF;;;;;;GAMG;AACH,MAAM,oBAAoB,GAAG,iCAAiC,CAAA;AAE9D;;;;GAIG;AACH,MAAM,eAAe,GAAG,EAAE,CAAA;AAE1B;;;;GAIG;AACH,MAAM,UAAU,OAAO,CAAC,KAAa;IACnC,OAAO,KAAK;SACT,SAAS,CAAC,MAAM,CAAC;SACjB,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC;SACrB,WAAW,EAAE;SACb,OAAO,CAAC,aAAa,EAAE,GAAG,CAAC;SAC3B,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;SACvB,KAAK,CAAC,CAAC,EAAE,eAAe,CAAC;SACzB,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;AACxB,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,SAAS,CAAC,UAAkB,EAAE,KAAc;IAC1D,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAA;IACxC,OAAO,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAA;AACpD,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,iBAAiB,CAAC,GAAW;IAC3C,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IACxC,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAC9C,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,cAAc,CAAC,GAAW;IACxC,MAAM,KAAK,GAAG,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAC5C,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAA;AAC9C,CAAC;AA2BD,mDAAmD;AACnD,MAAM,UAAU,aAAa,CAAC,KAA2B;IACvD,MAAM,GAAG,GAAiB,EAAE,CAAA;IAC5B,KAAK,MAAM,GAAG,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;QAC7B,IAAI,GAAG,CAAC,CAAC,CAAC,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;YAAE,SAAQ;QAC1C,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAA;QAChD,GAAG,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAA;IAC5E,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;
|
|
1
|
+
{"version":3,"file":"objectUrl.js","sourceRoot":"","sources":["../src/objectUrl.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.52.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/index.ts
CHANGED
package/src/objectUrl.ts
CHANGED
|
@@ -172,8 +172,19 @@ export interface MatchedObjectUrl {
|
|
|
172
172
|
* only `identifier`; this is for one that wants to say where it is.
|
|
173
173
|
*/
|
|
174
174
|
within?: { identifier: string; by: 'd' | 'id' }
|
|
175
|
+
/**
|
|
176
|
+
* One block of the object, when the pattern declares a `<block>` in its
|
|
177
|
+
* fragment and the URL carries one (SPEC §7.7, COM-2): Ship's block menu
|
|
178
|
+
* copies `…/issue/<slug>-<d>#block-<id>`. The block is optional — the same
|
|
179
|
+
* pattern still claims the URL without its fragment — so an app adds it to a
|
|
180
|
+
* shape it already declares rather than declaring a second one.
|
|
181
|
+
*/
|
|
182
|
+
block?: string
|
|
175
183
|
}
|
|
176
184
|
|
|
185
|
+
/** The placeholder a pattern's fragment uses for a block id. */
|
|
186
|
+
const BLOCK_PLACEHOLDER = '<block>'
|
|
187
|
+
|
|
177
188
|
/**
|
|
178
189
|
* Match a pasted URL against one app's declared shapes.
|
|
179
190
|
*
|
|
@@ -247,14 +258,81 @@ export function matchObjectUrl(url: string, patterns: UrlPattern[]): MatchedObje
|
|
|
247
258
|
}
|
|
248
259
|
if (!satisfied) continue
|
|
249
260
|
|
|
250
|
-
const
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
261
|
+
const block = readBlock(shape.hash, target.hash)
|
|
262
|
+
const match: MatchedObjectUrl = {
|
|
263
|
+
...(query ? { ...query, within: path } : path),
|
|
264
|
+
...(kind === undefined ? {} : { kind }),
|
|
265
|
+
...(block === undefined ? {} : { block }),
|
|
266
|
+
}
|
|
267
|
+
// A filled `<block>` breaks a tie, so an app that declares the block shape
|
|
268
|
+
// beside its older shape loses no block to declaration order.
|
|
269
|
+
const specificity = declared.length * 2 + (block === undefined ? 0 : 1)
|
|
270
|
+
if (!best || specificity > best.specificity) best = { specificity, match }
|
|
254
271
|
}
|
|
255
272
|
return best?.match ?? null
|
|
256
273
|
}
|
|
257
274
|
|
|
275
|
+
/**
|
|
276
|
+
* The block a URL's fragment names, by the pattern's `#…<block>…`; undefined
|
|
277
|
+
* when the pattern declares none, the URL has no fragment, or it does not fit.
|
|
278
|
+
* A fragment cut mid-escape names no block rather than throwing — the object
|
|
279
|
+
* still resolves, which is what the link was mostly for.
|
|
280
|
+
*/
|
|
281
|
+
function readBlock(pattern: string, value: string): string | undefined {
|
|
282
|
+
const at = pattern.indexOf(BLOCK_PLACEHOLDER)
|
|
283
|
+
if (at === -1) return undefined
|
|
284
|
+
const before = pattern.slice(0, at)
|
|
285
|
+
const after = pattern.slice(at + BLOCK_PLACEHOLDER.length)
|
|
286
|
+
if (value.length <= before.length + after.length || !value.startsWith(before) || !value.endsWith(after)) {
|
|
287
|
+
return undefined
|
|
288
|
+
}
|
|
289
|
+
try {
|
|
290
|
+
const block = decodeURIComponent(value.slice(before.length, value.length - after.length))
|
|
291
|
+
return BLOCK_ID.test(block) ? block : undefined
|
|
292
|
+
} catch {
|
|
293
|
+
return undefined
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
|
|
297
|
+
/** The ids a reader takes from a URL — protocol's `partsOf` takes the same. */
|
|
298
|
+
const BLOCK_ID = /^[A-Za-z0-9_-]{1,64}$/
|
|
299
|
+
|
|
300
|
+
/**
|
|
301
|
+
* The link that opens one block of an object, built from the app's own `urls`
|
|
302
|
+
* shape for its kind — the outbound half of {@link matchObjectUrl}'s `block`.
|
|
303
|
+
*
|
|
304
|
+
* Built from `urls` rather than `web` because NIP-89's `web` template has one
|
|
305
|
+
* placeholder, `<bech32>`, and an app's `/o/<naddr>` redirect is not obliged to
|
|
306
|
+
* carry a fragment through. Returns undefined when the app declares no path
|
|
307
|
+
* shape for that kind with a `<block>` fragment; the caller then opens the
|
|
308
|
+
* object without the block, which is still the right object.
|
|
309
|
+
*/
|
|
310
|
+
export function blockUrlOf(
|
|
311
|
+
patterns: UrlPattern[],
|
|
312
|
+
target: { kind: number; d: string; title?: string; block: string },
|
|
313
|
+
): string | undefined {
|
|
314
|
+
// A `d` that is not a clean identifier would be spliced into the path raw
|
|
315
|
+
// (`../settings`), and `matchObjectUrl` could never read the link back.
|
|
316
|
+
if (identifierFromRef(target.d) !== target.d || !BLOCK_ID.test(target.block)) return undefined
|
|
317
|
+
for (const { pattern, kind } of patterns) {
|
|
318
|
+
if (kind !== target.kind) continue
|
|
319
|
+
const hashAt = pattern.indexOf('#')
|
|
320
|
+
if (hashAt === -1) continue
|
|
321
|
+
const path = pattern.slice(0, hashAt)
|
|
322
|
+
const hash = pattern.slice(hashAt + 1)
|
|
323
|
+
// A fragment route (`/#/issue/<d>`) is the legacy shape, never written.
|
|
324
|
+
if (hash.startsWith('/') || !hash.includes(BLOCK_PLACEHOLDER) || !path.includes('<d>')) continue
|
|
325
|
+
// Only `<d>` and `<block>` are known here; a shape with any other
|
|
326
|
+
// placeholder (`?thread=<id>`) would be emitted half-filled.
|
|
327
|
+
if (/<(?!slug>|d>)[^>]*>/.test(path)) continue
|
|
328
|
+
const ref = path.includes('<slug>-<d>') ? objectRef(target.d, target.title) : target.d
|
|
329
|
+
// Replacer functions, so a `$&` in an identifier is not a replacement pattern.
|
|
330
|
+
const base = path.replace(/<slug>-<d>|<d>/, () => ref)
|
|
331
|
+
return `${base}#${hash.replace(BLOCK_PLACEHOLDER, () => encodeURIComponent(target.block))}`
|
|
332
|
+
}
|
|
333
|
+
return undefined
|
|
334
|
+
}
|
|
335
|
+
|
|
258
336
|
/** The identity a placeholder declares, read off the value in that position. */
|
|
259
337
|
function readPlaceholder(placeholder: string, value: string): { identifier: string; by: 'd' | 'id' } | null {
|
|
260
338
|
const wantsEventId = placeholder.includes('<id>')
|
|
@@ -286,6 +364,8 @@ function splitUrl(raw: string): {
|
|
|
286
364
|
segments: string[]
|
|
287
365
|
fragmented: boolean
|
|
288
366
|
query: Record<string, string>
|
|
367
|
+
/** A fragment that is not a route — `block-<id>` — as written; '' when none. */
|
|
368
|
+
hash: string
|
|
289
369
|
} | null {
|
|
290
370
|
const match = /^(https?):\/\/([^/?#]+)([^?#]*)(?:\?([^#]*))?(?:#(.*))?$/i.exec(raw.trim())
|
|
291
371
|
if (!match) return null
|
|
@@ -316,6 +396,7 @@ function splitUrl(raw: string): {
|
|
|
316
396
|
segments: [...(path ?? '').split('/'), ...fragmentPath.split('/')].filter(Boolean),
|
|
317
397
|
fragmented: fragmentPath !== '',
|
|
318
398
|
query: parseQuery(search ?? ''),
|
|
399
|
+
hash: fragmentPath === '' ? (fragment ?? '') : '',
|
|
319
400
|
}
|
|
320
401
|
}
|
|
321
402
|
|