ejv 1.1.10 → 2.0.0

package/build/scripts/add-js-extensions.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const node_path_1 = require("node:path");
+const promises_1 = require("node:fs/promises");
+// patch targets
+// cjs: const interfaces_1 = require("./interfaces.js");
+// esm: import { EjvError } from './interfaces.js';
+console.log('* add-js-extensions');
+(async () => {
+    // get all .js file in build folder
+    const buildFolder = (0, node_path_1.join)('.', 'build');
+    const folderNames = (await (0, promises_1.readdir)(buildFolder, { withFileTypes: true }))
+        .filter((one) => one.isDirectory())
+        .map((one) => one.name);
+    const importStateRegExp = /['"]\.\/[a-z]+['"]/g;
+    let modifiedFileCount = 0;
+    let modifiedStrCount = 0;
+    for await (const folder of folderNames) {
+        const jsFilePaths = (await (0, promises_1.readdir)((0, node_path_1.join)(buildFolder, folder), { withFileTypes: true }))
+            .filter((one) => one.isFile() && one.name.endsWith('.js'))
+            .map((one) => (0, node_path_1.join)(buildFolder, folder, one.name));
+        for await (const jsFilePath of jsFilePaths) {
+            let fileContents = await (0, promises_1.readFile)(jsFilePath, {
+                encoding: 'utf-8'
+            });
+            const matchResults = [...fileContents.matchAll(importStateRegExp)];
+            if (matchResults.length > 0) {
+                for (let i = 0; i < matchResults.length; i++) {
+                    const oneResult = matchResults[i];
+                    const beforeStr = oneResult[0];
+                    const afterStr = beforeStr.endsWith('"')
+                        ? beforeStr.replace(/"$/, '.js"')
+                        : beforeStr.replace(/'$/, '.js\'');
+                    fileContents = fileContents.replace(beforeStr, afterStr);
+                    ++modifiedStrCount;
+                }
+                await (0, promises_1.writeFile)(jsFilePath, fileContents, {
+                    encoding: 'utf-8'
+                });
+                ++modifiedFileCount;
+            }
+        }
+    }
+    console.log(`${modifiedStrCount} import statements in ${modifiedFileCount} files patched`);
+})();
+//# sourceMappingURL=add-js-extensions.js.map

package/build/scripts/add-js-extensions.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"add-js-extensions.js","sourceRoot":"","sources":["../../scripts/add-js-extensions.ts"],"names":[],"mappings":";;AAAA,yCAAiC;AAEjC,+CAAgE;AAEhE,gBAAgB;AAChB,qDAAqD;AACrD,gDAAgD;AAEhD,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC;AAEnC,CAAC,KAAK,IAAmB,EAAE;IAC1B,mCAAmC;IACnC,MAAM,WAAW,GAAW,IAAA,gBAAI,EAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAC/C,MAAM,WAAW,GAAa,CAAC,MAAM,IAAA,kBAAO,EAAC,WAAW,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SACjF,MAAM,CAAC,CAAC,GAAW,EAAW,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC;SACnD,GAAG,CAAC,CAAC,GAAW,EAAU,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IAEzC,MAAM,iBAAiB,GAAG,qBAAqB,CAAC;IAEhD,IAAI,iBAAiB,GAAW,CAAC,CAAC;IAClC,IAAI,gBAAgB,GAAW,CAAC,CAAC;IAEjC,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,WAAW,EAAE,CAAC;QACxC,MAAM,WAAW,GAAa,CAAC,MAAM,IAAA,kBAAO,EAAC,IAAA,gBAAI,EAAC,WAAW,EAAE,MAAM,CAAC,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;aAC/F,MAAM,CAAC,CAAC,GAAW,EAAW,EAAE,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;aAC1E,GAAG,CAAC,CAAC,GAAW,EAAU,EAAE,CAAC,IAAA,gBAAI,EAAC,WAAW,EAAE,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAEpE,IAAI,KAAK,EAAC,MAAM,UAAU,IAAI,WAAW,EAAE,CAAC;YAC3C,IAAI,YAAY,GAAW,MAAM,IAAA,mBAAQ,EAAC,UAAU,EAAE;gBACrD,QAAQ,EAAE,OAAO;aACjB,CAAC,CAAC;YAEH,MAAM,YAAY,GAAuB,CAAC,GAAG,YAAY,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC;YAEvF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAC9C,MAAM,SAAS,GAAqB,YAAY,CAAC,CAAC,CAAC,CAAC;oBAEpD,MAAM,SAAS,GAAW,SAAS,CAAC,CAAC,CAAC,CAAC;oBACvC,MAAM,QAAQ,GAAW,SAAS,CAAC,QAAQ,CAAC,GAAG,CAAC;wBAC/C,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;wBACjC,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;oBAEpC,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;oBAEzD,EAAE,gBAAgB,CAAC;gBACpB,CAAC;gBAED,MAAM,IAAA,oBAAS,EAAC,UAAU,EAAE,YAAY,EAAE;oBACzC,QAAQ,EAAE,OAAO;iBACjB,CAAC,CAAC;gBAEH,EAAE,iBAAiB,CAAC;YACrB,CAAC;QACF,CAAC;IACF,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,GAAI,gBAAiB,yBAA0B,iBAAkB,gBAAgB,CAAC,CAAC;AAChG,CAAC,CAAC,EAAE,CAAC"}

package/build/tester.d.ts

@@ -1,34 +1,33 @@
-import { DataType } from './constants';
-export declare const typeTester: (value: any, type: DataType) => boolean;
-export declare const definedTester: (value: any) => value is boolean;
-export declare const enumTester: <T>(value: T, arr: T[]) => boolean;
-export declare const lengthTester: (value: string | any[], length: number) => boolean;
-export declare const minLengthTester: (value: string | any[], minLength: number) => boolean;
-export declare const maxLengthTester: (value: string | any[], maxLength: number) => boolean;
-export declare const booleanTester: (value: any) => boolean;
-export declare const numberTester: (value: any) => value is number;
-export declare const integerTester: (value: number) => boolean;
-export declare const indexTester: (value: number) => value is number;
-export declare const minNumberTester: (value: number, min: number) => boolean;
-export declare const exclusiveMinNumberTester: (value: number, min: number) => boolean;
-export declare const maxNumberTester: (value: number, max: number) => boolean;
-export declare const exclusiveMaxNumberTester: (value: number, max: number) => boolean;
-export declare const stringTester: (value: any) => value is string;
-export declare const stringRegExpTester: (value: string, regExp: string | RegExp) => boolean;
-export declare const emailTester: (value: string) => boolean;
-export declare const dateFormatTester: (value: string) => boolean;
-export declare const timeFormatTester: (value: string) => boolean;
-export declare const dateTimeFormatTester: (value: string) => boolean;
-export declare const objectTester: (value: any) => value is {
-    [key: string]: any;
-};
-export declare const hasPropertyTester: (value: object) => boolean;
-export declare const dateTester: (value: any) => value is Date;
-export declare const minDateTester: (value: Date, min: Date) => boolean;
-export declare const exclusiveMinDateTester: (value: Date, min: Date) => boolean;
-export declare const maxDateTester: (value: Date, max: Date) => boolean;
-export declare const exclusiveMaxDateTester: (value: Date, max: Date) => boolean;
-export declare const arrayTester: (value: any) => value is any[];
-export declare const arrayTypeOfTester: (array: any[], type: DataType) => boolean;
-export declare const uniqueItemsTester: (array: any[]) => boolean;
-export declare const regExpTester: (value: any) => value is RegExp;
+import { DataType } from './constants';
+import { AnyObject } from './interfaces';
+export declare const typeTester: (value: unknown, type: DataType) => boolean;
+export declare const definedTester: (value: unknown) => value is boolean;
+export declare const enumTester: <T>(value: T, arr: T[]) => boolean;
+export declare const lengthTester: (value: string | unknown[], length: number) => boolean;
+export declare const minLengthTester: (value: string | unknown[], minLength: number) => boolean;
+export declare const maxLengthTester: (value: string | unknown[], maxLength: number) => boolean;
+export declare const booleanTester: (value: unknown) => value is boolean;
+export declare const numberTester: (value: unknown) => value is number;
+export declare const integerTester: (value: number) => boolean;
+export declare const indexTester: (value: number) => value is number;
+export declare const minNumberTester: (value: number, min: number) => boolean;
+export declare const exclusiveMinNumberTester: (value: number, min: number) => boolean;
+export declare const maxNumberTester: (value: number, max: number) => boolean;
+export declare const exclusiveMaxNumberTester: (value: number, max: number) => boolean;
+export declare const stringTester: (value: unknown) => value is string;
+export declare const stringRegExpTester: (value: string, regExp: string | RegExp) => boolean;
+export declare const emailTester: (value: string) => boolean;
+export declare const dateFormatTester: (value: string) => boolean;
+export declare const timeFormatTester: (value: string) => boolean;
+export declare const dateTimeFormatTester: (value: string) => boolean;
+export declare const objectTester: (value: unknown) => boolean;
+export declare const hasPropertyTester: (value: AnyObject) => boolean;
+export declare const dateTester: (value: unknown) => value is Date;
+export declare const minDateTester: (value: Date, min: Date) => boolean;
+export declare const exclusiveMinDateTester: (value: Date, min: Date) => boolean;
+export declare const maxDateTester: (value: Date, max: Date) => boolean;
+export declare const exclusiveMaxDateTester: (value: Date, max: Date) => boolean;
+export declare const arrayTester: (value: unknown) => value is unknown[];
+export declare const arrayTypeOfTester: (array: unknown[], type: DataType) => boolean;
+export declare const uniqueItemsTester: (array: unknown[]) => boolean;
+export declare const regExpTester: (value: unknown) => value is RegExp;

package/build/util.d.ts

@@ -1 +1,7 @@
-export declare const clone: (obj: any) => any;
+import { ErrorMsg } from './constants';
+export declare const isArray: <T>(value: unknown) => value is T[];
+export declare const clone: <T>(obj: T, sanitize?: boolean) => T;
+export declare const sift: <T>(arr: T[]) => T[];
+export declare const createErrorMsg: (errorMsg: ErrorMsg, param?: {
+    placeholders?: (string | number)[];
+}) => string;

package/package.json

@@ -1,39 +1,50 @@
 {
-  "name": "ejv",
-  "version": "1.1.10",
-  "description": "Easy JSON Validator",
-  "main": "build/public_api.js",
-  "types": "build/public_api.d.ts",
-  "scripts": {
-    "clean": "rimraf ./build",
-    "prebuild": "yarn clean",
-    "build": "tsc",
-    "prebuild:test": "yarn clean",
-    "build:test": "tsc -p tsconfig.spec.json",
-    "pretest": "yarn build:test",
-    "test": "mocha ./build/**/*.spec.js"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/han41858/ejv.git"
-  },
-  "keywords": [
-    "json",
-    "validator",
-    "validation"
-  ],
-  "author": "Janghyun Han <han41858@gmail.com>",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/han41858/ejv/issues"
-  },
-  "homepage": "https://github.com/han41858/ejv#readme",
-  "devDependencies": {
-    "@types/chai": "^4.2.14",
-    "@types/mocha": "^8.2.0",
-    "chai": "^4.2.0",
-    "mocha": "^8.2.1",
-    "rimraf": "^3.0.2",
-    "typescript": "^4.1.3"
-  }
+	"name": "ejv",
+	"version": "2.0.0",
+	"description": "Easy JSON Validator",
+	"exports": {
+		"require": "./build/cjs/index.js",
+		"import": "./build/esm/index.js"
+	},
+	"types": "build/public_api.d.ts",
+	"main": "build/cjs/public_api.js",
+	"scripts": {
+		"clean": "rimraf ./build",
+		"prebuild": "yarn clean",
+		"build:types": "tsc -p tsconfig.types.json",
+		"build:cjs": "tsc -p tsconfig.cjs.json&&echo { \"type\": \"commonjs\" } > build/cjs/package.json",
+		"build:esm": "tsc -p tsconfig.esm.json&&echo { \"type\": \"module\" } > build/esm/package.json",
+		"build": "yarn build:types&&yarn build:cjs&&yarn build:esm",
+		"postbuild": "tsc -p tsconfig.scripts.json&&node build/scripts/add-js-extensions",
+		"test": "mocha",
+		"lint": "eslint src/**/*.ts spec/**/*.ts"
+	},
+	"repository": {
+		"type": "git",
+		"url": "git+https://github.com/han41858/ejv.git"
+	},
+	"keywords": [
+		"json",
+		"validator",
+		"validation"
+	],
+	"author": "Janghyun Han <han41858@gmail.com>",
+	"license": "MIT",
+	"bugs": {
+		"url": "https://github.com/han41858/ejv/issues"
+	},
+	"homepage": "https://github.com/han41858/ejv#readme",
+	"devDependencies": {
+		"@types/chai": "^4.3.11",
+		"@types/mocha": "^10.0.6",
+		"@types/node": "20.8.0",
+		"@typescript-eslint/eslint-plugin": "^6.14.0",
+		"@typescript-eslint/parser": "^6.14.0",
+		"chai": "^4.3.10",
+		"eslint": "^8.55.0",
+		"mocha": "^10.2.0",
+		"rimraf": "^5.0.5",
+		"ts-node": "^10.9.2",
+		"typescript": "^5.3.3"
+	}
 }

