@things-factory/shell 5.0.14 → 6.0.0-alpha.0

package/dist-server/utils/condition-builder.d.ts

@@ -0,0 +1,17 @@
+export declare const buildCondition: (alias: string, fieldName: string, operator: string, value: any, relation: boolean | string, seq: number) => {
+    clause: string;
+    parameters: {
+        [x: string]: any;
+    };
+    value?: undefined;
+} | {
+    clause: string;
+    value: {
+        [x: string]: string;
+    };
+    parameters?: undefined;
+} | {
+    clause: string;
+    parameters?: undefined;
+    value?: undefined;
+};

package/dist-server/utils/get-domain.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="node" />
+import { URL } from 'url';
+import { Domain } from '../service/domain/domain';
+export declare function getUrlFromContext(context: any, path?: string): URL;
+export declare function getDomainFromURL(context: any): Promise<Domain>;
+export declare function getCookieDomainFromHostname(hostname: any): any;
+export declare function getContextPath(subdomain: any): string;
+export declare function getRedirectSubdomainPath(context: any, subdomain: any, redirectTo?: string): string;
+export declare function findSubdomainFromPath(context: any, path: any): any;
+export declare function getSiteRootPath(context: any): string;

package/dist-server/utils/get-domain.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSiteRootPath = exports.findSubdomainFromPath = exports.getRedirectSubdomainPath = exports.getContextPath = exports.getCookieDomainFromHostname = exports.getDomainFromURL = exports.getUrlFromContext = void 0;
-const typeorm_1 = require("typeorm");
 const url_1 = require("url");
 const env_1 = require("@things-factory/env");
 const utils_1 = require("@things-factory/utils");
+const database_1 = require("../initializers/database");
 const domain_1 = require("../service/domain/domain");
 const useVirtualHostBasedDomain = !!env_1.config.get('useVirtualHostBasedDomain');
 const protocol = env_1.config.get('protocol');
@@ -56,7 +56,7 @@ async function getDomainFromURL(context) {
     const { header } = context;
     const subdomain = header['x-things-factory-domain'] || getSubdomainFromURL(context);
     if (subdomain) {
-        return await (0, typeorm_1.getRepository)(domain_1.Domain).findOne({ subdomain }, { cache: true });
+        return await (0, database_1.getRepository)(domain_1.Domain).findOne({ where: { subdomain }, cache: true });
     }
 }
 exports.getDomainFromURL = getDomainFromURL;

