@wener/utils 1.0.0 → 1.1.1

package/lib/esm/shim/urljoin.test.js

@@ -0,0 +1,4 @@
+import { urljoin } from "./urljoin";
+test("join ext", () => {
+  expect(urljoin("http://wener.me/sub/", "/a/", "/hello.js")).toBe("http://wener.me/sub/a/hello.js");
+});

package/lib/esm/strings/camelCase.js

@@ -1,69 +1,57 @@
-// https://github.com/sindresorhus/camelcase/blob/master/index.js
 function preserveCamelCase(string) {
-    var isLastCharLower = false;
-    var isLastCharUpper = false;
-    var isLastLastCharUpper = false;
-    for (var i = 0; i < string.length; i++) {
-        var character = string[i];
-        if (isLastCharLower && /[a-zA-Z]/.test(character) && character.toUpperCase() === character) {
-            string = string.slice(0, i) + '-' + string.slice(i);
-            isLastCharLower = false;
-            isLastLastCharUpper = isLastCharUpper;
-            isLastCharUpper = true;
-            i++;
-        }
-        else if (isLastCharUpper &&
-            isLastLastCharUpper &&
-            /[a-zA-Z]/.test(character) &&
-            character.toLowerCase() === character) {
-            string = string.slice(0, i - 1) + '-' + string.slice(i - 1);
-            isLastLastCharUpper = isLastCharUpper;
-            isLastCharUpper = false;
-            isLastCharLower = true;
-        }
-        else {
-            isLastCharLower = character.toLowerCase() === character && character.toUpperCase() !== character;
-            isLastLastCharUpper = isLastCharUpper;
-            isLastCharUpper = character.toUpperCase() === character && character.toLowerCase() !== character;
-        }
+  let isLastCharLower = false;
+  let isLastCharUpper = false;
+  let isLastLastCharUpper = false;
+  for (let i = 0; i < string.length; i++) {
+    const character = string[i];
+    if (isLastCharLower && /[a-zA-Z]/.test(character) && character.toUpperCase() === character) {
+      string = string.slice(0, i) + "-" + string.slice(i);
+      isLastCharLower = false;
+      isLastLastCharUpper = isLastCharUpper;
+      isLastCharUpper = true;
+      i++;
+    } else if (isLastCharUpper && isLastLastCharUpper && /[a-zA-Z]/.test(character) && character.toLowerCase() === character) {
+      string = string.slice(0, i - 1) + "-" + string.slice(i - 1);
+      isLastLastCharUpper = isLastCharUpper;
+      isLastCharUpper = false;
+      isLastCharLower = true;
+    } else {
+      isLastCharLower = character.toLowerCase() === character && character.toUpperCase() !== character;
+      isLastLastCharUpper = isLastCharUpper;
+      isLastCharUpper = character.toUpperCase() === character && character.toLowerCase() !== character;
     }
-    return string;
+  }
+  return string;
 }
-export function pascalCase(input) {
-    return camelCase(input, { pascalCase: true });
+function pascalCase(input) {
+  return camelCase(input, { pascalCase: true });
 }
-export function camelCase(input, options) {
-    if (options === void 0) { options = {
-        pascalCase: false,
-    }; }
-    if (!(typeof input === 'string' || Array.isArray(input))) {
-        throw new TypeError('Expected the input to be `string | string[]`');
-    }
-    var postProcess = function (x) { return (options.pascalCase ? x.charAt(0).toUpperCase() + x.slice(1) : x); };
-    if (Array.isArray(input)) {
-        input = input
-            .map(function (x) { return x.trim(); })
-            .filter(function (x) { return x.length; })
-            .join('-');
-    }
-    else {
-        input = input.trim();
-    }
-    if (input.length === 0) {
-        return '';
-    }
-    if (input.length === 1) {
-        return options.pascalCase ? input.toUpperCase() : input.toLowerCase();
-    }
-    var hasUpperCase = input !== input.toLowerCase();
-    if (hasUpperCase) {
-        input = preserveCamelCase(input);
-    }
-    input = input
-        .replace(/^[_.\- ]+/, '')
-        .toLowerCase()
-        .replace(/[_.\- ]+(\w|$)/g, function (_, p1) { return p1.toUpperCase(); })
-        .replace(/\d+(\w|$)/g, function (m) { return m.toUpperCase(); });
-    return postProcess(input);
+function camelCase(input, options = {
+  pascalCase: false
+}) {
+  if (!(typeof input === "string" || Array.isArray(input))) {
+    throw new TypeError("Expected the input to be `string | string[]`");
+  }
+  const postProcess = (x) => options.pascalCase ? x.charAt(0).toUpperCase() + x.slice(1) : x;
+  if (Array.isArray(input)) {
+    input = input.map((x) => x.trim()).filter((x) => x.length).join("-");
+  } else {
+    input = input.trim();
+  }
+  if (input.length === 0) {
+    return "";
+  }
+  if (input.length === 1) {
+    return options.pascalCase ? input.toUpperCase() : input.toLowerCase();
+  }
+  const hasUpperCase = input !== input.toLowerCase();
+  if (hasUpperCase) {
+    input = preserveCamelCase(input);
+  }
+  input = input.replace(/^[_.\- ]+/, "").toLowerCase().replace(/[_.\- ]+(\w|$)/g, (_, p1) => p1.toUpperCase()).replace(/\d+(\w|$)/g, (m) => m.toUpperCase());
+  return postProcess(input);
 }
-//# sourceMappingURL=camelCase.js.map
+export {
+  camelCase,
+  pascalCase
+};

package/lib/esm/strings/index.d.ts

@@ -1,3 +1,2 @@
 export * from './camelCase';
 export * from './templates';
-export * from './urljoin';

package/lib/esm/strings/index.js

@@ -1,4 +1,2 @@
-export * from './camelCase';
-export * from './templates';
-export * from './urljoin';
-//# sourceMappingURL=index.js.map
+export * from "./camelCase";
+export * from "./templates";

package/lib/esm/strings/templates.d.ts

@@ -4,4 +4,4 @@
  * @example
  * templateString('My name is ${name}',{name:'wener'})
  */
-export declare function templateString(template: string, variables: Record<string, any>): string;
+export declare function templateString(template: string, getter: (v: string) => any): string;

package/lib/esm/strings/templates.js

@@ -1,15 +1,8 @@
-import { get } from 'lodash';
-/**
- * 替换类似于 JS 的模板字符串
- *
- * @example
- * templateString('My name is ${name}',{name:'wener'})
- */
-export function templateString(template, variables) {
-    return template.replace(/\${(.*?)}/g, function (_, g) {
-        // variables[g.trim()]
-        // 支持路径 - 例如 a.b[0]
-        return get(variables, g.trim());
-    });
+function templateString(template, getter) {
+  return template.replace(/\${(.*?)}/g, (_, g) => {
+    return getter(g.trim());
+  });
 }
-//# sourceMappingURL=templates.js.map
+export {
+  templateString
+};

package/lib/esm/validations/asserts.js

@@ -1,13 +1,10 @@
-export function assert(condition, msg) {
-    // if (!condition) {
-    //   throw new AssertionError(msg);
-    // }
-    console.assert(!condition, msg);
+function assert(condition, msg) {
+  console.assert(!condition, msg);
 }
-export function assertIsDefined(val) {
-    // if (val === undefined || val === null) {
-    //   throw new AssertionError(`Expected 'val' to be defined, but received ${val}`);
-    // }
-    console.assert(val === undefined || val === null, 'Expected defined');
+function assertIsDefined(val) {
+  console.assert(val === void 0 || val === null, "Expected defined");
 }
-//# sourceMappingURL=asserts.js.map
+export {
+  assert,
+  assertIsDefined
+};

package/lib/esm/validations/index.js

@@ -1,5 +1,4 @@
-export * from './asserts';
-export * from './isDefined';
-export * from './isEmptyObject';
-export * from './isClass';
-//# sourceMappingURL=index.js.map
+export * from "./asserts";
+export * from "./isDefined";
+export * from "./isEmptyObject";
+export * from "./isClass";

package/lib/esm/validations/isClass.js

@@ -1,4 +1,6 @@
-export function isClass(func) {
-    return typeof func === 'function' && /^class\s/.test(Function.prototype.toString.call(func));
+function isClass(func) {
+  return typeof func === "function" && /^class\s/.test(Function.prototype.toString.call(func));
 }
-//# sourceMappingURL=isClass.js.map
+export {
+  isClass
+};

package/lib/esm/validations/isDefined.js

@@ -1,4 +1,6 @@
-export function isDefined(v) {
-    return v !== null && v !== undefined;
+function isDefined(v) {
+  return v !== null && v !== void 0;
 }
-//# sourceMappingURL=isDefined.js.map
+export {
+  isDefined
+};

package/lib/esm/validations/isEmptyObject.js

@@ -1,7 +1,9 @@
-export function isEmptyObject(o) {
-    if (o === null || o === undefined) {
-        return true;
-    }
-    return o.constructor === Object && Object.keys(o).length === 0;
+function isEmptyObject(o) {
+  if (o === null || o === void 0) {
+    return true;
+  }
+  return o.constructor === Object && Object.keys(o).length === 0;
 }
-//# sourceMappingURL=isEmptyObject.js.map
+export {
+  isEmptyObject
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wener/utils",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Utils for daily use",
   "keywords": [
     "utils",
@@ -9,30 +9,29 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/wener/apis.git"
+    "url": "git+https://github.com/wener/wode.git"
   },
   "license": "MIT",
   "author": "wener",
   "main": "lib/cjs/index.js",
   "module": "lib/esm/index.js",
-  "typings": "lib/esm/index.d.ts",
+  "types": "src/index.ts",
   "esnext": "lib/esnext/index.js",
-  "umd:main": "dist/wener-utils.umd.js",
-  "unpkg": "dist/wener-utils.umd.js",
-  "jsdelivr": "dist/wener-utils.umd.js",
-  "jsnext:main": "dist/wener-utils.esm.js",
+  "umd:main": "dist/utils.js",
+  "unpkg": "dist/utils.js",
+  "jsdelivr": "dist/utils.js",
+  "jsnext:main": "dist/utils.esm.js",
   "exports": {
     ".": {
-      "import": "./dist/wener-utils.esm.js",
-      "require": "./dist/wener-utils.cjs"
+      "import": "./lib/esm/index.js",
+      "require": "./lib/cjs/index.js"
     }
   },
-  "homepage": "https://github.com/wenerme/apis#readme",
+  "homepage": "https://github.com/wenerme/wode#readme",
   "files": [
     "index.js",
     "index.d.ts",
     "lib",
-    "es",
     "dist",
     "src",
     "README.md",
@@ -44,36 +43,28 @@
     "tsconfig.json"
   ],
   "scripts": {
-    "build": "make build",
+    "build": "make prepublish",
     "clean": "make clean",
+    "dev": "make dev",
     "test": "jest"
   },
   "devDependencies": {
-    "@babel/core": "^7",
-    "@babel/preset-env": "^7.10.4",
-    "@babel/preset-typescript": "^7.10.4",
-    "@rollup/plugin-babel": "^5",
-    "@rollup/plugin-node-resolve": "^8.4.0",
-    "@rollup/plugin-typescript": "^5",
-    "@types/babel__core": "^7",
-    "@types/babel__preset-env": "^7",
-    "@types/jest": "^25",
+    "@types/jest": "^28",
     "@types/lodash": "^4",
-    "@types/node": "^12",
-    "dotenv": "^8",
-    "jest": "^26",
+    "@types/node": "^16",
+    "dotenv": "^16",
+    "esbuild": "^0.14",
+    "jest": "^28",
     "lodash": "^4",
-    "rollup": "^2",
-    "rollup-plugin-terser": "^6",
-    "ts-jest": "^26",
+    "ts-jest": "^28",
     "tslib": "^2",
-    "typedoc": "^0",
-    "typescript": "^3"
-  },
-  "peerDependencies": {
-    "lodash": "*"
+    "typescript": "^4"
   },
   "publishConfig": {
     "access": "public"
+  },
+  "engines": {
+    "node": "16",
+    "npm": "8"
   }
 }

package/src/arrays/MaybeArray.ts

@@ -3,13 +3,16 @@ export type MaybeArray<T> = T | T[];
 export function objectOfMaybeArray<T = any>(
   o: Record<string, MaybeArray<T>>,
   keys: string[] | null = null,
-  picker = firstOfMaybeArray,
+  picker = firstOfMaybeArray
 ): Record<string, T> {
   if (keys === null) {
-    return Object.fromEntries(Object.entries(o).map(([k, v]) => [k, picker(v)]));
+    return Object.fromEntries(
+      Object.entries(o).map(([k, v]) => [k, picker(v)])
+    );
   }
   return Object.fromEntries(keys.map((v) => [v, picker(v)])) as any;
 }
+
 export function firstOfMaybeArray<T>(v: MaybeArray<T>): T {
   if (Array.isArray(v)) {
     return v[0];

package/src/asyncs/timeout.ts

@@ -3,7 +3,7 @@ export function timeout<T = any>(v: Promise<T>, ms: number): Promise<T> {
   let timeout: any;
   return Promise.race([
     v,
-    new Promise((resolve, reject) => {
+    new Promise((_, reject) => {
       timeout = setTimeout(() => reject(error), ms);
     }),
   ]).then(

package/src/browsers/{transfers.ts → getFileFromDataTransfer.ts}

@@ -1,12 +1,17 @@
-export function getFile(dataTransfer: DataTransfer): { file: File; filename: string } | null {
-  const items: DataTransferItemList = dataTransfer?.items ?? ([] as any);
+export function getFileFromDataTransfer(dataTransfer?: DataTransfer | null): { file?: File; name?: string } {
+  if (!dataTransfer) {
+    return {};
+  }
+
+  const items: DataTransferItemList = dataTransfer.items ?? [];
 
   if (items.length >= 2 && items[0].kind === 'string' && items[1].kind === 'file') {
+    // name, file
     const text = dataTransfer.getData('text');
     const file = items[1].getAsFile() ?? dataTransfer.files?.item(0);
     if (!file) {
       console.error(`no file ${text}`, items[1]);
-      return null;
+      return {};
     }
 
     // let type = file.type;
@@ -18,19 +23,19 @@ export function getFile(dataTransfer: DataTransfer): { file: File; filename: str
     //   file = new File([blob], text, {type});
     // }
 
-    return { file, filename: text };
+    return { file, name: text };
   } else if (items[0].kind === 'file') {
     const file = items[0].getAsFile();
     if (!file) {
       console.error(`no file`, items[0]);
-      return null;
+      return {};
     }
-    return { file, filename: file.name };
+    return { file, name: file.name };
   } else {
     console.debug(
       `file item not match`,
       Array.from(items).map((v) => ({ type: v.type, kind: v.kind })),
     );
   }
-  return null;
+  return {};
 }

package/src/browsers/index.ts

@@ -1,4 +1,4 @@
-export * from './clipboard';
+export * from './copy';
 export * from './download';
 export * from './loaders';
-export * from './transfers';
+export * from './getFileFromDataTransfer';

package/src/browsers/loaders.ts

@@ -1,7 +1,7 @@
 function load(
   el: HTMLScriptElement | HTMLLinkElement,
   resolve: (v: any) => void,
-  reject: Function,
+  reject: (v: any) => void,
   options: { attributes: Record<string, string> } | undefined,
 ) {
   el.onload = resolve;

package/src/formats/formatBytes.ts

@@ -0,0 +1,30 @@
+/**
+ * Format bytes as human-readable text.
+ *
+ * @param bytes Number of bytes.
+ * @param si True to use metric (SI) units, aka powers of 1000. False to use
+ *           binary (IEC), aka powers of 1024.
+ * @param dp Number of decimal places to display.
+ *
+ * @return Formatted string.
+ */
+export function formatBytes(bytes: number, si = false, dp = 1) {
+  const thresh = si ? 1000 : 1024;
+
+  if (Math.abs(bytes) < thresh) {
+    return bytes + ' B';
+  }
+
+  const units = si
+    ? ['kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB']
+    : ['KiB', 'MiB', 'GiB', 'TiB', 'PiB', 'EiB', 'ZiB', 'YiB'];
+  let u = -1;
+  const r = 10 ** dp;
+
+  do {
+    bytes /= thresh;
+    ++u;
+  } while (Math.round(Math.abs(bytes) * r) / r >= thresh && u < units.length - 1);
+
+  return bytes.toFixed(dp) + ' ' + units[u];
+}

package/src/index.ts

@@ -4,6 +4,8 @@ export * from './validations';
 export * from './strings';
 export * from './maths';
 export * from './io';
-export * from './envs';
 export * from './browsers';
-export * from './isomorphics';
+
+export { getGlobalThis } from './isomorphics/getGlobalThis';
+export { formatBytes } from './formats/formatBytes';
+export { urljoin } from './shim/urljoin';

package/src/isomorphics/getGlobalThis.ts

@@ -3,7 +3,7 @@ declare const global: typeof globalThis;
 /**
  * isomorphic globalThis
  *
- * globalThis supported by ff 65, chrome 71, node 12, babel
+ * globalThis supported by ff 65, Chrome 71, Node 12, babel
  *
  * @see https://caniuse.com/#search=globalThis
  * @see https://v8.dev/features/globalthis
@@ -13,8 +13,6 @@ export const getGlobalThis = (): typeof globalThis => {
   if (typeof self !== 'undefined') return self;
   if (typeof window !== 'undefined') return window;
   if (typeof global !== 'undefined') return global as any;
-  // eslint-disable-next-line
-  // @ts-ignore
-  if (typeof this !== 'undefined') return this;
+  // if (typeof this !== 'undefined') return this;
   throw new Error('Unable to locate global `this`');
 };

package/src/maths/random.ts

@@ -1,10 +1,10 @@
 /// javascript pseudo random
-export function createRandom({ seed = 0 } = {}) {
-  if (typeof seed === 'string') {
-    const s: string = seed;
+export function createRandom(o: { seed?: string | number } = {}) {
+  let seed = typeof o.seed === 'string' ? 0 : o.seed ?? 0;
+  if (typeof o.seed === 'string') {
     let sum = 0;
-    for (let i = 0; i < s.length; i++) {
-      sum += s.charCodeAt(i);
+    for (let i = 0; i < o.seed.length; i++) {
+      sum += o.seed.charCodeAt(i);
     }
     seed = sum;
   }

package/src/shim/urljoin.test.ts

@@ -0,0 +1,5 @@
+import { urljoin } from './urljoin';
+
+test('join ext', () => {
+  expect(urljoin('http://wener.me/sub/', '/a/', '/hello.js')).toBe('http://wener.me/sub/a/hello.js');
+});

package/src/{strings → shim}/urljoin.ts

@@ -1,5 +1,18 @@
-/// see https://github.com/jfromaniello/url-join
-export function urljoin(...strArray: string[]) {
+export function urljoin(...strArray: string[]): string;
+export function urljoin(strArray: string[]): string;
+
+/**
+ * @see {@link https://github.com/jfromaniello/url-join}
+ */
+export function urljoin(...args: string[] | [string[]]): string {
+  if (Array.isArray(args[0])) {
+    return normalize(args[0]);
+  } else {
+    return normalize(args as any);
+  }
+}
+
+function normalize(strArray: string[]) {
   const resultArray: string[] = [];
   if (strArray.length === 0) {
     return '';
@@ -35,14 +48,14 @@ export function urljoin(...strArray: string[]) {
 
     if (i > 0) {
       // Removing the starting slashes for each component but the first.
-      component = component.replace(/^[/]+/, '');
+      component = component.replace(/^[\/]+/, '');
     }
     if (i < strArray.length - 1) {
       // Removing the ending slashes for each component but the last.
-      component = component.replace(/[/]+$/, '');
+      component = component.replace(/[\/]+$/, '');
     } else {
       // For the last component we will combine multiple slashes to a single one.
-      component = component.replace(/[/]+$/, '/');
+      component = component.replace(/[\/]+$/, '/');
     }
 
     resultArray.push(component);

package/src/strings/index.ts

@@ -1,3 +1,2 @@
 export * from './camelCase';
 export * from './templates';
-export * from './urljoin';

package/src/strings/templates.ts

@@ -1,15 +1,13 @@
-import { get } from 'lodash';
-
 /**
  * 替换类似于 JS 的模板字符串
  *
  * @example
  * templateString('My name is ${name}',{name:'wener'})
  */
-export function templateString(template: string, variables: Record<string, any>) {
+export function templateString(template: string, getter: (v: string) => any) {
   return template.replace(/\${(.*?)}/g, (_, g) => {
     // variables[g.trim()]
     // 支持路径 - 例如 a.b[0]
-    return get(variables, g.trim());
+    return getter(g.trim());
   });
 }

package/tsconfig.json

@@ -1,9 +1,16 @@
 {
   "compilerOptions": {
     "moduleResolution": "node",
-    "target": "es5",
-    "module": "es2015",
-    "lib": ["esnext", "dom"],
+    "target": "esnext",
+    "module": "esnext",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "es5",
+      "es2015.collection",
+      "es2015.iterable",
+      "esnext"
+    ],
     "strict": true,
     "sourceMap": true,
     "skipLibCheck": true,
@@ -13,8 +20,12 @@
     "allowSyntheticDefaultImports": true,
     "experimentalDecorators": true,
     "emitDecoratorMetadata": true,
-    "noImplicitAny": false,
+    "noImplicitAny": true,
+    "noImplicitReturns": true,
+    "noUnusedLocals": true,
+    "noUnusedParameters": true,
     "pretty": true,
+    "removeComments": false,
     "stripInternal": true
   },
   "exclude": [