@intentius/chant-lexicon-gitlab 0.0.3 → 0.0.6

package/src/codegen/parse.ts

@@ -132,6 +132,7 @@ const PROPERTY_ENTITIES: Array<{
   { typeName: "GitLab::CI::Artifacts", source: "#/definitions/artifacts", description: "Job artifact configuration" },
   { typeName: "GitLab::CI::Cache", source: "#/definitions/cache_item", description: "Cache configuration" },
   { typeName: "GitLab::CI::Image", source: "#/definitions/image", description: "Docker image for a job" },
+  { typeName: "GitLab::CI::Service", source: "#/definitions/services:item", description: "Docker service container for a job" },
   { typeName: "GitLab::CI::Rule", source: "#/definitions/rules:item", description: "Conditional rule for job execution" },
   { typeName: "GitLab::CI::Retry", source: "#/definitions/retry", description: "Job retry configuration" },
   { typeName: "GitLab::CI::AllowFailure", source: "#/definitions/allow_failure", description: "Allow failure configuration" },
@@ -266,17 +267,14 @@ function extractPropertyEntity(
  * Resolve a source path to a schema definition.
  */
 function resolveSource(schema: CISchema, source: string): CISchemaDefinition | null {
-  // Special case: rules array item extraction
-  if (source === "#/definitions/rules:item") {
-    const rulesDef = schema.definitions?.rules;
-    if (!rulesDef) return null;
-    // rules is an array — get items
-    const items = rulesDef.items;
-    if (!items) return null;
-    return findObjectVariant(items);
-  }
-
   if (source.startsWith("#/definitions/")) {
+    // Array item extraction: "#/definitions/foo:item" → foo.items object variant
+    if (source.includes(":item")) {
+      const defName = source.slice("#/definitions/".length).replace(":item", "");
+      const arrayDef = schema.definitions?.[defName];
+      if (!arrayDef?.items) return null;
+      return findObjectVariant(arrayDef.items);
+    }
     const defName = source.slice("#/definitions/".length);
     return schema.definitions?.[defName] ?? null;
   }

package/src/codegen/snapshot.test.ts

@@ -10,7 +10,7 @@ describe("generated lexicon-gitlab.json", () => {
   const registry = JSON.parse(content);
 
   test("is valid JSON with expected entries", () => {
-    expect(Object.keys(registry)).toHaveLength(15);
+    expect(Object.keys(registry)).toHaveLength(16);
   });
 
   test("contains all resource entities", () => {
@@ -30,7 +30,7 @@ describe("generated lexicon-gitlab.json", () => {
     const propertyNames = [
       "AllowFailure", "Artifacts", "AutoCancel", "Cache",
       "Environment", "Image", "Include", "Parallel",
-      "Release", "Retry", "Rule", "Trigger",
+      "Release", "Retry", "Rule", "Service", "Trigger",
     ];
     for (const name of propertyNames) {
       expect(registry[name]).toBeDefined();
@@ -55,7 +55,7 @@ describe("generated index.d.ts", () => {
       "Job", "Default", "Workflow",
       "AllowFailure", "Artifacts", "AutoCancel", "Cache",
       "Environment", "Image", "Include", "Parallel",
-      "Release", "Retry", "Rule", "Trigger",
+      "Release", "Retry", "Rule", "Service", "Trigger",
     ];
     for (const cls of expectedClasses) {
       expect(content).toContain(`export declare class ${cls}`);

package/src/generated/index.d.ts

@@ -203,6 +203,19 @@ export declare class Rule {
   });
 }
 
+export declare class Service {
+  constructor(props: {
+    /** Full name of the image that should be used. It should contain the Registry part if needed. */
+    name: string;
+    alias?: string;
+    command?: string[];
+    docker?: Record<string, unknown>;
+    entrypoint?: string[];
+    pull_policy?: "always" | "never" | "if-not-present" | "always" | "never" | "if-not-present"[];
+    variables?: Record<string, unknown>;
+  });
+}
+
 export declare class Trigger {
   constructor(props: {
     /** Path to the project, e.g. `group/project`, or `group/sub-group/project`. */

package/src/generated/index.ts

@@ -16,6 +16,7 @@ export const Parallel = createProperty("GitLab::CI::Parallel", "gitlab");
 export const Release = createProperty("GitLab::CI::Release", "gitlab");
 export const Retry = createProperty("GitLab::CI::Retry", "gitlab");
 export const Rule = createProperty("GitLab::CI::Rule", "gitlab");
+export const Service = createProperty("GitLab::CI::Service", "gitlab");
 export const Trigger = createProperty("GitLab::CI::Trigger", "gitlab");
 
 // Re-exports for convenience

package/src/generated/lexicon-gitlab.json

@@ -64,6 +64,11 @@
     "kind": "property",
     "lexicon": "gitlab"
   },
+  "Service": {
+    "resourceType": "GitLab::CI::Service",
+    "kind": "property",
+    "lexicon": "gitlab"
+  },
   "Trigger": {
     "resourceType": "GitLab::CI::Trigger",
     "kind": "property",

package/src/plugin.test.ts

@@ -96,7 +96,6 @@ describe("gitlabPlugin", () => {
   test("returns init templates", () => {
     const templates = gitlabPlugin.initTemplates!();
     expect(templates).toBeDefined();
-    expect(templates["_.ts"]).toBeDefined();
     expect(templates["config.ts"]).toBeDefined();
     expect(templates["test.ts"]).toBeDefined();
   });
@@ -192,7 +191,7 @@ describe("gitlabPlugin", () => {
     const result = await catalog.handler();
     const parsed = JSON.parse(result);
     expect(Array.isArray(parsed)).toBe(true);
-    expect(parsed.length).toBe(15);
+    expect(parsed.length).toBe(16);
     const job = parsed.find((e: { className: string }) => e.className === "Job");
     expect(job).toBeDefined();
     expect(job.kind).toBe("resource");

package/src/plugin.ts

@@ -41,20 +41,19 @@ export const gitlabPlugin: LexiconPlugin = {
 
   initTemplates(): Record<string, string> {
     return {
-      "_.ts": `export * from "./config";\n`,
       "config.ts": `/**
  * Shared pipeline configuration
  */
 
-import * as gl from "@intentius/chant-lexicon-gitlab";
+import { Image, Cache } from "@intentius/chant-lexicon-gitlab";
 
 // Default image for all jobs
-export const defaultImage = new gl.Image({
+export const defaultImage = new Image({
   name: "node:20-alpine",
 });
 
 // Standard cache configuration
-export const npmCache = new gl.Cache({
+export const npmCache = new Cache({
   key: "$CI_COMMIT_REF_SLUG",
   paths: ["node_modules/"],
   policy: "pull-push",
@@ -64,15 +63,15 @@ export const npmCache = new gl.Cache({
  * Test job
  */
 
-import * as gl from "@intentius/chant-lexicon-gitlab";
-import * as _ from "./_";
+import { Job, Artifacts } from "@intentius/chant-lexicon-gitlab";
+import { defaultImage, npmCache } from "./config";
 
-export const test = new gl.Job({
+export const test = new Job({
   stage: "test",
-  image: _.defaultImage,
-  cache: _.npmCache,
+  image: defaultImage,
+  cache: npmCache,
   script: ["npm ci", "npm test"],
-  artifacts: new gl.Artifacts({
+  artifacts: new Artifacts({
     reports: { junit: "coverage/junit.xml" },
     paths: ["coverage/"],
     expireIn: "1 week",
@@ -142,18 +141,9 @@ export const test = new gl.Job({
 
   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> {
@@ -166,7 +156,7 @@ export const test = new gl.Job({
 
   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");
 
@@ -174,24 +164,7 @@ export const test = new gl.Job({
 
     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);
-    }
-
-    if (spec.integrity) {
-      writeFileSync(join(distDir, "integrity.json"), JSON.stringify(spec.integrity, null, 2));
-    }
+    writeBundleSpec(spec, distDir);
 
     console.error(`Packaged ${stats.resources} entities, ${stats.ruleCount} rules, ${stats.skillCount} skills`);
   },