@descryy/adapter-kotlin 0.4.1 → 0.5.1

package/dist/shape-reach.d.ts

@@ -0,0 +1,97 @@
+/**
+ * Which resolution level this repository actually gets Kotlin to.
+ *
+ * **R3 on ORM-mapped shape facts, R2 on everything else** — a per-fact split,
+ * not a ceiling raised across the batch. `adapter-java` and `adapter-csharp`
+ * publish the same split on the same ground, and this file is Java's
+ * `shape-reach.ts` held to the same bar for the same reason.
+ *
+ * ## What is R3 here, and what is not
+ *
+ * R3 is "+ type checker (shapes)", and **no type checker runs here.** DEC-202
+ * is the precedent: *a declared schema is R3-grade because the declaration
+ * states the shape rather than inferring it.* A JPA mapping is exactly that,
+ * and it is the same mapping `adapter-java` already claims R3 on.
+ *
+ * Everything else Kotlin produces stays at R2 and is emitted at R2. Kotlin
+ * writes its package, its imports and its declared types down, so a reference
+ * resolves to a definition with no LSP and no compiler — that is name-and-path
+ * resolution, and no shape is checked by it.
+ *
+ * **Two fact kinds in this package reach 3**, both declared schema in
+ * DEC-202's sense rather than inferred shape: the mapped field shape on a
+ * `MODEL` (`extract.ts`, the only `SHAPE_LEVEL` there), and — since
+ * `DEC-NEXT-dto-shape-evidence-for-api-contracts` — a declaration's wire
+ * shape when it carries real kotlinx.serialization evidence
+ * (`serialization.ts`'s `@Serializable`, provenance-gated on a
+ * `kotlinx.serialization` import). Routes, client calls, Retrofit endpoints,
+ * type references, inheritance and test coverage all push at 2 or below and
+ * are unaffected. If a third fact kind ever earns R3, it is added here in the
+ * same commit that earns it — never inferred from the fact that some
+ * extractor exists.
+ *
+ * ## Why a count of shapes and not a density
+ *
+ * `adapter-python` gates its R3 on measured annotation density, because
+ * Python's R3 comes from annotations spread across ordinary code and "enough
+ * of them" is a real question with a distribution behind it. Kotlin's comes
+ * from a mapping that is either declared or is not, so there is no density to
+ * measure and a threshold would be a number with nothing under it.
+ *
+ * ## What a refusal does to the level
+ *
+ * A refused shape (`jpa.ts`'s four completeness gates) counts for **nothing**
+ * here. An entity whose shape was withheld is an entity this run read no shape
+ * from, so a repository whose every entity is refused publishes R2 — the same
+ * level it would publish with no entity at all, which is the honest answer.
+ *
+ * ## What this does NOT do
+ *
+ * It does not mint `DATABASE_TABLE`/`DATABASE_COLUMN`. The physical column
+ * name is decided by a *configurable* naming strategy (Spring Boot's
+ * camel-to-snake, plain Hibernate's implicit strategy as-written) that no
+ * source file states — `discountCode` in the entity against `discount_code`
+ * in the migration, measured on this corpus. Minting from the class would
+ * mint ids that do not join with `adapter-sql`'s for the same table (DEC-240).
+ * Precision over recall: the shape is claimed, the physical schema is not.
+ */
+import type { ResolutionLevel } from "@descryy/ir";
+import { type JpaModel, type JpaRefusal } from "./jpa.ts";
+import type { KotlinFile } from "./parse.ts";
+/**
+ * The one level `adapter-kotlin` can reach that R2 machinery cannot supply,
+ * and the one place in this package that mints at it.
+ */
+export declare const SHAPE_LEVEL: ResolutionLevel;
+export interface ShapeReach {
+    /** `identityPackage::path` -> the model, handed on so the caller never pays twice. */
+    readonly entities: ReadonlyMap<string, JpaModel>;
+    /** Shapes withheld by a completeness gate, for disclosure. */
+    readonly refusals: readonly (JpaRefusal & {
+        readonly file: string;
+    })[];
+    /**
+     * Entities carrying at least one mapped column whose shape this run actually
+     * decided — the exact condition `extract.ts` uses before writing
+     * `attrs.fields`, so this cannot drift into counting a shape never emitted.
+     */
+    readonly mappedShapes: number;
+    /** True when at least one fact in this repository genuinely rests on R3. */
+    readonly reachesShapes: boolean;
+}
+/**
+ * Read every entity in the batch, resolving supertypes across files.
+ *
+ * Resolution is by the *written* package: a single-type import names the
+ * parent's package outright, and an unqualified name otherwise means this
+ * file's own package. **Two declarations answering to one key make the name
+ * ambiguous, and an ambiguous parent resolves to nothing** — which routes
+ * straight into `jpa.ts`'s E1 refusal rather than picking a winner.
+ */
+export declare function readEntities(units: readonly KotlinFile[]): ShapeReach;
+/**
+ * The level to publish for a run: never above the caller's ceiling, never
+ * above what the repository supplied, and 0 when nothing anchored at all.
+ */
+export declare function reachedFor(ceiling: ResolutionLevel, anchoredAnything: boolean, reach: ShapeReach | undefined): ResolutionLevel;
+//# sourceMappingURL=shape-reach.d.ts.map

