create-gramstax 0.8.6 → 0.8.8

package/dist/src/templates/package.json

@@ -35,7 +35,7 @@
     "lint:fix": "eslint . --fix"
   },
   "dependencies": {
-    "gramstax": "^0.8.5",
+    "gramstax": "^0.8.7",
     "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).error(`${listenerName}:hookErrorPage`, error, isEdit)
+    await new GeneralStatusPage(ctx).showError(`${listenerName}:hookErrorPage`, error, isEdit)
   }
 
   async hookErrorInputNotFoundPage(ctx: CtxCore) {
-    await new GeneralStatusPage(ctx).errorInputNotFound()
+    await new GeneralStatusPage(ctx).showErrorInputNotFound()
   }
 }

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).error(func, err, isEdit)
+    await new GeneralStatusPage(this).showError(func, err, isEdit)
     return null
   }
 
   async ensureUsername(edit: boolean) {
     try {
       if (!this.userName || this.userName.length == 0) {
-        await new UserNameNotFoundPage(this).showEntryPoint(edit)
+        await new UserNameNotFoundPage(this).showStep1Form(edit)
         return null
       }
       return {status: true}

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

@@ -1,14 +1,8 @@
 import {PageBase} from "~/base/page"
 
-class Main {
-  static async showEntryPoint(ctx: BlankPage) {
-    await ctx.callbackQueryAnswer()
-  }
-}
-
 export class BlankPage extends PageBase {
   async handleCallbackData() {
-    await Main.showEntryPoint(this)
+    await this.callbackQueryAnswer()
   }
 
   static template = `<base></base>`

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

@@ -2,30 +2,38 @@ import {LogHe} from "~/helpers/log"
 import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
+class Base {
+  static dynamic = `d`
+}
+
 class Helper {
   static kb(ctx: GeneralStatusPage) {
-    return ctx.inlineKeyboardT([StartPage])
+    const bi = Base.dynamic
+    const kb = ctx.inlineKeyboardT([StartPage], `1`, bi)
+    return kb
   }
 }
 
 class Alert {
-  static async error(ctx: GeneralStatusPage, funcName: string, error: any, edit = true) {
+  static async showError(ctx: GeneralStatusPage, funcName: string, error: any, edit = true) {
     LogHe.errorMake(error, ctx.constructorName, funcName)
 
     await ctx.clearSession()
+    const bi = Base.dynamic
     const kb = Helper.kb(ctx)
     const da = {isNotFound: false}
     if (edit) {
-      await ctx.edit(kb, da)
+      await ctx.edit(kb, da, bi)
     } else {
-      await ctx.reply(kb, da)
+      await ctx.reply(kb, da, bi)
     }
   }
 
-  static async errorInputNotFound(ctx: GeneralStatusPage) {
+  static async showErrorInputNotFound(ctx: GeneralStatusPage) {
+    const bi = Base.dynamic
     const kb = Helper.kb(ctx)
     const da = {isNotFound: true}
-    await ctx.reply(kb, da)
+    await ctx.reply(kb, da, bi)
   }
 }
 
@@ -37,16 +45,16 @@ export class GeneralStatusPage extends PageBase {
     this.constructorName = p?.constructor?.name
   }
 
-  async error(...args: Parameters<typeof Alert.error> extends [any, ...infer R] ? R : []) {
-    await Alert.error(this, ...args)
+  async showError(...args: Parameters<typeof Alert.showError> extends [any, ...infer R] ? R : []) {
+    await Alert.showError(this, ...args)
   }
 
-  async errorInputNotFound() {
-    await Alert.errorInputNotFound(this)
+  async showErrorInputNotFound() {
+    await Alert.showErrorInputNotFound(this)
   }
 
   static template = `
-    <base>
+    <base id="${Base.dynamic}">
       ${this.kbk.home()}
       <message>
         <b>{~isNotFound ? "🔎 Route Not Found" : "❌ Error Occurred"~}</b>

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

@@ -1,28 +1,38 @@
 import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
+class Base {
+  static step1 = `s1`
+}
+
 class Main {
-  static async showEntryPoint(ctx: HelpPage, edit = true) {
-    const kb = ctx.inlineKeyboardT([StartPage])
+  static async showStep1Form(ctx: HelpPage, edit = true) {
+    const bi = Base.step1
+    const kb = ctx.inlineKeyboardT([StartPage], `1`, bi)
+    const da = {}
     if (edit) {
-      await ctx.edit(kb)
+      await ctx.edit(kb, da, bi)
     } else {
-      await ctx.reply(kb)
+      await ctx.reply(kb, da, bi)
     }
   }
+
+  static async processStep1Answer(ctx: HelpPage) {
+    throw ctx
+  }
 }
 
 export class HelpPage extends PageBase {
   async handleCallbackData() {
-    await Main.showEntryPoint(this, true)
+    await Main.showStep1Form(this, true)
   }
 
   async handleCommandText() {
-    await Main.showEntryPoint(this, false)
+    await Main.showStep1Form(this, false)
   }
 
   static template = `
-    <base>
+    <base id="${Base.step1}">
       ${this.kbk.back()}
       <message>
         <b>🆘 Help Message</b>

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

@@ -1,33 +1,42 @@
 import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
+class Base {
+  static step1 = `s1`
+}
+
 class Main {
-  static async showEntryPoint(ctx: RandomNumberPage, edit = true) {
-    const kb = ctx.inlineKeyboardT([this, StartPage])
+  static async showStep1Form(ctx: RandomNumberPage, edit = true) {
+    const bi = Base.step1
+    const kb = ctx.inlineKeyboardT([ctx, StartPage], `1`, bi)
     const da = {result: Math.random() * 10 ** 18}
     if (edit) {
-      await ctx.edit(kb, da)
+      await ctx.edit(kb, da, bi)
     } else {
-      await ctx.reply(kb, da)
+      await ctx.reply(kb, da, bi)
     }
   }
+
+  static async processStep1Answer(ctx: RandomNumberPage) {
+    throw ctx
+  }
 }
 
 export class RandomNumberPage extends PageBase {
   async handleCallbackData() {
-    await Main.showEntryPoint(this, true)
+    await Main.showStep1Form(this, true)
   }
 
   async handleCommandText() {
-    await Main.showEntryPoint(this, false)
+    await Main.showStep1Form(this, false)
   }
 
-  async entryPoint(edit = true) {
-    await Main.showEntryPoint(this, edit)
+  async showStep1Form(edit = true) {
+    await Main.showStep1Form(this, edit)
   }
 
   static template = `
-    <base>
+    <base id="${Base.step1}">
       <keyboard>🎲 Shake, ${this.kbl.back.default}</keyboard>
       <keyboard lang="id">🎲 Kocok, ${this.kbl.back.id}</keyboard>
       <message>

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

@@ -3,34 +3,43 @@ import {PageBase} from "~/base/page"
 import {RandomNumberPage} from "./random-number"
 import {SumNumberPage} from "./sum-number"
 
+class Base {
+  static step1 = `s1`
+}
+
 class Main {
-  static async showEntryPoint(ctx: StartPage, edit = true) {
+  static async showStep1Form(ctx: StartPage, edit = true) {
     await ctx.clearSession()
-    const kb = ctx.inlineKeyboardT([RandomNumberPage, SumNumberPage, HelpPage], `2`)
+    const bi = Base.step1
+    const kb = ctx.inlineKeyboardT([RandomNumberPage, SumNumberPage, HelpPage], `2`, bi)
     const da = {userName: ctx.userName}
     if (edit) {
-      await ctx.edit(kb, da)
+      await ctx.edit(kb, da, bi)
     } else {
-      await ctx.reply(kb, da)
+      await ctx.reply(kb, da, bi)
     }
   }
+
+  static async processStep1Answer(ctx: StartPage) {
+    throw ctx
+  }
 }
 
 export class StartPage extends PageBase {
   async handleCallbackData() {
-    await Main.showEntryPoint(this, true)
+    await Main.showStep1Form(this, true)
   }
 
   async handleCommandText() {
-    await Main.showEntryPoint(this, false)
+    await Main.showStep1Form(this, false)
   }
 
-  async entryPoint(edit = true) {
-    await Main.showEntryPoint(this, edit)
+  async showStep1Form(edit = true) {
+    await Main.showStep1Form(this, edit)
   }
 
   static template = `
-    <base>
+    <base id="${Base.step1}">
       <keyboard>🎰 Random Number, ➕ Sum Number, 🆘 Help</keyboard>
       <keyboard lang="id">🎰 Angka Acak, ➕ Jumlah Angka, 🆘 Bantuan</keyboard>
       <message>

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

@@ -2,14 +2,14 @@ import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
 class Base {
-  static pleft: `pleft`
-  static pright: `pright`
+  static step1: `s1`
+  static step2: `s2`
   static success: `success`
 }
 
 class Helper {
   static getSessionParams(ctx: SumNumberPage) {
-    return (ctx.temp.session?.params as {step?: `left` | `right`; left?: number} | undefined) ?? {}
+    return (ctx.temp.session?.params as {step?: (typeof Base)[keyof typeof Base]; left?: number} | undefined) ?? {}
   }
 
   static kb(ctx: SumNumberPage, baseId: string) {
@@ -18,7 +18,7 @@ class Helper {
 }
 
 class Alert {
-  static async success(ctx: SumNumberPage, left: number, right: number) {
+  static async showSuccess(ctx: SumNumberPage, left: number, right: number) {
     await ctx.clearSession()
     const bi = Base.success
     const kb = Helper.kb(ctx, bi)
@@ -29,10 +29,10 @@ class Alert {
 
 class Main {
   static async showStep1Form(ctx: SumNumberPage, edit: boolean) {
-    await ctx.sessionFreeText({step: `left`})
-    const bi = Base.pleft
+    const bi = Base.step1
     const kb = Helper.kb(ctx, bi)
     const da = {}
+    await ctx.sessionFreeText({step: bi})
     if (edit) {
       await ctx.edit(kb, da, bi)
     } else {
@@ -49,10 +49,10 @@ class Main {
   }
 
   static async showStep2Form(ctx: SumNumberPage, left: number) {
-    await ctx.sessionFreeText({step: `right`, left})
-    const bi = Base.pright
+    const bi = Base.step2
     const kb = Helper.kb(ctx, bi)
     const da = {}
+    await ctx.sessionFreeText({step: bi, left})
     await ctx.reply(kb, da, bi)
   }
 
@@ -60,10 +60,9 @@ class Main {
     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)
+      await Alert.showSuccess(ctx, left, right)
     }
   }
 }
@@ -84,15 +83,15 @@ export class SumNumberPage extends PageBase {
     const {step, left} = Helper.getSessionParams(this)
     const input = this.msgText?.trim()
     const value = input ? Number(input) : NaN
-    if (step === `left`) {
+    if (step === Base.step1) {
       await Main.processStep1Answer(this, value)
-    } else if (step === `right`) {
+    } else if (step === Base.step2) {
       await Main.processStep2Answer(this, left!, value)
     }
   }
 
   static template = `
-    <base id="${Base.pleft}">
+    <base id="${Base.step1}">
       ${this.kbk.cancel()}
       <message>
         <b>📚 Input Left Number</b>
@@ -106,7 +105,7 @@ export class SumNumberPage extends PageBase {
       </message>
     </base>
 
-    <base id="${Base.pright}">
+    <base id="${Base.step2}">
       ${this.kbk.cancel()}
       <message>
         <b>📚 Input Right Number</b>

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

@@ -1,24 +1,34 @@
 import {HelpPage} from "./help"
 import {PageBase} from "~/base/page"
 
+class Base {
+  static step1 = `s1`
+}
+
 class Main {
-  static async showEntryPoint(ctx: UserNameNotFoundPage, edit = true) {
-    const kb = ctx.inlineKeyboardT([HelpPage])
+  static async showStep1Form(ctx: UserNameNotFoundPage, edit = true) {
+    const bi = Base.step1
+    const kb = ctx.inlineKeyboardT([HelpPage], `1`, bi)
+    const da = {}
     if (edit) {
-      await ctx.edit(kb)
+      await ctx.edit(kb, da, bi)
     } else {
-      await ctx.reply(kb)
+      await ctx.reply(kb, da, bi)
     }
   }
+
+  static async processStep1Answer(ctx: UserNameNotFoundPage) {
+    throw ctx
+  }
 }
 
 export class UserNameNotFoundPage extends PageBase {
-  async showEntryPoint(edit = true) {
-    await Main.showEntryPoint(this, edit)
+  async showStep1Form(edit = true) {
+    await Main.showStep1Form(this, edit)
   }
 
   static template = `
-    <base>
+    <base id="${Base.step1}">
       ${this.kbk.home()}
       <message>
         <b>⚠️ Username Required</b>

package/package.json

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