Fix ST object bugs (#196)

* Fix ST object bugs * bump
lucasavila00 · May 10, 2024 · 16f38c0 · 16f38c0
1 parent 2af1f20
commit 16f38c0
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 15 deletions.
diff --git a/examples/standalone-parser/CHANGELOG.md b/examples/standalone-parser/CHANGELOG.md
@@ -1,5 +1,13 @@
 # node-server
 
+## 1.0.41
+
+### Patch Changes
+
+- Updated dependencies
+  - @beff/cli@0.0.44
+  - @beff/client@0.0.44
+
 ## 1.0.40
 
 ### Patch Changes

diff --git a/examples/standalone-parser/package.json b/examples/standalone-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standalone-parser",
-  "version": "1.0.40",
+  "version": "1.0.41",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@beff/cli": "workspace:^0.0.43",
+    "@beff/cli": "workspace:^0.0.44",
     "@beff/client": "workspace:^",
     "vitest": "^0.34.4",
     "zod": "^3.23.5"

diff --git a/packages/beff-cli/CHANGELOG.md b/packages/beff-cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @beff/cli
 
+## 0.0.44
+
+### Patch Changes
+
+- fix st obj bugs
+
 ## 0.0.43
 
 ### Patch Changes

diff --git a/packages/beff-cli/package.json b/packages/beff-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@beff/cli",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "",
   "bin": {
     "beff": "./bin/index.js"

diff --git a/packages/beff-client/CHANGELOG.md b/packages/beff-client/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @beff/client
 
+## 0.0.44
+
+### Patch Changes
+
+- fix st obj bugs
+- Updated dependencies
+  - @beff/cli@0.0.44
+
 ## 0.0.43
 
 ### Patch Changes

diff --git a/packages/beff-client/package.json b/packages/beff-client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@beff/client",
-  "version": "0.0.43",
+  "version": "0.0.44",
   "description": "",
   "main": "dist/cjs/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@beff/cli": "workspace:^0.0.43"
+    "@beff/cli": "workspace:^0.0.44"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^6.7.2",

diff --git a/packages/beff-core/src/subtyping/bdd.rs b/packages/beff-core/src/subtyping/bdd.rs
@@ -814,7 +814,6 @@ pub fn mapping_indexed_access(
             _ => unreachable!("should be string"),
         },
     };
-
     let b = SemTypeContext::sub_type_data(obj_st, SubTypeTag::Mapping);
     match b {
         SubType::False(_) => todo!(),

diff --git a/packages/beff-core/src/subtyping/mod.rs b/packages/beff-core/src/subtyping/mod.rs
@@ -63,7 +63,7 @@ impl<'a> ToSemTypeConverter<'a> {
                                 .collect::<Result<_>>()?;
                             let rest = match rest {
                                 Some(r) => self.to_sem_type(r, builder)?,
-                                None => SemTypeContext::never().into(),
+                                None => SemTypeContext::unknown().into(),
                             };
 
                             builder.mapping_definitions[idx] = Some(Rc::new(MappingAtomicType {

diff --git a/packages/beff-core/src/subtyping/semtype.rs b/packages/beff-core/src/subtyping/semtype.rs
@@ -320,6 +320,8 @@ impl MemoEmpty {
 #[derive(Clone, Debug)]
 pub struct BddMemoEmptyRef(pub MemoEmpty);
 
+#[derive(Debug)]
+
 pub struct MappingAtomicType {
     pub vs: Rc<MappingAtomic>,
     pub rest: Rc<SemType>,

diff --git a/packages/beff-core/src/subtyping/to_schema.rs b/packages/beff-core/src/subtyping/to_schema.rs
@@ -3,6 +3,8 @@ use std::{
     rc::Rc,
 };
 
+use anyhow::bail;
+
 use crate::{
     ast::json_schema::{JsonSchema, JsonSchemaConst, Optionality},
     Validator,
@@ -184,8 +186,7 @@ impl<'a, 'b> SchemerContext<'a, 'b> {
         }
 
         let rest = if mt.rest.is_empty(self.ctx.0) {
-            // bail!("rest should not be empty, all records are open")
-            None
+            bail!("rest should not be empty, all records are open")
         } else if mt.rest.is_any() {
             None
         } else {
@@ -425,7 +426,7 @@ impl<'a, 'b> SchemerContext<'a, 'b> {
                         acc.insert(JsonSchema::String);
                     }
                     SubTypeTag::Void => {
-                        // noop
+                        acc.insert(JsonSchema::Null);
                     }
                     SubTypeTag::Mapping => {
                         acc.insert(JsonSchema::object(vec![], Some(JsonSchema::Any.into())));

diff --git a/packages/beff-core/src/type_to_schema.rs b/packages/beff-core/src/type_to_schema.rs
@@ -1550,7 +1550,7 @@ impl<'a, 'b, R: FileManager> TypeToSchema<'a, 'b, R> {
             })?;
 
         let access_st: Rc<SemType> = ctx.indexed_access(obj_st, idx_st);
-        self.convert_sem_type(access_st, &mut ctx, &i.index_type.span())
+        self.convert_sem_type(access_st, &mut ctx, &i.span())
     }
     fn convert_keyof(&mut self, k: &TsType) -> Res<JsonSchema> {
         let json_schema = self.convert_ts_type(k)?;

diff --git a/packages/beff-core/tests/print_parser.rs b/packages/beff-core/tests/print_parser.rs
@@ -433,4 +433,19 @@ mod tests {
         parse.buildParsers<{ T3: T3 }>();
       "#));
     }
+    #[test]
+    fn ok_repro_3() {
+        insta::assert_snapshot!(ok(r#"
+      
+        export interface IY {
+            a: string
+        }
+        export interface IX {
+            sizes?: IY;
+        }
+        // type IX2 = Required<IX>
+        type T3 = IX[keyof IX]
+        parse.buildParsers<{ T3: T3 }>();
+      "#));
+    }
 }
diff --git a/packages/beff-core/tests/snapshots/print_parser__tests__ok_repro_3.snap b/packages/beff-core/tests/snapshots/print_parser__tests__ok_repro_3.snap
@@ -0,0 +1,8 @@
+---
+source: packages/beff-core/tests/print_parser.rs
+expression: "ok(r#\"\n      \n        export interface IY {\n            a: string\n        }\n        export interface IX {\n            sizes?: IY;\n        }\n        // type IX2 = Required<IX>\n        type T3 = IX[keyof IX]\n        parse.buildParsers<{ T3: T3 }>();\n      \"#)"
+---
+type IX = { "sizes"?: IY };
+type IY = { "a": string };
+type T3 = null | { "a": string };
+type T3 = T3;
diff --git a/packages/beff-wasm/package.json b/packages/beff-wasm/package.json
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "@babel/code-frame": "^7.22.13",
-    "@beff/cli": "workspace:^0.0.43",
+    "@beff/cli": "workspace:^0.0.44",
     "@types/babel__code-frame": "^7.0.4",
     "@types/node": "^20.6.2",
     "@types/vscode": "^1.73.0",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml