bug fix

Author: hukusuke1007

example/fdmd_output/dart_freezed/app_service/maintenance/maintenance.dart

@@ -0,0 +1,23 @@
+import '../../converters/date_time_timestamp_converter.dart';
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:freezed_annotation/freezed_annotation.dart';
+
+part 'maintenance.freezed.dart';
+part 'maintenance.g.dart';
+
+@freezed
+class Maintenance with _$Maintenance {
+  factory Maintenance({
+    required String status,
+    @DateTimeTimestampConverter() DateTime? createdAt,
+    @DateTimeTimestampConverter() DateTime? updatedAt,
+  }) = _Maintenance;
+  Maintenance._();
+
+  factory Maintenance.fromJson(Map<String, dynamic> json) =>
+      _$MaintenanceFromJson(json);
+
+  static String get collectionPath => throw UnimplementedError(); // appService/${appServiceId}/maintenance
+  static String docPath(String id) => throw UnimplementedError(); // appService/${appServiceId}/maintenance/$id
+
+}

example/fdmd_output/ts_ballcap_admin/app_service/maintenance.ts

@@ -0,0 +1,10 @@
+import { Doc, Field, Codable, Model, Timestamp, CollectionReference, Collection, firestore } from '@1amageek/ballcap-admin'
+
+export class Maintenance extends Doc {
+  static collectionReference(): CollectionReference {
+    return firestore.collection('appService').doc('v1').collection('maintenance')
+  }
+
+  @Field status: string
+
+}

example/package-lock.json

@@ -9,6 +9,6 @@
   "author": "shohei",
   "license": "MIT",
   "devDependencies": {
-    "fdmd": "0.0.19"
+    "fdmd": "0.0.21"
   }
 }

example/package.json

@@ -16,6 +16,9 @@ domains:
   - name: Master
     path: /master
     description: マスター管理
+  - name: AppService
+    path: /appService
+    description: アプリシステムの状態
 docs:
   - name: Poster
     path: /social/${socialId}/posters/${posterId}
@@ -86,6 +89,20 @@ docs:
       - field: codes
         type: string,array,nullable
         example: ['000000', FFFFFF]
+  - name: Maintenance
+    path: /appService/${appServiceId}/maintenance/${maintenanceId}
+    description: メンテナンス情報
+    codeGenerate: true
+    data:
+      - field: status
+        type: string
+        example: active
+      - field: createdAt
+        type: timestamp,nullable
+        example: '2021-09-16T13:10:52+09:00'
+      - field: updatedAt
+        type: timestamp,nullable
+        example: '2021-09-16T13:10:52+09:00'
 maps:
   - name: ThumbnailImage
     description: 画像情報

example/yaml/db.yaml

@@ -1,6 +1,6 @@
 {
   "name": "fdmd",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "firestore data modeling design tool",
   "main": "index.js",
   "bin": {

package.json

@@ -0,0 +1 @@
+npm publish

publish.sh

@@ -119,7 +119,7 @@ export class DartFreezedGeneratorRepository {
       ? fdmd.docs
           .filter((e) => Utils.isNotNull(e.name) && e.codeGenerate === true)
           .map((doc) => {
-            const domainName = Doc.getDomainNameFromPath(doc.path)
+            const domainName = Utils.camelToSnake(Doc.getDomainNameFromPath(doc.path))
             const docSnakeName = Utils.camelToSnake(doc.name)
             const docPath = `${outputPath}/${domainName}/${docSnakeName}`
             const dataFields = fdmd.getDataFields(doc)
@@ -162,9 +162,9 @@ export class DartFreezedGeneratorRepository {
       : []
     for (const data of outputDocsData) {
       const doc = data.doc
-      const domainName = Doc.getDomainNameFromPath(doc.path)
+      const domainSnakeName = Utils.camelToSnake(Doc.getDomainNameFromPath(doc.path))
       const docSnakeName = Utils.camelToSnake(doc.name)
-      const docPath = `${outputPath}/${domainName}/${docSnakeName}`
+      const docPath = `${outputPath}/${domainSnakeName}/${docSnakeName}`
       fs.mkdirSync(docPath, { recursive: true })
       const template = fs.readFileSync(`${tempPath}/dart_doc_freezed.temp`, 'utf8')
       const code = template

src/repositories/dart_freezed_generator_repository.ts

@@ -113,7 +113,7 @@ export class TsBallcapAdminGeneratorRepository {
       ? fdmd.docs
           .filter((e) => Utils.isNotNull(e.name) && e.codeGenerate === true)
           .map((doc) => {
-            const domainName = Doc.getDomainNameFromPath(doc.path)
+            const domainName = Utils.camelToSnake(Doc.getDomainNameFromPath(doc.path))
             const docSnakeName = Utils.camelToSnake(doc.name)
             const docPath = `${outputPath}/${domainName}`
             const dataFields = fdmd.getDataFields(doc)
@@ -148,6 +148,7 @@ export class TsBallcapAdminGeneratorRepository {
       : []
     for (const data of outputDocsData) {
       const doc = data.doc
+      // const domainCamelName = Utils.camelToSnake(Doc.getDomainNameFromPath(doc.path))
       const domainName = Doc.getDomainNameFromPath(doc.path)
       const docCamelName = Utils.snakeToCamel(Utils.firstCharUpper(doc.name))
       const template = fs.readFileSync(`${tempPath}/ts_ballcap_admin_doc.temp`, 'utf8')

src/repositories/ts_ballcap_admin_generator_repository.ts

@@ -16,6 +16,9 @@ domains:
   - name: Master
     path: /master
     description: マスター管理
+  - name: AppService
+    path: /appService
+    description: アプリシステムの状態
 docs:
   - name: Poster
     path: /social/${socialId}/posters/${posterId}
@@ -86,6 +89,20 @@ docs:
       - field: codes
         type: string,array,nullable
         example: ['000000', FFFFFF]
+  - name: Maintenance
+    path: /appService/${appServiceId}/maintenance/${maintenanceId}
+    description: メンテナンス情報
+    codeGenerate: true
+    data:
+      - field: status
+        type: string
+        example: active
+      - field: createdAt
+        type: timestamp,nullable
+        example: '2021-09-16T13:10:52+09:00'
+      - field: updatedAt
+        type: timestamp,nullable
+        example: '2021-09-16T13:10:52+09:00'
 maps:
   - name: ThumbnailImage
     description: 画像情報