namirasoft-node 1.4.101 → 1.4.103

package/src/BaseFilterItemBuilderDatabase.ts

@@ -1,46 +1,46 @@
-import { BaseTable } from "./BaseTable";
-import { BaseDatabase } from "./BaseDatabase";
-import { BaseFilterItemBuilder } from "./BaseFilterItemBuilder";
-import { ErrorOperation, TimeOperation } from "namirasoft-core";
-import { VariableType } from "namirasoft-schema";
-
-export abstract class BaseFilterItemBuilderDatabase<WhereOptions> extends BaseFilterItemBuilder<BaseTable<BaseDatabase, any>, WhereOptions>
-{
-    constructor(public database: BaseDatabase)
-    {
-        super();
-    }
-    public override checkColumn(table_name: string, column_name: string): void
-    {
-        let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
-        if (column_name != "*")
-            t.checkColumn(column_name, false, null);
-    }
-    public checkValue(table_name: string, column_name: string, value: string)
-    {
-        let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
-        if (column_name != "*")
-        {
-            let c = t.getColumn(column_name);
-            if (c.type.toLowerCase() === VariableType.Date.toLowerCase())
-                if (!TimeOperation.isValidDate(value))
-                    throw ErrorOperation.getHTTP(400, `Invalid value for Date: ${value}`);
-            if (c.type.toLowerCase() === VariableType.DateTime.toLowerCase())
-                if (!TimeOperation.isValidDateTime(value))
-                    throw ErrorOperation.getHTTP(400, `Invalid value for DateTime: ${value}`);
-            if (c.type.toLowerCase() === VariableType.Time.toLowerCase())
-                if (!TimeOperation.isValidTime(value))
-                    throw ErrorOperation.getHTTP(400, `Invalid value for Time: ${value}`);
-        }
-    }
-    public override getRealColumnName(table_name: string, column_name: string): string
-    {
-        let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
-        return t.getRealColumnName(column_name);
-    }
-    public override getAdvancedSearchColumns(table_name: string): string[]
-    {
-        let t = this.database.getTable(table_name) as BaseTable<BaseDatabase, any>;
-        return t.getColumns(false, null, { searchable: true });
-    }
+import { BaseTable } from "./BaseTable";
+import { BaseDatabase } from "./BaseDatabase";
+import { BaseFilterItemBuilder } from "./BaseFilterItemBuilder";
+import { ErrorOperation, TimeOperation } from "namirasoft-core";
+import { VariableType } from "namirasoft-schema";
+
+export abstract class BaseFilterItemBuilderDatabase<WhereOptions> extends BaseFilterItemBuilder<BaseTable<BaseDatabase, any>, WhereOptions>
+{
+    constructor(public database: BaseDatabase)
+    {
+        super();
+    }
+    public override checkColumn(table_name: string, column_name: string): void
+    {
+        let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
+        if (column_name != "*")
+            t.checkColumn(column_name, false, null);
+    }
+    public checkValue(table_name: string, column_name: string, value: string)
+    {
+        let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
+        if (column_name != "*")
+        {
+            let c = t.getColumn(column_name);
+            if (c.type.toLowerCase() === VariableType.Date.toLowerCase())
+                if (!TimeOperation.isValidDate(value))
+                    throw ErrorOperation.getHTTP(400, `Invalid value for Date: ${value}`);
+            if (c.type.toLowerCase() === VariableType.DateTime.toLowerCase())
+                if (!TimeOperation.isValidDateTime(value))
+                    throw ErrorOperation.getHTTP(400, `Invalid value for DateTime: ${value}`);
+            if (c.type.toLowerCase() === VariableType.Time.toLowerCase())
+                if (!TimeOperation.isValidTime(value))
+                    throw ErrorOperation.getHTTP(400, `Invalid value for Time: ${value}`);
+        }
+    }
+    public override getRealColumnName(table_name: string, column_name: string): string
+    {
+        let t = this.database.getTable<BaseTable<BaseDatabase, any>>(table_name);
+        return t.getRealColumnName(column_name);
+    }
+    public override getAdvancedSearchColumns(table_name: string): string[]
+    {
+        let t = this.database.getTable(table_name) as BaseTable<BaseDatabase, any>;
+        return t.getColumns(false, null, { searchable: true });
+    }
 }

package/src/BaseFilterItemBuilderObject.ts

@@ -1,92 +1,96 @@
-import { SearchOperation } from "namirasoft-core";
-import { BaseFilterItemBuilder, BaseFilterItemBuilder_JoinTable } from "./BaseFilterItemBuilder";
-
-export class BaseFilterItemBuilderObject extends BaseFilterItemBuilder<{ getName: () => string }, boolean>
-{
-    constructor(public object: any)
-    {
-        super();
-    }
-    public override checkColumn(): void
-    {
-    }
-    public override checkValue(): void
-    {
-    }
-    public getRealColumnName(_: string, column_name: string): string
-    {
-        return column_name;
-    }
-    override getAdvancedSearchColumns(): string[]
-    {
-        return Object.keys(this.object);
-    }
-    override async getAdvancedSearchConditions(columns: string[], search: string): Promise<boolean[]>
-    {
-        let text = columns.map(c => this.object[c]).filter(v => v).join(" ");
-        return [SearchOperation.match(text, search)];
-    }
-    override getIn(column_name: string, not: boolean, values: string[])
-    {
-        let condition = values.includes(this.object[column_name] ?? null) !== not;
-        return { condition };
-    }
-    override getLike(column_name: string, not: boolean, value: string)
-    {
-        let condition = new RegExp(`.*${value}.*`).test(this.object[column_name] ?? "") !== not;
-        return { condition };
-    }
-    override getRegex(column_name: string, not: boolean, value: string)
-    {
-        let condition = new RegExp(value).test(this.object[column_name] ?? "") !== not;
-        return { condition };
-    }
-    override getEmpty(column_name: string, not: boolean)
-    {
-        let condition = ((this.object[column_name] ?? "") == "") !== not;
-        return { condition };
-    }
-    override getExists(column_name: string, not: boolean)
-    {
-        let condition = ((this.object[column_name]) != null) !== not;
-        return { condition };
-    }
-    override getIncludes(column_name: string, not: boolean, values: string[])
-    {
-        return this.getExists(column_name, not) && this.getIn(column_name, not, values);
-    }
-    override getStartsWith(column_name: string, not: boolean, value: string)
-    {
-        let condition = new RegExp(`${value}.*`).test(this.object[column_name] ?? "") !== not;
-        return { condition };
-    }
-    override getEndsWith(column_name: string, not: boolean, value: string)
-    {
-        let condition = new RegExp(`.*${value}`).test(this.object[column_name] ?? "") !== not;
-        return { condition };
-    }
-    override getLT(column_name: string, value: any)
-    {
-        let condition = (parseFloat(this.object[column_name] ?? "") < parseFloat(value));
-        return { condition };
-    }
-    override getLTE(column_name: string, value: any)
-    {
-        let condition = (parseFloat(this.object[column_name] ?? "") <= parseFloat(value));
-        return { condition };
-    }
-    override getGT(column_name: string, value: any)
-    {
-        let condition = (parseFloat(this.object[column_name] ?? "") > parseFloat(value));
-        return { condition };
-    }
-    override getGTE(column_name: string, value: any)
-    {
-        let condition = (parseFloat(this.object[column_name] ?? "") >= parseFloat(value));
-        return { condition };
-    }
-    override async getInSelect(_: string, not: boolean, __: BaseFilterItemBuilder_JoinTable<boolean>, conditions: boolean[]): Promise<boolean>
-    {
-        return conditions.some(c => !c) === not;
-    }
+import { SearchOperation } from "namirasoft-core";
+import { BaseFilterItemBuilder, BaseFilterItemBuilder_JoinTable } from "./BaseFilterItemBuilder";
+
+export class BaseFilterItemBuilderObject extends BaseFilterItemBuilder<{ getName: () => string }, boolean>
+{
+    constructor(public object: any)
+    {
+        super();
+    }
+    public override checkColumn(): void
+    {
+    }
+    public override checkValue(): void
+    {
+    }
+    public override escapeValue(value: string)
+    {
+        return value;
+    }
+    public getRealColumnName(_: string, column_name: string): string
+    {
+        return column_name;
+    }
+    override getAdvancedSearchColumns(): string[]
+    {
+        return Object.keys(this.object);
+    }
+    override async getAdvancedSearchConditions(columns: string[], search: string): Promise<boolean[]>
+    {
+        let text = columns.map(c => this.object[c]).filter(v => v).join(" ");
+        return [SearchOperation.match(text, search)];
+    }
+    override getIn(column_name: string, not: boolean, values: string[])
+    {
+        let condition = values.includes(this.object[column_name] ?? null) !== not;
+        return { condition };
+    }
+    override getLike(column_name: string, not: boolean, value: string)
+    {
+        let condition = new RegExp(`.*${value}.*`).test(this.object[column_name] ?? "") !== not;
+        return { condition };
+    }
+    override getRegex(column_name: string, not: boolean, value: string)
+    {
+        let condition = new RegExp(value).test(this.object[column_name] ?? "") !== not;
+        return { condition };
+    }
+    override getEmpty(column_name: string, not: boolean)
+    {
+        let condition = ((this.object[column_name] ?? "") == "") !== not;
+        return { condition };
+    }
+    override getExists(column_name: string, not: boolean)
+    {
+        let condition = ((this.object[column_name]) != null) !== not;
+        return { condition };
+    }
+    override getIncludes(column_name: string, not: boolean, values: string[])
+    {
+        return this.getExists(column_name, not) && this.getIn(column_name, not, values);
+    }
+    override getStartsWith(column_name: string, not: boolean, value: string)
+    {
+        let condition = new RegExp(`${value}.*`).test(this.object[column_name] ?? "") !== not;
+        return { condition };
+    }
+    override getEndsWith(column_name: string, not: boolean, value: string)
+    {
+        let condition = new RegExp(`.*${value}`).test(this.object[column_name] ?? "") !== not;
+        return { condition };
+    }
+    override getLT(column_name: string, value: any)
+    {
+        let condition = (parseFloat(this.object[column_name] ?? "") < parseFloat(value));
+        return { condition };
+    }
+    override getLTE(column_name: string, value: any)
+    {
+        let condition = (parseFloat(this.object[column_name] ?? "") <= parseFloat(value));
+        return { condition };
+    }
+    override getGT(column_name: string, value: any)
+    {
+        let condition = (parseFloat(this.object[column_name] ?? "") > parseFloat(value));
+        return { condition };
+    }
+    override getGTE(column_name: string, value: any)
+    {
+        let condition = (parseFloat(this.object[column_name] ?? "") >= parseFloat(value));
+        return { condition };
+    }
+    override async getInSelect(_: string, not: boolean, __: BaseFilterItemBuilder_JoinTable<boolean>, conditions: boolean[]): Promise<boolean>
+    {
+        return conditions.some(c => !c) === not;
+    }
 }

package/src/BaseTable.ts

@@ -1,138 +1,138 @@
-import { ArraySchema, BaseTypeSchema, BaseVariableSchema, ObjectSchema } from "namirasoft-schema";
-import { BaseDatabase } from "./BaseDatabase";
-import { ErrorOperation, BaseUUID, NamingConvention, BaseMetaColumn } from "namirasoft-core";
-import { BaseTableColumnOptions } from "./BaseTableColumnOptions";
-
-export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption extends BaseTableColumnOptions>
-{
-    database: D;
-    uuid: BaseUUID;
-    constructor(database: D)
-    {
-        this.database = database;
-        this.uuid = new BaseUUID(this.getShortName());
-    }
-    public abstract getName(): string;
-    public abstract getShortName(): string;
-    public getSecureColumns(): string[]
-    {
-        let columns: string[] = [];
-        this.forEachColumn((name, column: ModelColumnOption) =>
-        {
-            if (column.secure)
-                columns.push(name);
-        });
-        return columns;
-    }
-    public getReadOnlyColumns(): string[]
-    {
-        let columns: string[] = [];
-        this.forEachColumn((name, column: ModelColumnOption) =>
-        {
-            if (column.read_only)
-                columns.push(name);
-        });
-        return columns;
-    }
-    public abstract getColumnOption(name: string): ModelColumnOption;
-    public abstract forEachColumn(handler: (name: string, column: ModelColumnOption) => void): void;
-    public abstract getColumn(name: string): BaseMetaColumn;
-    public getColumns(secure: boolean | null = false, read_only: boolean | null = null, filter?: any): string[]
-    {
-        let columns_secure: string[] = this.getSecureColumns();
-        let columns_read_only: string[] = this.getReadOnlyColumns();
-        let columns: string[] = [];
-        this.forEachColumn((name, element) =>
-        {
-            let keys: string[] = [];
-            if (filter)
-                keys = Object.keys(filter);
-            if (!filter || keys.length == 0 || keys.every(key => filter[key] == (element as any)[key]))
-                columns.push(name)
-        });
-        if (secure !== null)
-            columns = columns.filter(name => columns_secure.includes(name) == secure);
-        if (read_only !== null)
-            columns = columns.filter(name => columns_read_only.includes(name) == read_only);
-        return columns;
-    }
-    public checkColumn(column: string, secure: boolean | null, read_only: boolean | null)
-    {
-        let columns: string[] = this.getColumns(secure, read_only)
-        if (!columns.includes(column))
-            ErrorOperation.throwHTTP(404, `Column '${column}' not found`);
-    }
-    public getRealColumnName(column: string): string
-    {
-        return column;
-    }
-    public secure(obj: any)
-    {
-        if (obj.dataValues)
-            obj = obj.dataValues;
-        let secureColumns: string[] = this.getSecureColumns();
-        secureColumns.forEach(col => delete obj[col]);
-        return obj;
-    }
-    public getArraySchema(require: boolean, name?: string): ArraySchema
-    {
-        let ans = this.getSchema(require, name);
-        return new ArraySchema(require, [ans]);
-    }
-    public getSchema(require: boolean, name?: string): ObjectSchema
-    {
-        if (!name)
-            name = NamingConvention.lower_case_underscore.convert(this.getName(), NamingConvention.Pascal_Case);
-        let columns_secure: string[] = this.getSecureColumns();
-        let columns_read_only: string[] = this.getReadOnlyColumns();
-        let ans = new ObjectSchema(name, require, null);
-        this.forEachColumn((name, element) =>
-        {
-            if (!columns_secure.includes(name))
-                ans.addField(this.getVariableSchema(name, element, columns_read_only.includes(name)));
-        });
-        return ans;
-    }
-    private getVariableSchema(name: string, element: ModelColumnOption, read_only: boolean): BaseVariableSchema
-    {
-        let schema = this.getTypeSchema(element);
-        schema.read_only = read_only;
-        let es = this.getExamples();
-        schema.example = es[name] ?? "";
-        return new BaseVariableSchema(name, schema);
-    }
-    protected abstract getTypeSchema(element: ModelColumnOption): BaseTypeSchema;
-    protected getExamples(): { [name: string]: string }
-    {
-        return {};
-    }
-    public getSchemaNames(): string[]
-    {
-        return [];
-    }
-    public getSchemaByName(require: boolean, name?: string): ObjectSchema
-    {
-        let ans = this.getSchema(require, name);
-        if (name)
-        {
-            let names = this.getSchemaNames();
-            if (!names.includes(name))
-                throw new Error("Wrong schema name was provided: " + name);
-            this.setSchemaByName(ans);
-        }
-        return ans;
-    }
-    public getArraySchemaByName(require: boolean, name?: string): ArraySchema
-    {
-        let ans = this.getSchemaByName(require, name);
-        return new ArraySchema(require, [ans]);
-    }
-    protected setSchemaByName(_: ObjectSchema): void
-    {
-    }
-    public getNotFoundError(conditions: any | null)
-    {
-        let name = NamingConvention.lower_case_underscore.convert(this.getName(), NamingConvention.Pascal_Case);
-        return ErrorOperation.getHTTP(404, "Could not find " + name + " for " + JSON.stringify(conditions));
-    }
+import { ArraySchema, BaseTypeSchema, BaseVariableSchema, ObjectSchema } from "namirasoft-schema";
+import { BaseDatabase } from "./BaseDatabase";
+import { ErrorOperation, BaseUUID, NamingConvention, BaseMetaColumn } from "namirasoft-core";
+import { BaseTableColumnOptions } from "./BaseTableColumnOptions";
+
+export abstract class BaseTable<D extends BaseDatabase, ModelColumnOption extends BaseTableColumnOptions>
+{
+    database: D;
+    uuid: BaseUUID;
+    constructor(database: D)
+    {
+        this.database = database;
+        this.uuid = new BaseUUID(this.getShortName());
+    }
+    public abstract getName(): string;
+    public abstract getShortName(): string;
+    public getSecureColumns(): string[]
+    {
+        let columns: string[] = [];
+        this.forEachColumn((name, column: ModelColumnOption) =>
+        {
+            if (column.secure)
+                columns.push(name);
+        });
+        return columns;
+    }
+    public getReadOnlyColumns(): string[]
+    {
+        let columns: string[] = [];
+        this.forEachColumn((name, column: ModelColumnOption) =>
+        {
+            if (column.read_only)
+                columns.push(name);
+        });
+        return columns;
+    }
+    public abstract getColumnOption(name: string): ModelColumnOption;
+    public abstract forEachColumn(handler: (name: string, column: ModelColumnOption) => void): void;
+    public abstract getColumn(name: string): BaseMetaColumn;
+    public getColumns(secure: boolean | null = false, read_only: boolean | null = null, filter?: any): string[]
+    {
+        let columns_secure: string[] = this.getSecureColumns();
+        let columns_read_only: string[] = this.getReadOnlyColumns();
+        let columns: string[] = [];
+        this.forEachColumn((name, element) =>
+        {
+            let keys: string[] = [];
+            if (filter)
+                keys = Object.keys(filter);
+            if (!filter || keys.length == 0 || keys.every(key => filter[key] == (element as any)[key]))
+                columns.push(name)
+        });
+        if (secure !== null)
+            columns = columns.filter(name => columns_secure.includes(name) == secure);
+        if (read_only !== null)
+            columns = columns.filter(name => columns_read_only.includes(name) == read_only);
+        return columns;
+    }
+    public checkColumn(column: string, secure: boolean | null, read_only: boolean | null)
+    {
+        let columns: string[] = this.getColumns(secure, read_only)
+        if (!columns.includes(column))
+            ErrorOperation.throwHTTP(404, `Column '${column}' not found`);
+    }
+    public getRealColumnName(column: string): string
+    {
+        return column;
+    }
+    public secure(obj: any)
+    {
+        if (obj.dataValues)
+            obj = obj.dataValues;
+        let secureColumns: string[] = this.getSecureColumns();
+        secureColumns.forEach(col => delete obj[col]);
+        return obj;
+    }
+    public getArraySchema(require: boolean, name?: string): ArraySchema
+    {
+        let ans = this.getSchema(require, name);
+        return new ArraySchema(require, [ans]);
+    }
+    public getSchema(require: boolean, name?: string): ObjectSchema
+    {
+        if (!name)
+            name = NamingConvention.lower_case_underscore.convert(this.getName(), NamingConvention.Pascal_Case);
+        let columns_secure: string[] = this.getSecureColumns();
+        let columns_read_only: string[] = this.getReadOnlyColumns();
+        let ans = new ObjectSchema(name, require, null);
+        this.forEachColumn((name, element) =>
+        {
+            if (!columns_secure.includes(name))
+                ans.addField(this.getVariableSchema(name, element, columns_read_only.includes(name)));
+        });
+        return ans;
+    }
+    private getVariableSchema(name: string, element: ModelColumnOption, read_only: boolean): BaseVariableSchema
+    {
+        let schema = this.getTypeSchema(element);
+        schema.read_only = read_only;
+        let es = this.getExamples();
+        schema.example = es[name] ?? "";
+        return new BaseVariableSchema(name, schema);
+    }
+    protected abstract getTypeSchema(element: ModelColumnOption): BaseTypeSchema;
+    protected getExamples(): { [name: string]: string }
+    {
+        return {};
+    }
+    public getSchemaNames(): string[]
+    {
+        return [];
+    }
+    public getSchemaByName(require: boolean, name?: string): ObjectSchema
+    {
+        let ans = this.getSchema(require, name);
+        if (name)
+        {
+            let names = this.getSchemaNames();
+            if (!names.includes(name))
+                throw new Error("Wrong schema name was provided: " + name);
+            this.setSchemaByName(ans);
+        }
+        return ans;
+    }
+    public getArraySchemaByName(require: boolean, name?: string): ArraySchema
+    {
+        let ans = this.getSchemaByName(require, name);
+        return new ArraySchema(require, [ans]);
+    }
+    protected setSchemaByName(_: ObjectSchema): void
+    {
+    }
+    public getNotFoundError(conditions: any | null)
+    {
+        let name = NamingConvention.lower_case_underscore.convert(this.getName(), NamingConvention.Pascal_Case);
+        return ErrorOperation.getHTTP(404, "Could not find " + name + " for " + JSON.stringify(conditions));
+    }
 }

package/src/BaseTableColumnOptions.ts

@@ -1,9 +1,9 @@
-export interface BaseTableColumnOptions
-{
-    secure?: boolean;
-    read_only?: boolean;
-    searchable?: boolean;
-    tags?: {
-        type?: "BaseTypeSchema" | "BaseTypeSchema[]" | "BaseVariableSchema" | "BaseVariableSchema[]"
-    }
+export interface BaseTableColumnOptions
+{
+    secure?: boolean;
+    read_only?: boolean;
+    searchable?: boolean;
+    tags?: {
+        type?: "BaseTypeSchema" | "BaseTypeSchema[]" | "BaseVariableSchema" | "BaseVariableSchema[]"
+    }
 };

package/src/CommandOperation.ts

@@ -1,33 +1,33 @@
-import { ExecException, exec, execSync } from 'child_process';
-import { ConsoleOperation } from 'namirasoft-core';
-export class CommandOperation 
-{
-    static exec(command: string, cwd: string | undefined)
-    {
-        exec(command, { cwd }, (error: ExecException | null, stdout: string, stderr: string) =>
-        {
-            if (error)
-            {
-                ConsoleOperation.error(`error: ${error.message}`);
-                return;
-            }
-            if (stderr)
-            {
-                ConsoleOperation.error(`stderr: ${stderr}`);
-                return;
-            }
-            ConsoleOperation.log(`stdout:\n${stdout}`);
-        });
-    }
-    static execSync(command: string, cwd: string | undefined)
-    {
-        try
-        {
-            return execSync(command, { cwd, encoding: 'utf-8' });
-        } catch (error: any)
-        {
-            ConsoleOperation.error(error.stdout);
-            throw error;
-        }
-    }
+import { ExecException, exec, execSync } from 'child_process';
+import { ConsoleOperation } from 'namirasoft-core';
+export class CommandOperation 
+{
+    static exec(command: string, cwd: string | undefined)
+    {
+        exec(command, { cwd }, (error: ExecException | null, stdout: string, stderr: string) =>
+        {
+            if (error)
+            {
+                ConsoleOperation.error(`error: ${error.message}`);
+                return;
+            }
+            if (stderr)
+            {
+                ConsoleOperation.error(`stderr: ${stderr}`);
+                return;
+            }
+            ConsoleOperation.log(`stdout:\n${stdout}`);
+        });
+    }
+    static execSync(command: string, cwd: string | undefined)
+    {
+        try
+        {
+            return execSync(command, { cwd, encoding: 'utf-8' });
+        } catch (error: any)
+        {
+            ConsoleOperation.error(error.stdout);
+            throw error;
+        }
+    }
 }