package/dist-server/utils/get-domain.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-domain.js","sourceRoot":"","sources":["../../server/utils/get-domain.ts"],"names":[],"mappings":"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","sourcesContent":["import { getRepository } from 'typeorm'\nimport { URL } from 'url'\n\nimport { config } from '@things-factory/env'\nimport { getPathInfo } from '@things-factory/utils'\n\nimport { Domain } from '../service/domain/domain'\n\nconst useVirtualHostBasedDomain = !!config.get('useVirtualHostBasedDomain')\nconst protocol: string = config.get('protocol')\nconst fixed = config.get('subdomain')\nconst subdomainOffset = config.getNumber('subdomainOffset', 2)\n\nexport function getUrlFromContext(context, path = '') {\n  const { method, href, host } = context\n  const { referer } = context.header\n\n  var base = href\n\n  if (method !== 'GET' && referer) {\n    var { host: refererHost } = new URL(referer)\n    if (refererHost === host) {\n      base = referer\n    }\n  }\n\n  let url: URL = new URL(path, base)\n  url.protocol = protocol || url.protocol\n  return url\n}\n\nfunction getSubdomainsFromHost(context: any) {\n  const { request } = context\n  var subdomains = request.headers.host.split('.').reverse()\n  return subdomains.slice(subdomainOffset)\n}\n\nfunction getSubdomainFromPath(context: any) {\n  var { path } = context\n\n  var domain = getPathInfo(path || '')?.domain\n  if (domain) {\n    return domain\n  }\n\n  var {\n    host,\n    header: { referer }\n  } = context\n\n  if (referer) {\n    var { host: refererHost, pathname } = new URL(referer)\n    if (refererHost === host) {\n      return getPathInfo(pathname || '')?.domain\n    }\n  }\n}\n\nfunction getSubdomainFromVhost(context: any) {\n  const subdomain = (context.subdomains || getSubdomainsFromHost(context)).slice(-1)[0]\n\n  return subdomain\n}\n\nfunction getSubdomainFromURL(context) {\n  return fixed || (useVirtualHostBasedDomain ? getSubdomainFromVhost(context) : getSubdomainFromPath(context))\n}\n\nexport async function getDomainFromURL(context: any): Promise<Domain> {\n  const { header } = context\n\n  const subdomain = header['x-things-factory-domain'] || getSubdomainFromURL(context)\n\n  if (subdomain) {\n    return await getRepository(Domain).findOne({ subdomain }, { cache: true })\n  }\n}\n\nexport function getCookieDomainFromHostname(hostname) {\n  if (useVirtualHostBasedDomain) {\n    return hostname.split('.').slice(-subdomainOffset).join('.')\n  }\n}\n\nexport function getContextPath(subdomain) {\n  return fixed || useVirtualHostBasedDomain ? '' : '/domain/' + subdomain\n}\n\nexport function getRedirectSubdomainPath(context, subdomain, redirectTo = '/') {\n  if (fixed) {\n    return redirectTo || '/'\n  }\n\n  var parsed = getUrlFromContext(context, redirectTo)\n  var { hostname, pathname } = parsed\n\n  if (useVirtualHostBasedDomain) {\n    const splitHost = hostname.split('.').reverse()\n    splitHost[subdomainOffset] = subdomain\n    parsed.hostname = splitHost\n      .reverse()\n      .filter(a => a)\n      .join('.')\n  } else {\n    const contextPath = `/domain/${subdomain}`\n    const match = pathname.match(/^\\/domain\\/([^\\/]+)/)\n\n    if (match) {\n      parsed.pathname = pathname.replace(match[0], contextPath)\n    } else {\n      parsed.pathname = `${contextPath}${pathname}`\n    }\n  }\n\n  return parsed.toString()\n}\n\nexport function findSubdomainFromPath(context, path) {\n  if (fixed) {\n    return fixed\n  }\n\n  var parsed = getUrlFromContext(context, path)\n  var { hostname, pathname } = parsed\n\n  if (useVirtualHostBasedDomain) {\n    return hostname.split('.').reverse()[subdomainOffset]\n  }\n\n  const match = pathname.match(/^\\/domain\\/([^\\/]+)/)\n  return match && match[1]\n}\n\nexport function getSiteRootPath(context) {\n  if (useVirtualHostBasedDomain) {\n    var { protocol, host } = context\n    protocol = protocol.replace(':', '')\n\n    let domainname = host.split('.').slice(-subdomainOffset).join('.')\n    return protocol + '://' + domainname + '/'\n  } else {\n    return '/'\n  }\n}\n"]}
+{"version":3,"file":"get-domain.js","sourceRoot":"","sources":["../../server/utils/get-domain.ts"],"names":[],"mappings":"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","sourcesContent":["import { URL } from 'url'\n\nimport { config } from '@things-factory/env'\nimport { getPathInfo } from '@things-factory/utils'\n\nimport { getRepository } from '../initializers/database'\nimport { Domain } from '../service/domain/domain'\n\nconst useVirtualHostBasedDomain = !!config.get('useVirtualHostBasedDomain')\nconst protocol: string = config.get('protocol')\nconst fixed = config.get('subdomain')\nconst subdomainOffset = config.getNumber('subdomainOffset', 2)\n\nexport function getUrlFromContext(context, path = '') {\n  const { method, href, host } = context\n  const { referer } = context.header\n\n  var base = href\n\n  if (method !== 'GET' && referer) {\n    var { host: refererHost } = new URL(referer)\n    if (refererHost === host) {\n      base = referer\n    }\n  }\n\n  let url: URL = new URL(path, base)\n  url.protocol = protocol || url.protocol\n  return url\n}\n\nfunction getSubdomainsFromHost(context: any) {\n  const { request } = context\n  var subdomains = request.headers.host.split('.').reverse()\n  return subdomains.slice(subdomainOffset)\n}\n\nfunction getSubdomainFromPath(context: any) {\n  var { path } = context\n\n  var domain = getPathInfo(path || '')?.domain\n  if (domain) {\n    return domain\n  }\n\n  var {\n    host,\n    header: { referer }\n  } = context\n\n  if (referer) {\n    var { host: refererHost, pathname } = new URL(referer)\n    if (refererHost === host) {\n      return getPathInfo(pathname || '')?.domain\n    }\n  }\n}\n\nfunction getSubdomainFromVhost(context: any) {\n  const subdomain = (context.subdomains || getSubdomainsFromHost(context)).slice(-1)[0]\n\n  return subdomain\n}\n\nfunction getSubdomainFromURL(context) {\n  return fixed || (useVirtualHostBasedDomain ? getSubdomainFromVhost(context) : getSubdomainFromPath(context))\n}\n\nexport async function getDomainFromURL(context: any): Promise<Domain> {\n  const { header } = context\n\n  const subdomain = header['x-things-factory-domain'] || getSubdomainFromURL(context)\n\n  if (subdomain) {\n    return await getRepository(Domain).findOne({ where: { subdomain }, cache: true })\n  }\n}\n\nexport function getCookieDomainFromHostname(hostname) {\n  if (useVirtualHostBasedDomain) {\n    return hostname.split('.').slice(-subdomainOffset).join('.')\n  }\n}\n\nexport function getContextPath(subdomain) {\n  return fixed || useVirtualHostBasedDomain ? '' : '/domain/' + subdomain\n}\n\nexport function getRedirectSubdomainPath(context, subdomain, redirectTo = '/') {\n  if (fixed) {\n    return redirectTo || '/'\n  }\n\n  var parsed = getUrlFromContext(context, redirectTo)\n  var { hostname, pathname } = parsed\n\n  if (useVirtualHostBasedDomain) {\n    const splitHost = hostname.split('.').reverse()\n    splitHost[subdomainOffset] = subdomain\n    parsed.hostname = splitHost\n      .reverse()\n      .filter(a => a)\n      .join('.')\n  } else {\n    const contextPath = `/domain/${subdomain}`\n    const match = pathname.match(/^\\/domain\\/([^\\/]+)/)\n\n    if (match) {\n      parsed.pathname = pathname.replace(match[0], contextPath)\n    } else {\n      parsed.pathname = `${contextPath}${pathname}`\n    }\n  }\n\n  return parsed.toString()\n}\n\nexport function findSubdomainFromPath(context, path) {\n  if (fixed) {\n    return fixed\n  }\n\n  var parsed = getUrlFromContext(context, path)\n  var { hostname, pathname } = parsed\n\n  if (useVirtualHostBasedDomain) {\n    return hostname.split('.').reverse()[subdomainOffset]\n  }\n\n  const match = pathname.match(/^\\/domain\\/([^\\/]+)/)\n  return match && match[1]\n}\n\nexport function getSiteRootPath(context) {\n  if (useVirtualHostBasedDomain) {\n    var { protocol, host } = context\n    protocol = protocol.replace(':', '')\n\n    let domainname = host.split('.').slice(-subdomainOffset).join('.')\n    return protocol + '://' + domainname + '/'\n  } else {\n    return '/'\n  }\n}\n"]}

