sonamu 0.4.10 → 0.4.12

package/dist/{chunk-QT3GBIMP.js → chunk-INTZUNZ6.js}

@@ -2,7 +2,7 @@
 
 
 
-var _chunkE2I4OSFYjs = require('./chunk-E2I4OSFY.js');
+var _chunkZLFDB43Jjs = require('./chunk-ZLFDB43J.js');
 
 // src/database/upsert-builder.ts
 var _uuid = require('uuid');
@@ -20,7 +20,7 @@ async function batchUpdate(db, tableName, ids, rows, chunkSize = 50, trx = null)
   };
   if (trx) {
     for (const chunk of chunks) {
-      await executeUpdate(chunk, _chunkE2I4OSFYjs.DB.toClient(trx));
+      await executeUpdate(chunk, _chunkZLFDB43Jjs.DB.toClient(trx));
     }
   } else {
     await db.trx(async (newTrx) => {
@@ -87,7 +87,7 @@ var UpsertBuilder = class {
     if (table === void 0) {
       const tableSpec = (() => {
         try {
-          return _chunkE2I4OSFYjs.EntityManager.getTableSpec(tableName);
+          return _chunkZLFDB43Jjs.EntityManager.getTableSpec(tableName);
         } catch (e) {
           return null;
         }
@@ -119,7 +119,7 @@ var UpsertBuilder = class {
         return null;
       }
       return uniqueKeyArray.join("---delimiter--");
-    }).filter(_chunkE2I4OSFYjs.nonNullable);
+    }).filter(_chunkZLFDB43Jjs.nonNullable);
     const uuid = (() => {
       if (uniqueKeys.length > 0) {
         for (const uniqueKey of uniqueKeys) {
@@ -180,7 +180,7 @@ var UpsertBuilder = class {
     )) {
       throw new Error(`${tableName} \uD574\uACB0\uB418\uC9C0 \uC54A\uC740 \uCC38\uC870\uAC00 \uC788\uC2B5\uB2C8\uB2E4.`);
     }
-    const wdb = _chunkE2I4OSFYjs.DB.toClient(_wdb);
+    const wdb = _chunkZLFDB43Jjs.DB.toClient(_wdb);
     const { references, refTables } = Array.from(this.tables).reduce(
       (r, [, table2]) => {
         const reference = Array.from(table2.references.values()).find(
@@ -264,7 +264,7 @@ var UpsertBuilder = class {
       return row;
     });
     await batchUpdate(
-      _chunkE2I4OSFYjs.DB.toClient(wdb),
+      _chunkZLFDB43Jjs.DB.toClient(wdb),
       tableName,
       whereColumns,
       rows,
@@ -277,4 +277,4 @@ var UpsertBuilder = class {
 
 
 exports.isRefField = isRefField; exports.UpsertBuilder = UpsertBuilder;
-//# sourceMappingURL=chunk-QT3GBIMP.js.map
+//# sourceMappingURL=chunk-INTZUNZ6.js.map

package/dist/{chunk-IPFCELQ3.mjs → chunk-JQJTQQ7D.mjs}

@@ -1,6 +1,6 @@
 import {
   DB
-} from "./chunk-EEUCHV4P.mjs";
+} from "./chunk-LNZTU4JC.mjs";
 
 // src/database/base-model.ts
 import { DateTime } from "luxon";
@@ -228,4 +228,4 @@ var BaseModelClassAbstract = class {
 export {
   BaseModelClassAbstract
 };
-//# sourceMappingURL=chunk-IPFCELQ3.mjs.map
+//# sourceMappingURL=chunk-JQJTQQ7D.mjs.map

package/dist/{chunk-EEUCHV4P.mjs → chunk-LNZTU4JC.mjs}

@@ -187,7 +187,17 @@ var TemplateOptions = z.object({
     entityId: z.string()
   }),
   service: z.object({
-    entityId: z.string()
+    namesRecord: z.object({
+      fs: z.string(),
+      fsPlural: z.string(),
+      camel: z.string(),
+      camelPlural: z.string(),
+      capital: z.string(),
+      capitalPlural: z.string(),
+      upper: z.string(),
+      constant: z.string()
+    }),
+    modelTsPath: z.string()
   }),
   view_list: z.object({
     entityId: z.string(),
@@ -765,7 +775,7 @@ function api(options = {}) {
     const modelName = target.constructor.name.match(/(.+)Class$/)[1];
     const methodName = propertyKey;
     const defaultPath = `/${inflection.camelize(
-      modelName.replace(/Model$/, ""),
+      modelName.replace(/Model$/, "").replace(/Frame$/, ""),
       true
     )}/${inflection.camelize(propertyKey, true)}`;
     const api2 = {
@@ -4005,14 +4015,13 @@ var Template__service = class extends Template {
       path: `${names.fs}/${names.fs}.service.ts`
     };
   }
-  render({ entityId }, apis) {
-    const names = EntityManager.getNamesFromId(entityId);
+  render({ namesRecord }, apis) {
     const { lines, importKeys } = this.getTypeSource(apis);
     const hasAxiosProgressEvent = apis.find(
       (api2) => (api2.options.clients ?? []).includes("axios-multipart")
     );
     return {
-      ...this.getTargetAndPath(names),
+      ...this.getTargetAndPath(namesRecord),
       body: lines.join("\n"),
       importKeys: importKeys.filter(
         (key) => ["ListResult"].includes(key) === false
@@ -4099,7 +4108,7 @@ var Template__service = class extends Template {
           }
         }).join("\n");
       }).join("\n\n");
-      return `export namespace ${modelName.replace(/Model$/, "Service")} {
+      return `export namespace ${modelName.replace(/Model$/, "Service").replace(/Frame$/, "Service")} {
 ${methodCodes}
 }`;
     }).join("\n\n");
@@ -5348,7 +5357,7 @@ var Syncer = class {
     console.log("Changed Files: ", diffFiles);
     const diffGroups = _13.groupBy(diffFiles, (r) => {
       const matched = r.match(
-        /\.(model|types|functions|entity|generated)\.[tj]s/
+        /\.(model|types|functions|entity|generated|frame)\.[tj]s/
       );
       return matched[1];
     });
@@ -5382,12 +5391,38 @@ var Syncer = class {
       );
       await this.actionSyncFilesToTargets(tsPaths);
     }
-    if (diffTypes.includes("model")) {
-      const entityIds = this.getEntityIdFromPath(diffGroups["model"]);
+    if (diffTypes.includes("model") || diffTypes.includes("frame")) {
       console.log("// \uC561\uC158: \uC11C\uBE44\uC2A4 \uC0DD\uC131");
-      await this.actionGenerateServices(entityIds);
+      const mergedGroup = [
+        ...diffGroups["model"] ?? [],
+        ...diffGroups["frame"] ?? []
+      ];
+      const params = mergedGroup.map((modelPath) => {
+        if (modelPath.endsWith(".model.js")) {
+          const entityId = this.getEntityIdFromPath([modelPath])[0];
+          return {
+            namesRecord: EntityManager.getNamesFromId(entityId),
+            modelTsPath: path5.join(
+              Sonamu.apiRootPath,
+              modelPath.replace("/dist/", "/src/").replace(".model.js", ".model.ts")
+            )
+          };
+        }
+        if (modelPath.endsWith("frame.js")) {
+          const [, frameName] = modelPath.match(/.+\/(.+)\.frame.js$/) ?? [];
+          return {
+            namesRecord: EntityManager.getNamesFromId(frameName),
+            modelTsPath: path5.join(
+              Sonamu.apiRootPath,
+              modelPath.replace("/dist/", "/src/").replace(".frame.js", ".frame.ts")
+            )
+          };
+        }
+        throw new Error("not reachable");
+      });
+      await this.actionGenerateServices(params);
       console.log("// \uC561\uC158: HTTP\uD30C\uC77C \uC0DD\uC131");
-      await this.actionGenerateHttps(entityIds);
+      await this.actionGenerateHttps();
     }
     await this.saveChecksums(currentChecksums);
     this.isSyncing = false;
@@ -5408,25 +5443,19 @@ var Syncer = class {
       this.generateTemplate("generated", {}, { overwrite: true })
     ])).flat().flat();
   }
-  async actionGenerateServices(entityIds) {
+  async actionGenerateServices(paramsArray) {
     return (await Promise.all(
-      entityIds.map(
-        async (entityId) => this.generateTemplate(
-          "service",
-          {
-            entityId
-          },
-          {
-            overwrite: true
-          }
-        )
+      paramsArray.map(
+        async (params) => this.generateTemplate("service", params, {
+          overwrite: true
+        })
       )
     )).flat().flat();
   }
-  async actionGenerateHttps(entityIds) {
+  async actionGenerateHttps() {
     const [res] = await this.generateTemplate(
       "generated_http",
-      { entityId: entityIds[0] },
+      {},
       { overwrite: true }
     );
     return res;
@@ -5482,7 +5511,8 @@ var Syncer = class {
       generated: Sonamu.apiRootPath + "/src/application/sonamu.generated.ts",
       functions: Sonamu.apiRootPath + "/src/application/**/*.functions.ts",
       /* compiled-JS 체크 */
-      model: Sonamu.apiRootPath + "/dist/application/**/*.model.js"
+      model: Sonamu.apiRootPath + "/dist/application/**/*.model.js",
+      frame: Sonamu.apiRootPath + "/dist/application/**/*.frame.js"
     };
     const filePaths = (await Promise.all(
       Object.entries(PatternGroup).map(async ([_fileType, pattern]) => {
@@ -5593,6 +5623,9 @@ var Syncer = class {
         (method) => method.modelName === api2.modelName && method.methodName === api2.methodName
       );
     });
+    if (currentModelApis.length === 0) {
+      throw new Error(`\uD604\uC7AC \uD30C\uC77C\uC5D0 \uC0AC\uC804 \uB4F1\uB85D\uB41C API\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4. ${filePath}`);
+    }
     const extendedApis = currentModelApis.map((api2) => {
       const foundMethod = methods.find(
         (method) => method.modelName === api2.modelName && method.methodName === api2.methodName
@@ -5754,7 +5787,7 @@ var Syncer = class {
   async autoloadApis() {
     const pathPattern = path5.join(
       Sonamu.apiRootPath,
-      "/src/application/**/*.model.ts"
+      "/src/application/**/*.{model,frame}.ts"
     );
     const filePaths = await globAsync(pathPattern);
     const result = await Promise.all(
@@ -5766,7 +5799,7 @@ var Syncer = class {
   async autoloadModels() {
     const pathPattern = path5.join(
       Sonamu.apiRootPath,
-      "dist/application/**/*.model.js"
+      "dist/application/**/*.{model,frame}.js"
     );
     const filePaths = (await globAsync(pathPattern)).filter((path9) => {
       const srcPath = path9.replace("/dist/", "/src/").replace(".js", ".ts");
@@ -5775,7 +5808,9 @@ var Syncer = class {
     const modules = await importMultiple(filePaths);
     const functions = modules.map(({ imported }) => Object.entries(imported)).flat();
     this.models = Object.fromEntries(
-      functions.filter(([name]) => name.endsWith("Model"))
+      functions.filter(
+        ([name]) => name.endsWith("Model") || name.endsWith("Frame")
+      )
     );
     return this.models;
   }
@@ -5842,18 +5877,12 @@ var Syncer = class {
   async renderTemplate(key, options) {
     const template = this.getTemplate(key);
     let extra = [];
-    if (["service", "generated_http", "model", "view_list", "view_form"].includes(
-      key
-    )) {
+    if (key === "service") {
+      const { modelTsPath } = options;
+      extra = [await this.readApisFromFile(modelTsPath)];
+    } else if (["model", "view_list", "view_form"].includes(key)) {
       const entityId = options.entityId;
-      if (key === "service" || key === "generated_http") {
-        const entity = EntityManager.get(entityId);
-        const modelTsPath = `${path5.join(
-          Sonamu.apiRootPath,
-          "/src/application"
-        )}/${entity.names.fs}/${entity.names.fs}.model.ts`;
-        extra = [await this.readApisFromFile(modelTsPath)];
-      } else if (key === "view_list" || key === "model") {
+      if (key === "view_list" || key === "model") {
         const columnsNode = await this.getColumnsNode(entityId, "A");
         const listParamsZodType = await this.getZodTypeById(
           `${entityId}ListParams`
@@ -6286,7 +6315,7 @@ var Syncer = class {
     await EntityManager.reload();
     await Promise.all([
       this.actionGenerateSchemas(),
-      ...form.entityId === void 0 ? [
+      ...form.parentId === void 0 ? [
         this.generateTemplate("init_types", {
           entityId: form.entityId
         })
@@ -7540,4 +7569,4 @@ export {
   isTest,
   Sonamu
 };
-//# sourceMappingURL=chunk-EEUCHV4P.mjs.map
+//# sourceMappingURL=chunk-LNZTU4JC.mjs.map