@prezly/theme-kit-core 10.2.2 → 10.3.0

package/build/content-delivery/ContentDelivery.cjs

@@ -168,7 +168,7 @@ function createClient(prezly, newsroomUuid, newsroomThemeUuid) {
         query,
         offset = 0,
         limit,
-        category,
+        categories,
         locale,
         highlighted = 0,
         tags
@@ -184,8 +184,13 @@ function createClient(prezly, newsroomUuid, newsroomThemeUuid) {
         offset: offset > 0 ? offset + highlighted : offset,
         search,
         query: mergeQueries(query, {
-          ["category.id"]: category ? {
-            $any: [category.id]
+          ["category.id"]: categories !== null && categories !== void 0 && categories.length ? {
+            $all: categories.map(_ref => {
+              var {
+                id
+              } = _ref;
+              return id;
+            })
           } : undefined,
           ["newsroom.uuid"]: {
             $in: [newsroomUuid]

package/build/content-delivery/ContentDelivery.d.ts

@@ -11,7 +11,7 @@ export interface Options {
 export declare namespace stories {
     interface SearchParams {
         search?: string;
-        category?: Pick<Category, 'id'>;
+        categories?: Pick<Category, 'id'>[];
         tags?: string[];
         locale?: Pick<Culture, 'code'> | Culture.Code;
         limit: number;
@@ -26,7 +26,7 @@ export declare namespace stories {
 export declare namespace allStories {
     interface SearchParams {
         search?: string;
-        category?: Pick<Category, 'id'>;
+        categories?: Pick<Category, 'id'>[];
         locale?: Pick<Culture, 'code'>;
     }
     interface IncludeOptions<Include extends keyof Story.ExtraFields> {

package/build/content-delivery/ContentDelivery.mjs

@@ -160,7 +160,7 @@ export function createClient(prezly, newsroomUuid, newsroomThemeUuid) {
         query,
         offset = 0,
         limit,
-        category,
+        categories,
         locale,
         highlighted = 0,
         tags
@@ -176,8 +176,13 @@ export function createClient(prezly, newsroomUuid, newsroomThemeUuid) {
         offset: offset > 0 ? offset + highlighted : offset,
         search,
         query: mergeQueries(query, {
-          ["category.id"]: category ? {
-            $any: [category.id]
+          ["category.id"]: categories !== null && categories !== void 0 && categories.length ? {
+            $all: categories.map(_ref => {
+              var {
+                id
+              } = _ref;
+              return id;
+            })
           } : undefined,
           ["newsroom.uuid"]: {
             $in: [newsroomUuid]

package/build/routing/Route.cjs

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Route = void 0;
 var _urlPattern = _interopRequireDefault(require("url-pattern"));
+var _constants = require("./constants.cjs");
 var _index = require("./utils/index.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var Route;
@@ -15,8 +16,12 @@ var Route;
       generate,
       resolveLocale
     } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    var urlPattern = new _urlPattern.default(pattern);
-    var rewritePattern = new _urlPattern.default(rewrite);
+    var urlPattern = new _urlPattern.default(pattern, {
+      segmentValueCharset: _constants.URL_PATTERN_SEGMENT_CHARSET
+    });
+    var rewritePattern = new _urlPattern.default(rewrite, {
+      segmentValueCharset: _constants.URL_PATTERN_SEGMENT_CHARSET
+    });
     return {
       pattern,
       match(path, searchParams) {

package/build/routing/Route.mjs

@@ -1,4 +1,5 @@
 import UrlPattern from 'url-pattern';
+import { URL_PATTERN_SEGMENT_CHARSET } from "./constants.mjs";
 import { normalizeUrl } from "./utils/index.mjs";
 export var Route;
 (function (_Route) {
@@ -8,8 +9,12 @@ export var Route;
       generate,
       resolveLocale
     } = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-    var urlPattern = new UrlPattern(pattern);
-    var rewritePattern = new UrlPattern(rewrite);
+    var urlPattern = new UrlPattern(pattern, {
+      segmentValueCharset: URL_PATTERN_SEGMENT_CHARSET
+    });
+    var rewritePattern = new UrlPattern(rewrite, {
+      segmentValueCharset: URL_PATTERN_SEGMENT_CHARSET
+    });
     return {
       pattern,
       match(path, searchParams) {

package/build/routing/constants.cjs

@@ -0,0 +1,7 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.URL_PATTERN_SEGMENT_CHARSET = void 0;
+var URL_PATTERN_SEGMENT_CHARSET = exports.URL_PATTERN_SEGMENT_CHARSET = "a-zA-Z0-9-_~ %!'";

package/build/routing/constants.d.ts

@@ -0,0 +1 @@
+export declare const URL_PATTERN_SEGMENT_CHARSET = "a-zA-Z0-9-_~ %!'";

package/build/routing/constants.mjs

@@ -0,0 +1 @@
+export var URL_PATTERN_SEGMENT_CHARSET = "a-zA-Z0-9-_~ %!'";

package/build/routing/utils/generateUrlFromPattern.cjs

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.generateUrlFromPattern = generateUrlFromPattern;
 var _omitUndefined = require("@technically/omit-undefined");
 var _urlPattern = _interopRequireDefault(require("url-pattern"));
+var _constants = require("../constants.cjs");
 var _getShortestLocaleSlug = require("./getShortestLocaleSlug.cjs");
 var _normalizeUrl = require("./normalizeUrl.cjs");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -18,7 +19,9 @@ var CACHE = new Map();
 function toUrlPattern(pattern) {
   var cached = CACHE.get(pattern);
   if (cached) return cached;
-  var urlPattern = new _urlPattern.default(pattern);
+  var urlPattern = new _urlPattern.default(pattern, {
+    segmentValueCharset: _constants.URL_PATTERN_SEGMENT_CHARSET
+  });
   CACHE.set(pattern, urlPattern);
   return urlPattern;
 }

package/build/routing/utils/generateUrlFromPattern.mjs

@@ -5,13 +5,16 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import { omitUndefined } from '@technically/omit-undefined';
 import UrlPattern from 'url-pattern';
+import { URL_PATTERN_SEGMENT_CHARSET } from "../constants.mjs";
 import { getShortestLocaleSlug } from "./getShortestLocaleSlug.mjs";
 import { normalizeUrl } from "./normalizeUrl.mjs";
 var CACHE = new Map();
 function toUrlPattern(pattern) {
   var cached = CACHE.get(pattern);
   if (cached) return cached;
-  var urlPattern = new UrlPattern(pattern);
+  var urlPattern = new UrlPattern(pattern, {
+    segmentValueCharset: URL_PATTERN_SEGMENT_CHARSET
+  });
   CACHE.set(pattern, urlPattern);
   return urlPattern;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@prezly/theme-kit-core",
-  "version": "10.2.2",
+  "version": "10.3.0",
   "description": "Data layer and utility library for developing Prezly themes with JavaScript",
   "main": "build/index.mjs",
   "type": "module",
@@ -36,7 +36,7 @@
     "@prezly/sdk": "21.12.0 || ^23.x"
   },
   "dependencies": {
-    "@prezly/theme-kit-intl": "^10.2.2",
+    "@prezly/theme-kit-intl": "^10.3.0",
     "@prezly/uploadcare": "2.4.4",
     "@technically/is-not-undefined": "^1.0.0",
     "@technically/omit-undefined": "^1.0.4",
@@ -71,5 +71,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "54d10f592180d2c67a87152a0c10106d5656a2a2"
+  "gitHead": "eea5189d4e5ffd67f39f20a73797d0b77bc8fef6"
 }