namirasoft-sdk-generator 1.4.21 → 1.4.23

package/src/builder/npm/NPMBuilder.ts

@@ -28,8 +28,8 @@ export class NPMBuilder extends BaseBuilder
         await this.dst.download("https://static.namirasoft.com/template/npm/ts/tsconfig.json", "tsconfig.json");
         await this.dst.download("https://static.namirasoft.com/template/gitlab-ci.yml/npm-publish.yml", ".gitlab-ci.yml");
         let packagejson: any = {
-            name: this.name,
-            title: this.title + " NPM Package",
+            name: this.name_parser.api.name_namirasoft,
+            title: this.name_parser.api.title_namirasoft + " NPM Package",
             description: this.description + " NPM Package",
             "icon": "logo.png",
             "logo": this.src.json.logo,
@@ -52,9 +52,9 @@ export class NPMBuilder extends BaseBuilder
             },
             "bin": {}
         };
-        packagejson.bin[this.command] = "./dist/command/cli.js";
+        packagejson.bin[this.name_parser.command.name] = "./dist/command/cli.js";
         if (this.account)
-            if (this.src.json.name != "namirasoft-account-api-v1")
+            if (!this.name_parser.isAccountAPI)
                 packagejson.dependencies["namirasoft-account"] = BaseBuilder.MIN_VERSION;
         let extra = Object.keys(this.src.json.package?.dependencies ?? {});
         for (let i = 0; i < extra.length; i++)
@@ -89,13 +89,30 @@ export class NPMBuilder extends BaseBuilder
         }
         // Meta
         let metas: TS[] = [];
-        let Name = NamingConvention.Pascal_Case_Space.convert(this.title, NamingConvention.Pascal_Case);
-        let metadatabase = new TS("./src/meta", "./meta/", Name + "MetaDatabase", "NSBaseMetaDatabase", true);
+
+        let name_class_namirasoft_entity = this.name_parser.api.class_namirasoft;
+        let constructor_args = [];
+        if (this.account)
+            constructor_args.push(`manager: TokenManager`);
+        constructor_args.push(`onError: (error: Error) => void`);
+        let metadatabase = new TS("./src/meta", "./meta/", name_class_namirasoft_entity + "MetaDatabase", `NSBaseMetaDatabase<${name_class_namirasoft_entity}Server>`, true);
+        metadatabase.imports.push(`import { EnvService } from "namirasoft-core";`);
+        metadatabase.imports.push(`import { ${name_class_namirasoft_entity}Server } from "../${name_class_namirasoft_entity}Server";`);
         metadatabase.imports.push(`import { NSBaseMetaDatabase } from "namirasoft-site";`);
-        metadatabase.fields.push(`public static main: ${Name}MetaDatabase = new ${Name}MetaDatabase();`);
-        metadatabase.constructors.push(`constructor()`);
+        if (this.account)
+            if (this.name_parser.isAccountAPI)
+                metadatabase.imports.push(`import { TokenManager } from "../TokenManager";`);
+            else
+                metadatabase.imports.push(`import { TokenManager } from "namirasoft-account";`);
+        if (this.account)
+            metadatabase.fields.push(`private manager: TokenManager;`);
+        metadatabase.fields.push(`private onError: (error: Error) => void;`);
+        metadatabase.constructors.push(`constructor(${constructor_args.join(", ")})`);
         metadatabase.constructors.push(`{`);
         metadatabase.constructors.push(`    super({ id: "${this.product.id}", name: "${this.product.name}", headline: "${this.product.headline}", description: "${this.product.description}", logo: "${this.product.logo}", link: "${this.product.link}" });`);
+        if (this.account)
+            metadatabase.constructors.push(`    this.manager = manager;`);
+        metadatabase.constructors.push(`    this.onError = onError;`);
         let metadatabase_fields_tables: string[] = [];
         let metadatabase_constructors_init: string[] = [];
         for (let i = 0; i < this.schema.tables.length; i++)
@@ -111,7 +128,19 @@ export class NPMBuilder extends BaseBuilder
         metadatabase.constructors.push(`    this.tables = {`);
         metadatabase_constructors_init.forEach(x => { metadatabase.constructors.push(x) });
         metadatabase.constructors.push(`    };`);
