@cubejs-backend/schema-compiler 1.3.18 → 1.3.20

package/dist/src/compiler/transpilers/ImportExportTranspiler.js

@@ -65,20 +65,47 @@ class ImportExportTranspiler {
                         });
                     }
                 });
-                const addExportCall = t.callExpression(t.identifier('addExport'), [t.objectExpression(declarations)]);
                 if ('declaration' in path.node && path.node.declaration) {
-                    path.replaceWithMultiple([
-                        path.node.declaration,
-                        t.callExpression(t.identifier('addExport'), [
-                            t.objectExpression(
-                            // @ts-ignore
-                            path.get('declaration').get('declarations').map(d => t.objectProperty(d.get('id').node, d.get('id').node)))
-                        ])
-                    ]);
-                }
-                else {
-                    path.replaceWith(addExportCall);
+                    const decl = path.get('declaration');
+                    // If its FunctionDeclaration or ClassDeclaration
+                    if (t.isFunctionDeclaration(decl.node) ||
+                        t.isClassDeclaration(decl.node)) {
+                        const name = decl.node.id;
+                        if (!name) {
+                            reporter.syntaxError({
+                                message: 'Exported function/class must have a name',
+                                loc: decl.node.loc,
+                            });
+                            return;
+                        }
+                        path.replaceWithMultiple([
+                            decl.node,
+                            t.callExpression(t.identifier('addExport'), [
+                                t.objectExpression([t.objectProperty(name, name)])
+                            ])
+                        ]);
+                        return;
+                    }
+                    // VariableDeclaration (export const foo = ...)
+                    if (t.isVariableDeclaration(decl.node)) {
+                        path.replaceWithMultiple([
+                            decl.node,
+                            t.callExpression(t.identifier('addExport'), [
+                                t.objectExpression(
+                                // @ts-ignore
+                                decl.get('declarations').map(d => t.objectProperty(d.get('id').node, d.get('id').node)))
+                            ])
+                        ]);
+                        return;
+                    }
+                    reporter.syntaxError({
+                        message: `Unsupported export declaration of type '${decl.node?.type}'`,
+                        loc: decl.node?.loc,
+                    });
+                    return;
                 }
+                const addExportCall = t.callExpression(t.identifier('addExport'), [t.objectExpression(declarations)]);
+                path.replaceWith(addExportCall);
             },
             ExportDefaultDeclaration(path) {
                 // @ts-ignore

package/dist/src/compiler/transpilers/ImportExportTranspiler.js.map

@@ -1 +1 @@
-{"version":3,"file":"ImportExportTranspiler.js","sourceRoot":"","sources":["../../../../src/compiler/transpilers/ImportExportTranspiler.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ImportExportTranspiler.js","sourceRoot":"","sources":["../../../../src/compiler/transpilers/ImportExportTranspiler.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.18",
+  "version": "1.3.20",
   "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.18",
-    "@cubejs-backend/shared": "1.3.18",
+    "@cubejs-backend/native": "1.3.20",
+    "@cubejs-backend/shared": "1.3.20",
     "antlr4ts": "0.5.0-alpha.4",
     "camelcase": "^6.2.0",
     "cron-parser": "^4.9.0",
@@ -60,8 +60,8 @@
   },
   "devDependencies": {
     "@clickhouse/client": "^1.7.0",
-    "@cubejs-backend/linter": "1.3.18",
-    "@cubejs-backend/query-orchestrator": "1.3.18",
+    "@cubejs-backend/linter": "1.3.20",
+    "@cubejs-backend/query-orchestrator": "1.3.20",
     "@types/babel__code-frame": "^7.0.6",
     "@types/babel__generator": "^7.6.8",
     "@types/babel__traverse": "^7.20.5",
@@ -87,5 +87,5 @@
   "eslintConfig": {
     "extends": "../cubejs-linter"
   },
-  "gitHead": "fd889445b62391c4ecf531bbe7487250d6482e42"
+  "gitHead": "3bc4093e055af0d632d24c55c87ace165995cd06"
 }