Skip to content

Commit

Permalink
Update: Restructure
Browse files Browse the repository at this point in the history
  • Loading branch information
jerrywithaz committed Sep 18, 2023
1 parent 1f85a94 commit 1c792a9
Show file tree
Hide file tree
Showing 45 changed files with 461 additions and 307 deletions.
3 changes: 1 addition & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
"useNx": true,
"loglevel": "debug",
"packages": [
"packages/*",
"packages/react-formz-validators/*"
"packages/*"
],
"private": false,
"verbose": true
Expand Down
3 changes: 1 addition & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
"packageManager": "[email protected]",
"version": "1.2.0",
"workspaces": [
"packages/*",
"packages/react-formz-validators/*"
"packages/*"
],
"scripts": {
"test": "yarn workspace @zerry/react-formz-core test && yarn workspace @zerry/react-formz test",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,14 @@
"version": "1.2.0",
"license": "MIT",
"description": "Shared utilitity functions for zod validators.",
"main": "index.ts",
"main": "./dist/index.js",
"umd:main": "dist/index.umd.js",
"exports": "./dist/index.js",
"source": "index.ts",
"types": "./dist/index.d.ts",
"scripts": {
"build": "vite build && tsc -p ./tsconfig.build.json"
},
"peerDependencies": {
"@zerry/react-formz": ">=1.1.0",
"@zerry/react-formz-core": ">=1.1.0",
Expand All @@ -23,6 +30,8 @@
"devDependencies": {
"@zerry/react-formz": "workspace:^",
"@zerry/react-formz-core": "workspace:^",
"@zerry/react-formz-native": "workspace:^"
"@zerry/react-formz-native": "workspace:^",
"typescript": "^4.8.3",
"vite": "^3.1.0"
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@zerry/react-formz-validators",
"name": "@zerry/react-formz-validators-utils",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/react-formz-validators",
"sourceRoot": "packages/react-formz-validators-utils/src",
"projectType": "library",
"targets": {},
"tags": []
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"extends": "../tsconfig.json",
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./dist",
"declaration": true,
"emitDeclarationOnly": true,
"moduleResolution": "node"
},
"include": [
"./yup.ts"
"src"
]
}
105 changes: 105 additions & 0 deletions packages/react-formz-validators-utils/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{
"compilerOptions": {
/* Visit https://aka.ms/tsconfig to read more about this file */

/* Projects */
// "incremental": true, /* Save .tsbuildinfo files to allow for incremental compilation of projects. */
// "composite": true, /* Enable constraints that allow a TypeScript project to be used with project references. */
// "tsBuildInfoFile": "./.tsbuildinfo", /* Specify the path to .tsbuildinfo incremental compilation file. */
// "disableSourceOfProjectReferenceRedirect": true, /* Disable preferring source files instead of declaration files when referencing composite projects. */
// "disableSolutionSearching": true, /* Opt a project out of multi-project reference checking when editing. */
// "disableReferencedProjectLoad": true, /* Reduce the number of projects loaded automatically by TypeScript. */

/* Language and Environment */
"target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,
// "lib": [], /* Specify a set of bundled library declaration files that describe the target runtime environment. */
"jsx": "react" /* Specify what JSX code is generated. */,
// "experimentalDecorators": true, /* Enable experimental support for TC39 stage 2 draft decorators. */
// "emitDecoratorMetadata": true, /* Emit design-type metadata for decorated declarations in source files. */
// "jsxFactory": "", /* Specify the JSX factory function used when targeting React JSX emit, e.g. 'React.createElement' or 'h'. */
// "jsxFragmentFactory": "", /* Specify the JSX Fragment reference used for fragments when targeting React JSX emit e.g. 'React.Fragment' or 'Fragment'. */
// "jsxImportSource": "", /* Specify module specifier used to import the JSX factory functions when using 'jsx: react-jsx*'. */
// "reactNamespace": "", /* Specify the object invoked for 'createElement'. This only applies when targeting 'react' JSX emit. */
// "noLib": true, /* Disable including any library files, including the default lib.d.ts. */
// "useDefineForClassFields": true, /* Emit ECMAScript-standard-compliant class fields. */
// "moduleDetection": "auto", /* Control what method is used to detect module-format JS files. */

/* Modules */
"module": "commonjs" /* Specify what module code is generated. */,
// "rootDir": "./", /* Specify the root folder within your source files. */
"moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
"paths": {} /* Specify a set of entries that re-map imports to additional lookup locations. */,
// "rootDirs": [], /* Allow multiple folders to be treated as one when resolving modules. */
// "typeRoots": [], /* Specify multiple folders that act like './node_modules/@types'. */
// "types": [], /* Specify type package names to be included without being referenced in a source file. */
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
// "moduleSuffixes": [], /* List of file name suffixes to search when resolving a module. */
"resolveJsonModule": true /* Enable importing .json files. */,
// "noResolve": true, /* Disallow 'import's, 'require's or '<reference>'s from expanding the number of files TypeScript should add to a project. */

/* JavaScript Support */
// "allowJs": true, /* Allow JavaScript files to be a part of your program. Use the 'checkJS' option to get errors from these files. */
// "checkJs": true, /* Enable error reporting in type-checked JavaScript files. */
// "maxNodeModuleJsDepth": 1, /* Specify the maximum folder depth used for checking JavaScript files from 'node_modules'. Only applicable with 'allowJs'. */

/* Emit */
"declaration": true /* Generate .d.ts files from TypeScript and JavaScript files in your project. */,
"declarationMap": true /* Create sourcemaps for d.ts files. */,
// "emitDeclarationOnly": true, /* Only output d.ts files and not JavaScript files. */
"sourceMap": true /* Create source map files for emitted JavaScript files. */,
// "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. */
"outDir": "./dist" /* Specify an output folder for all emitted files. */,
// "removeComments": true, /* Disable emitting comments. */
// "noEmit": true, /* Disable emitting files from a compilation. */
// "importHelpers": true, /* Allow importing helper functions from tslib once per project, instead of including them per-file. */
// "importsNotUsedAsValues": "remove", /* Specify emit/checking behavior for imports that are only used for types. */
// "downlevelIteration": true, /* Emit more compliant, but verbose and less performant JavaScript for iteration. */
// "sourceRoot": "", /* Specify the root path for debuggers to find the reference source code. */
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
// "inlineSourceMap": true, /* Include sourcemap files inside the emitted JavaScript. */
// "inlineSources": true, /* Include source code in the sourcemaps inside the emitted JavaScript. */
// "emitBOM": true, /* Emit a UTF-8 Byte Order Mark (BOM) in the beginning of output files. */
// "newLine": "crlf", /* Set the newline character for emitting files. */
// "stripInternal": true, /* Disable emitting declarations that have '@internal' in their JSDoc comments. */
// "noEmitHelpers": true, /* Disable generating custom helper functions like '__extends' in compiled output. */
// "noEmitOnError": true, /* Disable emitting files if any type checking errors are reported. */
// "preserveConstEnums": true, /* Disable erasing 'const enum' declarations in generated code. */
// "declarationDir": "./", /* Specify the output directory for generated declaration files. */
// "preserveValueImports": true, /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */

/* Interop Constraints */
// "isolatedModules": true, /* Ensure that each file can be safely transpiled without relying on other imports. */
"allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
"esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables 'allowSyntheticDefaultImports' for type compatibility. */,
// "preserveSymlinks": true, /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
"forceConsistentCasingInFileNames": true /* Ensure that casing is correct in imports. */,

/* Type Checking */
"strict": true /* Enable all strict type-checking options. */,
"noImplicitAny": true /* Enable error reporting for expressions and declarations with an implied 'any' type. */,
"strictNullChecks": true /* When type checking, take into account 'null' and 'undefined'. */,
// "strictFunctionTypes": true, /* When assigning functions, check to ensure parameters and the return values are subtype-compatible. */
"strictBindCallApply": true /* Check that the arguments for 'bind', 'call', and 'apply' methods match the original function. */,
// "strictPropertyInitialization": true, /* Check for class properties that are declared but not set in the constructor. */
// "noImplicitThis": true, /* Enable error reporting when 'this' is given the type 'any'. */
// "useUnknownInCatchVariables": true, /* Default catch clause variables as 'unknown' instead of 'any'. */
// "alwaysStrict": true, /* Ensure 'use strict' is always emitted. */
"noUnusedLocals": true /* Enable error reporting when local variables aren't read. */,
"noUnusedParameters": true /* Raise an error when a function parameter isn't read. */,
// "exactOptionalPropertyTypes": true, /* Interpret optional property types as written, rather than adding 'undefined'. */
// "noImplicitReturns": true, /* Enable error reporting for codepaths that do not explicitly return in a function. */
// "noFallthroughCasesInSwitch": true, /* Enable error reporting for fallthrough cases in switch statements. */
// "noUncheckedIndexedAccess": true, /* Add 'undefined' to a type when accessed using an index. */
// "noImplicitOverride": true, /* Ensure overriding members in derived classes are marked with an override modifier. */
// "noPropertyAccessFromIndexSignature": true, /* Enforces using indexed accessors for keys declared using an indexed type. */
// "allowUnusedLabels": true, /* Disable error reporting for unused labels. */
// "allowUnreachableCode": true, /* Disable error reporting for unreachable code. */

/* Completeness */
// "skipDefaultLibCheck": true, /* Skip type checking .d.ts files that are included with TypeScript. */
"skipLibCheck": true /* Skip type checking all .d.ts files. */
},
"include": ["src"],
"typedoc": {}
}
25 changes: 25 additions & 0 deletions packages/react-formz-validators-utils/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { defineConfig } from 'vite';
import path from 'path';

export default defineConfig({
mode: 'production',
resolve: {
alias: {},
},
build: {
outDir: path.resolve(__dirname, 'dist'),
lib: {
entry: path.resolve(__dirname, 'src', 'index.ts'),
fileName: 'index',
name: 'utils',
formats: ['es', 'cjs', 'umd'],
},
emptyOutDir: true,
rollupOptions: {
external: ['@zerry/react-formz-core'],
output: {
globals: {},
},
},
},
});
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,23 @@
"version": "1.2.0",
"license": "MIT",
"description": "Up validator for @zerry/react-formz to validate form data against a zod schema.",
"main": "dist/yup.js",
"umd:main": "dist/yup.umd.js",
"exports": "./dist/yup.js",
"main": "dist/index.js",
"umd:main": "dist/index.umd.js",
"exports": "./dist/index.js",
"source": "index.ts",
"types": "dist/yup.d.ts",
"types": "dist/index.d.ts",
"scripts": {
"build": "vite build && tsc -p ./tsconfig.build.json"
},
"devDependencies": {
"@babel/core": "^7.19.0",
"@babel/preset-env": "^7.19.0",
"@babel/preset-typescript": "^7.18.6",
"@zerry/react-formz": "workspace:^",
"@zerry/react-formz-core": "workspace:^",
"@zerry/react-formz-validators-utils": "workspace:^",
"typescript": "^4.8.3",
"vite": "^3.1.0",
"yup": "^0.32.11"
},
"peerDependencies": {
Expand Down
14 changes: 14 additions & 0 deletions packages/react-formz-validators-yup/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "@zerry/react-formz-validators-yup",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/react-formz-validators-yup/src",
"projectType": "library",
"targets": {
"build": {
"dependsOn": [
{ "projects": ["@zerry/react-formz-validators-utils"], "target": "build" }
]
}
},
"tags": []
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FormzErrors, FormzValues, SchemaValidator } from "@zerry/react-formz-core";
import { toNestedErrors } from "@zerry/react-formz-validators-utils";
import * as yup from "yup";
import { ValidateOptions } from "yup/lib/types";
import type { ValidateOptions } from "yup/lib/types";

class YupSchemaValidator<
Values extends FormzValues,
Expand Down
14 changes: 14 additions & 0 deletions packages/react-formz-validators-yup/tsconfig.build.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "./dist",
"declaration": true,
"emitDeclarationOnly": true,
"moduleResolution": "node",
"skipLibCheck": true
},
"include": [
"./src"
],
"exclude": ["./src/**/*.test.ts", "./src/**/*.test.tsx"]
}
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,7 @@
"skipLibCheck": true /* Skip type checking all .d.ts files. */
},
"include": [
"./utils",
"./yup",
"./zod",
"./src",
],
"typedoc": {
}
Expand Down
10 changes: 10 additions & 0 deletions packages/react-formz-validators-yup/tsconfig.node.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"compilerOptions": {
"composite": true,
"module": "ESNext",
"moduleResolution": "Node",
"allowSyntheticDefaultImports": true
},
"include": ["vite.config.ts"]
}

