@cubejs-backend/schema-compiler 1.6.16 → 1.6.18

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.
@@ -89,14 +89,14 @@ class YamlCompiler {
89
89
  const transpiledFilesContent = [];
90
90
  for (const key of Object.keys(yamlObj)) {
91
91
  if (key === 'cubes') {
92
- this.checkDuplicateNames(yamlObj.cubes || [], 'cube', errorsReport);
92
+ this.checkDuplicateNames(yamlObj.cubes || [], errorsReport, (name) => `Found duplicate cube name '${name}'.`);
93
93
  (yamlObj.cubes || []).forEach(({ name, ...cube }) => {
94
94
  const transpiledCube = this.transpileAndPrepareJsFile('cube', { name, ...cube }, errorsReport);
95
95
  transpiledFilesContent.push(transpiledCube);
96
96
  });
97
97
  }
98
98
  else if (key === 'views') {
99
- this.checkDuplicateNames(yamlObj.views || [], 'view', errorsReport);
99
+ this.checkDuplicateNames(yamlObj.views || [], errorsReport, (name) => `Found duplicate view name '${name}'.`);
100
100
  (yamlObj.views || []).forEach(({ name, ...cube }) => {
101
101
  const transpiledView = this.transpileAndPrepareJsFile('view', { name, ...cube }, errorsReport);
102
102
  transpiledFilesContent.push(transpiledView);
@@ -306,17 +306,16 @@ class YamlCompiler {
306
306
  const body = ast.program.body[0];
307
307
  return body?.expression;
308
308
  }
309
- checkDuplicateNames(items, type, errorsReport) {
309
+ checkDuplicateNames(items, errorsReport, message) {
310
+ const names = items
311
+ .map(item => item?.name)
312
+ .filter((name) => name != null);
310
313
  const seen = new Set();
311
- for (const item of items) {
312
- if (item?.name) {
313
- if (seen.has(item.name)) {
314
- errorsReport.error(`Found duplicate ${type} name '${item.name}'.`);
315
- }
316
- else {
317
- seen.add(item.name);
318
- }
314
+ for (const name of names) {
315
+ if (seen.has(name)) {
316
+ errorsReport.error(message(name));
319
317
  }
318
+ seen.add(name);
320
319
  }
321
320
  }
322
321
  yamlArrayToObj(yamlArray, memberType, errorsReport, ctx) {
@@ -325,22 +324,13 @@ class YamlCompiler {
325
324
  return {};
326
325
  }
327
326
  // Check for duplicate names
328
- const names = yamlArray
329
- .map(item => item?.name)
330
- .filter(name => name != null);
331
- const seen = new Set();
332
- for (const name of names) {
333
- if (seen.has(name)) {
334
- if (ctx.parent) {
335
- errorsReport.error(`Found duplicate ${memberType} '${name}' in ${ctx.parent.type} '${ctx.parent.name}' in cube '${ctx.cubeName}'.`);
336
- }
337
- else {
338
- errorsReport.error(`Member names must be unique within a cube. Found duplicate ${memberType} '${name}' in cube '${ctx.cubeName}'.`);
339
- }
327
+ this.checkDuplicateNames(yamlArray, errorsReport, (name) => {
328
+ if (ctx.parent) {
329
+ return `Found duplicate ${memberType} '${name}' in ${ctx.parent.type} '${ctx.parent.name}' in cube '${ctx.cubeName}'.`;
340
330
  }
341
- seen.add(name);
342
- }
343
- const remapped = yamlArray.map(({ name, indexes, granularities, ...rest }) => {
331
+ return `Member names must be unique within a cube. Found duplicate ${memberType} '${name}' in cube '${ctx.cubeName}'.`;
332
+ });
333
+ const remapped = yamlArray.map(({ name, indexes, granularities, timeShift, ...rest }) => {
344
334
  if (!name) {
345
335
  errorsReport.error(`name isn't defined for ${memberType}: ${JSON.stringify(rest)}`);
346
336
  return {};
@@ -360,6 +350,10 @@ class YamlCompiler {
360
350
  });
361
351
  res[name] = { granularities, ...res[name] };
362
352
  }
353
+ if (timeShift) {
354
+ this.checkDuplicateNames(timeShift, errorsReport, (shiftName) => `Time shift names must be unique within a ${memberType}. Found duplicate time shift '${shiftName}' in ${memberType} '${name}' in cube '${ctx.cubeName}'.`);
355
+ res[name] = { timeShift, ...res[name] };
356
+ }
363
357
  res[name] = { ...res[name], ...rest };
364
358
  return res;
365
359
  });
@@ -1 +1 @@
1
- {"version":3,"file":"YamlCompiler.js","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"YamlCompiler.js","sourceRoot":"","sources":["../../../src/compiler/YamlCompiler.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/schema-compiler",
3
3
  "description": "Cube schema compiler",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "1.6.16",
5
+ "version": "1.6.18",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.git",
@@ -40,8 +40,8 @@
40
40
  "@babel/standalone": "^7.24",
41
41
  "@babel/traverse": "^7.24",
42
42
  "@babel/types": "^7.24",
43
- "@cubejs-backend/native": "1.6.16",
44
- "@cubejs-backend/shared": "1.6.16",
43
+ "@cubejs-backend/native": "1.6.18",
44
+ "@cubejs-backend/shared": "1.6.18",
45
45
  "antlr4": "^4.13.2",
46
46
  "camelcase": "^6.2.0",
47
47
  "cron-parser": "^4.9.0",
@@ -60,9 +60,9 @@
60
60
  },
61
61
  "devDependencies": {
62
62
  "@clickhouse/client": "^1.12.0",
63
- "@cubejs-backend/linter": "1.6.16",
64
- "@cubejs-backend/mssql-driver": "1.6.16",
65
- "@cubejs-backend/query-orchestrator": "1.6.16",
63
+ "@cubejs-backend/linter": "1.6.18",
64
+ "@cubejs-backend/mssql-driver": "1.6.18",
65
+ "@cubejs-backend/query-orchestrator": "1.6.18",
66
66
  "@types/babel__code-frame": "^7.0.6",
67
67
  "@types/babel__generator": "^7.6.8",
68
68
  "@types/babel__traverse": "^7.20.5",
@@ -89,5 +89,5 @@
89
89
  "eslintConfig": {
90
90
  "extends": "../cubejs-linter"
91
91
  },
92
- "gitHead": "880d52ea3e8cae08a9c03b9bb27b3b4a68988a2c"
92
+ "gitHead": "098d185fe7647c734964548ef74d2f3991ae265c"
93
93
  }