orange-orm 5.0.0 → 5.0.1-beta.0

package/bin/build.js

@@ -1,13 +1,10 @@
 let url = require('url');
 let compile = require('./compile');
-let { glob } = require('glob');
 let path = require('path');
-let findNodeModules = require('findup-sync');
 let fs = require('fs');
 let util = require('util');
 let writeFile = util.promisify(fs.writeFile);
 let ts = require('typescript');
-let moduleDefinition = require('module-definition');
 let getTSDefinition = require('../src/getTSDefinition');
 const _axios = require('axios');
 const axios = _axios.default ? _axios.default.create() : _axios.create();
@@ -32,7 +29,7 @@ async function runSingle(schemaTs) {
 		}
 		console.log(`Orange: found schema ${schemaTs}`);
 		if (!schemaJsPath) {
-			let nodeModules = findNodeModules('node_modules', { cwd: schemaTs });
+			let nodeModules = findClosestNodeModules(schemaTs);
 			outDir = path.join(nodeModules, '/.rdb', '/' + new Date().getUTCMilliseconds());
 			schemaJsPath = compile(schemaTs, { outDir });
 		}
@@ -73,18 +70,72 @@ async function runSingle(schemaTs) {
 async function writeIndexJs(schemaJsPath) {
 	const schema = path.basename(schemaJsPath);
 	const indexJs = path.join(path.dirname(schemaJsPath), '/index' + path.extname(schemaJsPath));
-	if (moduleDefinition.sync(schemaJsPath) === 'commonjs')
+	if (detectModuleFormat(schemaJsPath) === 'commonjs')
 		await writeFile(indexJs, `module.exports = require('./${schema}');`);
 	else
 		await writeFile(indexJs, `export {default} from './${schema}';`);
 }
 
+function detectModuleFormat(filePath) {
+	const extension = path.extname(filePath);
+	if (extension === '.mjs')
+		return 'module';
+	if (extension === '.cjs')
+		return 'commonjs';
+
+	const pkg = findClosestPackageJson(path.dirname(filePath));
+	if (pkg && pkg.type === 'module')
+		return 'module';
+
+	return 'commonjs';
+}
+
+function findClosestPackageJson(startDir) {
+	let currentDir = startDir;
+	while (currentDir) {
+		const packageJsonPath = path.join(currentDir, 'package.json');
+		if (fs.existsSync(packageJsonPath)) {
+			try {
+				return JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+			}
+			catch (e) {
+				return null;
+			}
+		}
+
+		const parentDir = path.dirname(currentDir);
+		if (parentDir === currentDir)
+			return null;
+		currentDir = parentDir;
+	}
+	return null;
+}
+
+function findClosestNodeModules(startPath) {
+	const startDir = fs.statSync(startPath).isDirectory() ? startPath : path.dirname(startPath);
+	let currentDir = startDir;
+	while (true) {
+		const nodeModulesPath = path.join(currentDir, 'node_modules');
+		if (fs.existsSync(nodeModulesPath))
+			return nodeModulesPath;
+
+		const parentDir = path.dirname(currentDir);
+		if (parentDir === currentDir)
+			return path.join(startDir, 'node_modules');
+		currentDir = parentDir;
+	}
+}
+
 async function findSchemaJs(cwd) {
-	let options = {
-		ignore: ['**/node_modules/**', '**/dist/**', '**/dev/**', '**/deploy/**', '**/build/**'],
-		cwd
+	let ignoredDirNames = {
+		node_modules: true,
+		dist: true,
+		dev: true,
+		deploy: true,
+		build: true
 	};
-	let files = await glob('**/schema.*(js|mjs|ts)', options);
+	let files = [];
+	scanForSchemaFiles(cwd, ignoredDirNames, files);
 	files.sort((a, b) => {
 		const aIsTs = a.substring(a.length - 2) === 'ts';
 		const bIsTs = b.substring(b.length - 2) === 'ts';
@@ -97,7 +148,29 @@ async function findSchemaJs(cwd) {
 		else
 			return 0;
 	});
-	return files.map(x => path.join(cwd, '/', x));
+	return files;
+}
+
+function scanForSchemaFiles(currentDir, ignoredDirNames, results) {
+	for (let entry of fs.readdirSync(currentDir)) {
+		const fullPath = path.join(currentDir, entry);
+		let stat;
+		try {
+			stat = fs.statSync(fullPath);
+		}
+		catch (e) {
+			continue;
+		}
+		if (stat.isDirectory()) {
+			if (ignoredDirNames[entry])
+				continue;
+			scanForSchemaFiles(fullPath, ignoredDirNames, results);
+			continue;
+		}
+
+		if (entry === 'schema.js' || entry === 'schema.mjs' || entry === 'schema.ts')
+			results.push(fullPath);
+	}
 }
 
 function tryDownload(_url, _isNamespace) {
@@ -124,4 +197,4 @@ async function download(url, isNamespace) {
 
 module.exports = function(cwd) {
 	run(cwd).then(null, console.log);
-};
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "orange-orm",
-    "version": "5.0.0",
+    "version": "5.0.1-beta.0",
     "publishConfig": {
         "access": "public"
     },
@@ -80,20 +80,17 @@
         "ajv": "^8.17.1",
         "axios": "^1.6.2",
         "fast-json-patch": "^3.1.1",
-        "findup-sync": "^5.0.0",
-        "glob": "^10.3.4 || ^11.0.2",
-        "module-definition": "^4.0.0 || ^5.0.0 || || ^6.0.0",
         "rfdc": "^1.2.0",
         "uuid": "^8.3.2 || ^9.0.0 || ^10.0.0 || ^11.1.0"
     },
     "peerDependencies": {
         "@electric-sql/pglite": "^0.3.0",
+        "better-sqlite3": "^11.8.1",
         "msnodesqlv8": "^4.1.0 || ^5.0.0",
         "mysql2": "^2.2.5 || ^3.9.4",
         "oracledb": "^6.3.0",
         "pg": "^8.5.1",
         "pg-query-stream": "^3.3.2",
-        "better-sqlite3": "^11.8.1",
         "tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || || ^19.0.0"
     },
     "peerDependenciesMeta": {
@@ -133,6 +130,7 @@
         "@typescript-eslint/eslint-plugin": "^6.x",
         "@typescript-eslint/parser": "^6.x",
         "@vitest/coverage-v8": "^3.2.4",
+        "better-sqlite3": "^11.8.1",
         "cors": "^2.8.5",
         "eslint": "^8.57.0",
         "eslint-plugin-jest": "^27.1.7",
@@ -144,7 +142,6 @@
         "pg": "^8.5.1",
         "pg-query-stream": "^3.3.2",
         "rollup": "^2.52.7",
-        "better-sqlite3": "^11.8.1",
         "tedious": "^19.0.0",
         "typescript": "^5.4.5",
         "vitest": "^3.2.4"