sasat 0.21.13 → 0.21.15

package/dist/cli/cli.cjs

@@ -2,7 +2,7 @@
 'use strict';
 
 const cac = require('cac');
-const error = require('../shared/sasat.CEngWMnG.cjs');
+const error = require('../shared/sasat.DEWhnlUl.cjs');
 require('pluralize');
 const fs = require('fs');
 const path = require('path');
@@ -5027,6 +5027,10 @@ const migrate = async (options) => {
     if (!options.skipBuild) {
       await compileMigrationFiles();
     }
+    const conf = error.config();
+    if (conf.migration.db) {
+      error.setConfig({ db: conf.migration.db });
+    }
     const migration = new MigrationController();
     const result = await migration.migrate(options);
     current = result.currentMigration;

package/dist/cli/cli.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 import { cac } from 'cac';
-import { S as SqlString, a as SasatError, c as config, r as readInitialSchema, g as getDbClient, m as mkDirIfNotExist, n as nonNullable, u as unique, C as Conditions, w as writeFileIfNotExist, b as writeCurrentSchema, d as writeYmlFile, e as defaultConf } from '../shared/sasat.CtwXwmHh.mjs';
+import { S as SqlString, a as SasatError, c as config, r as readInitialSchema, g as getDbClient, m as mkDirIfNotExist, n as nonNullable, u as unique, C as Conditions, w as writeFileIfNotExist, s as setConfig, d as writeCurrentSchema, e as writeYmlFile, f as defaultConf } from '../shared/sasat.OfgCNG3F.mjs';
 import 'pluralize';
 import * as fs from 'fs';
 import fs__default from 'fs';
@@ -5002,6 +5002,10 @@ const migrate = async (options) => {
     if (!options.skipBuild) {
       await compileMigrationFiles();
     }
+    const conf = config();
+    if (conf.migration.db) {
+      setConfig({ db: conf.migration.db });
+    }
     const migration = new MigrationController();
     const result = await migration.migrate(options);
     current = result.currentMigration;

package/dist/index.cjs

@@ -1,12 +1,12 @@
 'use strict';
 
-const error = require('./shared/sasat.CEngWMnG.cjs');
-const SqlString = require('sqlstring');
-require('mysql2');
-require('util');
+const error = require('./shared/sasat.DEWhnlUl.cjs');
 require('path');
 require('fs-extra');
 require('js-yaml');
+const SqlString = require('sqlstring');
+require('mysql2');
+require('util');
 
 function _interopNamespaceCompat(e) {
   if (e && typeof e === 'object' && 'default' in e) return e;
@@ -838,29 +838,6 @@ const getCurrentDateTimeString = () => {
   return date.getFullYear() + "-" + pad(date.getMonth() + 1) + "-" + pad(date.getDate()) + " " + pad(date.getHours()) + ":" + pad(date.getMinutes()) + ":" + pad(date.getSeconds());
 };
 
-const assignDeep = (base, ...objects) => {
-  const assign = (target, key, value) => {
-    if (key === "__proto__" || key === "constructor") {
-      return;
-    }
-    if (Array.isArray(target[key]) && Array.isArray(value)) {
-      target[key] = [...target[key], ...value];
-    } else if (typeof target[key] === "object" && typeof value === "object") {
-      assignDeep(target[key], value);
-    } else {
-      target[key] = value;
-    }
-  };
-  objects.forEach((obj) => {
-    if (typeof obj === "object") {
-      Object.entries(obj).forEach(([key, value]) => {
-        assign(base, key, value);
-      });
-    }
-  });
-  return base;
-};
-
 const makeArgs = (args) => {
   if (!args || args.length === 0) return "";
   return `(${args.map((arg) => `${arg.name}: ${arg.type}`).join(", ")})`;
@@ -1012,15 +989,16 @@ const pagingOption = (option) => {
 
 exports.Conditions = error.Conditions;
 exports.SqlString = error.SqlString;
+exports.assignDeep = error.assignDeep;
 exports.getDbClient = error.getDbClient;
 exports.pick = error.pick;
+exports.setConfig = error.setConfig;
 exports.CompositeCondition = CompositeCondition;
 exports.Mutations = Mutations;
 exports.QExpr = QExpr;
 exports.Queries = Queries;
 exports.SasatDBDatasource = SasatDBDatasource;
 exports.Sql = Sql;
-exports.assignDeep = assignDeep;
 exports.createTypeDef = createTypeDef;
 exports.dateOffset = dateOffset;
 exports.dateToDateString = dateToDateString;

package/dist/index.d.cts

@@ -150,6 +150,46 @@ type Sort = {
 
 declare const queryToSql: (query: Query) => string;
 
+type NestedPartial<T> = {
+    [K in keyof T]?: T[K] extends Array<infer R> ? Array<NestedPartial<R>> : NestedPartial<T[K]>;
+};
+
+interface SasatConfigDb {
+    host: string;
+    port: number;
+    user: string;
+    password?: string;
+    database: string;
+    ssl?: {
+        ca?: string[];
+    };
+}
+interface SasatConfigRedis {
+    host: string;
+    port: number;
+    password?: string;
+}
+interface SasatConfigMigration {
+    table: string;
+    dir: string;
+    out: string;
+    target?: string;
+    db?: SasatConfigDb;
+}
+interface SasatConfigGenerator {
+    addJsExtToImportStatement: boolean;
+    gql: {
+        subscription: boolean;
+    };
+}
+interface SasatConfig {
+    db: SasatConfigDb;
+    migration: SasatConfigMigration;
+    generator: SasatConfigGenerator;
+    redis: SasatConfigRedis;
+}
+declare function setConfig(update: NestedPartial<SasatConfig>): SasatConfig;
+
 type QueryResponse = Array<{
     [key: string]: SqlValueType;
 }>;
@@ -1092,5 +1132,5 @@ declare const pagingOption: (option: ListQueryOption) => DsPagingOption;
 
 type PagingOption = ListQueryOption;
 
-export { CompositeCondition, Conditions, Mutations, QExpr, Queries, SQLClient, SQLTransaction, SasatDBDatasource, Sql, SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql };
+export { CompositeCondition, Conditions, Mutations, QExpr, Queries, SQLClient, SQLTransaction, SasatDBDatasource, Sql, SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql, setConfig };
 export type { BooleanValueExpression, CommandResponse, ComparisonOperators, CustomCondition, EntityResult, EntityType, Fields, ListQueryOption, LockMode, MigrationStore, PagingOption, Query, QueryOptions, QueryResponse, Relation, RelationMap, ResolverMiddleware, SQLExecutor, SasatMigration, TableInfo, TypeFieldDefinition };

package/dist/index.d.mts

@@ -150,6 +150,46 @@ type Sort = {
 
 declare const queryToSql: (query: Query) => string;
 
+type NestedPartial<T> = {
+    [K in keyof T]?: T[K] extends Array<infer R> ? Array<NestedPartial<R>> : NestedPartial<T[K]>;
+};
+
+interface SasatConfigDb {
+    host: string;
+    port: number;
+    user: string;
+    password?: string;
+    database: string;
+    ssl?: {
+        ca?: string[];
+    };
+}
+interface SasatConfigRedis {
+    host: string;
+    port: number;
+    password?: string;
+}
+interface SasatConfigMigration {
+    table: string;
+    dir: string;
+    out: string;
+    target?: string;
+    db?: SasatConfigDb;
+}
+interface SasatConfigGenerator {
+    addJsExtToImportStatement: boolean;
+    gql: {
+        subscription: boolean;
+    };
+}
+interface SasatConfig {
+    db: SasatConfigDb;
+    migration: SasatConfigMigration;
+    generator: SasatConfigGenerator;
+    redis: SasatConfigRedis;
+}
+declare function setConfig(update: NestedPartial<SasatConfig>): SasatConfig;
+
 type QueryResponse = Array<{
     [key: string]: SqlValueType;
 }>;
@@ -1092,5 +1132,5 @@ declare const pagingOption: (option: ListQueryOption) => DsPagingOption;
 
 type PagingOption = ListQueryOption;
 
-export { CompositeCondition, Conditions, Mutations, QExpr, Queries, SQLClient, SQLTransaction, SasatDBDatasource, Sql, SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql };
+export { CompositeCondition, Conditions, Mutations, QExpr, Queries, SQLClient, SQLTransaction, SasatDBDatasource, Sql, SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql, setConfig };
 export type { BooleanValueExpression, CommandResponse, ComparisonOperators, CustomCondition, EntityResult, EntityType, Fields, ListQueryOption, LockMode, MigrationStore, PagingOption, Query, QueryOptions, QueryResponse, Relation, RelationMap, ResolverMiddleware, SQLExecutor, SasatMigration, TableInfo, TypeFieldDefinition };

package/dist/index.d.ts

@@ -150,6 +150,46 @@ type Sort = {
 
 declare const queryToSql: (query: Query) => string;
 
+type NestedPartial<T> = {
+    [K in keyof T]?: T[K] extends Array<infer R> ? Array<NestedPartial<R>> : NestedPartial<T[K]>;
+};
+
+interface SasatConfigDb {
+    host: string;
+    port: number;
+    user: string;
+    password?: string;
+    database: string;
+    ssl?: {
+        ca?: string[];
+    };
+}
+interface SasatConfigRedis {
+    host: string;
+    port: number;
+    password?: string;
+}
+interface SasatConfigMigration {
+    table: string;
+    dir: string;
+    out: string;
+    target?: string;
+    db?: SasatConfigDb;
+}
+interface SasatConfigGenerator {
+    addJsExtToImportStatement: boolean;
+    gql: {
+        subscription: boolean;
+    };
+}
+interface SasatConfig {
+    db: SasatConfigDb;
+    migration: SasatConfigMigration;
+    generator: SasatConfigGenerator;
+    redis: SasatConfigRedis;
+}
+declare function setConfig(update: NestedPartial<SasatConfig>): SasatConfig;
+
 type QueryResponse = Array<{
     [key: string]: SqlValueType;
 }>;
@@ -1092,5 +1132,5 @@ declare const pagingOption: (option: ListQueryOption) => DsPagingOption;
 
 type PagingOption = ListQueryOption;
 
-export { CompositeCondition, Conditions, Mutations, QExpr, Queries, SQLClient, SQLTransaction, SasatDBDatasource, Sql, SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql };
+export { CompositeCondition, Conditions, Mutations, QExpr, Queries, SQLClient, SQLTransaction, SasatDBDatasource, Sql, SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, pick, QExpr as qe, queryToSql, setConfig };
 export type { BooleanValueExpression, CommandResponse, ComparisonOperators, CustomCondition, EntityResult, EntityType, Fields, ListQueryOption, LockMode, MigrationStore, PagingOption, Query, QueryOptions, QueryResponse, Relation, RelationMap, ResolverMiddleware, SQLExecutor, SasatMigration, TableInfo, TypeFieldDefinition };

package/dist/index.mjs

@@ -1,11 +1,11 @@
-import { S as SqlString$1, n as nonNullable, u as unique, g as getDbClient, a as SasatError } from './shared/sasat.CtwXwmHh.mjs';
-export { C as Conditions, p as pick } from './shared/sasat.CtwXwmHh.mjs';
-import * as SqlString from 'sqlstring';
-import 'mysql2';
-import 'util';
+import { S as SqlString$1, n as nonNullable, u as unique, g as getDbClient, a as SasatError } from './shared/sasat.OfgCNG3F.mjs';
+export { C as Conditions, b as assignDeep, p as pick, s as setConfig } from './shared/sasat.OfgCNG3F.mjs';
 import 'path';
 import 'fs-extra';
 import 'js-yaml';
+import * as SqlString from 'sqlstring';
+import 'mysql2';
+import 'util';
 
 var QueryNodeKind = /* @__PURE__ */ ((QueryNodeKind2) => {
   QueryNodeKind2[QueryNodeKind2["Field"] = 0] = "Field";
@@ -823,29 +823,6 @@ const getCurrentDateTimeString = () => {
   return date.getFullYear() + "-" + pad(date.getMonth() + 1) + "-" + pad(date.getDate()) + " " + pad(date.getHours()) + ":" + pad(date.getMinutes()) + ":" + pad(date.getSeconds());
 };
 
-const assignDeep = (base, ...objects) => {
-  const assign = (target, key, value) => {
-    if (key === "__proto__" || key === "constructor") {
-      return;
-    }
-    if (Array.isArray(target[key]) && Array.isArray(value)) {
-      target[key] = [...target[key], ...value];
-    } else if (typeof target[key] === "object" && typeof value === "object") {
-      assignDeep(target[key], value);
-    } else {
-      target[key] = value;
-    }
-  };
-  objects.forEach((obj) => {
-    if (typeof obj === "object") {
-      Object.entries(obj).forEach(([key, value]) => {
-        assign(base, key, value);
-      });
-    }
-  });
-  return base;
-};
-
 const makeArgs = (args) => {
   if (!args || args.length === 0) return "";
   return `(${args.map((arg) => `${arg.name}: ${arg.type}`).join(", ")})`;
@@ -995,4 +972,4 @@ const pagingOption = (option) => {
   return { numberOfItem: option.numberOfItem, offset: option.offset, sort };
 };
 
-export { CompositeCondition, Mutations, QExpr, Queries, SasatDBDatasource, Sql, SqlString$1 as SqlString, assignDeep, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, QExpr as qe, queryToSql };
+export { CompositeCondition, Mutations, QExpr, Queries, SasatDBDatasource, Sql, SqlString$1 as SqlString, createTypeDef, dateOffset, dateToDateString, dateToDatetimeString, getCurrentDateTimeString, getDayRange, getDayRangeQExpr, getDbClient, getTodayDateString, getTodayDateTimeString, gqlResolveInfoToField, makeNumberIdEncoder, makeParamsMiddleware, makeResolver, pagingOption, QExpr as qe, queryToSql };

package/dist/shared/{sasat.CEngWMnG.cjs → sasat.DEWhnlUl.cjs}

@@ -33,6 +33,135 @@ const SqlString = {
   escapeId: (name) => escapeId(name)
 };
 
+const assignDeep = (base, ...objects) => {
+  const assign = (target, key, value) => {
+    if (key === "__proto__" || key === "constructor") {
+      return;
+    }
+    if (Array.isArray(target[key]) && Array.isArray(value)) {
+      target[key] = [...target[key], ...value];
+    } else if (typeof target[key] === "object" && typeof value === "object") {
+      assignDeep(target[key], value);
+    } else {
+      target[key] = value;
+    }
+  };
+  objects.forEach((obj) => {
+    if (typeof obj === "object") {
+      Object.entries(obj).forEach(([key, value]) => {
+        assign(base, key, value);
+      });
+    }
+  });
+  return base;
+};
+
+const readYmlFile = (filepath) => yaml__namespace.load(fs__default.readFileSync(filepath, "utf8"));
+const mkDirIfNotExist = (path) => {
+  if (!fs__default.pathExistsSync(path)) fs__default.mkdirpSync(path);
+};
+const writeFileIfNotExist = (path, data) => {
+  if (fs__default.existsSync(path)) return Promise.resolve();
+  return fs__default.writeFile(path, data);
+};
+const writeYmlFile = (path$1, fileName, obj) => {
+  mkDirIfNotExist(path$1);
+  fs__default.writeFileSync(
+    path.join(path$1, fileName),
+    yaml__namespace.dump(obj, {
+      skipInvalid: true,
+      noRefs: true,
+      sortKeys: (a, b) => {
+        if (b === "tableName") return 1;
+        if (a === "tableName") return -1;
+        if (a > b) return 1;
+        if (a < b) return -1;
+        return 0;
+      }
+    })
+  );
+};
+const readInitialSchema = () => {
+  return readYmlFile(path.join(config().migration.dir, "initialSchema.yml"));
+};
+const writeCurrentSchema = (schema) => {
+  writeYmlFile(config().migration.dir, "currentSchema.yml", schema);
+};
+
+class SasatConfigLoader {
+  static loadConfig() {
+    const fileName = "sasat.yml";
+    const filepath = path__default.join(process.cwd(), fileName);
+    if (!fs__default.existsSync(filepath)) return defaultConf;
+    return readYmlFile(filepath);
+  }
+  conf;
+  constructor() {
+    const conf = this.readValue({
+      ...defaultConf,
+      ...SasatConfigLoader.loadConfig()
+    });
+    this.conf = {
+      ...conf
+    };
+  }
+  getConfig() {
+    return this.conf;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  readValue(value) {
+    if (!value) return value;
+    if (Array.isArray(value)) return value.map((it) => this.readValue(it));
+    if (typeof value === "string" && value.startsWith("$"))
+      return process.env[value.slice(1)];
+    if (typeof value === "object") {
+      for (const key in value) {
+        if (Object.prototype.hasOwnProperty.call(value, key))
+          value[key] = this.readValue(value[key]);
+      }
+      return value;
+    }
+    return value;
+  }
+}
+
+const defaultConfDb = {
+  host: "127.0.0.1",
+  port: 3306,
+  user: "root",
+  database: "sasat",
+  password: ""
+};
+const defaultCofRedis = {
+  host: "127.0.0.1",
+  port: 6379
+};
+const defaultConfMigration = {
+  table: "__migrate__",
+  dir: "migrations",
+  out: "sasat"
+};
+const defaultConf = {
+  db: defaultConfDb,
+  migration: defaultConfMigration,
+  generator: {
+    addJsExtToImportStatement: false,
+    gql: {
+      subscription: true
+    }
+  },
+  redis: defaultCofRedis
+};
+let conf;
+const config = () => {
+  if (conf === void 0) conf = new SasatConfigLoader().getConfig();
+  return conf;
+};
+function setConfig(update) {
+  conf = assignDeep(config(), update);
+  return conf;
+}
+
 const parent = (field2) => ({
   kind: "parent",
   field: field2
@@ -240,115 +369,13 @@ class MySqlTransaction extends SQLTransaction {
   }
 }
 
-const readYmlFile = (filepath) => yaml__namespace.load(fs__default.readFileSync(filepath, "utf8"));
-const mkDirIfNotExist = (path) => {
-  if (!fs__default.pathExistsSync(path)) fs__default.mkdirpSync(path);
-};
-const writeFileIfNotExist = (path, data) => {
-  if (fs__default.existsSync(path)) return Promise.resolve();
-  return fs__default.writeFile(path, data);
-};
-const writeYmlFile = (path$1, fileName, obj) => {
-  mkDirIfNotExist(path$1);
-  fs__default.writeFileSync(
-    path.join(path$1, fileName),
-    yaml__namespace.dump(obj, {
-      skipInvalid: true,
-      noRefs: true,
-      sortKeys: (a, b) => {
-        if (b === "tableName") return 1;
-        if (a === "tableName") return -1;
-        if (a > b) return 1;
-        if (a < b) return -1;
-        return 0;
-      }
-    })
-  );
-};
-const readInitialSchema = () => {
-  return readYmlFile(path.join(config().migration.dir, "initialSchema.yml"));
-};
-const writeCurrentSchema = (schema) => {
-  writeYmlFile(config().migration.dir, "currentSchema.yml", schema);
-};
-
-class SasatConfigLoader {
-  static loadConfig() {
-    const fileName = "sasat.yml";
-    const filepath = path__default.join(process.cwd(), fileName);
-    if (!fs__default.existsSync(filepath)) return defaultConf;
-    return readYmlFile(filepath);
-  }
-  conf;
-  constructor() {
-    const conf = this.readValue({
-      ...defaultConf,
-      ...SasatConfigLoader.loadConfig()
-    });
-    this.conf = {
-      ...conf
-    };
-  }
-  getConfig() {
-    return this.conf;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  readValue(value) {
-    if (!value) return value;
-    if (Array.isArray(value)) return value.map((it) => this.readValue(it));
-    if (typeof value === "string" && value.startsWith("$"))
-      return process.env[value.slice(1)];
-    if (typeof value === "object") {
-      for (const key in value) {
-        if (Object.prototype.hasOwnProperty.call(value, key))
-          value[key] = this.readValue(value[key]);
-      }
-      return value;
-    }
-    return value;
-  }
-}
-
-const defaultConfDb = {
-  host: "127.0.0.1",
-  port: 3306,
-  user: "root",
-  database: "sasat",
-  password: ""
-};
-const defaultCofRedis = {
-  host: "127.0.0.1",
-  port: 6379
-};
-const defaultConfMigration = {
-  table: "__migrate__",
-  dir: "migrations",
-  out: "sasat"
-};
-const defaultConf = {
-  db: defaultConfDb,
-  migration: defaultConfMigration,
-  generator: {
-    addJsExtToImportStatement: false,
-    gql: {
-      subscription: true
-    }
-  },
-  redis: defaultCofRedis
-};
-let conf;
-const config = () => {
-  if (conf === void 0) conf = new SasatConfigLoader().getConfig();
-  return conf;
-};
-
-const defaultConfig = { ...config().db, dateStrings: true };
 class MysqlClient extends DBClient {
   constructor(connectionOption, poolOption) {
     super();
     this.connectionOption = connectionOption;
     this.pool = mysql__namespace.createPool({
-      ...defaultConfig,
+      ...config().db,
+      dateStrings: true,
       ...connectionOption,
       ...poolOption
     });
@@ -359,7 +386,8 @@ class MysqlClient extends DBClient {
   };
   async transaction() {
     const connection = mysql__namespace.createConnection({
-      ...defaultConfig,
+      ...config().db,
+      dateStrings: true,
       ...this.connectionOption
     });
     await util.promisify(connection.beginTransaction).bind(connection)();
@@ -393,6 +421,7 @@ class SasatError extends Error {
 exports.Conditions = Conditions;
 exports.SasatError = SasatError;
 exports.SqlString = SqlString;
+exports.assignDeep = assignDeep;
 exports.config = config;
 exports.defaultConf = defaultConf;
 exports.getDbClient = getDbClient;
@@ -400,6 +429,7 @@ exports.mkDirIfNotExist = mkDirIfNotExist;
 exports.nonNullable = nonNullable;
 exports.pick = pick;
 exports.readInitialSchema = readInitialSchema;
+exports.setConfig = setConfig;
 exports.unique = unique;
 exports.writeCurrentSchema = writeCurrentSchema;
 exports.writeFileIfNotExist = writeFileIfNotExist;

package/dist/shared/{sasat.CtwXwmHh.mjs → sasat.OfgCNG3F.mjs}

@@ -11,6 +11,135 @@ const SqlString = {
   escapeId: (name) => escapeId(name)
 };
 
+const assignDeep = (base, ...objects) => {
+  const assign = (target, key, value) => {
+    if (key === "__proto__" || key === "constructor") {
+      return;
+    }
+    if (Array.isArray(target[key]) && Array.isArray(value)) {
+      target[key] = [...target[key], ...value];
+    } else if (typeof target[key] === "object" && typeof value === "object") {
+      assignDeep(target[key], value);
+    } else {
+      target[key] = value;
+    }
+  };
+  objects.forEach((obj) => {
+    if (typeof obj === "object") {
+      Object.entries(obj).forEach(([key, value]) => {
+        assign(base, key, value);
+      });
+    }
+  });
+  return base;
+};
+
+const readYmlFile = (filepath) => yaml.load(fs.readFileSync(filepath, "utf8"));
+const mkDirIfNotExist = (path) => {
+  if (!fs.pathExistsSync(path)) fs.mkdirpSync(path);
+};
+const writeFileIfNotExist = (path, data) => {
+  if (fs.existsSync(path)) return Promise.resolve();
+  return fs.writeFile(path, data);
+};
+const writeYmlFile = (path, fileName, obj) => {
+  mkDirIfNotExist(path);
+  fs.writeFileSync(
+    join(path, fileName),
+    yaml.dump(obj, {
+      skipInvalid: true,
+      noRefs: true,
+      sortKeys: (a, b) => {
+        if (b === "tableName") return 1;
+        if (a === "tableName") return -1;
+        if (a > b) return 1;
+        if (a < b) return -1;
+        return 0;
+      }
+    })
+  );
+};
+const readInitialSchema = () => {
+  return readYmlFile(join(config().migration.dir, "initialSchema.yml"));
+};
+const writeCurrentSchema = (schema) => {
+  writeYmlFile(config().migration.dir, "currentSchema.yml", schema);
+};
+
+class SasatConfigLoader {
+  static loadConfig() {
+    const fileName = "sasat.yml";
+    const filepath = path__default.join(process.cwd(), fileName);
+    if (!fs.existsSync(filepath)) return defaultConf;
+    return readYmlFile(filepath);
+  }
+  conf;
+  constructor() {
+    const conf = this.readValue({
+      ...defaultConf,
+      ...SasatConfigLoader.loadConfig()
+    });
+    this.conf = {
+      ...conf
+    };
+  }
+  getConfig() {
+    return this.conf;
+  }
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  readValue(value) {
+    if (!value) return value;
+    if (Array.isArray(value)) return value.map((it) => this.readValue(it));
+    if (typeof value === "string" && value.startsWith("$"))
+      return process.env[value.slice(1)];
+    if (typeof value === "object") {
+      for (const key in value) {
+        if (Object.prototype.hasOwnProperty.call(value, key))
+          value[key] = this.readValue(value[key]);
+      }
+      return value;
+    }
+    return value;
+  }
+}
+
+const defaultConfDb = {
+  host: "127.0.0.1",
+  port: 3306,
+  user: "root",
+  database: "sasat",
+  password: ""
+};
+const defaultCofRedis = {
+  host: "127.0.0.1",
+  port: 6379
+};
+const defaultConfMigration = {
+  table: "__migrate__",
+  dir: "migrations",
+  out: "sasat"
+};
+const defaultConf = {
+  db: defaultConfDb,
+  migration: defaultConfMigration,
+  generator: {
+    addJsExtToImportStatement: false,
+    gql: {
+      subscription: true
+    }
+  },
+  redis: defaultCofRedis
+};
+let conf;
+const config = () => {
+  if (conf === void 0) conf = new SasatConfigLoader().getConfig();
+  return conf;
+};
+function setConfig(update) {
+  conf = assignDeep(config(), update);
+  return conf;
+}
+
 const parent = (field2) => ({
   kind: "parent",
   field: field2
@@ -218,115 +347,13 @@ class MySqlTransaction extends SQLTransaction {
   }
 }
 
-const readYmlFile = (filepath) => yaml.load(fs.readFileSync(filepath, "utf8"));
-const mkDirIfNotExist = (path) => {
-  if (!fs.pathExistsSync(path)) fs.mkdirpSync(path);
-};
-const writeFileIfNotExist = (path, data) => {
-  if (fs.existsSync(path)) return Promise.resolve();
-  return fs.writeFile(path, data);
-};
-const writeYmlFile = (path, fileName, obj) => {
-  mkDirIfNotExist(path);
-  fs.writeFileSync(
-    join(path, fileName),
-    yaml.dump(obj, {
-      skipInvalid: true,
-      noRefs: true,
-      sortKeys: (a, b) => {
-        if (b === "tableName") return 1;
-        if (a === "tableName") return -1;
-        if (a > b) return 1;
-        if (a < b) return -1;
-        return 0;
-      }
-    })
-  );
-};
-const readInitialSchema = () => {
-  return readYmlFile(join(config().migration.dir, "initialSchema.yml"));
-};
-const writeCurrentSchema = (schema) => {
-  writeYmlFile(config().migration.dir, "currentSchema.yml", schema);
-};
-
-class SasatConfigLoader {
-  static loadConfig() {
-    const fileName = "sasat.yml";
-    const filepath = path__default.join(process.cwd(), fileName);
-    if (!fs.existsSync(filepath)) return defaultConf;
-    return readYmlFile(filepath);
-  }
-  conf;
-  constructor() {
-    const conf = this.readValue({
-      ...defaultConf,
-      ...SasatConfigLoader.loadConfig()
-    });
-    this.conf = {
-      ...conf
-    };
-  }
-  getConfig() {
-    return this.conf;
-  }
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  readValue(value) {
-    if (!value) return value;
-    if (Array.isArray(value)) return value.map((it) => this.readValue(it));
-    if (typeof value === "string" && value.startsWith("$"))
-      return process.env[value.slice(1)];
-    if (typeof value === "object") {
-      for (const key in value) {
-        if (Object.prototype.hasOwnProperty.call(value, key))
-          value[key] = this.readValue(value[key]);
-      }
-      return value;
-    }
-    return value;
-  }
-}
-
-const defaultConfDb = {
-  host: "127.0.0.1",
-  port: 3306,
-  user: "root",
-  database: "sasat",
-  password: ""
-};
-const defaultCofRedis = {
-  host: "127.0.0.1",
-  port: 6379
-};
-const defaultConfMigration = {
-  table: "__migrate__",
-  dir: "migrations",
-  out: "sasat"
-};
-const defaultConf = {
-  db: defaultConfDb,
-  migration: defaultConfMigration,
-  generator: {
-    addJsExtToImportStatement: false,
-    gql: {
-      subscription: true
-    }
-  },
-  redis: defaultCofRedis
-};
-let conf;
-const config = () => {
-  if (conf === void 0) conf = new SasatConfigLoader().getConfig();
-  return conf;
-};
-
-const defaultConfig = { ...config().db, dateStrings: true };
 class MysqlClient extends DBClient {
   constructor(connectionOption, poolOption) {
     super();
     this.connectionOption = connectionOption;
     this.pool = mysql.createPool({
-      ...defaultConfig,
+      ...config().db,
+      dateStrings: true,
       ...connectionOption,
       ...poolOption
     });
@@ -337,7 +364,8 @@ class MysqlClient extends DBClient {
   };
   async transaction() {
     const connection = mysql.createConnection({
-      ...defaultConfig,
+      ...config().db,
+      dateStrings: true,
       ...this.connectionOption
     });
     await promisify(connection.beginTransaction).bind(connection)();
@@ -368,4 +396,4 @@ class SasatError extends Error {
   }
 }
 
-export { Conditions as C, SqlString as S, SasatError as a, writeCurrentSchema as b, config as c, writeYmlFile as d, defaultConf as e, getDbClient as g, mkDirIfNotExist as m, nonNullable as n, pick as p, readInitialSchema as r, unique as u, writeFileIfNotExist as w };
+export { Conditions as C, SqlString as S, SasatError as a, assignDeep as b, config as c, writeCurrentSchema as d, writeYmlFile as e, defaultConf as f, getDbClient as g, mkDirIfNotExist as m, nonNullable as n, pick as p, readInitialSchema as r, setConfig as s, unique as u, writeFileIfNotExist as w };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sasat",
-  "version": "0.21.13",
+  "version": "0.21.15",
   "repository": "https://github.com/nin138/sasat.git",
   "author": "nin138 <ninian138@gmail.com>",
   "license": "MIT",