@steedos/odata-v4-typeorm 2.2.50 → 2.2.51-beta.4

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@steedos/odata-v4-typeorm",
   "private": false,
-  "version": "2.2.50",
+  "version": "2.2.51-beta.4",
   "description": "OData to TYPEORM query compiler",
   "main": "lib/index.js",
   "typings": "lib/index",
@@ -9,8 +9,7 @@
     "test": "test"
   },
   "scripts": {
-    "compile": "tsc",
-    "prepare": "tsc"
+    "build": "tsc"
   },
   "repository": {
     "type": "git",
@@ -36,5 +35,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7859a5ac5bcc9c0089d52ce9246eee1c83022816"
+  "gitHead": "975061203a5c8ee2ed2ab495cfed25a100304c96"
 }

package/lib/createFilter.d.ts

@@ -1,13 +0,0 @@
-import { TypeOrmVisitor as Visitor } from './visitor';
-import { Token } from 'odata-v4-parser/lib/lexer';
-import { SqlOptions } from './sqlOptions';
-/**
- * Creates an SQL WHERE clause from an OData filter expression string
- * @param {string} odataFilter - A filter expression in OData $filter format
- * @return {string}  SQL WHERE clause
- * @example
- * const filter = createFilter("Size eq 4 and Age gt 18");
- * let sqlQuery = `SELECT * FROM table WHERE ${filter}`;
- */
-export declare function createFilter(odataFilter: string, options?: SqlOptions): Visitor;
-export declare function createFilter(odataFilter: Token, options?: SqlOptions): Visitor;

package/lib/createQuery.d.ts

@@ -1,13 +0,0 @@
-import { TypeOrmVisitor as Visitor } from './visitor';
-import { Token } from 'odata-v4-parser/lib/lexer';
-import { SqlOptions } from './sqlOptions';
-/**
- * Creates an SQL query descriptor from an OData query string
- * @param {string} odataQuery - An OData query string
- * @return {string}  SQL query descriptor
- * @example
- * const filter = createQuery("$filter=Size eq 4 and Age gt 18");
- * let sqlQuery = `SELECT * FROM table WHERE ${filter.where}`;
- */
-export declare function createQuery(odataQuery: string, options?: SqlOptions): Visitor;
-export declare function createQuery(odataQuery: Token, options?: SqlOptions): Visitor;

package/lib/executeQuery.d.ts

@@ -1,5 +0,0 @@
-import { SqlOptions } from './sqlOptions';
-declare const executeQuery: (repositoryOrQueryBuilder: any, query: any, options: SqlOptions) => Promise<any>;
-declare const executeCountQuery: (repositoryOrQueryBuilder: any, query: any, options: SqlOptions) => Promise<any>;
-declare const getExecuteQuerySQL: (repositoryOrQueryBuilder: any, query: any, options: SqlOptions) => Promise<any>;
-export { executeQuery, executeCountQuery, getExecuteQuerySQL };

package/lib/index.d.ts

@@ -1,6 +0,0 @@
-import { odataQuery } from './odataQueryMiddleware';
-import { executeQuery, executeCountQuery, getExecuteQuerySQL } from './executeQuery';
-import { SqlOptions } from './sqlOptions';
-import { createQuery } from './createQuery';
-import { createFilter } from './createFilter';
-export { odataQuery, executeQuery, executeCountQuery, getExecuteQuerySQL, SqlOptions, createQuery, createFilter };

package/lib/odataQueryMiddleware.d.ts

@@ -1,3 +0,0 @@
-import { executeQuery } from './executeQuery';
-declare function odataQuery(repositoryOrQueryBuilder: any): (req: any, res: any, next: any) => Promise<any>;
-export { odataQuery, executeQuery };

package/lib/sqlOptions.d.ts

@@ -1,7 +0,0 @@
-import { SQLLang } from 'odata-v4-sql';
-export interface SqlOptions {
-    useParameters?: boolean;
-    type?: SQLLang;
-    alias: string;
-    version?: string;
-}

package/lib/visitor.d.ts

