@drunkcod/argis 0.0.10 → 0.0.12

package/lib/cjs/index.d.ts

@@ -28,14 +28,15 @@ export declare function isNotNil<T>(x?: T): x is T;
 export declare function isNotNil<T, K extends keyof T>(x: T, key: K): x is T & {
     [P in K]-?: NonNullable<T[K]>;
 };
+export declare function isThenable(x: unknown): boolean;
 export declare function assertNotNil<T>(x: T | null): asserts x is T;
 export declare function argNotNil<T, K extends keyof T>(x: T, key: K): asserts x is T & {
     [P in K]-?: NonNullable<T[K]>;
 };
-export declare function hasOwn<T extends object, K extends PropertyKey>(x: T, key: K): x is T & WithKey<K>;
-export declare function hasOwn<T extends object, K extends PropertyKey, V>(x: T, key: K, ofType: (found: unknown) => found is V): x is T & WithKey<K, V>;
-export declare function hasKey<T extends object, K extends PropertyKey>(x: T, key: K): x is T & WithKey<K>;
-export declare function hasKey<T extends object, K extends PropertyKey, V>(x: T, key: K, ofType: (found: unknown) => found is V): x is T & WithKey<K, V>;
+export declare function hasOwn<T extends object, K extends PropertyKey>(x: T | unknown, key: K): x is T & WithKey<K>;
+export declare function hasOwn<T extends object, K extends PropertyKey, V>(x: T | unknown, key: K, ofType: (found: unknown) => found is V): x is T & WithKey<K, V>;
+export declare function hasKey<T extends object, K extends PropertyKey>(x: T | unknown, key: K): x is T & WithKey<K>;
+export declare function hasKey<T extends object, K extends PropertyKey, V>(x: T | unknown, key: K, ofType: (found: unknown) => found is V): x is T & WithKey<K, V>;
 export declare function assertOwn<T extends object, K extends PropertyKey>(x: T, key: K): asserts x is T & WithKey<K>;
 export declare function assertOwn<T extends object, K extends PropertyKey, V>(x: T, key: K, ofType: (found: unknown) => found is V): asserts x is T & WithKey<K, V>;
 export declare function assertKey<T extends object, K extends PropertyKey>(x: T, key: K): asserts x is T & WithKey<K>;

package/lib/cjs/index.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ArgumentError = void 0;
 exports.isNil = isNil;
 exports.isNotNil = isNotNil;
+exports.isThenable = isThenable;
 exports.assertNotNil = assertNotNil;
 exports.argNotNil = argNotNil;
 exports.hasOwn = hasOwn;
