Skip to content

Commit 1c792a9

Browse files
committed
Update: Restructure
1 parent 1f85a94 commit 1c792a9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+461
-307
lines changed

lerna.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
"useNx": true,
1616
"loglevel": "debug",
1717
"packages": [
18-
"packages/*",
19-
"packages/react-formz-validators/*"
18+
"packages/*"
2019
],
2120
"private": false,
2221
"verbose": true

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@
33
"packageManager": "yarn@3.2.3",
44
"version": "1.2.0",
55
"workspaces": [
6-
"packages/*",
7-
"packages/react-formz-validators/*"
6+
"packages/*"
87
],
98
"scripts": {
109
"test": "yarn workspace @zerry/react-formz-core test && yarn workspace @zerry/react-formz test",

packages/react-formz-validators/utils/package.json packages/react-formz-validators-utils/package.json

+11-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,14 @@
33
"version": "1.2.0",
44
"license": "MIT",
55
"description": "Shared utilitity functions for zod validators.",
6-
"main": "index.ts",
6+
"main": "./dist/index.js",
7+
"umd:main": "dist/index.umd.js",
8+
"exports": "./dist/index.js",
9+
"source": "index.ts",
10+
"types": "./dist/index.d.ts",
11+
"scripts": {
12+
"build": "vite build && tsc -p ./tsconfig.build.json"
13+
},
714
"peerDependencies": {
815
"@zerry/react-formz": ">=1.1.0",
916
"@zerry/react-formz-core": ">=1.1.0",
@@ -23,6 +30,8 @@
2330
"devDependencies": {
2431
"@zerry/react-formz": "workspace:^",
2532
"@zerry/react-formz-core": "workspace:^",
26-
"@zerry/react-formz-native": "workspace:^"
33+
"@zerry/react-formz-native": "workspace:^",
34+
"typescript": "^4.8.3",
35+
"vite": "^3.1.0"
2736
}
2837
}

packages/react-formz-validators/project.json packages/react-formz-validators-utils/project.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"name": "@zerry/react-formz-validators",
2+
"name": "@zerry/react-formz-validators-utils",
33
"$schema": "../../node_modules/nx/schemas/project-schema.json",
4-
"sourceRoot": "packages/react-formz-validators",
4+
"sourceRoot": "packages/react-formz-validators-utils/src",
55
"projectType": "library",
66
"targets": {},
77
"tags": []
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
2-
"extends": "../tsconfig.json",
2+
"extends": "./tsconfig.json",
33
"compilerOptions": {
44
"outDir": "./dist",
55
"declaration": true,
66
"emitDeclarationOnly": true,
77
"moduleResolution": "node"
88
},
99
"include": [
10-
"./yup.ts"
10+
"src"
1111
]
1212
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
{
2+
"compilerOptions": {
3+
/* Visit https://aka.ms/tsconfig to read more about this file */
4+
5+
/* Projects */
6+
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
7+
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
8+
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
9+
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
10+
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
11+
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */
12+
13+
/* Language and Environment */
14+
"target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
15+
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
16+
"jsx": "react" /* Specify what JSX code is generated. */,
17+
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
18+
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
19+
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
20+
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
21+
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
22+
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
23+
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
24+
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
25+
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */
26+
27+
/* Modules */
28+
"module": "commonjs" /* Specify what module code is generated. */,
29+
// "rootDir": "./", /* Specify the root folder within your source files. */
30+
"moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
31+
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
32+
"paths": {} /* Specify a set of entries that re-map imports to additional lookup locations. */,
33+
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
34+
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
35+
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
36+
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
37+
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
38+
"resolveJsonModule": true /* Enable importing .json files. */,
39+
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */
40+
41+
/* JavaScript Support */
42+
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
43+
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
44+
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */
45+
46+
/* Emit */
47+
"declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
48+
"declarationMap": true /* Create sourcemaps for d.ts files. */,
49+
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
50+
"sourceMap": true /* Create source map files for emitted JavaScript files. */,
51+
// "outFile": "./", /* Specify a file that bundles all outputs into one JavaScript file. If 'declaration' is true, also designates a file that bundles all .d.ts output. */
52+
"outDir": "./dist" /* Specify an output folder for all emitted files. */,
53+
// "removeComments": true, /* Disable emitting comments. */
54+
// "noEmit": true, /* Disable emitting files from a compilation. */
55+
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
56+
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
57+
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
58+
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
59+
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
60+
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
61+
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
62+
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
63+
// "newLine": "crlf", /* Set the newline character for emitting files. */
64+
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
65+
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
66+
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
67+
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
68+
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
69+
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
70+
71+
/* Interop Constraints */
72+
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
73+
"allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
74+
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
75+
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
76+
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,
77+
78+
/* Type Checking */
79+
"strict": true /* Enable all strict type-checking options. */,
80+
"noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied 'any' type. */,
81+
"strictNullChecks": true /* When type checking, take into account 'null' and 'undefined'. */,
82+
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
83+
"strictBindCallApply": true /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */,
84+
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
85+
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
86+
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
87+
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
88+
"noUnusedLocals": true /* Enable error reporting when local variables aren't read. */,
89+
"noUnusedParameters": true /* Raise an error when a function parameter isn't read. */,
90+
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
91+
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
92+
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
93+
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
94+
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
95+
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
96+
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
97+
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */
98+
99+
/* Completeness */
100+
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
101+
"skipLibCheck": true /* Skip type checking all .d.ts files. */
102+
},
103+
"include": ["src"],
104+
"typedoc": {}
105+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import { defineConfig } from 'vite';
2+
import path from 'path';
3+
4+
export default defineConfig({
5+
mode: 'production',
6+
resolve: {
7+
alias: {},
8+
},
9+
build: {
10+
outDir: path.resolve(__dirname, 'dist'),
11+
lib: {
12+
entry: path.resolve(__dirname, 'src', 'index.ts'),
13+
fileName: 'index',
14+
name: 'utils',
15+
formats: ['es', 'cjs', 'umd'],
16+
},
17+
emptyOutDir: true,
18+
rollupOptions: {
19+
external: ['@zerry/react-formz-core'],
20+
output: {
21+
globals: {},
22+
},
23+
},
24+
},
25+
});

packages/react-formz-validators/yup/package.json packages/react-formz-validators-yup/package.json

+12-4
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,23 @@
33
"version": "1.2.0",
44
"license": "MIT",
55
"description": "Up validator for @zerry/react-formz to validate form data against a zod schema.",
6-
"main": "dist/yup.js",
7-
"umd:main": "dist/yup.umd.js",
8-
"exports": "./dist/yup.js",
6+
"main": "dist/index.js",
7+
"umd:main": "dist/index.umd.js",
8+
"exports": "./dist/index.js",
99
"source": "index.ts",
10-
"types": "dist/yup.d.ts",
10+
"types": "dist/index.d.ts",
11+
"scripts": {
12+
"build": "vite build && tsc -p ./tsconfig.build.json"
13+
},
1114
"devDependencies": {
15+
"@babel/core": "^7.19.0",
16+
"@babel/preset-env": "^7.19.0",
17+
"@babel/preset-typescript": "^7.18.6",
1218
"@zerry/react-formz": "workspace:^",
1319
"@zerry/react-formz-core": "workspace:^",
1420
"@zerry/react-formz-validators-utils": "workspace:^",
21+
"typescript": "^4.8.3",
22+
"vite": "^3.1.0",
1523
"yup": "^0.32.11"
1624
},
1725
"peerDependencies": {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "@zerry/react-formz-validators-yup",
3+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
4+
"sourceRoot": "packages/react-formz-validators-yup/src",
5+
"projectType": "library",
6+
"targets": {
7+
"build": {
8+
"dependsOn": [
9+
{ "projects": ["@zerry/react-formz-validators-utils"], "target": "build" }
10+
]
11+
}
12+
},
13+
"tags": []
14+
}

packages/react-formz-validators/yup/yup.ts packages/react-formz-validators-yup/src/yup.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FormzErrors, FormzValues, SchemaValidator } from "@zerry/react-formz-core";
22
import { toNestedErrors } from "@zerry/react-formz-validators-utils";
33
import * as yup from "yup";
4-
import { ValidateOptions } from "yup/lib/types";
4+
import type { ValidateOptions } from "yup/lib/types";
55

66
class YupSchemaValidator<
77
Values extends FormzValues,
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"extends": "./tsconfig.json",
3+
"compilerOptions": {
4+
"outDir": "./dist",
5+
"declaration": true,
6+
"emitDeclarationOnly": true,
7+
"moduleResolution": "node",
8+
"skipLibCheck": true
9+
},
10+
"include": [
11+
"./src"
12+
],
13+
"exclude": ["./src/**/*.test.ts", "./src/**/*.test.tsx"]
14+
}

