From 77b83f51ddb73f40cf220ab1b519bf2935da19bf Mon Sep 17 00:00:00 2001
From: David Ball <david@daball.me>
Date: Sun, 25 Aug 2024 17:35:58 -0400
Subject: [PATCH] Migrated to release candidate Squidex SDK

---
 astro.config.mjs                              |  4 +-
 .../catalog/amazon/amazon-append-images.ts    |  8 +-
 src/apps/catalog/common/catalog-helpers.ts    | 86 ++++++++++---------
 src/components/Brand.astro                    |  6 +-
 src/components/BrandCard.astro                |  2 +-
 src/components/ComponentRouter.astro          | 16 ++--
 src/components/ImageCarousel.astro            |  2 +-
 src/components/Product.astro                  |  2 +-
 src/data/api-client.ts                        | 13 ++-
 src/data/core/client.ts                       | 13 ++-
 src/data/internals/ContentDtoT.ts             |  6 +-
 src/data/internals/ContentsDtoT.ts            |  4 +-
 src/layouts/Layout.astro                      |  2 +-
 src/pages/404.astro                           |  4 +-
 src/pages/[...routeLookup].astro              |  9 +-
 src/pages/view/brands/[...brandLookup].astro  |  6 +-
 .../marketplaces/[...marketplaceLookup].astro |  6 +-
 src/pages/view/pages/[...pageLookup].astro    |  6 +-
 .../[...productCategoryLookup].astro          |  6 +-
 .../view/products/[...productLookup].astro    |  6 +-
 .../view/sellers/[...sellerLookup].astro      |  6 +-
 21 files changed, 108 insertions(+), 105 deletions(-)

