@enonic/nextjs-adapter 6.0.0-beta.3 → 6.0.0-beta.4

package/README.md

@@ -303,27 +303,51 @@ They are available at `@enonic/nextjs-adapter`
 
 <br/>
 
-#### <a id="get-url"></a>`getUrl(url: string, meta: MetaData) => string`
-
-Converts a site-relative or absolute URL to relative one for current viewer (Next.js/Enonic XP). Also takes care of locale if needed.
-
-> **INFO:** For your URLs to work both in Enonic XP and Next.js you need to:
-> 1. Query site-relative or absolute URLs from guillotine
-> 2. Wrap them with `getUrl()` function in the views
-
-| Argument | Description                                             |
-|----------|---------------------------------------------------------|
-| `url`    | URL you want to transform                               |
-| `meta`   | Runtime data returned by [fetchContent](#fetch-content) |
+#### <a id="url-helpers"></a>Guillotine URL helpers
+
+Every Guillotine `*Url` field comes with two functions: `*UrlQuery(args)` builds the GraphQL selection for the field, and `*Url(result)`
+turns the returned object into the final URL string.
+
+| Field           | Query builder                             | String function       |
+|-----------------|-------------------------------------------|-----------------------|
+| `imageUrl`      | `imageUrlQuery(args: ImageUrlArgs)`       | `imageUrl(data)`      |
+| `mediaUrl`      | `mediaUrlQuery(args?: MediaUrlArgs)`      | `mediaUrl(data)`      |
+| `attachmentUrl` | `attachmentUrlQuery(args?: MediaUrlArgs)` | `attachmentUrl(data)` |
+| `pageUrl`       | `pageUrlQuery(args?: PageUrlArgs)`        | `pageUrl(data, meta)` |
+
+The query builders accept the same arguments as the Guillotine field (`scale`, `quality`, `background`, `format`, `filter`, `params` for
+`imageUrl`; `download`, `params` for `mediaUrl`/`attachmentUrl`; `params` for `pageUrl`) and select every field of the returned object:
+`url`, `path`, `queryString`, `context`, `id`, `fingerprint`, `name`, plus `scale` for images and `intent` for media and attachments
+(`pageUrl` has `url`, `path` and `queryString`).
+Media functions return absolute URLs pointing at the XP media API (`ENONIC_MEDIA_CDN`, defaulting to `ENONIC_API`). `pageUrl` returns a
+relative path for the Next.js router, prefixed with the locale unless it is the default locale (`meta.locale` vs `meta.defaultLocale`);
+`meta` is the runtime data returned by [fetchContent](#fetch-content). Pass `{locale}` alone to always prefix, e.g. for `revalidatePath`.
+The string functions take that object (`ImageUrl`, `AttachmentUrl` or `PageUrl` from the adapter types) and return `undefined` when given `undefined`;
+All four append `queryString` to `path` and need only `path` (`queryString` is optional), so links without a Guillotine object can
+pass a bare `{path}`, e.g. `pageUrl({path: '/'}, meta)` for the site root.
 
 Usage:
 
 ```tsx
-import {getUrl} from '@enonic/nextjs-adapter';
+import {imageUrlQuery, pageUrlQuery, imageUrl, pageUrl} from '@enonic/nextjs-adapter';
+
+const query = `
+  photos {
+    ... on media_Image {
+      ${imageUrlQuery({scale: 'width(500)'})}
+    }
+  }
+  parent {
+    ${pageUrlQuery()}
+  }`;
 
-const urlRelativeToViewer = getUrl('/some/content/url', meta);
+<img src={imageUrl(photo.imageUrl)}/>
+<Link href={pageUrl(parent.pageUrl, meta)}>Back</Link>
 ```
 
+`localizeMappings(mappings: UrlMappingRule[], mapping: LocaleMapping) => UrlMappingRule[]` prefixes `/api/mappings` targets with the
+mapping's locale unless it is the default one, leaving sources untouched.
+
 <br/>
 
 #### <a id="rich-text-query"></a>`richTextQuery(fieldName: string) => string`
@@ -638,98 +662,7 @@ import {ComponentRegistry} from '@enonic/nextjs-adapter';
 const macros = ComponentRegistry.getMacros();
 ```
 
-Response type: list of `[name, ComponentDefinition]` tuples — see [component definition](#comp-def).
-
-<br/>
-
-### `UrlProcessor`
-
-Helper singleton for processing URLs.
-
-<br/>
-
-#### <a id="process"></a>`static process(url: string, meta: MetaData, serverSide = false, isResource = false): string`
-
-Processes the absolute URL to become relative for the current viewer, while keeping in mind Next.js assets and Enonic XP binary content
-links
-
-> **NOTE:** There is a convenience alias to this function called [getUrl()](#get-url)
-
-| Argument     | Description                                                                  |
-|--------------|------------------------------------------------------------------------------|
-| `url`        | Absolute URL                                                                 |
-| `meta`       | Runtime data returned by [fetchContent](#fetch-content)                      |
-| `serverSide` | Whether URL is going to be used on the server side _(Skips adding basePath)_ |
-| `isResource` | Whether URL is a resource _(Skips adding locale)_                            |
-
-Usage:
-
-```tsx
-import {UrlProcessor} from '@enonic/nextjs-adapter';
-
-const url = UrlProcessor.process('http://www.some.site.com/url/to/content', meta, true, false);
-```
-
-<br/>
-
-#### `static processSrcSet(srcset: string, meta: MetaData): string`
-
-Processes the image srcset attribute to transform each URL with [`process`](#process) method
-
-| Argument | Description                                             |
-|----------|---------------------------------------------------------|
-| `srcset` | Value of the srcset attribute                           |
-| `meta`   | Runtime data returned by [fetchContent](#fetch-content) |
-
-Usage:
-
-```tsx
-import {UrlProcessor} from '@enonic/nextjs-adapter';
-
-const url = UrlProcessor.processSrcSet('<srcset value>', meta);
-```
-
-<br/>
-
-#### `static isMediaLink(ref: string, linkData: LinkData[]): boolean`
-
-Checks if link data array contains link with provided ref. Positive result means that this is a link to Enonic XP content.
-
-> **NOTE:** link data array is contained in response of the query generated by [richTextQuery('fieldName')](#rich-text-query)
-
-| Argument   | Description     |
-|------------|-----------------|
-| `ref`      | Link ref        |
-| `linkData` | Link data array |
-
-Usage:
-
-```tsx
-import {UrlProcessor} from '@enonic/nextjs-adapter';
-
-UrlProcessor.isMediaLink('<link ref>', linkData);
-```
-
-<br/>
-
-#### `static isContentImage(ref: string, imageData: ImageData[]): boolean`
-
-Checks if image data array contains image with provided ref. Positive response means that this is an Enonic XP image.
-
-> **NOTE:** image data array is contained in response of the query generated by [richTextQuery('fieldName')](#rich-text-query)
-
-| Argument    | Description      |
-|-------------|------------------|
-| `ref`       | Image ref        |
-| `imageData` | Image data array |
-
-Usage:
-
-```tsx
-import {UrlProcessor} from '@enonic/nextjs-adapter';
-
-UrlProcessor.isContentImage('<image ref>', imageData);
-```
+Response type: list of `[name, ComponentDefinition]` tuples — see [component definition](#comp-def).
 
 <br/>
 
@@ -1038,6 +971,32 @@ import StaticContent from '@enonic/nextjs-adapter/views/StaticContent';
 
 <br/>
 
+#### `<DraftModeIndicator label="Draft">`
+
+Floating badge in the bottom-right corner, styled like the Next.js dev indicator, for leaving Next.js draft mode. It renders only when `draftMode().isEnabled` is true, and hides itself inside iframes (i.e. in Content Studio). The label defaults to `Draft`, is followed by a `✕` glyph, and can be localized by the caller, e.g. with `I18n.localize()`. Clicking it runs a Server Action that calls `draftMode().disable()` and then reloads the page without the `xp` query parameter (the Content Studio preview marker, which would otherwise make the proxy re-enable draft mode), so content is served from the `master` branch again. The badge ships its own CSS module; its colors can be overridden through the `--draft-mode-*` custom properties set on the button.
+
+| Argument                    | Type                  | Description                                                              |
+|-----------------------------|-----------------------|--------------------------------------------------------------------------|
+| `label = 'Draft'`           | `String`              | Badge text, e.g. a localized phrase                                      |
+
+Usage:
+
+```tsx
+import {I18n, IS_DEV_MODE} from '@enonic/nextjs-adapter';
+import DraftModeIndicator from '@enonic/nextjs-adapter/views/DraftModeIndicator';
+
+// Root layout: render it conditionally (here: only under `next dev`) directly inside <body>,
+// not inside <StaticContent> (which disables hydration)
+<body>
+    {children}
+    {IS_DEV_MODE && <DraftModeIndicator label={I18n.localize('draft-mode')}/>}
+</body>
+```
+
+Requires `transpilePackages: ['@enonic/nextjs-adapter']` in `next.config.js` so that Next.js compiles the bundled Server Action.
+
+<br/>
+
 #### <a id="rich-text-view"></a>
 `<RichTextView className="css-class" tag="section" data={data} meta={meta} customReplacer={customReplacerFn}>`
 

package/dist/client/DraftModeButton.d.ts

@@ -0,0 +1,2 @@
+import type { DraftModeButtonProps } from '../types';
+export default function DraftModeButton({ action, label }: DraftModeButtonProps): import("react").JSX.Element;

package/dist/client/DraftModeButton.jsx

@@ -0,0 +1,28 @@
+'use client';
+import { useSyncExternalStore, useTransition } from 'react';
+import { FROM_XP_PARAM } from '../common/constants';
+import { replaceLocation } from './replaceLocation';
+import styles from './DraftModeButton.module.css';
+const subscribe = () => () => undefined;
+const isTopWindow = () => window.self === window.top;
+const isTopWindowOnServer = () => false;
+function urlWithoutXpParam() {
+    const url = new URL(window.location.href);
+    url.searchParams.delete(FROM_XP_PARAM);
+    return url.toString();
+}
+export default function DraftModeButton({ action, label }) {
+    const visible = useSyncExternalStore(subscribe, isTopWindow, isTopWindowOnServer);
+    const [isPending, startTransition] = useTransition();
+    if (!visible) {
+        return null;
+    }
+    return (<button type="button" className={styles.button} disabled={isPending} onClick={() => startTransition(async () => {
+            await action();
+            // Full reload without the CS marker: with it and no draft cookie the proxy would re-enable draft mode
+            replaceLocation(urlWithoutXpParam());
+        })}>
+            {label} <span className={styles.glyph}>✕</span>
+        </button>);
+}
+//# sourceMappingURL=DraftModeButton.jsx.map

package/dist/client/DraftModeButton.jsx.map

@@ -0,0 +1 @@
+{"version":3,"file":"DraftModeButton.jsx","sourceRoot":"","sources":["../../src/client/DraftModeButton.tsx"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAGb,OAAO,EAAC,oBAAoB,EAAE,aAAa,EAAC,MAAM,OAAO,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAC,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAClD,OAAO,MAAM,MAAM,8BAA8B,CAAC;AAElD,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC;AACxC,MAAM,WAAW,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,GAAG,CAAC;AACrD,MAAM,mBAAmB,GAAG,GAAG,EAAE,CAAC,KAAK,CAAC;AAExC,SAAS,iBAAiB;IACtB,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IAC1C,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IACvC,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AAC1B,CAAC;AAED,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,EAAC,MAAM,EAAE,KAAK,EAAuB;IACzE,MAAM,OAAO,GAAG,oBAAoB,CAAC,SAAS,EAAE,WAAW,EAAE,mBAAmB,CAAC,CAAC;IAClF,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,GAAG,aAAa,EAAE,CAAC;IAErD,IAAI,CAAC,OAAO,EAAE,CAAC;QACX,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,OAAO,CACH,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CACb,SAAS,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CACzB,QAAQ,CAAC,CAAC,SAAS,CAAC,CACpB,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,IAAI,EAAE;YACtC,MAAM,MAAM,EAAE,CAAC;YACf,sGAAsG;YACtG,eAAe,CAAC,iBAAiB,EAAE,CAAC,CAAC;QACzC,CAAC,CAAC,CAAC,CACP;YAAA,CAAC,KAAK,CAAE,CAAA,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAClD;QAAA,EAAE,MAAM,CAAC,CACZ,CAAC;AACN,CAAC"}

package/dist/client/DraftModeButton.module.css

@@ -0,0 +1,43 @@
+.button {
+    --draft-mode-bg: #000;
+    --draft-mode-bg-hover: #1a1a1a;
+    --draft-mode-border: #333;
+    --draft-mode-border-hover: #555;
+    --draft-mode-fg: #eee;
+    --draft-mode-fg-hover: #fff;
+
+    position: fixed;
+    right: 16px;
+    bottom: 16px;
+    z-index: 9999;
+    display: inline-flex;
+    align-items: center;
+    gap: 8px;
+    height: 36px;
+    padding: 0 14px;
+    border: 1px solid var(--draft-mode-border);
+    border-radius: 9999px;
+    background: var(--draft-mode-bg);
+    color: var(--draft-mode-fg);
+    font: 13px/1 system-ui, sans-serif;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.3);
+    cursor: pointer;
+}
+.button > * {
+    color: var(--draft-mode-fg);
+}
+
+.button:hover {
+    background: var(--draft-mode-bg-hover);
+    border-color: var(--draft-mode-border-hover);
+    color: var(--draft-mode-fg-hover);
+}
+
+.button:disabled {
+    cursor: wait;
+    opacity: 0.6;
+}
+
+.button:hover > * {
+    color: var(--draft-mode-fg-hover);
+}

package/dist/client/replaceLocation.d.ts

@@ -0,0 +1 @@
+export declare function replaceLocation(url: string): void;

package/dist/client/replaceLocation.js

@@ -0,0 +1,5 @@
+'use client';
+export function replaceLocation(url) {
+    window.location.replace(url);
+}
+//# sourceMappingURL=replaceLocation.js.map

package/dist/client/replaceLocation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"replaceLocation.js","sourceRoot":"","sources":["../../src/client/replaceLocation.ts"],"names":[],"mappings":"AAAA,YAAY,CAAC;AAEb,MAAM,UAAU,eAAe,CAAC,GAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;AACjC,CAAC"}

package/dist/common/constants.d.ts

@@ -3,9 +3,12 @@ export declare enum ENV_VARS {
     MAPPINGS = "ENONIC_MAPPINGS",
     API_TOKEN = "ENONIC_API_TOKEN",
     API_URL = "ENONIC_API",
+    GUILLOTINE_API = "GUILLOTINE_API",
+    MEDIA_URL = "ENONIC_MEDIA_CDN",
     APP_NAME = "ENONIC_APP_NAME",
     LOG = "ENONIC_LOGGING"
 }
+export declare const DEFAULT_GUILLOTINE_API = "com.enonic.app.guillotine:graphql";
 export declare const FRAGMENT_CONTENTTYPE_NAME = "portal:fragment";
 export declare const FRAGMENT_DEFAULT_REGION_NAME = "fragment";
 /** excluded contents:
@@ -37,6 +40,7 @@ export declare enum RENDER_MODE {
 }
 export declare const RENDER_MODE_HEADER = "content-studio-mode";
 export declare const SITE_CONTENTTYPE_NAME = "portal:site";
+export declare const FROM_XP_PARAM = "xp";
 export declare const XP_BASE_URL_HEADER = "xpbaseurl";
 export declare enum XP_COMPONENT_TYPE {
     PART = "part",

package/dist/common/constants.js

@@ -4,9 +4,12 @@ export var ENV_VARS;
     ENV_VARS["MAPPINGS"] = "ENONIC_MAPPINGS";
     ENV_VARS["API_TOKEN"] = "ENONIC_API_TOKEN";
     ENV_VARS["API_URL"] = "ENONIC_API";
+    ENV_VARS["GUILLOTINE_API"] = "GUILLOTINE_API";
+    ENV_VARS["MEDIA_URL"] = "ENONIC_MEDIA_CDN";
     ENV_VARS["APP_NAME"] = "ENONIC_APP_NAME";
     ENV_VARS["LOG"] = "ENONIC_LOGGING";
 })(ENV_VARS || (ENV_VARS = {}));
+export const DEFAULT_GUILLOTINE_API = 'com.enonic.app.guillotine:graphql';
 export const FRAGMENT_CONTENTTYPE_NAME = 'portal:fragment';
 export const FRAGMENT_DEFAULT_REGION_NAME = 'fragment';
 import { queryGuillotine } from '../guillotine/getMetaData';
@@ -68,6 +71,7 @@ export var RENDER_MODE;
 export const RENDER_MODE_HEADER = 'content-studio-mode';
 export const SITE_CONTENTTYPE_NAME = 'portal:site';
 // URI parameter marking that a request is for a preview for CS. MUST MATCH THE VALUE OF 'FROM_XP_PARAM' on XP side.
+export const FROM_XP_PARAM = 'xp';
 export const XP_BASE_URL_HEADER = 'xpbaseurl';
 // TODO: Use these instead of hardcoded strings everywhere
 export var XP_COMPONENT_TYPE;

package/dist/common/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAC;AAE7B,MAAM,CAAN,IAAY,QAMX;AAND,WAAY,QAAQ;IAChB,wCAA4B,CAAA;IAC5B,0CAA8B,CAAA;IAC9B,kCAAsB,CAAA;IACtB,wCAA4B,CAAA;IAC5B,kCAAsB,CAAA;AAC1B,CAAC,EANW,QAAQ,KAAR,QAAQ,QAMnB;AAED,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,4BAA4B,GAAG,UAAU,CAAC;AAEvD,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;MAqBhD,EACF;IACI,YAAY,EAAE,SAAS;IACvB,QAAQ,EAAE,KAAK;CAClB,CAAC,CAAC;AAEP,8EAA8E;AAC9E,qBAAqB;AACrB,MAAM,CAAN,IAAY,0BAKX;AALD,WAAY,0BAA0B;IAClC,+CAAiB,CAAA;IACjB,+CAAiB,CAAA;IACjB,iDAAmB,CAAA;IACnB,+DAAiC,CAAA;AACrC,CAAC,EALW,0BAA0B,KAA1B,0BAA0B,QAKrC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAE9C,MAAM,CAAC,MAAM,8BAA8B,GAAG,sBAAsB,CAAC;AACrE,MAAM,CAAC,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;AAC7D,MAAM,CAAC,MAAM,0BAA0B,GAAG,4BAA4B,CAAC;AACvE,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AAC5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AAE1D,MAAM,CAAN,IAAY,WAOX;AAPD,WAAY,WAAW;IACnB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,kCAAmB,CAAA;IACnB,4BAAa,CAAA;IACb,8BAAe,CAAA;IACf,4BAAa,CAAA,CAAO,mEAAmE;AAC3F,CAAC,EAPW,WAAW,KAAX,WAAW,QAOtB;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;AAExD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AAEnD,oHAAoH;AACpH,MAAM,CAAC,MAAM,kBAAkB,GAAG,WAAW,CAAC;AAE9C,0DAA0D;AAC1D,MAAM,CAAN,IAAY,iBAMX;AAND,WAAY,iBAAiB;IACzB,kCAAa,CAAA;IACb,sCAAiB,CAAA;IACjB,kCAAa,CAAA;IACb,0CAAqB,CAAA;IACrB,kCAAa,CAAA;AACjB,CAAC,EANW,iBAAiB,KAAjB,iBAAiB,QAM5B;AAED,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,0CAAuB,CAAA;IACvB,gCAAa,CAAA;IACb,gCAAa,CAAA;AACjB,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,SAAS,GAAG,GAAG,CAAC;AAE7B,MAAM,CAAN,IAAY,QAQX;AARD,WAAY,QAAQ;IAChB,wCAA4B,CAAA;IAC5B,0CAA8B,CAAA;IAC9B,kCAAsB,CAAA;IACtB,6CAAiC,CAAA;IACjC,0CAA8B,CAAA;IAC9B,wCAA4B,CAAA;IAC5B,kCAAsB,CAAA;AAC1B,CAAC,EARW,QAAQ,KAAR,QAAQ,QAQnB;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,mCAAmC,CAAC;AAE1E,MAAM,CAAC,MAAM,yBAAyB,GAAG,iBAAiB,CAAC;AAC3D,MAAM,CAAC,MAAM,4BAA4B,GAAG,UAAU,CAAC;AAEvD,OAAO,EAAC,eAAe,EAAC,MAAM,2BAA2B,CAAC;AAE1D;;;;;GAKG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAAG,eAAe,CAAC;;;;;;;;;;;;;;;;;;;;;MAqBhD,EACF;IACI,YAAY,EAAE,SAAS;IACvB,QAAQ,EAAE,KAAK;CAClB,CAAC,CAAC;AAEP,8EAA8E;AAC9E,qBAAqB;AACrB,MAAM,CAAN,IAAY,0BAKX;AALD,WAAY,0BAA0B;IAClC,+CAAiB,CAAA;IACjB,+CAAiB,CAAA;IACjB,iDAAmB,CAAA;IACnB,+DAAiC,CAAA;AACrC,CAAC,EALW,0BAA0B,KAA1B,0BAA0B,QAKrC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,YAAY,CAAC;AAE9C,MAAM,CAAC,MAAM,8BAA8B,GAAG,sBAAsB,CAAC;AACrE,MAAM,CAAC,MAAM,oBAAoB,GAAG,wBAAwB,CAAC;AAC7D,MAAM,CAAC,MAAM,0BAA0B,GAAG,4BAA4B,CAAC;AACvE,MAAM,CAAC,MAAM,uBAAuB,GAAG,oBAAoB,CAAC;AAC5D,MAAM,CAAC,MAAM,iBAAiB,GAAG,wBAAwB,CAAC;AAE1D,MAAM,CAAN,IAAY,WAOX;AAPD,WAAY,WAAW;IACnB,gCAAiB,CAAA;IACjB,4BAAa,CAAA;IACb,kCAAmB,CAAA;IACnB,4BAAa,CAAA;IACb,8BAAe,CAAA;IACf,4BAAa,CAAA,CAAO,mEAAmE;AAC3F,CAAC,EAPW,WAAW,KAAX,WAAW,QAOtB;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;AAExD,MAAM,CAAC,MAAM,qBAAqB,GAAG,aAAa,CAAC;AAEnD,oHAAoH;AACpH,MAAM,CAAC,MAAM,aAAa,GAAG,IAAI,CAAC;AAElC,MAAM,CAAC,MAAM,kBAAkB,GAAG,WAAW,CAAC;AAE9C,0DAA0D;AAC1D,MAAM,CAAN,IAAY,iBAMX;AAND,WAAY,iBAAiB;IACzB,kCAAa,CAAA;IACb,sCAAiB,CAAA;IACjB,kCAAa,CAAA;IACb,0CAAqB,CAAA;IACrB,kCAAa,CAAA;AACjB,CAAC,EANW,iBAAiB,KAAjB,iBAAiB,QAM5B;AAED,MAAM,CAAN,IAAY,eAIX;AAJD,WAAY,eAAe;IACvB,0CAAuB,CAAA;IACvB,gCAAa,CAAA;IACb,gCAAa,CAAA;AACjB,CAAC,EAJW,eAAe,KAAf,eAAe,QAI1B"}

package/dist/common/env.d.ts

@@ -1,5 +1,9 @@
-/** URL to the guillotine API (server-side only) */
+/** Absolute URL to the Enonic XP API root (server-side only) */
 export declare const API_URL: string;
+/** URL to the Guillotine GraphQL endpoint: API_URL + GUILLOTINE_API (server-side only) */
+export declare const GUILLOTINE_URL: string;
+/** Absolute URL to the media API root, defaults to API_URL (server-side only) */
+export declare const MEDIA_URL: string;
 /** Optional utility value - defining in one place the name of the target app (the app that defines the content types, the app name is therefore part of the content type strings used both in typeselector and in query introspections) (server-side only) */
 export declare const APP_NAME: string;
 /** Optional utility value - derived from APP_NAME, only with underscores instead of dots */

package/dist/common/env.js

@@ -1,9 +1,14 @@
-import { ENV_VARS } from './constants';
+import { DEFAULT_GUILLOTINE_API, ENV_VARS } from './constants';
+import { stripOutsideSlashes, stripTrailingSlashes } from '../utils/fixDoubleSlashes';
 const isServer = typeof window === 'undefined';
 // IMPORTANT:
 // NEXT_PUBLIC_ vars should be explicitly referenced to be made available on the client side (substituted with constants) !!!
-/** URL to the guillotine API (server-side only) */
-export const API_URL = process.env[ENV_VARS.API_URL];
+/** Absolute URL to the Enonic XP API root (server-side only) */
+export const API_URL = stripTrailingSlashes(process.env[ENV_VARS.API_URL] || '');
+/** URL to the Guillotine GraphQL endpoint: API_URL + GUILLOTINE_API (server-side only) */
+export const GUILLOTINE_URL = API_URL && `${API_URL}/${stripOutsideSlashes(process.env[ENV_VARS.GUILLOTINE_API] || DEFAULT_GUILLOTINE_API)}`;
+/** Absolute URL to the media API root, defaults to API_URL (server-side only) */
+export const MEDIA_URL = stripTrailingSlashes(process.env[ENV_VARS.MEDIA_URL] || '') || API_URL;
 /** Optional utility value - defining in one place the name of the target app (the app that defines the content types, the app name is therefore part of the content type strings used both in typeselector and in query introspections) (server-side only) */
 export const APP_NAME = process.env[ENV_VARS.APP_NAME];
 /** Optional utility value - derived from APP_NAME, only with underscores instead of dots */

package/dist/common/env.js.map

@@ -1 +1 @@
-{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/common/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErC,MAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAE/C,aAAa;AACb,6HAA6H;AAC7H,mDAAmD;AACnD,MAAM,CAAC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;AAErD,8PAA8P;AAC9P,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAEvD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAEzE,uFAAuF;AACvF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAEpE,sFAAsF;AACtF,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;AAElE,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAExG,4EAA4E;AAC5E,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAEvD,6CAA6C;AAC7C,IAAI,QAAQ,EAAE,CAAC;IACX,MAAM,iBAAiB,GAAG;QACtB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ;QAC7B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO;QAC3B,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ;KAChC,CAAC;IAEF,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;QACnD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,2BAA2B,CAAC,CAAC;QAC7E,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}
+{"version":3,"file":"env.js","sourceRoot":"","sources":["../../src/common/env.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,sBAAsB,EAAE,QAAQ,EAAC,MAAM,aAAa,CAAC;AAC7D,OAAO,EAAC,mBAAmB,EAAE,oBAAoB,EAAC,MAAM,2BAA2B,CAAC;AAEpF,MAAM,QAAQ,GAAG,OAAO,MAAM,KAAK,WAAW,CAAC;AAE/C,aAAa;AACb,6HAA6H;AAC7H,gEAAgE;AAChE,MAAM,CAAC,MAAM,OAAO,GAAG,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;AAEjF,0FAA0F;AAC1F,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,IAAI,GAAG,OAAO,IAAI,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,IAAI,sBAAsB,CAAC,EAAE,CAAC;AAE7I,iFAAiF;AACjF,MAAM,CAAC,MAAM,SAAS,GAAG,oBAAoB,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,IAAI,OAAO,CAAC;AAEhG,8PAA8P;AAC9P,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAEvD,4FAA4F;AAC5F,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAEzE,uFAAuF;AACvF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAEpE,sFAAsF;AACtF,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;AAElE,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAC;AAExG,4EAA4E;AAC5E,MAAM,CAAC,MAAM,QAAQ,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;AAEvD,6CAA6C;AAC7C,IAAI,QAAQ,EAAE,CAAC;IACX,MAAM,iBAAiB,GAAG;QACtB,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ;QAC7B,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO;QAC3B,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ;KAChC,CAAC;IAEF,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,CAAC,GAAW,EAAE,EAAE;QACnD,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1B,MAAM,IAAI,KAAK,CAAC,yBAAyB,GAAG,2BAA2B,CAAC,CAAC;QAC7E,CAAC;IACL,CAAC,CAAC,CAAC;AACP,CAAC"}

package/dist/guillotine/applyProcessors.js

@@ -1,33 +1,22 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { getComponentConfig } from './getComponentConfig';
-const NO_PROPS_PROCESSOR = (props) => __awaiter(void 0, void 0, void 0, function* () { var _a; return (_a = yield props) !== null && _a !== void 0 ? _a : {}; });
-export function applyProcessors(componentDescriptors, contentResults, context) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let dataCounter = 0;
-        const processorPromises = componentDescriptors.map((desc) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            // we're iterating component descriptors here
-            // some of them might not have provided graphql requests
-            // but we still need to run props processor for them
-            // in case they want to fetch their data from elsewhere
-            const propsProcessor = ((_a = desc.type) === null || _a === void 0 ? void 0 : _a.processor) || NO_PROPS_PROCESSOR;
-            let data;
-            if (desc.queryAndVariables) {
-                // if there is a query then there must be a result for it
-                data = contentResults.contents[dataCounter++];
-            }
-            const config = getComponentConfig(desc.component);
-            return yield propsProcessor(data, context, config);
-        }));
-        return Promise.allSettled(processorPromises);
+const NO_PROPS_PROCESSOR = async (props) => { var _a; return (_a = await props) !== null && _a !== void 0 ? _a : {}; };
+export async function applyProcessors(componentDescriptors, contentResults, context) {
+    let dataCounter = 0;
+    const processorPromises = componentDescriptors.map(async (desc) => {
+        var _a;
+        // we're iterating component descriptors here
+        // some of them might not have provided graphql requests
+        // but we still need to run props processor for them
+        // in case they want to fetch their data from elsewhere
+        const propsProcessor = ((_a = desc.type) === null || _a === void 0 ? void 0 : _a.processor) || NO_PROPS_PROCESSOR;
+        let data;
+        if (desc.queryAndVariables) {
+            // if there is a query then there must be a result for it
+            data = contentResults.contents[dataCounter++];
+        }
+        const config = getComponentConfig(desc.component);
+        return await propsProcessor(data, context, config);
     });
+    return Promise.allSettled(processorPromises);
 }
 //# sourceMappingURL=applyProcessors.js.map

package/dist/guillotine/applyProcessors.js.map

@@ -1 +1 @@
-{"version":3,"file":"applyProcessors.js","sourceRoot":"","sources":["../../src/guillotine/applyProcessors.ts"],"names":[],"mappings":";;;;;;;;;AAGA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAGxD,MAAM,kBAAkB,GAAG,CAAO,KAAU,EAAE,EAAE,0DAAC,OAAA,MAAA,MAAM,KAAK,mCAAI,EAAE,CAAA,GAAA,CAAC;AAGnE,MAAM,UAAgB,eAAe,CACjC,oBAA2C,EAC3C,cAA6B,EAC7B,OAAgB;;QAGhB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAO,IAAyB,EAAE,EAAE;;YACnF,6CAA6C;YAC7C,wDAAwD;YACxD,oDAAoD;YACpD,uDAAuD;YACvD,MAAM,cAAc,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,SAAS,KAAI,kBAAkB,CAAC;YAClE,IAAI,IAAI,CAAC;YACT,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACzB,yDAAyD;gBACzD,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;YAClD,CAAC;YAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAClD,OAAO,MAAM,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QACvD,CAAC,CAAA,CAAC,CAAC;QAEH,OAAO,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;IACjD,CAAC;CAAA"}
+{"version":3,"file":"applyProcessors.js","sourceRoot":"","sources":["../../src/guillotine/applyProcessors.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,kBAAkB,EAAC,MAAM,sBAAsB,CAAC;AAGxD,MAAM,kBAAkB,GAAG,KAAK,EAAE,KAAU,EAAE,EAAE,WAAC,OAAA,MAAA,MAAM,KAAK,mCAAI,EAAE,CAAA,EAAA,CAAC;AAGnE,MAAM,CAAC,KAAK,UAAU,eAAe,CACjC,oBAA2C,EAC3C,cAA6B,EAC7B,OAAgB;IAGhB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,GAAG,CAAC,KAAK,EAAE,IAAyB,EAAE,EAAE;;QACnF,6CAA6C;QAC7C,wDAAwD;QACxD,oDAAoD;QACpD,uDAAuD;QACvD,MAAM,cAAc,GAAG,CAAA,MAAA,IAAI,CAAC,IAAI,0CAAE,SAAS,KAAI,kBAAkB,CAAC;QAClE,IAAI,IAAI,CAAC;QACT,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACzB,yDAAyD;YACzD,IAAI,GAAG,cAAc,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QAClD,CAAC;QAED,MAAM,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAClD,OAAO,MAAM,cAAc,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;AACjD,CAAC"}