@trokky/client 3.5.2 → 3.5.4
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/client.d.ts +22 -5
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +8 -10
- package/dist/client.js.map +1 -1
- package/dist/http/client.d.ts.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/media/url-builder.d.ts +6 -1
- package/dist/media/url-builder.d.ts.map +1 -1
- package/dist/media/url-builder.js +1 -1
- package/dist/media/url-builder.js.map +1 -1
- package/dist/server/media-proxy.d.ts.map +1 -1
- package/dist/server/media-proxy.js +9 -0
- package/dist/server/media-proxy.js.map +1 -1
- package/dist/shortcodes/index.d.ts +2 -2
- package/dist/shortcodes/index.d.ts.map +1 -1
- package/dist/shortcodes/index.js +1 -1
- package/dist/shortcodes/index.js.map +1 -1
- package/dist/shortcodes/parser.d.ts +18 -1
- package/dist/shortcodes/parser.d.ts.map +1 -1
- package/dist/shortcodes/parser.js +75 -0
- package/dist/shortcodes/parser.js.map +1 -1
- package/dist/shortcodes/resolver.d.ts +13 -4
- package/dist/shortcodes/resolver.d.ts.map +1 -1
- package/dist/shortcodes/resolver.js +25 -23
- package/dist/shortcodes/resolver.js.map +1 -1
- package/dist/shortcodes/types.d.ts +9 -0
- package/dist/shortcodes/types.d.ts.map +1 -1
- package/dist/types/index.d.ts +10 -0
- package/dist/types/index.d.ts.map +1 -1
- package/package.json +2 -2
package/dist/client.d.ts
CHANGED
|
@@ -9,6 +9,7 @@ import { MediaHelper } from './media/helper.js';
|
|
|
9
9
|
import { ShortcodeResolver } from './shortcodes/resolver.js';
|
|
10
10
|
import { QueryBuilder, SingletonBuilder } from './query/builder.js';
|
|
11
11
|
import { ImageUrlBuilder } from './media/url-builder.js';
|
|
12
|
+
import type { RichTextNode, RichTextValue } from './shortcodes/types.js';
|
|
12
13
|
import type { ClientConfig, AuthConfig, AuthTokens, QueryOptions, DocumentResult, CollectionResult, MediaResult, BaseDocument, MediaFieldValue } from './types/index.js';
|
|
13
14
|
export declare class TrokkyClient {
|
|
14
15
|
readonly http: HttpClient;
|
|
@@ -16,6 +17,7 @@ export declare class TrokkyClient {
|
|
|
16
17
|
readonly documents: DocumentClient;
|
|
17
18
|
readonly media: MediaHelper;
|
|
18
19
|
readonly shortcodes: ShortcodeResolver;
|
|
20
|
+
private readonly mediaBaseUrl?;
|
|
19
21
|
constructor(config: ClientConfig);
|
|
20
22
|
/**
|
|
21
23
|
* Authenticate with username and password
|
|
@@ -122,10 +124,24 @@ export declare class TrokkyClient {
|
|
|
122
124
|
*/
|
|
123
125
|
deleteApiToken(id: string): Promise<void>;
|
|
124
126
|
/**
|
|
125
|
-
*
|
|
126
|
-
*
|
|
127
|
-
|
|
128
|
-
|
|
127
|
+
* Prepare a rich-text value for display: its images get URLs a browser can load.
|
|
128
|
+
*
|
|
129
|
+
* Placeholders become URLs: `[trokky-image:<id>]` in a ProseMirror document, and the
|
|
130
|
+
* `[trokky-image …]` placeholders earlier Studio versions wrote. With `mediaBaseUrl` (or
|
|
131
|
+
* `options.mediaBaseUrl` for this call) every image is also rebuilt from its media id, in
|
|
132
|
+
* HTML from `data-trokky-id` and in Markdown from its `/media/<id>/…` path, so the path the
|
|
133
|
+
* content was saved with stops mattering. Without it, stored images are left as saved and
|
|
134
|
+
* placeholders point at `${baseUrl}/media`. Empty content gives `''`.
|
|
135
|
+
*/
|
|
136
|
+
resolveContent(content: string | null | undefined, options?: {
|
|
137
|
+
mediaBaseUrl?: string;
|
|
138
|
+
}): string;
|
|
139
|
+
resolveContent(content: RichTextNode, options?: {
|
|
140
|
+
mediaBaseUrl?: string;
|
|
141
|
+
}): RichTextNode;
|
|
142
|
+
resolveContent(content: RichTextValue | null | undefined, options?: {
|
|
143
|
+
mediaBaseUrl?: string;
|
|
144
|
+
}): RichTextValue;
|
|
129
145
|
/**
|
|
130
146
|
* Check if content contains shortcodes
|
|
131
147
|
*/
|
|
@@ -134,7 +150,7 @@ export declare class TrokkyClient {
|
|
|
134
150
|
* Extract media dependencies from content
|
|
135
151
|
* Useful for preloading or understanding content requirements
|
|
136
152
|
*/
|
|
137
|
-
extractContentMedia(content: string): import("./
|
|
153
|
+
extractContentMedia(content: string): import("./shortcodes/types.js").TrokkyImageShortcode[];
|
|
138
154
|
/**
|
|
139
155
|
* Preload all media in content for faster rendering
|
|
140
156
|
*/
|
|
@@ -216,6 +232,7 @@ export declare class TrokkyClient {
|
|
|
216
232
|
*/
|
|
217
233
|
createImageUrlBuilder(options?: {
|
|
218
234
|
proxyPath?: string;
|
|
235
|
+
mediaBaseUrl?: string;
|
|
219
236
|
}): (source: MediaFieldValue | string | null | undefined) => ImageUrlBuilder;
|
|
220
237
|
}
|
|
221
238
|
//# sourceMappingURL=client.d.ts.map
|
package/dist/client.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,EAAE,eAAe,EAAyB,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,EAAE,eAAe,EAAyB,MAAM,wBAAwB,CAAA;AAC/E,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAExE,OAAO,KAAK,EACV,YAAY,EACZ,UAAU,EACV,UAAU,EACV,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,WAAW,EACX,YAAY,EACZ,eAAe,EAChB,MAAM,kBAAkB,CAAA;AAEzB,qBAAa,YAAY;IACvB,SAAgB,IAAI,EAAE,UAAU,CAAA;IAChC,SAAgB,KAAK,EAAE,YAAY,CAAA;IACnC,SAAgB,SAAS,EAAE,cAAc,CAAA;IACzC,SAAgB,KAAK,EAAE,WAAW,CAAA;IAClC,SAAgB,UAAU,EAAE,iBAAiB,CAAA;IAC7C,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAQ;gBAE1B,MAAM,EAAE,YAAY;IAYhC;;OAEG;IACG,YAAY,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC;IAIhE;;OAEG;IACG,WAAW,IAAI,OAAO,CAAC,UAAU,CAAC;IAIxC;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAK7B;;OAEG;IACH,eAAe,IAAI,OAAO;IAI1B;;OAEG;IACH,SAAS,IAAI,UAAU,GAAG,IAAI;IAI9B;;OAEG;IACH,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,IAAI;IAInC;;OAEG;IACH,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,IAAI;IAIhC;;OAEG;IACH,WAAW,IAAI,MAAM,GAAG,IAAI;IAI5B;;OAEG;IACH,aAAa,IAAI,IAAI;IAMrB;;OAEG;IACG,WAAW,CAAC,CAAC,SAAS,YAAY,EACtC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,QAAQ,UAAO,GACd,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAI7B;;OAEG;IACG,cAAc,CAAC,CAAC,SAAS,YAAY,EACzC,IAAI,EAAE,MAAM,EACZ,OAAO,GAAE,YAAiB,EAC1B,QAAQ,UAAO,GACd,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAI/B;;OAEG;IACG,cAAc,CAAC,CAAC,SAAS,YAAY,EACzC,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC,GACxE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAI7B;;OAEG;IACG,cAAc,CAAC,CAAC,SAAS,YAAY,EACzC,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC,CAAC,GACjF,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAI7B;;OAEG;IACG,eAAe,CAAC,CAAC,SAAS,YAAY,EAC1C,IAAI,EAAE,MAAM,EACZ,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,KAAK,GAAG,OAAO,GAAG,YAAY,GAAG,YAAY,GAAG,UAAU,CAAC,GACxE,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC;IAI7B;;OAEG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7D;;OAEG;IACG,eAAe,CAAC,CAAC,SAAS,YAAY,EAC1C,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,MAAM,CAAC,EAAE,MAAM,EAAE,EACjB,OAAO,GAAE,IAAI,CAAC,YAAY,EAAE,QAAQ,CAAM,GACzC,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAI/B;;OAEG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC;IAIjF;;OAEG;IACG,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAMhE;;OAEG;IACG,UAAU,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAI9E;;OAEG;IACG,QAAQ,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,CAAC;IAIhD;;OAEG;IACG,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5C;;OAEG;IACG,aAAa,IAAI,OAAO,CAAC,GAAG,CAAC;IAInC;;OAEG;IACG,cAAc,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAI7C;;OAEG;IACG,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAI/C;;OAEG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,GAAG,CAAC;IAIzD;;OAEG;IACG,cAAc,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAM/C;;;;;;;;;OASG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;IAC/F,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY;IACxF,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,aAAa;IAK7G;;OAEG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;OAGG;IACH,mBAAmB,CAAC,OAAO,EAAE,MAAM;IAInC;;OAEG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMzD;;OAEG;IACG,IAAI,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAI5D;;OAEG;IACG,MAAM,IAAI,OAAO,CAAC;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;IAI7E;;OAEG;IACH,UAAU,IAAI,IAAI;IAIlB;;OAEG;IACH,aAAa,IAAI;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE;IAMjC;;OAEG;IACH,OAAO,IAAI,IAAI;IAQf;;;;;;;;;;;;;OAaG;IACH,IAAI,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,EAAE,IAAI,EAAE,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC;IAI1E;;;;;;;;OAQG;IACH,SAAS,CAAC,CAAC,SAAS,YAAY,GAAG,YAAY,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,GAAG,gBAAgB,CAAC,CAAC,CAAC;IAQhG;;;;;;;;;;;OAWG;IACH,QAAQ,CAAC,MAAM,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS,GAAG,eAAe;IAO9E;;;;;;;;OAQG;IACH,qBAAqB,CAAC,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE;CAO9E"}
|
package/dist/client.js
CHANGED
|
@@ -16,7 +16,8 @@ export class TrokkyClient {
|
|
|
16
16
|
this.cache = new CacheManager(config.cacheMaxAge);
|
|
17
17
|
this.documents = new DocumentClient(this.http, this.cache);
|
|
18
18
|
this.media = new MediaHelper(this.http);
|
|
19
|
-
this.
|
|
19
|
+
this.mediaBaseUrl = config.mediaBaseUrl !== undefined ? config.mediaBaseUrl.replace(/\/+$/, '') : undefined;
|
|
20
|
+
this.shortcodes = new ShortcodeResolver(this.http, this.media, this.mediaBaseUrl);
|
|
20
21
|
}
|
|
21
22
|
// Authentication methods (delegate to http client)
|
|
22
23
|
/**
|
|
@@ -179,13 +180,8 @@ export class TrokkyClient {
|
|
|
179
180
|
async deleteApiToken(id) {
|
|
180
181
|
return this.http.deleteApiToken(id);
|
|
181
182
|
}
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
* Resolve shortcodes in content to HTML
|
|
185
|
-
* Converts environment-agnostic shortcodes to actual HTML for display
|
|
186
|
-
*/
|
|
187
|
-
resolveContent(content) {
|
|
188
|
-
return this.shortcodes.resolveContent(content);
|
|
183
|
+
resolveContent(content, options) {
|
|
184
|
+
return this.shortcodes.resolveContent(content, options);
|
|
189
185
|
}
|
|
190
186
|
/**
|
|
191
187
|
* Check if content contains shortcodes
|
|
@@ -288,7 +284,8 @@ export class TrokkyClient {
|
|
|
288
284
|
*/
|
|
289
285
|
imageUrl(source) {
|
|
290
286
|
return new ImageUrlBuilder({
|
|
291
|
-
baseUrl: this.http.getBaseUrl()
|
|
287
|
+
baseUrl: this.http.getBaseUrl(),
|
|
288
|
+
mediaBaseUrl: this.mediaBaseUrl
|
|
292
289
|
}).image(source);
|
|
293
290
|
}
|
|
294
291
|
/**
|
|
@@ -303,7 +300,8 @@ export class TrokkyClient {
|
|
|
303
300
|
createImageUrlBuilder(options) {
|
|
304
301
|
return createImageUrlBuilder({
|
|
305
302
|
baseUrl: this.http.getBaseUrl(),
|
|
306
|
-
proxyPath: options?.proxyPath
|
|
303
|
+
proxyPath: options?.proxyPath,
|
|
304
|
+
mediaBaseUrl: options?.mediaBaseUrl ?? this.mediaBaseUrl
|
|
307
305
|
});
|
|
308
306
|
}
|
|
309
307
|
}
|
package/dist/client.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACnE,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../src/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/http/client.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EACV,YAAY,EACZ,cAAc,EAEd,UAAU,EACV,UAAU,EACX,MAAM,mBAAmB,CAAA;AAe1B,qBAAa,UAAU;IACrB,OAAO,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../src/http/client.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -12,9 +12,9 @@ export type { QueryBuilderOptions, ExpandConfig } from './query/builder.js';
|
|
|
12
12
|
export { ImageUrlBuilder, createImageUrlBuilder, getSrcSet, getBestVariant } from './media/url-builder.js';
|
|
13
13
|
export type { ImageUrlBuilderOptions, ImageFormat, ImageFit } from './media/url-builder.js';
|
|
14
14
|
export { ShortcodeResolver, createMediaUrlResolver } from './shortcodes/resolver.js';
|
|
15
|
-
export { parseShortcodeAttrs, parseImageShortcode, shortcodeToHtml, resolveShortcodes, hasShortcodes, extractImageShortcodes } from './shortcodes/parser.js';
|
|
15
|
+
export { parseShortcodeAttrs, parseImageShortcode, shortcodeToHtml, resolveShortcodes, hasShortcodes, extractImageShortcodes, resolveProseMirrorShortcodes, rebaseStoredMediaUrls } from './shortcodes/parser.js';
|
|
16
16
|
export type { ClientConfig, AuthConfig, ApiTokenAuth, AuthTokens, AppToken, CreateAppTokenData, AppTokenResult, RequestOptions, MediaResult, ValidationError, ApiError, CacheEntry, TypeGeneratorOptions, DocumentGeneratorOptions, ClientEvents, ClientEventType, BaseDocument, DocumentResult, CollectionResult, DocumentWithContent, QueryOptions, ListOptions, MediaAsset, MediaFieldValue, MediaAssetReference, MediaType } from './types/index.js';
|
|
17
|
-
export type { TrokkyImageShortcode, MediaUrlResolver } from './shortcodes/types.js';
|
|
17
|
+
export type { TrokkyImageShortcode, MediaUrlResolver, RichTextNode, RichTextValue } from './shortcodes/types.js';
|
|
18
18
|
export { TypeGenerator, generateTypes, generateTypesFromSchema, DocumentGenerator, generateDocuments } from './generator/index.js';
|
|
19
19
|
export type { FieldSchema, DocumentSchema, ProjectSchema } from './generator/index.js';
|
|
20
20
|
export type { MediaVariant, MediaFile, MediaResponse } from './media/helper.js';
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACnE,YAAY,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAG3E,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,SAAS,EACT,cAAc,EACf,MAAM,wBAAwB,CAAA;AAC/B,YAAY,EAAE,sBAAsB,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAG3F,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACpF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,sBAAsB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAG/C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACnE,YAAY,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AAG3E,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,SAAS,EACT,cAAc,EACf,MAAM,wBAAwB,CAAA;AAC/B,YAAY,EAAE,sBAAsB,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAA;AAG3F,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACpF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,4BAA4B,EAC5B,qBAAqB,EACtB,MAAM,wBAAwB,CAAA;AAE/B,YAAY,EACV,YAAY,EACZ,UAAU,EACV,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,kBAAkB,EAClB,cAAc,EACd,cAAc,EACd,WAAW,EACX,eAAe,EACf,QAAQ,EACR,UAAU,EACV,oBAAoB,EACpB,wBAAwB,EACxB,YAAY,EACZ,eAAe,EAEf,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,WAAW,EACX,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,SAAS,EACV,MAAM,kBAAkB,CAAA;AAGzB,YAAY,EACV,oBAAoB,EACpB,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACd,MAAM,uBAAuB,CAAA;AAG9B,OAAO,EACL,aAAa,EACb,aAAa,EACb,uBAAuB,EACvB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,sBAAsB,CAAA;AAE7B,YAAY,EACV,WAAW,EACX,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAA;AAG7B,YAAY,EACV,YAAY,EACZ,SAAS,EACT,aAAa,EACd,MAAM,mBAAmB,CAAA;AAG1B,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA"}
|
package/dist/index.js
CHANGED
|
@@ -13,7 +13,7 @@ export { QueryBuilder, SingletonBuilder } from './query/builder.js';
|
|
|
13
13
|
export { ImageUrlBuilder, createImageUrlBuilder, getSrcSet, getBestVariant } from './media/url-builder.js';
|
|
14
14
|
// Shortcode support
|
|
15
15
|
export { ShortcodeResolver, createMediaUrlResolver } from './shortcodes/resolver.js';
|
|
16
|
-
export { parseShortcodeAttrs, parseImageShortcode, shortcodeToHtml, resolveShortcodes, hasShortcodes, extractImageShortcodes } from './shortcodes/parser.js';
|
|
16
|
+
export { parseShortcodeAttrs, parseImageShortcode, shortcodeToHtml, resolveShortcodes, hasShortcodes, extractImageShortcodes, resolveProseMirrorShortcodes, rebaseStoredMediaUrls } from './shortcodes/parser.js';
|
|
17
17
|
// Type generator exports (for separate import)
|
|
18
18
|
export { TypeGenerator, generateTypes, generateTypesFromSchema, DocumentGenerator, generateDocuments } from './generator/index.js';
|
|
19
19
|
// React integration (optional export path)
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,uBAAuB;AACvB,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGnE,2BAA2B;AAC3B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,SAAS,EACT,cAAc,EACf,MAAM,wBAAwB,CAAA;AAG/B,oBAAoB;AACpB,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACpF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,sBAAsB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAA;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,uBAAuB;AACvB,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAGnE,2BAA2B;AAC3B,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,SAAS,EACT,cAAc,EACf,MAAM,wBAAwB,CAAA;AAG/B,oBAAoB;AACpB,OAAO,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACpF,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,4BAA4B,EAC5B,qBAAqB,EACtB,MAAM,wBAAwB,CAAA;AAwC/B,+CAA+C;AAC/C,OAAO,EACL,aAAa,EACb,aAAa,EACb,uBAAuB,EACvB,iBAAiB,EACjB,iBAAiB,EAClB,MAAM,sBAAsB,CAAA;AAe7B,2CAA2C;AAC3C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA"}
|
|
@@ -8,8 +8,13 @@ import type { MediaFieldValue } from '@trokky/trokky/types';
|
|
|
8
8
|
export interface ImageUrlBuilderOptions {
|
|
9
9
|
/** Base URL for media API */
|
|
10
10
|
baseUrl: string;
|
|
11
|
-
/**
|
|
11
|
+
/**
|
|
12
|
+
* Legacy proxy mode: named variants become width parameters on `/file`. Prefer
|
|
13
|
+
* `mediaBaseUrl`, which keeps real variant URLs.
|
|
14
|
+
*/
|
|
12
15
|
proxyPath?: string;
|
|
16
|
+
/** Where media is loaded from, replacing `${baseUrl}/media` (a proxy path or a public URL) */
|
|
17
|
+
mediaBaseUrl?: string;
|
|
13
18
|
}
|
|
14
19
|
export type ImageFormat = 'webp' | 'jpeg' | 'jpg' | 'png' | 'avif' | 'auto';
|
|
15
20
|
export type ImageFit = 'cover' | 'contain' | 'fill' | 'inside' | 'outside';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-builder.d.ts","sourceRoot":"","sources":["../../src/media/url-builder.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAE3D,MAAM,WAAW,sBAAsB;IACrC,6BAA6B;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf
|
|
1
|
+
{"version":3,"file":"url-builder.d.ts","sourceRoot":"","sources":["../../src/media/url-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -158,7 +158,7 @@ export class ImageUrlBuilder {
|
|
|
158
158
|
// When using baseUrl, we need to add /media prefix
|
|
159
159
|
const basePath = isProxy
|
|
160
160
|
? this.options.proxyPath
|
|
161
|
-
: `${this.options.baseUrl}/media
|
|
161
|
+
: (this.options.mediaBaseUrl?.replace(/\/+$/, '') ?? `${this.options.baseUrl}/media`);
|
|
162
162
|
// Build URL with transformation parameters
|
|
163
163
|
const params = new URLSearchParams();
|
|
164
164
|
// For proxy mode with variants, convert to width params
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-builder.js","sourceRoot":"","sources":["../../src/media/url-builder.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;
|
|
1
|
+
{"version":3,"file":"url-builder.js","sourceRoot":"","sources":["../../src/media/url-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-proxy.d.ts","sourceRoot":"","sources":["../../src/server/media-proxy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,WAAW,gBAAgB;IAC/B,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,mCAAmC;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,qDAAqD;IACrD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACzC;AAED,MAAM,WAAW,YAAY;IAC3B,sEAAsE;IACtE,IAAI,EAAE,MAAM,CAAA;IACZ,sBAAsB;IACtB,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC3C;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,WAAW,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAA;IACrD,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;
|
|
1
|
+
{"version":3,"file":"media-proxy.d.ts","sourceRoot":"","sources":["../../src/server/media-proxy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,MAAM,WAAW,gBAAgB;IAC/B,0BAA0B;IAC1B,MAAM,EAAE,MAAM,CAAA;IACd,mCAAmC;IACnC,QAAQ,EAAE,MAAM,CAAA;IAChB,iCAAiC;IACjC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,qDAAqD;IACrD,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CACzC;AAED,MAAM,WAAW,YAAY;IAC3B,sEAAsE;IACtE,IAAI,EAAE,MAAM,CAAA;IACZ,sBAAsB;IACtB,OAAO,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAC3C;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,WAAW,GAAG,cAAc,CAAC,UAAU,CAAC,GAAG,IAAI,CAAA;IACrD,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAChC;AASD;;GAEG;AACH,wBAAsB,iBAAiB,CACrC,MAAM,EAAE,gBAAgB,EACxB,OAAO,EAAE,YAAY,GACpB,OAAO,CAAC,aAAa,CAAC,CA8CxB;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,gBAAgB,IACzC,SAAS,YAAY,KAAG,OAAO,CAAC,aAAa,CAAC,CAG7D;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,gBAAgB,IAC9C,YAAY;IAAE,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,KAAG,OAAO,CAAC,QAAQ,CAAC,CAgB5E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,gBAAgB,IAEzD,SAAS,OAAO,EAChB,YAAY;IAAE,MAAM,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAA;KAAE,CAAA;CAAE,KAC1C,OAAO,CAAC,QAAQ,CAAC,CAgBrB;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,gBAAgB,IAChD,KAAK,GAAG,EAAE,KAAK,GAAG,EAAE,OAAO,GAAG,kBAsB7C"}
|
|
@@ -4,12 +4,21 @@
|
|
|
4
4
|
*
|
|
5
5
|
* This hides the backend API URL from clients and handles authentication server-side
|
|
6
6
|
*/
|
|
7
|
+
/**
|
|
8
|
+
* The only paths the proxy forwards: a media file or one of its variants. Anything else would
|
|
9
|
+
* be a request to another API route carrying the site's token (`../users` reaches `/users`),
|
|
10
|
+
* answered and cached as if it were an image.
|
|
11
|
+
*/
|
|
12
|
+
const MEDIA_PATH = /^[A-Za-z0-9_-]{1,100}\/(?:file|variants\/[A-Za-z0-9_-]{1,100})$/;
|
|
7
13
|
/**
|
|
8
14
|
* Core proxy function that handles the actual proxying logic
|
|
9
15
|
*/
|
|
10
16
|
export async function proxyMediaRequest(config, request) {
|
|
11
17
|
const { apiUrl, apiToken, cacheControl, responseHeaders } = config;
|
|
12
18
|
const path = request.path || '';
|
|
19
|
+
if (!MEDIA_PATH.test(path)) {
|
|
20
|
+
return { body: null, status: 404, headers: { 'Content-Type': 'text/plain' } };
|
|
21
|
+
}
|
|
13
22
|
try {
|
|
14
23
|
const response = await fetch(`${apiUrl}/media/${path}`, {
|
|
15
24
|
headers: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"media-proxy.js","sourceRoot":"","sources":["../../src/server/media-proxy.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AA0BH;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,MAAwB,EACxB,OAAqB;IAErB,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,GAAG,MAAM,CAAA;IAClE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAA;
|
|
1
|
+
{"version":3,"file":"media-proxy.js","sourceRoot":"","sources":["../../src/server/media-proxy.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
* in RichTextField. It allows developers to easily resolve shortcodes in their
|
|
6
6
|
* applications for portable content across environments.
|
|
7
7
|
*/
|
|
8
|
-
export type { TrokkyImageShortcode, MediaUrlResolver } from './types.js';
|
|
9
|
-
export { parseShortcodeAttrs, parseImageShortcode, shortcodeToHtml, resolveShortcodes, hasShortcodes, extractImageShortcodes } from './parser.js';
|
|
8
|
+
export type { TrokkyImageShortcode, MediaUrlResolver, RichTextNode, RichTextValue } from './types.js';
|
|
9
|
+
export { parseShortcodeAttrs, parseImageShortcode, shortcodeToHtml, resolveShortcodes, hasShortcodes, extractImageShortcodes, resolveProseMirrorShortcodes, rebaseStoredMediaUrls } from './parser.js';
|
|
10
10
|
export { createMediaUrlResolver, ShortcodeResolver } from './resolver.js';
|
|
11
11
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shortcodes/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/shortcodes/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,YAAY,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEtG,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,4BAA4B,EAC5B,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,eAAe,CAAC"}
|
package/dist/shortcodes/index.js
CHANGED
|
@@ -5,6 +5,6 @@
|
|
|
5
5
|
* in RichTextField. It allows developers to easily resolve shortcodes in their
|
|
6
6
|
* applications for portable content across environments.
|
|
7
7
|
*/
|
|
8
|
-
export { parseShortcodeAttrs, parseImageShortcode, shortcodeToHtml, resolveShortcodes, hasShortcodes, extractImageShortcodes } from './parser.js';
|
|
8
|
+
export { parseShortcodeAttrs, parseImageShortcode, shortcodeToHtml, resolveShortcodes, hasShortcodes, extractImageShortcodes, resolveProseMirrorShortcodes, rebaseStoredMediaUrls } from './parser.js';
|
|
9
9
|
export { createMediaUrlResolver, ShortcodeResolver } from './resolver.js';
|
|
10
10
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shortcodes/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,sBAAsB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/shortcodes/index.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EACnB,eAAe,EACf,iBAAiB,EACjB,aAAa,EACb,sBAAsB,EACtB,4BAA4B,EAC5B,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAErB,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EAClB,MAAM,eAAe,CAAC"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Shortcode Parser for Client-Side Usage
|
|
3
3
|
* Handles parsing and resolving shortcodes in client applications
|
|
4
4
|
*/
|
|
5
|
-
import type { TrokkyImageShortcode, MediaUrlResolver } from './types.js';
|
|
5
|
+
import type { TrokkyImageShortcode, MediaUrlResolver, RichTextNode } from './types.js';
|
|
6
6
|
/**
|
|
7
7
|
* Parse shortcode attributes from string
|
|
8
8
|
* Example: 'id="media-123" variant="thumbnail" alt="Alt text"'
|
|
@@ -29,4 +29,21 @@ export declare function hasShortcodes(content: string): boolean;
|
|
|
29
29
|
* Extract all image shortcodes from content
|
|
30
30
|
*/
|
|
31
31
|
export declare function extractImageShortcodes(content: string): TrokkyImageShortcode[];
|
|
32
|
+
/**
|
|
33
|
+
* Resolve the image placeholders in rich text stored as ProseMirror JSON: each image node
|
|
34
|
+
* whose `src` is `[trokky-image:<id>]` gets a real URL, for the variant in
|
|
35
|
+
* `data-trokky-variant`. Returns a new document; the input is not changed.
|
|
36
|
+
*/
|
|
37
|
+
export declare function resolveProseMirrorShortcodes(node: RichTextNode, mediaUrlResolver: MediaUrlResolver): RichTextNode;
|
|
38
|
+
/**
|
|
39
|
+
* Point the images Studio stores in HTML and Markdown at another media base, such as the
|
|
40
|
+
* site's own proxy route. Studio stores them with the CMS's own relative path
|
|
41
|
+
* (`<img src="/api/media/<id>/variants/<v>" data-trokky-id="<id>" …>`, and
|
|
42
|
+
* `` in Markdown), which only resolves on the CMS's own origin.
|
|
43
|
+
*
|
|
44
|
+
* HTML images are recognised by `data-trokky-id`, or like Markdown images by a path on this
|
|
45
|
+
* origin (or a URL on `apiUrl`) ending in `/media/<id>/file` or `/media/<id>/variants/<name>`.
|
|
46
|
+
* Images from elsewhere, and Markdown inside code, are left alone.
|
|
47
|
+
*/
|
|
48
|
+
export declare function rebaseStoredMediaUrls(content: string, mediaUrlResolver: MediaUrlResolver, apiUrl?: string): string;
|
|
32
49
|
//# sourceMappingURL=parser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/shortcodes/parser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/shortcodes/parser.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAEvF;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAa9E;AAED;;GAEG;AACH,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,oBAAoB,GAAG,IAAI,CAiBlF;AAED;;;GAGG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,MAAM,EACjB,gBAAgB,EAAE,gBAAgB,GACjC,MAAM,CAiBR;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAC/B,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,gBAAgB,GACjC,MAAM,CAIR;AAED;;GAEG;AACH,wBAAgB,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAEtD;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,oBAAoB,EAAE,CAY9E;AAID;;;;GAIG;AACH,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,YAAY,EAClB,gBAAgB,EAAE,gBAAgB,GACjC,YAAY,CAkBd;AAED;;;;;;;;;GASG;AACH,wBAAgB,qBAAqB,CACnC,OAAO,EAAE,MAAM,EACf,gBAAgB,EAAE,gBAAgB,EAClC,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CAwCR"}
|
|
@@ -85,4 +85,79 @@ export function extractImageShortcodes(content) {
|
|
|
85
85
|
}
|
|
86
86
|
return shortcodes;
|
|
87
87
|
}
|
|
88
|
+
/** The placeholder ProseMirror storage puts in an image node's `src` */
|
|
89
|
+
const PROSEMIRROR_IMAGE_SRC = /^\[trokky-image:([^\]]+)\]$/;
|
|
90
|
+
/**
|
|
91
|
+
* Resolve the image placeholders in rich text stored as ProseMirror JSON: each image node
|
|
92
|
+
* whose `src` is `[trokky-image:<id>]` gets a real URL, for the variant in
|
|
93
|
+
* `data-trokky-variant`. Returns a new document; the input is not changed.
|
|
94
|
+
*/
|
|
95
|
+
export function resolveProseMirrorShortcodes(node, mediaUrlResolver) {
|
|
96
|
+
let resolved = node;
|
|
97
|
+
const src = node.type === 'image' ? node.attrs?.src : undefined;
|
|
98
|
+
const match = typeof src === 'string' ? src.match(PROSEMIRROR_IMAGE_SRC) : null;
|
|
99
|
+
if (match) {
|
|
100
|
+
const variant = node.attrs?.['data-trokky-variant'];
|
|
101
|
+
resolved = {
|
|
102
|
+
...node,
|
|
103
|
+
attrs: {
|
|
104
|
+
...node.attrs,
|
|
105
|
+
src: mediaUrlResolver.getMediaUrl(match[1], typeof variant === 'string' ? variant : undefined)
|
|
106
|
+
}
|
|
107
|
+
};
|
|
108
|
+
}
|
|
109
|
+
if (Array.isArray(node.content)) {
|
|
110
|
+
resolved = { ...resolved, content: node.content.map(child => resolveProseMirrorShortcodes(child, mediaUrlResolver)) };
|
|
111
|
+
}
|
|
112
|
+
return resolved;
|
|
113
|
+
}
|
|
114
|
+
/**
|
|
115
|
+
* Point the images Studio stores in HTML and Markdown at another media base, such as the
|
|
116
|
+
* site's own proxy route. Studio stores them with the CMS's own relative path
|
|
117
|
+
* (`<img src="/api/media/<id>/variants/<v>" data-trokky-id="<id>" …>`, and
|
|
118
|
+
* `` in Markdown), which only resolves on the CMS's own origin.
|
|
119
|
+
*
|
|
120
|
+
* HTML images are recognised by `data-trokky-id`, or like Markdown images by a path on this
|
|
121
|
+
* origin (or a URL on `apiUrl`) ending in `/media/<id>/file` or `/media/<id>/variants/<name>`.
|
|
122
|
+
* Images from elsewhere, and Markdown inside code, are left alone.
|
|
123
|
+
*/
|
|
124
|
+
export function rebaseStoredMediaUrls(content, mediaUrlResolver, apiUrl) {
|
|
125
|
+
const origin = apiUrl ? apiUrl.replace(/\/+$/, '') : undefined;
|
|
126
|
+
/** The media id and variant of a URL on the CMS (a path, or on `apiUrl`), else null */
|
|
127
|
+
const storedMedia = (url) => {
|
|
128
|
+
const onCms = (url.startsWith('/') && !url.startsWith('//')) ||
|
|
129
|
+
(origin !== undefined && url.startsWith(`${origin}/`));
|
|
130
|
+
const match = url.match(/\/media\/([A-Za-z0-9_-]+)\/(?:file|variants\/([A-Za-z0-9_-]+))$/);
|
|
131
|
+
return onCms && match ? { id: match[1], variant: match[2] } : null;
|
|
132
|
+
};
|
|
133
|
+
const html = content.replace(/<img\b[^>]*>/gi, (tag) => {
|
|
134
|
+
// Walk the attributes in order, so a quoted value that merely contains `src="` is skipped
|
|
135
|
+
const attrs = [];
|
|
136
|
+
const attrPattern = /\s([^\s=/>"']+)(?:\s*=\s*(?:"([^"]*)"|'([^']*)'|([^\s"'=<>`]+)))?/g;
|
|
137
|
+
for (let m = attrPattern.exec(tag); m; m = attrPattern.exec(tag)) {
|
|
138
|
+
const value = m[2] ?? m[3] ?? m[4] ?? '';
|
|
139
|
+
const valueStart = m.index + m[0].length - value.length - (m[2] !== undefined || m[3] !== undefined ? 1 : 0);
|
|
140
|
+
attrs.push({ name: m[1].toLowerCase(), value, start: valueStart, end: valueStart + value.length });
|
|
141
|
+
}
|
|
142
|
+
const attr = (name) => attrs.find(a => a.name === name);
|
|
143
|
+
const src = attr('src');
|
|
144
|
+
if (!src)
|
|
145
|
+
return tag;
|
|
146
|
+
const id = attr('data-trokky-id')?.value;
|
|
147
|
+
const media = id && /^[A-Za-z0-9_-]+$/.test(id)
|
|
148
|
+
? { id, variant: attr('data-trokky-variant')?.value.match(/^[A-Za-z0-9_-]+$/)?.[0] }
|
|
149
|
+
: storedMedia(src.value);
|
|
150
|
+
if (!media)
|
|
151
|
+
return tag;
|
|
152
|
+
const url = mediaUrlResolver.getMediaUrl(media.id, media.variant);
|
|
153
|
+
return tag.slice(0, src.start) + url + tag.slice(src.end);
|
|
154
|
+
});
|
|
155
|
+
// Markdown images, leaving code (fenced blocks and inline spans) as written
|
|
156
|
+
return html.replace(/(```[\s\S]*?```|~~~[\s\S]*?~~~|`[^`\n]*`)|(!\[[^\]]*\]\()([^)\s]+)((?:\s+"[^"]*")?\))/g, (whole, code, open, url, close) => {
|
|
157
|
+
if (code !== undefined)
|
|
158
|
+
return whole;
|
|
159
|
+
const media = storedMedia(url);
|
|
160
|
+
return media ? `${open}${mediaUrlResolver.getMediaUrl(media.id, media.variant)}${close}` : whole;
|
|
161
|
+
});
|
|
162
|
+
}
|
|
88
163
|
//# sourceMappingURL=parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/shortcodes/parser.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/shortcodes/parser.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,19 +4,20 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import type { HttpClient } from '../http/client.js';
|
|
6
6
|
import type { MediaHelper } from '../media/helper.js';
|
|
7
|
-
import type { MediaUrlResolver } from './types.js';
|
|
7
|
+
import type { MediaUrlResolver, RichTextNode, RichTextValue } from './types.js';
|
|
8
8
|
/**
|
|
9
9
|
* Create a media URL resolver from TrokkyClient's MediaHelper
|
|
10
10
|
*/
|
|
11
|
-
export declare function createMediaUrlResolver(http: HttpClient, mediaHelper?: MediaHelper): MediaUrlResolver;
|
|
11
|
+
export declare function createMediaUrlResolver(http: HttpClient, mediaHelper?: MediaHelper, mediaBaseUrl?: string): MediaUrlResolver;
|
|
12
12
|
/**
|
|
13
13
|
* Shortcode Resolver class for convenient shortcode handling
|
|
14
14
|
*/
|
|
15
15
|
export declare class ShortcodeResolver {
|
|
16
16
|
private http;
|
|
17
17
|
private mediaHelper?;
|
|
18
|
+
private mediaBaseUrl?;
|
|
18
19
|
private mediaUrlResolver;
|
|
19
|
-
constructor(http: HttpClient, mediaHelper?: MediaHelper | undefined);
|
|
20
|
+
constructor(http: HttpClient, mediaHelper?: MediaHelper | undefined, mediaBaseUrl?: string | undefined);
|
|
20
21
|
/**
|
|
21
22
|
* Resolve shortcodes in content to HTML
|
|
22
23
|
*
|
|
@@ -29,7 +30,15 @@ export declare class ShortcodeResolver {
|
|
|
29
30
|
* const htmlContent = resolver.resolveContent(rawContent);
|
|
30
31
|
* ```
|
|
31
32
|
*/
|
|
32
|
-
resolveContent(content: string
|
|
33
|
+
resolveContent(content: string | null | undefined, options?: {
|
|
34
|
+
mediaBaseUrl?: string;
|
|
35
|
+
}): string;
|
|
36
|
+
resolveContent(content: RichTextNode, options?: {
|
|
37
|
+
mediaBaseUrl?: string;
|
|
38
|
+
}): RichTextNode;
|
|
39
|
+
resolveContent(content: RichTextValue | null | undefined, options?: {
|
|
40
|
+
mediaBaseUrl?: string;
|
|
41
|
+
}): RichTextValue;
|
|
33
42
|
/**
|
|
34
43
|
* Check if content contains shortcodes
|
|
35
44
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/shortcodes/resolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../src/shortcodes/resolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,KAAK,EAAE,gBAAgB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAGhF;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,IAAI,EAAE,UAAU,EAChB,WAAW,CAAC,EAAE,WAAW,EACzB,YAAY,CAAC,EAAE,MAAM,GACpB,gBAAgB,CAUlB;AAED;;GAEG;AACH,qBAAa,iBAAiB;IAI1B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,WAAW,CAAC;IACpB,OAAO,CAAC,YAAY,CAAC;IALvB,OAAO,CAAC,gBAAgB,CAAmB;gBAGjC,IAAI,EAAE,UAAU,EAChB,WAAW,CAAC,EAAE,WAAW,YAAA,EACzB,YAAY,CAAC,EAAE,MAAM,YAAA;IAK/B;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,MAAM;IAC/F,cAAc,CAAC,OAAO,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,YAAY;IACxF,cAAc,CAAC,OAAO,EAAE,aAAa,GAAG,IAAI,GAAG,SAAS,EAAE,OAAO,CAAC,EAAE;QAAE,YAAY,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,aAAa;IAoB7G;;OAEG;IACH,aAAa,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO;IAIvC;;;OAGG;IACH,sBAAsB,CAAC,OAAO,EAAE,MAAM;IAItC;;;OAGG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAY7D;;;OAGG;IACG,mBAAmB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAgBzD;;OAEG;IACH,mBAAmB,IAAI,gBAAgB;CAGxC"}
|
|
@@ -2,18 +2,18 @@
|
|
|
2
2
|
* Shortcode Resolver for Client Applications
|
|
3
3
|
* High-level utilities for resolving shortcodes in client content
|
|
4
4
|
*/
|
|
5
|
-
import { resolveShortcodes, hasShortcodes, extractImageShortcodes } from './parser.js';
|
|
5
|
+
import { resolveShortcodes, hasShortcodes, extractImageShortcodes, resolveProseMirrorShortcodes, rebaseStoredMediaUrls } from './parser.js';
|
|
6
6
|
/**
|
|
7
7
|
* Create a media URL resolver from TrokkyClient's MediaHelper
|
|
8
8
|
*/
|
|
9
|
-
export function createMediaUrlResolver(http, mediaHelper) {
|
|
9
|
+
export function createMediaUrlResolver(http, mediaHelper, mediaBaseUrl) {
|
|
10
10
|
return {
|
|
11
11
|
getMediaUrl: (mediaId, variant) => {
|
|
12
|
-
const
|
|
12
|
+
const base = mediaBaseUrl !== undefined ? mediaBaseUrl.replace(/\/+$/, '') : `${http.getBaseUrl()}/media`;
|
|
13
13
|
if (!variant || variant === 'original') {
|
|
14
|
-
return `${
|
|
14
|
+
return `${base}/${mediaId}/file`;
|
|
15
15
|
}
|
|
16
|
-
return `${
|
|
16
|
+
return `${base}/${mediaId}/variants/${variant}`;
|
|
17
17
|
}
|
|
18
18
|
};
|
|
19
19
|
}
|
|
@@ -21,28 +21,30 @@ export function createMediaUrlResolver(http, mediaHelper) {
|
|
|
21
21
|
* Shortcode Resolver class for convenient shortcode handling
|
|
22
22
|
*/
|
|
23
23
|
export class ShortcodeResolver {
|
|
24
|
-
constructor(http, mediaHelper) {
|
|
24
|
+
constructor(http, mediaHelper, mediaBaseUrl) {
|
|
25
25
|
this.http = http;
|
|
26
26
|
this.mediaHelper = mediaHelper;
|
|
27
|
-
this.
|
|
27
|
+
this.mediaBaseUrl = mediaBaseUrl;
|
|
28
|
+
this.mediaUrlResolver = createMediaUrlResolver(http, mediaHelper, mediaBaseUrl);
|
|
28
29
|
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
* const htmlContent = resolver.resolveContent(rawContent);
|
|
39
|
-
* ```
|
|
40
|
-
*/
|
|
41
|
-
resolveContent(content) {
|
|
42
|
-
if (!hasShortcodes(content)) {
|
|
43
|
-
return content; // Fast path if no shortcodes
|
|
30
|
+
resolveContent(content, options) {
|
|
31
|
+
if (content === null || content === undefined)
|
|
32
|
+
return '';
|
|
33
|
+
const mediaBaseUrl = options?.mediaBaseUrl ?? this.mediaBaseUrl;
|
|
34
|
+
const resolver = options?.mediaBaseUrl !== undefined
|
|
35
|
+
? createMediaUrlResolver(this.http, this.mediaHelper, options.mediaBaseUrl)
|
|
36
|
+
: this.mediaUrlResolver;
|
|
37
|
+
if (typeof content !== 'string') {
|
|
38
|
+
return resolveProseMirrorShortcodes(content, resolver);
|
|
44
39
|
}
|
|
45
|
-
|
|
40
|
+
// Stored images keep the path they were saved with, which works on the CMS's own origin.
|
|
41
|
+
// With a media base they are rebuilt from their media id, so where the API was when the
|
|
42
|
+
// content was saved stops mattering.
|
|
43
|
+
const rebased = mediaBaseUrl !== undefined
|
|
44
|
+
? rebaseStoredMediaUrls(content, resolver, this.http.getBaseUrl())
|
|
45
|
+
: content;
|
|
46
|
+
// Placeholders written by earlier Studio versions
|
|
47
|
+
return hasShortcodes(rebased) ? resolveShortcodes(rebased, resolver) : rebased;
|
|
46
48
|
}
|
|
47
49
|
/**
|
|
48
50
|
* Check if content contains shortcodes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/shortcodes/resolver.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,EAAE,iBAAiB,EAAE,aAAa,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../src/shortcodes/resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,4 +14,13 @@ export interface TrokkyImageShortcode {
|
|
|
14
14
|
export interface MediaUrlResolver {
|
|
15
15
|
getMediaUrl: (mediaId: string, variant?: string) => string;
|
|
16
16
|
}
|
|
17
|
+
/** A node of rich text stored as ProseMirror (TipTap) JSON, as far as resolving needs it */
|
|
18
|
+
export interface RichTextNode {
|
|
19
|
+
type: string;
|
|
20
|
+
attrs?: Record<string, unknown>;
|
|
21
|
+
content?: RichTextNode[];
|
|
22
|
+
[key: string]: unknown;
|
|
23
|
+
}
|
|
24
|
+
/** Rich text as a field stores it: HTML or Markdown text, or a ProseMirror document */
|
|
25
|
+
export type RichTextValue = string | RichTextNode;
|
|
17
26
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shortcodes/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;CAC5D"}
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/shortcodes/types.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,WAAW,oBAAoB;IACnC,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,gBAAgB;IAC/B,WAAW,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;CAC5D;AACD,4FAA4F;AAC5F,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE,YAAY,EAAE,CAAC;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,uFAAuF;AACvF,MAAM,MAAM,aAAa,GAAG,MAAM,GAAG,YAAY,CAAC"}
|
package/dist/types/index.d.ts
CHANGED
|
@@ -15,6 +15,16 @@ export interface ClientConfig {
|
|
|
15
15
|
* serves the CMS.
|
|
16
16
|
*/
|
|
17
17
|
fetch?: typeof globalThis.fetch;
|
|
18
|
+
/**
|
|
19
|
+
* Where browsers load media from: a path on the site's own origin, such as a proxy route
|
|
20
|
+
* (`/media`), or a full URL (`https://cms.example.com/api/media`). `imageUrl()`,
|
|
21
|
+
* `createImageUrlBuilder()` and `resolveContent()` all build on it, so moving the API or
|
|
22
|
+
* putting a proxy in front is a change here, not in stored content. Unset, everything is
|
|
23
|
+
* as before: media fields and placeholders point at `${baseUrl}/media`, and images stored in
|
|
24
|
+
* rich text keep the path they were saved with. Set it whenever `baseUrl` is an address
|
|
25
|
+
* browsers cannot reach, such as an internal one.
|
|
26
|
+
*/
|
|
27
|
+
mediaBaseUrl?: string;
|
|
18
28
|
token?: string;
|
|
19
29
|
refreshToken?: string;
|
|
20
30
|
apiToken?: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,KAAK,EAEV,cAAc,EASf,MAAM,sBAAsB,CAAA;AAG7B,YAAY,EACV,YAAY,EACZ,cAAc,EACd,gBAAgB,EAChB,mBAAmB,EACnB,YAAY,EACZ,WAAW,EACX,UAAU,EACV,eAAe,EACf,mBAAmB,EACnB,SAAS,EACV,MAAM,sBAAsB,CAAA;AAE7B,MAAM,WAAW,YAAY;IAE3B,OAAO,EAAE,MAAM,CAAA;IACf,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@trokky/client",
|
|
3
|
-
"version": "3.5.
|
|
3
|
+
"version": "3.5.4",
|
|
4
4
|
"description": "TypeScript-native client SDK for Trokky CMS with type generation and shortcode support",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"cms",
|
|
@@ -71,7 +71,7 @@
|
|
|
71
71
|
"type-check": "tsc --noEmit"
|
|
72
72
|
},
|
|
73
73
|
"dependencies": {
|
|
74
|
-
"@trokky/trokky": "^3.5.
|
|
74
|
+
"@trokky/trokky": "^3.5.4",
|
|
75
75
|
"commander": "^11.0.0"
|
|
76
76
|
},
|
|
77
77
|
"devDependencies": {
|