@tsonic/frontend 0.0.62 → 0.0.63

package/dist/ir/validation/attribute-collection/orchestrator.js

@@ -0,0 +1,332 @@
+/**
+ * Attribute Collection — Module Processing & Entry Point
+ *
+ * Orchestrates the attribute collection pass: walks module statements,
+ * detects attribute markers, attaches IR attributes to declarations,
+ * and removes marker statements.
+ */
+import { createDiagnostic } from "../../../types/diagnostic.js";
+import { createLocation, getAttributesApiLocalNames, getAttributeTargetsApiLocalNames, parseAttrDescriptorCall, } from "./arg-extractor.js";
+import { tryDetectAttributeMarker, looksLikeAttributesApiUsage, } from "./marker-parser.js";
+// ═══════════════════════════════════════════════════════════════════════════
+// MODULE PROCESSING
+// ═══════════════════════════════════════════════════════════════════════════
+/**
+ * Process a single module: detect attribute markers and attach to declarations
+ */
+const processModule = (module, diagnostics) => {
+    const apiNames = getAttributesApiLocalNames(module);
+    const attributeTargetsApiNames = getAttributeTargetsApiLocalNames(module);
+    if (apiNames.size === 0) {
+        return module;
+    }
+    // Collect detected attribute descriptors declared as variables:
+    //   const d = A.attr(AttrCtor, ...args)
+    const descriptors = new Map();
+    const removedStatementIndices = new Set();
+    module.body.forEach((stmt, i) => {
+        if (stmt.kind !== "variableDeclaration")
+            return;
+        const decl = stmt;
+        // Only handle simple, single declarator `const name = A.attr(...)`.
+        if (decl.declarationKind !== "const")
+            return;
+        if (decl.declarations.length !== 1)
+            return;
+        const d0 = decl.declarations[0];
+        if (!d0)
+            return;
+        if (d0.name.kind !== "identifierPattern")
+            return;
+        if (!d0.initializer)
+            return;
+        const parsed = parseAttrDescriptorCall(d0.initializer, module, apiNames);
+        if (parsed.kind === "notMatch")
+            return;
+        if (parsed.kind === "error") {
+            diagnostics.push(parsed.diagnostic);
+            removedStatementIndices.add(i);
+            return;
+        }
+        descriptors.set(d0.name.name, parsed.value);
+        removedStatementIndices.add(i);
+    });
+    // Collect detected attribute markers
+    const markers = [];
+    // Walk statements looking for attribute markers
+    module.body.forEach((stmt, i) => {
+        if (removedStatementIndices.has(i))
+            return;
+        if (stmt.kind !== "expressionStatement")
+            return;
+        const expr = stmt.expression;
+        if (expr.kind !== "call")
+            return;
+        const marker = tryDetectAttributeMarker(expr, module, apiNames, attributeTargetsApiNames, descriptors);
+        if (marker.kind === "ok") {
+            markers.push(marker.value);
+            removedStatementIndices.add(i);
+            return;
+        }
+        if (marker.kind === "error") {
+            diagnostics.push(marker.diagnostic);
+            removedStatementIndices.add(i);
+            return;
+        }
+        // If it looks like an attribute API call but doesn't match a supported marker,
+        // fail deterministically instead of leaving runtime-dead code in the output.
+        if (looksLikeAttributesApiUsage(expr, apiNames)) {
+            diagnostics.push(createDiagnostic("TSN4005", "error", `Invalid attribute marker call. Expected one of: A.on(X).type.add(...), A.on(X).ctor.add(...), A.on(X).method(x => x.m).add(...), A.on(X).prop(x => x.p).add(...), with optional .target(...) before .add(...)`, createLocation(module.filePath, expr.sourceSpan)));
+            removedStatementIndices.add(i);
+        }
+    });
+    // If nothing to do, return module unchanged
+    if (markers.length === 0 && removedStatementIndices.size === 0) {
+        return module;
+    }
+    // Build map of declaration names to their indices
+    const classDeclarations = new Map();
+    const functionDeclarations = new Map();
+    module.body.forEach((stmt, i) => {
+        if (stmt.kind === "classDeclaration") {
+            classDeclarations.set(stmt.name, i);
+        }
+        else if (stmt.kind === "functionDeclaration") {
+            functionDeclarations.set(stmt.name, i);
+        }
+    });
+    // Build map of attributes per declaration
+    const classAttributes = new Map();
+    const classCtorAttributes = new Map();
+    const classMethodAttributes = new Map();
+    const classPropAttributes = new Map();
+    const functionAttributes = new Map();
+    for (const marker of markers) {
+        const classIndex = classDeclarations.get(marker.targetName);
+        const funcIndex = functionDeclarations.get(marker.targetName);
+        const attr = {
+            kind: "attribute",
+            target: marker.attributeTarget,
+            attributeType: marker.attributeType,
+            positionalArgs: marker.positionalArgs,
+            namedArgs: marker.namedArgs,
+        };
+        if (marker.targetSelector === "type") {
+            if (classIndex !== undefined && funcIndex !== undefined) {
+                diagnostics.push(createDiagnostic("TSN4005", "error", `Attribute target '${marker.targetName}' is ambiguous (matches both class and function)`, createLocation(module.filePath, marker.sourceSpan)));
+                continue;
+            }
+            if (classIndex !== undefined) {
+                if (marker.attributeTarget !== undefined &&
+                    marker.attributeTarget !== "type") {
+                    diagnostics.push(createDiagnostic("TSN4005", "error", `Invalid attribute target '${marker.attributeTarget}' for type attribute. Expected 'type' or omit .target(...)`, createLocation(module.filePath, marker.sourceSpan)));
+                    continue;
+                }
+                const attrs = classAttributes.get(classIndex) ?? [];
+                attrs.push(attr);
+                classAttributes.set(classIndex, attrs);
+                continue;
+            }
+            if (funcIndex !== undefined) {
+                if (marker.attributeTarget !== undefined) {
+                    diagnostics.push(createDiagnostic("TSN4005", "error", `.target(...) is not supported for function attributes via A.on(fn).type. Use A.on(Class).method(...) instead.`, createLocation(module.filePath, marker.sourceSpan)));
+                    continue;
+                }
+                const attrs = functionAttributes.get(funcIndex) ?? [];
+                attrs.push(attr);
+                functionAttributes.set(funcIndex, attrs);
+                continue;
+            }
+            diagnostics.push(createDiagnostic("TSN4007", "error", `Attribute target '${marker.targetName}' not found in module`, createLocation(module.filePath, marker.sourceSpan)));
+            continue;
+        }
+        if (classIndex === undefined) {
+            diagnostics.push(createDiagnostic("TSN4007", "error", `Attribute target '${marker.targetName}' not found in module`, createLocation(module.filePath, marker.sourceSpan)));
+            continue;
+        }
+        const classStmt = module.body[classIndex];
+        if (marker.targetSelector === "ctor") {
+            if (marker.attributeTarget !== undefined &&
+                marker.attributeTarget !== "method") {
+                diagnostics.push(createDiagnostic("TSN4005", "error", `Invalid attribute target '${marker.attributeTarget}' for constructor attribute. Expected 'method' or omit .target(...)`, createLocation(module.filePath, marker.sourceSpan)));
+                continue;
+            }
+            const hasCtor = classStmt.members.some((m) => m.kind === "constructorDeclaration");
+            if (classStmt.isStruct && !hasCtor) {
+                diagnostics.push(createDiagnostic("TSN4005", "error", `Cannot apply constructor attributes to struct '${classStmt.name}' without an explicit constructor`, createLocation(module.filePath, marker.sourceSpan)));
+                continue;
+            }
+            const attrs = classCtorAttributes.get(classIndex) ?? [];
+            attrs.push(attr);
+            classCtorAttributes.set(classIndex, attrs);
+            continue;
+        }
+        if (marker.targetSelector === "method") {
+            if (marker.attributeTarget !== undefined &&
+                marker.attributeTarget !== "method" &&
+                marker.attributeTarget !== "return") {
+                diagnostics.push(createDiagnostic("TSN4005", "error", `Invalid attribute target '${marker.attributeTarget}' for method attribute. Expected 'method', 'return', or omit .target(...)`, createLocation(module.filePath, marker.sourceSpan)));
+                continue;
+            }
+            const memberName = marker.selectedMemberName;
+            if (!memberName) {
+                diagnostics.push(createDiagnostic("TSN4005", "error", `Invalid attribute marker: method target missing member name`, createLocation(module.filePath, marker.sourceSpan)));
+                continue;
+            }
+            const hasMember = classStmt.members.some((m) => m.kind === "methodDeclaration" && m.name === memberName);
+            if (!hasMember) {
+                diagnostics.push(createDiagnostic("TSN4007", "error", `Method '${classStmt.name}.${memberName}' not found for attribute target`, createLocation(module.filePath, marker.sourceSpan)));
+                continue;
+            }
+            const perClass = classMethodAttributes.get(classIndex) ?? new Map();
+            const attrs = perClass.get(memberName) ?? [];
+            attrs.push(attr);
+            perClass.set(memberName, attrs);
+            classMethodAttributes.set(classIndex, perClass);
+            continue;
+        }
+        if (marker.targetSelector === "prop") {
+            const memberName = marker.selectedMemberName;
+            if (!memberName) {
+                diagnostics.push(createDiagnostic("TSN4005", "error", `Invalid attribute marker: property target missing member name`, createLocation(module.filePath, marker.sourceSpan)));
+                continue;
+            }
+            const member = classStmt.members.find((m) => m.kind === "propertyDeclaration" && m.name === memberName);
+            if (!member || member.kind !== "propertyDeclaration") {
+                diagnostics.push(createDiagnostic("TSN4007", "error", `Property '${classStmt.name}.${memberName}' not found for attribute target`, createLocation(module.filePath, marker.sourceSpan)));
+                continue;
+            }
+            if (marker.attributeTarget !== undefined) {
+                if (member.emitAsField) {
+                    if (marker.attributeTarget !== "field") {
+                        diagnostics.push(createDiagnostic("TSN4005", "error", `Invalid attribute target '${marker.attributeTarget}' for field-emitted property '${classStmt.name}.${memberName}'. Expected 'field' or omit .target(...)`, createLocation(module.filePath, marker.sourceSpan)));
+                        continue;
+                    }
+                }
+                else if (marker.attributeTarget !== "property" &&
+                    marker.attributeTarget !== "field") {
+                    diagnostics.push(createDiagnostic("TSN4005", "error", `Invalid attribute target '${marker.attributeTarget}' for property attribute. Expected 'property', 'field', or omit .target(...)`, createLocation(module.filePath, marker.sourceSpan)));
+                    continue;
+                }
+                if (marker.attributeTarget === "field") {
+                    const isAccessorProperty = member.getterBody !== undefined || member.setterBody !== undefined;
+                    if (isAccessorProperty) {
+                        diagnostics.push(createDiagnostic("TSN4005", "error", `Cannot apply [field: ...] attribute target to accessor property '${classStmt.name}.${memberName}'. Apply the attribute to the actual field instead.`, createLocation(module.filePath, marker.sourceSpan)));
+                        continue;
+                    }
+                }
+            }
+            const perClass = classPropAttributes.get(classIndex) ?? new Map();
+            const attrs = perClass.get(memberName) ?? [];
+            attrs.push(attr);
+            perClass.set(memberName, attrs);
+            classPropAttributes.set(classIndex, perClass);
+        }
+    }
+    // Rebuild module body:
+    // 1. Filter out marker statements
+    // 2. Update declarations with attached attributes
+    const newBody = [];
+    module.body.forEach((stmt, i) => {
+        // Skip marker statements
+        if (removedStatementIndices.has(i))
+            return;
+        if (stmt.kind === "classDeclaration") {
+            // Update class with attributes
+            const classStmt = stmt;
+            const existingAttrs = classStmt.attributes ?? [];
+            const typeAttrs = classAttributes.get(i) ?? [];
+            const ctorAttrs = classCtorAttributes.get(i) ?? [];
+            const methodAttrs = classMethodAttributes.get(i);
+            const propAttrs = classPropAttributes.get(i);
+            const updatedMembers = methodAttrs || propAttrs
+                ? classStmt.members.map((m) => {
+                    if (m.kind === "methodDeclaration" && methodAttrs) {
+                        const extras = methodAttrs.get(m.name);
+                        if (extras && extras.length > 0) {
+                            return {
+                                ...m,
+                                attributes: [...(m.attributes ?? []), ...extras],
+                            };
+                        }
+                    }
+                    if (m.kind === "propertyDeclaration" && propAttrs) {
+                        const extras = propAttrs.get(m.name);
+                        if (extras && extras.length > 0) {
+                            return {
+                                ...m,
+                                attributes: [...(m.attributes ?? []), ...extras],
+                            };
+                        }
+                    }
+                    return m;
+                })
+                : classStmt.members;
+            const updated = {
+                ...classStmt,
+                members: updatedMembers,
+                attributes: typeAttrs.length > 0
+                    ? [...existingAttrs, ...typeAttrs]
+                    : classStmt.attributes,
+                ctorAttributes: ctorAttrs.length > 0
+                    ? [...(classStmt.ctorAttributes ?? []), ...ctorAttrs]
+                    : classStmt.ctorAttributes,
+            };
+            // Avoid allocating new nodes when there are no changes.
+            if (typeAttrs.length === 0 &&
+                ctorAttrs.length === 0 &&
+                !methodAttrs &&
+                !propAttrs) {
+                newBody.push(classStmt);
+            }
+            else {
+                newBody.push(updated);
+            }
+            return;
+        }
+        if (stmt.kind === "functionDeclaration" && functionAttributes.has(i)) {
+            // Update function with attributes
+            const funcStmt = stmt;
+            const existingAttrs = funcStmt.attributes ?? [];
+            const newAttrs = functionAttributes.get(i) ?? [];
+            newBody.push({
+                ...funcStmt,
+                attributes: [...existingAttrs, ...newAttrs],
+            });
+            return;
+        }
+        // Keep statement unchanged
+        newBody.push(stmt);
+    });
+    return {
+        ...module,
+        body: newBody,
+    };
+};
+// ═══════════════════════════════════════════════════════════════════════════
+// ENTRY POINT
+// ═══════════════════════════════════════════════════════════════════════════
+/**
+ * Run the attribute collection pass on a set of modules.
+ *
+ * This pass:
+ * 1. Detects attribute marker calls (A.on(X).type.add(Y))
+ * 2. Attaches IrAttribute nodes to the corresponding declarations
+ * 3. Removes the marker statements from the module body
+ * 4. Emits diagnostics for invalid patterns
+ */
+export const runAttributeCollectionPass = (modules) => {
+    const diagnostics = [];
+    const processedModules = [];
+    for (const module of modules) {
+        const processed = processModule(module, diagnostics);
+        processedModules.push(processed);
+    }
+    const hasErrors = diagnostics.some((d) => d.severity === "error");
+    return {
+        ok: !hasErrors,
+        modules: processedModules,
+        diagnostics,
+    };
+};
+//# sourceMappingURL=orchestrator.js.map

