@weclapp/sdk 2.0.0-dev.58 → 2.0.0-dev.59

package/dist/cli.js

@@ -1155,6 +1155,7 @@ const generateArray = (values) => {
 
 // Only functions matching this regex are included in the generation.
 const FILTER_REGEX = /^(some|count|create|remove|unique|update)$/;
+const SOME_FILTER_REGEX = /^(some)$/;
 /**
  * Generates for each function a map with the entity-name as key and service type as value.
  * E.g. WServicesWith[Function] where [Function] may be something like "some" or "create".
@@ -1163,6 +1164,7 @@ const FILTER_REGEX = /^(some|count|create|remove|unique|update)$/;
  */
 const generateGroupedServices = (services) => {
     const entityDescriptors = new Map();
+    const someQueryDescriptors = new Map();
     for (const service of services) {
         for (const fn of service.functions) {
             if (!FILTER_REGEX.test(fn.name)) {
@@ -1176,17 +1178,28 @@ const generateGroupedServices = (services) => {
                     type: `${pascalCase(service.name)}Service_${pascalCase(fn.name)}`
                 }
             ]);
+            if (SOME_FILTER_REGEX.test(fn.name)) {
+                someQueryDescriptors.set(fn.name, [
+                    ...(someQueryDescriptors.get(fn.name) ?? []),
+                    {
+                        name: service.name,
+                        required: true,
+                        type: `${pascalCase(service.name)}Service_${pascalCase(fn.name)}_Query`
+                    }
+                ]);
+            }
         }
     }
-    const descriptors = [...entityDescriptors.entries()];
+    const entityDescriptorEntries = [...entityDescriptors.entries()];
+    const someQueryDescriptorEntries = [...someQueryDescriptors.entries()];
     const typeGuards = [];
-    for (const [name] of descriptors) {
+    for (const [name] of entityDescriptorEntries) {
         const constant = camelCase(`wServiceWith_${name}_Names`);
         const service = pascalCase(`WServiceWith_${name}`);
         const guard = `(service: string | undefined): service is ${service} =>\n${indent(`${constant}.includes(service as ${service});`)}`;
         typeGuards.push(`export const is${service} = ${guard}`);
     }
-    return generateStatements(...descriptors.map(([name, props]) => generateInterface(pascalCase(`WServicesWith_${name}`), props)), ...descriptors.map(([name]) => generateType(pascalCase(`WServiceWith_${name}`), `keyof ${pascalCase(`WServicesWith_${name}`)}`)), ...descriptors.map(([name, props]) => {
+    return generateStatements(...entityDescriptorEntries.map(([name, props]) => generateInterface(pascalCase(`WServicesWith_${name}`), props)), ...entityDescriptorEntries.map(([name]) => generateType(pascalCase(`WServiceWith_${name}`), `keyof ${pascalCase(`WServicesWith_${name}`)}`)), ...someQueryDescriptorEntries.map(([name, props]) => generateInterface(pascalCase(`WServicesWith_${name}_Query`), props)), ...someQueryDescriptorEntries.map(([name]) => generateType(pascalCase(`WServiceWith_${name}_Query`), `keyof ${pascalCase(`WServicesWith_${name}_Query`)}`)), ...entityDescriptorEntries.map(([name, props]) => {
         const constant = camelCase(`wServiceWith_${name}_Names`);
         const type = pascalCase(`WServiceWith_${name}`);
         const value = generateArray(props.map((v) => v.name));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@weclapp/sdk",
-  "version": "2.0.0-dev.58",
+  "version": "2.0.0-dev.59",
   "description": "weclapp SDK Generator",
   "author": "weclapp",
   "sideEffects": false,