sonamu 0.2.53 → 0.2.54

package/dist/bin/cli.js

@@ -11,7 +11,7 @@
 
 
 
-var _chunk5UCV2JP3js = require('../chunk-5UCV2JP3.js');
+var _chunkJOHF7PK4js = require('../chunk-JOHF7PK4.js');
 
 // src/bin/cli.ts
 var _chalk = require('chalk'); var _chalk2 = _interopRequireDefault(_chalk);
@@ -54,7 +54,7 @@ var SMD = class {
     this.table = _nullishCoalesce(table, () => ( _inflection2.default.underscore(_inflection2.default.pluralize(id))));
     if (props) {
       this.props = props.map((prop) => {
-        if (_chunk5UCV2JP3js.isEnumProp.call(void 0, prop)) {
+        if (_chunkJOHF7PK4js.isEnumProp.call(void 0, prop)) {
           if (prop.id.includes("$Model")) {
             prop.id = prop.id.replace("$Model", id);
           }
@@ -67,7 +67,7 @@ var SMD = class {
           [prop.name]: prop
         };
       }, {});
-      this.relations = props.filter((prop) => _chunk5UCV2JP3js.isRelationProp.call(void 0, prop)).reduce((result, prop) => {
+      this.relations = props.filter((prop) => _chunkJOHF7PK4js.isRelationProp.call(void 0, prop)).reduce((result, prop) => {
         return {
           ...result,
           [prop.name]: prop
@@ -112,10 +112,10 @@ var SMD = class {
         const fields2 = subsetGroup[groupKey];
         if (groupKey === "") {
           const realFields = fields2.filter(
-            (field) => !_chunk5UCV2JP3js.isVirtualProp.call(void 0, this.propsDict[field])
+            (field) => !_chunkJOHF7PK4js.isVirtualProp.call(void 0, this.propsDict[field])
           );
           const virtualFields = fields2.filter(
-            (field) => _chunk5UCV2JP3js.isVirtualProp.call(void 0, this.propsDict[field])
+            (field) => _chunkJOHF7PK4js.isVirtualProp.call(void 0, this.propsDict[field])
           );
           if (prefix === "") {
             r.select = r.select.concat(
@@ -136,7 +136,7 @@ var SMD = class {
           throw new Error(`\uC874\uC7AC\uD558\uC9C0 \uC54A\uB294 relation \uCC38\uC870 ${groupKey}`);
         }
         const relSMD = SMDManager.get(relation.with);
-        if (_chunk5UCV2JP3js.isOneToOneRelationProp.call(void 0, relation) || _chunk5UCV2JP3js.isBelongsToOneRelationProp.call(void 0, relation)) {
+        if (_chunkJOHF7PK4js.isOneToOneRelationProp.call(void 0, relation) || _chunkJOHF7PK4js.isBelongsToOneRelationProp.call(void 0, relation)) {
           const relFields = fields2.map(
             (field) => field.split(".").slice(1).join(".")
           );
@@ -154,7 +154,7 @@ var SMD = class {
             if (isAlreadyOuterJoined) {
               return "outer";
             }
-            if (_chunk5UCV2JP3js.isOneToOneRelationProp.call(void 0, relation)) {
+            if (_chunkJOHF7PK4js.isOneToOneRelationProp.call(void 0, relation)) {
               if (relation.hasJoinColumn === true && (_nullishCoalesce(relation.nullable, () => ( false))) === false) {
                 return "inner";
               } else {
@@ -184,7 +184,7 @@ var SMD = class {
             };
           } else {
             let from, to;
-            if (_chunk5UCV2JP3js.isOneToOneRelationProp.call(void 0, relation)) {
+            if (_chunkJOHF7PK4js.isOneToOneRelationProp.call(void 0, relation)) {
               if (relation.hasJoinColumn) {
                 from = `${fromTable}.${relation.name}_id`;
                 to = `${joinAs}.id`;
@@ -223,13 +223,13 @@ var SMD = class {
             r.loaders = [...r.loaders, ...convertedLoaders];
           }
           r.joins = r.joins.concat(relSubsetQuery.joins);
-        } else if (_chunk5UCV2JP3js.isHasManyRelationProp.call(void 0, relation) || _chunk5UCV2JP3js.isManyToManyRelationProp.call(void 0, relation)) {
+        } else if (_chunkJOHF7PK4js.isHasManyRelationProp.call(void 0, relation) || _chunkJOHF7PK4js.isManyToManyRelationProp.call(void 0, relation)) {
           const relFields = fields2.map(
             (field) => field.split(".").slice(1).join(".")
           );
           const relSubsetQuery = relSMD.resolveSubsetQuery("", relFields);
           let manyJoin;
-          if (_chunk5UCV2JP3js.isHasManyRelationProp.call(void 0, relation)) {
+          if (_chunkJOHF7PK4js.isHasManyRelationProp.call(void 0, relation)) {
             manyJoin = {
               fromTable: this.table,
               fromCol: "id",
@@ -237,7 +237,7 @@ var SMD = class {
               toTable: relSMD.table,
               toCol: relation.joinColumn
             };
-          } else if (_chunk5UCV2JP3js.isManyToManyRelationProp.call(void 0, relation)) {
+          } else if (_chunkJOHF7PK4js.isManyToManyRelationProp.call(void 0, relation)) {
             const [table1, table2] = relation.joinTable.split("__");
             manyJoin = {
               fromTable: this.table,
@@ -320,11 +320,11 @@ var SMD = class {
         });
       }
       const prop = smd.propsDict[key];
-      if (!_chunk5UCV2JP3js.isRelationProp.call(void 0, prop)) {
+      if (!_chunkJOHF7PK4js.isRelationProp.call(void 0, prop)) {
         throw new Error(`\uC798\uBABB\uB41C FieldExpr ${key}.${group[0]}`);
       }
       const relSMD = SMDManager.get(prop.with);
-      if (_chunk5UCV2JP3js.isBelongsToOneRelationProp.call(void 0, prop) || _chunk5UCV2JP3js.isOneToOneRelationProp.call(void 0, prop)) {
+      if (_chunkJOHF7PK4js.isBelongsToOneRelationProp.call(void 0, prop) || _chunkJOHF7PK4js.isOneToOneRelationProp.call(void 0, prop)) {
         if (group.length == 1 && (group[0] === "id" || group[0] == "id?")) {
           const idProp = relSMD.propsDict.id;
           return {
@@ -339,7 +339,7 @@ var SMD = class {
         }
       }
       const children = this.fieldExprsToPropNodes(group, relSMD);
-      const nodeType = _chunk5UCV2JP3js.isBelongsToOneRelationProp.call(void 0, prop) || _chunk5UCV2JP3js.isOneToOneRelationProp.call(void 0, prop) ? "object" : "array";
+      const nodeType = _chunkJOHF7PK4js.isBelongsToOneRelationProp.call(void 0, prop) || _chunkJOHF7PK4js.isOneToOneRelationProp.call(void 0, prop) ? "object" : "array";
       return {
         prop,
         children,
@@ -353,7 +353,7 @@ var SMD = class {
       if (propName === prefix) {
         return null;
       }
-      if (_chunk5UCV2JP3js.isRelationProp.call(void 0, prop)) {
+      if (_chunkJOHF7PK4js.isRelationProp.call(void 0, prop)) {
         if (maxDepth < 0) {
           return null;
         }
@@ -393,7 +393,7 @@ var SMD = class {
     }
     const typesModulePath = `${basePath}/${this.names.fs}.types`;
     const typesFileDistPath = _path2.default.join(
-      _chunk5UCV2JP3js.Sonamu.apiRootPath,
+      _chunkJOHF7PK4js.Sonamu.apiRootPath,
       `dist/application/${typesModulePath}.js`
     );
     if (_fsextra2.default.existsSync(typesFileDistPath)) {
@@ -410,7 +410,7 @@ var SMD = class {
     }
     const enumsModulePath = `${basePath}/${this.names.fs}.enums`;
     const enumsFileDistPath = _path2.default.join(
-      _chunk5UCV2JP3js.Sonamu.apiRootPath,
+      _chunkJOHF7PK4js.Sonamu.apiRootPath,
       `/dist/application/${enumsModulePath}.js`
     );
     if (_fsextra2.default.existsSync(enumsFileDistPath)) {
@@ -454,7 +454,7 @@ var SMDManagerClass = class {
       return;
     }
     const pathPattern = _path2.default.join(
-      _chunk5UCV2JP3js.Sonamu.apiRootPath,
+      _chunkJOHF7PK4js.Sonamu.apiRootPath,
       "/dist/application/**/*.smd.js"
     );
     !doSilent && console.log(_chalk2.default.yellow(`autoload ${pathPattern}`));
@@ -550,14 +550,14 @@ console.log(_chalk2.default.bgBlue(`BEGIN ${/* @__PURE__ */ new Date()}`));
 _dotenv2.default.config();
 var migrator;
 async function bootstrap() {
-  await _chunk5UCV2JP3js.Sonamu.init(false, false);
+  await _chunkJOHF7PK4js.Sonamu.init(false, false);
   await _tsicli.tsicli.call(void 0, _process2.default.argv, {
     types: {
       "#entityId": {
         type: "autocomplete",
         name: "#entityId",
         message: "Please input #entityId",
-        choices: _chunk5UCV2JP3js.EntityManager.getAllParentIds().map((entityId) => ({
+        choices: _chunkJOHF7PK4js.EntityManager.getAllParentIds().map((entityId) => ({
           title: entityId,
           value: entityId
         }))
@@ -607,18 +607,18 @@ bootstrap().finally(async () => {
   if (migrator) {
     await migrator.destroy();
   }
-  await _chunk5UCV2JP3js.FixtureManager.destory();
-  await _chunk5UCV2JP3js.BaseModel.destroy();
+  await _chunkJOHF7PK4js.FixtureManager.destory();
+  await _chunkJOHF7PK4js.BaseModel.destroy();
   console.log(_chalk2.default.bgBlue(`END ${/* @__PURE__ */ new Date()}
 `));
 });
 async function setupMigrator() {
-  migrator = new (0, _chunk5UCV2JP3js.Migrator)({
+  migrator = new (0, _chunkJOHF7PK4js.Migrator)({
     mode: "dev"
   });
 }
 async function setupFixtureManager() {
-  _chunk5UCV2JP3js.FixtureManager.init();
+  _chunkJOHF7PK4js.FixtureManager.init();
 }
 async function migrate_run() {
   await setupMigrator();
@@ -643,24 +643,24 @@ async function migrate_reset() {
   await migrator.resetAll();
 }
 async function fixture_init() {
-  const srcConfig = _chunk5UCV2JP3js.Sonamu.dbConfig.development_master;
+  const srcConfig = _chunkJOHF7PK4js.Sonamu.dbConfig.development_master;
   const targets = [
     {
       label: "(REMOTE) Fixture DB",
-      config: _chunk5UCV2JP3js.Sonamu.dbConfig.fixture_remote
+      config: _chunkJOHF7PK4js.Sonamu.dbConfig.fixture_remote
     },
     {
       label: "(LOCAL) Fixture DB",
-      config: _chunk5UCV2JP3js.Sonamu.dbConfig.fixture_local,
+      config: _chunkJOHF7PK4js.Sonamu.dbConfig.fixture_local,
       toSkip: (() => {
-        const remoteConn = _chunk5UCV2JP3js.Sonamu.dbConfig.fixture_remote.connection;
-        const localConn = _chunk5UCV2JP3js.Sonamu.dbConfig.fixture_local.connection;
+        const remoteConn = _chunkJOHF7PK4js.Sonamu.dbConfig.fixture_remote.connection;
+        const localConn = _chunkJOHF7PK4js.Sonamu.dbConfig.fixture_local.connection;
         return remoteConn.host === localConn.host && remoteConn.database === localConn.database;
       })()
     },
     {
       label: "(LOCAL) Testing DB",
-      config: _chunk5UCV2JP3js.Sonamu.dbConfig.test
+      config: _chunkJOHF7PK4js.Sonamu.dbConfig.test
     }
   ];
   console.log("DUMP...");
@@ -705,15 +705,15 @@ async function fixture_init() {
 }
 async function fixture_import(entityId, recordIds) {
   await setupFixtureManager();
-  await _chunk5UCV2JP3js.FixtureManager.importFixture(entityId, recordIds);
-  await _chunk5UCV2JP3js.FixtureManager.sync();
+  await _chunkJOHF7PK4js.FixtureManager.importFixture(entityId, recordIds);
+  await _chunkJOHF7PK4js.FixtureManager.sync();
 }
 async function fixture_sync() {
   await setupFixtureManager();
-  await _chunk5UCV2JP3js.FixtureManager.sync();
+  await _chunkJOHF7PK4js.FixtureManager.sync();
 }
 async function stub_practice(name) {
-  const practiceDir = _path2.default.join(_chunk5UCV2JP3js.Sonamu.apiRootPath, "src", "practices");
+  const practiceDir = _path2.default.join(_chunkJOHF7PK4js.Sonamu.apiRootPath, "src", "practices");
   const fileNames = _fsextra2.default.readdirSync(practiceDir);
   const maxSeqNo = (() => {
     if (_fsextra2.default.existsSync(practiceDir) === false) {
@@ -756,22 +756,22 @@ async function stub_practice(name) {
   _child_process.execSync.call(void 0, `echo "${runCode}" | pbcopy`);
 }
 async function stub_entity(entityId) {
-  await _chunk5UCV2JP3js.Sonamu.syncer.createEntity({ entityId });
+  await _chunkJOHF7PK4js.Sonamu.syncer.createEntity({ entityId });
 }
 async function scaffold_model(entityId) {
-  await _chunk5UCV2JP3js.Sonamu.syncer.generateTemplate("model", {
+  await _chunkJOHF7PK4js.Sonamu.syncer.generateTemplate("model", {
     entityId
   });
 }
 async function scaffold_model_test(entityId) {
-  await _chunk5UCV2JP3js.Sonamu.syncer.generateTemplate("model_test", {
+  await _chunkJOHF7PK4js.Sonamu.syncer.generateTemplate("model_test", {
     entityId
   });
 }
 async function ui() {
   try {
     const sonamuUI = await Promise.resolve().then(() => _interopRequireWildcard(require("@sonamu-kit/ui")));
-    sonamuUI.startServers(_chunk5UCV2JP3js.Sonamu.apiRootPath);
+    sonamuUI.startServers(_chunkJOHF7PK4js.Sonamu.apiRootPath);
   } catch (e) {
     if (e instanceof Error && e.message.includes("isn't declared")) {
       console.log(`You need to install ${_chalk2.default.blue(`@sonamu-kit/ui`)} first.`);
@@ -810,7 +810,7 @@ async function smd_migration() {
     const parentNames = SMDManager.getNamesFromId(_nullishCoalesce(smd.parentId, () => ( smd.id)));
     const names = SMDManager.getNamesFromId(smd.id);
     const dstPath = _path2.default.join(
-      _chunk5UCV2JP3js.Sonamu.apiRootPath,
+      _chunkJOHF7PK4js.Sonamu.apiRootPath,
       "src",
       "application",
       parentNames.fs,
@@ -822,7 +822,7 @@ async function smd_migration() {
     _fsextra2.default.writeFileSync(dstPath, formatted);
     console.log(_chalk2.default.blue(`CREATED: ${dstPath}`));
     const srcSmdPath = _path2.default.join(
-      _chunk5UCV2JP3js.Sonamu.apiRootPath,
+      _chunkJOHF7PK4js.Sonamu.apiRootPath,
       "src",
       "application",
       parentNames.fs,
@@ -830,7 +830,7 @@ async function smd_migration() {
     );
     const dstSmdPath = srcSmdPath.replace("/src/", "/dist/").replace(/\.ts$/, ".js");
     const srcEnumsPath = _path2.default.join(
-      _chunk5UCV2JP3js.Sonamu.apiRootPath,
+      _chunkJOHF7PK4js.Sonamu.apiRootPath,
       "src",
       "application",
       parentNames.fs,
@@ -838,7 +838,7 @@ async function smd_migration() {
     );
     const dstEnumsPath = srcEnumsPath.replace("/src/", "/dist/").replace(/\.ts$/, ".js");
     const srcGeneratedPath = _path2.default.join(
-      _chunk5UCV2JP3js.Sonamu.apiRootPath,
+      _chunkJOHF7PK4js.Sonamu.apiRootPath,
       "src",
       "application",
       parentNames.fs,
@@ -850,8 +850,8 @@ async function smd_migration() {
       dstSmdPath,
       srcEnumsPath,
       dstEnumsPath,
-      ..._chunk5UCV2JP3js.Sonamu.config.sync.targets.map(
-        (target) => srcEnumsPath.replace(_chunk5UCV2JP3js.Sonamu.apiRootPath, _path2.default.join(_chunk5UCV2JP3js.Sonamu.appRootPath, target)).replace("/src/application/", "/src/services/")
+      ..._chunkJOHF7PK4js.Sonamu.config.sync.targets.map(
+        (target) => srcEnumsPath.replace(_chunkJOHF7PK4js.Sonamu.apiRootPath, _path2.default.join(_chunkJOHF7PK4js.Sonamu.appRootPath, target)).replace("/src/application/", "/src/services/")
       ),
       srcGeneratedPath,
       dstGeneratedPath
@@ -865,11 +865,11 @@ async function smd_migration() {
     });
   }
   console.log("Entity\uB85C \uB2E4\uC2DC \uB85C\uB4DC\uD569\uB2C8\uB2E4.");
-  _chunk5UCV2JP3js.EntityManager.isAutoloaded = false;
-  await _chunk5UCV2JP3js.EntityManager.autoload();
-  const entityIds = _chunk5UCV2JP3js.EntityManager.getAllParentIds();
+  _chunkJOHF7PK4js.EntityManager.isAutoloaded = false;
+  await _chunkJOHF7PK4js.EntityManager.autoload();
+  const entityIds = _chunkJOHF7PK4js.EntityManager.getAllParentIds();
   for await (const entityId of entityIds) {
-    await _chunk5UCV2JP3js.Sonamu.syncer.generateTemplate("generated", { entityId });
+    await _chunkJOHF7PK4js.Sonamu.syncer.generateTemplate("generated", { entityId });
   }
 }
 //# sourceMappingURL=cli.js.map

package/dist/bin/cli.mjs

@@ -11,7 +11,7 @@ import {
   isOneToOneRelationProp,
   isRelationProp,
   isVirtualProp
-} from "../chunk-XTNCGTDO.mjs";
+} from "../chunk-L4KELCY7.mjs";
 import {
   __dirname
 } from "../chunk-PTFDTOJU.mjs";

package/dist/{chunk-5UCV2JP3.js → chunk-JOHF7PK4.js}

@@ -356,6 +356,19 @@ function getZodTypeFromApiParamType(paramType, references) {
           return reference;
         case "union":
           const unionType = paramType;
+          if (unionType.types.length === 2 && unionType.types.some((type) => type === "null")) {
+            if (unionType.types[0] === "null") {
+              return getZodTypeFromApiParamType(
+                unionType.types[1],
+                references
+              ).nullable();
+            } else {
+              return getZodTypeFromApiParamType(
+                unionType.types[0],
+                references
+              ).nullable();
+            }
+          }
           return _zod.z.union(
             unionType.types.map(
               (type) => getZodTypeFromApiParamType(type, references)
@@ -7832,4 +7845,4 @@ var FixtureManager = new FixtureManagerClass();
 
 
 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.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.Entity = Entity; exports.EntityManager = EntityManager; 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.DB = DB; exports.isRefField = isRefField; exports.UpsertBuilder = UpsertBuilder; exports.BaseModelClass = BaseModelClass; exports.BaseModel = BaseModel; exports.Sonamu = Sonamu; exports.Migrator = Migrator; exports.FixtureManagerClass = FixtureManagerClass; exports.FixtureManager = FixtureManager;
-//# sourceMappingURL=chunk-5UCV2JP3.js.map
+//# sourceMappingURL=chunk-JOHF7PK4.js.map