Merge pull request #214 from zenstackhq/dev

merge dev to main (v3.0.0-alpha.33)

Author: ymc9

package.json

@@ -1,6 +1,6 @@
 {
     "name": "zenstack-v3",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "description": "ZenStack",
     "packageManager": "[email protected]",
     "scripts": {

packages/cli/package.json

@@ -3,7 +3,7 @@
     "publisher": "zenstack",
     "displayName": "ZenStack CLI",
     "description": "FullStack database toolkit with built-in access control and automatic API generation.",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "type": "module",
     "author": {
         "name": "ZenStack Team"

packages/common-helpers/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/common-helpers",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "description": "ZenStack Common Helpers",
     "type": "module",
     "scripts": {

packages/create-zenstack/package.json

@@ -1,6 +1,6 @@
 {
     "name": "create-zenstack",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "description": "Create a new ZenStack project",
     "type": "module",
     "scripts": {

packages/dialects/sql.js/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/kysely-sql-js",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "description": "Kysely dialect for sql.js",
     "type": "module",
     "scripts": {

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/eslint-config",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "type": "module",
     "private": true,
     "license": "MIT"

packages/ide/vscode/package.json

@@ -1,7 +1,7 @@
 {
     "name": "zenstack",
     "publisher": "zenstack",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "displayName": "ZenStack Language Tools",
     "description": "VSCode extension for ZenStack ZModel language",
     "private": true,

packages/language/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@zenstackhq/language",
     "description": "ZenStack ZModel language specification",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "license": "MIT",
     "author": "ZenStack Team",
     "files": [

packages/runtime/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@zenstackhq/runtime",
-    "version": "3.0.0-alpha.32",
+    "version": "3.0.0-alpha.33",
     "description": "ZenStack Runtime",
     "type": "module",
     "scripts": {

packages/runtime/src/client/crud/dialects/base.ts

@@ -2,7 +2,7 @@ import { invariant, isPlainObject } from '@zenstackhq/common-helpers';
 import type { Expression, ExpressionBuilder, ExpressionWrapper, SqlBool, ValueNode } from 'kysely';
 import { expressionBuilder, sql, type SelectQueryBuilder } from 'kysely';
 import { match, P } from 'ts-pattern';
-import type { BuiltinType, DataSourceProviderType, FieldDef, GetModels, SchemaDef } from '../../../schema';
+import type { BuiltinType, DataSourceProviderType, FieldDef, GetModels, ModelDef, SchemaDef } from '../../../schema';
 import { enumerate } from '../../../utils/enumerate';
 import type { OrArray } from '../../../utils/type-utils';
 import { AGGREGATE_OPERATORS, DELEGATE_JOINED_FIELD_PREFIX, LOGICAL_COMBINATORS } from '../../constants';
@@ -963,6 +963,31 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
         return result;
     }
 
+    protected buildModelSelect(
+        eb: ExpressionBuilder<any, any>,
+        model: GetModels<Schema>,
+        subQueryAlias: string,
+        payload: true | FindArgs<Schema, GetModels<Schema>, true>,
+        selectAllFields: boolean,
+    ) {
+        let subQuery = this.buildSelectModel(eb, model, subQueryAlias);
+
+        if (selectAllFields) {
+            subQuery = this.buildSelectAllFields(
+                model,
+                subQuery,
+                typeof payload === 'object' ? payload?.omit : undefined,
+                subQueryAlias,
+            );
+        }
+
+        if (payload && typeof payload === 'object') {
+            subQuery = this.buildFilterSortTake(model, payload, subQuery, subQueryAlias);
+        }
+
+        return subQuery;
+    }
+
     buildSelectField(
         query: SelectQueryBuilder<any, any, any>,
         model: string,
@@ -1115,6 +1140,35 @@ export abstract class BaseCrudDialect<Schema extends SchemaDef> {
         return buildFieldRef(this.schema, model, field, this.options, eb, modelAlias, inlineComputedField);
     }
 
+    protected canJoinWithoutNestedSelect(
+        modelDef: ModelDef,
+        payload: boolean | FindArgs<Schema, GetModels<Schema>, true>,
+    ) {
+        if (modelDef.computedFields) {
+            // computed fields requires explicit select
+            return false;
+        }
+
+        if (modelDef.baseModel || modelDef.isDelegate) {
+            // delegate models require upward/downward joins
+            return false;
+        }
+
+        if (
+            typeof payload === 'object' &&
+            (payload.orderBy ||
+                payload.skip !== undefined ||
+                payload.take !== undefined ||
+                payload.cursor ||
+                (payload as any).distinct)
+        ) {
+            // ordering/pagination/distinct needs to be handled before joining
+            return false;
+        }
+
+        return true;
+    }
+
     // #endregion
 
     // #region abstract methods