@esydoc/doclet-parser - npm Package Compare versions

Comparing version 2.0.7 to 2.0.8-beta.0

dist/index.js

@@ -12,3 +12,3 @@ /*!
 
-/******************************************************************************
+/*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
@@ -120,3 +120,3 @@
 
-var resolveTag$1 = function (tagNames) {
+var resolveTag = function (tagNames) {
     var tagName;
@@ -137,15 +137,30 @@ if (Array.isArray(tagNames) && tagNames.length > 1) {
 };
-var DATA_NODE_ID_PREFIX$1 = '_data_node_';
-var createSimpleRawDataTreeNode$1 = function (tagName) {
+var DATA_NODE_ID_PREFIX = '_data_node_';
+var createSimpleRawDataTreeNode = function (tagName) {
+    var valueType = calcTagName(tagName);
     return {
         name: tagName,
         type: {
-            names: [tagName] // xxx maybe is SSS<XXX> or string
+            names: [valueType] // xxx maybe is SSS<XXX> or string
         }
     };
 };
-var POLYTYPE$1 = '__polytype__';
-var createNode$1 = function (name, type, parent, properties, description, summary, optional, defaultValue) {
-    var resolvedTag = resolveTag$1(type.names);
-    var id = genUniId(DATA_NODE_ID_PREFIX$1);
+function calcTagName(v) {
+    var n = Number(v);
+    if (isNaN(n)) {
+        if (v[0] === '"' || v[0] === "'") {
+            return 'string';
+        }
+        else {
+            return v;
+        }
+    }
+    else {
+        return 'number';
+    }
+}
+var POLYTYPE = '__polytype__';
+var createNode = function (name, type, parent, properties, description, summary, optional, defaultValue) {
+    var resolvedTag = resolveTag(type.names);
+    var id = genUniId(DATA_NODE_ID_PREFIX);
     var tagName = resolvedTag.tagName;
@@ -161,4 +176,4 @@ var rawTagName = undefined;
                 .split('|')
-                .map(function (v) { return createSimpleRawDataTreeNode$1(v); });
-            tagName = POLYTYPE$1;
+                .map(function (v) { return createSimpleRawDataTreeNode(v); });
+            tagName = POLYTYPE;
         }
@@ -185,3 +200,3 @@ return {
         type: tagName,
-        properties: [createSimpleRawDataTreeNode$1(subTagName)],
+        properties: [createSimpleRawDataTreeNode(subTagName)],
         description: description,
@@ -193,4 +208,4 @@ summary: summary,
 };
-var beMergedNode$1 = null;
-function mergeNode$1(mainNode, extraNode) {
+var beMergedNode = null;
+function mergeNode(mainNode, extraNode) {
     mainNode.properties = extraNode.properties;
@@ -206,9 +221,9 @@ mainNode.description = mainNode.description || extraNode.description;
 }
-var transform$1 = function (rawNode, dataMap, parent, fromDataMap) {
-    var node = createNode$1(rawNode.name, rawNode.type, parent, rawNode.properties || rawNode.params, // 统一抽象为一个properties
+var transform = function (rawNode, dataMap, parent, fromDataMap) {
+    var node = createNode(rawNode.name, rawNode.type, parent, rawNode.properties || rawNode.params, // 统一抽象为一个properties
     rawNode.description, rawNode.summary, rawNode.optional, rawNode.defaultvalue);
     // should be hooks
     // node = decorateNode(node)
-    if (fromDataMap && beMergedNode$1 !== null) {
-        node = mergeNode$1(beMergedNode$1, node); // 将离散在外部的node的属性转移到原来的树节点
+    if (fromDataMap && beMergedNode !== null) {
+        node = mergeNode(beMergedNode, node); // 将离散在外部的node的属性转移到原来的树节点
     }
@@ -222,7 +237,7 @@ var type = node.type;
         case 'function': // @callback type is function， it has properties of params
-        case POLYTYPE$1:
+        case POLYTYPE:
             if (node.properties) {
                 // @ts-expect-error
                 node.properties = node.properties.map(function (child) {
-                    return transform$1(child, dataMap, node);
+                    return transform(child, dataMap, node);
                 });
@@ -246,4 +261,4 @@ }
                 if (subRawTree) {
-                    beMergedNode$1 = node;
-                    transform$1(subRawTree, dataMap, node, true);
+                    beMergedNode = node;
+                    transform(subRawTree, dataMap, node, true);
                 }
@@ -268,3 +283,3 @@ else {
 function transofrmDocletRoot(rawDataRoot, dataMap) {
-    return transform$1(rawDataRoot, dataMap, null);
+    return transform(rawDataRoot, dataMap, null);
 }
@@ -347,3 +362,3 @@ function createDocletRootMark(content, key, nodeType) {
 
-var resolveTag = function (tagNames) {
+var resolveTag$1 = function (tagNames) {
     var tagName;
@@ -369,15 +384,30 @@ if (Array.isArray(tagNames) && tagNames.length > 1) {
 };
-var DATA_NODE_ID_PREFIX = '_data_node_';
-var createSimpleRawDataTreeNode = function (tagName) {
+var DATA_NODE_ID_PREFIX$1 = '_data_node_';
+var createSimpleRawDataTreeNode$1 = function (tagName) {
+    var valueType = calcTagName$1(tagName);
     return {
         name: tagName,
         type: {
-            names: [tagName] // xxx maybe is SSS<XXX> or string
+            names: [valueType] // xxx maybe is SSS<XXX> or string
         }
     };
 };
-var POLYTYPE = '__polytype__';
-var createNode = function (name, type, parent, properties, description, summary, optional, defaultValue) {
-    var resolvedTag = resolveTag(type.names);
-    var id = genUniId(DATA_NODE_ID_PREFIX);
+function calcTagName$1(v) {
+    var n = Number(v);
+    if (isNaN(n)) {
+        if (v[0] === '"' || v[0] === "'") {
+            return 'string';
+        }
+        else {
+            return v;
+        }
+    }
+    else {
+        return 'number';
+    }
+}
+var POLYTYPE$1 = '__polytype__';
+var createNode$1 = function (name, type, parent, properties, description, summary, optional, defaultValue) {
+    var resolvedTag = resolveTag$1(type.names);
+    var id = genUniId(DATA_NODE_ID_PREFIX$1);
     var tagName = resolvedTag.tagName;
@@ -393,4 +423,4 @@ var rawTagName = undefined;
                 .split('|')
-                .map(function (v) { return createSimpleRawDataTreeNode(v); });
-            tagName = POLYTYPE;
+                .map(function (v) { return createSimpleRawDataTreeNode$1(v); });
+            tagName = POLYTYPE$1;
         }
@@ -417,3 +447,3 @@ return {
         type: tagName,
-        properties: [createSimpleRawDataTreeNode(subTagName)],
+        properties: [createSimpleRawDataTreeNode$1(subTagName)],
         description: description,
@@ -425,4 +455,4 @@ summary: summary,
 };
-var beMergedNode = null;
-function mergeNode(mainNode, extraNode) {
+var beMergedNode$1 = null;
+function mergeNode$1(mainNode, extraNode) {
     mainNode.properties = extraNode.properties;
@@ -438,9 +468,9 @@ mainNode.description = mainNode.description || extraNode.description;
 }
-var transform = function (rawNode, dataMap, parent, fromDataMap) {
-    var node = createNode(rawNode.name, rawNode.type, parent, rawNode.properties || rawNode.params, // 统一抽象为一个properties
+var transform$1 = function (rawNode, dataMap, parent, fromDataMap) {
+    var node = createNode$1(rawNode.name, rawNode.type, parent, rawNode.properties || rawNode.params, // 统一抽象为一个properties
     rawNode.description, rawNode.summary, rawNode.optional, rawNode.defaultvalue);
     // should be hooks
     // node = decorateNode(node)
-    if (fromDataMap && beMergedNode !== null) {
-        node = mergeNode(beMergedNode, node); // 将离散在外部的node的属性转移到原来的树节点
+    if (fromDataMap && beMergedNode$1 !== null) {
+        node = mergeNode$1(beMergedNode$1, node); // 将离散在外部的node的属性转移到原来的树节点
     }
@@ -454,7 +484,7 @@ var type = node.type;
         case 'function': // @callback type is function， it has properties of params
-        case POLYTYPE:
+        case POLYTYPE$1:
             if (node.properties) {
                 // @ts-expect-error
                 node.properties = node.properties.map(function (child) {
-                    return transform(child, dataMap, node);
+                    return transform$1(child, dataMap, node);
                 });
@@ -478,4 +508,4 @@ }
                 if (subRawTree) {
-                    beMergedNode = node;
-                    transform(subRawTree, dataMap, node, true);
+                    beMergedNode$1 = node;
+                    transform$1(subRawTree, dataMap, node, true);
                 }
@@ -623,3 +653,3 @@ else {
         type !== 'enum' &&
-        type !== POLYTYPE &&
+        type !== POLYTYPE$1 &&
         type !== 'promise' &&
@@ -665,9 +695,12 @@ type !== 'function') {
                 break;
-            case POLYTYPE:
+            case POLYTYPE$1:
                 // side effect 对于多个类型，我们选取第一个作为默认值输出
-                node.properties = properties === null || properties === void 0 ? void 0 : properties.slice(0, 1);
-                // 对于多个类型，取值name要继承父级name
-                if (node.properties) {
-                    node.properties[0].name = node.name;
+                var firstChild = node.properties ? node.properties[0] : undefined;
+                if (firstChild != null) {
+                    record(node.name, firstChild.name);
+                    node.properties = undefined;
                 }
+                else {
+                    record(node.name, undefined);
+                }
                 break;
@@ -707,3 +740,3 @@ case 'enum':
 function isDateTreeNode(v) {
-    return share.isObject(v) && v.id != null && String(v.id).startsWith(DATA_NODE_ID_PREFIX);
+    return share.isObject(v) && v.id != null && String(v.id).startsWith(DATA_NODE_ID_PREFIX$1);
 }
@@ -717,3 +750,3 @@ function getFirstChild(node) {
 function isMutiValueNode(nodeType) {
-    return nodeType === POLYTYPE || nodeType === 'enum';
+    return nodeType === POLYTYPE$1 || nodeType === 'enum';
 }
@@ -809,8 +842,8 @@ function unwrap(node) {
 exports.ApiReflectConfig = ApiReflectConfig;
-exports.DATA_NODE_ID_PREFIX = DATA_NODE_ID_PREFIX;
+exports.DATA_NODE_ID_PREFIX = DATA_NODE_ID_PREFIX$1;
 exports.DocletParser = DocletParser;
-exports.POLYTYPE = POLYTYPE;
+exports.POLYTYPE = POLYTYPE$1;
 exports.clean = clean;
 exports.createJudgeNodeFn = createJudgeNodeFn;
-exports["default"] = DocletParser;
+exports.default = DocletParser;
 exports.genUniId = genUniId;
@@ -827,3 +860,3 @@ exports.getDescVal = getDescVal;
 exports.sharedDataScope = sharedDataScope;
-exports.transform = transform;
+exports.transform = transform$1;
 exports.transofrmDataTreeNode2Value = transofrmDataTreeNode2Value;
@@ -830,0 +863,0 @@ exports.traverseNode = traverseNode;

package.json

 {
   "name": "@esydoc/doclet-parser",
-  "version": "2.0.7",
+  "version": "2.0.8-beta.0",
   "description": "The parser for doclet that it resolved by jsdoc",
@@ -28,5 +28,5 @@ "author": "Alex <[e-mail]>",
   "dependencies": {
-    "@esydoc/share": "^2.0.7"
+    "@esydoc/share": "^2.0.8-beta.0"
   },
-  "gitHead": "501ab5881c1d01880e9ca1ce4536040437216ab8"
+  "gitHead": "baf4e0f62b7156dbe54113986e456a23e8baca72"
 }

New alerts

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

40972

increased by1.71%

Lines of code

951

increased by3.59%

Worsened metrics

Number of low quality alerts

2

increased by100%

Dependency changes

• Updated@esydoc/share@^2.0.8-beta.0