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

package/lib/db/LanguagesCollection.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"LanguagesCollection.d.ts","sourceRoot":"","sources":["../../src/db/LanguagesCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,mCAAmC,CAAC;AAE7D,eAAO,MAAM,mBAAmB,OAAc,OAAO,CAAC,EAAE,0CAuBvD,CAAC"}
+{"version":3,"file":"LanguagesCollection.d.ts","sourceRoot":"","sources":["../../src/db/LanguagesCollection.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAkB,MAAM,wBAAwB,CAAC;AACjE,OAAO,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAEzD,eAAO,MAAM,mBAAmB,OAAc,OAAO,CAAC,EAAE,0CAuBvD,CAAC"}

package/lib/languages-index.d.ts

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

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

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

package/lib/languages-index.js

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

package/lib/languages-index.js.map

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

package/lib/module/configureLanguagesModule.d.ts

@@ -1,9 +1,38 @@
-import { ModuleInput } from '@unchainedshop/types/core.js';
-import { LanguagesModule, LanguageQuery } from '@unchainedshop/types/languages.js';
+import { ModuleInput } from '@unchainedshop/mongodb';
+import { TimestampFields, mongodb } from '@unchainedshop/mongodb';
+import { SortOption } from '@unchainedshop/utils';
+export type Language = {
+    _id?: string;
+    isoCode: string;
+    isActive?: boolean;
+} & TimestampFields;
+export type LanguageQuery = {
+    includeInactive?: boolean;
+    queryString?: string;
+};
 export declare const buildFindSelector: ({ includeInactive, queryString }: LanguageQuery) => {
     isActive?: true;
     deleted?: Date;
     $text?: any;
 };
-export declare const configureLanguagesModule: ({ db, }: ModuleInput<Record<string, never>>) => Promise<LanguagesModule>;
+export declare const configureLanguagesModule: ({ db }: ModuleInput<Record<string, never>>) => Promise<{
+    findLanguage: ({ languageId, isoCode, }: {
+        languageId?: string;
+        isoCode?: string;
+    }) => Promise<Language>;
+    findLanguages: ({ limit, offset, sort, ...query }: LanguageQuery & {
+        limit?: number;
+        offset?: number;
+        sort?: Array<SortOption>;
+    }, options?: mongodb.FindOptions) => Promise<Array<Language>>;
+    count: (query: LanguageQuery) => Promise<number>;
+    languageExists: ({ languageId }: {
+        languageId: string;
+    }) => Promise<boolean>;
+    isBase(language: Language): boolean;
+    create: (doc: Language) => Promise<string>;
+    update: (languageId: any, doc: any) => Promise<any>;
+    delete: (languageId: any) => Promise<number>;
+}>;
+export type LanguagesModule = Awaited<ReturnType<typeof configureLanguagesModule>>;
 //# sourceMappingURL=configureLanguagesModule.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"configureLanguagesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureLanguagesModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAmB,MAAM,8BAA8B,CAAC;AAC5E,OAAO,EAAE,eAAe,EAAY,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAU7F,eAAO,MAAM,iBAAiB,qCAA8C,aAAa;eAC1D,IAAI;cAAY,IAAI;YAAU,GAAG;CAM/D,CAAC;AAEF,eAAO,MAAM,wBAAwB,YAElC,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,KAAG,OAAO,CAAC,eAAe,CAqE9D,CAAC"}
+{"version":3,"file":"configureLanguagesModule.d.ts","sourceRoot":"","sources":["../../src/module/configureLanguagesModule.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAGL,eAAe,EACf,OAAO,EAER,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAiB,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIjE,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB,GAAG,eAAe,CAAC;AAEpB,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAIF,eAAO,MAAM,iBAAiB,qCAA8C,aAAa;eAC1D,IAAI;cAAY,IAAI;YAAU,GAAG;CAM/D,CAAC;AAEF,eAAO,MAAM,wBAAwB,WAAkB,WAAW,CAAC,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;6CASlF;QACD,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,OAAO,CAAC,EAAE,MAAM,CAAC;KAClB,KAAG,OAAO,CAAC,QAAQ,CAAC;uDAUhB,aAAa,GAAG;QACjB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,IAAI,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,CAAC;KAC1B,YACS,OAAO,CAAC,WAAW,KAC5B,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;mBAUN,aAAa,KAAG,OAAO,CAAC,MAAM,CAAC;qCAKb;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,KAAG,OAAO,CAAC,OAAO,CAAC;qBAU/D,QAAQ,GAAG,OAAO;kBAIf,QAAQ;;;EAsC/B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,wBAAwB,CAAC,CAAC,CAAC"}

package/lib/module/configureLanguagesModule.js

@@ -1,9 +1,8 @@
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbMutations, generateDbFilterById, 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 { LanguagesCollection } from '../db/LanguagesCollection.js';
-import { LanguagesSchema } from '../db/LanguagesSchema.js';
 const LANGUAGE_EVENTS = ['LANGUAGE_CREATE', 'LANGUAGE_UPDATE', 'LANGUAGE_REMOVE'];
 export const buildFindSelector = ({ includeInactive = false, queryString }) => {
     const selector = { deleted: null };
@@ -14,12 +13,11 @@ export const buildFindSelector = ({ includeInactive = false, queryString }) => {
     }
     return selector;
 };
-export const configureLanguagesModule = async ({ db, }) => {
+export const configureLanguagesModule = async ({ db }) => {
     registerEvents(LANGUAGE_EVENTS);
     const Languages = await LanguagesCollection(db);
-    const mutations = generateDbMutations(Languages, LanguagesSchema);
     return {
-        findLanguage: async ({ languageId, isoCode }) => {
+        findLanguage: async ({ languageId, isoCode, }) => {
             return Languages.findOne(languageId ? generateDbFilterById(languageId) : { isoCode }, {});
         },
         findLanguages: async ({ limit, offset, sort, ...query }, options) => {
@@ -46,7 +44,9 @@ export const configureLanguagesModule = async ({ db, }) => {
         },
         create: async (doc) => {
             await Languages.deleteOne({ isoCode: doc.isoCode.toLowerCase(), deleted: { $ne: null } });
-            const languageId = await mutations.create({
+            const { insertedId: languageId } = await Languages.insertOne({
+                _id: generateDbObjectId(),
+                created: new Date(),
                 ...doc,
                 isoCode: doc.isoCode.toLowerCase(),
                 isActive: true,
@@ -55,19 +55,25 @@ export const configureLanguagesModule = async ({ db, }) => {
             return languageId;
         },
         update: async (languageId, doc) => {
-            await mutations.update(languageId, {
-                ...doc,
-                isoCode: doc.isoCode.toLowerCase(),
+            await Languages.updateOne(generateDbFilterById(languageId), {
+                $set: {
+                    updated: new Date(),
+                    ...doc,
+                    isoCode: doc.isoCode.toLowerCase(),
+                },
             });
             await emit('LANGUAGE_UPDATE', { languageId });
             return languageId;
         },
         delete: async (languageId) => {
-            const deletedCount = await mutations.delete(languageId);
+            const { modifiedCount: deletedCount } = await Languages.updateOne(generateDbFilterById(languageId), {
+                $set: {
+                    deleted: new Date(),
+                },
+            });
             await emit('LANGUAGE_REMOVE', { languageId });
             return deletedCount;
         },
-        deletePermanently: mutations.deletePermanently,
     };
 };
 //# sourceMappingURL=configureLanguagesModule.js.map

package/lib/module/configureLanguagesModule.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/core-languages",
-  "version": "3.0.0-alpha2",
+  "version": "3.0.0-alpha4",
   "main": "lib/languages-index.js",
   "exports": {
     ".": "./lib/languages-index.js",
@@ -31,15 +31,13 @@
   },
   "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",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.3",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.6.3"
   }
 }

package/src/db/LanguagesCollection.ts

@@ -1,5 +1,5 @@
 import { mongodb, buildDbIndexes } from '@unchainedshop/mongodb';
-import { Language } from '@unchainedshop/types/languages.js';
+import { Language } from '@unchainedshop/core-languages';
 
 export const LanguagesCollection = async (db: mongodb.Db) => {
   const Languages = db.collection<Language>('languages');

package/src/languages-index.ts

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

package/src/module/configureLanguagesModule.ts

@@ -1,11 +1,26 @@
-import { ModuleInput, ModuleMutations } from '@unchainedshop/types/core.js';
-import { LanguagesModule, Language, LanguageQuery } from '@unchainedshop/types/languages.js';
+import { ModuleInput } from '@unchainedshop/mongodb';
 import { emit, registerEvents } from '@unchainedshop/events';
-import { generateDbMutations, generateDbFilterById, buildSortOptions } from '@unchainedshop/mongodb';
-import { SortDirection, SortOption } from '@unchainedshop/types/api.js';
+import {
+  generateDbFilterById,
+  buildSortOptions,
+  TimestampFields,
+  mongodb,
+  generateDbObjectId,
+} from '@unchainedshop/mongodb';
+import { SortDirection, SortOption } from '@unchainedshop/utils';
 import { systemLocale } from '@unchainedshop/utils';
 import { LanguagesCollection } from '../db/LanguagesCollection.js';
-import { LanguagesSchema } from '../db/LanguagesSchema.js';
+
+export type Language = {
+  _id?: string;
+  isoCode: string;
+  isActive?: boolean;
+} & TimestampFields;
+
+export type LanguageQuery = {
+  includeInactive?: boolean;
+  queryString?: string;
+};
 
 const LANGUAGE_EVENTS: string[] = ['LANGUAGE_CREATE', 'LANGUAGE_UPDATE', 'LANGUAGE_REMOVE'];
 
@@ -18,24 +33,35 @@ export const buildFindSelector = ({ includeInactive = false, queryString }: Lang
   return selector;
 };
 
-export const configureLanguagesModule = async ({
-  db,
-}: ModuleInput<Record<string, never>>): Promise<LanguagesModule> => {
+export const configureLanguagesModule = async ({ db }: ModuleInput<Record<string, never>>) => {
   registerEvents(LANGUAGE_EVENTS);
 
   const Languages = await LanguagesCollection(db);
 
-  const mutations = generateDbMutations<Language>(
-    Languages,
-    LanguagesSchema,
-  ) as ModuleMutations<Language>;
-
   return {
-    findLanguage: async ({ languageId, isoCode }) => {
+    findLanguage: async ({
+      languageId,
+      isoCode,
+    }: {
+      languageId?: string;
+      isoCode?: string;
+    }): Promise<Language> => {
       return Languages.findOne(languageId ? generateDbFilterById(languageId) : { isoCode }, {});
     },
 
-    findLanguages: async ({ limit, offset, sort, ...query }, options) => {
+    findLanguages: async (
+      {
+        limit,
+        offset,
+        sort,
+        ...query
+      }: LanguageQuery & {
+        limit?: number;
+        offset?: number;
+        sort?: Array<SortOption>;
+      },
+      options?: mongodb.FindOptions,
+    ): Promise<Array<Language>> => {
       const defaultSort = [{ key: 'created', value: SortDirection.ASC }] as SortOption[];
       return Languages.find(buildFindSelector(query), {
         skip: offset,
@@ -45,12 +71,12 @@ export const configureLanguagesModule = async ({
       }).toArray();
     },
 
-    count: async (query) => {
+    count: async (query: LanguageQuery): Promise<number> => {
       const count = await Languages.countDocuments(buildFindSelector(query));
       return count;
     },
 
-    languageExists: async ({ languageId }) => {
+    languageExists: async ({ languageId }: { languageId: string }): Promise<boolean> => {
       const languageCount = await Languages.countDocuments(
         generateDbFilterById(languageId, { deleted: null }),
         {
@@ -60,13 +86,15 @@ export const configureLanguagesModule = async ({
       return !!languageCount;
     },
 
-    isBase(language) {
+    isBase(language: Language): boolean {
       return language.isoCode === systemLocale.language;
     },
 
     create: async (doc: Language) => {
       await Languages.deleteOne({ isoCode: doc.isoCode.toLowerCase(), deleted: { $ne: null } });
-      const languageId = await mutations.create({
+      const { insertedId: languageId } = await Languages.insertOne({
+        _id: generateDbObjectId(),
+        created: new Date(),
         ...doc,
         isoCode: doc.isoCode.toLowerCase(),
         isActive: true,
@@ -74,19 +102,32 @@ export const configureLanguagesModule = async ({
       await emit('LANGUAGE_CREATE', { languageId });
       return languageId;
     },
+
     update: async (languageId, doc) => {
-      await mutations.update(languageId, {
-        ...doc,
-        isoCode: doc.isoCode.toLowerCase(),
+      await Languages.updateOne(generateDbFilterById(languageId), {
+        $set: {
+          updated: new Date(),
+          ...doc,
+          isoCode: doc.isoCode.toLowerCase(),
+        },
       });
       await emit('LANGUAGE_UPDATE', { languageId });
       return languageId;
     },
+
     delete: async (languageId) => {
-      const deletedCount = await mutations.delete(languageId);
+      const { modifiedCount: deletedCount } = await Languages.updateOne(
+        generateDbFilterById(languageId),
+        {
+          $set: {
+            deleted: new Date(),
+          },
+        },
+      );
       await emit('LANGUAGE_REMOVE', { languageId });
       return deletedCount;
     },
-    deletePermanently: mutations.deletePermanently,
   };
 };
+
+export type LanguagesModule = Awaited<ReturnType<typeof configureLanguagesModule>>;

package/src/module/languages-index.test.ts

@@ -1,20 +1,26 @@
-import { buildFindSelector } from "./configureLanguagesModule.js";
+import { buildFindSelector } from './configureLanguagesModule.js';
 
-  describe('buildFindSelector', () => {
-    it('Return correct filter object when passed no argument', async () => {
-      expect(buildFindSelector({})).toEqual({ deleted: null, isActive: true })
-    });
+describe('buildFindSelector', () => {
+  it('Return correct filter object when passed no argument', () => {
+    expect(buildFindSelector({})).toEqual({ deleted: null, isActive: true });
+  });
 
-    it('Return correct filter object includeInactive is set to true', async () => {
-      expect(buildFindSelector({includeInactive: true})).toEqual({ deleted: null })
-    });
+  it('Return correct filter object includeInactive is set to true', () => {
+    expect(buildFindSelector({ includeInactive: true })).toEqual({ deleted: null });
+  });
 
-    it('Return correct filter object when passed  includeInactive, queryString', async () => {
-      expect(buildFindSelector({ includeInactive: true,queryString: "hello world"})).toEqual({ deleted: null, '$text': { '$search': 'hello world' } })
+  it('Return correct filter object when passed  includeInactive, queryString', () => {
+    expect(buildFindSelector({ includeInactive: true, queryString: 'hello world' })).toEqual({
+      deleted: null,
+      $text: { $search: 'hello world' },
     });
+  });
 
-    it('Return correct filter object when passed queryString', async () => {
-      expect(buildFindSelector({ queryString: "hello world"})).toEqual({ deleted: null, isActive: true, '$text': { '$search': 'hello world' } })
+  it('Return correct filter object when passed queryString', () => {
+    expect(buildFindSelector({ queryString: 'hello world' })).toEqual({
+      deleted: null,
+      isActive: true,
+      $text: { $search: 'hello world' },
     });
-
-  })
+  });
+});

package/tests/languages-index.test.ts

@@ -1,23 +1,28 @@
-import { buildFindSelector } from "../src/module/configureLanguagesModule.js";
+import { buildFindSelector } from '../src/module/configureLanguagesModule.js';
 
 describe('Languages', () => {
   describe('buildFindSelector', () => {
-    it('Return correct filter object when passed no argument', async () => {
-      expect(buildFindSelector({})).toEqual({ deleted: null, isActive: true })
+    it('Return correct filter object when passed no argument', () => {
+      expect(buildFindSelector({})).toEqual({ deleted: null, isActive: true });
     });
 
-    it('Return correct filter object includeInactive is set to true', async () => {
-      expect(buildFindSelector({includeInactive: true})).toEqual({ deleted: null })
+    it('Return correct filter object includeInactive is set to true', () => {
+      expect(buildFindSelector({ includeInactive: true })).toEqual({ deleted: null });
     });
 
-    it('Return correct filter object when passed  includeInactive, queryString', async () => {
-      expect(buildFindSelector({ includeInactive: true,queryString: "hello world"})).toEqual({ deleted: null, '$text': { '$search': 'hello world' } })
+    it('Return correct filter object when passed  includeInactive, queryString', () => {
+      expect(buildFindSelector({ includeInactive: true, queryString: 'hello world' })).toEqual({
+        deleted: null,
+        $text: { $search: 'hello world' },
+      });
     });
 
-    it('Return correct filter object when passed queryString', async () => {
-      expect(buildFindSelector({ queryString: "hello world"})).toEqual({ deleted: null, isActive: true, '$text': { '$search': 'hello world' } })
+    it('Return correct filter object when passed queryString', () => {
+      expect(buildFindSelector({ queryString: 'hello world' })).toEqual({
+        deleted: null,
+        isActive: true,
+        $text: { $search: 'hello world' },
+      });
     });
-
-  })
-  
+  });
 });

package/lib/db/LanguagesSchema.d.ts

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

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

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

package/lib/db/LanguagesSchema.js

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

package/lib/db/LanguagesSchema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"LanguagesSchema.js","sourceRoot":"","sources":["../../src/db/LanguagesSchema.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,GAAG,OAAO,CAAC,eAAe;CAC3B,EACD,EAAE,iBAAiB,EAAE,KAAK,EAAE,CAC7B,CAAC"}

package/src/db/LanguagesSchema.ts

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