zcb 0.0.24 → 0.0.26

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "zcb",
   "description": "Build configs with type safety from zod schema.",
-  "version": "0.0.24",
+  "version": "0.0.26",
   "author": "Dylan Aubrey",
   "license": "MIT",
   "homepage": "https://github.com/badbatch/zod-config-builder",
@@ -9,10 +9,16 @@
   "bugs": "https://github.com/badbatch/zod-config-builder/issues",
   "type": "module",
   "bin": {
-    "zcb": "./bin/zcb.mjs"
+    "zcb": "./bin/zcb.js"
   },
+  "main": "./dist/cjs/index.cjs",
+  "module": "./dist/esm/index.mjs",
+  "types": "./dist/types/cjs/index.d.cts",
   "exports": {
-    "types": "./dist/types/index.d.ts",
+    "types": {
+      "import": "./dist/types/esm/index.d.ts",
+      "require": "./dist/types/cjs/index.d.cts"
+    },
     "import": "./dist/esm/index.mjs",
     "require": "./dist/cjs/index.cjs"
   },
@@ -20,10 +26,15 @@
     "access": "public"
   },
   "dependencies": {
+    "@types/fs-extra": "^11.0.1",
+    "@types/json-schema": "^7.0.11",
+    "@types/shelljs": "^0.8.12",
+    "@types/yargs": "^15.0.15",
     "fs-extra": "^11.1.1",
     "handlebars": "^4.7.7",
     "json-schema": "^0.4.0",
     "shelljs": "^0.8.5",
+    "type-fest": "^3.10.0",
     "yargs": "^15.4.1",
     "zod": "^3.21.4",
     "zod-to-json-schema": "^3.21.0"
@@ -39,7 +50,6 @@
     "@babel/core": "^7.21.8",
     "@babel/eslint-parser": "^7.21.8",
     "@babel/plugin-proposal-decorators": "^7.23.3",
-    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-syntax-import-assertions": "^7.20.0",
     "@babel/plugin-transform-class-properties": "^7.23.3",
     "@babel/plugin-transform-export-namespace-from": "^7.23.4",
@@ -54,35 +64,32 @@
     "@commitlint/prompt-cli": "^17.6.3",
     "@jest/globals": "^29.5.0",
     "@repodog/babel-config": "^1.1.11",
-    "@repodog/cli": "^1.2.4",
+    "@repodog/cli": "^1.3.3",
     "@repodog/commitlint-config": "^1.1.6",
-    "@repodog/eslint-config": "^1.1.17",
+    "@repodog/eslint-config": "^1.1.19",
     "@repodog/eslint-config-jest": "^1.1.10",
     "@repodog/jest-config": "^1.1.11",
     "@repodog/markdownlint-config": "^1.1.5",
     "@repodog/prettier-config": "^1.1.5",
     "@repodog/rollup-config": "^1.1.8",
-    "@repodog/syncpack-config": "^1.2.2",
-    "@repodog/ts-config": "^1.1.6",
+    "@repodog/syncpack-config": "^1.2.3",
+    "@repodog/ts-config": "^1.1.7",
     "@rollup/plugin-babel": "^6.0.3",
     "@rollup/plugin-commonjs": "^25.0.7",
     "@rollup/plugin-image": "^3.0.2",
     "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.2",
     "@rollup/plugin-terser": "^0.4.1",
-    "@types/fs-extra": "^11.0.1",
     "@types/jest": "^25.2.3",
-    "@types/json-schema": "^7.0.11",
     "@types/lodash-es": "^4.17.9",
     "@types/node": "^18.16.7",
-    "@types/shelljs": "^0.8.12",
-    "@types/yargs": "^15.0.15",
     "@typescript-eslint/eslint-plugin": "^5.59.5",
     "@typescript-eslint/parser": "^5.59.5",
     "babel-jest": "^29.5.0",
     "babel-plugin-codegen": "^4.1.5",
     "babel-plugin-macros": "^3.1.0",
     "core-js": "^3.30.2",
+    "cts-types": "^0.0.4",
     "del-cli": "^3.0.1",
     "eslint": "^8.40.0",
     "eslint-config-prettier": "^8.8.0",
@@ -114,7 +121,6 @@
     "syncpack": "^12.0.0-alpha.0",
     "ts-node": "^10.9.1",
     "ts-toolbelt": "^9.6.0",
-    "type-fest": "^3.10.0",
     "typescript": "^5.0.4"
   },
   "keywords": [
@@ -130,7 +136,7 @@
     "compile": "pnpm run /^compile:.*/",
     "compile:cjs": "MODULE_SYSTEM=cjs rollup -c ./rollup.config.cjs",
     "compile:esm": "rollup -c ./rollup.config.cjs",
-    "compile:types": "tsc --project ./tsconfig.build.json",
+    "compile:types": "tsc --project ./tsconfig.build.json && cts-types build dist/types/esm dist/types/cjs",
     "cut:changelog": "changelog",
     "cut:post-version": "pnpm run build",
     "lint": "eslint . --ext .ts,.cjs",
@@ -138,7 +144,7 @@
     "syncpack": "syncpack format && syncpack list-mismatches && syncpack lint-semver-ranges",
     "test": "node --require=suppress-experimental-warnings --experimental-vm-modules node_modules/jest/bin/jest.js",
     "type-check": "tsc --noEmit",
-    "validate": "npm run syncpack && pnpm run build && pnpm run lint && pnpm run type-check && pnpm run test",
+    "validate": "pnpm run syncpack && pnpm run build && pnpm run lint && pnpm run type-check && pnpm run test",
     "zcb:build": "NODE_OPTIONS=\"--loader ts-node/esm\" node ./bin/zcb.mjs build ./src/__testUtils__/configBuilder.ts ./src/__testUtils__/builtConfig.ts",
     "zcb:watch": "NODE_OPTIONS=\"--loader ts-node/esm\" node ./bin/zcb.mjs watch ./src/__testUtils__/configBuilder.ts ./src/__testUtils__/builtConfig.ts"
   }

