@benup/bensdk 1.7.0 → 1.8.1

package/bin/src/cli/templates/bensdk-cli/generate.ts

@@ -1,6 +1,8 @@
 import fs from 'fs';
+import { promises as fsPromises } from 'fs';
 import { initialStates } from './lib/state-machine';
 import { validateBenefitDefinition } from './validate';
+import inquirer from 'inquirer';
 
 async function main() {
   const benefitDefinition = (await import(`${process.cwd()}/src/benefit-definition.ts`)).default;
@@ -24,12 +26,12 @@ async function main() {
       {} as Record<string, string[]>
     );
 
-  Object.keys(stateMachines).forEach((action) => {
+  for (const action of Object.keys(stateMachines)) {
     const states = stateMachines[action];
 
-    states.forEach((state) => {
+    for (const state of states) {
       if (initialStates.includes(state)) {
-        return;
+        continue;
       }
 
       const fileName = `${state.toLocaleLowerCase()}.handler.ts`;
@@ -85,8 +87,22 @@ async function main() {
       if (!fs.existsSync(handlersDir)) {
         fs.mkdirSync(handlersDir, { recursive: true });
       }
-      fs.writeFileSync(`${handlersDir}/${fileName}`, stateHandler, 'utf-8');
-    });
+
+      if (!fs.existsSync(`${handlersDir}/${fileName}`)) {
+        await fsPromises.writeFile(`${handlersDir}/${fileName}`, stateHandler, 'utf-8');
+      } else {
+        const answer = await inquirer.prompt({
+          type: 'list',
+          name: 'overwrite',
+          message: `The file ${fileName} already exists. Do you want to overwrite it?`,
+          choices: ['overwrite', 'skip']
+        });
+
+        if (answer.overwrite === 'overwrite') {
+          await fsPromises.writeFile(`${handlersDir}/${fileName}`, stateHandler, 'utf-8');
+        }
+      }
+    }
 
     const testsDir = `${process.cwd()}/__tests__`;
 
@@ -95,7 +111,7 @@ async function main() {
     }
 
     // Read the action test template
-    let actionTestTemplate = fs.readFileSync(
+    let actionTestTemplate = await fsPromises.readFile(
       process.cwd() + '/bin/cli/templates/action.test.template.ts',
       'utf-8'
     );
@@ -103,20 +119,49 @@ async function main() {
     // Replaces the action placeholder with the current action name
     actionTestTemplate = actionTestTemplate.replaceAll('CHANGE_ACTION_NAME_PLACEHOLDER', action);
 
-    fs.writeFileSync(`${testsDir}/${action.toLowerCase()}.test.ts`, actionTestTemplate, 'utf-8');
+    const testFileName = `${action.toLowerCase()}.test.ts`;
+    if (!fs.existsSync(`${testsDir}/${testFileName}`)) {
+      await fsPromises.writeFile(`${testsDir}/${testFileName}`, actionTestTemplate, 'utf-8');
+    } else {
+      const answer = await inquirer.prompt({
+        type: 'list',
+        name: 'overwrite',
+        message: `The test file ${testFileName} already exists. Do you want to overwrite it?`,
+        choices: ['overwrite', 'skip']
+      });
+
+      if (answer.overwrite === 'overwrite') {
+        await fsPromises.writeFile(`${testsDir}/${testFileName}`, actionTestTemplate, 'utf-8');
+      }
+    }
 
     /**
      * Creates the utils.ts for the tests if it doesn't exists
      */
     if (!fs.existsSync(`${testsDir}/utils.ts`)) {
-      const utilsTestTemplate = fs.readFileSync(
+      const utilsTestTemplate = await fsPromises.readFile(
         process.cwd() + '/bin/cli/templates/utils.template.ts',
         'utf-8'
       );
 
-      fs.writeFileSync(`${testsDir}/utils.ts`, utilsTestTemplate, 'utf-8');
+      await fsPromises.writeFile(`${testsDir}/utils.ts`, utilsTestTemplate, 'utf-8');
+    } else {
+      const answer = await inquirer.prompt({
+        type: 'list',
+        name: 'overwrite',
+        message: `The utils.ts file already exists. Do you want to overwrite it?`,
+        choices: ['overwrite', 'skip']
+      });
+
+      if (answer.overwrite === 'overwrite') {
+        const utilsTestTemplate = await fsPromises.readFile(
+          process.cwd() + '/bin/cli/templates/utils.template.ts',
+          'utf-8'
+        );
+        await fsPromises.writeFile(`${testsDir}/utils.ts`, utilsTestTemplate, 'utf-8');
+      }
     }
-  });
+  }
 }
 
 main();

package/bin/src/cli/templates/bensdk-cli/lib/benefit-definition.schema.ts

@@ -4,7 +4,9 @@ export const BenefitDefinitionSchema = z
   .object({
     benefitID: z.string().min(3),
     availableActions: z.array(
-      z.enum(['GRANT', 'REVOKE', 'RECHARGE', 'DEDUCTION', 'GRANT_DEPENDENT', 'REVOKE_DEPENDENT'])
+      z.enum(
+        ['GRANT', 'REVOKE', 'BEFORE_ALL_RECHARGE', 'RECHARGE', 'AFTER_ALL_RECHARGE','DEDUCTION', 'GRANT_DEPENDENT', 'REVOKE_DEPENDENT']
+      )
     ),
 
     stateMachine: z.object({
@@ -18,12 +20,24 @@ export const BenefitDefinitionSchema = z
           REQUESTED_REVOKE: z.object({ next: z.string() })
         })
         .passthrough(),
+      BEFORE_ALL_RECHARGE: z
+        .object({
+          REQUESTED_BEFORE_ALL_RECHARGE: z.object({ next: z.string() })
+        })
+        .passthrough()
+        .optional(),
       RECHARGE: z
         .object({
           REQUESTED_RECHARGE: z.object({ next: z.string() })
         })
         .passthrough()
         .optional(),
+      AFTER_ALL_RECHARGE: z
+        .object({
+          REQUESTED_AFTER_ALL_RECHARGE: z.object({ next: z.string() })
+        })
+        .passthrough()
+        .optional(),
       GRANT_DEPENDENT: z
         .object({
           REQUESTED_GRANT_DEPENDENT: z.object({ next: z.string() })
@@ -56,7 +70,9 @@ export const BenefitDefinitionSchema = z
       log: z.object({
         GRANT: z.object({}).passthrough(),
         REVOKE: z.object({}).passthrough(),
+        BEFORE_ALL_RECHARGE: z.object({}).passthrough().optional(),
         RECHARGE: z.object({}).passthrough().optional(),
+        AFTER_ALL_RECHARGE: z.object({}).passthrough().optional(),
         DEDUCTION: z.object({}).passthrough().optional(),
         GRANT_DEPENDENT: z.object({}).passthrough().optional(),
         REVOKE_DEPENDENT: z.object({}).passthrough().optional()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@benup/bensdk",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "main": "index.js",
   "type": "module",
   "scripts": {