sonamu 0.4.10 → 0.4.11

package/dist/{chunk-E2I4OSFY.js → chunk-KX4762I3.js}

@@ -189,7 +189,17 @@ var TemplateOptions = _zod.z.object({
     entityId: _zod.z.string()
   }),
   service: _zod.z.object({
-    entityId: _zod.z.string()
+    namesRecord: _zod.z.object({
+      fs: _zod.z.string(),
+      fsPlural: _zod.z.string(),
+      camel: _zod.z.string(),
+      camelPlural: _zod.z.string(),
+      capital: _zod.z.string(),
+      capitalPlural: _zod.z.string(),
+      upper: _zod.z.string(),
+      constant: _zod.z.string()
+    }),
+    modelTsPath: _zod.z.string()
   }),
   view_list: _zod.z.object({
     entityId: _zod.z.string(),
@@ -767,7 +777,7 @@ function api(options = {}) {
     const modelName = target.constructor.name.match(/(.+)Class$/)[1];
     const methodName = propertyKey;
     const defaultPath = `/${_inflection2.default.camelize(
-      modelName.replace(/Model$/, ""),
+      modelName.replace(/Model$/, "").replace(/Frame$/, ""),
       true
     )}/${_inflection2.default.camelize(propertyKey, true)}`;
     const api2 = {
@@ -4007,14 +4017,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) => (_nullishCoalesce(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
@@ -4101,7 +4110,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");
@@ -5350,7 +5359,7 @@ var Syncer = (_class4 = class {
     console.log("Changed Files: ", diffFiles);
     const diffGroups = _lodash2.default.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];
     });
@@ -5384,12 +5393,38 @@ var Syncer = (_class4 = 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 = [
+        ..._nullishCoalesce(diffGroups["model"], () => ( [])),
+        ..._nullishCoalesce(diffGroups["frame"], () => ( []))
+      ];
+      const params = mergedGroup.map((modelPath) => {
+        if (modelPath.endsWith(".model.js")) {
+          const entityId = this.getEntityIdFromPath([modelPath])[0];
+          return {
+            namesRecord: EntityManager.getNamesFromId(entityId),
+            modelTsPath: _path2.default.join(
+              Sonamu.apiRootPath,
+              modelPath.replace("/dist/", "/src/").replace(".model.js", ".model.ts")
+            )
+          };
+        }
+        if (modelPath.endsWith("frame.js")) {
+          const [, frameName] = _nullishCoalesce(modelPath.match(/.+\/(.+)\.frame.js$/), () => ( []));
+          return {
+            namesRecord: EntityManager.getNamesFromId(frameName),
+            modelTsPath: _path2.default.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;
@@ -5410,25 +5445,19 @@ var Syncer = (_class4 = 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;
@@ -5484,7 +5513,8 @@ var Syncer = (_class4 = 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]) => {
@@ -5595,6 +5625,9 @@ var Syncer = (_class4 = 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
@@ -5756,7 +5789,7 @@ var Syncer = (_class4 = class {
   async autoloadApis() {
     const pathPattern = _path2.default.join(
       Sonamu.apiRootPath,
-      "/src/application/**/*.model.ts"
+      "/src/application/**/*.{model,frame}.ts"
     );
     const filePaths = await globAsync(pathPattern);
     const result = await Promise.all(
@@ -5768,7 +5801,7 @@ var Syncer = (_class4 = class {
   async autoloadModels() {
     const pathPattern = _path2.default.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");
@@ -5777,7 +5810,9 @@ var Syncer = (_class4 = 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;
   }
@@ -5844,18 +5879,12 @@ var Syncer = (_class4 = 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 = `${_path2.default.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`
@@ -7542,4 +7571,4 @@ var Entity = (_class7 = class {
 
 
 exports.SQLDateTimeString = SQLDateTimeString; exports.zArrayable = zArrayable; exports.isIntegerProp = isIntegerProp; exports.isBigIntegerProp = isBigIntegerProp; exports.isTextProp = isTextProp; exports.isStringProp = isStringProp; exports.isEnumProp = isEnumProp; exports.isFloatProp = isFloatProp; exports.isDoubleProp = isDoubleProp; exports.isDecimalProp = isDecimalProp; exports.isBooleanProp = isBooleanProp; exports.isDateProp = isDateProp; exports.isDateTimeProp = isDateTimeProp; exports.isTimeProp = isTimeProp; exports.isTimestampProp = isTimestampProp; exports.isJsonProp = isJsonProp; exports.isUuidProp = isUuidProp; exports.isVirtualProp = isVirtualProp; exports.isRelationProp = isRelationProp; exports.isOneToOneRelationProp = isOneToOneRelationProp; exports.isBelongsToOneRelationProp = isBelongsToOneRelationProp; exports.isHasManyRelationProp = isHasManyRelationProp; exports.isManyToManyRelationProp = isManyToManyRelationProp; exports.isCustomJoinClause = isCustomJoinClause; exports.SonamuQueryMode = SonamuQueryMode; exports.isKnexError = isKnexError; exports.isKyselyError = isKyselyError; exports.ApiParamType = ApiParamType; exports.RenderingNode = RenderingNode; exports.TemplateOptions = TemplateOptions; exports.TemplateKey = TemplateKey; exports.GenerateOptions = GenerateOptions; exports.PathAndCode = PathAndCode; exports.getZodObjectFromApi = getZodObjectFromApi; exports.getZodObjectFromApiParams = getZodObjectFromApiParams; exports.getZodTypeFromApiParamType = getZodTypeFromApiParamType; exports.propNodeToZodTypeDef = propNodeToZodTypeDef; exports.getTextTypeLength = getTextTypeLength; exports.propToZodTypeDef = propToZodTypeDef; exports.zodTypeToZodCode = zodTypeToZodCode; exports.apiParamToTsCode = apiParamToTsCode; exports.apiParamTypeToTsType = apiParamTypeToTsType; exports.unwrapPromiseOnce = unwrapPromiseOnce; exports.serializeZodType = serializeZodType; exports.zodTypeToTsTypeDef = zodTypeToTsTypeDef; exports.registeredApis = registeredApis; exports.api = api; exports.SoException = SoException; exports.isSoException = isSoException; exports.BadRequestException = BadRequestException; exports.UnauthorizedException = UnauthorizedException; exports.NotFoundException = NotFoundException; exports.ServiceUnavailableException = ServiceUnavailableException; exports.InternalServerErrorException = InternalServerErrorException; exports.AlreadyProcessedException = AlreadyProcessedException; exports.DuplicateRowException = DuplicateRowException; exports.TargetNotFoundException = TargetNotFoundException; exports.globAsync = globAsync; exports.importMultiple = importMultiple; exports.findAppRootPath = findAppRootPath; exports.findApiRootPath = findApiRootPath; exports.nonNullable = nonNullable; exports.hydrate = hydrate; exports.Entity = Entity; exports.EntityManager = EntityManager; exports.asArray = asArray; exports.objToMap = objToMap; exports.KnexClient = KnexClient; exports.KyselyClient = KyselyClient; exports.DBKnexClass = DBKnexClass; exports.DBKyselyClass = DBKyselyClass; exports.DB = DB; exports.Syncer = Syncer; exports.isLocal = isLocal; exports.isRemote = isRemote; exports.isInDocker = isInDocker; exports.isDaemonServer = isDaemonServer; exports.isDevelopment = isDevelopment; exports.isStaging = isStaging; exports.isProduction = isProduction; exports.isTest = isTest; exports.Sonamu = Sonamu;
-//# sourceMappingURL=chunk-E2I4OSFY.js.map
+//# sourceMappingURL=chunk-KX4762I3.js.map