-        metadatabase.constructors.push(`};`);
+        metadatabase.constructors.push(`}`);
+
+        let getServer_args = [`BASE_URL`];
+        if (this.account)
+            getServer_args.push(`this.manager`);
+        getServer_args.push(`this.onError`);
+
+        metadatabase.functions.push(`override getServer(): ${name_class_namirasoft_entity}Server`);
+        metadatabase.functions.push(`{`);
+        metadatabase.functions.push(`    let NAME = NSBaseMetaDatabase.getServerBaseURL(this.product.name);`);
+        metadatabase.functions.push(`    let BASE_URL = new EnvService(NAME, true).getString();`);
+        metadatabase.functions.push(`    return new ${name_class_namirasoft_entity}Server(${getServer_args.join(", ")});`);
+        metadatabase.functions.push(`}`);
         metas.push(metadatabase);
 
         // Row
@@ -193,12 +222,12 @@ export class NPMBuilder extends BaseBuilder
             ts.imports.push(`import { ${tag}Command } from "./${tag}Command";`);
         });
         if (this.account)
-            if (this.src.json.name != "namirasoft-account-api-v1")
-                ts.imports.push(`import { AccountCommand } from "namirasoft-account";`);
-            else
+            if (this.name_parser.isAccountAPI)
                 ts.imports.push(`import { AccountCommand } from "./AccountCommand";`);
+            else
+                ts.imports.push(`import { AccountCommand } from "namirasoft-account";`);
         ts.imports.push(`import { ConfigCommand } from "namirasoft-node-cli";`);
-        ts.scripts.push(`let app = new Application("${this.command}", new BaseStorage(), `);
+        ts.scripts.push(`let app = new Application("${this.name_parser.command.name}", new BaseStorage(), `);
         ts.scripts.push(`    { `);
         tags.forEach(tag =>
         {
@@ -206,8 +235,8 @@ export class NPMBuilder extends BaseBuilder
         });
         if (this.account)
             ts.scripts.push(`        "account": AccountCommand,`);
-        this.command
-        ts.scripts.push(`        "config": (argv: string[]) => new ConfigCommand(argv, ["${this.command}-server-url"])`);
+
+        ts.scripts.push(`        "config": (argv: string[]) => new ConfigCommand(argv, ["${this.name_parser.command.name}-server-url"])`);
         ts.scripts.push(`    });`);
         ts.scripts.push(`app.run();`);
         return ts;