@@ -35,6 +36,9 @@ function isNil(x, key) {
 function isNotNil(x, key) {
     return !isNil(x) && (key === undefined || !isNil(x[key]));
 }
+function isThenable(x) {
+    return x != null && typeof x === 'object' && 'then' in x && typeof x.then === 'function';
+}
 function assertNotNil(x) {
     if (x == null)
         ArgumentError.null('Unexpected null');
@@ -49,7 +53,7 @@ function hasOwn(x, key, ofType) {
     return _hasOwn(x, key) && (ofType == undefined || ofType(x[key]));
 }
 function _hasKey(x, key) {
-    return key in x;
+    return typeof x === 'object' && key in x;
 }
 function hasKey(x, key, ofType) {
     return _hasKey(x, key) && (ofType == undefined || ofType(x[key]));
@@ -69,18 +73,14 @@ function intOrUndefined(x) {
     const v = Number.parseInt(x);
     return Number.isNaN(v) ? undefined : v;
 }
-function filterEntries(x, p) {
-    if (x == null)
-        return null;
-    if (typeof x !== 'object')
-        return x;
-    return Object.fromEntries(Object.entries(x).filter(p));
+function* excludeEntries(x, p) {
+    for (const k in x)
+        if (!p(k))
+            yield [k, Reflect.get(x, k)];
 }
 function omit(x, ...keys) {
-    const ks = keys;
-    return filterEntries(x, ([key]) => !ks.includes(key));
+    return Object.fromEntries(excludeEntries(x, Array.prototype.includes.bind(keys)));
 }
 function pick(x, ...keys) {
-    const ks = keys;
-    return filterEntries(x, ([key]) => ks.includes(key));
+    return Object.fromEntries(keys.map((k) => [keys, x[k]]));
 }

package/lib/index.d.ts

@@ -28,14 +28,15 @@ export declare function isNotNil<T>(x?: T): x is T;
 export declare function isNotNil<T, K extends keyof T>(x: T, key: K): x is T & {
     [P in K]-?: NonNullable<T[K]>;
 };
+export declare function isThenable(x: unknown): boolean;
 export declare function assertNotNil<T>(x: T | null): asserts x is T;
 export declare function argNotNil<T, K extends keyof T>(x: T, key: K): asserts x is T & {
     [P in K]-?: NonNullable<T[K]>;
 };
-export declare function hasOwn<T extends object, K extends PropertyKey>(x: T, key: K): x is T & WithKey<K>;
-export declare function hasOwn<T extends object, K extends PropertyKey, V>(x: T, key: K, ofType: (found: unknown) => found is V): x is T & WithKey<K, V>;
-export declare function hasKey<T extends object, K extends PropertyKey>(x: T, key: K): x is T & WithKey<K>;
-export declare function hasKey<T extends object, K extends PropertyKey, V>(x: T, key: K, ofType: (found: unknown) => found is V): x is T & WithKey<K, V>;
+export declare function hasOwn<T extends object, K extends PropertyKey>(x: T | unknown, key: K): x is T & WithKey<K>;
+export declare function hasOwn<T extends object, K extends PropertyKey, V>(x: T | unknown, key: K, ofType: (found: unknown) => found is V): x is T & WithKey<K, V>;
+export declare function hasKey<T extends object, K extends PropertyKey>(x: T | unknown, key: K): x is T & WithKey<K>;
+export declare function hasKey<T extends object, K extends PropertyKey, V>(x: T | unknown, key: K, ofType: (found: unknown) => found is V): x is T & WithKey<K, V>;
 export declare function assertOwn<T extends object, K extends PropertyKey>(x: T, key: K): asserts x is T & WithKey<K>;
 export declare function assertOwn<T extends object, K extends PropertyKey, V>(x: T, key: K, ofType: (found: unknown) => found is V): asserts x is T & WithKey<K, V>;
 export declare function assertKey<T extends object, K extends PropertyKey>(x: T, key: K): asserts x is T & WithKey<K>;

package/lib/index.js

@@ -19,6 +19,9 @@ export function isNil(x, key) {
 export function isNotNil(x, key) {
     return !isNil(x) && (key === undefined || !isNil(x[key]));
 }
+export function isThenable(x) {
+    return x != null && typeof x === 'object' && 'then' in x && typeof x.then === 'function';
+}
 export function assertNotNil(x) {
     if (x == null)
         ArgumentError.null('Unexpected null');
@@ -33,7 +36,7 @@ export function hasOwn(x, key, ofType) {
     return _hasOwn(x, key) && (ofType == undefined || ofType(x[key]));
 }
 function _hasKey(x, key) {
-    return key in x;
+    return typeof x === 'object' && key in x;
 }
 export function hasKey(x, key, ofType) {
     return _hasKey(x, key) && (ofType == undefined || ofType(x[key]));
@@ -53,18 +56,14 @@ export function intOrUndefined(x) {
     const v = Number.parseInt(x);
     return Number.isNaN(v) ? undefined : v;
 }
-function filterEntries(x, p) {
-    if (x == null)
-        return null;
-    if (typeof x !== 'object')
-        return x;
-    return Object.fromEntries(Object.entries(x).filter(p));
+function* excludeEntries(x, p) {
+    for (const k in x)
+        if (!p(k))
+            yield [k, Reflect.get(x, k)];
 }
 export function omit(x, ...keys) {
-    const ks = keys;
-    return filterEntries(x, ([key]) => !ks.includes(key));
+    return Object.fromEntries(excludeEntries(x, Array.prototype.includes.bind(keys)));
 }
 export function pick(x, ...keys) {
-    const ks = keys;
-    return filterEntries(x, ([key]) => ks.includes(key));
+    return Object.fromEntries(keys.map((k) => [keys, x[k]]));
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@drunkcod/argis",
   "type": "module",
-  "version": "0.0.10",
+  "version": "0.0.12",
   "description": "Tiny method arg checking with strong types.",
   "scripts": {
     "clean": "rimraf lib",
@@ -9,7 +9,7 @@
     "cjs:compile": "tsc --module commonjs --outdir lib/cjs",
     "cjs:fixup": "echo '{\"type\": \"commonjs\"}' > lib/cjs/package.json",
     "build": "npm-run-all clean -p compile cjs:compile -s cjs:fixup --silent",
-    "test": "jest"
+    "test": "node --experimental-vm-modules --disable-warning=ExperimentalWarning node_modules/jest/bin/jest.js"
   },
   "author": "Tobbe Gyllebring",
   "license": "MIT",
@@ -32,11 +32,11 @@
     }
   },
   "devDependencies": {
-    "@jest/globals": "^29.7.0",
-    "jest": "^29.7.0",
+    "@jest/globals": "^30.0.4",
+    "jest": "^30.0.4",
     "npm-run-all": "^4.1.5",
     "rimraf": "^6.0.1",
-    "ts-jest": "^29.2.5",
-    "typescript": "^5.7.3"
+    "ts-jest": "^29.4.0",
+    "typescript": "^5.8.3"
   }
 }