Skip to content

Commit 2945722

Browse files
committed
removed module-definition dependency
1 parent a9b5aeb commit 2945722

File tree

3 files changed

+45
-46
lines changed

3 files changed

+45
-46
lines changed

bin/build.js

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ let fs = require('fs');
66
let util = require('util');
77
let writeFile = util.promisify(fs.writeFile);
88
let ts = require('typescript');
9-
let moduleDefinition = require('module-definition');
109
let getTSDefinition = require('../src/getTSDefinition');
1110
const _axios = require('axios');
1211
const axios = _axios.default ? _axios.default.create() : _axios.create();
@@ -72,12 +71,47 @@ async function runSingle(schemaTs) {
7271
async function writeIndexJs(schemaJsPath) {
7372
const schema = path.basename(schemaJsPath);
7473
const indexJs = path.join(path.dirname(schemaJsPath), '/index' + path.extname(schemaJsPath));
75-
if (moduleDefinition.sync(schemaJsPath) === 'commonjs')
74+
if (detectModuleFormat(schemaJsPath) === 'commonjs')
7675
await writeFile(indexJs, `module.exports = require('./${schema}');`);
7776
else
7877
await writeFile(indexJs, `export {default} from './${schema}';`);
7978
}
8079

80+
function detectModuleFormat(filePath) {
81+
const extension = path.extname(filePath);
82+
if (extension === '.mjs')
83+
return 'module';
84+
if (extension === '.cjs')
85+
return 'commonjs';
86+
87+
const pkg = findClosestPackageJson(path.dirname(filePath));
88+
if (pkg && pkg.type === 'module')
89+
return 'module';
90+
91+
return 'commonjs';
92+
}
93+
94+
function findClosestPackageJson(startDir) {
95+
let currentDir = startDir;
96+
while (currentDir) {
97+
const packageJsonPath = path.join(currentDir, 'package.json');
98+
if (fs.existsSync(packageJsonPath)) {
99+
try {
100+
return JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
101+
}
102+
catch (e) {
103+
return null;
104+
}
105+
}
106+
107+
const parentDir = path.dirname(currentDir);
108+
if (parentDir === currentDir)
109+
return null;
110+
currentDir = parentDir;
111+
}
112+
return null;
113+
}
114+
81115
async function findSchemaJs(cwd) {
82116
let ignoredDirNames = {
83117
node_modules: true,

package-lock.json

Lines changed: 6 additions & 40 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "orange-orm",
3-
"version": "5.0.1-beta.0",
3+
"version": "5.0.1-beta.0",
44
"publishConfig": {
55
"access": "public"
66
},
@@ -81,18 +81,17 @@
8181
"axios": "^1.6.2",
8282
"fast-json-patch": "^3.1.1",
8383
"findup-sync": "^5.0.0",
84-
"module-definition": "^4.0.0 || ^5.0.0 || || ^6.0.0",
8584
"rfdc": "^1.2.0",
8685
"uuid": "^8.3.2 || ^9.0.0 || ^10.0.0 || ^11.1.0"
8786
},
8887
"peerDependencies": {
8988
"@electric-sql/pglite": "^0.3.0",
89+
"better-sqlite3": "^11.8.1",
9090
"msnodesqlv8": "^4.1.0 || ^5.0.0",
9191
"mysql2": "^2.2.5 || ^3.9.4",
9292
"oracledb": "^6.3.0",
9393
"pg": "^8.5.1",
9494
"pg-query-stream": "^3.3.2",
95-
"better-sqlite3": "^11.8.1",
9695
"tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || || ^19.0.0"
9796
},
9897
"peerDependenciesMeta": {
@@ -132,6 +131,7 @@
132131
"@typescript-eslint/eslint-plugin": "^6.x",
133132
"@typescript-eslint/parser": "^6.x",
134133
"@vitest/coverage-v8": "^3.2.4",
134+
"better-sqlite3": "^11.8.1",
135135
"cors": "^2.8.5",
136136
"eslint": "^8.57.0",
137137
"eslint-plugin-jest": "^27.1.7",
@@ -143,7 +143,6 @@
143143
"pg": "^8.5.1",
144144
"pg-query-stream": "^3.3.2",
145145
"rollup": "^2.52.7",
146-
"better-sqlite3": "^11.8.1",
147146
"tedious": "^19.0.0",
148147
"typescript": "^5.4.5",
149148
"vitest": "^3.2.4"

0 commit comments

Comments
 (0)