package/dist-server/utils/get-query-builder-from-list-params.d.ts

@@ -0,0 +1,21 @@
+import { Repository, SelectQueryBuilder } from 'typeorm';
+import { ListParam } from '../service/common-types/list-param';
+import { Domain } from '../service/domain/domain';
+/**
+ *
+ * @param options
+ * @returns
+ */
+export declare function getQueryBuilderFromListParams<Type>(options: {
+    repository: Repository<Type>;
+    params: ListParam;
+    domain?: Domain;
+    alias?: string;
+    searchables?: string[];
+    filtersMap?: {
+        [name: string]: {
+            columnName: string;
+            relationColumn?: string;
+        };
+    };
+}): SelectQueryBuilder<Type>;

package/dist-server/utils/index.d.ts

@@ -0,0 +1,7 @@
+export * from './get-domain';
+export * from './condition-builder';
+export * from './list-query-builder';
+export * from './list-params-converter';
+export * from './publish-progress';
+export * from './get-query-builder-from-list-params';
+export * from './list-param-adjuster';

package/dist-server/utils/list-param-adjuster.d.ts

@@ -0,0 +1,2 @@
+import { Filter } from '../service/common-types';
+export declare function adjustFilters(filters: Filter[], filtersChange: Filter[]): Filter[];

package/dist-server/utils/list-params-converter.d.ts

@@ -0,0 +1,16 @@
+import { FindOperator } from 'typeorm';
+import { ListParam } from '../service/common-types';
+import { Domain } from '../service/domain/domain';
+export declare function convertListParams(params: ListParam, options?: string | {
+    domain?: string | Domain;
+    searchables?: string[];
+}): {
+    where?: {
+        [name: string]: FindOperator<any>;
+    };
+    order?: {
+        [name: string]: 'DESC' | 'ASC';
+    };
+    skip?: number;
+    take?: number;
+};

