@content-island/api-client 0.8.2 → 0.9.0

package/dist/index.d.ts

@@ -1,10 +1,6 @@
-import { FieldType } from '@content-island/common';
-import { Lookup } from '@content-island/common';
-import { Media } from '@content-island/common';
-
 declare type AllowedQueryKeys<M extends Model = Model> = keyof Pick<
 Query<M>,
-'id' | 'contentType' | 'language' | Extract<keyof Query<M>, `fields.${string}`>
+'id' | 'contentType' | 'language' | 'includeRelatedContent' | Extract<keyof Query<M>, `fields.${string}`>
 >;
 
 export declare interface ApiClient {
@@ -15,7 +11,7 @@ export declare interface ApiClient {
     getRawContent: <M extends Model = Model & Record<string, any>>(queryParam: QueryParams<M>) => Promise<Content>;
 }
 
-export declare type ClientFilter<Type = string> = Type | { in?: Type[] };
+export declare type ClientFilter<Type = string | boolean> = Type | { in?: Type[] };
 
 export declare interface Content {
     id: string;
@@ -46,13 +42,30 @@ export declare interface Field {
     language: string;
 }
 
-export { FieldType }
-
-export { Lookup }
+declare type FieldEntityType = `${string}|${string}`;
+
+export declare type FieldType =
+| 'short-text'
+| 'long-text'
+| 'number'
+| 'date'
+| 'date-time'
+| 'media'
+| 'boolean'
+| 'color'
+| FieldEntityType;
+
+export declare interface Lookup<ID = string> {
+    id: ID;
+    name: string;
+}
 
 export declare const mapContentToModel: <M extends Model<Language> = Model<any> & Record<string, any>, Language = M["language"]>(content: Content, language?: Language) => M;
 
-export { Media }
+export declare interface Media {
+    name: string;
+    url: string;
+}
 
 export declare type Model<Language = string> = {
     id: string;
@@ -78,6 +91,7 @@ declare type Query<M extends Model = Model> = {
     lastUpdate?: ClientFilter;
     language?: ClientFilter<M['language'] extends undefined ? string : M['language']>;
     contentType?: ClientFilter;
+    includeRelatedContent?: boolean;
 } & Partial<
 Omit<
     {

package/dist/index.js

@@ -1,36 +1,42 @@
-const s = {
+const a = {
   IS_PRODUCTION: !0,
   DEFAULT_API_CLIENT_DOMAIN: "api.contentisland.net",
   DEFAULT_API_CLIENT_VERSION: "1.0"
-}, l = {
+}, u = {
   SESSION_KEY: "authorization",
   SESSION_TYPE: "Bearer"
-}, O = (t) => t.reduce((e, o) => ({ ...e, [o.name]: o.value }), {}), S = (t, e, o) => {
-  var i;
-  const n = o ?? ((i = t[0]) == null ? void 0 : i.language), r = t.filter((u) => u.language === n), c = O(r);
-  return Object.keys(c).length === 0 && console.warn(`No fields found for language "${n}" and content id "${e}"`), {
+}, O = (t) => t == null ? void 0 : t.includes("|"), S = (t, e) => Array.isArray(t) ? t.map(e) : [], C = (t, e) => t.isArray ? S(t.value, (o) => c(o, e)) : c(t.value, e), I = (t) => O(t.type) && (t.isArray ? t.value.every((e) => typeof e == "object" && "contentType" in e) : typeof t.value == "object" && "contentType" in t.value), _ = (t, e) => t.reduce(
+  (o, n) => ({
+    ...o,
+    [n.name]: I(n) ? C(n, e) : n.value
+  }),
+  {}
+), A = (t, e, o) => {
+  var l;
+  const n = o ?? ((l = t[0]) == null ? void 0 : l.language), r = t.filter((g) => g.language === n), s = _(r, n);
+  return Object.keys(s).length === 0 && console.warn(`No fields found for language "${n}" and content id "${e}"`), {
     id: e,
     language: n,
-    ...c
+    ...s
   };
-}, N = (t, e) => Array.isArray(t == null ? void 0 : t.fields) ? S(t.fields, t.id, e) : {}, E = (t, e) => {
-  if (typeof e == "string")
+}, c = (t, e) => Array.isArray(t == null ? void 0 : t.fields) ? A(t.fields, t.id, e) : {}, N = (t, e) => {
+  if (typeof e == "string" || typeof e == "boolean")
     return `${t}=${e}`;
   if (e.in)
     return `${t}[in]=${e.in.join(",")}`;
-}, I = (t, e) => Object.entries(t).reduce(
-  (o, [n, r], c) => c === 0 ? E(n, r) : `${o}${e}${E(n, r)}`,
+}, $ = (t, e) => Object.entries(t).reduce(
+  (o, [n, r], s) => s === 0 ? N(n, r) : `${o}${e}${N(n, r)}`,
   ""
-), g = (t) => t && Object.keys(t).length > 0 ? `?${I(t, "&")}` : "", a = {
+), E = (t) => t && Object.keys(t).length > 0 ? `?${$(t, "&")}` : "", T = {
   PROJECT: "/project",
-  CONTENT_LIST: (t) => `/contents${g(t)}`,
-  CONTENT: (t) => `/content${g(t)}`
-}, _ = (t) => {
-  const o = (t.secureProtocol === void 0 ? s.IS_PRODUCTION : t.secureProtocol) ? "https" : "http", n = t.domain ? t.domain : s.DEFAULT_API_CLIENT_DOMAIN, r = t.apiVersion ? t.apiVersion : s.DEFAULT_API_CLIENT_VERSION;
+  CONTENT_LIST: (t) => `/contents${E(t)}`,
+  CONTENT: (t) => `/content${E(t)}`
+}, d = (t) => {
+  const o = (t.secureProtocol === void 0 ? a.IS_PRODUCTION : t.secureProtocol) ? "https" : "http", n = t.domain ? t.domain : a.DEFAULT_API_CLIENT_DOMAIN, r = t.apiVersion ? t.apiVersion : a.DEFAULT_API_CLIENT_VERSION;
   return `${o}://${n}/api/${r}`;
-}, T = async (t, e) => fetch(`${_(e)}${t}`, {
+}, i = async (t, e) => fetch(`${d(e)}${t}`, {
   headers: {
-    [l.SESSION_KEY]: `${l.SESSION_TYPE} ${e.accessToken}`
+    [u.SESSION_KEY]: `${u.SESSION_TYPE} ${e.accessToken}`
   }
 }).then((o) => {
   if (o.ok)
@@ -41,23 +47,23 @@ const s = {
       statusText: o.statusText
     })
   );
-}), d = (t) => {
-  const e = (n) => T(a.CONTENT_LIST(n), t), o = (n) => T(a.CONTENT(n), t);
+}), p = (t) => {
+  const e = (n) => i(T.CONTENT_LIST(n), t), o = (n) => i(T.CONTENT(n), t);
   return {
-    getProject: () => T(a.PROJECT, t),
+    getProject: () => i(T.PROJECT, t),
     getContentList: (n) => e(n).then(
       (r) => Array.isArray(r) ? r.map(
-        (c) => N(c, n == null ? void 0 : n.language)
+        (s) => c(s, n == null ? void 0 : n.language)
       ) : []
     ),
     getContent: (n) => o(n).then(
-      (r) => N(r, n == null ? void 0 : n.language)
+      (r) => c(r, n == null ? void 0 : n.language)
     ),
     getRawContentList: e,
     getRawContent: o
   };
 };
 export {
-  d as createClient,
-  N as mapContentToModel
+  p as createClient,
+  c as mapContentToModel
 };

package/dist/index.umd.cjs

@@ -1 +1 @@
-(function(s,c){typeof exports=="object"&&typeof module<"u"?c(exports):typeof define=="function"&&define.amd?define(["exports"],c):(s=typeof globalThis<"u"?globalThis:s||self,c(s.ApiClient={}))})(this,function(s){"use strict";const c={IS_PRODUCTION:!0,DEFAULT_API_CLIENT_DOMAIN:"api.contentisland.net",DEFAULT_API_CLIENT_VERSION:"1.0"},u={SESSION_KEY:"authorization",SESSION_TYPE:"Bearer"},E=e=>e.reduce((t,o)=>({...t,[o.name]:o.value}),{}),S=(e,t,o)=>{var g;const n=o??((g=e[0])==null?void 0:g.language),i=e.filter(I=>I.language===n),r=E(i);return Object.keys(r).length===0&&console.warn(`No fields found for language "${n}" and content id "${t}"`),{id:t,language:n,...r}},l=(e,t)=>Array.isArray(e==null?void 0:e.fields)?S(e.fields,e.id,t):{},d=(e,t)=>{if(typeof t=="string")return`${e}=${t}`;if(t.in)return`${e}[in]=${t.in.join(",")}`},O=(e,t)=>Object.entries(e).reduce((o,[n,i],r)=>r===0?d(n,i):`${o}${t}${d(n,i)}`,""),N=e=>e&&Object.keys(e).length>0?`?${O(e,"&")}`:"",a={PROJECT:"/project",CONTENT_LIST:e=>`/contents${N(e)}`,CONTENT:e=>`/content${N(e)}`},f=e=>{const o=(e.secureProtocol===void 0?c.IS_PRODUCTION:e.secureProtocol)?"https":"http",n=e.domain?e.domain:c.DEFAULT_API_CLIENT_DOMAIN,i=e.apiVersion?e.apiVersion:c.DEFAULT_API_CLIENT_VERSION;return`${o}://${n}/api/${i}`},T=async(e,t)=>fetch(`${f(t)}${e}`,{headers:{[u.SESSION_KEY]:`${u.SESSION_TYPE} ${t.accessToken}`}}).then(o=>{if(o.ok)return o.json();throw Error(JSON.stringify({status:o.status,statusText:o.statusText}))}),C=e=>{const t=n=>T(a.CONTENT_LIST(n),e),o=n=>T(a.CONTENT(n),e);return{getProject:()=>T(a.PROJECT,e),getContentList:n=>t(n).then(i=>Array.isArray(i)?i.map(r=>l(r,n==null?void 0:n.language)):[]),getContent:n=>o(n).then(i=>l(i,n==null?void 0:n.language)),getRawContentList:t,getRawContent:o}};s.createClient=C,s.mapContentToModel=l,Object.defineProperty(s,Symbol.toStringTag,{value:"Module"})});
+(function(r,c){typeof exports=="object"&&typeof module<"u"?c(exports):typeof define=="function"&&define.amd?define(["exports"],c):(r=typeof globalThis<"u"?globalThis:r||self,c(r.ApiClient={}))})(this,function(r){"use strict";const c={IS_PRODUCTION:!0,DEFAULT_API_CLIENT_DOMAIN:"api.contentisland.net",DEFAULT_API_CLIENT_VERSION:"1.0"},u={SESSION_KEY:"authorization",SESSION_TYPE:"Bearer"},g=e=>e==null?void 0:e.includes("|"),C=(e,t)=>Array.isArray(e)?e.map(t):[],S=(e,t)=>e.isArray?C(e.value,o=>i(o,t)):i(e.value,t),O=e=>g(e.type)&&(e.isArray?e.value.every(t=>typeof t=="object"&&"contentType"in t):typeof e.value=="object"&&"contentType"in e.value),A=(e,t)=>e.reduce((o,n)=>({...o,[n.name]:O(n)?S(n,t):n.value}),{}),I=(e,t,o)=>{var E;const n=o??((E=e[0])==null?void 0:E.language),s=e.filter(f=>f.language===n),a=A(s,n);return Object.keys(a).length===0&&console.warn(`No fields found for language "${n}" and content id "${t}"`),{id:t,language:n,...a}},i=(e,t)=>Array.isArray(e==null?void 0:e.fields)?I(e.fields,e.id,t):{},N=(e,t)=>{if(typeof t=="string"||typeof t=="boolean")return`${e}=${t}`;if(t.in)return`${e}[in]=${t.in.join(",")}`},_=(e,t)=>Object.entries(e).reduce((o,[n,s],a)=>a===0?N(n,s):`${o}${t}${N(n,s)}`,""),d=e=>e&&Object.keys(e).length>0?`?${_(e,"&")}`:"",T={PROJECT:"/project",CONTENT_LIST:e=>`/contents${d(e)}`,CONTENT:e=>`/content${d(e)}`},p=e=>{const o=(e.secureProtocol===void 0?c.IS_PRODUCTION:e.secureProtocol)?"https":"http",n=e.domain?e.domain:c.DEFAULT_API_CLIENT_DOMAIN,s=e.apiVersion?e.apiVersion:c.DEFAULT_API_CLIENT_VERSION;return`${o}://${n}/api/${s}`},l=async(e,t)=>fetch(`${p(t)}${e}`,{headers:{[u.SESSION_KEY]:`${u.SESSION_TYPE} ${t.accessToken}`}}).then(o=>{if(o.ok)return o.json();throw Error(JSON.stringify({status:o.status,statusText:o.statusText}))}),$=e=>{const t=n=>l(T.CONTENT_LIST(n),e),o=n=>l(T.CONTENT(n),e);return{getProject:()=>l(T.PROJECT,e),getContentList:n=>t(n).then(s=>Array.isArray(s)?s.map(a=>i(a,n==null?void 0:n.language)):[]),getContent:n=>o(n).then(s=>i(s,n==null?void 0:n.language)),getRawContentList:t,getRawContent:o}};r.createClient=$,r.mapContentToModel=i,Object.defineProperty(r,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@content-island/api-client",
-  "version": "0.8.2",
+  "version": "0.9.0",
   "description": "Content Island - REST API Client",
   "private": false,
   "sideEffects": false,
@@ -29,6 +29,7 @@
     "test:watch": "vitest -c ./config/test/config.ts"
   },
   "devDependencies": {
-    "@content-island/b2b-api-model": "*"
+    "@content-island/b2b-api-model": "*",
+    "@content-island/common": "*"
   }
 }