Add support for using *LIBL with DCLF in CL

Signed-off-by: worksofliam <[email protected]>

Author: worksofliam

cli/src/targets.ts

@@ -688,6 +688,10 @@ export class Targets {
 		files.forEach(def => {
 			const possibleObject = def.file;
 			if (possibleObject) {
+				if (possibleObject.library?.toUpperCase() === `*LIBL`) {
+					possibleObject.library = undefined; // This means lookup as normal
+				}
+
 				if (possibleObject.library) {
 					this.logger.fileLog(ileObject.relativePath, {
 						message: `Definition to ${possibleObject.library}/${possibleObject.name} ignored due to qualified path.`,

cli/test/cldclf.test.ts

@@ -0,0 +1,45 @@
+import { beforeAll, describe, expect, test } from 'vitest';
+
+import { Targets } from '../src/targets'
+import { setupFixture } from './fixtures/projects';
+import { ReadFileSystem } from '../src/readFileSystem';
+
+describe(`CL with DCLF`, () => {
+  const project = setupFixture(`cldclf`);
+  
+  const fs = new ReadFileSystem();
+  const targets = new Targets(project.cwd, fs);
+
+  beforeAll(async () => {
+    project.setup();
+    await targets.loadProject();
+
+    expect(targets.getTargets().length).toBeGreaterThan(0);
+    targets.resolveBinder();
+  });
+
+  test(`Objects are loaded`, () => {
+    expect(targets).toBeDefined();
+    expect(targets.binderRequired()).toBeFalsy();
+
+    const targetObjects = targets.getTargets();
+
+    expect(targetObjects.length).toBe(2);
+
+    expect(targetObjects.some(t => t.systemName === `APGM` && t.type === `PGM` && t.extension === `clle`)).toBeTruthy();
+    expect(targetObjects.some(t => t.systemName === `DEPARTMENT` && t.type === `FILE` && t.extension === `table`)).toBeTruthy();
+  });
+
+  test(`CL has valid dependency`, () => {
+    const apgm = targets.getTarget({systemName: `APGM`, type: `PGM`});
+    expect(apgm).toBeDefined();
+
+    const logs = targets.logger.getLogsFor(apgm.relativePath);
+    console.log(logs);
+    expect(logs.length).toBe(0);
+
+    expect(apgm.deps.length).toBe(1);
+    expect(apgm.deps[0].systemName).toBe(`DEPARTMENT`);
+    expect(apgm.deps[0].type).toBe(`FILE`);
+  });
+});

cli/test/fixtures/cldclf/apgm.pgm.clle

@@ -0,0 +1,3 @@
+PGM
+  DCLF FILE(*LIBL/DEPARTMENT) OPNID(SAVRSTLIB)
+ENDPGM

cli/test/fixtures/cldclf/department.table

@@ -0,0 +1,29 @@
+--https://www.ibm.com/docs/en/i/7.3?topic=tables-department-table-department
+
+CREATE OR REPLACE TABLE DEPARTMENT
+      (DEPTNO    CHAR(3)           NOT NULL,
+       DEPTNAME  VARCHAR(36)       NOT NULL,
+       MGRNO     CHAR(6)           NOT NULL,
+       ADMRDEPT  CHAR(3)           NOT NULL, 
+       LOCATION  CHAR(16)          NOT NULL,
+       PRIMARY KEY (DEPTNO));
+
+ALTER TABLE DEPARTMENT
+      ADD FOREIGN KEY ROD (ADMRDEPT)
+          REFERENCES DEPARTMENT
+          ON DELETE CASCADE;
+
+-- Remove circular reference
+--ALTER TABLE DEPARTMENT
+--      ADD FOREIGN KEY RDE (MGRNO)
+--          REFERENCES EMPLOYEE
+--          ON DELETE SET NULL;
+
+-- CREATE UNIQUE INDEX XDEPT1
+--        ON DEPARTMENT (DEPTNO);
+
+-- CREATE INDEX XDEPT2
+--        ON DEPARTMENT (MGRNO);
+
+-- CREATE INDEX XDEPT3
+--        ON DEPARTMENT (ADMRDEPT);