27 changes: 27 additions & 0 deletions packages/react-formz-validators-yup/vite.config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { defineConfig } from 'vite';
import path from 'path';

export default defineConfig({
mode: 'production',
resolve: {
alias: {},
},
build: {
outDir: path.resolve(__dirname, 'dist'),
lib: {
entry: path.resolve(__dirname, 'src', 'index.ts'),
fileName: 'index',
name: 'yup',
formats: ['es', 'cjs', 'umd'],
},
emptyOutDir: true,
rollupOptions: {
external: ['@zerry/react-formz-core', '@zerry/react-formz-validators-utils', 'yup'],
output: {
globals: {
yup: 'yup',
},
},
},
},
});
6 changes: 6 additions & 0 deletions packages/react-formz-validators-zod/babel.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
module.exports = {
presets: [
["@babel/preset-env", { targets: { node: "current" } }],
"@babel/preset-typescript",
],
};
27 changes: 27 additions & 0 deletions packages/react-formz-validators-zod/jest.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
const { defaults } = require("jest-config");
const path = require("path");

const workspaceNodeModules = path.resolve(__dirname, "../../", "node_modules");
const rootNodeModules = path.resolve(__dirname, "node_modules");

/** @type {import('jest').Config} */
const config = {
testMatch: ["<rootDir>/**/__tests__/**/*.[jt]s?(x)"],
verbose: true,
transform: {
"\\.[jt]sx?$": "babel-jest",
},
moduleDirectories: [
workspaceNodeModules,
rootNodeModules,
"src",
],
collectCoverageFrom: [
'<rootDir>/**/*.{js,jsx,ts,tsx}',
'!<rootDir>/**/index.{js,jsx,ts,tsx}',
'!**/node_modules/**',
'!**/vendor/**',
],
};

module.exports = config;
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,14 @@
"build": "LIB=zod vite build && tsc -p ./tsconfig.build.json"
},
"devDependencies": {
"@babel/core": "^7.19.0",
"@babel/preset-env": "^7.19.0",
"@babel/preset-typescript": "^7.18.6",
"@zerry/react-formz": "workspace:^",
"@zerry/react-formz-core": "workspace:^",
"@zerry/react-formz-validators-utils": "workspace:^",
"typescript": "^4.8.3",
"vite": "^3.1.0",
"zod": "^3.19.1"
},
"peerDependencies": {
Expand Down
14 changes: 14 additions & 0 deletions packages/react-formz-validators-zod/project.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"name": "@zerry/react-formz-validators-zod",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/react-formz-validators-zod/src",
"projectType": "library",
"targets": {
"build": {
"dependsOn": [
{ "projects": ["@zerry/react-formz-validators-utils"], "target": "build" }
]
}
},
"tags": []
}
File renamed without changes.
Loading

0 comments on commit 1c792a9

Please sign in to comment.