Merge pull request #521 from shimataro/develop

version 3.0.0-rc.15

.eslintrc.yml

@@ -199,7 +199,7 @@ rules: # https://eslint.org/docs/rules/
   no-script-url: error
   no-self-compare: error
   no-sequences: error
-  no-shadow: error
+  no-shadow: 'off'
   no-shadow-restricted-names: error
   no-spaced-func: error
   no-sync: error

.github/FUNDING.yml

@@ -0,0 +1,4 @@
+github:
+- shimataro
+custom:
+- "https://www.paypal.me/shimataro"

.github/workflows/verify-examples.yml

@@ -189,6 +189,9 @@ jobs:
         - "1.0.0"
         - "1.1.0"
         - "1.2.0"
+        - "1.3.0"
+        - "1.4.0"
+        - "1.5.0"
       fail-fast: false
     steps:
     - name: Checkout source codes

.github/workflows/verify-on-linux.yml

@@ -17,6 +17,7 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
+        - "4.0"
       fail-fast: false
     steps:
     - name: Checkout source codes

.github/workflows/verify-on-macos.yml

@@ -17,6 +17,7 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
+        - "4.0"
       fail-fast: false
     steps:
     - name: Checkout source codes

.github/workflows/verify-on-windows.yml

@@ -17,6 +17,7 @@ jobs:
         - "3.7"
         - "3.8"
         - "3.9"
+        - "4.0"
       fail-fast: false
     steps:
     - name: Turn off auto-crlf

CHANGELOG.md

@@ -7,6 +7,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [3.0.0-rc.15] - 2020-11-08
+
+### Others
+
+* support TypeScript 4.0
+* support Deno 1.3, 1.4, 1.5
+
 ## [3.0.0-rc.14] - 2020-07-26
 
 ### Added
@@ -530,7 +537,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 * First release.
 
-[Unreleased]: https://github.com/shimataro/value-schema/compare/v3.0.0-rc.14...HEAD
+[Unreleased]: https://github.com/shimataro/value-schema/compare/v3.0.0-rc.15...HEAD
+[3.0.0-rc.15]: https://github.com/shimataro/value-schema/compare/v3.0.0-rc.14...v3.0.0-rc.15
 [3.0.0-rc.14]: https://github.com/shimataro/value-schema/compare/v3.0.0-rc.13...v3.0.0-rc.14
 [3.0.0-rc.13]: https://github.com/shimataro/value-schema/compare/v3.0.0-rc.12...v3.0.0-rc.13
 [3.0.0-rc.12]: https://github.com/shimataro/value-schema/compare/v3.0.0-rc.11...v3.0.0-rc.12

dist-deno/exporter.ts

@@ -1,4 +1,5 @@
 export * from "./libs/applySchemaObject.ts";
+export * from "./libs/publicTypes.ts";
 export * from "./libs/ValueSchemaError.ts";
 export * from "./schemas/array.ts";
 export * from "./schemas/boolean.ts";

dist-deno/libs/applySchemaObject.ts

@@ -1,7 +1,7 @@
 import { applySchemaObjectCore } from "./applySchemaObjectCore.ts";
+import { ErrorHandler, FinishHandler } from "./publicTypes.ts";
 import { ObjectTypeOf, SchemaObject } from "./types.ts";
