@akanjs/cli 0.0.58 → 0.0.60

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@akanjs/cli",
-  "version": "0.0.58",
+  "version": "0.0.60",
   "bin": {
     "akan": "index.js"
   },
@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@inquirer/prompts": "^7.2.1",
-    "@langchain/core": "^0.3.27",
-    "@langchain/openai": "^0.3.16",
+    "@langchain/core": "^0.3.56",
+    "@langchain/openai": "^0.5.10",
     "@next/bundle-analyzer": "^15.1.3",
     "@nx/devkit": "^20.7.2",
     "@trapezedev/project": "^7.1.3",
@@ -35,7 +35,6 @@
     "form-data": "^4.0.1",
     "js-yaml": "^4.1.0",
     "latest-version": "^9.0.0",
-    "lodash": "^4.17.21",
     "next-pwa": "^5.6.0",
     "open": "^10.1.1",
     "ora": "^3.4.0",

package/pkgs/@akanjs/cli/src/application/application.runner.d.ts

@@ -7,6 +7,7 @@ export interface ReleaseSourceOptions {
 }
 export declare class ApplicationRunner {
     #private;
+    createApplication(appName: string, workspace: Workspace): Promise<void>;
     scanSync(app: App): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
     buildBackend(app: App, distApp: DistAppExecutor): Promise<void>;
     serveBackend(app: App, distApp: DistAppExecutor): Promise<void>;

package/pkgs/@akanjs/cli/src/application/application.script.d.ts

@@ -1,10 +1,11 @@
-import type { App } from "@akanjs/devkit";
+import type { App, Workspace } from "@akanjs/devkit";
 import { DistAppExecutor } from "@akanjs/devkit";
 import { LibraryScript } from "../library/library.script";
 import { type ReleaseSourceOptions } from "./application.runner";
 export declare class ApplicationScript {
     #private;
     libraryScript: LibraryScript;
+    createApplication(appName: string, workspace: Workspace): Promise<void>;
     scanApplication(app: App): Promise<void>;
     syncApplication(app: App, { recursive }?: {
         recursive?: boolean;

package/pkgs/@akanjs/cli/src/library/library.command.d.ts

@@ -6,5 +6,7 @@ export declare class LibraryCommand {
     removeLibrary(lib: Lib, workspace: Workspace): Promise<void>;
     scanLibrary(lib: Lib): Promise<void>;
     buildLibrary(lib: Lib): Promise<void>;
-    pushLibrary(lib: Lib): Promise<void>;
+    installLibrary(name: string, workspace: Workspace): Promise<void>;
+    pushLibrary(lib: Lib, branch: string): Promise<void>;
+    pullLibrary(lib: Lib, branch: string): Promise<void>;
 }

package/pkgs/@akanjs/cli/src/library/library.runner.d.ts

@@ -1,4 +1,7 @@
-import { Lib } from "@akanjs/devkit";
+import { Lib, Workspace } from "@akanjs/devkit";
 export declare class LibraryRunner {
     scanSync(lib: Lib): Promise<import("@akanjs/config").AppScanResult | import("@akanjs/config").LibScanResult>;
+    installLibrary(workspace: Workspace, libName: string): Promise<void>;
+    pushLibrary(lib: Lib, branch: string): Promise<void>;
+    pullLibrary(lib: Lib, branch: string): Promise<void>;
 }

package/pkgs/@akanjs/cli/src/library/library.script.d.ts

@@ -1,8 +1,11 @@
-import type { Lib } from "@akanjs/devkit";
+import type { Lib, Workspace } from "@akanjs/devkit";
 export declare class LibraryScript {
     #private;
     scanLibrary(lib: Lib): Promise<void>;
     syncLibrary(lib: Lib, { recursive }?: {
         recursive?: boolean;
     }): Promise<void>;
+    installLibrary(workspace: Workspace, libName: string): Promise<void>;
+    pushLibrary(lib: Lib, branch: string): Promise<void>;
+    pullLibrary(lib: Lib, branch: string): Promise<void>;
 }

package/pkgs/@akanjs/cli/src/module/module.command.d.ts

@@ -5,7 +5,7 @@ export declare class ModuleCommand {
     createModule(name: string, workspace: Workspace): Promise<void>;
     removeModule(name: string, workspace: Workspace): Promise<void>;
     scanModule(name: string, workspace: Workspace): Promise<void>;
-    createScalar(sys: Sys, name: string, workspace: Workspace): Promise<void>;
+    createScalar(sys: Sys, name: string, description: string, schemaDescription: string, workspace: Workspace): Promise<void>;
     createService(name: string, workspace: Workspace): Promise<void>;
     createTest(name: string, workspace: Workspace): Promise<void>;
     createView(name: string, workspace: Workspace): Promise<void>;

package/pkgs/@akanjs/cli/src/module/module.prompt.d.ts

@@ -7,7 +7,7 @@ interface RequestConstantProps {
     modelSchemaDesign: string;
     boilerplate: string;
     otherConstants: {
-        path: string;
+        filepath: string;
         content: string;
     }[];
 }

package/pkgs/@akanjs/cli/src/module/module.script.d.ts

@@ -3,7 +3,7 @@ export declare class ModuleScript {
     #private;
     createModule(workspace: Workspace, name: string): Promise<void>;
     removeModule(workspace: Workspace, name: string): Promise<void>;
-    createScalar(sys: Sys, name: string): Promise<void>;
+    createScalar(sys: Sys, name: string, description: string, schemaDescription: string): Promise<void>;
     createService(workspace: Workspace, name: string): Promise<void>;
     createTest(workspace: Workspace, name: string): Promise<void>;
     createUnit(workspace: Workspace, type: "app" | "lib", appOrLibName: string, modelName: string): Promise<void>;

package/pkgs/@akanjs/cli/src/workspace/workspace.command.d.ts

@@ -2,7 +2,6 @@ import { Workspace } from "@akanjs/devkit";
 import { WorkspaceScript } from "./workspace.script";
 export declare class WorkspaceCommand {
     workspaceScript: WorkspaceScript;
-    createWorkspace(name: string, dir: string, app: string): Promise<void>;
-    installLibrary(name: string, workspace: Workspace): Promise<void>;
+    createWorkspace(name: string, app: string, dir: string): Promise<void>;
     generateMongo(workspace: Workspace): Promise<void>;
 }

package/pkgs/@akanjs/cli/src/workspace/workspace.runner.d.ts

@@ -2,5 +2,4 @@ import { type Workspace } from "@akanjs/devkit";
 export declare class WorkspaceRunner {
     createWorkspace(repoName: string, appName: string, dirname?: string): Promise<void>;
     generateMongo(workspace: Workspace): Promise<void>;
-    installLibrary(workspace: Workspace, libName: string): Promise<void>;
 }

package/pkgs/@akanjs/cli/src/workspace/workspace.script.d.ts

@@ -1,7 +1,10 @@
 import { WorkspaceExecutor } from "@akanjs/devkit";
+import { ApplicationScript } from "../application/application.script";
+import { LibraryScript } from "../library/library.script";
 export declare class WorkspaceScript {
     #private;
+    applicationScript: ApplicationScript;
+    libraryScript: LibraryScript;
     createWorkspace(repoName: string, appName: string, dirname?: string): Promise<void>;
     generateMongo(workspace: WorkspaceExecutor): Promise<void>;
-    installLibrary(workspace: WorkspaceExecutor, libName: string): Promise<void>;
 }

package/pkgs/@akanjs/devkit/src/aiEditor.d.ts

@@ -0,0 +1,17 @@
+import { BaseMessage } from "@langchain/core/messages";
+interface EditOptions {
+    onChunk?: (chunk: string) => void;
+    maxTry?: number;
+}
+export declare class AiSession {
+    #private;
+    readonly messageHistory: BaseMessage[];
+    constructor(messageHistory?: BaseMessage[]);
+    ask(question: string, { onChunk, }?: EditOptions): Promise<{
+        content: string;
+        messageHistory: BaseMessage[];
+    }>;
+    edit(question: string, { onChunk, maxTry }?: EditOptions): Promise<string>;
+    editTypescript(question: string, options?: EditOptions): Promise<string>;
+}
+export {};

package/pkgs/@akanjs/devkit/src/executors.d.ts

@@ -16,6 +16,10 @@ export declare class Executor {
     mkdir(dirPath: string): this;
     writeFile(filePath: string, content: string | object): this;
     writeJson(filePath: string, content: object): this;
+    getLocalFile(filePath: string): {
+        filepath: string;
+        content: string;
+    };
     readFile(filePath: string): string;
     readJson(filePath: string): object;
     cp(srcPath: string, destPath: string): Promise<void>;
@@ -46,6 +50,15 @@ export declare class WorkspaceExecutor extends Executor {
     getLibs(): Promise<string[]>;
     getSyss(): Promise<[string[], string[]]>;
     getPkgs(): Promise<string[]>;
+    setTsPaths(type: "app" | "lib", name: string): this;
+    commit(message: string, { init, add }?: {
+        init?: boolean;
+        add?: boolean;
+    }): Promise<void>;
+    getScalarConstantFiles(): Promise<{
+        filepath: string;
+        content: string;
+    }[]>;
 }
 interface SysExecutorOptions {
     workspace?: WorkspaceExecutor;
@@ -64,9 +77,22 @@ export declare class SysExecutor extends Executor {
     }, libScanResults?: {
         [key: string]: LibScanResult;
     }): Promise<AppScanResult | LibScanResult>;
+    getLocalFile(filePath: string): {
+        filepath: string;
+        content: string;
+    };
     getDatabaseModules(): Promise<string[]>;
     getServiceModules(): Promise<string[]>;
     getScalarModules(): Promise<string[]>;
+    getScalarConstantFiles(): Promise<{
+        filepath: string;
+        content: string;
+    }[]>;
+    getScalarDictionaryFiles(): Promise<{
+        filepath: string;
+        content: string;
+    }[]>;
+    setTsPaths(): this;
 }
 interface AppExecutorOptions {
     workspace?: WorkspaceExecutor;

package/pkgs/@akanjs/devkit/src/index.d.ts

@@ -16,3 +16,4 @@ export * from "./capacitorApp";
 export * from "./extractDeps";
 export * from "./commandDecorators";
 export * from "./installExternalLib";
+export * from "./aiEditor";

package/pkgs/@akanjs/devkit/src/streamAi.d.ts

@@ -2,5 +2,5 @@ interface StreamResponse {
     content: string;
     chunk?: string;
 }
-export declare const streamAi: (question: string, callback: (chunk: string) => void) => Promise<StreamResponse>;
+export declare const streamAi: (question: string, callback?: (chunk: string) => void) => Promise<StreamResponse>;
 export {};

package/src/templates/app/akan.config.js

@@ -0,0 +1,35 @@
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var akan_config_exports = {};
+__export(akan_config_exports, {
+  default: () => getContent
+});
+module.exports = __toCommonJS(akan_config_exports);
+function getContent(scanResult, dict) {
+  return `
+import type { AppConfig } from "@akanjs/config";
+
+const config: AppConfig = {
+  rootLib: "shared",
+  libs: ["util", "shared"],
+};
+
+export default config;
+  `;
+}
+module.exports = module.exports.default;

package/src/templates/app/env/env.client.debug.ts.template

@@ -0,0 +1,7 @@
+import { baseClientEnv } from "@akanjs/base";
+
+import { AppClientEnv } from "./env.client.type";
+
+export const env: AppClientEnv = {
+  ...baseClientEnv,
+} as const;

package/src/templates/app/env/env.client.develop.ts.template

@@ -0,0 +1,7 @@
+import { baseClientEnv } from "@akanjs/base";
+
+import { AppClientEnv } from "./env.client.type";
+
+export const env: AppClientEnv = {
+  ...baseClientEnv,
+} as const;

package/src/templates/app/env/env.client.main.ts.template

@@ -0,0 +1,7 @@
+import { baseClientEnv } from "@akanjs/base";
+
+import { AppClientEnv } from "./env.client.type";
+
+export const env: AppClientEnv = {
+  ...baseClientEnv,
+} as const;

package/src/templates/app/env/env.client.testing.ts.template

@@ -0,0 +1,7 @@
+import { baseClientEnv } from "@akanjs/base";
+
+import { AppClientEnv } from "./env.client.type";
+
+export const env: AppClientEnv = {
+  ...baseClientEnv,
+} as const;

package/src/templates/app/env/env.client.type.js

@@ -25,7 +25,7 @@ function getContent(scanResult, dict = {}) {
 import type { BaseClientEnv } from "@akanjs/base";
 
 export type AppClientEnv = BaseClientEnv & {
-  cloudflare: {
+  cloudflare?: {
     siteKey: string;
   };
 };

package/src/templates/app/env/env.server.debug.ts.template

@@ -0,0 +1,15 @@
+import { baseEnv } from "@akanjs/base";
+
+import type { ModulesOptions } from "../lib/option";
+
+export const env: ModulesOptions = {
+  ...baseEnv,
+  hostname: null,
+  redis: {},
+  mongo: { password: "S20n-D2bUg" },
+  security: {
+    verifies: [["password", "phone", "naver", "kakao"]],
+    sso: {},
+  },
+  rootAdminInfo: { accountId: "akamirofficial@gmail.com", password: "akamir190319" },
+};

package/src/templates/app/env/env.server.develop.ts.template

@@ -0,0 +1,15 @@
+import { baseEnv } from "@akanjs/base";
+
+import type { ModulesOptions } from "../lib/option";
+
+export const env: ModulesOptions = {
+  ...baseEnv,
+  hostname: null,
+  redis: {},
+  mongo: { password: "S20n-D2VeL0p-0905*" },
+  security: {
+    verifies: [["password", "phone", "naver", "kakao"]],
+    sso: {},
+  },
+  rootAdminInfo: { accountId: "akamirofficial@gmail.com", password: "akamir190319" },
+};

package/src/templates/app/env/env.server.main.ts.template

@@ -0,0 +1,15 @@
+import { baseEnv } from "@akanjs/base";
+
+import type { ModulesOptions } from "../lib/option";
+
+export const env: ModulesOptions = {
+  ...baseEnv,
+  hostname: null,
+  redis: {},
+  mongo: { password: "S20n-m@In-0905*-SEON" },
+  security: {
+    verifies: [["password", "phone", "naver", "kakao"]],
+    sso: {},
+  },
+  rootAdminInfo: { accountId: "akamirofficial@gmail.com", password: "akamir190319" },
+};

package/src/templates/app/env/env.server.testing.ts.template

@@ -0,0 +1,7 @@
+import { env as shared } from "@shared/server";
+
+import type { ModulesOptions } from "../lib/option";
+
+export const env: ModulesOptions = {
+  ...shared,
+};

package/src/templates/app/tsconfig.json.template

@@ -9,14 +9,14 @@
     "jsx": "preserve",
     "plugins": [
       {
-        "name": "next",
-      },
-    ],
+        "name": "next"
+      }
+    ]
   },
   "include": ["./**/*.ts", "./**/*.tsx", ".next/types/**/*.ts"],
   "references": [
     {
-      "path": "./tsconfig.spec.json",
-    },
-  ],
+      "path": "./tsconfig.spec.json"
+    }
+  ]
 }

package/src/templates/workspaceRoot/.gitignore.template

@@ -0,0 +1,117 @@
+**/dist
+/node_modules
+/.akan
+.vscode/*
+.DS_Store
+Thumbs.db
+*.env
+**/node_modules
+/data
+apps/*/data
+/releases
+apps/*/scripts
+**/.env
+**/env.client.debug.ts
+**/env.client.develop.ts
+**/env.client.main.ts
+**/env.client.testing.ts
+**/env.server.debug.ts
+**/env.server.develop.ts
+**/env.server.main.ts
+**/env.server.testing.ts
+**/*secrets.yaml
+**/kubeconfig.yaml
+**/secrets.*
+apps/**/src/schema.gql
+.next
+dump
+local
+
+# Xcode
+build/
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+*.xccheckout
+*.moved-aside
+DerivedData
+*.hmap
+*.ipa
+*.xcuserstate
+
+# **/android
+build/
+.gradle
+local.properties
+*.iml
+*.hprof
+.cxx/
+*.keystore
+!debug.keystore
+
+**/public/precache.*.*.js
+**/public/sw.js
+**/public/workbox-*.js
+**/public/worker-*.js
+**/public/fallback-*.js
+**/public/precache.*.*.js.map
+**/public/sw.js.map
+**/public/workbox-*.js.map
+**/public/worker-*.js.map
+**/public/fallback-*.js
+**/public/libs
+
+**/vendor/bundle/
+**/ios/App/App/public
+**/ios/App/App/Podfile.lock
+**/ios/App/App.pbxproj
+**/*-secret.yaml
+
+# Akanjs files
+**/akan.app.json
+**/akan.lib.json
+**/akan.pkg.json
+**/next.config.ts
+**/next-env.d.ts
+apps/**/lib/__lib/**
+libs/**/lib/__lib/**
+apps/*/lib/cnst.ts
+apps/*/lib/cnst_.ts
+apps/*/lib/dict.ts
+apps/*/lib/db.ts
+apps/*/lib/fetch.ts
+apps/*/lib/srv.ts
+apps/*/lib/st.ts
+apps/*/lib/sig.ts
+apps/*/lib/store.ts
+apps/*/lib/usePage.ts
+apps/*/lib/__scalar/_server.ts
+apps/*/client.ts
+apps/*/server.ts
+libs/*/lib/cnst.ts
+libs/*/lib/cnst_.ts
+libs/*/lib/dict.ts
+libs/*/lib/db.ts
+libs/*/lib/fetch.ts
+libs/*/lib/srv.ts
+libs/*/lib/st.ts
+libs/*/lib/sig.ts
+libs/*/lib/store.ts
+libs/*/lib/usePage.ts
+libs/*/lib/__scalar/_server.ts
+libs/*/client.ts
+libs/*/server.ts
+libs/*/index.ts
+# **/capacitor.config.ts
+# **/postcss.config.js
+# **/playwright.config.ts
+# **/jest.config.ts
+# **/next-env.d.ts
+# **/tsconfig.json
+# **/tsconfig.spec.json

package/src/templates/{workplaceRoot/eslint.config.js.template → workspaceRoot/eslint.config.ts.template}

@@ -1,12 +1,12 @@
-const nx = require("@nx/eslint-plugin");
-const unusedImports = require("eslint-plugin-unused-imports");
-const simpleImportSort = require("eslint-plugin-simple-import-sort");
-const typescriptEslint = require("@typescript-eslint/eslint-plugin");
-const nxWorkspace = require("./tools/eslint-rules/index.ts");
-const tsParser = require("@typescript-eslint/parser");
-const js = require("@eslint/js");
+/* eslint-disable */
+import { FlatCompat } from "@eslint/eslintrc";
+import js from "@eslint/js";
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import tsParser from "@typescript-eslint/parser";
+import simpleImportSort from "eslint-plugin-simple-import-sort";
+import unusedImports from "eslint-plugin-unused-imports";
 
-const { FlatCompat } = require("@eslint/eslintrc");
+import akanjsLint from "@akanjs/lint";
 
 const compat = new FlatCompat({
   baseDirectory: __dirname,
@@ -14,7 +14,7 @@ const compat = new FlatCompat({
   allConfig: js.configs.all,
 });
 
-module.exports = [
+export default [
   {
     ignores: [
       "**/node_modules/**/*",
@@ -43,8 +43,7 @@ module.exports = [
   ),
   {
     plugins: {
-      "@nx": nx,
-      "@nx/workspace": nxWorkspace,
+      "@akanjs/lint": akanjsLint,
       "unused-imports": unusedImports,
       "simple-import-sort": simpleImportSort,
       "@typescript-eslint": typescriptEslint,
@@ -77,10 +76,10 @@ module.exports = [
 
     rules: {
       "no-console": "error",
-      "@nx/workspace/useClientByFile": "error",
-      "@nx/workspace/noImportClientFunctions": "error",
-      "@nx/workspace/nonScalarPropsRestricted": "error",
-      "@nx/workspace/noImportExternalLibrary": "error",
+      "@akanjs/lint/useClientByFile": "error",
+      "@akanjs/lint/noImportClientFunctions": "error",
+      "@akanjs/lint/nonScalarPropsRestricted": "error",
+      "@akanjs/lint/noImportExternalLibrary": "error",
       "@typescript-eslint/no-inferrable-types": "off",
       "@typescript-eslint/restrict-template-expressions": "off",
       "@typescript-eslint/consistent-indexed-object-style": "off",
@@ -108,10 +107,6 @@ module.exports = [
       "import/newline-after-import": "warn",
     },
   },
-  ...compat.extends("plugin:@nx/typescript").map((config) => ({
-    ...config,
-    files: ["**/*.ts", "**/*.tsx"],
-  })),
   {
     files: ["**/*.ts", "**/*.tsx"],
     rules: {},

package/src/templates/app/akan.config.ts.template

@@ -1,5 +0,0 @@
-import type { AppConfig } from "@akanjs/config";
-
-const config: AppConfig = {};
-
-export default config;