hyperapp-is 0.1.12 → 0.1.14

package/README.md

@@ -532,17 +532,15 @@ getEntriesの返す値
 
 ```ts
 export interface JsonEntry <D> {
-	name      : string
-	data      : D
-	isNode    : boolean
-	extension?: Record<string, any>
+	name  : string
+	data  : D
+	isNode: boolean
 }
 ```
 
-- name      : 名前
-- data      : データ
-- isNode    : ディレクトリか
-- extension?: `NavigatorItem.extension` に追加する値
+- name  : 名前
+- data  : データ
+- isNode: ディレクトリか
 
 ---
 
@@ -553,12 +551,14 @@ NavigatorFinder に渡すヘッダーと値
 export interface NavigatorColumn {
 	name    : string
 	val     : (item: NavigatorItem) => any
+	text   ?: (item: NavigatorItem) => string
 	compare?: (a: NavigatorItem, b: NavigatorItem) => number
 }
 ```
 
-- name: 名前
-- val : 値を返す関数
+- name   : 名前
+- val    : 値を返す関数 (VNode等も可)
+- text   : val が string ではない時に設定するテキスト
 - compare: 比較関数
 
 `compare` を設置したカラムだけ、ソート対象となります
@@ -578,6 +578,7 @@ export const convertJsonToNavigatorItem = function <D> (
 		getEntries : (data: D, depth: number) => JsonEntry<D>[]
 		isNode     : boolean
 		depth     ?: number
+		extension ?: (item: NavigatorItem, data: D, depth: number) => Record<string, any> | undefined
 	}
 ): NavigatorItem
 ```
@@ -588,6 +589,7 @@ export const convertJsonToNavigatorItem = function <D> (
 - getEntries: JsonEntry配列を返す関数
 - isNode    : ディレクトリか
 - depth     : 階層の深さ
+- extension : NavigatorItem.extensionに格納する拡張データ
 
 ---
 

package/dist/hyperapp-is/core/navigator.d.ts

@@ -12,7 +12,6 @@ export interface JsonEntry<D> {
     name: string;
     data: D;
     isNode: boolean;
-    extension?: Record<string, any>;
 }
 export interface NavigatorColumn {
     name: string;
@@ -27,6 +26,7 @@ export declare const convertJsonToNavigatorItem: <D>(props: {
     getEntries: (data: D, depth: number) => JsonEntry<D>[];
     isNode: boolean;
     depth?: number;
+    extension?: (item: NavigatorItem, data: D, depth: number) => Record<string, any> | undefined;
 }) => NavigatorItem;
 export declare const getParentItems: (item: NavigatorItem | undefined) => NavigatorItem[];
 /**

package/dist/hyperapp-is/core/navigator.js

@@ -5,24 +5,25 @@ import { el, deleteKeys, SelectButton } from "./component";
 // convertJsonToNavigatorItem
 // ---------- ---------- ---------- ---------- ----------
 export const convertJsonToNavigatorItem = function (props) {
-    const { parent, name, data, getEntries, isNode, depth = 0 } = props;
+    const { parent, name, data, getEntries, isNode, depth = 0, extension } = props;
     const result = {
         parent,
         name,
         path: parent ? parent.path + "/" + name : "/" + name
     };
-    let extension;
-    let properties;
+    if (extension) {
+        const ext = extension(result, data, depth);
+        if (ext)
+            result.extension = ext;
+    }
+    let properties = {};
+    let hasProperties = false;
     const children = [];
     getEntries(data, depth).forEach(entry => {
-        if (entry.extension) {
-            extension !== null && extension !== void 0 ? extension : (extension = {});
-            Object.assign(extension, entry.extension);
-        }
         const isProperty = typeof entry.data !== "object" || Array.isArray(entry.data);
         if (isProperty) {
-            properties !== null && properties !== void 0 ? properties : (properties = {});
             properties[entry.name] = entry.data;
+            hasProperties = true;
         }
         else {
             children.push(convertJsonToNavigatorItem({
@@ -35,9 +36,7 @@ export const convertJsonToNavigatorItem = function (props) {
             }));
         }
     });
-    if (extension)
-        result.extension = extension;
-    if (properties)
+    if (hasProperties)
         result.properties = properties;
     if (isNode)
         result.children = children;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperapp-is",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "UI foundation library for Hyperapp by is4416",
   "license": "MIT",
   "type": "module",