-import { ErrorHandler, FinishHandler, onErrorDefault, onFinishedDefault } from "../schemaClasses/BaseSchema.ts";
-export { ErrorHandler } from "../schemaClasses/BaseSchema.ts";
+import { onErrorDefault, onFinishedDefault } from "../schemaClasses/BaseSchema.ts";
 /**
  * apply schema object to data
  * @param schemaObject schema object

dist-deno/libs/applySchemaObjectCore.ts

@@ -1,6 +1,6 @@
+import { ErrorHandler, FinishHandler } from "./publicTypes.ts";
 import { AnyObject, Key, ObjectTypeOf, SchemaObject, isObject } from "./types.ts";
 import { CAUSE, ValueSchemaError } from "./ValueSchemaError.ts";
-import { ErrorHandler, FinishHandler } from "../schemaClasses/BaseSchema.ts";
 /**
  * apply schema object to data
  * @param schemaObject schema object

dist-deno/libs/publicTypes.ts

@@ -0,0 +1,10 @@
+import { ValueSchemaError } from "./ValueSchemaError.ts";
+export type NullableOptions = {
+    ifNull: null;
+} | {
+    ifUndefined: null;
+} | {
+    ifEmptyString: null;
+};
+export type ErrorHandler<T = unknown> = (err: ValueSchemaError) => T | never;
+export type FinishHandler = () => void;

dist-deno/schemaClasses/ArraySchema.ts

@@ -7,7 +7,6 @@ import * as maxLength from "../appliers/array/maxLength.ts";
 import * as minLength from "../appliers/array/minLength.ts";
 import * as type from "../appliers/array/type.ts";
 import { BaseSchema } from "./BaseSchema.ts";
-export { NullableOptions } from "./BaseSchema.ts";
 export type OptionsForArray<T> = converter.Options<T[]> | ifUndefined.Options<T[]> | ifEmptyString.Options<T[]> | ifNull.Options<T[]> | each.Options<T> | minLength.Options | maxLength.Options | type.Options;
 export class ArraySchema<T, Tx = never> extends BaseSchema<T[] | Tx> {
     constructor(options: OptionsForArray<T>) {

dist-deno/schemaClasses/BaseSchema.ts

@@ -1,17 +1,9 @@
 import { Key, Values, makeValues } from "../libs/types.ts";
+import { ErrorHandler } from "../libs/publicTypes.ts";
 import { ValueSchemaError } from "../libs/ValueSchemaError.ts";
-export type ErrorHandler<T = unknown> = (err: ValueSchemaError) => T | never;
-export type FinishHandler = () => void;
 interface Options {
 }
 type ApplyTo<T> = (values: Values, options: Options, keyStack: Key[]) => values is Values<T>;
-export type NullableOptions = {
-    ifNull: null;
-} | {
-    ifUndefined: null;
-} | {
-    ifEmptyString: null;
-};
 /**
  * Base Schema Class
  */

dist-deno/schemaClasses/BooleanSchema.ts

@@ -3,7 +3,6 @@ import * as ifNull from "../appliers/ifNull.ts";
 import * as ifUndefined from "../appliers/ifUndefined.ts";
 import * as type from "../appliers/boolean/type.ts";
 import { BaseSchema } from "./BaseSchema.ts";
