@intentius/chant-lexicon-aws 0.1.4 → 0.1.8

package/src/import/generator.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { CFGenerator } from "./generator";
 import type { TemplateIR } from "@intentius/chant/import/parser";
 

package/src/import/generator.ts

@@ -15,7 +15,7 @@ export class CFGenerator implements TypeScriptGenerator {
 
   constructor() {
     // Build reverse lookup from dist/meta.json: resourceType → className
-    const metaPath = join(import.meta.dir, "../../dist/meta.json");
+    const metaPath = join(import.meta.dirname, "../../dist/meta.json");
     const meta: Record<string, { resourceType: string; kind: string }> =
       require(metaPath);
     this.typeToClass = new Map();

package/src/import/parser.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { CFParser } from "./parser";
 
 describe("CFParser", () => {

package/src/import/roundtrip-fixtures.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { readdirSync, readFileSync, mkdtempSync, writeFileSync, mkdirSync, rmSync } from "fs";
 import { join } from "path";
 import { CFParser } from "./parser";
@@ -11,8 +11,8 @@ const awsLexicon = await import("../index");
 const parser = new CFParser();
 const generator = new CFGenerator();
 
-const roundtripDir = join(import.meta.dir, "../testdata/roundtrip");
-const samDir = join(import.meta.dir, "../testdata/sam-fixtures");
+const roundtripDir = join(import.meta.dirname, "../testdata/roundtrip");
+const samDir = join(import.meta.dirname, "../testdata/sam-fixtures");
 
 /** Extract imported symbols from `import { A, B } from "..."` statements */
 function extractImportedSymbols(code: string): string[] {
@@ -75,7 +75,7 @@ describe("parameters.json build roundtrip", () => {
     const mainFile = files.find((f) => f.path === "main.ts")!;
 
     // Write generated code to a temp directory inside the monorepo (so workspace packages resolve)
-    const dir = mkdtempSync(join(import.meta.dir, "../../.roundtrip-tmp-"));
+    const dir = mkdtempSync(join(import.meta.dirname, "../../.roundtrip-tmp-"));
     try {
     const srcDir = join(dir, "src");
     mkdirSync(srcDir);

package/src/import/roundtrip.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { CFParser } from "./parser";
 import { CFGenerator } from "./generator";
 

package/src/integration.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { awsSerializer } from "./serializer";
 import { Sub, If, Join, AWS } from "./index";
 import { Bucket, Function, Role } from "./generated/index";

package/src/intrinsics.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { Sub, Ref, GetAtt, If, Join, Select, Split, Base64 } from "./intrinsics";
 import { AWS } from "./pseudo";
 import { AttrRef } from "@intentius/chant/attrref";

package/src/lint/post-synth/ext001.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { ext001, checkExtensionConstraints, type ExtensionConstraint } from "./ext001";
 

package/src/lint/post-synth/post-synth.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test } from "bun:test";
+import { describe, expect, test } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw010 } from "./waw010";
 import { waw011 } from "./waw011";

package/src/lint/post-synth/waw013.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import type { PostSynthContext } from "@intentius/chant/lint/post-synth";
 import type { Declarable } from "@intentius/chant/declarable";
 import { CHILD_PROJECT_MARKER, type ChildProjectInstance } from "@intentius/chant/child-project";

package/src/lint/post-synth/waw014.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import type { PostSynthContext } from "@intentius/chant/lint/post-synth";
 import type { Declarable } from "@intentius/chant/declarable";
 import { CHILD_PROJECT_MARKER, type ChildProjectInstance } from "@intentius/chant/child-project";

package/src/lint/post-synth/waw015.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import type { PostSynthContext } from "@intentius/chant/lint/post-synth";
 import type { Declarable } from "@intentius/chant/declarable";
 import { CHILD_PROJECT_MARKER, type ChildProjectInstance } from "@intentius/chant/child-project";

package/src/lint/post-synth/waw016.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw016, checkDeprecatedProperties } from "./waw016";
 

package/src/lint/post-synth/waw017.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw017, checkMissingTags } from "./waw017";
 

package/src/lint/post-synth/waw018.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw018, checkS3PublicAccess } from "./waw018";
 

package/src/lint/post-synth/waw019.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw019, checkUnrestrictedIngress } from "./waw019";
 

package/src/lint/post-synth/waw020.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw020, checkIamWildcardAction } from "./waw020";
 

package/src/lint/post-synth/waw021.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw021, checkRdsEncryption } from "./waw021";
 

package/src/lint/post-synth/waw022.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw022, checkLambdaVpc } from "./waw022";
 

package/src/lint/post-synth/waw023.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw023, checkCloudFrontWaf } from "./waw023";
 

package/src/lint/post-synth/waw024.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw024, checkAlbAccessLogs } from "./waw024";
 