@@ -1,20 +0,0 @@
-import { Token } from 'odata-v4-parser/lib/lexer';
-import { Visitor } from 'odata-v4-sql/lib/visitor';
-export declare class TypeOrmVisitor extends Visitor {
-    includes: TypeOrmVisitor[];
-    alias: string;
-    constructor(options: any);
-    from(table: string): string;
-    asMsSql(): this;
-    asPostgreSql(): this;
-    asType(): this;
-    protected VisitExpand(node: Token, context: any): void;
-    protected VisitSelectItem(node: Token, context: any): void;
-    protected VisitODataIdentifier(node: Token, context: any): void;
-    private getIdentifier;
-    protected VisitEqualsExpression(node: Token, context: any): void;
-    protected VisitNotEqualsExpression(node: Token, context: any): void;
-    protected VisitLiteral(node: Token, context: any): void;
-    protected VisitNotExpression(node: Token, context: any): void;
-    protected VisitMethodCallExpression(node: Token, context: any): void;
-}

package/src/createFilter.ts

@@ -1,27 +0,0 @@
-import {TypeOrmVisitor as Visitor} from './visitor';
-import {Token} from 'odata-v4-parser/lib/lexer';
-import {SqlOptions} from './sqlOptions';
-import {filter} from 'odata-v4-parser';
-import {SQLLang} from 'odata-v4-sql';
-
-/**
- * Creates an SQL WHERE clause from an OData filter expression string
- * @param {string} odataFilter - A filter expression in OData $filter format
- * @return {string}  SQL WHERE clause
- * @example
- * const filter = createFilter("Size eq 4 and Age gt 18");
- * let sqlQuery = `SELECT * FROM table WHERE ${filter}`;
- */
-export function createFilter(odataFilter: string, options?: SqlOptions): Visitor;
-export function createFilter(odataFilter: Token, options?: SqlOptions): Visitor;
-export function createFilter(odataFilter: string | Token, options = <SqlOptions>{}): Visitor {
-  if (!options.type){
-    options.type = SQLLang.Oracle;
-  }
-  let ast: Token = <Token>(typeof odataFilter == 'string' ? filter(<string>odataFilter) : odataFilter);
-  const visitor = new Visitor(options);
-  const visit = visitor.Visit(ast);
-  const type = visit.asType();
-  return type;
-
-}

package/src/createQuery.ts

@@ -1,23 +0,0 @@
-import {TypeOrmVisitor as Visitor} from './visitor';
-import {Token} from 'odata-v4-parser/lib/lexer';
-import {query} from 'odata-v4-parser';
-import {SQLLang} from 'odata-v4-sql';
-import {SqlOptions} from './sqlOptions';
-
-/**
- * Creates an SQL query descriptor from an OData query string
- * @param {string} odataQuery - An OData query string
- * @return {string}  SQL query descriptor
- * @example
- * const filter = createQuery("$filter=Size eq 4 and Age gt 18");
- * let sqlQuery = `SELECT * FROM table WHERE ${filter.where}`;
- */
-export function createQuery(odataQuery: string, options?: SqlOptions): Visitor;
-export function createQuery(odataQuery: Token, options?: SqlOptions): Visitor;
-export function createQuery(odataQuery: string | Token, options = <SqlOptions>{}): Visitor {
-  if (!options.type) {
-    options.type = SQLLang.Oracle;
-  }
-  let ast: Token = <Token>(typeof odataQuery == 'string' ? query(<string>odataQuery) : odataQuery);
-  return new Visitor(options).Visit(ast).asType();
-}

package/src/executeQuery.ts