diff --git a/astro.config.mjs b/astro.config.mjs
index 192d181..17ae452 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -44,7 +44,7 @@ export default defineConfig({
       transformMixedEsModules: true,
     },
     rollupOptions: {
-      external: ['@squidex/squidex', '../squidex-node-sdk'],
+      // external: ['@squidex/squidex', '../squidex-node-sdk'],
     }
   },
   vite: {
@@ -52,7 +52,7 @@ export default defineConfig({
       commonjs(/**/)
     ],
     optimizeDeps: {
-      exclude: ['@squidex/squidex', '../squidex-node-sdk'],
+      // exclude: ['@squidex/squidex', '../squidex-node-sdk'],
     }
   //     resolve: {
   //         alias: [
diff --git a/src/apps/catalog/amazon/amazon-append-images.ts b/src/apps/catalog/amazon/amazon-append-images.ts
index df31505..3edfec7 100644
--- a/src/apps/catalog/amazon/amazon-append-images.ts
+++ b/src/apps/catalog/amazon/amazon-append-images.ts
@@ -97,11 +97,11 @@ export const amazonAppendImagesCommand = (amazonCommand: Command) =>
                     }
                     if (didUpdate) {
                         log(`Listing did update, updating product listing with appended images.`);
-                        let updatedDto = await core.client.contents.putContent(SCHEMAS.LISTINGS, listingDto.id, {
+                        let updatedDto = await core.client.contents.putContent({
+                            schema: SCHEMAS.LISTINGS,
+                            id: listingDto.id,
                             unpublished: false,
-                            body: listing as any,
-                        }, {
-                            timeoutInSeconds: core.TIMEOUT_IN_SECONDS
+                            requestBody: listing as any,
                         });
                         log(`Listing version ${updatedDto.version} stored.`);
                     }
diff --git a/src/apps/catalog/common/catalog-helpers.ts b/src/apps/catalog/common/catalog-helpers.ts
index f7720c3..593847b 100644
--- a/src/apps/catalog/common/catalog-helpers.ts
+++ b/src/apps/catalog/common/catalog-helpers.ts
@@ -20,13 +20,15 @@ import axios from 'axios';
 import ollama from 'ollama';
 import slugify from 'slugify';
 import type { Offer } from '../../../data/models/multis/Offer.ts';
+// import { Blob } from 'buffer';
+import { lookup as mimeLookup } from 'mime-types';
 
 export function isValidASIN(asinOrNot: string) {
     return asinOrNot.match(/[A-Z0-9]{10}/g) ? true : false;
 }
 
 export async function getAmazonGetItemsRequestSchemaDto() {
-    return await client.schemas.getSchema('amazon-pa-get-items-request');
+    return await client.schemas.getSchema({ schema: 'amazon-pa-get-items-request' });
 }
 
 export async function lookupAmazonASINs(asins: string[]) {
@@ -46,20 +48,21 @@ export async function lookupAmazonASINs(asins: string[]) {
         ] } },
         requestDate: { iv: requestDate }
     }
-    let amazonGetItemDto = await client.contents.postContent(SCHEMAS.AMAZON_GET_ITEMS, {
+    let amazonGetItemDto = await client.contents.postContent({
+        schema: SCHEMAS.AMAZON_GET_ITEMS,
         publish: true,
-        body: amazonGetItem as any,
+        requestBody: amazonGetItem as any,
     })
     let amazonGetItemsDto = await getContentsByIds<AmazonGetItem>(SCHEMAS.AMAZON_GET_ITEMS, amazonGetItemDto.id);
     return amazonGetItemsDto;
 }
 
 export async function getMarketplaceConnectionSchemaDto() {
-    return await client.schemas.getSchema('product-marketplace-connection');
+    return await client.schemas.getSchema({ schema: 'product-marketplace-connection' });
 }
 
 export async function getAmazonMarketplaceConnectionSchemaDto() {
-    return await client.schemas.getSchema('product-marketplace-connection-amazon')
+    return await client.schemas.getSchema({ schema: 'product-marketplace-connection-amazon' })
 }
 
 export async function getAmazonMarketplaceDto() {
@@ -97,8 +100,9 @@ export async function getBrandDtoByName(brandName: string) {
 }
 
 export async function getAddNewBrandDtoByName(brandName: string) {
-    let brandDto = await client.contents.postContent(SCHEMAS.BRANDS, {
-        body: {
+    let brandDto = await client.contents.postContent({
+        schema: SCHEMAS.BRANDS,
+        requestBody: {
             brandName: {
                 "en-US": brandName!,
                 "es-US": brandName!,
@@ -110,10 +114,8 @@ export async function getAddNewBrandDtoByName(brandName: string) {
                 "fr-CA": `fr-CA/${slugify(brandName!, { lower: true, trim: true })}`
             },
         }
-    }, {
-        timeoutInSeconds: TIMEOUT_IN_SECONDS,
     });
-    let brandsDto = await client.contents.getContents(SCHEMAS.BRANDS, { unpublished: true, ids: brandDto.id }, { timeoutInSeconds: TIMEOUT_IN_SECONDS }) as ContentsDto<Brand>;
+    let brandsDto = await client.contents.getContents({ schema: SCHEMAS.BRANDS, unpublished: true, ids: brandDto.id }) as ContentsDto<Brand>;
     return brandsDto;
 }
 
@@ -128,8 +130,9 @@ export async function getSellerDtoByName(sellerName: string) {
 }
 
 export async function getAddNewSellerDtoByName(sellerName: string) {
-    let sellerDto = await client.contents.postContent(SCHEMAS.SELLERS, {
-        body: {
+    let sellerDto = await client.contents.postContent({
+        schema: SCHEMAS.SELLERS,
+        requestBody: {
             sellerName: {
                 "en-US": sellerName!,
                 "es-US": sellerName!,
@@ -141,10 +144,8 @@ export async function getAddNewSellerDtoByName(sellerName: string) {
                 "fr-CA": `fr-CA/${slugify(sellerName!, { lower: true, trim: true })}`
             },
         }
-    }, {
-        timeoutInSeconds: TIMEOUT_IN_SECONDS,
     });
-    let sellersDto = await client.contents.getContents(SCHEMAS.SELLERS, { unpublished: true, ids: sellerDto.id }, {timeoutInSeconds: TIMEOUT_IN_SECONDS}) as ContentsDto<Seller>;
+    let sellersDto = await client.contents.getContents({ schema: SCHEMAS.SELLERS, unpublished: true, ids: sellerDto.id }) as ContentsDto<Seller>;
     return sellersDto;
 }
 
@@ -407,17 +408,16 @@ export async function translateTags_from_en_US_to_fr_CA(tags_en_US: string[]) {
 }
 
 export async function getAddNewProductSubCategoryDto(parentProductCategoryId: NonLocalized<string[]>, categoryName: Localized<string>, description: Localized<string>) {
-    let productCategoryDto = await client.contents.postContent(SCHEMAS.PRODUCT_CATEGORIES, {
+    let productCategoryDto = await client.contents.postContent({
+        schema: SCHEMAS.PRODUCT_CATEGORIES,
         publish: false,
-        body: {
+        requestBody: {
             categoryName,
             description,
             parentCategory: parentProductCategoryId,
         },
-    }, {
-        timeoutInSeconds: TIMEOUT_IN_SECONDS,
     });
-    let productCategoriesDto = await client.contents.getContents(SCHEMAS.PRODUCT_CATEGORIES, { unpublished: true, ids: productCategoryDto.id }, {timeoutInSeconds: TIMEOUT_IN_SECONDS}) as ContentsDto<ProductCategory>;
+    let productCategoriesDto = await client.contents.getContents({ schema: SCHEMAS.PRODUCT_CATEGORIES, unpublished: true, ids: productCategoryDto.id }) as ContentsDto<ProductCategory>;
     return productCategoriesDto;
 }
 
@@ -448,28 +448,26 @@ export async function translateAmazonDescription_from_en_US_to_fr_CA(brandName:
 }
 
 export async function getAddNewProductDtoByProduct(product: Product) {
-    let productDto = await client.contents.postContent(SCHEMAS.PRODUCTS, {
+    let productDto = await client.contents.postContent({
+        schema: SCHEMAS.PRODUCTS,
         publish: false,
-        body: {
+        requestBody: {
             ...product
         },
-    }, {
-        timeoutInSeconds: TIMEOUT_IN_SECONDS,
     });
-    let productsDto = await client.contents.getContents(SCHEMAS.PRODUCTS, { unpublished: true, ids: productDto.id }, {timeoutInSeconds: TIMEOUT_IN_SECONDS}) as ContentsDto<Product>;
+    let productsDto = await client.contents.getContents({ schema: SCHEMAS.PRODUCTS, unpublished: true, ids: productDto.id }) as ContentsDto<Product>;
     return productsDto;
 }
 
 export async function getAddNewProductListingDtoByProduct(listing: Listing) {
-    let listingDto = await client.contents.postContent(SCHEMAS.LISTINGS, {
+    let listingDto = await client.contents.postContent({
+        schema: SCHEMAS.LISTINGS,
         publish: true,
-        body: {
+        requestBody: {
             ...listing
         }
-    }, {
-        timeoutInSeconds: TIMEOUT_IN_SECONDS,
     });
-    let listingsDto = await client.contents.getContents(SCHEMAS.LISTINGS, { unpublished: true, ids: listingDto.id }, {timeoutInSeconds: TIMEOUT_IN_SECONDS}) as ContentsDto<Listing>;
+    let listingsDto = await client.contents.getContents({ schema: SCHEMAS.LISTINGS, unpublished: true, ids: listingDto.id }) as ContentsDto<Listing>;
     return listingsDto;
 }
 
@@ -482,11 +480,11 @@ export function removeQuotes(str: string) {
 }
 
 export async function upsertAssetFolder(folderName: string, parentFolderId?: string|undefined) {
-    const assetFolders = await client.assets.getAssetFolders({ scope: 'Items', parentId: parentFolderId }, { timeoutInSeconds: TIMEOUT_IN_SECONDS });
+    const assetFolders = await client.assets.getAssetFolders({ scope: 'Items', parentId: parentFolderId });
     let assetFolder;
     let assetFolderLookup = assetFolders.items.filter(folder => folder.folderName === folderName);
     if (assetFolderLookup.length === 0) {
-        assetFolder = await client.assets.postAssetFolder({ folderName: folderName, parentId: parentFolderId }, { timeoutInSeconds: TIMEOUT_IN_SECONDS });
+        assetFolder = await client.assets.postAssetFolder({ createAssetFolderDto: { folderName: folderName, parentId: parentFolderId }});
     }
     else {
         assetFolder = assetFolderLookup[0];
@@ -500,21 +498,27 @@ export async function getAllAssetsInFolder(assetFolderId: string) {
 }
 
 export async function uploadDownloadedImageToSquidexAsAsset(downloadUrl: string, assetFolderId: string) {
-    let filename = downloadUrl.substring(downloadUrl.lastIndexOf('/')+1);
+    let filename = downloadUrl.substring(downloadUrl.lastIndexOf('/')+1);//.replace(/[A-Z0-9\.-_]*, '$0');
     let response = await axios.get(downloadUrl, { timeout: TIMEOUT_IN_SECONDS * 1000, responseType: 'arraybuffer' });
-    let assetDto = await client.assets.postAsset({ readable: response.data, fileName: filename }, { timeoutInSeconds: TIMEOUT_IN_SECONDS });
-    assetDto = await client.assets.putAsset(assetDto.id, { fileName: filename, metadata: { ...assetDto.metadata, 'amazon-url': downloadUrl }, tags: ['amazon', 'product'] })
-    assetDto = await client.assets.putAssetParent(assetDto.id, { parentId: assetFolderId });
+    let form = new FormData();
+    let blob = new Blob(response.data, {type: mimeLookup(filename) as string});
+    form.append('fileName', filename);
+    form.append('file', blob, filename);
+    form.append('parentId', assetFolderId);
+    let assetDto = await client.assets.postAsset({ file: blob, fileName: filename, fileUrl: filename, parentId: assetFolderId }, {
+        body: form
+    });
+    assetDto = await client.assets.putAsset({ id: assetDto.id, annotateAssetDto: { metadata: { ...assetDto.metadata, 'amazon-url': downloadUrl }, tags: ['amazon', 'product'] } })
+    // assetDto = await client.assets.putAssetParent({ id: assetDto.id, moveAssetDto: { parentId: assetFolderId } });
     return assetDto;
 }
 
 export async function getAddNewOfferDto(offer: Offer) {
-    let offerDto = await client.contents.postContent(SCHEMAS.OFFERS, {
+    let offerDto = await client.contents.postContent({
+        schema: SCHEMAS.OFFERS,
         publish: true,
-        body: offer as any,
-    }, {
-        timeoutInSeconds: TIMEOUT_IN_SECONDS,
+        requestBody: offer as any,
     });
-    let offersDto = await client.contents.getContents(SCHEMAS.OFFERS, { unpublished: true, ids: offerDto.id }, {timeoutInSeconds: TIMEOUT_IN_SECONDS}) as ContentsDto<ProductCategory>;
+    let offersDto = await client.contents.getContents({ schema: SCHEMAS.OFFERS, unpublished: true, ids: offerDto.id }) as ContentsDto<ProductCategory>;
     return offersDto;
 }
diff --git a/src/components/Brand.astro b/src/components/Brand.astro
index 541cf34..4d173a2 100644
--- a/src/components/Brand.astro
+++ b/src/components/Brand.astro
@@ -11,7 +11,7 @@ interface Props extends Multilingual, SquidexEditable {
 
 const { brand, editToken, locale } = Astro.props;
 
-let brandLogoImage = path.posix.join('/img', (await getAssetById(brand.logoImage[locale]))
+let brandLogoImage = path.posix.join('/img', (await getAssetById(brand.logoImage![locale]))
 						.links['content']
 							.href
 								.split('/')
@@ -27,10 +27,10 @@ let brandLogoImage = path.posix.join('/img', (await getAssetById(brand.logoImage
 		    <img src={brandLogoImage} alt={brand.brandName[locale]} title={brand.brandName[locale]} />
         }
         <div class="flex-right">
-            {getLocaleField(locale, brand.shortDescription) && <div class="short-desc"><Fragment set:html={renderMarkdown(getLocaleField(locale, brand.shortDescription)!)} /></div> }
+            {getLocaleField(locale, brand.shortDescription!) && <div class="short-desc"><Fragment set:html={renderMarkdown(getLocaleField(locale, brand.shortDescription!)!)} /></div> }
         </div>
     </div>
-    {getLocaleField(locale, brand.longDescription) && <div class="after-flex"><Fragment set:html={renderMarkdown(getLocaleField(locale, brand.longDescription)!)} /></div> }
+    {getLocaleField(locale, brand.longDescription!) && <div class="after-flex"><Fragment set:html={renderMarkdown(getLocaleField(locale, brand.longDescription!)!)} /></div> }
 </div>
 
 <style>
diff --git a/src/components/BrandCard.astro b/src/components/BrandCard.astro
index cfa5767..698a170 100644
--- a/src/components/BrandCard.astro
+++ b/src/components/BrandCard.astro
@@ -10,7 +10,7 @@ interface Props extends Multilingual, SquidexEditable {
 
 const { brand, editToken, locale } = Astro.props;
 
-let brandLogoImage = path.posix.join('/img', (await getAssetById(brand.logoImage[locale]))
+let brandLogoImage = path.posix.join('/img', (await getAssetById(brand.logoImage![locale]))
 						.links['content']
 							.href
 								//The purpose of .split('/').reverse().filter(...2...).reverse().join('/') is to
diff --git a/src/components/ComponentRouter.astro b/src/components/ComponentRouter.astro
index 08f0efe..c85b5a1 100644
--- a/src/components/ComponentRouter.astro
+++ b/src/components/ComponentRouter.astro
@@ -120,7 +120,7 @@ async function flatWalkSubCategories (productCategoryId: string): Promise<Conten
 					if (recurseCategory.parentCategory && recurseCategory.parentCategory.iv && recurseCategory.parentCategory.iv.length > 0) {
 						if (abortAfterRecursions !== 0) {
                             let parentCategoriesDto = await getProductCategoriesByIds(recurseCategory.parentCategory.iv[0]);
-							parentCategories = await walkParentCategoriesForCrumbsRecursive(parentCategoriesDto.items[0].data!, abortAfterRecursions--, parentCategoriesDto.items[0].editToken);
+							parentCategories = await walkParentCategoriesForCrumbsRecursive(parentCategoriesDto.items[0].data!, abortAfterRecursions--, parentCategoriesDto.items[0].editToken!);
 						}
 					}
                     if (startCategory.slug !== recurseCategory.slug) {
@@ -166,7 +166,7 @@ async function flatWalkSubCategories (productCategoryId: string): Promise<Conten
                         return (
                             <BrandCard
                                 locale={locale}
-                                editToken={brandDto.editToken}
+                                editToken={brandDto.editToken!}
                                 brand={brandDto.data!}
                             />
                         );
@@ -189,7 +189,7 @@ async function flatWalkSubCategories (productCategoryId: string): Promise<Conten
                         return (
                             <BrandCard
                                 locale={locale}
-                                editToken={brandDto.editToken}
+                                editToken={brandDto.editToken!}
                                 brand={brandDto.data!}
                             />
                         );
@@ -213,7 +213,7 @@ async function flatWalkSubCategories (productCategoryId: string): Promise<Conten
                         return (
                             <BrandCard
                                 locale={locale}
-                                editToken={brandDto.editToken}
+                                editToken={brandDto.editToken!}
                                 brand={brandDto.data!}
                             />
                         );
@@ -255,7 +255,7 @@ async function flatWalkSubCategories (productCategoryId: string): Promise<Conten
                 <ul class="link-card-grid marketplaces" data-squidex-token={pageEditToken}>
                     {marketplaces.sort((a, b) => a.data!.marketplaceName[locale].localeCompare(b.data!.marketplaceName[locale])).map(marketplaceDto => (
                         <MarketplaceCard
-                            editToken={marketplaceDto.editToken}
+                            editToken={marketplaceDto.editToken!}
                             locale={locale}
                             marketplace={marketplaceDto.data!}
                         />
@@ -276,7 +276,7 @@ async function flatWalkSubCategories (productCategoryId: string): Promise<Conten
                 <ul class="link-card-grid sellers" data-squidex-token={pageEditToken}>
                     {sellers.sort((a, b) => a.data!.sellerName[locale].localeCompare(b.data!.sellerName[locale])).map(sellerDto => (
                         <SellerCard
-                            editToken={sellerDto.editToken}
+                            editToken={sellerDto.editToken!}
                             locale={locale}
                             seller={sellerDto.data!}
                         />
@@ -308,7 +308,7 @@ async function flatWalkSubCategories (productCategoryId: string): Promise<Conten
                         let editToken = productCategoryDto.editToken;
                         return (
                             <ProductCategoryCard
-                                editToken={editToken}
+                                editToken={editToken!}
                                 locale={locale}
                                 productCategory={productCategoryDto.data!}
                             />
@@ -333,7 +333,7 @@ async function flatWalkSubCategories (productCategoryId: string): Promise<Conten
                             let editToken = productDto.editToken;
                             return (
                                 <ProductCard
-                                    editToken={editToken}
+                                    editToken={editToken!}
                                     locale={locale}
                                     productDto={productDto}
                                 />
diff --git a/src/components/ImageCarousel.astro b/src/components/ImageCarousel.astro
index 14bc981..9c517ad 100644
--- a/src/components/ImageCarousel.astro
+++ b/src/components/ImageCarousel.astro
@@ -1,5 +1,5 @@
 ---
-import type { Brand } from '../data/brands/brand';
+// import type { Brand } from '../data/brands/brand';
 // import { Swiper, SwiperSlide } from 'swiper/react';
 // import { Navigation as SwiperNavigation, Pagination as SwiperPagination } from 'swiper/modules';
 import CarouselSwiper from './CarouselSwiper';
diff --git a/src/components/Product.astro b/src/components/Product.astro
index e2b275c..69fbdc0 100644
--- a/src/components/Product.astro
+++ b/src/components/Product.astro
@@ -25,7 +25,7 @@ const formatAsCurrency = (amount: number) => amount.toLocaleString(locale, { sty
 const { productDto, editToken, locale } = Astro.props;
 const product = productDto.items[0].data!;
 
-let amazonConnectorSchemaId = (await core.client.schemas.getSchema('product-marketplace-connection-amazon')).id;
+let amazonConnectorSchemaId = (await core.client.schemas.getSchema({ schema: 'product-marketplace-connection-amazon' })).id;
 let brandDto = (await getBrandsByIds(product.brand.iv[0]));
 let possibleAmazonConnectors = product.marketplaceConnections.iv.filter((connection) => connection.connection.schemaId === amazonConnectorSchemaId);
 let amazonConnector = possibleAmazonConnectors.length > 0 ? possibleAmazonConnectors[0].connection as AmazonMarketplaceConnection : undefined;
diff --git a/src/data/api-client.ts b/src/data/api-client.ts
index 3e991a4..07551a0 100644
--- a/src/data/api-client.ts
+++ b/src/data/api-client.ts
@@ -1,6 +1,6 @@
 import * as core from "./core/client";
 import { SCHEMAS } from "./models/schemas";
-import { getContents } from "./core/client.js";
+import { getAllContents } from "./core/client.js";
 import { SupportedLocales, type Localized } from "./internals/LocalizedT.js";
 import type { Component } from "./internals/Component";
 import type { Brand } from "./models/multis/Brand";
@@ -14,7 +14,6 @@ import type { Slug } from "./models/multis/Slug";
 import type { Seller } from "./models/multis/Seller";
 import type { NonLocalized } from "./internals/NonLocalizedT.js";
 import type { ContentsDto } from "./internals/ContentsDtoT";
-import type { ContentData } from "@squidex/squidex/api/types/ContentData";
 import type { ContentDto } from "./internals/ContentDtoT";
 import type { Listing } from "./models/multis/Listing.js";
 import type { Offer } from "./models/multis/Offer.js";
@@ -144,7 +143,7 @@ export const getRedirectsByPreviousSlug = async (prevSlug: string) =>
 /** Slugs handlers */
 
 export const getAllSlugs = async () =>
-    await core.getContents<Slug>(SCHEMAS.SLUGS);
+    await core.getAllContents<Slug>(SCHEMAS.SLUGS);
 
 export const getSlugByLangSlug = async (forLang: SupportedLocales|string, slug: string) =>
     await core.getContentsUsingJsonQuery<Slug>(SCHEMAS.SLUGS, JSON.stringify({
@@ -159,7 +158,7 @@ export const getSlugByLangSlug = async (forLang: SupportedLocales|string, slug:
 /** Site handlers */
 
 export const getSite = async () =>
-    await getContents<Site>(SCHEMAS.SITE);
+    await getAllContents<Site>(SCHEMAS.SITE);
 
 export const getSiteHomePage = async (site: Site) => {
     if (site.homePage && site.homePage.iv.length > 0) {
@@ -171,7 +170,7 @@ export const getSiteHomePage = async (site: Site) => {
 }
 
 export const getSiteConfig = async () =>
-    await getContents<SiteConfig>(SCHEMAS.SITE_CONFIG);
+    await getAllContents<SiteConfig>(SCHEMAS.SITE_CONFIG);
 
 export async function performSyncLocalizedSlugs(logFn = console.log) {
     logFn("Begin sync localized slugs.")
@@ -321,10 +320,10 @@ export async function performSyncLocalizedSlugs(logFn = console.log) {
     });
     const MAX_TIME_TO_POST_SLUGS = 60;//s
     logFn("Add", batchAddSlugsQueue.length, "slugs");
-    let bulkAddResult = await core.client.contents.postContents(SCHEMAS.SLUGS, { datas: batchAddSlugsQueue as unknown as ContentData[], publish: true }, { timeoutInSeconds: MAX_TIME_TO_POST_SLUGS });
+    let bulkAddResult = await core.client.contents.postContents({ schema: SCHEMAS.SLUGS, importContentsDto: { datas: batchAddSlugsQueue as any, publish: true } });
     logFn("Remove by id", batchRemoveSlugsQueue.length, "slugs");
     batchRemoveSlugsQueue.forEach(async (removeId) => {
-        await core.client.contents.deleteContent(SCHEMAS.SLUGS, removeId)
+        await core.client.contents.deleteContent({ schema: SCHEMAS.SLUGS, id: removeId })
     })
     logFn("Finish sync localized slugs.")
 }
diff --git a/src/data/core/client.ts b/src/data/core/client.ts
index 2883285..e8bc92e 100644
--- a/src/data/core/client.ts
+++ b/src/data/core/client.ts
@@ -1,9 +1,8 @@
 import { config } from "../../config.js";
-import { Squidex, SquidexClient } from "@squidex/squidex";
+import { SquidexClient } from "@squidex/squidex";
 import type { ContentsDto } from "../internals/ContentsDtoT.js";
 import type { SupportedLocales } from "../internals/LocalizedT.js";
 import type { SCHEMAS } from "../models/schemas.js";
-import type { Contents } from "@squidex/squidex/api/resources/contents/client/Client.js";
 
 export const client = new SquidexClient({
     appName: config.squidexAppName!,
@@ -20,21 +19,21 @@ export const TIMEOUT_IN_SECONDS = 10;
 /** Asset Handling */
 
 export const getAssetById = async (assetId: string) => (
-    await client.assets.getAsset(assetId, {timeoutInSeconds: TIMEOUT_IN_SECONDS})
+    await client.assets.getAsset({ id: assetId })
 );
 
 /** Generic Content Handling */
 
-export const getContents = async <T>(schema: SCHEMAS|string) => (
-    await client.contents.getContents(schema, { }, { timeoutInSeconds: TIMEOUT_IN_SECONDS })
+export const getAllContents = async <T>(schema: SCHEMAS|string) => (
+    await client.contents.getContents({ schema })
 ) as ContentsDto<T>;
 
 export const getContentsByIds = async <T>(schema: SCHEMAS|string, ids: string) => (
-    await client.contents.getContents(schema, { ids }, { timeoutInSeconds: TIMEOUT_IN_SECONDS })
+    await client.contents.getContents({ schema, ids })
 ) as ContentsDto<T>;
 
 export const getContentsUsingJsonQuery = async <T>(schema: SCHEMAS|string, jsonQuery: string|undefined = undefined) => (
-    await client.contents.getContents(schema, { q: jsonQuery }, { timeoutInSeconds: TIMEOUT_IN_SECONDS })
+    await client.contents.getContents({ schema, q: jsonQuery })
 ) as ContentsDto<T>;
 
 export const getContentsByLangSlug = async <T>(schema: SCHEMAS|string, forLang: SupportedLocales|string, slug: string) => (
diff --git a/src/data/internals/ContentDtoT.ts b/src/data/internals/ContentDtoT.ts
index 0814628..2db95fa 100644
--- a/src/data/internals/ContentDtoT.ts
+++ b/src/data/internals/ContentDtoT.ts
@@ -1,5 +1,5 @@
-import { Squidex } from "@squidex/squidex";
+import type { ContentDto as SquidexContentDto } from "@squidex/squidex";
 
-export interface ContentDto<T> extends Squidex.ContentDto {
-    data?: T;
+export interface ContentDto<T> extends SquidexContentDto {
+    data: T;
 }
\ No newline at end of file
diff --git a/src/data/internals/ContentsDtoT.ts b/src/data/internals/ContentsDtoT.ts
index 25cd9ca..d24816b 100644
--- a/src/data/internals/ContentsDtoT.ts
+++ b/src/data/internals/ContentsDtoT.ts
@@ -1,7 +1,7 @@
 import type { ContentDto } from "./ContentDtoT";
-import { Squidex } from "@squidex/squidex";
+import type { ContentsDto as SquidexContentsDto } from "@squidex/squidex";
 
-export interface ContentsDto<T> extends Squidex.ContentsDto {
+export interface ContentsDto<T> extends SquidexContentsDto {
     /** The generic content items. */
     items: ContentDto<T>[];
 }
\ No newline at end of file
diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 251137f..c89e74f 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -64,7 +64,7 @@ const cssFixSquidex = `
 		<script src="https://code.jquery.com/jquery-3.7.1.min.js" integrity="sha256-/JqT3SQfawRcv/BIHPThkBvs0OEvtFFmqPF/lYI/Cxo=" crossorigin="anonymous"></script>
 		<script src="https://code.jquery.com/ui/1.13.3/jquery-ui.min.js" integrity="sha256-sw0iNNXmOJbQhYFuC9OF2kOlD5KQKe1y5lfBn4C9Sjg=" crossorigin="anonymous"></script>
 		<script src="https://unpkg.com/htmx.org@1.9.9" integrity="sha384-QFjmbokDn2DjBjq+fM+8LUIVrAgqcNW2s0PjAxHETgRn9l4fvX31ZxDxvwQnyMOX" crossorigin="anonymous"></script>
-		<script src={bootstrap}></script>
+		<script is:inline src={bootstrap}></script>
 		<link rel="preconnect" href="https://fonts.googleapis.com">
 		<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
 		<link href="https://fonts.googleapis.com/css2?family=Holtwood+One+SC&family=Caveat:wght@400..700&family=Noto+Sans:ital,wght@0,100..900;1,100..900&family=Urbanist:ital,wght@0,100..900;1,100..900&family=Saira+Extra+Condensed&display=swap" rel="stylesheet">
diff --git a/src/pages/404.astro b/src/pages/404.astro
index e388eb8..11a0611 100644
--- a/src/pages/404.astro
+++ b/src/pages/404.astro
@@ -140,7 +140,7 @@ try {
 	}
 }
 ---
-<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken} page={page as Page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
+<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken!} page={page as Page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
 	<slot name="head">
 		<meta name="description" content={metaDescription} />
 		{
@@ -160,7 +160,7 @@ try {
 	<main>
 		<Banner editToken={siteDto.items[0].editToken} homePageLink={`/${locale}/`} siteName={site.siteName[locale]} />
 		<ComponentRouter
-			pageEditToken={pageDto?.items[0].editToken}
+			pageEditToken={pageDto?.items[0].editToken!}
 			componentRouter={getLocaleField(locale, page.content)||[]}
 			homePage={homePage as Page}
 			isHomePage={isHomePage}
diff --git a/src/pages/[...routeLookup].astro b/src/pages/[...routeLookup].astro
index 9ccf93d..665d849 100644
--- a/src/pages/[...routeLookup].astro
+++ b/src/pages/[...routeLookup].astro
@@ -88,9 +88,10 @@ else {
 	console.log("redirectDto:", redirectDto);
 	if (redirectDto && redirectDto.items && redirectDto.items.length > 0) {
 		console.log("getting redirectReferencesDto for", SCHEMAS.REDIRECTS, redirectDto.items[0].id);
-		let redirectReferencesDto = await client.contents.getReferences(SCHEMAS.REDIRECTS, redirectDto.items[0].id);
+		//next line crashes:
+		let redirectReferencesDto = await client.contents.getReferences({ schema: SCHEMAS.REDIRECTS, id: redirectDto.items[0].id });
 		console.log("redirectReferencesDto:", redirectReferencesDto);
-		client.contents.getConten
+		// client.contents.getConten
 		// switch (redirectDto.items[0].data?.referenceSchema.iv) {
 		// 	case SCHEMAS.BRANDS:
 		// 		return Astro.rewrite(`/view/brands/${locale}/${objectId}`);
@@ -136,7 +137,7 @@ const renderContext = {
 	shouldEmbedSquidexSDK,
 }
 ---
-<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
+<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken!} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
 	<slot slot="head">
 		{ metaDescription && <meta name="description" content={metaDescription} /> }
 		{
@@ -177,7 +178,7 @@ const renderContext = {
 			pageEditToken={pageEditToken}
 			brand={brand||undefined}
 			site={site}
-			siteEditToken={siteEditToken}
+			siteEditToken={siteEditToken!}
 		/>
     </main>
 	<slot name="disclaimers" slot="disclaimers">
diff --git a/src/pages/view/brands/[...brandLookup].astro b/src/pages/view/brands/[...brandLookup].astro
index 57af3ea..ca3caef 100644
--- a/src/pages/view/brands/[...brandLookup].astro
+++ b/src/pages/view/brands/[...brandLookup].astro
@@ -65,7 +65,7 @@ const renderContext = {
 	shouldEmbedSquidexSDK,
 }
 ---
-<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
+<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken!} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
 	<slot name="head">
 		{ metaDescription && <meta name="description" content={metaDescription} /> }
 		{
@@ -90,10 +90,10 @@ const renderContext = {
 			isHomePage={false}
 			locale={locale}
 			page={page}
-			pageEditToken={pageEditToken}
+			pageEditToken={pageEditToken!}
 			brand={brand||undefined}
 			site={site}
-			siteEditToken={siteEditToken}
+			siteEditToken={siteEditToken!}
 		/>
     </main>
 	<span slot="disclaimers">
diff --git a/src/pages/view/marketplaces/[...marketplaceLookup].astro b/src/pages/view/marketplaces/[...marketplaceLookup].astro
index aca03f6..c3bdc6e 100644
--- a/src/pages/view/marketplaces/[...marketplaceLookup].astro
+++ b/src/pages/view/marketplaces/[...marketplaceLookup].astro
@@ -65,7 +65,7 @@ const renderContext = {
 	shouldEmbedSquidexSDK,
 }
 ---
-<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
+<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken!} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
 	<slot name="head">
 		{ metaDescription && <meta name="description" content={metaDescription} /> }
 		{
@@ -90,10 +90,10 @@ const renderContext = {
 			isHomePage={false}
 			locale={locale}
 			page={page}
-			pageEditToken={pageEditToken}
+			pageEditToken={pageEditToken!}
 			marketplace={marketplace}
 			site={site}
-			siteEditToken={siteEditToken}
+			siteEditToken={siteEditToken!}
 		/>
     </main>
 	<span slot="disclaimers">
diff --git a/src/pages/view/pages/[...pageLookup].astro b/src/pages/view/pages/[...pageLookup].astro
index 55ae82f..901c145 100644
--- a/src/pages/view/pages/[...pageLookup].astro
+++ b/src/pages/view/pages/[...pageLookup].astro
@@ -71,7 +71,7 @@ const renderContext = {
 	shouldEmbedSquidexSDK,
 }
 ---
-<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
+<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken!} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
 	<slot name="head">
 		{ metaDescription && <meta name="description" content={metaDescription} /> }
 		{
@@ -96,9 +96,9 @@ const renderContext = {
 			isHomePage={isHomePage}
 			locale={locale}
 			page={page}
-			pageEditToken={pageEditToken}
+			pageEditToken={pageEditToken!}
 			site={site}
-			siteEditToken={siteEditToken}
+			siteEditToken={siteEditToken!}
 		/>
     </main>
 	<span slot="disclaimers">
diff --git a/src/pages/view/product-categories/[...productCategoryLookup].astro b/src/pages/view/product-categories/[...productCategoryLookup].astro
index cd8f75e..70a5e19 100644
--- a/src/pages/view/product-categories/[...productCategoryLookup].astro
+++ b/src/pages/view/product-categories/[...productCategoryLookup].astro
@@ -66,7 +66,7 @@ const renderContext = {
 	shouldEmbedSquidexSDK,
 }
 ---
-<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
+<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken!} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
 	<slot name="head">
 		{ metaDescription && <meta name="description" content={metaDescription} /> }
 		{
@@ -91,11 +91,11 @@ const renderContext = {
 			isHomePage={false}
 			locale={locale}
 			page={page}
-			pageEditToken={pageEditToken}
+			pageEditToken={pageEditToken!}
             productCategory={productCategory}
 			brand={undefined}
 			site={site}
-			siteEditToken={siteEditToken}
+			siteEditToken={siteEditToken!}
 		/>
     </main>
 	<span slot="disclaimers">
diff --git a/src/pages/view/products/[...productLookup].astro b/src/pages/view/products/[...productLookup].astro
index fa42bb3..eb8b109 100644
--- a/src/pages/view/products/[...productLookup].astro
+++ b/src/pages/view/products/[...productLookup].astro
@@ -69,7 +69,7 @@ const renderContext = {
 	// disclaimers,
 }
 ---
-<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
+<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken!} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
 	<slot name="head">
 		{ metaDescription && <meta name="description" content={metaDescription} /> }
 		{
@@ -94,11 +94,11 @@ const renderContext = {
 			isHomePage={false}
 			locale={locale}
 			page={page}
-			pageEditToken={pageEditToken}
+			pageEditToken={pageEditToken!}
             productDto={productDto}
 			brand={undefined}
 			site={site}
-			siteEditToken={siteEditToken}
+			siteEditToken={siteEditToken!}
 		/>
     </main>
 	<span slot="disclaimers">
diff --git a/src/pages/view/sellers/[...sellerLookup].astro b/src/pages/view/sellers/[...sellerLookup].astro
index be913b6..d4cb34e 100644
--- a/src/pages/view/sellers/[...sellerLookup].astro
+++ b/src/pages/view/sellers/[...sellerLookup].astro
@@ -65,7 +65,7 @@ const renderContext = {
 	shouldEmbedSquidexSDK,
 }
 ---
-<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
+<Layout locale={locale} title={title} site={site} siteConfig={siteConfig} siteEditToken={siteDto.items[0].editToken!} page={page} shouldEmbedSquidexSDK={shouldEmbedSquidexSDK}>
 	<slot name="head">
 		{ metaDescription && <meta name="description" content={metaDescription} /> }
 		{
@@ -90,10 +90,10 @@ const renderContext = {
 			isHomePage={false}
 			locale={locale}
 			page={page}
-			pageEditToken={pageEditToken}
+			pageEditToken={pageEditToken!}
 			seller={seller}
 			site={site}
-			siteEditToken={siteEditToken}
+			siteEditToken={siteEditToken!}
 		/>
     </main>
 	<span slot="disclaimers">