@intentius/chant-lexicon-docker 0.80.0 → 0.82.0

package/dist/composites/docker-otel-collector.d.ts

@@ -0,0 +1,54 @@
+/**
+ * DockerOtelCollector composite: an OpenTelemetry Collector as a Compose
+ * service.
+ *
+ * The collector config is declared with the otel lexicon
+ * (`@intentius/chant-lexicon-otel`), rendered with `collectorYaml`, and
+ * carried inline in a top-level Compose config that the service mounts. The
+ * published ports are read back from the config, so they follow whatever
+ * config is passed in.
+ */
+import type { Declarable } from "@intentius/chant/declarable";
+import { type OTelComponent, type Signal } from "@intentius/chant-lexicon-otel";
+export interface DockerOtelCollectorProps {
+    /** Collector image (default: the contrib image at the otel lexicon's pinned collector version). */
+    image?: string;
+    /**
+     * The collector config, as otel lexicon entities (components and
+     * pipelines). Replaces the default config, and `exporters` and `signals`
+     * are then ignored.
+     */
+    config?: Iterable<Declarable>;
+    /** Exporters for the default config (default: one `debug` exporter). */
+    exporters?: OTelComponent<"exporter", string, any>[];
+    /** Signals the default config has pipelines for (default: traces, metrics and logs). */
+    signals?: Signal[];
+    /** Publish the receiver ports on the host (default: true). Other services on the network reach the collector either way. */
+    publishPorts?: boolean;
+    /** Restart policy (default: "unless-stopped"). */
+    restart?: string;
+    /** Per-member defaults for fine-grained overrides. */
+    defaults?: {
+        service?: Partial<Record<string, unknown>>;
+        config?: Partial<Record<string, unknown>>;
+    };
+}
+/**
+ * Create a DockerOtelCollector composite. Returns a Compose service and the
+ * config it mounts. The service key is the export name plus `Service`.
+ *
+ * @example
+ * ```ts
+ * import { DockerOtelCollector } from "@intentius/chant-lexicon-docker";
+ * import { OtlpExporter } from "@intentius/chant-lexicon-otel";
+ *
+ * export const otel = DockerOtelCollector({
+ *   exporters: [new OtlpExporter({ endpoint: "tempo:4317", tls: { insecure: true } })],
+ * });
+ * ```
+ */
+export declare const DockerOtelCollector: import("@intentius/chant").CompositeDefinition<DockerOtelCollectorProps, {
+    service: Declarable & Record<string, string>;
+    config: Declarable & Record<string, string>;
+}>;
+//# sourceMappingURL=docker-otel-collector.d.ts.map

package/dist/composites/docker-otel-collector.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"docker-otel-collector.d.ts","sourceRoot":"","sources":["../../src/composites/docker-otel-collector.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAGH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAC;AAC9D,OAAO,EAOL,KAAK,aAAa,EAClB,KAAK,MAAM,EACZ,MAAM,+BAA+B,CAAC;AAGvC,MAAM,WAAW,wBAAwB;IACvC,mGAAmG;IACnG,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,MAAM,CAAC,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC9B,wEAAwE;IACxE,SAAS,CAAC,EAAE,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;IACrD,wFAAwF;IACxF,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,4HAA4H;IAC5H,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sDAAsD;IACtD,QAAQ,CAAC,EAAE;QACT,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;QAC3C,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KAC3C,CAAC;CACH;AAED;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,mBAAmB;;;EAmBP,CAAC"}

package/dist/composites/index.d.ts

@@ -1,7 +1,7 @@
 /**
- * Docker lexicon composites.
- *
- * Composites are factory functions that return pre-configured
- * multi-resource bundles. Docker composites will be added here.
+ * Docker lexicon composites: factory functions that return pre-configured
+ * multi-resource bundles.
  */