@@ -239,7 +268,7 @@ export class NPMBuilder extends BaseBuilder
     }
     async getCLIControllerCommand(controller: ControllerSchema): Promise<TS> 
     {
-        let className = this.title.replace(/\s/gm, "") + "Server";
+        let name_class_namirasoft_entity_server = this.name_parser.api.class_namirasoft.replace(/\s/gm, "") + "Server";
 
         let args = ControllerSchema.getArgs(controller).map(a => a.name);
         let options = ControllerSchema.getOptions(controller);
@@ -257,14 +286,14 @@ export class NPMBuilder extends BaseBuilder
         let ts = new TS("./src/command", "./command/", controller.tag + controller.name + "Command", "BaseFinalCommand", true);
         if (this.account)
         {
-            if (this.src.json.name == "namirasoft-account-api-v1")
+            if (this.name_parser.isAccountAPI)
                 ts.imports.push(`import { TokenManager } from "../TokenManager";`);
             else
                 ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
             ts.imports.push(`import { IStorageMemory } from "namirasoft-core";`);
         }
         ts.imports.push(`import { BaseFinalCommand } from "namirasoft-node-cli";`);
-        ts.imports.push(`import { ${className} } from "../${className}";`);
+        ts.imports.push(`import { ${name_class_namirasoft_entity_server} } from "../${name_class_namirasoft_entity_server}";`);
         ts.constructors.push(`constructor(argv: string[])`);
         ts.constructors.push(`{`);
         if ((options ?? []).length == 0)
@@ -292,18 +321,18 @@ export class NPMBuilder extends BaseBuilder
         {
             ts.functions.push(`    let token = this.app.storage.getNSAToken();`);
             ts.functions.push(`    if (token == null)`);
-            ts.functions.push(`        throw new Error("Token is not available. Please login first using:\\n${this.command} account config \\nor \\n{this.command} account login.");`); // todo 
+            ts.functions.push(`        throw new Error("Token is not available. Please login first using:\\n${this.name_parser.command.name} account config \\nor \\n${this.name_parser.command.name} account login.");`); // todo 
             ts.functions.push(`    let storage = new IStorageMemory();`);
             ts.functions.push(`    let manager = new TokenManager(storage, () => { });`);
             ts.functions.push(`    manager.setValue(token, false);`);
         }
-        ts.functions.push(`    let url = this.app.storage.getItem("${this.command}-server-url");`);
-        ts.functions.push(`    let server = new ${className}(url, ${this.account ? "manager, " : ""}e => this.app.logger.error(e.message));`);
+        ts.functions.push(`    let url = this.app.storage.getItem("${this.name_parser.command.name}-server-url");`);
+        ts.functions.push(`    let server = new ${name_class_namirasoft_entity_server}(url, ${this.account ? "manager, " : ""}e => this.app.logger.error(e.message));`);
         if (options.length == 0 && controller.body?.type !== VariableType.Any)
-            ts.functions.push(`    let ans = await server.${controller.tag.toLowerCase()}.${controller.name}(${args.map((_, index) => `this.arg_values[${index}]`).join(", ")});`);
+            ts.functions.push(`    let ans = await server.${NamingConvention.auto.convert(controller.tag, NamingConvention.lower_case_underscore)}.${controller.name}(${args.map((_, index) => `this.arg_values[${index}]`).join(", ")});`);
         else
         {
-            ts.functions.push(`    let ans = await server.${controller.tag.toLowerCase()}.${controller.name}(${args.map((_, index) => `this.arg_values[${index}]`).join(", ")}${args.length == 0 ? "" : ", "}{`);
+            ts.functions.push(`    let ans = await server.${NamingConvention.auto.convert(controller.tag, NamingConvention.lower_case_underscore)}.${controller.name}(${args.map((_, index) => `this.arg_values[${index}]`).join(", ")}${args.length == 0 ? "" : ", "}{`);
             forEachVariable((option, last) =>
             {
                 ts.functions.push(`        ${option.name}: this.option_values.${option.name}${last ? "" : ","}`);
@@ -324,11 +353,14 @@ export class NPMBuilder extends BaseBuilder
             let TName = NamingConvention.Pascal_Case.convert(name, NamingConvention.Pascal_Case);
             let TNameSpace = NamingConvention.Pascal_Case.convert(name, NamingConvention.Pascal_Case_Space);
             let tname = NamingConvention.Pascal_Case.convert(name, NamingConvention.lower_case_underscore);
-            let ts = new TS("./src/meta", "./meta/", TName + "MetaTable", "NSBaseMetaTable", true);
-            ts.imports.push(`import { BaseUUID, BaseMetaColumn } from "namirasoft-core";`);
+            let row_name = this.src.json["ns-sdkg"]?.meta?.table?.[TName]?.row ?? (`${TName}Row`);
+            let ts = new TS("./src/meta", "./meta/", TName + "MetaTable", `NSBaseMetaTable<${this.name_parser.api.class_namirasoft}Server, ${row_name}>`, true);
+            ts.imports.push(`import { BaseUUID, BaseMetaColumn, FilterItem, SortItem } from "namirasoft-core";`);
             ts.imports.push(`import { NSBaseMetaDatabase, NSBaseMetaTable } from "namirasoft-site";`);
+            ts.imports.push(`import { ${row_name} } from "../row/${row_name}";`);
+            ts.imports.push(`import { ${this.name_parser.api.class_namirasoft}Server } from "../${this.name_parser.api.class_namirasoft}Server";`);
             ts.fields.push(`public override columns: {`);
-            ts.constructors.push(`constructor(database: NSBaseMetaDatabase)`);
+            ts.constructors.push(`constructor(database: NSBaseMetaDatabase<${this.name_parser.api.class_namirasoft}Server>)`);
             ts.constructors.push(`{`);
             ts.constructors.push(`    super(database, "${tname}", "${TNameSpace}", new BaseUUID("${short}"));`);
             ts.constructors.push(`    this.columns = {`);
@@ -348,6 +380,34 @@ export class NPMBuilder extends BaseBuilder
                 }
             ts.fields.push(`}`);
             ts.constructors.push(`    };`);
+            ts.constructors.push(`    this.back_end.get = async (id: string) =>`);
+            ts.constructors.push(`    {`);
+            if (this.src.json["ns-sdkg"]?.meta?.table?.[TName]?.["Get"]?.enabled ?? true)
+            {
+                let function_name = this.src.json["ns-sdkg"]?.meta?.table?.[TName]?.["Get"]?.function ?? "Get";
+                ts.constructors.push(`        let server = this.database.getServer();`);
+                ts.constructors.push(`        return await server.${tname}.${function_name}(id);`);
+            }
+            else
+            {
+                ts.constructors.push(`        console.log(id);`);
+                ts.constructors.push(`        throw new Error("${TName}.Get is not implemented");`);
+            }
+            ts.constructors.push(`    };`);
+            ts.constructors.push(`    this.back_end.list = async (filters: FilterItem[] | null, page: (number | null), size: (number | null), sorts: SortItem[]) =>`);
+            ts.constructors.push(`    {`);
+            if (this.src.json["ns-sdkg"]?.meta?.table?.[TName]?.["List"]?.enabled ?? true)
+            {
+                let function_name = this.src.json["ns-sdkg"]?.meta?.table?.[TName]?.["List"]?.function ?? "List";
+                ts.constructors.push(`        let server = this.database.getServer();`);
+                ts.constructors.push(`        return await server.${tname}.${function_name}(filters, page, size, sorts);`);
+            }
+            else
+            {
+                ts.constructors.push(`        console.log(filters, page, size, sorts);`);
+                ts.constructors.push(`        throw new Error("${TName}.List is not implemented");`);
+            }
+            ts.constructors.push(`    };`);
             ts.constructors.push(`}`);
             return ts;
         };
@@ -442,13 +502,13 @@ export class NPMBuilder extends BaseBuilder
 
     getServer(tags: string[]): TS
     {
-        let className = this.title.replace(/\s/gm, "") + "Server";
+        let name_class_namirasoft_entity_server = this.name_parser.api.class_namirasoft + "Server";
         let parentName = this.account ? "NSABaseServer" : "NSBaseServer";
-        let ts = new TS("./src", "./", className, parentName);
+        let ts = new TS("./src", "./", name_class_namirasoft_entity_server, parentName);
 
         if (this.account)
         {
-            if (this.src.json.name == "namirasoft-account-api-v1")
+            if (this.name_parser.isAccountAPI)
             {
                 ts.imports.push(`import { NSABaseServer } from "./NSABaseServer";`);
                 ts.imports.push(`import { TokenManager } from "./TokenManager";`);
@@ -464,8 +524,8 @@ export class NPMBuilder extends BaseBuilder
             ts.imports.push(`import { NSBaseServer } from "namirasoft-site";`);
         }
 
-        tags.forEach(tag => ts.imports.push(`import { ${className}${tag} } from "./${className}${tag}";`));
-        tags.forEach(tag => ts.fields.push(`${tag.toLowerCase()}: ${className}${tag};`));
+        tags.forEach(tag => ts.imports.push(`import { ${name_class_namirasoft_entity_server}${tag} } from "./${name_class_namirasoft_entity_server}${tag}";`));
+        tags.forEach(tag => ts.fields.push(`${NamingConvention.auto.convert(tag, NamingConvention.lower_case_underscore)}: ${name_class_namirasoft_entity_server}${tag};`));
 
         let pars: string[] = ["base_url: string"];
         let args: string[] = [`base_url`, `\`${this.src.json.version}\``];
@@ -487,20 +547,20 @@ export class NPMBuilder extends BaseBuilder
             ts.fields.push("protected onError;");
             ts.constructors.push(`    this.onError = onError;`);
         }
-        tags.forEach(tag => ts.constructors.push(`    this.${tag.toLowerCase()} = new ${className}${tag}(this);`));
+        tags.forEach(tag => ts.constructors.push(`    this.${NamingConvention.auto.convert(tag, NamingConvention.lower_case_underscore)} = new ${name_class_namirasoft_entity_server}${tag}(this);`));
         ts.constructors.push(`}`);
         return ts;
     }
     getServerBase(): TS
     {
-        let className = this.title.replace(/\s/gm, "") + "ServerBase";
-        let ts = new TS("./src", "./", className);
+        let name_class_namirasoft_entity_server_base = this.name_parser.api.class_namirasoft + "ServerBase";
+        let ts = new TS("./src", "./", name_class_namirasoft_entity_server_base);
 
-        let serverClassName = this.title.replace(/\s/gm, "") + "Server";
-        ts.imports.push(`import { ${serverClassName} } from "./${serverClassName}";`);
+        let name_class_namirasoft_entity_server = this.name_parser.api.class_namirasoft + "Server";
+        ts.imports.push(`import { ${name_class_namirasoft_entity_server} } from "./${name_class_namirasoft_entity_server}";`);
 
-        ts.fields.push(`public server: ${serverClassName};`);
-        ts.constructors.push(`constructor(server: ${serverClassName})`);
+        ts.fields.push(`public server: ${name_class_namirasoft_entity_server};`);
+        ts.constructors.push(`constructor(server: ${name_class_namirasoft_entity_server})`);
         ts.constructors.push(`{`);
         ts.constructors.push(`    this.server = server;`);
         ts.constructors.push(`}`);
@@ -509,17 +569,15 @@ export class NPMBuilder extends BaseBuilder
     }
     getServerTag(tag: string): TS
     {
-        let baseName = NamingConvention.Pascal_Case_Space.convert(this.title, NamingConvention.Pascal_Case) + "Server";
-        let parentName = baseName + "Base";
-        let className = baseName + tag;
-
-        let ts = new TS("./src", "./", className, parentName);
-        ts.imports.push(`import { ${parentName} } from "./${parentName}";`);
+        let name_class_namirasoft_entity_server = this.name_parser.api.class_namirasoft + "Server";
+        let name_class_namirasoft_entity_server_base = name_class_namirasoft_entity_server + "Base";
+        let name_class_namirasoft_entity_server_tag = name_class_namirasoft_entity_server + tag;
 
-        let serverClassName = this.title.replace(/\s/gm, "") + "Server";
-        ts.imports.push(`import { ${serverClassName} } from "./${serverClassName}";`);
+        let ts = new TS("./src", "./", name_class_namirasoft_entity_server_tag, name_class_namirasoft_entity_server_base);
+        ts.imports.push(`import { ${name_class_namirasoft_entity_server_base} } from "./${name_class_namirasoft_entity_server_base}";`);
+        ts.imports.push(`import { ${name_class_namirasoft_entity_server} } from "./${name_class_namirasoft_entity_server}";`);
 
-        ts.constructors.push(`constructor(server: ${serverClassName})`);
+        ts.constructors.push(`constructor(server: ${name_class_namirasoft_entity_server})`);
         ts.constructors.push(`{`);
         ts.constructors.push(`    super(server);`);
         for (let i = 0; i < this.schema.controllers.length; i++)

package/src/builder/php/PHPBuilder.ts

@@ -13,7 +13,7 @@ export class PHPBuilder extends BaseBuilder
     private getNameSpace(folder: string): string
     {
         let NameSpaceCase: NamingConvention = new NamingConvention("NameSpaceCase", "\\", true, NamingConvention.formatter_pascal, NamingConvention.splitter_uppercase);
-        let name = NamingConvention.lower_case_dash.convert(this.name, NameSpaceCase);
+        let name = NamingConvention.lower_case_dash.convert(this.name_parser.api.name_namirasoft, NameSpaceCase);
         let ans = [name];
         if (folder)
             ans.push(folder);
@@ -33,7 +33,7 @@ export class PHPBuilder extends BaseBuilder
         await this.dst.download("https://static.namirasoft.com/template/composer/php/.gitignore", ".gitignore");
 
         let composerjson: any = {
-            name: this.name.replace("namirasoft-", "namirasoft/"),
+            name: this.name_parser.api.name_namirasoft.replace("namirasoft-", "namirasoft/"),
             description: this.description + " PHP Package",
             "type": "library",
             "version": this.src.json.version,
@@ -56,8 +56,8 @@ export class PHPBuilder extends BaseBuilder
         composerjson["autoload"]["psr-4"][this.getNameSpace("") + "\\"] = "src/";
 
         let packagejson: any = {
-            name: this.name,
-            title: this.title + " PHP Package",
+            name: this.name_parser.api.name_namirasoft,
+            title: this.name_parser.api.title_namirasoft + " PHP Package",
             description: this.description + " PHP Package",
             "icon": "logo.png",
             "logo": this.src.json.logo,
@@ -70,7 +70,7 @@ export class PHPBuilder extends BaseBuilder
             "license": "MIT"
         };
         if (this.account)
-            if (this.src.json.name != "namirasoft-account-api-v1")
+            if (this.name_parser.isAccountAPI)
                 composerjson.require["namirasoft/account"] = BaseBuilder.MIN_VERSION;
         let extra = Object.keys(this.src.json.package?.dependencies ?? {});
         for (let i = 0; i < extra.length; i++)
@@ -93,11 +93,11 @@ export class PHPBuilder extends BaseBuilder
 
         // Meta
         let metas: PHP[] = [];
-        let Name = NamingConvention.Pascal_Case_Space.convert(this.title, NamingConvention.Pascal_Case);
-        let metadatabasetables = new PHP(this.getNameSpace("meta"), "./src/meta", "./meta/", Name + "MetaDatabaseTables", "", true);
-        let metadatabase = new PHP(this.getNameSpace("meta"), "./src/meta", "./meta/", Name + "MetaDatabase", "NSBaseMetaDatabase", true);
+        let name_class_namirasoft_entity = this.name_parser.api.class_namirasoft;
+        let metadatabasetables = new PHP(this.getNameSpace("meta"), "./src/meta", "./meta/", name_class_namirasoft_entity + "MetaDatabaseTables", "", true);
+        let metadatabase = new PHP(this.getNameSpace("meta"), "./src/meta", "./meta/", name_class_namirasoft_entity + "MetaDatabase", "NSBaseMetaDatabase", true);
         metadatabase.uses.push(`use Namirasoft\\Site\\NSBaseMetaDatabase;`);
-        metadatabase.fields.push(`public static ${Name}MetaDatabase $main;`);
+        metadatabase.fields.push(`public static ${name_class_namirasoft_entity}MetaDatabase $main;`);
         metadatabase.constructors.push(`public function __construct()`);
         metadatabase.constructors.push(`{`);
 
@@ -119,7 +119,7 @@ export class PHPBuilder extends BaseBuilder
             if (php)
                 metas.push(php);
         }
-        metadatabase.fields.push(`public ${Name}MetaDatabaseTables $tables;`);
+        metadatabase.fields.push(`public ${name_class_namirasoft_entity}MetaDatabaseTables $tables;`);
         metadatabase.constructors.push(`}`);
         metadatabase.functions.push(`public function getTables(): array`);
         metadatabase.functions.push(`{`);
@@ -127,7 +127,7 @@ export class PHPBuilder extends BaseBuilder
         tnames.forEach(table => { metadatabase.functions.push(`        "${table}",`); });
         metadatabase.functions.push(`    ];`);
         metadatabase.functions.push(`}`);
-        metadatabase.scripts_after.push(`${Name}MetaDatabase::$main = new ${Name}MetaDatabase();`);
+        metadatabase.scripts_after.push(`${name_class_namirasoft_entity}MetaDatabase::$main = new ${name_class_namirasoft_entity}MetaDatabase();`);
         metas.push(metadatabasetables);
         metas.push(metadatabase);
 
@@ -210,7 +210,7 @@ export class PHPBuilder extends BaseBuilder
     //         ts.imports.push(`import { ${tag}Command } from "./${tag}Command";`);
     //     });
     //     if (this.account)
-    //         if (this.src.json.name != "namirasoft-account-api-v1")
+    //         if (!this.name_parser.isAccountAPI)
     //             ts.imports.push(`import { AccountCommand } from "namirasoft-account";`);
     //         else
     //             ts.imports.push(`import { AccountCommand } from "./AccountCommand";`);
@@ -218,7 +218,7 @@ export class PHPBuilder extends BaseBuilder
     //     ts.scripts.push(`    {`);
     //     tags.forEach(tag =>
     //     {
-    //         ts.scripts.push(`        "${tag.toLowerCase()}": ${tag}Command,`);
+    //         ts.scripts.push(`        "${NamingConvention.auto.convert(tag, NamingConvention.lower_case_underscore)}": ${tag}Command,`);
     //     });
     //     if (this.account)
     //         ts.scripts.push(`        "account": AccountCommand`);
@@ -271,7 +271,7 @@ export class PHPBuilder extends BaseBuilder
     //     let ts = new TS("./src/command", "./command/", controller.tag + controller.name + "Command", "BaseFinalCommand", true);
     //     if (this.account)
     //     {
-    //         if (this.src.json.name == "namirasoft-account-api-v1")
+    //         if (this.name_parser.isAccountAPI)
     //             ts.imports.push(`import { TokenManager } from "../TokenManager";`);
     //         else
     //             ts.imports.push(`import { TokenManager } from "namirasoft-account";`);
@@ -313,10 +313,10 @@ export class PHPBuilder extends BaseBuilder
     //     }
     //     ts.functions.push(`    let server = new ${className}(${this.account ? "manager, " : ""}${this.nws ? "\"zone\", " : ""}e => this.app.logger.error(e.message));`);
     //     if (options.length == 0)
-    //         ts.functions.push(`    let ans = await server.${controller.tag.toLowerCase()}.${controller.name}(${args.map((_, index) => `this.arg_values[${index}]`).join(", ")});`);
+    //         ts.functions.push(`    let ans = await server.${NamingConvention.auto.convert(controller.tag, NamingConvention.lower_case_underscore)}.${controller.name}(${args.map((_, index) => `this.arg_values[${index}]`).join(", ")});`);
     //     else
     //     {
-    //         ts.functions.push(`    let ans = await server.${controller.tag.toLowerCase()}.${controller.name}(${args.map((_, index) => `this.arg_values[${index}]`).join(", ")}${args.length == 0 ? "" : ", "}{`);
+    //         ts.functions.push(`    let ans = await server.${NamingConvention.auto.convert(controller.tag, NamingConvention.lower_case_underscore)}.${controller.name}(${args.map((_, index) => `this.arg_values[${index}]`).join(", ")}${args.length == 0 ? "" : ", "}{`);
     //         forEachVariable((option, last) =>
     //         {
     //             ts.functions.push(`        ${option.name}: this.option_values.${option.name}${last ? "" : ","}`);
@@ -465,19 +465,19 @@ export class PHPBuilder extends BaseBuilder
     }
     getServer(tags: string[]): PHP
     {
-        let className = this.title.replace(/\s/gm, "") + "Server";
+        let name_class_namirasoft_entity_server = this.name_parser.api.class_namirasoft + "Server";
         let parentName = this.account ? "NSABaseServer" : "NSBaseServer";
-        let php = new PHP(this.getNameSpace(""), "./src", "./", className, parentName);
+        let php = new PHP(this.getNameSpace(""), "./src", "./", name_class_namirasoft_entity_server, parentName);
 
         if (this.account)
         {
-            if (this.src.json.name != "namirasoft-account-api-v1")
+            if (!this.name_parser.isAccountAPI)
                 php.imports.push(`require_once "namirasoft/account";`);
         }
 
         if (this.account)
         {
-            if (this.src.json.name != "namirasoft-account-api-v1")
+            if (!this.name_parser.isAccountAPI)
             {
                 php.uses.push(`use Namirasoft\\Account\\NSABaseServer;`);
                 php.uses.push(`use Namirasoft\\Account\\TokenManager;`);
@@ -486,9 +486,9 @@ export class PHPBuilder extends BaseBuilder
         else
             php.uses.push(`use Namirasoft\\Site\\NSBaseServer;`);
 
-        if (this.src.json.name != "namirasoft-account-api-v1")
-            tags.forEach(tag => php.uses.push(`use ${this.getNameSpace("") + "\\" + className + tag};`));
-        tags.forEach(tag => php.fields.push(`public ${className}${tag} $${tag.toLowerCase()}; `));
+        if (!this.name_parser.isAccountAPI)
+            tags.forEach(tag => php.uses.push(`use ${this.getNameSpace("") + "\\" + name_class_namirasoft_entity_server + tag};`));
+        tags.forEach(tag => php.fields.push(`public ${name_class_namirasoft_entity_server}${tag} $${NamingConvention.auto.convert(tag, NamingConvention.lower_case_underscore)}; `));
 
         let pars: string[] = ["String $base_url"];
         let args: string[] = [`$base_url`, `"${this.src.json.version}"`];
@@ -510,7 +510,7 @@ export class PHPBuilder extends BaseBuilder
             php.fields.push("protected $onError;");
             php.constructors.push(`    $this->onError = $onError;`);
         }
-        tags.forEach(tag => php.constructors.push(`    $this->${tag.toLowerCase()} = new ${className}${tag}($this); `));
+        tags.forEach(tag => php.constructors.push(`    $this->${NamingConvention.auto.convert(tag, NamingConvention.lower_case_underscore)} = new ${name_class_namirasoft_entity_server}${tag}($this); `));
         php.constructors.push(`}`);
         if (!this.account)
         {
@@ -524,16 +524,16 @@ export class PHPBuilder extends BaseBuilder
     }
     getServerBase(): PHP
     {
-        let className = this.title.replace(/\s/gm, "") + "ServerBase";
-        let php = new PHP(this.getNameSpace(""), "./src", "./", className);
+        let name_class_namirasoft_entity_server_base = this.name_parser.api.class_namirasoft + "ServerBase";
+        let php = new PHP(this.getNameSpace(""), "./src", "./", name_class_namirasoft_entity_server_base);
 
-        let serverClassName = this.title.replace(/\s/gm, "") + "Server";
+        let name_class_namirasoft_entity_server = this.name_parser.api.class_namirasoft + "Server";
 
-        if (this.src.json.name != "namirasoft-account-api-v1")
-            php.uses.push(`use ${this.getNameSpace("") + "\\" + serverClassName};`);
+        if (!this.name_parser.isAccountAPI)
+            php.uses.push(`use ${this.getNameSpace("") + "\\" + name_class_namirasoft_entity_server};`);
 
-        php.fields.push(`public ${serverClassName} $server;`);
-        php.constructors.push(`public function __construct(${serverClassName} $server)`);
+        php.fields.push(`public ${name_class_namirasoft_entity_server} $server;`);
+        php.constructors.push(`public function __construct(${name_class_namirasoft_entity_server} $server)`);
         php.constructors.push(`{`);
         php.constructors.push(`    $this->server = $server;`);
         php.constructors.push(`}`);
@@ -542,13 +542,13 @@ export class PHPBuilder extends BaseBuilder
     }
     getServerTag(tag: string): PHP
     {
-        let baseName = this.title.replace(/\s/gm, "") + "Server";
-        let parentName = baseName + "Base";
-        let className = baseName + tag;
+        let name_class_namirasoft_entity_server = this.name_parser.api.class_namirasoft + "Server";
+        let name_class_namirasoft_entity_server_base = name_class_namirasoft_entity_server + "Base";
+        let name_class_namirasoft_entity_server_tag = name_class_namirasoft_entity_server + tag;
 
-        let php = new PHP(this.getNameSpace(""), "./src", "./", className, parentName);
-        if (this.src.json.name != "namirasoft-account-api-v1")
-            php.uses.push(`use ${this.getNameSpace("") + "\\" + parentName};`);
+        let php = new PHP(this.getNameSpace(""), "./src", "./", name_class_namirasoft_entity_server_tag, name_class_namirasoft_entity_server_base);
+        if (!this.name_parser.isAccountAPI)
+            php.uses.push(`use ${this.getNameSpace("") + "\\" + name_class_namirasoft_entity_server_base};`);
 
         return php;
     }