nfkit 1.0.26 → 1.0.28

package/dist/index.mjs

@@ -1240,7 +1240,6 @@ var makeArray = (value) => {
 };
 
 // src/app-context/app-context.ts
-var ProvidePrefix = "provide:";
 var getMethodDescriptor = (cls, key) => {
   let proto = cls.prototype;
   while (proto && proto !== Object.prototype) {
@@ -1254,7 +1253,6 @@ var AppContextCore = class {
   constructor() {
     this.provideRecords = [];
     this.registry = /* @__PURE__ */ new Map();
-    this.loadSeq = [];
     this.objectSteps = [];
     this.started = false;
   }
@@ -1264,12 +1262,10 @@ var AppContextCore = class {
     const options = hasOptions ? last : void 0;
     const _args = hasOptions ? args.slice(0, -1) : args;
     const classRef = cls;
-    const provideKey = options?.provide ? ProvidePrefix + String(options.provide) : void 0;
-    const factory = () => options?.useValue ?? (options?.useFactory ? options.useFactory(this, ..._args) : new (options?.useClass ?? cls)(this, ..._args));
+    const factory = (ctx) => options?.useValue ?? (options?.useFactory ? options.useFactory(ctx, ..._args) : new (options?.useClass ?? cls)(ctx, ..._args));
     this.provideRecords.push({
       classRef,
-      factory,
-      provideKey
+      factory
     });
     if (options?.provide) {
       const prop = options.provide;
@@ -1344,6 +1340,11 @@ var AppContextCore = class {
   use(...ctxes) {
     for (const ctx of ctxes) {
       const other = ctx;
+      if (this.started && !other?.started) {
+        throw new Error(
+          "Cannot use an unstarted context into a started context."
+        );
+      }
       if (Array.isArray(other?.provideRecords)) {
         this.provideRecords.push(...other.provideRecords);
       }
@@ -1354,9 +1355,6 @@ var AppContextCore = class {
         }
       }
       if (other?.started) {
-        if (Array.isArray(other?.loadSeq)) {
-          this.loadSeq.push(...other.loadSeq);
-        }
         if (other?.registry instanceof Map) {
           for (const [key, value] of other.registry.entries()) {
             this.registry.set(key, value);
@@ -1373,24 +1371,26 @@ var AppContextCore = class {
     if (this.started) {
       return this;
     }
+    const startedEntries = [];
+    const preloadedKeys = new Set(this.registry.keys());
     for (const record of this.provideRecords) {
-      const inst = record.factory();
+      if (preloadedKeys.has(record.classRef)) {
+        continue;
+      }
+      const inst = record.factory(this);
       const entry = {
         classRef: record.classRef,
         inst
       };
       this.registry.set(record.classRef, entry);
-      if (record.provideKey) {
-        this.registry.set(record.provideKey, entry);
-      }
-      this.loadSeq.push(entry);
+      startedEntries.push(entry);
     }
-    for (const entry of this.loadSeq) {
+    for (const entry of startedEntries) {
       if (entry.inst && typeof entry.inst.then === "function") {
         entry.inst = await entry.inst;
       }
     }
-    for (const entry of this.loadSeq) {
+    for (const entry of startedEntries) {
       const inst = entry.inst;
       if (inst && typeof inst.init === "function") {
         await inst.init();
@@ -1410,10 +1410,164 @@ var AppServiceBase = class {
   async init() {
   }
 };
+
+// src/configurer/configurer.ts
+var ConfigurerInstance = class {
+  constructor(config, defaultConfig) {
+    this.config = config;
+    this.defaultConfig = defaultConfig;
+  }
+  getString(key) {
+    return this.config[key] || this.defaultConfig[key];
+  }
+  getInt(key) {
+    return parseInt(this.getString(key));
+  }
+  getFloat(key) {
+    return parseFloat(this.getString(key));
+  }
+  getBoolean(key) {
+    const defaultBoolean = parseConfigBoolean(this.defaultConfig[key], false);
+    return parseConfigBoolean(this.getString(key), defaultBoolean);
+  }
+  getStringArray(key) {
+    return convertStringArray(this.getString(key));
+  }
+  getIntArray(key) {
+    return convertIntArray(this.getString(key));
+  }
+  getFloatArray(key) {
+    return convertFloatArray(this.getString(key));
+  }
+  getBooleanArray(key) {
+    const defaultBoolean = parseConfigBoolean(this.defaultConfig[key], false);
+    return convertBooleanArray(this.getString(key), defaultBoolean);
+  }
+};
+var Configurer = class {
+  constructor(defaultConfig) {
+    this.defaultConfig = defaultConfig;
+  }
+  loadConfig(options = {}) {
+    const readConfig = options?.obj && typeof options.obj === "object" ? options.obj : {};
+    const normalizedConfig = normalizeConfigByDefaultKeys(
+      readConfig,
+      this.defaultConfig
+    );
+    return new ConfigurerInstance(
+      {
+        ...this.defaultConfig,
+        ...normalizedConfig,
+        ...options?.env || {}
+      },
+      this.defaultConfig
+    );
+  }
+  generateExampleObject() {
+    return Object.fromEntries(
+      Object.entries(this.defaultConfig).map(([key, value]) => {
+        if (value.includes(",")) {
+          return [
+            toCamelCaseKey(key),
+            value.split(",").map((v) => toTypedValue(v))
+          ];
+        }
+        return [toCamelCaseKey(key), toTypedValue(value)];
+      })
+    );
+  }
+};
+function toCamelCaseKey(key) {
+  const lower = key.toLowerCase();
+  return lower.replace(/_([a-z0-9])/g, (_, ch) => ch.toUpperCase());
+}
+function normalizeConfigValue(value) {
+  if (value == null) {
+    return void 0;
+  }
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number") {
+    return value.toString();
+  }
+  if (typeof value === "boolean") {
+    return value ? "1" : "0";
+  }
+  if (Array.isArray(value)) {
+    return value.map((item) => normalizeArrayItem(item)).join(",");
+  }
+  return String(value);
+}
+function normalizeArrayItem(value) {
+  if (typeof value === "string") {
+    return value;
+  }
+  if (typeof value === "number") {
+    return value.toString();
+  }
+  if (typeof value === "boolean") {
+    return value ? "1" : "0";
+  }
+  return String(value);
+}
+function normalizeConfigByDefaultKeys(readConfig, defaultConfig) {
+  const normalizedConfig = {};
+  for (const key of Object.keys(defaultConfig)) {
+    const rawKey = key;
+    const camelKey = toCamelCaseKey(rawKey);
+    const value = readConfig[camelKey] !== void 0 ? readConfig[camelKey] : readConfig[rawKey];
+    const normalized = normalizeConfigValue(value);
+    if (normalized !== void 0) {
+      normalizedConfig[key] = normalized;
+    }
+  }
+  return normalizedConfig;
+}
+function parseConfigBoolean(value, defaultValue = false) {
+  if (typeof value === "boolean") {
+    return value;
+  }
+  if (typeof value === "number") {
+    return value !== 0;
+  }
+  if (typeof value === "string") {
+    const normalized = value.trim().toLowerCase();
+    if (defaultValue) {
+      return !(normalized === "0" || normalized === "false" || normalized === "null");
+    }
+    return !(normalized === "" || normalized === "0" || normalized === "false" || normalized === "null");
+  }
+  if (value == null) {
+    return defaultValue;
+  }
+  return Boolean(value);
+}
+function convertStringArray(str) {
+  return str?.split(",").map((s) => s.trim()).filter((s) => s) || [];
+}
+function convertIntArray(str) {
+  return str?.split(",").map((s) => parseInt(s.trim())).filter((n) => !isNaN(n)) || [];
+}
+function convertFloatArray(str) {
+  return str?.split(",").map((s) => parseFloat(s.trim())).filter((n) => !isNaN(n)) || [];
+}
+function convertBooleanArray(str, defaultValue = false) {
+  return str?.split(",").map((s) => parseConfigBoolean(s.trim(), defaultValue)).filter((item) => typeof item === "boolean") || [];
+}
+function toTypedValue(value) {
+  const trimmed = value.trim();
+  if (/^\d+$/.test(trimmed)) {
+    return Number.parseInt(trimmed, 10);
+  }
+  return trimmed;
+}
 export {
   AbortedError,
   AppContextCore,
   AppServiceBase,
+  Configurer,
+  ConfigurerInstance,
   DUAL_PENDING,
   DynamicMiddlewareDispatcher,
   I18n,