@caelo-cms/shared 0.12.4 → 0.12.5
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/dist/ai-tools.d.ts +21 -0
- package/dist/ai-tools.d.ts.map +1 -1
- package/dist/ai-tools.js +11 -0
- package/dist/ai-tools.js.map +1 -1
- package/dist/change-journal.d.ts +1 -1
- package/dist/change-journal.d.ts.map +1 -1
- package/dist/change-journal.js +9 -0
- package/dist/change-journal.js.map +1 -1
- package/dist/document-language.d.ts +11 -0
- package/dist/document-language.d.ts.map +1 -1
- package/dist/document-language.js +27 -1
- package/dist/document-language.js.map +1 -1
- package/dist/gateway-refresh.d.ts +52 -0
- package/dist/gateway-refresh.d.ts.map +1 -0
- package/dist/gateway-refresh.js +55 -0
- package/dist/gateway-refresh.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -1
- package/dist/live-events.d.ts.map +1 -1
- package/dist/live-events.js +10 -3
- package/dist/live-events.js.map +1 -1
- package/dist/redirect-plan.d.ts +45 -5
- package/dist/redirect-plan.d.ts.map +1 -1
- package/dist/redirect-plan.js +97 -13
- package/dist/redirect-plan.js.map +1 -1
- package/dist/redirect-release.d.ts +105 -0
- package/dist/redirect-release.d.ts.map +1 -0
- package/dist/redirect-release.js +104 -0
- package/dist/redirect-release.js.map +1 -0
- package/dist/untrusted-tool-result.d.ts +13 -0
- package/dist/untrusted-tool-result.d.ts.map +1 -1
- package/dist/untrusted-tool-result.js +15 -0
- package/dist/untrusted-tool-result.js.map +1 -1
- package/dist/version.d.ts +2 -2
- package/dist/version.js +1 -1
- package/package.json +1 -1
- package/src/ai-tools.ts +12 -0
- package/src/change-journal.ts +14 -0
- package/src/document-language.test.ts +35 -0
- package/src/document-language.ts +31 -2
- package/src/gateway-refresh.ts +64 -0
- package/src/index.ts +2 -0
- package/src/live-events.ts +10 -3
- package/src/redirect-plan.test.ts +62 -0
- package/src/redirect-plan.ts +98 -12
- package/src/redirect-release.test.ts +167 -0
- package/src/redirect-release.ts +162 -0
- package/src/untrusted-tool-result.ts +17 -0
- package/src/version.ts +1 -1
package/dist/index.js
CHANGED
|
@@ -27,6 +27,7 @@ export * from "./font-assets.js";
|
|
|
27
27
|
export * from "./font-axis-policy.js";
|
|
28
28
|
export * from "./font-usage.js";
|
|
29
29
|
export * from "./fonts.js";
|
|
30
|
+
export * from "./gateway-refresh.js";
|
|
30
31
|
export * from "./genesis.js";
|
|
31
32
|
export * from "./genesis-inventory.js";
|
|
32
33
|
export * from "./google-models.js";
|
|
@@ -62,6 +63,7 @@ export * from "./redirect-emit-cloudfront.js";
|
|
|
62
63
|
export * from "./redirect-emit-front-door.js";
|
|
63
64
|
export * from "./redirect-emit-gcp.js";
|
|
64
65
|
export * from "./redirect-plan.js";
|
|
66
|
+
export * from "./redirect-release.js";
|
|
65
67
|
export * from "./redirect-target.js";
|
|
66
68
|
export * from "./release-manifest.js";
|
|
67
69
|
export * from "./responsive-images.js";
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-events.d.ts","sourceRoot":"","sources":["../src/live-events.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,qDAAqD;AACrD,eAAO,MAAM,WAAW,uFAmBd,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAIrD,gCAAgC;AAChC,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,SAAS,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,GAAG,IAAI,GACjB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAQtE;
|
|
1
|
+
{"version":3,"file":"live-events.d.ts","sourceRoot":"","sources":["../src/live-events.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;GAkBG;AAEH,qDAAqD;AACrD,eAAO,MAAM,WAAW,uFAmBd,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,CAAC,OAAO,WAAW,CAAC,CAAC,MAAM,CAAC,CAAC;AAIrD,gCAAgC;AAChC,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,SAAS,CAE7D;AAED;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,GAAG,IAAI,GACjB;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,MAAM,EAAE,SAAS,EAAE,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,EAAE,CAAA;CAAE,CAQtE;AAqFD;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CAAC,aAAa,EAAE,MAAM,GAAG,SAAS,SAAS,EAAE,CAkBjF"}
|
package/dist/live-events.js
CHANGED
|
@@ -60,9 +60,10 @@ export function parseLiveTopics(raw) {
|
|
|
60
60
|
return { ok: true, topics: [...new Set(names)] };
|
|
61
61
|
}
|
|
62
62
|
// Write ops per topic. Heartbeats (`chat.heartbeat_agent_run`,
|
|
63
|
-
// `chat.renew_turn_lease
|
|
64
|
-
//
|
|
65
|
-
//
|
|
63
|
+
// `chat.renew_turn_lease`, a reporting job's `reporting_jobs.authorize`) and
|
|
64
|
+
// the tick's `quality_audits.sweep_unstarted` / `imports.sweep_unstarted_crawls`
|
|
65
|
+
// are left out on purpose: they commit on a clock, and a hint on a clock is
|
|
66
|
+
// the very polling this replaces.
|
|
66
67
|
const EXACT = {
|
|
67
68
|
"chat.register_agent_run": ["agents"],
|
|
68
69
|
"chat.finish_agent_run": ["agents"],
|
|
@@ -100,6 +101,8 @@ const EXACT = {
|
|
|
100
101
|
"chat.finalize_draft_stage": ["quality", "deploys"],
|
|
101
102
|
"chat.publish": ["quality", "deploys"],
|
|
102
103
|
"quality_audits.enqueue": ["quality"],
|
|
104
|
+
// #1359 — the audit's job took the run: queued → running.
|
|
105
|
+
"quality_audits.claim": ["quality"],
|
|
103
106
|
"quality_audits.record_result": ["quality"],
|
|
104
107
|
"quality_audits.retry": ["quality"],
|
|
105
108
|
"quality_audits.claim_chat_notification": ["quality"],
|
|
@@ -112,6 +115,10 @@ const EXACT = {
|
|
|
112
115
|
"imports.create_run": ["crawl"],
|
|
113
116
|
"imports.update_run_status": ["crawl"],
|
|
114
117
|
"imports.write_extracted_pages": ["crawl"],
|
|
118
|
+
// #1360 — the crawl's job took the run, and ended it either way.
|
|
119
|
+
"imports.claim_crawl": ["crawl"],
|
|
120
|
+
"imports.finish_crawl": ["crawl"],
|
|
121
|
+
"imports.fail_crawl": ["crawl"],
|
|
115
122
|
"deploy.trigger": ["deploys", "quality"],
|
|
116
123
|
// #1211 — the Stage's steps: its run appears, ends failed, ends recorded.
|
|
117
124
|
"deploy.start_trigger": ["deploys"],
|
package/dist/live-events.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"live-events.js","sourceRoot":"","sources":["../src/live-events.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAEnC;;;;;;;;;;;;;;;;;;GAkBG;AAEH,qDAAqD;AACrD,MAAM,CAAC,MAAM,WAAW,GAAG;IACzB,8DAA8D;IAC9D,QAAQ;IACR,6EAA6E;IAC7E,SAAS;IACT,qEAAqE;IACrE,aAAa;IACb,wDAAwD;IACxD,SAAS;IACT,yCAAyC;IACzC,OAAO;IACP,mDAAmD;IACnD,SAAS;IACT;;;;OAIG;IACH,OAAO;CACC,CAAC;AAIX,MAAM,SAAS,GAAwB,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC;AAE5D,gCAAgC;AAChC,MAAM,UAAU,WAAW,CAAC,KAAa;IACvC,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AAC9B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAC7B,GAAkB;IAElB,MAAM,KAAK,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC;SACtB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC;QAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;IACtD,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,CAAgB,EAAE,CAAC;AAClE,CAAC;AAED,+DAA+D;AAC/D,6EAA6E;AAC7E,4EAA4E;AAC5E,
|
|
1
|
+
{"version":3,"file":"live-events.js","sourceRoot":"","sources":["../src/live-events.ts"],"names":[],"mappings":"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"}
|
package/dist/redirect-plan.d.ts
CHANGED
|
@@ -66,19 +66,59 @@ export interface BuildRedirectPlanArgs {
|
|
|
66
66
|
* loop.
|
|
67
67
|
*/
|
|
68
68
|
export declare function buildRedirectPlan(args: BuildRedirectPlanArgs): RedirectPlan;
|
|
69
|
+
/**
|
|
70
|
+
* #1550 — the loops among `rows`, each as the bare from paths of its cycle
|
|
71
|
+
* in chain order: what {@link buildRedirectPlan} refuses as a loop, found
|
|
72
|
+
* without refusing. A caller that combines rules from several sources (a
|
|
73
|
+
* rollback restores some addresses and keeps others live) holds back the
|
|
74
|
+
* rules that close a loop instead of committing a table no host can serve.
|
|
75
|
+
* Chains follow the plan's rules: a row the build serves a page for is left
|
|
76
|
+
* out, and a chain ends at a 410, an external target, a target with a query
|
|
77
|
+
* or fragment, or a path no row answers. Rows are not validated here
|
|
78
|
+
* (`buildRedirectPlan` does that); of two spellings of one address the
|
|
79
|
+
* first counts.
|
|
80
|
+
*
|
|
81
|
+
* @example
|
|
82
|
+
* findRedirectLoops(
|
|
83
|
+
* [
|
|
84
|
+
* { fromPath: "/a", toPath: "/b", statusCode: 301 },
|
|
85
|
+
* { fromPath: "/b", toPath: "/a/", statusCode: 301 },
|
|
86
|
+
* ],
|
|
87
|
+
* new Set(),
|
|
88
|
+
* )
|
|
89
|
+
* // → [["/a", "/b"]]
|
|
90
|
+
*/
|
|
91
|
+
export declare function findRedirectLoops(rows: readonly RedirectTableRow[], servedFiles: ReadonlySet<string>): string[][];
|
|
69
92
|
/**
|
|
70
93
|
* The planned redirects whose Location is a same-site path the build does
|
|
71
|
-
* not serve (#1157; an external address is the destination's business)
|
|
72
|
-
*
|
|
73
|
-
*
|
|
74
|
-
*
|
|
75
|
-
* build, and are never reported.
|
|
94
|
+
* not serve (#1157; an external address is the destination's business), so
|
|
95
|
+
* a redirect to a page that is still a draft answers 404 at its target
|
|
96
|
+
* until that page is published. Callers report these, and a release keeps
|
|
97
|
+
* such a change waiting (#1550). Paths under `/api/` are answered by the
|
|
98
|
+
* gateway, not the build, and are never reported.
|
|
99
|
+
*
|
|
100
|
+
* #1550 — a Location with a query or fragment ends the plan's chain
|
|
101
|
+
* collapse (it is another URL than the path a rule matches), but every
|
|
102
|
+
* serving layer matches a rule by the path alone: `/alias?utm=x` follows
|
|
103
|
+
* the rule on `/alias`. So a path another planned rule answers is served
|
|
104
|
+
* when that rule's own Location is (a gone rule's is not).
|
|
76
105
|
*
|
|
77
106
|
* @example
|
|
78
107
|
* redirectsToUnservedPaths(plan, new Set(["index.html"]))
|
|
79
108
|
* // → the entries of `plan.redirects` pointing anywhere but `/`
|
|
80
109
|
*/
|
|
81
110
|
export declare function redirectsToUnservedPaths(plan: RedirectPlan, servedFiles: ReadonlySet<string>): PlannedRedirect[];
|
|
111
|
+
/**
|
|
112
|
+
* #1550 — whether a file of the build answers `path` (a same-site path, its
|
|
113
|
+
* query and fragment ignored): the page's directory index, the bare-slug
|
|
114
|
+
* page, or the file itself. The same test the plan uses to let a page win
|
|
115
|
+
* over a rule.
|
|
116
|
+
*
|
|
117
|
+
* @example
|
|
118
|
+
* redirectPathServed("/about/", new Set(["about/index.html"])) // → true
|
|
119
|
+
* redirectPathServed("/gone", new Set(["index.html"])) // → false
|
|
120
|
+
*/
|
|
121
|
+
export declare function redirectPathServed(path: string, servedFiles: ReadonlySet<string>): boolean;
|
|
82
122
|
/**
|
|
83
123
|
* #1447 — every spelling of a path the redirects table can hold a row for.
|
|
84
124
|
* A row answers its path with and without the trailing slash (see the module
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirect-plan.d.ts","sourceRoot":"","sources":["../src/redirect-plan.ts"],"names":[],"mappings":"AA6CA,sEAAsE;AACtE,MAAM,MAAM,kBAAkB,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEvD,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,2EAA2E;AAC3E,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG,cAAc,CAAC;AAEhE,8CAA8C;AAC9C,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACxC,6DAA6D;IAC7D,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC;AAED,uEAAuE;AACvE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAED,sEAAsE;AACtE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,SAAS,WAAW,EAAE,CAAC;IACtC,mEAAmE;IACnE,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAKD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAgBnE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,GAAG,MAAM,CAM7E;AAED,8CAA8C;AAC9C,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC3C;AAQD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,YAAY,CA+B3E;AAED
|
|
1
|
+
{"version":3,"file":"redirect-plan.d.ts","sourceRoot":"","sources":["../src/redirect-plan.ts"],"names":[],"mappings":"AA6CA,sEAAsE;AACtE,MAAM,MAAM,kBAAkB,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;AAEvD,sEAAsE;AACtE,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,2EAA2E;AAC3E,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG,cAAc,CAAC;AAEhE,8CAA8C;AAC9C,MAAM,WAAW,eAAe;IAC9B,wEAAwE;IACxE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wEAAwE;IACxE,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;IACvC,4EAA4E;IAC5E,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,kBAAkB,CAAC;IACxC,6DAA6D;IAC7D,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC;AAED,uEAAuE;AACvE,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,UAAU,EAAE,SAAS,MAAM,EAAE,CAAC;CACxC;AAED,sEAAsE;AACtE,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,SAAS,EAAE,SAAS,eAAe,EAAE,CAAC;IAC/C,QAAQ,CAAC,IAAI,EAAE,SAAS,WAAW,EAAE,CAAC;IACtC,mEAAmE;IACnE,QAAQ,CAAC,eAAe,EAAE,SAAS,MAAM,EAAE,CAAC;CAC7C;AAKD;;;;;;;;GAQG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,gBAAgB,EAAE,CAgBnE;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,GAAG,MAAM,CAM7E;AAED,8CAA8C;AAC9C,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC3C,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;IAC5C;;;;OAIG;IACH,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC3C;AAQD;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,qBAAqB,GAAG,YAAY,CA+B3E;AAED;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,iBAAiB,CAC/B,IAAI,EAAE,SAAS,gBAAgB,EAAE,EACjC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAC/B,MAAM,EAAE,EAAE,CA6BZ;AAED;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,YAAY,EAClB,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAC/B,eAAe,EAAE,CAkBnB;AAED;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CAE1F;AAED;;;;;;;;;GASG;AACH,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAGzE;AA0HD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,GAAG,GAAG,GAAG,CAgBjE"}
|
package/dist/redirect-plan.js
CHANGED
|
@@ -116,29 +116,113 @@ export function buildRedirectPlan(args) {
|
|
|
116
116
|
}
|
|
117
117
|
return { redirects, gone, shadowedByBuild };
|
|
118
118
|
}
|
|
119
|
+
/**
|
|
120
|
+
* #1550 — the loops among `rows`, each as the bare from paths of its cycle
|
|
121
|
+
* in chain order: what {@link buildRedirectPlan} refuses as a loop, found
|
|
122
|
+
* without refusing. A caller that combines rules from several sources (a
|
|
123
|
+
* rollback restores some addresses and keeps others live) holds back the
|
|
124
|
+
* rules that close a loop instead of committing a table no host can serve.
|
|
125
|
+
* Chains follow the plan's rules: a row the build serves a page for is left
|
|
126
|
+
* out, and a chain ends at a 410, an external target, a target with a query
|
|
127
|
+
* or fragment, or a path no row answers. Rows are not validated here
|
|
128
|
+
* (`buildRedirectPlan` does that); of two spellings of one address the
|
|
129
|
+
* first counts.
|
|
130
|
+
*
|
|
131
|
+
* @example
|
|
132
|
+
* findRedirectLoops(
|
|
133
|
+
* [
|
|
134
|
+
* { fromPath: "/a", toPath: "/b", statusCode: 301 },
|
|
135
|
+
* { fromPath: "/b", toPath: "/a/", statusCode: 301 },
|
|
136
|
+
* ],
|
|
137
|
+
* new Set(),
|
|
138
|
+
* )
|
|
139
|
+
* // → [["/a", "/b"]]
|
|
140
|
+
*/
|
|
141
|
+
export function findRedirectLoops(rows, servedFiles) {
|
|
142
|
+
const live = new Map();
|
|
143
|
+
for (const row of rows) {
|
|
144
|
+
const bare = stripTrailingSlash(row.fromPath);
|
|
145
|
+
if (live.has(bare) || servedByBuild(bare, servedFiles))
|
|
146
|
+
continue;
|
|
147
|
+
live.set(bare, { bare, toPath: row.toPath, statusCode: row.statusCode });
|
|
148
|
+
}
|
|
149
|
+
const loops = [];
|
|
150
|
+
// A path whose chain was walked once: its loop, if any, is recorded, so
|
|
151
|
+
// every path is walked once and every loop found once.
|
|
152
|
+
const settled = new Set();
|
|
153
|
+
for (const start of live.values()) {
|
|
154
|
+
const chain = [];
|
|
155
|
+
const onChain = new Map();
|
|
156
|
+
let row = start;
|
|
157
|
+
while (row && row.statusCode !== GONE_STATUS && !settled.has(row.bare)) {
|
|
158
|
+
const at = onChain.get(row.bare);
|
|
159
|
+
if (at !== undefined) {
|
|
160
|
+
loops.push(chain.slice(at));
|
|
161
|
+
break;
|
|
162
|
+
}
|
|
163
|
+
onChain.set(row.bare, chain.length);
|
|
164
|
+
chain.push(row.bare);
|
|
165
|
+
if (/[?#]/.test(row.toPath) || isExternalRedirectTarget(row.toPath))
|
|
166
|
+
break;
|
|
167
|
+
row = live.get(stripTrailingSlash(row.toPath));
|
|
168
|
+
}
|
|
169
|
+
for (const bare of chain)
|
|
170
|
+
settled.add(bare);
|
|
171
|
+
}
|
|
172
|
+
return loops;
|
|
173
|
+
}
|
|
119
174
|
/**
|
|
120
175
|
* The planned redirects whose Location is a same-site path the build does
|
|
121
|
-
* not serve (#1157; an external address is the destination's business)
|
|
122
|
-
*
|
|
123
|
-
*
|
|
124
|
-
*
|
|
125
|
-
* build, and are never reported.
|
|
176
|
+
* not serve (#1157; an external address is the destination's business), so
|
|
177
|
+
* a redirect to a page that is still a draft answers 404 at its target
|
|
178
|
+
* until that page is published. Callers report these, and a release keeps
|
|
179
|
+
* such a change waiting (#1550). Paths under `/api/` are answered by the
|
|
180
|
+
* gateway, not the build, and are never reported.
|
|
181
|
+
*
|
|
182
|
+
* #1550 — a Location with a query or fragment ends the plan's chain
|
|
183
|
+
* collapse (it is another URL than the path a rule matches), but every
|
|
184
|
+
* serving layer matches a rule by the path alone: `/alias?utm=x` follows
|
|
185
|
+
* the rule on `/alias`. So a path another planned rule answers is served
|
|
186
|
+
* when that rule's own Location is (a gone rule's is not).
|
|
126
187
|
*
|
|
127
188
|
* @example
|
|
128
189
|
* redirectsToUnservedPaths(plan, new Set(["index.html"]))
|
|
129
190
|
* // → the entries of `plan.redirects` pointing anywhere but `/`
|
|
130
191
|
*/
|
|
131
192
|
export function redirectsToUnservedPaths(plan, servedFiles) {
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
193
|
+
const byFromPath = new Map(plan.redirects.map((r) => [r.fromPath, r]));
|
|
194
|
+
const reachable = (location, seen) => {
|
|
195
|
+
if (isExternalRedirectTarget(location))
|
|
196
|
+
return true;
|
|
197
|
+
const path = pathBeforeQuery(location);
|
|
136
198
|
if (path === "/api" || path.startsWith("/api/"))
|
|
199
|
+
return true;
|
|
200
|
+
const bare = stripTrailingSlash(path);
|
|
201
|
+
if (looksLikeFile(path) ? servedFiles.has(path.slice(1)) : servedByBuild(bare, servedFiles)) {
|
|
202
|
+
return true;
|
|
203
|
+
}
|
|
204
|
+
// A rule answers the path: served when its own Location is. `seen`
|
|
205
|
+
// ends a loop, which serves nothing.
|
|
206
|
+
const next = byFromPath.get(bare);
|
|
207
|
+
if (next === undefined || seen.has(bare))
|
|
137
208
|
return false;
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
209
|
+
seen.add(bare);
|
|
210
|
+
return reachable(next.location, seen);
|
|
211
|
+
};
|
|
212
|
+
return plan.redirects.filter((r) => !reachable(r.location, new Set([r.fromPath])));
|
|
213
|
+
}
|
|
214
|
+
/**
|
|
215
|
+
* #1550 — whether a file of the build answers `path` (a same-site path, its
|
|
216
|
+
* query and fragment ignored): the page's directory index, the bare-slug
|
|
217
|
+
* page, or the file itself. The same test the plan uses to let a page win
|
|
218
|
+
* over a rule.
|
|
219
|
+
*
|
|
220
|
+
* @example
|
|
221
|
+
* redirectPathServed("/about/", new Set(["about/index.html"])) // → true
|
|
222
|
+
* redirectPathServed("/gone", new Set(["index.html"])) // → false
|
|
223
|
+
*/
|
|
224
|
+
export function redirectPathServed(path, servedFiles) {
|
|
225
|
+
return servedByBuild(stripTrailingSlash(pathBeforeQuery(path)), servedFiles);
|
|
142
226
|
}
|
|
143
227
|
/**
|
|
144
228
|
* #1447 — every spelling of a path the redirects table can hold a row for.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"redirect-plan.js","sourceRoot":"","sources":["../src/redirect-plan.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"redirect-plan.js","sourceRoot":"","sources":["../src/redirect-plan.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* #1550 — redirects are draft state. An address (a from path, both
|
|
3
|
+
* trailing-slash spellings together) has a live state (a row of the
|
|
4
|
+
* `redirects` table, or none) and at most one pending change: a create, a
|
|
5
|
+
* change or a removal, in state Draft or Staged. Draft is served nowhere.
|
|
6
|
+
* A Staged change is served by staging and goes live with the Publish live
|
|
7
|
+
* that ships it.
|
|
8
|
+
*
|
|
9
|
+
* Which Staged changes a build serves is decided here, against the files of
|
|
10
|
+
* that build, so the staging gateway (the staging view, against the staged
|
|
11
|
+
* build) and the admin (Publish live, against the build going live; Go live
|
|
12
|
+
* now, against the live build) decide the same way:
|
|
13
|
+
*
|
|
14
|
+
* - **A change waits for its target.** A change whose same-site target the
|
|
15
|
+
* build does not serve (after the plan's chain collapse) is left out: the
|
|
16
|
+
* address keeps its live state, and the change stays Staged until a build
|
|
17
|
+
* that serves the target goes live. An address on another domain, a
|
|
18
|
+
* target under `/api/` and a 410 never wait.
|
|
19
|
+
* - **An automatic removal waits for its page.** A page that moves onto an
|
|
20
|
+
* address takes it over from the rule there (`applyPathMoveEffects`). That
|
|
21
|
+
* removal goes live with the build that serves the page at the address, so
|
|
22
|
+
* the rule keeps answering until then instead of leaving a 404.
|
|
23
|
+
*
|
|
24
|
+
* Leaving a change out can make another change's chain end at a target the
|
|
25
|
+
* build does not serve, so the check repeats until nothing more is left out.
|
|
26
|
+
* Each round leaves out every unserved change at once, so the rounds are
|
|
27
|
+
* bounded by the length of the longest chain, not by the number of changes.
|
|
28
|
+
*/
|
|
29
|
+
import { type RedirectPageUrlStyle, type RedirectPlan, type RedirectTableRow } from "./redirect-plan.js";
|
|
30
|
+
/** A pending change of one address, as the planner reads it. */
|
|
31
|
+
export interface PendingRedirectChange {
|
|
32
|
+
readonly id: string;
|
|
33
|
+
/** The bare from path (`/old`, `/` for the root): {@link redirectAddress}. */
|
|
34
|
+
readonly address: string;
|
|
35
|
+
/** The spelling the live row gets (`/old` or `/old/`). */
|
|
36
|
+
readonly fromPath: string;
|
|
37
|
+
/** Null: the change removes the address's live rule. */
|
|
38
|
+
readonly toPath: string | null;
|
|
39
|
+
/** Null exactly when `toPath` is. */
|
|
40
|
+
readonly statusCode: number | null;
|
|
41
|
+
/** A change a page write or a plugin made (never chosen by a person). */
|
|
42
|
+
readonly automatic: boolean;
|
|
43
|
+
}
|
|
44
|
+
/** Why a change is left out of a build. */
|
|
45
|
+
export type RedirectWaitReason =
|
|
46
|
+
/** Its same-site target is not served by the build. */
|
|
47
|
+
"target"
|
|
48
|
+
/** An automatic removal whose page the build does not serve at the address yet. */
|
|
49
|
+
| "page";
|
|
50
|
+
/** What {@link planRedirectRelease} decided. */
|
|
51
|
+
export interface RedirectRelease {
|
|
52
|
+
/** The table the build is served with: the live rows with every applied change. */
|
|
53
|
+
readonly rows: readonly RedirectTableRow[];
|
|
54
|
+
/** {@link buildRedirectPlan} of {@link rows} against the build. */
|
|
55
|
+
readonly plan: RedirectPlan;
|
|
56
|
+
/** Ids of the changes in {@link rows}. */
|
|
57
|
+
readonly applied: readonly string[];
|
|
58
|
+
/** The changes left out, with why. */
|
|
59
|
+
readonly waiting: readonly {
|
|
60
|
+
readonly id: string;
|
|
61
|
+
readonly reason: RedirectWaitReason;
|
|
62
|
+
}[];
|
|
63
|
+
}
|
|
64
|
+
/** Arguments of {@link planRedirectRelease}. */
|
|
65
|
+
export interface PlanRedirectReleaseArgs {
|
|
66
|
+
/** The live state: every row of the `redirects` table. */
|
|
67
|
+
readonly live: readonly RedirectTableRow[];
|
|
68
|
+
/** The changes that may go live with this build. */
|
|
69
|
+
readonly changes: readonly PendingRedirectChange[];
|
|
70
|
+
/** Every file of the build, relative and without a leading slash. */
|
|
71
|
+
readonly servedFiles: ReadonlySet<string>;
|
|
72
|
+
readonly pageUrlStyle: RedirectPageUrlStyle;
|
|
73
|
+
}
|
|
74
|
+
/**
|
|
75
|
+
* The address a from path belongs to: the path without its trailing slash
|
|
76
|
+
* (`/` stays `/`). Both spellings of a path are one address.
|
|
77
|
+
*
|
|
78
|
+
* @example
|
|
79
|
+
* redirectAddress("/old/") // → "/old"
|
|
80
|
+
*/
|
|
81
|
+
export declare function redirectAddress(fromPath: string): string;
|
|
82
|
+
/**
|
|
83
|
+
* The live rows with `changes` applied: a change replaces every live row of
|
|
84
|
+
* its address (both spellings), a removal leaves none. Ordered by from path,
|
|
85
|
+
* like the table dump every serving layer reads.
|
|
86
|
+
*/
|
|
87
|
+
export declare function applyRedirectChanges(live: readonly RedirectTableRow[], changes: readonly PendingRedirectChange[]): RedirectTableRow[];
|
|
88
|
+
/**
|
|
89
|
+
* Decide which of `changes` a build serves (see the module comment) and the
|
|
90
|
+
* table it is served with. Throws what {@link buildRedirectPlan} throws for a
|
|
91
|
+
* table no host can serve (a loop, two rules for one address): the caller
|
|
92
|
+
* refuses with that message, it never serves a guess.
|
|
93
|
+
*
|
|
94
|
+
* @example
|
|
95
|
+
* planRedirectRelease({
|
|
96
|
+
* live: [],
|
|
97
|
+
* changes: [{ id: "c1", address: "/old", fromPath: "/old", toPath: "/new",
|
|
98
|
+
* statusCode: 301, automatic: false }],
|
|
99
|
+
* servedFiles: new Set(["index.html"]),
|
|
100
|
+
* pageUrlStyle: "directory",
|
|
101
|
+
* }).waiting
|
|
102
|
+
* // → [{ id: "c1", reason: "target" }]: the build has no page at /new
|
|
103
|
+
*/
|
|
104
|
+
export declare function planRedirectRelease(args: PlanRedirectReleaseArgs): RedirectRelease;
|
|
105
|
+
//# sourceMappingURL=redirect-release.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redirect-release.d.ts","sourceRoot":"","sources":["../src/redirect-release.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AAEH,OAAO,EAEL,KAAK,oBAAoB,EACzB,KAAK,YAAY,EACjB,KAAK,gBAAgB,EAItB,MAAM,oBAAoB,CAAC;AAE5B,gEAAgE;AAChE,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,8EAA8E;IAC9E,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,0DAA0D;IAC1D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAC1B,wDAAwD;IACxD,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,qCAAqC;IACrC,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,yEAAyE;IACzE,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;CAC7B;AAED,2CAA2C;AAC3C,MAAM,MAAM,kBAAkB;AAC5B,uDAAuD;AACrD,QAAQ;AACV,mFAAmF;GACjF,MAAM,CAAC;AAEX,gDAAgD;AAChD,MAAM,WAAW,eAAe;IAC9B,mFAAmF;IACnF,QAAQ,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC3C,mEAAmE;IACnE,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IAC5B,0CAA0C;IAC1C,QAAQ,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;IACpC,sCAAsC;IACtC,QAAQ,CAAC,OAAO,EAAE,SAAS;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,EAAE,kBAAkB,CAAA;KAAE,EAAE,CAAC;CAC3F;AAED,gDAAgD;AAChD,MAAM,WAAW,uBAAuB;IACtC,0DAA0D;IAC1D,QAAQ,CAAC,IAAI,EAAE,SAAS,gBAAgB,EAAE,CAAC;IAC3C,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,SAAS,qBAAqB,EAAE,CAAC;IACnD,qEAAqE;IACrE,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC1C,QAAQ,CAAC,YAAY,EAAE,oBAAoB,CAAC;CAC7C;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAIxD;AAED;;;;GAIG;AACH,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,SAAS,gBAAgB,EAAE,EACjC,OAAO,EAAE,SAAS,qBAAqB,EAAE,GACxC,gBAAgB,EAAE,CAQpB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,uBAAuB,GAAG,eAAe,CA4BlF"}
|
|
@@ -0,0 +1,104 @@
|
|
|
1
|
+
// SPDX-License-Identifier: MPL-2.0
|
|
2
|
+
/**
|
|
3
|
+
* #1550 — redirects are draft state. An address (a from path, both
|
|
4
|
+
* trailing-slash spellings together) has a live state (a row of the
|
|
5
|
+
* `redirects` table, or none) and at most one pending change: a create, a
|
|
6
|
+
* change or a removal, in state Draft or Staged. Draft is served nowhere.
|
|
7
|
+
* A Staged change is served by staging and goes live with the Publish live
|
|
8
|
+
* that ships it.
|
|
9
|
+
*
|
|
10
|
+
* Which Staged changes a build serves is decided here, against the files of
|
|
11
|
+
* that build, so the staging gateway (the staging view, against the staged
|
|
12
|
+
* build) and the admin (Publish live, against the build going live; Go live
|
|
13
|
+
* now, against the live build) decide the same way:
|
|
14
|
+
*
|
|
15
|
+
* - **A change waits for its target.** A change whose same-site target the
|
|
16
|
+
* build does not serve (after the plan's chain collapse) is left out: the
|
|
17
|
+
* address keeps its live state, and the change stays Staged until a build
|
|
18
|
+
* that serves the target goes live. An address on another domain, a
|
|
19
|
+
* target under `/api/` and a 410 never wait.
|
|
20
|
+
* - **An automatic removal waits for its page.** A page that moves onto an
|
|
21
|
+
* address takes it over from the rule there (`applyPathMoveEffects`). That
|
|
22
|
+
* removal goes live with the build that serves the page at the address, so
|
|
23
|
+
* the rule keeps answering until then instead of leaving a 404.
|
|
24
|
+
*
|
|
25
|
+
* Leaving a change out can make another change's chain end at a target the
|
|
26
|
+
* build does not serve, so the check repeats until nothing more is left out.
|
|
27
|
+
* Each round leaves out every unserved change at once, so the rounds are
|
|
28
|
+
* bounded by the length of the longest chain, not by the number of changes.
|
|
29
|
+
*/
|
|
30
|
+
import { buildRedirectPlan, redirectFromPathSpellings, redirectPathServed, redirectsToUnservedPaths, } from "./redirect-plan.js";
|
|
31
|
+
/**
|
|
32
|
+
* The address a from path belongs to: the path without its trailing slash
|
|
33
|
+
* (`/` stays `/`). Both spellings of a path are one address.
|
|
34
|
+
*
|
|
35
|
+
* @example
|
|
36
|
+
* redirectAddress("/old/") // → "/old"
|
|
37
|
+
*/
|
|
38
|
+
export function redirectAddress(fromPath) {
|
|
39
|
+
const [bare] = redirectFromPathSpellings(fromPath);
|
|
40
|
+
if (bare === undefined)
|
|
41
|
+
throw new Error(`redirectAddress: no spelling for ${fromPath}`);
|
|
42
|
+
return bare;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* The live rows with `changes` applied: a change replaces every live row of
|
|
46
|
+
* its address (both spellings), a removal leaves none. Ordered by from path,
|
|
47
|
+
* like the table dump every serving layer reads.
|
|
48
|
+
*/
|
|
49
|
+
export function applyRedirectChanges(live, changes) {
|
|
50
|
+
const changed = new Set(changes.map((c) => c.address));
|
|
51
|
+
const rows = live.filter((r) => !changed.has(redirectAddress(r.fromPath)));
|
|
52
|
+
for (const c of changes) {
|
|
53
|
+
if (c.toPath === null || c.statusCode === null)
|
|
54
|
+
continue;
|
|
55
|
+
rows.push({ fromPath: c.fromPath, toPath: c.toPath, statusCode: c.statusCode });
|
|
56
|
+
}
|
|
57
|
+
return rows.sort((a, b) => (a.fromPath < b.fromPath ? -1 : a.fromPath > b.fromPath ? 1 : 0));
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* Decide which of `changes` a build serves (see the module comment) and the
|
|
61
|
+
* table it is served with. Throws what {@link buildRedirectPlan} throws for a
|
|
62
|
+
* table no host can serve (a loop, two rules for one address): the caller
|
|
63
|
+
* refuses with that message, it never serves a guess.
|
|
64
|
+
*
|
|
65
|
+
* @example
|
|
66
|
+
* planRedirectRelease({
|
|
67
|
+
* live: [],
|
|
68
|
+
* changes: [{ id: "c1", address: "/old", fromPath: "/old", toPath: "/new",
|
|
69
|
+
* statusCode: 301, automatic: false }],
|
|
70
|
+
* servedFiles: new Set(["index.html"]),
|
|
71
|
+
* pageUrlStyle: "directory",
|
|
72
|
+
* }).waiting
|
|
73
|
+
* // → [{ id: "c1", reason: "target" }]: the build has no page at /new
|
|
74
|
+
*/
|
|
75
|
+
export function planRedirectRelease(args) {
|
|
76
|
+
const waiting = [];
|
|
77
|
+
let applied = [];
|
|
78
|
+
for (const c of args.changes) {
|
|
79
|
+
if (c.automatic && c.toPath === null && !redirectPathServed(c.address, args.servedFiles)) {
|
|
80
|
+
waiting.push({ id: c.id, reason: "page" });
|
|
81
|
+
}
|
|
82
|
+
else {
|
|
83
|
+
applied.push(c);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
for (;;) {
|
|
87
|
+
const rows = applyRedirectChanges(args.live, applied);
|
|
88
|
+
const plan = buildRedirectPlan({
|
|
89
|
+
rows,
|
|
90
|
+
pageUrlStyle: args.pageUrlStyle,
|
|
91
|
+
servedFiles: args.servedFiles,
|
|
92
|
+
});
|
|
93
|
+
const unserved = new Set(redirectsToUnservedPaths(plan, args.servedFiles).map((r) => r.fromPath));
|
|
94
|
+
const late = applied.filter((c) => c.toPath !== null && unserved.has(c.address));
|
|
95
|
+
if (late.length === 0) {
|
|
96
|
+
return { rows, plan, applied: applied.map((c) => c.id), waiting };
|
|
97
|
+
}
|
|
98
|
+
const lateIds = new Set(late.map((c) => c.id));
|
|
99
|
+
applied = applied.filter((c) => !lateIds.has(c.id));
|
|
100
|
+
for (const c of late)
|
|
101
|
+
waiting.push({ id: c.id, reason: "target" });
|
|
102
|
+
}
|
|
103
|
+
}
|
|
104
|
+
//# sourceMappingURL=redirect-release.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redirect-release.js","sourceRoot":"","sources":["../src/redirect-release.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,4 +25,17 @@ export declare function isUntrustedToolResult(content: string): boolean;
|
|
|
25
25
|
* anything that is not such a wrapper.
|
|
26
26
|
*/
|
|
27
27
|
export declare function untrustedToolResultValue(content: string): unknown;
|
|
28
|
+
/** The element that marks content crawled from another website (#1360). */
|
|
29
|
+
export declare const SITE_DATA_TAG = "site-data";
|
|
30
|
+
/**
|
|
31
|
+
* Mark `text` as crawled from another website, for the admin AI (#1360): a
|
|
32
|
+
* site import's pages, titles, URLs and what its crawl reported about them
|
|
33
|
+
* come from a job that read third-party pages, so any of it may be an
|
|
34
|
+
* attempt to instruct the AI. Inline, so the tool's own guidance around it
|
|
35
|
+
* stays Caelo's; the static system prompt says what the element means. A
|
|
36
|
+
* closing tag inside the text is escaped, so crawled text cannot end the
|
|
37
|
+
* element early and go on as if it were outside it; everything else stays
|
|
38
|
+
* as it is, so the HTML and Markdown the AI rebuilds from stay readable.
|
|
39
|
+
*/
|
|
40
|
+
export declare function siteData(text: string): string;
|
|
28
41
|
//# sourceMappingURL=untrusted-tool-result.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"untrusted-tool-result.d.ts","sourceRoot":"","sources":["../src/untrusted-tool-result.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AAEH,uCAAuC;AACvC,eAAO,MAAM,yBAAyB,0BAA0B,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAU1D;AAED,mEAAmE;AACnE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAUjE"}
|
|
1
|
+
{"version":3,"file":"untrusted-tool-result.d.ts","sourceRoot":"","sources":["../src/untrusted-tool-result.ts"],"names":[],"mappings":"AAEA;;;;;;;;GAQG;AAEH,uCAAuC;AACvC,eAAO,MAAM,yBAAyB,0BAA0B,CAAC;AAEjE;;;;;;GAMG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAU1D;AAED,mEAAmE;AACnE,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAE9D;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAUjE;AAED,2EAA2E;AAC3E,eAAO,MAAM,aAAa,cAAc,CAAC;AAEzC;;;;;;;;;GASG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE7C"}
|
|
@@ -46,4 +46,19 @@ export function untrustedToolResultValue(content) {
|
|
|
46
46
|
}
|
|
47
47
|
return JSON.parse(lines[2]);
|
|
48
48
|
}
|
|
49
|
+
/** The element that marks content crawled from another website (#1360). */
|
|
50
|
+
export const SITE_DATA_TAG = "site-data";
|
|
51
|
+
/**
|
|
52
|
+
* Mark `text` as crawled from another website, for the admin AI (#1360): a
|
|
53
|
+
* site import's pages, titles, URLs and what its crawl reported about them
|
|
54
|
+
* come from a job that read third-party pages, so any of it may be an
|
|
55
|
+
* attempt to instruct the AI. Inline, so the tool's own guidance around it
|
|
56
|
+
* stays Caelo's; the static system prompt says what the element means. A
|
|
57
|
+
* closing tag inside the text is escaped, so crawled text cannot end the
|
|
58
|
+
* element early and go on as if it were outside it; everything else stays
|
|
59
|
+
* as it is, so the HTML and Markdown the AI rebuilds from stay readable.
|
|
60
|
+
*/
|
|
61
|
+
export function siteData(text) {
|
|
62
|
+
return `<${SITE_DATA_TAG}>${text.replace(/<\/(site-data)/gi, "<\\/$1")}</${SITE_DATA_TAG}>`;
|
|
63
|
+
}
|
|
49
64
|
//# sourceMappingURL=untrusted-tool-result.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"untrusted-tool-result.js","sourceRoot":"","sources":["../src/untrusted-tool-result.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAEnC;;;;;;;;GAQG;AAEH,uCAAuC;AACvC,MAAM,CAAC,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC;SAC3C,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC;SAC1B,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9B,OAAO;QACL,IAAI,yBAAyB,GAAG;QAChC,6NAA6N;QAC7N,IAAI;QACJ,KAAK,yBAAyB,GAAG;KAClC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,yBAAyB,KAAK,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAAe;IACtD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,IACE,KAAK,CAAC,MAAM,KAAK,CAAC;QAClB,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,yBAAyB,GAAG;QAC7C,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,yBAAyB,GAAG,EAC9C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAW,CAAC,CAAC;AACxC,CAAC"}
|
|
1
|
+
{"version":3,"file":"untrusted-tool-result.js","sourceRoot":"","sources":["../src/untrusted-tool-result.ts"],"names":[],"mappings":"AAAA,mCAAmC;AAEnC;;;;;;;;GAQG;AAEH,uCAAuC;AACvC,MAAM,CAAC,MAAM,yBAAyB,GAAG,uBAAuB,CAAC;AAEjE;;;;;;GAMG;AACH,MAAM,UAAU,mBAAmB,CAAC,KAAc;IAChD,MAAM,IAAI,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,MAAM,CAAC;SAC3C,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC;SAC1B,UAAU,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IAC9B,OAAO;QACL,IAAI,yBAAyB,GAAG;QAChC,6NAA6N;QAC7N,IAAI;QACJ,KAAK,yBAAyB,GAAG;KAClC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACf,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,qBAAqB,CAAC,OAAe;IACnD,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,yBAAyB,KAAK,CAAC,CAAC;AAChE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,wBAAwB,CAAC,OAAe;IACtD,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,IACE,KAAK,CAAC,MAAM,KAAK,CAAC;QAClB,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,yBAAyB,GAAG;QAC7C,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,yBAAyB,GAAG,EAC9C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAW,CAAC,CAAC;AACxC,CAAC;AAED,2EAA2E;AAC3E,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAC;AAEzC;;;;;;;;;GASG;AACH,MAAM,UAAU,QAAQ,CAAC,IAAY;IACnC,OAAO,IAAI,aAAa,IAAI,IAAI,CAAC,OAAO,CAAC,kBAAkB,EAAE,QAAQ,CAAC,KAAK,aAAa,GAAG,CAAC;AAC9F,CAAC"}
|