Typeof bin expr and spread (#240)

e2e-tests/standalone-parser/CHANGELOG.md

@@ -1,5 +1,13 @@
 # node-server
 
+## 1.0.57
+
+### Patch Changes
+
+- Updated dependencies
+  - @beff/cli@0.0.60
+  - @beff/client@0.0.60
+
 ## 1.0.56
 
 ### Patch Changes

e2e-tests/standalone-parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "standalone-parser",
-  "version": "1.0.56",
+  "version": "1.0.57",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@beff/cli": "workspace:^0.0.59",
+    "@beff/cli": "workspace:^0.0.60",
     "@beff/client": "workspace:^",
     "vitest": "^0.34.4",
     "zod": "^3.23.5"

packages/beff-cli/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @beff/cli
 
+## 0.0.60
+
+### Patch Changes
+
+- fix bugs
+
 ## 0.0.59
 
 ### Patch Changes

packages/beff-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beff/cli",
-  "version": "0.0.59",
+  "version": "0.0.60",
   "description": "",
   "bin": {
     "beff": "./bin/index.js"

packages/beff-client/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @beff/client
 
+## 0.0.60
+
+### Patch Changes
+
+- fix bugs
+- Updated dependencies
+  - @beff/cli@0.0.60
+
 ## 0.0.59
 
 ### Patch Changes

packages/beff-client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beff/client",
-  "version": "0.0.59",
+  "version": "0.0.60",
   "description": "",
   "main": "dist/cjs/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@beff/cli": "workspace:^0.0.59",
+    "@beff/cli": "workspace:^0.0.60",
     "zod": "^3.23.5"
   },
   "devDependencies": {

packages/beff-core/src/type_to_schema.rs

@@ -1270,11 +1270,19 @@ impl<'a, 'b, R: FileManager> TypeToSchema<'a, 'b, R> {
 
                 for it in &lit.props {
                     match it {
-                        PropOrSpread::Spread(_) => {
-                            return self.error(
-                                &it.span(),
-                                DiagnosticInfoMessage::TypeofObjectUnsupportedSpread,
-                            )
+                        PropOrSpread::Spread(sp) => {
+                            let spread_ty = self.typeof_expr(&sp.expr, as_const)?;
+
+                            if let JsonSchema::Object { vs: spread_vs, .. } = spread_ty {
+                                for (k, v) in spread_vs {
+                                    vs.insert(k, v);
+                                }
+                            } else {
+                                return self.error(
+                                    &it.span(),
+                                    DiagnosticInfoMessage::TypeofObjectUnsupportedSpread,
+                                );
+                            }
                         }
                         PropOrSpread::Prop(p) => match p.as_ref() {
                             Prop::KeyValue(p) => {
@@ -1452,6 +1460,16 @@ impl<'a, 'b, R: FileManager> TypeToSchema<'a, 'b, R> {
                 self.convert_sem_type(access_st, &mut ctx, &m.prop.span())
             }
             Expr::Arrow(_a) => Ok(JsonSchema::Function),
+            Expr::Bin(e) => {
+                let left = self.typeof_expr(&e.left, as_const)?;
+                let right = self.typeof_expr(&e.right, as_const)?;
+
+                match (left, right) {
+                    (JsonSchema::Number, JsonSchema::Number) => Ok(JsonSchema::Number),
+                    (JsonSchema::String, JsonSchema::String) => Ok(JsonSchema::String),
+                    _ => self.error(&e.span(), DiagnosticInfoMessage::CannotConvertExprToSchema),
+                }
+            }
             _ => {
                 dbg!(&e);
                 self.error(&e.span(), DiagnosticInfoMessage::CannotConvertExprToSchema)

packages/beff-core/tests/print_parser.rs

@@ -575,6 +575,25 @@ mod tests {
       "#));
     }
     #[test]
+    fn ok_repro12() {
+        insta::assert_snapshot!(ok(r#"
+        const val = 1 + 1;
+        export type AllTs = typeof val;
+
+        parse.buildParsers<{ AllTs: AllTs }>();
+      "#));
+    }
+    #[test]
+    fn ok_repro13() {
+        insta::assert_snapshot!(ok(r#"
+        const val = {a: 1} as const;
+        const spread = {...val, b: 2} as const;
+        export type AllTs = typeof spread;
+
+        parse.buildParsers<{ AllTs: AllTs }>();
+      "#));
+    }
+    #[test]
     fn ok_void() {
         insta::assert_snapshot!(ok(r#"
         export type IX = void

packages/beff-core/tests/snapshots/print_parser__tests__ok_repro12.snap

@@ -0,0 +1,6 @@
+---
+source: packages/beff-core/tests/print_parser.rs
+expression: "ok(r#\"\n        const val = 1 + 1;\n        export type AllTs = typeof val;\n\n        parse.buildParsers<{ AllTs: AllTs }>();\n      \"#)"
+---
+type AllTs = number;
+type AllTs = AllTs;

packages/beff-core/tests/snapshots/print_parser__tests__ok_repro13.snap

@@ -0,0 +1,6 @@
+---
+source: packages/beff-core/tests/print_parser.rs
+expression: "ok(r#\"\n        const val = {a: 1} as const;\n        const spread = {...val, b: 2} as const;\n        export type AllTs = typeof spread;\n\n        parse.buildParsers<{ AllTs: AllTs }>();\n      \"#)"
+---
+type AllTs = { "a": 1; "b": 2 };
+type AllTs = AllTs;

packages/beff-wasm/package.json

@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@babel/code-frame": "^7.22.13",
-    "@beff/cli": "workspace:^0.0.59",
+    "@beff/cli": "workspace:^0.0.60",
     "@types/babel__code-frame": "^7.0.4",
     "@types/node": "^20.6.2",
     "@types/vscode": "^1.73.0",