@nudojs/core 2.0.1 → 2.1.0

package/dist/index.d.ts

@@ -799,23 +799,25 @@ declare function string(): ConstraintBuilder;
 declare function boolean(): ConstraintBuilder;
 /** any() —— 无约束；formatConstraint / draft import 与显示同源 */
 declare function any(): ConstraintBuilder;
-/** array(item) —— 数组，元素满足 item */
-declare function array(item: NudoConstraint | ConstraintBuilder): ConstraintBuilder;
+/** array(item) —— 数组，元素满足 item；item 亦可为具体字面量（指令文法） */
+declare function array(item: NudoConstraint | ConstraintBuilder | number | string | boolean | null | undefined): ConstraintBuilder;
 /**
  * object 形状约束（契约规范形状，无需 interface）：
  *
  *   shape({ id: number().gt(0), name: string() })
+ *
+ * 字段值亦可为具体字面量（指令文法）。
  */
-declare function shape(fields: Record<string, NudoConstraint | ConstraintBuilder>): ConstraintBuilder;
+declare function shape(fields: Record<string, NudoConstraint | ConstraintBuilder | number | string | boolean | null | undefined>): ConstraintBuilder;
 /** union(...cs)：成员析取；instantiate 为 or(...)，entry Abs 为成员 joinAbs。空参 throw */
-declare function union(...cs: (NudoConstraint | ConstraintBuilder)[]): ConstraintBuilder;
+declare function union(...cs: (NudoConstraint | ConstraintBuilder | number | string | boolean | null | undefined)[]): ConstraintBuilder;
 /**
  * fn(params, returns?, { throws? })：一等函数约束。
  * Phase 1 只展示不执法：参数位 instantiate 恒真（pTrue），
  * 逐参约束经 fnConstraintToEntryReqs 消费。
  */
-declare function fn(params: Record<string, NudoConstraint | ConstraintBuilder>, returns?: NudoConstraint | ConstraintBuilder, opts?: {
-    throws?: NudoConstraint | ConstraintBuilder;
+declare function fn(params: Record<string, NudoConstraint | ConstraintBuilder | number | string | boolean | null | undefined>, returns?: NudoConstraint | ConstraintBuilder | number | string | boolean | null | undefined, opts?: {
+    throws?: NudoConstraint | ConstraintBuilder | number | string | boolean | null | undefined;
 }): ConstraintBuilder;
 /** partial(c)：shape 全字段变可选；非 shape throw */
 declare function partial(c: NudoConstraint | ConstraintBuilder): ConstraintBuilder;

package/dist/index.js

@@ -666,20 +666,17 @@ function any() {
   return makeBuilder(void 0, []);
 }
 function array(item) {
-  if (!isConstraint(item))
-    throw new Error("nudo: array(item) \u671F\u671B\u7EA6\u675F\u503C\uFF08number()/string()/\u2026\u6216\u5176\u7EC4\u5408\u5B50\uFF09");
-  return makeBuilder(void 0, [], { element: item });
+  return makeBuilder(void 0, [], {
+    element: asNestedConstraint(item, "array(item)")
+  });
 }
 function shape(fields) {
   const mapped = {};
   for (const [k, v2] of Object.entries(fields)) {
-    if (!isConstraint(v2))
-      throw new Error(
-        `nudo: shape \u5B57\u6BB5 '${k}' \u671F\u671B\u7EA6\u675F\u503C\uFF08number()/string()/\u2026\u6216\u5176\u7EC4\u5408\u5B50\uFF09\uFF0C\u6536\u5230\u975E\u7EA6\u675F`
-      );
+    const constraint = asNestedConstraint(v2, `shape \u5B57\u6BB5 '${k}'`);
     mapped[k] = {
-      constraint: v2,
-      ...v2.isOptional ? { optional: true } : {}
+      constraint,
+      ...constraint.isOptional ? { optional: true } : {}
     };
   }
   return makeBuilder(void 0, [], { fields: mapped });
@@ -704,19 +701,32 @@ function lit2(v2) {
   const prim = typeof v2 === "number" ? "number" : typeof v2 === "string" ? "string" : typeof v2 === "boolean" ? "boolean" : void 0;
   return makeBuilder(prim, [eq(selfTerm(), lit(v2))]);
 }
+function asNestedConstraint(x, ctx) {
+  if (isConstraint(x)) return toPlainConstraint(x);
+  if (x === null || x === void 0 || typeof x === "number" || typeof x === "string" || typeof x === "boolean") {
+    return toPlainConstraint(lit2(x));
+  }
+  throw new Error(
+    `nudo: ${ctx} \u671F\u671B\u7EA6\u675F\u503C\uFF08number()/string()/\u2026\uFF09\u6216\u5177\u4F53\u5B57\u9762\u91CF\uFF0C\u6536\u5230\u975E\u7EA6\u675F`
+  );
+}
 function union(...cs) {
   if (cs.length === 0)
     throw new Error("nudo union(): \u81F3\u5C11\u9700\u8981\u4E00\u4E2A\u6210\u5458\u7EA6\u675F");
-  return makeBuilder(void 0, [], { members: cs.map(toPlainConstraint) });
+  return makeBuilder(void 0, [], {
+    members: cs.map((c) => asNestedConstraint(c, "union \u6210\u5458"))
+  });
 }
 function fn(params, returns, opts) {
   const normalized = {};
-  for (const [k, v2] of Object.entries(params)) normalized[k] = toPlainConstraint(v2);
+  for (const [k, v2] of Object.entries(params)) {
+    normalized[k] = asNestedConstraint(v2, `fn \u53C2\u6570 '${k}'`);
+  }
   return makeBuilder(void 0, [], {
     fn: {
       params: normalized,
-      ...returns !== void 0 ? { returns: toPlainConstraint(returns) } : {},
-      ...opts?.throws !== void 0 ? { throws: toPlainConstraint(opts.throws) } : {}
+      ...returns !== void 0 ? { returns: asNestedConstraint(returns, "fn \u8FD4\u56DE\u503C") } : {},
+      ...opts?.throws !== void 0 ? { throws: asNestedConstraint(opts.throws, "fn throws") } : {}
     }
   });
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nudojs/core",
-  "version": "2.0.1",
+  "version": "2.1.0",
   "engines": {
     "node": ">=20"
   },