@akanjs/cli 0.9.60-canary.1 → 0.9.60-canary.2

package/cjs/index.js

@@ -7442,6 +7442,14 @@ ${boilerplate}
 
 // pkgs/@akanjs/cli/src/scalar/scalar.runner.ts
 var ScalarRunner = class {
+  async applyScalarTemplate(sys3, scalarName) {
+    await sys3.applyTemplate({
+      basePath: "./lib/__scalar",
+      template: "__scalar",
+      dict: { model: scalarName, models: (0, import_pluralize3.default)(scalarName), sysName: sys3.name },
+      overwrite: false
+    });
+  }
   async createScalarConstant(sys3, scalarName) {
     const isContinued = sys3.exists(`lib/__scalar/${scalarName}/${scalarName}.constant.ts`);
     const prompt = new ScalarPrompt(sys3, scalarName);
@@ -7450,12 +7458,7 @@ var ScalarRunner = class {
     const writes = await session.writeTypescripts(request, sys3, { validate });
     const scalarNames = writes.map(({ filePath }) => filePath.split("/").at(-2)).filter((name) => !!name);
     for (const name of scalarNames)
-      await sys3.applyTemplate({
-        basePath: "./lib/__scalar",
-        template: "__scalar",
-        dict: { model: name, models: (0, import_pluralize3.default)(name), sysName: sys3.name },
-        overwrite: false
-      });
+      await this.applyScalarTemplate(sys3, name);
     return { session, scalarNames, writes, prompt };
   }
   async updateScalarDictionaries(sys3, scalarNames, { session }) {
@@ -7475,6 +7478,9 @@ var ScalarRunner = class {
 var ScalarScript = class {
   #runner = new ScalarRunner();
   async createScalar(sys3, scalarName) {
+    await this.#runner.applyScalarTemplate(sys3, scalarName);
+  }
+  async createScalarWithAi(sys3, scalarName) {
     const { session, scalarNames } = await this.#runner.createScalarConstant(sys3, scalarName);
     await this.#runner.updateScalarDictionaries(sys3, scalarNames, { session });
   }
@@ -7486,22 +7492,22 @@ var ScalarScript = class {
 // pkgs/@akanjs/cli/src/scalar/scalar.command.ts
 var ScalarCommand = class {
   scalarScript = new ScalarScript();
-  async createScalar(sys3, scalarName) {
+  async createScalar(scalarName, sys3) {
     await this.scalarScript.createScalar(sys3, lowerlize(scalarName.replace(/ /g, "")));
   }
-  async removeScalar(sys3, scalarName) {
+  async removeScalar(scalarName, sys3) {
     await this.scalarScript.removeScalar(sys3, scalarName);
   }
 };
 __decorateClass([
   Target.Public(),
-  __decorateParam(0, Sys()),
-  __decorateParam(1, Argument("scalarName", { desc: "name of scalar scalar" }))
+  __decorateParam(0, Argument("scalarName", { desc: "name of scalar scalar" })),
+  __decorateParam(1, Sys())
 ], ScalarCommand.prototype, "createScalar", 1);
 __decorateClass([
   Target.Public(),
-  __decorateParam(0, Sys()),
-  __decorateParam(1, Argument("scalarName", { desc: "name of scalar scalar" }))
+  __decorateParam(0, Argument("scalarName", { desc: "name of scalar scalar" })),
+  __decorateParam(1, Sys())
 ], ScalarCommand.prototype, "removeScalar", 1);
 ScalarCommand = __decorateClass([
   Commands()

package/cjs/src/templates/__scalar/__model__/__model__.dictionary.js

@@ -24,21 +24,14 @@ __export(model_dictionary_exports, {
 module.exports = __toCommonJS(model_dictionary_exports);
 function getContent(scanInfo, dict) {
   return `
-import { ModelDictionary } from "@akanjs/dictionary";
+import { scalarDictionary } from "@akanjs/dictionary";
 
 import type { ${dict.Model} } from "./${dict.model}.constant";
 
-export const dictionary = {
-  modelName: ["${dict.Model}", "${dict.Model}"],
-  modelDesc: ["${dict.Model}", "${dict.Model}"],
-
-  // * ==================== Model ==================== * //
-  field: ["Field", "\uD544\uB4DC"],
-  "desc-field": ["Field", "\uD544\uB4DC"],
-  // * ==================== Model ==================== * //
-
-  // * ==================== Etc ==================== * //
-  // * ==================== Etc ==================== * //
-} satisfies ModelDictionary<${dict.Model}>;
+export const dictionary = scalarDictionary(["en", "ko"])
+  .of((t) => t(["${dict.Model}", "${dict.Model}"]).desc(["${dict.Model} description", "${dict.Model} \uC124\uBA85"]))
+  .model<${dict.Model}>((t) => ({
+    field: t(["Field", "\uD544\uB4DC"]).desc(["Field Description", "\uD544\uB4DC \uC124\uBA85"]),
+  }));
 `;
 }

package/cjs/src/templates/module/__model__.dictionary.js

@@ -27,7 +27,6 @@ function getContent(scanInfo, dict) {
 import { modelDictionary } from "@akanjs/dictionary";
 
 import type { ${dict.Model}, ${dict.Model}Insight } from "./${dict.model}.constant";
-import type { ${dict.Model}Filter } from "./${dict.model}.document";
 import type { ${dict.Model}Endpoint, ${dict.Model}Slice } from "./${dict.model}.signal";
 
 export const dictionary = modelDictionary(["en", "ko"])

package/esm/index.js

@@ -7422,6 +7422,14 @@ ${boilerplate}
 
 // pkgs/@akanjs/cli/src/scalar/scalar.runner.ts
 var ScalarRunner = class {
+  async applyScalarTemplate(sys3, scalarName) {
+    await sys3.applyTemplate({
+      basePath: "./lib/__scalar",
+      template: "__scalar",
+      dict: { model: scalarName, models: pluralize2(scalarName), sysName: sys3.name },
+      overwrite: false
+    });
+  }
   async createScalarConstant(sys3, scalarName) {
     const isContinued = sys3.exists(`lib/__scalar/${scalarName}/${scalarName}.constant.ts`);
     const prompt = new ScalarPrompt(sys3, scalarName);
@@ -7430,12 +7438,7 @@ var ScalarRunner = class {
     const writes = await session.writeTypescripts(request, sys3, { validate });
     const scalarNames = writes.map(({ filePath }) => filePath.split("/").at(-2)).filter((name) => !!name);
     for (const name of scalarNames)
-      await sys3.applyTemplate({
-        basePath: "./lib/__scalar",
-        template: "__scalar",
-        dict: { model: name, models: pluralize2(name), sysName: sys3.name },
-        overwrite: false
-      });
+      await this.applyScalarTemplate(sys3, name);
     return { session, scalarNames, writes, prompt };
   }
   async updateScalarDictionaries(sys3, scalarNames, { session }) {
@@ -7455,6 +7458,9 @@ var ScalarRunner = class {
 var ScalarScript = class {
   #runner = new ScalarRunner();
   async createScalar(sys3, scalarName) {
+    await this.#runner.applyScalarTemplate(sys3, scalarName);
+  }
+  async createScalarWithAi(sys3, scalarName) {
     const { session, scalarNames } = await this.#runner.createScalarConstant(sys3, scalarName);
     await this.#runner.updateScalarDictionaries(sys3, scalarNames, { session });
   }
@@ -7466,22 +7472,22 @@ var ScalarScript = class {
 // pkgs/@akanjs/cli/src/scalar/scalar.command.ts
 var ScalarCommand = class {
   scalarScript = new ScalarScript();
-  async createScalar(sys3, scalarName) {
+  async createScalar(scalarName, sys3) {
     await this.scalarScript.createScalar(sys3, lowerlize(scalarName.replace(/ /g, "")));
   }
-  async removeScalar(sys3, scalarName) {
+  async removeScalar(scalarName, sys3) {
     await this.scalarScript.removeScalar(sys3, scalarName);
   }
 };
 __decorateClass([
   Target.Public(),
-  __decorateParam(0, Sys()),
-  __decorateParam(1, Argument("scalarName", { desc: "name of scalar scalar" }))
+  __decorateParam(0, Argument("scalarName", { desc: "name of scalar scalar" })),
+  __decorateParam(1, Sys())
 ], ScalarCommand.prototype, "createScalar", 1);
 __decorateClass([
   Target.Public(),
-  __decorateParam(0, Sys()),
-  __decorateParam(1, Argument("scalarName", { desc: "name of scalar scalar" }))
+  __decorateParam(0, Argument("scalarName", { desc: "name of scalar scalar" })),
+  __decorateParam(1, Sys())
 ], ScalarCommand.prototype, "removeScalar", 1);
 ScalarCommand = __decorateClass([
   Commands()

package/esm/src/templates/__scalar/__model__/__model__.dictionary.js

@@ -1,22 +1,15 @@
 // pkgs/@akanjs/cli/src/templates/__scalar/__model__/__model__.dictionary.ts
 function getContent(scanInfo, dict) {
   return `
-import { ModelDictionary } from "@akanjs/dictionary";
+import { scalarDictionary } from "@akanjs/dictionary";
 
 import type { ${dict.Model} } from "./${dict.model}.constant";
 
-export const dictionary = {
-  modelName: ["${dict.Model}", "${dict.Model}"],
-  modelDesc: ["${dict.Model}", "${dict.Model}"],
-
-  // * ==================== Model ==================== * //
-  field: ["Field", "\uD544\uB4DC"],
-  "desc-field": ["Field", "\uD544\uB4DC"],
-  // * ==================== Model ==================== * //
-
-  // * ==================== Etc ==================== * //
-  // * ==================== Etc ==================== * //
-} satisfies ModelDictionary<${dict.Model}>;
+export const dictionary = scalarDictionary(["en", "ko"])
+  .of((t) => t(["${dict.Model}", "${dict.Model}"]).desc(["${dict.Model} description", "${dict.Model} \uC124\uBA85"]))
+  .model<${dict.Model}>((t) => ({
+    field: t(["Field", "\uD544\uB4DC"]).desc(["Field Description", "\uD544\uB4DC \uC124\uBA85"]),
+  }));
 `;
 }
 export {

package/esm/src/templates/module/__model__.dictionary.js

@@ -4,7 +4,6 @@ function getContent(scanInfo, dict) {
 import { modelDictionary } from "@akanjs/dictionary";
 
 import type { ${dict.Model}, ${dict.Model}Insight } from "./${dict.model}.constant";
-import type { ${dict.Model}Filter } from "./${dict.model}.document";
 import type { ${dict.Model}Endpoint, ${dict.Model}Slice } from "./${dict.model}.signal";
 
 export const dictionary = modelDictionary(["en", "ko"])

package/package.json

@@ -2,7 +2,7 @@
   "type": "module",
   "sourceType": "module",
   "name": "@akanjs/cli",
-  "version": "0.9.60-canary.1",
+  "version": "0.9.60-canary.2",
   "bin": {
     "akan": "esm/index.js"
   },

package/src/scalar/scalar.command.d.ts

@@ -2,6 +2,6 @@ import { Sys } from "@akanjs/devkit";
 import { ScalarScript } from "./scalar.script";
 export declare class ScalarCommand {
     scalarScript: ScalarScript;
-    createScalar(sys: Sys, scalarName: string): Promise<void>;
-    removeScalar(sys: Sys, scalarName: string): Promise<void>;
+    createScalar(scalarName: string, sys: Sys): Promise<void>;
+    removeScalar(scalarName: string, sys: Sys): Promise<void>;
 }

package/src/scalar/scalar.runner.d.ts

@@ -1,6 +1,7 @@
 import { AiSession, type Sys } from "@akanjs/devkit";
 import { ScalarPrompt } from "./scalar.prompt";
 export declare class ScalarRunner {
+    applyScalarTemplate(sys: Sys, scalarName: string): Promise<void>;
     createScalarConstant(sys: Sys, scalarName: string): Promise<{
         session: AiSession;
         scalarNames: string[];

package/src/scalar/scalar.script.d.ts

@@ -2,5 +2,6 @@ import { type Sys } from "@akanjs/devkit";
 export declare class ScalarScript {
     #private;
     createScalar(sys: Sys, scalarName: string): Promise<void>;
+    createScalarWithAi(sys: Sys, scalarName: string): Promise<void>;
     removeScalar(sys: Sys, scalarName: string): Promise<void>;
 }