package/src/createConfigBuilder.ts

@@ -87,10 +87,10 @@ export const createConfigBuilder = <ZodTypes>(
 
       return configBuilder;
     },
-    extend: (configBuilder: ConfigBuilder<Config>) => {
-      config = transformConfigSync<Config>(configBuilder.values(), [cloneNonEnumerableValues]);
+    extend: (builder: ConfigBuilder<Config>) => {
+      config = transformConfigSync<Config>(builder.values(), [cloneNonEnumerableValues]);
       // @ts-expect-error private property
-      callbacks = { ...configBuilder.__callbacks } as Partial<Record<keyof Config, DerivedValueCallback>>;
+      callbacks = { ...builder.__callbacks } as Partial<Record<keyof Config, DerivedValueCallback>>;
     },
     flush: () => {
       const values = configBuilder.values();

package/src/types.ts

@@ -59,16 +59,16 @@ export interface WriteConfigOptions {
   outputFile: string;
 }
 
-export type Leaves<T, Path extends string[] = []> = T extends string
-  ? Path
+export type Leaves<T, LeafPath extends string[] = []> = T extends string
+  ? LeafPath
   : {
-      [K in keyof T & string]: Leaves<T[K], [...Path, K]>;
+      [K in keyof T & string]: Leaves<T[K], [...LeafPath, K]>;
     }[keyof T & string];
 
-export type Paths<T, Path extends string[] = []> = T extends string
-  ? Path
+export type Paths<T, LeafPath extends string[] = []> = T extends string
+  ? LeafPath
   : {
-      [K in keyof T & string]: T[K] extends object ? Paths<T[K], [...Path, K]> : Path;
+      [K in keyof T & string]: T[K] extends object ? Paths<T[K], [...LeafPath, K]> : LeafPath;
     }[keyof T & string];
 
 export type LeavesScopeDiffs<T1 extends readonly string[][], T2 extends string[]> = {

package/tsconfig.build.json

@@ -2,7 +2,7 @@
   "extends": "@repodog/ts-config/build.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "dist/types"
+    "outDir": "dist/types/esm"
   },
   "include": [
     "src/**/*"

package/bin/zcb.mjs

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-const { cli } = await import('../dist/esm/cli.mjs'); // eslint-disable-line import/no-unresolved
-cli();