@baseplate-dev/project-builder-server 0.5.3 → 0.6.1

package/dist/compiler/backend/query-filter-compiler.d.ts

@@ -0,0 +1,40 @@
+import type { AuthorizerExpressionNode } from '@baseplate-dev/project-builder-lib';
+import type { GeneratorBundle } from '@baseplate-dev/sync';
+import type { BackendAppEntryBuilder } from '../app-entry-builder.js';
+/**
+ * Resolved information about a relation for nested query filter code generation.
+ */
+interface ResolvedNestedQueryFilter {
+    /** The Prisma relation field name (e.g., 'todoList') */
+    relationFieldName: string;
+    /** The foreign model name (e.g., 'TodoList') */
+    foreignModelName: string;
+    /** The foreign query filter variable name (e.g., 'todoListQueryFilter') */
+    foreignQueryFilterVar: string;
+}
+/**
+ * Context for generating query filter expression code with relation resolution.
+ */
+interface QueryFilterCodeContext {
+    /** Map of relation name → resolved nested query filter info */
+    resolvedFilters: Map<string, ResolvedNestedQueryFilter>;
+}
+/**
+ * Generate TypeScript code from an authorizer expression AST node,
+ * producing a Prisma where clause instead of a boolean check.
+ *
+ * - `model.field === userId` → `{ field: ctx.auth.userId }`
+ * - `hasRole('admin')` → `ctx.auth.hasRole('admin')` (boolean → true/false)
+ * - `hasSomeRole([...])` → `ctx.auth.hasSomeRole([...])` (boolean)
+ * - `A || B` → `queryHelpers.or([A, B])`
+ * - `A && B` → `queryHelpers.and([A, B])`
+ */
+export declare function generateQueryFilterExpressionCode(node: AuthorizerExpressionNode, codeContext?: QueryFilterCodeContext): string;
+/**
+ * Build model query filter generators for all models in a feature
+ * that have authorizer roles. Every model with authorizer roles gets a query
+ * filter so it can be referenced by nested expressions from other models.
+ */
+export declare function buildQueryFiltersForFeature(appBuilder: BackendAppEntryBuilder, featureId: string): GeneratorBundle[];
+export {};
+//# sourceMappingURL=query-filter-compiler.d.ts.map

package/dist/compiler/backend/query-filter-compiler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-filter-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/backend/query-filter-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,wBAAwB,EAGzB,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAS3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AAEtE;;GAEG;AACH,UAAU,yBAAyB;IACjC,wDAAwD;IACxD,iBAAiB,EAAE,MAAM,CAAC;IAC1B,gDAAgD;IAChD,gBAAgB,EAAE,MAAM,CAAC;IACzB,2EAA2E;IAC3E,qBAAqB,EAAE,MAAM,CAAC;CAC/B;AAED;;GAEG;AACH,UAAU,sBAAsB;IAC9B,+DAA+D;IAC/D,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC;CACzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,iCAAiC,CAC/C,IAAI,EAAE,wBAAwB,EAC9B,WAAW,CAAC,EAAE,sBAAsB,GACnC,MAAM,CAgCR;AAwKD;;;;GAIG;AACH,wBAAgB,2BAA2B,CACzC,UAAU,EAAE,sBAAsB,EAClC,SAAS,EAAE,MAAM,GAChB,eAAe,EAAE,CAanB"}

package/dist/compiler/backend/query-filter-compiler.js

