orange-orm 4.7.14 → 4.7.15-beta.0

package/README.md

@@ -222,7 +222,12 @@ Because of a peculiarity in SQLite, which only allows one statement execution at
 import map from './map';
 const db = map.sqlite('demo.db');
 
-const sql = `DROP TABLE IF EXISTS deliveryAddress; DROP TABLE IF EXISTS package; DROP TABLE IF EXISTS orderLine; DROP TABLE IF EXISTS _order; DROP TABLE IF EXISTS customer;
+const sql = `DROP TABLE IF EXISTS deliveryAddress;
+DROP TABLE IF EXISTS package; 
+DROP TABLE IF EXISTS orderLine; 
+DROP TABLE IF EXISTS _order; 
+DROP TABLE IF EXISTS customer;
+
 CREATE TABLE customer (
     id INTEGER PRIMARY KEY,
     name TEXT,

package/SECURITY.md

@@ -3,7 +3,8 @@
 ## Supported versions
 
 The following table describes the versions of this project that are currently supported with security updates:
-- [x] 3.x
+- [x] 4.x
+- [ ] 3.x
 - [ ] 2.x
 - [ ] 1.x
 

package/dist/index.browser.mjs

@@ -11085,6 +11085,10 @@ function requireGetManyDto$1 () {
 			const extractKey = createExtractKey(leg);
 			const extractFromMap = createExtractFromMap(rowsMap, table._primaryColumns);
 
+			if (span._ids.length === 0) {
+				return;
+			}
+
 			// If maxRows is defined, chunk the IDs before calling getManyDto
 			if (maxRows) {
 				const chunkedIds = chunk(span._ids, maxRows);

package/dist/index.mjs

@@ -11086,6 +11086,10 @@ function requireGetManyDto$1 () {
 			const extractKey = createExtractKey(leg);
 			const extractFromMap = createExtractFromMap(rowsMap, table._primaryColumns);
 
+			if (span._ids.length === 0) {
+				return;
+			}
+
 			// If maxRows is defined, chunk the IDs before calling getManyDto
 			if (maxRows) {
 				const chunkedIds = chunk(span._ids, maxRows);
@@ -16034,9 +16038,16 @@ var hasRequiredWrapQuery$6;
 function requireWrapQuery$6 () {
 	if (hasRequiredWrapQuery$6) return wrapQuery_1$6;
 	hasRequiredWrapQuery$6 = 1;
-	var log = requireLog();
+	const log = requireLog();
+	const connectionCache  = new WeakMap();
 
 	function wrapQuery(_context, connection) {
+		let statementCache = connectionCache.get(connection);
+		if (!statementCache) {
+			statementCache = new Map();
+			connectionCache.set(connection, statementCache);
+		}
+
 		return runQuery;
 
 		function runQuery(query, onCompleted) {
@@ -16045,7 +16056,11 @@ function requireWrapQuery$6 () {
 				var sql = query.sql();
 				log.emitQuery({ sql, parameters: params });
 
-				var statement = connection.prepare(sql);
+				let statement = statementCache.get(sql);
+				if (!statement) {
+					statement = connection.prepare(sql);
+					statementCache.set(sql, statement);
+				}
 				const rows = statement.all.apply(statement, params);
 				onCompleted(null, rows);
 			}
@@ -20719,7 +20734,7 @@ function requireSrc () {
 	Object.defineProperty(connectViaPool, 'sqlite', {
 		get: function() {
 			if (!_sqlite) {
-				if (runtimes.deno || (runtimes.node && runtimes.node.major >= 22))
+				if (runtimes.deno || (runtimes.node && (runtimes.node.major > 22 || (runtimes.node.major === 22 && runtimes.node.minor >= 5))))
 					_sqlite = requireNewDatabase$7();
 				else if (runtimes.bun)
 					_sqlite = requireNewDatabase$6();

package/docs/changelog.md

@@ -1,4 +1,6 @@
 ## Changelog
+__4.7.15__  
+Minor performance improvements and node minor version check for node:sqlite.  
 __4.7.14__  
 Improved performance for SQL Server.  
 __4.7.13__  

package/package.json

@@ -1,165 +1,166 @@
 {
-  "name": "orange-orm",
-  "version": "4.7.14",
-  "main": "./src/index.js",
-  "module": "./dist/index.mjs",
-  "browser": "./dist/index.browser.mjs",
-  "exports": {
-    ".": {
-      "require": "./src/index.js",
-      "import": "./dist/index.mjs",
-      "browser": "./dist/index.browser.mjs",
-      "types": "./src/index.d.ts"
-    }
-  },
-  "bin": {
-    "orange-orm": "bin/rdb.js"
-  },
-  "title": "Orange ORM",
-  "description": "Object Relational Mapper",
-  "keywords": [
-    "typescript orm",
-    "orm",
-    "sql",
-    "mySql",
-    "SQLite",
-    "MySQL",
-    "mssql",
-    "Microsoft Sql Server",
-    "PGlite",
-    "Cloudflare D1",
-    "PostgreSql",
-    "Postgres",
-    "pg",
-    "sap",
-    "sapase",
-    "Oracle",
-    "rdb",
-    "Orange ORM",
-    "active record"
-  ],
-  "authors": [
-    "Lars-Erik Roald <lars.roald@gmail.com>"
-  ],
-  "license": "ISC",
-  "codeOfConduct": "https://github.com/alfateam/orange-orm/blob/master/docs/CODE_OF_CONDUCT.md",
-  "contributing": "https://github.com/alfateam/orange-orm/blob/master/CONTRIBUTING.md",
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/lroal"
-  },
-  "scripts": {
-    "test": "vitest run --threads=false",
-    "test:bun": "bun test --timeout=30000 ./tests/*.bun.test.js",    
-    "test:deno": "deno test --allow-all --unstable-detect-cjs ./tests/*.deno.test.js",
-    "test:all": "echo 'Running Node.js tests...' && npm run test:node && echo 'Running Bun tests...' && npm run test:bun && echo 'Running Deno tests...' && npm run test:deno && echo 'All tests completed!'",
-    "test:all:parallel": "concurrently \"npm:test:node\" \"npm:test:bun\" \"npm:test:deno\"",
-    "coverage": "vitest run --coverage.enabled --coverage.reporter='text-summary' --threads=false",
-    "testw": "vitest --threads=false update",
-    "tscheck": "tsc ./src/index.d.ts --module commonjs --target es2022 --noEmit true --strict true --esModuleInterop true",
-    "concat-server": "node ./src/merge-server.js",
-    "concat-browser": "node ./src/merge-browser.js",
-    "build": "npm run build-server && npm run build-browser",
-    "build-server": "rollup -c ./src/rollup.config.server.js && npm run concat-server",
-    "build-browser": "rollup -c ./src/rollup.config.browser.js && npm run concat-browser",
-    "lint": "eslint ./",
-    "fix": "eslint ./ --fix",
-    "owasp": "owasp-dependency-check --project \"MY_PROJECT\" --scan \"package-lock.json\" --exclude \"dependency-check-bin\" --out \"owasp\" --format HTML",
-    "beta": "npm publish --tag beta"
-  },
-  "dependencies": {
-    "@cloudflare/workers-types": "^4.20241106.0",
-    "@lroal/on-change": "^4.0.2",
-    "@tediousjs/connection-string": "^0.4.1",
-    "@types/express": "^4.17.13",
-    "@types/oracledb": "^6.0.4",
-    "@types/tedious": "^4.0.14",
-    "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",
-    "msnodesqlv8": "^4.1.0",
-    "mysql2": "^2.2.5 || ^3.9.4",
-    "oracledb": "^6.3.0",
-    "pg": "^8.5.1",
-    "pg-query-stream": "^3.3.2",
-    "sqlite3": "^5.0.2",
-    "tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || || ^19.0.0"
-  },
-  "peerDependenciesMeta": {
-    "pg": {
-      "optional": true
+    "name": "orange-orm",
+    "version": "4.7.15-beta.0",
+    "publishConfig": {
+        "access": "public"
+    },
+    "main": "./src/index.js",
+    "module": "./dist/index.mjs",
+    "browser": "./dist/index.browser.mjs",
+    "exports": {
+        ".": {
+            "types": "./src/index.d.ts",
+            "browser": "./dist/index.browser.mjs",
+            "import": "./dist/index.mjs",
+            "require": "./src/index.js"
+        }
+    },
+    "bin": {
+        "orange-orm": "bin/rdb.js"
+    },
+    "title": "Orange ORM",
+    "description": "Object Relational Mapper",
+    "keywords": [
+        "typescript orm",
+        "orm",
+        "sql",
+        "mySql",
+        "SQLite",
+        "MySQL",
+        "mssql",
+        "Microsoft Sql Server",
+        "PGlite",
+        "Cloudflare D1",
+        "PostgreSql",
+        "Postgres",
+        "pg",
+        "sap",
+        "sapase",
+        "Oracle",
+        "rdb",
+        "Orange ORM",
+        "active record"
+    ],
+    "authors": [
+        "Lars-Erik Roald <lars.roald@gmail.com>"
+    ],
+    "license": "ISC",
+    "codeOfConduct": "https://github.com/alfateam/orange-orm/blob/master/docs/CODE_OF_CONDUCT.md",
+    "contributing": "https://github.com/alfateam/orange-orm/blob/master/CONTRIBUTING.md",
+    "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/lroal"
     },
-    "pg-query-stream": {
-      "optional": true
+    "scripts": {
+        "test": "vitest run --pool=forks --poolOptions.forks.singleFork",
+        "test:bun": "bun test --timeout=30000 ./tests/*.bun.test.js",
+        "test:deno": "deno test --allow-all --unstable-detect-cjs ./tests/*.deno.test.js",
+        "test:all": "echo 'Running Node.js tests...' && npm run test:node && echo 'Running Bun tests...' && npm run test:bun && echo 'Running Deno tests...' && npm run test:deno && echo 'All tests completed!'",
+        "test:all:parallel": "concurrently \"npm:test:node\" \"npm:test:bun\" \"npm:test:deno\"",
+        "coverage": "vitest run --coverage.enabled --coverage.reporter='text-summary' --pool=forks --poolOptions.forks.singleFork",
+        "testw": "vitest --pool=forks --poolOptions.forks.singleFork update",
+        "tscheck": "tsc ./src/index.d.ts --module commonjs --target es2022 --noEmit true --strict true --esModuleInterop true",
+        "concat-server": "node ./src/merge-server.js",
+        "concat-browser": "node ./src/merge-browser.js",
+        "build": "npm run build-server && npm run build-browser",
+        "build-server": "rollup -c ./src/rollup.config.server.js && npm run concat-server",
+        "build-browser": "rollup -c ./src/rollup.config.browser.js && npm run concat-browser",
+        "lint": "eslint ./",
+        "fix": "eslint ./ --fix",
+        "owasp": "owasp-dependency-check --project \"MY_PROJECT\" --scan \"package-lock.json\" --exclude \"dependency-check-bin\" --out \"owasp\" --format HTML",
+        "beta": "npm publish --tag beta"
     },
-    "mysql2": {
-      "optional": true
+    "dependencies": {
+        "@cloudflare/workers-types": "^4.20241106.0",
+        "@lroal/on-change": "^4.0.2",
+        "@tediousjs/connection-string": "^0.4.1",
+        "@types/express": "^4.17.13",
+        "@types/oracledb": "^6.0.4",
+        "@types/tedious": "^4.0.14",
+        "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"
     },
-    "sqlite3": {
-      "optional": true
+    "peerDependencies": {
+        "@electric-sql/pglite": "^0.3.0",
+        "msnodesqlv8": "^4.1.0",
+        "mysql2": "^2.2.5 || ^3.9.4",
+        "oracledb": "^6.3.0",
+        "pg": "^8.5.1",
+        "pg-query-stream": "^3.3.2",
+        "sqlite3": "^5.0.2",
+        "tedious": "^15.1.2 || ^16.0.0 || ^18.1.0 || || ^19.0.0"
     },
-    "pg-native": {
-      "optional": true
+    "peerDependenciesMeta": {
+        "pg": {
+            "optional": true
+        },
+        "pg-query-stream": {
+            "optional": true
+        },
+        "mysql2": {
+            "optional": true
+        },
+        "sqlite3": {
+            "optional": true
+        },
+        "pg-native": {
+            "optional": true
+        },
+        "msnodesqlv8": {
+            "optional": true
+        },
+        "tedious": {
+            "optional": true
+        },
+        "oracledb": {
+            "optional": true
+        },
+        "@electric-sql/pglite": {
+            "optional": true
+        }
     },
-    "msnodesqlv8": {
-      "optional": true
+    "devDependencies": {
+        "@electric-sql/pglite": "^0.3.0",
+        "@rollup/plugin-commonjs": "^28.0.2",
+        "@rollup/plugin-json": "^6.1.0",
+        "@rollup/plugin-node-resolve": "^13.0.0",
+        "@typescript-eslint/eslint-plugin": "^6.x",
+        "@typescript-eslint/parser": "^6.x",
+        "@vitest/coverage-v8": "^3.2.4",
+        "cors": "^2.8.5",
+        "eslint": "^8.57.0",
+        "eslint-plugin-jest": "^27.1.7",
+        "express": "^4.18.2",
+        "msnodesqlv8": "^4.1.0",
+        "mysql2": "^3.9.4",
+        "oracledb": "^6.3.0",
+        "owasp-dependency-check": "^0.0.21",
+        "pg": "^8.5.1",
+        "pg-query-stream": "^3.3.2",
+        "rollup": "^2.52.7",
+        "sqlite3": "^5.0.2",
+        "tedious": "^19.0.0",
+        "typescript": "^5.4.5",
+        "vitest": "^3.2.4"
     },
-    "tedious": {
-      "optional": true
+    "engines": {
+        "node": ">= 8.0.0"
     },
-    "oracledb": {
-      "optional": true
+    "repository": {
+        "type": "git",
+        "url": "git@github.com:alfateam/orange-orm.git"
     },
-    "@electric-sql/pglite": {
-      "optional": true
+    "homepage": "https://orange-orm.io",
+    "jshintConfig": {
+        "asi": true,
+        "eqnull": true,
+        "undef": true,
+        "node": true
     }
-  },
-  "devDependencies": {
-    "@electric-sql/pglite": "^0.3.0",
-    "@miniflare/d1": "^2.14.4",
-    "@rollup/plugin-commonjs": "^28.0.2",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.0",
-    "@typescript-eslint/eslint-plugin": "^6.x",
-    "@typescript-eslint/parser": "^6.x",
-    "@vitest/coverage-v8": "^0.34.1",
-    "cors": "^2.8.5",
-    "eslint": "^8.57.0",
-    "eslint-plugin-jest": "^27.1.7",
-    "express": "^4.18.2",
-    "miniflare": "^3.20250129.0",
-    "msnodesqlv8": "^4.1.0",
-    "mysql2": "^3.9.4",
-    "oracledb": "^6.3.0",
-    "owasp-dependency-check": "^0.0.21",
-    "pg": "^8.5.1",
-    "pg-query-stream": "^3.3.2",
-    "rollup": "^2.52.7",
-    "sqlite3": "^5.0.2",
-    "tedious": "^19.0.0",
-    "typescript": "^5.4.5",
-    "vitest": "^0.34.6"
-  },
-  "engines": {
-    "node": ">= 8.0.0"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git@github.com:alfateam/orange-orm.git"
-  },
-  "homepage": "https://orange-orm.io",
-  "jshintConfig": {
-    "asi": true,
-    "eqnull": true,
-    "undef": true,
-    "node": true
-  }
-}
+}

package/src/getManyDto.js

@@ -209,6 +209,10 @@ async function decodeManyRelations(context, strategy, span) {
 		const extractKey = createExtractKey(leg);
 		const extractFromMap = createExtractFromMap(rowsMap, table._primaryColumns);
 
+		if (span._ids.length === 0) {
+			return;
+		}
+
 		// If maxRows is defined, chunk the IDs before calling getManyDto
 		if (maxRows) {
 			const chunkedIds = chunk(span._ids, maxRows);

package/src/index.js

@@ -88,7 +88,7 @@ Object.defineProperty(connectViaPool, 'pg', {
 Object.defineProperty(connectViaPool, 'sqlite', {
 	get: function() {
 		if (!_sqlite) {
-			if (runtimes.deno || (runtimes.node && runtimes.node.major >= 22))
+			if (runtimes.deno || (runtimes.node && (runtimes.node.major > 22 || (runtimes.node.major === 22 && runtimes.node.minor >= 5))))
 				_sqlite = require('./nodeSqlite/newDatabase');
 			else if (runtimes.bun)
 				_sqlite = require('./bunSqlite/newDatabase');

package/src/nodeSqlite/wrapQuery.js

@@ -1,6 +1,13 @@
-var log = require('../table/log');
+const log = require('../table/log');
+const connectionCache  = new WeakMap();
 
 function wrapQuery(_context, connection) {
+	let statementCache = connectionCache.get(connection);
+	if (!statementCache) {
+		statementCache = new Map();
+		connectionCache.set(connection, statementCache);
+	}
+
 	return runQuery;
 
 	function runQuery(query, onCompleted) {
@@ -9,7 +16,11 @@ function wrapQuery(_context, connection) {
 			var sql = query.sql();
 			log.emitQuery({ sql, parameters: params });
 
-			var statement = connection.prepare(sql);
+			let statement = statementCache.get(sql);
+			if (!statement) {
+				statement = connection.prepare(sql);
+				statementCache.set(sql, statement);
+			}
 			const rows = statement.all.apply(statement, params);
 			onCompleted(null, rows);
 		}

package/.dockerignore

@@ -1 +0,0 @@
-node_modules

package/.eslintignore

@@ -1,2 +0,0 @@
-node_modules
-*Spec

package/.eslintrc.js

@@ -1,45 +0,0 @@
-module.exports = {
-	'env': {
-		'node': true,
-		'es6': true
-	},
-	'extends': [
-		'eslint:recommended',
-		'plugin:@typescript-eslint/eslint-recommended',
-		'plugin:@typescript-eslint/recommended',
-		// 'plugin:jest/recommended'
-	],
-	'parserOptions': {
-		'sourceType': 'module',
-		'ecmaVersion': 2018
-	},
-	'ignorePatterns': ['*esm.js', '*.ts'],
-	'rules': {
-		'@typescript-eslint/no-empty-function': 0,
-		'@typescript-eslint/no-var-requires': 0,
-		'@typescript-eslint/ban-ts-comment': 0,
-		'no-unused-vars': 'off',
-		'@typescript-eslint/no-unused-vars': [2, { 'args': 'after-used', 'ignoreRestSiblings': true, 'argsIgnorePattern': '^_' }],
-		'indent': ['error', 'tab'],
-		// 'linebreak-style': ['error', 'unix'],
-		'quotes': ['error', 'single'],
-		'semi': ['error', 'always'],
-		'no-console': 'off',
-		'no-debugger': 'off',
-		'no-trailing-spaces': 'error',
-		'no-underscore-dangle': 0,
-		'space-before-function-paren': ['error', {
-			'anonymous': 'never',
-			'named': 'never',
-			'asyncArrow': 'always'
-		}],
-		// 'jest/no-disabled-tests': 'warn',
-		// 'jest/no-focused-tests': 'error',
-		// 'jest/no-identical-title': 'error',
-		// 'jest/prefer-to-have-length': 'warn',
-		// 'jest/valid-expect': 'error'
-	},
-	'plugins': [ '@typescript-eslint']
-	// 'plugins': ['jest', '@typescript-eslint']
-};
-

package/.gitattributes

@@ -1,3 +0,0 @@
-* text=auto eol=lf
-*.{cmd,[cC][mM][dD]} text eol=crlf
-*.{bat,[bB][aA][tT]} text eol=crlf

package/CNAME

@@ -1 +0,0 @@
-orange-orm.io

package/src/package.json

@@ -1,5 +0,0 @@
-{
-  "dependencies": {
-    "uuid": "^11.0.5"
-  }
-}

package/vitest.config.js

@@ -1,17 +0,0 @@
-// vitest.config.js
-/** @type {import('vitest').UserConfig} */
-module.exports = {
-	test: {
-		// Copied baseline excludes (since configDefaults is ESM-only)
-		exclude: [
-			'**/node_modules/**',
-			'**/dist/**',
-			'**/cypress/**',
-			'**/.{idea,git,cache}/**',
-			'**/coverage/**',
-			'**/*.deno.test.js',
-			'**/*.bun.test.js',
-		],
-		threads: false,
-	},
-};