@arcteninc/core 0.0.94 → 0.0.96

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcteninc/core",
-  "version": "0.0.94",
+  "version": "0.0.96",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",

package/scripts/cli-extract-types-auto.ts

@@ -87,6 +87,33 @@ async function findToolUsageFiles(projectRoot: string): Promise<string[]> {
   return files;
 }
 
+function unwrapExpression(expr: ts.Expression): ts.Expression {
+  let current: ts.Expression = expr;
+  // Keep unwrapping as long as we're looking at wrappers
+  while (true) {
+    if (ts.isParenthesizedExpression(current)) {
+      current = current.expression;
+      continue;
+    }
+    if (ts.isAsExpression(current)) {
+      current = current.expression;
+      continue;
+    }
+    if (ts.isTypeAssertionExpression(current)) {
+      current = current.expression;
+      continue;
+    }
+    // satisfies expressions exist in TS 4.9+
+    // @ts-ignore - older compiler types may not have this helper
+    if (typeof ts.isSatisfiesExpression === 'function' && ts.isSatisfiesExpression(current)) {
+      current = current.expression;
+      continue;
+    }
+    break;
+  }
+  return current;
+}
+
 /**
  * Extract tool names from an expression (handles arrays, variables, useMemo, etc.)
  */
@@ -100,6 +127,9 @@ function extractToolNamesFromExpression(
   const visited = new Set<ts.Node>();
 
   function extractFromExpr(node: ts.Node): void {
+    if (ts.isExpression(node)) {
+      node = unwrapExpression(node);
+    }
     if (visited.has(node)) return;
     visited.add(node);
 
@@ -217,11 +247,7 @@ function extractToolNamesFromExpression(
       return;
     }
 
-    // Parenthesized: (toolsList)
-    if (ts.isParenthesizedExpression(node)) {
-      extractFromExpr(node.expression);
-      return;
-    }
+    // Parentheses handled via unwrapExpression
   }
 
   extractFromExpr(expr);
@@ -331,7 +357,7 @@ function extractToolNamesFromFile(
         const toolNames = new Set<string>();
 
         if (node.arguments.length > 0) {
-          const arg = node.arguments[0];
+          const arg = unwrapExpression(node.arguments[0]);
           if (ts.isObjectLiteralExpression(arg)) {
             for (const prop of arg.properties) {
               if (ts.isPropertyAssignment(prop)) {
@@ -344,6 +370,18 @@ function extractToolNamesFromFile(
                   );
                   extracted.names.forEach(name => toolNames.add(name));
                 }
+              } else if (ts.isShorthandPropertyAssignment(prop)) {
+                // Handle shorthand: { safeTools } instead of { safeTools: safeTools }
+                const propName = prop.name.getText(sourceFile);
+                if (propName === 'tools' || propName === 'safeTools') {
+                  // For shorthand, the property name IS the identifier
+                  const extracted = extractToolNamesFromExpression(
+                    prop.name,
+                    sourceFile,
+                    variableMap
+                  );
+                  extracted.names.forEach(name => toolNames.add(name));
+                }
               }
             }
           }
@@ -353,7 +391,7 @@ function extractToolNamesFromFile(
           // Collect ordered tool names from tools and safeTools properties
           const allToolOrder: string[] = [];
           if (node.arguments.length > 0) {
-            const arg = node.arguments[0];
+            const arg = unwrapExpression(node.arguments[0]);
             if (ts.isObjectLiteralExpression(arg)) {
               for (const prop of arg.properties) {
                 if (ts.isPropertyAssignment(prop)) {
@@ -366,6 +404,18 @@ function extractToolNamesFromFile(
                     );
                     allToolOrder.push(...extracted.order);
                   }
+                } else if (ts.isShorthandPropertyAssignment(prop)) {
+                  // Handle shorthand: { safeTools } instead of { safeTools: safeTools }
+                  const propName = prop.name.getText(sourceFile);
+                  if (propName === 'tools' || propName === 'safeTools') {
+                    // For shorthand, the property name IS the identifier
+                    const extracted = extractToolNamesFromExpression(
+                      prop.name,
+                      sourceFile,
+                      variableMap
+                    );
+                    allToolOrder.push(...extracted.order);
+                  }
                 }
               }
             }