extra-utils 3.6.0 → 4.0.0

package/README.md

@@ -29,11 +29,15 @@ function isntFalsy<T>(val: T): val is Exclude<T, Falsy>
 
 ### JSON
 ```ts
-function isJson(val: unknown): Json
-function isntJson<T>(val: T): val is Exclude<T, Json>
-
-function isJsonable<T extends Json>(val: unknown): val is Jsonable<T>
-function isntJsonable<T>(val: T): val is Exclude<T, Jsonable<Json>>
+function isJSONValue(val: unknown): val is JSONValue
+function isntJSONValue<T>(val: T): val is Exclude<T, JSONValue>
+
+function isJSONSerializable<T extends
+| JSONValue
+| Record<string, JSONValue | JSONSerializable<any>>
+| Array<JSONValue | JSONSerializable<any>>
+>(val: unknown): val is JSONSerializable<T>
+function isntJSONSerializable<T>(val: T): val is Exclude<T, JSONSerializable<any>>
 ```
 
 ### Nullish
@@ -137,7 +141,10 @@ removeBlankLines(
 
 #### removeLeadingBlankLines
 ```ts
-function removeLeadingBlankLines(text: string): string
+function removeLeadingBlankLines(
+  text: string
+, maxRemovals: number = Infinity
+): string
 ```
 
 Example:
@@ -153,7 +160,10 @@ removeLeadingBlankLines(
 
 #### removeTrailingBlankLines
 ```ts
-function removeTrailingBlankLines(text: string): string
+function removeTrailingBlankLines(
+  text: string
+, maxRemovals: number = Infinity
+): string
 ```
 
 Example:

package/lib/json/index.d.ts

@@ -1,2 +1,2 @@
-export * from './is-json';
-export * from './is-jsonable';
+export * from './is-json-value';
+export * from './is-json-serializable';

package/lib/json/index.js

@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./is-json"), exports);
-__exportStar(require("./is-jsonable"), exports);
+__exportStar(require("./is-json-value"), exports);
+__exportStar(require("./is-json-serializable"), exports);
 //# sourceMappingURL=index.js.map

package/lib/json/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/json/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,4CAAyB;AACzB,gDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/json/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,kDAA+B;AAC/B,yDAAsC"}

package/lib/json/is-json-serializable.d.ts

@@ -0,0 +1,3 @@
+import { JSONValue, JSONSerializable } from 'justypes';
+export declare function isJSONSerializable<T extends JSONValue | Record<string, JSONValue | JSONSerializable<any>> | Array<JSONValue | JSONSerializable<any>>>(val: unknown): val is JSONSerializable<T>;
+export declare function isntJSONSerializable<T>(val: T): val is Exclude<T, JSONSerializable<any>>;

package/lib/json/is-json-serializable.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isntJSONSerializable = exports.isJSONSerializable = void 0;
+const object_1 = require("../object");
+const is_function_1 = require("../is-function");
+function isJSONSerializable(val) {
+    return (0, object_1.isObject)(val)
+        && 'toJSON' in val
+        && (0, is_function_1.isFunction)(val.toJSON);
+}
+exports.isJSONSerializable = isJSONSerializable;
+function isntJSONSerializable(val) {
+    return !isJSONSerializable(val);
+}
+exports.isntJSONSerializable = isntJSONSerializable;
+//# sourceMappingURL=is-json-serializable.js.map

package/lib/json/is-json-serializable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-json-serializable.js","sourceRoot":"","sources":["../../src/json/is-json-serializable.ts"],"names":[],"mappings":";;;AACA,wCAAsC;AACtC,kDAA6C;AAE7C,SAAgB,kBAAkB,CAIhC,GAAY;IACZ,OAAO,IAAA,iBAAQ,EAAC,GAAG,CAAC;WACb,QAAQ,IAAI,GAAG;WACf,IAAA,wBAAU,EAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC/B,CAAC;AARD,gDAQC;AAED,SAAgB,oBAAoB,CAAI,GAAM;IAC5C,OAAO,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAA;AACjC,CAAC;AAFD,oDAEC"}

package/lib/json/is-json-value.d.ts

@@ -0,0 +1,3 @@
+import { JSONValue } from 'justypes';
+export declare function isJSONValue(val: unknown): val is JSONValue;
+export declare function isntJSONValue<T>(val: T): val is Exclude<T, JSONValue>;

package/lib/json/{is-json.js → is-json-value.js}

@@ -1,23 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isntJson = exports.isJson = void 0;
+exports.isntJSONValue = exports.isJSONValue = void 0;
 const nullish_1 = require("../nullish");
 const boolean_1 = require("../boolean");
 const string_1 = require("../string");
 const number_1 = require("../number");
 const array_1 = require("../array");
 const object_1 = require("../object");
-function isJson(val) {
+function isJSONValue(val) {
     return (0, nullish_1.isNull)(val)
         || (0, boolean_1.isBoolean)(val)
         || (0, string_1.isString)(val)
         || (0, number_1.isNumber)(val)
-        || ((0, array_1.isArray)(val) && val.every(isJson))
-        || ((0, object_1.isPlainObject)(val) && Object.values(val).every(isJson));
+        || ((0, array_1.isArray)(val) && val.every(isJSONValue))
+        || ((0, object_1.isPlainObject)(val) && Object.values(val).every(isJSONValue));
 }
-exports.isJson = isJson;
-function isntJson(val) {
-    return !isJson(val);
+exports.isJSONValue = isJSONValue;
+function isntJSONValue(val) {
+    return !isJSONValue(val);
 }
-exports.isntJson = isntJson;
-//# sourceMappingURL=is-json.js.map
+exports.isntJSONValue = isntJSONValue;
+//# sourceMappingURL=is-json-value.js.map

package/lib/json/is-json-value.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"is-json-value.js","sourceRoot":"","sources":["../../src/json/is-json-value.ts"],"names":[],"mappings":";;;AACA,0CAAqC;AACrC,0CAAwC;AACxC,wCAAsC;AACtC,wCAAsC;AACtC,sCAAoC;AACpC,wCAA2C;AAE3C,SAAgB,WAAW,CAAC,GAAY;IACtC,OAAO,IAAA,gBAAM,EAAC,GAAG,CAAC;WACX,IAAA,mBAAS,EAAC,GAAG,CAAC;WACd,IAAA,iBAAQ,EAAC,GAAG,CAAC;WACb,IAAA,iBAAQ,EAAC,GAAG,CAAC;WACb,CAAC,IAAA,eAAO,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;WACxC,CAAC,IAAA,sBAAa,EAAC,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,CAAA;AACtE,CAAC;AAPD,kCAOC;AAED,SAAgB,aAAa,CAAI,GAAM;IACrC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAA;AAC1B,CAAC;AAFD,sCAEC"}

package/lib/string/remove-leading-blank-lines.d.ts

@@ -1 +1 @@
-export declare function removeLeadingBlankLines(text: string): string;
+export declare function removeLeadingBlankLines(text: string, maxRemovals?: number): string;

package/lib/string/remove-leading-blank-lines.js

@@ -2,10 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeLeadingBlankLines = void 0;
 const utils_1 = require("./utils");
-function removeLeadingBlankLines(text) {
+function removeLeadingBlankLines(text, maxRemovals = Infinity) {
     const lines = text.split('\n');
-    while (lines.length > 0 && (0, utils_1.isBlankLine)(lines[0])) {
+    let removals = 0;
+    while (removals < maxRemovals &&
+        lines.length > 0 &&
+        (0, utils_1.isBlankLine)(lines[0])) {
         lines.shift();
+        removals++;
     }
     return lines.join('\n');
 }

package/lib/string/remove-leading-blank-lines.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-leading-blank-lines.js","sourceRoot":"","sources":["../../src/string/remove-leading-blank-lines.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AAErC,SAAgB,uBAAuB,CAAC,IAAY;IAClD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAE9B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE;QAChD,KAAK,CAAC,KAAK,EAAE,CAAA;KACd;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AARD,0DAQC"}
+{"version":3,"file":"remove-leading-blank-lines.js","sourceRoot":"","sources":["../../src/string/remove-leading-blank-lines.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AAErC,SAAgB,uBAAuB,CACrC,IAAY,EACZ,cAAsB,QAAQ;IAE9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAE9B,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,OACE,QAAQ,GAAG,WAAW;QACtB,KAAK,CAAC,MAAM,GAAG,CAAC;QAChB,IAAA,mBAAW,EAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EACrB;QACA,KAAK,CAAC,KAAK,EAAE,CAAA;QACb,QAAQ,EAAE,CAAA;KACX;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AAjBD,0DAiBC"}

package/lib/string/remove-trailing-blank-lines.d.ts

@@ -1 +1 @@
-export declare function removeTrailingBlankLines(text: string): string;
+export declare function removeTrailingBlankLines(text: string, maxRemovals?: number): string;

package/lib/string/remove-trailing-blank-lines.js

@@ -2,10 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeTrailingBlankLines = void 0;
 const utils_1 = require("./utils");
-function removeTrailingBlankLines(text) {
+function removeTrailingBlankLines(text, maxRemovals = Infinity) {
     const lines = text.split('\n');
-    while (lines.length > 0 && (0, utils_1.isBlankLine)(lines[lines.length - 1])) {
+    let removals = 0;
+    while (removals < maxRemovals &&
+        lines.length > 0 &&
+        (0, utils_1.isBlankLine)(lines[lines.length - 1])) {
         lines.pop();
+        removals++;
     }
     return lines.join('\n');
 }

package/lib/string/remove-trailing-blank-lines.js.map

@@ -1 +1 @@
-{"version":3,"file":"remove-trailing-blank-lines.js","sourceRoot":"","sources":["../../src/string/remove-trailing-blank-lines.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AAErC,SAAgB,wBAAwB,CAAC,IAAY;IACnD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAE9B,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,IAAA,mBAAW,EAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EAAE;QAC/D,KAAK,CAAC,GAAG,EAAE,CAAA;KACZ;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AARD,4DAQC"}
+{"version":3,"file":"remove-trailing-blank-lines.js","sourceRoot":"","sources":["../../src/string/remove-trailing-blank-lines.ts"],"names":[],"mappings":";;;AAAA,mCAAqC;AAErC,SAAgB,wBAAwB,CACtC,IAAY,EACZ,cAAsB,QAAQ;IAE9B,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IAE9B,IAAI,QAAQ,GAAG,CAAC,CAAA;IAChB,OACE,QAAQ,GAAG,WAAW;QACtB,KAAK,CAAC,MAAM,GAAG,CAAC;QAChB,IAAA,mBAAW,EAAC,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,EACpC;QACA,KAAK,CAAC,GAAG,EAAE,CAAA;QACX,QAAQ,EAAE,CAAA;KACX;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACzB,CAAC;AAjBD,4DAiBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "extra-utils",
-  "version": "3.6.0",
+  "version": "4.0.0",
   "description": "Utilities for JavaScript and Typescript",
   "files": [
     "lib"
@@ -11,6 +11,9 @@
   "repository": "git@github.com:BlackGlory/extra-utils.git",
   "author": "BlackGlory <woshenmedoubuzhidao@blackglory.me>",
   "license": "MIT",
+  "engines": {
+    "node": ">=12"
+  },
   "scripts": {
     "lint": "eslint --ext .js,.jsx,.ts,.tsx --quiet src __tests__",
     "test": "jest --runInBand --config jest.config.js",
@@ -29,33 +32,29 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   },
-  "engines": {
-    "node": ">=12"
-  },
   "devDependencies": {
     "@blackglory/pass": "^1.1.0",
     "@commitlint/cli": "^17.3.0",
     "@commitlint/config-conventional": "^17.3.0",
-    "@types/jest": "^29.2.3",
+    "@types/jest": "^29.2.4",
     "@types/jsdom": "^20.0.1",
-    "@types/lodash": "^4.14.190",
-    "@typescript-eslint/eslint-plugin": "^5.44.0",
-    "@typescript-eslint/parser": "^5.44.0",
-    "eslint": "^8.28.0",
+    "@types/lodash": "^4.14.191",
+    "@typescript-eslint/eslint-plugin": "^5.46.1",
+    "@typescript-eslint/parser": "^5.46.1",
+    "eslint": "^8.30.0",
     "husky": "^4.3.8",
     "jest": "^29.3.1",
-    "jest-extended": "^3.2.0",
     "npm-run-all": "^4.1.5",
     "rimraf": "^3.0.2",
     "standard-version": "^9.5.0",
     "ts-jest": "^29.0.3",
     "tscpaths": "^0.0.9",
-    "tsd": "^0.24.1",
+    "tsd": "^0.25.0",
     "tslib": "^2.4.1",
     "typescript": "4.9.3"
   },
   "dependencies": {
-    "justypes": "^3.1.2",
+    "justypes": "^4.0.0",
     "lodash": "^4.17.21"
   }
 }

package/lib/json/is-json.d.ts

@@ -1,3 +0,0 @@
-import { Json } from 'justypes';
-export declare function isJson(val: unknown): val is Json;
-export declare function isntJson<T>(val: T): val is Exclude<T, Json>;

package/lib/json/is-json.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"is-json.js","sourceRoot":"","sources":["../../src/json/is-json.ts"],"names":[],"mappings":";;;AACA,0CAAqC;AACrC,0CAAwC;AACxC,wCAAsC;AACtC,wCAAsC;AACtC,sCAAoC;AACpC,wCAA2C;AAE3C,SAAgB,MAAM,CAAC,GAAY;IACjC,OAAO,IAAA,gBAAM,EAAC,GAAG,CAAC;WACX,IAAA,mBAAS,EAAC,GAAG,CAAC;WACd,IAAA,iBAAQ,EAAC,GAAG,CAAC;WACb,IAAA,iBAAQ,EAAC,GAAG,CAAC;WACb,CAAC,IAAA,eAAO,EAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;WACnC,CAAC,IAAA,sBAAa,EAAC,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;AACjE,CAAC;AAPD,wBAOC;AAED,SAAgB,QAAQ,CAAI,GAAM;IAChC,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,CAAA;AACrB,CAAC;AAFD,4BAEC"}

package/lib/json/is-jsonable.d.ts

@@ -1,3 +0,0 @@
-import { Json, Jsonable } from 'justypes';
-export declare function isJsonable<T extends Json>(val: unknown): val is Jsonable<T>;
-export declare function isntJsonable<T>(val: T): val is Exclude<T, Jsonable<Json>>;

package/lib/json/is-jsonable.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isntJsonable = exports.isJsonable = void 0;
-const object_1 = require("../object");
-const is_function_1 = require("../is-function");
-function isJsonable(val) {
-    return (0, object_1.isObject)(val)
-        && 'toJSON' in val
-        && (0, is_function_1.isFunction)(val.toJSON);
-}
-exports.isJsonable = isJsonable;
-function isntJsonable(val) {
-    return !isJsonable(val);
-}
-exports.isntJsonable = isntJsonable;
-//# sourceMappingURL=is-jsonable.js.map

package/lib/json/is-jsonable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"is-jsonable.js","sourceRoot":"","sources":["../../src/json/is-jsonable.ts"],"names":[],"mappings":";;;AACA,wCAAsC;AACtC,kDAA6C;AAE7C,SAAgB,UAAU,CAAiB,GAAY;IACrD,OAAO,IAAA,iBAAQ,EAAC,GAAG,CAAC;WACb,QAAQ,IAAI,GAAG;WACf,IAAA,wBAAU,EAAC,GAAG,CAAC,MAAM,CAAC,CAAA;AAC/B,CAAC;AAJD,gCAIC;AAED,SAAgB,YAAY,CAAI,GAAM;IACpC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,CAAA;AACzB,CAAC;AAFD,oCAEC"}