@@ -0,0 +1,168 @@
+import { prismaModelQueryFilterGenerator } from '@baseplate-dev/fastify-generators';
+import { ModelUtils, parseAuthorizerExpression, } from '@baseplate-dev/project-builder-lib';
+import { lowercaseFirstChar } from '@baseplate-dev/utils';
+/**
+ * Generate TypeScript code from an authorizer expression AST node,
+ * producing a Prisma where clause instead of a boolean check.
+ *
+ * - `model.field === userId` → `{ field: ctx.auth.userId }`
+ * - `hasRole('admin')` → `ctx.auth.hasRole('admin')` (boolean → true/false)
+ * - `hasSomeRole([...])` → `ctx.auth.hasSomeRole([...])` (boolean)
+ * - `A || B` → `queryHelpers.or([A, B])`
+ * - `A && B` → `queryHelpers.and([A, B])`
+ */
+export function generateQueryFilterExpressionCode(node, codeContext) {
+    switch (node.type) {
+        case 'fieldComparison': {
+            return generateFieldComparisonWhereCode(node.left, node.right);
+        }
+        case 'hasRole': {
+            return `ctx.auth.hasRole('${node.role}')`;
+        }
+        case 'hasSomeRole': {
+            const roles = node.roles.map((r) => `'${r}'`).join(', ');
+            return `ctx.auth.hasSomeRole([${roles}])`;
+        }
+        case 'isAuthenticated': {
+            return 'ctx.auth.isAuthenticated';
+        }
+        case 'nestedHasRole': {
+            const resolved = getResolvedQueryFilter(codeContext, node.relationName);
+            const roles = `'${node.role}'`;
+            return `${resolved.foreignQueryFilterVar}.buildNestedWhere(ctx, '${resolved.relationFieldName}', [${roles}])`;
+        }
+        case 'nestedHasSomeRole': {
+            const resolved = getResolvedQueryFilter(codeContext, node.relationName);
+            const roles = node.roles.map((r) => `'${r}'`).join(', ');
+            return `${resolved.foreignQueryFilterVar}.buildNestedWhere(ctx, '${resolved.relationFieldName}', [${roles}])`;
+        }
+        case 'binaryLogical': {
+            const left = generateQueryFilterExpressionCode(node.left, codeContext);
+            const right = generateQueryFilterExpressionCode(node.right, codeContext);
+            const helper = node.operator === '||' ? 'or' : 'and';
+            return `queryHelpers.${helper}([${left}, ${right}])`;
+        }
+    }
+}
+/**
+ * Get the resolved query filter info from the code context, throwing if not found.
+ */
+function getResolvedQueryFilter(codeContext, relationName) {
+    if (!codeContext) {
+        throw new Error(`Nested query filter expression references relation '${relationName}' but no code context was provided`);
+    }
+    const resolved = codeContext.resolvedFilters.get(relationName);
+    if (!resolved) {
+        throw new Error(`Nested query filter expression references relation '${relationName}' which was not resolved`);
+    }
+    return resolved;
+}
+/**
+ * Generate a Prisma where clause from a field comparison.
+ *
+ * In a field comparison one side is always a model field and the other
+ * is an auth field. We produce `{ modelField: ctx.auth.authField }`.
+ */
+function generateFieldComparisonWhereCode(left, right) {
+    const modelNode = left.source === 'model' ? left : right;
+    const authNode = left.source === 'auth' ? left : right;
+    const authExpr = `ctx.auth.${authNode.field}`;
+    return `(${authExpr} != null ? { ${modelNode.field}: ${authExpr} } : false)`;
+}
+/**
+ * Resolve relation info for nested query filter expressions on a model.
+ * Unlike authorizer resolution which needs the local FK field, query filters
+ * need the Prisma relation field name for nested where clauses.
+ */
+function resolveNestedQueryFilters(appBuilder, model, nestedRoleRefs) {
+    const resolvedFilters = new Map();
+    const foreignModelNames = [];
+    for (const { relationName } of nestedRoleRefs) {
+        if (resolvedFilters.has(relationName)) {
+            continue;
+        }
+        const relation = model.model.relations.find((r) => r.name === relationName);
+        if (!relation) {
+            throw new Error(`Relation '${relationName}' not found on model '${model.name}'`);
+        }
+        const foreignModel = ModelUtils.byIdOrThrow(appBuilder.projectDefinition, relation.modelRef);
+        const foreignModelName = foreignModel.name;
+        const foreignQueryFilterVar = `${lowercaseFirstChar(foreignModelName)}QueryFilter`;
+        resolvedFilters.set(relationName, {
+            relationFieldName: relationName,
+            foreignModelName,
+            foreignQueryFilterVar,
+        });
+        if (!foreignModelNames.includes(foreignModelName)) {
+            foreignModelNames.push(foreignModelName);
+        }
+    }
+    return { resolvedFilters, foreignModelNames };
+}
+/**
+ * Build a query filter generator for a single model given its roles and
+ * optional foreign query filter model names.
+ */
+function buildQueryFilterForModel(appBuilder, model, roleRefs) {
+    const { authorizer } = model;
+    // Collect all nested role refs across all referenced roles
+    const allNestedRoleRefs = [];
+    const parsedRoles = roleRefs.map((roleRef) => {
+        const authRole = authorizer.roles.find((r) => r.id === roleRef || r.name === roleRef);
+        if (!authRole) {
+            throw new Error(`Instance role '${roleRef}' not found in model '${model.name}' authorizer roles.`);
+        }
+        const parsed = parseAuthorizerExpression(authRole.expression);
+        allNestedRoleRefs.push(...parsed.nestedRoleRefs);
+        return { authRole, parsed };
+    });
+    // Resolve relation info if there are nested refs
+    const { resolvedFilters, foreignModelNames } = allNestedRoleRefs.length > 0
+        ? resolveNestedQueryFilters(appBuilder, model, allNestedRoleRefs)
+        : {
+            resolvedFilters: new Map(),
+            foreignModelNames: [],
+        };
+    const codeContext = resolvedFilters.size > 0 ? { resolvedFilters } : undefined;
+    const roles = parsedRoles.map(({ authRole, parsed }) => {
+        const expressionCode = generateQueryFilterExpressionCode(parsed.ast, codeContext);
+        // Wrap object literals in parens to avoid arrow function body ambiguity
+        const wrappedCode = expressionCode.startsWith('{')
+            ? `(${expressionCode})`
+            : expressionCode;
+        return {
+            name: authRole.name,
+            roleCode: `(ctx) => ${wrappedCode}`,
+            foreignQueryFilterRefs: [
+                ...new Set(parsed.nestedRoleRefs
+                    .map((ref) => resolvedFilters.get(ref.relationName)?.foreignModelName)
+                    .filter((n) => n != null)),
+            ],
+            needsQueryHelpers: parsed.ast.type === 'binaryLogical',
+        };
+    });
+    return {
+        bundle: prismaModelQueryFilterGenerator({
+            modelName: model.name,
+            foreignQueryFilterModelNames: foreignModelNames,
+            roles,
+        }),
+        foreignModelNames,
+    };
+}
+/**
+ * Build model query filter generators for all models in a feature
+ * that have authorizer roles. Every model with authorizer roles gets a query
+ * filter so it can be referenced by nested expressions from other models.
+ */
+export function buildQueryFiltersForFeature(appBuilder, featureId) {
+    const models = ModelUtils.getModelsForFeature(appBuilder.projectDefinition, featureId);
+    return models
+        .filter((model) => model.authorizer.roles.length > 0)
+        .map((model) => {
+        const roleRefs = model.authorizer.roles.map((r) => r.name);
+        const { bundle } = buildQueryFilterForModel(appBuilder, model, roleRefs);
+        return bundle;
+    });
+}
+//# sourceMappingURL=query-filter-compiler.js.map

