@arkstack/common 0.17.3 → 0.17.5

package/dist/{helpers-FHx7jP7g.d.ts → helpers-Bn6dk-9j.d.ts}

@@ -72,6 +72,16 @@ declare const perPage: (query: {
  */
 declare function getModel<TName extends ModelName>(modelName: TName): Promise<ModelRegistry[TName]>;
 declare function getModel<TModel extends AbstractModelConstructor = ModelConstructor>(modelName: string): Promise<TModel>;
+/**
+ * Synchronously import an application model by name.
+ *
+ * Apps can augment `ModelRegistry` to make `getModel('User')` return `typeof User`.
+ * Without a registry entry, pass the class type explicitly: `getModel<typeof User>('User')`.
+ *
+ * @param modelName
+ */
+declare function getModelSync<TName extends ModelName>(modelName: TName): ModelRegistry[TName];
+declare function getModelSync<TModel extends AbstractModelConstructor = ModelConstructor>(modelName: string): TModel;
 declare const initializeGlobalContext: ({
   Request,
   Response,
@@ -108,4 +118,4 @@ declare const abortIf: <T>(boolean: T, message?: string, code?: number) => asser
  */
 declare const assertFound: <T>(value: T | null | undefined, message: string, code?: number) => asserts value is T;
 //#endregion
-export { abortIf as a, initializeGlobalContext as c, Hash as d, Encryption as f, abort as i, isClass as l, ModelConstructor as n, assertFound as o, ModelRegistry as r, getModel as s, AbstractModelConstructor as t, perPage as u };
+export { abortIf as a, getModelSync as c, perPage as d, Hash as f, abort as i, initializeGlobalContext as l, ModelConstructor as n, assertFound as o, Encryption as p, ModelRegistry as r, getModel as s, AbstractModelConstructor as t, isClass as u };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference path="./app.d.ts" />
-import { a as abortIf, c as initializeGlobalContext, d as Hash, f as Encryption, i as abort, l as isClass, n as ModelConstructor, o as assertFound, r as ModelRegistry, s as getModel, t as AbstractModelConstructor, u as perPage } from "./helpers-FHx7jP7g.js";
+import { a as abortIf, c as getModelSync, d as perPage, f as Hash, i as abort, l as initializeGlobalContext, n as ModelConstructor, o as assertFound, p as Encryption, r as ModelRegistry, s as getModel, t as AbstractModelConstructor, u as isClass } from "./helpers-Bn6dk-9j.js";
 import { JitiOptions, JitiResolveOptions } from "jiti";
 import { Arkstack } from "@arkstack/contract";
 import pino from "pino";
@@ -870,4 +870,4 @@ declare const devTlsCredentials: (host?: string) => Promise<TlsCredentials>;
  */
 declare const localNetworkAddress: () => string | undefined;
 //#endregion
-export { AbstractModelConstructor, AppConfig, AppException, ArkstackErrorPayload, ArkstackErrorShape, CONFIG_KEY, Choice, Choices, ConfigLoader, ConfigRegistry, ConfigShape, DotPath, DotPathValue, Encryption, EnvKey, EnvLoader, EnvLookup, EnvRegistry, EnvReturn, ErrorHandler, Exception, FileImporter, GlobalConfig, GlobalEnv, Hash, Hook, HookArgs, HookFor, HookName, HookPos, HookPositions, HookRegistry, IHook, Logger, LoggerChalk, LoggerLog, LoggerParseSignature, MergedConfig, ModelConstructor, ModelRegistry, Primitive, PublishConfirmation, PublishEntry, PublishFilter, PublishGroup, Publisher, RequestException, TlsCredentials, UnionToIntersection, abort, abortIf, appKey, appUrl, assertFound, bindGracefulShutdown, bootWithDetectedPort, config, configLoader, createErrorPayload, devTlsCredentials, discoverCommands, env, envLoader, getErrorLogger, getModel, getPrimaryError, getValidationErrors, importFile, initializeGlobalContext, interopDefault, isClass, isModelNotFoundError, isValidationError, loadPrototypes, localNetworkAddress, logUnhandledError, nodeEnv, normalizeStatusCode, outputDir, perPage, rebuildOutput, renderError, resolveRuntimeDir, resolveRuntimeModule, serializeError, shouldHideStack, shouldLogError, toErrorShape, toOutputPath };
+export { AbstractModelConstructor, AppConfig, AppException, ArkstackErrorPayload, ArkstackErrorShape, CONFIG_KEY, Choice, Choices, ConfigLoader, ConfigRegistry, ConfigShape, DotPath, DotPathValue, Encryption, EnvKey, EnvLoader, EnvLookup, EnvRegistry, EnvReturn, ErrorHandler, Exception, FileImporter, GlobalConfig, GlobalEnv, Hash, Hook, HookArgs, HookFor, HookName, HookPos, HookPositions, HookRegistry, IHook, Logger, LoggerChalk, LoggerLog, LoggerParseSignature, MergedConfig, ModelConstructor, ModelRegistry, Primitive, PublishConfirmation, PublishEntry, PublishFilter, PublishGroup, Publisher, RequestException, TlsCredentials, UnionToIntersection, abort, abortIf, appKey, appUrl, assertFound, bindGracefulShutdown, bootWithDetectedPort, config, configLoader, createErrorPayload, devTlsCredentials, discoverCommands, env, envLoader, getErrorLogger, getModel, getModelSync, getPrimaryError, getValidationErrors, importFile, initializeGlobalContext, interopDefault, isClass, isModelNotFoundError, isValidationError, loadPrototypes, localNetworkAddress, logUnhandledError, nodeEnv, normalizeStatusCode, outputDir, perPage, rebuildOutput, renderError, resolveRuntimeDir, resolveRuntimeModule, serializeError, shouldHideStack, shouldLogError, toErrorShape, toOutputPath };

package/dist/index.js

@@ -1,5 +1,5 @@
 import { _ as EnvLoader, a as env, c as nodeEnv, d as resolveRuntimeDir, f as resolveRuntimeModule, g as configLoader, h as ConfigLoader, i as discoverCommands, l as outputDir, m as CONFIG_KEY, n as appUrl, o as importFile, p as toOutputPath, r as config, s as interopDefault, t as appKey, u as rebuildOutput, v as envLoader } from "./system-XvUhJFS0.js";
-import { _ as Hash, c as abortIf, d as initializeGlobalContext, f as isClass, g as Exception, h as AppException, l as assertFound, m as RequestException, p as perPage, s as abort, u as getModel, v as Encryption } from "./utils-BGjeEW4M.js";
+import { _ as Exception, c as abortIf, d as getModelSync, f as initializeGlobalContext, g as AppException, h as RequestException, l as assertFound, m as perPage, p as isClass, s as abort, u as getModel, v as Hash, y as Encryption } from "./utils-C3mcZZMN.js";
 import { Hook as Hook$1 } from "@arkstack/foundry";
 import { Arkstack } from "@arkstack/contract";
 import { str } from "@h3ravel/support";
@@ -599,4 +599,4 @@ const localNetworkAddress = () => {
 	for (const list of Object.values(networkInterfaces())) for (const net of list ?? []) if (net.family === "IPv4" && !net.internal) return net.address;
 };
 //#endregion
-export { AppException, CONFIG_KEY, ConfigLoader, Encryption, EnvLoader, ErrorHandler, Exception, Hash, Hook, Logger, Publisher, RequestException, abort, abortIf, appKey, appUrl, assertFound, bindGracefulShutdown, bootWithDetectedPort, config, configLoader, createErrorPayload, devTlsCredentials, discoverCommands, env, envLoader, getErrorLogger, getModel, getPrimaryError, getValidationErrors, importFile, initializeGlobalContext, interopDefault, isClass, isModelNotFoundError, isValidationError, loadPrototypes, localNetworkAddress, logUnhandledError, nodeEnv, normalizeStatusCode, outputDir, perPage, rebuildOutput, renderError, resolveRuntimeDir, resolveRuntimeModule, serializeError, shouldHideStack, shouldLogError, toErrorShape, toOutputPath };
+export { AppException, CONFIG_KEY, ConfigLoader, Encryption, EnvLoader, ErrorHandler, Exception, Hash, Hook, Logger, Publisher, RequestException, abort, abortIf, appKey, appUrl, assertFound, bindGracefulShutdown, bootWithDetectedPort, config, configLoader, createErrorPayload, devTlsCredentials, discoverCommands, env, envLoader, getErrorLogger, getModel, getModelSync, getPrimaryError, getValidationErrors, importFile, initializeGlobalContext, interopDefault, isClass, isModelNotFoundError, isValidationError, loadPrototypes, localNetworkAddress, logUnhandledError, nodeEnv, normalizeStatusCode, outputDir, perPage, rebuildOutput, renderError, resolveRuntimeDir, resolveRuntimeModule, serializeError, shouldHideStack, shouldLogError, toErrorShape, toOutputPath };

package/dist/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { a as abortIf, c as initializeGlobalContext, d as Hash, f as Encryption, i as abort, l as isClass, n as ModelConstructor, o as assertFound, r as ModelRegistry, s as getModel, t as AbstractModelConstructor, u as perPage } from "../helpers-FHx7jP7g.js";
+import { a as abortIf, c as getModelSync, d as perPage, f as Hash, i as abort, l as initializeGlobalContext, n as ModelConstructor, o as assertFound, p as Encryption, r as ModelRegistry, s as getModel, t as AbstractModelConstructor, u as isClass } from "../helpers-Bn6dk-9j.js";
 import { Model } from "arkormx";
 
 //#region src/utils/traits.d.ts
@@ -185,4 +185,4 @@ type Derived<T extends (Trait | TypeFactory<Trait> | Cons)> = T extends TypeFact
  */
 declare function uses<T extends (Trait | TypeFactory<Trait> | Cons)>(instance: unknown, trait: T): instance is Derived<T>;
 //#endregion
-export { AbstractModelConstructor, Derived, Encryption, Hash, ModelConstructor, ModelRegistry, Trait, abort, abortIf, assertFound, callTraitMethods, crc32, getModel, getTraitMethods, initializeGlobalContext, isClass, perPage, trait, use, uses };
+export { AbstractModelConstructor, Derived, Encryption, Hash, ModelConstructor, ModelRegistry, Trait, abort, abortIf, assertFound, callTraitMethods, crc32, getModel, getModelSync, getTraitMethods, initializeGlobalContext, isClass, perPage, trait, use, uses };

package/dist/utils/index.js

@@ -1,2 +1,2 @@
-import { _ as Hash, a as use, c as abortIf, d as initializeGlobalContext, f as isClass, i as trait, l as assertFound, n as crc32, o as uses, p as perPage, r as getTraitMethods, s as abort, t as callTraitMethods, u as getModel, v as Encryption } from "../utils-BGjeEW4M.js";
-export { Encryption, Hash, abort, abortIf, assertFound, callTraitMethods, crc32, getModel, getTraitMethods, initializeGlobalContext, isClass, perPage, trait, use, uses };
+import { a as use, c as abortIf, d as getModelSync, f as initializeGlobalContext, i as trait, l as assertFound, m as perPage, n as crc32, o as uses, p as isClass, r as getTraitMethods, s as abort, t as callTraitMethods, u as getModel, v as Hash, y as Encryption } from "../utils-C3mcZZMN.js";
+export { Encryption, Hash, abort, abortIf, assertFound, callTraitMethods, crc32, getModel, getModelSync, getTraitMethods, initializeGlobalContext, isClass, perPage, trait, use, uses };

package/dist/{utils-BGjeEW4M.js → utils-C3mcZZMN.js}

@@ -1,4 +1,5 @@
 import { a as env, f as resolveRuntimeModule, o as importFile, t as appKey } from "./system-XvUhJFS0.js";
+import { createRequire } from "node:module";
 import { createCipheriv, createDecipheriv, createHash, randomBytes } from "node:crypto";
 import { Arkstack } from "@arkstack/contract";
 import path from "node:path";
@@ -191,6 +192,22 @@ async function getModel(modelName) {
 	if (typeof model !== "function") throw new Error(`Model "${modelName}" not found`);
 	return model;
 }
+const isModelModule = (value) => typeof value === "object" && value !== null;
+const resolveModelExport = (module, modelName) => {
+	if (!isModelModule(module)) return module;
+	return module.default ?? module[modelName] ?? module;
+};
+function getModelSync(modelName) {
+	const require = createRequire(import.meta.url);
+	const { Arkorm, getUserConfig } = require("arkormx");
+	const exportName = path.basename(modelName, path.extname(modelName));
+	const registeredModel = Arkorm.getRegisteredModels().find((model) => model.name === exportName);
+	if (registeredModel) return registeredModel;
+	const modelPath = getUserConfig().paths?.models || "./src/models";
+	const model = resolveModelExport(require(resolveRuntimeModule(path.join(path.isAbsolute(modelPath) ? modelPath : path.join(Arkstack.rootDir(), modelPath), modelName))), exportName);
+	if (typeof model !== "function") throw new Error(`Model "${modelName}" not found`);
+	return model;
+}
 const initializeGlobalContext = async ({ Request, Response, Session } = {}) => {
 	try {
 		const { Request: Req, Response: Res, Session: Ses } = await import("@arkstack/http");
@@ -449,4 +466,4 @@ function uses(instance, trait) {
 	return false;
 }
 //#endregion
-export { Hash as _, use as a, abortIf as c, initializeGlobalContext as d, isClass as f, Exception as g, AppException as h, trait as i, assertFound as l, RequestException as m, crc32 as n, uses as o, perPage as p, getTraitMethods as r, abort as s, callTraitMethods as t, getModel as u, Encryption as v };
+export { Exception as _, use as a, abortIf as c, getModelSync as d, initializeGlobalContext as f, AppException as g, RequestException as h, trait as i, assertFound as l, perPage as m, crc32 as n, uses as o, isClass as p, getTraitMethods as r, abort as s, callTraitMethods as t, getModel as u, Hash as v, Encryption as y };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arkstack/common",
-  "version": "0.17.3",
+  "version": "0.17.5",
   "type": "module",
   "description": "Core utilities, primitives, and shared infrastructure for the Arkstack ecosystem.",
   "homepage": "https://arkstack.toneflix.net",
@@ -46,9 +46,9 @@
   },
   "peerDependencies": {
     "@h3ravel/support": "^2.2.4",
-    "arkormx": "^2.11.4",
-    "@arkstack/contract": "^0.17.3",
-    "@arkstack/foundry": "^0.17.3"
+    "arkormx": "^2.11.6",
+    "@arkstack/contract": "^0.17.5",
+    "@arkstack/foundry": "^0.17.5"
   },
   "optionalDependencies": {
     "@faker-js/faker": "^10.4.0"