package/dist-server/utils/list-params-converter.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-params-converter.js","sourceRoot":"","sources":["../../server/utils/list-params-converter.ts"],"names":[],"mappings":"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","sourcesContent":["import { Between, Equal, FindOperator, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'\n\nimport { Filter, ListParam, Pagination, Sorting } from '../service/common-types'\nimport { Domain } from '../service/domain/domain'\nimport { adjustFilters } from './list-param-adjuster'\n\nconst OPERATION_FUNCTION_MAP: { [operator: string]: (value: any) => FindOperator<any> } = {\n  search: value => ILike(value),\n  eq: value => Equal(value),\n  noteq: value => Not(Equal(value)),\n  like: value => Like(value),\n  i_like: value => ILike(value),\n  nlike: value => Not(Like(value)),\n  i_nlike: value => Not(ILike(value)),\n  lt: value => Raw(alias => `${alias} < ${typeof value === 'string' ? \"'\" + value + \"'\" : value}`),\n  gt: value => Raw(alias => `${alias} > ${typeof value === 'string' ? \"'\" + value + \"'\" : value}`),\n  lte: value => Raw(alias => `${alias} <= ${typeof value === 'string' ? \"'\" + value + \"'\" : value}`),\n  gte: value => Raw(alias => `${alias} >= ${typeof value === 'string' ? \"'\" + value + \"'\" : value}`),\n  in: value => In(value),\n  notin: value => Not(In(value)),\n  is_null: () => IsNull(),\n  is_not_null: () => Not(IsNull()),\n  is_false: () => Raw(alias => `${alias} IS FALSE`),\n  in_true: () => Raw(alias => `${alias} IS TRUE`),\n  is_not_true: () => Raw(alias => `${alias} IS NOT TRUE`),\n  is_present: () => Raw(alias => `${alias} IS PRESENT`),\n  is_blank: () => Raw(alias => `${alias} IS BLANK`),\n  is_empty_num_id: () => Raw(alias => `${alias} IS EMPTY NUMERIC ID`),\n  between: value => Between(value[0], value[1])\n}\n\nfunction getOperatorFunction({ operator, value }: { operator: string; value: any }): FindOperator<any> {\n  return OPERATION_FUNCTION_MAP[operator](value)\n}\n\nfunction makePaginationParams(pagination: Pagination): { skip?: number; take?: number } {\n  var result = {} as { skip?: number; take?: number }\n  if (pagination) {\n    var { page = 0, limit = 0 } = pagination\n    var skip = 0\n    var take = 0\n\n    if (limit > 0) {\n      skip = Math.max(page - 1, 0) * limit\n      take = limit\n      Object.assign(result, {\n        skip,\n        take\n      })\n    }\n  }\n\n  return result\n}\n\nfunction makeSortingParams(sortings: Sorting[]): { order?: { [name: string]: 'DESC' | 'ASC' } } {\n  var result = {} as { order?: { [name: string]: 'DESC' | 'ASC' } }\n  if (sortings) {\n    var order = {} as { [name: string]: 'DESC' | 'ASC' }\n    sortings.forEach(s => {\n      order[s.name] = s.desc ? 'DESC' : 'ASC'\n    })\n\n    Object.assign(result, {\n      order\n    })\n  }\n\n  return result\n}\n\nfunction makeFilterParams(\n  filters: Filter[],\n  searchables?: string[]\n): {\n  where: { [name: string]: FindOperator<any> } | { [name: string]: FindOperator<any> }[]\n} {\n  /* for where AND clauses */\n  const columnFilters =\n    filters?.filter(filter => {\n      if (filter.operator === 'search') {\n        return false\n      }\n      if (filter.operator.toLowerCase().includes('like') && (!searchables || !searchables.includes(filter.name))) {\n        return false\n      }\n      return true\n    }) || []\n\n  const searchFilters =\n    searchables instanceof Array\n      ? filters?.filter(filter => {\n          if (filter.operator !== 'search') {\n            return false\n          }\n          if (!searchables.includes(filter.name)) {\n            console.warn(\n              '\"searchables\" setting is required for like searches with a heavy database query load',\n              filter.name\n            )\n            return false\n          }\n          return true\n        }) || []\n      : []\n\n  const columnWhere = columnFilters.reduce((where, f) => {\n    where[f.name] = getOperatorFunction(f)\n    return where\n  }, {} as { [name: string]: FindOperator<any> })\n\n  if (searchFilters.length === 0) {\n    return {\n      where: columnWhere\n    }\n  }\n\n  /* for fulltext searching ... OR-AND composition */\n  const searchWheres = searchFilters.map(f => {\n    return {\n      [f.name]: getOperatorFunction(f),\n      ...columnWhere\n    }\n  })\n\n  return {\n    where: searchWheres\n  }\n}\n\nexport function convertListParams(\n  params: ListParam,\n  options?:\n    | string\n    | {\n        domain?: string | Domain\n        searchables?: string[]\n      }\n): {\n  where?: { [name: string]: FindOperator<any> }\n  order?: {\n    [name: string]: 'DESC' | 'ASC'\n  }\n  skip?: number\n  take?: number\n} {\n  var domainId: string | undefined\n\n  if (options) {\n    if (typeof options === 'string' /* for 하위 호환성 */) {\n      var domainId = options\n    } else {\n      var { domain, searchables } = options\n      var domainId = typeof domain === 'string' ? domain : domain?.id\n    }\n  }\n\n  var { pagination, filters = [], sortings } = params\n  var result = {}\n\n  if (domainId) {\n    filters = adjustFilters(filters, [\n      {\n        name: 'domain',\n        operator: 'eq',\n        value: domainId\n      }\n    ])\n  }\n\n  if (pagination) Object.assign(result, makePaginationParams(pagination))\n  if (sortings) Object.assign(result, makeSortingParams(sortings))\n  if (filters) Object.assign(result, makeFilterParams(filters, searchables))\n\n  return result\n}\n"]}
+{"version":3,"file":"list-params-converter.js","sourceRoot":"","sources":["../../server/utils/list-params-converter.ts"],"names":[],"mappings":"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","sourcesContent":["import { Between, Equal, FindOperator, ILike, In, IsNull, Like, Not, Raw } from 'typeorm'\n\nimport { Filter, ListParam, Pagination, Sorting } from '../service/common-types'\nimport { Domain } from '../service/domain/domain'\nimport { adjustFilters } from './list-param-adjuster'\n\nconst OPERATION_FUNCTION_MAP: { [operator: string]: (value: any) => FindOperator<any> } = {\n  search: value => ILike(value),\n  eq: value => Equal(value),\n  noteq: value => Not(Equal(value)),\n  like: value => Like(value),\n  i_like: value => ILike(value),\n  nlike: value => Not(Like(value)),\n  i_nlike: value => Not(ILike(value)),\n  lt: value => Raw(alias => `${alias} < ${typeof value === 'string' ? \"'\" + value + \"'\" : value}`),\n  gt: value => Raw(alias => `${alias} > ${typeof value === 'string' ? \"'\" + value + \"'\" : value}`),\n  lte: value => Raw(alias => `${alias} <= ${typeof value === 'string' ? \"'\" + value + \"'\" : value}`),\n  gte: value => Raw(alias => `${alias} >= ${typeof value === 'string' ? \"'\" + value + \"'\" : value}`),\n  in: value => In(value),\n  notin: value => Not(In(value)),\n  is_null: () => IsNull(),\n  is_not_null: () => Not(IsNull()),\n  is_false: () => Raw(alias => `${alias} IS FALSE`),\n  in_true: () => Raw(alias => `${alias} IS TRUE`),\n  is_not_true: () => Raw(alias => `${alias} IS NOT TRUE`),\n  is_present: () => Raw(alias => `${alias} IS PRESENT`),\n  is_blank: () => Raw(alias => `${alias} IS BLANK`),\n  is_empty_num_id: () => Raw(alias => `${alias} IS EMPTY NUMERIC ID`),\n  between: value => Between(value[0], value[1])\n}\n\nfunction getOperatorFunction({ operator, value }: Filter): FindOperator<any> {\n  return OPERATION_FUNCTION_MAP[operator](value)\n}\n\nfunction makePaginationParams(pagination: Pagination): { skip?: number; take?: number } {\n  var result = {} as { skip?: number; take?: number }\n  if (pagination) {\n    var { page = 0, limit = 0 } = pagination\n    var skip = 0\n    var take = 0\n\n    if (limit > 0) {\n      skip = Math.max(page - 1, 0) * limit\n      take = limit\n      Object.assign(result, {\n        skip,\n        take\n      })\n    }\n  }\n\n  return result\n}\n\nfunction makeSortingParams(sortings: Sorting[]): { order?: { [name: string]: 'DESC' | 'ASC' } } {\n  var result = {} as { order?: { [name: string]: 'DESC' | 'ASC' } }\n  if (sortings) {\n    var order = {} as { [name: string]: 'DESC' | 'ASC' }\n    sortings.forEach(s => {\n      order[s.name] = s.desc ? 'DESC' : 'ASC'\n    })\n\n    Object.assign(result, {\n      order\n    })\n  }\n\n  return result\n}\n\nfunction makeFilterParams(\n  filters: Filter[],\n  searchables?: string[]\n): {\n  where: { [name: string]: FindOperator<any> } | { [name: string]: FindOperator<any> }[]\n} {\n  /* for where AND clauses */\n  const columnFilters =\n    filters?.filter(filter => {\n      if (filter.operator === 'search') {\n        return false\n      }\n      if (filter.operator.toLowerCase().includes('like') && (!searchables || !searchables.includes(filter.name))) {\n        return false\n      }\n      return true\n    }) || []\n\n  const searchFilters =\n    searchables instanceof Array\n      ? filters?.filter(filter => {\n          if (filter.operator !== 'search') {\n            return false\n          }\n          if (!searchables.includes(filter.name)) {\n            console.warn(\n              '\"searchables\" setting is required for like searches with a heavy database query load',\n              filter.name\n            )\n            return false\n          }\n          return true\n        }) || []\n      : []\n\n  const columnWhere = columnFilters.reduce((where, f) => {\n    where[f.name] = getOperatorFunction(f)\n    return where\n  }, {} as { [name: string]: FindOperator<any> })\n\n  if (searchFilters.length === 0) {\n    return {\n      where: columnWhere\n    }\n  }\n\n  /* for fulltext searching ... OR-AND composition */\n  const searchWheres = searchFilters.map(f => {\n    return {\n      [f.name]: getOperatorFunction(f),\n      ...columnWhere\n    }\n  })\n\n  return {\n    where: searchWheres\n  }\n}\n\nexport function convertListParams(\n  params: ListParam,\n  options?:\n    | string\n    | {\n        domain?: string | Domain\n        searchables?: string[]\n      }\n): {\n  where?: { [name: string]: FindOperator<any> }\n  order?: {\n    [name: string]: 'DESC' | 'ASC'\n  }\n  skip?: number\n  take?: number\n} {\n  var domainId: string | undefined\n\n  if (options) {\n    if (typeof options === 'string' /* for 하위 호환성 */) {\n      var domainId = options\n    } else {\n      var { domain, searchables } = options\n      var domainId = typeof domain === 'string' ? domain : domain?.id\n    }\n  }\n\n  var { pagination, filters = [], sortings } = params\n  var result = {}\n\n  if (domainId) {\n    filters = adjustFilters(filters, [\n      {\n        name: 'domain',\n        operator: 'eq',\n        value: domainId\n      }\n    ])\n  }\n\n  if (pagination) Object.assign(result, makePaginationParams(pagination))\n  if (sortings) Object.assign(result, makeSortingParams(sortings))\n  if (filters) Object.assign(result, makeFilterParams(filters, searchables))\n\n  return result\n}\n"]}