package/src/lint/post-synth/waw025.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw025, checkSnsEncryption } from "./waw025";
 

package/src/lint/post-synth/waw026.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw026, checkSqsEncryption } from "./waw026";
 

package/src/lint/post-synth/waw027.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw027, checkDynamoDbPitr } from "./waw027";
 

package/src/lint/post-synth/waw028.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw028, checkEbsEncryption } from "./waw028";
 

package/src/lint/post-synth/waw029.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw029, checkInvalidDependsOn } from "./waw029";
 

package/src/lint/post-synth/waw030.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw030, checkMissingDependsOn } from "./waw030";
 

package/src/lint/post-synth/waw031.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw031, checkAddonMissingRole } from "./waw031";
 

package/src/lint/post-synth/waw032.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw032, checkEfsTransitEncryption } from "./waw032";
 

package/src/lint/post-synth/waw033.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw033, checkSolrHeapRatio } from "./waw033";
 

package/src/lint/post-synth/waw034.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw034, checkSolrMemoryMinimum } from "./waw034";
 

package/src/lint/post-synth/waw035.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw035, checkSolrUlimits } from "./waw035";
 

package/src/lint/post-synth/waw036.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw036, checkNonAsciiProps } from "./waw036";
 

package/src/lint/post-synth/waw037.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { createPostSynthContext } from "@intentius/chant-test-utils";
 import { waw037, checkNullProperties } from "./waw037";
 

package/src/lint/rules/rules.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import * as ts from "typescript";
 import { hardcodedRegionRule } from "./hardcoded-region";
 import { s3EncryptionRule } from "./s3-encryption";

package/src/lsp/completions.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { awsCompletions } from "./completions";
 import type { CompletionContext } from "@intentius/chant/lsp/types";
 

package/src/lsp/hover.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { awsHover } from "./hover";
 import type { HoverContext } from "@intentius/chant/lsp/types";
 

package/src/nested-stack-integration.test.ts

@@ -1,10 +1,10 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { build } from "../../../packages/core/src/build";
 import { resolve } from "path";
 import { awsSerializer } from "./serializer";
 import type { SerializerResult } from "../../../packages/core/src/serializer";
 
