@baseplate-dev/project-builder-server 0.4.4 → 0.5.1

package/dist/compiler/compile-packages.js

@@ -1,6 +1,7 @@
 import { ProjectDefinitionContainer } from '@baseplate-dev/project-builder-lib';
 import { sortBy } from 'es-toolkit';
 import { BackendPackageCompiler } from './backend/index.js';
+import { createLibraryCompilerFromSpec } from './library/index.js';
 import { RootPackageCompiler } from './root/index.js';
 import { WebPackageCompiler } from './web/index.js';
 /**
@@ -26,11 +27,11 @@ function createAppCompiler(definitionContainer, app) {
 /**
  * Compile all packages in a project definition
  *
- * Root package is compiled first, then backend apps, then other apps.
+ * Root package is compiled first, then backend apps, then other apps, then library packages.
  *
  * @param projectJson - Serialized project definition JSON
  * @param context - Schema parser context
- * @returns Array of compiled package entries with generator bundles (root first, then apps)
+ * @returns Array of compiled package entries with generator bundles (root first, then apps, then libraries)
  */
 export function compilePackages(projectJson, context) {
     const definitionContainer = ProjectDefinitionContainer.fromSerializedConfig(projectJson, context);
@@ -38,10 +39,15 @@ export function compilePackages(projectJson, context) {
         (a) => (a.type === 'backend' ? 0 : 1),
         (a) => a.name,
     ]);
