@akanjs/config 0.0.87 → 0.0.88

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@akanjs/config",
-  "version": "0.0.87",
+  "version": "0.0.88",
   "type": "commonjs",
   "module": {
     "access": "public"

package/src/akanConfig.d.ts

@@ -1,7 +1,7 @@
 import type { AppConfig, AppConfigResult, DeepPartial, LibConfigResult, RunnerProps } from "@akanjs/config";
 import type { NextConfig } from "next";
-export declare const makeAppConfig: (config: DeepPartial<AppConfigResult>, props?: Partial<RunnerProps>) => AppConfigResult;
+export declare const makeAppConfig: (config: DeepPartial<AppConfigResult>, props: RunnerProps) => AppConfigResult;
 export declare const getAppConfig: (appRoot: string, props: RunnerProps) => Promise<AppConfigResult>;
-export declare const makeLibConfig: (config: DeepPartial<LibConfigResult>, props?: Partial<RunnerProps>) => LibConfigResult;
+export declare const makeLibConfig: (config: DeepPartial<LibConfigResult>, props: RunnerProps) => LibConfigResult;
 export declare const getLibConfig: (libRoot: string, props: RunnerProps) => Promise<LibConfigResult>;
 export declare const getNextConfig: (configImp: AppConfig, appData: any) => NextConfig | (() => Promise<NextConfig> | NextConfig);

package/src/akanConfig.js

@@ -36,17 +36,9 @@ __export(akanConfig_exports, {
 module.exports = __toCommonJS(akanConfig_exports);
 var import_fs = __toESM(require("fs"));
 var import_path = __toESM(require("path"));
-var import_baseConfigEnv = require("./baseConfigEnv");
 var import_nextConfig = require("./nextConfig");
-const makeAppConfig = (config, props = {}) => {
-  const baseConfigEnv = (0, import_baseConfigEnv.getBaseConfigEnv)(props.appName);
-  const {
-    appName = baseConfigEnv.appName,
-    repoName = baseConfigEnv.repoName,
-    serveDomain = baseConfigEnv.serveDomain,
-    env = baseConfigEnv.env,
-    command = "build"
-  } = props;
+const makeAppConfig = (config, props) => {
+  const { name, repoName, serveDomain, env, command = "build" } = props;
   return {
     rootLib: config.rootLib,
     libs: config.libs ?? [],
@@ -68,7 +60,7 @@ ENV PORT 8080
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${appName}
+ENV NEXT_PUBLIC_APP_NAME=${name}
 ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
 CMD ["node", "main.js"]`,
@@ -87,12 +79,12 @@ ENV PORT 4200
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${appName}
+ENV NEXT_PUBLIC_APP_NAME=${name}
 ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
 CMD ["npm", "start"]`,
       nextConfig: (0, import_nextConfig.withBase)(
-        appName,
+        name,
         config.frontend?.nextConfig ? typeof config.frontend.nextConfig === "function" ? config.frontend.nextConfig() : config.frontend.nextConfig : {},
         config.libs ?? [],
         config.frontend?.routes
@@ -109,7 +101,7 @@ const getAppConfig = async (appRoot, props) => {
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeAppConfig(config, props);
 };
-const makeLibConfig = (config, props = {}) => {
+const makeLibConfig = (config, props) => {
   return {
     rootLib: config.rootLib,
     libs: config.libs ?? [],
@@ -131,12 +123,12 @@ const getLibConfig = async (libRoot, props) => {
 };
 const getNextConfig = (configImp, appData) => {
   const appInfo = appData;
-  const baseConfigEnv = (0, import_baseConfigEnv.getBaseConfigEnv)(appInfo.name);
   const props = {
-    appName: baseConfigEnv.appName,
-    repoName: baseConfigEnv.repoName,
-    serveDomain: baseConfigEnv.serveDomain,
-    env: baseConfigEnv.env,
+    type: "app",
+    name: appInfo.name,
+    repoName: appInfo.repoName,
+    serveDomain: appInfo.serveDomain,
+    env: process.env.NEXT_PUBLIC_ENV ?? "debug",
     command: "build"
   };
   const config = typeof configImp === "function" ? configImp(props) : configImp;

package/src/akanConfig.mjs

@@ -1,16 +1,8 @@
 import fs from "fs";
 import path from "path";
-import { getBaseConfigEnv } from "./baseConfigEnv";
 import { withBase } from "./nextConfig";
-const makeAppConfig = (config, props = {}) => {
-  const baseConfigEnv = getBaseConfigEnv(props.appName);
-  const {
-    appName = baseConfigEnv.appName,
-    repoName = baseConfigEnv.repoName,
-    serveDomain = baseConfigEnv.serveDomain,
-    env = baseConfigEnv.env,
-    command = "build"
-  } = props;
+const makeAppConfig = (config, props) => {
+  const { name, repoName, serveDomain, env, command = "build" } = props;
   return {
     rootLib: config.rootLib,
     libs: config.libs ?? [],
@@ -32,7 +24,7 @@ ENV PORT 8080
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${appName}
+ENV NEXT_PUBLIC_APP_NAME=${name}
 ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
 CMD ["node", "main.js"]`,
@@ -51,12 +43,12 @@ ENV PORT 4200
 ENV NODE_OPTIONS=--max_old_space_size=8192
 ENV NEXT_PUBLIC_REPO_NAME=${repoName}
 ENV NEXT_PUBLIC_SERVE_DOMAIN=${serveDomain}
-ENV NEXT_PUBLIC_APP_NAME=${appName}
+ENV NEXT_PUBLIC_APP_NAME=${name}
 ENV NEXT_PUBLIC_ENV=${env}
 ENV NEXT_PUBLIC_OPERATION_MODE=cloud
 CMD ["npm", "start"]`,
       nextConfig: withBase(
-        appName,
+        name,
         config.frontend?.nextConfig ? typeof config.frontend.nextConfig === "function" ? config.frontend.nextConfig() : config.frontend.nextConfig : {},
         config.libs ?? [],
         config.frontend?.routes
@@ -73,7 +65,7 @@ const getAppConfig = async (appRoot, props) => {
   const config = typeof configImp === "function" ? configImp(props) : configImp;
   return makeAppConfig(config, props);
 };
-const makeLibConfig = (config, props = {}) => {
+const makeLibConfig = (config, props) => {
   return {
     rootLib: config.rootLib,
     libs: config.libs ?? [],
@@ -95,12 +87,12 @@ const getLibConfig = async (libRoot, props) => {
 };
 const getNextConfig = (configImp, appData) => {
   const appInfo = appData;
-  const baseConfigEnv = getBaseConfigEnv(appInfo.name);
   const props = {
-    appName: baseConfigEnv.appName,
-    repoName: baseConfigEnv.repoName,
-    serveDomain: baseConfigEnv.serveDomain,
-    env: baseConfigEnv.env,
+    type: "app",
+    name: appInfo.name,
+    repoName: appInfo.repoName,
+    serveDomain: appInfo.serveDomain,
+    env: process.env.NEXT_PUBLIC_ENV ?? "debug",
     command: "build"
   };
   const config = typeof configImp === "function" ? configImp(props) : configImp;

package/src/types.d.ts

@@ -1,9 +1,10 @@
 import type { NextConfig } from "next";
 export interface RunnerProps {
-    appName: string;
+    type: "app" | "lib";
+    name: string;
     repoName: string;
     serveDomain: string;
-    env: "testing" | "debug" | "develop" | "main";
+    env: "testing" | "local" | "debug" | "develop" | "main";
     command?: string;
 }
 export type Arch = "amd64" | "arm64";
@@ -88,6 +89,8 @@ export declare const getDefaultFileScan: () => FileConventionScanResult;
 export interface AppScanResult {
     name: string;
     type: "app" | "lib";
+    repoName: string;
+    serveDomain: string;
     akanConfig: AppConfigResult;
     files: FileConventionScanResult;
     libDeps: string[];
@@ -100,6 +103,8 @@ export interface AppScanResult {
 export interface LibScanResult {
     name: string;
     type: "app" | "lib";
+    repoName: string;
+    serveDomain: string;
     akanConfig: LibConfigResult;
     files: FileConventionScanResult;
     libDeps: string[];

package/src/baseConfigEnv.d.ts

@@ -1,8 +0,0 @@
-interface BaseConfigEnv {
-    appName: string;
-    repoName: string;
-    serveDomain: string;
-    env: "testing" | "debug" | "develop" | "main";
-}
-export declare const getBaseConfigEnv: (appName?: string | undefined) => BaseConfigEnv;
-export {};

package/src/baseConfigEnv.js

@@ -1,36 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var baseConfigEnv_exports = {};
-__export(baseConfigEnv_exports, {
-  getBaseConfigEnv: () => getBaseConfigEnv
-});
-module.exports = __toCommonJS(baseConfigEnv_exports);
-const getBaseConfigEnv = (appName = process.env.NEXT_PUBLIC_APP_NAME) => {
-  if (!appName)
-    throw new Error("NEXT_PUBLIC_APP_NAME is not set");
-  const repoName = process.env.NEXT_PUBLIC_REPO_NAME;
-  if (!repoName)
-    throw new Error("NEXT_PUBLIC_REPO_NAME is not set");
-  const serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN;
-  if (!serveDomain)
-    throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
-  const env = process.env.NEXT_PUBLIC_ENV ?? "debug";
-  if (!env)
-    throw new Error("NEXT_PUBLIC_ENV is not set");
-  return { appName, repoName, serveDomain, env };
-};

package/src/baseConfigEnv.mjs

@@ -1,17 +0,0 @@
-const getBaseConfigEnv = (appName = process.env.NEXT_PUBLIC_APP_NAME) => {
-  if (!appName)
-    throw new Error("NEXT_PUBLIC_APP_NAME is not set");
-  const repoName = process.env.NEXT_PUBLIC_REPO_NAME;
-  if (!repoName)
-    throw new Error("NEXT_PUBLIC_REPO_NAME is not set");
-  const serveDomain = process.env.NEXT_PUBLIC_SERVE_DOMAIN;
-  if (!serveDomain)
-    throw new Error("NEXT_PUBLIC_SERVE_DOMAIN is not set");
-  const env = process.env.NEXT_PUBLIC_ENV ?? "debug";
-  if (!env)
-    throw new Error("NEXT_PUBLIC_ENV is not set");
-  return { appName, repoName, serveDomain, env };
-};
-export {
-  getBaseConfigEnv
-};