@@ -1,292 +0,0 @@
-import { createQuery } from './createQuery';
-import { SqlOptions } from './sqlOptions';
-import { SQLLang } from 'odata-v4-sql';
-const _ = require("underscore");
-
-const mapToObject = (aMap) => {
-  const obj = {};
-  if (aMap) {
-    aMap.forEach((v, k) => {
-      obj[k] = v;
-    });
-  }
-  return obj;
-};
-
-const queryToOdataString = (query): string => {
-  let result = '';
-  for (let key in query) {
-    if (key.startsWith('$')) {
-      if (result !== '') {
-        result += '&';
-      }
-      result += `${key}=${query[key]}`;
-    }
-  }
-  return result;
-};
-
-const processIncludes = (queryBuilder: any, odataQuery: any, alias: string) => {
-  if (odataQuery.includes && odataQuery.includes.length > 0) {
-    odataQuery.includes.forEach(item => {
-      queryBuilder = queryBuilder.leftJoinAndSelect(
-        (alias ? alias + '.' : '') + item.navigationProperty,
-        item.navigationProperty,
-        item.where.replace(/typeorm_query/g, item.navigationProperty),
-        mapToObject(item.parameters)
-      );
-
-      if (item.orderby && item.orderby != '1') {
-        const orders = item.orderby.split(',').map(i => i.trim().replace(/typeorm_query/g, item.navigationProperty));
-        orders.forEach((itemOrd) => {
-          queryBuilder = queryBuilder.addOrderBy(...(itemOrd.split(' ')));
-        });
-      }
-
-      if (item.includes && item.includes.length > 0) {
-        processIncludes(queryBuilder, { includes: item.includes }, item.navigationProperty);
-      }
-    });
-  }
-
-  return queryBuilder;
-};
-
-const executeQueryByQueryBuilder = async (inputQueryBuilder, query, options: SqlOptions, returnSql: boolean = false) => {
-  const alias = inputQueryBuilder.expressionMap.mainAlias.name;
-  options.alias = alias;
-  //const filter = createFilter(query.$filter, {alias: alias});
-  let odataQuery: any = {};
-  if (query) {
-    const odataString = queryToOdataString(query);
-    if (odataString) {
-      odataQuery = createQuery(odataString, options);
-    }
-  }
-  let queryBuilder = inputQueryBuilder;
-
-  if(odataQuery.where){
-    queryBuilder = queryBuilder.andWhere(odataQuery.where)
-  }
-
-  if(odataQuery.parameters){
-    queryBuilder = queryBuilder.setParameters(mapToObject(odataQuery.parameters));
-  }
-
-  const queryRunner = inputQueryBuilder.obtainQueryRunner();
-  const isPaging = query.$skip !== undefined || query.$top !== undefined;
-  if (isPaging && query.$top === undefined) {
-    query.$top = 100;
-  }
-  if (queryRunner && isPaging && [SQLLang.MsSql, SQLLang.Oracle].indexOf(options.type) >= 0) {
-    // 老版本的SqlServer/Oracle数据库不支持OFFSET FETCH 的语法来翻页，只能单独处理
-    // SqlServer 2012版本号options.version为11.0.3128.0，这以下的版本，比如2008/2005都不支持OFFSET FETCH 的语法来翻页
-    const oldVersionMsSql = options.type === SQLLang.MsSql && options.version && parseInt(options.version) < 11;
-    const tooOldVersionMsSql = oldVersionMsSql && parseInt(options.version) < 9;
-    // Oracle 12c版本号options.version为12.2...，这以下的版本，比如10.2都不支持OFFSET FETCH 的语法来翻页
-    const oldVersionOracle = options.type === SQLLang.Oracle && options.version && parseInt(options.version) < 12;
-    if (oldVersionMsSql || oldVersionOracle) {
-      let selectFields = "*";
-      if (odataQuery.select && odataQuery.select !== '*') {
-        selectFields = odataQuery.select;
-      }
-      const RowNumberKey = "RowNumber";
-      if (oldVersionMsSql) {
-        if (tooOldVersionMsSql) {
-          queryBuilder = queryBuilder.select(`top ${query.$top} ${selectFields}`);
-        }
-        else {
-          let orderby = odataQuery.orderby;
-          if (oldVersionMsSql && !(orderby && orderby !== '1')) {
-            orderby = "(select null) ASC";
-          }
-          queryBuilder = queryBuilder.select(`${selectFields},ROW_NUMBER() OVER(ORDER BY ${orderby}) ${RowNumberKey}`);
-        }
-      }
-      else if (oldVersionOracle) {
-        queryBuilder = queryBuilder.select(`${selectFields}`);
-      }
-      if ((oldVersionOracle || tooOldVersionMsSql) && odataQuery.orderby && odataQuery.orderby !== '1') {
-        const orders = odataQuery.orderby.split(',').map(i => i.trim());
-        orders.forEach((item) => {
-          queryBuilder = queryBuilder.addOrderBy(...(item.split(' ')));
-        });
-      }
-      let qs = queryBuilder.getQueryAndParameters();
-      if (returnSql) {
-        return qs;
-      }
-      let splicedSql = "";
-      let start = query.$skip ? query.$skip : 0;
-      let end = 0;
-      if (query.$top) {
-        end = start + query.$top;
-      }
-      if (oldVersionMsSql) {
-        if (tooOldVersionMsSql) {
-          splicedSql = `SELECT * FROM (${qs[0]}) A`;
-        }
-        else {
-          let betweenSql = "";
-          if (end) {
-            betweenSql = `BETWEEN ${start} + 1 and ${end}`;
-          }
-          else {
-            betweenSql = `> ${start}`;
-          }
-          splicedSql = `SELECT * FROM (${qs[0]}) A WHERE ${RowNumberKey} ${betweenSql}`;
-        }
-      }
-      else if (oldVersionOracle) {
-        splicedSql = `SELECT * FROM (SELECT A.*, ROWNUM ${RowNumberKey} FROM (${qs[0]}) A ${end ? ('WHERE ROWNUM <= ' + end) : ''}) b WHERE B.${RowNumberKey} > ${start}`;
-      }
-      try {
-        let getFieldMap = function(columns){
-            let map = {};
-            _.each(columns, function(column){
-                if(column.givenDatabaseName && column.givenDatabaseName != column.propertyName){
-                    map[column.givenDatabaseName] = column.propertyName
-                }
-            })
-            return map;
-        }
-        let columnsMap = getFieldMap(queryBuilder.expressionMap.mainAlias.metadata.columns)
-        const result = await queryRunner.query(splicedSql, qs[1]);
-        let items = result.concat();
-        if(!_.isEmpty(columnsMap)){
-          items.map(function(item){
-            _.each(columnsMap, function(v, k){
-                  item[v] = item[k];
-                  delete item[k];
-              })
-          })
-        }
-        if (query.$count && query.$count !== 'false') {
-          return {
-            items: items,
-            count: result.length
-          }
-        }
-        else {
-          return items;
-        }
-      } finally {
-        if (queryRunner !== queryBuilder.queryRunner) {
-          await queryRunner.release();
-        }
-        if (queryBuilder.connection.driver.options.type === "sqljs") {
-          // this.connection.driver instanceof SqljsDriver
-          // SqljsDriver is not export from typeorm,so we user driver.options.type to check the SqljsDriver instance
-          await queryBuilder.connection.driver.autoSave();
-        }
-      }
-    }
-  }
-
-  if (odataQuery.select && odataQuery.select != '*') {
-    queryBuilder = queryBuilder.select(odataQuery.select.split(',').map(i => i.trim()));
-  }
-
-  queryBuilder = processIncludes(queryBuilder, odataQuery, alias);
-
-  if (odataQuery.orderby && odataQuery.orderby !== '1') {
-    const orders = odataQuery.orderby.split(',').map(i => i.trim());
-    orders.forEach((item) => {
-      queryBuilder = queryBuilder.addOrderBy(...(item.split(' ')));
-    });
-  }
-  queryBuilder = queryBuilder.skip(query.$skip || 0);
-  if (query.$top) {
-    queryBuilder = queryBuilder.take(query.$top);
-  }
-  if (returnSql) {
-    return {
-      sql: queryBuilder.getSql(),
-      query: queryBuilder.getQuery()
-    };
-  }
-  if (query.$count && query.$count !== 'false') {
-    const resultData = await queryBuilder.getManyAndCount();
-    return {
-      items: resultData[0],
-      count: resultData[1]
-    }
-  }
-
-  return queryBuilder.getMany();
-};
-
-const executeQuery = async (repositoryOrQueryBuilder: any, query, options: SqlOptions) => {
-  // options = options || {};
-  const alias = options.alias || '';
-  let queryBuilder = null;
-
-  // check that input object is query builder
-  if (typeof repositoryOrQueryBuilder.expressionMap !== 'undefined') {
-    queryBuilder = repositoryOrQueryBuilder;
-  } else {
-    queryBuilder = await repositoryOrQueryBuilder.createQueryBuilder(alias);
-  }
-  const result = await executeQueryByQueryBuilder(queryBuilder, query, options);
-  return result;
-};
-
-
-const executeCountQueryByQueryBuilder = async (inputQueryBuilder, query, options: SqlOptions) => {
-  const alias = inputQueryBuilder.expressionMap.mainAlias.name;
-  options.alias = alias;
-  //const filter = createFilter(query.$filter, {alias: alias});
-  let odataQuery: any = {};
-  if (query) {
-    const odataString = queryToOdataString(query);
-    if (odataString) {
-      odataQuery = createQuery(odataString, options);
-    }
-  }
-  const queryRunner = inputQueryBuilder.obtainQueryRunner();
-  let queryBuilder = inputQueryBuilder;
-
-  if(odataQuery.where){
-    queryBuilder = queryBuilder.andWhere(odataQuery.where)
-  }
-
-  if(odataQuery.parameters){
-    queryBuilder = queryBuilder.setParameters(mapToObject(odataQuery.parameters));
-  }
-
-  queryBuilder = processIncludes(queryBuilder, odataQuery, alias);
-
-  return await queryBuilder.getCount();
-};
-
-const executeCountQuery = async (repositoryOrQueryBuilder: any, query, options: SqlOptions) => {
-  // options = options || {};
-  const alias = options.alias || '';
-  let queryBuilder = null;
-
-  // check that input object is query builder
-  if (typeof repositoryOrQueryBuilder.expressionMap !== 'undefined') {
-    queryBuilder = repositoryOrQueryBuilder;
-  } else {
-    queryBuilder = repositoryOrQueryBuilder.createQueryBuilder(alias);
-  }
-  const result = await executeCountQueryByQueryBuilder(queryBuilder, query, options);
-  return result;
-};
-
-const getExecuteQuerySQL = async (repositoryOrQueryBuilder: any, query, options: SqlOptions) => {
-  // options = options || {};
-  const alias = options.alias || '';
-  let queryBuilder = null;
-
-  // check that input object is query builder
-  if (typeof repositoryOrQueryBuilder.expressionMap !== 'undefined') {
-    queryBuilder = repositoryOrQueryBuilder;
-  } else {
-    queryBuilder = await repositoryOrQueryBuilder.createQueryBuilder(alias);
-  }
-  const result = executeQueryByQueryBuilder(queryBuilder, query, options, true);
-  return result;
-};
-
-export { executeQuery, executeCountQuery, getExecuteQuerySQL };

