@lark-apaas/fullstack-cli 1.1.63-beta.0 → 1.1.64-alpha.20260901040718

package/dist/index.js

@@ -1195,19 +1195,80 @@ function extractTypeAnnotation(comment) {
   const typeStart = comment.indexOf("@type");
   if (typeStart === -1) return null;
   const afterType = comment.slice(typeStart + 5).trimStart();
-  if (!afterType.startsWith("{")) return null;
+  if (!afterType) return null;
+  if (afterType.startsWith("{")) {
+    const braceEnd = matchBalanced(afterType, 0, "{", "}");
+    if (braceEnd === -1) return null;
+    return afterType.slice(0, consumeArraySuffixes(afterType, braceEnd)).trimEnd();
+  }
+  const parsedEnd = parseTypeExpression(afterType);
+  if (parsedEnd === -1) return null;
+  const rest = afterType.slice(parsedEnd).replace(/^\s+/, "");
+  if (rest && !rest.startsWith("@") && continuesTypeExpression(rest)) return null;
+  return afterType.slice(0, parsedEnd).trimEnd();
+}
+function matchBalanced(source, start, open, close) {
   let depth = 0;
-  let endIndex = 0;
-  for (let i = 0; i < afterType.length; i++) {
-    if (afterType[i] === "{") depth++;
-    if (afterType[i] === "}") depth--;
-    if (depth === 0) {
-      endIndex = i + 1;
-      break;
+  for (let i = start; i < source.length; i++) {
+    const quoted = skipStringLiteral(source, i);
+    if (quoted !== -1) {
+      i = quoted - 1;
+      continue;
+    }
+    if (source[i] === open) depth++;
+    else if (source[i] === close) {
+      depth--;
+      if (depth === 0) return i + 1;
+    }
+  }
+  return -1;
+}
+function skipStringLiteral(source, i) {
+  const quote = source[i];
+  if (quote !== "'" && quote !== '"' && quote !== "`") return -1;
+  for (let j = i + 1; j < source.length; j++) {
+    if (source[j] === "\\") {
+      j++;
+      continue;
     }
+    if (source[j] === quote) return j + 1;
   }
-  if (endIndex === 0) return null;
-  return afterType.slice(0, endIndex);
+  return -1;
+}
+function consumeArraySuffixes(source, end) {
+  let i = end;
+  for (; ; ) {
+    const suffix = /^\s*\[\s*\]/.exec(source.slice(i));
+    if (!suffix) return i;
+    i += suffix[0].length;
+  }
+}
+function parseTypeExpression(source) {
+  let i = parseTypeAtom(source, 0);
+  if (i === -1) return -1;
+  for (; ; ) {
+    const union = /^\s*\|\s*/.exec(source.slice(i));
+    if (!union) return i;
+    const next = parseTypeAtom(source, i + union[0].length);
+    if (next === -1) return i;
+    i = next;
+  }
+}
+function parseTypeAtom(source, start) {
+  const quoted = skipStringLiteral(source, start);
+  if (quoted !== -1) return consumeArraySuffixes(source, quoted);
+  const identifier = /^[A-Za-z_$][\w$]*(?:\.[A-Za-z_$][\w$]*)*/.exec(source.slice(start));
+  if (!identifier) return -1;
+  let i = start + identifier[0].length;
+  if (source[i] === "<") {
+    const generic = matchBalanced(source, i, "<", ">");
+    if (generic === -1) return i;
+    i = generic;
+  }
+  return consumeArraySuffixes(source, i);
+}
+function continuesTypeExpression(rest) {
+  return /^(?:[|&<>[\].,()?:=]|extends\b|keyof\b|typeof\b|infer\b)/.test(rest);
 }
 function parseColumnComment(comment) {
   const typeValue = extractTypeAnnotation(comment);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/fullstack-cli",
-  "version": "1.1.63-beta.0",
+  "version": "1.1.64-alpha.20260901040718",
   "description": "CLI tool for fullstack template management",
   "type": "module",
   "main": "dist/index.js",