@celljs/vite 4.0.0 → 4.1.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.
@@ -1,24 +1,28 @@
1
- type Section = string | {
2
- evalSync(ctx: object): unknown;
3
- };
4
- interface ExpressionCompiler {
5
- compileSections(text: string, options: object): Section[];
1
+ import { CellError } from '@celljs/kit';
2
+ /** What the build uses of `@celljs/core/el` (packages/core/src/common/el/expression-util.ts). */
3
+ interface ExpressionUtil {
4
+ evaluateText(text: string, context: object): unknown;
5
+ evaluateConfiguration(root: object): void;
6
6
  }
7
7
  /**
8
- * Evaluates `${...}` expressions with the project's own @celljs/core compiler, so build-time and
9
- * runtime evaluation have identical semantics. The context is the object itself plus `extra`.
8
+ * Evaluates `${...}` expressions with the project's own @celljs/core (`@celljs/core/el`), so build-time
9
+ * and runtime evaluation are the same code: references between keys resolve in any order, and what an
10
+ * expression returns (an environment variable, for instance) is never evaluated again.
10
11
  */
11
12
  export declare class ExpressionEvaluator {
12
- protected static readonly compilers: Map<string, ExpressionCompiler>;
13
- protected readonly compiler: ExpressionCompiler;
13
+ protected static readonly utils: Map<string, ExpressionUtil>;
14
+ protected readonly util: ExpressionUtil;
14
15
  constructor(root: string);
15
- protected static compilerFor(root: string): ExpressionCompiler;
16
- /** Evaluates every string of `target` in place and returns it. */
17
- evaluate<T extends Record<string, unknown>>(target: T, extra?: Record<string, unknown>): T;
16
+ protected static utilFor(root: string): ExpressionUtil;
17
+ protected static loadError(require: NodeJS.Require, root: string, cause: unknown): CellError;
18
+ /**
19
+ * Evaluates `target` in place and returns it. The objects of `extra` (e.g. `env`) are visible to the
20
+ * expressions as they are, without being evaluated, and are removed afterwards.
21
+ */
22
+ evaluate<T extends Record<string, unknown>>(target: T, extra?: Record<string, object>): T;
18
23
  /** Evaluates one text against `ctx`. */
19
24
  evaluateText(text: string, ctx: Record<string, unknown>, path?: string): unknown;
20
- protected run(section: Section, ctx: Record<string, unknown>, text: string, path: string): unknown;
21
- protected walk(node: Record<string, unknown> | unknown[], path: string, ctx: Record<string, unknown>, extra: Record<string, unknown>): void;
25
+ protected error(cause: unknown, message: string): CellError;
22
26
  }
23
27
  export {};
24
28
  //# sourceMappingURL=expression-evaluator.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"expression-evaluator.d.ts","sourceRoot":"","sources":["../../src/expression/expression-evaluator.ts"],"names":[],"mappings":"AAIA,KAAK,OAAO,GAAG,MAAM,GAAG;IAAE,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;CAAE,CAAC;AAE3D,UAAU,kBAAkB;IACxB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;CAC7D;AAED;;;GAGG;AACH,qBAAa,mBAAmB;IAC5B,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,kCAAyC;IAE5E,SAAS,CAAC,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,CAAC;IAEhD,YAAY,IAAI,EAAE,MAAM,EAEvB;IAED,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,kBAAkB,CAY7D;IAED,kEAAkE;IAClE,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM,GAAG,CAAC,CAU7F;IAED,wCAAwC;IACxC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,SAAU,GAAG,OAAO,CAmBhF;IAED,SAAS,CAAC,GAAG,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAgBjG;IAED,SAAS,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAc1I;CACJ"}
1
+ {"version":3,"file":"expression-evaluator.d.ts","sourceRoot":"","sources":["../../src/expression/expression-evaluator.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,iGAAiG;AACjG,UAAU,cAAc;IACpB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC;IACrD,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7C;AAED;;;;GAIG;AACH,qBAAa,mBAAmB;IAC5B,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,8BAAqC;IAEpE,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,cAAc,CAAC;IAExC,YAAY,IAAI,EAAE,MAAM,EAEvB;IAED,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAYrD;IAED,SAAS,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,GAAG,SAAS,CAoB3F;IAED;;;OAGG;IACH,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAM,GAAG,CAAC,CAe5F;IAED,wCAAwC;IACxC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,SAAU,GAAG,OAAO,CAMhF;IAED,SAAS,CAAC,KAAK,CAAC,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAO1D;CACJ"}
@@ -2,96 +2,90 @@ import { createRequire } from 'node:module';
2
2
  import { join } from 'node:path';
3
3
  import { CellError } from '@celljs/kit';
4
4
  /**
5
- * Evaluates `${...}` expressions with the project's own @celljs/core compiler, so build-time and
6
- * runtime evaluation have identical semantics. The context is the object itself plus `extra`.
5
+ * Evaluates `${...}` expressions with the project's own @celljs/core (`@celljs/core/el`), so build-time
6
+ * and runtime evaluation are the same code: references between keys resolve in any order, and what an
7
+ * expression returns (an environment variable, for instance) is never evaluated again.
7
8
  */
8
9
  export class ExpressionEvaluator {
9
- static compilers = new Map();
10
- compiler;
10
+ static utils = new Map();
11
+ util;
11
12
  constructor(root) {
12
- this.compiler = ExpressionEvaluator.compilerFor(root);
13
+ this.util = ExpressionEvaluator.utilFor(root);
13
14
  }
14
- static compilerFor(root) {
15
- let compiler = ExpressionEvaluator.compilers.get(root);
16
- if (!compiler) {
15
+ static utilFor(root) {
16
+ let util = ExpressionEvaluator.utils.get(root);
17
+ if (!util) {
17
18
  const require = createRequire(join(root, 'package.json'));
18
- require('reflect-metadata');
19
- const { ExpressionCompilerImpl } = require('@celljs/core/lib/common/el/expression-compiler');
20
- const { JexlEngineProviderImpl } = require('@celljs/core/lib/common/el/jexl-engine-provider');
21
- compiler = new ExpressionCompilerImpl();
22
- Object.defineProperty(compiler, 'jexlEngineProvider', { value: new JexlEngineProviderImpl() });
23
- ExpressionEvaluator.compilers.set(root, compiler);
19
+ try {
20
+ util = require('@celljs/core/el').ExpressionUtil;
21
+ }
22
+ catch (cause) {
23
+ throw ExpressionEvaluator.loadError(require, root, cause);
24
+ }
25
+ ExpressionEvaluator.utils.set(root, util);
26
+ }
27
+ return util;
28
+ }
29
+ static loadError(require, root, cause) {
30
+ let version;
31
+ try {
32
+ version = require('@celljs/core/package.json').version;
33
+ }
34
+ catch {
35
+ return new CellError({
36
+ code: 'CELL_CORE_NOT_FOUND',
37
+ message: 'The project does not depend on @celljs/core.',
38
+ file: join(root, 'package.json'),
39
+ hint: 'Add @celljs/core to dependencies and install.',
40
+ cause,
41
+ });
24
42
  }
25
- return compiler;
43
+ return new CellError({
44
+ code: 'CELL_CORE_EL_MISSING',
45
+ message: `The @celljs/core ${version} of this project has no @celljs/core/el entry, which the build evaluates configuration expressions with.`,
46
+ file: join(root, 'package.json'),
47
+ hint: 'Upgrade @celljs/core and the other @celljs/* packages to 4.1.0 or later.',
48
+ cause,
49
+ });
26
50
  }
27
- /** Evaluates every string of `target` in place and returns it. */
51
+ /**
52
+ * Evaluates `target` in place and returns it. The objects of `extra` (e.g. `env`) are visible to the
53
+ * expressions as they are, without being evaluated, and are removed afterwards.
54
+ */
28
55
  evaluate(target, extra = {}) {
29
- const ctx = Object.assign(target, extra);
56
+ const root = target;
57
+ for (const [key, value] of Object.entries(extra)) {
58
+ root[key] = { ...value, _ignoreEl: true };
59
+ }
30
60
  try {
31
- this.walk(ctx, '', ctx, extra);
61
+ this.util.evaluateConfiguration(root);
62
+ }
63
+ catch (cause) {
64
+ throw this.error(cause, cause.message);
32
65
  }
33
66
  finally {
34
67
  for (const key of Object.keys(extra)) {
35
- delete ctx[key];
68
+ delete root[key];
36
69
  }
37
70
  }
38
71
  return target;
39
72
  }
40
73
  /** Evaluates one text against `ctx`. */
41
74
  evaluateText(text, ctx, path = 'value') {
42
- let sections;
43
75
  try {
44
- sections = this.compiler.compileSections(text, {});
76
+ return this.util.evaluateText(text, ctx);
45
77
  }
46
78
  catch (cause) {
47
- throw new CellError({
48
- code: 'CELL_CONFIG_EXPRESSION',
49
- message: `Invalid expression at ${path}: ${text}`,
50
- hint: 'Expressions are jexl inside ${...}; check quotes and braces.',
51
- cause,
52
- });
53
- }
54
- if (!sections.some(s => typeof s !== 'string')) {
55
- return text;
79
+ throw this.error(cause, `Cannot evaluate ${path}: ${text} (${cause.message})`);
56
80
  }
57
- if (sections.length === 1) {
58
- return this.run(sections[0], ctx, text, path);
59
- }
60
- return sections.map(s => (typeof s === 'string' ? s : this.run(s, ctx, text, path))).join('');
61
81
  }
62
- run(section, ctx, text, path) {
63
- if (typeof section === 'string') {
64
- return section;
65
- }
66
- let value;
67
- try {
68
- value = section.evalSync(ctx);
69
- }
70
- catch (cause) {
71
- throw new CellError({
72
- code: 'CELL_CONFIG_EXPRESSION',
73
- message: `Cannot evaluate ${path}: ${text} (${cause.message})`,
74
- hint: 'Only configuration keys and `env` are available in expressions.',
75
- cause,
76
- });
77
- }
78
- return typeof value === 'string' ? this.evaluateText(value, ctx, path) : value;
79
- }
80
- walk(node, path, ctx, extra) {
81
- const record = node;
82
- for (const key of Object.keys(record)) {
83
- if (node === ctx && key in extra) {
84
- continue;
85
- }
86
- const value = record[key];
87
- const child = path ? `${path}.${key}` : key;
88
- if (typeof value === 'string') {
89
- record[key] = this.evaluateText(value, ctx, child);
90
- }
91
- else if (value && typeof value === 'object') {
92
- this.walk(value, child, ctx, extra);
93
- }
94
- }
82
+ error(cause, message) {
83
+ return new CellError({
84
+ code: 'CELL_CONFIG_EXPRESSION',
85
+ message,
86
+ hint: 'Expressions are jexl inside ${...} and see only configuration keys and `env`; check quotes, braces and key names.',
87
+ cause,
88
+ });
95
89
  }
96
90
  }
97
91
  //# sourceMappingURL=expression-evaluator.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"expression-evaluator.js","sourceRoot":"","sources":["../../src/expression/expression-evaluator.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"expression-evaluator.js","sourceRoot":"","sources":["../../src/expression/expression-evaluator.ts"],"names":[],"mappings":"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"}
@@ -7,6 +7,10 @@ describe('ExpressionEvaluator', () => {
7
7
  const config = { cell: { server: { port: 3000, endpoint: 'http://localhost:${cell.server.port}' }, db: "${env.DB_HOST ?: 'localhost'}" } };
8
8
  expect(evaluator.evaluate(config, { env: {} })).toEqual({ cell: { server: { port: 3000, endpoint: 'http://localhost:3000' }, db: 'localhost' } });
9
9
  });
10
+ it('resolves references between keys in any order', () => {
11
+ const config = { cell: { url: '${cell.base}/api', base: 'https://${cell.host}', host: 'example.com' } };
12
+ expect(evaluator.evaluate(config)).toEqual({ cell: { url: 'https://example.com/api', base: 'https://example.com', host: 'example.com' } });
13
+ });
10
14
  it('keeps the type of a single expression and joins mixed text', () => {
11
15
  const config = { a: '${[1, 2]}', b: 'x-${1 + 1}-y', c: 'plain' };
12
16
  expect(evaluator.evaluate(config)).toEqual({ a: [1, 2], b: 'x-2-y', c: 'plain' });
@@ -16,8 +20,29 @@ describe('ExpressionEvaluator', () => {
16
20
  evaluator.evaluate(config, { env: { HOST: 'db' } });
17
21
  expect(config).toEqual({ list: [{ host: 'db' }] });
18
22
  });
23
+ it('outputs an environment value with ${...} as it is, also through another key', () => {
24
+ const config = { cell: { api: '${env.API_URL}', copy: '${cell.api}', name: 'app' } };
25
+ const env = { API_URL: '${env.NPM_TOKEN}-${cell.name}', NPM_TOKEN: 'secret' };
26
+ expect(evaluator.evaluate(config, { env })).toEqual({
27
+ cell: { api: '${env.NPM_TOKEN}-${cell.name}', copy: '${env.NPM_TOKEN}-${cell.name}', name: 'app' },
28
+ });
29
+ });
19
30
  it('reports unknown transforms as CELL_CONFIG_EXPRESSION with the key path', () => {
20
31
  expect(() => evaluator.evaluate({ cell: { keys: "${ ['x'] | onTarget('backend') }" } })).toThrow(expect.objectContaining({ code: 'CELL_CONFIG_EXPRESSION', message: expect.stringContaining('cell.keys') }));
21
32
  });
33
+ it('reports a circular reference as CELL_CONFIG_EXPRESSION with the keys involved', () => {
34
+ expect(() => evaluator.evaluate({ a: '${b}', b: '${a}' })).toThrow(expect.objectContaining({ code: 'CELL_CONFIG_EXPRESSION', message: 'Circular reference in the configuration: a -> b -> a' }));
35
+ });
36
+ it('asks to upgrade a @celljs/core without the @celljs/core/el entry', () => {
37
+ const project = new FixtureProject('old-core')
38
+ .file('package.json', { name: 'app' })
39
+ .dependency('@celljs/core', { version: '4.0.0', exports: { './package.json': './package.json', './lib/*': './lib/*.js' } });
40
+ try {
41
+ expect(() => new ExpressionEvaluator(project.root)).toThrow(expect.objectContaining({ code: 'CELL_CORE_EL_MISSING', message: expect.stringContaining('4.0.0') }));
42
+ }
43
+ finally {
44
+ project.dispose();
45
+ }
46
+ });
22
47
  });
23
48
  //# sourceMappingURL=expression-evaluator.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"expression-evaluator.spec.js","sourceRoot":"","sources":["../../src/expression/expression-evaluator.spec.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAAU,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAEhE,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACjC,MAAM,SAAS,GAAG,IAAI,mBAAmB,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAE/D,EAAE,CAAC,8DAA8D,EAAE,GAAG,EAAE;QACpE,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,sCAAsC,EAAE,EAAE,EAAE,EAAE,+BAA+B,EAAE,EAAE,CAAC;QAC3I,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,uBAAuB,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACtJ,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,GAAG,EAAE;QAClE,MAAM,MAAM,GAAG,EAAE,CAAC,EAAE,WAAW,EAAE,CAAC,EAAE,cAAc,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC;QACjE,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAW,CAAC,CAAC;IAC/F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kEAAkE,EAAE,GAAG,EAAE;QACxE,MAAM,MAAM,GAA4B,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,EAAE,CAAC,EAAE,CAAC;QAC5E,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,GAAG,EAAE;QAC9E,MAAM,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,kCAAkC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAC5F,MAAM,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,wBAAwB,EAAE,OAAO,EAAE,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAE,CAAC,CAC7G,CAAC;IACN,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"expression-evaluator.spec.js","sourceRoot":"","sources":["../../src/expression/expression-evaluator.spec.ts"],"names":[],"mappings":"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"}
@@ -33,7 +33,7 @@ export class ContainerGenerator {
33
33
  }
34
34
  prelude() {
35
35
  if (this.target === 'frontend') {
36
- return ["import 'reflect-metadata';", "import 'setimmediate';", "import '../../browser/index.js';"];
36
+ return ["import 'reflect-metadata';", "import '../../browser/index.js';"];
37
37
  }
38
38
  return ["import 'reflect-metadata';"];
39
39
  }
@@ -1 +1 @@
1
- {"version":3,"file":"container-generator.js","sourceRoot":"","sources":["../../src/generator/container-generator.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,OAAO,kBAAkB;IACI,MAAM;IAArC,YAA+B,MAAc;sBAAd,MAAM;IAAW,CAAC;IAEjD,QAAQ,CAAC,SAAmB,EAAE,SAAmB;QAC7C,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAC9F,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1G,OAAO;YACH,wCAAwC,IAAI,CAAC,MAAM,gBAAgB;YACnE,GAAG,IAAI,CAAC,OAAO,EAAE;YACjB,4DAA4D;YAC5D,GAAG,OAAO;YACV,EAAE;YACF,6CAA6C;YAC7C,GAAG,KAAK;YACR,EAAE;YACF,sBAAsB;YACtB,sEAAsE;YACtE,GAAG;YACH,EAAE;YACF,6CAA6C,KAAK,EAAE;YACpD,uGAAuG;YACvG,4BAA4B;YAC5B,EAAE;SACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAES,OAAO;QACb,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC7B,OAAO,CAAC,4BAA4B,EAAE,wBAAwB,EAAE,kCAAkC,CAAC,CAAC;QACxG,CAAC;QACD,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAC1C,CAAC;CACJ"}
1
+ {"version":3,"file":"container-generator.js","sourceRoot":"","sources":["../../src/generator/container-generator.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,MAAM,OAAO,kBAAkB;IACI,MAAM;IAArC,YAA+B,MAAc;sBAAd,MAAM;IAAW,CAAC;IAEjD,QAAQ,CAAC,SAAmB,EAAE,SAAmB;QAC7C,MAAM,OAAO,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC,oBAAoB,CAAC,SAAS,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC;QAC9F,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,CAAC,CAAC;QACxE,MAAM,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC,4BAA4B,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC1G,OAAO;YACH,wCAAwC,IAAI,CAAC,MAAM,gBAAgB;YACnE,GAAG,IAAI,CAAC,OAAO,EAAE;YACjB,4DAA4D;YAC5D,GAAG,OAAO;YACV,EAAE;YACF,6CAA6C;YAC7C,GAAG,KAAK;YACR,EAAE;YACF,sBAAsB;YACtB,sEAAsE;YACtE,GAAG;YACH,EAAE;YACF,6CAA6C,KAAK,EAAE;YACpD,uGAAuG;YACvG,4BAA4B;YAC5B,EAAE;SACL,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjB,CAAC;IAES,OAAO;QACb,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAC7B,OAAO,CAAC,4BAA4B,EAAE,kCAAkC,CAAC,CAAC;QAC9E,CAAC;QACD,OAAO,CAAC,4BAA4B,CAAC,CAAC;IAC1C,CAAC;CACJ"}
@@ -15,7 +15,7 @@ describe('ContainerGenerator', () => {
15
15
  });
16
16
  it('adds the browser prelude for the frontend', () => {
17
17
  const code = new ContainerGenerator('frontend').generate([], []);
18
- expect(code).toContain("import 'setimmediate';");
18
+ expect(code).not.toContain('setimmediate');
19
19
  expect(code).toContain("import '../../browser/index.js';");
20
20
  // A failing module rejects the container, so the entry (or the ApplicationHost) sees the error.
21
21
  expect(code).not.toContain('.catch(');
@@ -1 +1 @@
1
- {"version":3,"file":"generator.spec.js","sourceRoot":"","sources":["../../src/generator/generator.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generator.spec.js","sourceRoot":"","sources":["../../src/generator/generator.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.0.0",
3
+ "version": "4.1.0",
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.0.0",
41
- "js-yaml": "^4.1.0",
40
+ "@celljs/kit": "4.1.0",
41
+ "js-yaml": "^4.1.1",
42
42
  "vite": "^8.3.6"
43
43
  },
44
44
  "devDependencies": {
45
- "@celljs/core": "4.0.0",
46
- "@celljs/express-adapter": "4.0.0",
47
- "@celljs/http": "4.0.0",
48
- "@celljs/mvc": "4.0.0",
49
- "@celljs/web": "4.0.0",
45
+ "@celljs/core": "4.1.0",
46
+ "@celljs/express-adapter": "4.1.0",
47
+ "@celljs/http": "4.1.0",
48
+ "@celljs/mvc": "4.1.0",
49
+ "@celljs/web": "4.1.0",
50
50
  "@types/js-yaml": "^4.0.9"
51
51
  }
52
52
  }
@@ -2,47 +2,78 @@ import { createRequire } from 'node:module';
2
2
  import { join } from 'node:path';
3
3
  import { CellError } from '@celljs/kit';
4
4
 
5
- type Section = string | { evalSync(ctx: object): unknown };
6
-
7
- interface ExpressionCompiler {
8
- compileSections(text: string, options: object): Section[];
5
+ /** What the build uses of `@celljs/core/el` (packages/core/src/common/el/expression-util.ts). */
6
+ interface ExpressionUtil {
7
+ evaluateText(text: string, context: object): unknown;
8
+ evaluateConfiguration(root: object): void;
9
9
  }
10
10
 
11
11
  /**
12
- * Evaluates `${...}` expressions with the project's own @celljs/core compiler, so build-time and
13
- * runtime evaluation have identical semantics. The context is the object itself plus `extra`.
12
+ * Evaluates `${...}` expressions with the project's own @celljs/core (`@celljs/core/el`), so build-time
13
+ * and runtime evaluation are the same code: references between keys resolve in any order, and what an
14
+ * expression returns (an environment variable, for instance) is never evaluated again.
14
15
  */
15
16
  export class ExpressionEvaluator {
16
- protected static readonly compilers = new Map<string, ExpressionCompiler>();
17
+ protected static readonly utils = new Map<string, ExpressionUtil>();
17
18
 
18
- protected readonly compiler: ExpressionCompiler;
19
+ protected readonly util: ExpressionUtil;
19
20
 
20
21
  constructor(root: string) {
21
- this.compiler = ExpressionEvaluator.compilerFor(root);
22
+ this.util = ExpressionEvaluator.utilFor(root);
22
23
  }
23
24
 
24
- protected static compilerFor(root: string): ExpressionCompiler {
25
- let compiler = ExpressionEvaluator.compilers.get(root);
26
- if (!compiler) {
25
+ protected static utilFor(root: string): ExpressionUtil {
26
+ let util = ExpressionEvaluator.utils.get(root);
27
+ if (!util) {
27
28
  const require = createRequire(join(root, 'package.json'));
28
- require('reflect-metadata');
29
- const { ExpressionCompilerImpl } = require('@celljs/core/lib/common/el/expression-compiler');
30
- const { JexlEngineProviderImpl } = require('@celljs/core/lib/common/el/jexl-engine-provider');
31
- compiler = new ExpressionCompilerImpl() as ExpressionCompiler;
32
- Object.defineProperty(compiler, 'jexlEngineProvider', { value: new JexlEngineProviderImpl() });
33
- ExpressionEvaluator.compilers.set(root, compiler);
29
+ try {
30
+ util = require('@celljs/core/el').ExpressionUtil as ExpressionUtil;
31
+ } catch (cause) {
32
+ throw ExpressionEvaluator.loadError(require, root, cause);
33
+ }
34
+ ExpressionEvaluator.utils.set(root, util);
34
35
  }
35
- return compiler;
36
+ return util;
36
37
  }
37
38
 
38
- /** Evaluates every string of `target` in place and returns it. */
39
- evaluate<T extends Record<string, unknown>>(target: T, extra: Record<string, unknown> = {}): T {
40
- const ctx: Record<string, unknown> = Object.assign(target, extra);
39
+ protected static loadError(require: NodeJS.Require, root: string, cause: unknown): CellError {
40
+ let version: string | undefined;
41
41
  try {
42
- this.walk(ctx, '', ctx, extra);
42
+ version = require('@celljs/core/package.json').version;
43
+ } catch {
44
+ return new CellError({
45
+ code: 'CELL_CORE_NOT_FOUND',
46
+ message: 'The project does not depend on @celljs/core.',
47
+ file: join(root, 'package.json'),
48
+ hint: 'Add @celljs/core to dependencies and install.',
49
+ cause,
50
+ });
51
+ }
52
+ return new CellError({
53
+ code: 'CELL_CORE_EL_MISSING',
54
+ message: `The @celljs/core ${version} of this project has no @celljs/core/el entry, which the build evaluates configuration expressions with.`,
55
+ file: join(root, 'package.json'),
56
+ hint: 'Upgrade @celljs/core and the other @celljs/* packages to 4.1.0 or later.',
57
+ cause,
58
+ });
59
+ }
60
+
61
+ /**
62
+ * Evaluates `target` in place and returns it. The objects of `extra` (e.g. `env`) are visible to the
63
+ * expressions as they are, without being evaluated, and are removed afterwards.
64
+ */
65
+ evaluate<T extends Record<string, unknown>>(target: T, extra: Record<string, object> = {}): T {
66
+ const root: Record<string, unknown> = target;
67
+ for (const [key, value] of Object.entries(extra)) {
68
+ root[key] = { ...value, _ignoreEl: true };
69
+ }
70
+ try {
71
+ this.util.evaluateConfiguration(root);
72
+ } catch (cause) {
73
+ throw this.error(cause, (cause as Error).message);
43
74
  } finally {
44
75
  for (const key of Object.keys(extra)) {
45
- delete ctx[key];
76
+ delete root[key];
46
77
  }
47
78
  }
48
79
  return target;
@@ -50,57 +81,19 @@ export class ExpressionEvaluator {
50
81
 
51
82
  /** Evaluates one text against `ctx`. */
52
83
  evaluateText(text: string, ctx: Record<string, unknown>, path = 'value'): unknown {
53
- let sections: Section[];
54
84
  try {
55
- sections = this.compiler.compileSections(text, {});
85
+ return this.util.evaluateText(text, ctx);
56
86
  } catch (cause) {
57
- throw new CellError({
58
- code: 'CELL_CONFIG_EXPRESSION',
59
- message: `Invalid expression at ${path}: ${text}`,
60
- hint: 'Expressions are jexl inside ${...}; check quotes and braces.',
61
- cause,
62
- });
63
- }
64
- if (!sections.some(s => typeof s !== 'string')) {
65
- return text;
87
+ throw this.error(cause, `Cannot evaluate ${path}: ${text} (${(cause as Error).message})`);
66
88
  }
67
- if (sections.length === 1) {
68
- return this.run(sections[0], ctx, text, path);
69
- }
70
- return sections.map(s => (typeof s === 'string' ? s : this.run(s, ctx, text, path))).join('');
71
- }
72
-
73
- protected run(section: Section, ctx: Record<string, unknown>, text: string, path: string): unknown {
74
- if (typeof section === 'string') {
75
- return section;
76
- }
77
- let value: unknown;
78
- try {
79
- value = section.evalSync(ctx);
80
- } catch (cause) {
81
- throw new CellError({
82
- code: 'CELL_CONFIG_EXPRESSION',
83
- message: `Cannot evaluate ${path}: ${text} (${(cause as Error).message})`,
84
- hint: 'Only configuration keys and `env` are available in expressions.',
85
- cause,
86
- });
87
- }
88
- return typeof value === 'string' ? this.evaluateText(value, ctx, path) : value;
89
89
  }
90
90
 
91
- protected walk(node: Record<string, unknown> | unknown[], path: string, ctx: Record<string, unknown>, extra: Record<string, unknown>): void {
92
- const record = node as Record<string, unknown>;
93
- for (const key of Object.keys(record)) {
94
- if (node === ctx && key in extra) {
95
- continue;
96
- }
97
- const value = record[key];
98
- const child = path ? `${path}.${key}` : key;
99
- if (typeof value === 'string') {
100
- record[key] = this.evaluateText(value, ctx, child);
101
- } else if (value && typeof value === 'object') {
102
- this.walk(value as Record<string, unknown>, child, ctx, extra);
103
- }
104
- }
91
+ protected error(cause: unknown, message: string): CellError {
92
+ return new CellError({
93
+ code: 'CELL_CONFIG_EXPRESSION',
94
+ message,
95
+ hint: 'Expressions are jexl inside ${...} and see only configuration keys and `env`; check quotes, braces and key names.',
96
+ cause,
97
+ });
105
98
  }
106
99
  }
@@ -34,7 +34,7 @@ export class ContainerGenerator {
34
34
 
35
35
  protected prelude(): string[] {
36
36
  if (this.target === 'frontend') {
37
- return ["import 'reflect-metadata';", "import 'setimmediate';", "import '../../browser/index.js';"];
37
+ return ["import 'reflect-metadata';", "import '../../browser/index.js';"];
38
38
  }
39
39
  return ["import 'reflect-metadata';"];
40
40
  }