@nudojs/core 2.0.0 → 2.0.1

package/dist/{chunk-VVSVQKWF.js → chunk-6REHMIAE.js}

@@ -2811,6 +2811,15 @@ function ok() {
 function fail(reason) {
   return { ok: false, reason };
 }
+function requiredFnArity(params) {
+  if (!params) return 0;
+  let n = 0;
+  for (const p of params) {
+    if (!p || p.startsWith("...") || p.endsWith("?")) continue;
+    n++;
+  }
+  return n;
+}
 function leqAbs(src, tgt, opts = {}) {
   const phi2 = opts.phi ?? pTrue;
   return leqWithPred(src, tgt, phi2, opts.env ?? null, 0);
@@ -2963,8 +2972,12 @@ function leqShape(src, tgt, phi2, env, depth) {
   }
   if (t.k === "fn") {
     if (s.k !== "fn") return fail(`shape ${s.k} \u22AD fn`);
-    if (s.params.length !== t.params.length) {
-      return fail(`fn arity ${s.params.length} \u22AD ${t.params.length}`);
+    const sReq = requiredFnArity(s.params);
+    const tReq = requiredFnArity(t.params);
+    if (sReq > tReq) {
+      return fail(
+        `fn arity required ${sReq} \u22AD target required ${tReq} (params ${s.params.length} / ${t.params.length})`
+      );
     }
     if (t.returnType !== void 0) {
       const sr = s.returnType;
@@ -3879,7 +3892,12 @@ function isRelFn(a) {
   if (!s || s.k !== "fn") return false;
   if (s.returnType === void 0) return false;
   if (s.paramTypes === void 0) return s.params.length === 0;
-  return s.paramTypes.length === s.params.length;
+  if (s.paramTypes.length === s.params.length) return true;
+  let required = 0;
+  for (const p of s.params) {
+    if (p && !p.startsWith("...") && !p.endsWith("?")) required++;
+  }
+  return s.paramTypes.length === required;
 }
 function litOfTerm(t) {
   return t.op === "lit" ? t.value : void 0;
@@ -10413,6 +10431,7 @@ export {
   awaitAbs,
   coerceAsyncReturn,
   classFromMethods,
+  requiredFnArity,
   leqAbs,
   tagAbsOrigin,
   getAbsOrigin,

package/dist/exec.js

@@ -111,7 +111,7 @@ import {
   transpileFile,
   transpileSource,
   withExecPhi
-} from "./chunk-VVSVQKWF.js";
+} from "./chunk-6REHMIAE.js";
 export {
   $add,
   $arr,

package/dist/index.d.ts

@@ -490,6 +490,8 @@ type LeqResult = {
  * src 可赋给 tgt。
  * phi：路径前提（可选）；env：用于 brand 继承链。
  */
+/** Required arity from fn param labels — skips rest (`...`) and optional (`?`). */
+declare function requiredFnArity(params: readonly string[] | undefined): number;
 declare function leqAbs(src: Abs, tgt: Abs, opts?: {
     phi?: Phi;
     env?: AstEnv;
@@ -1793,4 +1795,4 @@ type InjectedDomainEvidenceOpts = {
  */
 declare function checkInjectedDomainEvidence(fnName: string, source: string, records: InjectedDomainRecord[], opts: InjectedDomainEvidenceOpts): CheckIssue[];
 
-export { Abs, type AbsAssignRecord, type AbsCallRecord, type AbsFnImpl, type AbsInlay, AbsModuleExports, type AbsSigImpl, type ArgDerivation, AstEnv, type CheckIssue, type CheckJson, type CheckOptions, type CheckReport, type ClassDef, type CollectAbsInlaysOpts, Confidence, type ConstraintBuilder, type DerivationNode, type Diagnostic, type EffectiveInterface, type EffectiveInterfaceOpts, type Environment, type EvalOptions, type EvalResult, type FnAbs, type FnFp, type FormalParam, type FormatOptions, HofSite, type InjectedDomainRecord, type InterfaceDiag, type InterfaceSource, type InterfaceTierInfo, type InterfaceTierOpts, type LeakBudget, type LeqResult, type LoadDepsFingerprint, MAX_CALL_DEPTH, MAX_TOTAL_CALLS, type MethodDef, type MockHelper, type NamedImport, type NudoConstraint, type NudoField, type NudoFnConstraint, NudoSidecarError, type NudoSig, type ObjShape, Phi, type PolyFn, Pred, PrimName, type RefineDiag, type RefineEntry, type RefineResolveOpts, RelSource, SELF, Shape, type Slot, type TemplateMeta, type TemplatePartDesc, type TemplatePartView, type TemplatePredicateDecision, Term, type TypeParam, abortDerivationSession, absFunction, absShapeKey, absTemplateViews, absToConstraint, add, allFixedTextOfViews, analyzeFn, analyzeFnFull, any, applyAbsFn, array, attachFnImpl, awaitAbs, beginCollectionFork, beginDerivationSession, boolean, buildArgsFromAssume, callAbsMethod, callFunction, callFunctionFull, canSkipLiteralCallScan, checkArg, checkCall, checkInjectedDomainEvidence, checkSource, classFromMethods, clearCollectionTables, cmp, coerceAsyncReturn, collectAbsFreeVars, collectAbsInlays, collectAbsNodeTypes, collectionElementJoin, collectionExactLen, concatString, constraintToEntryAbs, contractParamNameSet, createEnvironment, createTemplateAbs, currentPhi, decideEndsWith, decideIncludes, decideStartsWith, defaultLeakBudget, defineClass, definitelyNotNullishShape, denoteGuard, derivationChain, describePhi, div, effectiveInterface, emptyEnv, endCollectionFork, endDerivationSession, errorBrandAbs, evalArrayStatic, evalBuiltinInstanceMethod, evalBuiltinNew, evalDateCtor, evalDateMethod, evalDateStatic, evalGlobalFn, evalJsonMethod, evalMathMethod, evalMethodBody, evalNamespaceCall, evalNode, evalNumberStatic, evalObjectMethod, evalProgramAbs, evalPromiseCtor, evalPromiseStatic, evalRegExpCtor, evalRegExpMethod, evalSource, evictCheckSourceMemoForPaths, evictGeneralizeMemoForPaths, exceedsBudget, execNudoModule, extractAllLoadSpecs, extractFn, extractNudoImports, extractRefineReturnFromSource, extractRefinesFromSource, falseConstraint, findAbsAtPosition, fixedLengthOfViews, fn, fnConstraintToEntryReqs, fnFingerprints, fnOf, formalParamDisplayNames, formalParamsFromNodes, formatAbs, formatAbsMultiline, formatCheckReport, formatConstraint, formatDiagnostics, formatEffectiveInterfaceDisplay, formatInterfaceTierLine, formatShape, formatShapeSlot, formatTemplateNameViews, generalizeAll, generalizeFromAst, generalizeSourceKeyPart, generatedExportNames, getAbsProperty, getClass, getClassChain, getDerivation, getFnImpl, getFnNameAndBodies, getGeneralizeMemoSize, getParseSourceCacheSize, getSlot, getTerm, hasDerivationSession, hashSource, instanceOf, instantiateClass, instantiateConstraint, interfaceDiagCount, interfaceSourceOf, interfaceTierOf, isErrorCtorName, isIntFlag, isMapAbs, isNodeModulesPath, isNudoConstraint, isNullishLitAbs, isObj, isSetAbs, isTemplateLike, joinAbs, joinFunctions, joinObjects, joinThenProject, joinValues, knownPrefixOfViews, knownSuffixOfViews, leakIfNeeded, lenTerm, leqAbs, listFunctionNames, literalMeetsConstraint, loadModuleDepsFingerprint, localNamedExports, locateContractParam, lookupMethod, lookupMethodWithOwner, lookupSuperMethod, looseEqAbs, makeMapAbs, makeSetAbs, makeSum, mapClearEntries, mapDeleteEntry, mapEntriesAbs, mapGetEntry, mapHasEntry, mapSetEntry, mapSizeAbs, mapValuesAbs, matchRelIdentLit, maybeLeak, mergeAdjacentFixedViews, mergeCollectionArms, mock, mod, mul, negAbs, normPath, notAbs, noteCollectionWrite, noteDerivationAdd, noteDerivationJoin, number, objOf, omit, parseSource, partial, pick, popCollectionArm, popPhi, projectBrand, projectDerivationDsl, pushCollectionArm, pushPhi, refineAbsForRelTrue, refineDiagCount, refineToIndexedFull, relationFingerprint, relationFn, resetAbsCallBudget, resetCheckSourceMemo, resetFnFpCache, resetGeneralizeMemo, resetHashSourceCache, resetLeakCounter, resetNudoModuleExecCache, resetParseSourceCache, resetPhi, resolveDepPath, serializeCheckJson, setAbsAssignCollector, setAbsCallCollector, setAbsNodeCollector, setAbsTruncationCollector, setAddEntry, setClearEntries, setDeleteEntry, setDerivation, setDerivationCollector, setElementsAbs, setHasEntry, setInterfaceDiagCollector, setRefineDiagCollector, setSizeAbs, shape, shapeOnlyFn, sidecarClosureFingerprint, sidecarPathOf, sidecarSpecsOf, spread, spy, stableAnalyzeKeySource, strictEqAbs, string, stripTypes, stub, sub, superNameOf, tagDerivationRoot, takeInterfaceDiags, takeInterfaceDiagsSince, takeRefineDiags, takeRefineDiagsSince, templateMatchesValue, templatePartsOf, termDepth, termKey, termNodes, trueConstraint, typeofAbs, union, viewTemplateParts, withPhiConstraint, withVar, wrapPromise };
+export { Abs, type AbsAssignRecord, type AbsCallRecord, type AbsFnImpl, type AbsInlay, AbsModuleExports, type AbsSigImpl, type ArgDerivation, AstEnv, type CheckIssue, type CheckJson, type CheckOptions, type CheckReport, type ClassDef, type CollectAbsInlaysOpts, Confidence, type ConstraintBuilder, type DerivationNode, type Diagnostic, type EffectiveInterface, type EffectiveInterfaceOpts, type Environment, type EvalOptions, type EvalResult, type FnAbs, type FnFp, type FormalParam, type FormatOptions, HofSite, type InjectedDomainRecord, type InterfaceDiag, type InterfaceSource, type InterfaceTierInfo, type InterfaceTierOpts, type LeakBudget, type LeqResult, type LoadDepsFingerprint, MAX_CALL_DEPTH, MAX_TOTAL_CALLS, type MethodDef, type MockHelper, type NamedImport, type NudoConstraint, type NudoField, type NudoFnConstraint, NudoSidecarError, type NudoSig, type ObjShape, Phi, type PolyFn, Pred, PrimName, type RefineDiag, type RefineEntry, type RefineResolveOpts, RelSource, SELF, Shape, type Slot, type TemplateMeta, type TemplatePartDesc, type TemplatePartView, type TemplatePredicateDecision, Term, type TypeParam, abortDerivationSession, absFunction, absShapeKey, absTemplateViews, absToConstraint, add, allFixedTextOfViews, analyzeFn, analyzeFnFull, any, applyAbsFn, array, attachFnImpl, awaitAbs, beginCollectionFork, beginDerivationSession, boolean, buildArgsFromAssume, callAbsMethod, callFunction, callFunctionFull, canSkipLiteralCallScan, checkArg, checkCall, checkInjectedDomainEvidence, checkSource, classFromMethods, clearCollectionTables, cmp, coerceAsyncReturn, collectAbsFreeVars, collectAbsInlays, collectAbsNodeTypes, collectionElementJoin, collectionExactLen, concatString, constraintToEntryAbs, contractParamNameSet, createEnvironment, createTemplateAbs, currentPhi, decideEndsWith, decideIncludes, decideStartsWith, defaultLeakBudget, defineClass, definitelyNotNullishShape, denoteGuard, derivationChain, describePhi, div, effectiveInterface, emptyEnv, endCollectionFork, endDerivationSession, errorBrandAbs, evalArrayStatic, evalBuiltinInstanceMethod, evalBuiltinNew, evalDateCtor, evalDateMethod, evalDateStatic, evalGlobalFn, evalJsonMethod, evalMathMethod, evalMethodBody, evalNamespaceCall, evalNode, evalNumberStatic, evalObjectMethod, evalProgramAbs, evalPromiseCtor, evalPromiseStatic, evalRegExpCtor, evalRegExpMethod, evalSource, evictCheckSourceMemoForPaths, evictGeneralizeMemoForPaths, exceedsBudget, execNudoModule, extractAllLoadSpecs, extractFn, extractNudoImports, extractRefineReturnFromSource, extractRefinesFromSource, falseConstraint, findAbsAtPosition, fixedLengthOfViews, fn, fnConstraintToEntryReqs, fnFingerprints, fnOf, formalParamDisplayNames, formalParamsFromNodes, formatAbs, formatAbsMultiline, formatCheckReport, formatConstraint, formatDiagnostics, formatEffectiveInterfaceDisplay, formatInterfaceTierLine, formatShape, formatShapeSlot, formatTemplateNameViews, generalizeAll, generalizeFromAst, generalizeSourceKeyPart, generatedExportNames, getAbsProperty, getClass, getClassChain, getDerivation, getFnImpl, getFnNameAndBodies, getGeneralizeMemoSize, getParseSourceCacheSize, getSlot, getTerm, hasDerivationSession, hashSource, instanceOf, instantiateClass, instantiateConstraint, interfaceDiagCount, interfaceSourceOf, interfaceTierOf, isErrorCtorName, isIntFlag, isMapAbs, isNodeModulesPath, isNudoConstraint, isNullishLitAbs, isObj, isSetAbs, isTemplateLike, joinAbs, joinFunctions, joinObjects, joinThenProject, joinValues, knownPrefixOfViews, knownSuffixOfViews, leakIfNeeded, lenTerm, leqAbs, listFunctionNames, literalMeetsConstraint, loadModuleDepsFingerprint, localNamedExports, locateContractParam, lookupMethod, lookupMethodWithOwner, lookupSuperMethod, looseEqAbs, makeMapAbs, makeSetAbs, makeSum, mapClearEntries, mapDeleteEntry, mapEntriesAbs, mapGetEntry, mapHasEntry, mapSetEntry, mapSizeAbs, mapValuesAbs, matchRelIdentLit, maybeLeak, mergeAdjacentFixedViews, mergeCollectionArms, mock, mod, mul, negAbs, normPath, notAbs, noteCollectionWrite, noteDerivationAdd, noteDerivationJoin, number, objOf, omit, parseSource, partial, pick, popCollectionArm, popPhi, projectBrand, projectDerivationDsl, pushCollectionArm, pushPhi, refineAbsForRelTrue, refineDiagCount, refineToIndexedFull, relationFingerprint, relationFn, requiredFnArity, resetAbsCallBudget, resetCheckSourceMemo, resetFnFpCache, resetGeneralizeMemo, resetHashSourceCache, resetLeakCounter, resetNudoModuleExecCache, resetParseSourceCache, resetPhi, resolveDepPath, serializeCheckJson, setAbsAssignCollector, setAbsCallCollector, setAbsNodeCollector, setAbsTruncationCollector, setAddEntry, setClearEntries, setDeleteEntry, setDerivation, setDerivationCollector, setElementsAbs, setHasEntry, setInterfaceDiagCollector, setRefineDiagCollector, setSizeAbs, shape, shapeOnlyFn, sidecarClosureFingerprint, sidecarPathOf, sidecarSpecsOf, spread, spy, stableAnalyzeKeySource, strictEqAbs, string, stripTypes, stub, sub, superNameOf, tagDerivationRoot, takeInterfaceDiags, takeInterfaceDiagsSince, takeRefineDiags, takeRefineDiagsSince, templateMatchesValue, templatePartsOf, termDepth, termKey, termNodes, trueConstraint, typeofAbs, union, viewTemplateParts, withPhiConstraint, withVar, wrapPromise };

package/dist/index.js

@@ -272,6 +272,7 @@ import {
   registerBClass,
   relationFingerprint,
   relationFn,
+  requiredFnArity,
   resetAbsCallBudget,
   resetLeakCounter,
   resetParseSourceCache,
@@ -337,7 +338,7 @@ import {
   withExecPhi,
   withVar,
   wrapPromise
-} from "./chunk-VVSVQKWF.js";
+} from "./chunk-6REHMIAE.js";
 
 // src/environment.ts
 function createEnvironment(parent, bindings = /* @__PURE__ */ new Map()) {
@@ -511,13 +512,39 @@ function formatShape(a) {
     case "tuple":
       return `[${s.elements.map(formatShape).join(", ")}]`;
     case "fn": {
-      if (s.paramTypes && s.paramTypes.length > 0) {
-        const ps = s.paramTypes.map((p) => formatShapeSlot(p));
-        const ret2 = s.returnType !== void 0 ? formatShapeSlot(s.returnType) : "?";
-        return `(${ps.join(", ")}) => ${ret2}`;
-      }
       const ret = s.returnType !== void 0 ? formatShapeSlot(s.returnType) : "?";
-      return `(${s.params.join(", ")}) => ${ret}`;
+      const labels = s.params ?? [];
+      const paramTypes = s.paramTypes;
+      const hasMarkers = labels.some(
+        (p) => p.startsWith("...") || p.endsWith("?")
+      );
+      const renderLabeled = () => {
+        const ps = [];
+        const n = paramTypes ? Math.max(paramTypes.length, labels.length) : labels.length;
+        for (let i = 0; i < n; i++) {
+          const label = labels[i];
+          const type = paramTypes?.[i];
+          const typeText = type !== void 0 ? formatShapeSlot(type) : void 0;
+          if (label?.startsWith("...")) {
+            ps.push(typeText ? `...${label.slice(3)}: ${typeText}` : label);
+          } else if (label?.endsWith("?")) {
+            ps.push(typeText ? `${label.slice(0, -1)}?: ${typeText}` : label);
+          } else if (typeText !== void 0) {
+            ps.push(typeText);
+          } else if (label) {
+            ps.push(label);
+          }
+        }
+        return ps;
+      };
+      if (hasMarkers) {
+        return `(${renderLabeled().join(", ")}) => ${ret}`;
+      }
+      if (paramTypes && paramTypes.length > 0) {
+        const ps = paramTypes.map((p) => formatShapeSlot(p));
+        return `(${ps.join(", ")}) => ${ret}`;
+      }
+      return `(${labels.join(", ")}) => ${ret}`;
     }
     case "brand":
       return `${s.name}`;
@@ -6695,6 +6722,7 @@ export {
   registerBClass,
   relationFingerprint,
   relationFn,
+  requiredFnArity,
   resetAbsCallBudget,
   resetCheckSourceMemo,
   resetFnFpCache,

package/package.json

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