@wcstack/state 2.6.1 → 3.1.0

package/dist/manifest.d.ts

@@ -83,6 +83,8 @@ interface IWcsManifest {
             elseKeyword: string;
             spread: string;
             eventPropertyPrefix: string;
+            /** 左辺の先頭に付けると、名前が `on` で始まってもイベントにしない明示のプロパティ形（`.online:`、要件 B5） */
+            explicitPropertyPrefix: string;
             propNamespaces: {
                 eventToken: string;
                 command: string;

package/dist/manifest.esm.js

@@ -81,16 +81,6 @@ function valueMustBeArray(fnName) {
     raiseError(`filter ${fnName} requires an array value`);
 }
 
-const warned = new Set();
-/** 同じ文面は 1 回だけ警告する（文面は書き方とサイトを含むので、書き方・サイトごとに 1 回） */
-function warnV3Migration(message) {
-    if (warned.has(message)) {
-        return;
-    }
-    warned.add(message);
-    console.warn(`[@wcstack/state] [wcs/v3-migration] ${message} See "Preparing for 3.0" in the @wcstack/state README.`);
-}
-
 /**
  * builtinFilters.ts
  *
@@ -119,8 +109,10 @@ function validateNumberString(value) {
  * @param options - Array with comparison value as first element
  * @returns Filter function that returns boolean
  */
-const eq = (options) => {
+const eq = (options, literals) => {
     const opt = options?.[0] ?? optionsRequired('eq');
+    // The typed literal (B9): unquoted true / false / null / numbers are typed, quoted arguments are strings
+    const literal = literals !== undefined && literals.length > 0 ? literals[0] : opt;
     return (value) => {
         // Align types for comparison
         if (typeof value === 'number') {
@@ -132,8 +124,8 @@ const eq = (options) => {
         if (typeof value === 'string') {
             return value === opt;
         }
-        // Strict equality for others
-        return value === opt;
+        // Booleans, null and the rest compare with the typed literal: eq(true) matches true (B9)
+        return value === literal;
     };
 };
 /**
@@ -142,8 +134,9 @@ const eq = (options) => {
  * @param options - Array with comparison value as first element
  * @returns Filter function that returns boolean
  */
-const ne = (options) => {
+const ne = (options, literals) => {
     const opt = options?.[0] ?? optionsRequired('ne');
+    const literal = literals !== undefined && literals.length > 0 ? literals[0] : opt;
     return (value) => {
         // Align types for comparison
         if (typeof value === 'number') {
@@ -155,8 +148,8 @@ const ne = (options) => {
         if (typeof value === 'string') {
             return value !== opt;
         }
-        // Strict equality for others
-        return value !== opt;
+        // Booleans, null and the rest compare with the typed literal (B9)
+        return value !== literal;
     };
 };
 /**
@@ -817,23 +810,15 @@ const hms = (options) => {
         return `${hours}${opt}${minutes}${opt}${seconds}`;
     };
 };
-/** 3.0 は truthy / falsy / defaults を JavaScript の真偽判定に揃える（要件 B10）— 0n の差を予告する */
-function warnBigIntZero(fnName, value) {
-    if (value === 0n) {
-        warnV3Migration(`"${fnName}" got 0n: 3.0 treats it as falsy.`);
-    }
-}
 /**
- * Falsy filter - checks if value is falsy.
+ * Falsy filter - checks if value is falsy, by JavaScript's own truthiness (`!value`: false, null,
+ * undefined, 0, -0, 0n, '' and NaN). Before 3.0 the list was spelled out and missed 0n (B10).
  *
  * @param options - Unused
- * @returns Filter function that returns true for false/null/undefined/0/''/NaN
+ * @returns Filter function that returns true for falsy values
  */
 const falsy = (_options) => {
-    return (value) => {
-        warnBigIntZero('falsy', value);
-        return value === false || value === null || value === undefined || value === 0 || value === '' || Number.isNaN(value);
-    };
+    return (value) => !value;
 };
 /**
  * Truthy filter - checks if value is truthy.
@@ -842,23 +827,22 @@ const falsy = (_options) => {
  * @returns Filter function that returns true for non-falsy values
  */
 const truthy = (_options) => {
-    return (value) => {
-        warnBigIntZero('truthy', value);
-        return value !== false && value !== null && value !== undefined && value !== 0 && value !== '' && !Number.isNaN(value);
-    };
+    // JavaScript's truthiness, the same as the `boolean` filter (B10)
+    return (value) => !!value;
 };
 /**
- * Default filter - returns default value if input is falsy.
+ * Default filter - returns default value if input is falsy (JavaScript's truthiness, as `falsy`).
  *
  * @param options - Array with default value as first element
  * @returns Filter function that returns value or default
  */
-const defaults = (options) => {
+const defaults = (options, literals) => {
     const opt = options?.[0] ?? optionsRequired('defaults');
+    // The fallback is the typed literal (B9): defaults(0) gives 0, defaults(null) gives null, defaults('0') gives "0"
+    const fallback = literals !== undefined && literals.length > 0 ? literals[0] : opt;
     return (value) => {
-        warnBigIntZero('defaults', value);
-        if (value === false || value === null || value === undefined || value === 0 || value === '' || Number.isNaN(value)) {
-            return opt;
+        if (!value) {
+            return fallback;
         }
         return value;
     };
@@ -1153,6 +1137,7 @@ function getWcsManifest() {
                 elseKeyword: ELSE_KEYWORD,
                 spread: SPREAD_PROP,
                 eventPropertyPrefix: EVENT_PROP_PREFIX,
+                explicitPropertyPrefix: DELIMITER,
                 propNamespaces: {
                     eventToken: EVENT_TOKEN_NAMESPACE,
                     command: COMMAND_NAMESPACE,

package/dist/parser.d.ts

@@ -1,3 +1,19 @@
+/**
+ * Filter/types.ts
+ *
+ * Type definition file for filter functions.
+ *
+ * Main responsibilities:
+ * - Defines types for filter functions (FilterFn) and filter functions with options (FilterWithOptionsFn)
+ * - Type-safe management of filter name-to-function mappings (FilterWithOptions) and filter function arrays (Filters)
+ * - Defines types for retrieving filter functions from built-in filter collections
+ *
+ * Design points:
+ * - Type design enabling flexible filter design and extension
+ * - Supports filters with options and combinations of multiple filters
+ */
+type FilterFn<T = unknown> = (value: unknown) => T;
+
 interface IPathInfo {
     readonly id: number;
     readonly path: string;
@@ -24,26 +40,23 @@ interface IPathInfo {
     readonly wildcardCount: number;
 }
 
+type BindingType = 'text' | 'prop' | 'event' | 'for' | 'if' | 'elseif' | 'else' | 'radio' | 'checkbox' | 'spread';
 /**
- * Filter/types.ts
- *
- * Type definition file for filter functions.
- *
- * Main responsibilities:
- * - Defines types for filter functions (FilterFn) and filter functions with options (FilterWithOptionsFn)
- * - Type-safe management of filter name-to-function mappings (FilterWithOptions) and filter function arrays (Filters)
- * - Defines types for retrieving filter functions from built-in filter collections
- *
- * Design points:
- * - Type design enabling flexible filter design and extension
- * - Supports filters with options and combinations of multiple filters
+ * 文法の段が読むフィルタ（名前と引数だけ。要件 D16）。実関数は束縛計画の段で
+ * 登録簿から解決される（`core/filterRegistry.ts`）ので、パース結果はここで止まる。
  */
-type FilterFn<T = unknown> = (value: unknown) => T;
-
-type BindingType = 'text' | 'prop' | 'event' | 'for' | 'if' | 'elseif' | 'else' | 'radio' | 'checkbox' | 'spread';
-interface IFilterInfo {
+interface IParsedFilter {
     readonly filterName: string;
     readonly args: string[];
+    /**
+     * 引数の型付きの値（要件 B9）。引用符の無い `true` / `false` / `null` / 数値は型付き、引用符付きは
+     * 文字列のまま。`args` は引用符を外した原文（書式フィルタはこちらを読む）。組み立てた側が省略したら
+     * `args` と同じ扱い。
+     */
+    readonly literals?: readonly unknown[];
+}
+/** 束縛計画の段で実関数まで解決したフィルタ */
+interface IFilterInfo extends IParsedFilter {
     readonly filterFn: FilterFn;
 }
 /**
@@ -57,40 +70,25 @@ interface IParsedBinding {
     readonly propModifiers: string[];
     readonly statePathName: string;
     readonly statePathInfo: IPathInfo;
-    readonly inFilters: IFilterInfo[];
-    readonly outFilters: IFilterInfo[];
+    readonly inFilters: IParsedFilter[];
+    readonly outFilters: IParsedFilter[];
     readonly bindingType: BindingType;
     readonly uuid?: string | null;
 }
 
 type ParseBindTextResult = IParsedBinding;
 
+/**
+ * `data-wcs` の値をバインディングごとに区切る（前後の空白は残す — tooling が位置を数えられるように）。
+ * 引用符の中の `;` は区切りではない（要件 B1 — `join(';')`）。ランタイムと tooling（`@wcstack/state/parser`）で共有する
+ */
+declare function splitBindTexts(bindText: string): string[];
 declare function parseBindTextsForElement(bindText: string): ParseBindTextResult[];
 
 declare function parseBindTextForEmbeddedNode(bindText: string): ParseBindTextResult;
 
 declare function getPathInfo(path: string): IPathInfo;
 
-/**
- * v3MigrationRules.ts — 3.0 で拒否される（または読み方が変わる）書き方の判定。純関数。
- *
- * ランタイム（v3Migration.ts が `[wcs/v3-migration]` として console に 1 回ずつ出す）と
- * tooling（`@wcstack/state/parser` 経由で lint が同じ判定を使う）の共通の正本。
- * ここは console に何も出さず、2.x の挙動も変えない（次期メジャーの要件 D2）。
- * 文面は短く保つ — 全文はランタイムのバンドルに載る。2.x との差と書き換え先の一覧は
- * state README の "Preparing for 3.0"（警告の末尾が案内する）。
- *
- * 式は 2.x の分割（`;` で無条件に割る）のまま受け取る — 引用符の中の `;` は 2.x では既に壊れている。
- */
-
-/**
- * `data-wcs` の式 1 つ（`;` を含まない、trim 済み）の判定。`parsed` があればフィルタの引数の個数も見る。
- * 区切りの無い式は 2.x のパーサが先に拒否するので何も言わない。
- */
-declare function findV3MigrationIssues(expr: string, parsed?: ParseBindTextResult | null): string[];
-/** mustache / コメントのテキストバインディング（右辺だけ、`;` で割らない）の判定 */
-declare function findEmbeddedV3MigrationIssues(expression: string, parsed?: ParseBindTextResult | null): string[];
-
 /**
  * parser.ts — `data-wcs` バインディング構文の正本パーサを tooling 向けに公開する
  * サブパスエントリ（`@wcstack/state/parser`）。
@@ -130,5 +128,5 @@ declare function findEmbeddedV3MigrationIssues(expression: string, parsed?: Pars
  */
 declare function clearParserCaches(): void;
 
-export { clearParserCaches, findEmbeddedV3MigrationIssues, findV3MigrationIssues, getPathInfo, parseBindTextForEmbeddedNode, parseBindTextsForElement };
+export { clearParserCaches, getPathInfo, parseBindTextForEmbeddedNode, parseBindTextsForElement, splitBindTexts };
 export type { BindingType, IFilterInfo, IPathInfo, ParseBindTextResult };