package/dist/compiler/backend/query-filter-compiler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-filter-compiler.js","sourceRoot":"","sources":["../../../src/compiler/backend/query-filter-compiler.ts"],"names":[],"mappings":"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"}

package/dist/compiler/backend/services.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../src/compiler/backend/services.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAgB3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AA4FtE,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,sBAAsB,EAClC,SAAS,EAAE,MAAM,GAChB,eAAe,EAAE,CAcnB"}
+{"version":3,"file":"services.d.ts","sourceRoot":"","sources":["../../../src/compiler/backend/services.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAiB3D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AA2HtE,wBAAgB,uBAAuB,CACrC,UAAU,EAAE,sBAAsB,EAClC,SAAS,EAAE,MAAM,GAChB,eAAe,EAAE,CAcnB"}

package/dist/compiler/backend/services.js

@@ -1,5 +1,5 @@
 import { prismaDataCreateGenerator, prismaDataDeleteGenerator, prismaDataServiceGenerator, prismaDataUpdateGenerator, serviceFileGenerator, } from '@baseplate-dev/fastify-generators';
-import { modelTransformerCompilerSpec, ModelUtils, } from '@baseplate-dev/project-builder-lib';
+import { authConfigSpec, modelTransformerCompilerSpec, ModelUtils, } from '@baseplate-dev/project-builder-lib';
 import { notEmpty, uppercaseFirstChar } from '@baseplate-dev/utils';
 import { kebabCase } from 'change-case';
 function buildVirtualInputField(appBuilder, transformer, model) {
@@ -14,10 +14,18 @@ function buildVirtualInputField(appBuilder, transformer, model) {
         model,
     });
 }
