@content-island/api-client 0.16.0 → 0.18.0

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-declare type AllowedModelFields<M extends Model, ValueType> = Partial<Omit<{
-    [K in keyof M as IsPrimitive<NonNullable<M[K]>> extends true ? `fields.${string & K}` : never]?: ValueType;
+declare type AllowedFields<M extends Model, Type extends 'sort' | 'filter'> = Partial<Omit<{
+    [K in keyof M as IsPrimitive<NonNullable<M[K]>> extends true ? `fields.${string & K}` : never]?: Type extends 'sort' ? SortOrder : ClientFilter<NonNullable<M[K]>>;
 }, 'fields.id' | 'fields.language'>>;
 
 export declare interface ApiClient {
@@ -18,9 +18,10 @@ declare interface BaseModel {
     type: ModelType;
 }
 
-export declare type ClientFilter<Type = string | boolean> = Type | {
+export declare type ClientFilter<Type = string | boolean | number> = Type | {
     in?: Type[];
     ne?: Type;
+    nin?: Type[];
 };
 
 export declare interface Content {
@@ -97,12 +98,12 @@ export declare type FieldType =
 | RelatedModelType;
 
 declare type FilterableFields<M extends Model = Model> = {
-    id?: ClientFilter;
-    lastUpdate?: ClientFilter;
+    id?: ClientFilter<string>;
+    lastUpdate?: ClientFilter<string>;
     language?: M['language'];
-    contentType?: ClientFilter;
+    contentType?: ClientFilter<string>;
     includeRelatedContent?: boolean;
-} & AllowedModelFields<M, ClientFilter>;
+} & AllowedFields<M, 'filter'>;
 
 declare type IsPrimitive<T> = [T] extends [string | number | boolean] ? true : false;
 
@@ -342,7 +343,7 @@ declare type RelatedModelType = `${string}|${string}`;
 declare type SortableFields<M extends Model> = {
     contentType?: SortOrder;
     lastUpdate?: SortOrder;
-} & AllowedModelFields<M, SortOrder>;
+} & AllowedFields<M, 'sort'>;
 
 declare type SortOrder = 'asc' | 'desc';
 

package/dist/index.js

@@ -1,26 +1,29 @@
-const N = (t, e) => {
-  if (typeof e == "string" || typeof e == "boolean")
-    return `${t}=${e}`;
-  if (e.in)
-    return `${t}[in]=${e.in.join(",")}`;
-  if (e.ne)
-    return `${t}[ne]=${e.ne}`;
-}, A = (t) => Object.entries(t).map(([e, n]) => `${e}:${n}`).join(","), O = (t, e) => {
-  let n = "";
-  return t.take !== void 0 && (n += `take=${t.take}`), t.skip !== void 0 && (n += n ? `${e}skip=${t.skip}` : `skip=${t.skip}`), n;
-}, _ = (t, e) => Object.entries(t).reduce((n, [o, s], a) => {
-  if (o === "sort" && typeof s == "object" && s !== null && !Array.isArray(s)) {
-    const r = A(s);
-    return a === 0 ? `sort=${r}` : `${n}${e}sort=${r}`;
-  } else if (o === "pagination" && typeof s == "object" && s !== null) {
-    const r = O(s, e);
-    return a === 0 ? r : `${n}${e}${r}`;
-  } else if (s !== void 0 && o !== "sort" && o !== "pagination") {
-    const r = s;
-    return a === 0 ? N(o, r) : `${n}${e}${N(o, r)}`;
+const $ = (t, n) => `&${t}.type=${typeof n}`, A = (t) => typeof t == "string" || typeof t == "number" || typeof t == "boolean", O = (t, n, e) => `${t}=${n}${e ? $(t, n) : ""}`, l = (t, n) => {
+  const e = t.startsWith("fields.");
+  if (A(n))
+    return O(t, n, e);
+  if (n.in)
+    return `${t}[in]=${n.in.join(",")}${e && n.in.length > 0 ? $(t, n.in[0]) : ""}`;
+  if (n.ne !== void 0)
+    return `${t}[ne]=${n.ne}${e ? $(t, n.ne) : ""}`;
+  if (n.nin)
+    return `${t}[nin]=${n.nin.join(",")}${e && n.nin.length > 0 ? $(t, n.nin[0]) : ""}`;
+}, _ = (t) => Object.entries(t).map(([n, e]) => `${n}:${e}`).join(","), p = (t, n) => {
+  let e = "";
+  return t.take !== void 0 && (e += `take=${t.take}`), t.skip !== void 0 && (e += e ? `${n}skip=${t.skip}` : `skip=${t.skip}`), e;
+}, C = (t, n) => Object.entries(t).reduce((e, [o, r], a) => {
+  if (o === "sort" && typeof r == "object" && r !== null && !Array.isArray(r)) {
+    const s = _(r);
+    return a === 0 ? `sort=${s}` : `${e}${n}sort=${s}`;
+  } else if (o === "pagination" && typeof r == "object" && r !== null) {
+    const s = p(r, n);
+    return a === 0 ? s : `${e}${n}${s}`;
+  } else if (r !== void 0 && o !== "sort" && o !== "pagination") {
+    const s = r;
+    return a === 0 ? l(o, s) : `${e}${n}${l(o, s)}`;
   }
-  return n;
-}, ""), S = (t) => t && Object.keys(t).length > 0 ? `?${_(t, "&")}` : "", $ = {
+  return e;
+}, ""), S = (t) => t && Object.keys(t).length > 0 ? `?${C(t, "&")}` : "", N = {
   IS_PRODUCTION: !0,
   DEFAULT_API_CLIENT_DOMAIN: "api.contentisland.net",
   DEFAULT_API_CLIENT_VERSION: "1.0"
@@ -28,31 +31,31 @@ const N = (t, e) => {
   SESSION_KEY: "authorization",
   SESSION_TYPE: "Bearer",
   METADATA_KEY: "x-metadata"
-}, l = (t) => {
-  const n = (t.secureProtocol === void 0 ? $.IS_PRODUCTION : t.secureProtocol) ? "https" : "http", o = t.domain ? t.domain : $.DEFAULT_API_CLIENT_DOMAIN, s = t.apiVersion ? t.apiVersion : $.DEFAULT_API_CLIENT_VERSION;
-  return `${n}://${o}/api/${s}`;
-}, d = async (t, e) => fetch(`${l(e)}${t}`, {
+}, d = (t) => {
+  const e = (t.secureProtocol === void 0 ? N.IS_PRODUCTION : t.secureProtocol) ? "https" : "http", o = t.domain ? t.domain : N.DEFAULT_API_CLIENT_DOMAIN, r = t.apiVersion ? t.apiVersion : N.DEFAULT_API_CLIENT_VERSION;
+  return `${e}://${o}/api/${r}`;
+}, I = async (t, n) => fetch(`${d(n)}${t}`, {
   headers: {
-    [i.SESSION_KEY]: `${i.SESSION_TYPE} ${e.accessToken}`,
-    ...e.metadata ? { [i.METADATA_KEY]: e.metadata } : {}
+    [i.SESSION_KEY]: `${i.SESSION_TYPE} ${n.accessToken}`,
+    ...n.metadata ? { [i.METADATA_KEY]: n.metadata } : {}
   }
-}).then((n) => {
-  if (n.ok)
-    return n.json();
+}).then((e) => {
+  if (e.ok)
+    return e.json();
   throw Error(
     JSON.stringify({
-      status: n.status,
-      statusText: n.statusText
+      status: e.status,
+      statusText: e.statusText
     })
   );
-}), C = async (t, e, n) => fetch(`${l(n)}${t}`, {
+}), L = async (t, n, e) => fetch(`${d(e)}${t}`, {
   method: "PUT",
   headers: {
     "Content-Type": "application/json",
-    [i.SESSION_KEY]: `${i.SESSION_TYPE} ${n.accessToken}`,
-    ...n.metadata ? { [i.METADATA_KEY]: n.metadata } : {}
+    [i.SESSION_KEY]: `${i.SESSION_TYPE} ${e.accessToken}`,
+    ...e.metadata ? { [i.METADATA_KEY]: e.metadata } : {}
   },
-  body: JSON.stringify(e)
+  body: JSON.stringify(n)
 }).then((o) => {
   if (o.ok)
     return !0;
@@ -63,51 +66,51 @@ const N = (t, e) => {
     })
   );
 }), T = {
-  get: d,
-  put: C
-}, I = (t) => t == null ? void 0 : t.includes("|"), p = (t, e) => Array.isArray(t) ? t.map(e) : [], L = (t, e) => t.isArray ? p(t.value, (n) => E(n, e)) : E(t.value, e), f = (t) => I(t.type) && (t.isArray ? t.value.every((e) => typeof e == "object" && "contentType" in e) : typeof t.value == "object" && "contentType" in t.value), h = (t, e) => t.reduce(
-  (n, o) => ({
-    ...n,
-    [o.name]: f(o) ? L(o, e) : o.value
+  get: I,
+  put: L
+}, h = (t) => t == null ? void 0 : t.includes("|"), j = (t, n) => Array.isArray(t) ? t.map(n) : [], F = (t, n) => t.isArray ? j(t.value, (e) => E(e, n)) : E(t.value, n), y = (t) => h(t.type) && (t.isArray ? t.value.every((n) => typeof n == "object" && "contentType" in n) : typeof t.value == "object" && "contentType" in t.value), R = (t, n) => t.reduce(
+  (e, o) => ({
+    ...e,
+    [o.name]: y(o) ? F(o, n) : o.value
   }),
   {}
-), y = (t, e, n, o) => {
+), f = (t, n, e, o) => {
   var c;
-  const s = n ?? ((c = t[0]) == null ? void 0 : c.language), a = t.filter((g) => g.language === s), r = h(a, s);
-  return Object.keys(r).length === 0 && console.warn(`No fields found for language "${s}" and content id "${e}"`), {
-    id: e,
-    language: s,
+  const r = e ?? ((c = t[0]) == null ? void 0 : c.language), a = t.filter((g) => g.language === r), s = R(a, r);
+  return Object.keys(s).length === 0 && console.warn(`No fields found for language "${r}" and content id "${n}"`), {
+    id: n,
+    language: r,
     lastUpdate: o,
-    ...r
+    ...s
   };
-}, E = (t, e) => Array.isArray(t == null ? void 0 : t.fields) ? y(t.fields, t.id, e, t.lastUpdate) : {}, u = {
+}, E = (t, n) => Array.isArray(t == null ? void 0 : t.fields) ? f(t.fields, t.id, n, t.lastUpdate) : {}, u = {
   PROJECT: "/project",
   CONTENT_LIST: (t) => `/contents${S(t)}`,
   CONTENT: (t) => `/content${S(t)}`,
   CONTENT_LIST_SIZE: (t) => t ? `/contents/size${S(t)}` : "/contents/size"
-}, j = (t) => {
-  const e = (a) => T.get(u.CONTENT_LIST(a), t), n = (a) => T.get(u.CONTENT(a), t), o = () => T.get(u.PROJECT, t), s = async () => {
-    var r;
+}, D = (t) => {
+  const n = (a) => T.get(u.CONTENT_LIST(a), t), e = (a) => T.get(u.CONTENT(a), t), o = () => T.get(u.PROJECT, t), r = async () => {
+    var s;
     const a = await o();
-    return (r = a == null ? void 0 : a.languages) == null ? void 0 : r[0];
+    return (s = a == null ? void 0 : a.languages) == null ? void 0 : s[0];
   };
   return {
     getProject: o,
     getContentList: async (a) => {
-      const r = await e(a), c = (a == null ? void 0 : a.language) ?? await s();
-      return Array.isArray(r) ? r.map((g) => E(g, c)) : [];
+      const s = await n(a), c = (a == null ? void 0 : a.language) ?? await r();
+      return Array.isArray(s) ? s.map((g) => E(g, c)) : [];
     },
     getContent: async (a) => {
-      const r = await n(a), c = (a == null ? void 0 : a.language) ?? await s();
-      return E(r, c);
+      const s = await e(a), c = (a == null ? void 0 : a.language) ?? await r();
+      return E(s, c);
     },
-    getRawContentList: e,
-    getRawContent: n,
+    getRawContentList: n,
+    getRawContent: e,
     getContentListSize: (a) => T.get(u.CONTENT_LIST_SIZE(a), t),
-    updateContentFieldValue: (a, r, c) => T.put(
+    updateContentFieldValue: (a, s, c) => T.put(
       `${u.CONTENT(null)}/${a}`,
       {
-        id: r,
+        id: s,
         value: c
       },
       t
@@ -115,6 +118,6 @@ const N = (t, e) => {
   };
 };
 export {
-  j as createClient,
+  D as createClient,
   E as mapContentToModel
 };

package/dist/index.umd.cjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@content-island/api-client",
-  "version": "0.16.0",
+  "version": "0.18.0",
   "description": "Content Island - REST API Client",
   "private": false,
   "sideEffects": false,