@midwayjs/typeorm 3.9.0 → 3.9.4

package/cli.js

@@ -0,0 +1,50 @@
+#!/usr/bin/env node
+'use strict';
+
+const { join } = require('path');
+// eslint-disable-next-line node/no-unpublished-require
+const { CommandUtils } = require('typeorm/commands/CommandUtils');
+// eslint-disable-next-line node/no-unpublished-require
+const ImportUtils = require('typeorm/util/ImportUtils');
+// eslint-disable-next-line node/no-unpublished-require
+const { DataSource } = require('typeorm');
+
+const originLoadDataSource = CommandUtils.loadDataSource;
+
+CommandUtils.loadDataSource = async function (dataSourceFilePath) {
+  try {
+    let dataSourceFileExports = await ImportUtils.importOrRequireFile(
+      dataSourceFilePath
+    );
+    if (dataSourceFileExports[0] && dataSourceFileExports[0].default) {
+      dataSourceFileExports = dataSourceFileExports[0].default;
+      if (typeof dataSourceFileExports === 'function') {
+        dataSourceFileExports = dataSourceFileExports({
+          appDir: process.cwd(),
+          baseDir: join(process.cwd(), 'src'),
+        });
+      }
+      if (dataSourceFileExports['typeorm']) {
+        dataSourceFileExports = dataSourceFileExports['typeorm'];
+        dataSourceFileExports =
+          dataSourceFileExports.dataSource[
+            dataSourceFileExports['defaultClientName'] || 'default'
+          ];
+
+        return new DataSource(dataSourceFileExports);
+      } else {
+        console.log(
+          '[midway:typeorm] Not found dataSource options and run origin loadDataSource method'
+        );
+        return originLoadDataSource(dataSourceFilePath);
+      }
+    }
+  } catch (err) {
+    throw new Error(
+      `Unable to open file: "${dataSourceFilePath}". ${err.message}`
+    );
+  }
+};
+
+// eslint-disable-next-line node/no-unpublished-require
+require('typeorm/cli-ts-node-commonjs');

package/package.json

@@ -1,17 +1,21 @@
 {
   "name": "@midwayjs/typeorm",
-  "version": "3.9.0",
+  "version": "3.9.4",
   "main": "dist/index",
   "typings": "index.d.ts",
+  "bin": {
+    "mwtypeorm": "./cli.js"
+  },
   "files": [
     "dist/**/*.js",
     "dist/**/*.d.ts",
+    "cli.js",
     "index.d.ts"
   ],
   "devDependencies": {
     "@midwayjs/core": "^3.9.0",
     "@midwayjs/mock": "^3.9.0",
-    "sqlite3": "5.1.2",
+    "sqlite3": "5.1.4",
     "typeorm": "0.3.11"
   },
   "author": {
@@ -31,5 +35,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "5f6603d2c9606fc6fc7ece71f956e89e394efeee"
+  "gitHead": "b3daa4674afc965f147fc94b2801b4eefed87660"
 }