Merge pull request #198 from samchon/v3.2

Fix #197 - no superfluous property inspection when `undefined` value comes
samchon · Sep 19, 2022 · b942b33 · b942b33
2 parents fccd66e + 921a001
commit b942b33
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript-json",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "description": "Runtime type checkers and 5x faster JSON.stringify() function",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",

diff --git a/src/programmers/internal/check_object.ts b/src/programmers/internal/check_object.ts
@@ -15,7 +15,7 @@ export function check_object(
 ) => (
     halter: (expr: ts.CallExpression) => ts.Expression,
 ) => (
-    wrapper?: (expr: ts.CallExpression) => ts.Expression,
+    wrapper?: (expr: ts.Expression) => ts.Expression,
 ) => (entries: IExpressionEntry[]) => ts.Expression;
 
 export function check_object(equals: true | false) {
@@ -37,7 +37,7 @@ export function check_object(equals: true | false) {
         };
 }
 
-type Wrapper = (expr: ts.CallExpression) => ts.Expression;
+type Wrapper = (expr: ts.Expression) => ts.Expression;
 const reduce = (assert: boolean) => (expressions: ts.Expression[]) =>
     assert
         ? expressions.reduce((x, y) => ts.factory.createLogicalAnd(x, y))

diff --git a/src/programmers/internal/check_properties.ts b/src/programmers/internal/check_properties.ts
@@ -8,13 +8,12 @@ import { check_everything } from "./check_everything";
 export const check_properties =
     (assert: boolean) =>
     (halter: (exp: ts.CallExpression) => ts.Expression) =>
-    (wrapper?: (exp: ts.CallExpression) => ts.Expression) =>
+    (wrapper?: (exp: ts.Expression) => ts.Expression) =>
     (entries: IExpressionEntry[]): ts.Expression => {
-        const func = wrapper ? "entries" : "keys";
         const criteria = ts.factory.createCallExpression(
             IdentifierFactory.join(
                 ts.factory.createCallExpression(
-                    ts.factory.createIdentifier(`Object.${func}`),
+                    ts.factory.createIdentifier("Object.entries"),
                     undefined,
                     [ts.factory.createIdentifier("input")],
                 ),
@@ -29,55 +28,59 @@ export const check_properties =
     };
 
 const check_property =
-    (wrapper?: (exp: ts.CallExpression) => ts.Expression) =>
+    (wrapper?: (exp: ts.Expression) => ts.Expression) =>
     (entries: IExpressionEntry[]) =>
         ts.factory.createArrowFunction(
             undefined,
             undefined,
             [
-                wrapper === undefined
-                    ? IdentifierFactory.parameter("key")
-                    : IdentifierFactory.parameter(
-                          ts.factory.createArrayBindingPattern([
-                              ts.factory.createBindingElement(
-                                  undefined,
-                                  undefined,
-                                  "key",
-                              ),
-                              ts.factory.createBindingElement(
-                                  undefined,
-                                  undefined,
-                                  "value",
-                              ),
-                          ]),
-                      ),
+                IdentifierFactory.parameter(
+                    ts.factory.createArrayBindingPattern([
+                        ts.factory.createBindingElement(
+                            undefined,
+                            undefined,
+                            "key",
+                        ),
+                        ts.factory.createBindingElement(
+                            undefined,
+                            undefined,
+                            "value",
+                        ),
+                    ]),
+                ),
             ],
             undefined,
             undefined,
             (wrapper || ((elem) => elem))(
-                ts.factory.createCallExpression(
-                    IdentifierFactory.join(
-                        ts.factory.createArrayLiteralExpression(
-                            entries.map((entry) =>
-                                ts.factory.createStringLiteral(entry.key),
-                            ),
-                        ),
-                        "some",
+                ts.factory.createLogicalOr(
+                    ts.factory.createStrictEquality(
+                        ts.factory.createIdentifier("undefined"),
+                        ts.factory.createIdentifier("value"),
                     ),
-                    undefined,
-                    [
-                        ts.factory.createArrowFunction(
-                            undefined,
-                            undefined,
-                            [IdentifierFactory.parameter("prop")],
-                            undefined,
-                            undefined,
-                            ts.factory.createStrictEquality(
-                                ts.factory.createIdentifier("key"),
-                                ts.factory.createIdentifier("prop"),
+                    ts.factory.createCallExpression(
+                        IdentifierFactory.join(
+                            ts.factory.createArrayLiteralExpression(
+                                entries.map((entry) =>
+                                    ts.factory.createStringLiteral(entry.key),
+                                ),
                             ),
+                            "some",
                         ),
-                    ],
+                        undefined,
+                        [
+                            ts.factory.createArrowFunction(
+                                undefined,
+                                undefined,
+                                [IdentifierFactory.parameter("prop")],
+                                undefined,
+                                undefined,
+                                ts.factory.createStrictEquality(
+                                    ts.factory.createIdentifier("key"),
+                                    ts.factory.createIdentifier("prop"),
+                                ),
+                            ),
+                        ],
+                    ),
                 ),
             ),
         );