FIX: rules do not exist on type 'EnforceExtendMap' (#377)

ealush · Sep 8, 2020 · dca5b3b · dca5b3b
1 parent 2accb48
commit dca5b3b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 8 deletions.
diff --git a/packages/vest/src/spec/infra.spec.js b/packages/vest/src/spec/infra.spec.js
@@ -132,7 +132,7 @@ describe('General scenario tests', () => {
 
 describe('TypeScript Typings', () => {
   const declarationFiles = glob
-    .sync('src/**/*.d.ts', {
+    .sync('src/typings/*.d.ts', {
       cwd: packagePath('vest'),
       absolute: true,
       ignore: '**/spec/*',

diff --git a/packages/vest/src/utilities/any.d.ts → packages/vest/src/typings/any.d.ts b/packages/vest/src/utilities/any.d.ts → packages/vest/src/typings/any.d.ts
diff --git a/packages/vest/src/utilities/classNames.d.ts → packages/vest/src/typings/classNames.d.ts b/packages/vest/src/utilities/classNames.d.ts → packages/vest/src/typings/classNames.d.ts
@@ -1,3 +1,5 @@
+import { IVestResult } from './vest';
+
 declare function classNames(
   res: Partial<IVestResult>,
   classes?: {

diff --git a/...s/vest/src/utilities/enforceExtended.d.ts → ...ges/vest/src/typings/enforceExtended.d.ts b/...s/vest/src/utilities/enforceExtended.d.ts → ...ges/vest/src/typings/enforceExtended.d.ts
@@ -1,3 +1,5 @@
+import { EnforceExtendMap, IEnforceRules } from './vest';
+
 interface ExtendedRules {
   isAlphanumeric: (...args: any) => IEnforceRules;
   isCreditCard: (...args: any) => IEnforceRules;

diff --git a/packages/vest/src/utilities/promisify.d.ts → packages/vest/src/typings/promisify.d.ts b/packages/vest/src/utilities/promisify.d.ts → packages/vest/src/typings/promisify.d.ts
@@ -1,3 +1,5 @@
+import { IVestResult, DraftResult } from './vest';
+
 declare function promisify(
   validatorFn: (...args: any[]) => IVestResult
 ): Promise<DraftResult>;

diff --git a/packages/vest/src/vest.d.ts → packages/vest/src/typings/vest.d.ts b/packages/vest/src/vest.d.ts → packages/vest/src/typings/vest.d.ts
@@ -1,9 +1,10 @@
+export type DraftResult = Omit<IVestResult, 'done'>;
+
 type TestCB = () => void | Promise<string | void> | false;
-type DraftResult = Omit<IVestResult, 'done'>;
 type DoneCB = (res: DraftResult) => void;
 type ExclusionArg = string | string[] | void;
 
-interface IVestResult {
+export type IVestResult = {
   name: string;
   errorCount: number;
   warnCount: number;
@@ -28,7 +29,6 @@ interface IVestResult {
       };
     };
   };
-
   /**
    * Returns whether the specified field has errors
    */
@@ -95,13 +95,13 @@ interface IVestResult {
    * Runs a callback when all tests of the specified field finished running
    */
   done(fieldName: string, cb: DoneCB): void;
-}
+};
 
-type EnforceExtendMap<T> = {
+export type EnforceExtendMap<T> = {
   [K in keyof T]: (...args: any[]) => IEnforceRules<T> & EnforceExtendMap<T>;
 };
 
-interface IEnforceRules<T = {}> {
+export interface IEnforceRules<T = {}> {
   equals: (expected: any) => IEnforceRules<T> & EnforceExtendMap<T>;
   notEquls: (expected: any) => IEnforceRules<T> & EnforceExtendMap<T>;
   numberEquals: (

diff --git a/scripts/steps/copyDistFiles.js b/scripts/steps/copyDistFiles.js
@@ -11,7 +11,7 @@ function copyDistFiles(packageName) {
   // And copy them over to the root folder
   // This is good enough until I add a ts build
   glob
-    .sync('src/**/*.d.ts', {
+    .sync('src/typings/*.d.ts', {
       cwd: packagePath(packageName),
       absolute: true,
       ignore: '**/spec/*',