@intentius/chant-lexicon-aws 0.0.5 → 0.0.6

package/src/plugin.ts

@@ -54,7 +54,6 @@ export const awsPlugin: LexiconPlugin = {
 
   initTemplates(): Record<string, string> {
     return {
-      "_.ts": `export * from "./config";\n`,
       "config.ts": `/**
  * Shared bucket configuration — encryption, versioning, public access
  */
@@ -93,29 +92,29 @@ export const versioningEnabled = new aws.VersioningConfiguration({
  * Data bucket — primary storage with encryption and versioning
  */
 
-import * as aws from "@intentius/chant-lexicon-aws";
-import * as _ from "./_";
+import { Bucket, Sub, AWS } from "@intentius/chant-lexicon-aws";
+import { versioningEnabled, bucketEncryption, publicAccessBlock } from "./config";
 
-export const dataBucket = new aws.Bucket({
-  bucketName: aws.Sub\`\${aws.AWS.StackName}-data\`,
-  versioningConfiguration: _.versioningEnabled,
-  bucketEncryption: _.bucketEncryption,
-  publicAccessBlockConfiguration: _.publicAccessBlock,
+export const dataBucket = new Bucket({
+  bucketName: Sub\`\${AWS.StackName}-data\`,
+  versioningConfiguration: versioningEnabled,
+  bucketEncryption: bucketEncryption,
+  publicAccessBlockConfiguration: publicAccessBlock,
 });
 `,
       "logs-bucket.ts": `/**
  * Logs bucket — log delivery with encryption and versioning
  */
 
-import * as aws from "@intentius/chant-lexicon-aws";
-import * as _ from "./_";
+import { Bucket, Sub, AWS } from "@intentius/chant-lexicon-aws";
+import { versioningEnabled, bucketEncryption, publicAccessBlock } from "./config";
 
-export const logsBucket = new aws.Bucket({
-  bucketName: aws.Sub\`\${aws.AWS.StackName}-logs\`,
+export const logsBucket = new Bucket({
+  bucketName: Sub\`\${AWS.StackName}-logs\`,
   accessControl: "LogDeliveryWrite",
-  versioningConfiguration: _.versioningEnabled,
-  bucketEncryption: _.bucketEncryption,
-  publicAccessBlockConfiguration: _.publicAccessBlock,
+  versioningConfiguration: versioningEnabled,
+  bucketEncryption: bucketEncryption,
+  publicAccessBlockConfiguration: publicAccessBlock,
 });
 `,
     };
@@ -185,18 +184,9 @@ export const logsBucket = new aws.Bucket({
 
   async validate(options?: { verbose?: boolean }): Promise<void> {
     const { validate } = await import("./validate");
+    const { printValidationResult } = await import("@intentius/chant/codegen/validate");
     const result = await validate();
-
-    for (const check of result.checks) {
-      const status = check.ok ? "OK" : "FAIL";
-      const msg = check.error ? ` — ${check.error}` : "";
-      console.error(`  [${status}] ${check.name}${msg}`);
-    }
-
-    if (!result.success) {
-      throw new Error("Validation failed");
-    }
-    console.error("All validation checks passed.");
+    printValidationResult(result);
   },
 
   async coverage(options?: { verbose?: boolean; minOverall?: number }): Promise<void> {
@@ -227,34 +217,15 @@ export const logsBucket = new aws.Bucket({
 
   async package(options?: { verbose?: boolean; force?: boolean }): Promise<void> {
     const { packageLexicon } = await import("./codegen/package");
-    const { writeFileSync, mkdirSync } = await import("fs");
+    const { writeBundleSpec } = await import("@intentius/chant/codegen/package");
     const { join, dirname } = await import("path");
     const { fileURLToPath } = await import("url");
 
     const { spec, stats } = await packageLexicon({ verbose: options?.verbose, force: options?.force });
 
-    // Write manifest and artifacts to dist/
     const pkgDir = dirname(dirname(fileURLToPath(import.meta.url)));
     const distDir = join(pkgDir, "dist");
-    mkdirSync(join(distDir, "types"), { recursive: true });
-    mkdirSync(join(distDir, "rules"), { recursive: true });
-    mkdirSync(join(distDir, "skills"), { recursive: true });
-
-    writeFileSync(join(distDir, "manifest.json"), JSON.stringify(spec.manifest, null, 2));
-    writeFileSync(join(distDir, "meta.json"), spec.registry);
-    writeFileSync(join(distDir, "types", "index.d.ts"), spec.typesDTS);
-
-    for (const [name, content] of spec.rules) {
-      writeFileSync(join(distDir, "rules", name), content);
-    }
-    for (const [name, content] of spec.skills) {
-      writeFileSync(join(distDir, "skills", name), content);
-    }
-
-    // Write integrity.json if available
-    if (spec.integrity) {
-      writeFileSync(join(distDir, "integrity.json"), JSON.stringify(spec.integrity, null, 2));
-    }
+    writeBundleSpec(spec, distDir);
 
     console.error(`Packaged ${stats.resources} resources, ${stats.ruleCount} rules, ${stats.skillCount} skills`);
 
@@ -349,7 +320,7 @@ description: AWS CloudFormation best practices and common patterns
 3. **Use least-privilege IAM** — Avoid \`*\` in IAM policy actions and resources
 4. **Enable versioning** — Turn on \`VersioningConfiguration\` for data buckets
 5. **Use Sub for dynamic names** — \`Sub\\\`\\\${AWS::StackName}-suffix\\\`\` for unique naming
-6. **Share config via barrel files** — Put common settings in \`_.ts\` and import as \`* as _\`
+6. **Share config via direct imports** — Put common settings in a config file and import directly
 `,
         triggers: [
           { type: "file-pattern", value: "**/*.aws.ts" },

package/src/spec/parse.ts

@@ -36,7 +36,7 @@ export interface ParsedAttribute {
 
 export interface ParsedPropertyType {
   name: string;
-  cfnType: string;
+  specType: string;
   properties: ParsedProperty[];
 }
 
@@ -130,7 +130,7 @@ export function parseCFNSchema(data: string | Buffer): SchemaParseResult {
         }
         propertyTypes.push({
           name: `${shortName}_${defName}`,
-          cfnType: defName,
+          specType: defName,
           properties: defProps,
         });
       }