@unchainedshop/core-countries 3.0.0-alpha2 → 3.0.0-alpha4

package/lib/countries-index.d.ts

@@ -1,2 +1,2 @@
-export { configureCountriesModule } from './module/configureCountriesModule.js';
+export * from './module/configureCountriesModule.js';
 //# sourceMappingURL=countries-index.d.ts.map

package/lib/countries-index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"countries-index.d.ts","sourceRoot":"","sources":["../src/countries-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC"}
+{"version":3,"file":"countries-index.d.ts","sourceRoot":"","sources":["../src/countries-index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC"}

package/lib/countries-index.js

@@ -1,2 +1,2 @@
-export { configureCountriesModule } from './module/configureCountriesModule.js';
+export * from './module/configureCountriesModule.js';
 //# sourceMappingURL=countries-index.js.map

package/lib/countries-index.js.map

@@ -1 +1 @@
-{"version":3,"file":"countries-index.js","sourceRoot":"","sources":["../src/countries-index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC"}
+{"version":3,"file":"countries-index.js","sourceRoot":"","sources":["../src/countries-index.ts"],"names":[],"mappings":"AAAA,cAAc,sCAAsC,CAAC"}

package/lib/db/CountriesCollection.d.ts

@@ -1,4 +1,4 @@
 import { mongodb } from '@unchainedshop/mongodb';
-import { Country } from '@unchainedshop/types/countries.js';
+import { Country } from '../countries-index.js';
 export declare const CountriesCollection: (db: mongodb.Db) => Promise<mongodb.Collection<Country>>;
 //# sourceMappingURL=CountriesCollection.d.ts.map

package/lib/db/CountriesCollection.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CountriesCollection.d.ts","sourceRoot":"","sources":["../../src/db/CountriesCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAE5D,eAAO,MAAM,mBAAmB,OAAc,OAAO,CAAC,EAAE,yCAuBvD,CAAC"}
+{"version":3,"file":"CountriesCollection.d.ts","sourceRoot":"","sources":["../../src/db/CountriesCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAC;AAEhD,eAAO,MAAM,mBAAmB,OAAc,OAAO,CAAC,EAAE,yCAuBvD,CAAC"}

package/lib/migrations/addMigrations.d.ts

@@ -1,3 +1,3 @@
-import { Migration, MigrationRepository } from '@unchainedshop/types/core.js';
-export default function addMigrations(repository: MigrationRepository<Migration>): void;
+import { MigrationRepository } from '@unchainedshop/mongodb';
+export default function addMigrations(repository: MigrationRepository): void;
 //# sourceMappingURL=addMigrations.d.ts.map

package/lib/migrations/addMigrations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"addMigrations.d.ts","sourceRoot":"","sources":["../../src/migrations/addMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAI9E,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAAU,EAAE,mBAAmB,CAAC,SAAS,CAAC,QAmC/E"}
+{"version":3,"file":"addMigrations.d.ts","sourceRoot":"","sources":["../../src/migrations/addMigrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAI7D,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAAU,EAAE,mBAAmB,QAmCpE"}

package/lib/migrations/addMigrations.js.map

@@ -1 +1 @@
-{"version":3,"file":"addMigrations.js","sourceRoot":"","sources":["../../src/migrations/addMigrations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGnE,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAA0C;IAC9E,UAAU,EAAE,QAAQ,CAAC;QACnB,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,2DAA2D;QACjE,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,UAAU,CAAmC,YAAY,CAAC,CAAC;YAClG,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAE3D,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1D,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAExD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CACtC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;gBAChB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC;gBACrC,OAAO,GAAG,CAAC;YACb,CAAC,EACD,EAAyB,CAC1B,CAAC;YAEF,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE,CAAC;gBACnC,MAAM,SAAS,CAAC,SAAS,CACvB,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAC1D;oBACE,IAAI,EAAE;wBACJ,mBAAmB,EACjB,WAAW,CAAE,OAAmD,CAAC,iBAAiB,CAAC;qBACtF;oBACD,MAAM,EAAE;wBACN,iBAAiB,EAAE,CAAC;qBACrB;iBACF,CACF,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"addMigrations.js","sourceRoot":"","sources":["../../src/migrations/addMigrations.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAGnE,MAAM,CAAC,OAAO,UAAU,aAAa,CAAC,UAA+B;IACnE,UAAU,EAAE,QAAQ,CAAC;QACnB,EAAE,EAAE,cAAc;QAClB,IAAI,EAAE,2DAA2D;QACjE,EAAE,EAAE,KAAK,IAAI,EAAE;YACb,MAAM,UAAU,GAAG,MAAM,UAAU,CAAC,EAAE,CAAC,UAAU,CAAmC,YAAY,CAAC,CAAC;YAClG,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;YAE3D,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAC1D,MAAM,YAAY,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC;YAExD,MAAM,WAAW,GAAG,aAAa,CAAC,MAAM,CACtC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE;gBAChB,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,OAAO,CAAC;gBACrC,OAAO,GAAG,CAAC;YACb,CAAC,EACD,EAAyB,CAC1B,CAAC;YAEF,KAAK,MAAM,OAAO,IAAI,YAAY,EAAE,CAAC;gBACnC,MAAM,SAAS,CAAC,SAAS,CACvB,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,iBAAiB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAC1D;oBACE,IAAI,EAAE;wBACJ,mBAAmB,EACjB,WAAW,CAAE,OAAmD,CAAC,iBAAiB,CAAC;qBACtF;oBACD,MAAM,EAAE;wBACN,iBAAiB,EAAE,CAAC;qBACrB;iBACF,CACF,CAAC;YACJ,CAAC;QACH,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}

package/lib/module/configureCountriesModule.d.ts

@@ -1,5 +1,36 @@
-import { ModuleInput } from '@unchainedshop/types/core.js';
-import { CountriesModule, CountryQuery } from '@unchainedshop/types/countries.js';
+import type { mongodb, TimestampFields, ModuleInput } from '@unchainedshop/mongodb';
+import { SortOption } from '@unchainedshop/utils';
+export type Country = {
+    _id?: string;
+    isoCode: string;
+    isActive?: boolean;
+    defaultCurrencyCode?: string;
+} & TimestampFields;
+export type CountryQuery = {
+    includeInactive?: boolean;
+    queryString?: string;
+};
+export type CountriesModule = {
+    findCountry: (params: {
+        countryId?: string;
+        isoCode?: string;
+    }) => Promise<Country>;
+    findCountries: (params: CountryQuery & {
+        limit?: number;
+        offset?: number;
+        sort?: Array<SortOption>;
+    }, options?: mongodb.FindOptions) => Promise<Array<Country>>;
+    count: (query: CountryQuery) => Promise<number>;
+    countryExists: (params: {
+        countryId: string;
+    }) => Promise<boolean>;
+    flagEmoji: (country: Country) => string;
+    isBase: (country: Country) => boolean;
+    name: (country: Country, language: string) => string;
+    update: (_id: string, doc: Country) => Promise<string>;
+    delete: (_id: string) => Promise<number>;
+    create: (doc: Country) => Promise<string | null>;
+};
 export declare const buildFindSelector: ({ includeInactive, queryString }: CountryQuery) => {
     isActive?: true;
     $text?: any;

package/lib/module/configureCountriesModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"configureCountriesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureCountriesModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAmB,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAW,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAW3F,eAAO,MAAM,iBAAiB,qCAAmD,YAAY;eAC9D,IAAI;YAAU,GAAG;cAAY,IAAI;CAI/D,CAAC;AAEF,eAAO,MAAM,wBAAwB,iCAGlC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,eAAe,CA6E9D,CAAC"}
+{"version":3,"file":"configureCountriesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureCountriesModule.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAGpF,OAAO,EAAiB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAKjE,MAAM,MAAM,OAAO,GAAG;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,mBAAmB,CAAC,EAAE,MAAM,CAAC;CAC9B,GAAG,eAAe,CAAC;AAEpB,MAAM,MAAM,YAAY,GAAG;IACzB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,MAAM,MAAM,eAAe,GAAG;IAC5B,WAAW,EAAE,CAAC,MAAM,EAAE;QAAE,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IACpF,aAAa,EAAE,CACb,MAAM,EAAE,YAAY,GAAG;QACrB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;KAC1B,EACD,OAAO,CAAC,EAAE,OAAO,CAAC,WAAW,KAC1B,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;IAC7B,KAAK,EAAE,CAAC,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,aAAa,EAAE,CAAC,MAAM,EAAE;QAAE,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAEnE,SAAS,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC;IACxC,MAAM,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC;IACtC,IAAI,EAAE,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,CAAC;IAErD,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACvD,MAAM,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;CAClD,CAAC;AAIF,eAAO,MAAM,iBAAiB,qCAAmD,YAAY;eAC9D,IAAI;YAAU,GAAG;cAAY,IAAI;CAI/D,CAAC;AAEF,eAAO,MAAM,wBAAwB,iCAGlC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,eAAe,CA2F9D,CAAC"}

package/lib/module/configureCountriesModule.js

@@ -1,9 +1,8 @@
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbFilterById, generateDbMutations, buildSortOptions } from '@unchainedshop/mongodb';
-import { SortDirection } from '@unchainedshop/types/api.js';
+import { generateDbFilterById, buildSortOptions, generateDbObjectId } from '@unchainedshop/mongodb';
+import { SortDirection } from '@unchainedshop/utils';
 import { systemLocale } from '@unchainedshop/utils';
 import { CountriesCollection } from '../db/CountriesCollection.js';
-import { CountriesSchema } from '../db/CountriesSchema.js';
 import addMigrations from '../migrations/addMigrations.js';
 const COUNTRY_EVENTS = ['COUNTRY_CREATE', 'COUNTRY_UPDATE', 'COUNTRY_REMOVE'];
 export const buildFindSelector = ({ includeInactive = false, queryString = '' }) => {
@@ -19,7 +18,6 @@ export const configureCountriesModule = async ({ db, migrationRepository, }) =>
     // Migration
     addMigrations(migrationRepository);
     const Countries = await CountriesCollection(db);
-    const mutations = generateDbMutations(Countries, CountriesSchema);
     return {
         count: async (query) => {
             const countryCount = await Countries.countDocuments(buildFindSelector(query));
@@ -54,11 +52,13 @@ export const configureCountriesModule = async ({ db, migrationRepository, }) =>
             return Array.from(country.isoCode.toUpperCase()).map(letterToLetterEmoji).join('');
         },
         isBase(country) {
-            return country.isoCode === systemLocale.country;
+            return country.isoCode === systemLocale.region;
         },
         create: async (doc) => {
             await Countries.deleteOne({ isoCode: doc.isoCode.toUpperCase(), deleted: { $ne: null } });
-            const countryId = await mutations.create({
+            const { insertedId: countryId } = await Countries.insertOne({
+                _id: generateDbObjectId(),
+                created: new Date(),
                 ...doc,
                 isoCode: doc.isoCode.toUpperCase(),
                 isActive: true,
@@ -66,17 +66,25 @@ export const configureCountriesModule = async ({ db, migrationRepository, }) =>
             await emit('COUNTRY_CREATE', { countryId });
             return countryId;
         },
-        update: async (_id, doc) => {
-            const countryId = await mutations.update(_id, { $set: doc });
+        update: async (countryId, doc) => {
+            await Countries.updateOne(generateDbFilterById(countryId), {
+                $set: {
+                    updated: new Date(),
+                    ...doc,
+                },
+            });
             await emit('COUNTRY_UPDATE', { countryId });
             return countryId;
         },
         delete: async (countryId) => {
-            const deletedCount = await mutations.delete(countryId);
+            const { modifiedCount: deletedCount } = await Countries.updateOne(generateDbFilterById(countryId), {
+                $set: {
+                    deleted: new Date(),
+                },
+            });
             await emit('COUNTRY_REMOVE', { countryId });
             return deletedCount;
         },
-        deletePermanently: mutations.deletePermanently,
     };
 };
 //# sourceMappingURL=configureCountriesModule.js.map

package/lib/module/configureCountriesModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"configureCountriesModule.js","sourceRoot":"","sources":["../../src/module/configureCountriesModule.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"configureCountriesModule.js","sourceRoot":"","sources":["../../src/module/configureCountriesModule.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-countries",
-  "version": "3.0.0-alpha2",
+  "version": "3.0.0-alpha4",
   "main": "lib/countries-index.js",
   "exports": {
     ".": "./lib/countries-index.js",
@@ -31,16 +31,14 @@
   },
   "homepage": "https://github.com/unchainedshop/unchained#readme",
   "dependencies": {
-    "@unchainedshop/events": "^3.0.0-alpha2",
-    "@unchainedshop/utils": "^3.0.0-alpha2",
-    "simpl-schema": "^3.4.6"
+    "@unchainedshop/events": "^3.0.0-alpha4",
+    "@unchainedshop/utils": "^3.0.0-alpha4"
   },
   "devDependencies": {
-    "@types/node": "^20.14.12",
-    "@unchainedshop/types": "^3.0.0-alpha2",
+    "@types/node": "^22.7.8",
     "cross-env": "^7.0.3",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.3",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3"
   }
 }

package/src/countries-index.ts

@@ -1 +1 @@
-export { configureCountriesModule } from './module/configureCountriesModule.js';
+export * from './module/configureCountriesModule.js';

package/src/db/CountriesCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { Country } from '@unchainedshop/types/countries.js';
+import { Country } from '../countries-index.js';
 
 export const CountriesCollection = async (db: mongodb.Db) => {
   const Countries = db.collection<Country>('countries');

package/src/migrations/addMigrations.ts

@@ -1,8 +1,8 @@
-import { Migration, MigrationRepository } from '@unchainedshop/types/core.js';
+import { MigrationRepository } from '@unchainedshop/mongodb';
 import { CountriesCollection } from '../db/CountriesCollection.js';
-import { Country } from '@unchainedshop/types/countries.js';
+import { Country } from '../countries-index.js';
 
-export default function addMigrations(repository: MigrationRepository<Migration>) {
+export default function addMigrations(repository: MigrationRepository) {
   repository?.register({
     id: 20240712123500,
     name: 'Convert all tags to lower case to make it easy for search',

package/src/module/buildFindSelector.test.ts

@@ -1,10 +1,16 @@
-import { buildFindSelector } from "./configureCountriesModule.js";
+import { buildFindSelector } from './configureCountriesModule.js';
 
 describe('buildFindSelector', () => {
-  it('should return correct filter object', async () => {
-    expect(buildFindSelector({includeInactive: true, queryString: 'hello world'})).toEqual({ deleted: null, '$text': { '$search': 'hello world' } })
-    expect(buildFindSelector({includeInactive: true})).toEqual({ deleted: null })
-    expect(buildFindSelector({queryString: 'hello world'})).toEqual({ deleted: null, '$text': { '$search': 'hello world' }, isActive: true })
+  it('should return correct filter object', () => {
+    expect(buildFindSelector({ includeInactive: true, queryString: 'hello world' })).toEqual({
+      deleted: null,
+      $text: { $search: 'hello world' },
+    });
+    expect(buildFindSelector({ includeInactive: true })).toEqual({ deleted: null });
+    expect(buildFindSelector({ queryString: 'hello world' })).toEqual({
+      deleted: null,
+      $text: { $search: 'hello world' },
+      isActive: true,
+    });
   });
-
 });

package/src/module/configureCountriesModule.ts

@@ -1,13 +1,44 @@
-import { ModuleInput, ModuleMutations } from '@unchainedshop/types/core.js';
-import { CountriesModule, Country, CountryQuery } from '@unchainedshop/types/countries.js';
+import type { mongodb, TimestampFields, ModuleInput } from '@unchainedshop/mongodb';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbFilterById, generateDbMutations, buildSortOptions } from '@unchainedshop/mongodb';
-import { SortDirection, SortOption } from '@unchainedshop/types/api.js';
+import { generateDbFilterById, buildSortOptions, generateDbObjectId } from '@unchainedshop/mongodb';
+import { SortDirection, SortOption } from '@unchainedshop/utils';
 import { systemLocale } from '@unchainedshop/utils';
 import { CountriesCollection } from '../db/CountriesCollection.js';
-import { CountriesSchema } from '../db/CountriesSchema.js';
 import addMigrations from '../migrations/addMigrations.js';
 
+export type Country = {
+  _id?: string;
+  isoCode: string;
+  isActive?: boolean;
+  defaultCurrencyCode?: string;
+} & TimestampFields;
+
+export type CountryQuery = {
+  includeInactive?: boolean;
+  queryString?: string;
+};
+export type CountriesModule = {
+  findCountry: (params: { countryId?: string; isoCode?: string }) => Promise<Country>;
+  findCountries: (
+    params: CountryQuery & {
+      limit?: number;
+      offset?: number;
+      sort?: Array<SortOption>;
+    },
+    options?: mongodb.FindOptions,
+  ) => Promise<Array<Country>>;
+  count: (query: CountryQuery) => Promise<number>;
+  countryExists: (params: { countryId: string }) => Promise<boolean>;
+
+  flagEmoji: (country: Country) => string;
+  isBase: (country: Country) => boolean;
+  name: (country: Country, language: string) => string;
+
+  update: (_id: string, doc: Country) => Promise<string>;
+  delete: (_id: string) => Promise<number>;
+  create: (doc: Country) => Promise<string | null>;
+};
+
 const COUNTRY_EVENTS: string[] = ['COUNTRY_CREATE', 'COUNTRY_UPDATE', 'COUNTRY_REMOVE'];
 
 export const buildFindSelector = ({ includeInactive = false, queryString = '' }: CountryQuery) => {
@@ -28,8 +59,6 @@ export const configureCountriesModule = async ({
 
   const Countries = await CountriesCollection(db);
 
-  const mutations = generateDbMutations<Country>(Countries, CountriesSchema) as ModuleMutations<Country>;
-
   return {
     count: async (query) => {
       const countryCount = await Countries.countDocuments(buildFindSelector(query));
@@ -64,6 +93,7 @@ export const configureCountriesModule = async ({
     name(country, language) {
       return new Intl.DisplayNames([language], { type: 'region', fallback: 'code' }).of(country.isoCode);
     },
+
     flagEmoji(country) {
       const letterToLetterEmoji = (letter: string): string => {
         return String.fromCodePoint(letter.toLowerCase().charCodeAt(0) + 127365);
@@ -72,11 +102,14 @@ export const configureCountriesModule = async ({
     },
 
     isBase(country) {
-      return country.isoCode === systemLocale.country;
+      return country.isoCode === systemLocale.region;
     },
-    create: async (doc: Country) => {
+
+    create: async (doc) => {
       await Countries.deleteOne({ isoCode: doc.isoCode.toUpperCase(), deleted: { $ne: null } });
-      const countryId = await mutations.create({
+      const { insertedId: countryId } = await Countries.insertOne({
+        _id: generateDbObjectId(),
+        created: new Date(),
         ...doc,
         isoCode: doc.isoCode.toUpperCase(),
         isActive: true,
@@ -84,17 +117,29 @@ export const configureCountriesModule = async ({
       await emit('COUNTRY_CREATE', { countryId });
       return countryId;
     },
-    update: async (_id: string, doc: Partial<Country>) => {
-      const countryId = await mutations.update(_id, { $set: doc });
+
+    update: async (countryId, doc) => {
+      await Countries.updateOne(generateDbFilterById(countryId), {
+        $set: {
+          updated: new Date(),
+          ...doc,
+        },
+      });
       await emit('COUNTRY_UPDATE', { countryId });
       return countryId;
     },
+
     delete: async (countryId) => {
-      const deletedCount = await mutations.delete(countryId);
+      const { modifiedCount: deletedCount } = await Countries.updateOne(
+        generateDbFilterById(countryId),
+        {
+          $set: {
+            deleted: new Date(),
+          },
+        },
+      );
       await emit('COUNTRY_REMOVE', { countryId });
       return deletedCount;
     },
-
-    deletePermanently: mutations.deletePermanently,
   };
 };

package/lib/db/CountriesSchema.d.ts

@@ -1,3 +0,0 @@
-import SimpleSchema from 'simpl-schema';
-export declare const CountriesSchema: SimpleSchema;
-//# sourceMappingURL=CountriesSchema.d.ts.map

package/lib/db/CountriesSchema.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"CountriesSchema.d.ts","sourceRoot":"","sources":["../../src/db/CountriesSchema.ts"],"names":[],"mappings":"AACA,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,eAAO,MAAM,eAAe,cAQ3B,CAAC"}

package/lib/db/CountriesSchema.js

@@ -1,9 +0,0 @@
-import { Schemas } from '@unchainedshop/utils';
-import SimpleSchema from 'simpl-schema';
-export const CountriesSchema = new SimpleSchema({
-    isoCode: { type: String, required: true },
-    isActive: Boolean,
-    defaultCurrencyCode: String,
-    ...Schemas.timestampFields,
-}, { requiredByDefault: false });
-//# sourceMappingURL=CountriesSchema.js.map

package/lib/db/CountriesSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"CountriesSchema.js","sourceRoot":"","sources":["../../src/db/CountriesSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,YAAY,MAAM,cAAc,CAAC;AAExC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,YAAY,CAC7C;IACE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;IACzC,QAAQ,EAAE,OAAO;IACjB,mBAAmB,EAAE,MAAM;IAC3B,GAAG,OAAO,CAAC,eAAe;CAC3B,EACD,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAC"}

package/src/db/CountriesSchema.ts

@@ -1,12 +0,0 @@
-import { Schemas } from '@unchainedshop/utils';
-import SimpleSchema from 'simpl-schema';
-
-export const CountriesSchema = new SimpleSchema(
-  {
-    isoCode: { type: String, required: true },
-    isActive: Boolean,
-    defaultCurrencyCode: String,
-    ...Schemas.timestampFields,
-  },
-  { requiredByDefault: false },
-);