@intentius/chant-lexicon-terraform 0.79.0 → 0.81.0

package/dist/config.d.ts

@@ -101,9 +101,9 @@ export declare const terraformConfigSchema: z.ZodObject<{
      * binary alone runs the root stock, exactly as `terraform`/`tofu` do.
      */
     binary: z.ZodOptional<z.ZodEnum<{
-        choudoufu: "choudoufu";
         terraform: "terraform";
         tofu: "tofu";
+        choudoufu: "choudoufu";
     }>>;
     /**
      * How far a root's parse follows its `module` calls (#2112), spelled the

package/dist/integrity.json

@@ -1,7 +1,7 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "8dbc229e1cede4598f7b72276319272b57124d91e69652d141b2c3ec45b7e95b",
+    "manifest.json": "835f44ef66fca6500c71223d188a003cfe16f686ccd987ee5e324db5f5aa5749",
     "meta.json": "ca3d163bab055381827226140568f3bef7eaac187cebd76878e0b63e9e442356",
     "types/index.d.ts": "022927e6a7b351cc4cf52d5f973f60ccd140e5810e17b32fb8868965aa1db161",
     "rules/plan-before-apply.ts": "31b1b3176799fd365b2583fe3947edd187c2a863e3dc0094ed9e91ece2464c99",
@@ -38,5 +38,5 @@
     "rules/tf029.ts": "52e02b4921a64f3f928836896b8b80682400adb50bd7a0645f3fe2e8819433c2",
     "skills/chant-terraform.md": "d9ca7b7c28aed0038ce775a3491150298492eed2858fd3651ed9bfca0e577ae8"
   },
-  "composite": "f6e19c1a717b8ba79ffcd8eea9bb8c4e908b37c8b171138f466076e3fa19aa38"
+  "composite": "cd7f9cdbeb0503dc0af51fd69c48a299dd6bda865bcbc3a2701adc11aaed5b68"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "terraform",
-  "version": "0.79.0",
+  "version": "0.81.0",
   "chantVersion": ">=0.1.0",
   "namespace": "Terraform"
 }

package/package.json

@@ -1,10 +1,11 @@
 {
   "name": "@intentius/chant-lexicon-terraform",
-  "version": "0.79.0",
+  "version": "0.81.0",
   "type": "module",
   "files": [
     "src/",
-    "dist/"
+    "dist/",
+    "workspace-kinds.json"
   ],
   "exports": {
     ".": {
@@ -12,6 +13,7 @@
       "types": "./dist/index.d.ts",
       "default": "./src/index.ts"
     },
+    "./workspace-kinds": "./workspace-kinds.json",
     "./*": {
       "development": "./src/*.ts",
       "types": "./dist/*.d.ts",
@@ -55,7 +57,7 @@
     "access": "public"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.79.0",
+    "@intentius/chant": "^0.81.0",
     "typescript": "^5.9.3",
     "zod": "^4.3.6"
   },

package/src/plugin.test.ts

@@ -8,6 +8,8 @@ import type { ChantConfig } from "@intentius/chant/config";
 import { isDeclarable, isResourceDeclarable, type Declarable } from "@intentius/chant/declarable";
 import { terraformPlugin } from "./plugin";
 import { terraformConfigSchema } from "./config";
+import { RESERVED_COMMAND_NAMES } from "@intentius/chant/cli/command-group";
+import { checkConflicts } from "@intentius/chant/cli/conflict-check";
 import {
   DATA_TYPE,
   LIVE_TYPE,
@@ -117,6 +119,17 @@ describe("terraform config schema", () => {
     expect(parsed.roots.app.workspace).toBe("prod");
   });
 
+  // #2529 — core reserves `workspace` as a command name. That reserves a
+  // top-level command word, not the word itself: this lexicon's root field
+  // keeps its meaning, and the plugin loads with no conflict.
+  it("keeps its workspace field while core reserves the workspace command", () => {
+    expect(RESERVED_COMMAND_NAMES.has("workspace")).toBe(true);
+    expect(checkConflicts([terraformPlugin]).conflicts).toEqual([]);
+    expect(terraformConfigSchema.parse({ roots: { app: { dir: ".", workspace: "workspace" } } }).roots.app.workspace).toBe(
+      "workspace",
+    );
+  });
+
   it("rejects an unknown key at the namespace level", () => {
     expect(() => terraformConfigSchema.parse({ roots: {}, binaries: "tofu" })).toThrow();
   });

package/src/workspace-kinds.test.ts

@@ -0,0 +1,23 @@
+/**
+ * The terraform member kind this lexicon supplies to a chant workspace
+ * (#2545). The kind is data in `workspace-kinds.json` at the package root,
+ * exported at `./workspace-kinds`; chant reads it without importing the
+ * lexicon.
+ */
+import { join } from "node:path";
+import { describeWorkspaceKindConformance } from "@intentius/chant-test-utils";
+
+const main = `terraform {\n  required_version = ">= 1.5.0"\n}\n\nresource "null_resource" "x" {}\n`;
+
+describeWorkspaceKindConformance({
+  packageDir: join(import.meta.dirname, ".."),
+  scenarios: [
+    { name: "a root with main.tf", kind: "terraform", files: { "main.tf": main }, claims: true },
+    { name: "a root whose files are not named main.tf", kind: "terraform", files: { "network.tf": main, "versions.tf": "" }, claims: true },
+    { name: "a root that has only been planned, lock file and all", kind: "terraform", files: { "main.tf": main, ".terraform.lock.hcl": "" }, claims: true },
+    // chant's own precedence (500) outranks terraform's (400): no tie.
+    { name: "a chant project beside its .tf files", kind: "terraform", files: { "main.tf": main, "chant.config.ts": "" }, claims: true },
+    { name: "a directory whose modules sit one level down", kind: "terraform", files: { "modules/net/main.tf": main }, claims: false },
+    { name: "variable and backend files alone", kind: "terraform", files: { "terraform.tfvars": "", "backend.tfbackend": "" }, claims: false },
+  ],
+});

package/workspace-kinds.json

@@ -0,0 +1,12 @@
+{
+  "$comment": "Member kinds this lexicon supplies to a chant workspace (#2545). chant reads this file as data and never imports the lexicon. The probe is behold's terraform member probe, narrowed to the member's own directory.",
+  "schema": 1,
+  "kinds": [
+    {
+      "name": "terraform",
+      "description": "a Terraform root module, with a .tf file directly in its directory",
+      "precedence": 400,
+      "probe": { "anyFile": ["*.tf"] }
+    }
+  ]
+}