@intentius/chant 0.1.1 → 0.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant",
-  "version": "0.1.1",
+  "version": "0.1.4",
   "description": "Declarative infrastructure-as-code toolkit — TypeScript on Bun",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",

package/src/lexicon-output.ts

@@ -21,7 +21,7 @@ export class LexiconOutput implements Intrinsic {
   /** @internal Intrinsic value when constructed from an Intrinsic rather than AttrRef */
   private readonly _intrinsic: Intrinsic | null;
 
-  constructor(ref: AttrRef | Intrinsic, name: string) {
+  constructor(ref: AttrRef | Intrinsic | string, name: string) {
     if (ref instanceof AttrRef) {
       const parent = ref.parent.deref();
       if (!parent) {
@@ -40,12 +40,14 @@ export class LexiconOutput implements Intrinsic {
       this._intrinsic = null;
     } else {
       // Intrinsic (Sub, Join, Ref, etc.) — no parent entity tracking needed
+      // Note: `string` in the union is for attribute accessors typed as string at the
+      // TypeScript level (they are AttrRef at runtime, caught by instanceof above).
       this.sourceLexicon = "";
       this.sourceEntity = "";
       this.sourceAttribute = null;
       this.outputName = name;
       this._sourceParent = null;
-      this._intrinsic = ref;
+      this._intrinsic = typeof ref !== "string" ? ref : null;
     }
   }
 
@@ -103,7 +105,7 @@ export class LexiconOutput implements Intrinsic {
  * const solrUrl = output(Sub`http://${Ref(albDnsName)}/solr`, "solrUrl");
  * ```
  */
-export function output(ref: AttrRef | Intrinsic, name: string): LexiconOutput {
+export function output(ref: AttrRef | Intrinsic | string, name: string): LexiconOutput {
   return new LexiconOutput(ref, name);
 }
 

package/src/runtime.ts

@@ -5,7 +5,7 @@
  * lexicon, entityType, kind, and attribute references.
  */
 
-import { DECLARABLE_MARKER } from "./declarable";
+import { DECLARABLE_MARKER, type Declarable } from "./declarable";
 import { AttrRef } from "./attrref";
 
 /**
@@ -22,7 +22,7 @@ export function createResource(
   type: string,
   lexicon: string,
   attrMap: Record<string, string>,
-): new (props: Record<string, unknown>, attributes?: Record<string, unknown>) => Record<string, unknown> {
+): new (props: Record<string, unknown>, attributes?: Record<string, unknown>) => Declarable & Record<string, string> {
   const ResourceClass = function (this: Record<string, unknown>, props: Record<string, unknown>, attributes?: Record<string, unknown>) {
     Object.defineProperty(this, DECLARABLE_MARKER, { value: true, enumerable: false });
     Object.defineProperty(this, "lexicon", { value: lexicon, enumerable: false });
@@ -44,7 +44,7 @@ export function createResource(
         writable: false,
       });
     }
-  } as unknown as new (props: Record<string, unknown>, attributes?: Record<string, unknown>) => Record<string, unknown>;
+  } as unknown as new (props: Record<string, unknown>, attributes?: Record<string, unknown>) => Declarable & Record<string, string>;
 
   // Set the constructor name for debugging
   Object.defineProperty(ResourceClass, "name", { value: type.split("::").pop() ?? type });

package/src/yaml.ts

@@ -188,7 +188,10 @@ export function parseYAMLLines(
         if (i + 1 < lines.length) {
           const nextLine = lines[i + 1];
           const nextIndent = nextLine.search(/\S/);
-          if (nextIndent > indent && nextLine.trimStart().startsWith("- ")) {
+          if (nextLine.trimStart().startsWith("- ") && nextIndent >= indent) {
+            // Same-indent arrays are valid YAML (e.g. controller-gen output):
+            //   versions:
+            //   - name: v1
             const arr = parseYAMLArray(lines, i + 1, nextIndent);
             result[key] = arr.value;
             i = arr.endIndex;