-export { NullableOptions } from "./BaseSchema.ts";
 export type OptionsForBoolean = ifUndefined.Options<boolean> | ifEmptyString.Options<boolean> | ifNull.Options<boolean> | type.Options;
 export class BooleanSchema<Tx = never> extends BaseSchema<boolean | Tx> {
     constructor(options: OptionsForBoolean) {

dist-deno/schemaClasses/EmailSchema.ts

@@ -6,7 +6,6 @@ import * as pattern from "../appliers/email/pattern.ts";
 import * as trims from "../appliers/string/trims.ts";
 import * as type from "../appliers/string/type.ts";
 import { BaseSchema } from "./BaseSchema.ts";
-export { NullableOptions } from "./BaseSchema.ts";
 export type OptionsForEmail = ifEmptyString.Options<string> | ifNull.Options<string> | ifUndefined.Options<string> | pattern.Options | maxLength.Options | trims.Options | type.Options;
 export class EmailSchema<Tx = never> extends BaseSchema<string | Tx> {
     constructor(options: OptionsForEmail) {

dist-deno/schemaClasses/NumberSchema.ts

@@ -8,7 +8,6 @@ import * as maxValue from "../appliers/number/maxValue.ts";
 import * as minValue from "../appliers/number/minValue.ts";
 import * as type from "../appliers/number/type.ts";
 import { BaseSchema } from "./BaseSchema.ts";
-export { NullableOptions } from "./BaseSchema.ts";
 export const NUMBER = {
     INTEGER: type.INTEGER
 };

dist-deno/schemaClasses/NumericStringSchema.ts

@@ -12,7 +12,6 @@ import * as maxLength from "../appliers/string/maxLength.ts";
 import * as minLength from "../appliers/string/minLength.ts";
 import * as type from "../appliers/string/type.ts";
 import { BaseSchema } from "../schemaClasses/BaseSchema.ts";
-export { NullableOptions } from "../schemaClasses/BaseSchema.ts";
 export const NUMERIC_STRING = {
     CHECKSUM_ALGORITHM: checksum.CHECKSUM_ALGORITHM
 };

dist-deno/schemaClasses/ObjectSchema.ts

@@ -6,7 +6,6 @@ import * as schema from "../appliers/object/schema.ts";
 import * as type from "../appliers/object/type.ts";
 import { AnyObject, ObjectTypeOf, SchemaObject } from "../libs/types.ts";
 import { BaseSchema } from "./BaseSchema.ts";
-export { NullableOptions } from "./BaseSchema.ts";
 export type OptionsForObject<S> = converter.Options<AnyObject> | ifUndefined.Options<AnyObject> | ifEmptyString.Options<AnyObject> | ifNull.Options<AnyObject> | schema.Options<S> | type.Options;
 export class ObjectSchema<S extends SchemaObject, Tx = never> extends BaseSchema<ObjectTypeOf<S> | Tx> {
     constructor(options: OptionsForObject<S>) {

dist-deno/schemaClasses/StringSchema.ts

@@ -9,7 +9,6 @@ import * as pattern from "../appliers/string/pattern.ts";
 import * as trims from "../appliers/string/trims.ts";
 import * as type from "../appliers/string/type.ts";
 import { BaseSchema } from "./BaseSchema.ts";
-export { NullableOptions } from "./BaseSchema.ts";
 export const STRING = {
     PATTERN: pattern.PATTERN
 };

dist-deno/schemas/array.ts

@@ -1,4 +1,5 @@
-import { ArraySchema, NullableOptions, OptionsForArray } from "../schemaClasses/ArraySchema.ts";
+import { NullableOptions } from "../libs/publicTypes.ts";
+import { ArraySchema, OptionsForArray } from "../schemaClasses/ArraySchema.ts";
 export function array<T>(options: OptionsForArray<T> & NullableOptions): ArraySchema<T, null>;
 export function array<T>(options: OptionsForArray<T>): ArraySchema<T>;
 export function array<T>(): ArraySchema<T>;

dist-deno/schemas/boolean.ts

@@ -1,4 +1,5 @@
-import { BooleanSchema, NullableOptions, OptionsForBoolean } from "../schemaClasses/BooleanSchema.ts";
+import { NullableOptions } from "../libs/publicTypes.ts";
+import { BooleanSchema, OptionsForBoolean } from "../schemaClasses/BooleanSchema.ts";
 export function boolean(options: OptionsForBoolean & NullableOptions): BooleanSchema<null>;
 export function boolean(options: OptionsForBoolean): BooleanSchema;
 export function boolean(): BooleanSchema;

dist-deno/schemas/email.ts

@@ -1,4 +1,5 @@
-import { EmailSchema, NullableOptions, OptionsForEmail } from "../schemaClasses/EmailSchema.ts";
+import { NullableOptions } from "../libs/publicTypes.ts";
+import { EmailSchema, OptionsForEmail } from "../schemaClasses/EmailSchema.ts";
 export function email(options: OptionsForEmail & NullableOptions): EmailSchema<null>;
 export function email(options: OptionsForEmail): EmailSchema;
 export function email(): EmailSchema;

dist-deno/schemas/number.ts

@@ -1,4 +1,5 @@
-import { NullableOptions, NumberSchema, OptionsForNumber } from "../schemaClasses/NumberSchema.ts";
+import { NullableOptions } from "../libs/publicTypes.ts";
+import { NumberSchema, OptionsForNumber } from "../schemaClasses/NumberSchema.ts";
 export { NUMBER } from "../schemaClasses/NumberSchema.ts";
 export function number(options: OptionsForNumber & NullableOptions): NumberSchema<null>;
 export function number(options: OptionsForNumber): NumberSchema;

dist-deno/schemas/numericString.ts

@@ -1,4 +1,5 @@
-import { NullableOptions, NumericStringSchema, OptionsForNumericString } from "../schemaClasses/NumericStringSchema.ts";
+import { NullableOptions } from "../libs/publicTypes.ts";
+import { NumericStringSchema, OptionsForNumericString } from "../schemaClasses/NumericStringSchema.ts";
 export { NUMERIC_STRING } from "../schemaClasses/NumericStringSchema.ts";
 export function numericString(options: OptionsForNumericString & NullableOptions): NumericStringSchema<null>;
 export function numericString(options: OptionsForNumericString): NumericStringSchema;

dist-deno/schemas/object.ts

@@ -1,5 +1,6 @@
-import { NullableOptions, ObjectSchema, OptionsForObject } from "../schemaClasses/ObjectSchema.ts";
+import { NullableOptions } from "../libs/publicTypes.ts";
 import { SchemaObject } from "../libs/types.ts";
+import { ObjectSchema, OptionsForObject } from "../schemaClasses/ObjectSchema.ts";
 export function object<S extends SchemaObject>(options: OptionsForObject<S> & NullableOptions): ObjectSchema<S, null>;
 export function object<S extends SchemaObject>(options: OptionsForObject<S>): ObjectSchema<S>;
 export function object(): ObjectSchema<SchemaObject>;

dist-deno/schemas/string.ts

@@ -1,4 +1,5 @@
-import { NullableOptions, OptionsForString, StringSchema } from "../schemaClasses/StringSchema.ts";
+import { NullableOptions } from "../libs/publicTypes.ts";
+import { OptionsForString, StringSchema } from "../schemaClasses/StringSchema.ts";
 export { STRING } from "../schemaClasses/StringSchema.ts";
 export function string(options: OptionsForString & NullableOptions): StringSchema<null>;
 export function string(options: OptionsForString): StringSchema;