package/dist/shape-reach.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"shape-reach.d.ts","sourceRoot":"","sources":["../src/shape-reach.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwDG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAEnD,OAAO,EAAa,KAAK,QAAQ,EAAE,KAAK,UAAU,EAAgB,MAAM,UAAU,CAAC;AACnF,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAG7C;;;GAGG;AACH,eAAO,MAAM,WAAW,EAAE,eAAmB,CAAC;AAE9C,MAAM,WAAW,UAAU;IACzB,sFAAsF;IACtF,QAAQ,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IACjD,8DAA8D;IAC9D,QAAQ,CAAC,QAAQ,EAAE,SAAS,CAAC,UAAU,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,EAAE,CAAC;IACvE;;;;OAIG;IACH,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,4EAA4E;IAC5E,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAC;CACjC;AAID;;;;;;;;GAQG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,SAAS,UAAU,EAAE,GAAG,UAAU,CAgErE;AAED;;;GAGG;AACH,wBAAgB,UAAU,CACxB,OAAO,EAAE,eAAe,EACxB,gBAAgB,EAAE,OAAO,EACzB,KAAK,EAAE,UAAU,GAAG,SAAS,GAC5B,eAAe,CAIjB"}

package/dist/shape-reach.js

@@ -0,0 +1,156 @@
+/**
+ * Which resolution level this repository actually gets Kotlin to.
+ *
+ * **R3 on ORM-mapped shape facts, R2 on everything else** — a per-fact split,
+ * not a ceiling raised across the batch. `adapter-java` and `adapter-csharp`
+ * publish the same split on the same ground, and this file is Java's
+ * `shape-reach.ts` held to the same bar for the same reason.
+ *
+ * ## What is R3 here, and what is not
+ *
+ * R3 is "+ type checker (shapes)", and **no type checker runs here.** DEC-202
+ * is the precedent: *a declared schema is R3-grade because the declaration
+ * states the shape rather than inferring it.* A JPA mapping is exactly that,
+ * and it is the same mapping `adapter-java` already claims R3 on.
+ *
+ * Everything else Kotlin produces stays at R2 and is emitted at R2. Kotlin
+ * writes its package, its imports and its declared types down, so a reference
+ * resolves to a definition with no LSP and no compiler — that is name-and-path
+ * resolution, and no shape is checked by it.
+ *
+ * **Two fact kinds in this package reach 3**, both declared schema in
+ * DEC-202's sense rather than inferred shape: the mapped field shape on a
+ * `MODEL` (`extract.ts`, the only `SHAPE_LEVEL` there), and — since
+ * `DEC-NEXT-dto-shape-evidence-for-api-contracts` — a declaration's wire
+ * shape when it carries real kotlinx.serialization evidence
+ * (`serialization.ts`'s `@Serializable`, provenance-gated on a
+ * `kotlinx.serialization` import). Routes, client calls, Retrofit endpoints,
+ * type references, inheritance and test coverage all push at 2 or below and
+ * are unaffected. If a third fact kind ever earns R3, it is added here in the
+ * same commit that earns it — never inferred from the fact that some
+ * extractor exists.
+ *
+ * ## Why a count of shapes and not a density
+ *
+ * `adapter-python` gates its R3 on measured annotation density, because
+ * Python's R3 comes from annotations spread across ordinary code and "enough
+ * of them" is a real question with a distribution behind it. Kotlin's comes
+ * from a mapping that is either declared or is not, so there is no density to
+ * measure and a threshold would be a number with nothing under it.
+ *
+ * ## What a refusal does to the level
+ *
+ * A refused shape (`jpa.ts`'s four completeness gates) counts for **nothing**
+ * here. An entity whose shape was withheld is an entity this run read no shape
+ * from, so a repository whose every entity is refused publishes R2 — the same
+ * level it would publish with no entity at all, which is the honest answer.
+ *
+ * ## What this does NOT do
+ *
+ * It does not mint `DATABASE_TABLE`/`DATABASE_COLUMN`. The physical column
+ * name is decided by a *configurable* naming strategy (Spring Boot's
+ * camel-to-snake, plain Hibernate's implicit strategy as-written) that no
+ * source file states — `discountCode` in the entity against `discount_code`
+ * in the migration, measured on this corpus. Minting from the class would
+ * mint ids that do not join with `adapter-sql`'s for the same table (DEC-240).
+ * Precision over recall: the shape is claimed, the physical schema is not.
+ */
+import { jpaModels } from "./jpa.js";
+import { hasSerializationEvidence } from "./serialization.js";
+/**
+ * The one level `adapter-kotlin` can reach that R2 machinery cannot supply,
+ * and the one place in this package that mints at it.
+ */
+export const SHAPE_LEVEL = 3;
+const pathKey = (identityPackage, path) => `${identityPackage}::${path.join(".")}`;
+/**
+ * Read every entity in the batch, resolving supertypes across files.
+ *
+ * Resolution is by the *written* package: a single-type import names the
+ * parent's package outright, and an unqualified name otherwise means this
+ * file's own package. **Two declarations answering to one key make the name
+ * ambiguous, and an ambiguous parent resolves to nothing** — which routes
+ * straight into `jpa.ts`'s E1 refusal rather than picking a winner.
+ */
+export function readEntities(units) {
+    const byFqn = new Map();
+    for (const unit of units) {
+        for (const declaration of unit.jpaDeclarations) {
+            const fqn = `${unit.packageName}.${[...declaration.owners, declaration.name].join(".")}`;
+            const bucket = byFqn.get(fqn);
+            if (bucket === undefined)
+                byFqn.set(fqn, [{ unit, declaration }]);
+            else
+                bucket.push({ unit, declaration });
+        }
+    }
+    const entities = new Map();
+    const refusals = [];
+    for (const unit of units) {
+        if (unit.identityPackage === undefined || unit.jpaDeclarations.length === 0)
+            continue;
+        const importedFqn = new Map();
+        for (const each of unit.imports) {
+            if (each.isWildcard)
+                continue;
+            importedFqn.set(each.alias ?? each.path.slice(each.path.lastIndexOf(".") + 1), each.path);
+        }
+        const jpaUnit = { packageName: unit.packageName, jpaDeclarations: unit.jpaDeclarations };
+        const { models, refusals: refused } = jpaModels(jpaUnit, (written, from) => {
+            const fqn = importedFqn.get(written) ?? `${from.packageName}.${written}`;
+            const found = byFqn.get(fqn);
+            // One candidate or none. Two is an ambiguity this adapter cannot settle.
+            if (found === undefined || found.length !== 1)
+                return undefined;
+            const [only] = found;
+            if (only === undefined)
+                return undefined;
+            return {
+                declaration: only.declaration,
+                unit: { packageName: only.unit.packageName, jpaDeclarations: only.unit.jpaDeclarations },
+            };
+        });
+        for (const model of models)
+            entities.set(pathKey(unit.identityPackage, [...model.owners, model.className]), model);
+        for (const refusal of refused)
+            refusals.push({ ...refusal, file: unit.file });
+    }
+    let mappedShapes = 0;
+    for (const model of entities.values())
+        if (model.fields.length > 0)
+            mappedShapes += 1;
+    // The second R3 fact kind (see module header): does at least one
+    // declaration carry real kotlinx.serialization evidence? A `MODEL` is
+    // excluded (`entities.has(key)`) — the same narrower-evidence-wins
+    // tie-break `extract.ts`'s node-kind decision uses, kept here so this
+    // count can never disagree with what `responseShapeEvidence` would emit.
+    let serializationReach = false;
+    for (const unit of units) {
+        if (unit.identityPackage === undefined)
+            continue;
+        for (const decl of unit.decls) {
+            const key = pathKey(unit.identityPackage, [...decl.owners, decl.name]);
+            if (entities.has(key))
+                continue;
+            if (hasSerializationEvidence(unit, decl)) {
+                serializationReach = true;
+                break;
+            }
+        }
+        if (serializationReach)
+            break;
+    }
+    return { entities, refusals, mappedShapes, reachesShapes: mappedShapes > 0 || serializationReach };
+}
+/**
+ * The level to publish for a run: never above the caller's ceiling, never
+ * above what the repository supplied, and 0 when nothing anchored at all.
+ */
+export function reachedFor(ceiling, anchoredAnything, reach) {
+    if (!anchoredAnything)
+        return 0;
+    if (ceiling < SHAPE_LEVEL)
+        return ceiling;
+    return reach?.reachesShapes === true ? ceiling : Math.min(2, ceiling);
+}
+//# sourceMappingURL=shape-reach.js.map