package/scripts/add-js-extensions.ts

@@ -0,0 +1,59 @@
+import { join } from 'node:path';
+import { Dirent } from 'node:fs';
+import { readdir, readFile, writeFile } from 'node:fs/promises';
+
+// patch targets
+// cjs: const interfaces_1 = require("./interfaces");
+// esm: import { EjvError } from './interfaces';
+
+console.log('* add-js-extensions');
+
+(async (): Promise<void> => {
+	// get all .js file in build folder
+	const buildFolder: string = join('.', 'build');
+	const folderNames: string[] = (await readdir(buildFolder, { withFileTypes: true }))
+		.filter((one: Dirent): boolean => one.isDirectory())
+		.map((one: Dirent): string => one.name);
+
+	const importStateRegExp = /['"]\.\/[a-z]+['"]/g;
+
+	let modifiedFileCount: number = 0;
+	let modifiedStrCount: number = 0;
+
+	for await (const folder of folderNames) {
+		const jsFilePaths: string[] = (await readdir(join(buildFolder, folder), { withFileTypes: true }))
+			.filter((one: Dirent): boolean => one.isFile() && one.name.endsWith('.js'))
+			.map((one: Dirent): string => join(buildFolder, folder, one.name));
+
+		for await(const jsFilePath of jsFilePaths) {
+			let fileContents: string = await readFile(jsFilePath, {
+				encoding: 'utf-8'
+			});
+
+			const matchResults: RegExpMatchArray[] = [...fileContents.matchAll(importStateRegExp)];
+
+			if (matchResults.length > 0) {
+				for (let i = 0; i < matchResults.length; i++) {
+					const oneResult: RegExpMatchArray = matchResults[i];
+
+					const beforeStr: string = oneResult[0];
+					const afterStr: string = beforeStr.endsWith('"')
+						? beforeStr.replace(/"$/, '.js"')
+						: beforeStr.replace(/'$/, '.js\'');
+
+					fileContents = fileContents.replace(beforeStr, afterStr);
+
+					++modifiedStrCount;
+				}
+
+				await writeFile(jsFilePath, fileContents, {
+					encoding: 'utf-8'
+				});
+
+				++modifiedFileCount;
+			}
+		}
+	}
+
+	console.log(`${ modifiedStrCount } import statements in ${ modifiedFileCount } files patched`);
+})();