lazy uuid to work with d1

Author: lroal

package.json

@@ -107,6 +107,7 @@
     "@cloudflare/workers-types": "^4.20241106.0",
     "@miniflare/d1": "^2.14.4",
     "@rollup/plugin-commonjs": "^21.0.1",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^13.0.0",
     "@typescript-eslint/eslint-plugin": "^6.x",
     "@typescript-eslint/parser": "^6.x",

src/client/rollup.config.js

@@ -1,12 +1,13 @@
+import json from '@rollup/plugin-json';
 import commonjs from '@rollup/plugin-commonjs';
 import nodeResolve from '@rollup/plugin-node-resolve';
 
 export default {
-	input: './src/client/index.js',
+	input: './src/index.js',
 	output: {
 		file: './src/client/index.mjs',
 		format: 'esm'
 	},
-	plugins: [commonjs(), nodeResolve({browser: true})],
+	plugins: [json(), commonjs(), nodeResolve({browser: true})],
 	external: ['vue']
 };

src/table/relation/newManyCache.js

@@ -9,7 +9,7 @@ var setSessionSingleton = require('../setSessionSingleton');
 
 function newManyCache(joinRelation) {
 	var c = {};
-	var key = newId();
+	var key;
 
 	c.tryAdd = function(context, parent, child) {
 		c.getInnerCache(context).tryAdd(parent, child);
@@ -25,10 +25,11 @@ function newManyCache(joinRelation) {
 	};
 
 	c.getInnerCache = function(context) {
-		var cache = getSessionSingleton(context, key);
+		const theKey = negotiateKey();
+		var cache = getSessionSingleton(context, theKey);
 		if (!cache) {
 			cache = newCacheCore(joinRelation);
-			setSessionSingleton(context, key, cache);
+			setSessionSingleton(context, theKey, cache);
 			fillCache(context);
 			synchronizeAdded(context, c.tryAdd.bind(null, context), joinRelation);
 			synchronizeRemoved(context, c.tryRemove.bind(null, context), joinRelation);
@@ -49,6 +50,13 @@ function newManyCache(joinRelation) {
 		}
 	}
 
+	function negotiateKey() {
+		if (key)
+			return key;
+		key = newId();
+		return key;
+
+	}
 
 
 	return c;

tests/getMany.test.js

@@ -32,9 +32,6 @@ afterAll(async () => {
 
 beforeAll(async () => {
 	({ d1, miniflare } = await setupD1(fileURLToPath(import.meta.url)));
-	console.dir('d1');
-	console.dir(d1);
-	console.dir(miniflare);
 	await createMs('mssql');
 	await insertData('pg');
 	await insertData('mssql');