create-gramstax 0.8.2 → 0.8.3

package/dist/src/templates/package.json

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

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

@@ -11,7 +11,7 @@ export class UserGuard extends GuardBase {
   async ensureUsername(edit: boolean) {
     try {
       if (!this.userName || this.userName.length == 0) {
-        await new UserNameNotFoundPage(this).entryPoint(edit)
+        await new UserNameNotFoundPage(this).showEntryPoint(edit)
         return null
       }
       return {status: true}

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

@@ -37,8 +37,8 @@ export class GeneralStatusPage extends PageBase {
     this.constructorName = p?.constructor?.name
   }
 
-  async error(funcName: string, error: any, edit = true) {
-    await Alert.error(this, funcName, error, edit)
+  async error(...args: Parameters<typeof Alert.error> extends [any, ...infer R] ? R : []) {
+    await Alert.error(this, ...args)
   }
 
   async errorInputNotFound() {

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

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

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

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

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

@@ -3,8 +3,8 @@ import {PageBase} from "~/base/page"
 import {RandomNumberPage} from "./random-number"
 import {SumNumberPage} from "./sum-number"
 
-class Perform {
-  static async entryPoint(ctx: StartPage, edit = true) {
+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}
@@ -18,15 +18,15 @@ class Perform {
 
 export class StartPage extends PageBase {
   async handleCallbackData() {
-    await Perform.entryPoint(this, true)
+    await Main.showEntryPoint(this, true)
   }
 
   async handleCommandText() {
-    await Perform.entryPoint(this, false)
+    await Main.showEntryPoint(this, false)
   }
 
   async entryPoint(edit = true) {
-    await Perform.entryPoint(this, edit)
+    await Main.showEntryPoint(this, edit)
   }
 
   static template = `

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

@@ -4,7 +4,7 @@ import {StartPage} from "./start"
 class Base {
   static pleft: `pleft`
   static pright: `pright`
-  static result: `result`
+  static success: `success`
 }
 
 class Helper {
@@ -17,8 +17,8 @@ class Helper {
   }
 }
 
-class Flow {
-  static async step1Form(ctx: SumNumberPage, edit: boolean) {
+class Main {
+  static async showStep1Form(ctx: SumNumberPage, edit: boolean) {
     await ctx.sessionFreeText({step: `left`})
     const bi = Base.pleft
     const kb = Helper.kb(ctx, bi)
@@ -30,15 +30,15 @@ class Flow {
     }
   }
 
-  static async step1Answer(ctx: SumNumberPage, left: number) {
+  static async processStep1Answer(ctx: SumNumberPage, left: number) {
     if (!Number.isFinite(left)) {
-      await Flow.step1Form(ctx, false)
+      await Main.showStep1Form(ctx, false)
     } else {
-      await this.step2Form(ctx, left)
+      await this.showStep2Form(ctx, left)
     }
   }
 
-  static async step2Form(ctx: SumNumberPage, left: number) {
+  static async showStep2Form(ctx: SumNumberPage, left: number) {
     await ctx.sessionFreeText({step: `right`, left})
     const bi = Base.pright
     const kb = Helper.kb(ctx, bi)
@@ -46,12 +46,12 @@ class Flow {
     await ctx.reply(kb, da, bi)
   }
 
-  static async step2Answer(ctx: SumNumberPage, left: number, right: number) {
+  static async processStep2Answer(ctx: SumNumberPage, left: number, right: number) {
     if (!Number.isFinite(right)) {
-      await Flow.step2Form(ctx, right)
+      await Main.showStep2Form(ctx, right)
     } else if (!Number.isFinite(right ?? NaN)) {
       await ctx.clearSession()
-      await Flow.step1Form(ctx, false)
+      await Main.showStep1Form(ctx, false)
     } else {
       await Alert.success(ctx, left, right)
     }
@@ -61,7 +61,7 @@ class Flow {
 class Alert {
   static async success(ctx: SumNumberPage, left: number, right: number) {
     await ctx.clearSession()
-    const bi = Base.result
+    const bi = Base.success
     const kb = Helper.kb(ctx, bi)
     const da = {result: left! + right}
     await ctx.reply(kb, da, bi)
@@ -70,11 +70,11 @@ class Alert {
 
 export class SumNumberPage extends PageBase {
   async handleCallbackData() {
-    await Flow.step1Form(this, true)
+    await Main.showStep1Form(this, true)
   }
 
   async handleCommandText() {
-    await Flow.step1Form(this, false)
+    await Main.showStep1Form(this, false)
   }
 
   async handleFreeText() {
@@ -85,9 +85,9 @@ export class SumNumberPage extends PageBase {
     const input = this.msgText?.trim()
     const value = input ? Number(input) : NaN
     if (step === `left`) {
-      await Flow.step1Answer(this, value)
+      await Main.processStep1Answer(this, value)
     } else if (step === `right`) {
-      await Flow.step2Answer(this, left!, value)
+      await Main.processStep2Answer(this, left!, value)
     }
   }
 
@@ -120,7 +120,7 @@ export class SumNumberPage extends PageBase {
       </message>
     </base>
 
-    <base id="${Base.result}">
+    <base id="${Base.success}">
       ${this.kbk.home()}
       <message>
         <b>📚 Result Sum</b>

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

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

package/package.json

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