Fix omit and intersection (#245)

* Fix omit and intersection

* fix ci

* fix bugs

* fix omit intersection

e2e-tests/standalone-parser/CHANGELOG.md

@@ -1,5 +1,13 @@
 # node-server
 
+## 1.0.61
+
+### Patch Changes
+
+- Updated dependencies
+  - @beff/cli@0.0.63
+  - @beff/client@0.0.64
+
 ## 1.0.60
 
 ### Patch Changes

e2e-tests/standalone-parser/package.json

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

packages/beff-cli/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @beff/cli
 
+## 0.0.63
+
+### Patch Changes
+
+- fix omit and intersection
+
 ## 0.0.62
 
 ### Patch Changes

packages/beff-cli/package.json

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

packages/beff-client/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @beff/client
 
+## 0.0.64
+
+### Patch Changes
+
+- fix omit and intersection
+- Updated dependencies
+  - @beff/cli@0.0.63
+
 ## 0.0.63
 
 ### Patch Changes

packages/beff-client/package.json

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

packages/beff-core/src/diag.rs

@@ -7,6 +7,7 @@ use crate::{BffFileName, ParsedModule};
 
 #[derive(Debug, Clone)]
 pub enum DiagnosticInfoMessage {
+    ObjectHasConflictingKeyValueInIntersection,
     CannotResolveNamedImport,
     EnumMemberNotFound,
     TplLitTypeUnsupported,
@@ -461,6 +462,9 @@ impl DiagnosticInfoMessage {
             DiagnosticInfoMessage::CannotResolveNamedImport => {
                 "Cannot resolve named import".to_string()
             }
+            DiagnosticInfoMessage::ObjectHasConflictingKeyValueInIntersection => {
+                "Object has conflicting key value in intersection".to_string()
+            }
         }
     }
 }

packages/beff-core/src/type_to_schema.rs

@@ -290,9 +290,31 @@ impl<'a, 'b, R: FileManager> TypeToSchema<'a, 'b, R> {
                 let map = self.components.get(r).and_then(|it| it.as_ref()).cloned();
                 match map {
                     Some(Validator { schema, .. }) => self.extract_object(&schema, span),
-                    _ => self.error(span, DiagnosticInfoMessage::ShouldHaveObjectAsTypeArgument),
+                    None => self.error(span, DiagnosticInfoMessage::ShouldHaveObjectAsTypeArgument),
                 }
             }
+            JsonSchema::AllOf(vs) => {
+                let mut acc = BTreeMap::new();
+
+                for v in vs {
+                    let extracted = self.extract_object(v, span)?;
+
+                    // check that if items have the same key, they have the same value
+
+                    for (k, v) in &extracted {
+                        if let Some(existing) = acc.get(k) {
+                            if existing != v {
+                                return self
+                                    .error(span, DiagnosticInfoMessage::ObjectHasConflictingKeyValueInIntersection);
+                            }
+                        }
+                    }
+
+                    acc.extend(extracted);
+                }
+
+                Ok(acc)
+            }
             _ => self.error(span, DiagnosticInfoMessage::ShouldHaveObjectAsTypeArgument),
         }
     }

packages/beff-core/tests/print_parser.rs

@@ -622,6 +622,17 @@ mod tests {
         export type ABC = {}
         export type KABC = keyof ABC
      
+        parse.buildParsers<{ KABC: KABC }>();
+      "#));
+    }
+    #[test]
+    fn ok_omit_intersection() {
+        insta::assert_snapshot!(ok(r#"
+        export type A = {a: string}
+        export type B = {b: string}
+
+        export type KABC = Omit<A & B, 'a'>
+     
         parse.buildParsers<{ KABC: KABC }>();
       "#));
     }

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

@@ -0,0 +1,8 @@
+---
+source: packages/beff-core/tests/print_parser.rs
+expression: "ok(r#\"\n        export type A = {a: string}\n        export type B = {b: string}\n\n        export type KABC = Omit<A & B, 'a'>\n     \n        parse.buildParsers<{ KABC: KABC }>();\n      \"#)"
+---
+type A = { "a": string };
+type B = { "b": string };
+type KABC = { "b": string };
+type KABC = KABC;

packages/beff-wasm/fixtures/errors/conflict-object-kvs/bff.json

@@ -0,0 +1,4 @@
+{
+  "parser": "./src/parser.ts",
+  "outputDir": "./src/generated"
+}

packages/beff-wasm/fixtures/errors/conflict-object-kvs/src/.gitignore

@@ -0,0 +1 @@
+generated/

packages/beff-wasm/fixtures/errors/conflict-object-kvs/src/parser.ts

@@ -0,0 +1,6 @@
+import parse from "./generated/parser";
+type A = { a: string };
+type A2 = { a: number; b: number };
+type IX3 = A & A2;
+
+parse.buildParsers<{ IX3: Omit<IX3, "a"> }>();

packages/beff-wasm/fixtures/errors/conflict-object-kvs/stderr.log

@@ -0,0 +1,9 @@
+Error: Object has conflicting key value in intersection
+ /errors/conflict-object-kvs/src/parser.ts:6:27
+   4 | type IX3 = A & A2;
+   5 |
+ > 6 | parse.buildParsers<{ IX3: Omit<IX3, "a"> }>();
+     |                           ^^^^ Object has conflicting key value in intersection
+   7 |
+
+Found 1 error

packages/beff-wasm/package.json

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