package/src/index.ts

@@ -1,7 +0,0 @@
-import {odataQuery} from './odataQueryMiddleware';
-import { executeQuery, executeCountQuery, getExecuteQuerySQL} from './executeQuery';
-import {SqlOptions} from './sqlOptions';
-import {createQuery} from './createQuery';
-import {createFilter} from './createFilter';
-
-export { odataQuery, executeQuery, executeCountQuery, getExecuteQuerySQL, SqlOptions, createQuery, createFilter };

package/src/odataQueryMiddleware.ts

@@ -1,18 +0,0 @@
-import {executeQuery} from './executeQuery';
-
-function odataQuery(repositoryOrQueryBuilder: any) {
-  return async (req: any, res: any, next) => {
-    try {
-      const alias = '';
-
-      const result = await executeQuery(repositoryOrQueryBuilder, req.query, {alias});
-      return res.status(200).json(result);
-    } catch (e) {
-      console.log('ODATA ERROR',e);
-      res.status(500).json({message: 'Internal server error.', error: {message: e.message}});
-    }
-    return next();
-  }
-}
-
-export {odataQuery, executeQuery};

package/src/sqlOptions.ts

@@ -1,8 +0,0 @@
-import {SQLLang} from 'odata-v4-sql';
-
-export interface SqlOptions {
-  useParameters?: boolean;
-  type?: SQLLang;
-  alias: string;
-  version?: string;
-}

