@cubejs-backend/schema-compiler 1.3.7 → 1.3.9

package/dist/src/compiler/converters/CubeSchemaConverter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CubeSchemaConverter.d.ts","sourceRoot":"","sources":["../../../../src/compiler/converters/CubeSchemaConverter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAElC,MAAM,MAAM,MAAM,GAAG;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;IACZ,cAAc,EAAE,CAAC,CAAC,gBAAgB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAEnD,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;CAC7C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,mBAAmB;IAKX,SAAS,CAAC,cAAc,EAAE,GAAG;IAAE,SAAS,CAAC,UAAU,EAAE,sBAAsB,EAAE;IAJhG,SAAS,CAAC,eAAe,EAAE,UAAU,EAAE,CAAM;IAE7C,SAAS,CAAC,WAAW,EAAE,aAAa,CAAM;gBAEb,cAAc,EAAE,GAAG,EAAY,UAAU,EAAE,sBAAsB,EAAE;cAEhF,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAwCxC,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,UAAU;IAmBnB,QAAQ;IAQd,cAAc;;;;;CAOtB"}
+{"version":3,"file":"CubeSchemaConverter.d.ts","sourceRoot":"","sources":["../../../../src/compiler/converters/CubeSchemaConverter.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,CAAC,MAAM,cAAc,CAAC;AAClC,OAAO,IAAsB,MAAM,MAAM,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC;IACZ,cAAc,EAAE,CAAC,CAAC,gBAAgB,CAAC;CACpC,CAAC;AAEF,MAAM,MAAM,OAAO,GAAG;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,cAAc,EAAE,IAAI,CAAC,OAAO,CAAC;CAC9B,CAAC;AAIF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,KAAK,GAAG,OAAO,CAAC,CAAC,CAAC;AAE9D,MAAM,WAAW,sBAAsB;IACrC,OAAO,CAAC,aAAa,EAAE,aAAa,GAAG,IAAI,CAAC;CAC7C;AAED,KAAK,UAAU,GAAG;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qBAAa,mBAAmB;IAKX,SAAS,CAAC,cAAc,EAAE,GAAG;IAAE,SAAS,CAAC,UAAU,EAAE,sBAAsB,EAAE;IAJhG,SAAS,CAAC,eAAe,EAAE,UAAU,EAAE,CAAM;IAE7C,SAAS,CAAC,WAAW,EAAE,aAAa,CAAM;gBAEb,cAAc,EAAE,GAAG,EAAY,UAAU,EAAE,sBAAsB,EAAE;IAEhG;;;;;OAKG;cACa,OAAO,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAczD,SAAS,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE,MAAM;IAiDvE,SAAS,CAAC,WAAW,CAAC,UAAU,EAAE,UAAU,EAAE,cAAc,CAAC,EAAE,MAAM;IAoCrE,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,UAAU;IAmBrB,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM;IAQhC,cAAc;;;;;CAatB"}

package/dist/src/compiler/converters/CubeSchemaConverter.js

@@ -31,6 +31,8 @@ const generator_1 = __importDefault(require("@babel/generator"));
 const parser_1 = require("@babel/parser");
 const traverse_1 = __importDefault(require("@babel/traverse"));
 const t = __importStar(require("@babel/types"));
+const yaml_1 = __importStar(require("yaml"));
+const JINJA_SYNTAX = /{%|%}|{{|}}/ig;
 class CubeSchemaConverter {
     fileRepository;
     converters;
@@ -40,41 +42,96 @@ class CubeSchemaConverter {
         this.fileRepository = fileRepository;
         this.converters = converters;
     }
-    async prepare() {
+    /**
+     * Parse Schema files from the repository and create a mapping of cube names to schema files.
+     * If optional `cubeName` parameter is passed - only file with asked cube is parsed and stored.
+     * @param cubeName
+     * @protected
+     */
+    async prepare(cubeName) {
         this.dataSchemaFiles = await this.fileRepository.dataSchemaFiles();
         this.dataSchemaFiles.forEach((schemaFile) => {
-            const ast = this.parse(schemaFile);
-            (0, traverse_1.default)(ast, {
-                CallExpression: (path) => {
-                    if (t.isIdentifier(path.node.callee)) {
-                        const args = path.get('arguments');
-                        if (path.node.callee.name === 'cube') {
-                            if (args?.[args.length - 1]) {
-                                let cubeName;
-                                if (args[0].node.type === 'StringLiteral' && args[0].node.value) {
-                                    cubeName = args[0].node.value;
-                                }
-                                else if (args[0].node.type === 'TemplateLiteral' && args[0].node.quasis?.[0]?.value.cooked) {
-                                    cubeName = args[0].node.quasis?.[0]?.value.cooked;
-                                }
-                                if (cubeName == null) {
-                                    throw new Error(`Error parsing ${schemaFile.fileName}`);
-                                }
-                                if (t.isObjectExpression(args[1]?.node) && ast != null) {
-                                    this.parsedFiles[cubeName] = {
-                                        fileName: schemaFile.fileName,
-                                        ast,
-                                        cubeDefinition: args[1].node,
-                                    };
-                                }
+            if (schemaFile.fileName.endsWith('.js')) {
+                this.transformJS(schemaFile, cubeName);
+            }
+            else if ((schemaFile.fileName.endsWith('.yml') || schemaFile.fileName.endsWith('.yaml')) && !schemaFile.content.match(JINJA_SYNTAX)) {
+                // Jinja-templated data models are not supported in Rollup Designer yet, so we're ignoring them,
+                // and if user has chosen the cube from such file - it won't be found during generation.
+                this.transformYaml(schemaFile, cubeName);
+            }
+        });
+    }
+    transformYaml(schemaFile, filterCubeName) {
+        if (!schemaFile.content.trim()) {
+            return;
+        }
+        const yamlDoc = yaml_1.default.parseDocument(schemaFile.content);
+        if (!yamlDoc?.contents) {
+            return;
+        }
+        const root = yamlDoc.contents;
+        if (!(0, yaml_1.isMap)(root)) {
+            return;
+        }
+        const cubesPair = root.items.find((item) => {
+            const key = item.key;
+            return key?.value === 'cubes';
+        });
+        if (!cubesPair || !(0, yaml_1.isSeq)(cubesPair.value)) {
+            return;
+        }
+        for (const cubeNode of cubesPair.value.items) {
+            if ((0, yaml_1.isMap)(cubeNode)) {
+                const cubeNamePair = cubeNode.items.find((item) => {
+                    const key = item.key;
+                    return key?.value === 'name';
+                });
+                const cubeName = (cubeNamePair?.value).value;
+                if (cubeName && typeof cubeName === 'string' && (!filterCubeName || cubeName === filterCubeName)) {
+                    this.parsedFiles[cubeName] = {
+                        fileName: schemaFile.fileName,
+                        yaml: yamlDoc,
+                        cubeDefinition: cubeNode,
+                    };
+                    if (cubeName === filterCubeName) {
+                        return;
+                    }
+                }
+            }
+        }
+    }
+    transformJS(schemaFile, filterCubeName) {
+        const ast = this.parseJS(schemaFile);
+        (0, traverse_1.default)(ast, {
+            CallExpression: (path) => {
+                if (t.isIdentifier(path.node.callee)) {
+                    const args = path.get('arguments');
+                    if (path.node.callee.name === 'cube') {
+                        if (args?.[args.length - 1]) {
+                            let cubeName;
+                            if (args[0].node.type === 'StringLiteral' && args[0].node.value) {
+                                cubeName = args[0].node.value;
+                            }
+                            else if (args[0].node.type === 'TemplateLiteral' && args[0].node.quasis?.[0]?.value.cooked) {
+                                cubeName = args[0].node.quasis?.[0]?.value.cooked;
+                            }
+                            if (cubeName == null) {
+                                throw new Error(`Error parsing ${schemaFile.fileName}`);
+                            }
+                            if (t.isObjectExpression(args[1]?.node) && ast != null && (!filterCubeName || cubeName === filterCubeName)) {
+                                this.parsedFiles[cubeName] = {
+                                    fileName: schemaFile.fileName,
+                                    ast,
+                                    cubeDefinition: args[1].node,
+                                };
                             }
                         }
                     }
-                },
-            });
+                }
+            },
         });
     }
-    parse(file) {
+    parseJS(file) {
         try {
             return (0, parser_1.parse)(file.content, {
                 sourceFilename: file.fileName,
@@ -91,18 +148,23 @@ class CubeSchemaConverter {
             throw error;
         }
     }
-    async generate() {
-        await this.prepare();
+    async generate(cubeName) {
+        await this.prepare(cubeName);
         this.converters.forEach((converter) => {
             converter.convert(this.parsedFiles);
         });
     }
     getSourceFiles() {
-        return Object.entries(this.parsedFiles).map(([cubeName, file]) => ({
-            cubeName,
-            fileName: file.fileName,
-            source: (0, generator_1.default)(file.ast, {}).code,
-        }));
+        return Object.entries(this.parsedFiles).map(([cubeName, file]) => {
+            const source = 'ast' in file
+                ? (0, generator_1.default)(file.ast, {}).code
+                : String(file.yaml);
+            return {
+                cubeName,
+                fileName: file.fileName,
+                source,
+            };
+        });
     }
 }
 exports.CubeSchemaConverter = CubeSchemaConverter;

package/dist/src/compiler/converters/CubeSchemaConverter.js.map

@@ -1 +1 @@
-{"version":3,"file":"CubeSchemaConverter.js","sourceRoot":"","sources":["../../../../src/compiler/converters/CubeSchemaConverter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"CubeSchemaConverter.js","sourceRoot":"","sources":["../../../../src/compiler/converters/CubeSchemaConverter.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -2,7 +2,7 @@
   "name": "@cubejs-backend/schema-compiler",
   "description": "Cube schema compiler",
   "author": "Cube Dev, Inc.",
-  "version": "1.3.7",
+  "version": "1.3.9",
   "repository": {
     "type": "git",
     "url": "https://github.com/cube-js/cube.git",
@@ -40,8 +40,8 @@
     "@babel/standalone": "^7.24",
     "@babel/traverse": "^7.24",
     "@babel/types": "^7.24",
-    "@cubejs-backend/native": "1.3.7",
-    "@cubejs-backend/shared": "1.3.7",
+    "@cubejs-backend/native": "1.3.9",
+    "@cubejs-backend/shared": "1.3.9",
     "antlr4ts": "0.5.0-alpha.4",
     "camelcase": "^6.2.0",
     "cron-parser": "^4.9.0",
@@ -55,24 +55,25 @@
     "ramda": "^0.27.2",
     "syntax-error": "^1.3.0",
     "uuid": "^8.3.2",
-    "workerpool": "^9.2.0"
+    "workerpool": "^9.2.0",
+    "yaml": "^2.7.1"
   },
   "devDependencies": {
     "@clickhouse/client": "^1.7.0",
-    "@cubejs-backend/linter": "1.3.7",
-    "@cubejs-backend/query-orchestrator": "1.3.7",
+    "@cubejs-backend/linter": "1.3.9",
+    "@cubejs-backend/query-orchestrator": "1.3.9",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.5",
     "@types/inflection": "^1.5.28",
-    "@types/jest": "^27",
+    "@types/jest": "^29",
     "@types/node": "^20",
     "@types/ramda": "^0.27.34",
     "@types/sqlstring": "^2.3.0",
     "@types/syntax-error": "^1.4.1",
     "@types/uuid": "^8.3.0",
     "antlr4ts-cli": "^0.5.0-alpha.4",
-    "jest": "^27",
+    "jest": "^29",
     "mssql": "^10.0.2",
     "mysql": "^2.18.1",
     "node-fetch": "2",
@@ -87,33 +88,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "jest": {
-    "testEnvironment": "node",
-    "collectCoverage": true,
-    "coverageReporters": [
-      "text",
-      "html",
-      "lcov"
-    ],
-    "coverageDirectory": "coverage/",
-    "collectCoverageFrom": [
-      "dist/src/**/*.js",
-      "dist/src/**/*.ts",
-      "!dist/src/parser/GenericSql*.js",
-      "!dist/src/parser/Python3*.js"
-    ],
-    "coveragePathIgnorePatterns": [
-      ".*\\.d\\.ts"
-    ],
-    "globalSetup": "<rootDir>/dist/test/global-setup.js",
-    "snapshotResolver": "<rootDir>/test/snapshotResolver.js",
-    "transformIgnorePatterns": [
-      "/node_modules/(?!node-fetch).+\\.js$",
-      "node_modules/(?!axios)/"
-    ],
-    "moduleNameMapper": {
-      "^axios$": "axios/dist/node/axios.cjs"
-    }
-  },
-  "gitHead": "1d1518253701f13691856f5de7759608a8e060c1"
+  "gitHead": "39ff5e955562a0a143486dd0ea5c1cc12f016e98"
 }