tw5-typed 0.2.18 → 0.2.20

package/package.json

@@ -2,7 +2,7 @@
   "description": "Types for tiddlywiki",
   "license": "MIT",
   "name": "tw5-typed",
-  "version": "0.2.18",
+  "version": "0.2.20",
   "url": "https://github.com/tiddly-gittly/tw5-typed",
   "homepage": "https://github.com/tiddly-gittly/tw5-typed",
   "bugs": {
@@ -16,6 +16,9 @@
   "files": [
     "src/"
   ],
+  "scripts": {
+    "check": "tsc --noEmit && eslint src/**/*.ts"
+  },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
@@ -32,16 +35,15 @@
   "devDependencies": {
     "@modern-js/eslint-config": "latest",
     "@modern-js/tsconfig": "latest",
-    "@types/codemirror": "^5.60.6",
-    "@types/echarts": "^4.9.16",
-    "@types/node": "^18.11.9",
     "husky": "^8.0.2",
     "lint-staged": "^13.1.0",
     "rimraf": "^3.0.2",
     "tiddlywiki": "^5.2.5",
     "typescript": "^4.9.4"
   },
-  "scripts": {
-    "check": "tsc --noEmit && eslint src/**/*.ts"
+  "dependencies": {
+    "@types/codemirror": "^5.60.6",
+    "@types/echarts": "^4.9.16",
+    "@types/node": "^18.11.9"
   }
-}
+}

package/src/modules/story.d.ts

