@moldea.ai/adapter-google-genai 1.0.3 → 1.0.4

package/README.md

@@ -8,7 +8,7 @@ The package implements the official `google-genai` runtime adapter for `@moldea.
 
 ## Supported target
 
-Version `1.0.3` experimentally supports:
+Version `1.0.4` experimentally supports:
 
 - Repository Format version `1`
 - `@moldea.ai/core ^2.0.0`

package/dist/index.js

@@ -187,14 +187,8 @@ var classifyPackageDeclarations = (declarations, supportedRange) => {
 	if (classifications.every((classification) => classification === "unsupported")) return "unsupported";
 	return "ambiguous";
 };
-/**
-* Discovers the nearest package declaration without repository enumeration.
-* @param options The package target, repository callbacks, path, range, and signal.
-* @returns The first observed declaration, invalid manifest, or absence result.
-* @throws If repository reading or the active inspection is aborted.
-*/
-var discoverPackage = async (options) => {
-	const { packageName, reader, signal, sourcePath, supportedRange } = options;
+var readOwningManifest = async (options) => {
+	const { reader, signal, sourcePath } = options;
 	for (const manifestPath of createPackageManifestCandidatePaths(sourcePath)) {
 		signal?.throwIfAborted();
 		const entry = await reader.getEntry(manifestPath);
@@ -222,28 +216,48 @@ var discoverPackage = async (options) => {
 			});
 		}
 		signal?.throwIfAborted();
-		if (!isRecord(parsed)) return Object.freeze({
-			kind: "invalid",
+		return isRecord(parsed) ? Object.freeze({
+			kind: "present",
+			manifest: parsed,
 			path: manifestPath
-		});
-		const declarations = extractPackageDeclarations(parsed, packageName);
-		if (declarations === null) return Object.freeze({
+		}) : Object.freeze({
 			kind: "invalid",
 			path: manifestPath
 		});
-		if (declarations.length === 0) return Object.freeze({ kind: "absent" });
-		return Object.freeze({
-			kind: "observed",
-			observation: Object.freeze({
-				compatibility: classifyPackageDeclarations(declarations, supportedRange),
-				declarations: Object.freeze(declarations),
-				path: manifestPath
-			})
-		});
 	}
 	return Object.freeze({ kind: "absent" });
 };
 /**
+* Discovers the nearest package declaration without repository enumeration.
+* @param options The package target, repository callbacks, path, range, and signal.
+* @returns The first observed declaration, invalid manifest, or absence result.
+* @throws If repository reading or the active inspection is aborted.
+*/
+var discoverPackage = async (options) => {
+	const { includeManifestPackageName, packageName, reader, signal, sourcePath, supportedRange } = options;
+	const owningManifest = await readOwningManifest({
+		reader,
+		...signal === void 0 ? {} : { signal },
+		sourcePath
+	});
+	if (owningManifest.kind !== "present") return owningManifest;
+	const declarations = extractPackageDeclarations(owningManifest.manifest, packageName);
+	if (declarations === null) return Object.freeze({
+		kind: "invalid",
+		path: owningManifest.path
+	});
+	if (declarations.length === 0) return Object.freeze({ kind: "absent" });
+	return Object.freeze({
+		kind: "observed",
+		observation: Object.freeze({
+			compatibility: classifyPackageDeclarations(declarations, supportedRange),
+			declarations: Object.freeze(declarations),
+			...includeManifestPackageName === true ? { manifestPackageName: typeof owningManifest.manifest["name"] === "string" ? owningManifest.manifest["name"] : null } : {},
+			path: owningManifest.path
+		})
+	});
+};
+/**
 * Removes the transparent expression wrappers supported by runtime adapters.
 * @param expression The expression to normalize.
 * @returns The underlying expression used by static matching.
@@ -648,42 +662,42 @@ var analyzeObjectRelationships = (object, relationshipNames) => {
 	});
 };
 var isNestedLexicalBoundary = (node) => ts.isFunctionLike(node) || ts.isClassLike(node) || ts.isClassStaticBlockDeclaration(node);
-var skipTransparentParents$1 = (node) => {
+var skipTransparentParents$2 = (node) => {
 	let current = node;
 	while (ts.isAsExpression(current.parent) || ts.isParenthesizedExpression(current.parent) || ts.isSatisfiesExpression(current.parent)) current = current.parent;
 	return current;
 };
-var isAssignmentOperator$1 = (kind) => kind >= ts.SyntaxKind.FirstAssignment && kind <= ts.SyntaxKind.LastAssignment;
+var isAssignmentOperator$2 = (kind) => kind >= ts.SyntaxKind.FirstAssignment && kind <= ts.SyntaxKind.LastAssignment;
 var isResourceAccessCreateTarget = (expression, analysis, config) => {
-	const parent = skipTransparentParents$1(expression).parent;
+	const parent = skipTransparentParents$2(expression).parent;
 	if (!ts.isPropertyAccessExpression(parent) && !ts.isElementAccessExpression(parent)) return false;
 	const access = getAccessSegment(parent);
 	return access !== null && unwrapExpression(access.target) === unwrapExpression(expression) && classifyCreateAccess(parent, analysis, config) !== null;
 };
 var isKnownClientResourceTarget = (identifier, analysis, config) => {
-	const candidate = skipTransparentParents$1(identifier);
+	const candidate = skipTransparentParents$2(identifier);
 	const parent = candidate.parent;
 	return (ts.isPropertyAccessExpression(parent) || ts.isElementAccessExpression(parent)) && parent.expression === candidate && classifyKnownClientResourceAccess(parent, analysis, config) !== null;
 };
 var getClientValueExpression = (identifier) => {
-	let current = skipTransparentParents$1(identifier);
+	let current = skipTransparentParents$2(identifier);
 	while (true) {
 		const parent = current.parent;
 		const isFlowingConditionalBranch = ts.isConditionalExpression(parent) && parent.condition !== current;
 		const isFlowingBinaryBranch = ts.isBinaryExpression(parent) && (parent.operatorToken.kind === ts.SyntaxKind.AmpersandAmpersandToken || parent.operatorToken.kind === ts.SyntaxKind.BarBarToken || parent.operatorToken.kind === ts.SyntaxKind.QuestionQuestionToken || parent.operatorToken.kind === ts.SyntaxKind.CommaToken && parent.right === current);
 		const isFlowingWrapper = (ts.isAwaitExpression(parent) || ts.isNonNullExpression(parent)) && parent.expression === current;
 		if (!isFlowingConditionalBranch && !isFlowingBinaryBranch && !isFlowingWrapper) return current;
-		current = skipTransparentParents$1(parent);
+		current = skipTransparentParents$2(parent);
 	}
 };
 var isClientEscape = (identifier) => {
 	const expression = getClientValueExpression(identifier);
 	const parent = expression.parent;
-	if (ts.isVariableDeclaration(parent) && parent.initializer !== void 0 && skipTransparentParents$1(parent.initializer) === expression) return true;
+	if (ts.isVariableDeclaration(parent) && parent.initializer !== void 0 && skipTransparentParents$2(parent.initializer) === expression) return true;
 	if (ts.isReturnStatement(parent) || ts.isYieldExpression(parent) || ts.isArrowFunction(parent) && parent.body === expression || ts.isSpreadElement(parent) || ts.isSpreadAssignment(parent) || ts.isShorthandPropertyAssignment(parent) || ts.isArrayLiteralExpression(parent) || ts.isExportAssignment(parent)) return true;
-	if (ts.isPropertyAssignment(parent)) return skipTransparentParents$1(parent.initializer) === expression;
-	if ((ts.isCallExpression(parent) || ts.isNewExpression(parent)) && parent.arguments?.some((argument) => skipTransparentParents$1(argument) === expression) === true) return true;
-	return ts.isBinaryExpression(parent) && isAssignmentOperator$1(parent.operatorToken.kind);
+	if (ts.isPropertyAssignment(parent)) return skipTransparentParents$2(parent.initializer) === expression;
+	if ((ts.isCallExpression(parent) || ts.isNewExpression(parent)) && parent.arguments?.some((argument) => skipTransparentParents$2(argument) === expression) === true) return true;
+	return ts.isBinaryExpression(parent) && isAssignmentOperator$2(parent.operatorToken.kind);
 };
 /**
 * Finds direct provider requests owned by one runtime-agent body.
@@ -752,24 +766,24 @@ var SAFE_ARRAY_METHODS = /* @__PURE__ */ new Set([
 ]);
 var isDirectToolRequestPropertyUse = (identifier, analysis, config) => {
 	if (config.toolRelationshipName === void 0) return false;
-	const expression = skipTransparentParents$1(identifier);
+	const expression = skipTransparentParents$2(identifier);
 	const property = expression.parent;
-	if (!(ts.isShorthandPropertyAssignment(property) && property.name.text === config.toolRelationshipName || ts.isPropertyAssignment(property) && (ts.isIdentifier(property.name) && property.name.text === config.toolRelationshipName || ts.isStringLiteral(property.name) && property.name.text === config.toolRelationshipName) && skipTransparentParents$1(property.initializer) === expression) || !ts.isObjectLiteralExpression(property.parent)) return false;
-	const request = skipTransparentParents$1(property.parent);
+	if (!(ts.isShorthandPropertyAssignment(property) && property.name.text === config.toolRelationshipName || ts.isPropertyAssignment(property) && (ts.isIdentifier(property.name) && property.name.text === config.toolRelationshipName || ts.isStringLiteral(property.name) && property.name.text === config.toolRelationshipName) && skipTransparentParents$2(property.initializer) === expression) || !ts.isObjectLiteralExpression(property.parent)) return false;
+	const request = skipTransparentParents$2(property.parent);
 	const call = request.parent;
-	if (!ts.isCallExpression(call) || !config.acceptedArgumentCounts.includes(call.arguments.length) || skipTransparentParents$1(call.arguments[0]) !== request) return false;
+	if (!ts.isCallExpression(call) || !config.acceptedArgumentCounts.includes(call.arguments.length) || skipTransparentParents$2(call.arguments[0]) !== request) return false;
 	return classifyCreateAccess(call.expression, analysis, config) === "direct";
 };
 var isArrayMemberAssignmentTarget = (member) => {
-	let current = skipTransparentParents$1(member);
+	let current = skipTransparentParents$2(member);
 	while (true) {
 		const parent = current.parent;
-		if (ts.isBinaryExpression(parent) && isAssignmentOperator$1(parent.operatorToken.kind)) return parent.left === current;
+		if (ts.isBinaryExpression(parent) && isAssignmentOperator$2(parent.operatorToken.kind)) return parent.left === current;
 		if ((ts.isPrefixUnaryExpression(parent) || ts.isPostfixUnaryExpression(parent)) && parent.operand === current && (parent.operator === ts.SyntaxKind.PlusPlusToken || parent.operator === ts.SyntaxKind.MinusMinusToken)) return true;
 		if (ts.isDeleteExpression(parent) && parent.expression === current) return true;
 		if ((ts.isForInStatement(parent) || ts.isForOfStatement(parent)) && parent.initializer === current) return true;
 		if (ts.isPropertyAssignment(parent) || ts.isSpreadAssignment(parent) || ts.isSpreadElement(parent) || ts.isArrayLiteralExpression(parent) || ts.isObjectLiteralExpression(parent)) {
-			current = skipTransparentParents$1(parent);
+			current = skipTransparentParents$2(parent);
 			continue;
 		}
 		return false;
@@ -777,7 +791,7 @@ var isArrayMemberAssignmentTarget = (member) => {
 };
 var isDisallowedArrayMemberUse = (member) => {
 	if (isArrayMemberAssignmentTarget(member)) return true;
-	const candidate = skipTransparentParents$1(member);
+	const candidate = skipTransparentParents$2(member);
 	const parent = candidate.parent;
 	if (!ts.isCallExpression(parent) || parent.expression !== candidate) return false;
 	if (ts.isPropertyAccessExpression(member)) return !SAFE_ARRAY_METHODS.has(member.name.text);
@@ -787,7 +801,7 @@ var isDisallowedArrayMemberUse = (member) => {
 };
 var isDisallowedArrayUse = (identifier, analysis, config) => {
 	if (isDirectToolRequestPropertyUse(identifier, analysis, config)) return false;
-	const expression = skipTransparentParents$1(identifier);
+	const expression = skipTransparentParents$2(identifier);
 	const parent = expression.parent;
 	if (ts.isPropertyAccessExpression(parent) && parent.expression === expression) return isDisallowedArrayMemberUse(parent);
 	if (ts.isElementAccessExpression(parent) && parent.expression === expression) return isDisallowedArrayMemberUse(parent);
@@ -880,39 +894,39 @@ var READONLY_ARRAY_METHODS = /* @__PURE__ */ new Set([
 	"values",
 	"with"
 ]);
-var skipTransparentParents = (node) => {
+var skipTransparentParents$1 = (node) => {
 	let current = node;
 	while (ts.isAsExpression(current.parent) || ts.isParenthesizedExpression(current.parent) || ts.isSatisfiesExpression(current.parent)) current = current.parent;
 	return current;
 };
-var isAssignmentOperator = (kind) => kind >= ts.SyntaxKind.FirstAssignment && kind <= ts.SyntaxKind.LastAssignment;
+var isAssignmentOperator$1 = (kind) => kind >= ts.SyntaxKind.FirstAssignment && kind <= ts.SyntaxKind.LastAssignment;
 var isAssignmentTarget = (expression) => {
-	let current = skipTransparentParents(expression);
+	let current = skipTransparentParents$1(expression);
 	while (true) {
 		const parent = current.parent;
-		if (ts.isBinaryExpression(parent) && isAssignmentOperator(parent.operatorToken.kind)) return parent.left === current;
+		if (ts.isBinaryExpression(parent) && isAssignmentOperator$1(parent.operatorToken.kind)) return parent.left === current;
 		if ((ts.isPrefixUnaryExpression(parent) || ts.isPostfixUnaryExpression(parent)) && parent.operand === current && (parent.operator === ts.SyntaxKind.PlusPlusToken || parent.operator === ts.SyntaxKind.MinusMinusToken)) return true;
 		if (ts.isDeleteExpression(parent) && parent.expression === current) return true;
 		if ((ts.isForInStatement(parent) || ts.isForOfStatement(parent)) && parent.initializer === current) return true;
 		if (ts.isPropertyAccessExpression(parent) || ts.isElementAccessExpression(parent) || ts.isPropertyAssignment(parent) || ts.isSpreadAssignment(parent) || ts.isSpreadElement(parent) || ts.isArrayLiteralExpression(parent) || ts.isObjectLiteralExpression(parent)) {
-			current = skipTransparentParents(parent);
+			current = skipTransparentParents$1(parent);
 			continue;
 		}
 		return false;
 	}
 };
-var getStaticMemberName = (member) => {
+var getStaticMemberName$1 = (member) => {
 	if (ts.isPropertyAccessExpression(member)) return member.name.text;
 	const argument = member.argumentExpression;
 	return argument !== void 0 && (ts.isStringLiteral(argument) || ts.isNoSubstitutionTemplateLiteral(argument)) ? argument.text : null;
 };
 var isSafeArrayMemberUse = (member) => {
 	if (isAssignmentTarget(member)) return false;
-	const candidate = skipTransparentParents(member);
+	const candidate = skipTransparentParents$1(member);
 	const parent = candidate.parent;
 	if (!ts.isCallExpression(parent) || parent.expression !== candidate) return ts.isPropertyAccessExpression(member) && member.name.text === "length";
-	const memberName = getStaticMemberName(member);
-	const call = skipTransparentParents(parent);
+	const memberName = getStaticMemberName$1(member);
+	const call = skipTransparentParents$1(parent);
 	return memberName !== null && READONLY_ARRAY_METHODS.has(memberName) && ts.isExpressionStatement(call.parent);
 };
 var isIgnoredIdentifierPosition = (identifier, declarationName) => identifier === declarationName || ts.isImportSpecifier(identifier.parent) || ts.isPropertyAssignment(identifier.parent) && identifier.parent.name === identifier || ts.isPropertyAccessExpression(identifier.parent) && identifier.parent.name === identifier;
@@ -930,7 +944,7 @@ var isModuleValueBindingSafe = (analysis, bindingName, declarationName, allowedR
 	for (const identifier of identifierUses) {
 		if (isIgnoredIdentifierPosition(identifier, declarationName) || !isModuleBindingVisible(identifier, analysis)) continue;
 		if (allowedReferences.has(identifier)) continue;
-		const expression = skipTransparentParents(identifier);
+		const expression = skipTransparentParents$1(identifier);
 		const parent = expression.parent;
 		const member = (ts.isPropertyAccessExpression(parent) || ts.isElementAccessExpression(parent)) && parent.expression === expression ? parent : null;
 		if (kind !== "array" || member === null || !isSafeArrayMemberUse(member)) return false;
@@ -961,6 +975,17 @@ function getSafeModuleConstLiteral(expression, analysis, allowedReferences, kind
 		expression: initializer
 	});
 }
+var TYPESCRIPT_DECLARATION_EXTENSIONS = [
+	".d.ts",
+	".d.tsx",
+	".d.mts",
+	".d.cts"
+];
+var TYPESCRIPT_SOURCE_EXTENSIONS = [
+	".ts",
+	".tsx",
+	".mts"
+];
 var getScriptKind = (path) => path.endsWith(".tsx") ? ts.ScriptKind.TSX : ts.ScriptKind.TS;
 var createSyntaxProgram = (sourceFile, text) => {
 	return ts.createProgram({
@@ -987,15 +1012,15 @@ var createSyntaxProgram = (sourceFile, text) => {
 	});
 };
 /**
-* Parses and indexes one TypeScript source without execution, emit, or typechecking.
+* Parses and indexes one TypeScript module without provider request assumptions.
 * @param path The normalized logical source path.
 * @param bytes The exact source bytes returned by the adapter reader.
-* @param config The provider import and request analysis contract.
+* @param importConfig The provider constructor-import contract.
 * @param signal The active inspection signal.
 * @returns A source analysis or stable invalid-text or invalid-syntax result.
 * @throws If source analysis is aborted.
 */
-var analyzeSource = (path, bytes, config, signal) => {
+var analyzeTypeScriptModule = (path, bytes, importConfig, signal) => {
 	signal?.throwIfAborted();
 	const text = normalizeText(bytes);
 	if (!text.valid) return Object.freeze({ kind: "invalid-text" });
@@ -1010,7 +1035,7 @@ var analyzeSource = (path, bytes, config, signal) => {
 			range: start === void 0 ? null : text.locator.locateRange(start, start + (syntaxDiagnostic.length ?? 0))
 		});
 	}
-	const { constructorNames, namedImports } = indexImports(sourceFile, config.importConfig);
+	const { constructorNames, namedImports } = indexImports(sourceFile, importConfig);
 	signal?.throwIfAborted();
 	const { clientNames, exports, moduleArrays, moduleConstDeclarations } = indexModuleDeclarations(sourceFile, constructorNames);
 	signal?.throwIfAborted();
@@ -1018,7 +1043,7 @@ var analyzeSource = (path, bytes, config, signal) => {
 	signal?.throwIfAborted();
 	const localBindingNames = indexLocalBindingNames(sourceFile);
 	signal?.throwIfAborted();
-	const preliminaryAnalysis = Object.freeze({
+	const analysis = Object.freeze({
 		clientNames,
 		constructorNames,
 		exports,
@@ -1032,9 +1057,27 @@ var analyzeSource = (path, bytes, config, signal) => {
 		sourceFile,
 		text
 	});
+	signal?.throwIfAborted();
+	return Object.freeze({
+		analysis,
+		kind: "valid"
+	});
+};
+/**
+* Parses one TypeScript source and indexes provider request-specific array safety.
+* @param path The normalized logical source path.
+* @param bytes The exact source bytes returned by the adapter reader.
+* @param config The provider import and request analysis contract.
+* @param signal The active inspection signal.
+* @returns A source analysis or stable invalid-text or invalid-syntax result.
+* @throws If source analysis is aborted.
+*/
+var analyzeSource = (path, bytes, config, signal) => {
+	const moduleResult = analyzeTypeScriptModule(path, bytes, config.importConfig, signal);
+	if (moduleResult.kind !== "valid") return moduleResult;
 	const analysis = Object.freeze({
-		...preliminaryAnalysis,
-		safeModuleArrayNames: indexSafeModuleArrayNames(preliminaryAnalysis, config.requestConfig)
+		...moduleResult.analysis,
+		safeModuleArrayNames: indexSafeModuleArrayNames(moduleResult.analysis, config.requestConfig)
 	});
 	signal?.throwIfAborted();
 	return Object.freeze({
@@ -1047,11 +1090,7 @@ var analyzeSource = (path, bytes, config, signal) => {
 * @param path The bound source path.
 * @returns Whether its extension is supported.
 */
-var isSupportedTypeScriptSourcePath = (path) => [
-	".ts",
-	".tsx",
-	".mts"
-].some((extension) => path.endsWith(extension));
+var isSupportedTypeScriptSourcePath = (path) => !TYPESCRIPT_DECLARATION_EXTENSIONS.some((extension) => path.endsWith(extension)) && TYPESCRIPT_SOURCE_EXTENSIONS.some((extension) => path.endsWith(extension));
 /**
 * Classifies a direct exported runtime-agent function and exposes its body.
 * @param analysis The indexed runtime source.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moldea.ai/adapter-google-genai",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "Deterministic runtime evidence and diagnostics for direct Google Gen AI SDK integrations.",
   "homepage": "https://github.com/moldea-ai/packages/tree/main/projects/adapter-google-genai#readme",
   "bugs": {