create-gramstax 0.6.1 → 0.7.1

package/dist/src/templates/package.json

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

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

@@ -17,11 +17,11 @@ export class GeneralStatusPage extends PageBase {
   async toError(funcName: string, error: any, edit = true) {
     log.errorMake(error, this.constructorName, funcName)
 
-    await this.sessionClear()
+    await this.clearSession()
     const kb = this.kb()
-    const data = {isNotFound: false}
-    if (edit) await this.edit(kb, data)
-    else await this.reply(kb, data)
+    const da = {isNotFound: false}
+    if (edit) await this.edit(kb, da)
+    else await this.reply(kb, da)
   }
 
   async toErrorInputNotFound() {

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

@@ -8,11 +8,11 @@ export class HelpPage extends PageBase {
     else await this.reply(kb)
   }
 
-  async callback() {
+  async handleCallbackData() {
     await this.show(true)
   }
 
-  async textCommand() {
+  async handleCommandText() {
     await this.show(false)
   }
 

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

@@ -2,6 +2,14 @@ import {PageBase} from "~/base/page"
 import {StartPage} from "./start"
 
 export class RandomNumberPage extends PageBase {
+  async handleCallbackData() {
+    await this.show(true)
+  }
+
+  async handleCommandText() {
+    await this.show(false)
+  }
+
   async show(edit = true) {
     const kb = this.inlineKeyboardT([this, StartPage])
     const da = {result: Math.random() * 10 ** 18}
@@ -9,14 +17,6 @@ export class RandomNumberPage extends PageBase {
     else await this.reply(kb, da)
   }
 
-  async callback() {
-    await this.show(true)
-  }
-
-  async textCommand() {
-    await this.show(false)
-  }
-
   static template = `
     <base>
       <keyboard>🎲 Shake, ${this.kbl.back.default}</keyboard>

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

@@ -4,22 +4,22 @@ import {RandomNumberPage} from "./random-number"
 import {SumNumberPage} from "./sum-number"
 
 export class StartPage extends PageBase {
+  async handleCallbackData() {
+    await this.show(true)
+  }
+
+  async handleCommandText() {
+    await this.show(false)
+  }
+
   async show(edit = true) {
-    await this.sessionClear()
+    await this.clearSession()
     const kb = this.inlineKeyboardT([RandomNumberPage, SumNumberPage, HelpPage], `2`)
     const data = {userName: this.userName}
     if (edit) await this.edit(kb, data)
     else await this.reply(kb, data)
   }
 
-  async callback() {
-    await this.show(true)
-  }
-
-  async textCommand() {
-    await this.show(false)
-  }
-
   static template = `
     <base>
       <keyboard>🎰 Random Number, ➕ Sum Number, 🆘 Help</keyboard>

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

@@ -4,52 +4,55 @@ import {StartPage} from "./start"
 export class SumNumberPage extends PageBase {
   static BASE = {pleft: `pleft`, pright: `pright`, result: `result`}
 
-  async callback() {
+  async handleCallbackData() {
     await this.first(true)
   }
 
-  async textCommand() {
+  async handleCommandText() {
     await this.first(false)
   }
 
-  async textFree() {
-    if (!this.validateSessionTextFree()) return null
+  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
 
     if (step === `left`) {
       if (!Number.isFinite(value)) {
-        await this.sessionTextFree({step: `left`})
-        return await this.reply(this.kb(SumNumberPage.BASE.pleft), {}, SumNumberPage.BASE.pleft)
+        await this.sessionFreeText({step: `left`})
+        return await this.reply(this.kb(BASE.pleft), {}, BASE.pleft)
       }
 
-      await this.sessionTextFree({step: `right`, left: value})
-      return await this.reply(this.kb(SumNumberPage.BASE.pright), {}, SumNumberPage.BASE.pright)
+      await this.sessionFreeText({step: `right`, left: value})
+      return await this.reply(this.kb(BASE.pright), {}, BASE.pright)
     }
 
     if (step === `right`) {
       if (!Number.isFinite(value)) {
-        await this.sessionTextFree({step: `right`, left})
-        return await this.reply(this.kb(SumNumberPage.BASE.pright), {}, SumNumberPage.BASE.pright)
+        await this.sessionFreeText({step: `right`, left})
+        return await this.reply(this.kb(BASE.pright), {}, BASE.pright)
       }
 
       if (!Number.isFinite(left ?? NaN)) {
-        await this.sessionClear()
+        await this.clearSession()
         return await this.first(false)
       }
 
       const result = left! + value
-      await this.sessionClear()
-      return await this.reply(this.kb(SumNumberPage.BASE.result), {result}, SumNumberPage.BASE.result)
+      await this.clearSession()
+      return await this.reply(this.kb(BASE.result), {result}, BASE.result)
     }
   }
 
   private async first(edit: boolean) {
-    await this.sessionTextFree({step: `left`})
-    const kb = this.kb(SumNumberPage.BASE.pleft)
-    if (edit) await this.edit(kb, {}, SumNumberPage.BASE.pleft)
-    else await this.reply(kb, {}, SumNumberPage.BASE.pleft)
+    await this.sessionFreeText({step: `left`})
+    const {BASE} = SumNumberPage
+    const kb = this.kb(BASE.pleft)
+
+    if (edit) await this.edit(kb, {}, BASE.pleft)
+    else await this.reply(kb, {}, BASE.pleft)
   }
 
   private kb(baseId: string) {
@@ -57,7 +60,7 @@ export class SumNumberPage extends PageBase {
   }
 
   private getSessionParams() {
-    return (this.session?.params as {step?: `left` | `right`; left?: number} | undefined) ?? {}
+    return (this.temp.session?.params as {step?: `left` | `right`; left?: number} | undefined) ?? {}
   }
 
   static template = `

package/package.json

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