@getstrata/core 1.1.2 → 1.1.3

package/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @getstrata/core changelog
 
+## 1.1.3
+
+- Eager with() arrays, OpenAPI mkdir, public-read/auth docs
+
 ## 1.1.2
 
 - Product CLI helpers, file migrations, and job discovery.

package/dist/core/database/model.d.ts

@@ -14,6 +14,7 @@ interface ModelConstructor<TEntity extends object, PrimaryKey extends keyof TEnt
 }
 type AnyModel = Model<Record<string, unknown>, "id">;
 type RelatedRef<TRelated extends object, RelatedKey extends keyof TRelated & string> = RelatedModelClass<TRelated, RelatedKey> | string | (() => RelatedModelClass<TRelated, RelatedKey>);
+type RelationNameInput = string | readonly string[];
 type ModelObserver = {
     retrieved?: (model: AnyModel) => unknown;
     creating?: (model: AnyModel) => unknown;
@@ -36,7 +37,7 @@ declare class ModelQuery {
     readonly query: RepositoryQuery<Record<string, unknown>, "id">;
     private readonly eager;
     constructor(modelClass: object, query: RepositoryQuery<Record<string, unknown>, "id">);
-    with(...relations: string[]): this;
+    with(...relations: RelationNameInput[]): this;
     where(input: QueryWhere<object> | ((builder: import("./whereBuilder.ts").WhereBuilder<object>) => void)): this;
     orWhere(input: QueryWhere<object> | ((builder: import("./whereBuilder.ts").WhereBuilder<object>) => void)): this;
     orderBy(orderBy: QueryOptions<object>["orderBy"]): this;
@@ -124,7 +125,7 @@ declare class Model<TEntity extends object, PrimaryKey extends keyof TEntity & s
     static query(this: object): ModelQuery;
     static newFromRecord(this: object, record: object, exists?: boolean): Model<Record<string, unknown>, "id">;
     static create(this: object, attributes: Record<string, unknown>, forced?: Record<string, unknown>): Promise<Model<Record<string, unknown>, "id">>;
-    static with(this: object, ...relations: string[]): ModelQuery;
+    static with(this: object, ...relations: RelationNameInput[]): ModelQuery;
     static withTrashed(this: object): ModelQuery;
     static onlyTrashed(this: object): ModelQuery;
     static chunk(this: object, count: number, callback: (models: Array<Model<Record<string, unknown>, "id">>) => Promise<boolean | void>): Promise<void>;
@@ -173,7 +174,7 @@ declare class Model<TEntity extends object, PrimaryKey extends keyof TEntity & s
     morphMany<TRelated extends object, RelatedKey extends keyof TRelated & string>(related: RelatedRef<TRelated, RelatedKey>, morphName: string, typeKey?: keyof TRelated & string, idKey?: keyof TRelated & string, morphType?: string): MorphManyRelationQuery<TEntity, PrimaryKey, TRelated, RelatedKey>;
     morphOne<TRelated extends object, RelatedKey extends keyof TRelated & string>(related: RelatedRef<TRelated, RelatedKey>, morphName: string, typeKey?: keyof TRelated & string, idKey?: keyof TRelated & string, morphType?: string): MorphOneRelationQuery<TEntity, PrimaryKey, TRelated, RelatedKey>;
     morphTo(relatedByType: Record<string, RelatedRef<Record<string, unknown>, "id">>, morphName?: string, typeKey?: keyof TEntity & string, idKey?: keyof TEntity & string): MorphToRelationQuery<TEntity, PrimaryKey>;
-    load(...names: string[]): Promise<this>;
+    load(...names: RelationNameInput[]): Promise<this>;
     loaded<T = unknown>(name: string): T | undefined;
     setLoaded(name: string, value: unknown): this;
     mergeAttributes(patch: Partial<TEntity>): this;

package/dist/entries/database/model.js

@@ -1469,6 +1469,25 @@ var namedModels = new Map;
 var modelGlobalScopes = new WeakMap;
 var modelObservers = new WeakMap;
 var modelBooted = new WeakSet;
+function flattenRelationNames(relations) {
+  const names = [];
+  for (const item of relations) {
+    if (typeof item === "string") {
+      if (item.length > 0) {
+        names.push(item);
+      }
+      continue;
+    }
+    if (Array.isArray(item)) {
+      for (const nested of item) {
+        if (typeof nested === "string" && nested.length > 0) {
+          names.push(nested);
+        }
+      }
+    }
+  }
+  return names;
+}
 async function runObservers(model, hook) {
   const observers = modelObservers.get(model.constructor) ?? [];
   for (const observer of observers) {
@@ -1725,7 +1744,7 @@ class ModelQuery {
     const statics = modelStatics(this.modelClass);
     ensureBooted(this.modelClass);
     const dummy = statics.newFromRecord({}, false);
-    for (const path of relations) {
+    for (const path of flattenRelationNames(relations)) {
       const name = path.split(".")[0] ?? path;
       const method = dummy[name];
       if (typeof method !== "function") {
@@ -2387,7 +2406,7 @@ class Model {
     }));
   }
   async load(...names) {
-    for (const name of names) {
+    for (const name of flattenRelationNames(names)) {
       if (name.includes(".")) {
         await loadNested(this, name);
         continue;

package/dist/index.js

@@ -5868,6 +5868,25 @@ var namedModels = new Map;
 var modelGlobalScopes = new WeakMap;
 var modelObservers = new WeakMap;
 var modelBooted = new WeakSet;
+function flattenRelationNames(relations) {
+  const names = [];
+  for (const item of relations) {
+    if (typeof item === "string") {
+      if (item.length > 0) {
+        names.push(item);
+      }
+      continue;
+    }
+    if (Array.isArray(item)) {
+      for (const nested of item) {
+        if (typeof nested === "string" && nested.length > 0) {
+          names.push(nested);
+        }
+      }
+    }
+  }
+  return names;
+}
 async function runObservers(model, hook) {
   const observers = modelObservers.get(model.constructor) ?? [];
   for (const observer of observers) {
@@ -6124,7 +6143,7 @@ class ModelQuery {
     const statics = modelStatics(this.modelClass);
     ensureBooted(this.modelClass);
     const dummy = statics.newFromRecord({}, false);
-    for (const path of relations) {
+    for (const path of flattenRelationNames(relations)) {
       const name = path.split(".")[0] ?? path;
       const method = dummy[name];
       if (typeof method !== "function") {
@@ -6786,7 +6805,7 @@ class Model {
     }));
   }
   async load(...names) {
-    for (const name of names) {
+    for (const name of flattenRelationNames(names)) {
       if (name.includes(".")) {
         await loadNested(this, name);
         continue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getstrata/core",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Strata Bun framework public API",
   "type": "module",
   "license": "MIT",