@cheetah.js/orm 0.1.32 → 0.1.34

package/dist/bun/index.js

@@ -218325,7 +218325,7 @@ var PROPERTIES_METADATA = "cheetah:properties:metadata";
 var PROPERTIES_RELATIONS = "cheetah:properties:relations";
 var EVENTS_METADATA = "cheetah:events:metadata";
 
-// /export/htdocs/p/framework/packages/core/dist/domain/provider-type.js
+// ../../node_modules/balanced-match/index.jsodules/minimatch
 var ProviderType;
 (function(ProviderType2) {
   ProviderType2["ROUTES"] = "routes";
@@ -218334,7 +218334,7 @@ var ProviderType;
   ProviderType2["CONTROLLER"] = "controller";
 })(ProviderType || (ProviderType = {}));
 
-// /export/htdocs/p/framework/packages/core/dist/domain/provider-scope.js
+// ../../node_modules/balanced-match/index.jsodules/minimatch/
 var ProviderScope;
 (function(ProviderScope2) {
   ProviderScope2["REQUEST"] = "request";
@@ -218342,9 +218342,26 @@ var ProviderScope;
   ProviderScope2["SINGLETON"] = "singleton";
 })(ProviderScope || (ProviderScope = {}));
 
+// /export/htdocs/p/framework/packages/core/dist/domain/provider-type.js
+var ProviderType2;
+(function(ProviderType3) {
+  ProviderType3["ROUTES"] = "routes";
+  ProviderType3["SERVICE"] = "service";
+  ProviderType3["PROVIDER"] = "provider";
+  ProviderType3["CONTROLLER"] = "controller";
+})(ProviderType2 || (ProviderType2 = {}));
+
+// /export/htdocs/p/framework/packages/core/dist/domain/provider-scope.js
+var ProviderScope2;
+(function(ProviderScope3) {
+  ProviderScope3["REQUEST"] = "request";
+  ProviderScope3["INSTANCE"] = "instance";
+  ProviderScope3["SINGLETON"] = "singleton";
+})(ProviderScope2 || (ProviderScope2 = {}));
+
 // /export/htdocs/p/framework/packages/core/dist/domain/provider.js
 class Provider {
-  type = ProviderType.PROVIDER;
+  type = ProviderType2.PROVIDER;
   deps = [];
   instance;
   _provide;
@@ -218352,7 +218369,7 @@ class Provider {
   _useValue;
   hooks;
   path;
-  scope = ProviderScope.SINGLETON;
+  scope = ProviderScope2.SINGLETON;
   children = [];
   parent;
   constructor(token, options = {}) {
@@ -218470,7 +218487,7 @@ class ProviderControl extends Map {
     }
   }
   createIfNotExists(key, options) {
-    const type = options.type || ProviderType.PROVIDER;
+    const type = options.type || ProviderType2.PROVIDER;
     if (!this.has(key)) {
       const { model = Provider } = this.settings.get(type) || {};
       const item = new model(key, options);
@@ -218487,9 +218504,9 @@ function registerProvider(provider3) {
   }
   return GlobalProvider.merge(provider3.provide, provider3);
 }
-GlobalProvider.createRegistry(ProviderType.CONTROLLER, Provider);
-GlobalProvider.createRegistry(ProviderType.ROUTES, Provider);
-var registerController = GlobalProvider.createRegisterFn(ProviderType.CONTROLLER);
+GlobalProvider.createRegistry(ProviderType2.CONTROLLER, Provider);
+GlobalProvider.createRegistry(ProviderType2.ROUTES, Provider);
+var registerController = GlobalProvider.createRegisterFn(ProviderType2.CONTROLLER);
 // /export/htdocs/p/framework/packages/core/node_modules/globby/index.js
 var import_merge2 = __toESM(require_merge2(), 1);
 var import_fast_glob2 = __toESM(require_out4(), 1);
@@ -221448,7 +221465,7 @@ var InjectorService = InjectorService_1 = class InjectorService2 {
   resolveControllers() {
     if (!this.settings)
       return {};
-    const controllers = GlobalProvider.getByType(ProviderType.CONTROLLER).filter((controller2) => !controller2.isChild());
+    const controllers = GlobalProvider.getByType(ProviderType2.CONTROLLER).filter((controller2) => !controller2.isChild());
     let hydrateRoute = new Map;
     for (const controller2 of controllers) {
       let routes = Metadata.get(CONTROLLER_ROUTES, controller2.token);
@@ -221573,18 +221590,18 @@ var InjectorService = InjectorService_1 = class InjectorService2 {
       construct = (deps2) => new provider3.useClass(...deps2);
     let instance;
     if (isRequestScope(provider3, deps, this)) {
-      scope = ProviderScope.REQUEST;
+      scope = ProviderScope2.REQUEST;
     }
     let services = [];
     if (!provider3.useValue)
       services = deps.filter((t) => !isPrimitiveType(t)).map((token) => this.invoke(getClassOrSymbol(token), locals));
     instance = construct(services);
     switch (scope) {
-      case ProviderScope.SINGLETON:
+      case ProviderScope2.SINGLETON:
         provider3.instance = instance;
         this.container.addProvider(provider3.token, provider3);
         break;
-      case ProviderScope.REQUEST:
+      case ProviderScope2.REQUEST:
         const clone = provider3.clone();
         clone.instance = instance;
         locals.set(clone.token, clone);
@@ -221599,7 +221616,7 @@ var InjectorService = InjectorService_1 = class InjectorService2 {
   async invokeMethod(instance, methodName, locals, context) {
     const cachedMethod = this.historyMethods.get(instance);
     let methodInfo;
-    if (cachedMethod) {
+    if (cachedMethod && cachedMethod[methodName]) {
       methodInfo = cachedMethod[methodName];
     } else {
       methodInfo = this.cacheMethodInfo(instance, methodName);
@@ -221636,7 +221653,7 @@ var InjectorService = InjectorService_1 = class InjectorService2 {
     return methodInfo;
   }
   scopeOf(provider3) {
-    return provider3.scope || ProviderScope.SINGLETON;
+    return provider3.scope || ProviderScope2.SINGLETON;
   }
   getConstructorDependencies(target, propertyKey) {
     return Metadata.getOwn("override:ctor:design:paramtypes", target, propertyKey) || [...Metadata.getParamTypes(target, propertyKey)];
@@ -221777,7 +221794,7 @@ var Context = Context_1 = class Context2 {
   }
 };
 Context = Context_1 = __decorate2([
-  Injectable({ scope: ProviderScope.REQUEST }),
+  Injectable({ scope: ProviderScope2.REQUEST }),
   __metadata("design:paramtypes", [])
 ], Context);
 // /export/htdocs/p/framework/packages/core/dist/domain/LocalsContainer.js
@@ -222164,7 +222181,7 @@ function isRequestScope(provider4, deps, injector) {
     const depProvider = injector.get(dep);
     if (!depProvider)
       return false;
-    return depProvider.scope === ProviderScope.REQUEST;
+    return depProvider.scope === ProviderScope2.REQUEST;
   });
 }
 // /export/htdocs/p/framework/packages/core/dist/utils/nameOf.js
@@ -222340,43 +222357,9 @@ LoggerService = __decorate4([
   Service(),
   __metadata3("design:paramtypes", [InjectorService])
 ], LoggerService);
-// ../../node_modules/balanced-match/
-function Entity(options) {
-  return (target) => {
-    const entities = Metadata.get(ENTITIES, Reflect) || [];
-    entities.push({ target, options });
-    Metadata.set(ENTITIES, entities, Reflect);
-  };
-}
-// ../../node_m
-function getDefaultLength(type) {
-  return null;
-}
-function toSnakeCase(propertyKey1) {
-  propertyKey1 = propertyKey1[0].toLowerCase() + propertyKey1.slice(1);
-  return propertyKey1.replace(/([A-Z])/g, "_$1").toLowerCase();
-}
-
-// ../../node_modules/balanced-match/index.jsodules/minimatch
-var ProviderType2;
-(function(ProviderType3) {
-  ProviderType3["ROUTES"] = "routes";
-  ProviderType3["SERVICE"] = "service";
-  ProviderType3["PROVIDER"] = "provider";
-  ProviderType3["CONTROLLER"] = "controller";
-})(ProviderType2 || (ProviderType2 = {}));
-
-// ../../node_modules/balanced-match/index.jsodules/minimatch/
-var ProviderScope2;
-(function(ProviderScope3) {
-  ProviderScope3["REQUEST"] = "request";
-  ProviderScope3["INSTANCE"] = "instance";
-  ProviderScope3["SINGLETON"] = "singleton";
-})(ProviderScope2 || (ProviderScope2 = {}));
-
 // ../../node_modules/balanced-match/index.jsodules/mini
 class Provider2 {
-  type = ProviderType2.PROVIDER;
+  type = ProviderType.PROVIDER;
   deps = [];
   instance;
   _provide;
@@ -222384,7 +222367,7 @@ class Provider2 {
   _useValue;
   hooks;
   path;
-  scope = ProviderScope2.SINGLETON;
+  scope = ProviderScope.SINGLETON;
   children = [];
   parent;
   constructor(token, options = {}) {
@@ -222502,7 +222485,7 @@ class ProviderControl5 extends Map {
     }
   }
   createIfNotExists(key, options) {
-    const type = options.type || ProviderType2.PROVIDER;
+    const type = options.type || ProviderType.PROVIDER;
     if (!this.has(key)) {
       const { model = Provider2 } = this.settings.get(type) || {};
       const item = new model(key, options);
@@ -222513,9 +222496,9 @@ class ProviderControl5 extends Map {
 }
 var GlobalProvider2 = new ProviderControl5;
 // ../../node_modules/balanced-match/index.jsodules/minimatch/dist/cjs/unesc
-GlobalProvider2.createRegistry(ProviderType2.CONTROLLER, Provider2);
-GlobalProvider2.createRegistry(ProviderType2.ROUTES, Provider2);
-var registerController2 = GlobalProvider2.createRegisterFn(ProviderType2.CONTROLLER);
+GlobalProvider2.createRegistry(ProviderType.CONTROLLER, Provider2);
+GlobalProvider2.createRegistry(ProviderType.ROUTES, Provider2);
+var registerController2 = GlobalProvider2.createRegisterFn(ProviderType.CONTROLLER);
 // /export/htdocs/p/framework/node_modules/globby/index.js
 var import_merge22 = __toESM(require_merge2(), 1);
 var import_fast_glob4 = __toESM(require_out4(), 1);
@@ -223144,7 +223127,7 @@ var InjectorService5 = InjectorService_12 = class InjectorService6 {
   resolveControllers() {
     if (!this.settings)
       return {};
-    const controllers = GlobalProvider.getByType(ProviderType.CONTROLLER).filter((controller3) => !controller3.isChild());
+    const controllers = GlobalProvider.getByType(ProviderType2.CONTROLLER).filter((controller3) => !controller3.isChild());
     let hydrateRoute = new Map;
     for (const controller3 of controllers) {
       let routes = Metadata.get(CONTROLLER_ROUTES, controller3.token);
@@ -223269,16 +223252,16 @@ var InjectorService5 = InjectorService_12 = class InjectorService6 {
       construct = (deps2) => provider6.useValue;
     let instance;
     if (isRequestScope(provider6, deps, this)) {
-      scope = ProviderScope.REQUEST;
+      scope = ProviderScope2.REQUEST;
     }
     const services = deps.filter((t) => !isPrimitiveType(t)).map((token) => this.invoke(getClassOrSymbol(token), locals));
     instance = construct(services);
     switch (scope) {
-      case ProviderScope.SINGLETON:
+      case ProviderScope2.SINGLETON:
         provider6.instance = instance;
         this.container.addProvider(provider6.token, provider6);
         break;
-      case ProviderScope.REQUEST:
+      case ProviderScope2.REQUEST:
         const clone = provider6.clone();
         clone.instance = instance;
         locals.set(clone.token, clone);
@@ -223330,7 +223313,7 @@ var InjectorService5 = InjectorService_12 = class InjectorService6 {
     return methodInfo;
   }
   scopeOf(provider6) {
-    return provider6.scope || ProviderScope.SINGLETON;
+    return provider6.scope || ProviderScope2.SINGLETON;
   }
   getConstructorDependencies(target, propertyKey) {
     return Metadata.getOwn("override:ctor:design:paramtypes", target, propertyKey) || [...Metadata.getParamTypes(target, propertyKey)];
@@ -223466,7 +223449,7 @@ var Context4 = Context_12 = class Context5 {
   }
 };
 Context4 = Context_12 = __decorate6([
-  Injectable({ scope: ProviderScope.REQUEST }),
+  Injectable({ scope: ProviderScope2.REQUEST }),
   __metadata4("design:paramtypes", [])
 ], Context4);
 // ../../node_modules/balanced-match/index.jsodules/mini
@@ -223778,10 +223761,27 @@ LoggerService3 = __decorate8([
   Service(),
   __metadata6("design:paramtypes", [InjectorService])
 ], LoggerService3);
+// ../../node_modules/balanced-match/
+function Entity(options) {
+  return (target) => {
+    const entities = Metadata3.get(ENTITIES, Reflect) || [];
+    entities.push({ target, options });
+    Metadata3.set(ENTITIES, entities, Reflect);
+  };
+}
+// ../../node_m
+function getDefaultLength(type) {
+  return null;
+}
+function toSnakeCase(propertyKey1) {
+  propertyKey1 = propertyKey1[0].toLowerCase() + propertyKey1.slice(1);
+  return propertyKey1.replace(/([A-Z])/g, "_$1").toLowerCase();
+}
+
 // ../../node_modules/balanced-match
 function Index(options) {
   return (target, propertyKey) => {
-    const indexes = Metadata3.get("indexes", target.constructor) || [];
+    const indexes = Metadata.get("indexes", target.constructor) || [];
     let index;
     if (options && options.properties) {
       const properties = options.properties;
@@ -223790,7 +223790,7 @@ function Index(options) {
       index = { name: `${propertyKey}_index`, properties: [propertyKey] };
     }
     indexes.push(index);
-    Metadata3.set("indexes", indexes, target.constructor);
+    Metadata.set("indexes", indexes, target.constructor);
   };
 }
 
@@ -225262,9 +225262,10 @@ class PgDriver {
   }
   async index(tableName, options) {
     const schema = options && options.schema || "public";
-    const result = await this.client.query(`SELECT indexname AS index_name, indexdef AS column_name, tablename AS table_name
+    let result = await this.client.query(`SELECT indexname AS index_name, indexdef AS column_name, tablename AS table_name
        FROM pg_indexes
        WHERE tablename = '${tableName}' AND schemaname = '${schema}'`);
+    result.rows = result.rows.filter((row) => row.index_name.includes("_pkey") || !row.column_name.includes("UNIQUE INDEX"));
     return result.rows.map((row) => {
       return {
         table: tableName,
@@ -226718,7 +226719,7 @@ class DiffCalculator {
     const colT = entityCol.isEnum ? { type: "USER-DEFINED", len: null } : this.convertEntityTypeToSqlType(entityCol.type);
     const colType = colT.type;
     const length = entityCol.length ?? colT.len;
-    if (bdCol.type !== colType || bdCol.length !== length) {
+    if (!bdCol.type.includes(colType) || bdCol.length !== length) {
       if (colType === "USER-DEFINED") {
         colDiffs.push({
           actionType: "DELETE",
@@ -226824,13 +226825,13 @@ class DiffCalculator {
       case "varchar":
         return { type: "character varying", len: 255 };
       case "Boolean":
-        return { type: "boolean" };
+        return { type: "boolean", len: null };
       case "Date":
         return { type: "timestamp" };
       case "Object":
-        return { type: "json" };
+        return { type: "json", len: null };
       case "uuid":
-        return { type: "uuid" };
+        return { type: "uuid", len: null };
       case "text":
         return { type: "text" };
       default:
@@ -227072,6 +227073,7 @@ class Migrator {
         if (colDiff.colChanges.unique) {
           sqlInstructions.push(this.orm.driverInstance.getAddUniqueConstraint(schema, tableName, colName));
         } else {
+          sqlInstructions.push(this.orm.driverInstance.getDropConstraint({ name: `${tableName}_${colName}_key` }, schema, tableName));
         }
       }
       if (colDiff.colChanges.nullable !== undefined) {
@@ -227229,7 +227231,7 @@ class DiffCalculator2 {
     const colT = entityCol.isEnum ? { type: "USER-DEFINED", len: null } : this.convertEntityTypeToSqlType(entityCol.type);
     const colType = colT.type;
     const length = entityCol.length ?? colT.len;
-    if (bdCol.type !== colType || bdCol.length !== length) {
+    if (!bdCol.type.includes(colType) || bdCol.length !== length) {
       if (colType === "USER-DEFINED") {
         colDiffs.push({
           actionType: "DELETE",
@@ -227335,13 +227337,13 @@ class DiffCalculator2 {
       case "varchar":
         return { type: "character varying", len: 255 };
       case "Boolean":
-        return { type: "boolean" };
+        return { type: "boolean", len: null };
       case "Date":
         return { type: "timestamp" };
       case "Object":
-        return { type: "json" };
+        return { type: "json", len: null };
       case "uuid":
-        return { type: "uuid" };
+        return { type: "uuid", len: null };
       case "text":
         return { type: "text" };
       default:
@@ -227583,6 +227585,7 @@ class Migrator2 {
         if (colDiff.colChanges.unique) {
           sqlInstructions.push(this.orm.driverInstance.getAddUniqueConstraint(schema, tableName, colName));
         } else {
+          sqlInstructions.push(this.orm.driverInstance.getDropConstraint({ name: `${tableName}_${colName}_key` }, schema, tableName));
         }
       }
       if (colDiff.colChanges.nullable !== undefined) {
@@ -227630,4 +227633,4 @@ export {
   AfterCreate
 };
 
-//# debugId=D324EA0E9DAC3A1664756e2164756e21
+//# debugId=0601C8B41D18B46364756e2164756e21