feat(validation): Callout validation (Part 2)

beabee-client/deno.json

@@ -13,10 +13,11 @@
     "test:deno": "deno test --allow-net --allow-read --allow-write --allow-env --allow-ffi ./test/deno",
     "test:node": "npm run test:node",
     "test:web": "npm run test:web",
-    "lint": "deno lint",
+    "lint": "deno lint mod.ts src",
     "format": "deno fmt",
-    "check": "deno task check:format",
+    "check": "deno task check:types && deno task check:format",
     "check:format": "deno task format --check",
+    "check:types": "deno check mod.ts",
     "cache": "deno task cache:deno && deno task cache:node",
     "cache:deno": "deno cache --reload mod.ts",
     "cache:node": "npm install",
@@ -26,6 +27,6 @@
     "std/": "https://deno.land/[email protected]/",
     "@beabee/beabee-common": "../beabee-common/mod.ts",
     "@beabee/client": "./mod.ts",
-    "date-fns": "npm:date-fns@3.2.0"
+    "date-fns": "npm:date-fns@3.3.1"
   }
 }

beabee-client/src/deps.ts

@@ -16,4 +16,5 @@ export type {
   PaymentStatus,
   RoleType,
   RuleGroup,
+  StripeFeeCountry,
 } from "@beabee/beabee-common";

beabee-client/src/types/content-join.ts

@@ -1,5 +1,8 @@
-import type { ContributionPeriod, PaymentMethod } from "../deps.ts";
-import type { StripeFeeCountry } from "./index.ts";
+import type {
+  ContributionPeriod,
+  PaymentMethod,
+  StripeFeeCountry,
+} from "../deps.ts";
 
 export interface ContentJoin {
   title: string;

beabee-client/src/types/index.ts

@@ -74,7 +74,6 @@ export * from "./set-contribution-data.ts";
 export * from "./start-contribution-data.ts";
 export * from "./stripe-bacs-payment-source.ts";
 export * from "./stripe-card-payment-source.ts";
-export * from "./stripe-fee-country.ts";
 export * from "./stripe-sepa-payment-source.ts";
 export * from "./update-callout-data.ts";
 export * from "./update-callout-response-comment-data.ts";

deno.jsonc

@@ -24,7 +24,7 @@
     "sqlite3": "https://deno.land/x/[email protected]/mod.ts",
     "@beabee/beabee-common": "./beabee-common/mod.ts",
     "@beabee/beabee-client": "../beabee-client/mod.ts",
-    "date-fns": "npm:date-fns@3.2.0"
+    "date-fns": "npm:date-fns@3.3.1"
   },
   "scopes": {
     "https://raw.githubusercontent.com/Zhomart/dex/": {

telegram-bot-deno.code-workspace

@@ -2,7 +2,7 @@
   "folders": [
     {
       "path": ".",
-      "name": "root"
+      "name": "_root"
     },
     {
       "path": "./telegram-bot",
@@ -11,6 +11,10 @@
     {
       "path": "./beabee-client",
       "name": "beabee-client"
+    },
+    {
+      "path": "./beabee-common",
+      "name": "beabee-common"
     }
   ],
   "settings": {
@@ -23,6 +27,8 @@
       "denodb",
       "selectboxes"
     ],
+    "prettier.enable": false,
+    "eslint.enable": false,
     "deno.enable": true,
     "deno.lint": true,
     "deno.unstable": true,
@@ -35,13 +41,12 @@
       "./beabee-client/jest.config.web.js",
       "./beabee-client/jest.config.node.js",
       "./beabee-common/dist",
-      "./beabee-common/scripts",
       "./beabee-common/test/node",
       "./beabee-common/jest.config.js"
     ],
     "editor.defaultFormatter": "denoland.vscode-deno",
     "editor.formatOnSave": true,
-    "typescript.format.enable": true,
+    "typescript.format.enable": true
   },
   "launch": {
     "version": "0.2.0",

telegram-bot/README.md

@@ -53,7 +53,7 @@ To update the locale data in the repository you run the following
 
 ```
 deno task i18n
-git add -A locales/ && git commit locales/ -m 'chore: updated locales'
+git add -A locales/ && git commit locales/ -m 'chore(i18n): Updated locales'
 ```
 
 #### Using the localisation strings
@@ -63,7 +63,7 @@ import { container } from "../deps.ts";
 import { I18nService } from "./services/index.ts";
 
 const i18n = container.resolve(I18nService); // Get the Singleton instance of I18nService
-const translated = i18n.t("info.messages.placeholder", { placeholder: "Hello World!" }
+const translated = i18n.t("bot.info.messages.placeholder", { placeholder: "Hello World!" }
 ```
 
 ### Testing

telegram-bot/core/command.ts

@@ -40,9 +40,9 @@ export abstract class Command implements BotCommand {
    */
   changeLocale(lang: string) {
     // FIXME: This is not working on runtime
-    // this.command = this.i18n.t(`commands.${this.key}.command`, {}, lang);
+    // this.command = this.i18n.t(`bot.commands.${this.key}.command`, {}, lang);
     this.description = this.i18n.t(
-      `commands.${this.key}.description`,
+      `bot.commands.${this.key}.description`,
       {},
       lang,
     );

telegram-bot/deno.json

@@ -14,7 +14,7 @@
     "std/": "https://deno.land/[email protected]/",
     "typeorm": "npm:[email protected]",
     "sqlite3": "https://deno.land/x/[email protected]/mod.ts",
-    "date-fns": "npm:date-fns@3.2.0",
+    "date-fns": "npm:date-fns@3.3.1",
     "@beabee/beabee-common": "../beabee-common/mod.ts",
     "@beabee/beabee-client": "../beabee-client/mod.ts"
   },
@@ -31,8 +31,9 @@
     "test": "deno test --allow-net --allow-read --allow-write --allow-env --allow-ffi --unstable-ffi",
     "lint": "deno lint",
     "format": "deno fmt",
-    "check": "deno task check:format",
+    "check": "deno task check:types && deno task check:format",
     "check:format": "deno task format --check",
+    "check:types": "deno check main.ts",
     "cache": "deno cache --reload main.ts",
     "docker:build": "docker build -f ../Dockerfile -t beabee/telegram-bot:latest ..",
     "docker:start": "docker run -it --init -p 3003:3003 beabee/telegram-bot",