@celljs/vite 4.3.0 → 4.4.1

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 (116) 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 +23 -2
  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 +17 -2
  45. package/lib/plugin/cell-plugin.d.ts.map +1 -1
  46. package/lib/plugin/cell-plugin.js +63 -5
  47. package/lib/plugin/cell-plugin.js.map +1 -1
  48. package/lib/plugin/cell-plugin.spec.js +15 -0
  49. package/lib/plugin/cell-plugin.spec.js.map +1 -1
  50. package/lib/plugin/class-name-util.d.ts +14 -0
  51. package/lib/plugin/class-name-util.d.ts.map +1 -0
  52. package/lib/plugin/class-name-util.js +82 -0
  53. package/lib/plugin/class-name-util.js.map +1 -0
  54. package/lib/plugin/class-name-util.spec.d.ts +2 -0
  55. package/lib/plugin/class-name-util.spec.d.ts.map +1 -0
  56. package/lib/plugin/class-name-util.spec.js +37 -0
  57. package/lib/plugin/class-name-util.spec.js.map +1 -0
  58. package/lib/project/browser-dependency-scanner.d.ts +29 -0
  59. package/lib/project/browser-dependency-scanner.d.ts.map +1 -0
  60. package/lib/project/browser-dependency-scanner.js +96 -0
  61. package/lib/project/browser-dependency-scanner.js.map +1 -0
  62. package/lib/project/browser-dependency-scanner.spec.d.ts +2 -0
  63. package/lib/project/browser-dependency-scanner.spec.d.ts.map +1 -0
  64. package/lib/project/browser-dependency-scanner.spec.js +41 -0
  65. package/lib/project/browser-dependency-scanner.spec.js.map +1 -0
  66. package/lib/project/config-loader.d.ts +6 -6
  67. package/lib/project/config-loader.d.ts.map +1 -1
  68. package/lib/project/config-loader.js +16 -22
  69. package/lib/project/config-loader.js.map +1 -1
  70. package/lib/project/config-schema.d.ts +107 -0
  71. package/lib/project/config-schema.d.ts.map +1 -0
  72. package/lib/project/config-schema.js +522 -0
  73. package/lib/project/config-schema.js.map +1 -0
  74. package/lib/project/config-schema.spec.d.ts +2 -0
  75. package/lib/project/config-schema.spec.d.ts.map +1 -0
  76. package/lib/project/config-schema.spec.js +248 -0
  77. package/lib/project/config-schema.spec.js.map +1 -0
  78. package/lib/project/env-overrides.d.ts +14 -10
  79. package/lib/project/env-overrides.d.ts.map +1 -1
  80. package/lib/project/env-overrides.js +28 -19
  81. package/lib/project/env-overrides.js.map +1 -1
  82. package/lib/project/env-overrides.spec.js +23 -13
  83. package/lib/project/env-overrides.spec.js.map +1 -1
  84. package/lib/project/page-scanner.d.ts +26 -0
  85. package/lib/project/page-scanner.d.ts.map +1 -0
  86. package/lib/project/page-scanner.js +102 -0
  87. package/lib/project/page-scanner.js.map +1 -0
  88. package/lib/project/page-scanner.spec.d.ts +2 -0
  89. package/lib/project/page-scanner.spec.d.ts.map +1 -0
  90. package/lib/project/page-scanner.spec.js +68 -0
  91. package/lib/project/page-scanner.spec.js.map +1 -0
  92. package/lib/project/project-loader.d.ts +32 -3
  93. package/lib/project/project-loader.d.ts.map +1 -1
  94. package/lib/project/project-loader.js +70 -15
  95. package/lib/project/project-loader.js.map +1 -1
  96. package/lib/project/project-loader.spec.js +78 -56
  97. package/lib/project/project-loader.spec.js.map +1 -1
  98. package/lib/testing/test-app.spec.js +3 -3
  99. package/lib/testing/test-app.spec.js.map +1 -1
  100. package/package.json +7 -7
  101. package/src/constants.ts +0 -3
  102. package/src/dev/cell-dev-server.ts +39 -5
  103. package/src/expression/expression-evaluator.ts +16 -3
  104. package/src/generator/config-generator.ts +7 -5
  105. package/src/generator/html-generator.ts +3 -3
  106. package/src/generator/route-generator.ts +34 -0
  107. package/src/index.ts +1 -0
  108. package/src/output/output-writer.ts +12 -0
  109. package/src/plugin/cell-plugin.ts +68 -6
  110. package/src/plugin/class-name-util.ts +85 -0
  111. package/src/project/browser-dependency-scanner.ts +102 -0
  112. package/src/project/config-loader.ts +18 -23
  113. package/src/project/config-schema.ts +596 -0
  114. package/src/project/env-overrides.ts +33 -22
  115. package/src/project/page-scanner.ts +105 -0
  116. package/src/project/project-loader.ts +82 -17