-const srcDir = resolve(import.meta.dir, "testdata/nested-stacks");
+const srcDir = resolve(import.meta.dirname, "testdata/nested-stacks");
 
 describe("nested-stacks integration", () => {
   test("build produces valid CloudFormation with nested stack", async () => {

package/src/nested-stack.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { nestedStack, isNestedStackInstance, NestedStackOutputRef, NESTED_STACK_MARKER } from "./nested-stack";
 import { DECLARABLE_MARKER, isDeclarable } from "@intentius/chant/declarable";
 import { CHILD_PROJECT_MARKER, isChildProject } from "@intentius/chant/child-project";

package/src/package-cli.ts

@@ -1,10 +1,10 @@
-#!/usr/bin/env bun
+#!/usr/bin/env tsx
 /**
- * Thin entry point for `bun run bundle` in lexicon-aws.
+ * Thin entry point for `npm run bundle` in lexicon-aws.
  * Generates src/generated/ files and writes dist/ bundle.
  *
  * NOTE: Does NOT call plugin.package() because that internally spawns
- * `bun pm pack`, which would cause infinite recursion when invoked
+ * `npm pack`, which would cause infinite recursion when invoked
  * from a prepack lifecycle script.
  */
 import { generate, writeGeneratedFiles } from "./codegen/generate";

package/src/plugin.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { awsPlugin } from "./plugin";
 import { isLexiconPlugin } from "@intentius/chant/lexicon";
 
@@ -189,7 +189,7 @@ describe("awsPlugin", () => {
 
     test("diff tool has correct structure", () => {
       const tools = awsPlugin.mcpTools!();
-      const diffTool = tools.find((t) => t.name === "diff");
+      const diffTool = tools.find((t) => t.name === "aws:diff");
       expect(diffTool).toBeDefined();
       expect(diffTool!.description.length).toBeGreaterThan(0);
       expect(diffTool!.inputSchema.type).toBe("object");
@@ -199,7 +199,7 @@ describe("awsPlugin", () => {
 
     test("diff tool schema has path as required", () => {
       const tools = awsPlugin.mcpTools!();
-      const diffTool = tools.find((t) => t.name === "diff")!;
+      const diffTool = tools.find((t) => t.name === "aws:diff")!;
       expect(diffTool.inputSchema.required).toContain("path");
     });
   });
@@ -216,7 +216,7 @@ describe("awsPlugin", () => {
 
     test("resource-catalog has correct structure", () => {
       const resources = awsPlugin.mcpResources!();
-      const catalog = resources.find((r) => r.uri === "resource-catalog");
+      const catalog = resources.find((r) => r.uri === "aws:resource-catalog");
       expect(catalog).toBeDefined();
       expect(catalog!.name.length).toBeGreaterThan(0);
       expect(catalog!.description.length).toBeGreaterThan(0);
@@ -226,7 +226,7 @@ describe("awsPlugin", () => {
 
     test("resource-catalog handler returns JSON array of resources", async () => {
       const resources = awsPlugin.mcpResources!();
-      const catalog = resources.find((r) => r.uri === "resource-catalog")!;
+      const catalog = resources.find((r) => r.uri === "aws:resource-catalog")!;
       const content = await catalog.handler();
 
       const parsed = JSON.parse(content) as Array<{ className: string; resourceType: string }>;

package/src/plugin.ts

@@ -11,6 +11,10 @@ import { readFileSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
 import { awsSerializer } from "./serializer";
+import { CFParser } from "./import/parser";
+import { CFGenerator } from "./import/generator";
+import { awsCompletions } from "./lsp/completions";
+import { awsHover } from "./lsp/hover";
 
 /**
  * AWS CloudFormation lexicon plugin.
@@ -252,12 +256,10 @@ export const logsBucket = new Bucket({
   },
 
   templateParser(): TemplateParser {
-    const { CFParser } = require("./import/parser");
     return new CFParser();
   },
 
   templateGenerator(): TypeScriptGenerator {
-    const { CFGenerator } = require("./import/generator");
     return new CFGenerator();
   },
 
@@ -462,12 +464,10 @@ aws cloudformation wait stack-update-complete --stack-name my-app-prod`,
   ]),
 
   completionProvider(ctx: CompletionContext): CompletionItem[] {
-    const { awsCompletions } = require("./lsp/completions");
     return awsCompletions(ctx);
   },
 
   hoverProvider(ctx: HoverContext): HoverInfo | undefined {
-    const { awsHover } = require("./lsp/hover");
     return awsHover(ctx);
   },
 
@@ -559,7 +559,7 @@ aws cloudformation wait stack-update-complete --stack-name my-app-prod`,
   mcpTools() {
     return [
       {
-        name: "diff",
+        name: "aws:diff",
         description: "Compare current build output against previous output for AWS CloudFormation",
         inputSchema: {
           type: "object" as const,
@@ -591,7 +591,7 @@ aws cloudformation wait stack-update-complete --stack-name my-app-prod`,
   mcpResources() {
     return [
       {
-        uri: "resource-catalog",
+        uri: "aws:resource-catalog",
         name: "AWS Resource Catalog",
         description: "JSON list of all supported AWS CloudFormation resource types",
         mimeType: "application/json",

package/src/pseudo.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import {
   AWS,
   StackName,

package/src/serializer.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { awsSerializer } from "./serializer";
 import { AttrRef } from "@intentius/chant/attrref";
 import { DECLARABLE_MARKER, type Declarable } from "@intentius/chant/declarable";

package/src/spec/fetch.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { fetchSchemaZip } from "./fetch";
 
 describe("fetchSchemaZip", () => {

package/src/spec/parse.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import {
   parseCFNSchema,
   cfnShortName,

package/src/spec/parse.ts

@@ -90,13 +90,19 @@ export function parseCFNSchema(data: string | Buffer): SchemaParseResult {
   }
 
   // Parse readOnlyProperties as attributes
+  // Deduplicate — some upstream schemas (e.g. aws-s3files-filesystem) list the same
+  // property twice in readOnlyProperties, which would produce duplicate class members.
   const attrs: ParsedAttribute[] = [];
+  const seenAttrs = new Set<string>();
   for (const path of schema.readOnlyProperties ?? []) {
     const attrName = stripPointerPath(path);
 
     // Flatten nested paths: "Endpoint/Address" → attr name "Endpoint.Address"
     const cfnAttr = attrName.replace(/\//g, ".");
 
+    if (seenAttrs.has(cfnAttr)) continue;
+    seenAttrs.add(cfnAttr);
+
     let tsType = "string";
     // For top-level attrs, look up type from properties
     if (!cfnAttr.includes(".") && schema.properties?.[cfnAttr]) {

package/src/validate-cli.ts

@@ -1,6 +1,6 @@
-#!/usr/bin/env bun
+#!/usr/bin/env tsx
 /**
- * Thin entry point for `bun run validate` in lexicon-aws.
+ * Thin entry point for `npm run validate` in lexicon-aws.
  */
 import { validate } from "./validate";
 

package/src/validate.test.ts

@@ -1,4 +1,4 @@
-import { describe, test, expect } from "bun:test";
+import { describe, test, expect } from "vitest";
 import { validate } from "./validate";
 import { dirname } from "path";
 import { fileURLToPath } from "url";