@unchainedshop/core 4.8.19 → 4.8.20

package/lib/bulk-importer/handlers/product/create.d.ts

@@ -10,7 +10,11 @@ export declare const ProductCreateSpecificationSchema: z.ZodMiniObject<{
         readonly TOKENIZED_PRODUCT: "TOKENIZED_PRODUCT";
     }>;
     sequence: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
-    status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
+    status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniEnum<{
+        readonly DRAFT: "DRAFT";
+        readonly ACTIVE: "ACTIVE";
+        readonly DELETED: "DELETED";
+    }>>>;
     published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
     tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
     commerce: z.ZodMiniOptional<z.ZodMiniObject<{
@@ -67,7 +71,11 @@ export declare const ProductCreatePayloadSchema: z.ZodMiniObject<{
             readonly TOKENIZED_PRODUCT: "TOKENIZED_PRODUCT";
         }>;
         sequence: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
-        status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
+        status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniEnum<{
+            readonly DRAFT: "DRAFT";
+            readonly ACTIVE: "ACTIVE";
+            readonly DELETED: "DELETED";
+        }>>>;
         published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
         tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
         commerce: z.ZodMiniOptional<z.ZodMiniObject<{
@@ -170,7 +178,11 @@ declare namespace createProduct {
                 readonly TOKENIZED_PRODUCT: "TOKENIZED_PRODUCT";
             }>;
             sequence: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
-            status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
+            status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniEnum<{
+                readonly DRAFT: "DRAFT";
+                readonly ACTIVE: "ACTIVE";
+                readonly DELETED: "DELETED";
+            }>>>;
             published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
             tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
             commerce: z.ZodMiniOptional<z.ZodMiniObject<{

package/lib/bulk-importer/handlers/product/create.js

@@ -3,11 +3,11 @@ import upsertVariations, { ProductVariationSchema } from "./upsertVariations.js"
 import upsertMedia from "./upsertMedia.js";
 import { MediaSchema } from "../assortment/upsertMedia.js";
 import convertTagsToLowerCase from "../utils/convertTagsToLowerCase.js";
-import { ProductType } from '@unchainedshop/core-products';
+import { ProductStatus, ProductType } from '@unchainedshop/core-products';
 export const ProductCreateSpecificationSchema = z.object({
     type: z.enum(ProductType),
     sequence: z.optional(z.number()),
-    status: z.nullish(z.string()),
+    status: z.nullish(z.enum(ProductStatus)),
     published: z.nullish(z.iso.datetime()),
     tags: z.optional(z.array(z.string())),
     commerce: z.optional(z.object({
@@ -59,6 +59,7 @@ export const ProductCreatePayloadSchema = z.object({
     media: z.optional(z.array(MediaSchema)),
     variations: z.optional(z.array(ProductVariationSchema)),
 });
+const normalizeStatus = (status) => (status === ProductStatus.DRAFT ? null : status);
 const transformSpecification = (specification) => {
     const { variationResolvers: assignments, content, supply, warehousing, sequence, ...productData } = specification;
     const tags = productData?.tags ? convertTagsToLowerCase(productData.tags) : [];
@@ -66,6 +67,7 @@ const transformSpecification = (specification) => {
     return {
         ...productData,
         published: productData.published ? new Date(productData.published) : undefined,
+        ...(productData.status !== undefined && { status: normalizeStatus(productData.status) }),
         tags,
         warehousing,
         supply,

package/lib/bulk-importer/handlers/product/update.d.ts

@@ -4,7 +4,11 @@ import type { Services } from '../../../services/index.ts';
 export declare const ProductUpdateSpecificationSchema: z.ZodMiniObject<{
     type: z.ZodMiniOptional<z.ZodMiniString<string>>;
     sequence: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
-    status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
+    status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniEnum<{
+        readonly DRAFT: "DRAFT";
+        readonly ACTIVE: "ACTIVE";
+        readonly DELETED: "DELETED";
+    }>>>;
     published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
     tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
     commerce: z.ZodMiniOptional<z.ZodMiniObject<{
@@ -55,7 +59,11 @@ export declare const ProductUpdatePayloadSchema: z.ZodMiniObject<{
     specification: z.ZodMiniOptional<z.ZodMiniObject<{
         type: z.ZodMiniOptional<z.ZodMiniString<string>>;
         sequence: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
-        status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
+        status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniEnum<{
+            readonly DRAFT: "DRAFT";
+            readonly ACTIVE: "ACTIVE";
+            readonly DELETED: "DELETED";
+        }>>>;
         published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
         tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
         commerce: z.ZodMiniOptional<z.ZodMiniObject<{
@@ -152,7 +160,11 @@ declare namespace updateProduct {
         specification: z.ZodMiniOptional<z.ZodMiniObject<{
             type: z.ZodMiniOptional<z.ZodMiniString<string>>;
             sequence: z.ZodMiniOptional<z.ZodMiniNumber<number>>;
-            status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniString<string>>>;
+            status: z.ZodMiniOptional<z.ZodMiniNullable<z.ZodMiniEnum<{
+                readonly DRAFT: "DRAFT";
+                readonly ACTIVE: "ACTIVE";
+                readonly DELETED: "DELETED";
+            }>>>;
             published: z.ZodMiniOptional<z.ZodMiniNullable<z.iso.ZodMiniISODateTime>>;
             tags: z.ZodMiniOptional<z.ZodMiniArray<z.ZodMiniString<string>>>;
             commerce: z.ZodMiniOptional<z.ZodMiniObject<{

package/lib/bulk-importer/handlers/product/update.js

@@ -3,10 +3,11 @@ import upsertVariations, { ProductVariationSchema } from "./upsertVariations.js"
 import upsertMedia, { MediaSchema } from "./upsertMedia.js";
 import createProduct, { ProductCreatePayloadSchema } from "./create.js";
 import convertTagsToLowerCase from "../utils/convertTagsToLowerCase.js";
+import { ProductStatus } from '@unchainedshop/core-products';
 export const ProductUpdateSpecificationSchema = z.object({
     type: z.optional(z.string()),
     sequence: z.optional(z.number()),
-    status: z.nullish(z.string()),
+    status: z.nullish(z.enum(ProductStatus)),
     published: z.nullish(z.iso.datetime()),
     tags: z.optional(z.array(z.string())),
     commerce: z.optional(z.object({
@@ -58,6 +59,7 @@ export const ProductUpdatePayloadSchema = z.object({
     media: z.optional(z.array(MediaSchema)),
     variations: z.optional(z.array(ProductVariationSchema)),
 });
+const normalizeStatus = (status) => (status === ProductStatus.DRAFT ? null : status);
 const transformSpecification = (specification) => {
     const { variationResolvers: assignments, content, supply, warehousing, ...productData } = specification;
     const tags = productData?.tags ? convertTagsToLowerCase(productData.tags) : [];
@@ -65,6 +67,7 @@ const transformSpecification = (specification) => {
     return {
         ...productData,
         published: productData.published ? new Date(productData.published) : undefined,
+        ...(productData.status !== undefined && { status: normalizeStatus(productData.status) }),
         tags,
         warehousing,
         supply,

package/lib/directors/FilterDirector.js

@@ -1,6 +1,6 @@
 import { mongodb } from '@unchainedshop/mongodb';
 import { BaseDirector } from '@unchainedshop/utils';
-import { filtersSettings, FilterType, } from '@unchainedshop/core-filters';
+import { filterCacheGeneration, filtersSettings, FilterType, } from '@unchainedshop/core-filters';
 export const parseQueryArray = (query) => (query || []).reduce((accumulator, { key, value }) => ({
     ...accumulator,
     [key]: accumulator[key] ? accumulator[key].concat(value) : [value],
@@ -70,18 +70,19 @@ export const FilterDirector = {
     },
     async buildProductIdMap(filter, unchainedAPI) {
         const allProductIds = await this.findProductIds(filter, {}, unchainedAPI);
-        const productIdsMap = filter.type === FilterType.SWITCH
-            ? {
-                true: await this.findProductIds(filter, { value: true }, unchainedAPI),
-                false: await this.findProductIds(filter, { value: { $in: [null, false] } }, unchainedAPI),
-            }
-            : await (filter.options || []).reduce(async (accumulatorPromise, option) => {
-                const accumulator = await accumulatorPromise;
-                return {
-                    ...accumulator,
-                    [option]: await this.findProductIds(filter, { value: option }, unchainedAPI),
-                };
-            }, Promise.resolve({}));
+        if (filter.type === FilterType.SWITCH) {
+            return [
+                allProductIds,
+                {
+                    true: await this.findProductIds(filter, { value: true }, unchainedAPI),
+                    false: await this.findProductIds(filter, { value: { $in: [null, false] } }, unchainedAPI),
+                },
+            ];
+        }
+        const productIdsMap = Object.create(null);
+        for (const option of filter.options || []) {
+            productIdsMap[option] = await this.findProductIds(filter, { value: option }, unchainedAPI);
+        }
         return [allProductIds, productIdsMap];
     },
     async filterProductIds(filter, { values, forceLiveCollection }, unchainedAPI) {
@@ -92,11 +93,13 @@ export const FilterDirector = {
             return new Set(allProductIds);
         const result = new Set();
         for (const key of filteredKeys) {
+            if (!Object.hasOwn(keyToProductIdMap, key))
+                continue;
             const additionalValues = keyToProductIdMap[key];
-            if (additionalValues) {
-                for (const val of additionalValues)
-                    result.add(val);
-            }
+            if (!additionalValues)
+                continue;
+            for (const val of additionalValues)
+                result.add(val);
         }
         return result;
     },
@@ -165,6 +168,8 @@ export const FilterDirector = {
         if (!filter)
             return;
         const [productIds, productIdMap] = await this.buildProductIdMap(filter, unchainedAPI);
-        await filtersSettings.setCachedProductIds(filter._id, productIds, productIdMap);
+        if (!(await unchainedAPI.modules.filters.filterExists({ filterId: filter._id })))
+            return;
+        await filtersSettings.setCachedProductIds(filter._id, productIds, productIdMap, filterCacheGeneration(filter));
     },
 };

package/lib/directors/WorkerDirector.js

@@ -54,7 +54,7 @@ export const WorkerDirector = {
             logger.warn(`WorkerDirector: No registered adapter for type: ${type}`);
         }
         try {
-            const output = await adapter.doWork(input, unchainedAPI, workId);
+            const output = await adapter.doWork(input ?? {}, unchainedAPI, workId);
             return output;
         }
         catch (error) {

package/lib/services/createFilter.d.ts

@@ -0,0 +1,3 @@
+import type { Filter } from '@unchainedshop/core-filters';
+import type { Modules } from '../modules.ts';
+export declare function createFilterService(this: Modules, filter: Parameters<Modules['filters']['create']>[0]): Promise<Filter>;

package/lib/services/createFilter.js

@@ -0,0 +1,6 @@
+import { FilterDirector } from "../core-index.js";
+export async function createFilterService(filter) {
+    const newFilter = await this.filters.create(filter);
+    await FilterDirector.invalidateProductIdCache(newFilter, { modules: this });
+    return newFilter;
+}

package/lib/services/createFilterOption.d.ts

@@ -0,0 +1,5 @@
+import type { Filter } from '@unchainedshop/core-filters';
+import type { Modules } from '../modules.ts';
+export declare function createFilterOptionService(this: Modules, filterId: string, { value }: {
+    value: string;
+}): Promise<Filter | null>;

package/lib/services/createFilterOption.js

@@ -0,0 +1,8 @@
+import { FilterDirector } from "../core-index.js";
+export async function createFilterOptionService(filterId, { value }) {
+    const filter = await this.filters.createFilterOption(filterId, { value });
+    if (filter) {
+        await FilterDirector.invalidateProductIdCache(filter, { modules: this });
+    }
+    return filter;
+}

package/lib/services/index.d.ts

@@ -41,6 +41,10 @@ import { verifyQuotationService } from './verifyQuotation.ts';
 import { loadFiltersService } from './loadFilters.ts';
 import { loadFilterOptionsService } from './loadFilterOptions.ts';
 import { removeFilterService } from './removeFilter.ts';
+import { createFilterService } from './createFilter.ts';
+import { updateFilterService } from './updateFilter.ts';
+import { createFilterOptionService } from './createFilterOption.ts';
+import { removeFilterOptionService } from './removeFilterOption.ts';
 import { removeCartDiscountService } from './removeCartDiscount.ts';
 import { addMultipleCartProductsService } from './addMultipleCartProducts.ts';
 import { ercMetadataService } from './ercMetadata.ts';
@@ -131,6 +135,10 @@ export default function initServices(modules: Modules, customServices?: CustomSe
         loadFilters: Bound<typeof loadFiltersService>;
         loadFilterOptions: Bound<typeof loadFilterOptionsService>;
         removeFilter: Bound<typeof removeFilterService>;
+        createFilter: Bound<typeof createFilterService>;
+        updateFilter: Bound<typeof updateFilterService>;
+        createFilterOption: Bound<typeof createFilterOptionService>;
+        removeFilterOption: Bound<typeof removeFilterOptionService>;
     };
     warehousing: {
         ercMetadata: Bound<typeof ercMetadataService>;

package/lib/services/index.js

@@ -40,6 +40,10 @@ import { verifyQuotationService } from "./verifyQuotation.js";
 import { loadFiltersService } from "./loadFilters.js";
 import { loadFilterOptionsService } from "./loadFilterOptions.js";
 import { removeFilterService } from "./removeFilter.js";
+import { createFilterService } from "./createFilter.js";
+import { updateFilterService } from "./updateFilter.js";
+import { createFilterOptionService } from "./createFilterOption.js";
+import { removeFilterOptionService } from "./removeFilterOption.js";
 import { removeCartDiscountService } from "./removeCartDiscount.js";
 import { addMultipleCartProductsService } from "./addMultipleCartProducts.js";
 import { ercMetadataService } from "./ercMetadata.js";
@@ -142,6 +146,10 @@ export default function initServices(modules, customServices = {}) {
             loadFilters: loadFiltersService,
             loadFilterOptions: loadFilterOptionsService,
             removeFilter: removeFilterService,
+            createFilter: createFilterService,
+            updateFilter: updateFilterService,
+            createFilterOption: createFilterOptionService,
+            removeFilterOption: removeFilterOptionService,
         },
         warehousing: {
             ercMetadata: ercMetadataService,

package/lib/services/loadFilterOptions.js

@@ -1,10 +1,10 @@
-import { FilterType } from '@unchainedshop/core-filters';
+import { filterOptionValues } from '@unchainedshop/core-filters';
 import { FilterDirector, parseQueryArray } from "../directors/FilterDirector.js";
 export async function loadFilterOptionsService(filter, params) {
     const { forceLiveCollection, productIdSet, searchQuery } = params;
     const filterQueryParsed = parseQueryArray(searchQuery?.filterQuery);
     const values = filterQueryParsed[filter.key];
-    const allOptions = (filter.type === FilterType.SWITCH && ['true', 'false']) || filter.options || [];
+    const allOptions = filterOptionValues(filter);
     const mappedOptions = await Promise.all(allOptions.map(async (value) => {
         const filterOptionProductIds = await FilterDirector.filterProductIds(filter, {
             values: [value],

package/lib/services/removeFilterOption.d.ts

@@ -0,0 +1,6 @@
+import type { Filter } from '@unchainedshop/core-filters';
+import type { Modules } from '../modules.ts';
+export declare function removeFilterOptionService(this: Modules, { filterId, filterOptionValue }: {
+    filterId: string;
+    filterOptionValue: string;
+}): Promise<Filter | null>;

package/lib/services/removeFilterOption.js

@@ -0,0 +1,8 @@
+import { FilterDirector } from "../core-index.js";
+export async function removeFilterOptionService({ filterId, filterOptionValue }) {
+    const filter = await this.filters.removeFilterOption({ filterId, filterOptionValue });
+    if (filter) {
+        await FilterDirector.invalidateProductIdCache(filter, { modules: this });
+    }
+    return filter;
+}

package/lib/services/updateFilter.d.ts

@@ -0,0 +1,3 @@
+import type { Filter } from '@unchainedshop/core-filters';
+import type { Modules } from '../modules.ts';
+export declare function updateFilterService(this: Modules, filterId: string, doc: Partial<Filter>): Promise<Filter | null>;

package/lib/services/updateFilter.js

@@ -0,0 +1,8 @@
+import { FilterDirector } from "../core-index.js";
+export async function updateFilterService(filterId, doc) {
+    const updatedFilter = await this.filters.update(filterId, doc);
+    if (updatedFilter) {
+        await FilterDirector.invalidateProductIdCache(updatedFilter, { modules: this });
+    }
+    return updatedFilter;
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@unchainedshop/core",
   "description": "Core orchestration package for the Unchained Engine with business services and directors",
-  "version": "4.8.19",
+  "version": "4.8.20",
   "main": "lib/core-index.js",
   "types": "lib/core-index.d.ts",
   "type": "module",