@@ -9,17 +9,31 @@ describe('ProjectLoader', () => {
9
9
  function project() {
10
10
  fixture = new FixtureProject('loader')
11
11
  .file('package.json', { name: 'app', dependencies: { '@x/a': '*', '@x/b': '*', 'not-a-component': '*' } })
12
- .dependency('@x/c', { cell: { modules: { backend: ['lib/node/module'] } } }, { 'cell.yml': 'cell:\n owner: c\n list: [1, 2]\n' })
13
- .dependency('@x/a', { dependencies: { '@x/c': '*' }, cell: { targets: ['frontend'], staticModules: { frontend: ['lib/browser/static-module'] } } }, { 'cell.yml': 'cell:\n owner: a\n' })
14
- .dependency('@x/b', { cell: { optionalDependencies: ['pg-native'] } }, { 'cell.yml': 'backend:\n cell:\n secret: from-b\n', 'cell.test.yml': 'cell:\n owner: b-test\n' })
12
+ .dependency('@x/c', { cell: { modules: { backend: ['lib/node/module'] } } }, {
13
+ 'cell.yml': 'shared:\n owner: c\n list: [1, 2]\n',
14
+ 'cell.schema.json': JSON.stringify({
15
+ properties: {
16
+ shared: { type: 'object', properties: { owner: { type: 'string' }, list: { type: 'array', 'x-cell-public': true } } },
17
+ site: {
18
+ type: 'object',
19
+ 'x-cell-public': true,
20
+ properties: { greeting: { type: 'string' }, port: { type: 'integer' }, endpoint: { type: 'string' } },
21
+ },
22
+ },
23
+ }),
24
+ })
25
+ .dependency('@x/a', { dependencies: { '@x/c': '*' }, cell: { targets: ['frontend'], staticModules: { frontend: ['lib/browser/static-module'] } } }, { 'cell.yml': 'shared:\n owner: a\n' })
26
+ .dependency('@x/b', { cell: { optionalDependencies: ['pg-native'] } },
27
+ // No schema: the component owns the top-level keys of its cell.yml.
28
+ { 'cell.yml': 'vault:\n secret: from-b\n', 'cell.test.yml': 'shared:\n owner: b-test\n' })
15
29
  .dependency('not-a-component')
16
30
  .file('cell.yml', [
17
- 'cell:',
31
+ 'shared:',
18
32
  ' list: [9]',
19
- ' greeting: "Hello ${env.CELL_TEST_NAME ?: \'nobody\'}"',
20
- ' server:',
21
- ' port: 3000',
22
- ' endpoint: http://localhost:${cell.server.port}',
33
+ 'site:',
34
+ ' greeting: "Hello ${env.CELL_TEST_NAME ?? \'nobody\'}"',
35
+ ' port: 3000',
36
+ ' endpoint: http://localhost:${site.port}',
23
37
  ].join('\n'))
24
38
  .file('src/common/module.ts', 'export default {};')
25
39
  .file('src/node/module.ts', 'export default {};')
@@ -42,70 +56,73 @@ describe('ProjectLoader', () => {
42
56
  expect(model.frontend?.staticModules.map(m => m.specifier)).toEqual(['@x/a/lib/browser/static-module']);
43
57
  expect(model.backend?.staticModules).toEqual([]);
44
58
  });
45
- it('merges layers in order, replaces arrays and drops tooling keys', () => {
59
+ it('merges layers in order and replaces arrays', () => {
46
60
  const model = new ProjectLoader({ root: project().root, mode: ['test'] }).load();
47
61
  const config = model.backend.config;
48
- expect(config.cell.owner).toBe('b-test');
49
- expect(config.cell.list).toEqual([9]);
50
- expect(config.cell.secret).toBe('from-b');
62
+ expect(config.shared).toEqual({ owner: 'b-test', list: [9] });
63
+ expect(config.vault.secret).toBe('from-b');
51
64
  expect(config.mode).toEqual(['test']);
52
- for (const key of ['frontend', 'backend']) {
53
- expect(key in config).toBe(false);
54
- }
55
65
  expect(model.components.find(c => c.name === '@x/b')?.configFiles.map(f => basename(f))).toEqual(['cell.yml', 'cell.test.yml']);
56
66
  });
57
- it('keeps the target sections apart', () => {
67
+ it('gives the frontend only the keys the schemas mark public', () => {
58
68
  const model = new ProjectLoader({ root: project().root }).load();
59
- expect(model.frontend.config.cell.secret).toBeUndefined();
69
+ const frontend = model.frontend.config;
70
+ expect(Object.keys(frontend).sort()).toEqual(['mode', 'shared', 'site'].filter(k => k !== 'mode' || 'mode' in frontend).sort());
71
+ expect(frontend.shared).toEqual({ list: [9] });
72
+ expect(frontend.vault).toBeUndefined();
60
73
  });
61
74
  it('evaluates frontend expressions now and leaves backend ones for the runtime', () => {
62
- process.env.CELL_TEST_NAME = 'agent';
63
- try {
64
- const model = new ProjectLoader({ root: project().root }).load();
65
- expect(model.frontend.config.cell.greeting).toBe('Hello agent');
66
- expect(model.frontend.config.cell.server.endpoint).toBe('http://localhost:3000');
67
- expect(model.backend.config.cell.greeting).toBe("Hello ${env.CELL_TEST_NAME ?: 'nobody'}");
68
- }
69
- finally {
70
- delete process.env.CELL_TEST_NAME;
71
- }
75
+ const model = new ProjectLoader({ root: project().root, env: { CELL_TEST_NAME: 'agent' } }).load();
76
+ expect(model.frontend.config.site).toEqual({ greeting: 'Hello agent', port: 3000, endpoint: 'http://localhost:3000' });
77
+ expect(model.backend.config.site.greeting).toBe("Hello ${env.CELL_TEST_NAME ?? 'nobody'}");
78
+ // An empty variable counts as unset.
79
+ expect(new ProjectLoader({ root: fixture.root, env: { CELL_TEST_NAME: '' } }).load().frontend.config.site.greeting).toBe('Hello nobody');
72
80
  });
73
- it('applies CELL_FRONTEND__ variables before evaluating and reports what CELL_BACKEND__ ones would do', () => {
81
+ it('applies CELL_ variables before evaluating the frontend and reports what the server would do', () => {
74
82
  const env = {
75
- CELL_FRONTEND__SERVER__PORT: '8080',
76
- CELL_FRONTEND__LIST: '${[cell.server.port, 1]}',
77
- CELL_FRONTEND__OWNR: 'x',
78
- CELL_BACKEND__SERVER__PORT: '9090',
83
+ CELL_SITE__PORT: '8080',
84
+ CELL_SHARED__LIST: '${[site.port, 1]}',
85
+ CELL_SHARED__OWNR: 'x',
86
+ CELL_VAULT__SECRET: 'from-env',
79
87
  CELL_TEST_NAME: 'env',
80
88
  };
81
89
  const model = new ProjectLoader({ root: project().root, env }).load();
82
90
  const frontend = model.frontend.config;
83
- expect(frontend.cell.server).toEqual({ port: 8080, endpoint: 'http://localhost:8080' });
84
- expect(frontend.cell.greeting).toBe('Hello env');
91
+ expect(frontend.site).toEqual({ greeting: 'Hello env', port: 8080, endpoint: 'http://localhost:8080' });
85
92
  // A value that is one expression is evaluated with the rest, so it may produce any type.
86
- expect(frontend.cell.list).toEqual([8080, 1]);
87
- expect(model.frontend.envOverrides.applied).toEqual([
88
- { variable: 'CELL_FRONTEND__LIST', path: 'cell.list' },
89
- { variable: 'CELL_FRONTEND__SERVER__PORT', path: 'cell.server.port' },
90
- ]);
91
- expect(model.frontend.envOverrides.problems).toEqual([
92
- {
93
- variable: 'CELL_FRONTEND__OWNR',
94
- message: expect.stringContaining("no key 'OWNR' at the top level (keys: cell, mode) or under cell (keys: owner, list,"),
95
- },
96
- ]);
97
- // The server applies backend variables at startup, so the model keeps the configuration as built.
98
- expect(model.backend.config.cell.server.port).toBe(3000);
99
- expect(model.backend.envOverrides).toEqual({ applied: [{ variable: 'CELL_BACKEND__SERVER__PORT', path: 'cell.server.port' }], problems: [] });
93
+ expect(frontend.shared.list).toEqual([8080, 1]);
94
+ expect(frontend.vault).toBeUndefined();
95
+ const report = {
96
+ applied: [
97
+ { variable: 'CELL_SHARED__LIST', path: 'shared.list' },
98
+ { variable: 'CELL_SITE__PORT', path: 'site.port' },
99
+ { variable: 'CELL_VAULT__SECRET', path: 'vault.secret' },
100
+ ],
101
+ problems: [{ variable: 'CELL_SHARED__OWNR', message: expect.stringContaining("no key 'OWNR' under shared (keys: owner, list)") }],
102
+ };
103
+ expect(model.frontend.envOverrides).toEqual(report);
104
+ // The server applies the variables at startup, so the model keeps the configuration as built.
105
+ expect(model.backend.config.site.port).toBe(3000);
106
+ expect(model.backend.envOverrides).toEqual(report);
100
107
  expect(new ProjectLoader({ root: fixture.root, env: {} }).load().backend.envOverrides).toEqual({ applied: [], problems: [] });
101
108
  });
109
+ it('converts expressions of number and boolean keys: the backend gets their schema types', () => {
110
+ fixture = project();
111
+ fixture.file('cell.yml', 'site:\n port: ${env.PORT ?? 3000}\n');
112
+ const model = new ProjectLoader({ root: fixture.root, env: { PORT: '4000' } }).load();
113
+ expect(model.backend.configTypes).toEqual({ 'site.port': 'integer' });
114
+ expect(model.frontend.config.site.port).toBe(4000);
115
+ });
116
+ it('rejects configuration keys that no component owns', () => {
117
+ fixture = project();
118
+ fixture.file('cell.yml', 'shared:\n ownr: x\n');
119
+ expect(() => new ProjectLoader({ root: fixture.root }).load()).toThrow(expect.objectContaining({ code: 'CELL_CONFIG_INVALID', line: 2 }));
120
+ });
102
121
  it('gives the backend paths.public, relative to the output directory, so it can be overridden like any key', () => {
103
- const model = new ProjectLoader({ root: project().root, env: { CELL_BACKEND__PATHS__PUBLIC: '/srv/www' } }).load();
122
+ const model = new ProjectLoader({ root: project().root, env: { CELL_PATHS__PUBLIC: '/srv/www' } }).load();
104
123
  expect(model.backend.config.paths).toEqual({ public: 'public' });
105
124
  expect(model.frontend.config.paths).toBeUndefined();
106
- expect(model.backend.envOverrides).toEqual({ applied: [{ variable: 'CELL_BACKEND__PATHS__PUBLIC', path: 'paths.public' }], problems: [] });
107
- fixture.file('cell.yml', 'paths:\n public: static\n uploads: files\n');
108
- expect(new ProjectLoader({ root: fixture.root }).load().backend.config.paths).toEqual({ public: 'static', uploads: 'files' });
125
+ expect(model.backend.envOverrides).toEqual({ applied: [{ variable: 'CELL_PATHS__PUBLIC', path: 'paths.public' }], problems: [] });
109
126
  });
110
127
  it('collects optional dependencies and uses the default entry', () => {
111
128
  const model = new ProjectLoader({ root: project().root }).load();
@@ -117,6 +134,8 @@ describe('ProjectLoader', () => {
117
134
  });
118
135
  it('builds the backend plus the targets components declare, or exactly the explicit ones', () => {
119
136
  expect(new ProjectLoader({ root: project().root }).load().targets).toEqual(['frontend', 'backend']);
137
+ // Without @x/a and @x/c, nothing owns the keys of the project's cell.yml.
138
+ fixture.file('cell.yml', '');
120
139
  expect(new ProjectLoader({ root: fixture.root, disabled: ['@x/a'] }).load().targets).toEqual(['backend']);
121
140
  expect(new ProjectLoader({ root: fixture.root, targets: ['frontend'] }).load().targets).toEqual(['frontend']);
122
141
  fixture.dispose();
@@ -142,7 +161,7 @@ describe('ProjectLoader', () => {
142
161
  expect(load({ entryName: 'http' }).backend).toMatchObject({ entry: fixture.path('src/server.ts'), entryComponent: 'app' });
143
162
  });
144
163
  it('reports YAML errors with code, file and line', () => {
145
- fixture = new FixtureProject('yaml').file('package.json', { name: 'app' }).file('cell.yml', 'cell:\n a: 1\n b: [\n');
164
+ fixture = new FixtureProject('yaml').file('package.json', { name: 'app' }).file('cell.yml', 'app:\n a: 1\n b: [\n');
146
165
  try {
147
166
  new ProjectLoader({ root: fixture.root }).load();
148
167
  throw new Error('expected an error');
@@ -155,15 +174,18 @@ describe('ProjectLoader', () => {
155
174
  }
156
175
  });
157
176
  it('leaves out disabled components with the dependencies only they lead to', () => {
158
- const model = new ProjectLoader({ root: project().root, disabled: ['@x/a'] }).load();
177
+ const root = project().root;
178
+ expect(() => new ProjectLoader({ root, disabled: ['@x/a'] }).load()).toThrow(expect.objectContaining({ code: 'CELL_CONFIG_INVALID' }));
179
+ fixture.file('cell.yml', 'vault:\n secret: mine\n');
180
+ const model = new ProjectLoader({ root, disabled: ['@x/a'] }).load();
159
181
  expect(model.components.map(c => c.name)).toEqual(['@x/b', 'app']);
160
- expect(model.backend.config.cell.owner).toBeUndefined();
182
+ expect(model.backend.config.shared).toBeUndefined();
161
183
  expect(model.backend?.modules.map(m => m.component)).toEqual(['app', 'app']);
162
184
  });
163
185
  it('drops only the DI modules of runtime-disabled components', () => {
164
186
  const model = new ProjectLoader({ root: project().root, runtimeDisabled: ['@x/c', '@x/a'] }).load();
165
187
  expect(model.components.map(c => c.name)).toEqual(['@x/c', '@x/a', '@x/b', 'app']);
166
- expect(model.backend.config.cell.owner).toBe('a');
188
+ expect(model.backend.config.shared.owner).toBe('a');
167
189
  expect(model.backend?.modules.map(m => m.component)).toEqual(['app', 'app']);
168
190
  expect(model.frontend?.staticModules).toEqual([]);
169
191
  });
@@ -1 +1 @@
1
- {"version":3,"file":"project-loader.spec.js","sourceRoot":"","sources":["../../src/project/project-loader.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"project-loader.spec.js","sourceRoot":"","sources":["../../src/project/project-loader.spec.ts"],"names":[],"mappings":"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"}
@@ -7,13 +7,13 @@ const DEPENDENCIES = { '@celljs/core': '*', '@celljs/http': '*', '@celljs/web':
7
7
  function project(name) {
8
8
  return new FixtureProject(name)
9
9
  .file('package.json', { name, dependencies: DEPENDENCIES })
10
- .file('cell.yml', 'backend:\n cell:\n greeting: Hello\n')
11
- .file('cell.test.yml', 'backend:\n cell:\n greeting: Hello from tests\n')
10
+ .file('cell.yml', 'app:\n greeting: Hello\n')
11
+ .file('cell.test.yml', 'app:\n greeting: Hello from tests\n')
12
12
  .file('src/node/greeter.ts', [
13
13
  "import { Component, Value } from '@celljs/core';",
14
14
  '@Component()',
15
15
  'export class Greeter {',
16
- " @Value('cell.greeting') protected readonly greeting: string;",
16
+ " @Value('app.greeting') protected readonly greeting: string;",
17
17
  " greet(name: string): string { return this.greeting + ', ' + name; }",
18
18
  '}',
19
19
  ].join('\n'))
@@ -1 +1 @@
1
- {"version":3,"file":"test-app.spec.js","sourceRoot":"","sources":["../../src/testing/test-app.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"test-app.spec.js","sourceRoot":"","sources":["../../src/testing/test-app.spec.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@celljs/vite",
3
- "version": "4.3.0",
3
+ "version": "4.4.1",
4
4
  "description": "Vite plugin that builds Cell applications: component graph, DI container, configuration and single-file server output.",
5
5
  "type": "module",
6
6
  "homepage": "https://github.com/cellbang/cell",
@@ -37,16 +37,16 @@
37
37
  "watch": "tsc -b -w --preserveWatchOutput"
38
38
  },
39
39
  "dependencies": {
40
- "@celljs/kit": "4.3.0",
40
+ "@celljs/kit": "4.4.1",
41
41
  "js-yaml": "^4.1.1",
42
42
  "vite": "^8.3.6"
43
43
  },
44
44
  "devDependencies": {
45
- "@celljs/core": "4.3.0",
46
- "@celljs/express-adapter": "4.3.0",
47
- "@celljs/http": "4.3.0",
48
- "@celljs/mvc": "4.3.0",
49
- "@celljs/web": "4.3.0",
45
+ "@celljs/core": "4.4.1",
46
+ "@celljs/express-adapter": "4.4.1",
47
+ "@celljs/http": "4.4.1",
48
+ "@celljs/mvc": "4.4.1",
49
+ "@celljs/web": "4.4.1",
50
50
  "@types/js-yaml": "^4.0.9"
51
51
  }
52
52
  }
package/src/constants.ts CHANGED
@@ -9,9 +9,6 @@ export const DEFAULT_ENTRY = '@celljs/core/lib/common/application/application-en
9
9
  export const ENVIRONMENT_OF: Record<Target, string> = { frontend: 'client', backend: 'server' };
10
10
  export const TARGET_OF: Record<string, Target> = { client: 'frontend', server: 'backend' };
11
11
 
12
- /** Keys of the merged cell.yml that are not application configuration as such: the target sections and the mode. */
13
- export const TOOLING_KEYS = ['mode', 'frontend', 'backend'];
14
-
15
12
  /** Directory of the frontend output inside the output directory; the backend default of `paths.public`. */
16
13
  export const PUBLIC_DIR = 'public';
17
14
 
@@ -3,8 +3,10 @@ import type { IncomingMessage, ServerResponse } from 'node:http';
3
3
  import { basename, dirname, extname, isAbsolute, join, normalize, sep } from 'node:path';
4
4
  import { CellError, type ProjectModel } from '@celljs/kit';
5
5
  import { type InlineConfig, type Logger, normalizePath, type Plugin, type PluginOption, type UserConfig, type ViteDevServer } from 'vite';
6
+ import { ExpressionEvaluator } from '../expression/expression-evaluator.js';
6
7
  import { CellPlugin, type CellPluginOptions } from '../plugin/cell-plugin.js';
7
8
  import { EnvOverrides } from '../project/env-overrides.js';
9
+ import { PageScanner } from '../project/page-scanner.js';
8
10
 
9
11
  /** What a backend entry hands to the host (`ApplicationHost` of @celljs/core). */
10
12
  export interface StartedApplication {
@@ -25,9 +27,9 @@ export interface DevRequestRecord {
25
27
  }
26
28
 
27
29
  export interface CellDevServerOptions extends CellPluginOptions {
28
- /** Port of the one server for frontend and backend. Default: `cell.server.port` of the backend, else 3000. */
30
+ /** Port of the one server for frontend and backend. Default: `server.port` of the backend, else 3000. */
29
31
  port?: number;
30
- /** Interface to listen on. Default: `cell.server.host` of the backend, else 127.0.0.1. */
32
+ /** Interface to listen on. Default: `server.host` of the backend, else 127.0.0.1. */
31
33
  host?: string;
32
34
  logLevel?: 'info' | 'warn' | 'error' | 'silent';
33
35
  /** Vite logger, e.g. one that writes to stderr for `--json`. */
@@ -256,6 +258,9 @@ export class CellDevServer {
256
258
  this.options.onRestart?.([file]);
257
259
  return;
258
260
  }
261
+ if (this.project.frontend && event !== 'change' && new PageScanner(this.project.root).affects(file)) {
262
+ this.reloadRoutes();
263
+ }
259
264
  if (!this.project.backend || file.split(sep).includes('node_modules')) {
260
265
  return;
261
266
  }
@@ -273,6 +278,28 @@ export class CellDevServer {
273
278
  }
274
279
  }
275
280
 
281
+ /** A page was added or removed: scan the pages again and reload the browser with the new routes. */
282
+ protected reloadRoutes(): void {
283
+ let changed: boolean;
284
+ try {
285
+ changed = this.plugin.refreshRoutes();
286
+ } catch (error) {
287
+ const cellError = CellDevServer.toCellError(error, 'CELL_ROUTE_INVALID');
288
+ this.vite.config.logger.error(`[cell] ${cellError.code}: ${cellError.message}${cellError.hint ? `\n hint: ${cellError.hint}` : ''}`);
289
+ return;
290
+ }
291
+ if (!changed) {
292
+ return;
293
+ }
294
+ const client = this.vite.environments.client;
295
+ for (const module of client.moduleGraph.idToModuleMap.values()) {
296
+ if (module.file?.replace(/\\/g, '/').endsWith(`/${CellPlugin.ROUTES_FILE}`)) {
297
+ client.moduleGraph.invalidateModule(module);
298
+ }
299
+ }
300
+ client.hot.send({ type: 'full-reload' });
301
+ }
302
+
276
303
  protected devPlugin(): Plugin {
277
304
  return {
278
305
  name: 'cell:dev',
@@ -293,9 +320,16 @@ export class CellDevServer {
293
320
  const backend = this.project.backend;
294
321
  const server = { port: undefined as unknown, host: undefined as unknown };
295
322
  if (backend) {
296
- const config = structuredClone(backend.config) as { cell?: { server?: { port?: unknown; host?: unknown } } };
297
- new EnvOverrides(this.project.root, this.options.env ?? process.env).apply('backend', config);
298
- Object.assign(server, config.cell?.server ?? {});
323
+ const env = this.options.env ?? process.env;
324
+ const config = structuredClone(backend.config) as { server?: { port?: unknown; host?: unknown } };
325
+ new EnvOverrides(this.project.root, env).apply(config, backend.configTypes);
326
+ // Only the server keys: the others may use transforms that only the running application has.
327
+ new ExpressionEvaluator(this.project.root).evaluate(
328
+ config,
329
+ { env: ExpressionEvaluator.definedEnv(env) },
330
+ { types: backend.configTypes, include: path => path.startsWith('server.') },
331
+ );
332
+ Object.assign(server, config.server ?? {});
299
333
  }
300
334
  return {
301
335
  port: this.options.port ?? (typeof server.port === 'number' ? server.port : CellDevServer.DEFAULT_PORT),
@@ -5,7 +5,15 @@ import { CellError } from '@celljs/kit';
5
5
  /** What the build uses of `@celljs/core/el` (packages/core/src/common/el/expression-util.ts). */
6
6
  interface ExpressionUtil {
7
7
  evaluateText(text: string, context: object): unknown;
8
- evaluateConfiguration(root: object): void;
8
+ evaluateConfiguration(root: object, options?: EvaluateOptions): void;
9
+ }
10
+
11
+ /** Options of `ExpressionUtil.evaluateConfiguration` the build passes. */
12
+ export interface EvaluateOptions {
13
+ /** Schema types that the text of expressions converts to, by dotted path. */
14
+ types?: Record<string, string>;
15
+ /** Evaluates only the keys whose dotted path it accepts (the keys they refer to are still evaluated). */
16
+ include?: (path: string) => boolean;
9
17
  }
10
18
 
11
19
  /**
@@ -18,6 +26,11 @@ export class ExpressionEvaluator {
18
26
 
19
27
  protected readonly util: ExpressionUtil;
20
28
 
29
+ /** The environment as expressions see it: an empty variable counts as unset, as on the server. */
30
+ static definedEnv(env: Record<string, string | undefined>): Record<string, string> {
31
+ return Object.fromEntries(Object.entries(env).filter((entry): entry is [string, string] => entry[1] !== undefined && entry[1] !== ''));
32
+ }
33
+
21
34
  constructor(root: string) {
22
35
  this.util = ExpressionEvaluator.utilFor(root);
23
36
  }
@@ -62,13 +75,13 @@ export class ExpressionEvaluator {
62
75
  * Evaluates `target` in place and returns it. The objects of `extra` (e.g. `env`) are visible to the
63
76
  * expressions as they are, without being evaluated, and are removed afterwards.
64
77
  */
65
- evaluate<T extends Record<string, unknown>>(target: T, extra: Record<string, object> = {}): T {
78
+ evaluate<T extends Record<string, unknown>>(target: T, extra: Record<string, object> = {}, options: EvaluateOptions = {}): T {
66
79
  const root: Record<string, unknown> = target;
67
80
  for (const [key, value] of Object.entries(extra)) {
68
81
  root[key] = { ...value, _ignoreEl: true };
69
82
  }
70
83
  try {
71
- this.util.evaluateConfiguration(root);
84
+ this.util.evaluateConfiguration(root, options);
72
85
  } catch (cause) {
73
86
  throw this.error(cause, (cause as Error).message);
74
87
  } finally {
@@ -4,8 +4,9 @@ import { PUBLIC_DIR } from '../constants.js';
4
4
  /**
5
5
  * Generates the code that replaces @celljs/core's `common/config/dynamic-config.js`. Backend
6
6
  * `${...}` expressions stay as strings: @celljs/core evaluates them at runtime against the config
7
- * and `process.env`, so one build serves every environment. `CELL_BACKEND__*` environment variables
8
- * override keys at startup, then `paths.public` (relative to the output directory) becomes absolute.
7
+ * and `process.env`, converting them to the schema types of `types`, so one build serves every
8
+ * environment. `CELL_*` environment variables override keys at startup, then `paths.public`
9
+ * (relative to the output directory) becomes absolute.
9
10
  */
10
11
  export class ConfigGenerator {
11
12
  constructor(
@@ -15,7 +16,7 @@ export class ConfigGenerator {
15
16
  protected readonly outputDir?: string,
16
17
  ) {}
17
18
 
18
- generate(config: Record<string, unknown>): string {
19
+ generate(config: Record<string, unknown>, types: Record<string, string> = {}): string {
19
20
  const lines = ['// Generated by @celljs/vite. Do not edit.'];
20
21
  if (this.target === 'backend') {
21
22
  if (this.format === 'esm' && !this.outputDir) {
@@ -26,6 +27,7 @@ export class ConfigGenerator {
26
27
  lines.push("import { EnvConfigUtil } from './env-config-util.js';");
27
28
  }
28
29
  lines.push(`export const config = ${JSON.stringify(config)};`);
30
+ lines.push(`export const types = ${JSON.stringify(this.target === 'backend' ? types : {})};`);
29
31
  if (this.target === 'backend') {
30
32
  const outputDir = this.outputDir
31
33
  ? JSON.stringify(this.outputDir)
@@ -33,8 +35,8 @@ export class ConfigGenerator {
33
35
  ? "fileURLToPath(new URL('..', import.meta.url))"
34
36
  : "join(__dirname, '..')";
35
37
  lines.push(`config.paths = { public: '${PUBLIC_DIR}', ...config.paths };`);
36
- // CELL_BACKEND__* variables override keys before any ${...} is evaluated.
37
- lines.push('EnvConfigUtil.applyProcessEnv(config);');
38
+ // CELL_* variables override keys before any ${...} is evaluated.
39
+ lines.push('EnvConfigUtil.applyProcessEnv(config, types);');
38
40
  // paths.public is relative to the output directory (the parent of server/), unless absolute or an expression.
39
41
  lines.push(
40
42
  `const publicDir = config.paths.public; if (typeof publicDir === 'string' && !isAbsolute(publicDir) && !publicDir.includes('$' + '{')) config.paths.public = join(${outputDir}, publicDir);`,
@@ -14,13 +14,13 @@ export class HtmlGenerator {
14
14
  ' <meta http-equiv="X-UA-Compatible" content="edge">',
15
15
  ' <meta name="renderer" content="webkit">',
16
16
  ' <meta charset="UTF-8">',
17
- ' <title>${cell.name}</title>',
17
+ ' <title>${html.title}</title>',
18
18
  ' <style>body { margin: 0; }</style>',
19
- ' <base href="${cell.server.path ?: \'/\'}">',
19
+ ' <base href="${server.path ?? \'/\'}">',
20
20
  ' <link rel="icon" href="favicon.ico" vite-ignore>',
21
21
  ' </head>',
22
22
  ' <body>',
23
- ' <div id="${cell.hostDomId}"></div>',
23
+ ' <div id="${html.rootId}"></div>',
24
24
  ' </body>',
25
25
  '</html>',
26
26
  '',
@@ -0,0 +1,34 @@
1
+ import { join } from 'node:path';
2
+ import type { PageRoute } from '@celljs/kit';
3
+
4
+ /**
5
+ * Generates the code that replaces @celljs/react's `browser/router/dynamic-routes.js`: the pages of
6
+ * `src/browser/pages`, each with a dynamic import of the page and of its layouts, so every page is a
7
+ * chunk loaded when it is visited.
8
+ */
9
+ export class RouteGenerator {
10
+ constructor(protected readonly root: string) {}
11
+
12
+ generate(routes: PageRoute[]): string {
13
+ const items = routes.map(route => {
14
+ const layouts = route.layouts.map(file => `{ file: ${JSON.stringify(file)}, load: ${this.loader(file)} }`).join(', ');
15
+ return [
16
+ ' {',
17
+ ` path: ${JSON.stringify(route.path)},`,
18
+ ` file: ${JSON.stringify(route.file)},`,
19
+ ` load: ${this.loader(route.file)},`,
20
+ ` layouts: [${layouts}],`,
21
+ ' },',
22
+ ].join('\n');
23
+ });
24
+ return [
25
+ '// Generated by @celljs/vite from src/browser/pages. Do not edit.',
26
+ `export const routes = [${items.length ? `\n${items.join('\n')}\n` : ''}];`,
27
+ '',
28
+ ].join('\n');
29
+ }
30
+
31
+ protected loader(file: string): string {
32
+ return `() => import(${JSON.stringify(join(this.root, file).split('\\').join('/'))})`;
33
+ }
34
+ }
package/src/index.ts CHANGED
@@ -12,6 +12,7 @@ export { CellPlugin, type CellPluginOptions, cell } from './plugin/cell-plugin.j
12
12
  export * from './plugin/node-polyfills.js';
13
13
  export * from './project/component-collector.js';
14
14
  export * from './project/config-loader.js';
15
+ export * from './project/config-schema.js';
15
16
  export * from './project/env-overrides.js';
16
17
  export * from './project/module-resolver.js';
17
18
  export * from './project/project-loader.js';
@@ -2,6 +2,7 @@ import { cpSync, existsSync, mkdirSync, rmSync, statSync, writeFileSync } from '
2
2
  import { dirname, join } from 'node:path';
3
3
  import { fileURLToPath } from 'node:url';
4
4
  import type { OutputManifest, ProjectModel } from '@celljs/kit';
5
+ import { ConfigSchema } from '../project/config-schema.js';
5
6
  import { ExternalsCopier } from './externals-copier.js';
6
7
 
7
8
  /** Kept for importers of `@celljs/vite`; the type lives in `@celljs/kit`. */
@@ -55,6 +56,17 @@ export class OutputWriter {
55
56
  this.write(join(this.generatedDir, relative), content);
56
57
  }
57
58
 
59
+ /** The merged configuration schema, for editors (`# yaml-language-server: $schema=...` in cell.yml) and agents. */
60
+ writeSchema(schema: ConfigSchema): void {
61
+ OutputWriter.writeSchema(this.model.root, schema);
62
+ }
63
+
64
+ static writeSchema(root: string, schema: ConfigSchema): void {
65
+ const file = join(root, ConfigSchema.OUTPUT);
66
+ mkdirSync(dirname(file), { recursive: true });
67
+ writeFileSync(file, `${JSON.stringify(schema.toJSON(), null, 2)}\n`);
68
+ }
69
+
58
70
  /**
59
71
  * The file that `copyFrontendFiles` puts at `path` of the public directory (`/favicon.ico`,
60
72
  * `/assets/...`), for `cell dev`, which serves them from where they are. The first component