firebase-contract 0.1.0-rc.3 → 0.1.0-rc.5

package/dist/lib/_internal/generators/api/api-dto-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-dto-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/api/api-dto-generator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AAiG5E;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,QAAO,SAgBvC,CAAA"}
+{"version":3,"file":"api-dto-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/api/api-dto-generator.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AA0G5E;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,QAAO,SAkBvC,CAAA"}

package/dist/lib/_internal/generators/api/api-dto-generator.js

@@ -94,21 +94,31 @@ const decoratorsFor = (ir, field, used) => {
     }
     return out;
 };
+const jsdoc = (description, indent) => {
+    if (!description)
+        return '';
+    const lines = description.split('\n');
+    if (lines.length === 1)
+        return `${indent}/** ${lines[0]} */\n`;
+    return `${indent}/**\n${lines.map(line => `${indent} * ${line}`.trimEnd()).join('\n')}\n${indent} */\n`;
+};
 const renderDto = (ir, api, used) => {
     const fields = payloadFields(ir, api.request);
     const className = `${pascalCase(api.name)}Dto`;
+    const doc = jsdoc(api.description, '');
     if (api.request.isVoid || fields.length === 0) {
-        return `export class ${className} {}`;
+        return `${doc}export class ${className} {}`;
     }
     const members = fields
         .map(field => {
         const name = isRelation(field) ? relationFkName(field) : field.name;
         const decorators = decoratorsFor(ir, field, used).join('\n');
         const mark = field.optional ? '?' : '!';
-        return `${decorators}\n  ${name}${mark}: ${propType(ir, field)}`;
+        const nullable = field.nullable ? ' | null' : '';
+        return `${jsdoc(field.description, '  ')}${decorators}\n  ${name}${mark}: ${propType(ir, field)}${nullable}`;
     })
         .join('\n\n');
-    return `export class ${className} {\n${members}\n}`;
+    return `${doc}export class ${className} {\n${members}\n}`;
 };
 /**
  * Generates class-validator DTO classes for API endpoint requests, mirroring the
@@ -119,11 +129,13 @@ export const createApiDtoGenerator = () => ({
     name: 'api-dto',
     description: 'class-validator DTO classes for API requests',
     generate(ir, context) {
-        if (ir.apis.length === 0) {
+        // DTO は HTTP リクエストボディ用 — task / pubsub のペイロードは task-payloads が担う。
+        const httpApis = ir.apis.filter(api => api.kind === 'https' || api.kind === 'callable');
+        if (httpApis.length === 0) {
             return [];
         }
         const used = new Set();
-        const dtoBlocks = ir.apis.map(api => renderDto(ir, api, used));
+        const dtoBlocks = httpApis.map(api => renderDto(ir, api, used));
         const blocks = [...headerBlocks(context)];
         if (used.size > 0) {
             blocks.push(`import { ${[...used].sort().join(', ')} } from 'class-validator'`);

package/dist/lib/_internal/generators/api/api-validation-generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"api-validation-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/api/api-validation-generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AAsD5E;;;GAGG;AACH,eAAO,MAAM,4BAA4B,QAAO,SAa9C,CAAA"}
+{"version":3,"file":"api-validation-generator.d.ts","sourceRoot":"","sources":["../../../../../src/lib/_internal/generators/api/api-validation-generator.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiB,SAAS,EAAoB,MAAM,iBAAiB,CAAA;AAuE5E;;;GAGG;AACH,eAAO,MAAM,4BAA4B,QAAO,SAa9C,CAAA"}

package/dist/lib/_internal/generators/api/api-validation-generator.js

@@ -21,8 +21,7 @@ const payloadFields = (ir, payload) => {
     }
     return payload.fields;
 };
-const fieldSchema = (ir, field) => {
-    const name = isRelation(field) ? relationFkName(field) : field.name;
+const fieldChain = (ir, field, seen) => {
     let schema;
     if (isRelation(field)) {
         schema = SCALAR_ZOD[relationFkType(ir, field)];
@@ -35,6 +34,21 @@ const fieldSchema = (ir, field) => {
         const irEnum = ir.enums.find(e => e.name === enumName);
         schema = irEnum ? `z.enum([${irEnum.values.map(singleQuote).join(', ')}])` : 'z.string()';
     }
+    else if (field.type.kind === 'model') {
+        // Embedded value objects expand to a structural z.object so request payloads
+        // validate all the way down; cycles fall back to z.unknown().
+        const model = findModel(ir, field.type.name);
+        if (model && !seen.has(model.name)) {
+            const nested = new Set([...seen, model.name]);
+            const body = model.fields
+                .map(f => `${isRelation(f) ? relationFkName(f) : f.name}: ${fieldChain(ir, f, nested)}`)
+                .join(', ');
+            schema = `z.object({ ${body} })`;
+        }
+        else {
+            schema = 'z.unknown()';
+        }
+    }
     else {
         schema = 'z.unknown()';
     }
@@ -44,7 +58,11 @@ const fieldSchema = (ir, field) => {
         schema = `${schema}.nullable()`;
     if (field.optional)
         schema = `${schema}.optional()`;
-    return `  ${name}: ${schema},`;
+    return schema;
+};
+const fieldSchema = (ir, field) => {
+    const name = isRelation(field) ? relationFkName(field) : field.name;
+    return `  ${name}: ${fieldChain(ir, field, new Set())},`;
 };
 const renderRequestSchema = (ir, api) => {
     const name = `${pascalCase(api.name)}RequestSchema`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "firebase-contract",
-  "version": "0.1.0-rc.3",
+  "version": "0.1.0-rc.5",
   "type": "module",
   "bin": {
     "firebase-contract": "./dist/lib/cli/index.js",