Add never decoder

lucasavila00 · Dec 3, 2024 · 3d4fb61 · 3d4fb61
1 parent c34d2b3
commit 3d4fb61
Show file tree

Hide file tree

Showing 18 changed files with 113 additions and 17 deletions.
diff --git a/e2e-tests/bug-rust-repro/src/generated/parser.js b/e2e-tests/bug-rust-repro/src/generated/parser.js
@@ -4,7 +4,7 @@
 
 import {printErrors} from '@beff/client';
 import {z} from 'zod';
-import validatorsMod from "./validators.js"; const { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeConst, registerCustomFormatter, validators, c } = validatorsMod;
+import validatorsMod from "./validators.js"; const { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeNever, decodeConst, registerCustomFormatter, validators, c } = validatorsMod;
 const RequiredCustomFormats = ["ValidCurrency"];
 const buildParsersInput = {
     "A": function(ctx, input, required = true) {

diff --git a/e2e-tests/bug-rust-repro/src/generated/validators.js b/e2e-tests/bug-rust-repro/src/generated/validators.js
@@ -317,6 +317,12 @@ function decodeNull(ctx, input, required) {
   }
   return buildError(input, ctx, "expected null");
 }
+function decodeNever(ctx, input, required) {
+  if (!required && input == null) {
+    return input;
+  }
+  return buildError(input, ctx, "never");
+}
 function decodeConst(ctx, input, required, constValue) {
   if (!required && input == null) {
     return input;
@@ -346,4 +352,4 @@ const validators = {
     A: DecodeA
 };
 
-export default { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeConst, registerCustomFormatter, validators };
+export default { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeNever, decodeConst, registerCustomFormatter, validators };
diff --git a/e2e-tests/standalone-parser/CHANGELOG.md b/e2e-tests/standalone-parser/CHANGELOG.md
@@ -1,5 +1,13 @@
 # node-server
 
+## 1.0.59
+
+### Patch Changes
+
+- Updated dependencies
+  - @beff/cli@0.0.62
+  - @beff/client@0.0.62
+
 ## 1.0.58
 
 ### Patch Changes

diff --git a/e2e-tests/standalone-parser/package.json b/e2e-tests/standalone-parser/package.json
@@ -1,6 +1,6 @@
 {
   "name": "standalone-parser",
-  "version": "1.0.58",
+  "version": "1.0.59",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -11,7 +11,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@beff/cli": "workspace:^0.0.61",
+    "@beff/cli": "workspace:^0.0.62",
     "@beff/client": "workspace:^",
     "vitest": "^0.34.4",
     "zod": "^3.23.5"

diff --git a/e2e-tests/standalone-parser/src/generated/parser.js b/e2e-tests/standalone-parser/src/generated/parser.js
@@ -4,7 +4,7 @@
 
 import {printErrors} from '@beff/client';
 import {z} from 'zod';
-import validatorsMod from "./validators.js"; const { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeConst, registerCustomFormatter, validators, c } = validatorsMod;
+import validatorsMod from "./validators.js"; const { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeNever, decodeConst, registerCustomFormatter, validators, c } = validatorsMod;
 const RequiredCustomFormats = ["ValidCurrency"];
 const buildParsersInput = {
     "AObject": function(ctx, input, required = true) {
@@ -60,6 +60,15 @@ const buildParsersInput = {
             "A": (ctx, input)=>(decodeConst(ctx, input, true, "a"))
         });
     },
+    "K": function(ctx, input, required = true) {
+        return validators.K(ctx, input, required);
+    },
+    "KABC": function(ctx, input, required = true) {
+        return validators.KABC(ctx, input, required);
+    },
+    "KDEF": function(ctx, input, required = true) {
+        return validators.KDEF(ctx, input, required);
+    },
     "LevelAndDSettings": function(ctx, input, required = true) {
         return validators.LevelAndDSettings(ctx, input, required);
     },

diff --git a/e2e-tests/standalone-parser/src/generated/validators.js b/e2e-tests/standalone-parser/src/generated/validators.js
@@ -317,6 +317,12 @@ function decodeNull(ctx, input, required) {
   }
   return buildError(input, ctx, "expected null");
 }
+function decodeNever(ctx, input, required) {
+  if (!required && input == null) {
+    return input;
+  }
+  return buildError(input, ctx, "never");
+}
 function decodeConst(ctx, input, required, constValue) {
   if (!required && input == null) {
     return input;
@@ -646,6 +652,26 @@ function DecodeBObject(ctx, input, required = true) {
         "tag": (ctx, input)=>(decodeConst(ctx, input, true, "b"))
     });
 }
+function DecodeDEF(ctx, input, required = true) {
+    return decodeObject(ctx, input, required, {
+        "a": (ctx, input)=>(decodeString(ctx, input, true))
+    });
+}
+function DecodeKDEF(ctx, input, required = true) {
+    return decodeConst(ctx, input, required, "a");
+}
+function DecodeABC(ctx, input, required = true) {
+    return decodeObject(ctx, input, required, {});
+}
+function DecodeKABC(ctx, input, required = true) {
+    return decodeNever(ctx, input, required);
+}
+function DecodeK(ctx, input, required = true) {
+    return decodeAnyOf(ctx, input, required, [
+        (ctx, input)=>(validators.KABC(ctx, input, required)),
+        (ctx, input)=>(validators.KDEF(ctx, input, required))
+    ]);
+}
 const validators = {
     AllTs: DecodeAllTs,
     AObject: DecodeAObject,
@@ -684,7 +710,12 @@ const validators = {
     UnionWithEnumAccess: DecodeUnionWithEnumAccess,
     Shape: DecodeShape,
     T3: DecodeT3,
-    BObject: DecodeBObject
+    BObject: DecodeBObject,
+    DEF: DecodeDEF,
+    KDEF: DecodeKDEF,
+    ABC: DecodeABC,
+    KABC: DecodeKABC,
+    K: DecodeK
 };
 
-export default { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeConst, registerCustomFormatter, validators };
+export default { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeNever, decodeConst, registerCustomFormatter, validators };
diff --git a/e2e-tests/standalone-parser/src/parser.ts b/e2e-tests/standalone-parser/src/parser.ts
@@ -179,6 +179,16 @@ const ImportEnumTypeof = {
   A: OtherEnum.A,
 } as const;
 
+export type ABC = {};
+export type KABC = keyof ABC;
+
+export type DEF = {
+  a: string;
+};
+export type KDEF = keyof DEF;
+
+export type K = KABC | KDEF;
+
 export const {
   Version,
   Version2,
@@ -245,6 +255,9 @@ export const {
   AvatarSize: AvatarSize;
   BObject: BObject;
   ImportEnumTypeof: typeof ImportEnumTypeof;
+  KDEF: KDEF;
+  KABC: KABC;
+  K: K;
 }>({
   customFormats: {
     ValidCurrency: (input: string) => {

diff --git a/packages/beff-cli/CHANGELOG.md b/packages/beff-cli/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @beff/cli
 
+## 0.0.62
+
+### Patch Changes
+
+- fix bugs never decoder
+
 ## 0.0.61
 
 ### 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.61",
+  "version": "0.0.62",
   "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.62
+
+### Patch Changes
+
+- fix bugs never decoder
+- Updated dependencies
+  - @beff/cli@0.0.62
+
 ## 0.0.61
 
 ### 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.61",
+  "version": "0.0.62",
   "description": "",
   "main": "dist/cjs/index.js",
   "scripts": {
@@ -20,7 +20,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@beff/cli": "workspace:^0.0.61",
+    "@beff/cli": "workspace:^0.0.62",
     "zod": "^3.23.5"
   },
   "devDependencies": {

diff --git a/packages/beff-core/src/print/decoder.rs b/packages/beff-core/src/print/decoder.rs
@@ -403,9 +403,11 @@ impl DecoderFnGenerator<'_> {
 
     fn decode_expr(&self, schema: &JsonSchema, required: Required) -> Expr {
         match schema {
-            JsonSchema::StNever | JsonSchema::StNot(_) => {
+            JsonSchema::StNot(_) => {
                 unreachable!("should not create decoders for semantic types")
             }
+
+            JsonSchema::StNever => Self::decode_call("decodeNever", required),
             JsonSchema::AnyArrayLike => {
                 self.decode_expr(&JsonSchema::Array(JsonSchema::Any.into()), required)
             }

diff --git a/packages/beff-wasm/bundled-code/decoders.js b/packages/beff-wasm/bundled-code/decoders.js
@@ -314,6 +314,12 @@ function decodeNull(ctx, input, required) {
   }
   return buildError(input, ctx, "expected null");
 }
+function decodeNever(ctx, input, required) {
+  if (!required && input == null) {
+    return input;
+  }
+  return buildError(input, ctx, "never");
+}
 function decodeConst(ctx, input, required, constValue) {
   if (!required && input == null) {
     return input;

diff --git a/packages/beff-wasm/fixtures/codegen-snaps/export-decoder/bff-generated/parser.js b/packages/beff-wasm/fixtures/codegen-snaps/export-decoder/bff-generated/parser.js
@@ -4,7 +4,7 @@
 
 import {printErrors} from '@beff/client';
 import {z} from 'zod';
-import validatorsMod from "./validators.js"; const { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeConst, registerCustomFormatter, validators, c } = validatorsMod;
+import validatorsMod from "./validators.js"; const { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeNever, decodeConst, registerCustomFormatter, validators, c } = validatorsMod;
 const RequiredCustomFormats = ["password","StartsWithA"];
 const buildParsersInput = {
     "NotPublicRenamed": function(ctx, input, required = true) {

diff --git a/packages/beff-wasm/fixtures/codegen-snaps/export-decoder/bff-generated/validators.js b/packages/beff-wasm/fixtures/codegen-snaps/export-decoder/bff-generated/validators.js
@@ -317,6 +317,12 @@ function decodeNull(ctx, input, required) {
   }
   return buildError(input, ctx, "expected null");
 }
+function decodeNever(ctx, input, required) {
+  if (!required && input == null) {
+    return input;
+  }
+  return buildError(input, ctx, "never");
+}
 function decodeConst(ctx, input, required, constValue) {
   if (!required && input == null) {
     return input;
@@ -402,4 +408,4 @@ const validators = {
     UnionNested: DecodeUnionNested
 };
 
-export default { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeConst, registerCustomFormatter, validators };
+export default { decodeObject, decodeArray, decodeString, decodeNumber, decodeCodec, decodeFunction, decodeStringWithFormat, decodeAnyOf, decodeAllOf, decodeBoolean, decodeAny, decodeTuple, decodeNull, decodeNever, decodeConst, registerCustomFormatter, validators };
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.61",
+    "@beff/cli": "workspace:^0.0.62",
     "@types/babel__code-frame": "^7.0.4",
     "@types/node": "^20.6.2",
     "@types/vscode": "^1.73.0",

diff --git a/packages/beff-wasm/ts-node/bundle-to-disk.ts b/packages/beff-wasm/ts-node/bundle-to-disk.ts
@@ -18,6 +18,7 @@ const decodersExported = [
   "decodeAny",
   "decodeTuple",
   "decodeNull",
+  "decodeNever",
   "decodeConst",
   "registerCustomFormatter",
 ];

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