@celljs/vite 4.3.0 → 4.4.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (105) hide show
  1. package/README.md +2 -1
  2. package/lib/builder/cell-builder.spec.js +27 -21
  3. package/lib/builder/cell-builder.spec.js.map +1 -1
  4. package/lib/builder/pages.spec.d.ts +2 -0
  5. package/lib/builder/pages.spec.d.ts.map +1 -0
  6. package/lib/builder/pages.spec.js +96 -0
  7. package/lib/builder/pages.spec.js.map +1 -0
  8. package/lib/constants.d.ts +0 -2
  9. package/lib/constants.d.ts.map +1 -1
  10. package/lib/constants.js +0 -2
  11. package/lib/constants.js.map +1 -1
  12. package/lib/dev/cell-dev-server.d.ts +4 -2
  13. package/lib/dev/cell-dev-server.d.ts.map +1 -1
  14. package/lib/dev/cell-dev-server.js +32 -2
  15. package/lib/dev/cell-dev-server.js.map +1 -1
  16. package/lib/dev/cell-dev-server.spec.js +1 -1
  17. package/lib/dev/cell-dev-server.spec.js.map +1 -1
  18. package/lib/expression/expression-evaluator.d.ts +11 -2
  19. package/lib/expression/expression-evaluator.d.ts.map +1 -1
  20. package/lib/expression/expression-evaluator.js +6 -2
  21. package/lib/expression/expression-evaluator.js.map +1 -1
  22. package/lib/expression/expression-evaluator.spec.js +3 -3
  23. package/lib/expression/expression-evaluator.spec.js.map +1 -1
  24. package/lib/generator/config-generator.d.ts +4 -3
  25. package/lib/generator/config-generator.d.ts.map +1 -1
  26. package/lib/generator/config-generator.js +7 -5
  27. package/lib/generator/config-generator.js.map +1 -1
  28. package/lib/generator/generator.spec.js +20 -5
  29. package/lib/generator/generator.spec.js.map +1 -1
  30. package/lib/generator/html-generator.js +3 -3
  31. package/lib/generator/html-generator.js.map +1 -1
  32. package/lib/generator/route-generator.d.ts +13 -0
  33. package/lib/generator/route-generator.d.ts.map +1 -0
  34. package/lib/generator/route-generator.js +34 -0
  35. package/lib/generator/route-generator.js.map +1 -0
  36. package/lib/index.d.ts +1 -0
  37. package/lib/index.d.ts.map +1 -1
  38. package/lib/index.js +1 -0
  39. package/lib/index.js.map +1 -1
  40. package/lib/output/output-writer.d.ts +4 -0
  41. package/lib/output/output-writer.d.ts.map +1 -1
  42. package/lib/output/output-writer.js +10 -0
  43. package/lib/output/output-writer.js.map +1 -1
  44. package/lib/plugin/cell-plugin.d.ts +11 -1
  45. package/lib/plugin/cell-plugin.d.ts.map +1 -1
  46. package/lib/plugin/cell-plugin.js +49 -3
  47. package/lib/plugin/cell-plugin.js.map +1 -1
  48. package/lib/plugin/class-name-util.d.ts +14 -0
  49. package/lib/plugin/class-name-util.d.ts.map +1 -0
  50. package/lib/plugin/class-name-util.js +82 -0
  51. package/lib/plugin/class-name-util.js.map +1 -0
  52. package/lib/plugin/class-name-util.spec.d.ts +2 -0
  53. package/lib/plugin/class-name-util.spec.d.ts.map +1 -0
  54. package/lib/plugin/class-name-util.spec.js +37 -0
  55. package/lib/plugin/class-name-util.spec.js.map +1 -0
  56. package/lib/project/config-loader.d.ts +6 -6
  57. package/lib/project/config-loader.d.ts.map +1 -1
  58. package/lib/project/config-loader.js +16 -22
  59. package/lib/project/config-loader.js.map +1 -1
  60. package/lib/project/config-schema.d.ts +107 -0
  61. package/lib/project/config-schema.d.ts.map +1 -0
  62. package/lib/project/config-schema.js +522 -0
  63. package/lib/project/config-schema.js.map +1 -0
  64. package/lib/project/config-schema.spec.d.ts +2 -0
  65. package/lib/project/config-schema.spec.d.ts.map +1 -0
  66. package/lib/project/config-schema.spec.js +248 -0
  67. package/lib/project/config-schema.spec.js.map +1 -0
  68. package/lib/project/env-overrides.d.ts +14 -10
  69. package/lib/project/env-overrides.d.ts.map +1 -1
  70. package/lib/project/env-overrides.js +28 -19
  71. package/lib/project/env-overrides.js.map +1 -1
  72. package/lib/project/env-overrides.spec.js +23 -13
  73. package/lib/project/env-overrides.spec.js.map +1 -1
  74. package/lib/project/page-scanner.d.ts +26 -0
  75. package/lib/project/page-scanner.d.ts.map +1 -0
  76. package/lib/project/page-scanner.js +102 -0
  77. package/lib/project/page-scanner.js.map +1 -0
  78. package/lib/project/page-scanner.spec.d.ts +2 -0
  79. package/lib/project/page-scanner.spec.d.ts.map +1 -0
  80. package/lib/project/page-scanner.spec.js +68 -0
  81. package/lib/project/page-scanner.spec.js.map +1 -0
  82. package/lib/project/project-loader.d.ts +32 -3
  83. package/lib/project/project-loader.d.ts.map +1 -1
  84. package/lib/project/project-loader.js +70 -15
  85. package/lib/project/project-loader.js.map +1 -1
  86. package/lib/project/project-loader.spec.js +78 -56
  87. package/lib/project/project-loader.spec.js.map +1 -1
  88. package/lib/testing/test-app.spec.js +3 -3
  89. package/lib/testing/test-app.spec.js.map +1 -1
  90. package/package.json +7 -7
  91. package/src/constants.ts +0 -3
  92. package/src/dev/cell-dev-server.ts +39 -5
  93. package/src/expression/expression-evaluator.ts +16 -3
  94. package/src/generator/config-generator.ts +7 -5
  95. package/src/generator/html-generator.ts +3 -3
  96. package/src/generator/route-generator.ts +34 -0
  97. package/src/index.ts +1 -0
  98. package/src/output/output-writer.ts +12 -0
  99. package/src/plugin/cell-plugin.ts +52 -3
  100. package/src/plugin/class-name-util.ts +85 -0
  101. package/src/project/config-loader.ts +18 -23
  102. package/src/project/config-schema.ts +596 -0
  103. package/src/project/env-overrides.ts +33 -22
  104. package/src/project/page-scanner.ts +105 -0
  105. package/src/project/project-loader.ts +82 -17
@@ -0,0 +1,102 @@
1
+ import { existsSync, readdirSync } from 'node:fs';
2
+ import { isAbsolute, join, relative } from 'node:path';
3
+ import { CellError } from '@celljs/kit';
4
+ /**
5
+ * Turns the files of `src/browser/pages` into routes, as `docs/guide/frontend.md` describes:
6
+ *
7
+ * - `index.tsx` is the path of its directory, `about.tsx` is `/about`;
8
+ * - `[id].tsx` is a parameter (`:id`), `[...rest].tsx` matches the rest of the path (`*`);
9
+ * - `_layout.tsx` wraps the pages of its directory and below; other names starting with `_` (files
10
+ * or directories) and tests are not pages, so components can live next to the pages that use them.
11
+ */
12
+ export class PageScanner {
13
+ root;
14
+ static DIR = join('src', 'browser', 'pages');
15
+ static PAGE = /\.(tsx|jsx|ts|js)$/;
16
+ static LAYOUT = /^_layout\.(tsx|jsx|ts|js)$/;
17
+ static IGNORED = /\.(spec|test)\.[^.]+$|\.d\.ts$/;
18
+ constructor(root) {
19
+ this.root = root;
20
+ }
21
+ get dir() {
22
+ return join(this.root, PageScanner.DIR);
23
+ }
24
+ /** The routes, or none when the project has no pages directory. */
25
+ scan() {
26
+ if (!existsSync(this.dir)) {
27
+ return [];
28
+ }
29
+ const routes = [];
30
+ this.scanDir(this.dir, [], [], routes);
31
+ const byPath = new Map();
32
+ for (const route of routes) {
33
+ const other = byPath.get(route.path);
34
+ if (other) {
35
+ throw new CellError({
36
+ code: 'CELL_ROUTE_CONFLICT',
37
+ message: `${other.file} and ${route.file} are both the page of ${route.path}.`,
38
+ file: join(this.root, route.file),
39
+ hint: 'Keep one of them: about.tsx and about/index.tsx are the same path.',
40
+ });
41
+ }
42
+ byPath.set(route.path, route);
43
+ }
44
+ return routes;
45
+ }
46
+ /** Whether a file is one the routes depend on: a page or layout file, or a directory, under the pages directory. */
47
+ affects(file) {
48
+ const rel = relative(this.dir, file);
49
+ return rel === '' || (!rel.startsWith('..') && !isAbsolute(rel));
50
+ }
51
+ scanDir(dir, segments, layouts, routes) {
52
+ const entries = readdirSync(dir, { withFileTypes: true }).sort((a, b) => a.name.localeCompare(b.name));
53
+ const layout = entries.find(e => e.isFile() && PageScanner.LAYOUT.test(e.name));
54
+ const around = layout ? [...layouts, this.relative(join(dir, layout.name))] : layouts;
55
+ for (const entry of entries) {
56
+ if (entry.name.startsWith('_') || entry.name.startsWith('.')) {
57
+ continue;
58
+ }
59
+ const file = join(dir, entry.name);
60
+ if (entry.isDirectory()) {
61
+ const segment = this.segment(entry.name, file);
62
+ if (segment === '*') {
63
+ throw new CellError({
64
+ code: 'CELL_ROUTE_INVALID',
65
+ message: `${this.relative(file)}: [...name] matches the rest of the path, so it can only be a file.`,
66
+ file,
67
+ hint: 'Rename the directory, or make it a file: [...rest].tsx.',
68
+ });
69
+ }
70
+ this.scanDir(file, [...segments, segment], around, routes);
71
+ }
72
+ else if (entry.isFile() && PageScanner.PAGE.test(entry.name) && !PageScanner.IGNORED.test(entry.name)) {
73
+ const name = entry.name.replace(PageScanner.PAGE, '');
74
+ const path = name === 'index' ? segments : [...segments, this.segment(name, file)];
75
+ routes.push({ path: `/${path.join('/')}`, file: this.relative(file), layouts: around });
76
+ }
77
+ }
78
+ }
79
+ segment(name, file) {
80
+ const catchAll = /^\[\.\.\.([A-Za-z_$][\w$]*)\]$/.exec(name);
81
+ if (catchAll) {
82
+ return '*';
83
+ }
84
+ const param = /^\[([A-Za-z_$][\w$]*)\]$/.exec(name);
85
+ if (param) {
86
+ return `:${param[1]}`;
87
+ }
88
+ if (/[[\]:*?]/.test(name)) {
89
+ throw new CellError({
90
+ code: 'CELL_ROUTE_INVALID',
91
+ message: `${this.relative(file)}: "${name}" is not a path segment.`,
92
+ file,
93
+ hint: 'Use a plain name (about), a parameter ([id]) or the rest of the path ([...rest]).',
94
+ });
95
+ }
96
+ return name;
97
+ }
98
+ relative(file) {
99
+ return relative(this.root, file).split('\\').join('/');
100
+ }
101
+ }
102
+ //# sourceMappingURL=page-scanner.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"page-scanner.js","sourceRoot":"","sources":["../../src/project/page-scanner.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,2 @@
1
+ export {};
2
+ //# sourceMappingURL=page-scanner.spec.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"page-scanner.spec.d.ts","sourceRoot":"","sources":["../../src/project/page-scanner.spec.ts"],"names":[],"mappings":""}
@@ -0,0 +1,68 @@
1
+ import { afterEach, describe, expect, it } from 'bun:test';
2
+ import { mkdirSync, mkdtempSync, rmSync, writeFileSync } from 'node:fs';
3
+ import { tmpdir } from 'node:os';
4
+ import { dirname, join } from 'node:path';
5
+ import { PageScanner } from './page-scanner.js';
6
+ let root;
7
+ function project(files) {
8
+ root = mkdtempSync(join(tmpdir(), 'cell-pages-'));
9
+ for (const file of files) {
10
+ const path = join(root, 'src/browser/pages', file);
11
+ mkdirSync(dirname(path), { recursive: true });
12
+ writeFileSync(path, 'export default () => null;\n');
13
+ }
14
+ return new PageScanner(root);
15
+ }
16
+ function errorOf(fn) {
17
+ try {
18
+ fn();
19
+ }
20
+ catch (error) {
21
+ return error;
22
+ }
23
+ throw new Error('expected a CellError');
24
+ }
25
+ describe('PageScanner', () => {
26
+ afterEach(() => rmSync(root, { recursive: true, force: true }));
27
+ it('maps files to paths: index, names, [param] and [...rest]', () => {
28
+ const routes = project(['index.tsx', 'about.tsx', 'users/index.tsx', 'users/[id].tsx', 'users/[id]/edit.tsx', 'docs/[...slug].tsx']).scan();
29
+ expect(routes.map(r => [r.path, r.file])).toEqual([
30
+ ['/about', 'src/browser/pages/about.tsx'],
31
+ ['/docs/*', 'src/browser/pages/docs/[...slug].tsx'],
32
+ ['/', 'src/browser/pages/index.tsx'],
33
+ ['/users/:id/edit', 'src/browser/pages/users/[id]/edit.tsx'],
34
+ ['/users/:id', 'src/browser/pages/users/[id].tsx'],
35
+ ['/users', 'src/browser/pages/users/index.tsx'],
36
+ ]);
37
+ });
38
+ it('puts the _layout files of the directory and its parents around each page, outermost first', () => {
39
+ const routes = project(['_layout.tsx', 'index.tsx', 'admin/_layout.tsx', 'admin/index.tsx', 'admin/users.tsx']).scan();
40
+ const layouts = Object.fromEntries(routes.map(r => [r.path, r.layouts]));
41
+ expect(layouts['/']).toEqual(['src/browser/pages/_layout.tsx']);
42
+ expect(layouts['/admin/users']).toEqual(['src/browser/pages/_layout.tsx', 'src/browser/pages/admin/_layout.tsx']);
43
+ });
44
+ it('ignores _ files and directories, tests, declarations and other files', () => {
45
+ const routes = project(['index.tsx', '_parts/button.tsx', '_util.ts', 'index.spec.tsx', 'about.test.ts', 'types.d.ts', 'style.css']).scan();
46
+ expect(routes.map(r => r.path)).toEqual(['/']);
47
+ });
48
+ it('has no routes without a pages directory', () => {
49
+ root = mkdtempSync(join(tmpdir(), 'cell-pages-'));
50
+ expect(new PageScanner(root).scan()).toEqual([]);
51
+ });
52
+ it('fails with CELL_ROUTE_CONFLICT when two files are the same path', () => {
53
+ const error = errorOf(() => project(['about.tsx', 'about/index.tsx']).scan());
54
+ expect(error.code).toBe('CELL_ROUTE_CONFLICT');
55
+ expect(error.message).toContain('/about');
56
+ });
57
+ it('fails with CELL_ROUTE_INVALID on names that are not path segments', () => {
58
+ expect(errorOf(() => project(['[id.tsx']).scan()).code).toBe('CELL_ROUTE_INVALID');
59
+ expect(errorOf(() => project(['[...rest]/index.tsx']).scan()).code).toBe('CELL_ROUTE_INVALID');
60
+ });
61
+ it('tells which files affect the routes', () => {
62
+ const scanner = project(['index.tsx']);
63
+ expect(scanner.affects(join(root, 'src/browser/pages/a/b.tsx'))).toBe(true);
64
+ expect(scanner.affects(join(root, 'src/browser/pages'))).toBe(true);
65
+ expect(scanner.affects(join(root, 'src/browser/module.ts'))).toBe(false);
66
+ });
67
+ });
68
+ //# sourceMappingURL=page-scanner.spec.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"page-scanner.spec.js","sourceRoot":"","sources":["../../src/project/page-scanner.spec.ts"],"names":[],"mappings":"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"}
@@ -1,5 +1,8 @@
1
1
  import { type ModuleRef, type ProjectModel, type Target, type TargetModel } from '@celljs/kit';
