@iebh/tera-fy 2.0.13 → 2.0.15

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [2.0.15](https://github.com/IEBH/TERA-fy/compare/v2.0.14...v2.0.15) (2025-03-19)
+
+
+### refactor
+
+* Switch from Syncro.wrapSupabase() -> NPM:@iebh/supabasey handling ([23e3805](https://github.com/IEBH/TERA-fy/commit/23e3805aecb70e130a727028df27c0d269d4d603))
+
+## [2.0.14](https://github.com/IEBH/TERA-fy/compare/v2.0.13...v2.0.14) (2025-03-16)
+
+
+### fix
+
+* Missing ID when creating blank user ([574aaa4](https://github.com/IEBH/TERA-fy/commit/574aaa4204b02b90405a83e99086b82fdfce8f3d))
+
 ## [2.0.13](https://github.com/IEBH/TERA-fy/compare/v2.0.12...v2.0.13) (2025-03-16)
 
 

package/lib/syncro/entities.js

@@ -1,7 +1,6 @@
 import Reflib from '@iebh/reflib';
 import {v4 as uuid4} from 'uuid';
 import {nanoid} from 'nanoid';
-import Syncro from './syncro.js';
 
 /**
 * Entities we support Syncro paths for, each should correspond directly with a Firebase/Firestore collection name
@@ -9,14 +8,14 @@ import Syncro from './syncro.js';
 * @type {Object} An object lookup of entities
 *
 * @property {String} singular The singular noun for the item
-* @property {Function} initState Function called to initialize state when Firestore has no existing document. Called as `({supabase:SupabaseClient, entity:String, id:String, relation?:string})` and expected to return the initial data object state
+* @property {Function} initState Function called to initialize state when Firestore has no existing document. Called as `({supabase:Supabasey, entity:String, id:String, relation?:string})` and expected to return the initial data object state
 * @property {Function} flushState Function called to flush state from Firebase to Supabase. Called the same as `initState` + `{state:Object}`
 */
 export default {
 	projects: { // {{{
 		singular: 'project',
 		async initState({supabase, id}) {
-			let data = await Syncro.wrapSupabase(supabase
+			let data = await supabase(s => s
 				.from('projects')
 				.select('data')
 				.maybeSingle()
@@ -43,7 +42,7 @@ export default {
 							console.log('[MIGRATION] Creating filename:', fileName);
 
 							return Promise.resolve()
-								.then(()=> Syncro.wrapSupabase(supabase.storage // Split data.temp[toolKey] -> file {{{
+								.then(()=> supabase(s => s // Split data.temp[toolKey] -> file {{{
 									.from('projects')
 									.upload(
 										`${id}/${fileName}`,
@@ -82,7 +81,7 @@ export default {
 			return data;
 		},
 		flushState({supabase, state, fsId}) {
-			return Syncro.wrapSupabase(supabase.rpc('syncro_merge_data', {
+			return supabase(s => s.rpc('syncro_merge_data', {
 				table_name: 'projects',
 				entity_id: fsId,
 				new_data: state,
@@ -97,13 +96,13 @@ export default {
 			let fileId = relation.replace(/_\*$/, '');
 
 			return Promise.resolve()
-				.then(()=> Syncro.wrapSupabase(supabase.storage
+				.then(()=> supabase(s => s.storage
 					.from('projects')
 					.list(id)
 				))
 				.then(files => files.find(f => f.id == fileId))
 				.then(file => file || Promise.reject(`Invalid file ID "${fileId}"`))
-				.then(file => Syncro.wrapSupabase(supabase.storage
+				.then(file => supabase(s => s.storage
 					.from('projects')
 					.download(`${id}/${file.name}`)
 				)
@@ -130,7 +129,8 @@ export default {
 		singular: 'project namespace',
 		initState({supabase, id, relation}) {
 			if (!relation) throw new Error('Project namespace relation missing, path should resemble "project_namespaces::${PROJECT}::${RELATION}"');
-			return Syncro.wrapSupabase(supabase.from('project_namespaces')
+			return supabase(s => s
+				.from('project_namespaces')
 				.select('data')
 				.limit(1)
 				.eq('project', id)
@@ -138,7 +138,8 @@ export default {
 			)
 				.then(rows => rows.length == 1
 					? rows[0]
-					: Syncro.wrapSupabase(supabase.from('project_namespaces') // Doesn't exist - create it
+					: supabase(s => s
+						.from('project_namespaces') // Doesn't exist - create it
 						.insert({
 							project: id,
 							name: relation,
@@ -150,7 +151,8 @@ export default {
 				.then(item => item.data);
 		},
 		flushState({supabase, state, id, relation}) {
-			return Syncro.wrapSupabase(supabase.from('project_namespaces')
+			return supabase(s => s
+				.from('project_namespaces')
 				.update({
 					edited_at: new Date(),
 					data: state,
@@ -163,7 +165,8 @@ export default {
 	test: { // {{{
 		singular: 'test',
 		initState({supabase, id}) {
-			return Syncro.wrapSupabase(supabase.from('test')
+			return supabase(s => s
+				.from('test')
 				.select('data')
 				.limit(1)
 				.eq('id', id)
@@ -172,7 +175,7 @@ export default {
 				.then(item => item.data);
 		},
 		flushState({supabase, state, fsId}) {
-			return Syncro.wrapSupabase(supabase.rpc('syncro_merge_data', {
+			return supabase(s => s.rpc('syncro_merge_data', {
 				table_name: 'test',
 				entity_id: fsId,
 				new_data: state,
@@ -182,7 +185,8 @@ export default {
 	users: { // {{{
 		singular: 'user',
 		initState({supabase, id}) {
-			return Syncro.wrapSupabase(supabase.from('users')
+			return supabase(s => s
+				.from('users')
 				.select('data')
 				.limit(1)
 				.maybeSingle()
@@ -192,8 +196,10 @@ export default {
 					if (user) return user.data; // User is valid and already exists
 
 					// User row doesn't already exist - need to create stub
-					return Syncro.wrapSupabase(supabase.from('users')
+					return supabase(s => s
+						.from('users')
 						.insert({
+							id,
 							data: {
 								id,
 								data: { // Create user prototype data
@@ -208,7 +214,7 @@ export default {
 				})
 		},
 		flushState({supabase, state, fsId}) {
-			return Syncro.wrapSupabase(supabase.rpc('syncro_merge_data', {
+			return supabase(s => s.rpc('syncro_merge_data', {
 				table_name: 'users',
 				entity_id: fsId,
 				new_data: state,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iebh/tera-fy",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "TERA website worker",
   "scripts": {
     "dev": "esbuild --platform=browser --format=esm --bundle lib/terafy.client.js --outfile=dist/terafy.js --minify --serve --servedir=.",