package/src/visitor.ts

@@ -1,301 +0,0 @@
-import {Token} from 'odata-v4-parser/lib/lexer';
-import {Literal} from 'odata-v4-literal';
-import {SQLLiteral, SQLLang, Visitor} from 'odata-v4-sql/lib/visitor';
-// import {SqlOptions} from './index';
-
-export class TypeOrmVisitor extends Visitor {
-  //parameters:any[] = [];
-  includes: TypeOrmVisitor[] = [];
-  alias: string = ''// 'typeorm_query';
-
-  constructor(options) {
-    super(options);
-    if (!options.type) {
-      this.type = SQLLang.Oracle;
-    }
-    else{
-      this.type = options.type;
-    }
-    this.alias = options.alias || this.alias;
-  }
-
-  from(table: string) {
-    let sql = `SELECT ${this.select} FROM [${table}] WHERE ${this.where} ORDER BY ${this.orderby}`;
-    switch (this.type) {
-      case SQLLang.Oracle:
-        if (typeof this.skip == "number") sql += ` OFFSET ${this.skip} ROWS`;
-        if (typeof this.limit == "number") {
-          if (typeof this.skip != "number") sql += " OFFSET 0 ROWS";
-          sql += ` FETCH NEXT ${this.limit} ROWS ONLY`;
-        }
-      case SQLLang.MsSql:
-        if (typeof this.orderby !== "string" || this.orderby === "1"){
-          this.orderby = "(select null) ASC";
-        }
-        let start = this.skip ? this.skip : 0;
-        let end = start + this.limit;
-        sql = `SELECT * from (SELECT ${this.select}, ROW_NUMBER() OVER(ORDER BY ${this.orderby}) AS RowId 
-          FROM [${table}] WHERE ${this.where}) as a WHERE RowId BETWEEN ${start} + 1 and ${end}`;
-        break;
-      case SQLLang.MySql:
-      case SQLLang.PostgreSql:
-      default:
-        if (typeof this.limit == "number") sql += ` LIMIT ${this.limit}`;
-        if (typeof this.skip == "number") sql += ` OFFSET ${this.skip}`;
-        break;
-    }
-    // 给sql语句中字段名称增加中括号，防止字段名称使用了数据库的关键字
-    sql = sql.replace(/(\b\w+\b)\.(\b\w+\b)/g, '[$1].[$2]');
-    return sql;
-  }
-
-  asMsSql() {
-    this.type = SQLLang.MsSql;
-    let rx = new RegExp("\\?", "g");
-    let keys = this.parameters.keys();
-    this.originalWhere = this.where;
-    this.where = this.where.replace(rx, () => `:${keys.next().value}`);
-    this.includes.forEach((item) => item.asMsSql());
-    return this;
-  }
-
-  asPostgreSql() {
-    this.type = SQLLang.ANSI;
-    let rx = new RegExp("\\?", "g");
-    let keys = this.parameters.keys();
-    this.originalWhere = this.where;
-    this.where = this.where.replace(rx, () => `:${keys.next().value}`);
-    this.includes.forEach((item) => item.asPostgreSql());
-    return this;
-  }
-
-  asType() {
-    switch (this.type) {
-      case SQLLang.MsSql: return this.asMsSql();
-      case SQLLang.ANSI:
-      case SQLLang.MySql:
-      case SQLLang.PostgreSql: return this.asPostgreSql();
-      case SQLLang.Oracle: return this.asOracleSql();
-      default: return this;
-    }
-  }
-
-  protected VisitExpand(node: Token, context: any) {
-    node.value.items.forEach((item) => {
-      let expandPath = item.value.path.raw;
-      let visitor = this.includes.filter(v => v.navigationProperty == expandPath)[0];
-      if (!visitor) {
-        visitor = new TypeOrmVisitor(this.options);
-        visitor.parameterSeed = this.parameterSeed;
-        this.includes.push(visitor);
-      }
-      visitor.Visit(item);
-      this.parameterSeed = visitor.parameterSeed;
-    });
-  }
-
-  protected VisitSelectItem(node: Token, context: any) {
-    let item = node.raw.replace(/\//g, '.');
-    this.select += this.getIdentifier(item, context.identifier);//`${this.alias}.${item}`;
-  }
-
-  protected VisitODataIdentifier(node: Token, context: any) {
-    if (context.identifier && context.identifier.endsWith('.')) {
-      this[context.target] += '.';
-    }
-
-    if (node.value.name === 'NULL') {
-      this[context.target] += node.value.name;
-    } else {
-      const ident = this.getIdentifier(node.value.name, context);//`${this.alias ? this.alias + '.' : ''}${node.value.name}`;
-      this[context.target] += ident
-    }
-    context.identifier = /*this.getIdentifier(node.value.name, context); //*/node.value.name;
-  }
-
-  private getIdentifier(originalIdentifier: string, context: any) {
-    let alias = '';
-    if (!context || !context.identifier || !context.identifier.endsWith('.')) {
-      alias = this.alias + '.';
-    } else {
-      this[context.target] = this[context.target].replace(new RegExp(this.alias + '.' + context.identifier, 'g'), context.identifier)
-    }
-    return `${alias}${originalIdentifier}`;
-  };
-
-  protected VisitEqualsExpression(node: Token, context: any) {
-    this.Visit(node.value.left, context);
-    this.where += ' = ';
-    this.Visit(node.value.right, context);
-    if (this.options.useParameters && context.literal == null) {
-      this.where = this.where.replace(/= :p\d*$/, 'IS NULL')
-        .replace(new RegExp(`\\:p\\d* = ${context.identifier}$`),
-          `${context.identifier} IS NULL`);
-    } else if (context.literal == 'NULL') {
-      this.where = this.where.replace(/= NULL$/, 'IS NULL')
-        .replace(new RegExp(`NULL = ${context.identifier}$`), `${context.identifier} IS NULL`);
-    }
-  }
-
-  protected VisitNotEqualsExpression(node: Token, context: any) {
-    this.Visit(node.value.left, context);
-    this.where += ' <> ';
-    this.Visit(node.value.right, context);
-    if (this.options.useParameters && context.literal == null) {
-      this.where = this.where.replace(/<> :p\d*$/, 'IS NOT NULL')
-        .replace(new RegExp(`\\:p\\d* <> ${context.identifier}$`),
-          `${context.identifier} IS NOT NULL`);
-    } else if (context.literal == 'NULL') {
-      this.where = this.where.replace(/<> NULL$/, 'IS NOT NULL')
-        .replace(new RegExp(`NULL <> ${context.identifier}$`), `${context.identifier} IS NOT NULL`);
-    }
-  }
-
-  protected VisitLiteral(node: Token, context: any) {
-    if (this.options.useParameters) {
-      let name = `p${this.parameterSeed++}`;
-      let value = Literal.convert(node.value, node.raw);
-      context.literal = value;
-      if (context.literal != null) {
-        this.parameters.set(name, value);
-      }
-      // this.where += `:${name}`;
-      // 因为useParameters为true，所以这里不可以把where追加为:p1这种格式，因为asOracleSql、asPostgreSql等用了正则替换?占位的方式重新设置:p{index}值
-      // 如果把where追加为:p1这种格式，已知的问题是VisitMethodCallExpression函数中的包括contains在内的所有method都只能写在过滤条件的最前面，而不可以写在后面的位置
-      this.where += `?`;
-    } else this.where += (context.literal = SQLLiteral.convert(node.value, node.raw));
-  }
-
-  protected VisitNotExpression(node: Token, context: any) {
-    if (node.value && node.value.type === "MethodCallExpression" && node.value.value.method) {
-      node.value.value.method = `not ${node.value.value.method}`;
-      this.VisitMethodCallExpression(node.value, context);
-    }
-  }
-
-  protected VisitMethodCallExpression(node:Token, context:any){
-    var method = node.value.method;
-    var params = node.value.parameters || [];
-    switch (method){
-      case "contains":
-        this.Visit(params[0], context);
-        if (this.options.useParameters){
-          let name = `p${this.parameterSeed++}`;
-          let value = Literal.convert(params[1].value, params[1].raw);
-          this.parameters.set(name, `%${value}%`);
-          this.where += " like ?";
-        }else this.where += ` like '%${SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
-        break;
-      case "not contains":
-        this.Visit(params[0], context);
-        if (this.options.useParameters) {
-          let name = `p${this.parameterSeed++}`;
-          let value = Literal.convert(params[1].value, params[1].raw);
-          this.parameters.set(name, `%${value}%`);
-          this.where += " not like ?";
-        } else this.where += ` not like '%${SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
-        break;
-      case "endswith":
-        this.Visit(params[0], context);
-        if (this.options.useParameters){
-          let name = `p${this.parameterSeed++}`;
-          let value = Literal.convert(params[1].value, params[1].raw);
-          this.parameters.set(name, `%${value}`);
-          this.where += " like ?";
-        }else this.where += ` like '%${SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}'`;
-        break;
-      case "not endswith":
-        this.Visit(params[0], context);
-        if (this.options.useParameters) {
-          let name = `p${this.parameterSeed++}`;
-          let value = Literal.convert(params[1].value, params[1].raw);
-          this.parameters.set(name, `%${value}`);
-          this.where += " not like ?";
-        } else this.where += ` not like '%${SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}'`;
-        break;
-      case "startswith":
-        this.Visit(params[0], context);
-        if (this.options.useParameters){
-          let name = `p${this.parameterSeed++}`;
-          let value = Literal.convert(params[1].value, params[1].raw);
-          this.parameters.set(name, `${value}%`);
-          this.where += " like ?";
-        }else this.where += ` like '${SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
-        break;
-      case "not startswith":
-        this.Visit(params[0], context);
-        if (this.options.useParameters) {
-          let name = `p${this.parameterSeed++}`;
-          let value = Literal.convert(params[1].value, params[1].raw);
-          this.parameters.set(name, `${value}%`);
-          this.where += " not like ?";
-        } else this.where += ` not like '${SQLLiteral.convert(params[1].value, params[1].raw).slice(1, -1)}%'`;
-        break;
-      case "indexof":
-        let fn = "";
-        switch (this.type) {
-          case SQLLang.MsSql:
-            fn = "CHARINDEX";
-            break;
-          case SQLLang.ANSI:
-          case SQLLang.MySql:
-          case SQLLang.PostgreSql:
-          default:
-            fn = "INSTR";
-            break;
-        }
-        if (fn === "CHARINDEX"){
-          const tmp = params[0];
-          params[0] = params[1];
-          params[1] = tmp;
-        }
-        this.where += `${fn}(`;
-        this.Visit(params[0], context);
-        this.where += ', ';
-        this.Visit(params[1], context);
-        this.where += ") - 1";
-        break;
-      case "round":
-        this.where += "ROUND(";
-        this.Visit(params[0], context);
-        this.where += ")";
-        break;
-      case "length":
-        this.where += "LEN(";
-        this.Visit(params[0], context);
-        this.where += ")";
-        break;
-      case "tolower":
-        this.where += "LOWER(";
-        this.Visit(params[0], context);
-        this.where += ")";
-        break;
-      case "toupper":
-        this.where += "UPPER(";
-        this.Visit(params[0], context);
-        this.where += ")";
-        break;
-      case "floor":
-      case "ceiling":
-      case "year":
-      case "month":
-      case "day":
-      case "hour":
-      case "minute":
-      case "second":
-        this.where += `${method.toUpperCase()}(`;
-        this.Visit(params[0], context);
-        this.where += ")";
-        break;
-      case "now":
-        this.where += "NOW()";
-        break;
-      case "trim":
-        this.where += "TRIM(' ' FROM ";
-        this.Visit(params[0], context);
-        this.where += ")";
-        break;
-    }
-  }
-
-}

package/tsconfig.json

@@ -1,11 +0,0 @@
-{
-  "compilerOptions": {
-    "sourceMap": true,
-    "target": "es6",
-    "module": "commonjs",
-    "declaration": true,
-    "skipLibCheck": true,
-    "experimentalDecorators": true,
-    "outDir": "lib"
-  }
-}