+function mapRoleIds(appBuilder, roles) {
+    if (roles.length === 0) {
+        return undefined;
+    }
+    return roles.map((r) => appBuilder.nameFromId(r));
+}
 function buildDataServiceForModel(appBuilder, model) {
     if (!ModelUtils.hasService(model)) {
         return undefined;
     }
+    const authConfig = appBuilder.definitionContainer.pluginStore.use(authConfigSpec);
+    const isAuthEnabled = !!authConfig.getAuthConfig(appBuilder.projectDefinition);
     const createFields = model.service.create.enabled
         ? (model.service.create.fields?.map((f) => appBuilder.nameFromId(f)) ?? [])
         : [];
@@ -45,6 +53,9 @@ function buildDataServiceForModel(appBuilder, model) {
                                 ...createFields,
                                 ...(model.service.create.transformerNames?.map((t) => appBuilder.nameFromId(t)) ?? []),
                             ],
+                            globalRoles: isAuthEnabled
+                                ? mapRoleIds(appBuilder, model.service.create.globalRoles)
+                                : undefined,
                         })
                         : undefined,
                     $update: updateFields.length > 0
@@ -55,12 +66,24 @@ function buildDataServiceForModel(appBuilder, model) {
                                 ...updateFields,
                                 ...(model.service.update.transformerNames?.map((t) => appBuilder.nameFromId(t)) ?? []),
                             ],
+                            globalRoles: isAuthEnabled
+                                ? mapRoleIds(appBuilder, model.service.update.globalRoles)
+                                : undefined,
+                            instanceRoles: isAuthEnabled
+                                ? mapRoleIds(appBuilder, model.service.update.instanceRoles)
+                                : undefined,
                         })
                         : undefined,
                     $delete: model.service.delete.enabled
                         ? prismaDataDeleteGenerator({
                             name: `delete${uppercaseFirstChar(model.name)}`,
                             modelName: model.name,
+                            globalRoles: isAuthEnabled
+                                ? mapRoleIds(appBuilder, model.service.delete.globalRoles)
+                                : undefined,
+                            instanceRoles: isAuthEnabled
+                                ? mapRoleIds(appBuilder, model.service.delete.instanceRoles)
+                                : undefined,
                         })
                         : undefined,
                 },

package/dist/compiler/backend/services.js.map