+export { DockerOtelCollector } from "./docker-otel-collector.js";
+export type { DockerOtelCollectorProps } from "./docker-otel-collector.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/composites/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/composites/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/composites/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,YAAY,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC"}

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export { defaultLabels, defaultAnnotations, isDefaultLabels, isDefaultAnnotation
 export { DEFAULT_LABELS_MARKER, DEFAULT_ANNOTATIONS_MARKER } from "./default-labels.js";
 export type { DefaultLabels, DefaultAnnotations } from "./default-labels.js";
 export * from "./generated/index.js";
+export * from "./composites/index.js";
 export { generate, writeGeneratedFiles } from "./codegen/generate.js";
 export { packageLexicon } from "./codegen/package.js";
 export type { PackageOptions, PackageResult } from "./codegen/package.js";

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC5G,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AACrF,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAG1E,cAAc,mBAAmB,CAAC;AAMlC,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAGhD,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAGhE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACxD,YAAY,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzD,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,kBAAkB,CAAC;AAC5G,OAAO,EAAE,qBAAqB,EAAE,0BAA0B,EAAE,MAAM,kBAAkB,CAAC;AACrF,YAAY,EAAE,aAAa,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAG1E,cAAc,mBAAmB,CAAC;AAGlC,cAAc,oBAAoB,CAAC;AAGnC,OAAO,EAAE,QAAQ,EAAE,mBAAmB,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,YAAY,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC"}

package/dist/integrity.json

@@ -1,9 +1,9 @@
 {
   "algorithm": "sha256",
   "artifacts": {
-    "manifest.json": "c749201dbc6b60bc987a79678550b3b20ad6f9a6d94c2e2c4941eabfd11c50a4",
-    "meta.json": "ae27dc809e705d37a645ee83b9789c50051282f7891d21d6b9e6ce8d111624ff",
-    "types/index.d.ts": "758f989ff86af54284d7f841a2db2259038d51ce1f3ed839a5d8e83fa20d95b8",
+    "manifest.json": "9e058c1682a020948d25f36044fa4a2508d7f8cd2e8d4991dba8c2e51b98a81b",
+    "meta.json": "2996be8fdb14f3f935e1e1441fed8f69af7b6aeeefb14dac96301cc41eba8046",
+    "types/index.d.ts": "7b2e6f784b7dbecbbe7924fa1aec7e2520ac0547069311253a006bc2267a5646",
     "rules/no-latest-tag.ts": "efd060453d8ca3d5b85c3972906c6650b6f63eb5f67cb6cdb0f16a41cad91228",
     "rules/apt-no-recommends.ts": "579ea54435b1cbd59088994aaaf7b249a42064facd74b62163b302fe31e769e0",
     "rules/docker-helpers.ts": "c76ea1294b630df086a23b24c0435c9daac8cdf21dd371a8aabf74e9984e6b13",
@@ -15,5 +15,5 @@
     "skills/chant-docker.md": "3ff0708e3c76e245f202948949c768464563af2b60cc9aa2ca52f494ef8357f1",
     "skills/chant-docker-patterns.md": "ad1b0196d8150b2df579a699ff107f604340c799c04f3460ebf65003e287b12a"
   },
-  "composite": "6ea22af8b21d3a7958255e4d987a2b59691bde4909e621a89472831a237d57c8"
+  "composite": "3b565e5779a52c94d87f477eaeb700cc2bff8ea6c3fe16c66bdf93f5cb4df13f"
 }

package/dist/manifest.json

@@ -1,6 +1,6 @@
 {
   "name": "docker",
-  "version": "0.80.0",
+  "version": "0.82.0",
   "chantVersion": ">=0.1.0",
   "namespace": "Docker",
   "intrinsics": [

package/dist/meta.json

@@ -61,8 +61,8 @@
         "description": "Secrets to expose"
       },
       "configs": {
-        "type": "string[]",
-        "description": "Configs to expose"
+        "type": "Array<string | { source: string | Declarable; target?: string; uid?: string; gid?: string; mode?: number }>",
+        "description": "Configs to expose (short form, or long form with a mount target)"
       }
     }
   },
@@ -133,6 +133,10 @@
         "type": "string",
         "description": "Path to the config file"
       },
