@akanjs/cli 0.0.146 → 0.0.148

package/esm/index.js

@@ -589,7 +589,7 @@ var withBase = (appName, config, libs, routes = []) => {
     eslint: { ...config.eslint, ignoreDuringBuilds: true },
     env: {
       ...config.env,
-      basePaths: routes.map(({ basePath: basePath2 }) => basePath2).join(",")
+      basePaths: [...new Set(routes.map(({ basePath: basePath2 }) => basePath2))].join(",")
     },
     transpilePackages: ["swiper", "ssr-window", "dom7"],
     reactStrictMode: commandType === "start" ? false : true,
@@ -755,6 +755,7 @@ CMD ["npm", "start"]`,
         config.libs ?? [],
         config.frontend?.routes
       ),
+      routes: config.frontend?.routes,
       explicitDependencies: config.frontend?.explicitDependencies ?? []
     },
     mobile: {
@@ -1238,7 +1239,10 @@ ${errorMessages}`);
     ];
     const errors = diagnostics.filter((diagnostic) => diagnostic.category === ts3.DiagnosticCategory.Error);
     const warnings = diagnostics.filter((diagnostic) => diagnostic.category === ts3.DiagnosticCategory.Warning);
-    return { diagnostics, errors, warnings };
+    const fileDiagnostics = diagnostics.filter((diagnostic) => diagnostic.file?.fileName === filePath);
+    const fileErrors = fileDiagnostics.filter((diagnostic) => diagnostic.category === ts3.DiagnosticCategory.Error);
+    const fileWarnings = fileDiagnostics.filter((diagnostic) => diagnostic.category === ts3.DiagnosticCategory.Warning);
+    return { diagnostics, errors, warnings, fileDiagnostics, fileErrors, fileWarnings };
   }
   /**
    * Format diagnostics for console output
@@ -1665,9 +1669,9 @@ var Executor = class _Executor {
   typeCheck(filePath) {
     const path9 = this.getPath(filePath);
     const typeChecker = this.getTypeChecker();
-    const { diagnostics, errors, warnings } = typeChecker.check(path9);
-    const message = typeChecker.formatDiagnostics(diagnostics);
-    return { diagnostics, errors, warnings, message };
+    const { fileDiagnostics, fileErrors, fileWarnings } = typeChecker.check(path9);
+    const message = typeChecker.formatDiagnostics(fileDiagnostics);
+    return { fileDiagnostics, fileErrors, fileWarnings, message };
   }
   getLinter() {
     this.linter ??= new Linter(this.cwdPath);
@@ -3097,7 +3101,7 @@ ${validate.map((v) => `- ${v}`).join("\n")}`;
         writes.map(async ({ filePath }) => {
           const typeCheckResult = executor.typeCheck(filePath);
           const lintResult = await executor.lint(filePath);
-          const needFix2 = !!typeCheckResult.errors.length || !!lintResult.errors.length;
+          const needFix2 = !!typeCheckResult.fileErrors.length || !!lintResult.errors.length;
           return { filePath, typeCheckResult, lintResult, needFix: needFix2 };
         })
       );
@@ -3131,7 +3135,7 @@ ${fileCheck.lintResult.message}`
     throw new Error("Failed to create scalar");
   }
   #getTypescriptCodes(text) {
-    const codes = text.match(/```typescript([\s\S]*?)```/g);
+    const codes = text.match(/```(typescript|tsx)([\s\S]*?)```/g);
     if (!codes)
       return [];
     const result = codes.map((code) => {
@@ -3239,7 +3243,7 @@ var Builder = class {
 };
 
 // pkgs/@akanjs/devkit/src/prompter.ts
-import { select as select4 } from "@inquirer/prompts";
+import { input as input3, select as select4 } from "@inquirer/prompts";
 import fsPromise2 from "fs/promises";
 var Prompter = class {
   static async selectGuideline() {
@@ -3256,6 +3260,9 @@ var Prompter = class {
     const content = await fsPromise2.readFile(filePath, "utf-8");
     return content;
   }
+  static async getUpdateRequest(guideName) {
+    return await input3({ message: `What do you want to update in ${guideName}?` });
+  }
   async makeTsFileUpdatePrompt({ context: context2, request }) {
     return `You are a senior developer writing TypeScript-based programs using Akan.js, an in-house framework. Here's an overview of the Akan.js framework:
 ${await this.getDocumentation("framework")}
@@ -3417,7 +3424,7 @@ var LibraryScript = class {
 };
 
 // pkgs/@akanjs/cli/src/application/application.runner.ts
-import { confirm as confirm2, input as input3 } from "@inquirer/prompts";
+import { confirm as confirm2, input as input4 } from "@inquirer/prompts";
 import { StringOutputParser } from "@langchain/core/output_parsers";
 import { PromptTemplate as PromptTemplate2 } from "@langchain/core/prompts";
 import { RunnableSequence as RunnableSequence2 } from "@langchain/core/runnables";
@@ -3572,6 +3579,8 @@ var ApplicationRunner = class {
   async #getViteConfig(app, command) {
     const { env } = await this.#prepareCommand(app, command, "csr");
     const tsconfig = app.workspace.getTsConfig();
+    const akanConfig = await app.getConfig();
+    const basePaths = akanConfig.frontend.routes ? [...new Set(akanConfig.frontend.routes.map(({ basePath: basePath2 }) => basePath2))].join(",") : void 0;
     const processEnv = env;
     const akanjsPrefix = process.env.USE_AKANJS_PKGS === "true" ? `${app.workspace.workspaceRoot}/pkgs/` : "";
     const config = vite.defineConfig({
@@ -3635,7 +3644,8 @@ var ApplicationRunner = class {
           APP_OPERATION_MODE: processEnv.APP_OPERATION_MODE ?? "local",
           AKAN_WORKSPACE_ROOT: app.workspace.workspaceRoot,
           AKAN_APP_ROOT: app.cwdPath,
-          RENDER_ENV: "csr"
+          RENDER_ENV: "csr",
+          basePaths
         },
         "process.platform": JSON.stringify("browser"),
         "process.version": JSON.stringify(process.version)
@@ -3877,8 +3887,8 @@ var ApplicationRunner = class {
     if (!openAIApiKey)
       throw new Error("OPENAI_API_KEY is not set");
     const chatModel = new ChatOpenAI3({ modelName: "gpt-4o", openAIApiKey });
-    const projectName = await input3({ message: "please enter project name." });
-    const projectDesc = await input3({ message: "please enter project description. (40 ~ 60 characters)" });
+    const projectName = await input4({ message: "please enter project name." });
+    const projectDesc = await input4({ message: "please enter project description. (40 ~ 60 characters)" });
     const spinner = ora3("Gerating project files...");
     const mainPrompt = PromptTemplate2.fromTemplate(`prompt.requestApplication()`);
     const chain = RunnableSequence2.from([mainPrompt, chatModel, new StringOutputParser()]);
@@ -3945,7 +3955,11 @@ var ApplicationScript = class {
     await this.syncApplication(app);
     if (app.workspace.getBaseDevEnv().env === "local")
       await this.dbup(app.workspace);
-    await Promise.all([this.startBackend(app, { open: open2, sync: false }), this.startFrontend(app, { open: open2, sync: false })]);
+    await Promise.all([
+      this.startBackend(app, { open: open2, sync: false }),
+      this.startFrontend(app, { open: open2, sync: false }),
+      this.startCsr(app, { open: open2, sync: false })
+    ]);
   }
   async buildBackend(app, { sync = true } = {}) {
     if (sync)
@@ -5486,7 +5500,9 @@ var GuidelinePrompt = class extends Prompter {
     });
     const paths = [];
     for await (const path9 of matchingPaths) {
-      if (filterText && !fs16.readFileSync(path9, "utf-8").includes(filterText))
+      const fileContent = fs16.readFileSync(path9, "utf-8");
+      const textFilter = filterText ? new RegExp(filterText) : null;
+      if (filterText && !textFilter?.test(fileContent))
         continue;
       paths.push(path9);
     }
@@ -5539,10 +5555,39 @@ ${guideJson.update.rules.map((rule) => `- ${rule}`).join("\n")}
 
 => Now, you need to write the file content here. Let's go.
 `;
-    return { request, writePath };
+    return { guideJson, request, writePath };
   }
-  async requestUpdateDocumentPage(page) {
-    const writePath = `apps/angelo/app/${page}`;
+  async requestUpdateInstruction(updateRequest) {
+    const guideJson = await Prompter.getGuideJson(this.name);
+    const resultPath = `${__dirname}/src/guidelines/${this.name}/${guideJson.update.filePath}`;
+    const writePath = `${this.workspace.workspaceRoot}/pkgs/@akanjs/cli/src/guidelines/${this.name}/${guideJson.update.filePath}`;
+    const isResultExists = this.workspace.exists(writePath);
+    if (!isResultExists)
+      throw new Error(`${guideJson.update.filePath} file does not exist. Please create it first.`);
+    const existingResult = this.workspace.readFile(resultPath);
+    const request = `
+I am a developer of akanjs framework, a full-stack framework for building web applications.
+I want to update a ${guideJson.update.filePath} file for ${guideJson.description}.
+This file is a programming guideline for Akan.js framwork users.
+
+# ${guideJson.title} Workflow
+- 1. Read already-written ${guideJson.update.filePath} file.
+- 2. Write the updated file content of the ${guideJson.update.filePath} with the update request.
+
+## 1. Read already-written ${guideJson.update.filePath} file.
+\`\`\`markdown
+${existingResult}
+\`\`\`
+
+## 2. Write the updated file content of the ${guideJson.update.filePath} with the update request.
+Request: ${updateRequest}
+
+=> Now, you need to write the file content here. Let's go.
+`;
+    return { guideJson, request, writePath };
+  }
+  async requestCreateDocumentPage(page) {
+    const writePath = `apps/angelo/app${page}`;
     if (!this.workspace.exists(writePath))
       this.workspace.writeFile(
         writePath,
@@ -5584,6 +5629,69 @@ Please return only the file result in the following format for easy parsing.
 // File: ${writePath}
 ...pageContent
 \`\`\`
+`;
+    return { request, writePath };
+  }
+  async requestUpdateDocumentPage(page, updateRequest) {
+    const writePath = `apps/angelo/app${page}`;
+    if (!this.workspace.exists(writePath))
+      this.workspace.writeFile(
+        writePath,
+        `export default function Page() {
+  return <div>No Content</div>;
+}
+`
+      );
+    const instruction = await Prompter.getInstruction(this.name);
+    const pageContent = this.workspace.getLocalFile(writePath);
+    const request = `
+I'm updating a documentation website for the Akan.js framework.
+
+I want to update the Next.js server-side page located at ${writePath}.
+Below is the content of the currently written page. You should update stale infos and preserve the existing content.
+\`\`\`tsx
+// File: ${writePath}
+${pageContent.content}
+\`\`\`
+
+The existing instruction is below.
+\`\`\`markdown
+${instruction}
+\`\`\`
+
+Please update this page with the request below.
+${updateRequest}
+
+Please return only the file result in the following format for easy parsing.
+\`\`\`tsx
+// File: ${writePath}
+...pageContent
+\`\`\`
+`;
+    return { request, writePath };
+  }
+  async requestReapplyInstruction(filePath) {
+    const guideJson = await Prompter.getGuideJson(this.name);
+    const writePath = `${this.workspace.workspaceRoot}/pkgs/@akanjs/cli/src/guidelines/${this.name}/${guideJson.update.filePath}`;
+    if (!guideJson.page)
+      throw new Error(`${this.name} does not have a page.`);
+    const pagePath = `apps/angelo/app${guideJson.page}`;
+    const pageFile = this.workspace.getLocalFile(pagePath);
+    const request = `
+I want to apply information in the Next.js page to markdown instruction file.
+
+Here's the newest information in the Next.js page.
+\`\`\`tsx
+// File: ${pagePath}
+${pageFile.content}
+\`\`\`
+
+Here's the existing instruction file.
+\`\`\`markdown
+${await Prompter.getInstruction(this.name)}
+\`\`\`
+
+Please update the instruction file with the information in the Next.js page.
 `;
     return { request, writePath };
   }
@@ -5594,19 +5702,45 @@ var GuidelineRunner = class {
   async generateInstruction(workspace, guideName) {
     const session = new AiSession("generateInstruction", { workspace, cacheKey: guideName });
     const prompt = new GuidelinePrompt(workspace, guideName);
-    const { request, writePath } = await prompt.requestCreateInstruction();
+    const { guideJson, request, writePath } = await prompt.requestCreateInstruction();
+    const guidelineContent = await session.editMarkdown(request);
+    workspace.writeFile(writePath, guidelineContent);
+    return { guideJson, session };
+  }
+  async updateInstruction(workspace, guideName, { updateRequest }) {
+    const session = new AiSession("updateInstruction", { workspace, cacheKey: guideName });
+    const prompt = new GuidelinePrompt(workspace, guideName);
+    const { guideJson, request, writePath } = await prompt.requestUpdateInstruction(updateRequest);
     const guidelineContent = await session.editMarkdown(request);
     workspace.writeFile(writePath, guidelineContent);
+    return { guideJson, session };
   }
-  async deployDocPage(workspace, guideName) {
+  async generateDocument(workspace, guideName) {
     const session = new AiSession("deployDocPages", { workspace, cacheKey: guideName });
     const guideJson = await Prompter.getGuideJson(guideName);
     const prompt = new GuidelinePrompt(workspace, guideName);
     if (!guideJson.page)
       return Promise.resolve({});
-    const { request } = await prompt.requestUpdateDocumentPage(guideJson.page);
+    const { request } = await prompt.requestCreateDocumentPage(guideJson.page);
     await session.writeTypescripts(request, workspace);
   }
+  async updateDocument(workspace, guideName, { updateRequest, session }) {
+    const guideJson = await Prompter.getGuideJson(guideName);
+    if (!guideJson.page)
+      throw new Error(`${guideName} does not have a page.`);
+    const prompt = new GuidelinePrompt(workspace, guideName);
+    const { request, writePath } = await prompt.requestUpdateDocumentPage(guideJson.page, updateRequest);
+    const guidelineContent = await session.editMarkdown(request);
+    workspace.writeFile(writePath, guidelineContent);
+  }
+  async reapplyInstruction(workspace, guideName) {
+    const session = new AiSession("reapplyInstruction", { workspace, cacheKey: guideName });
+    const guideJson = await Prompter.getGuideJson(guideName);
+    const prompt = new GuidelinePrompt(workspace, guideName);
+    const { request, writePath } = await prompt.requestReapplyInstruction(guideJson.update.filePath);
+    const guidelineContent = await session.editMarkdown(request);
+    workspace.writeFile(writePath, guidelineContent);
+  }
 };
 
 // pkgs/@akanjs/cli/src/guideline/guideline.script.ts
@@ -5616,9 +5750,23 @@ var GuidelineScript = class {
     const guideName = name ?? await Prompter.selectGuideline();
     await this.#runner.generateInstruction(workspace, guideName);
   }
-  async deployDocPage(workspace, name = null) {
+  async updateInstruction(workspace, name = null, updateRequest) {
+    const guideName = name ?? await Prompter.selectGuideline();
+    const { guideJson, session } = await this.#runner.updateInstruction(workspace, guideName, { updateRequest });
+    if (guideJson.page)
+      await this.updateDocument(workspace, guideName, { updateRequest, session });
+  }
+  async generateDocument(workspace, name = null) {
+    const guideName = name ?? await Prompter.selectGuideline();
+    await this.#runner.generateDocument(workspace, guideName);
+  }
+  async updateDocument(workspace, name = null, { updateRequest, session }) {
     const guideName = name ?? await Prompter.selectGuideline();
-    await this.#runner.deployDocPage(workspace, guideName);
+    await this.#runner.updateDocument(workspace, guideName, { updateRequest, session });
+  }
+  async reapplyInstruction(workspace, name = null) {
+    const guideName = name ?? await Prompter.selectGuideline();
+    await this.#runner.reapplyInstruction(workspace, guideName);
   }
 };
 
@@ -5628,8 +5776,14 @@ var GuidelineCommand = class {
   async generateInstruction(name, workspace) {
     await this.guidelineScript.generateInstruction(workspace, name);
   }
-  async deployDoc(name, workspace) {
-    await this.guidelineScript.deployDocPage(workspace, name);
+  async updateInstruction(name, request, workspace) {
+    await this.guidelineScript.updateInstruction(workspace, name, request);
+  }
+  async generateDocument(name, workspace) {
+    await this.guidelineScript.generateDocument(workspace, name);
+  }
+  async reapplyInstruction(name, workspace) {
+    await this.guidelineScript.reapplyInstruction(workspace, name);
   }
 };
 __decorateClass([
@@ -5637,11 +5791,22 @@ __decorateClass([
   __decorateParam(0, Argument("name", { ask: "name of the instruction", nullable: true })),
   __decorateParam(1, Workspace())
 ], GuidelineCommand.prototype, "generateInstruction", 1);
+__decorateClass([
+  Target.Public(),
+  __decorateParam(0, Argument("name", { ask: "name of the instruction", nullable: true })),
+  __decorateParam(1, Option("request", { ask: "What do you want to update?" })),
+  __decorateParam(2, Workspace())
+], GuidelineCommand.prototype, "updateInstruction", 1);
+__decorateClass([
+  Target.Public(),
+  __decorateParam(0, Argument("name", { ask: "name of the instruction", nullable: true })),
+  __decorateParam(1, Workspace())
+], GuidelineCommand.prototype, "generateDocument", 1);
 __decorateClass([
   Target.Public(),
   __decorateParam(0, Argument("name", { ask: "name of the instruction", nullable: true })),
   __decorateParam(1, Workspace())
-], GuidelineCommand.prototype, "deployDoc", 1);
+], GuidelineCommand.prototype, "reapplyInstruction", 1);
 GuidelineCommand = __decorateClass([
   Commands()
 ], GuidelineCommand);
@@ -5650,7 +5815,7 @@ GuidelineCommand = __decorateClass([
 import pluralize2 from "pluralize";
 
 // pkgs/@akanjs/cli/src/scalar/scalar.prompt.ts
-import { input as input4 } from "@inquirer/prompts";
+import { input as input5 } from "@inquirer/prompts";
 var ScalarPrompt = class extends Prompter {
   constructor(sys3, name) {
     super();
@@ -5658,13 +5823,13 @@ var ScalarPrompt = class extends Prompter {
     this.name = name;
   }
   async requestUpdateConstant() {
-    const request = await input4({ message: `What do you want to change?` });
+    const request = await input5({ message: `What do you want to change?` });
     return { request, validate: void 0 };
   }
   async requestCreateConstant() {
     const constantFiles = await this.sys.getConstantFilesWithLibs();
-    const description = await input4({ message: "description of scalar scalar" });
-    const schemaDescription = await input4({ message: "schema description of scalar scalar" });
+    const description = await input5({ message: "description of scalar scalar" });
+    const schemaDescription = await input5({ message: "schema description of scalar scalar" });
     await this.sys.applyTemplate({
       basePath: "./lib/__scalar",
       template: "__scalar",

package/esm/src/guidelines/cssRule/cssRule.instruction.md

@@ -180,7 +180,7 @@ export const Card = ({ className, project, href }: ModelProps<"project", cnst.Li
       className={clsx(
         "border-base-300 bg-base-100 flex flex-col gap-3 rounded-lg border-2 p-4",
         "hover:border-primary transition-all hover:shadow-md",
-        "focus:ring-primary focus:outline-hidden focus:ring-2",
+        "focus:ring-primary focus:ring-2 focus:outline-hidden",
         className
       )}
     >