package/dist-server/utils/list-query-builder.d.ts

@@ -0,0 +1,7 @@
+/**
+ * @deprecated The name of this function does not imply an exact purpose and it is not possible to correspond to a foreign key using the meta information of the table column, so it is recommended to replace it with the getQueryBuilderFromListParams function.
+ */
+export declare const buildQuery: (queryBuilder: any, params: any, context: any, options?: boolean | {
+    domainRef?: boolean;
+    searchables?: string[];
+}) => void;

package/dist-server/utils/publish-progress.d.ts

@@ -0,0 +1,6 @@
+export declare function publishProgress({ domain, tag, progress, message }: {
+    domain: any;
+    tag: any;
+    progress: any;
+    message: any;
+}): void;

package/dist-server/webpack/koa-webpack/client.d.ts

@@ -0,0 +1 @@
+declare const webpackHotClient: any;

package/dist-server/webpack/koa-webpack/index.d.ts

@@ -0,0 +1,2 @@
+declare const _default: (opts: any) => Promise<any>;
+export default _default;

package/dist-server/webpack/koa-webpack/validate.d.ts

@@ -0,0 +1 @@
+declare const Joi: any;

package/ormconfig.js

@@ -1,4 +1,4 @@
-const { orderedModuleNames, config, loader } = require('@things-factory/env')
+const { orderedModuleNames, loader } = require('@things-factory/env')
 const { NamingStrategy } = require('@things-factory/shell')
 
 const debug = require('debug')('things-factory:shell:ormconfig')
