@famgia/omnify-laravel 2.0.23 → 2.0.25

package/dist/{chunk-RSC5ATSV.js → chunk-FQYGLKZY.js}

@@ -288,7 +288,7 @@ function generateForeignKey(propertyName, property, allSchemas, options = {}) {
   const columnName = toColumnName(propertyName) + "_id";
   const targetSchema = assocProp.target ? allSchemas[assocProp.target] : void 0;
   const targetTable = assocProp.target ? toTableName(assocProp.target) : "unknown";
-  const targetPkType = targetSchema ? getIdType(targetSchema) : "BigInt";
+  const targetPkType = assocProp.idType ?? (targetSchema ? getIdType(targetSchema) : "BigInt");
   let method = "unsignedBigInteger";
   if (targetPkType === "Int") {
     method = "unsignedInteger";
@@ -1496,7 +1496,12 @@ function formatAddColumn(columnName, prop) {
   }
   if (isAssociationWithFkColumn(prop)) {
     const fkColumn = getAssociationFkColumnName(columnName);
-    let code2 = `$table->unsignedBigInteger('${fkColumn}')`;
+    const idType = prop.idType ?? "BigInt";
+    let columnMethod = "unsignedBigInteger";
+    if (idType === "Int") columnMethod = "unsignedInteger";
+    else if (idType === "Uuid") columnMethod = "uuid";
+    else if (idType === "String") columnMethod = "string";
+    let code2 = `$table->${columnMethod}('${fkColumn}')`;
     if (prop.nullable) code2 += "->nullable()";
     lines.push(code2 + ";");
     if (prop.target) {
@@ -1559,7 +1564,12 @@ function formatRenameColumn(oldName, newName, prop) {
 function formatModifyColumn(columnName, _prevProp, currProp) {
   if (isAssociationWithFkColumn(currProp)) {
     const fkColumn = getAssociationFkColumnName(columnName);
-    let code2 = `$table->unsignedBigInteger('${fkColumn}')`;
+    const idType = currProp.idType ?? "BigInt";
+    let columnMethod = "unsignedBigInteger";
+    if (idType === "Int") columnMethod = "unsignedInteger";
+    else if (idType === "Uuid") columnMethod = "uuid";
+    else if (idType === "String") columnMethod = "string";
+    let code2 = `$table->${columnMethod}('${fkColumn}')`;
     if (currProp.nullable) code2 += "->nullable()";
     return code2 + "->change();";
   }
@@ -2095,7 +2105,8 @@ function generateEntityBaseModel(schema, schemas, options, stubContent, authStub
     if (propDef.type === "Association") {
       const assoc = propDef;
       if (assoc.target) {
-        imports.push(`use ${options.modelNamespace}\\${toPascalCase(assoc.target)};`);
+        const targetNs = assoc.targetNamespace ?? options.modelNamespace;
+        imports.push(`use ${targetNs}\\${toPascalCase(assoc.target)};`);
       }
       relations.push(generateRelation(propName, assoc, schema, schemas, options));
       if (assoc.relation === "ManyToOne" || assoc.relation === "OneToOne") {
@@ -3467,15 +3478,16 @@ function generateAssociationFake(propertyName, property, schema, schemas, modelN
   if (property.type !== "Association") {
     return null;
   }
-  const relation = property.relation;
-  const target = property.target;
-  if (relation !== "ManyToOne" || !target) {
+  const assoc = property;
+  if (assoc.relation !== "ManyToOne" || !assoc.target) {
     return null;
   }
+  const target = assoc.target;
   const foreignKey = `${toSnakeCase(propertyName)}_id`;
-  const isNullable2 = property.nullable ?? false;
+  const isNullable2 = assoc.nullable ?? false;
   const targetSchema = schemas[target];
-  if (!targetSchema) {
+  const targetNs = assoc.targetNamespace ?? modelNamespace;
+  if (!targetSchema && !assoc.targetNamespace) {
     return null;
   }
   let fake;
@@ -3486,7 +3498,7 @@ function generateAssociationFake(propertyName, property, schema, schemas, modelN
   }
   let importStatement;
   if (target !== schema.name) {
-    importStatement = `use ${modelNamespace}\\${target};`;
+    importStatement = `use ${targetNs}\\${target};`;
   }
   return { fake, import: importStatement };
 }
@@ -5451,4 +5463,4 @@ export {
   getFactoryPath,
   laravelPlugin
 };
-//# sourceMappingURL=chunk-RSC5ATSV.js.map
+//# sourceMappingURL=chunk-FQYGLKZY.js.map