package/dist/ir/validation/attribute-collection/orchestrator.js.map

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

package/dist/ir/validation/attribute-collection-pass.d.ts

@@ -12,31 +12,9 @@
  * - add(A.attr(AttrCtor, ...args))                    - Descriptor form
  * - add(descriptor) where `const descriptor = A.attr(...)`
  *
- * Backward compatibility:
- * - A.on(fn).type.add(AttrCtor, ...args) attaches to a function declaration
- *
  * Notes:
  * - This API is compiler-only. All recognized marker statements are removed.
  * - Invalid marker calls are errors (no silent drops).
  */
-import { Diagnostic } from "../../types/diagnostic.js";
-import { IrModule } from "../types.js";
-/**
- * Result of attribute collection pass
- */
-export type AttributeCollectionResult = {
-    readonly ok: boolean;
-    readonly modules: readonly IrModule[];
-    readonly diagnostics: readonly Diagnostic[];
-};
-/**
- * Run the attribute collection pass on a set of modules.
- *
- * This pass:
- * 1. Detects attribute marker calls (A.on(X).type.add(Y))
- * 2. Attaches IrAttribute nodes to the corresponding declarations
- * 3. Removes the marker statements from the module body
- * 4. Emits diagnostics for invalid patterns
- */
-export declare const runAttributeCollectionPass: (modules: readonly IrModule[]) => AttributeCollectionResult;
+export { runAttributeCollectionPass, type AttributeCollectionResult, } from "./attribute-collection/orchestrator.js";
 //# sourceMappingURL=attribute-collection-pass.d.ts.map

package/dist/ir/validation/attribute-collection-pass.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"attribute-collection-pass.d.ts","sourceRoot":"","sources":["../../../src/ir/validation/attribute-collection-pass.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EACL,UAAU,EAGX,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,QAAQ,EAiBT,MAAM,aAAa,CAAC;AAmBrB;;GAEG;AACH,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,EAAE,EAAE,OAAO,CAAC;IACrB,QAAQ,CAAC,OAAO,EAAE,SAAS,QAAQ,EAAE,CAAC;IACtC,QAAQ,CAAC,WAAW,EAAE,SAAS,UAAU,EAAE,CAAC;CAC7C,CAAC;AAq3CF;;;;;;;;GAQG;AACH,eAAO,MAAM,0BAA0B,GACrC,SAAS,SAAS,QAAQ,EAAE,KAC3B,yBAgBF,CAAC"}
+{"version":3,"file":"attribute-collection-pass.d.ts","sourceRoot":"","sources":["../../../src/ir/validation/attribute-collection-pass.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EACL,0BAA0B,EAC1B,KAAK,yBAAyB,GAC/B,MAAM,wCAAwC,CAAC"}