@enonic/nextjs-adapter 0.0.1-alpha.6 → 0.10.1

package/ComponentRegistry.d.ts

@@ -16,15 +16,16 @@ export interface ComponentDefinition {
 }
 export declare type DataProcessor = (data: any, context?: Context) => Promise<Record<string, any>>;
 export declare type VariablesGetter = (path: string, context?: Context, config?: any) => VariablesGetterResult;
+export declare type QueryGetter = (config?: any) => string;
 export declare type VariablesGetterResult = {
     [variables: string]: any;
     path: string;
 };
-export declare type SelectedQueryMaybeVariablesFunc = string | {
-    query: string;
+export declare type SelectedQueryMaybeVariablesFunc = string | QueryGetter | {
+    query: string | QueryGetter;
     variables: VariablesGetter;
 } | [
-    string,
+    string | QueryGetter,
     VariablesGetter
 ];
 export declare const CATCH_ALL = "*";
@@ -36,6 +37,9 @@ export declare class ComponentRegistry {
     private static layouts;
     private static macros;
     private static commonQuery;
+    private static getSelector;
+    private static getType;
+    private static addType;
     static getByComponent(component: PageComponent): ComponentDefinition | undefined;
     static setCommonQuery(query: SelectedQueryMaybeVariablesFunc): void;
     static getCommonQuery(): SelectedQueryMaybeVariablesFunc;
@@ -55,7 +59,4 @@ export declare class ComponentRegistry {
     static getLayout(name: string): ComponentDefinition | undefined;
     static addComponent(name: string, obj: ComponentDefinition): void;
     static getComponent(name: string): ComponentDefinition | undefined;
-    private static getSelector;
-    private static getType;
-    private static addType;
 }

package/ComponentRegistry.js

@@ -11,6 +11,41 @@ function toSelectorName(type) {
 }
 export const CATCH_ALL = '*';
 export class ComponentRegistry {
+    static getSelector(name) {
+        switch (name) {
+            case 'contentType':
+                return this.contentTypes;
+            case 'page':
+                return this.pages;
+            case 'component':
+                return this.components;
+            case 'layout':
+                return this.layouts;
+            case 'part':
+                return this.parts;
+            case 'macro':
+                return this.macros;
+        }
+    }
+    static getType(selectorName, typeName, useCatchAll = true) {
+        const selector = ComponentRegistry.getSelector(selectorName);
+        let type = selector[typeName];
+        if (type) {
+            type.catchAll = false;
+        }
+        else if (!type && useCatchAll) {
+            type = selector[CATCH_ALL];
+            if (type) {
+                type.catchAll = true;
+            }
+        }
+        return type;
+    }
+    static addType(selectorName, name, obj) {
+        const selector = ComponentRegistry.getSelector(selectorName);
+        const curr = selector[name];
+        selector[name] = curr ? Object.assign(curr, obj) : obj;
+    }
     static getByComponent(component) {
         const selName = toSelectorName(component.type);
         const cmpData = component[component.type];
@@ -71,41 +106,6 @@ export class ComponentRegistry {
     static getComponent(name) {
         return ComponentRegistry.getType('component', name);
     }
-    static getSelector(name) {
-        switch (name) {
-            case 'contentType':
-                return this.contentTypes;
-            case 'page':
-                return this.pages;
-            case 'component':
-                return this.components;
-            case 'layout':
-                return this.layouts;
-            case 'part':
-                return this.parts;
-            case 'macro':
-                return this.macros;
-        }
-    }
-    static getType(selectorName, typeName, useCatchAll = true) {
-        const selector = ComponentRegistry.getSelector(selectorName);
-        let type = selector[typeName];
-        if (type) {
-            type.catchAll = false;
-        }
-        else if (!type && useCatchAll) {
-            type = selector[CATCH_ALL];
-            if (type) {
-                type.catchAll = true;
-            }
-        }
-        return type;
-    }
-    static addType(selectorName, name, obj) {
-        const selector = ComponentRegistry.getSelector(selectorName);
-        const curr = selector[name];
-        selector[name] = curr ? Object.assign(curr, obj) : obj;
-    }
 }
 ComponentRegistry.contentTypes = {};
 ComponentRegistry.pages = {};

package/guillotine/fetchContent.js

@@ -7,7 +7,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import { getMetaQuery, pageFragmentQuery, } from './getMetaData';
+import { getMetaQuery, pageFragmentQuery } from './getMetaData';
 import adapterConstants, { APP_NAME, APP_NAME_DASHED, FRAGMENT_CONTENTTYPE_NAME, FRAGMENT_DEFAULT_REGION_NAME, getContentApiUrl, getXpBaseUrl, IS_DEV_MODE, PAGE_TEMPLATE_CONTENTTYPE_NAME, PAGE_TEMPLATE_FOLDER, RENDER_MODE, sanitizeGraphqlName, SITE_KEY, XP_COMPONENT_TYPE, XP_REQUEST_TYPE, } from '../utils';
 import { ComponentRegistry } from '../ComponentRegistry';
 const NO_PROPS_PROCESSOR = (props) => __awaiter(void 0, void 0, void 0, function* () { var _a; return (_a = yield props) !== null && _a !== void 0 ? _a : {}; });
@@ -406,7 +406,7 @@ function processComponentConfig(myAppName, myAppNameDashed, cmp) {
 }
 function getQueryAndVariables(type, path, selectedQuery, context, config) {
     let query, getVariables;
-    if (typeof selectedQuery === 'string') {
+    if (typeof selectedQuery === 'string' || typeof selectedQuery === 'function') {
         query = selectedQuery;
     }
     else if (Array.isArray(selectedQuery)) {
@@ -420,12 +420,15 @@ function getQueryAndVariables(type, path, selectedQuery, context, config) {
     if (getVariables && typeof getVariables !== 'function') {
         throw Error(`getVariables for content type ${type} should be a function, not: ${typeof getVariables}`);
     }
-    if (query && typeof query !== 'string') {
-        throw Error(`Query for content type ${type} should be a string, not: ${typeof query}`);
+    if (query && typeof query !== 'string' && typeof query !== 'function') {
+        throw Error(`Query for content type ${type} should be a string or function, not: ${typeof query}`);
+    }
+    if (typeof query === 'function') {
+        query = query(config);
     }
     if (query) {
         return {
-            query: query,
+            query,
             variables: getVariables ? getVariables(path, context, config) : { path },
         };
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@enonic/nextjs-adapter",
-  "version": "0.0.1-alpha.6",
+  "version": "0.10.1",
   "license": "Apache-2.0",
   "main": "index.js",
   "publishConfig": {