2
2
  import type { Component } from './component-collector.js';
3
+ import { ConfigLoader } from './config-loader.js';
4
+ import { type ConfigProblem, ConfigSchema } from './config-schema.js';
5
+ import { EnvOverrides } from './env-overrides.js';
3
6
  export interface ProjectLoaderOptions {
4
7
  root?: string;
5
8
  /** Active modes, in order; later modes override earlier ones. */
@@ -16,7 +19,7 @@ export interface ProjectLoaderOptions {
16
19
  runtimeDisabled?: string[];
17
20
  /** DI modules added by toolchain modules, loaded after the components' own (`cell.addRuntimeModule`). */
18
21
  extraModules?: ExtraModule[];
19
- /** Environment for `${env.*}` in frontend configuration and `CELL_FRONTEND__` / `CELL_BACKEND__` overrides. Default: `process.env`. */
22
+ /** Environment for `${env.*}` in frontend configuration and `CELL_` overrides. Default: `process.env`. */
20
23
  env?: Record<string, string | undefined>;
21
24
  }
22
25
  /** A DI module that a toolchain module adds to a target. */
@@ -34,11 +37,39 @@ export interface ExtraModule {
34
37
  */
35
38
  export declare class ProjectLoader {
36
39
  protected readonly options: ProjectLoaderOptions;
40
+ protected loadedSchema?: ConfigSchema;
37
41
  protected readonly root: string;
38
42
  protected readonly mode: string[];
39
43
  protected readonly env: Record<string, string | undefined>;
40
44
  constructor(options?: ProjectLoaderOptions);
45
+ /**
46
+ * Reads the configuration files and the schemas and checks the files against the merged schema,
47
+ * without building the model: `cell check` reports each problem on its own.
48
+ */
49
+ validate(): {
50
+ schema: ConfigSchema;
51
+ problems: ConfigProblem[];
52
+ };
53
+ protected read(): {
54
+ components: Component[];
55
+ configLoader: ConfigLoader;
56
+ layers: import("./config-schema.js").ConfigLayerFile[];
57
+ schema: ConfigSchema;
58
+ problems: ConfigProblem[];
59
+ };
60
+ /** The merged configuration schema; available after {@link load} or {@link validate}. */
61
+ get schema(): ConfigSchema;
41
62
  load(): ProjectModel;
63
+ /**
64
+ * The browser sees only the keys the schemas mark public: the variables apply to the whole
65
+ * configuration (a public key may refer to another one), the public keys are evaluated, then picked.
66
+ */
67
+ protected frontendConfig(merged: Record<string, unknown>, schema: ConfigSchema, overrides: EnvOverrides, types: Record<string, string>): {
68
+ config: Record<string, unknown>;
69
+ envOverrides: import("@celljs/kit").EnvOverrideReport;
70
+ };
71
+ /** All problems of the configuration files in one error, the first one's file and line as its location. */
72
+ protected static throwProblems(problems: ConfigProblem[]): void;
42
73
  protected extraModules(target: Target, isStatic: boolean): ModuleRef[];
43
74
  /** Every project has a backend; components add targets (`@celljs/widget` adds the frontend). Explicit targets replace both. */
44
75
  protected targets(components: Component[]): Target[];
@@ -48,7 +79,5 @@ export declare class ProjectLoader {
48
79
  protected checkFilters(excluded: readonly string[], components: {
49
80
  name: string;
50
81
  }[]): void;
51
- /** The browser has no runtime environment, so frontend expressions are evaluated at build time. */
52
- protected evaluate(target: Target, config: Record<string, unknown>): Record<string, unknown>;
53
82
  }
54
83
  //# sourceMappingURL=project-loader.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"project-loader.d.ts","sourceRoot":"","sources":["../../src/project/project-loader.ts"],"names":[],"mappings":"AAEA,OAAO,EAAa,KAAK,SAAS,EAAE,KAAK,YAAY,EAAE,KAAK,MAAM,EAAE,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAG1G,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAM1D,MAAM,WAAW,oBAAoB;IACjC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,iEAAiE;IACjE,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,kEAAkE;IAClE,KAAK,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;IACxC,4GAA4G;IAC5G,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2EAA2E;IAC3E,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,2GAA2G;IAC3G,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,mFAAmF;IACnF,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B,yGAAyG;IACzG,YAAY,CAAC,EAAE,WAAW,EAAE,CAAC;IAC7B,uIAAuI;IACvI,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC5C;AAED,4DAA4D;AAC5D,MAAM,WAAW,WAAW;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,sEAAsE;IACtE,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,kDAAkD;IAClD,SAAS,EAAE,MAAM,CAAC;CACrB;AAED;;;GAGG;AACH,qBAAa,aAAa;IAKV,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,oBAAoB;IAJ5D,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAChC,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;IAClC,SAAS,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAE3D,YAA+B,OAAO,GAAE,oBAAyB,EAahE;IAED,IAAI,IAAI,YAAY,CAoCnB;IAED,SAAS,CAAC,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,GAAG,SAAS,EAAE,CAKrE;IAED,+HAA+H;IAC/H,SAAS,CAAC,OAAO,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,MAAM,EAAE,CAGnD;IAED,sGAAsG;IACtG,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,WAAW,EAAE,OAAO,GAAG,gBAAgB,CAAC,CAYtG;IAED,kGAAkG;IAClG,SAAS,CAAC,YAAY,CAAC,QAAQ,EAAE,SAAS,MAAM,EAAE,EAAE,UAAU,EAAE;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,GAAG,IAAI,CAcxF;IAED,mGAAmG;IACnG,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAE3F;CACJ"}
1
+ {"version":3,"file":"project-loader.d.ts","sourceRoot":"","sources":["../../src/project/project-loader.ts"],"names":[],"mappings":"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"}
@@ -5,14 +5,17 @@ import { DEFAULT_ENTRY, PUBLIC_DIR, TARGETS } from '../constants.js';
5
5
  import { ExpressionEvaluator } from '../expression/expression-evaluator.js';
6
6
  import { ComponentCollector } from './component-collector.js';
7
7
  import { ConfigLoader } from './config-loader.js';
8
+ import { ConfigSchema } from './config-schema.js';
8
9
  import { EnvOverrides } from './env-overrides.js';
9
10
  import { ModuleResolver } from './module-resolver.js';
11
+ import { PageScanner } from './page-scanner.js';
10
12
  /**
11
13
  * Builds the project model from package.json and cell*.yml files only. No project code runs, so it
12
14
  * is cheap enough for `cell info` and editor tooling (docs/design/agent-first.md R2).
13
15
  */
14
16
  export class ProjectLoader {
15
17
  options;
18
+ loadedSchema;
16
19
  root;
17
20
  mode;
18
21
  env;
@@ -31,14 +34,38 @@ export class ProjectLoader {
31
34
  this.mode = options.mode ?? [];
32
35
  this.env = options.env ?? process.env;
33
36
  }
34
- load() {
37
+ /**
38
+ * Reads the configuration files and the schemas and checks the files against the merged schema,
39
+ * without building the model: `cell check` reports each problem on its own.
40
+ */
41
+ validate() {
42
+ const { schema, problems } = this.read();
43
+ return { schema, problems };
44
+ }
45
+ read() {
35
46
  const collector = new ComponentCollector(this.root, new Set(this.options.disabled));
36
47
  const components = collector.collect();
37
48
  this.checkFilters(collector.excluded, components);
49
+ const configLoader = new ConfigLoader(this.mode);
50
+ const layers = configLoader.read(components);
51
+ const schema = ConfigSchema.load(components, layers);
52
+ this.loadedSchema = schema;
53
+ const problems = layers.flatMap(layer => schema.validate(layer.doc, layer.file, layer.text));
54
+ return { components, configLoader, layers, schema, problems };
55
+ }
56
+ /** The merged configuration schema; available after {@link load} or {@link validate}. */
57
+ get schema() {
58
+ if (!this.loadedSchema) {
59
+ throw new Error('ProjectLoader.schema is read before load() or validate().');
60
+ }
61
+ return this.loadedSchema;
62
+ }
63
+ load() {
64
+ const { components, configLoader, layers, schema, problems } = this.read();
65
+ ProjectLoader.throwProblems(problems);
38
66
  const runtimeDisabled = new Set(this.options.runtimeDisabled);
39
67
  const runtime = components.filter(c => !runtimeDisabled.has(c.name));
40
- const configLoader = new ConfigLoader(this.mode);
41
- const merged = configLoader.load(components);
68
+ const merged = configLoader.merge(layers);
42
69
  const targets = this.targets(components);
43
70
  const model = {
44
71
  schemaVersion: 1,
@@ -49,25 +76,57 @@ export class ProjectLoader {
49
76
  };
50
77
  const moduleResolver = new ModuleResolver();
51
78
  const overrides = new EnvOverrides(this.root, this.env);
79
+ // Where the server finds the frontend; `${paths.public}` in cell.yml (serve-static) refers to it.
80
+ merged.paths = { public: PUBLIC_DIR, ...merged.paths };
81
+ const types = schema.types(merged);
52
82
  for (const target of targets) {
53
- const config = configLoader.forTarget(merged, target);
54
- if (target === 'backend') {
55
- // Where the server finds the frontend; `${paths.public}` in cell.yml (serve-static) refers to it.
56
- config.paths = { public: PUBLIC_DIR, ...config.paths };
57
- }
58
- const envOverrides = target === 'frontend' ? overrides.apply(target, config) : overrides.preview(target, config);
83
+ const config = target === 'frontend'
84
+ ? this.frontendConfig(merged, schema, overrides, types)
85
+ : { config: structuredClone(merged), envOverrides: overrides.preview(merged, types) };
59
86
  const targetModel = {
60
87
  target,
61
88
  ...this.entry(target, runtime),
62
89
  staticModules: [...runtime.flatMap(c => moduleResolver.resolve(c, target, 'staticModules')), ...this.extraModules(target, true)],
63
90
  modules: [...runtime.flatMap(c => moduleResolver.resolve(c, target, 'modules')), ...this.extraModules(target, false)],
64
- config: this.evaluate(target, config),
65
- envOverrides,
91
+ config: config.config,
92
+ ...(target === 'backend' ? { configTypes: types } : {}),
93
+ envOverrides: config.envOverrides,
66
94
  };
95
+ if (target === 'frontend') {
96
+ targetModel.routes = new PageScanner(this.root).scan();
97
+ }
67
98
  model[target] = targetModel;
68
99
  }
69
100
  return model;
70
101
  }
102
+ /**
103
+ * The browser sees only the keys the schemas mark public: the variables apply to the whole
104
+ * configuration (a public key may refer to another one), the public keys are evaluated, then picked.
105
+ */
106
+ frontendConfig(merged, schema, overrides, types) {
107
+ const config = structuredClone(merged);
108
+ delete config.paths;
109
+ const envOverrides = overrides.apply(config, types);
110
+ new ExpressionEvaluator(this.root).evaluate(config, { env: ExpressionEvaluator.definedEnv(this.env) }, { types, include: path => schema.isPublic(path) });
111
+ return { config: schema.project(config), envOverrides };
112
+ }
113
+ /** All problems of the configuration files in one error, the first one's file and line as its location. */
114
+ static throwProblems(problems) {
115
+ if (problems.length === 0) {
116
+ return;
117
+ }
118
+ const [first] = problems;
119
+ const lines = problems.slice(0, 20).map(p => ` ${p.file}${p.line ? `:${p.line}` : ''} ${p.path}: ${p.message} ${p.hint}`);
120
+ throw new CellError({
121
+ code: 'CELL_CONFIG_INVALID',
122
+ message: problems.length === 1
123
+ ? `${first.message}`
124
+ : `${problems.length} problems in the configuration files:\n${lines.join('\n')}${problems.length > 20 ? '\n ...' : ''}`,
125
+ file: first.file,
126
+ line: first.line,
127
+ hint: problems.length === 1 ? first.hint : 'Fix each reported key; the keys of every component are in .cell/schema/cell.yml.json.',
128
+ });
129
+ }
71
130
  extraModules(target, isStatic) {
72
131
  const importer = join(this.root, 'package.json');
73
132
  return (this.options.extraModules ?? [])
@@ -109,9 +168,5 @@ export class ProjectLoader {
109
168
  });
110
169
  }
111
170
  }
112
- /** The browser has no runtime environment, so frontend expressions are evaluated at build time. */
113
- evaluate(target, config) {
114
- return target === 'frontend' ? new ExpressionEvaluator(this.root).evaluate(config, { env: { ...this.env } }) : config;
115
- }
116
171
  }
117
172
  //# sourceMappingURL=project-loader.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"project-loader.js","sourceRoot":"","sources":["../../src/project/project-loader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,SAAS,EAAoE,MAAM,aAAa,CAAC;AAC1G,OAAO,EAAE,aAAa,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAE5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAgCtD;;;GAGG;AACH,MAAM,OAAO,aAAa;IAKS,OAAO;IAJnB,IAAI,CAAS;IACb,IAAI,CAAW;IACf,GAAG,CAAqC;IAE3D,YAA+B,OAAO,GAAyB,EAAE;uBAAlC,OAAO;QAClC,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC;QAC3C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,SAAS,CAAC;gBAChB,IAAI,EAAE,wBAAwB;gBAC9B,OAAO,EAAE,sBAAsB,IAAI,GAAG;gBACtC,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;gBAChC,IAAI,EAAE,sDAAsD;aAC/D,CAAC,CAAC;QACP,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;QAC/B,IAAI,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;QAC/B,IAAI,CAAC,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAC1C,CAAC;IAED,IAAI;QACA,MAAM,SAAS,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;QACpF,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC;QACvC,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;QAClD,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;QAC9D,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;QACrE,MAAM,YAAY,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACjD,MAAM,MAAM,GAAG,YAAY,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAC7C,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QACzC,MAAM,KAAK,GAAiB;YACxB,aAAa,EAAE,CAAC;YAChB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC;YACpB,OAAO;YACP,UAAU,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC;SACzE,CAAC;QACF,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;QAC5C,MAAM,SAAS,GAAG,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QACxD,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;YAC3B,MAAM,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACtD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;gBACvB,kGAAkG;gBAClG,MAAM,CAAC,KAAK,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,GAAI,MAAM,CAAC,KAAgB,EAAE,CAAC;YACvE,CAAC;YACD,MAAM,YAAY,GAAG,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;YACjH,MAAM,WAAW,GAAgB;gBAC7B,MAAM;gBACN,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC;gBAC9B,aAAa,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,eAAe,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;gBAChI,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;gBACrH,MAAM,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBACrC,YAAY;aACf,CAAC;YACF,KAAK,CAAC,MAAM,CAAC,GAAG,WAAW,CAAC;QAChC,CAAC;QACD,OAAO,KAAK,CAAC;IACjB,CAAC;IAES,YAAY,CAAC,MAAc,EAAE,QAAiB;QACpD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,EAAE,CAAC;aACnC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,CAAC,CAAC,MAAM,IAAI,KAAK,CAAC,KAAK,QAAQ,CAAC;aACpE,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC,SAAS,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;IAClF,CAAC;IAED,+HAA+H;IACrH,OAAO,CAAC,UAAuB;QACrC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,SAAS,EAAE,GAAG,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,CAAC;QAC3G,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;IACrD,CAAC;IAED,sGAAsG;IAC5F,KAAK,CAAC,MAAc,EAAE,UAAuB;QACnD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC;QAC9C,IAAI,QAAQ,EAAE,CAAC;YACX,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;QAC/B,CAAC;QACD,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QACpC,MAAM,QAAQ,GAAG,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5H,MAAM,OAAO,GAAG,IAAI,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QACtE,IAAI,CAAC,QAAQ,IAAI,CAAC,OAAO,EAAE,CAAC;YACxB,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAC;QACpC,CAAC;QACD,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,IAAI,IAAI,OAAO,EAAE,EAAE,cAAc,EAAE,QAAQ,CAAC,IAAI,EAAE,CAAC;IACjI,CAAC;IAED,kGAAkG;IACxF,YAAY,CAAC,QAA2B,EAAE,UAA8B;QAC9E,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAC1C,MAAM,OAAO,GAAG;YACZ,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;YACzE,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC;SACzG,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,SAAS,CAAC;gBAChB,IAAI,EAAE,0BAA0B;gBAChC,OAAO,EAAE,oCAAoC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG;gBAC5H,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC;gBACrC,IAAI,EAAE,2IAA2I;aACpJ,CAAC,CAAC;QACP,CAAC;IACL,CAAC;IAED,mGAAmG;IACzF,QAAQ,CAAC,MAAc,EAAE,MAA+B;QAC9D,OAAO,MAAM,KAAK,UAAU,CAAC,CAAC,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IAC1H,CAAC;CACJ"}
1
+ {"version":3,"file":"project-loader.js","sourceRoot":"","sources":["../../src/project/project-loader.ts"],"names":[],"mappings":"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"}