@@ -1 +1 @@
-{"version":3,"file":"services.js","sourceRoot":"","sources":["../../../src/compiler/backend/services.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"services.js","sourceRoot":"","sources":["../../../src/compiler/backend/services.ts"],"names":[],"mappings":"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"}

package/dist/compiler/index.d.ts

@@ -1,4 +1,5 @@
 export { compilePackages } from './compile-packages.js';
 export * from './library/index.js';
+export type { PackageEntry } from './package-entry.js';
 export * from './root/index.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/compiler/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compiler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/compiler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,cAAc,oBAAoB,CAAC;AACnC,YAAY,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACvD,cAAc,iBAAiB,CAAC"}

package/dist/compiler/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/compiler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/compiler/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,cAAc,oBAAoB,CAAC;AAEnC,cAAc,iBAAiB,CAAC"}

package/dist/compiler/root/root-package-compiler.js

@@ -104,16 +104,16 @@ export class RootPackageCompiler extends PackageCompiler {
                 'baseplate:serve': 'baseplate serve',
                 'baseplate:generate': 'baseplate generate',
                 'prettier:check:root': `prettier --check . "!${appsFolder}/**" "!${librariesFolder}/**"`,
-                'prettier:write:root': `prettier --write . "!${appsFolder}/**" "!${librariesFolder}/**"`,
+                'prettier:write:root': `prettier --write --list-different . "!${appsFolder}/**" "!${librariesFolder}/**"`,
             },
             additionalPackages: {
                 dev: {
-                    // only include the project-builder-cli package if the project is not an internal example
-                    ...(this.definitionContainer.parserContext.project.isInternalExample
-                        ? {}
-                        : {
+                    // only include the project-builder-cli package for user projects (not examples or tests)
+                    ...(this.definitionContainer.parserContext.project.type === 'user'
+                        ? {
                             '@baseplate-dev/project-builder-cli': cliVersion,
-                        }),
+                        }
+                        : {}),
                     // Include Typescript to allow tsconfig plugins like gql.tada to be used
                     typescript: CORE_PACKAGES.typescript,
                 },

package/dist/compiler/root/root-package-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"root-package-compiler.js","sourceRoot":"","sources":["../../../src/compiler/root/root-package-compiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"root-package-compiler.js","sourceRoot":"","sources":["../../../src/compiler/root/root-package-compiler.ts"],"names":[],"mappings":"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"}

package/dist/compiler/web/admin/crud/index.js

@@ -72,7 +72,7 @@ export function compileAdminCrudSection(crudSection, builder, parentId) {
                         disableCreate,
                         children: {
                             columns: crudSection.table.columns.map((column, idx) => compileAdminCrudColumn(column, crudSection.modelRef, builder, crudSection, idx)),
-                            actions: crudSection.table.actions?.map((action, idx) => compileAdminCrudAction(action, crudSection.modelRef, builder, crudSection, idx)),
+                            actions: crudSection.table.actions.map((action, idx) => compileAdminCrudAction(action, crudSection.modelRef, builder, crudSection, idx)),
                         },
                     }),
                 },

package/dist/compiler/web/admin/crud/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/index.ts"],"names":[],"mappings":"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"}

package/dist/compiler/web/admin/index.js

@@ -2,7 +2,7 @@ import { compileAdminFeatures } from './sections.js';
 // Export the admin features compilation for use by the web compiler
 export function compileAdminSections(builder) {
     const { adminApp } = builder.appConfig;
-    if (!adminApp?.enabled) {
+    if (!adminApp.enabled) {
         return undefined;
     }
     return compileAdminFeatures(builder);

package/dist/compiler/web/admin/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/compiler/web/admin/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,oEAAoE;AACpE,MAAM,UAAU,oBAAoB,CAClC,OAAsC;IAEtC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;IAEvC,IAAI,CAAC,QAAQ,EAAE,OAAO,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/compiler/web/admin/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,oBAAoB,EAAE,MAAM,eAAe,CAAC;AAErD,oEAAoE;AACpE,MAAM,UAAU,oBAAoB,CAClC,OAAsC;IAEtC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,SAAS,CAAC;IAEvC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC;QACtB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,oBAAoB,CAAC,OAAO,CAAC,CAAC;AACvC,CAAC"}

package/dist/compiler/web/admin/sections.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sections.d.ts","sourceRoot":"","sources":["../../../../src/compiler/web/admin/sections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAM3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AA6ElE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,GACrC,eAAe,EAAE,CAOnB"}
+{"version":3,"file":"sections.d.ts","sourceRoot":"","sources":["../../../../src/compiler/web/admin/sections.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oCAAoC,CAAC;AACvE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAM3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AA2ElE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,GACrC,eAAe,EAAE,CAOnB"}

package/dist/compiler/web/admin/sections.js

@@ -4,8 +4,8 @@ import { notEmpty } from '@baseplate-dev/utils';
 import { compileAdminCrudSection } from './crud/index.js';
 function compileAdminSections(featureId, builder, sectionsId) {
     const { adminApp } = builder.appConfig;
-    const sections = adminApp?.sections?.filter((s) => s.featureRef === featureId);
-    if (!sections?.length) {
+    const sections = adminApp.sections.filter((s) => s.featureRef === featureId);
+    if (sections.length === 0) {
         return undefined;
     }
     return sections.map((section) => {

package/dist/compiler/web/admin/sections.js.map

@@ -1 +1 @@
-{"version":3,"file":"sections.js","sourceRoot":"","sources":["../../../../src/compiler/web/admin/sections.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sections.js","sourceRoot":"","sources":["../../../../src/compiler/web/admin/sections.ts"],"names":[],"mappings":"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"}

package/dist/compiler/web/web-compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"web-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/web/web-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACb,MAAM,oCAAoC,CAAC;AAkC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAuIjD;;;;;;;;;GASG;AACH,qBAAa,kBAAmB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/D,OAAO,IAAI,YAAY;IAwBvB,QAAQ,IAAI,YAAY;CAOzB"}
+{"version":3,"file":"web-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/web/web-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACb,MAAM,oCAAoC,CAAC;AAkC5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAsIjD;;;;;;;;;GASG;AACH,qBAAa,kBAAmB,SAAQ,WAAW,CAAC,YAAY,CAAC;IAC/D,OAAO,IAAI,YAAY;IAwBvB,QAAQ,IAAI,YAAY;CAOzB"}

package/dist/compiler/web/web-compiler.js

@@ -16,7 +16,7 @@ import { compileWebFeatures } from './features.js';
 function buildAdminNavigationLinks(builder) {
     const { adminApp } = builder.appConfig;
     const { projectDefinition } = builder;
-    if (!adminApp?.enabled || !adminApp.sections) {
+    if (!adminApp.enabled) {
         return [];
     }
     return adminApp.sections.map((section) => ({
@@ -35,7 +35,7 @@ function buildAdminNavigationLinks(builder) {
 function buildAdminRoutes(builder) {
     const { adminApp } = builder.appConfig;
     const { definitionContainer } = builder;
-    if (!adminApp?.enabled) {
+    if (!adminApp.enabled) {
         return undefined;
     }
     return reactRoutesGenerator({
@@ -54,7 +54,7 @@ function buildAdminRoutes(builder) {
                     },
                     ...buildAdminNavigationLinks(builder),
                 ],
-                requiredRoles: adminApp.allowedRoles?.map((roleId) => definitionContainer.nameFromId(roleId)) ?? [],
+                requiredRoles: adminApp.allowedRoles.map((roleId) => definitionContainer.nameFromId(roleId)),
             }),
             admin: adminHomeGenerator({}),
             routes: compileAdminSections(builder),
@@ -97,7 +97,7 @@ function buildReact(builder, devWebPort) {
                 },
             }),
             apolloError: apolloErrorGenerator({}),
-            ...(appConfig.adminApp?.enabled
+            ...(appConfig.adminApp.enabled
                 ? { adminComponents: adminComponentsGenerator({}) }
                 : {}),
         },

package/dist/compiler/web/web-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-compiler.js","sourceRoot":"","sources":["../../../src/compiler/web/web-compiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-compiler.js","sourceRoot":"","sources":["../../../src/compiler/web/web-compiler.ts"],"names":[],"mappings":"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"}

package/dist/core-modules/admin-crud-column-compiler.js

@@ -12,7 +12,7 @@ const adminCrudTextColumnCompiler = {
 const adminCrudForeignColumnCompiler = {
     name: 'foreign',
     compileColumn: (column, { definitionContainer, model, order }) => {
-        const relation = model.model.relations?.find((r) => r.id === column.localRelationRef);
+        const relation = model.model.relations.find((r) => r.id === column.localRelationRef);
         const localRelationName = definitionContainer.nameFromId(column.localRelationRef);
         if (!relation) {
             throw new Error(`Could not find relation ${localRelationName} in model ${model.name}`);

package/dist/core-modules/admin-crud-column-compiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"admin-crud-column-compiler.js","sourceRoot":"","sources":["../../src/core-modules/admin-crud-column-compiler.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,eAAe,EACf,UAAU,GACX,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,+BAA+B,EAC/B,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,2BAA2B,GAC/B;IACE,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CACjC,4BAA4B,CAAC;QAC3B,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAChD,MAAM,CAAC,aAAa,CACrB;KACF,CAAC;CACL,CAAC;AAEJ,MAAM,8BAA8B,GAClC;IACE,IAAI,EAAE,SAAS;IACf,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;QAC/D,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,EAAE,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,gBAAgB,CACxC,CAAC;QACF,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,UAAU,CACtD,MAAM,CAAC,gBAAgB,CACxB,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACb,2BAA2B,iBAAiB,aAAa,KAAK,CAAC,IAAI,EAAE,CACtE,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,oBAAoB,GAAG,UAAU,CAAC,WAAW,CACjD,mBAAmB,CAAC,UAAU,EAC9B,QAAQ,CAAC,QAAQ,CAClB,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACtC,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CACpC,CAAC;QAEF,OAAO,+BAA+B,CAAC;YACrC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK;YACL,YAAY,EAAE,iBAAiB;YAC/B,oBAAoB;YACpB,UAAU,EAAE,eAAe,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC/D,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;IAC1D,IAAI,EAAE,4BAA4B;IAClC,YAAY,EAAE;QACZ,uBAAuB,EAAE,2BAA2B;KACrD;IACD,UAAU,EAAE,CAAC,EAAE,uBAAuB,EAAE,EAAE,EAAE;QAC1C,uBAAuB,CAAC,OAAO,CAAC,OAAO,CAAC;YACtC,2BAA2B;YAC3B,8BAA8B;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC"}
+{"version":3,"file":"admin-crud-column-compiler.js","sourceRoot":"","sources":["../../src/core-modules/admin-crud-column-compiler.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,2BAA2B,EAC3B,kBAAkB,EAClB,eAAe,EACf,UAAU,GACX,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,+BAA+B,EAC/B,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AAEzC,MAAM,2BAA2B,GAC/B;IACE,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CACjC,4BAA4B,CAAC;QAC3B,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,KAAK,EAAE,OAAO,CAAC,KAAK;QACpB,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAChD,MAAM,CAAC,aAAa,CACrB;KACF,CAAC;CACL,CAAC;AAEJ,MAAM,8BAA8B,GAClC;IACE,IAAI,EAAE,SAAS;IACf,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;QAC/D,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CACzC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAC,gBAAgB,CACxC,CAAC;QACF,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,UAAU,CACtD,MAAM,CAAC,gBAAgB,CACxB,CAAC;QAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,KAAK,CACb,2BAA2B,iBAAiB,aAAa,KAAK,CAAC,IAAI,EAAE,CACtE,CAAC;QACJ,CAAC;QAED,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACrC,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QAED,MAAM,oBAAoB,GAAG,UAAU,CAAC,WAAW,CACjD,mBAAmB,CAAC,UAAU,EAC9B,QAAQ,CAAC,QAAQ,CAClB,CAAC,KAAK,CAAC,mBAAmB,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACtC,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,CACpC,CAAC;QAEF,OAAO,+BAA+B,CAAC;YACrC,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK;YACL,YAAY,EAAE,iBAAiB;YAC/B,oBAAoB;YACpB,UAAU,EAAE,eAAe,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC/D,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;IACL,CAAC;CACF,CAAC;AAEJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,kBAAkB,CAAC;IAC1D,IAAI,EAAE,4BAA4B;IAClC,YAAY,EAAE;QACZ,uBAAuB,EAAE,2BAA2B;KACrD;IACD,UAAU,EAAE,CAAC,EAAE,uBAAuB,EAAE,EAAE,EAAE;QAC1C,uBAAuB,CAAC,OAAO,CAAC,OAAO,CAAC;YACtC,2BAA2B;YAC3B,8BAA8B;SAC/B,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC"}

package/dist/core-modules/admin-crud-input-compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"admin-crud-input-compiler.d.ts","sourceRoot":"","sources":["../../src/core-modules/admin-crud-input-compiler.ts"],"names":[],"mappings":"AAoPA,eAAO,MAAM,wBAAwB;;EAenC,CAAC"}
+{"version":3,"file":"admin-crud-input-compiler.d.ts","sourceRoot":"","sources":["../../src/core-modules/admin-crud-input-compiler.ts"],"names":[],"mappings":"AAuQA,eAAO,MAAM,wBAAwB;;EAenC,CAAC"}

package/dist/core-modules/admin-crud-input-compiler.js

@@ -9,7 +9,7 @@ const adminEnumInputCompiler = {
         }
         const enumBlock = EnumUtils.byId(definitionContainer.definition, fieldConfig.options.enumRef);
         if (!enumBlock) {
-            throw new Error(`Could not find enum type ${fieldConfig.options.enumRef ?? ''}`);
+            throw new Error(`Could not find enum type ${fieldConfig.options.enumRef}`);
         }
         const fieldName = definitionContainer.nameFromId(definition.modelFieldRef);
         return adminCrudEnumInputGenerator({
@@ -24,10 +24,14 @@ const adminEnumInputCompiler = {
         });
     },
 };
+function isFieldOptionalByName(model, fieldName) {
+    const field = model.model.fields.find((f) => f.name === fieldName);
+    return field?.isOptional ?? false;
+}
 const adminForeignInputCompiler = {
     name: 'foreign',
     compileInput: (definition, { order, definitionContainer, model }) => {
-        const relation = model.model.relations?.find((r) => r.id === definition.localRelationRef);
+        const relation = model.model.relations.find((r) => r.id === definition.localRelationRef);
         if (!relation) {
             throw new Error(`Could not find relation ${definition.localRelationRef} in model ${model.name}`);
         }
@@ -40,6 +44,10 @@ const adminForeignInputCompiler = {
             (localFieldType !== 'string' && localFieldType !== 'uuid')) {
             throw new Error(`Only string and uuid primary keys are supported for foreign inputs`);
         }
+        // Only pass defaultLabel if the label field is actually nullable on the
+        // foreign model, so the generated code won't produce an unnecessary `??`.
+        const foreignModel = ModelUtils.byIdOrThrow(definitionContainer.definition, relation.modelRef);
+        const isLabelFieldOptional = isFieldOptionalByName(foreignModel, definition.labelExpression);
         return adminCrudForeignInputGenerator({
             order,
             label: definition.label,
@@ -50,7 +58,9 @@ const adminForeignInputCompiler = {
             labelExpression: definition.labelExpression,
             valueExpression: definition.valueExpression,
             valueType: localFieldType,
-            defaultLabel: definition.defaultLabel,
+            defaultLabel: isLabelFieldOptional
+                ? definition.defaultLabel
+                : undefined,
             nullLabel: definition.nullLabel,
         });
     },