swallowkit 1.0.0-beta.5 → 1.0.0-beta.6

package/dist/core/scaffold/functions-generator.js

@@ -16,224 +16,224 @@ function generateCompactAzureFunctionsCRUD(model, sharedPackageName) {
     const modelCamel = (0, model_parser_1.toCamelCase)(modelName);
     const modelKebab = (0, model_parser_1.toKebabCase)(modelName);
     const schemaName = model.schemaName;
-    return `import { app, HttpRequest, HttpResponseInit, InvocationContext } from '@azure/functions';
-import { z } from 'zod/v4';
-import crypto from 'crypto';
-import { ${schemaName} } from '${sharedPackageName}';
-
-const containerName = '${modelName}s';
-
-// GET /api/${modelCamel} - 全件取得
-app.http('${modelCamel}-get-all', {
-  methods: ['GET'],
-  route: '${modelCamel}',
-  authLevel: 'anonymous',
-  extraInputs: [
-    {
-      type: 'cosmosDB',
-      name: 'cosmosInput',
-      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
-      containerName,
-      connection: 'CosmosDBConnection',
-      sqlQuery: 'SELECT * FROM c',
-    },
-  ],
-  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
-    try {
-      const documents = context.extraInputs.get('cosmosInput') as any[];
-
-      if (!documents || !Array.isArray(documents)) {
-        return { status: 200, jsonBody: [] };
-      }
-
-      const validated = z.array(${schemaName}).parse(documents);
-      context.log(\`Fetched \${validated.length} items from \${containerName}\`);
-
-      return { status: 200, jsonBody: validated };
-    } catch (error) {
-      context.error(\`Error fetching from \${containerName}:\`, error);
-      return { status: 500, jsonBody: { error: 'Failed to fetch items' } };
-    }
-  },
-});
-
-// GET /api/${modelCamel}/{id} - ID指定取得
-app.http('${modelCamel}-get-by-id', {
-  methods: ['GET'],
-  route: '${modelCamel}/{id}',
-  authLevel: 'anonymous',
-  extraInputs: [
-    {
-      type: 'cosmosDB',
-      name: 'cosmosInput',
-      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
-      containerName,
-      connection: 'CosmosDBConnection',
-      id: '{id}',
-      partitionKey: '{id}',
-    },
-  ],
-  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
-    try {
-      const document = context.extraInputs.get('cosmosInput');
-
-      if (!document) {
-        return { status: 404, jsonBody: { error: 'Item not found' } };
-      }
-
-      const validated = ${schemaName}.parse(document);
-      return { status: 200, jsonBody: validated };
-    } catch (error) {
-      context.error(\`Error fetching item from \${containerName}:\`, error);
-      return { status: 500, jsonBody: { error: 'Failed to fetch item' } };
-    }
-  },
-});
-
-// POST /api/${modelCamel} - 新規作成
-app.http('${modelCamel}-create', {
-  methods: ['POST'],
-  route: '${modelCamel}',
-  authLevel: 'anonymous',
-  extraOutputs: [
-    {
-      type: 'cosmosDB',
-      name: 'cosmosOutput',
-      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
-      containerName,
-      connection: 'CosmosDBConnection',
-      createIfNotExists: true,
-    },
-  ],
-  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
-    try {
-      const body = await request.json() as any;
-
-      const { id, createdAt, updatedAt, ...userData } = body;
-      const now = new Date().toISOString();
-      const dataWithManagedFields = {
-        ...userData,
-        id: id || crypto.randomUUID(),
-        createdAt: now,
-        updatedAt: now,
-      };
-
-      const result = ${schemaName}.safeParse(dataWithManagedFields);
-
-      if (!result.success) {
-        context.error('Validation failed:', result.error.issues);
-        return { status: 400, jsonBody: { error: 'Validation failed', details: result.error.issues } };
-      }
-
-      context.extraOutputs.set('cosmosOutput', result.data);
-      return { status: 201, jsonBody: result.data };
-    } catch (error) {
-      context.error(\`Error creating item in \${containerName}:\`, error);
-      return { status: 500, jsonBody: { error: 'Failed to create item' } };
-    }
-  },
-});
-
-// PUT /api/${modelCamel}/{id} - 更新
-app.http('${modelCamel}-update', {
-  methods: ['PUT'],
-  route: '${modelCamel}/{id}',
-  authLevel: 'anonymous',
-  extraInputs: [
-    {
-      type: 'cosmosDB',
-      name: 'cosmosInput',
-      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
-      containerName,
-      connection: 'CosmosDBConnection',
-      id: '{id}',
-      partitionKey: '{id}',
-    },
-  ],
-  extraOutputs: [
-    {
-      type: 'cosmosDB',
-      name: 'cosmosOutput',
-      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
-      containerName,
-      connection: 'CosmosDBConnection',
-    },
-  ],
-  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
-    try {
-      const id = request.params.id;
-      if (!id) {
-        return { status: 400, jsonBody: { error: 'ID is required' } };
-      }
-
-      const existingDocument = context.extraInputs.get('cosmosInput') as any;
-      if (!existingDocument) {
-        return { status: 404, jsonBody: { error: 'Item not found' } };
-      }
-
-      const body = await request.json() as any;
-      const { createdAt, updatedAt, ...userData } = body;
-
-      const dataWithManagedFields = {
-        ...userData,
-        id,
-        createdAt: existingDocument.createdAt,
-        updatedAt: new Date().toISOString(),
-      };
-
-      const result = ${schemaName}.safeParse(dataWithManagedFields);
-
-      if (!result.success) {
-        context.error('Validation failed:', result.error.issues);
-        return { status: 400, jsonBody: { error: 'Validation failed', details: result.error.issues } };
-      }
-
-      context.extraOutputs.set('cosmosOutput', result.data);
-      return { status: 200, jsonBody: result.data };
-    } catch (error) {
-      context.error(\`Error updating item in \${containerName}:\`, error);
-      return { status: 500, jsonBody: { error: 'Failed to update item' } };
-    }
-  },
-});
-
-// DELETE /api/${modelCamel}/{id} - 削除
-app.http('${modelCamel}-delete', {
-  methods: ['DELETE'],
-  route: '${modelCamel}/{id}',
-  authLevel: 'anonymous',
-  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
-    try {
-      const id = request.params.id;
-      if (!id) {
-        return { status: 400, jsonBody: { error: 'ID is required' } };
-      }
-
-      const { CosmosClient } = await import('@azure/cosmos');
-      const endpoint = process.env.CosmosDBConnection__accountEndpoint;
-      let client: InstanceType<typeof CosmosClient>;
-      if (endpoint) {
-        const { DefaultAzureCredential } = await import('@azure/identity');
-        client = new CosmosClient({ endpoint, aadCredentials: new DefaultAzureCredential() });
-      } else {
-        client = new CosmosClient(process.env.CosmosDBConnection!);
-      }
-      const database = client.database(process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase');
-      const container = database.container(containerName);
-
-      await container.item(id, id).delete();
-      context.log(\`Deleted item \${id} from \${containerName}\`);
-
-      return { status: 204 };
-    } catch (error: any) {
-      if (error.code === 404) {
-        return { status: 404, jsonBody: { error: 'Item not found' } };
-      }
-      context.error(\`Error deleting item from \${containerName}:\`, error);
-      return { status: 500, jsonBody: { error: 'Failed to delete item' } };
-    }
-  },
-});
+    return `import { app, HttpRequest, HttpResponseInit, InvocationContext } from '@azure/functions';
+import { z } from 'zod/v4';
+import crypto from 'crypto';
+import { ${schemaName} } from '${sharedPackageName}';
+
+const containerName = '${modelName}s';
+
+// GET /api/${modelCamel} - 全件取得
+app.http('${modelCamel}-get-all', {
+  methods: ['GET'],
+  route: '${modelCamel}',
+  authLevel: 'anonymous',
+  extraInputs: [
+    {
+      type: 'cosmosDB',
+      name: 'cosmosInput',
+      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
+      containerName,
+      connection: 'CosmosDBConnection',
+      sqlQuery: 'SELECT * FROM c',
+    },
+  ],
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {
+      const documents = context.extraInputs.get('cosmosInput') as any[];
+
+      if (!documents || !Array.isArray(documents)) {
+        return { status: 200, jsonBody: [] };
+      }
+
+      const validated = z.array(${schemaName}).parse(documents);
+      context.log(\`Fetched \${validated.length} items from \${containerName}\`);
+
+      return { status: 200, jsonBody: validated };
+    } catch (error) {
+      context.error(\`Error fetching from \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to fetch items' } };
+    }
+  },
+});
+
+// GET /api/${modelCamel}/{id} - ID指定取得
+app.http('${modelCamel}-get-by-id', {
+  methods: ['GET'],
+  route: '${modelCamel}/{id}',
+  authLevel: 'anonymous',
+  extraInputs: [
+    {
+      type: 'cosmosDB',
+      name: 'cosmosInput',
+      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
+      containerName,
+      connection: 'CosmosDBConnection',
+      id: '{id}',
+      partitionKey: '{id}',
+    },
+  ],
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {
+      const document = context.extraInputs.get('cosmosInput');
+
+      if (!document) {
+        return { status: 404, jsonBody: { error: 'Item not found' } };
+      }
+
+      const validated = ${schemaName}.parse(document);
+      return { status: 200, jsonBody: validated };
+    } catch (error) {
+      context.error(\`Error fetching item from \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to fetch item' } };
+    }
+  },
+});
+
+// POST /api/${modelCamel} - 新規作成
+app.http('${modelCamel}-create', {
+  methods: ['POST'],
+  route: '${modelCamel}',
+  authLevel: 'anonymous',
+  extraOutputs: [
+    {
+      type: 'cosmosDB',
+      name: 'cosmosOutput',
+      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
+      containerName,
+      connection: 'CosmosDBConnection',
+      createIfNotExists: true,
+    },
+  ],
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {
+      const body = await request.json() as any;
+
+      const { id, createdAt, updatedAt, ...userData } = body;
+      const now = new Date().toISOString();
+      const dataWithManagedFields = {
+        ...userData,
+        id: id || crypto.randomUUID(),
+        createdAt: now,
+        updatedAt: now,
+      };
+
+      const result = ${schemaName}.safeParse(dataWithManagedFields);
+
+      if (!result.success) {
+        context.error('Validation failed:', result.error.issues);
+        return { status: 400, jsonBody: { error: 'Validation failed', details: result.error.issues } };
+      }
+
+      context.extraOutputs.set('cosmosOutput', result.data);
+      return { status: 201, jsonBody: result.data };
+    } catch (error) {
+      context.error(\`Error creating item in \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to create item' } };
+    }
+  },
+});
+
+// PUT /api/${modelCamel}/{id} - 更新
+app.http('${modelCamel}-update', {
+  methods: ['PUT'],
+  route: '${modelCamel}/{id}',
+  authLevel: 'anonymous',
+  extraInputs: [
+    {
+      type: 'cosmosDB',
+      name: 'cosmosInput',
+      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
+      containerName,
+      connection: 'CosmosDBConnection',
+      id: '{id}',
+      partitionKey: '{id}',
+    },
+  ],
+  extraOutputs: [
+    {
+      type: 'cosmosDB',
+      name: 'cosmosOutput',
+      databaseName: process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase',
+      containerName,
+      connection: 'CosmosDBConnection',
+    },
+  ],
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {
+      const id = request.params.id;
+      if (!id) {
+        return { status: 400, jsonBody: { error: 'ID is required' } };
+      }
+
+      const existingDocument = context.extraInputs.get('cosmosInput') as any;
+      if (!existingDocument) {
+        return { status: 404, jsonBody: { error: 'Item not found' } };
+      }
+
+      const body = await request.json() as any;
+      const { createdAt, updatedAt, ...userData } = body;
+
+      const dataWithManagedFields = {
+        ...userData,
+        id,
+        createdAt: existingDocument.createdAt,
+        updatedAt: new Date().toISOString(),
+      };
+
+      const result = ${schemaName}.safeParse(dataWithManagedFields);
+
+      if (!result.success) {
+        context.error('Validation failed:', result.error.issues);
+        return { status: 400, jsonBody: { error: 'Validation failed', details: result.error.issues } };
+      }
+
+      context.extraOutputs.set('cosmosOutput', result.data);
+      return { status: 200, jsonBody: result.data };
+    } catch (error) {
+      context.error(\`Error updating item in \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to update item' } };
+    }
+  },
+});
+
+// DELETE /api/${modelCamel}/{id} - 削除
+app.http('${modelCamel}-delete', {
+  methods: ['DELETE'],
+  route: '${modelCamel}/{id}',
+  authLevel: 'anonymous',
+  handler: async (request: HttpRequest, context: InvocationContext): Promise<HttpResponseInit> => {
+    try {
+      const id = request.params.id;
+      if (!id) {
+        return { status: 400, jsonBody: { error: 'ID is required' } };
+      }
+
+      const { CosmosClient } = await import('@azure/cosmos');
+      const endpoint = process.env.CosmosDBConnection__accountEndpoint;
+      let client: InstanceType<typeof CosmosClient>;
+      if (endpoint) {
+        const { DefaultAzureCredential } = await import('@azure/identity');
+        client = new CosmosClient({ endpoint, aadCredentials: new DefaultAzureCredential() });
+      } else {
+        client = new CosmosClient(process.env.CosmosDBConnection!);
+      }
+      const database = client.database(process.env.COSMOS_DB_DATABASE_NAME || 'AppDatabase');
+      const container = database.container(containerName);
+
+      await container.item(id, id).delete();
+      context.log(\`Deleted item \${id} from \${containerName}\`);
+
+      return { status: 204 };
+    } catch (error: any) {
+      if (error.code === 404) {
+        return { status: 404, jsonBody: { error: 'Item not found' } };
+      }
+      context.error(\`Error deleting item from \${containerName}:\`, error);
+      return { status: 500, jsonBody: { error: 'Failed to delete item' } };
+    }
+  },
+});
 `;
 }
 //# sourceMappingURL=functions-generator.js.map

package/dist/core/scaffold/model-parser.js

@@ -328,104 +328,104 @@ async function extractFieldsFromSchema(modelPath, schemaName) {
         }
         // プロジェクトルート内に一時スクリプトファイルを作成
         const tempScript = path.join(projectRoot, `.swallowkit-parser-${Date.now()}.mjs`);
-        const scriptCode = `
-import { z } from 'zod/v4';
-
-// インライン化した依存スキーマ
-${inlinedDeps}
-// モデルファイルの内容を評価
-${modelContent}
-
-const schema = ${schemaName};
-
-// Zod v3とv4の両方に対応
-const isObject = (schema && schema._def && 
-  (schema._def.typeName === 'ZodObject' || schema.constructor?.name === 'ZodObject' || typeof schema._def.shape === 'function'));
-
-if (isObject) {
-  const shape = typeof schema._def.shape === 'function' ? schema._def.shape() : schema._def.shape;
-  const fields = Object.keys(shape).map(key => {
-    const field = shape[key];
-    let type = 'string';
-    let isOptional = false;
-    let isArray = false;
-    let enumValues = undefined;
-    
-    // ZodOptional, ZodDefault, ZodEffects を unwrap
-    let fieldDef = field;
-    const getTypeName = (def) => def?._def?.typeName || def?.constructor?.name || '';
-    
-    // 繰り返し unwrap（複数のラッパーがある場合に対応）
-    let unwrapped = false;
-    do {
-      unwrapped = false;
-      const typeName = getTypeName(fieldDef);
-      
-      if (typeName === 'ZodOptional') {
-        isOptional = true;
-        fieldDef = fieldDef._def.innerType;
-        unwrapped = true;
-      } else if (typeName === 'ZodDefault') {
-        // .default() は optional と同様に扱う
-        isOptional = true;
-        fieldDef = fieldDef._def.innerType;
-        unwrapped = true;
-      } else if (typeName === 'ZodEffects') {
-        // .min(), .max(), .regex() などの Effects を unwrap
-        fieldDef = fieldDef._def.schema;
-        unwrapped = true;
-      }
-    } while (unwrapped);
-    
-    // ZodArray をチェック
-    if (getTypeName(fieldDef) === 'ZodArray') {
-      isArray = true;
-      fieldDef = fieldDef._def.type || fieldDef._def.element;
-    }
-    
-    // 基本型を判定
-    const typeName = getTypeName(fieldDef);
-    if (typeName === 'ZodString') type = 'string';
-    else if (typeName === 'ZodNumber') type = 'number';
-    else if (typeName === 'ZodBoolean') type = 'boolean';
-    else if (typeName === 'ZodDate') type = 'date';
-    else if (typeName === 'ZodObject') type = 'object';
-    else if (typeName === 'ZodEnum' || typeName === 'ZodNativeEnum') {
-      type = 'string';
-      // enum の選択肢を取得（複数のZodバージョンに対応）
-      if (fieldDef.options) {
-        // Zod v3.23+ では options プロパティを使用
-        enumValues = Array.isArray(fieldDef.options) 
-          ? fieldDef.options 
-          : Object.values(fieldDef.options);
-      } else if (fieldDef._def.values) {
-        // 古いバージョンでは _def.values を使用
-        enumValues = Array.isArray(fieldDef._def.values) 
-          ? fieldDef._def.values 
-          : Object.values(fieldDef._def.values);
-      } else if (fieldDef._def.entries) {
-        // さらに古いバージョンでは _def.entries を使用
-        enumValues = Array.isArray(fieldDef._def.entries)
-          ? fieldDef._def.entries
-          : Object.values(fieldDef._def.entries);
-      }
-    }
-    
-    // 外部キー検出: フィールド名が <ModelName>Id のパターンの場合
-    let isForeignKey = false;
-    let referencedModel = undefined;
-    if (key.endsWith('Id') && key.length > 2 && type === 'string') {
-      // categoryId -> Category, userId -> User など
-      const modelName = key.slice(0, -2); // "Id" を除去
-      referencedModel = modelName.charAt(0).toUpperCase() + modelName.slice(1); // 先頭を大文字に
-      isForeignKey = true;
-    }
-    
-    return { name: key, type, isOptional, isArray, enumValues, isForeignKey, referencedModel };
-  });
-  
-  console.log(JSON.stringify(fields));
-}
+        const scriptCode = `
+import { z } from 'zod/v4';
+
+// インライン化した依存スキーマ
+${inlinedDeps}
+// モデルファイルの内容を評価
+${modelContent}
+
+const schema = ${schemaName};
+
+// Zod v3とv4の両方に対応
+const isObject = (schema && schema._def && 
+  (schema._def.typeName === 'ZodObject' || schema.constructor?.name === 'ZodObject' || typeof schema._def.shape === 'function'));
+
+if (isObject) {
+  const shape = typeof schema._def.shape === 'function' ? schema._def.shape() : schema._def.shape;
+  const fields = Object.keys(shape).map(key => {
+    const field = shape[key];
+    let type = 'string';
+    let isOptional = false;
+    let isArray = false;
+    let enumValues = undefined;
+    
+    // ZodOptional, ZodDefault, ZodEffects を unwrap
+    let fieldDef = field;
+    const getTypeName = (def) => def?._def?.typeName || def?.constructor?.name || '';
+    
+    // 繰り返し unwrap（複数のラッパーがある場合に対応）
+    let unwrapped = false;
+    do {
+      unwrapped = false;
+      const typeName = getTypeName(fieldDef);
+      
+      if (typeName === 'ZodOptional') {
+        isOptional = true;
+        fieldDef = fieldDef._def.innerType;
+        unwrapped = true;
+      } else if (typeName === 'ZodDefault') {
+        // .default() は optional と同様に扱う
+        isOptional = true;
+        fieldDef = fieldDef._def.innerType;
+        unwrapped = true;
+      } else if (typeName === 'ZodEffects') {
+        // .min(), .max(), .regex() などの Effects を unwrap
+        fieldDef = fieldDef._def.schema;
+        unwrapped = true;
+      }
+    } while (unwrapped);
+    
+    // ZodArray をチェック
+    if (getTypeName(fieldDef) === 'ZodArray') {
+      isArray = true;
+      fieldDef = fieldDef._def.type || fieldDef._def.element;
+    }
+    
+    // 基本型を判定
+    const typeName = getTypeName(fieldDef);
+    if (typeName === 'ZodString') type = 'string';
+    else if (typeName === 'ZodNumber') type = 'number';
+    else if (typeName === 'ZodBoolean') type = 'boolean';
+    else if (typeName === 'ZodDate') type = 'date';
+    else if (typeName === 'ZodObject') type = 'object';
+    else if (typeName === 'ZodEnum' || typeName === 'ZodNativeEnum') {
+      type = 'string';
+      // enum の選択肢を取得（複数のZodバージョンに対応）
+      if (fieldDef.options) {
+        // Zod v3.23+ では options プロパティを使用
+        enumValues = Array.isArray(fieldDef.options) 
+          ? fieldDef.options 
+          : Object.values(fieldDef.options);
+      } else if (fieldDef._def.values) {
+        // 古いバージョンでは _def.values を使用
+        enumValues = Array.isArray(fieldDef._def.values) 
+          ? fieldDef._def.values 
+          : Object.values(fieldDef._def.values);
+      } else if (fieldDef._def.entries) {
+        // さらに古いバージョンでは _def.entries を使用
+        enumValues = Array.isArray(fieldDef._def.entries)
+          ? fieldDef._def.entries
+          : Object.values(fieldDef._def.entries);
+      }
+    }
+    
+    // 外部キー検出: フィールド名が <ModelName>Id のパターンの場合
+    let isForeignKey = false;
+    let referencedModel = undefined;
+    if (key.endsWith('Id') && key.length > 2 && type === 'string') {
+      // categoryId -> Category, userId -> User など
+      const modelName = key.slice(0, -2); // "Id" を除去
+      referencedModel = modelName.charAt(0).toUpperCase() + modelName.slice(1); // 先頭を大文字に
+      isForeignKey = true;
+    }
+    
+    return { name: key, type, isOptional, isArray, enumValues, isForeignKey, referencedModel };
+  });
+  
+  console.log(JSON.stringify(fields));
+}
 `;
         writeFileSync(tempScript, scriptCode, 'utf8');
         try {