@balena/pinejs 21.2.1 → 21.2.2-build-shared-namespace-relationships-6cdf2fab2c3f6796f5543d19d9ecaefbd052c67c-1

package/src/sbvr-api/permissions.ts

@@ -9,7 +9,6 @@ import type {
 	ReferencedFieldNode,
 	Relationship,
 	RelationshipInternalNode,
-	RelationshipLeafNode,
 	RelationshipMapping,
 	SelectNode,
 	SelectQueryNode,
@@ -56,6 +55,7 @@ import type { Config } from '../config-loader/config-loader.js';
 import type { ODataOptions } from 'pinejs-client-core';
 import type { Permission } from './user.js';
 import { importSBVR } from '../server-glue/sbvr-loader.js';
+import { namespaceRelationships } from './abstract-sql.js';
 
 const userModel = await importSBVR('./user.sbvr', import.meta);
 
@@ -303,31 +303,6 @@ const collapsePermissionFilters = <T>(
 	return v;
 };
 
-const namespaceRelationships = (
-	relationships: Relationship,
-	alias: string,
-): void => {
-	for (const [key, relationship] of Object.entries(
-		relationships as RelationshipInternalNode,
-	)) {
-		if (key === '$') {
-			continue;
-		}
-
-		let mapping = (relationship as RelationshipLeafNode).$;
-		if (mapping != null && mapping.length === 2) {
-			mapping = _.cloneDeep(mapping);
-			// we do check the length above, but typescript thinks the second
-			// element could be undefined
-			mapping[1]![0] = `${mapping[1]![0]}$${alias}`;
-			(relationships as RelationshipInternalNode)[`${key}$${alias}`] = {
-				$: mapping,
-			};
-		}
-		namespaceRelationships(relationship, alias);
-	}
-};
-
 type PermissionLookup = Dictionary<true | string[]>;
 
 const getPermissionsLookup = env.createCache(
@@ -1174,7 +1149,9 @@ const getBoundConstrainedMemoizer = memoizeWeak(
 							for (const relationship of origRelationships) {
 								relationships[`${relationship}$${alias}`] =
 									relationships[relationship];
-								namespaceRelationships(relationships[relationship], alias);
+								namespaceRelationships(relationships[relationship], alias, {
+									deleteOriginal: false,
+								});
 							}
 							return relationships[permissionResourceName];
 						},

package/src/sbvr-api/translations.ts

@@ -1,13 +1,10 @@
 import _ from 'lodash';
 import type {
 	AbstractSqlModel,
-	Relationship,
 	ReferencedFieldNode,
 	SelectNode,
 	AliasNode,
 	Definition,
-	RelationshipInternalNode,
-	RelationshipLeafNode,
 	SelectQueryNode,
 	NumberTypeNodes,
 	BooleanTypeNodes,
@@ -15,6 +12,7 @@ import type {
 	NullNode,
 } from '@balena/abstract-sql-compiler';
 import type { Dictionary } from './common-types.js';
+import { namespaceRelationships as $namespaceRelationships } from './abstract-sql.js';
 
 export type AliasValidNodeType =
 	| ReferencedFieldNode
@@ -95,29 +93,13 @@ const aliasResource = (
 };
 
 const namespaceRelationships = (
-	relationships: Relationship,
-	alias: string,
+	relationships: Parameters<typeof $namespaceRelationships>[0],
+	alias: Parameters<typeof $namespaceRelationships>[1],
 ): void => {
-	for (const [key, relationship] of Object.entries(
-		relationships as RelationshipInternalNode,
-	)) {
-		if (key === '$') {
-			continue;
-		}
-
-		let mapping = (relationship as RelationshipLeafNode).$;
-		if (mapping != null && mapping.length === 2) {
-			if (!key.includes('$')) {
-				mapping = _.cloneDeep(mapping);
-				mapping[1]![0] = `${mapping[1]![0]}$${alias}`;
-				(relationships as RelationshipInternalNode)[`${key}$${alias}`] = {
-					$: mapping,
-				};
-				delete (relationships as RelationshipInternalNode)[key];
-			}
-		}
-		namespaceRelationships(relationship, alias);
-	}
+	$namespaceRelationships(relationships, alias, {
+		keyFilter: (key) => !key.includes('$'),
+		deleteOriginal: true,
+	});
 };
 
 export const translateAbstractSqlModel = (