+    // Get libraries sorted by name
+    const libraryConfigs = sortBy(definitionContainer.definition.libraries, [
+        (lib) => lib.name,
+    ]);
     // Instantiate all package compilers
     const compilers = [
         new RootPackageCompiler(definitionContainer),
         ...appConfigs.map((app) => createAppCompiler(definitionContainer, app)),
+        ...libraryConfigs.map((lib) => createLibraryCompilerFromSpec(definitionContainer, lib)),
     ];
     const compilerContext = {
         compilers,

package/dist/compiler/compile-packages.js.map

@@ -1 +1 @@
-{"version":3,"file":"compile-packages.js","sourceRoot":"","sources":["../../src/compiler/compile-packages.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAQpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD;;;;;;GAMG;AACH,SAAS,iBAAiB,CACxB,mBAA+C,EAC/C,GAAc;IAEd,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,OAAO,IAAI,sBAAsB,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,OAAO,IAAI,kBAAkB,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,qBAAsB,GAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAC7B,WAAoB,EACpB,OAA4B;IAE5B,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,oBAAoB,CACzE,WAAW,EACX,OAAO,CACR,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE;QAC7D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;KACd,CAAC,CAAC;IAEH,oCAAoC;IACpC,MAAM,SAAS,GAAG;QAChB,IAAI,mBAAmB,CAAC,mBAAmB,CAAC;QAC5C,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;KACxE,CAAC;IAEF,MAAM,eAAe,GAA2B;QAC9C,SAAS;KACV,CAAC;IAEF,uBAAuB;IACvB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC1C,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAClC,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"compile-packages.js","sourceRoot":"","sources":["../../src/compiler/compile-packages.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,0BAA0B,EAAE,MAAM,oCAAoC,CAAC;AAChF,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAIpC,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,6BAA6B,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEpD;;;;;;GAMG;AACH,SAAS,iBAAiB,CACxB,mBAA+C,EAC/C,GAAc;IAEd,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;QACjB,KAAK,SAAS,CAAC,CAAC,CAAC;YACf,OAAO,IAAI,sBAAsB,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,KAAK,CAAC,CAAC,CAAC;YACX,OAAO,IAAI,kBAAkB,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QAC1D,CAAC;QACD,OAAO,CAAC,CAAC,CAAC;YACR,MAAM,IAAI,KAAK,CAAC,qBAAsB,GAAiB,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAC7B,WAAoB,EACpB,OAA4B;IAE5B,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,oBAAoB,CACzE,WAAW,EACX,OAAO,CACR,CAAC;IAEF,MAAM,UAAU,GAAG,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,EAAE;QAC7D,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI;KACd,CAAC,CAAC;IAEH,+BAA+B;IAC/B,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,UAAU,CAAC,SAAS,EAAE;QACtE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI;KAClB,CAAC,CAAC;IAEH,oCAAoC;IACpC,MAAM,SAAS,GAAG;QAChB,IAAI,mBAAmB,CAAC,mBAAmB,CAAC;QAC5C,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,iBAAiB,CAAC,mBAAmB,EAAE,GAAG,CAAC,CAAC;QACvE,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAC5B,6BAA6B,CAAC,mBAAmB,EAAE,GAAG,CAAC,CACxD;KACF,CAAC;IAEF,MAAM,eAAe,GAA2B;QAC9C,SAAS;KACV,CAAC;IAEF,uBAAuB;IACvB,MAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAC1C,QAAQ,CAAC,OAAO,CAAC,eAAe,CAAC,CAClC,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/compiler/index.d.ts

@@ -1,3 +1,4 @@
 export { compilePackages } from './compile-packages.js';
+export * from './library/index.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,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,cAAc,iBAAiB,CAAC"}

package/dist/compiler/index.js

@@ -1,3 +1,4 @@
 export { compilePackages } from './compile-packages.js';
+export * from './library/index.js';
 export * from './root/index.js';
 //# sourceMappingURL=index.js.map

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,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;AACnC,cAAc,iBAAiB,CAAC"}

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

@@ -0,0 +1,3 @@
+export * from './library-compiler.js';
+export * from './node-library-package-compiler.js';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/compiler/library/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,oCAAoC,CAAC"}

package/dist/compiler/library/index.js

@@ -0,0 +1,3 @@
+export * from './library-compiler.js';
+export * from './node-library-package-compiler.js';
+//# sourceMappingURL=index.js.map

package/dist/compiler/library/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/compiler/library/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,oCAAoC,CAAC"}

package/dist/compiler/library/library-compiler.d.ts

@@ -0,0 +1,3 @@
+import type { BaseLibraryDefinition, PackageCompiler, ProjectDefinitionContainer } from '@baseplate-dev/project-builder-lib';
+export declare function createLibraryCompilerFromSpec(definitionContainer: ProjectDefinitionContainer, packageConfig: BaseLibraryDefinition): PackageCompiler;
+//# sourceMappingURL=library-compiler.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"library-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/library/library-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,qBAAqB,EACrB,eAAe,EACf,0BAA0B,EAC3B,MAAM,oCAAoC,CAAC;AAI5C,wBAAgB,6BAA6B,CAC3C,mBAAmB,EAAE,0BAA0B,EAC/C,aAAa,EAAE,qBAAqB,GACnC,eAAe,CAOjB"}

package/dist/compiler/library/library-compiler.js

@@ -0,0 +1,10 @@
+import { libraryTypeSpec } from '@baseplate-dev/project-builder-lib';
+export function createLibraryCompilerFromSpec(definitionContainer, packageConfig) {
+    const typeSpec = definitionContainer.pluginStore.use(libraryTypeSpec);
+    const compilerCreator = typeSpec.compilerCreators.get(packageConfig.type);
+    if (!compilerCreator) {
+        throw new Error(`Unknown library type: ${packageConfig.type}`);
+    }
+    return compilerCreator.createCompiler(definitionContainer, packageConfig);
+}
+//# sourceMappingURL=library-compiler.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"library-compiler.js","sourceRoot":"","sources":["../../../src/compiler/library/library-compiler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAErE,MAAM,UAAU,6BAA6B,CAC3C,mBAA+C,EAC/C,aAAoC;IAEpC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;IACtE,MAAM,eAAe,GAAG,QAAQ,CAAC,gBAAgB,CAAC,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC1E,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,yBAAyB,aAAa,CAAC,IAAI,EAAE,CAAC,CAAC;IACjE,CAAC;IACD,OAAO,eAAe,CAAC,cAAc,CAAC,mBAAmB,EAAE,aAAa,CAAC,CAAC;AAC5E,CAAC"}

package/dist/compiler/library/node-library-package-compiler.d.ts

@@ -0,0 +1,3 @@
+import type { LibraryCompilerCreator } from '@baseplate-dev/project-builder-lib';
+export declare const nodeLibraryCompilerCreator: LibraryCompilerCreator;
+//# sourceMappingURL=node-library-package-compiler.d.ts.map

package/dist/compiler/library/node-library-package-compiler.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-library-package-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/library/node-library-package-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,sBAAsB,EAEvB,MAAM,oCAAoC,CAAC;AAyC5C,eAAO,MAAM,0BAA0B,EAAE,sBAIxC,CAAC"}

package/dist/compiler/library/node-library-package-compiler.js

@@ -0,0 +1,32 @@
+import { composeNodeGenerator, nodeLibraryGenerator, vitestGenerator, } from '@baseplate-dev/core-generators';
+import { LibraryCompiler, nodeLibraryDefinitionSchemaEntry, } from '@baseplate-dev/project-builder-lib';
+class NodeLibraryPackageCompiler extends LibraryCompiler {
+    compile() {
+        const { packageConfig, definitionContainer } = this;
+        const projectDefinition = definitionContainer.definition;
+        const generalSettings = projectDefinition.settings.general;
+        const packageName = this.getPackageName();
+        const packageDirectory = this.getPackageDirectory();
+        const rootBundle = composeNodeGenerator({
+            name: `${generalSettings.name}-${packageConfig.name}`,
+            packageName,
+            description: `Library package for ${generalSettings.name}`,
+            version: '1.0.0',
+            children: {
+                library: nodeLibraryGenerator({ includePlaceholderIndexFile: true }),
+                vitest: vitestGenerator({ includeTestHelpers: false }),
+            },
+        });
+        return {
+            id: packageConfig.id,
+            name: packageConfig.name,
+            packageDirectory,
+            generatorBundle: rootBundle,
+        };
+    }
+}
+export const nodeLibraryCompilerCreator = {
+    name: nodeLibraryDefinitionSchemaEntry.name,
+    createCompiler: (definitionContainer, packageConfig) => new NodeLibraryPackageCompiler(definitionContainer, packageConfig),
+};
+//# sourceMappingURL=node-library-package-compiler.js.map

package/dist/compiler/library/node-library-package-compiler.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"node-library-package-compiler.js","sourceRoot":"","sources":["../../../src/compiler/library/node-library-package-compiler.ts"],"names":[],"mappings":"AAMA,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,eAAe,GAChB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EACL,eAAe,EACf,gCAAgC,GACjC,MAAM,oCAAoC,CAAC;AAE5C,MAAM,0BAA2B,SAAQ,eAAsC;IAC7E,OAAO;QACL,MAAM,EAAE,aAAa,EAAE,mBAAmB,EAAE,GAAG,IAAI,CAAC;QACpD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,UAAU,CAAC;QACzD,MAAM,eAAe,GAAG,iBAAiB,CAAC,QAAQ,CAAC,OAAO,CAAC;QAE3D,MAAM,WAAW,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1C,MAAM,gBAAgB,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QAEpD,MAAM,UAAU,GAAG,oBAAoB,CAAC;YACtC,IAAI,EAAE,GAAG,eAAe,CAAC,IAAI,IAAI,aAAa,CAAC,IAAI,EAAE;YACrD,WAAW;YACX,WAAW,EAAE,uBAAuB,eAAe,CAAC,IAAI,EAAE;YAC1D,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE;gBACR,OAAO,EAAE,oBAAoB,CAAC,EAAE,2BAA2B,EAAE,IAAI,EAAE,CAAC;gBACpE,MAAM,EAAE,eAAe,CAAC,EAAE,kBAAkB,EAAE,KAAK,EAAE,CAAC;aACvD;SACF,CAAC,CAAC;QAEH,OAAO;YACL,EAAE,EAAE,aAAa,CAAC,EAAE;YACpB,IAAI,EAAE,aAAa,CAAC,IAAI;YACxB,gBAAgB;YAChB,eAAe,EAAE,UAAU;SAC5B,CAAC;IACJ,CAAC;CACF;AAED,MAAM,CAAC,MAAM,0BAA0B,GAA2B;IAChE,IAAI,EAAE,gCAAgC,CAAC,IAAI;IAC3C,cAAc,EAAE,CAAC,mBAAmB,EAAE,aAAa,EAAE,EAAE,CACrD,IAAI,0BAA0B,CAAC,mBAAmB,EAAE,aAAa,CAAC;CACrE,CAAC"}

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

@@ -1,74 +1,5 @@
 import type { AppEntryType, BaseAppConfig, ProjectDefinitionContainer } from '@baseplate-dev/project-builder-lib';
-import type { PackageEntry } from './package-entry.js';
 import { AppEntryBuilder } from './app-entry-builder.js';
-export interface PackageTasks {
-    build: string[];
-    dev: string[];
-    watch: string[];
-}
-export interface PackageCompilerContext {
-    compilers: PackageCompiler[];
-}
-/**
- * Abstract base class for package type compilers
- *
- * Each package type (backend, web, library, etc.) extends this class
- * to define how it should be compiled into a PackageEntry with generator bundles.
- *
- * Each child class defines its own constructor requirements based on what
- * information it needs (e.g., app config, definition container).
- */
-export declare abstract class PackageCompiler {
-    protected readonly definitionContainer: ProjectDefinitionContainer;
-    constructor(definitionContainer: ProjectDefinitionContainer);
-    /**
-     * Compile a package configuration into a PackageEntry with generator bundle
-     *
-     * @returns PackageEntry with generated bundle ready for sync
-     */
-    abstract compile(context: PackageCompilerContext): PackageEntry;
-    /**
-     * Get the formatted package name (e.g., '@scope/backend' or 'project-backend')
-     *
-     * @returns Formatted package name
-     */
-    abstract getPackageName(): string;
-    /**
-     * Get the package directory path relative to monorepo root
-     *
-     * @returns Package directory path (e.g., 'apps/backend', '.')
-     */
-    abstract getPackageDirectory(): string;
-    /**
-     * Get the tasks for a package used in turbo configuration
-     *
-     * @returns Object with build, dev, and watch tasks
-     */
-    getTasks(): PackageTasks;
-}
-/**
- * Build a package name following monorepo naming conventions
- *
- * If packageScope is set, creates scoped package: @scope/name
- * Otherwise, creates prefixed package: project-name
- *
- * @param generalSettings - Project general settings
- * @param packageName - The app/package name
- * @returns Formatted package name
- *
- * @example
- * ```typescript
- * buildPackageName({ name: 'blog', packageScope: 'acme' }, 'backend')
- * // Returns: '@acme/backend'
- *
- * buildPackageName({ name: 'blog', packageScope: '' }, 'backend')
- * // Returns: 'blog-backend'
- * ```
- */
-export declare function buildPackageName(generalSettings: {
-    name: string;
-    packageScope: string;
-}, packageName: string): string;
 /**
  * Create an AppEntryBuilder for a package
  *

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

@@ -1 +1 @@
-{"version":3,"file":"package-compiler.d.ts","sourceRoot":"","sources":["../../src/compiler/package-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,0BAA0B,EAC3B,MAAM,oCAAoC,CAAC;AAE5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,GAAG,EAAE,MAAM,EAAE,CAAC;IACd,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,sBAAsB;IACrC,SAAS,EAAE,eAAe,EAAE,CAAC;CAC9B;AAED;;;;;;;;GAQG;AACH,8BAAsB,eAAe;IACnC,SAAS,CAAC,QAAQ,CAAC,mBAAmB,EAAE,0BAA0B,CAAC;gBAEvD,mBAAmB,EAAE,0BAA0B;IAG3D;;;;OAIG;IACH,QAAQ,CAAC,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,YAAY;IAE/D;;;;OAIG;IACH,QAAQ,CAAC,cAAc,IAAI,MAAM;IAEjC;;;;OAIG;IACH,QAAQ,CAAC,mBAAmB,IAAI,MAAM;IAEtC;;;;OAIG;IACH,QAAQ,IAAI,YAAY;CAOzB;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,wBAAgB,gBAAgB,CAC9B,eAAe,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,EACvD,WAAW,EAAE,MAAM,GAClB,MAAM,CAIR;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,SAAS,aAAa,EAEhC,mBAAmB,EAAE,0BAA0B,EAC/C,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,YAAY,CAAC,UAAU,CAAC,GACtC,eAAe,CAAC,UAAU,CAAC,CAE7B"}
+{"version":3,"file":"package-compiler.d.ts","sourceRoot":"","sources":["../../src/compiler/package-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,YAAY,EACZ,aAAa,EACb,0BAA0B,EAC3B,MAAM,oCAAoC,CAAC;AAE5C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,wBAAgB,+BAA+B,CAC7C,UAAU,SAAS,aAAa,EAEhC,mBAAmB,EAAE,0BAA0B,EAC/C,SAAS,EAAE,UAAU,EACrB,aAAa,EAAE,YAAY,CAAC,UAAU,CAAC,GACtC,eAAe,CAAC,UAAU,CAAC,CAE7B"}

package/dist/compiler/package-compiler.js

@@ -1,55 +1,4 @@
 import { AppEntryBuilder } from './app-entry-builder.js';
-/**
- * Abstract base class for package type compilers
- *
- * Each package type (backend, web, library, etc.) extends this class
- * to define how it should be compiled into a PackageEntry with generator bundles.
- *
- * Each child class defines its own constructor requirements based on what
- * information it needs (e.g., app config, definition container).
- */
-export class PackageCompiler {
-    definitionContainer;
-    constructor(definitionContainer) {
-        this.definitionContainer = definitionContainer;
-    }
-    /**
-     * Get the tasks for a package used in turbo configuration
-     *
-     * @returns Object with build, dev, and watch tasks
-     */
-    getTasks() {
-        return {
-            build: [],
-            dev: [],
-            watch: [],
-        };
-    }
-}
-/**
- * Build a package name following monorepo naming conventions
- *
- * If packageScope is set, creates scoped package: @scope/name
- * Otherwise, creates prefixed package: project-name
- *
- * @param generalSettings - Project general settings
- * @param packageName - The app/package name
- * @returns Formatted package name
- *
- * @example
- * ```typescript
- * buildPackageName({ name: 'blog', packageScope: 'acme' }, 'backend')
- * // Returns: '@acme/backend'
- *
- * buildPackageName({ name: 'blog', packageScope: '' }, 'backend')
- * // Returns: 'blog-backend'
- * ```
- */
-export function buildPackageName(generalSettings, packageName) {
-    return generalSettings.packageScope
-        ? `@${generalSettings.packageScope}/${packageName}`
-        : `${generalSettings.name}-${packageName}`;
-}
 /**
  * Create an AppEntryBuilder for a package
  *

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

@@ -1 +1 @@
-{"version":3,"file":"package-compiler.js","sourceRoot":"","sources":["../../src/compiler/package-compiler.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAYzD;;;;;;;;GAQG;AACH,MAAM,OAAgB,eAAe;IAChB,mBAAmB,CAA6B;IAEnE,YAAY,mBAA+C;QACzD,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;IACjD,CAAC;IAsBD;;;;OAIG;IACH,QAAQ;QACN,OAAO;YACL,KAAK,EAAE,EAAE;YACT,GAAG,EAAE,EAAE;YACP,KAAK,EAAE,EAAE;SACV,CAAC;IACJ,CAAC;CACF;AAED;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,UAAU,gBAAgB,CAC9B,eAAuD,EACvD,WAAmB;IAEnB,OAAO,eAAe,CAAC,YAAY;QACjC,CAAC,CAAC,IAAI,eAAe,CAAC,YAAY,IAAI,WAAW,EAAE;QACnD,CAAC,CAAC,GAAG,eAAe,CAAC,IAAI,IAAI,WAAW,EAAE,CAAC;AAC/C,CAAC;AAED;;;;;;;;;;GAUG;AACH,MAAM,UAAU,+BAA+B,CAG7C,mBAA+C,EAC/C,SAAqB,EACrB,aAAuC;IAEvC,OAAO,IAAI,eAAe,CAAC,mBAAmB,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAC5E,CAAC"}
+{"version":3,"file":"package-compiler.js","sourceRoot":"","sources":["../../src/compiler/package-compiler.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD;;;;;;;;;;GAUG;AACH,MAAM,UAAU,+BAA+B,CAG7C,mBAA+C,EAC/C,SAAqB,EACrB,aAAuC;IAEvC,OAAO,IAAI,eAAe,CAAC,mBAAmB,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAC5E,CAAC"}

package/dist/compiler/root/root-package-compiler.d.ts

@@ -1,6 +1,6 @@
-import type { PackageCompilerContext } from '../package-compiler.js';
+import type { PackageCompilerContext } from '@baseplate-dev/project-builder-lib';
+import { PackageCompiler } from '@baseplate-dev/project-builder-lib';
 import type { PackageEntry } from '../package-entry.js';
-import { PackageCompiler } from '../package-compiler.js';
 /**
  * Compiler for monorepo root package
  *

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

@@ -1 +1 @@
-{"version":3,"file":"root-package-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/root/root-package-compiler.ts"],"names":[],"mappings":"AAeA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAOxD,OAAO,EAAoB,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAmB3E;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,YAAY;IAiHtD,cAAc,IAAI,MAAM;IAMxB,mBAAmB,IAAI,MAAM;CAG9B"}
+{"version":3,"file":"root-package-compiler.d.ts","sourceRoot":"","sources":["../../../src/compiler/root/root-package-compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EAEvB,MAAM,oCAAoC,CAAC;AAc5C,OAAO,EAIL,eAAe,EAChB,MAAM,oCAAoC,CAAC;AAG5C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAyBxD;;;;;;;;;;;;;GAaG;AACH,qBAAa,mBAAoB,SAAQ,eAAe;IACtD,OAAO,CAAC,OAAO,EAAE,sBAAsB,GAAG,YAAY;IAyHtD,cAAc,IAAI,MAAM;IAMxB,mBAAmB,IAAI,MAAM;CAG9B"}

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

@@ -1,7 +1,7 @@
-import { dockerComposeGenerator, nodeGenerator, nodeGitIgnoreGenerator, pathRootsGenerator, pnpmWorkspaceGenerator, prettierGenerator, rootReadmeGenerator, turboGenerator, } from '@baseplate-dev/core-generators';
+import { CORE_PACKAGES, dockerComposeGenerator, nodeGenerator, nodeGitIgnoreGenerator, pathRootsGenerator, pnpmWorkspaceGenerator, prettierGenerator, rootReadmeGenerator, turboGenerator, } from '@baseplate-dev/core-generators';
+import { buildPackageName, DEFAULT_APPS_FOLDER, DEFAULT_LIBRARIES_FOLDER, PackageCompiler, } from '@baseplate-dev/project-builder-lib';
 import { uniq } from 'es-toolkit';
 import { getPostgresSettings, getRedisSettings, isRedisEnabled, } from '../infrastructure-utils.js';
-import { buildPackageName, PackageCompiler } from '../package-compiler.js';
 /**
  * Build Docker Compose configuration at root level
  *
@@ -38,8 +38,9 @@ export class RootPackageCompiler extends PackageCompiler {
         const generalSettings = projectDefinition.settings.general;
         const monorepoSettings = projectDefinition.settings.monorepo;
         // Build workspace patterns from monorepo settings
-        const appsFolder = monorepoSettings?.appsFolder ?? 'apps';
-        const workspacePackages = [`${appsFolder}/*`];
+        const appsFolder = monorepoSettings?.appsFolder ?? DEFAULT_APPS_FOLDER;
+        const librariesFolder = monorepoSettings?.librariesFolder ?? DEFAULT_LIBRARIES_FOLDER;
+        const workspacePackages = [`${appsFolder}/*`, `${librariesFolder}/*`];
         const tasks = context.compilers.map((compiler) => compiler.getTasks());
         const mergedTasks = {
             dev: uniq(tasks.flatMap((task) => task.dev)),
@@ -84,8 +85,12 @@ export class RootPackageCompiler extends PackageCompiler {
             private: true,
             rootPackage: true,
             scripts: {
-                build: `turbo run ${buildTasks}`,
-                'build:affected': `turbo run ${buildTasks} --affected`,
+                ...(buildTasks.length > 0
+                    ? {
+                        build: `turbo run ${buildTasks}`,
+                        'build:affected': `turbo run ${buildTasks} --affected`,
+                    }
+                    : {}),
                 typecheck: `turbo run typecheck`,
                 lint: `turbo run lint`,
                 'lint:affected': `turbo run lint --affected`,
@@ -94,12 +99,12 @@ export class RootPackageCompiler extends PackageCompiler {
                 'prettier:check': `turbo run prettier:check && pnpm run prettier:check:root`,
                 'prettier:check:affected': `turbo run prettier:check --affected`,
                 'prettier:write': `turbo run prettier:write && pnpm run prettier:write:root`,
-                dev: `turbo run ${devTasks}`,
-                watch: `turbo run ${watchTasks}`,
+                ...(devTasks.length > 0 ? { dev: `turbo run ${devTasks}` } : {}),
+                ...(watchTasks.length > 0 ? { watch: `turbo run ${watchTasks}` } : {}),
                 'baseplate:serve': 'baseplate serve',
                 'baseplate:generate': 'baseplate generate',
-                'prettier:check:root': `prettier --check . "!${appsFolder}/**"`,
-                'prettier:write:root': `prettier --write . "!${appsFolder}/**"`,
+                'prettier:check:root': `prettier --check . "!${appsFolder}/**" "!${librariesFolder}/**"`,
+                'prettier:write:root': `prettier --write . "!${appsFolder}/**" "!${librariesFolder}/**"`,
             },
             additionalPackages: {
                 dev: {
@@ -109,6 +114,8 @@ export class RootPackageCompiler extends PackageCompiler {
                         : {
                             '@baseplate-dev/project-builder-cli': cliVersion,
                         }),
+                    // Include Typescript to allow tsconfig plugins like gql.tada to be used
+                    typescript: CORE_PACKAGES.typescript,
                 },
             },
             children: {

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/actions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,oBAAoB,EAGpB,sBAAsB,EACtB,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAQ3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAkC1E,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,EACtC,gBAAgB,EAAE,sBAAsB,EACxC,KAAK,EAAE,MAAM,GACZ,eAAe,CAkBjB"}
+{"version":3,"file":"actions.d.ts","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/actions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,sBAAsB,EACtB,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAI3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,oBAAoB,EAC5B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,EACtC,gBAAgB,EAAE,sBAAsB,EACxC,KAAK,EAAE,MAAM,GACZ,eAAe,CAoBjB"}

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

@@ -1,28 +1,10 @@
 import { adminCrudActionCompilerSpec } from '@baseplate-dev/project-builder-lib';
-import { adminCrudDeleteActionGenerator, adminCrudEditActionGenerator, } from '@baseplate-dev/react-generators';
-const adminCrudEditActionCompiler = {
-    name: 'edit',
-    compileAction: (definition, { order }) => adminCrudEditActionGenerator({
-        order,
-        position: definition.position,
-    }),
-};
-const adminCrudDeleteActionCompiler = {
-    name: 'delete',
-    compileAction: (definition, { order, model, modelCrudSection, definitionContainer }) => adminCrudDeleteActionGenerator({
-        order,
-        position: definition.position,
-        modelName: model.name,
-        nameField: definitionContainer.nameFromId(modelCrudSection.nameFieldRef),
-    }),
-};
-const builtInCompilers = [
-    adminCrudEditActionCompiler,
-    adminCrudDeleteActionCompiler,
-];
 export function compileAdminCrudAction(action, modelId, builder, modelCrudSection, order) {
-    const actionCompiler = builder.pluginStore.getPluginSpec(adminCrudActionCompilerSpec);
-    const compiler = actionCompiler.getCompiler(action.type, builtInCompilers);
+    const actionCompiler = builder.pluginStore.use(adminCrudActionCompilerSpec);
+    const compiler = actionCompiler.actions.get(action.type);
+    if (!compiler) {
+        throw new Error(`Compiler for action type ${action.type} not found`);
+    }
     const model = builder.projectDefinition.models.find((m) => m.id === modelId);
     if (!model) {
         throw new Error(`Model with id ${modelId} not found`);

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

@@ -1 +1 @@
-{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/actions.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AACjF,OAAO,EACL,8BAA8B,EAC9B,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AAIzC,MAAM,2BAA2B,GAC/B;IACE,IAAI,EAAE,MAAM;IACZ,aAAa,EAAE,CAAC,UAAU,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CACvC,4BAA4B,CAAC;QAC3B,KAAK;QACL,QAAQ,EAAE,UAAU,CAAC,QAAQ;KAC9B,CAAC;CACL,CAAC;AAEJ,MAAM,6BAA6B,GACjC;IACE,IAAI,EAAE,QAAQ;IACd,aAAa,EAAE,CACb,UAAU,EACV,EAAE,KAAK,EAAE,KAAK,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,EACvD,EAAE,CACF,8BAA8B,CAAC;QAC7B,KAAK;QACL,QAAQ,EAAE,UAAU,CAAC,QAAQ;QAC7B,SAAS,EAAE,KAAK,CAAC,IAAI;QACrB,SAAS,EAAE,mBAAmB,CAAC,UAAU,CACvC,gBAAgB,CAAC,YAAY,CAC9B;KACF,CAAC;CACL,CAAC;AAEJ,MAAM,gBAAgB,GAAG;IACvB,2BAA2B;IAC3B,6BAA6B;CAC9B,CAAC;AAEF,MAAM,UAAU,sBAAsB,CACpC,MAA4B,EAC5B,OAAe,EACf,OAAsC,EACtC,gBAAwC,EACxC,KAAa;IAEb,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,aAAa,CACtD,2BAA2B,CAC5B,CAAC;IAEF,MAAM,QAAQ,GAAG,cAAc,CAAC,WAAW,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC;IAE3E,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE;QACpC,KAAK;QACL,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;QAChD,KAAK;QACL,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/actions.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,2BAA2B,EAAE,MAAM,oCAAoC,CAAC;AAIjF,MAAM,UAAU,sBAAsB,CACpC,MAA4B,EAC5B,OAAe,EACf,OAAsC,EACtC,gBAAwC,EACxC,KAAa;IAEb,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,CAAC,IAAI,YAAY,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC;IAC7E,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,iBAAiB,OAAO,YAAY,CAAC,CAAC;IACxD,CAAC;IAED,OAAO,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE;QACpC,KAAK;QACL,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;QAChD,KAAK;QACL,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC"}

package/dist/compiler/web/admin/crud/columns.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"columns.d.ts","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/columns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EAEzB,sBAAsB,EAEtB,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAa3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAwD1E;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,yBAAyB,EACjC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,EACtC,gBAAgB,EAAE,sBAAsB,EACxC,KAAK,EAAE,MAAM,GACZ,eAAe,CAmBjB"}
+{"version":3,"file":"columns.d.ts","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/columns.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,yBAAyB,EACzB,sBAAsB,EACtB,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAO3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAE1E;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,yBAAyB,EACjC,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,EACtC,gBAAgB,EAAE,sBAAsB,EACxC,KAAK,EAAE,MAAM,GACZ,eAAe,CAiBjB"}

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

@@ -1,54 +1,18 @@
-import { adminCrudColumnCompilerSpec, createAdminCrudColumnCompiler, ModelFieldUtils, ModelUtils, } from '@baseplate-dev/project-builder-lib';
-import { adminCrudForeignColumnGenerator, adminCrudTextColumnGenerator, } from '@baseplate-dev/react-generators';
-// Built-in column compilers
-const BUILT_IN_COLUMN_COMPILERS = [
-    createAdminCrudColumnCompiler({
-        name: 'text',
-        compileColumn: (column, options) => adminCrudTextColumnGenerator({
-            id: column.id,
-            label: column.label,
-            order: options.order,
-            modelField: options.definitionContainer.nameFromId(column.modelFieldRef),
-        }),
-    }),
-    createAdminCrudColumnCompiler({
-        name: 'foreign',
-        compileColumn: (column, { definitionContainer, model, order }) => {
-            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}`);
-            }
-            if (relation.references.length !== 1) {
-                throw new Error(`Only relations with a single reference are supported`);
-            }
-            const localField = definitionContainer.nameFromId(relation.references[0].localRef);
-            const foreignModelName = definitionContainer.nameFromId(relation.modelRef);
-            return adminCrudForeignColumnGenerator({
-                id: column.id,
-                label: column.label,
-                order,
-                localField,
-                isOptional: ModelFieldUtils.isRelationOptional(model, relation),
-                foreignModelName,
-                labelExpression: column.labelExpression,
-                valueExpression: column.valueExpression,
-            });
-        },
-    }),
-];
+import { adminCrudColumnCompilerSpec, ModelUtils, } from '@baseplate-dev/project-builder-lib';
 /**
  * Compiles an admin CRUD column definition into generator bundles
  */
 export function compileAdminCrudColumn(column, modelId, builder, modelCrudSection, order) {
-    const { definitionContainer } = builder;
-    // Get the registered column compiler for this type
-    const columnCompilers = definitionContainer.pluginStore.getPluginSpec(adminCrudColumnCompilerSpec);
-    const compiler = columnCompilers.getCompiler(column.type, BUILT_IN_COLUMN_COMPILERS);
+    const columnCompiler = builder.pluginStore.use(adminCrudColumnCompilerSpec);
+    const compiler = columnCompiler.columns.get(column.type);
+    if (!compiler) {
+        throw new Error(`Compiler for column type ${column.type} not found`);
+    }
+    const model = ModelUtils.byIdOrThrow(builder.projectDefinition, modelId);
     return compiler.compileColumn(column, {
         order,
-        model: ModelUtils.byIdOrThrow(builder.projectDefinition, modelId),
-        definitionContainer,
+        definitionContainer: builder.definitionContainer,
+        model,
         modelCrudSection,
     });
 }

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

@@ -1 +1 @@
-{"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/columns.ts"],"names":[],"mappings":"AASA,OAAO,EACL,2BAA2B,EAC3B,6BAA6B,EAC7B,eAAe,EACf,UAAU,GACX,MAAM,oCAAoC,CAAC;AAC5C,OAAO,EACL,+BAA+B,EAC/B,4BAA4B,GAC7B,MAAM,iCAAiC,CAAC;AAIzC,4BAA4B;AAC5B,MAAM,yBAAyB,GAAG;IAChC,6BAA6B,CAAgC;QAC3D,IAAI,EAAE,MAAM;QACZ,aAAa,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,EAAE,CACjC,4BAA4B,CAAC;YAC3B,EAAE,EAAE,MAAM,CAAC,EAAE;YACb,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,UAAU,EAAE,OAAO,CAAC,mBAAmB,CAAC,UAAU,CAChD,MAAM,CAAC,aAAa,CACrB;SACF,CAAC;KACL,CAAC;IACF,6BAA6B,CAAmC;QAC9D,IAAI,EAAE,SAAS;QACf,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,mBAAmB,EAAE,KAAK,EAAE,KAAK,EAAE,EAAE,EAAE;YAC/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;YACF,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,UAAU,CACtD,MAAM,CAAC,gBAAgB,CACxB,CAAC;YAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CACb,2BAA2B,iBAAiB,aAAa,KAAK,CAAC,IAAI,EAAE,CACtE,CAAC;YACJ,CAAC;YAED,IAAI,QAAQ,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACrC,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;YAC1E,CAAC;YAED,MAAM,UAAU,GAAG,mBAAmB,CAAC,UAAU,CAC/C,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,QAAQ,CAChC,CAAC;YACF,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,UAAU,CACrD,QAAQ,CAAC,QAAQ,CAClB,CAAC;YACF,OAAO,+BAA+B,CAAC;gBACrC,EAAE,EAAE,MAAM,CAAC,EAAE;gBACb,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,KAAK;gBACL,UAAU;gBACV,UAAU,EAAE,eAAe,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,CAAC;gBAC/D,gBAAgB;gBAChB,eAAe,EAAE,MAAM,CAAC,eAAe;gBACvC,eAAe,EAAE,MAAM,CAAC,eAAe;aACxC,CAAC,CAAC;QACL,CAAC;KACF,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,MAAiC,EACjC,OAAe,EACf,OAAsC,EACtC,gBAAwC,EACxC,KAAa;IAEb,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC;IAExC,mDAAmD;IACnD,MAAM,eAAe,GAAG,mBAAmB,CAAC,WAAW,CAAC,aAAa,CACnE,2BAA2B,CAC5B,CAAC;IAEF,MAAM,QAAQ,GAAG,eAAe,CAAC,WAAW,CAC1C,MAAM,CAAC,IAAI,EACX,yBAAyB,CAC1B,CAAC;IAEF,OAAO,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE;QACpC,KAAK;QACL,KAAK,EAAE,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC;QACjE,mBAAmB;QACnB,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC"}
+{"version":3,"file":"columns.js","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/columns.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,2BAA2B,EAC3B,UAAU,GACX,MAAM,oCAAoC,CAAC;AAI5C;;GAEG;AACH,MAAM,UAAU,sBAAsB,CACpC,MAAiC,EACjC,OAAe,EACf,OAAsC,EACtC,gBAAwC,EACxC,KAAa;IAEb,MAAM,cAAc,GAAG,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,2BAA2B,CAAC,CAAC;IAE5E,MAAM,QAAQ,GAAG,cAAc,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAEzD,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,MAAM,IAAI,KAAK,CAAC,4BAA4B,MAAM,CAAC,IAAI,YAAY,CAAC,CAAC;IACvE,CAAC;IAED,MAAM,KAAK,GAAG,UAAU,CAAC,WAAW,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAC;IAEzE,OAAO,QAAQ,CAAC,aAAa,CAAC,MAAM,EAAE;QACpC,KAAK;QACL,mBAAmB,EAAE,OAAO,CAAC,mBAAmB;QAChD,KAAK;QACL,gBAAgB;KACjB,CAAC,CAAC;AACL,CAAC"}

package/dist/compiler/web/admin/crud/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,sBAAsB,EACtB,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAa3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAuE1E,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,sBAAsB,EACnC,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,EACtC,QAAQ,EAAE,MAAM,GACf,eAAe,CAkEjB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/compiler/web/admin/crud/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,sBAAsB,EACtB,YAAY,EACb,MAAM,oCAAoC,CAAC;AAC5C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAY3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAuE1E,wBAAgB,uBAAuB,CACrC,WAAW,EAAE,sBAAsB,EACnC,OAAO,EAAE,eAAe,CAAC,YAAY,CAAC,EACtC,QAAQ,EAAE,MAAM,GACf,eAAe,CAqFjB"}

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

@@ -1,5 +1,5 @@
 import { ModelUtils } from '@baseplate-dev/project-builder-lib';
-import { adminCrudEditGenerator, adminCrudEmbeddedFormGenerator, adminCrudListGenerator, adminCrudQueriesGenerator, adminCrudSectionGenerator, reactRoutesGenerator, } from '@baseplate-dev/react-generators';
+import { adminCrudEditGenerator, adminCrudEmbeddedFormGenerator, adminCrudListGenerator, adminCrudSectionGenerator, reactRoutesGenerator, } from '@baseplate-dev/react-generators';
 import inflection from 'inflection';
 import { compileAdminCrudAction } from './actions.js';
 import { compileAdminCrudColumn } from './columns.js';
@@ -39,6 +39,16 @@ export function compileAdminCrudSection(crudSection, builder, parentId) {
     const crudSectionId = `${parentId}.${sectionName}.$section`;
     const modelName = builder.nameFromId(crudSection.modelRef);
     const { disableCreate } = crudSection;
+    const model = ModelUtils.byIdOrThrow(builder.projectDefinition, crudSection.modelRef);
+    const idFieldRefs = model.model.primaryKeyFieldRefs;
+    if (idFieldRefs.length !== 1) {
+        throw new Error(`Section ${crudSection.name} has ${idFieldRefs.length} primary keys, but only one is allowed`);
+    }
+    const idField = builder.nameFromId(idFieldRefs[0]);
+    const idFieldType = model.model.fields.find((field) => field.id === idFieldRefs[0])?.type;
+    if (!idFieldType || (idFieldType !== 'uuid' && idFieldType !== 'string')) {
+        throw new Error(`Section ${crudSection.name} has a primary key that is not a Uuid or String`);
+    }
     return reactRoutesGenerator({
         name: sectionName,
         children: {
@@ -49,6 +59,8 @@ export function compileAdminCrudSection(crudSection, builder, parentId) {
                         modelName,
                         disableCreate,
                         nameField: builder.nameFromId(crudSection.nameFieldRef),
+                        idField,
+                        idFieldGraphqlType: idFieldType === 'uuid' ? 'Uuid' : 'String',
                         children: {
                             inputs: crudSection.form.fields.map((field, idx) => compileAdminCrudInput(field, crudSection.modelRef, builder, crudSectionId, idx)),
                             embeddedForms: crudSection.embeddedForms?.map((form) => compileAdminCrudEmbeddedForm(builder, form, crudSection)),
@@ -63,10 +75,6 @@ export function compileAdminCrudSection(crudSection, builder, parentId) {
                             actions: crudSection.table.actions?.map((action, idx) => compileAdminCrudAction(action, crudSection.modelRef, builder, crudSection, idx)),
                         },
                     }),
-                    queries: adminCrudQueriesGenerator({
-                        modelId: crudSection.modelRef,
-                        modelName,
-                    }),
                 },
             }),
         },

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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"}