add schemas for first/last

nirinchev · nirinchev · commit 39324066aaf7 · 2025-06-04T11:23:59.000+02:00
diff --git a/packages/mql-typescript/mongo-php-library b/packages/mql-typescript/mongo-php-library
@@ -1 +1 @@
-Subproject commit b9b1d19f73fb8df972051136af80f0b61a87cee8
+Subproject commit c2b1ee5233ee16d07a1541b381184bfcdfae9cf2
diff --git a/packages/mql-typescript/src/driverSchema/staticSchemas.ts b/packages/mql-typescript/src/driverSchema/staticSchemas.ts
@@ -1468,6 +1468,22 @@ const staticSchemas: SchemaMap = {
         },
       },
     },
+    first: {
+      collectionName: 'collection',
+      schema: {
+        items: {
+          types: [{ bsonType: 'Array', types: [{ bsonType: 'String' }] }],
+        },
+      },
+    },
+    last: {
+      collectionName: 'collection',
+      schema: {
+        items: {
+          types: [{ bsonType: 'Array', types: [{ bsonType: 'String' }] }],
+        },
+      },
+    },
   },
   query: {
     and: inventorySchema,
diff --git a/packages/mql-typescript/src/schemaGenerator.ts b/packages/mql-typescript/src/schemaGenerator.ts
@@ -464,6 +464,7 @@ export class SchemaGenerator extends GeneratorBase {
                     mergedArgs.push(arg);
                     continue;
                   }
+
                   if (arg.description) {
                     this.emitComment(arg.description);
                   }
@@ -555,11 +556,7 @@ export class SchemaGenerator extends GeneratorBase {
       this.emit(
         `\nexport type ${this.toTypeName(name)}${
           isTemplated ? '<S>' : ''
-        } = |` +
-          [...new Set(interfaces)]
-            .map((i) => `(${i}${i.endsWith('_S') ? '<S>' : ''})`)
-            .join('|') +
-          ';',
+        } = ${[...new Set(interfaces)].join('|')};`,
       );
     }
   }
diff --git a/packages/mql-typescript/src/testGenerator/testGenerator.ts b/packages/mql-typescript/src/testGenerator/testGenerator.ts
@@ -131,13 +131,6 @@ export class TestGenerator extends GeneratorBase {
     operator: string,
     test: TestType,
   ): Promise<void> {
-    if (!test.link) {
-      this.emit(
-        `// TODO: No docs reference found for ${operator}.${test.name}\n`,
-      );
-      return;
-    }
-
     if (!test.pipeline) {
       this.emit(`// TODO: No pipeline found for ${operator}.${test.name}\n`);
       return;
@@ -189,9 +182,9 @@ export class TestGenerator extends GeneratorBase {
   protected override async generateImpl(yamlFiles: YamlFiles): Promise<void> {
     for await (const file of yamlFiles) {
       if (
-        // file.category !== 'query' &&
-        // file.category !== 'expression' &&
-        // file.category !== 'accumulator' &&
+        file.category !== 'query' &&
+        file.category !== 'expression' &&
+        file.category !== 'accumulator' &&
         file.category !== 'search'
       ) {
         // TODO: enable for others
diff --git a/packages/mql-typescript/tests/expression/first.spec.ts b/packages/mql-typescript/tests/expression/first.spec.ts
@@ -5,5 +5,11 @@ import * as bson from 'bson';
  * Use in $addFields Stage
  */
 function test0() {
-  // TODO: No docs reference found for first.Use in $addFields Stage
+  type collection = {
+    items: Array<string>;
+  };
+
+  const aggregation: schema.Pipeline<collection> = [
+    { $addFields: { firstItem: { $first: '$items' } } },
+  ];
 }
diff --git a/packages/mql-typescript/tests/expression/last.spec.ts b/packages/mql-typescript/tests/expression/last.spec.ts
@@ -5,5 +5,11 @@ import * as bson from 'bson';
  * Use in $addFields Stage
  */
 function test0() {
-  // TODO: No docs reference found for last.Use in $addFields Stage
+  type collection = {
+    items: Array<string>;
+  };
+
+  const aggregation: schema.Pipeline<collection> = [
+    { $addFields: { lastItem: { $last: '$items' } } },
+  ];
 }

Original file line number	Diff line number	Diff line change
`@@ -464,6 +464,7 @@ export class SchemaGenerator extends GeneratorBase {`
`464`	`464`	`mergedArgs.push(arg);`
`465`	`465`	`continue;`
`466`	`466`	`}`
	`467`	`+`
`467`	`468`	`if (arg.description) {`
`468`	`469`	`this.emitComment(arg.description);`
`469`	`470`	`}`
`@@ -555,11 +556,7 @@ export class SchemaGenerator extends GeneratorBase {`
`555`	`556`	`this.emit(`
`556`	`557`	`\nexport type ${this.toTypeName(name)}${
`557`	`558`	`isTemplated ? '<S>' : ''`
`558`		- } = \|` +
`559`		`- [...new Set(interfaces)]`
`560`		- .map((i) => `(${i}${i.endsWith('_S') ? '<S>' : ''})`)
`561`		`- .join('\|') +`
`562`		`- ';',`
	`559`	+ } = ${[...new Set(interfaces)].join('\|')};`,
`563`	`560`	`);`
`564`	`561`	`}`
`565`	`562`	`}`