@@ -27,6 +27,5 @@ module.exports = {
   namingStrategy: new NamingStrategy(),
   entities,
   migrations,
-  subscribers,
-  ...config.get('ormconfig')
+  subscribers
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/shell",
-  "version": "5.0.14",
+  "version": "6.0.0-alpha.0",
   "description": "Core module for framework",
   "bin": {
     "things-factory": "bin/things-factory",
@@ -45,16 +45,17 @@
     "@material/mwc-icon-button": "^0.26.1",
     "@material/mwc-slider": "^0.26.1",
     "@material/mwc-textfield": "^0.26.1",
+    "@open-wc/scoped-elements": "^2.1.3",
     "@operato/board": "^1.0.1",
     "@operato/graphql": "^1.0.0",
     "@operato/help": "^1.0.1",
     "@operato/layout": "^1.0.1",
     "@operato/shell": "^1.0.1",
     "@operato/utils": "^1.0.1",
-    "@things-factory/ejs-remote": "^5.0.0",
-    "@things-factory/env": "^5.0.0",
-    "@things-factory/styles": "^5.0.0",
-    "@things-factory/utils": "^5.0.1",
+    "@things-factory/ejs-remote": "^6.0.0-alpha.0",
+    "@things-factory/env": "^6.0.0-alpha.0",
+    "@things-factory/styles": "^6.0.0-alpha.0",
+    "@things-factory/utils": "^6.0.0-alpha.0",
     "@webcomponents/webcomponentsjs": "^2.6.0",
     "@webpack-contrib/schema-utils": "^1.0.0-beta.0",
     "apollo-server-core": "^3.10.0",
@@ -116,7 +117,7 @@
     "scrollbooster": "^3.0.2",
     "sweetalert2": "^10.9.0",
     "type-graphql": "npm:type-graphql-v2-fork@2.0.0-alpha2",
-    "typeorm": "^0.2.45",
+    "typeorm": "^0.3.9",
     "uuid": "^3.4.0",
     "web-animations-js": "^2.3.2",
     "web-push": "^3.5.0",
@@ -131,5 +132,5 @@
     "pg": "^8.7.3",
     "sqlite3": "^5.0.8"
   },
-  "gitHead": "9ceaa39746fcf42953e429fab2001353cd821ded"
+  "gitHead": "e5b9823ab3ebc5d6ae5bcb4b5aa60c1306e4dd7e"
 }

package/server/index.ts

@@ -1,5 +1,6 @@
 export * from './migrations'
 export * from './initializers/naming-strategy'
+export * from './initializers/database'
 export * from './utils'
 export * from './pubsub'
 export * from './pubsub-log-transport'

package/server/initializers/database.ts

@@ -1,7 +1,8 @@
-const path = require('path')
+import { createConnection, DataSource, EntityTarget, Repository } from 'typeorm'
+
+import { appRootPath, config, logger } from '@things-factory/env'
 
