create-gramstax 0.8.1 → 0.8.3

package/dist/src/templates/package.json

@@ -35,7 +35,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "gramstax": "^0.8.0",
+    "gramstax": "^0.8.2",
     "dayjs": "^1.11.13"
   },
   "peerDependencies": {

package/dist/src/templates/src/core/bot.ts

@@ -13,10 +13,10 @@ export class BotCore extends Gramstax {
   }
 
   async hookErrorPage(ctx: CtxCore, listenerName: string, error: any, isEdit: boolean) {
-    await new GeneralStatusPage(ctx).toError(`${listenerName}:hookErrorPage`, error, isEdit)
+    await new GeneralStatusPage(ctx).error(`${listenerName}:hookErrorPage`, error, isEdit)
   }
 
   async hookErrorInputNotFoundPage(ctx: CtxCore) {
-    await new GeneralStatusPage(ctx).toErrorInputNotFound()
+    await new GeneralStatusPage(ctx).errorInputNotFound()
   }
 }

package/dist/src/templates/src/guards/user.ts

@@ -4,14 +4,14 @@ import {UserNameNotFoundPage} from "~/pages/username-notfound"
 
 export class UserGuard extends GuardBase {
   async _catch(err: any, func: any, isEdit: boolean) {
-    await new GeneralStatusPage(this).toError(func, err, isEdit)
+    await new GeneralStatusPage(this).error(func, err, isEdit)
     return null
   }
 
   async ensureUsername(edit: boolean) {
     try {
       if (!this.userName || this.userName.length == 0) {
-        await new UserNameNotFoundPage(this).transition(edit)
+        await new UserNameNotFoundPage(this).showEntryPoint(edit)
         return null
       }
       return {status: true}

package/dist/src/templates/src/pages/general-status.ts

@@ -2,6 +2,33 @@ import {LogHe} from "~/helpers/log"
 import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
+class Helper {
+  static kb(ctx: GeneralStatusPage) {
+    return ctx.inlineKeyboardT([StartPage])
+  }
+}
+
+class Alert {
+  static async error(ctx: GeneralStatusPage, funcName: string, error: any, edit = true) {
+    LogHe.errorMake(error, ctx.constructorName, funcName)
+
+    await ctx.clearSession()
+    const kb = Helper.kb(ctx)
+    const da = {isNotFound: false}
+    if (edit) {
+      await ctx.edit(kb, da)
+    } else {
+      await ctx.reply(kb, da)
+    }
+  }
+
+  static async errorInputNotFound(ctx: GeneralStatusPage) {
+    const kb = Helper.kb(ctx)
+    const da = {isNotFound: true}
+    await ctx.reply(kb, da)
+  }
+}
+
 export class GeneralStatusPage extends PageBase {
   constructorName?: string
 
@@ -10,23 +37,12 @@ export class GeneralStatusPage extends PageBase {
     this.constructorName = p?.constructor?.name
   }
 
-  kb() {
-    return this.inlineKeyboardT([StartPage])
-  }
-
-  async toError(funcName: string, error: any, edit = true) {
-    LogHe.errorMake(error, this.constructorName, funcName)
-
-    await this.clearSession()
-    const kb = this.kb()
-    const da = {isNotFound: false}
-    if (edit) await this.edit(kb, da)
-    else await this.reply(kb, da)
+  async error(...args: Parameters<typeof Alert.error> extends [any, ...infer R] ? R : []) {
+    await Alert.error(this, ...args)
   }
 
-  async toErrorInputNotFound() {
-    const kb = this.kb()
-    await this.reply(kb, {isNotFound: true})
+  async errorInputNotFound() {
+    await Alert.errorInputNotFound(this)
   }
 
   static template = `

package/dist/src/templates/src/pages/help.ts

@@ -1,19 +1,24 @@
 import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
-export class HelpPage extends PageBase {
-  async show(edit = true) {
-    const kb = this.inlineKeyboardT([StartPage])
-    if (edit) await this.edit(kb)
-    else await this.reply(kb)
+class Main {
+  static async showEntryPoint(ctx: HelpPage, edit = true) {
+    const kb = ctx.inlineKeyboardT([StartPage])
+    if (edit) {
+      await ctx.edit(kb)
+    } else {
+      await ctx.reply(kb)
+    }
   }
+}
 
+export class HelpPage extends PageBase {
   async handleCallbackData() {
-    await this.show(true)
+    await Main.showEntryPoint(this, true)
   }
 
   async handleCommandText() {
-    await this.show(false)
+    await Main.showEntryPoint(this, false)
   }
 
   static template = `

package/dist/src/templates/src/pages/random-number.ts

@@ -1,20 +1,29 @@
 import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
+class Main {
+  static async showEntryPoint(ctx: RandomNumberPage, edit = true) {
+    const kb = ctx.inlineKeyboardT([this, StartPage])
+    const da = {result: Math.random() * 10 ** 18}
+    if (edit) {
+      await ctx.edit(kb, da)
+    } else {
+      await ctx.reply(kb, da)
+    }
+  }
+}
+
 export class RandomNumberPage extends PageBase {
   async handleCallbackData() {
-    await this.show(true)
+    await Main.showEntryPoint(this, true)
   }
 
   async handleCommandText() {
-    await this.show(false)
+    await Main.showEntryPoint(this, false)
   }
 
-  async show(edit = true) {
-    const kb = this.inlineKeyboardT([this, StartPage])
-    const da = {result: Math.random() * 10 ** 18}
-    if (edit) await this.edit(kb, da)
-    else await this.reply(kb, da)
+  async entryPoint(edit = true) {
+    await Main.showEntryPoint(this, edit)
   }
 
   static template = `

package/dist/src/templates/src/pages/start.ts

@@ -3,21 +3,30 @@ import {PageBase} from "~/base/page"
 import {RandomNumberPage} from "./random-number"
 import {SumNumberPage} from "./sum-number"
 
+class Main {
+  static async showEntryPoint(ctx: StartPage, edit = true) {
+    await ctx.clearSession()
+    const kb = ctx.inlineKeyboardT([RandomNumberPage, SumNumberPage, HelpPage], `2`)
+    const da = {userName: ctx.userName}
+    if (edit) {
+      await ctx.edit(kb, da)
+    } else {
+      await ctx.reply(kb, da)
+    }
+  }
+}
+
 export class StartPage extends PageBase {
   async handleCallbackData() {
-    await this.show(true)
+    await Main.showEntryPoint(this, true)
   }
 
   async handleCommandText() {
-    await this.show(false)
+    await Main.showEntryPoint(this, false)
   }
 
-  async show(edit = true) {
-    await this.clearSession()
-    const kb = this.inlineKeyboardT([RandomNumberPage, SumNumberPage, HelpPage], `2`)
-    const da = {userName: this.userName}
-    if (edit) await this.edit(kb, da)
-    else await this.reply(kb, da)
+  async entryPoint(edit = true) {
+    await Main.showEntryPoint(this, edit)
   }
 
   static template = `

package/dist/src/templates/src/pages/sum-number.ts

@@ -1,79 +1,98 @@
 import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
-export class SumNumberPage extends PageBase {
-  static BASE = {pleft: `pleft`, pright: `pright`, result: `result`}
+class Base {
+  static pleft: `pleft`
+  static pright: `pright`
+  static success: `success`
+}
 
-  async handleCallbackData() {
-    await this.first(true)
+class Helper {
+  static getSessionParams(ctx: SumNumberPage) {
+    return (ctx.temp.session?.params as {step?: `left` | `right`; left?: number} | undefined) ?? {}
   }
 
-  async handleCommandText() {
-    await this.first(false)
+  static kb(ctx: SumNumberPage, baseId: string) {
+    return ctx.inlineKeyboardT([StartPage], `1`, baseId)
   }
+}
 
-  async handleFreeText() {
-    if (!this.isSessionFreeText()) return null
-    const {BASE} = SumNumberPage
-    const {step, left} = this.getSessionParams()
-    const input = this.msgText?.trim()
-    const value = input ? Number(input) : NaN
+class Main {
+  static async showStep1Form(ctx: SumNumberPage, edit: boolean) {
+    await ctx.sessionFreeText({step: `left`})
+    const bi = Base.pleft
+    const kb = Helper.kb(ctx, bi)
+    const da = {}
+    if (edit) {
+      await ctx.edit(kb, da, bi)
+    } else {
+      await ctx.reply(kb, da, bi)
+    }
+  }
 
-    if (step === `left`) {
-      if (!Number.isFinite(value)) {
-        await this.sessionFreeText({step: `left`})
-        const bi = BASE.pleft
-        const kb = this.kb(bi)
-        return await this.reply(kb, {}, bi)
-      }
-
-      await this.sessionFreeText({step: `right`, left: value})
-      const bi = BASE.pright
-      const kb = this.kb(bi)
-      return await this.reply(kb, {}, bi)
+  static async processStep1Answer(ctx: SumNumberPage, left: number) {
+    if (!Number.isFinite(left)) {
+      await Main.showStep1Form(ctx, false)
+    } else {
+      await this.showStep2Form(ctx, left)
     }
+  }
+
+  static async showStep2Form(ctx: SumNumberPage, left: number) {
+    await ctx.sessionFreeText({step: `right`, left})
+    const bi = Base.pright
+    const kb = Helper.kb(ctx, bi)
+    const da = {}
+    await ctx.reply(kb, da, bi)
+  }
 
-    if (step === `right`) {
-      if (!Number.isFinite(value)) {
-        await this.sessionFreeText({step: `right`, left})
-        const bi = BASE.pright
-        const kb = this.kb(bi)
-        return await this.reply(kb, {}, bi)
-      }
-
-      if (!Number.isFinite(left ?? NaN)) {
-        await this.clearSession()
-        return await this.first(false)
-      }
-
-      await this.clearSession()
-      const bi = BASE.result
-      const kb = this.kb(bi)
-      const da = {result: left! + value}
-      await this.reply(kb, da, bi)
+  static async processStep2Answer(ctx: SumNumberPage, left: number, right: number) {
+    if (!Number.isFinite(right)) {
+      await Main.showStep2Form(ctx, right)
+    } else if (!Number.isFinite(right ?? NaN)) {
+      await ctx.clearSession()
+      await Main.showStep1Form(ctx, false)
+    } else {
+      await Alert.success(ctx, left, right)
     }
   }
+}
 
-  private async first(edit: boolean) {
-    await this.sessionFreeText({step: `left`})
-    const {BASE} = SumNumberPage
-    const bi = BASE.pleft
-    const kb = this.kb(bi)
+class Alert {
+  static async success(ctx: SumNumberPage, left: number, right: number) {
+    await ctx.clearSession()
+    const bi = Base.success
+    const kb = Helper.kb(ctx, bi)
+    const da = {result: left! + right}
+    await ctx.reply(kb, da, bi)
+  }
+}
 
-    if (edit) await this.edit(kb, {}, bi)
-    else await this.reply(kb, {}, bi)
+export class SumNumberPage extends PageBase {
+  async handleCallbackData() {
+    await Main.showStep1Form(this, true)
   }
 
-  private kb(baseId: string) {
-    return this.inlineKeyboardT([StartPage], `1`, baseId)
+  async handleCommandText() {
+    await Main.showStep1Form(this, false)
   }
 
-  private getSessionParams() {
-    return (this.temp.session?.params as {step?: `left` | `right`; left?: number} | undefined) ?? {}
+  async handleFreeText() {
+    if (!this.isSessionFreeText()) {
+      return null
+    }
+    const {step, left} = Helper.getSessionParams(this)
+    const input = this.msgText?.trim()
+    const value = input ? Number(input) : NaN
+    if (step === `left`) {
+      await Main.processStep1Answer(this, value)
+    } else if (step === `right`) {
+      await Main.processStep2Answer(this, left!, value)
+    }
   }
 
   static template = `
-    <base id="${this.BASE.pleft}">
+    <base id="${Base.pleft}">
       ${this.kbk.cancel()}
       <message>
         <b>📚 Input Left Number</b>
@@ -86,7 +105,8 @@ export class SumNumberPage extends PageBase {
         Contoh: 23
       </message>
     </base>
-    <base id="${this.BASE.pright}">
+
+    <base id="${Base.pright}">
       ${this.kbk.cancel()}
       <message>
         <b>📚 Input Right Number</b>
@@ -99,7 +119,8 @@ export class SumNumberPage extends PageBase {
         Contoh: 10
       </message>
     </base>
-    <base id="${this.BASE.result}">
+
+    <base id="${Base.success}">
       ${this.kbk.home()}
       <message>
         <b>📚 Result Sum</b>

package/dist/src/templates/src/pages/username-notfound.ts

@@ -1,11 +1,20 @@
 import {HelpPage} from "./help"
 import {PageBase} from "~/base/page"
 
+class Main {
+  static async showEntryPoint(ctx: UserNameNotFoundPage, edit = true) {
+    const kb = ctx.inlineKeyboardT([HelpPage])
+    if (edit) {
+      await ctx.edit(kb)
+    } else {
+      await ctx.reply(kb)
+    }
+  }
+}
+
 export class UserNameNotFoundPage extends PageBase {
-  async transition(edit = true) {
-    const kb = this.inlineKeyboardT([HelpPage])
-    if (edit) await this.edit(kb)
-    else await this.reply(kb)
+  async showEntryPoint(edit = true) {
+    await Main.showEntryPoint(this, edit)
   }
 
   static template = `

package/dist/src/templates/tsconfig.json

@@ -1,7 +1,5 @@
 {
   "compilerOptions": {
-    // Short relative path
-    "baseUrl": ".",
     "paths": {
       "~/*": [
         "./src/*"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-gramstax",
-  "version": "0.8.1",
+  "version": "0.8.3",
   "private": false,
   "publishConfig": {
     "access": "public",