@pixpilot/formily-shadcn 0.9.1 → 0.10.0

package/dist/utils/resolve-responsive-space.js

@@ -9,74 +9,44 @@ const densitySpaceMap = {
 	comfortable: "lg"
 };
 /**
-* Space to Tailwind space-y class mapping
-* Converts space values to actual Tailwind utilities
+* Space-Y spacing configuration
+* Controls vertical spacing between form items
 */
-const spaceClassMap = {
-	sm: "space-y-3",
-	md: "space-y-4",
-	lg: "space-y-6"
+const spaceYConfig = {
+	fixed: {
+		sm: "space-y-3",
+		md: "space-y-4",
+		lg: "space-y-6"
+	},
+	responsive: "space-y-3 md:space-y-4 lg:space-y-6"
 };
 /**
-* Space to Tailwind gap class mapping
-* Converts space values to gap utilities for grid/flex containers
+* Gap-Y spacing configuration
+* Controls vertical gaps in containers
 */
-const gapClassMap = {
-	sm: "gap-y-3",
-	md: "gap-y-4",
-	lg: "gap-y-6"
+const gapYConfig = {
+	fixed: {
+		sm: "gap-y-3",
+		md: "gap-y-4",
+		lg: "gap-y-6"
+	},
+	responsive: "gap-y-3 md:gap-y-4 lg:gap-y-6"
 };
 /**
-* Responsive breakpoint classes for responsive density mode
-* - Mobile (default): compact (space-y-3)
-* - Tablet (md:): normal (space-y-4)
-* - Desktop (lg:): comfortable (space-y-6)
-*/
-const autoResponsiveSpaceClasses = "space-y-3 md:space-y-4 lg:space-y-6";
-/**
-* Responsive breakpoint classes for responsive density mode using gap
-* - Mobile (default): compact (gap-y-3)
-* - Tablet (md:): normal (gap-y-4)
-* - Desktop (lg:): comfortable (gap-y-6)
-*/
-const autoResponsiveGapClasses = "gap-y-3 md:gap-y-4 lg:gap-y-6";
-/**
-* Checks if density is responsive mode
-*
-* @param density - Density value
-* @returns true if density is 'responsive'
-*/
-function isResponsiveDensity(density) {
-	return density === "responsive";
-}
-/**
-* Resolves responsive space value from FormSpace configuration
-* Priority:
-* 1. If responsive is set → use it (ignore density)
-* 2. If density is 'responsive' → return undefined (handled separately with responsive classes)
-* 3. If only other density is set → use density-based mapping
-* 4. Default to undefined (responsive mode)
-*
-* @param formSpace - FormSpace configuration
-* @returns Space value ('sm' | 'md' | 'lg') or undefined for responsive mode
-*/
-function resolveResponsiveSpace(formSpace) {
-	if (!formSpace) return;
-	if (formSpace.responsive) return formSpace.responsive.desktop || formSpace.responsive.tablet || formSpace.responsive.mobile || "lg";
-	if (isResponsiveDensity(formSpace.density)) return;
-	if (formSpace.density && !isResponsiveDensity(formSpace.density)) return densitySpaceMap[formSpace.density];
-}
-/**
-* Gets the Tailwind class for a given space value
+* Resolves spacing class based on density and spacing configuration
+* Generic utility that works with any spacing config
 *
-* @param space - Space value
-* @returns Tailwind utility class
+* @param density - Density value ('compact' | 'normal' | 'comfortable' | 'responsive')
+* @param config - Spacing configuration with fixed and responsive classes
+* @returns Tailwind utility class(es)
 */
-function getSpaceClass(space) {
-	return spaceClassMap[space];
+function resolveSpacingClass(density, config) {
+	if (!density || density === "responsive") return config.responsive;
+	const space = densitySpaceMap[density];
+	return config.fixed[space];
 }
 /**
-* Resolves responsive space and returns the Tailwind class(es)
+* Resolves responsive space and returns the Tailwind space-y class(es)
 * For responsive density, returns responsive breakpoint classes
 * For fixed density, returns single space class
 *
@@ -84,25 +54,10 @@ function getSpaceClass(space) {
 * @returns Tailwind utility class(es)
 */
 function resolveResponsiveSpaceClass(formSpace) {
-	if (!formSpace || isResponsiveDensity(formSpace.density)) return autoResponsiveSpaceClasses;
-	if (formSpace.responsive && !isResponsiveDensity(formSpace.density)) {
-		const space$1 = resolveResponsiveSpace(formSpace);
-		return space$1 ? getSpaceClass(space$1) : autoResponsiveSpaceClasses;
-	}
-	const space = resolveResponsiveSpace(formSpace);
-	return space ? getSpaceClass(space) : autoResponsiveSpaceClasses;
+	return resolveSpacingClass(formSpace?.density, spaceYConfig);
 }
 /**
-* Gets the Tailwind gap class for a given space value
-*
-* @param space - Space value
-* @returns Tailwind utility gap class
-*/
-function getGapClass(space) {
-	return gapClassMap[space];
-}
-/**
-* Resolves responsive space and returns the Tailwind gap class(es)
+* Resolves responsive space and returns the Tailwind gap-y class(es)
 * For responsive density, returns responsive breakpoint classes
 * For fixed density, returns single gap class
 *
@@ -110,14 +65,18 @@ function getGapClass(space) {
 * @returns Tailwind utility gap class(es)
 */
 function resolveResponsiveGapClass(formSpace) {
-	if (!formSpace || isResponsiveDensity(formSpace.density)) return autoResponsiveGapClasses;
-	if (formSpace.responsive && !isResponsiveDensity(formSpace.density)) {
-		const space$1 = resolveResponsiveSpace(formSpace);
-		return space$1 ? getGapClass(space$1) : autoResponsiveGapClasses;
-	}
-	const space = resolveResponsiveSpace(formSpace);
-	return space ? getGapClass(space) : autoResponsiveGapClasses;
+	return resolveSpacingClass(formSpace?.density, gapYConfig);
 }
+/**
+* Deprecated: Use resolveSpacingClass instead
+* @deprecated
+*/
+const autoResponsiveSpaceClasses = spaceYConfig.responsive;
+/**
+* Deprecated: Use resolveSpacingClass instead
+* @deprecated
+*/
+const autoResponsiveGapClasses = gapYConfig.responsive;
 
 //#endregion
-export { autoResponsiveGapClasses, autoResponsiveSpaceClasses, getGapClass, getSpaceClass, isResponsiveDensity, resolveResponsiveGapClass, resolveResponsiveSpace, resolveResponsiveSpaceClass };
+export { gapYConfig, resolveResponsiveGapClass, resolveResponsiveSpaceClass, resolveSpacingClass, spaceYConfig };

package/dist/utils/transform-schema.cjs

@@ -26,15 +26,22 @@ const inputSchemaMap = {
 	},
 	object: { "x-component": "ObjectContainer" }
 };
-function transformSchema(schema) {
+function transformSchema(schema, fieldsDecorators) {
 	(0, json_schema_traverse.default)(schema, {
 		allKeys: true,
 		cb: (currentSchema) => {
 			const { type } = currentSchema;
+			const xComponent = currentSchema["x-component"];
 			if (typeof type === "string" && type in inputSchemaMap) {
 				const mapping = inputSchemaMap[type];
 				if (currentSchema["x-component"] == null) currentSchema["x-component"] = mapping["x-component"];
-				if (!["Hidden", "hidden"].includes(currentSchema["x-component"])) currentSchema["x-decorator"] = mapping["x-decorator"];
+			}
+			if (!["Hidden", "hidden"].includes(currentSchema["x-component"])) {
+				if (currentSchema["x-decorator"] == null) {
+					const userDecorator = xComponent != null && fieldsDecorators != null && fieldsDecorators[xComponent] != null ? fieldsDecorators[xComponent] : null;
+					if (userDecorator != null) currentSchema["x-decorator"] = userDecorator;
+					else if (typeof type === "string" && type in inputSchemaMap) currentSchema["x-decorator"] = inputSchemaMap[type]["x-decorator"];
+				}
 			}
 		}
 	});

package/dist/utils/transform-schema.js

@@ -24,15 +24,22 @@ const inputSchemaMap = {
 	},
 	object: { "x-component": "ObjectContainer" }
 };
-function transformSchema(schema) {
+function transformSchema(schema, fieldsDecorators) {
 	traverse(schema, {
 		allKeys: true,
 		cb: (currentSchema) => {
 			const { type } = currentSchema;
+			const xComponent = currentSchema["x-component"];
 			if (typeof type === "string" && type in inputSchemaMap) {
 				const mapping = inputSchemaMap[type];
 				if (currentSchema["x-component"] == null) currentSchema["x-component"] = mapping["x-component"];
-				if (!["Hidden", "hidden"].includes(currentSchema["x-component"])) currentSchema["x-decorator"] = mapping["x-decorator"];
+			}
+			if (!["Hidden", "hidden"].includes(currentSchema["x-component"])) {
+				if (currentSchema["x-decorator"] == null) {
+					const userDecorator = xComponent != null && fieldsDecorators != null && fieldsDecorators[xComponent] != null ? fieldsDecorators[xComponent] : null;
+					if (userDecorator != null) currentSchema["x-decorator"] = userDecorator;
+					else if (typeof type === "string" && type in inputSchemaMap) currentSchema["x-decorator"] = inputSchemaMap[type]["x-decorator"];
+				}
 			}
 		}
 	});

package/dist/utils/validate-schema-components.cjs

@@ -0,0 +1,45 @@
+const require_rolldown_runtime = require('../_virtual/rolldown_runtime.cjs');
+let json_schema_traverse = require("json-schema-traverse");
+json_schema_traverse = require_rolldown_runtime.__toESM(json_schema_traverse);
+
+//#region src/utils/validate-schema-components.ts
+/**
+* Validates schema components against the provided React components.
+*
+* For x-component and x-decorator references, they must match a component key
+* in the provided components object.
+*
+* Throws an error if:
+* - An x-component reference doesn't match any available component key
+* - An x-decorator reference doesn't match any available component key
+*
+* @param schema - The ISchema to validate
+* @param components - Record of available React components (includes both components and decorators)
+* @throws {Error} If validation fails
+*
+* @example
+* const components = { Input, NumberInput, Checkbox, FormItem };
+* validateSchemaComponents(schema, components);
+*/
+function validateSchemaComponents(schema, components) {
+	const componentKeys = Object.keys(components);
+	const errors = [];
+	(0, json_schema_traverse.default)(schema, {
+		allKeys: true,
+		cb: (currentSchema, jsonPointer) => {
+			const current = currentSchema;
+			const xComponent = current["x-component"];
+			const xDecorator = current["x-decorator"];
+			if (xComponent != null && typeof xComponent === "string") {
+				if (!componentKeys.includes(xComponent)) errors.push(`Component '${xComponent}' at path '${jsonPointer}' is not registered in the provided components.`);
+			}
+			if (xDecorator != null && typeof xDecorator === "string") {
+				if (!componentKeys.includes(xDecorator)) errors.push(`Decorator '${xDecorator}' at path '${jsonPointer}' is not registered in the provided components.`);
+			}
+		}
+	});
+	if (errors.length > 0) throw new Error(`Schema validation failed:\n${errors.join("\n")}`);
+}
+
+//#endregion
+exports.validateSchemaComponents = validateSchemaComponents;

package/dist/utils/validate-schema-components.js

@@ -0,0 +1,43 @@
+import traverse from "json-schema-traverse";
+
+//#region src/utils/validate-schema-components.ts
+/**
+* Validates schema components against the provided React components.
+*
+* For x-component and x-decorator references, they must match a component key
+* in the provided components object.
+*
+* Throws an error if:
+* - An x-component reference doesn't match any available component key
+* - An x-decorator reference doesn't match any available component key
+*
+* @param schema - The ISchema to validate
+* @param components - Record of available React components (includes both components and decorators)
+* @throws {Error} If validation fails
+*
+* @example
+* const components = { Input, NumberInput, Checkbox, FormItem };
+* validateSchemaComponents(schema, components);
+*/
+function validateSchemaComponents(schema, components) {
+	const componentKeys = Object.keys(components);
+	const errors = [];
+	traverse(schema, {
+		allKeys: true,
+		cb: (currentSchema, jsonPointer) => {
+			const current = currentSchema;
+			const xComponent = current["x-component"];
+			const xDecorator = current["x-decorator"];
+			if (xComponent != null && typeof xComponent === "string") {
+				if (!componentKeys.includes(xComponent)) errors.push(`Component '${xComponent}' at path '${jsonPointer}' is not registered in the provided components.`);
+			}
+			if (xDecorator != null && typeof xDecorator === "string") {
+				if (!componentKeys.includes(xDecorator)) errors.push(`Decorator '${xDecorator}' at path '${jsonPointer}' is not registered in the provided components.`);
+			}
+		}
+	});
+	if (errors.length > 0) throw new Error(`Schema validation failed:\n${errors.join("\n")}`);
+}
+
+//#endregion
+export { validateSchemaComponents };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@pixpilot/formily-shadcn",
   "type": "module",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "Formily integration for shadcn/ui components",
   "author": "m.doaie <m.doaie@hotmail.com>",
   "license": "MIT",
@@ -35,12 +35,13 @@
     "@iconify-json/fa": "^1.2.2",
     "@iconify-json/mdi": "^1.2.3",
     "@iconify/react": "^6.0.2",
+    "@pixpilot/env": "^0.2.1",
     "@pixpilot/string": "^2.3.0",
     "json-schema-traverse": "^1.0.0",
     "lucide-react": "^0.554.0",
     "pretty-bytes": "^7.1.0",
-    "@pixpilot/shadcn": "0.4.0",
-    "@pixpilot/shadcn-ui": "0.5.1"
+    "@pixpilot/shadcn-ui": "0.5.1",
+    "@pixpilot/shadcn": "0.4.0"
   },
   "devDependencies": {
     "@storybook/react": "^10.1.8",