package/dist/shape-reach.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"shape-reach.js","sourceRoot":"","sources":["../src/shape-reach.ts"],"names":[],"mappings":"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"}

package/dist/spring.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"spring.d.ts","sourceRoot":"","sources":["../src/spring.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAkJ/C,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,WAAW,EAAE,CA4DrG"}
+{"version":3,"file":"spring.d.ts","sourceRoot":"","sources":["../src/spring.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;GAwBG;AAEH,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAExD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAkJ/C,qEAAqE;AACrE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,YAAY,EAAE,GAAG,SAAS,WAAW,EAAE,CAmFrG"}

package/dist/spring.js

@@ -160,19 +160,29 @@ export function readSpringRoutes(root, imports) {
     if (!importsSpring(imports))
         return [];
     const routes = [];
-    const walkClasses = (node) => {
+    // `owners` mirrors `parse.ts`'s own `Scope.owners` walk — the same class-name-chain
+    // accumulation `extract.ts` used to key every FUNCTION node in `funcsByKey`, so a handler
+    // found here resolves through the identical key rather than a second naming scheme.
+    const walkClasses = (node, owners) => {
         for (const child of namedChildren(node)) {
             if (child.type !== "class_declaration" && child.type !== "object_declaration") {
                 if (child.namedChildCount > 0)
-                    walkClasses(child);
+                    walkClasses(child, owners);
                 continue;
             }
+            // An unnamed class/object cannot be placed in the owner chain. `parse.ts` refuses the
+            // same way (`if (name === undefined) break`) rather than fabricate a path segment that
+            // would never match a real FUNCTION node's own key.
+            const className = firstOfType(child, "type_identifier")?.text;
+            if (className === undefined)
+                continue;
+            const innerOwners = [...owners, className];
             const classAnnotations = annotationsOf(child);
             const kind = controllerKind(classAnnotations);
             const body = namedChildren(child).find((c) => c.type === "class_body" || c.type === "enum_class_body");
             if (kind === null) {
                 if (body !== undefined)
-                    walkClasses(body);
+                    walkClasses(body, innerOwners);
                 continue;
             }
             const classMapping = mappingOf(classAnnotations);
@@ -195,13 +205,25 @@ export function readSpringRoutes(root, imports) {
                 if (unreadable)
                     continue;
                 const parts = suffixes.length > 0 ? suffixes : [""];
+                // The annotated method IS the handler — no lambda dispatch to resolve, unlike Ktor.
+                // Defensively absent when this reader can't read the function's own name back, which
+                // leaves the route real but its handler edge unestablished rather than guessed.
+                const fnName = firstOfType(fn, "simple_identifier")?.text;
+                const handler = fnName === undefined ? undefined : { owners: innerOwners, name: fnName };
                 for (const prefix of prefixes) {
                     for (const suffix of parts) {
                         const template = join(prefix, suffix);
                         if (!template.startsWith("/"))
                             continue;
                         for (const verb of verbsOf(mapping)) {
-                            routes.push({ method: verb, template, written: `@${mapping.name}`, framework: "spring", line: mapping.line });
+                            routes.push({
+                                method: verb,
+                                template,
+                                written: `@${mapping.name}`,
+                                framework: "spring",
+                                line: mapping.line,
+                                ...(handler === undefined ? {} : { handler }),
+                            });
                         }
                     }
                 }
@@ -210,10 +232,10 @@ export function readSpringRoutes(root, imports) {
             // never nests a controller, but an unrelated nested type in the same
             // file must not be silently skipped.
             if (body !== undefined)
-                walkClasses(body);
+                walkClasses(body, innerOwners);
         }
     };
-    walkClasses(root);
+    walkClasses(root, []);
     return routes;
 }
 //# sourceMappingURL=spring.js.map

package/dist/spring.js.map

@@ -1 +1 @@
-{"version":3,"file":"spring.js","sourceRoot":"","sources":["../src/spring.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"spring.js","sourceRoot":"","sources":["../src/spring.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@descryy/adapter-kotlin",
-  "version": "0.4.1",
+  "version": "0.5.1",
   "type": "module",
   "description": "Kotlin adapter, breadth tier. The tenth language, and the first to share an identity anchor with another language rather than defining its own — it reuses @descryy/adapter-jvm, because Kotlin and Java answer the identity question the same way. Where a file does not sit where its package declaration says, the node is refused rather than anchored on the package alone: Kotlin Multiplatform declares one qualified name in several source sets by design, and a bare-package fallback collapses them onto one id.",
   "license": "UNLICENSED",
@@ -34,11 +34,11 @@
     "build:assets": "node ../../scripts/install-grammar.mjs"
   },
   "dependencies": {
-    "@descryy/adapter-common": "0.3.0",
-    "@descryy/adapter-jvm": "0.1.0",
-    "@descryy/adapter-openapi": "0.4.1",
-    "@descryy/adapter-sql": "0.4.1",
-    "@descryy/adapter-treesitter": "0.2.0",
-    "@descryy/ir": "0.7.0"
+    "@descryy/adapter-common": "0.3.1",
+    "@descryy/adapter-jvm": "0.1.1",
+    "@descryy/adapter-openapi": "0.5.1",
+    "@descryy/adapter-sql": "0.5.1",
+    "@descryy/adapter-treesitter": "0.2.1",
+    "@descryy/ir": "0.10.0"
   }
 }