@@ -1,5 +1,5 @@
 declare module 'tiddlywiki' {
-  declare class Story {
+  export class Story {
     wiki: Wiki;
     storyTitle: string;
     historyTitle: string;
@@ -14,13 +14,13 @@ declare module 'tiddlywiki' {
 
     navigateTiddler(
       navigateTo: string,
-      navigateFromTitle: string,
-      navigateFromClientRect: DOMRect,
+      navigateFromTitle?: string,
+      navigateFromClientRect?: DOMRect,
     );
 
     addToStory(
       navigateTo: string,
-      navigateFromTitle: string,
+      navigateFromTitle?: string,
       options?: {
         openLinkFromInsideRiver?: 'top' | 'bottom' | 'above' | 'below';
       },
@@ -28,7 +28,7 @@ declare module 'tiddlywiki' {
 
     addToHistory(
       navigateTo: string | string[],
-      navigateFromClientRect: DOMRect,
+      navigateFromClientRect?: DOMRect,
     );
 
     saveStoryList(storyList: string[] | string);

package/src/modules/utils/dom.d.ts

@@ -9,7 +9,7 @@ declare const addEventListeners: (
   }[],
 ) => void;
 
-declare class Notifier {
+export class Notifier {
   /**
    * Display a notification
    * * title: Title of tiddler containing the notification text

package/src/modules/widgets/index.d.ts

@@ -9,6 +9,16 @@ declare module 'tiddlywiki' {
     deleted?: boolean;
     modified?: boolean;
   }
+  export interface IWidgetVariableParam {
+    name: string;
+    default: string;
+  }
+
+  export interface IWidgetVariable {
+    value: string;
+    params?: IWidgetVariableParam[];
+    isMacroDefinition: boolean;
+  }
 
   export interface IWidgetEvent {
     [extraKeys: string]: unknown;
@@ -53,7 +63,7 @@ declare module 'tiddlywiki' {
    * * parentWidget: optional reference to a parent renderer node for the context chain
    * * document: optional document object to use instead of global document
    */
-  export declare class Widget {
+  export class Widget {
     parseTreeNode: IParseTreeNode;
 
     wiki: ITiddlyWiki;
@@ -90,14 +100,7 @@ declare module 'tiddlywiki' {
      * * params: array of {name:, default:} for each parameter
      * * isMacroDefinition: true if the variable is set via a \define macro pragma (and hence should have variable substitution performed)
      */
-    variables: Record<
-      string,
-      {
-        value: string;
-        params?: { name: string; default: string }[];
-        isMacroDefinition: boolean;
-      }
-    >;
+    variables: Record<string, IWidgetVariable>;
 
     constructor(
       parseTreeNode: IParseTreeNode,
@@ -105,17 +108,10 @@ declare module 'tiddlywiki' {
     );
 
     /**
-      Make child widgets correspondng to specified parseTreeNodes
-      And push them to `this.children`
-      @param parseTreeNodes default to `this.parseTreeNode.children`, can be undefined
-    */
-    makeChildWidgets(
-      parseTreeNodes?: IParseTreeNode[],
-      options?: { variables?: unknown },
-    ): void;
-
-    /**
+     * @en
      * Initialise widget properties. These steps are pulled out of the constructor so that we can reuse them in subclasses
+     * @zh
+     * 初始化widget属性。这些步骤被拉出构造函数，以便我们可以在子类中重复使用它们
      */
     initialise(
       parseTreeNode: IParseTreeNode,
@@ -125,146 +121,361 @@ declare module 'tiddlywiki' {
         wiki?: ITiddlyWiki;
       },
     ): void;
+
     /**
-     * Remove any DOM nodes created by this widget or its children
-     *
-     * If this widget has directly created DOM nodes, delete them and exit. This assumes that any child widgets are contained within the created DOM nodes, which would normally be the case.
-     * Otherwise, ask the child widgets to delete their DOM nodes
+     * @en
+     * Lifecycle method: Render this widget into the DOM
+     * @zh
+     * 生命周期方法: 将这个微件渲染到DOM中;
+     * 只会在首次渲染、销毁后重新渲染时自动调用，或者通过 refreshSelf 等方法主动调用
      */
-    removeChildDomNodes(): void;
+    render(parent: Node, nextSibling: Node | null): void;
+
     /**
-      Construct the widget object for a parse tree node, and return the new widget
-      options include:
-        variables: optional hashmap of variables to wrap around the widget
-    */
-    makeChildWidget(
-      parseTreeNode: IParseTreeNode,
-      options?: { variables?: unknown },
-    ): Widget;
+     * @en
+     * Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering.
+     * You can do some cleanup or buildup before return true.
+     * @zh
+     * 如果需要的话，有选择地刷新该微件。如果该微件或其任何子项需要重新渲染，则返回 true。
+     * 你可以在返回 true 之前做一些清理或构建工作。
+     * @param {IChangedTiddlers} changedTiddlers Object key is tiddler title, value is metadata about the change
+     * @link https://tiddlywiki.com/dev/#Selective%20Update
+     */
+    refresh(changedTiddlers: IChangedTiddlers): boolean;
+
     /**
-      Add an event listener
-    */
-    addEventListener(
-      type: string,
-      handler: (event: IWidgetEvent) => void | Promise<void>,
+     * Compute the internal state of the widget.
+     * This will be automatically called in the `render` method.
+     *
+     * For example, `getAttribute` and set them to class members.
+     */
+    execute(): void;
+
+    /**
+     * @en
+     * Set the value of a context variable
+     * @zh
+     * 设置一个上下文变量的值
+     *
+     * @param {string } name name of the variable
+     * @param {string} value value of the variable
+     * @param {IWidgetVariableParam[]} [params=[]] array of {name:, default:} for each parameter
+     * @param {boolean} [isMacroDefinition=true] true if the variable is set via a \define macro pragma (and hence should have variable substitution performed)
+     */
+    setVariable(
+      name: string,
+      value: string,
+      parameters?: IWidgetVariableParam[],
+      isMacroDefinition?: boolean,
     ): void;
+
+    /**
+     * Get variable in the context of the widget.
+     * Simplified version of getVariableInfo() that just returns the text.
+     * @param name variable name, for example, `currentTiddler` in the widget context
+     * @param options options for getVariableInfo()
+     *
+     * Options include
+     * * params: array of {name:, value:} for each parameter
+     * * defaultValue: default value if the variable is not defined
+     *
+     * Returns an object with the following fields:
+     * * params: array of {name:,value:} of parameters passed to wikitext variables
+     * * text: text of variable, with parameters properly substituted
+     *
+     * @param {string} name
+     * @param {{ params?: IWidgetVariableParam[]; defaultValue: string }} [options]
+     * @return {*}  {{
+     *       text: string;
+     *       params?: IWidgetVariableParam[];
+     *       srcVariable?: IWidgetVariable;
+     *       isCacheable?: boolean;
+     *     }}
+     * @memberof Widget
+     */
+    getVariableInfo(
+      name: string,
+      options?: { params?: IWidgetVariableParam[]; defaultValue: string },
+    ): {
+      text: string;
+      params?: IWidgetVariableParam[];
+      srcVariable?: IWidgetVariable;
+      isCacheable?: boolean;
+    };
+
     /**
-      Dispatch an event to a widget. If the widget doesn't handle the event then it is also dispatched to the parent widget
+     * Simplified version of getVariableInfo() that just returns the text
+     *
+     * @param {string} name
+     * @param {{ params?: IWidgetVariableParam[]; defaultValue: string }} [options]
+     * @return {*}  {string}
+     * @memberof Widget
+     */
+    getVariable(
+      name: string,
+      options?: { params?: IWidgetVariableParam[]; defaultValue: string },
+    ): string;
+
+    resolveVariableParameters(
+      formalParams?: IWidgetVariableParam[],
+      actualParams?: IWidgetVariableParam[],
+    ): IWidgetVariableParam[];
+
+    substituteVariableReferences(
+      text: string,
+      options: { variables: Record<string, string> },
+    ): string;
+
+    evaluateMacroModule(
+      name: string,
+      actualParams: IWidgetVariableParam[],
+      defaultValue: string,
+    ): string;
 
-      Events added via `addEventListener`, like `tm-notify`, can be invoked by this.
-    */
-    dispatchEvent(typeOrEvent: string | Omit<IWidgetEvent, 'widget'>): void;
     /**
-      Add a list of event listeners from an array [{type:,handler:},...]
-    */
-    addEventListeners(
-      listeners: Array<{
-        handler: (event: IWidgetEvent) => void | Promise<void>;
-        type: string;
-      }>,
-    ): void;
+     * @en
+     * Check whether a given context variable value exists in the parent chain
+     * @zh
+     * 检查一个给定的上下文变量值是否存在于父链中
+     *
+     * @param {string} name
+     * @param {string} value
+     * @return {*}  {boolean}
+     * @memberof Widget
+     */
+    hasVariable(name: string, value: string): boolean;
 
     /**
-      Compute the internal state of the widget.
-      This will be automatically called in the `render` method.
+     * @en
+     * Construct a qualifying string based on a hash of concatenating the values of a given variable in the parent chain
+     * @zh
+     * 在连接父链中给定变量值的哈希基础上构建一个限定字符串
+     *
+     * @param {string} name
+     * @return {*}  {string}
+     * @memberof Widget
+     */
+    getStateQualifier(name: string): string;
 
-      For example, `getAttribute` and set them to class members.
+    /**
+     * @en
+     * Compute the current values of the attributes of the widget. Returns a hashmap of the names of the attributes that have changed
+     * @zh
+     * 计算微件的属性的当前值。返回一个已经改变的属性名称的哈希图
+     *
+     * @return {*}  {Record<string, true>}
+     * @memberof Widget
+     */
+    computeAttributes(): Record<string, true>;
+
+    computeAttribute(attribute: string): string;
 
-    */
-    execute(): void;
     /**
-     * Invoke the action widgets that are descendents of the current widget. Will call child widget's invokeAction recursively.
+     * @en
+     * Check for the presence of an evaluated attribute on the widget. Note that attributes set to a missing variable (ie `attr=<<missing>>`) will be treated as missing
+     * @zh
+     * 检查微件上是否存在一个已评估的属性。请注意，设置为缺失变量的属性（即`attr=<<missing>>`）将被视为缺失。
      *
-     * @param triggeringWidget
-     * @param event
-     * @returns handled by any children
+     * @param {string} attribute
+     * @return {*}  {boolean}
+     * @memberof Widget
      */
-    invokeActions(triggeringWidget: Widget, event: IWidgetEvent): boolean;
+    hasAttribute(attribute: string): boolean;
+
     /**
-     * Invoke the action associated with this widget
+     * @en
+     * Check for the presence of a raw attribute on the widget parse tree node. Note that attributes set to a missing variable (ie `attr=<<missing>>`) will NOT be treated as missing
+     * @zh
+     * 检查微件解析树节点上是否存在原始属性。注意，设置为缺失变量的属性（即`ttr=<<missing>>`）不会被视为缺失。
      *
-     * No every widget has this method, but some do, like `action-xxx` widget, e.g., `action-sendmessage`
-     * @param triggeringWidget
-     * @param event
-     * @returns handled
+     * @param {string} attribute
+     * @return {*}  {boolean}
+     * @memberof Widget
      */
-    invokeAction(
-      triggeringWidget: Widget,
-      event: IWidgetEvent,
-    ): boolean | undefined;
+    hasParseTreeNodeAttribute(attribute: string): boolean;
 
     /**
-     * Lifecycle method: Render this widget into the DOM
+     * @en
+     * Get parameters that user set in the widget
+     * @zh
+     * 获取用户在小组件中设置的参数
+     *
+     * @param {string} name attribute name, for example, `actions` in the button widget
+     * @param {string} [fallbackText] default value if the attribute is not set
+     * @return {*}  {string}
+     * @memberof Widget
      */
-    render(parent: Node, nextSibling: Node | null): void;
+    getAttribute(name: string, fallbackText?: string): string;
+
+    /**
+     * @en
+     * Assign the computed attributes of the widget to a domNode
+     * options include:
+     * * `excludeEventAttributes`: ignores attributes whose name begins with "on"
+     * @zh
+     * 将微件的计算属性分配给一个domNode, 选项包括:
+     * * `excludeEventAttributes`: 忽略名称以 "on "开头的属性
+     * 一些特殊的属性：
+     * * `xlink:<xlink-name>`
+     * * `style.<css-style-name>`
+     *
+     * @param {*} domNode
+     * @param {*} options
+     * @memberof Widget
+     */
+    assignAttributes(
+      domNode: Node,
+      options?: { excludeEventAttributes?: boolean },
+    );
+
+    /**
+     * @en
+     * Get the number of ancestor widgets for this widget
+     * @zh
+     * 获取这个微件的祖先微件的数量
+     *
+     * @return {*}  {number}
+     * @memberof Widget
+     */
+    getAncestorCount(): number;
+
+    /**
+     * Make child widgets correspondng to specified parseTreeNodes
+     * And push them to `this.children`
+     * @param parseTreeNodes default to `this.parseTreeNode.children`, can be undefined
+     */
+    makeChildWidgets(
+      parseTreeNodes?: IParseTreeNode[],
+      options?: { variables?: unknown },
+    ): void;
+
+    /**
+     * Construct the widget object for a parse tree node, and return the new widget
+     * options include:
+     *   variables: optional hashmap of variables to wrap around the widget
+     */
+    makeChildWidget(
+      parseTreeNode: IParseTreeNode,
+      options?: { variables?: unknown },
+    ): Widget;
+
+    /**
+     * @en
+     * Get the next sibling of this widget
+     *
+     * @return {*}  {(Widget | null)}
+     * @memberof Widget
+     */
+    nextSibling(): Widget | null;
+
+    /**
+     * @en
+     * Get the previous sibling of this widget
+     *
+     * @return {*}  {(Widget | null)}
+     * @memberof Widget
+     */
+    previousSibling(): Widget | null;
+
     /**
      * Render the children of this widget into the DOM
      */
     renderChildren(parent: Node, nextSibling: Node | null): void;
+
     /**
-     * Selectively refreshes the widget if needed. Returns true if the widget or any of its children needed re-rendering.
-     * You can do some cleanup or buildup before return true.
-     * @param changedTiddlers Object key is tiddler title, value is metadata about the change
-     * @link https://tiddlywiki.com/dev/#Selective%20Update
+     * Add a list of event listeners from an array [{type:,handler:},...]
      */
-    refresh(changedTiddlers: IChangedTiddlers): boolean;
+    addEventListeners(
+      listeners: {
+        handler: (event: IWidgetEvent) => void | Promise<void>;
+        type: string;
+      }[],
+    ): void;
+
     /**
-      Refresh all the children of a widget
-      will call `this.render`
+     * Add an event listener
+     */
+    addEventListener(
+      type: string,
+      handler: (event: IWidgetEvent) => void | Promise<void>,
+    ): void;
+
+    /**
+     * Dispatch an event to a widget. If the widget doesn't handle the event then it is also dispatched to the parent widget
+     * Events added via `addEventListener`, like `tm-notify`, can be invoked by this.
+     */
+    dispatchEvent(typeOrEvent: string | Omit<IWidgetEvent, 'widget'>): void;
 
-      Need to call this after `setVariable`
-    */
-    refreshChildren(changedTiddlers?: IChangedTiddlers): boolean;
     /**
      * Rebuild a previously rendered widget
      */
     refreshSelf(): boolean | void;
+
+    /**
+     * Refresh all the children of a widget, will call `this.render`.
+     * Need to call this after `setVariable`
+     */
+    refreshChildren(changedTiddlers?: IChangedTiddlers): boolean;
+
     /**
      * Find the next sibling in the DOM to this widget. This is done by scanning the widget tree through all next siblings and their descendents that share the same parent DOM node
      * @param startIndex Refer to this widget by its index within its parents children
      */
     findNextSiblingDomNode(startIndex?: number): Node | null;
+
     /**
      * Find the first DOM node generated by a widget or its children
      */
     findFirstDomNode(): Node | null;
-    computeAttributes(): Record<string, IParseTreeAttribute>;
+
     /**
-     * Get parameters that user set in the widget
-     * @param name attribute name, for example, `actions` in the button widget
-     * @param fallbackText default value if the attribute is not set
+     * Remove any DOM nodes created by this widget or its children
+     *
+     * If this widget has directly created DOM nodes, delete them and exit. This assumes that any child widgets are contained within the created DOM nodes, which would normally be the case.
+     * Otherwise, ask the child widgets to delete their DOM nodes
      */
-    getAttribute(name: string, fallbackText?: string): string;
+    removeChildDomNodes(): void;
+
     /**
-     * Get variable in the context of the widget.
-     * Simplified version of getVariableInfo() that just returns the text.
-     * @param name variable name, for example, `currentTiddler` in the widget context
-     * @param options options for getVariableInfo()
+     * Invoke the action associated with this widget
      *
-     * Options include
-        params: array of {name:, value:} for each parameter
-        defaultValue: default value if the variable is not defined
-
-        Returns an object with the following fields:
-
-        params: array of {name:,value:} of parameters passed to wikitext variables
-        text: text of variable, with parameters properly substituted
+     * No every widget has this method, but some do, like `action-xxx` widget, e.g., `action-sendmessage`
+     * @param triggeringWidget
+     * @param event
+     * @returns handled
      */
-    getVariable(name: string, options?: object): string;
+    invokeAction?(
+      triggeringWidget: Widget,
+      event: IWidgetEvent,
+    ): boolean | undefined;
+
     /**
-      Set the value of a context variable
+     * @en
+     * Invoke the action widgets that are descendents of the current widget.
+     *
+     * @param {Widget} triggeringWidget
+     * @param {IWidgetEvent} event
+     * @memberof Widget
+     */
+    invokeActions(triggeringWidget: Widget, event: IWidgetEvent): boolean;
 
-      @param name name of the variable
-      @param value value of the variable
-      @param params array of {name:, default:} for each parameter
-      @param isMacroDefinition true if the variable is set via a \define macro pragma (and hence should have variable substitution performed)
-      */
-    setVariable(
-      name: string,
-      value: string,
-      parameters?: object[],
-      isMacroDefinition?: boolean,
-    ): void;
+    /**
+     * @en
+     * Invoke the action widgets defined in a string
+     *
+     * @param {string} actions
+     * @param {Widget} triggeringWidget
+     * @param {IWidgetEvent} event
+     * @param {Record<string, IWidgetVariable>} variables
+     * @return {*}  {boolean}
+     * @memberof Widget
+     */
+    invokeActionString(
+      actions: string,
+      triggeringWidget: Widget,
+      event: IWidgetEvent,
+      variables: Record<string, IWidgetVariable>,
+    ): boolean;
   }
 
   export interface IFakeDocument {
@@ -311,7 +522,7 @@ declare module 'tiddlywiki' {
   };
 }
 
-export module '$:/core/modules/widgets/widget.js' {
+declare module '$:/core/modules/widgets/widget.js' {
   import { Widget } from 'tiddlywiki';
   export { Widget as widget };
 }

package/src/modules/wiki.d.ts

@@ -6,7 +6,7 @@ declare const getModificationFields: () => {
 declare const getTiddlersWithTag: (tag: string) => string[];
 
 declare module 'tiddlywiki' {
-  class Wiki {
+  export interface Wiki {
     getCreationFields: typeof getCreationFields;
 
     getModificationFields: typeof getModificationFields;

package/src/utils/index.d.ts

@@ -197,13 +197,9 @@ declare module 'tiddlywiki' {
      * $tw.utils.each([1, 2, 3], element => console.log(element));
      * $tw.utils.each({ a: 1, b: 2 }, (value, key) => console.log(key, value));
      */
-    each: <T>(
+    each: <T, K = T extends Array<any> ? number : keyof T>(
       object: T,
-      callback: (
-        element: T[keyof T],
-        index: keyof T,
-        object: T,
-      ) => void | false,
+      callback: (element: T[K], index: K, object: T) => void | false,
     ) => void;
 
     /**
@@ -213,10 +209,10 @@ declare module 'tiddlywiki' {
      * 产生一个 DOM 元素
      *
      * @param {string} tag tag name
-     * @param {IDomMakerOptions} options
+     * @param {IDomMakerOptions} [options]
      * @returns {TWElement}
      */
-    domMaker: (tag: string, options: IDomMakerOptions) => TWElement;
+    domMaker: (tag: string, options?: IDomMakerOptions) => TWElement;
 
     /**
      * @en

package/src/wiki/index.d.ts

@@ -257,6 +257,6 @@ declare module 'tiddlywiki' {
     getShadowSource(title: string): string | null;
     getTiddlerBacklinks(targetTitle: string): string[];
     getTiddlerLinks(title: string): string[];
-    getPluginInfo(title: string): { tiddlers: ITiddlerFields[] };
+    getPluginInfo(title: string): { tiddlers: Record<string, ITiddlerFields> };
   }
 }