@intentius/chant 0.0.24 → 0.1.0

package/package.json

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

package/src/codegen/typecheck.ts

@@ -65,6 +65,19 @@ export async function typecheckDTS(content: string): Promise<TypeCheckResult> {
       MINIMAL_LIB,
     );
 
+    // Write stubs for @intentius/chant sub-path imports used in generated .d.ts files.
+    // tsc runs in a temp dir with no node_modules, so these must be declared manually.
+    const chantDeclarableDir = join(dir, "node_modules", "@intentius", "chant", "declarable");
+    mkdirSync(chantDeclarableDir, { recursive: true });
+    writeFileSync(
+      join(chantDeclarableDir, "index.d.ts"),
+      `export interface Declarable<TProps = Record<string, unknown>> { props: TProps; }\n`,
+    );
+    writeFileSync(
+      join(chantDeclarableDir, "package.json"),
+      JSON.stringify({ name: "@intentius/chant/declarable", main: "index.d.ts", types: "index.d.ts" }),
+    );
+
     // Write a minimal tsconfig — noLib: true prevents tsc from looking for
     // standard lib files; our lib.d.ts is included via the include array.
     const tsconfig = {

package/src/discovery/collect.ts

@@ -35,7 +35,7 @@ export function collectEntities(
           entities.set(name, value);
         }
       } else if (Array.isArray(value)) {
-        // Arrays of Declarables — each element gets an indexed name: exportName_0, exportName_1, ...
+        // Arrays of Declarables or CompositeInstances — each element gets an indexed name: exportName_0, ...
         for (let i = 0; i < value.length; i++) {
           const item = value[i];
           if (isDeclarable(item)) {
@@ -44,6 +44,19 @@ export function collectEntities(
               throw new DiscoveryError(file, `Duplicate entity name "${indexedName}"`, "resolution");
             }
             entities.set(indexedName, item);
+          } else if (isCompositeInstance(item)) {
+            const indexedName = `${name}_${i}`;
+            const expanded = expandComposite(indexedName, item);
+            for (const [expandedName, entity] of expanded) {
+              if (entities.has(expandedName)) {
+                throw new DiscoveryError(
+                  file,
+                  `Duplicate entity name "${expandedName}" from composite expansion of "${indexedName}"`,
+                  "resolution",
+                );
+              }
+              entities.set(expandedName, entity);
+            }
           }
         }
       } else if (isCompositeInstance(value)) {

package/src/yaml.ts

@@ -308,8 +308,13 @@ export function parseYAMLArray(
     const itemMatch = line.match(/^(\s*)- (.*)$/);
     if (itemMatch && indent === baseIndent) {
       const itemValue = itemMatch[2].trim();
-      // Check if it's a key-value pair (object item in array)
-      const kvMatch = itemValue.match(/^([^\s:][^:]*?):\s*(.*)$/);
+      // Check if it's a key-value pair (object item in array).
+      // Skip quoted scalars — a quoted string containing a colon (e.g. "80:80")
+      // must not be treated as a key-value pair.
+      const isQuotedScalar =
+        (itemValue.startsWith('"') && itemValue.endsWith('"')) ||
+        (itemValue.startsWith("'") && itemValue.endsWith("'"));
+      const kvMatch = !isQuotedScalar && itemValue.match(/^([^\s:][^:]*?):\s*(.*)$/);
       if (kvMatch) {
         const obj: Record<string, unknown> = {};
         obj[kvMatch[1].trim()] = parseArrayItemValue(kvMatch[2].trim(), lines, i, indent + 2);