@nascentdigital/funnel-core 5.0.1 → 5.0.3

package/dist/app/RegionsConfig.d.ts

@@ -4,6 +4,7 @@ export type RegionsConfig<TRegion extends string = string> = {
     fallback: TRegion;
     urlTruncation: RegionsConfig.UrlTruncation;
     mergedRoutes?: boolean;
+    liveRoutesOnly?: boolean;
 };
 export declare namespace RegionsConfig {
     type RegionConfig = {
@@ -24,6 +25,7 @@ export declare namespace RegionsConfig {
     function parse<TRegion extends string = string>(regionalization: RegionsConfig, value: string | undefined): TRegion;
     function getRegionConfig<TRegion extends string = string>(regionalization: RegionsConfig, region: TRegion): RegionConfig;
     function getLocales<TRegion extends string = string>(regionalization: RegionsConfig): [TRegion, Language][];
+    function getLocaleParams<TRegion extends string = string>(regionalization: RegionsConfig): Locale.Params<TRegion>[];
     function getLanguages(regionalization: RegionsConfig): Language[];
     /**
      * Given a config for all regions, return the default region. If the default region is set through cookies, we use

package/dist/app/RegionsConfig.js

@@ -72,6 +72,11 @@ var RegionsConfig;
             .filter(utils_1.Value.isDefined);
     }
     RegionsConfig.getLocales = getLocales;
+    function getLocaleParams(regionalization) {
+        return getLocales(regionalization)
+            .map(([region, language]) => ({ region: region, language }));
+    }
+    RegionsConfig.getLocaleParams = getLocaleParams;
     function getLanguages(regionalization) {
         return Object.values(regionalization.regions).reduce((languages, regionConfig) => {
             // add missing languages

package/dist/schema/Collection.js

@@ -85,7 +85,7 @@ exports.Collection = Collection;
 (function (Collection) {
     let Id;
     (function (Id) {
-        Id.draft = '__draft';
+        Id.draft = '__draft.id__';
     })(Id = Collection.Id || (Collection.Id = {}));
     let Data;
     (function (Data) {

package/dist/schema/LinkedPage.js

@@ -16,6 +16,7 @@ const LinkedData_1 = require("./LinkedData");
 // class
 class LinkedPage {
     constructor(args) {
+        console.debug('[LinkedPage/new] creating with', args);
         // set instance variables
         this._data = args.data;
         this._linkedStore = args.linkedStore;
@@ -76,6 +77,7 @@ class LinkedPage {
         });
     }
     static async create(args) {
+        console.debug('[LinkedPage/create] called with', args);
         // find and resolve all dynamic references
         const dynamicRefs = LinkedData_1.LinkedData.findDynamicRefs(args.data);
         const dynamic = await LinkedData_1.LinkedData.resolveDynamicRefs({ dynamicRefs, resolvers: args.resolvers });

package/dist/schema/Page.d.ts

@@ -12,6 +12,7 @@ import { PageRoute } from './PageRoute';
 import type { PageSnapshot } from './PageSnapshot';
 import { Section } from './Section';
 import type { Seo } from './Seo';
+import { Tag } from './Tag';
 import { TagGroup } from './TagGroup';
 export declare class Page<TContent extends Page.Content = Page.Content, TPreview extends Page.PreviewTarget<TContent> = Page.PreviewTarget<TContent>> {
     private _type?;
@@ -27,6 +28,7 @@ export declare class Page<TContent extends Page.Content = Page.Content, TPreview
     readonly parent?: string;
     private constructor();
     get type(): Page.Type;
+    parseTags(tags: Tag.Data[]): Tag[];
     bind(type: Page.Type): void;
     static static<TContent extends Page.Content, TPreview extends Page.PreviewTarget<TContent>>({ route, ...args }: Page.FactoryArgs.Static<TContent, TPreview>): Page<TContent, TPreview>;
     static dynamic<TContent extends Page.Content, TPreview extends Page.PreviewTarget<TContent>>(args: Page.FactoryArgs.Dynamic<TContent, TPreview>): Page<TContent, TPreview>;
@@ -207,7 +209,7 @@ export declare namespace Page {
         }
         type AsNewLanguage<TPage extends Page = Page, TRegion extends string = string> = Pick<LegacyData<TPage, TRegion>, AsNewLanguage.Prop>;
         namespace AsNewLanguage {
-            type Prop = Extract<Props.Id, 'brand' | 'groupId' | 'slug' | 'language'>;
+            type Prop = Extract<Props.Id, 'brand' | 'groupId' | 'slug' | 'region' | 'language'>;
             const props: ReadonlyArray<Prop>;
             function filter<TPage extends Page = Page, TRegion extends string = string>(page: AsNew<TPage, TRegion> | AsNewLanguage<TPage, TRegion>): page is AsNewLanguage<TPage, TRegion>;
         }
@@ -238,7 +240,6 @@ export declare namespace Page {
             group: {
                 groupId: GroupId;
                 brand: string;
-                region: TRegion;
                 type: Type;
                 slug?: string;
                 preset?: string;
@@ -249,7 +250,7 @@ export declare namespace Page {
         namespace AsGroup {
             type Instance<TPage extends Page = Page, TRegion extends string = string> = Pick<LegacyData<TPage, TRegion>, Instance.Prop>;
             namespace Instance {
-                type Prop = Extract<Props.Id, 'id' | 'name' | 'language' | 'url' | 'slug' | 'tags'> | Exclude<Props.Audit, 'publication'>;
+                type Prop = Extract<Props.Id, 'id' | 'name' | 'region' | 'language' | 'url' | 'slug' | 'tags'> | Exclude<Props.Audit, 'publication'>;
                 const props: ReadonlyArray<Prop>;
             }
         }
@@ -264,8 +265,8 @@ export declare namespace Page {
     }
     type References = {
         files: Record<Asset.Id, Asset.Linked>;
-        pages: Record<Page.Id, Data>;
         collections: Record<Collection.Id, Collection.Data.AsLink>;
+        pages: Record<Page.Id, Data>;
     };
     type FlattenedData<TPage extends Page = Page, TRegion extends string = string> = References & {
         data: Data<TPage, TRegion>;
@@ -292,10 +293,9 @@ export declare namespace Page {
             function from(data: LinkedData): AsPreview;
         }
     }
-    type Id = Tagged<string, 'funnel.Page.Id'> | Id.Draft;
+    type Id = Tagged<string, 'funnel.Page.Id'>;
     namespace Id {
-        type Draft = '__draft.id__';
-        const draft: Draft;
+        const draft: Id;
     }
     type Type = Tagged<string, 'funnel.Page.Type'> | Type.Unknown;
     namespace Type {

package/dist/schema/Page.js

@@ -14,6 +14,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = void 0;
 const errors_1 = require("../errors");
 const utils_1 = require("../utils");
+const Tag_1 = require("./Tag");
 // class
 class Page {
     // constructor
@@ -43,6 +44,14 @@ class Page {
         // return id
         return _type;
     }
+    parseTags(tags) {
+        const { tags: tagGroups = [] } = this;
+        return (tags !== null && tags !== void 0 ? tags : [])
+            .map(tag => Tag_1.Tag.Data.parse(tag))
+            .filter(utils_1.Value.isDefined)
+            .map(({ tagGroupId, tagId }) => { var _a; return (_a = tagGroups.find(tagGroup => tagGroup.id === tagGroupId)) === null || _a === void 0 ? void 0 : _a.get(tagId); })
+            .filter(utils_1.Value.isDefined);
+    }
     bind(type) {
         // ignore if the type is the same
         if (this._type === type) {
@@ -109,7 +118,7 @@ exports.Page = Page;
         })(AsNew = Data.AsNew || (Data.AsNew = {}));
         let AsNewLanguage;
         (function (AsNewLanguage) {
-            AsNewLanguage.props = ['brand', 'groupId', 'slug', 'language'];
+            AsNewLanguage.props = ['brand', 'groupId', 'slug', 'region', 'language'];
             // type guard
             function filter(page) {
                 return 'groupId' in page;
@@ -161,7 +170,7 @@ exports.Page = Page;
             let Instance;
             (function (Instance) {
                 Instance.props = [
-                    'id', 'name', 'language', 'url', 'slug', 'tags',
+                    'id', 'name', 'region', 'language', 'url', 'slug', 'tags',
                     ...Props.audit.filter(prop => prop !== 'publication')
                 ];
             })(Instance = AsGroup.Instance || (AsGroup.Instance = {}));

package/dist/schema/field/base/AssetField.d.ts

@@ -1,9 +1,9 @@
 import { AspectRatio, Size } from '../../../ui/geometry';
 import { MimeType } from '../../../ui/MimeType';
 import { Position } from '../../../ui/Position';
-import { Asset } from '../../Asset';
-import { AssetScope } from '../../AssetScope';
-import { Tag } from '../../Tag';
+import type { Asset } from '../../Asset';
+import type { AssetScope } from '../../AssetScope';
+import type { Tag } from '../../Tag';
 import { TagGroup } from '../../TagGroup';
 import { Field } from '../index';
 export declare class AssetField<TValue extends AssetField.LinkedValue = AssetField.LinkedValue> extends Field<AssetField<TValue>> {
@@ -103,7 +103,7 @@ export declare namespace AssetField {
         }
         function filter(value: any): value is LinkedValue;
         function unlink(value: LinkedValue): Value;
-        function toData(value: LinkedValue): Field.LinkedData<AssetField>;
+        function toData(value: LinkedValue): Asset.Linked<LinkedValue>;
     }
     type VisualData = Field.LinkedData<AssetField<LinkedValue.Image | LinkedValue.Video>>;
     type ImageData = Field.LinkedData<AssetField<LinkedValue.Image>>;

package/dist/schema/field/base/AssetField.js

@@ -131,7 +131,11 @@ exports.AssetField = AssetField;
             return {
                 __ref: 'asset',
                 type: 'asset',
-                value
+                value: {
+                    id: value.id,
+                    type: value.type,
+                    url: value.url
+                }
             };
         }
         Value.toData = toData;
@@ -197,6 +201,7 @@ exports.AssetField = AssetField;
         // serialization
         function toData(value) {
             return {
+                __root: 'asset',
                 type: 'asset',
                 value
             };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nascentdigital/funnel-core",
-  "version": "5.0.1",
+  "version": "5.0.3",
   "repository": {
     "url": "git+https://github.com/nascentdigital/funnel.git",
     "directory": "libs/core"
@@ -65,5 +65,5 @@
     "jest-tsd": "^0.2.2",
     "ts-jest": "^29.3.2"
   },
-  "gitHead": "6ac66e04e5d6d10b959826b84cf3827422ddf47b"
+  "gitHead": "0d1cc7d78504e8819998d928ffb342d622f75690"
 }