-import { createConnection } from 'typeorm'
-import { logger, appRootPath } from '@things-factory/env'
+const path = require('path')
 
 var ormconfig
 try {
@@ -10,18 +11,57 @@ try {
   ormconfig = require('@things-factory/shell/ormconfig')
 }
 
+const dataSources: { [name: string]: DataSource } = {}
+
+export function getDataSource(name?: string): DataSource {
+  return dataSources[name || 'default']
+}
+
+export function addDataSource(name: string, dataSource: DataSource) {
+  dataSources[name] = dataSource
+}
+
+export function removeDataSource(name: string) {
+  delete dataSources[name]
+}
+
+export function getDataSourceNames() {
+  return Object.keys(dataSources)
+}
+
+export function getRepository<X>(target: EntityTarget<X>): Repository<X> {
+  return getDataSource('default').getRepository<X>(target)
+}
+
 export const databaseInitializer = async () => {
   try {
-    const connection = await createConnection(ormconfig)
-    logger.info('Database connection established')
+    const dataSource = await createConnection({
+      ...ormconfig,
+      ...config.get('ormconfig')
+    })
+
+    addDataSource('default', dataSource)
+
+    logger.info('Default DataSource established')
 
     if (ormconfig.type == 'sqlite' && ormconfig.synchronize == false) {
-      await connection.query('PRAGMA foreign_keys=OFF')
-      await connection.synchronize()
-      await connection.query('PRAGMA foreign_keys=ON')
+      await dataSource.query('PRAGMA foreign_keys=OFF')
+      await dataSource.synchronize()
+      await dataSource.query('PRAGMA foreign_keys=ON')
     }
 
-    return connection
+    if (config.get('ormconfig4Tx')) {
+      const dataSource4Tx = new DataSource({
+        ...ormconfig,
+        ...config.get('ormconfig4Tx')
+      })
+      dataSource4Tx.initialize()
+      addDataSource('tx', dataSource4Tx)
+
+      logger.info('Transaction DataSource established')
+    } else {
+      addDataSource('tx', dataSource)
+    }
   } catch (e) {
     logger.error(e)
   }

package/server/migrations/1000000000000-SeedDomain.ts

@@ -1,4 +1,6 @@
-import { MigrationInterface, QueryRunner, getRepository } from 'typeorm'
+import { MigrationInterface, QueryRunner } from 'typeorm'
+
+import { getRepository } from '../initializers/database'
 import { Domain } from '../service/domain/domain'
 
 const SEED_DOMAINS = [
@@ -27,7 +29,7 @@ export class SeedDomain1000000000000 implements MigrationInterface {
 
     return await Promise.all(
       SEED_DOMAINS.reverse().map(async domain => {
-        let recode = await repository.findOne({ subdomain: domain.subdomain })
+        let recode = await repository.findOneBy({ subdomain: domain.subdomain })
         await repository.remove(recode)
       })
     )

package/server/server-dev.ts

@@ -4,7 +4,7 @@
 process.env.NODE_ENV = 'development'
 process.setMaxListeners(0)
 
-import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageGraphQLPlayground } from 'apollo-server-core'
+import { ApolloServerPluginDrainHttpServer, ApolloServerPluginLandingPageLocalDefault } from 'apollo-server-core'
 import { ApolloServer } from 'apollo-server-koa'
 import bytesFormat from 'bytes'
 import graphqlUploadKoa from 'graphql-upload/graphqlUploadKoa.js'
@@ -27,6 +27,8 @@ import { GraphqlLocalClient } from './graphql-local-client'
 import { databaseInitializer } from './initializers/database'
 import { domainPrivateRouter, domainPublicRouter, globalPrivateRouter, globalPublicRouter } from './routers'
 import { schema } from './schema'
+import { Domain } from './service'
+import { EntityManager } from 'typeorm'
 
 process.on('uncaughtException', error => {
   logger.error(error)
@@ -68,11 +70,21 @@ const fileUploadOption = {
   maxFiles: fileUpload.maxFiles || 10
 }
 
+interface ICustomAppState {
+  domain: Domain
+  user: any
+  tx: EntityManager
+}
+
+interface ICustomAppContext {
+  t: any
+}
+
 /* bootstrap */
 const bootstrap = async () => {
   await databaseInitializer()
 
-  const app = new Koa()
+  const app = new Koa<ICustomAppState, ICustomAppContext>()
 
   app.use(
     cors({
@@ -124,9 +136,13 @@ const bootstrap = async () => {
         var { extra, connectionParams } = ctx
         var { request } = extra
 
-        var url = new URL(((connectionParams['headers'] as any) || connectionParams).referer)
-        var accessToken = url.searchParams.get('access_token')
-        connectionParams['headers']['authorization'] = accessToken
+        if (((connectionParams['headers'] as any) || connectionParams)?.referer) {
+          var url = new URL(((connectionParams['headers'] as any) || connectionParams).referer)
+          var accessToken = url.searchParams.get('access_token')
+          if (accessToken) {
+            connectionParams['headers']['authorization'] = accessToken
+          }
+        }
 
         request.headers = {
           ...request.headers,
@@ -170,13 +186,11 @@ const bootstrap = async () => {
         return ctx
       }
     },
+    csrfPrevention: true,
     plugins: [
-      ApolloServerPluginLandingPageGraphQLPlayground({
-        settings: {
-          'request.credentials': 'same-origin'
-        }
-      }),
+      // Proper shutdown for the HTTP server.
       ApolloServerPluginDrainHttpServer({ httpServer }),
+      // Proper shutdown for the WebSocket server.
       {
         async serverWillStart() {
           return {
@@ -185,7 +199,10 @@ const bootstrap = async () => {
             }
           }
         }
-      }
+      },
+      ApolloServerPluginLandingPageLocalDefault({
+        embed: true
+      })
     ],
     cache: 'bounded'
   })
@@ -226,11 +243,7 @@ const bootstrap = async () => {
   app.use(koaBodyParser(bodyParserOption))
   app.use(graphqlUploadKoa(fileUploadOption))
 
-  app.use(
-    server.getMiddleware({
-      path: '/graphql'
-    })
-  )
+  server.applyMiddleware({ app, path: '/graphql' })
 
   /* routers */
   process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)

package/server/server.ts

@@ -113,9 +113,13 @@ const bootstrap = async () => {
         var { extra, connectionParams } = ctx
         var { request } = extra
 
-        var url = new URL(((connectionParams['headers'] as any) || connectionParams).referer)
-        var accessToken = url.searchParams.get('access_token')
-        connectionParams['headers']['authorization'] = accessToken
+        if (((connectionParams['headers'] as any) || connectionParams)?.referer) {
+          var url = new URL(((connectionParams['headers'] as any) || connectionParams).referer)
+          var accessToken = url.searchParams.get('access_token')
+          if (accessToken) {
+            connectionParams['headers']['authorization'] = accessToken
+          }
+        }
 
         request.headers = {
           ...request.headers,
@@ -198,11 +202,7 @@ const bootstrap = async () => {
   app.use(koaBodyParser(bodyParserOption))
   app.use(graphqlUploadKoa(fileUploadOption))
 
-  app.use(
-    server.getMiddleware({
-      path: '/graphql'
-    })
-  )
+  server.applyMiddleware({ app, path: '/graphql' })
 
   /* routers */
   process.emit('bootstrap-module-global-public-route' as any, app, globalPublicRouter)

package/server/service/common-types/list-param.ts

@@ -1,4 +1,5 @@
-import { ArgsType, InputType, Field, Int } from 'type-graphql'
+import { ArgsType, Field, InputType, Int } from 'type-graphql'
+
 import { ScalarAny } from './scalar-any'
 
 @InputType()
@@ -27,8 +28,8 @@ export class Filter {
   @Field()
   operator: string
 
-  @Field(type => ScalarAny)
-  value: any
+  @Field(type => ScalarAny, { nullable: true })
+  value?: any
 
   @Field({ nullable: true })
   relation?: boolean

package/server/service/directive-transaction/transaction.ts

@@ -1,9 +1,10 @@
 import { defaultFieldResolver, GraphQLSchema } from 'graphql'
 import gql from 'graphql-tag'
-import { getConnection } from 'typeorm'
 
 import { getDirective, MapperKind, mapSchema } from '@graphql-tools/utils'
 
+import { getDataSource } from '../../initializers/database'
+
 const DIRECTIVE = 'transaction'
 
 export const transactionDirectiveTypeDefs = gql`
@@ -17,7 +18,7 @@ export const transactionDirectiveResolver = (schema: GraphQLSchema) =>
         const { resolve = defaultFieldResolver } = fieldConfig
 
         fieldConfig.resolve = async function (source, args, context, info) {
-          return await getConnection().transaction(async tx => {
+          return await getDataSource('tx').transaction(async tx => {
             /* local-graphql-client로부터 invoke인 경우에는 context.req, context.res 가 없으므로, 빈 오브젝트로 대체해준다. */
             let wrap = context.app.createContext(context.req || {}, context.res || {})
 

package/server/service/domain/domain-resolver.ts

@@ -1,8 +1,9 @@
 import { Arg, Args, Ctx, Directive, Mutation, Query, Resolver } from 'type-graphql'
-import { getRepository, In, Repository } from 'typeorm'
+import { In, Repository } from 'typeorm'
 
 import { slugger } from '@things-factory/utils'
 
+import { getRepository } from '../../initializers/database'
 import { buildQuery } from '../../utils/list-query-builder'
 import { ListParam } from '../common-types/list-param'
 import { Domain } from './domain'
@@ -15,12 +16,12 @@ export class DomainResolver {
   async domain(@Arg('id') id: string): Promise<Domain> {
     const repository = getRepository(Domain)
 
-    return await repository.findOne({ id })
+    return await repository.findOneBy({ id })
   }
 
   @Directive('@privilege(category: "system", privilege: "query", superUserGranted: true)')
   @Query(returns => DomainList, { description: 'To fetch multiple domain' })
-  async domains(@Args() params: ListParam, @Ctx() context): Promise<DomainList> {
+  async domains(@Args() params: ListParam, @Ctx() context: any): Promise<DomainList> {
     const queryBuilder = getRepository(Domain).createQueryBuilder()
 
     buildQuery(queryBuilder, params || {}, context, {
@@ -37,7 +38,7 @@ export class DomainResolver {
     const domainRepository: Repository<Domain> = getRepository(Domain)
     const targetSubdomain: string = slugger(name)
 
-    const oldDomain = await domainRepository.findOne({ subdomain: targetSubdomain })
+    const oldDomain = await domainRepository.findOneBy({ subdomain: targetSubdomain })
     if (oldDomain) {
       throw new Error('domain is duplicated')
     }
@@ -52,7 +53,7 @@ export class DomainResolver {
     const domainRepo: Repository<Domain> = getRepository(Domain)
     const subdomain: string = slugger(name)
 
-    const domain: Domain = await domainRepo.findOne({ subdomain })
+    const domain: Domain = await domainRepo.findOneBy({ subdomain })
     if (domain) {
       throw new Error('domain is duplicated')
     }
@@ -79,7 +80,7 @@ export class DomainResolver {
   @Mutation(returns => Domain, { description: 'To update domain' })
   async updateDomain(@Arg('name') name: string, @Arg('patch', () => DomainPatch) patch: DomainPatch) {
     const repository = getRepository(Domain)
-    const domain: Domain = await repository.findOne({ name })
+    const domain: Domain = await repository.findOneBy({ name })
 
     return await repository.save({
       ...domain,

package/server/utils/get-domain.ts

@@ -1,9 +1,9 @@
-import { getRepository } from 'typeorm'
 import { URL } from 'url'
 
 import { config } from '@things-factory/env'
 import { getPathInfo } from '@things-factory/utils'
 
+import { getRepository } from '../initializers/database'
 import { Domain } from '../service/domain/domain'
 
 const useVirtualHostBasedDomain = !!config.get('useVirtualHostBasedDomain')
@@ -72,7 +72,7 @@ export async function getDomainFromURL(context: any): Promise<Domain> {
   const subdomain = header['x-things-factory-domain'] || getSubdomainFromURL(context)
 
   if (subdomain) {
-    return await getRepository(Domain).findOne({ subdomain }, { cache: true })
+    return await getRepository(Domain).findOne({ where: { subdomain }, cache: true })
   }
 }