+      "content": {
+        "type": "string",
+        "description": "Inline config content"
+      },
       "external": {
         "type": "boolean",
         "description": "Whether the config is external"

package/dist/okf/types/DockerConfig.md

@@ -11,6 +11,7 @@ A config definition in Docker Compose
 ## Properties
 
 - `file` (`string`): Path to the config file
+- `content` (`string`): Inline config content
 - `external` (`boolean`): Whether the config is external
 - `labels` (`Record<string, string>`): Config labels
 - `name` (`string`): Custom config name

package/dist/okf/types/Service.md

@@ -24,7 +24,7 @@ A containerized service definition in Docker Compose
 - `healthcheck` (`object`): Health check configuration
 - `deploy` (`object`): Swarm deployment configuration
 - `secrets` (`string[]`): Secrets to expose
-- `configs` (`string[]`): Configs to expose
+- `configs` (`Array<string | { source: string | Declarable; target?: string; uid?: string; gid?: string; mode?: number }>`): Configs to expose (short form, or long form with a mount target)
 
 ## Governed by
 

package/dist/serializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,6BAA6B,CAAC;AAgPhF,eAAO,MAAM,gBAAgB,EAAE,UAoE9B,CAAC"}
+{"version":3,"file":"serializer.d.ts","sourceRoot":"","sources":["../src/serializer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,OAAO,KAAK,EAAE,UAAU,EAAoB,MAAM,6BAA6B,CAAC;AAqPhF,eAAO,MAAM,gBAAgB,EAAE,UAoE9B,CAAC"}

package/dist/spec/parse-compose.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parse-compose.d.ts","sourceRoot":"","sources":["../../src/spec/parse-compose.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,EAAE,CAuFpE"}
+{"version":3,"file":"parse-compose.d.ts","sourceRoot":"","sources":["../../src/spec/parse-compose.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,eAAe,EAAE,CAAC;IAC9B,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;CACjB;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,kBAAkB,EAAE,CA8FpE"}

package/dist/types/index.d.ts

@@ -16,7 +16,7 @@ export interface ServiceProps {
   healthcheck?: object;
   deploy?: object;
   secrets?: string[];
-  configs?: string[];
+  configs?: Array<string | { source: string | Declarable; target?: string; uid?: string; gid?: string; mode?: number }>;
 }
 export declare const Service: new (props?: ServiceProps) => Declarable;
 
@@ -41,6 +41,7 @@ export declare const Network: new (props?: NetworkProps) => Declarable;
 
 export interface DockerConfigProps {
   file?: string;
+  content?: string;
   external?: boolean;
   labels?: Record<string, string>;
   name?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intentius/chant-lexicon-docker",
-  "version": "0.80.0",
+  "version": "0.82.0",
   "description": "Docker lexicon for chant — declarative IaC in TypeScript",
   "license": "Apache-2.0",
   "homepage": "https://intentius.io/chant",
@@ -62,12 +62,15 @@
     "prepack": "npm run generate && npm run bundle && npm run validate && npm run build",
     "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && find dist -type f \\( -name \"*.js\" -o -name \"*.js.map\" \\) -delete"
   },
+  "dependencies": {
+    "@intentius/chant-lexicon-otel": "*"
+  },
   "devDependencies": {
     "@intentius/chant": "*",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "@intentius/chant": "^0.80.0",
+    "@intentius/chant": "^0.82.0",
     "typescript": "^5.9.3"
   }
 }

package/src/codegen/__snapshots__/okf.test.ts.snap

@@ -167,6 +167,7 @@ A config definition in Docker Compose
 ## Properties
 
 - \`file\` (\`string\`): Path to the config file
+- \`content\` (\`string\`): Inline config content
 - \`external\` (\`boolean\`): Whether the config is external
 - \`labels\` (\`Record<string, string>\`): Config labels
 - \`name\` (\`string\`): Custom config name
@@ -276,7 +277,7 @@ A containerized service definition in Docker Compose
 - \`healthcheck\` (\`object\`): Health check configuration
 - \`deploy\` (\`object\`): Swarm deployment configuration
 - \`secrets\` (\`string[]\`): Secrets to expose
-- \`configs\` (\`string[]\`): Configs to expose
+- \`configs\` (\`Array<string | { source: string | Declarable; target?: string; uid?: string; gid?: string; mode?: number }>\`): Configs to expose (short form, or long form with a mount target)
 
 ## Governed by
 

package/src/composites/docker-otel-collector.ts

@@ -0,0 +1,83 @@
+/**
+ * DockerOtelCollector composite: an OpenTelemetry Collector as a Compose
+ * service.
+ *
+ * The collector config is declared with the otel lexicon
+ * (`@intentius/chant-lexicon-otel`), rendered with `collectorYaml`, and
+ * carried inline in a top-level Compose config that the service mounts. The
+ * published ports are read back from the config, so they follow whatever
+ * config is passed in.
+ */
+
+import { Composite, mergeDefaults } from "@intentius/chant";
+import type { Declarable } from "@intentius/chant/declarable";
+import {
+  buildCollectorConfig,
+  collectorEndpoints,
+  collectorYaml,
+  otlpCollector,
+  COLLECTOR_CONFIG_PATH,
+  COLLECTOR_IMAGE,
+  type OTelComponent,
+  type Signal,
+} from "@intentius/chant-lexicon-otel";
+import { Service, DockerConfig } from "../generated/index";
+
+export interface DockerOtelCollectorProps {
+  /** Collector image (default: the contrib image at the otel lexicon's pinned collector version). */
+  image?: string;
+  /**
+   * The collector config, as otel lexicon entities (components and
+   * pipelines). Replaces the default config, and `exporters` and `signals`
+   * are then ignored.
+   */
+  config?: Iterable<Declarable>;
+  /** Exporters for the default config (default: one `debug` exporter). */
+  exporters?: OTelComponent<"exporter", string, any>[];
+  /** Signals the default config has pipelines for (default: traces, metrics and logs). */
+  signals?: Signal[];
+  /** Publish the receiver ports on the host (default: true). Other services on the network reach the collector either way. */
+  publishPorts?: boolean;
+  /** Restart policy (default: "unless-stopped"). */
+  restart?: string;
+  /** Per-member defaults for fine-grained overrides. */
+  defaults?: {
+    service?: Partial<Record<string, unknown>>;
+    config?: Partial<Record<string, unknown>>;
+  };
+}
+
+/**
+ * Create a DockerOtelCollector composite. Returns a Compose service and the
+ * config it mounts. The service key is the export name plus `Service`.
+ *
+ * @example
+ * ```ts
+ * import { DockerOtelCollector } from "@intentius/chant-lexicon-docker";
+ * import { OtlpExporter } from "@intentius/chant-lexicon-otel";
+ *
+ * export const otel = DockerOtelCollector({
+ *   exporters: [new OtlpExporter({ endpoint: "tempo:4317", tls: { insecure: true } })],
+ * });
+ * ```
+ */
+export const DockerOtelCollector = Composite((props: DockerOtelCollectorProps) => {
+  const { image = COLLECTOR_IMAGE, publishPorts = true, restart = "unless-stopped", defaults: defs } = props;
+
+  const entities = props.config ? [...props.config] : otlpCollector({ exporters: props.exporters, signals: props.signals });
+  const { ports } = collectorEndpoints(buildCollectorConfig(entities).config);
+
+  const config = new DockerConfig(mergeDefaults({
+    content: collectorYaml(entities),
+  }, defs?.config));
+
+  const service = new Service(mergeDefaults({
+    image,
+    command: [`--config=${COLLECTOR_CONFIG_PATH}`],
+    configs: [{ source: config, target: COLLECTOR_CONFIG_PATH }],
+    ...(publishPorts && ports.length > 0 ? { ports: ports.map((p) => `${p.port}:${p.port}`) } : {}),
+    restart,
+  }, defs?.service));
+
+  return { service, config };
+}, "DockerOtelCollector");

package/src/composites/index.ts

@@ -1,12 +1,7 @@
 /**
- * Docker lexicon composites.
- *
- * Composites are factory functions that return pre-configured
- * multi-resource bundles. Docker composites will be added here.
+ * Docker lexicon composites: factory functions that return pre-configured
+ * multi-resource bundles.
  */
 
-// Composites deferred — see plan for Tier 2 implementation.
-// Example future composites:
-//   - PostgresService({ version, database, user, password }) → Service + Volume
-//   - RedisService({ version, persistence }) → Service + Volume
-//   - NginxService({ port, config }) → Service
+export { DockerOtelCollector } from "./docker-otel-collector";
+export type { DockerOtelCollectorProps } from "./docker-otel-collector";

package/src/generated/index.d.ts

@@ -16,7 +16,7 @@ export interface ServiceProps {
   healthcheck?: object;
   deploy?: object;
   secrets?: string[];
-  configs?: string[];
+  configs?: Array<string | { source: string | Declarable; target?: string; uid?: string; gid?: string; mode?: number }>;
 }
 export declare const Service: new (props?: ServiceProps) => Declarable;
 
@@ -41,6 +41,7 @@ export declare const Network: new (props?: NetworkProps) => Declarable;
 
 export interface DockerConfigProps {
   file?: string;
+  content?: string;
   external?: boolean;
   labels?: Record<string, string>;
   name?: string;

package/src/generated/lexicon-docker.json

@@ -61,8 +61,8 @@
         "description": "Secrets to expose"
       },
       "configs": {
-        "type": "string[]",
-        "description": "Configs to expose"
+        "type": "Array<string | { source: string | Declarable; target?: string; uid?: string; gid?: string; mode?: number }>",
+        "description": "Configs to expose (short form, or long form with a mount target)"
       }
     }
   },
@@ -133,6 +133,10 @@
         "type": "string",
         "description": "Path to the config file"
       },
+      "content": {
+        "type": "string",
+        "description": "Inline config content"
+      },
       "external": {
         "type": "boolean",
         "description": "Whether the config is external"

package/src/index.ts

@@ -20,8 +20,8 @@ export type { DefaultLabels, DefaultAnnotations } from "./default-labels";
 // Generated entities — populated by `npm run generate`
 export * from "./generated/index";
 
-// Composites (to be added in Tier 2)
-// export * from "./composites/index";
+// Composites
+export * from "./composites/index";
 
 // Codegen pipeline (for external tooling)
 export { generate, writeGeneratedFiles } from "./codegen/generate";

package/src/serializer.ts

@@ -70,10 +70,15 @@ function preprocessIntrinsics(value: unknown): unknown {
 // ── Visitor ───────────────────────────────────────────────────────
 
 function dockerVisitor(entityNames: Map<Declarable, string>): SerializerVisitor {
+  const dockerfiles = new Set<string>();
+  for (const [entity, name] of entityNames) {
+    if ((entity as unknown as Record<string, unknown>).entityType === "Docker::Dockerfile") dockerfiles.add(name);
+  }
   return {
     attrRef: (name, _attr) => name,
-    // For Dockerfile references, emit the filename
-    resourceRef: (name) => `Dockerfile.${name}`,
+    // A Dockerfile reference is its filename. Any other entity (a config, a
+    // secret, a volume) is referenced by its key in the compose file.
+    resourceRef: (name) => (dockerfiles.has(name) ? `Dockerfile.${name}` : name),
     propertyDeclarable: (entity, walk) => {
       const props = getProps(entity);
       const result: Record<string, unknown> = {};

package/src/spec/parse-compose.ts

@@ -58,7 +58,13 @@ export function parseComposeSpec(_data: Buffer): ComposeParseResult[] {
         { name: "healthcheck", type: "object", description: "Health check configuration" },
         { name: "deploy", type: "object", description: "Swarm deployment configuration" },
         { name: "secrets", type: "string[]", description: "Secrets to expose" },
-        { name: "configs", type: "string[]", description: "Configs to expose" },
+        {
+          name: "configs",
+          // Short form names a top-level config; long form also sets where it
+          // is mounted. `source` may be the DockerConfig entity itself.
+          type: "Array<string | { source: string | Declarable; target?: string; uid?: string; gid?: string; mode?: number }>",
+          description: "Configs to expose (short form, or long form with a mount target)",
+        },
       ],
     },
     {
@@ -95,6 +101,7 @@ export function parseComposeSpec(_data: Buffer): ComposeParseResult[] {
       isResource: true,
       properties: [
         { name: "file", type: "string", description: "Path to the config file" },
+        { name: "content", type: "string", description: "Inline config content" },
         { name: "external", type: "boolean", description: "Whether the config is external" },
         { name: "labels", type: "Record<string, string>", description: "Config labels" },
         { name: "name", type: "string", description: "Custom config name" },