@balena/pinejs 22.1.4-build-renovate-bcrypt-6-x-6b995cfc00adc4154dc008a20bc666adc18c70f5-1 → 23.0.0-build-23-x-06bf0c67151995a64e8f502ea9dfb1232abb6001-1

package/src/sbvr-api/permissions.ts

@@ -1,4 +1,5 @@
 import type AuthModel from './user.js';
+import { abstractSqlContainsNode } from '@balena/abstract-sql-compiler';
 import type {
 	AbstractSqlModel,
 	AbstractSqlQuery,
@@ -1102,12 +1103,33 @@ const getBoundConstrainedMemoizer = memoizeWeak(
 								// * When the resolution reaches the last model in the chain (`<resource>$vDB$permissions"<permJson>"`) and tries to resolve it,
 								//   the `generateConstrainedAbstractSql()` that's in the `onceGetter(permissionsTable, 'definition'` below get called, which reads
 								//   the `$permissions"<permJson>"` suffix of the resource name and add a filter with the respective permissions to that last/deepest model in the chain.
-								onceGetter(permissionsTable, 'definition', () =>
-									createVersionSpecificPermissionDefinition(
+								onceGetter(permissionsTable, 'definition', () => {
+									const effectiveTableName =
+										permissionsTable.modifyName ?? permissionsTable.name;
+									if (
+										abstractSqlContainsNode(
+											tableDefinition.abstractSql,
+											(n) => n[0] === 'Table' && n[1] === effectiveTableName,
+										)
+									) {
+										const permissionsAbstractSql =
+											generateConstrainedAbstractSql(
+												permissionsLookup,
+												JSON.parse(permissionsJSON),
+												finalVocabulary,
+												sqlNameToODataName(effectiveTableName),
+											);
+										if (permissionsAbstractSql != null) {
+											// If we're targeting the table directly then we can just return the permissionsAbstractSql as both should be generated using the final model
+											// TODO: in practice we could have a translation that targets the table directly rather than via a `Resource` node, so we should try to handle that
+											return permissionsAbstractSql;
+										}
+									}
+									return createVersionSpecificPermissionDefinition(
 										tableDefinition,
 										permissionsJSON,
-									),
-								);
+									);
+								});
 							} else {
 								onceGetter(permissionsTable, 'definition', () =>
 									// For $filter on eg a DELETE you need read permissions on the sub-resources,

package/src/sbvr-api/sbvr-utils.ts

@@ -24,7 +24,7 @@ import type { TypedError } from 'typed-error';
 import { cachedCompile } from './cached-compile.js';
 
 type LFModel = any[];
-import AbstractSQLCompiler from '@balena/abstract-sql-compiler';
+import * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
 import AbstractSqlCompilerPackage from '@balena/abstract-sql-compiler/package.json' with { type: 'json' };
 const { version: AbstractSQLCompilerVersion } = AbstractSqlCompilerPackage;
 
@@ -537,7 +537,7 @@ export const generateAbstractSqlModel = (
 		() =>
 			AbstractSQLCompiler.optimizeSchema(
 				LF2AbstractSQLTranslator(lfModel, 'Process'),
-				false,
+				{ createCheckConstraints: false },
 			),
 	);
 

package/src/sbvr-api/uri-parser.ts

@@ -1,4 +1,4 @@
-import type AbstractSQLCompiler from '@balena/abstract-sql-compiler';
+import type * as AbstractSQLCompiler from '@balena/abstract-sql-compiler';
 import type {
 	ODataBinds,
 	ODataOptions,

package/src/sbvr-api/user.ts

@@ -1,4 +1,4 @@
-// These types were generated by @balena/abstract-sql-to-typescript v5.1.5
+// These types were generated by @balena/abstract-sql-to-typescript v6.1.0
 
 import type { Types } from '@balena/abstract-sql-to-typescript';
 

package/src/tasks/tasks.ts

@@ -1,4 +1,4 @@
-// These types were generated by @balena/abstract-sql-to-typescript v5.1.5
+// These types were generated by @balena/abstract-sql-to-typescript v6.1.0
 
 import type { Types } from '@balena/abstract-sql-to-typescript';
 

package/src/webresource-handler/webresource.ts

@@ -1,4 +1,4 @@
-// These types were generated by @balena/abstract-sql-to-typescript v5.1.5
+// These types were generated by @balena/abstract-sql-to-typescript v6.1.0
 
 import type { Types } from '@balena/abstract-sql-to-typescript';