packages/react-formz-validators/tsconfig.json packages/react-formz-validators-yup/tsconfig.json

+1-3
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,7 @@
102102
"skipLibCheck": true /* Skip type checking all .d.ts files. */
103103
},
104104
"include": [
105-
"./utils",
106-
"./yup",
107-
"./zod",
105+
"./src",
108106
],
109107
"typedoc": {
110108
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"compilerOptions": {
3+
"composite": true,
4+
"module": "ESNext",
5+
"moduleResolution": "Node",
6+
"allowSyntheticDefaultImports": true
7+
},
8+
"include": ["vite.config.ts"]
9+
}
10+
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
import { defineConfig } from 'vite';
2+
import path from 'path';
3+
4+
export default defineConfig({
5+
mode: 'production',
6+
resolve: {
7+
alias: {},
8+
},
9+
build: {
10+
outDir: path.resolve(__dirname, 'dist'),
11+
lib: {
12+
entry: path.resolve(__dirname, 'src', 'index.ts'),
13+
fileName: 'index',
14+
name: 'yup',
15+
formats: ['es', 'cjs', 'umd'],
16+
},
17+
emptyOutDir: true,
18+
rollupOptions: {
19+
external: ['@zerry/react-formz-core', '@zerry/react-formz-validators-utils', 'yup'],
20+
output: {
21+
globals: {
22+
yup: 'yup',
23+
},
24+
},
25+
},
26+
},
27+
});
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
module.exports = {
2+
presets: [
3+
["@babel/preset-env", { targets: { node: "current" } }],
4+
"@babel/preset-typescript",
5+
],
6+
};
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
const { defaults } = require("jest-config");
2+
const path = require("path");
3+
4+
const workspaceNodeModules = path.resolve(__dirname, "../../", "node_modules");
5+
const rootNodeModules = path.resolve(__dirname, "node_modules");
6+
7+
/** @type {import('jest').Config} */
8+
const config = {
9+
testMatch: ["<rootDir>/**/__tests__/**/*.[jt]s?(x)"],
10+
verbose: true,
11+
transform: {
12+
"\\.[jt]sx?$": "babel-jest",
13+
},
14+
moduleDirectories: [
15+
workspaceNodeModules,
16+
rootNodeModules,
17+
"src",
18+
],
19+
collectCoverageFrom: [
20+
'<rootDir>/**/*.{js,jsx,ts,tsx}',
21+
'!<rootDir>/**/index.{js,jsx,ts,tsx}',
22+
'!**/node_modules/**',
23+
'!**/vendor/**',
24+
],
25+
};
26+
27+
module.exports = config;

packages/react-formz-validators/zod/package.json packages/react-formz-validators-zod/package.json

+5
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,14 @@
1212
"build": "LIB=zod vite build && tsc -p ./tsconfig.build.json"
1313
},
1414
"devDependencies": {
15+
"@babel/core": "^7.19.0",
16+
"@babel/preset-env": "^7.19.0",
17+
"@babel/preset-typescript": "^7.18.6",
1518
"@zerry/react-formz": "workspace:^",
1619
"@zerry/react-formz-core": "workspace:^",
1720
"@zerry/react-formz-validators-utils": "workspace:^",
21+
"typescript": "^4.8.3",
22+
"vite": "^3.1.0",
1823
"zod": "^3.19.1"
1924
},
2025
"peerDependencies": {
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "@zerry/react-formz-validators-zod",
3+
"$schema": "../../node_modules/nx/schemas/project-schema.json",
4+
"sourceRoot": "packages/react-formz-validators-zod/src",
5+
"projectType": "library",
6+
"targets": {
7+
"build": {
8+
"dependsOn": [
9+
{ "projects": ["@zerry/react-formz-validators-utils"], "target": "build" }
10+
]
11+
}
12+
},
13+
"tags": []
14+
}

0 commit comments

Comments
 (0)